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
2021-01-27 19:41:21 +00:00
parent 04966f7358
commit ef0b4e9663
4 changed files with 160 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -242,12 +242,12 @@ namespace AyaNova.DataList
//
//
//internal static async Task<long[]> GetIdListResponseAsync(string dataListKey, string listView, string metaListView, AyContext ct, AuthorizationRoles userRoles, ILogger log, long userId)
internal static async Task<long[]> GetIdListResponseAsync(AyContext ct, DataListSelectionOptions dataListSelectionOptions, AuthorizationRoles userRoles, ILogger log, long userId)
internal static async Task<long[]> GetIdListResponseAsync(AyContext ct, DataListSelectionOptions dataListSelectionOptions, AuthorizationRoles userRoles, ILogger log, long userId)
{
var DataList = DataListFactory.GetAyaDataList(dataListKey);
var DataList = DataListFactory.GetAyaDataList(dataListSelectionOptions.DataListKey);
//was the name not found as a list?
if (DataList == null)
throw new System.ArgumentOutOfRangeException($"DataList \"{dataListKey}\" specified does not exist");
throw new System.ArgumentOutOfRangeException($"DataList \"{dataListSelectionOptions.DataListKey}\" specified does not exist");
@@ -255,34 +255,42 @@ namespace AyaNova.DataList
if (!userRoles.HasAnyFlags(DataList.AllowedRoles))
throw new System.UnauthorizedAccessException("User roles insufficient for this datalist");
//do we need to default the listView?
if (string.IsNullOrWhiteSpace(listView))
listView = DataList.DefaultListView;
// //do we need to default the listView?
// if (string.IsNullOrWhiteSpace(listView))
// listView = DataList.DefaultListView;
//parse the list view
var ListViewArray = JArray.Parse(listView);
DataList.SetListOptionDefaultsIfNecessary(dataListSelectionOptions);
// //parse the list view
// var ListViewArray = JArray.Parse(listView);
//Hard coded extra criteria from server end
// //Hard coded extra criteria from server end
// if (DataList is IAyaDataListServerCriteria)
// {
// var ServerCriteriaListView = JArray.Parse(((IAyaDataListServerCriteria)DataList).DataListServerCriteria(await ct.User.AsNoTracking().FirstOrDefaultAsync(z => z.Id == userId), ct));
// foreach (JToken jt in ServerCriteriaListView)
// ListViewArray.Add(jt);
// }
//STATIC filter options from server
List<DataListFilterOption> StaticServerFilterOptions = null;
if (DataList is IAyaDataListServerCriteria)
{
var ServerCriteriaListView = JArray.Parse(((IAyaDataListServerCriteria)DataList).DataListServerCriteria(await ct.User.AsNoTracking().FirstOrDefaultAsync(z => z.Id == userId), ct));
foreach (JToken jt in ServerCriteriaListView)
ListViewArray.Add(jt);
}
StaticServerFilterOptions = ((IAyaDataListServerCriteria)DataList).DataListServerCriteria(userId, userRoles, dataListSelectionOptions);
//Hard coded extra criteria from Client end
//parse and combine any additional listview hard coded from Client UI
var MetaListViewArray = JArray.Parse(metaListView ?? "[]");
foreach (JToken jt in MetaListViewArray)
ListViewArray.Add(jt);
//Get the field key names in a list from the listview
List<string> ListViewFieldList = DataList.GetFieldListFromListView(ListViewArray);
// //Hard coded extra criteria from Client end
// //parse and combine any additional listview hard coded from Client UI
// var MetaListViewArray = JArray.Parse(metaListView ?? "[]");
// foreach (JToken jt in MetaListViewArray)
// ListViewArray.Add(jt);
// //Get the field key names in a list from the listview
// List<string> ListViewFieldList = DataList.GetFieldListFromListView(ListViewArray);
//BUILD THE QUERY
//SELECT FRAGMENT COLUMNS FROM TEMPLATE
var SelectBuild = DataListSqlSelectBuilder.BuildForReportIdListOnly(DataList.FieldDefinitions, ListViewFieldList);
var SelectBuild = DataListSqlSelectBuilder.BuildForReportIdListOnly(DataList.FieldDefinitions);
//FROM CLAUSE
var qFrom = DataList.SQLFrom;
@@ -291,10 +299,10 @@ namespace AyaNova.DataList
var qOrderBy = string.Empty;
//WHERE CLAUSE - FILTER
qWhere = DataListSqlFilterCriteriaBuilder.DataFilterToSQLCriteria(DataList.FieldDefinitions, ListViewArray);
qWhere = DataListSqlFilterCriteriaBuilder.DataFilterToSQLCriteria(DataList.FieldDefinitions, dataListSelectionOptions);
//ORDER BY CLAUSE - SORT
qOrderBy = DataListSqlFilterOrderByBuilder.DataFilterToSQLOrderBy(DataList.FieldDefinitions, ListViewArray);
qOrderBy = DataListSqlFilterOrderByBuilder.DataFilterToSQLOrderBy(DataList.FieldDefinitions, dataListSelectionOptions);
//PUT IT ALL TOGETHER
string qDataQuery = string.Empty;
@@ -306,16 +314,19 @@ namespace AyaNova.DataList
//GET ID COLUMN ORDINAL
int IDColumnOrdinal = 0;
foreach (string TemplateField in ListViewFieldList)
{
//get the AyaObjectFieldDefinition
AyaDataListFieldDefinition f = DataList.FieldDefinitions.FirstOrDefault(z => z.FieldKey == TemplateField);
if (f.IsRowId)
{
IDColumnOrdinal = SelectBuild.map[f.SqlIdColumnName];
break;
}
}
//NOTE: assuming change of code means id column is *always* the zeroth column
// foreach (string TemplateField in ListViewFieldList)
// {
// //get the AyaObjectFieldDefinition
// AyaDataListFieldDefinition f = DataList.FieldDefinitions.FirstOrDefault(z => z.FieldKey == TemplateField);
// if (f.IsRowId)
// {
// IDColumnOrdinal = SelectBuild.map[f.SqlIdColumnName];
// break;
// }
// }
using (var command = ct.Database.GetDbConnection().CreateCommand())
{