diff --git a/server/AyaNova/Controllers/PMController.cs b/server/AyaNova/Controllers/PMController.cs index a07fc84f..3a06606f 100644 --- a/server/AyaNova/Controllers/PMController.cs +++ b/server/AyaNova/Controllers/PMController.cs @@ -15,7 +15,7 @@ namespace AyaNova.Api.Controllers [ApiController] [ApiVersion("8.0")] - [Route("api/v{version:apiVersion}/[controller]")] + [Route("api/v{version:apiVersion}/pm")] [Produces("application/json")] [Authorize] public class PMController : ControllerBase diff --git a/server/AyaNova/Controllers/PMTemplateController.cs b/server/AyaNova/Controllers/PMTemplateController.cs index 7e7f9d13..cadb1c75 100644 --- a/server/AyaNova/Controllers/PMTemplateController.cs +++ b/server/AyaNova/Controllers/PMTemplateController.cs @@ -13,7 +13,7 @@ namespace AyaNova.Api.Controllers { [ApiController] [ApiVersion("8.0")] - [Route("api/v{version:apiVersion}/[controller]")] + [Route("api/v{version:apiVersion}/pm-template")] [Produces("application/json")] [Authorize] public class PMTemplateController : ControllerBase diff --git a/server/AyaNova/Controllers/ProjectController.cs b/server/AyaNova/Controllers/ProjectController.cs index 6b367bfa..58f0e652 100644 --- a/server/AyaNova/Controllers/ProjectController.cs +++ b/server/AyaNova/Controllers/ProjectController.cs @@ -13,7 +13,7 @@ namespace AyaNova.Api.Controllers { [ApiController] [ApiVersion("8.0")] - [Route("api/v{version:apiVersion}/[controller]")] + [Route("api/v{version:apiVersion}/project")] [Produces("application/json")] [Authorize] public class ProjectController : ControllerBase diff --git a/server/AyaNova/Controllers/PurchaseOrderController.cs b/server/AyaNova/Controllers/PurchaseOrderController.cs index 504ecdba..dfe227d4 100644 --- a/server/AyaNova/Controllers/PurchaseOrderController.cs +++ b/server/AyaNova/Controllers/PurchaseOrderController.cs @@ -13,7 +13,7 @@ namespace AyaNova.Api.Controllers { [ApiController] [ApiVersion("8.0")] - [Route("api/v{version:apiVersion}/[controller]")] + [Route("api/v{version:apiVersion}/purchase-order")] [Produces("application/json")] [Authorize] public class PurchaseOrderController : ControllerBase diff --git a/server/AyaNova/Controllers/QuoteController.cs b/server/AyaNova/Controllers/QuoteController.cs index ab72df78..15d22574 100644 --- a/server/AyaNova/Controllers/QuoteController.cs +++ b/server/AyaNova/Controllers/QuoteController.cs @@ -15,7 +15,7 @@ namespace AyaNova.Api.Controllers [ApiController] [ApiVersion("8.0")] - [Route("api/v{version:apiVersion}/[controller]")] + [Route("api/v{version:apiVersion}/quote")] [Produces("application/json")] [Authorize] public class QuoteController : ControllerBase diff --git a/server/AyaNova/Controllers/QuoteTemplateController.cs b/server/AyaNova/Controllers/QuoteTemplateController.cs index bd50f6fe..47b1e224 100644 --- a/server/AyaNova/Controllers/QuoteTemplateController.cs +++ b/server/AyaNova/Controllers/QuoteTemplateController.cs @@ -16,7 +16,7 @@ namespace AyaNova.Api.Controllers [ApiController] [ApiVersion("8.0")] - [Route("api/v{version:apiVersion}/[controller]")] + [Route("api/v{version:apiVersion}/quote-template")] [Produces("application/json")] [Authorize] public class QuoteTemplateController : ControllerBase diff --git a/server/AyaNova/Controllers/SearchController.cs b/server/AyaNova/Controllers/SearchController.cs index 5d2ba66c..dd80816e 100644 --- a/server/AyaNova/Controllers/SearchController.cs +++ b/server/AyaNova/Controllers/SearchController.cs @@ -21,7 +21,7 @@ namespace AyaNova.Api.Controllers /// [ApiController] [ApiVersion("8.0")] - [Route("api/v{version:apiVersion}/[controller]")] + [Route("api/v{version:apiVersion}/search")] [Produces("application/json")] [Authorize] public class SearchController : ControllerBase @@ -77,7 +77,7 @@ namespace AyaNova.Api.Controllers /// /// /// A search result excerpt of object - [HttpGet("Info/{ayaType}/{id}")] + [HttpGet("info/{ayaType}/{id}")] public async Task GetInfo([FromRoute] AyaType ayaType, [FromRoute] long id, [FromQuery] string phrase, [FromQuery] int max = 80) { if (serverState.IsClosed) diff --git a/server/AyaNova/Controllers/ServerStateController.cs b/server/AyaNova/Controllers/ServerStateController.cs index c9fc3241..7360b0ea 100644 --- a/server/AyaNova/Controllers/ServerStateController.cs +++ b/server/AyaNova/Controllers/ServerStateController.cs @@ -18,7 +18,7 @@ namespace AyaNova.Api.Controllers /// [ApiController] [ApiVersion("8.0")] - [Route("api/v{version:apiVersion}/[controller]")] + [Route("api/v{version:apiVersion}/server-state")] [Produces("application/json")] public class ServerStateController : ControllerBase { diff --git a/server/AyaNova/Controllers/TagListController.cs b/server/AyaNova/Controllers/TagListController.cs index 69e51c5b..8f13e97c 100644 --- a/server/AyaNova/Controllers/TagListController.cs +++ b/server/AyaNova/Controllers/TagListController.cs @@ -16,7 +16,7 @@ namespace AyaNova.Api.Controllers /// [ApiController] [ApiVersion("8.0")] - [Route("api/v{version:apiVersion}/[controller]")] + [Route("api/v{version:apiVersion}/tag-list")] [Produces("application/json")] [Authorize] public class TagListController : ControllerBase diff --git a/server/AyaNova/Controllers/TranslationController.cs b/server/AyaNova/Controllers/TranslationController.cs index 2f96aac9..f377daf1 100644 --- a/server/AyaNova/Controllers/TranslationController.cs +++ b/server/AyaNova/Controllers/TranslationController.cs @@ -25,7 +25,7 @@ namespace AyaNova.Api.Controllers /// [ApiController] [ApiVersion("8.0")] - [Route("api/v{version:apiVersion}/[controller]")] + [Route("api/v{version:apiVersion}/translation")] [Produces("application/json")] [Authorize] public class TranslationController : ControllerBase @@ -87,7 +87,7 @@ namespace AyaNova.Api.Controllers /// Get Translations list /// /// List in alphabetical order of all Translations - [HttpGet("List")] + [HttpGet("list")] public async Task TranslationList() { if (serverState.IsClosed) @@ -106,7 +106,7 @@ namespace AyaNova.Api.Controllers /// Get a coverage report of translation keys used versus unused /// /// Report of all unique translation keys requested since last server reboot - [HttpGet("TranslationKeyCoverage")] + [HttpGet("translationkeycoverage")] public async Task TranslationKeyCoverage() { if (serverState.IsClosed) @@ -126,7 +126,7 @@ namespace AyaNova.Api.Controllers /// /// List of translation key strings /// A key value array of translation text values - [HttpPost("SubSet")] + [HttpPost("subset")] public async Task SubSet([FromBody] List inObj) { if (serverState.IsClosed) @@ -148,7 +148,7 @@ namespace AyaNova.Api.Controllers /// NameIdItem object containing source translation Id and new name /// From route path /// Error response or newly created translation - [HttpPost("Duplicate")] + [HttpPost("duplicate")] public async Task Duplicate([FromBody] NameIdItem inObj, ApiVersion apiVersion) { if (serverState.IsClosed) @@ -178,7 +178,7 @@ namespace AyaNova.Api.Controllers /// /// NewText/Id/Concurrency token object. NewText is new display text, Id is TranslationItem Id, concurrency token is required /// - [HttpPut("UpdateTranslationItemDisplayText")] + [HttpPut("updatetranslationitemdisplaytext")] public async Task PutTranslationItemDisplayText([FromBody] NewTextIdConcurrencyTokenItem inObj) { if (serverState.IsClosed) @@ -245,7 +245,7 @@ namespace AyaNova.Api.Controllers /// /// Array of NewText/Id/Concurrency token objects. NewText is new display text, Id is TranslationItem Id, concurrency token is required /// - [HttpPut("UpdateTranslationItemsDisplayText")] + [HttpPut("updatetranslationitemsdisplaytext")] public async Task PutTranslationItemsDisplayText([FromBody] List inObj) { if (serverState.IsClosed) @@ -304,7 +304,7 @@ namespace AyaNova.Api.Controllers /// /// NewText/Id/Concurrency token object. NewText is new translation name, Id is Translation Id, concurrency token is required /// - [HttpPut("UpdateTranslationName")] + [HttpPut("updatetranslationname")] public async Task PutTranslationName([FromBody] NewTextIdConcurrencyTokenItem inObj) { if (serverState.IsClosed) diff --git a/server/AyaNova/Controllers/TrialController.cs b/server/AyaNova/Controllers/TrialController.cs index 24b78297..e11b6bb1 100644 --- a/server/AyaNova/Controllers/TrialController.cs +++ b/server/AyaNova/Controllers/TrialController.cs @@ -16,7 +16,7 @@ namespace AyaNova.Api.Controllers /// [ApiController] [ApiVersion("8.0")] - [Route("api/v{version:apiVersion}/[controller]")] + [Route("api/v{version:apiVersion}/trial")] [Produces("application/json")] [Authorize] public class TrialController : ControllerBase diff --git a/server/AyaNova/Controllers/UnitController.cs b/server/AyaNova/Controllers/UnitController.cs index b33b702c..55aa65db 100644 --- a/server/AyaNova/Controllers/UnitController.cs +++ b/server/AyaNova/Controllers/UnitController.cs @@ -13,7 +13,7 @@ namespace AyaNova.Api.Controllers { [ApiController] [ApiVersion("8.0")] - [Route("api/v{version:apiVersion}/[controller]")] + [Route("api/v{version:apiVersion}/unit")] [Produces("application/json")] [Authorize] public class UnitController : ControllerBase diff --git a/server/AyaNova/Controllers/UnitModelController.cs b/server/AyaNova/Controllers/UnitModelController.cs index c5fbc3b1..623676d8 100644 --- a/server/AyaNova/Controllers/UnitModelController.cs +++ b/server/AyaNova/Controllers/UnitModelController.cs @@ -13,7 +13,7 @@ namespace AyaNova.Api.Controllers { [ApiController] [ApiVersion("8.0")] - [Route("api/v{version:apiVersion}/[controller]")] + [Route("api/v{version:apiVersion}/unit-model")] [Produces("application/json")] [Authorize] public class UnitModelController : ControllerBase diff --git a/server/AyaNova/Controllers/UserController.cs b/server/AyaNova/Controllers/UserController.cs index 8acd6507..9ceca15f 100644 --- a/server/AyaNova/Controllers/UserController.cs +++ b/server/AyaNova/Controllers/UserController.cs @@ -21,7 +21,7 @@ namespace AyaNova.Api.Controllers /// [ApiController] [ApiVersion("8.0")] - [Route("api/v{version:apiVersion}/[controller]")] + [Route("api/v{version:apiVersion}/user")] [Produces("application/json")] [Authorize] public class UserController : ControllerBase diff --git a/server/AyaNova/Controllers/UserOptionsController.cs b/server/AyaNova/Controllers/UserOptionsController.cs index 2c9c43f3..93e3a56d 100644 --- a/server/AyaNova/Controllers/UserOptionsController.cs +++ b/server/AyaNova/Controllers/UserOptionsController.cs @@ -21,7 +21,7 @@ namespace AyaNova.Api.Controllers /// [ApiController] [ApiVersion("8.0")] - [Route("api/v{version:apiVersion}/[controller]")] + [Route("api/v{version:apiVersion}/user-option")] [Produces("application/json")] [Authorize] public class UserOptionsController : ControllerBase diff --git a/server/AyaNova/Controllers/VendorController.cs b/server/AyaNova/Controllers/VendorController.cs index 705c0f8c..7daccd9a 100644 --- a/server/AyaNova/Controllers/VendorController.cs +++ b/server/AyaNova/Controllers/VendorController.cs @@ -13,7 +13,7 @@ namespace AyaNova.Api.Controllers { [ApiController] [ApiVersion("8.0")] - [Route("api/v{version:apiVersion}/[controller]")] + [Route("api/v{version:apiVersion}/vendor")] [Produces("application/json")] [Authorize] public class VendorController : ControllerBase diff --git a/server/AyaNova/Controllers/WidgetController.cs b/server/AyaNova/Controllers/WidgetController.cs index 1945719e..758c8dc0 100644 --- a/server/AyaNova/Controllers/WidgetController.cs +++ b/server/AyaNova/Controllers/WidgetController.cs @@ -3,10 +3,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; - -using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; - using AyaNova.Models; using AyaNova.Api.ControllerHelpers; using AyaNova.Biz; @@ -23,7 +20,7 @@ namespace AyaNova.Api.Controllers /// [ApiController] [ApiVersion("8.0")] - [Route("api/v{version:apiVersion}/[controller]")] + [Route("api/v{version:apiVersion}/widget")] [Produces("application/json")] [Authorize] public class WidgetController : ControllerBase @@ -194,7 +191,7 @@ namespace AyaNova.Api.Controllers /// Get route that submits a simulated long running operation job for testing /// /// Nothing - [HttpGet("TestWidgetJob")] + [HttpGet("testwidgetjob")] public async Task TestWidgetJob() { if (!serverState.IsOpen) diff --git a/server/AyaNova/Controllers/WorkOrderController.cs b/server/AyaNova/Controllers/WorkOrderController.cs index 68fdbd66..4b3eb2f9 100644 --- a/server/AyaNova/Controllers/WorkOrderController.cs +++ b/server/AyaNova/Controllers/WorkOrderController.cs @@ -14,7 +14,7 @@ namespace AyaNova.Api.Controllers [ApiController] [ApiVersion("8.0")] - [Route("api/v{version:apiVersion}/workorders")] + [Route("api/v{version:apiVersion}/workorder")] [Produces("application/json")] [Authorize] public class WorkOrderController : ControllerBase diff --git a/server/AyaNova/Controllers/WorkOrderTemplateController.cs b/server/AyaNova/Controllers/WorkOrderTemplateController.cs index 187c3bcf..ad8f1d99 100644 --- a/server/AyaNova/Controllers/WorkOrderTemplateController.cs +++ b/server/AyaNova/Controllers/WorkOrderTemplateController.cs @@ -16,7 +16,7 @@ namespace AyaNova.Api.Controllers [ApiController] [ApiVersion("8.0")] - [Route("api/v{version:apiVersion}/[controller]")] + [Route("api/v{version:apiVersion}/workorder-template")] [Produces("application/json")] [Authorize] public class WorkOrderTemplateController : ControllerBase