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-13 22:23:20 +00:00
parent e855a7cf88
commit 144e92dabe
1 changed files with 15 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
server/AyaNova/DataList/DataListFetcher.cs
View File

@@ -16,8 +16,9 @@ namespace AyaNova.DataList
internal static async Task<ApiDataListResponse> GetResponseAsync(string DataListKey, AyContext ct, ListOptions listOptions, long UserId, AuthorizationRoles UserRoles) internal static async Task<ApiDataListResponse> GetResponseAsync(string DataListKey, AyContext ct, ListOptions listOptions, long UserId, AuthorizationRoles UserRoles)
{ {
var DataList = DataListFactory.GetAyaDataList(DataListKey); var DataList = DataListFactory.GetAyaDataList(DataListKey);
//was the name not found as a list? //was the name not found as a list?
if (DataList == null) if (DataList == null)
{ {
@@ -29,60 +30,30 @@ namespace AyaNova.DataList
if (!UserRoles.HasAnyFlags(DataList.AllowedRoles)) if (!UserRoles.HasAnyFlags(DataList.AllowedRoles))
throw new System.UnauthorizedAccessException("User roles insufficient for this datalist"); throw new System.UnauthorizedAccessException("User roles insufficient for this datalist");
//parse the list view //parse the list view
//TODO: do I need to try /catch here? Or will an exception properly bubble back to the controller
var ListViewArray = JArray.Parse(listOptions.ListView); var ListViewArray = JArray.Parse(listOptions.ListView);
string[] templateFieldList = DataList.GetFieldListFromListView(ListViewArray);
//PARSE THE TEMPLATE INTO A STRING ARRAY
//SO WE KNOW WHICH FIELDS TO RETURN FROM QUERY
// var jtemplate = JObject.Parse(JSONDataListTemplate);
// //convert to strings array (https://stackoverflow.com/a/33836599/8939)
// string[] templateFieldList;
// if (listOptions.Mini != null && listOptions.Mini == true)
// {
// templateFieldList = ((JArray)jtemplate["mini"]).ToObject<string[]>();
// }
// else
// {
// templateFieldList = ((JArray)jtemplate["full"]).ToObject<string[]>();
// }
string[] templateFieldList = DataList.GetFieldListFromListView(listOptions.ListView);
//BUILD THE QUERY //BUILD THE QUERY
//SELECT FRAGMENT COLUMNS FROM TEMPLATE //SELECT FRAGMENT COLUMNS FROM TEMPLATE
var qSelectColumns = DataListSqlSelectBuilder.Build(DataList.FieldDefinitions, listOptions.ListView); var qSelectColumns = DataListSqlSelectBuilder.Build(DataList.FieldDefinitions, ListViewArray);
//FROM CLAUSE //FROM CLAUSE
var qFrom = DataList.SQLFrom; var qFrom = DataList.SQLFrom;
//FILTERED?
bool HasFilter = !string.IsNullOrWhiteSpace(listOptions.FilterJson);
bool HasSort = !string.IsNullOrWhiteSpace(listOptions.SortJson);
var qWhere = string.Empty; var qWhere = string.Empty;
var qOrderBy = string.Empty; var qOrderBy = string.Empty;
if (HasFilter)
{ //WHERE CLAUSE - FILTER
//WHERE CLAUSE - FILTER qWhere = DataListSqlFilterCriteriaBuilder.DataFilterToSQLCriteria(DataList.FieldDefinitions, ListViewArray, UserId);
qWhere = DataListSqlFilterCriteriaBuilder.DataFilterToSQLCriteria(DataList.FieldDefinitions, listOptions.FilterJson, UserId);
} //ORDER BY CLAUSE - SORT
if (HasSort) //BUILD ORDER BY
{ qOrderBy = DataListSqlFilterOrderByBuilder.DataFilterToSQLOrderBy(DataList.FieldDefinitions, ListViewArray);
//ORDER BY CLAUSE - SORT
//BUILD ORDER BY
qOrderBy = DataListSqlFilterOrderByBuilder.DataFilterToSQLOrderBy(DataList.FieldDefinitions, listOptions.SortJson);
}
else
{
//BUILD DEFAULT ORDER BY IF POSSIBLE
qOrderBy = DataListSqlFilterOrderByBuilder.DataFilterToSQLOrderBy(DataList.FieldDefinitions, null);
}
//LIMIT AND OFFSET CLAUSE - PAGING //LIMIT AND OFFSET CLAUSE - PAGING
listOptions.Offset = listOptions.Offset ?? ListOptions.DefaultOffset; listOptions.Offset = listOptions.Offset ?? ListOptions.DefaultOffset;
@@ -92,18 +63,9 @@ namespace AyaNova.DataList
//PUT IT ALL TOGETHER //PUT IT ALL TOGETHER
string qDataQuery = string.Empty; string qDataQuery = string.Empty;
string qTotalRecordsQuery = string.Empty; string qTotalRecordsQuery = string.Empty;
if (HasFilter)
{
qDataQuery = $"{qSelectColumns} {qFrom} {qWhere} {qOrderBy} {qLimitOffset}";
qTotalRecordsQuery = $"SELECT COUNT(*) {qFrom} {qWhere}";
}
else
{
qDataQuery = $"{qSelectColumns} {qFrom} {qOrderBy} {qLimitOffset}";
qTotalRecordsQuery = $"SELECT COUNT(*) {qFrom}";
}
qDataQuery = $"{qSelectColumns} {qFrom} {qWhere} {qOrderBy} {qLimitOffset}".Replace(" ", " ");
qTotalRecordsQuery = $"SELECT COUNT(*) {qFrom} {qWhere}".Replace(" ", " ");
//RETURN OBJECTS //RETURN OBJECTS
int returnRowColumnCount = templateFieldList.Count() + 1;//Templates don't have the DF column in them but we need it and it's in the query so plus one int returnRowColumnCount = templateFieldList.Count() + 1;//Templates don't have the DF column in them but we need it and it's in the query so plus one
@@ -177,9 +139,7 @@ namespace AyaNova.DataList
//BUILD THE COLUMNS RETURN PROPERTY JSON FRAGMENT //BUILD THE COLUMNS RETURN PROPERTY JSON FRAGMENT
Newtonsoft.Json.Linq.JArray ColumnsJSON = null; Newtonsoft.Json.Linq.JArray ColumnsJSON = null;
ColumnsJSON = DataList.GenerateListColumnsJSONFromListView(JSONDataListTemplate); ColumnsJSON = DataList.GenerateListColumnsJSONFromListView(ListViewArray);
return new ApiDataListResponse(rows, totalRecordCount, ColumnsJSON); return new ApiDataListResponse(rows, totalRecordCount, ColumnsJSON);