admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2018-09-07 18:48:50 +00:00
parent a70f599008
commit d2783cf626
3 changed files with 51 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/AyaNova/Controllers/TagGroupController.cs
View File

@@ -134,7 +134,7 @@ namespace AyaNova.Api.Controllers
/// </summary> /// </summary>
/// <param name="id">TagGroupId</param> /// <param name="id">TagGroupId</param>
/// <returns>name value list of all tags in group</returns> /// <returns>name value list of all tags in group</returns>
[HttpGet("TagsInGroupPickList")] [HttpGet("TagsInGroupPickList/{id}")]
public async Task<IActionResult> TagsInGroupPickList([FromRoute] long id) public async Task<IActionResult> TagsInGroupPickList([FromRoute] long id)
{ {
if (!serverState.IsOpen) if (!serverState.IsOpen)

7
server/AyaNova/biz/TagGroupBiz.cs
View File

@@ -145,9 +145,12 @@ namespace AyaNova.Biz
//get picklist (simple non-paged) //get picklist (simple non-paged)
internal async Task<List<NameIdItem>> GetTagsInGroupPickListAsync(long tagGroupId) internal async Task<List<NameIdItem>> GetTagsInGroupPickListAsync(long tagGroupId)
{ {
TODO: change this to return a name value list of tags in group //first, get an array of the tagId's in this group
var tagGroupTags = await ct.TagGroupMap.Where(m => m.TagGroupId == tagGroupId).Select(m => m.TagId).ToArrayAsync();
List<NameIdItem> l = new List<NameIdItem>(); List<NameIdItem> l = new List<NameIdItem>();
l = await ct.Locale l = await ct.Tag
.Where(m => tagGroupTags.Contains(m.Id))
.OrderBy(m => m.Name) .OrderBy(m => m.Name)
.Select(m => new NameIdItem() .Select(m => new NameIdItem()
{ {

87
test/raven-integration/Tags/TagGroupOps.cs
View File

@@ -63,7 +63,10 @@ namespace raven_integration
Util.ValidateDataReturnResponseOk(R); Util.ValidateDataReturnResponseOk(R);
//GET PICKLIST OF TAGS FOR GROUP //GET PICKLIST OF TAGS FOR GROUP
R = await Util.GetAsync("TagGroup/TagsInGroupPickList/" + TestTagGroupId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
Util.ValidateDataReturnResponseOk(R);
// R.ObjectResponse["result"]["id"].Value<long>().Should().Be(tagMapId);
//TAG ITEM WITH GROUP OF TAGS //TAG ITEM WITH GROUP OF TAGS
@@ -72,57 +75,57 @@ namespace raven_integration
//CREATE WIDGET // //CREATE WIDGET
dynamic w = new JObject(); // dynamic w = new JObject();
w.name = Util.Uniquify("WIDGET_TAG"); // w.name = Util.Uniquify("WIDGET_TAG");
w.created = DateTime.Now.ToString(); // w.created = DateTime.Now.ToString();
w.dollarAmount = 1.11m; // w.dollarAmount = 1.11m;
w.active = true; // w.active = true;
w.roles = 0; // w.roles = 0;
R = await Util.PostAsync("Widget", await Util.GetTokenAsync("BizAdminFull"), w.ToString()); // R = await Util.PostAsync("Widget", await Util.GetTokenAsync("BizAdminFull"), w.ToString());
Util.ValidateDataReturnResponseOk(R); // Util.ValidateDataReturnResponseOk(R);
long widgetId = R.ObjectResponse["result"]["id"].Value<long>(); // long widgetId = R.ObjectResponse["result"]["id"].Value<long>();
//CREATE TAGMAP (tag the widget) // //CREATE TAGMAP (tag the widget)
/* // /*
{ // {
"tagId": 0, // "tagId": 0,
"tagToObjectId": 0, // "tagToObjectId": 0,
"tagToObjectType": 0 // "tagToObjectType": 0
} // }
*/ // */
dynamic tm = new JObject(); // dynamic tm = new JObject();
tm.tagId = TestTagId; // tm.tagId = TestTagId;
tm.tagToObjectId = widgetId; // tm.tagToObjectId = widgetId;
tm.tagToObjectType = 2;//widget // tm.tagToObjectType = 2;//widget
R = await Util.PostAsync("TagMap", await Util.GetTokenAsync("BizAdminFull"), tm.ToString()); // R = await Util.PostAsync("TagMap", await Util.GetTokenAsync("BizAdminFull"), tm.ToString());
Util.ValidateDataReturnResponseOk(R); // Util.ValidateDataReturnResponseOk(R);
long tagMapId = R.ObjectResponse["result"]["id"].Value<long>(); // long tagMapId = R.ObjectResponse["result"]["id"].Value<long>();
//VERIFY TAGMAP // //VERIFY TAGMAP
R = await Util.GetAsync("TagMap/" + tagMapId.ToString(), await Util.GetTokenAsync("BizAdminFull")); // R = await Util.GetAsync("TagMap/" + tagMapId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
Util.ValidateDataReturnResponseOk(R); // Util.ValidateDataReturnResponseOk(R);
R.ObjectResponse["result"]["id"].Value<long>().Should().Be(tagMapId); // R.ObjectResponse["result"]["id"].Value<long>().Should().Be(tagMapId);
//ATTEMPT TO DELETE TAG THAT HAS TAGMAP SHOULD FAIL with 2200 / 400 // //ATTEMPT TO DELETE TAG THAT HAS TAGMAP SHOULD FAIL with 2200 / 400
R = await Util.DeleteAsync("Tag/" + TestTagId.ToString(), await Util.GetTokenAsync("BizAdminFull")); // R = await Util.DeleteAsync("Tag/" + TestTagId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
Util.ValidateViolatesReferentialIntegrityError(R); // Util.ValidateViolatesReferentialIntegrityError(R);
//DELETE TAGMAP // //DELETE TAGMAP
R = await Util.DeleteAsync("TagMap/" + tagMapId.ToString(), await Util.GetTokenAsync("BizAdminFull")); // R = await Util.DeleteAsync("TagMap/" + tagMapId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
Util.ValidateHTTPStatusCode(R, 204); // Util.ValidateHTTPStatusCode(R, 204);
//DELETE TAG // //DELETE TAG
R = await Util.DeleteAsync("Tag/" + TestTagId.ToString(), await Util.GetTokenAsync("BizAdminFull")); // R = await Util.DeleteAsync("Tag/" + TestTagId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
Util.ValidateHTTPStatusCode(R, 204); // Util.ValidateHTTPStatusCode(R, 204);
//DELETE WIDGET // //DELETE WIDGET
R = await Util.DeleteAsync("Widget/" + widgetId.ToString(), await Util.GetTokenAsync("BizAdminFull")); // R = await Util.DeleteAsync("Widget/" + widgetId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
Util.ValidateHTTPStatusCode(R, 204); // Util.ValidateHTTPStatusCode(R, 204);
} }