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
2020-05-10 16:46:01 +00:00
parent 90e9119f62
commit a87d3ecb35
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/AyaNova/Controllers/WorkOrderController.cs
View File

@@ -127,12 +127,11 @@ namespace AyaNova.Api.Controllers
/// <summary> /// <summary>
/// Put (update) WorkOrder /// Put (update) WorkOrder
/// (Descendent objects must be updated via their individual routes seperately) /// (Descendent objects must be updated via their individual routes seperately)
/// </summary> /// </summary>
/// <param name="id">WorkOrder id</param>
/// <param name="updatedObject">WorkOrder - top level only, no descendents</param> /// <param name="updatedObject">WorkOrder - top level only, no descendents</param>
/// <returns>New concurrency token</returns> /// <returns>New concurrency token</returns>
[HttpPut("{id}")] [HttpPut]
public async Task<IActionResult> PutWorkOrder([FromRoute] long id, [FromBody] dtWorkOrder updatedObject) public async Task<IActionResult> PutWorkOrder([FromBody] dtWorkOrder updatedObject)
{ {
if (!serverState.IsOpen) if (!serverState.IsOpen)
return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
@@ -141,7 +140,7 @@ namespace AyaNova.Api.Controllers
WorkOrderBiz biz = WorkOrderBiz.GetBiz(ct, HttpContext); WorkOrderBiz biz = WorkOrderBiz.GetBiz(ct, HttpContext);
if (!Authorized.HasModifyRole(HttpContext.Items, biz.BizType)) if (!Authorized.HasModifyRole(HttpContext.Items, biz.BizType))
return StatusCode(403, new ApiNotAuthorizedResponse()); 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 (o == null)
{ {
if (biz.Errors.Exists(m => m.Code == ApiErrorCode.CONCURRENCY_CONFLICT)) if (biz.Errors.Exists(m => m.Code == ApiErrorCode.CONCURRENCY_CONFLICT))

6
server/AyaNova/biz/WorkOrderBiz.cs
View File

@@ -131,10 +131,10 @@ namespace AyaNova.Biz
//////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////
//UPDATE //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) if (dbObject == null)
{ {
AddError(ApiErrorCode.NOT_FOUND, "id"); AddError(ApiErrorCode.NOT_FOUND, "id");
@@ -168,7 +168,7 @@ namespace AyaNova.Biz
} }
catch (DbUpdateConcurrencyException) catch (DbUpdateConcurrencyException)
{ {
if (!await WorkOrderExistsAsync(id)) if (!await WorkOrderExistsAsync(dtPutObject.Id))
AddError(ApiErrorCode.NOT_FOUND); AddError(ApiErrorCode.NOT_FOUND);
else else
new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT); new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT);