From e4c2b3cec88feb6f0584261baa2faa9ab819526f Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Wed, 12 Feb 2020 18:07:14 +0000 Subject: [PATCH] --- ...ler.cs => DataListSortFilterController.cs} | 40 +++++++++---------- server/AyaNova/Program.cs | 2 +- server/AyaNova/Startup.cs | 2 +- server/AyaNova/biz/AyaType.cs | 2 +- .../AyaNova/biz/BizObjectExistsInDatabase.cs | 2 +- server/AyaNova/biz/BizObjectFactory.cs | 4 +- .../AyaNova/biz/BizObjectNameFetcherDirect.cs | 4 +- server/AyaNova/biz/BizRoles.cs | 2 +- server/AyaNova/biz/DataListSortFilterBiz.cs | 10 ++--- server/AyaNova/biz/DataListTemplateBiz.cs | 2 +- server/AyaNova/util/DbUtil.cs | 2 +- 11 files changed, 36 insertions(+), 36 deletions(-) rename server/AyaNova/Controllers/{DataListFilterController.cs => DataListSortFilterController.cs} (75%) diff --git a/server/AyaNova/Controllers/DataListFilterController.cs b/server/AyaNova/Controllers/DataListSortFilterController.cs similarity index 75% rename from server/AyaNova/Controllers/DataListFilterController.cs rename to server/AyaNova/Controllers/DataListSortFilterController.cs index f2d49e4b..038525eb 100644 --- a/server/AyaNova/Controllers/DataListFilterController.cs +++ b/server/AyaNova/Controllers/DataListSortFilterController.cs @@ -24,10 +24,10 @@ namespace AyaNova.Api.Controllers [Route("api/v{version:apiVersion}/[controller]")] [Produces("application/json")] [Authorize] - public class DataListFilterController : ControllerBase + public class DataListSortFilterController : ControllerBase { private readonly AyContext ct; - private readonly ILogger log; + private readonly ILogger log; private readonly ApiServerState serverState; @@ -37,7 +37,7 @@ namespace AyaNova.Api.Controllers /// /// /// - public DataListFilterController(AyContext dbcontext, ILogger logger, ApiServerState apiServerState) + public DataListSortFilterController(AyContext dbcontext, ILogger logger, ApiServerState apiServerState) { ct = dbcontext; log = logger; @@ -46,18 +46,18 @@ namespace AyaNova.Api.Controllers /// - /// Get full DataFilter object + /// Get full DataListSortFilter object /// /// /// A single DataFilter [HttpGet("{id}")] - public async Task GetDataFilter([FromRoute] long id) + public async Task GetDataListSortFilter([FromRoute] long id) { if (serverState.IsClosed) return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); //Instantiate the business object handler - DataListFilterBiz biz = DataListFilterBiz.GetBiz(ct, HttpContext); + DataListSortFilterBiz biz = DataListSortFilterBiz.GetBiz(ct, HttpContext); if (!Authorized.HasReadFullRole(HttpContext.Items, biz.BizType)) return StatusCode(403, new ApiNotAuthorizedResponse()); @@ -75,11 +75,11 @@ namespace AyaNova.Api.Controllers /// - /// Get DataFilter pick list + /// Get DataListSortFilter pick list /// /// List of public or owned data filters for listKey provided - [HttpGet("PickList", Name = nameof(DataFilterPickList))] - public async Task DataFilterPickList([FromQuery] string ListKey) + [HttpGet("PickList", Name = nameof(DataListSortFilterPickList))] + public async Task DataListSortFilterPickList([FromQuery] string ListKey) { if (serverState.IsClosed) return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); @@ -88,7 +88,7 @@ namespace AyaNova.Api.Controllers return BadRequest(new ApiErrorResponse(ModelState)); //Instantiate the business object handler - DataListFilterBiz biz = DataListFilterBiz.GetBiz(ct, HttpContext); + DataListSortFilterBiz biz = DataListSortFilterBiz.GetBiz(ct, HttpContext); var l = await biz.GetPickListAsync(ListKey); return Ok(ApiOkResponse.Response(l, true)); @@ -97,13 +97,13 @@ namespace AyaNova.Api.Controllers /// - /// Put (update) DataFilter + /// Put (update) DataListSortFilter /// /// /// /// [HttpPut("{id}")] - public async Task PutDataFilter([FromRoute] long id, [FromBody] DataListSortFilter inObj) + public async Task PutDataListSortFilter([FromRoute] long id, [FromBody] DataListSortFilter inObj) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); @@ -112,7 +112,7 @@ namespace AyaNova.Api.Controllers return BadRequest(new ApiErrorResponse(ModelState)); //Instantiate the business object handler - DataListFilterBiz biz = DataListFilterBiz.GetBiz(ct, HttpContext); + DataListSortFilterBiz biz = DataListSortFilterBiz.GetBiz(ct, HttpContext); var o = await biz.GetAsync(id, false); if (o == null) @@ -138,19 +138,19 @@ namespace AyaNova.Api.Controllers /// - /// Post DataFilter + /// Post DataListSortFilter /// /// /// Automatically filled from route path, no need to specify in body /// [HttpPost] - public async Task PostDataFilter([FromBody] DataListSortFilter inObj, ApiVersion apiVersion) + public async Task PostDataListSortFilter([FromBody] DataListSortFilter inObj, ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); //Instantiate the business object handler - DataListFilterBiz biz = DataListFilterBiz.GetBiz(ct, HttpContext); + DataListSortFilterBiz biz = DataListSortFilterBiz.GetBiz(ct, HttpContext); //check roles if (!Authorized.HasCreateRole(HttpContext.Items, biz.BizType)) @@ -164,19 +164,19 @@ namespace AyaNova.Api.Controllers if (o == null) return BadRequest(new ApiErrorResponse(biz.Errors)); else - return CreatedAtAction(nameof(DataListFilterController.GetDataFilter), new { id = o.Id, version = apiVersion.ToString() }, new ApiCreatedResponse(o)); + return CreatedAtAction(nameof(DataListSortFilterController.GetDataListSortFilter), new { id = o.Id, version = apiVersion.ToString() }, new ApiCreatedResponse(o)); } /// - /// Delete DataFilter + /// Delete DataListSortFilter /// /// /// Ok [HttpDelete("{id}")] - public async Task DeleteDataFilter([FromRoute] long id) + public async Task DeleteDataListSortFilter([FromRoute] long id) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); @@ -185,7 +185,7 @@ namespace AyaNova.Api.Controllers return BadRequest(new ApiErrorResponse(ModelState)); //Instantiate the business object handler - DataListFilterBiz biz = DataListFilterBiz.GetBiz(ct, HttpContext); + DataListSortFilterBiz biz = DataListSortFilterBiz.GetBiz(ct, HttpContext); var o = await biz.GetAsync(id, false); if (o == null) diff --git a/server/AyaNova/Program.cs b/server/AyaNova/Program.cs index 0f732070..7243d2fc 100644 --- a/server/AyaNova/Program.cs +++ b/server/AyaNova/Program.cs @@ -159,7 +159,7 @@ namespace AyaNova } // NLog: setup the logger first to catch all errors - var logger = NLogBuilder.ConfigureNLog(logConfig).GetCurrentClassLogger(); + var logger = NLogBuilder.ConfigureNLog(logConfig).GetLogger("Server");//.GetCurrentClassLogger(); //This is the first log entry logger.Info("AYANOVA SERVER BOOTING (log level: \"{0}\")", ServerBootConfig.AYANOVA_LOG_LEVEL); diff --git a/server/AyaNova/Startup.cs b/server/AyaNova/Startup.cs index ab6553a6..ae1fb731 100644 --- a/server/AyaNova/Startup.cs +++ b/server/AyaNova/Startup.cs @@ -35,7 +35,7 @@ namespace AyaNova var nlogLoggerProvider = new NLogLoggerProvider(); // Create an ILogger. - _newLog = nlogLoggerProvider.CreateLogger("SRVR"); + _newLog = nlogLoggerProvider.CreateLogger("Server"); //x_log = logger; _hostingEnvironment = hostingEnvironment; diff --git a/server/AyaNova/biz/AyaType.cs b/server/AyaNova/biz/AyaType.cs index d43a8230..3681e6b0 100644 --- a/server/AyaNova/biz/AyaType.cs +++ b/server/AyaNova/biz/AyaType.cs @@ -32,7 +32,7 @@ namespace AyaNova.Biz DEPRECATED_REUSELATER_15 = 15, DEPRECATED_REUSELATER_16 = 16, FileAttachment = 17, - DataListFilter = 18, + DataListSortFilter = 18, FormCustom = 19, DataListTemplate = 20 diff --git a/server/AyaNova/biz/BizObjectExistsInDatabase.cs b/server/AyaNova/biz/BizObjectExistsInDatabase.cs index d7dc6c08..f8d71cbc 100644 --- a/server/AyaNova/biz/BizObjectExistsInDatabase.cs +++ b/server/AyaNova/biz/BizObjectExistsInDatabase.cs @@ -36,7 +36,7 @@ namespace AyaNova.Biz return await ct.Widget.AnyAsync(m => m.Id == id); case AyaType.FileAttachment: return await ct.FileAttachment.AnyAsync(m => m.Id == id); - case AyaType.DataListFilter: + case AyaType.DataListSortFilter: return await ct.DataListSortFilter.AnyAsync(m => m.Id == id); case AyaType.DataListTemplate: return await ct.DataListTemplate.AnyAsync(m => m.Id == id); diff --git a/server/AyaNova/biz/BizObjectFactory.cs b/server/AyaNova/biz/BizObjectFactory.cs index 8f7e5947..40b13d15 100644 --- a/server/AyaNova/biz/BizObjectFactory.cs +++ b/server/AyaNova/biz/BizObjectFactory.cs @@ -35,8 +35,8 @@ namespace AyaNova.Biz return new TrialBiz(dbcontext, userId, roles); case AyaType.Locale: return new LocaleBiz(dbcontext, userId, ServerBootConfig.AYANOVA_DEFAULT_LANGUAGE_ID, roles); - case AyaType.DataListFilter: - return new DataListFilterBiz(dbcontext, userId, ServerBootConfig.AYANOVA_DEFAULT_LANGUAGE_ID, roles); + case AyaType.DataListSortFilter: + return new DataListSortFilterBiz(dbcontext, userId, ServerBootConfig.AYANOVA_DEFAULT_LANGUAGE_ID, roles); case AyaType.DataListTemplate: return new DataListTemplateBiz(dbcontext, userId, ServerBootConfig.AYANOVA_DEFAULT_LANGUAGE_ID, roles); case AyaType.FormCustom: diff --git a/server/AyaNova/biz/BizObjectNameFetcherDirect.cs b/server/AyaNova/biz/BizObjectNameFetcherDirect.cs index d1979336..7b2c6827 100644 --- a/server/AyaNova/biz/BizObjectNameFetcherDirect.cs +++ b/server/AyaNova/biz/BizObjectNameFetcherDirect.cs @@ -30,8 +30,8 @@ namespace AyaNova.Biz TABLE = "afileattachment"; COLUMN = "displayfilename"; break; - case AyaType.DataListFilter: - TABLE = "adatalistfilter"; + case AyaType.DataListSortFilter: + TABLE = "adatalistsortfilter"; break; case AyaType.FormCustom: TABLE = "aformcustom"; diff --git a/server/AyaNova/biz/BizRoles.cs b/server/AyaNova/biz/BizRoles.cs index d6132ea4..f946dc9c 100644 --- a/server/AyaNova/biz/BizRoles.cs +++ b/server/AyaNova/biz/BizRoles.cs @@ -133,7 +133,7 @@ namespace AyaNova.Biz //////////////////////////////////////////////////////////// //DATALISTFILTER // - roles.Add(AyaType.DataListFilter, new BizRoleSet() + roles.Add(AyaType.DataListSortFilter, new BizRoleSet() { Change = AuthorizationRoles.BizAdminFull, ReadFullRecord = AuthorizationRoles.All diff --git a/server/AyaNova/biz/DataListSortFilterBiz.cs b/server/AyaNova/biz/DataListSortFilterBiz.cs index c269e783..5d9fc657 100644 --- a/server/AyaNova/biz/DataListSortFilterBiz.cs +++ b/server/AyaNova/biz/DataListSortFilterBiz.cs @@ -13,21 +13,21 @@ namespace AyaNova.Biz { - internal class DataListFilterBiz : BizObject + internal class DataListSortFilterBiz : BizObject { - internal DataListFilterBiz(AyContext dbcontext, long currentUserId, long userLocaleId, AuthorizationRoles UserRoles) + internal DataListSortFilterBiz(AyContext dbcontext, long currentUserId, long userLocaleId, AuthorizationRoles UserRoles) { ct = dbcontext; UserId = currentUserId; UserLocaleId = userLocaleId; CurrentUserRoles = UserRoles; - BizType = AyaType.DataListFilter; + BizType = AyaType.DataListSortFilter; } - internal static DataListFilterBiz GetBiz(AyContext ct, Microsoft.AspNetCore.Http.HttpContext httpContext) + internal static DataListSortFilterBiz GetBiz(AyContext ct, Microsoft.AspNetCore.Http.HttpContext httpContext) { - return new DataListFilterBiz(ct, UserIdFromContext.Id(httpContext.Items), UserLocaleIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); + return new DataListSortFilterBiz(ct, UserIdFromContext.Id(httpContext.Items), UserLocaleIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); } // //Version for internal use diff --git a/server/AyaNova/biz/DataListTemplateBiz.cs b/server/AyaNova/biz/DataListTemplateBiz.cs index da73d136..064fa71e 100644 --- a/server/AyaNova/biz/DataListTemplateBiz.cs +++ b/server/AyaNova/biz/DataListTemplateBiz.cs @@ -21,7 +21,7 @@ namespace AyaNova.Biz UserId = currentUserId; UserLocaleId = userLocaleId; CurrentUserRoles = UserRoles; - BizType = AyaType.DataListFilter; + BizType = AyaType.DataListSortFilter; } internal static DataListTemplateBiz GetBiz(AyContext ct, Microsoft.AspNetCore.Http.HttpContext httpContext) diff --git a/server/AyaNova/util/DbUtil.cs b/server/AyaNova/util/DbUtil.cs index e915bb91..1c58cecc 100644 --- a/server/AyaNova/util/DbUtil.cs +++ b/server/AyaNova/util/DbUtil.cs @@ -288,7 +288,7 @@ namespace AyaNova.Util await EraseTableAsync("afileattachment", conn); await EraseTableAsync("awidget", conn); await EraseTableAsync("aevent", conn); - await EraseTableAsync("adatalistfilter", conn); + await EraseTableAsync("adatalistsortfilter", conn); await EraseTableAsync("adatalisttemplate", conn); await EraseTableAsync("aformcustom", conn); await EraseTableAsync("asearchkey", conn);