admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2020-02-12 18:07:14 +00:00
parent e531a913f8
commit e4c2b3cec8
11 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
server/AyaNova/Controllers/DataListFilterController.cs → server/AyaNova/Controllers/DataListSortFilterController.cs
View File

@@ -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<DataListFilterController> log;
private readonly ILogger<DataListSortFilterController> log;
private readonly ApiServerState serverState;
@@ -37,7 +37,7 @@ namespace AyaNova.Api.Controllers
/// <param name="dbcontext"></param>
/// <param name="logger"></param>
/// <param name="apiServerState"></param>
public DataListFilterController(AyContext dbcontext, ILogger<DataListFilterController> logger, ApiServerState apiServerState)
public DataListSortFilterController(AyContext dbcontext, ILogger<DataListSortFilterController> logger, ApiServerState apiServerState)
{
ct = dbcontext;
log = logger;
@@ -46,18 +46,18 @@ namespace AyaNova.Api.Controllers
/// <summary>
/// Get full DataFilter object
/// Get full DataListSortFilter object
/// </summary>
/// <param name="id"></param>
/// <returns>A single DataFilter</returns>
[HttpGet("{id}")]
public async Task<IActionResult> GetDataFilter([FromRoute] long id)
public async Task<IActionResult> 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
/// <summary>
/// Get DataFilter pick list
/// Get DataListSortFilter pick list
/// </summary>
/// <returns>List of public or owned data filters for listKey provided</returns>
[HttpGet("PickList", Name = nameof(DataFilterPickList))]
public async Task<IActionResult> DataFilterPickList([FromQuery] string ListKey)
[HttpGet("PickList", Name = nameof(DataListSortFilterPickList))]
public async Task<IActionResult> 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
/// <summary>
/// Put (update) DataFilter
/// Put (update) DataListSortFilter
/// </summary>
/// <param name="id"></param>
/// <param name="inObj"></param>
/// <returns></returns>
[HttpPut("{id}")]
public async Task<IActionResult> PutDataFilter([FromRoute] long id, [FromBody] DataListSortFilter inObj)
public async Task<IActionResult> 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
/// <summary>
/// Post DataFilter
/// Post DataListSortFilter
/// </summary>
/// <param name="inObj"></param>
/// <param name="apiVersion">Automatically filled from route path, no need to specify in body</param>
/// <returns></returns>
[HttpPost]
public async Task<IActionResult> PostDataFilter([FromBody] DataListSortFilter inObj, ApiVersion apiVersion)
public async Task<IActionResult> 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));
}
/// <summary>
/// Delete DataFilter
/// Delete DataListSortFilter
/// </summary>
/// <param name="id"></param>
/// <returns>Ok</returns>
[HttpDelete("{id}")]
public async Task<IActionResult> DeleteDataFilter([FromRoute] long id)
public async Task<IActionResult> 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)

2
server/AyaNova/Program.cs
View File

@@ -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);

2
server/AyaNova/Startup.cs
View File

@@ -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;

2
server/AyaNova/biz/AyaType.cs
View File

@@ -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

2
server/AyaNova/biz/BizObjectExistsInDatabase.cs
View File

@@ -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);

4
server/AyaNova/biz/BizObjectFactory.cs
View File

@@ -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:

4
server/AyaNova/biz/BizObjectNameFetcherDirect.cs
View File

@@ -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";

2
server/AyaNova/biz/BizRoles.cs
View File

@@ -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

10
server/AyaNova/biz/DataListSortFilterBiz.cs
View File

@@ -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

2
server/AyaNova/biz/DataListTemplateBiz.cs
View File

@@ -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)

2
server/AyaNova/util/DbUtil.cs
View File

@@ -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);