diff --git a/WorkOrder/WorkOrderCrud.cs b/WorkOrder/WorkOrderCrud.cs index b78aee4..7db11a1 100644 --- a/WorkOrder/WorkOrderCrud.cs +++ b/WorkOrder/WorkOrderCrud.cs @@ -168,6 +168,7 @@ namespace raven_integration a = await Util.GetAsync($"workorder/{WorkOrderId}", await Util.GetTokenAsync("BizAdmin")); Util.ValidateDataReturnResponseOk(a); o = a.ObjectResponse["data"]; + ((JObject)o).Remove("items"); o["notes"] = "UpdatedWoNotes"; a = await Util.PutAsync("workorder", await Util.GetTokenAsync("BizAdmin"), o.ToString()); Util.ValidateDataReturnResponseOk(a); @@ -217,7 +218,7 @@ namespace raven_integration a = await Util.GetAsync($"workorder/items/outside-services/{WorkOrderItemOutsideServiceToBeUpdatedId}", await Util.GetTokenAsync("BizAdmin")); Util.ValidateDataReturnResponseOk(a); o = a.ObjectResponse["data"]; - o["notes"] = ""; + o["notes"] = "UpdatedOutsideServiceNotes"; a = await Util.PutAsync("workorder/items/outside-services", await Util.GetTokenAsync("BizAdmin"), o.ToString()); Util.ValidateDataReturnResponseOk(a); @@ -233,8 +234,8 @@ namespace raven_integration o = w["items"].FirstOrDefault(z => (long)z["id"] == WorkOrderItem1Id); o["labors"].Count().Should().Be(2); o["parts"].Count().Should().Be(1); - ((string)o["notes"]).Should().Be("UpdatedWoItemNotes"); - ((string)o["labors"].FirstOrDefault(z => (long)z["id"] == WorkOrderItemLaborToBeUpdatedId)["notes"]).Should().Be("UpdatedLaborNotes"); + ((string)o["notes"]).Should().Be("UpdatedWoItemNotes"); + ((string)o["labors"].FirstOrDefault(z => (long)z["id"] == WorkOrderItemLaborToBeUpdatedId)["serviceDetails"]).Should().Be("UpdatedLaborNotes"); ((long)o["parts"].FirstOrDefault(z => (long)z["id"] == WorkOrderItemPartToBeUpdatedId)["suggestedQuantity"]).Should().Be(2); //Verify workorder item 2 and it's subitems @@ -243,57 +244,56 @@ namespace raven_integration o["labors"].Count().Should().Be(1); o["parts"].Count().Should().Be(1); o["units"].Count().Should().Be(1); - o["scheduled-users"].Count().Should().Be(1); + o["scheduledUsers"].Count().Should().Be(1); o["tasks"].Count().Should().Be(1); o["travels"].Count().Should().Be(1); o["expenses"].Count().Should().Be(1); o["loans"].Count().Should().Be(1); - o["outside-services"].Count().Should().Be(1); + o["outsideServices"].Count().Should().Be(1); o["labors"][0]["serviceDetails"].Value().Should().Be("Test woitem2 labour service details"); o["parts"][0]["suggestedQuantity"].Value().Should().Be(1); o["units"][0]["notes"].Value().Should().Be("UpdatedUnitNotes"); - o["scheduled-users"][0]["estimatedQuantity"].Value().Should().Be(2); + o["scheduledUsers"][0]["estimatedQuantity"].Value().Should().Be(2); o["tasks"][0]["task"].Value().Should().Be("UpdatedTask"); - o["travels"][0]["travelDetails"].Value().Should().Be("UpdatedTravelDetails"); - o["expenses"][0]["description"].Value().Should().Be("UpdatedExpenseDescription"); - o["loans"][0]["notes"].Value().Should().Be("UpdatedLoanNotes"); - o["outside-services"][0]["notes"].Value().Should().Be("UpdatedOutsideServiceNotes"); + o["travels"][0]["travelDetails"].Value().Should().Be("UpdatedTravelDetails"); + o["expenses"][0]["description"].Value().Should().Be("UpdatedExpenseDescription"); + o["loans"][0]["notes"].Value().Should().Be("UpdatedLoanNotes"); + o["outsideServices"][0]["notes"].Value().Should().Be("UpdatedOutsideServiceNotes"); + //DELETE + //delete from each level + //not going to test every delete at this point + a = await Util.DeleteAsync($"workorder/items/labors/{WorkOrderItemLaborToBeUpdatedId}", await Util.GetTokenAsync("BizAdmin")); + Util.ValidateHTTPStatusCode(a, 204); + a = await Util.GetAsync($"workorder/items/labors/{WorkOrderItemLaborToBeUpdatedId}", await Util.GetTokenAsync("BizAdmin")); + Util.ValidateHTTPStatusCode(a, 404); + a = await Util.DeleteAsync($"workorder/items/{WorkOrderItem2Id}", await Util.GetTokenAsync("BizAdmin")); + Util.ValidateHTTPStatusCode(a, 204); + a = await Util.GetAsync($"workorder/items/{WorkOrderItem2Id}", await Util.GetTokenAsync("BizAdmin")); + Util.ValidateHTTPStatusCode(a, 404); - - - - - // //Test get ancestor route - // var AyaTypeWorkOrderItemExpense = 36; - // a = await Util.GetAsync($"search/ancestor/{AyaTypeWorkOrderItemExpense}/{TestExpenseId}", await Util.GetTokenAsync("BizAdmin")); - // Util.ValidateDataReturnResponseOk(a); - - - - // a = await Util.DeleteAsync("workorder/items/labors/" + Labor1Id.ToString(), await Util.GetTokenAsync("BizAdmin")); - // Util.ValidateHTTPStatusCode(a, 204); - // a = await Util.GetAsync("workorder/items/labors/" + Labor1Id.ToString(), await Util.GetTokenAsync("BizAdmin")); - // Util.ValidateHTTPStatusCode(a, 404); - - // a = await Util.DeleteAsync("workorder/items/" + WorkOrderItem2Id.ToString(), await Util.GetTokenAsync("BizAdmin")); - // Util.ValidateHTTPStatusCode(a, 204); - // a = await Util.GetAsync("workorder/items/" + WorkOrderItem2Id.ToString(), await Util.GetTokenAsync("BizAdmin")); - // Util.ValidateHTTPStatusCode(a, 404); - - // a = await Util.DeleteAsync("workorder/" + WorkOrderId.ToString(), await Util.GetTokenAsync("BizAdmin")); - // Util.ValidateHTTPStatusCode(a, 204); - // a = await Util.GetAsync("workorder/" + WorkOrderId.ToString(), await Util.GetTokenAsync("BizAdmin")); - // Util.ValidateHTTPStatusCode(a, 404); + a = await Util.DeleteAsync($"workorder/{WorkOrderId}", await Util.GetTokenAsync("BizAdmin")); + Util.ValidateHTTPStatusCode(a, 204); + a = await Util.GetAsync($"workorder/{WorkOrderId}", await Util.GetTokenAsync("BizAdmin")); + Util.ValidateHTTPStatusCode(a, 404); } + [Fact(Skip = "TODO: add test get ancestor route")] + public async Task GetAncestor() + { + // //Test get ancestor route + // var AyaTypeWorkOrderItemExpense = 36; + // a = await Util.GetAsync($"search/ancestor/{AyaTypeWorkOrderItemExpense}/{TestExpenseId}", await Util.GetTokenAsync("BizAdmin")); + // Util.ValidateDataReturnResponseOk(a); + } + [Fact] public async Task ConfirmDeleteTransactionWorksAtServer()