From 90e9119f6252233f308c976f0726cab43a2cf59a Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Sun, 10 May 2020 14:39:06 +0000 Subject: [PATCH] --- .../Controllers/WorkOrderController.cs | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/server/AyaNova/Controllers/WorkOrderController.cs b/server/AyaNova/Controllers/WorkOrderController.cs index 4d51b666..3a0bca60 100644 --- a/server/AyaNova/Controllers/WorkOrderController.cs +++ b/server/AyaNova/Controllers/WorkOrderController.cs @@ -324,10 +324,10 @@ namespace AyaNova.Api.Controllers /// /// Get WorkOrderItemLabor object /// - /// + /// /// A single WorkOrderItemLabor - [HttpGet("items/labors/{WorkOrderItemLaborId}")] - public async Task GetWorkOrderItemLabor([FromRoute] long WorkOrderItemLaborId) + [HttpGet("items/labors/{workOrderItemLaborId}")] + public async Task GetWorkOrderItemLabor([FromRoute] long workOrderItemLaborId) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -336,7 +336,7 @@ namespace AyaNova.Api.Controllers return StatusCode(403, new ApiNotAuthorizedResponse()); if (!ModelState.IsValid) return BadRequest(new ApiErrorResponse(ModelState)); - var o = await biz.LaborGetAsync(WorkOrderItemLaborId); + var o = await biz.LaborGetAsync(workOrderItemLaborId); if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, AyaType.WorkOrderItemLabor))); @@ -349,7 +349,7 @@ namespace AyaNova.Api.Controllers /// /// WorkOrderItemLabor - top level only, no descendents /// New concurrency token - [HttpPut("items/")] + [HttpPut("items/labors")] public async Task PutWorkOrderItemLabor([FromBody] WorkOrderItemLabor updatedObject) { if (!serverState.IsOpen) @@ -374,10 +374,10 @@ namespace AyaNova.Api.Controllers /// /// Delete WorkOrderItemLabor /// - /// + /// /// NoContent - [HttpDelete("{id}")] - public async Task DeleteWorkOrderItemLabor([FromRoute] long id) + [HttpDelete("items/labors/{workOrderItemLaborId}")] + public async Task DeleteWorkOrderItemLabor([FromRoute] long workOrderItemLaborId) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -386,7 +386,7 @@ namespace AyaNova.Api.Controllers WorkOrderBiz biz = WorkOrderBiz.GetBiz(ct, HttpContext); if (!Authorized.HasDeleteRole(HttpContext.Items, AyaType.WorkOrderItemLabor)) return StatusCode(403, new ApiNotAuthorizedResponse()); - if (!await biz.LaborDeleteAsync(id)) + if (!await biz.LaborDeleteAsync(workOrderItemLaborId)) return BadRequest(new ApiErrorResponse(biz.Errors)); return NoContent(); } @@ -458,7 +458,7 @@ namespace AyaNova.Api.Controllers /// /// WorkOrderItemPart - top level only, no descendents /// New concurrency token - [HttpPut("items/")] + [HttpPut("items/parts")] public async Task PutWorkOrderItemPart([FromBody] WorkOrderItemPart updatedObject) { if (!serverState.IsOpen) @@ -482,10 +482,10 @@ namespace AyaNova.Api.Controllers /// /// Delete WorkOrderItemPart /// - /// + /// /// NoContent - [HttpDelete("{id}")] - public async Task DeleteWorkOrderItemPart([FromRoute] long id) + [HttpDelete("items/parts/{WorkOrderItemPartId}")] + public async Task DeleteWorkOrderItemPart([FromRoute] long WorkOrderItemPartId) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -494,7 +494,7 @@ namespace AyaNova.Api.Controllers WorkOrderBiz biz = WorkOrderBiz.GetBiz(ct, HttpContext); if (!Authorized.HasDeleteRole(HttpContext.Items, AyaType.WorkOrderItemPart)) return StatusCode(403, new ApiNotAuthorizedResponse()); - if (!await biz.PartDeleteAsync(id)) + if (!await biz.PartDeleteAsync(WorkOrderItemPartId)) return BadRequest(new ApiErrorResponse(biz.Errors)); return NoContent(); }