From 1b81188806c5debab887a0d61c08a9688f9d7e47 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 28 Jan 2020 19:55:11 +0000 Subject: [PATCH] --- .../AuthorizationRolesController.cs | 4 +- .../AyaNova/Controllers/AyaTypeController.cs | 82 ------------------- .../AyaNova/Controllers/DataListController.cs | 4 +- ...ontroller.cs => EnumPickListController.cs} | 26 ++++-- .../FormFieldsDefinitionsController.cs | 4 +- .../AyaNova/Controllers/TagListController.cs | 4 +- 6 files changed, 29 insertions(+), 95 deletions(-) delete mode 100644 server/AyaNova/Controllers/AyaTypeController.cs rename server/AyaNova/Controllers/{AyaEnumPickListController.cs => EnumPickListController.cs} (88%) diff --git a/server/AyaNova/Controllers/AuthorizationRolesController.cs b/server/AyaNova/Controllers/AuthorizationRolesController.cs index 14a0c8bf..eb01bd5b 100644 --- a/server/AyaNova/Controllers/AuthorizationRolesController.cs +++ b/server/AyaNova/Controllers/AuthorizationRolesController.cs @@ -23,7 +23,7 @@ namespace AyaNova.Api.Controllers public class AuthorizationRolesController : ControllerBase { private readonly AyContext ct; - private readonly ILogger log; + private readonly ILogger log; private readonly ApiServerState serverState; @@ -33,7 +33,7 @@ namespace AyaNova.Api.Controllers /// /// /// - public AuthorizationRolesController(AyContext dbcontext, ILogger logger, ApiServerState apiServerState) + public AuthorizationRolesController(AyContext dbcontext, ILogger logger, ApiServerState apiServerState) { ct = dbcontext; log = logger; diff --git a/server/AyaNova/Controllers/AyaTypeController.cs b/server/AyaNova/Controllers/AyaTypeController.cs deleted file mode 100644 index 4a942898..00000000 --- a/server/AyaNova/Controllers/AyaTypeController.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System; -using System.Collections.Generic; -using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Routing; -using Microsoft.Extensions.Logging; -using Microsoft.AspNetCore.Authorization; -using AyaNova.Models; -using AyaNova.Api.ControllerHelpers; -using AyaNova.Biz; - - -namespace AyaNova.Api.Controllers -{ - - /// - /// AyaType list controller - /// - [ApiController] - [ApiVersion("8.0")] - [Route("api/v{version:apiVersion}/[controller]")] - [Produces("application/json")] - [Authorize] - public class AyaTypeController : ControllerBase - { - private readonly AyContext ct; - private readonly ILogger log; - private readonly ApiServerState serverState; - - - /// - /// ctor - /// - /// - /// - /// - public AyaTypeController(AyContext dbcontext, ILogger logger, ApiServerState apiServerState) - { - ct = dbcontext; - log = logger; - serverState = apiServerState; - } - - - /// - /// Get name value list of AyaNova business object types - /// - /// List - [HttpGet] - public ActionResult GetAyaTypes() - { - if (!serverState.IsOpen) - { - return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); - } - - List l = new List(); - var values = Enum.GetValues(typeof(AyaType)); - foreach (AyaType t in values) - { - - string name = t.ToString(); - if (t.HasAttribute(typeof(AttachableAttribute))) - { - name += " [Attachable]"; - } - - - l.Add(new NameIdItem() { Name = name, Id = (long)t }); - } - - - return Ok(ApiOkResponse.Response(l, true)); - } - - - - - - - - } -} \ No newline at end of file diff --git a/server/AyaNova/Controllers/DataListController.cs b/server/AyaNova/Controllers/DataListController.cs index b21f2438..8e8e288b 100644 --- a/server/AyaNova/Controllers/DataListController.cs +++ b/server/AyaNova/Controllers/DataListController.cs @@ -21,7 +21,7 @@ namespace AyaNova.Api.Controllers public class DataListController : ControllerBase { private readonly AyContext ct; - private readonly ILogger log; + private readonly ILogger log; private readonly ApiServerState serverState; @@ -32,7 +32,7 @@ namespace AyaNova.Api.Controllers /// /// /// - public DataListController(AyContext dbcontext, ILogger logger, ApiServerState apiServerState) + public DataListController(AyContext dbcontext, ILogger logger, ApiServerState apiServerState) { ct = dbcontext; log = logger; diff --git a/server/AyaNova/Controllers/AyaEnumPickListController.cs b/server/AyaNova/Controllers/EnumPickListController.cs similarity index 88% rename from server/AyaNova/Controllers/AyaEnumPickListController.cs rename to server/AyaNova/Controllers/EnumPickListController.cs index f2b49316..aea29d5a 100644 --- a/server/AyaNova/Controllers/AyaEnumPickListController.cs +++ b/server/AyaNova/Controllers/EnumPickListController.cs @@ -20,10 +20,10 @@ namespace AyaNova.Api.Controllers [Route("api/v{version:apiVersion}/[controller]")] [Produces("application/json")] [Authorize] - public class AyaEnumPickListController : ControllerBase + public class EnumPickListController : ControllerBase { private readonly AyContext ct; - private readonly ILogger log; + private readonly ILogger log; private readonly ApiServerState serverState; @@ -33,7 +33,7 @@ namespace AyaNova.Api.Controllers /// /// /// - public AyaEnumPickListController(AyContext dbcontext, ILogger logger, ApiServerState apiServerState) + public EnumPickListController(AyContext dbcontext, ILogger logger, ApiServerState apiServerState) { ct = dbcontext; log = logger; @@ -68,12 +68,28 @@ namespace AyaNova.Api.Controllers Enum.GetName(t, AyaUiFieldDataType.NoType); foreach (var dt in Enum.GetValues(t)) { - ReturnList.Add(new NameIdItem() { Name = Enum.GetName(t, dt), Id = (int) dt }); + ReturnList.Add(new NameIdItem() { Name = Enum.GetName(t, dt), Id = (int)dt }); } } break; + case "ayatype": + { + + var values = Enum.GetValues(typeof(AyaType)); + foreach (AyaType t in values) + { + string name = t.ToString(); + if (t.HasAttribute(typeof(AttachableAttribute))) + { + name += " [Attachable]"; + } + ReturnList.Add(new NameIdItem() { Name = name, Id = (long)t }); + } + } + break; + case "usertypes": { LocaleKeysToFetch.Add("UserTypesAdministrator"); @@ -168,7 +184,7 @@ namespace AyaNova.Api.Controllers List> ret = new List>(); ret.Add(new KeyValuePair("usertypes", "AyaNova user account types")); ret.Add(new KeyValuePair("authorizationroles", "AyaNova user account role types")); - ret.Add(new KeyValuePair("AyaType", "All AyaNova object types, use the AyaTypeController route to fetch these")); + ret.Add(new KeyValuePair("ayatype", "All AyaNova object types")); ret.Add(new KeyValuePair("datatypes", "Types of data used in AyaNova for display and formatting UI purposes")); return Ok(ApiOkResponse.Response(ret, true)); diff --git a/server/AyaNova/Controllers/FormFieldsDefinitionsController.cs b/server/AyaNova/Controllers/FormFieldsDefinitionsController.cs index 67421d85..2f95bbd6 100644 --- a/server/AyaNova/Controllers/FormFieldsDefinitionsController.cs +++ b/server/AyaNova/Controllers/FormFieldsDefinitionsController.cs @@ -19,7 +19,7 @@ namespace AyaNova.Api.Controllers public class FormFieldsDefinitionsController : ControllerBase { private readonly AyContext ct; - private readonly ILogger log; + private readonly ILogger log; private readonly ApiServerState serverState; @@ -29,7 +29,7 @@ namespace AyaNova.Api.Controllers /// /// /// - public FormFieldsDefinitionsController(AyContext dbcontext, ILogger logger, ApiServerState apiServerState) + public FormFieldsDefinitionsController(AyContext dbcontext, ILogger logger, ApiServerState apiServerState) { ct = dbcontext; log = logger; diff --git a/server/AyaNova/Controllers/TagListController.cs b/server/AyaNova/Controllers/TagListController.cs index d3b61ee3..02c5031e 100644 --- a/server/AyaNova/Controllers/TagListController.cs +++ b/server/AyaNova/Controllers/TagListController.cs @@ -22,7 +22,7 @@ namespace AyaNova.Api.Controllers public class TagListController : ControllerBase { private readonly AyContext ct; - private readonly ILogger log; + private readonly ILogger log; private readonly ApiServerState serverState; @@ -32,7 +32,7 @@ namespace AyaNova.Api.Controllers /// /// /// - public TagListController(AyContext dbcontext, ILogger logger, ApiServerState apiServerState) + public TagListController(AyContext dbcontext, ILogger logger, ApiServerState apiServerState) { ct = dbcontext; log = logger;