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
2018-12-13 00:17:36 +00:00
parent 4060d8900f
commit a0e8192352
6 changed files with 325 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
server/AyaNova/Controllers/WidgetController.cs
View File

@@ -133,7 +133,37 @@ namespace AyaNova.Api.Controllers
/// <summary>
// /// <summary>
// /// Get widget pick list
// ///
// /// Required roles: Any
// ///
// /// This list supports querying the Name property
// /// include a "q" parameter for string to search for
// /// use % for wildcards.
// ///
// /// e.g. q=%Jones%
// ///
// /// Query is case insensitive
// /// </summary>
// /// <returns>Paged id/name collection of widgets with paging data</returns>
// [HttpGet("PickList", Name = nameof(WidgetPickList))]
// public async Task<IActionResult> WidgetPickList([FromQuery] string q, [FromQuery] PagingOptions pagingOptions)
// {
// if (serverState.IsClosed)
// return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason));
// if (!ModelState.IsValid)
// return BadRequest(new ApiErrorResponse(ModelState));
// //Instantiate the business object handler
// WidgetBiz biz = WidgetBiz.GetBiz(ct, HttpContext);
// ApiPagedResponse<NameIdItem> pr = await biz.GetPickListAsync(Url, nameof(WidgetPickList), pagingOptions, q);
// return Ok(new ApiOkWithPagingResponse<NameIdItem>(pr));
// }
/// <summary>
/// Get widget pick list
///
/// Required roles: Any
@@ -148,7 +178,7 @@ namespace AyaNova.Api.Controllers
/// </summary>
/// <returns>Paged id/name collection of widgets with paging data</returns>
[HttpGet("PickList", Name = nameof(WidgetPickList))]
public async Task<IActionResult> WidgetPickList([FromQuery] string q, [FromQuery] PagingOptions pagingOptions)
public async Task<IActionResult> WidgetPickList([FromQuery] PagingOptions pagingOptions)
{
if (serverState.IsClosed)
return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason));
@@ -159,7 +189,7 @@ namespace AyaNova.Api.Controllers
//Instantiate the business object handler
WidgetBiz biz = WidgetBiz.GetBiz(ct, HttpContext);
ApiPagedResponse<NameIdItem> pr = await biz.GetPickListAsync(Url, nameof(WidgetPickList), pagingOptions, q);
ApiPagedResponse<NameIdItem> pr = await biz.GetPickListAsync(Url, nameof(WidgetPickList), pagingOptions);
return Ok(new ApiOkWithPagingResponse<NameIdItem>(pr));
}

109
server/AyaNova/biz/PickListFetcher.cs Normal file
View File

@@ -0,0 +1,109 @@
using System.Linq;
using System.Threading.Tasks;
using Microsoft.EntityFrameworkCore;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.JsonPatch;
using EnumsNET;
using AyaNova.Util;
using AyaNova.Api.ControllerHelpers;
using AyaNova.Biz;
using AyaNova.Models;
using System.Collections.Generic;
using System.Linq;
namespace AyaNova.Biz
{
internal static class PickListFetcher
{
internal static PickListResult GetPickList(AyContext ct, long userId, PagingOptions pagingOptions, string tableName)
{
List<NameIdItem> listItems = new List<NameIdItem>();
using (var cm = ct.Database.GetDbConnection().CreateCommand())
{
ct.Database.OpenConnection();
//BUILD THE QUERY
//base query
var q = $"SELECT id, name FROM {tableName} ";
//GET THE FILTER / SORT
if (pagingOptions.DataFilterId > 0)
{
var TheFilter = ct.DataFilter.FirstOrDefault(x => x.Id == pagingOptions.DataFilterId);
//BUILD WHERE AND APPEND IT
q = q + FilterSqlCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, WidgetBiz.FilterOptions(), userId);
//BUILD ORDER BY AND APPEND IT
q = q + FilterSqlOrderByBuilder.DataFilterToSQLOrderBy(TheFilter);
}
else
{
//GET DEFAULT ORDER BY
q = q + FilterSqlOrderByBuilder.DefaultOrderBy();
}
cm.CommandText = q;
using (var dr = cm.ExecuteReader())
{
while (dr.Read())
{
listItems.Add(new NameIdItem() { Id = dr.GetInt64(0), Name = dr.GetString(1) });
}
}
}
PickListResult ret = new PickListResult();
ret.Items = listItems.ToArray();
ret.TotalRecordCount = 9999;
return ret;
}
// //Returns existance status of object type and id specified in database
// internal static string Name(AyaType aytype, long id, System.Data.Common.DbCommand cmd)
// {
// string TABLE = string.Empty;
// string COLUMN = "name";
// switch (aytype)
// {
// case AyaType.User:
// TABLE = "auser";
// break;
// case AyaType.Widget:
// TABLE = "awidget";
// break;
// case AyaType.FileAttachment:
// TABLE = "afileattachment";
// COLUMN = "displayfilename";
// break;
// case AyaType.DataFilter:
// TABLE = "adatafilter";
// break;
// default:
// throw new System.NotSupportedException($"AyaNova.BLL.BizObjectNameFetcher::Name type {aytype.ToString()} is not supported");
// }
// cmd.CommandText = $"SELECT m.{COLUMN} FROM {TABLE} AS m WHERE m.id = {id} LIMIT 1";
// using (var dr = cmd.ExecuteReader())
// return dr.Read() ? dr.GetString(0) : "UNKNOWN";
// }
/////////////////////////////////////////////////////////////////////
}//eoc
}//eons

107
server/AyaNova/biz/WidgetBiz.cs
View File

@@ -200,8 +200,6 @@ namespace AyaNova.Biz
.Take(pagingOptions.Limit.Value)
.ToArrayAsync();
// var totalRecordCount = await ct.Widget.CountAsync();
var totalRecordCount = await ct.Widget
.AsNoTracking()
.FromSql(q)
@@ -216,51 +214,88 @@ namespace AyaNova.Biz
//get picklist (paged)
internal async Task<ApiPagedResponse<NameIdItem>> GetPickListAsync(IUrlHelper Url, string routeName, PagingOptions pagingOptions, string q)
internal async Task<ApiPagedResponse<NameIdItem>> GetPickListAsync(IUrlHelper Url, string routeName, PagingOptions pagingOptions)
{
pagingOptions.Offset = pagingOptions.Offset ?? PagingOptions.DefaultOffset;
pagingOptions.Limit = pagingOptions.Limit ?? PagingOptions.DefaultLimit;
NameIdItem[] items;
int totalRecordCount = 0;
// NameIdItem[] items;
// int totalRecordCount = 0;
if (!string.IsNullOrWhiteSpace(q))
{
items = await ct.Widget
.AsNoTracking()
.Where(m => EF.Functions.ILike(m.Name, q))
.OrderBy(m => m.Name)
.Skip(pagingOptions.Offset.Value)
.Take(pagingOptions.Limit.Value)
.Select(m => new NameIdItem()
{
Id = m.Id,
Name = m.Name
}).ToArrayAsync();
// //BUILD THE QUERY
// //base query
// var q = "SELECT id, name FROM AWIDGET ";
totalRecordCount = await ct.Widget.Where(m => EF.Functions.ILike(m.Name, q)).CountAsync();
}
else
{
items = await ct.Widget
.AsNoTracking()
.OrderBy(m => m.Name)
.Skip(pagingOptions.Offset.Value)
.Take(pagingOptions.Limit.Value)
.Select(m => new NameIdItem()
{
Id = m.Id,
Name = m.Name
}).ToArrayAsync();
// //GET THE FILTER / SORT
// if (pagingOptions.DataFilterId > 0)
// {
// var TheFilter = await ct.DataFilter.FirstOrDefaultAsync(x => x.Id == pagingOptions.DataFilterId);
totalRecordCount = await ct.Widget.CountAsync();
}
// //BUILD WHERE AND APPEND IT
// q = q + FilterSqlCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, WidgetBiz.FilterOptions(), UserId);
// //BUILD ORDER BY AND APPEND IT
// q = q + FilterSqlOrderByBuilder.DataFilterToSQLOrderBy(TheFilter);
// }
// else
// {
// //GET DEFAULT ORDER BY
// q = q + FilterSqlOrderByBuilder.DefaultOrderBy();
// }
// #pragma warning disable EF1000
var pageLinks = new PaginationLinkBuilder(Url, routeName, null, pagingOptions, totalRecordCount).PagingLinksObject();
// var items = await ct.Widget
// .AsNoTracking()
// .FromSql(q)
// .Skip(pagingOptions.Offset.Value)
// .Take(pagingOptions.Limit.Value)
// .ToArrayAsync();
ApiPagedResponse<NameIdItem> pr = new ApiPagedResponse<NameIdItem>(items, pageLinks);
// var totalRecordCount = await ct.Widget
// .AsNoTracking()
// .FromSql(q)
// .CountAsync();
// #pragma warning restore EF1000
// if (!string.IsNullOrWhiteSpace(q))
// {
// items = await ct.Widget
// .AsNoTracking()
// .Where(m => EF.Functions.ILike(m.Name, q))
// .OrderBy(m => m.Name)
// .Skip(pagingOptions.Offset.Value)
// .Take(pagingOptions.Limit.Value)
// .Select(m => new NameIdItem()
// {
// Id = m.Id,
// Name = m.Name
// }).ToArrayAsync();
// totalRecordCount = await ct.Widget.Where(m => EF.Functions.ILike(m.Name, q)).CountAsync();
// }
// else
// {
// items = await ct.Widget
// .AsNoTracking()
// .OrderBy(m => m.Name)
// .Skip(pagingOptions.Offset.Value)
// .Take(pagingOptions.Limit.Value)
// .Select(m => new NameIdItem()
// {
// Id = m.Id,
// Name = m.Name
// }).ToArrayAsync();
// totalRecordCount = await ct.Widget.CountAsync();
// }
var ret = PickListFetcher.GetPickList(ct, UserId, pagingOptions, "awidget");
var pageLinks = new PaginationLinkBuilder(Url, routeName, null, pagingOptions, ret.TotalRecordCount).PagingLinksObject();
ApiPagedResponse<NameIdItem> pr = new ApiPagedResponse<NameIdItem>(ret.Items, pageLinks);
return pr;
}

10
server/AyaNova/models/dto/PickListResult.cs Normal file
View File

@@ -0,0 +1,10 @@
namespace AyaNova.Models
{
public partial class PickListResult
{
public int TotalRecordCount { get; set; }
public NameIdItem[] Items { get; set; }
}
}