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-01-21 19:38:08 +00:00
parent c897a47059
commit e5a04667aa
4 changed files with 125 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
server/AyaNova/Controllers/UserController.cs
View File

@@ -88,70 +88,70 @@ namespace AyaNova.Api.Controllers
} }
/// <summary> // /// <summary>
/// Get paged list of Users // /// Get paged list of Users
/// // ///
/// Required roles: // /// Required roles:
/// BizAdminFull, BizAdminLimited // /// BizAdminFull, BizAdminLimited
/// // ///
/// </summary> // /// </summary>
/// <returns>Paged collection of Users with paging data</returns> // /// <returns>Paged collection of Users with paging data</returns>
[HttpGet("ListUsers", Name = nameof(ListUsers))]//We MUST have a "Name" defined or we can't get the link for the pagination, non paged urls don't need a name // [HttpGet("ListUsers", Name = nameof(ListUsers))]//We MUST have a "Name" defined or we can't get the link for the pagination, non paged urls don't need a name
public async Task<IActionResult> ListUsers([FromQuery] ListOptions pagingOptions) // public async Task<IActionResult> ListUsers([FromQuery] ListOptions pagingOptions)
{ // {
if (serverState.IsClosed) // if (serverState.IsClosed)
{ // {
return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); // return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason));
} // }
//Instantiate the business object handler // //Instantiate the business object handler
UserBiz biz = UserBiz.GetBiz(ct, HttpContext); // UserBiz biz = UserBiz.GetBiz(ct, HttpContext);
if (!Authorized.HasReadFullRole(HttpContext.Items, biz.BizType)) // if (!Authorized.HasReadFullRole(HttpContext.Items, biz.BizType))
{ // {
return StatusCode(403, new ApiNotAuthorizedResponse()); // return StatusCode(403, new ApiNotAuthorizedResponse());
} // }
if (!ModelState.IsValid) // if (!ModelState.IsValid)
{ // {
return BadRequest(new ApiErrorResponse(ModelState)); // return BadRequest(new ApiErrorResponse(ModelState));
} // }
ApiPagedResponse<System.Object> pr = await biz.GetManyAsync(Url, nameof(ListUsers), pagingOptions); // ApiPagedResponse<System.Object> pr = await biz.GetManyAsync(Url, nameof(ListUsers), pagingOptions);
return Ok(new ApiOkWithPagingResponse<System.Object>(pr)); // return Ok(new ApiOkWithPagingResponse<System.Object>(pr));
} // }
/// <summary> // /// <summary>
/// Get User pick list // /// Get User pick list
/// // ///
/// Required roles: Any // /// Required roles: Any
/// // ///
/// </summary> // /// </summary>
/// <param name="pagingOptions">Paging, filtering and sorting options</param> // /// <param name="pagingOptions">Paging, filtering and sorting options</param>
/// <returns>Paged id/name collection with paging data</returns> // /// <returns>Paged id/name collection with paging data</returns>
[HttpGet("PickList", Name = nameof(UserPickList))] // [HttpGet("PickList", Name = nameof(UserPickList))]
public ActionResult UserPickList([FromQuery] ListOptions pagingOptions) // public ActionResult UserPickList([FromQuery] ListOptions pagingOptions)
{ // {
if (serverState.IsClosed) // if (serverState.IsClosed)
{ // {
return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); // return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason));
} // }
if (!ModelState.IsValid) // if (!ModelState.IsValid)
{ // {
return BadRequest(new ApiErrorResponse(ModelState)); // return BadRequest(new ApiErrorResponse(ModelState));
} // }
//Instantiate the business object handler // //Instantiate the business object handler
UserBiz biz = UserBiz.GetBiz(ct, HttpContext); // UserBiz biz = UserBiz.GetBiz(ct, HttpContext);
ApiPagedResponse<NameIdItem> pr = biz.GetPickList(Url, nameof(UserPickList), pagingOptions); // ApiPagedResponse<NameIdItem> pr = biz.GetPickList(Url, nameof(UserPickList), pagingOptions);
return Ok(new ApiOkWithPagingResponse<NameIdItem>(pr)); // return Ok(new ApiOkWithPagingResponse<NameIdItem>(pr));
} // }
/// <summary> /// <summary>

9
server/AyaNova/biz/PickListFetcher.cs
View File

@@ -38,12 +38,13 @@ namespace AyaNova.Biz
{ {
var TheFilter = ct.DataFilter.FirstOrDefault(x => x.Id == pagingOptions.DataFilterId); var TheFilter = ct.DataFilter.FirstOrDefault(x => x.Id == pagingOptions.DataFilterId);
//BUILD WHERE AND APPEND IT //BUILD WHERE AND APPEND IT
//qCriteria = FilterSqlCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, WidgetBiz.FilterOptions(), userId); //************* COMMENTED OUT FOLLOWING DUE TO NEW DATALIST REFACTOR BREAKING THIS
qCriteria = SqlFilterCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, objectFields, userId); // qCriteria = SqlFilterCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, objectFields, userId);
//BUILD ORDER BY AND APPEND IT //BUILD ORDER BY AND APPEND IT
qSort = SqlFilterOrderByBuilder.DataFilterToSQLOrderBy(TheFilter); //************* COMMENTED OUT FOLLOWING DUE TO NEW DATALIST REFACTOR BREAKING THIS
//qSort = SqlFilterOrderByBuilder.DataFilterToSQLOrderBy(TheFilter);
} }
// else // else
// { // {

126
server/AyaNova/biz/UserBiz.cs
View File

@@ -173,92 +173,92 @@ namespace AyaNova.Biz
// } // }
//get many (paged) // //get many (paged)
internal async Task<ApiPagedResponse<System.Object>> GetManyAsync(IUrlHelper Url, string routeName, ListOptions pagingOptions) // internal async Task<ApiPagedResponse<System.Object>> GetManyAsync(IUrlHelper Url, string routeName, ListOptions pagingOptions)
{ // {
pagingOptions.Offset = pagingOptions.Offset ?? ListOptions.DefaultOffset; // pagingOptions.Offset = pagingOptions.Offset ?? ListOptions.DefaultOffset;
pagingOptions.Limit = pagingOptions.Limit ?? ListOptions.DefaultLimit; // pagingOptions.Limit = pagingOptions.Limit ?? ListOptions.DefaultLimit;
//BUILD THE QUERY // //BUILD THE QUERY
//base query // //base query
var q = "SELECT *, xmin FROM AUSER "; // var q = "SELECT *, xmin FROM AUSER ";
//GET THE FILTER / SORT // //GET THE FILTER / SORT
if (pagingOptions.DataFilterId > 0) // if (pagingOptions.DataFilterId > 0)
{ // {
var TheFilter = await ct.DataFilter.FirstOrDefaultAsync(x => x.Id == pagingOptions.DataFilterId); // var TheFilter = await ct.DataFilter.FirstOrDefaultAsync(x => x.Id == pagingOptions.DataFilterId);
//BUILD WHERE AND APPEND IT // //BUILD WHERE AND APPEND IT
q = q + SqlFilterCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, AyaObjectFieldDefinitions.AyaObjectFields(AyaObjectFieldDefinitions.USER_KEY), UserId); // q = q + SqlFilterCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, AyaObjectFieldDefinitions.AyaObjectFields(AyaObjectFieldDefinitions.USER_KEY), UserId);
//BUILD ORDER BY AND APPEND IT // //BUILD ORDER BY AND APPEND IT
q = q + SqlFilterOrderByBuilder.DataFilterToSQLOrderBy(TheFilter); // q = q + SqlFilterOrderByBuilder.DataFilterToSQLOrderBy(TheFilter);
} // }
// else // // else
// { // // {
// //GET DEFAULT ORDER BY // // //GET DEFAULT ORDER BY
// q = q + SqlFilterOrderByBuilder.DefaultGetManyOrderBy; // // q = q + SqlFilterOrderByBuilder.DefaultGetManyOrderBy;
// } // // }
#pragma warning disable EF1000 // #pragma warning disable EF1000
// var items = await ct.User // // var items = await ct.User
// .AsNoTracking() // // .AsNoTracking()
// .FromSql(q) // // .FromSql(q)
// .Skip(pagingOptions.Offset.Value) // // .Skip(pagingOptions.Offset.Value)
// .Take(pagingOptions.Limit.Value) // // .Take(pagingOptions.Limit.Value)
// .ToArrayAsync(); // // .ToArrayAsync();
var items = await ct.User // var items = await ct.User
.FromSqlRaw(q) // .FromSqlRaw(q)
.AsNoTracking() // .AsNoTracking()
.Skip(pagingOptions.Offset.Value) // .Skip(pagingOptions.Offset.Value)
.Take(pagingOptions.Limit.Value) // .Take(pagingOptions.Limit.Value)
.ToArrayAsync(); // .ToArrayAsync();
// var totalRecordCount = await ct.User // // var totalRecordCount = await ct.User
// .AsNoTracking() // // .AsNoTracking()
// .FromSql(q) // // .FromSql(q)
// .CountAsync(); // // .CountAsync();
var totalRecordCount = await ct.User.FromSqlRaw(q) // var totalRecordCount = await ct.User.FromSqlRaw(q)
.AsNoTracking() // .AsNoTracking()
.CountAsync(); // .CountAsync();
#pragma warning restore EF1000 // #pragma warning restore EF1000
int itemCount = items.Count();//totalRecordCount doesn't skip and take so not usable here // int itemCount = items.Count();//totalRecordCount doesn't skip and take so not usable here
var cleanedItems = new System.Object[itemCount]; // var cleanedItems = new System.Object[itemCount];
for (int i = 0; i < itemCount; i++) // for (int i = 0; i < itemCount; i++)
{ // {
cleanedItems[i] = CleanUserForReturn(items[i]); // cleanedItems[i] = CleanUserForReturn(items[i]);
} // }
var pageLinks = new PaginationLinkBuilder(Url, routeName, null, pagingOptions, totalRecordCount).PagingLinksObject(); // var pageLinks = new PaginationLinkBuilder(Url, routeName, null, pagingOptions, totalRecordCount).PagingLinksObject();
ApiPagedResponse<System.Object> pr = new ApiPagedResponse<System.Object>(cleanedItems, pageLinks); // ApiPagedResponse<System.Object> pr = new ApiPagedResponse<System.Object>(cleanedItems, pageLinks);
return pr; // return pr;
} // }
//get picklist (paged) // //get picklist (paged)
internal ApiPagedResponse<NameIdItem> GetPickList(IUrlHelper Url, string routeName, ListOptions pagingOptions) // internal ApiPagedResponse<NameIdItem> GetPickList(IUrlHelper Url, string routeName, ListOptions pagingOptions)
{ // {
pagingOptions.Offset = pagingOptions.Offset ?? ListOptions.DefaultOffset; // pagingOptions.Offset = pagingOptions.Offset ?? ListOptions.DefaultOffset;
pagingOptions.Limit = pagingOptions.Limit ?? ListOptions.DefaultLimit; // pagingOptions.Limit = pagingOptions.Limit ?? ListOptions.DefaultLimit;
var ret = PickListFetcher.GetPickList(ct, UserId, pagingOptions, AyaObjectFieldDefinitions.AyaObjectFields(AyaObjectFieldDefinitions.USER_KEY), "auser"); // var ret = PickListFetcher.GetPickList(ct, UserId, pagingOptions, AyaObjectFieldDefinitions.AyaObjectFields(AyaObjectFieldDefinitions.USER_KEY), "auser");
var pageLinks = new PaginationLinkBuilder(Url, routeName, null, pagingOptions, ret.TotalRecordCount).PagingLinksObject(); // var pageLinks = new PaginationLinkBuilder(Url, routeName, null, pagingOptions, ret.TotalRecordCount).PagingLinksObject();
ApiPagedResponse<NameIdItem> pr = new ApiPagedResponse<NameIdItem>(ret.Items, pageLinks); // ApiPagedResponse<NameIdItem> pr = new ApiPagedResponse<NameIdItem>(ret.Items, pageLinks);
return pr; // return pr;
} // }
//////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////

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

@@ -439,22 +439,16 @@ namespace AyaNova.Biz
} }
//BUILD THE QUERY //BUILD THE QUERY
/* //SELECT FRAGMENT COLUMNS FROM TEMPLATE
Select awidget.id, awidget.name, auser.name, auser.id, auseroptions.emailaddress //TODO: Make this a function called from DataList
from awidget
left outer join auser on (awidget.userid=auser.id)
left outer join auseroptions on (auser.id=auseroptions.userid)
order by auseroptions.emailaddress desc
*/
//SELECT FRAGMENT COLUMNS FROM TEMPLATE
//"select clm,clm,clm"
var qSelectColumns = DataListSqlSelectBuilder.Build(DataList.FieldDefinitions, MOCK_WIDGET_USER_EMAIL_DISPLAY_TEMPLATE_JSON, listOptions.Mini); var qSelectColumns = DataListSqlSelectBuilder.Build(DataList.FieldDefinitions, MOCK_WIDGET_USER_EMAIL_DISPLAY_TEMPLATE_JSON, listOptions.Mini);
//FROM CLAUSE //FROM CLAUSE
//this is where the full SQL statement needs to be made with JOINS etc //this is where the full SQL statement needs to be made with JOINS etc
//TODO: Can this be moved away into the objectfields or new object //TODO: Can this be moved away into the objectfields or new object
var qFrom = "from awidget left outer join auser on (awidget.userid=auser.id) left outer join auseroptions on (auser.id=auseroptions.userid)"; //var qFrom = "from awidget left outer join auser on (awidget.userid=auser.id) left outer join auseroptions on (auser.id=auseroptions.userid)";
var qFrom=DataList.SQLFrom;
//FILTERED? //FILTERED?
DataFilter TheFilter = null; DataFilter TheFilter = null;