diff --git a/server/AyaNova/AyaNova.csproj b/server/AyaNova/AyaNova.csproj index 3b8ececc..b9352a0a 100644 --- a/server/AyaNova/AyaNova.csproj +++ b/server/AyaNova/AyaNova.csproj @@ -25,30 +25,35 @@ - - - - - - + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/server/AyaNova/ConfigureSwaggerOptions.cs b/server/AyaNova/ConfigureSwaggerOptions.cs index 26c7bb33..436a3f75 100644 --- a/server/AyaNova/ConfigureSwaggerOptions.cs +++ b/server/AyaNova/ConfigureSwaggerOptions.cs @@ -1,6 +1,6 @@ namespace AyaNova { - using Microsoft.AspNetCore.Mvc.ApiExplorer; + using Asp.Versioning.ApiExplorer; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Microsoft.OpenApi.Models; diff --git a/server/AyaNova/Controllers/ApiRootController.cs b/server/AyaNova/Controllers/ApiRootController.cs index 689bd9f3..ebf33ae6 100644 --- a/server/AyaNova/Controllers/ApiRootController.cs +++ b/server/AyaNova/Controllers/ApiRootController.cs @@ -12,7 +12,7 @@ namespace AyaNova.Api.Controllers /// /// Meta controller class /// - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/")] [Authorize] [ApiController] diff --git a/server/AyaNova/Controllers/AttachmentController.cs b/server/AyaNova/Controllers/AttachmentController.cs index 31b247dc..5617a74e 100644 --- a/server/AyaNova/Controllers/AttachmentController.cs +++ b/server/AyaNova/Controllers/AttachmentController.cs @@ -27,7 +27,7 @@ namespace AyaNova.Api.Controllers /// Attachment controller /// [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/attachment")] [Produces("application/json")] public class AttachmentController : ControllerBase diff --git a/server/AyaNova/Controllers/AuthController.cs b/server/AyaNova/Controllers/AuthController.cs index 024c0558..77262b6e 100644 --- a/server/AyaNova/Controllers/AuthController.cs +++ b/server/AyaNova/Controllers/AuthController.cs @@ -22,7 +22,7 @@ namespace AyaNova.Api.Controllers /// Authentication controller /// [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/auth")] [Produces("application/json")] [Authorize] @@ -492,7 +492,7 @@ namespace AyaNova.Api.Controllers /// From route path /// New concurrency code [HttpPost("request-reset-password/{id}")] - public async Task SendPasswordResetCode([FromRoute] long id, ApiVersion apiVersion) + public async Task SendPasswordResetCode([FromRoute] long id, Asp.Versioning.ApiVersion apiVersion) { //Note: this is not allowed for an anonymous users because it's only intended for now to work for staff user's who will send the request on behalf of the User if (!serverState.IsOpen) @@ -525,7 +525,7 @@ namespace AyaNova.Api.Controllers /// From route path /// Authentication app activation code [HttpGet("totp")] - public async Task GenerateAndSendTOTP(ApiVersion apiVersion) + public async Task GenerateAndSendTOTP(Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -578,7 +578,7 @@ namespace AyaNova.Api.Controllers /// From route path /// OK on success [HttpPost("totp-validate")] - public async Task ValidateTOTP([FromBody] TFAPinParam pin, ApiVersion apiVersion) + public async Task ValidateTOTP([FromBody] TFAPinParam pin, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -637,7 +637,7 @@ namespace AyaNova.Api.Controllers /// From route path /// OK on success [HttpPost("totp-disable/{id}")] - public async Task DisableTOTP([FromRoute] long id, ApiVersion apiVersion) + public async Task DisableTOTP([FromRoute] long id, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/AuthorizationRolesController.cs b/server/AyaNova/Controllers/AuthorizationRolesController.cs index 7824418d..dd22610b 100644 --- a/server/AyaNova/Controllers/AuthorizationRolesController.cs +++ b/server/AyaNova/Controllers/AuthorizationRolesController.cs @@ -16,7 +16,7 @@ namespace AyaNova.Api.Controllers /// Enum pick list controller /// [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/authorization-roles")] [Produces("application/json")] [Authorize] diff --git a/server/AyaNova/Controllers/BackupController.cs b/server/AyaNova/Controllers/BackupController.cs index 0a2fead6..d393b8b5 100644 --- a/server/AyaNova/Controllers/BackupController.cs +++ b/server/AyaNova/Controllers/BackupController.cs @@ -23,7 +23,7 @@ namespace AyaNova.Api.Controllers /// /// [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/backup")] [Produces("application/json")] public class BackupController : ControllerBase diff --git a/server/AyaNova/Controllers/ContractController.cs b/server/AyaNova/Controllers/ContractController.cs index 06c3d589..0e803f18 100644 --- a/server/AyaNova/Controllers/ContractController.cs +++ b/server/AyaNova/Controllers/ContractController.cs @@ -12,7 +12,7 @@ using AyaNova.Biz; namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/contract")] [Produces("application/json")] [Authorize] @@ -42,7 +42,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost] - public async Task PostContract([FromBody] Contract newObject, ApiVersion apiVersion) + public async Task PostContract([FromBody] Contract newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -66,7 +66,7 @@ namespace AyaNova.Api.Controllers // /// From route path // /// Contract // [HttpPost("duplicate/{id}")] - // public async Task DuplicateContract([FromRoute] long id, ApiVersion apiVersion) + // public async Task DuplicateContract([FromRoute] long id, Asp.Versioning.ApiVersion apiVersion) // { // if (!serverState.IsOpen) // return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/CustomerController.cs b/server/AyaNova/Controllers/CustomerController.cs index cc6c85aa..db32f56b 100644 --- a/server/AyaNova/Controllers/CustomerController.cs +++ b/server/AyaNova/Controllers/CustomerController.cs @@ -14,7 +14,7 @@ using AyaNova.Biz; namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/customer")] [Produces("application/json")] [Authorize] @@ -44,7 +44,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost] - public async Task PostCustomer([FromBody] Customer newObject, ApiVersion apiVersion) + public async Task PostCustomer([FromBody] Customer newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/CustomerNoteController.cs b/server/AyaNova/Controllers/CustomerNoteController.cs index a4f62345..474c4829 100644 --- a/server/AyaNova/Controllers/CustomerNoteController.cs +++ b/server/AyaNova/Controllers/CustomerNoteController.cs @@ -12,7 +12,7 @@ using AyaNova.Biz; namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/customer-note")] [Produces("application/json")] [Authorize] @@ -42,7 +42,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost] - public async Task PostCustomerNote([FromBody] CustomerNote newObject, ApiVersion apiVersion) + public async Task PostCustomerNote([FromBody] CustomerNote newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/CustomerNotifySubscriptionController.cs b/server/AyaNova/Controllers/CustomerNotifySubscriptionController.cs index 109e2a5d..b1e6ec08 100644 --- a/server/AyaNova/Controllers/CustomerNotifySubscriptionController.cs +++ b/server/AyaNova/Controllers/CustomerNotifySubscriptionController.cs @@ -14,7 +14,7 @@ using System; namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/customer-notify-subscription")] [Produces("application/json")] [Authorize] @@ -44,7 +44,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost] - public async Task PostCustomerNotifySubscription([FromBody] CustomerNotifySubscription newObject, ApiVersion apiVersion) + public async Task PostCustomerNotifySubscription([FromBody] CustomerNotifySubscription newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -134,7 +134,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost("who")] - public async Task GetWho([FromBody] List customerTags, ApiVersion apiVersion) + public async Task GetWho([FromBody] List customerTags, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/CustomerServiceRequestController.cs b/server/AyaNova/Controllers/CustomerServiceRequestController.cs index a90527c5..43ab11dc 100644 --- a/server/AyaNova/Controllers/CustomerServiceRequestController.cs +++ b/server/AyaNova/Controllers/CustomerServiceRequestController.cs @@ -13,7 +13,7 @@ using AyaNova.Biz; namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/csr")] [Produces("application/json")] [Authorize] @@ -43,7 +43,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost] - public async Task PostCustomerServiceRequest([FromBody] CustomerServiceRequest newObject, ApiVersion apiVersion) + public async Task PostCustomerServiceRequest([FromBody] CustomerServiceRequest newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/DashboardViewController.cs b/server/AyaNova/Controllers/DashboardViewController.cs index 21b4ed2e..63d5df28 100644 --- a/server/AyaNova/Controllers/DashboardViewController.cs +++ b/server/AyaNova/Controllers/DashboardViewController.cs @@ -20,7 +20,7 @@ namespace AyaNova.Api.Controllers /// /// [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/dashboard-view")] [Produces("application/json")] [Authorize] diff --git a/server/AyaNova/Controllers/DataListColumnViewController.cs b/server/AyaNova/Controllers/DataListColumnViewController.cs index 6afc1a1a..ccd236b5 100644 --- a/server/AyaNova/Controllers/DataListColumnViewController.cs +++ b/server/AyaNova/Controllers/DataListColumnViewController.cs @@ -15,7 +15,7 @@ namespace AyaNova.Api.Controllers /// /// [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/data-list-column-view")] [Produces("application/json")] [Authorize] @@ -68,7 +68,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost] - public async Task ReplaceDataListColumnView([FromBody] DataListColumnView newObject, ApiVersion apiVersion) + public async Task ReplaceDataListColumnView([FromBody] DataListColumnView newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen && UserIdFromContext.Id(HttpContext.Items) != 1)//bypass for superuser to fix fundamental problems return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -113,7 +113,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost("sort")] - public async Task SetSort([FromBody] DataListSortRequest sortRequest, ApiVersion apiVersion) + public async Task SetSort([FromBody] DataListSortRequest sortRequest, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen && UserIdFromContext.Id(HttpContext.Items) != 1)//bypass for superuser to fix fundamental problems return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/DataListController.cs b/server/AyaNova/Controllers/DataListController.cs index 65fe8518..24859831 100644 --- a/server/AyaNova/Controllers/DataListController.cs +++ b/server/AyaNova/Controllers/DataListController.cs @@ -15,7 +15,7 @@ namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/data-list")] [Produces("application/json")] [Authorize] diff --git a/server/AyaNova/Controllers/DataListSavedFilterController.cs b/server/AyaNova/Controllers/DataListSavedFilterController.cs index c205e85f..d25edc88 100644 --- a/server/AyaNova/Controllers/DataListSavedFilterController.cs +++ b/server/AyaNova/Controllers/DataListSavedFilterController.cs @@ -14,7 +14,7 @@ namespace AyaNova.Api.Controllers /// /// [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/data-list-filter")] [Produces("application/json")] [Authorize] @@ -124,7 +124,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost] - public async Task PostDataListSavedFilter([FromBody] DataListSavedFilter inObj, ApiVersion apiVersion) + public async Task PostDataListSavedFilter([FromBody] DataListSavedFilter inObj, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen && UserIdFromContext.Id(HttpContext.Items) != 1)//bypass for superuser to fix fundamental problems return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/EnumListController.cs b/server/AyaNova/Controllers/EnumListController.cs index e9400968..358e3eb6 100644 --- a/server/AyaNova/Controllers/EnumListController.cs +++ b/server/AyaNova/Controllers/EnumListController.cs @@ -19,7 +19,7 @@ namespace AyaNova.Api.Controllers /// Enum list controller /// [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/enum-list")] [Produces("application/json")] [Authorize] diff --git a/server/AyaNova/Controllers/EventLogController.cs b/server/AyaNova/Controllers/EventLogController.cs index b527381d..adbbaa09 100644 --- a/server/AyaNova/Controllers/EventLogController.cs +++ b/server/AyaNova/Controllers/EventLogController.cs @@ -17,7 +17,7 @@ namespace AyaNova.Api.Controllers /// Log files controller /// [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/event-log")] [Authorize] public class EventLogController : ControllerBase @@ -108,7 +108,7 @@ namespace AyaNova.Api.Controllers /// [ApiExplorerSettings(IgnoreApi = true)] [HttpPost("v7")] - public async Task PostV7Modify([FromBody] V7Event inObj, ApiVersion apiVersion) + public async Task PostV7Modify([FromBody] V7Event inObj, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/ExportController.cs b/server/AyaNova/Controllers/ExportController.cs index 23c367f7..1c4d1d8d 100644 --- a/server/AyaNova/Controllers/ExportController.cs +++ b/server/AyaNova/Controllers/ExportController.cs @@ -17,7 +17,7 @@ using System; namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/export")] [Produces("application/json")] [Authorize] diff --git a/server/AyaNova/Controllers/FormCustomController.cs b/server/AyaNova/Controllers/FormCustomController.cs index 8e7e351f..bf5c1be4 100644 --- a/server/AyaNova/Controllers/FormCustomController.cs +++ b/server/AyaNova/Controllers/FormCustomController.cs @@ -20,7 +20,7 @@ namespace AyaNova.Api.Controllers /// /// [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/form-custom")] [Produces("application/json")] [Authorize] diff --git a/server/AyaNova/Controllers/FormFieldsDefinitionsController.cs b/server/AyaNova/Controllers/FormFieldsDefinitionsController.cs index 766c8207..2354b09b 100644 --- a/server/AyaNova/Controllers/FormFieldsDefinitionsController.cs +++ b/server/AyaNova/Controllers/FormFieldsDefinitionsController.cs @@ -10,7 +10,7 @@ using AyaNova.Biz; namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/form-field-reference")] [Produces("application/json")] [Authorize] diff --git a/server/AyaNova/Controllers/FormUserOptionsController.cs b/server/AyaNova/Controllers/FormUserOptionsController.cs index d138ce8c..c9eaa580 100644 --- a/server/AyaNova/Controllers/FormUserOptionsController.cs +++ b/server/AyaNova/Controllers/FormUserOptionsController.cs @@ -13,7 +13,7 @@ using AyaNova.Biz; namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/form-user-options")] [Produces("application/json")] [Authorize] @@ -43,7 +43,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost] - public async Task PostFormUserOptions([FromBody] FormUserOptions newObject, ApiVersion apiVersion) + public async Task PostFormUserOptions([FromBody] FormUserOptions newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/GlobalBizSettingsController.cs b/server/AyaNova/Controllers/GlobalBizSettingsController.cs index 6bb5ac47..c551d518 100644 --- a/server/AyaNova/Controllers/GlobalBizSettingsController.cs +++ b/server/AyaNova/Controllers/GlobalBizSettingsController.cs @@ -14,7 +14,7 @@ namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/global-biz-setting")] [Produces("application/json")] [Authorize] diff --git a/server/AyaNova/Controllers/GlobalOpsBackupSettingsController.cs b/server/AyaNova/Controllers/GlobalOpsBackupSettingsController.cs index 541db4f6..72de8005 100644 --- a/server/AyaNova/Controllers/GlobalOpsBackupSettingsController.cs +++ b/server/AyaNova/Controllers/GlobalOpsBackupSettingsController.cs @@ -12,7 +12,7 @@ namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/global-ops-backup-setting")] [Produces("application/json")] [Authorize] diff --git a/server/AyaNova/Controllers/GlobalOpsNotificationSettingsController.cs b/server/AyaNova/Controllers/GlobalOpsNotificationSettingsController.cs index f7296760..66c0264b 100644 --- a/server/AyaNova/Controllers/GlobalOpsNotificationSettingsController.cs +++ b/server/AyaNova/Controllers/GlobalOpsNotificationSettingsController.cs @@ -12,7 +12,7 @@ namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/global-ops-notification-setting")] [Produces("application/json")] [Authorize] diff --git a/server/AyaNova/Controllers/HeadOfficeController.cs b/server/AyaNova/Controllers/HeadOfficeController.cs index c85a5dc4..15d47cdf 100644 --- a/server/AyaNova/Controllers/HeadOfficeController.cs +++ b/server/AyaNova/Controllers/HeadOfficeController.cs @@ -12,7 +12,7 @@ using AyaNova.Biz; namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/head-office")] [Produces("application/json")] [Authorize] @@ -42,7 +42,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost] - public async Task PostHeadOffice([FromBody] HeadOffice newObject, ApiVersion apiVersion) + public async Task PostHeadOffice([FromBody] HeadOffice newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -66,7 +66,7 @@ namespace AyaNova.Api.Controllers // /// From route path // /// HeadOffice // [HttpPost("duplicate/{id}")] - // public async Task DuplicateHeadOffice([FromRoute] long id, ApiVersion apiVersion) + // public async Task DuplicateHeadOffice([FromRoute] long id, Asp.Versioning.ApiVersion apiVersion) // { // if (!serverState.IsOpen) // return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/HealthController.cs b/server/AyaNova/Controllers/HealthController.cs index 27e8dd01..3ab361a5 100644 --- a/server/AyaNova/Controllers/HealthController.cs +++ b/server/AyaNova/Controllers/HealthController.cs @@ -8,7 +8,7 @@ using Swashbuckle.AspNetCore.Annotations; namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/health")] [Produces("text/plain")] [Authorize] diff --git a/server/AyaNova/Controllers/ImportController.cs b/server/AyaNova/Controllers/ImportController.cs index 9ed0084a..c2ab9992 100644 --- a/server/AyaNova/Controllers/ImportController.cs +++ b/server/AyaNova/Controllers/ImportController.cs @@ -13,7 +13,7 @@ using Newtonsoft.Json.Linq; namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/import")] [Produces("application/json")] [Authorize] @@ -45,7 +45,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost] - public async Task PostImportData([FromBody] AyImportData importData, ApiVersion apiVersion) + public async Task PostImportData([FromBody] AyImportData importData, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/IntegrationController.cs b/server/AyaNova/Controllers/IntegrationController.cs index a72b20f7..b031e5b0 100644 --- a/server/AyaNova/Controllers/IntegrationController.cs +++ b/server/AyaNova/Controllers/IntegrationController.cs @@ -13,7 +13,7 @@ using System; namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/integration")] [Produces("application/json")] [Authorize] @@ -47,7 +47,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost] - public async Task PostIntegration([FromBody] Integration newObject, ApiVersion apiVersion) + public async Task PostIntegration([FromBody] Integration newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -204,7 +204,7 @@ namespace AyaNova.Api.Controllers /// From route path /// NoContent if ok otherwise BadRequest and an error object [HttpPost("log")] - public async Task PostIntegrationLog([FromBody] NameIdItem logItem, ApiVersion apiVersion) + public async Task PostIntegrationLog([FromBody] NameIdItem logItem, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/JobOperationsController.cs b/server/AyaNova/Controllers/JobOperationsController.cs index 032862f4..145932a6 100644 --- a/server/AyaNova/Controllers/JobOperationsController.cs +++ b/server/AyaNova/Controllers/JobOperationsController.cs @@ -19,7 +19,7 @@ namespace AyaNova.Api.Controllers /// ServerJob controller /// [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/job-operations")] [Produces("application/json")] [Authorize] diff --git a/server/AyaNova/Controllers/KPIController.cs b/server/AyaNova/Controllers/KPIController.cs index d24782ff..5520d0e3 100644 --- a/server/AyaNova/Controllers/KPIController.cs +++ b/server/AyaNova/Controllers/KPIController.cs @@ -14,7 +14,7 @@ namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/kpi")] [Produces("application/json")] [Authorize] diff --git a/server/AyaNova/Controllers/LicenseController.cs b/server/AyaNova/Controllers/LicenseController.cs index 356f27dd..eddd230e 100644 --- a/server/AyaNova/Controllers/LicenseController.cs +++ b/server/AyaNova/Controllers/LicenseController.cs @@ -20,7 +20,7 @@ namespace AyaNova.Api.Controllers /// License route /// [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/license")] [Produces("application/json")] [Authorize] diff --git a/server/AyaNova/Controllers/LoanUnitController.cs b/server/AyaNova/Controllers/LoanUnitController.cs index db635f6e..4bbcd3b6 100644 --- a/server/AyaNova/Controllers/LoanUnitController.cs +++ b/server/AyaNova/Controllers/LoanUnitController.cs @@ -12,7 +12,7 @@ using AyaNova.Biz; namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/loan-unit")] [Produces("application/json")] [Authorize] @@ -42,7 +42,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost] - public async Task PostLoanUnit([FromBody] LoanUnit newObject, ApiVersion apiVersion) + public async Task PostLoanUnit([FromBody] LoanUnit newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -66,7 +66,7 @@ namespace AyaNova.Api.Controllers // /// From route path // /// LoanUnit // [HttpPost("duplicate/{id}")] - // public async Task DuplicateLoanUnit([FromRoute] long id, ApiVersion apiVersion) + // public async Task DuplicateLoanUnit([FromRoute] long id, Asp.Versioning.ApiVersion apiVersion) // { // if (!serverState.IsOpen) // return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/LogFilesController.cs b/server/AyaNova/Controllers/LogFilesController.cs index 470a8360..0f552f2b 100644 --- a/server/AyaNova/Controllers/LogFilesController.cs +++ b/server/AyaNova/Controllers/LogFilesController.cs @@ -19,7 +19,7 @@ namespace AyaNova.Api.Controllers /// Log files controller /// [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/log-file")] //[Produces("application/json")] [Authorize] diff --git a/server/AyaNova/Controllers/LogoController.cs b/server/AyaNova/Controllers/LogoController.cs index afdd6acf..1410b2ff 100644 --- a/server/AyaNova/Controllers/LogoController.cs +++ b/server/AyaNova/Controllers/LogoController.cs @@ -21,7 +21,7 @@ namespace AyaNova.Api.Controllers /// Logo controller /// [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/logo")] [Produces("application/json")] [Authorize] diff --git a/server/AyaNova/Controllers/MemoController.cs b/server/AyaNova/Controllers/MemoController.cs index 485f8286..249e1cb0 100644 --- a/server/AyaNova/Controllers/MemoController.cs +++ b/server/AyaNova/Controllers/MemoController.cs @@ -15,7 +15,7 @@ using AyaNova.Biz; namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/memo")] [Produces("application/json")] [Authorize] @@ -45,7 +45,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost] - public async Task PostMemo([FromBody] SendMemo newObject, ApiVersion apiVersion) + public async Task PostMemo([FromBody] SendMemo newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -114,7 +114,7 @@ namespace AyaNova.Api.Controllers // /// From route path // /// Memo // [HttpPost("duplicate/{id}")] - // public async Task DuplicateMemo([FromRoute] long id, ApiVersion apiVersion) + // public async Task DuplicateMemo([FromRoute] long id, Asp.Versioning.ApiVersion apiVersion) // { // if (!serverState.IsOpen) // return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/NameController.cs b/server/AyaNova/Controllers/NameController.cs index 848acf35..b293e7dd 100644 --- a/server/AyaNova/Controllers/NameController.cs +++ b/server/AyaNova/Controllers/NameController.cs @@ -10,7 +10,7 @@ using AyaNova.Biz; namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/name")] [Produces("application/json")] [Authorize] diff --git a/server/AyaNova/Controllers/NotifyController.cs b/server/AyaNova/Controllers/NotifyController.cs index 90608ccf..f6c15593 100644 --- a/server/AyaNova/Controllers/NotifyController.cs +++ b/server/AyaNova/Controllers/NotifyController.cs @@ -16,7 +16,7 @@ using AyaNova.Util; namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/notify")] [Produces("application/json")] [Authorize] diff --git a/server/AyaNova/Controllers/NotifySubscriptionController.cs b/server/AyaNova/Controllers/NotifySubscriptionController.cs index 3c959ec9..8b60c9d3 100644 --- a/server/AyaNova/Controllers/NotifySubscriptionController.cs +++ b/server/AyaNova/Controllers/NotifySubscriptionController.cs @@ -14,7 +14,7 @@ using System; namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/notify-subscription")] [Produces("application/json")] [Authorize] @@ -44,7 +44,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost] - public async Task PostNotifySubscription([FromBody] NotifySubscription newObject, ApiVersion apiVersion) + public async Task PostNotifySubscription([FromBody] NotifySubscription newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -67,7 +67,7 @@ namespace AyaNova.Api.Controllers // /// From route path // /// NotifySubscription // [HttpPost("duplicate/{id}")] - // public async Task DuplicateNotifySubscription([FromRoute] long id, ApiVersion apiVersion) + // public async Task DuplicateNotifySubscription([FromRoute] long id, Asp.Versioning.ApiVersion apiVersion) // { // if (!serverState.IsOpen) // return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/PMController.cs b/server/AyaNova/Controllers/PMController.cs index 9eda41a9..1211d58e 100644 --- a/server/AyaNova/Controllers/PMController.cs +++ b/server/AyaNova/Controllers/PMController.cs @@ -14,7 +14,7 @@ namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/pm")] [Produces("application/json")] [Authorize] @@ -56,7 +56,7 @@ namespace AyaNova.Api.Controllers /// From route path /// PM [HttpPost] - public async Task PostPM([FromBody] PM newObject, ApiVersion apiVersion) + public async Task PostPM([FromBody] PM newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -85,7 +85,7 @@ namespace AyaNova.Api.Controllers // /// From route path // /// PM // [HttpPost("duplicate/{id}")] - // public async Task DuplicatePM([FromRoute] long id, ApiVersion apiVersion) + // public async Task DuplicatePM([FromRoute] long id, Asp.Versioning.ApiVersion apiVersion) // { // if (!serverState.IsOpen) // return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -227,7 +227,7 @@ namespace AyaNova.Api.Controllers /// /// PMItem object [HttpPost("items")] - public async Task PostPMItem([FromBody] PMItem newObject, ApiVersion apiVersion) + public async Task PostPMItem([FromBody] PMItem newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -336,7 +336,7 @@ namespace AyaNova.Api.Controllers /// /// PMItemExpense object (no descendants) [HttpPost("items/expenses")] - public async Task PostPMItemExpense([FromBody] PMItemExpense newObject, ApiVersion apiVersion) + public async Task PostPMItemExpense([FromBody] PMItemExpense newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -443,7 +443,7 @@ namespace AyaNova.Api.Controllers /// /// PMItemLabor object (no descendants) [HttpPost("items/labors")] - public async Task PostPMItemLabor([FromBody] PMItemLabor newObject, ApiVersion apiVersion) + public async Task PostPMItemLabor([FromBody] PMItemLabor newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -552,7 +552,7 @@ namespace AyaNova.Api.Controllers /// /// PMItemLoan object (no descendants) [HttpPost("items/loans")] - public async Task PostPMItemLoan([FromBody] PMItemLoan newObject, ApiVersion apiVersion) + public async Task PostPMItemLoan([FromBody] PMItemLoan newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -661,7 +661,7 @@ namespace AyaNova.Api.Controllers /// /// PMItemOutsideService object (no descendants) [HttpPost("items/outside-services")] - public async Task PostPMItemOutsideService([FromBody] PMItemOutsideService newObject, ApiVersion apiVersion) + public async Task PostPMItemOutsideService([FromBody] PMItemOutsideService newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -768,7 +768,7 @@ namespace AyaNova.Api.Controllers /// /// PMItemPart object (no descendants) [HttpPost("items/parts")] - public async Task PostPMItemPart([FromBody] PMItemPart newObject, ApiVersion apiVersion) + public async Task PostPMItemPart([FromBody] PMItemPart newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -875,7 +875,7 @@ namespace AyaNova.Api.Controllers /// /// PMItemScheduledUser object (no descendants) [HttpPost("items/scheduled-users")] - public async Task PostPMItemScheduledUser([FromBody] PMItemScheduledUser newObject, ApiVersion apiVersion) + public async Task PostPMItemScheduledUser([FromBody] PMItemScheduledUser newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -981,7 +981,7 @@ namespace AyaNova.Api.Controllers /// /// PMItemTask object (no descendants) [HttpPost("items/tasks")] - public async Task PostPMItemTask([FromBody] PMItemTask newObject, ApiVersion apiVersion) + public async Task PostPMItemTask([FromBody] PMItemTask newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -1087,7 +1087,7 @@ namespace AyaNova.Api.Controllers /// /// PMItemTravel object (no descendants) [HttpPost("items/travels")] - public async Task PostPMItemTravel([FromBody] PMItemTravel newObject, ApiVersion apiVersion) + public async Task PostPMItemTravel([FromBody] PMItemTravel newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -1193,7 +1193,7 @@ namespace AyaNova.Api.Controllers /// /// PMItemUnit object (no descendants) [HttpPost("items/units")] - public async Task PostPMItemUnit([FromBody] PMItemUnit newObject, ApiVersion apiVersion) + public async Task PostPMItemUnit([FromBody] PMItemUnit newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/PartAssemblyController.cs b/server/AyaNova/Controllers/PartAssemblyController.cs index 51aefa33..0bd267d7 100644 --- a/server/AyaNova/Controllers/PartAssemblyController.cs +++ b/server/AyaNova/Controllers/PartAssemblyController.cs @@ -12,7 +12,7 @@ using AyaNova.Biz; namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/part-assembly")] [Produces("application/json")] [Authorize] @@ -42,7 +42,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost] - public async Task PostPartAssembly([FromBody] PartAssembly newObject, ApiVersion apiVersion) + public async Task PostPartAssembly([FromBody] PartAssembly newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -66,7 +66,7 @@ namespace AyaNova.Api.Controllers // /// From route path // /// PartAssembly // [HttpPost("duplicate/{id}")] - // public async Task DuplicatePartAssembly([FromRoute] long id, ApiVersion apiVersion) + // public async Task DuplicatePartAssembly([FromRoute] long id, Asp.Versioning.ApiVersion apiVersion) // { // if (!serverState.IsOpen) // return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/PartController.cs b/server/AyaNova/Controllers/PartController.cs index 7328d8ea..35b5f678 100644 --- a/server/AyaNova/Controllers/PartController.cs +++ b/server/AyaNova/Controllers/PartController.cs @@ -16,7 +16,7 @@ using AyaNova.Biz; namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/part")] [Produces("application/json")] [Authorize] @@ -46,7 +46,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost] - public async Task PostPart([FromBody] Part newObject, ApiVersion apiVersion) + public async Task PostPart([FromBody] Part newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/PartInventoryController.cs b/server/AyaNova/Controllers/PartInventoryController.cs index f7741ddf..480e7754 100644 --- a/server/AyaNova/Controllers/PartInventoryController.cs +++ b/server/AyaNova/Controllers/PartInventoryController.cs @@ -13,7 +13,7 @@ using AyaNova.Biz; namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/part-inventory")] [Produces("application/json")] [Authorize] @@ -43,7 +43,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost] - public async Task PostPartInventory([FromBody] dtPartInventory newObject, ApiVersion apiVersion) + public async Task PostPartInventory([FromBody] dtPartInventory newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/PartWarehouseController.cs b/server/AyaNova/Controllers/PartWarehouseController.cs index ff559ba7..acea1fee 100644 --- a/server/AyaNova/Controllers/PartWarehouseController.cs +++ b/server/AyaNova/Controllers/PartWarehouseController.cs @@ -14,7 +14,7 @@ using AyaNova.Biz; namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/part-warehouse")] [Produces("application/json")] [Authorize] @@ -44,7 +44,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost] - public async Task PostPartWarehouse([FromBody] PartWarehouse newObject, ApiVersion apiVersion) + public async Task PostPartWarehouse([FromBody] PartWarehouse newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -68,7 +68,7 @@ namespace AyaNova.Api.Controllers // /// From route path // /// PartWarehouse // [HttpPost("duplicate/{id}")] - // public async Task DuplicatePartWarehouse([FromRoute] long id, ApiVersion apiVersion) + // public async Task DuplicatePartWarehouse([FromRoute] long id, Asp.Versioning.ApiVersion apiVersion) // { // if (!serverState.IsOpen) // return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/PickListController.cs b/server/AyaNova/Controllers/PickListController.cs index 7a1a101c..9d47e7ba 100644 --- a/server/AyaNova/Controllers/PickListController.cs +++ b/server/AyaNova/Controllers/PickListController.cs @@ -14,7 +14,7 @@ namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/pick-list")] [Produces("application/json")] [Authorize] diff --git a/server/AyaNova/Controllers/ProjectController.cs b/server/AyaNova/Controllers/ProjectController.cs index c11a22af..23b5a9f2 100644 --- a/server/AyaNova/Controllers/ProjectController.cs +++ b/server/AyaNova/Controllers/ProjectController.cs @@ -13,7 +13,7 @@ using AyaNova.Biz; namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/project")] [Produces("application/json")] [Authorize] @@ -43,7 +43,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost] - public async Task PostProject([FromBody] Project newObject, ApiVersion apiVersion) + public async Task PostProject([FromBody] Project newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -67,7 +67,7 @@ namespace AyaNova.Api.Controllers // /// From route path // /// Project // [HttpPost("duplicate/{id}")] - // public async Task DuplicateProject([FromRoute] long id, ApiVersion apiVersion) + // public async Task DuplicateProject([FromRoute] long id, Asp.Versioning.ApiVersion apiVersion) // { // if (!serverState.IsOpen) // return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/PurchaseOrderController.cs b/server/AyaNova/Controllers/PurchaseOrderController.cs index 78b5a0b0..8121d547 100644 --- a/server/AyaNova/Controllers/PurchaseOrderController.cs +++ b/server/AyaNova/Controllers/PurchaseOrderController.cs @@ -14,7 +14,7 @@ using System.Linq; namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/purchase-order")] [Produces("application/json")] [Authorize] @@ -44,7 +44,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost] - public async Task PostPurchaseOrder([FromBody] PurchaseOrder newObject, ApiVersion apiVersion) + public async Task PostPurchaseOrder([FromBody] PurchaseOrder newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -68,7 +68,7 @@ namespace AyaNova.Api.Controllers // /// From route path // /// PurchaseOrder // [HttpPost("duplicate/{id}")] - // public async Task DuplicatePurchaseOrder([FromRoute] long id, ApiVersion apiVersion) + // public async Task DuplicatePurchaseOrder([FromRoute] long id, Asp.Versioning.ApiVersion apiVersion) // { // if (!serverState.IsOpen) // return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/QuoteController.cs b/server/AyaNova/Controllers/QuoteController.cs index a25c9b2a..a6542c8a 100644 --- a/server/AyaNova/Controllers/QuoteController.cs +++ b/server/AyaNova/Controllers/QuoteController.cs @@ -14,7 +14,7 @@ namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/quote")] [Produces("application/json")] [Authorize] @@ -56,7 +56,7 @@ namespace AyaNova.Api.Controllers /// From route path /// Quote [HttpPost] - public async Task PostQuote([FromBody] Quote newObject, ApiVersion apiVersion) + public async Task PostQuote([FromBody] Quote newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -85,7 +85,7 @@ namespace AyaNova.Api.Controllers // /// From route path // /// Quote // [HttpPost("duplicate/{id}")] - // public async Task DuplicateQuote([FromRoute] long id, ApiVersion apiVersion) + // public async Task DuplicateQuote([FromRoute] long id, Asp.Versioning.ApiVersion apiVersion) // { // if (!serverState.IsOpen) // return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -225,7 +225,7 @@ namespace AyaNova.Api.Controllers /// /// QuoteState object [HttpPost("states")] - public async Task PostQuoteState([FromBody] QuoteState newObject, ApiVersion apiVersion) + public async Task PostQuoteState([FromBody] QuoteState newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -288,7 +288,7 @@ namespace AyaNova.Api.Controllers /// /// QuoteItem object [HttpPost("items")] - public async Task PostQuoteItem([FromBody] QuoteItem newObject, ApiVersion apiVersion) + public async Task PostQuoteItem([FromBody] QuoteItem newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -397,7 +397,7 @@ namespace AyaNova.Api.Controllers /// /// QuoteItemExpense object (no descendants) [HttpPost("items/expenses")] - public async Task PostQuoteItemExpense([FromBody] QuoteItemExpense newObject, ApiVersion apiVersion) + public async Task PostQuoteItemExpense([FromBody] QuoteItemExpense newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -504,7 +504,7 @@ namespace AyaNova.Api.Controllers /// /// QuoteItemLabor object (no descendants) [HttpPost("items/labors")] - public async Task PostQuoteItemLabor([FromBody] QuoteItemLabor newObject, ApiVersion apiVersion) + public async Task PostQuoteItemLabor([FromBody] QuoteItemLabor newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -613,7 +613,7 @@ namespace AyaNova.Api.Controllers /// /// QuoteItemLoan object (no descendants) [HttpPost("items/loans")] - public async Task PostQuoteItemLoan([FromBody] QuoteItemLoan newObject, ApiVersion apiVersion) + public async Task PostQuoteItemLoan([FromBody] QuoteItemLoan newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -722,7 +722,7 @@ namespace AyaNova.Api.Controllers /// /// QuoteItemOutsideService object (no descendants) [HttpPost("items/outside-services")] - public async Task PostQuoteItemOutsideService([FromBody] QuoteItemOutsideService newObject, ApiVersion apiVersion) + public async Task PostQuoteItemOutsideService([FromBody] QuoteItemOutsideService newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -829,7 +829,7 @@ namespace AyaNova.Api.Controllers /// /// QuoteItemPart object (no descendants) [HttpPost("items/parts")] - public async Task PostQuoteItemPart([FromBody] QuoteItemPart newObject, ApiVersion apiVersion) + public async Task PostQuoteItemPart([FromBody] QuoteItemPart newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -936,7 +936,7 @@ namespace AyaNova.Api.Controllers /// /// QuoteItemScheduledUser object (no descendants) [HttpPost("items/scheduled-users")] - public async Task PostQuoteItemScheduledUser([FromBody] QuoteItemScheduledUser newObject, ApiVersion apiVersion) + public async Task PostQuoteItemScheduledUser([FromBody] QuoteItemScheduledUser newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -1042,7 +1042,7 @@ namespace AyaNova.Api.Controllers /// /// QuoteItemTask object (no descendants) [HttpPost("items/tasks")] - public async Task PostQuoteItemTask([FromBody] QuoteItemTask newObject, ApiVersion apiVersion) + public async Task PostQuoteItemTask([FromBody] QuoteItemTask newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -1148,7 +1148,7 @@ namespace AyaNova.Api.Controllers /// /// QuoteItemTravel object (no descendants) [HttpPost("items/travels")] - public async Task PostQuoteItemTravel([FromBody] QuoteItemTravel newObject, ApiVersion apiVersion) + public async Task PostQuoteItemTravel([FromBody] QuoteItemTravel newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -1254,7 +1254,7 @@ namespace AyaNova.Api.Controllers /// /// QuoteItemUnit object (no descendants) [HttpPost("items/units")] - public async Task PostQuoteItemUnit([FromBody] QuoteItemUnit newObject, ApiVersion apiVersion) + public async Task PostQuoteItemUnit([FromBody] QuoteItemUnit newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/QuoteStatusController.cs b/server/AyaNova/Controllers/QuoteStatusController.cs index 209f5d0b..db191f2f 100644 --- a/server/AyaNova/Controllers/QuoteStatusController.cs +++ b/server/AyaNova/Controllers/QuoteStatusController.cs @@ -14,7 +14,7 @@ using EnumsNET; namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/quote-status")] [Produces("application/json")] [Authorize] @@ -44,7 +44,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost] - public async Task PostQuoteStatus([FromBody] QuoteStatus newObject, ApiVersion apiVersion) + public async Task PostQuoteStatus([FromBody] QuoteStatus newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/ReminderController.cs b/server/AyaNova/Controllers/ReminderController.cs index 3ceaae14..25822cf7 100644 --- a/server/AyaNova/Controllers/ReminderController.cs +++ b/server/AyaNova/Controllers/ReminderController.cs @@ -13,7 +13,7 @@ using AyaNova.Biz; namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/reminder")] [Produces("application/json")] [Authorize] @@ -43,7 +43,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost] - public async Task PostReminder([FromBody] Reminder newObject, ApiVersion apiVersion) + public async Task PostReminder([FromBody] Reminder newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/ReportController.cs b/server/AyaNova/Controllers/ReportController.cs index 29206008..86dcdb03 100644 --- a/server/AyaNova/Controllers/ReportController.cs +++ b/server/AyaNova/Controllers/ReportController.cs @@ -18,7 +18,7 @@ using Newtonsoft.Json.Linq; namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/report")] [Produces("application/json")] [Authorize] @@ -49,7 +49,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost] - public async Task PostReport([FromBody] Report newObject, ApiVersion apiVersion) + public async Task PostReport([FromBody] Report newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -165,7 +165,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost("data")] - public async Task GetReportData([FromBody] DataListSelectedRequest selectedRequest, ApiVersion apiVersion) + public async Task GetReportData([FromBody] DataListSelectedRequest selectedRequest, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -202,7 +202,7 @@ namespace AyaNova.Api.Controllers /// From route path /// Job Id [HttpPost("render-job")] - public async Task RequestRenderReport([FromBody] DataListReportRequest reportRequest, ApiVersion apiVersion) + public async Task RequestRenderReport([FromBody] DataListReportRequest reportRequest, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/ReviewController.cs b/server/AyaNova/Controllers/ReviewController.cs index 55b33438..029ae26b 100644 --- a/server/AyaNova/Controllers/ReviewController.cs +++ b/server/AyaNova/Controllers/ReviewController.cs @@ -13,7 +13,7 @@ using AyaNova.Biz; namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/review")] [Produces("application/json")] [Authorize] @@ -43,7 +43,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost] - public async Task PostReview([FromBody] Review newObject, ApiVersion apiVersion) + public async Task PostReview([FromBody] Review newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/ScheduleController.cs b/server/AyaNova/Controllers/ScheduleController.cs index 505f4f02..69e81ac2 100644 --- a/server/AyaNova/Controllers/ScheduleController.cs +++ b/server/AyaNova/Controllers/ScheduleController.cs @@ -17,7 +17,7 @@ using Newtonsoft.Json.Linq; namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/schedule")] [Produces("application/json")] [Authorize] @@ -56,7 +56,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost("svc")] - public async Task PostServiceSchedule([FromBody] ServiceScheduleParams p, ApiVersion apiVersion) + public async Task PostServiceSchedule([FromBody] ServiceScheduleParams p, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -148,7 +148,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost("user")] - public async Task PostUserSchedule([FromBody] PersonalScheduleParams p, ApiVersion apiVersion) + public async Task PostUserSchedule([FromBody] PersonalScheduleParams p, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -206,7 +206,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost("personal")] - public async Task PostPersonalSchedule([FromBody] PersonalScheduleParams p, ApiVersion apiVersion) + public async Task PostPersonalSchedule([FromBody] PersonalScheduleParams p, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -284,7 +284,7 @@ namespace AyaNova.Api.Controllers /// From route path /// Error or OK response [HttpPost("adjust")] - public async Task AdjustSchedule([FromBody] ScheduleItemAdjustParams ad, ApiVersion apiVersion) + public async Task AdjustSchedule([FromBody] ScheduleItemAdjustParams ad, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/SearchController.cs b/server/AyaNova/Controllers/SearchController.cs index ca011c5d..b1954339 100644 --- a/server/AyaNova/Controllers/SearchController.cs +++ b/server/AyaNova/Controllers/SearchController.cs @@ -16,7 +16,7 @@ namespace AyaNova.Api.Controllers /// Search /// [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/search")] [Produces("application/json")] [Authorize] diff --git a/server/AyaNova/Controllers/ServerMetricsController.cs b/server/AyaNova/Controllers/ServerMetricsController.cs index a4a006c0..4e8b0080 100644 --- a/server/AyaNova/Controllers/ServerMetricsController.cs +++ b/server/AyaNova/Controllers/ServerMetricsController.cs @@ -23,7 +23,7 @@ namespace AyaNova.Api.Controllers /// Server metrics /// [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/server-metric")] [Authorize] public class ServerMetricsController : ControllerBase diff --git a/server/AyaNova/Controllers/ServerStateController.cs b/server/AyaNova/Controllers/ServerStateController.cs index 3dd68835..5fc338dc 100644 --- a/server/AyaNova/Controllers/ServerStateController.cs +++ b/server/AyaNova/Controllers/ServerStateController.cs @@ -21,7 +21,7 @@ namespace AyaNova.Api.Controllers /// Server state controller /// [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/server-state")] [Produces("application/json")] [Authorize] diff --git a/server/AyaNova/Controllers/ServiceBankController.cs b/server/AyaNova/Controllers/ServiceBankController.cs index 49b37da2..7e74ac44 100644 --- a/server/AyaNova/Controllers/ServiceBankController.cs +++ b/server/AyaNova/Controllers/ServiceBankController.cs @@ -13,7 +13,7 @@ // namespace AyaNova.Api.Controllers // { // [ApiController] -// [ApiVersion("8.0")] +// [Asp.Versioning.ApiVersion("8.0")] // [Route("api/v{version:apiVersion}/service-bank")] // [Produces("application/json")] // [Authorize] @@ -44,7 +44,7 @@ // /// From route path // /// // [HttpPost] -// public async Task PostServiceBank([FromBody] dtServiceBank newObject, ApiVersion apiVersion) +// public async Task PostServiceBank([FromBody] dtServiceBank newObject, Asp.Versioning.ApiVersion apiVersion) // { // if (!serverState.IsOpen) // return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -68,7 +68,7 @@ // /// From route path // /// // [HttpPost("migrate")] -// public async Task MigrateServiceBank([FromBody] ServiceBank newObject, ApiVersion apiVersion) +// public async Task MigrateServiceBank([FromBody] ServiceBank newObject, Asp.Versioning.ApiVersion apiVersion) // { // if (!serverState.IsOpen) // return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/ServiceRateController.cs b/server/AyaNova/Controllers/ServiceRateController.cs index 9cef2f34..64612ac2 100644 --- a/server/AyaNova/Controllers/ServiceRateController.cs +++ b/server/AyaNova/Controllers/ServiceRateController.cs @@ -13,7 +13,7 @@ using AyaNova.Biz; namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/service-rate")] [Produces("application/json")] [Authorize] @@ -43,7 +43,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost] - public async Task PostServiceRate([FromBody] ServiceRate newObject, ApiVersion apiVersion) + public async Task PostServiceRate([FromBody] ServiceRate newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -67,7 +67,7 @@ namespace AyaNova.Api.Controllers // /// From route path // /// ServiceRate // [HttpPost("duplicate/{id}")] - // public async Task DuplicateServiceRate([FromRoute] long id, ApiVersion apiVersion) + // public async Task DuplicateServiceRate([FromRoute] long id, Asp.Versioning.ApiVersion apiVersion) // { // if (!serverState.IsOpen) // return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/TagController.cs b/server/AyaNova/Controllers/TagController.cs index 49150993..36c7736c 100644 --- a/server/AyaNova/Controllers/TagController.cs +++ b/server/AyaNova/Controllers/TagController.cs @@ -17,7 +17,7 @@ namespace AyaNova.Api.Controllers /// /// [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/tag-list")] [Produces("application/json")] [Authorize] diff --git a/server/AyaNova/Controllers/TaskGroupController.cs b/server/AyaNova/Controllers/TaskGroupController.cs index 5c15ebbb..5d6513a9 100644 --- a/server/AyaNova/Controllers/TaskGroupController.cs +++ b/server/AyaNova/Controllers/TaskGroupController.cs @@ -12,7 +12,7 @@ using AyaNova.Biz; namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/task-group")] [Produces("application/json")] [Authorize] @@ -42,7 +42,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost] - public async Task PostTaskGroup([FromBody] TaskGroup newObject, ApiVersion apiVersion) + public async Task PostTaskGroup([FromBody] TaskGroup newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -66,7 +66,7 @@ namespace AyaNova.Api.Controllers // /// From route path // /// TaskGroup // [HttpPost("duplicate/{id}")] - // public async Task DuplicateTaskGroup([FromRoute] long id, ApiVersion apiVersion) + // public async Task DuplicateTaskGroup([FromRoute] long id, Asp.Versioning.ApiVersion apiVersion) // { // if (!serverState.IsOpen) // return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/TaxCodeController.cs b/server/AyaNova/Controllers/TaxCodeController.cs index dd7d9f41..4d0e7609 100644 --- a/server/AyaNova/Controllers/TaxCodeController.cs +++ b/server/AyaNova/Controllers/TaxCodeController.cs @@ -13,7 +13,7 @@ using AyaNova.Biz; namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/tax-code")] [Produces("application/json")] [Authorize] @@ -43,7 +43,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost] - public async Task PostTaxCode([FromBody] TaxCode newObject, ApiVersion apiVersion) + public async Task PostTaxCode([FromBody] TaxCode newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -67,7 +67,7 @@ namespace AyaNova.Api.Controllers // /// From route path // /// TaxCode // [HttpPost("duplicate/{id}")] - // public async Task DuplicateTaxCode([FromRoute] long id, ApiVersion apiVersion) + // public async Task DuplicateTaxCode([FromRoute] long id, Asp.Versioning.ApiVersion apiVersion) // { // if (!serverState.IsOpen) // return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/TranslationController.cs b/server/AyaNova/Controllers/TranslationController.cs index 9b5c4fb3..85e1785a 100644 --- a/server/AyaNova/Controllers/TranslationController.cs +++ b/server/AyaNova/Controllers/TranslationController.cs @@ -27,7 +27,7 @@ namespace AyaNova.Api.Controllers /// Translation controller /// [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/translation")] [Produces("application/json")] [Authorize] @@ -203,7 +203,7 @@ namespace AyaNova.Api.Controllers /// From route path /// Duplicate [HttpPost("duplicate/{id}")] - public async Task DuplicateTranslation([FromRoute] long id, ApiVersion apiVersion) + public async Task DuplicateTranslation([FromRoute] long id, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/TravelRateController.cs b/server/AyaNova/Controllers/TravelRateController.cs index ea541860..95755dbb 100644 --- a/server/AyaNova/Controllers/TravelRateController.cs +++ b/server/AyaNova/Controllers/TravelRateController.cs @@ -13,7 +13,7 @@ using AyaNova.Biz; namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/travel-rate")] [Produces("application/json")] [Authorize] @@ -43,7 +43,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost] - public async Task PostTravelRate([FromBody] TravelRate newObject, ApiVersion apiVersion) + public async Task PostTravelRate([FromBody] TravelRate newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -67,7 +67,7 @@ namespace AyaNova.Api.Controllers // /// From route path // /// TravelRate // [HttpPost("duplicate/{id}")] - // public async Task DuplicateTravelRate([FromRoute] long id, ApiVersion apiVersion) + // public async Task DuplicateTravelRate([FromRoute] long id, Asp.Versioning.ApiVersion apiVersion) // { // if (!serverState.IsOpen) // return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/TrialController.cs b/server/AyaNova/Controllers/TrialController.cs index 9c884572..665edb2a 100644 --- a/server/AyaNova/Controllers/TrialController.cs +++ b/server/AyaNova/Controllers/TrialController.cs @@ -16,7 +16,7 @@ namespace AyaNova.Api.Controllers ///Test controller class used during development /// [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/trial")] [Produces("application/json")] [Authorize] diff --git a/server/AyaNova/Controllers/UnitController.cs b/server/AyaNova/Controllers/UnitController.cs index 79c66fc8..33488733 100644 --- a/server/AyaNova/Controllers/UnitController.cs +++ b/server/AyaNova/Controllers/UnitController.cs @@ -16,7 +16,7 @@ using System; namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/unit")] [Produces("application/json")] [Authorize] @@ -46,7 +46,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost] - public async Task PostUnit([FromBody] Unit newObject, ApiVersion apiVersion) + public async Task PostUnit([FromBody] Unit newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -69,7 +69,7 @@ namespace AyaNova.Api.Controllers /// From route path /// Id of newly created Unit or error response [HttpPost("customerunit")] - public async Task CustomerPostUnit([FromBody] CustomerPostUnit newObject, ApiVersion apiVersion) + public async Task CustomerPostUnit([FromBody] CustomerPostUnit newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -389,7 +389,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost("meter-reading")] - public async Task PostUnitMeterReading([FromBody] UnitMeterReading newObject, ApiVersion apiVersion) + public async Task PostUnitMeterReading([FromBody] UnitMeterReading newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/UnitModelController.cs b/server/AyaNova/Controllers/UnitModelController.cs index c9947b59..cf0636d6 100644 --- a/server/AyaNova/Controllers/UnitModelController.cs +++ b/server/AyaNova/Controllers/UnitModelController.cs @@ -12,7 +12,7 @@ using AyaNova.Biz; namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/unit-model")] [Produces("application/json")] [Authorize] @@ -42,7 +42,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost] - public async Task PostUnitModel([FromBody] UnitModel newObject, ApiVersion apiVersion) + public async Task PostUnitModel([FromBody] UnitModel newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -66,7 +66,7 @@ namespace AyaNova.Api.Controllers // /// From route path // /// UnitModel // [HttpPost("duplicate/{id}")] - // public async Task DuplicateUnitModel([FromRoute] long id, ApiVersion apiVersion) + // public async Task DuplicateUnitModel([FromRoute] long id, Asp.Versioning.ApiVersion apiVersion) // { // if (!serverState.IsOpen) // return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/UserController.cs b/server/AyaNova/Controllers/UserController.cs index 12a608ec..4a144c8e 100644 --- a/server/AyaNova/Controllers/UserController.cs +++ b/server/AyaNova/Controllers/UserController.cs @@ -20,7 +20,7 @@ namespace AyaNova.Api.Controllers /// User /// [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/user")] [Produces("application/json")] [Authorize] @@ -126,7 +126,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost] - public async Task PostUser([FromBody] User inObj, ApiVersion apiVersion) + public async Task PostUser([FromBody] User inObj, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -167,7 +167,7 @@ namespace AyaNova.Api.Controllers // /// From route path // /// User // [HttpPost("duplicate/{id}")] - // public async Task DuplicateUser([FromRoute] long id, ApiVersion apiVersion) + // public async Task DuplicateUser([FromRoute] long id, Asp.Versioning.ApiVersion apiVersion) // { // if (!serverState.IsOpen) // return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/UserOptionsController.cs b/server/AyaNova/Controllers/UserOptionsController.cs index 3c02ba9a..156ce3b3 100644 --- a/server/AyaNova/Controllers/UserOptionsController.cs +++ b/server/AyaNova/Controllers/UserOptionsController.cs @@ -20,7 +20,7 @@ namespace AyaNova.Api.Controllers /// UserOptions /// [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/user-option")] [Produces("application/json")] [Authorize] @@ -100,7 +100,7 @@ namespace AyaNova.Api.Controllers // /// From route path // /// // [HttpPost] - // public async Task PostUserOptions([FromBody] UserOptions newObject, ApiVersion apiVersion) + // public async Task PostUserOptions([FromBody] UserOptions newObject, Asp.Versioning.ApiVersion apiVersion) // { // if (!serverState.IsOpen) // return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/VendorController.cs b/server/AyaNova/Controllers/VendorController.cs index aedcd89e..6294d93f 100644 --- a/server/AyaNova/Controllers/VendorController.cs +++ b/server/AyaNova/Controllers/VendorController.cs @@ -14,7 +14,7 @@ using AyaNova.Biz; namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/vendor")] [Produces("application/json")] [Authorize] @@ -44,7 +44,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost] - public async Task PostVendor([FromBody] Vendor newObject, ApiVersion apiVersion) + public async Task PostVendor([FromBody] Vendor newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -68,7 +68,7 @@ namespace AyaNova.Api.Controllers // /// From route path // /// Vendor // [HttpPost("duplicate/{id}")] - // public async Task DuplicateVendor([FromRoute] long id, ApiVersion apiVersion) + // public async Task DuplicateVendor([FromRoute] long id, Asp.Versioning.ApiVersion apiVersion) // { // if (!serverState.IsOpen) // return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/WorkOrderController.cs b/server/AyaNova/Controllers/WorkOrderController.cs index fbf4ef98..95ef1659 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")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/workorder")] [Produces("application/json")] [Authorize] @@ -57,7 +57,7 @@ namespace AyaNova.Api.Controllers /// From route path /// WorkOrder [HttpPost] - public async Task PostWorkOrder([FromBody] WorkOrder newObject, ApiVersion apiVersion) + public async Task PostWorkOrder([FromBody] WorkOrder newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -246,7 +246,7 @@ namespace AyaNova.Api.Controllers /// /// WorkOrderState object [HttpPost("states")] - public async Task PostWorkOrderState([FromBody] WorkOrderState newObject, ApiVersion apiVersion) + public async Task PostWorkOrderState([FromBody] WorkOrderState newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -309,7 +309,7 @@ namespace AyaNova.Api.Controllers /// /// WorkOrderItem object [HttpPost("items")] - public async Task PostWorkOrderItem([FromBody] WorkOrderItem newObject, ApiVersion apiVersion) + public async Task PostWorkOrderItem([FromBody] WorkOrderItem newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -418,7 +418,7 @@ namespace AyaNova.Api.Controllers /// /// WorkOrderItemExpense object (no descendants) [HttpPost("items/expenses")] - public async Task PostWorkOrderItemExpense([FromBody] WorkOrderItemExpense newObject, ApiVersion apiVersion) + public async Task PostWorkOrderItemExpense([FromBody] WorkOrderItemExpense newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -525,7 +525,7 @@ namespace AyaNova.Api.Controllers /// /// WorkOrderItemLabor object (no descendants) [HttpPost("items/labors")] - public async Task PostWorkOrderItemLabor([FromBody] WorkOrderItemLabor newObject, ApiVersion apiVersion) + public async Task PostWorkOrderItemLabor([FromBody] WorkOrderItemLabor newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -634,7 +634,7 @@ namespace AyaNova.Api.Controllers /// /// WorkOrderItemLoan object (no descendants) [HttpPost("items/loans")] - public async Task PostWorkOrderItemLoan([FromBody] WorkOrderItemLoan newObject, ApiVersion apiVersion) + public async Task PostWorkOrderItemLoan([FromBody] WorkOrderItemLoan newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -743,7 +743,7 @@ namespace AyaNova.Api.Controllers /// /// WorkOrderItemOutsideService object (no descendants) [HttpPost("items/outside-services")] - public async Task PostWorkOrderItemOutsideService([FromBody] WorkOrderItemOutsideService newObject, ApiVersion apiVersion) + public async Task PostWorkOrderItemOutsideService([FromBody] WorkOrderItemOutsideService newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -850,7 +850,7 @@ namespace AyaNova.Api.Controllers /// /// WorkOrderItemPart object (no descendants) [HttpPost("items/parts")] - public async Task PostWorkOrderItemPart([FromBody] WorkOrderItemPart newObject, ApiVersion apiVersion) + public async Task PostWorkOrderItemPart([FromBody] WorkOrderItemPart newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -956,7 +956,7 @@ namespace AyaNova.Api.Controllers /// /// WorkOrderItemPartRequest object (no descendants) [HttpPost("items/part-requests")] - public async Task PostWorkOrderItemPartRequest([FromBody] WorkOrderItemPartRequest newObject, ApiVersion apiVersion) + public async Task PostWorkOrderItemPartRequest([FromBody] WorkOrderItemPartRequest newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -1062,7 +1062,7 @@ namespace AyaNova.Api.Controllers /// /// WorkOrderItemScheduledUser object (no descendants) [HttpPost("items/scheduled-users")] - public async Task PostWorkOrderItemScheduledUser([FromBody] WorkOrderItemScheduledUser newObject, ApiVersion apiVersion) + public async Task PostWorkOrderItemScheduledUser([FromBody] WorkOrderItemScheduledUser newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -1191,7 +1191,7 @@ namespace AyaNova.Api.Controllers /// /// WorkOrderItemTask object (no descendants) [HttpPost("items/tasks")] - public async Task PostWorkOrderItemTask([FromBody] WorkOrderItemTask newObject, ApiVersion apiVersion) + public async Task PostWorkOrderItemTask([FromBody] WorkOrderItemTask newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -1297,7 +1297,7 @@ namespace AyaNova.Api.Controllers /// /// WorkOrderItemTravel object (no descendants) [HttpPost("items/travels")] - public async Task PostWorkOrderItemTravel([FromBody] WorkOrderItemTravel newObject, ApiVersion apiVersion) + public async Task PostWorkOrderItemTravel([FromBody] WorkOrderItemTravel newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -1403,7 +1403,7 @@ namespace AyaNova.Api.Controllers /// /// WorkOrderItemUnit object (no descendants) [HttpPost("items/units")] - public async Task PostWorkOrderItemUnit([FromBody] WorkOrderItemUnit newObject, ApiVersion apiVersion) + public async Task PostWorkOrderItemUnit([FromBody] WorkOrderItemUnit newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/WorkOrderItemPriorityController.cs b/server/AyaNova/Controllers/WorkOrderItemPriorityController.cs index 5bafd068..77d10904 100644 --- a/server/AyaNova/Controllers/WorkOrderItemPriorityController.cs +++ b/server/AyaNova/Controllers/WorkOrderItemPriorityController.cs @@ -14,7 +14,7 @@ using EnumsNET; namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/work-order-item-priority")] [Produces("application/json")] [Authorize] @@ -44,7 +44,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost] - public async Task PostWorkOrderItemPriority([FromBody] WorkOrderItemPriority newObject, ApiVersion apiVersion) + public async Task PostWorkOrderItemPriority([FromBody] WorkOrderItemPriority newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -68,7 +68,7 @@ namespace AyaNova.Api.Controllers // /// From route path // /// WorkOrderItemPriority // [HttpPost("duplicate/{id}")] - // public async Task DuplicateWorkOrderItemPriority([FromRoute] long id, ApiVersion apiVersion) + // public async Task DuplicateWorkOrderItemPriority([FromRoute] long id, Asp.Versioning.ApiVersion apiVersion) // { // if (!serverState.IsOpen) // return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/WorkOrderItemStatusController.cs b/server/AyaNova/Controllers/WorkOrderItemStatusController.cs index 9d48be99..d3cc17bf 100644 --- a/server/AyaNova/Controllers/WorkOrderItemStatusController.cs +++ b/server/AyaNova/Controllers/WorkOrderItemStatusController.cs @@ -14,7 +14,7 @@ using EnumsNET; namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/work-order-item-status")] [Produces("application/json")] [Authorize] @@ -44,7 +44,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost] - public async Task PostWorkOrderItemStatus([FromBody] WorkOrderItemStatus newObject, ApiVersion apiVersion) + public async Task PostWorkOrderItemStatus([FromBody] WorkOrderItemStatus newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -68,7 +68,7 @@ namespace AyaNova.Api.Controllers // /// From route path // /// WorkOrderItemStatus // [HttpPost("duplicate/{id}")] - // public async Task DuplicateWorkOrderItemStatus([FromRoute] long id, ApiVersion apiVersion) + // public async Task DuplicateWorkOrderItemStatus([FromRoute] long id, Asp.Versioning.ApiVersion apiVersion) // { // if (!serverState.IsOpen) // return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Controllers/WorkOrderStatusController.cs b/server/AyaNova/Controllers/WorkOrderStatusController.cs index e28cfeee..aadfd127 100644 --- a/server/AyaNova/Controllers/WorkOrderStatusController.cs +++ b/server/AyaNova/Controllers/WorkOrderStatusController.cs @@ -14,7 +14,7 @@ using EnumsNET; namespace AyaNova.Api.Controllers { [ApiController] - [ApiVersion("8.0")] + [Asp.Versioning.ApiVersion("8.0")] [Route("api/v{version:apiVersion}/work-order-status")] [Produces("application/json")] [Authorize] @@ -44,7 +44,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost] - public async Task PostWorkOrderStatus([FromBody] WorkOrderStatus newObject, ApiVersion apiVersion) + public async Task PostWorkOrderStatus([FromBody] WorkOrderStatus newObject, Asp.Versioning.ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -68,7 +68,7 @@ namespace AyaNova.Api.Controllers // /// From route path // /// WorkOrderStatus // [HttpPost("duplicate/{id}")] - // public async Task DuplicateWorkOrderStatus([FromRoute] long id, ApiVersion apiVersion) + // public async Task DuplicateWorkOrderStatus([FromRoute] long id, Asp.Versioning.ApiVersion apiVersion) // { // if (!serverState.IsOpen) // return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/Program.cs b/server/AyaNova/Program.cs index 190efdad..12c64a10 100644 --- a/server/AyaNova/Program.cs +++ b/server/AyaNova/Program.cs @@ -10,6 +10,7 @@ using NLog.Web; using NLog.Targets; using NLog.Config; using AyaNova.Util; +using NLog; //using StackExchange.Profiling; namespace AyaNova @@ -201,7 +202,8 @@ namespace AyaNova } // NLog: setup the logger first to catch all errors - var logger = NLogBuilder.ConfigureNLog(logConfig).GetLogger("BOOT"); + //var logger = NLogBuilder.ConfigureNLog(logConfig).GetLogger("BOOT"); + var logger= NLog.LogManager.Setup().LoadConfiguration(logConfig).GetLogger("BOOT"); #endregion diff --git a/server/AyaNova/Startup.cs b/server/AyaNova/Startup.cs index 78a5e185..f07724cd 100644 --- a/server/AyaNova/Startup.cs +++ b/server/AyaNova/Startup.cs @@ -4,7 +4,7 @@ using System.Linq; using System; using System.Collections.Generic; using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Mvc.ApiExplorer; +using Asp.Versioning.ApiExplorer; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.EntityFrameworkCore; @@ -197,14 +197,12 @@ namespace AyaNova #region Swagger - services - .AddApiVersioning(options => + services.AddApiVersioning(options => { options.AssumeDefaultVersionWhenUnspecified = true; - options.DefaultApiVersion = Microsoft.AspNetCore.Mvc.ApiVersion.Parse("8.0"); + options.DefaultApiVersion = new Asp.Versioning.ApiVersion(8, 0);// Asp.Versioning.ApiVersion..Parse("8.0"); options.ReportApiVersions = true; - }); - services.AddVersionedApiExplorer(options => + }).AddApiExplorer(options => { // add the versioned api explorer, which also adds IApiVersionDescriptionProvider service