From a87d3ecb35897446732521e0da30ef06ef7deddd Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Sun, 10 May 2020 16:46:01 +0000
Subject: [PATCH]

---
 server/AyaNova/Controllers/WorkOrderController.cs | 9 ++++-----
 server/AyaNova/biz/WorkOrderBiz.cs                | 6 +++---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/server/AyaNova/Controllers/WorkOrderController.cs b/server/AyaNova/Controllers/WorkOrderController.cs
index 3a0bca60..2b0265fb 100644
--- a/server/AyaNova/Controllers/WorkOrderController.cs
+++ b/server/AyaNova/Controllers/WorkOrderController.cs
@@ -127,12 +127,11 @@ namespace AyaNova.Api.Controllers
         /// <summary>
         /// Put (update) WorkOrder        
         /// (Descendent objects must be updated via their individual routes seperately)
-        /// </summary>
-        /// <param name="id">WorkOrder id</param>
+        /// </summary>       
         /// <param name="updatedObject">WorkOrder - top level only, no descendents</param>
         /// <returns>New concurrency token</returns>
-        [HttpPut("{id}")]
-        public async Task<IActionResult> PutWorkOrder([FromRoute] long id, [FromBody] dtWorkOrder updatedObject)
+        [HttpPut]
+        public async Task<IActionResult> PutWorkOrder([FromBody] dtWorkOrder updatedObject)
         {
             if (!serverState.IsOpen)
                 return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
@@ -141,7 +140,7 @@ namespace AyaNova.Api.Controllers
             WorkOrderBiz biz = WorkOrderBiz.GetBiz(ct, HttpContext);
             if (!Authorized.HasModifyRole(HttpContext.Items, biz.BizType))
                 return StatusCode(403, new ApiNotAuthorizedResponse());
-            var o = await biz.PutAsync(id, updatedObject);//In future may need to return entire object, for now just concurrency token 
+            var o = await biz.PutAsync(updatedObject);//In future may need to return entire object, for now just concurrency token 
             if (o == null)
             {
                 if (biz.Errors.Exists(m => m.Code == ApiErrorCode.CONCURRENCY_CONFLICT))
diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs
index 5848ce3e..393678c2 100644
--- a/server/AyaNova/biz/WorkOrderBiz.cs
+++ b/server/AyaNova/biz/WorkOrderBiz.cs
@@ -131,10 +131,10 @@ namespace AyaNova.Biz
         ////////////////////////////////////////////////////////////////////////////////////////////////
         //UPDATE
         //       
-        internal async Task<WorkOrder> PutAsync(long id, dtWorkOrder dtPutObject)
+        internal async Task<WorkOrder> PutAsync(dtWorkOrder dtPutObject)
         {
 
-            WorkOrder dbObject = await ct.WorkOrder.SingleOrDefaultAsync(m => m.Id == id);
+            WorkOrder dbObject = await ct.WorkOrder.SingleOrDefaultAsync(m => m.Id == dtPutObject.Id);
             if (dbObject == null)
             {
                 AddError(ApiErrorCode.NOT_FOUND, "id");
@@ -168,7 +168,7 @@ namespace AyaNova.Biz
             }
             catch (DbUpdateConcurrencyException)
             {
-                if (!await WorkOrderExistsAsync(id))
+                if (!await WorkOrderExistsAsync(dtPutObject.Id))
                     AddError(ApiErrorCode.NOT_FOUND);
                 else
                     new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT);