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(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? //was the name not found as a list?
if (DataList == null) 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)) 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");
//do we need to default the listView? // //do we need to default the listView?
if (string.IsNullOrWhiteSpace(listView)) // if (string.IsNullOrWhiteSpace(listView))
listView = DataList.DefaultListView; // listView = DataList.DefaultListView;
//parse the list view DataList.SetListOptionDefaultsIfNecessary(dataListSelectionOptions);
var ListViewArray = JArray.Parse(listView);
// //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) if (DataList is IAyaDataListServerCriteria)
{ StaticServerFilterOptions = ((IAyaDataListServerCriteria)DataList).DataListServerCriteria(userId, userRoles, dataListSelectionOptions);
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);
}
//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 // //Hard coded extra criteria from Client end
List<string> ListViewFieldList = DataList.GetFieldListFromListView(ListViewArray); // //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 //BUILD THE QUERY
//SELECT FRAGMENT COLUMNS FROM TEMPLATE //SELECT FRAGMENT COLUMNS FROM TEMPLATE
var SelectBuild = DataListSqlSelectBuilder.BuildForReportIdListOnly(DataList.FieldDefinitions, ListViewFieldList); var SelectBuild = DataListSqlSelectBuilder.BuildForReportIdListOnly(DataList.FieldDefinitions);
//FROM CLAUSE //FROM CLAUSE
var qFrom = DataList.SQLFrom; var qFrom = DataList.SQLFrom;
@@ -291,10 +299,10 @@ namespace AyaNova.DataList
var qOrderBy = string.Empty; var qOrderBy = string.Empty;
//WHERE CLAUSE - FILTER //WHERE CLAUSE - FILTER
qWhere = DataListSqlFilterCriteriaBuilder.DataFilterToSQLCriteria(DataList.FieldDefinitions, ListViewArray); qWhere = DataListSqlFilterCriteriaBuilder.DataFilterToSQLCriteria(DataList.FieldDefinitions, dataListSelectionOptions);
//ORDER BY CLAUSE - SORT //ORDER BY CLAUSE - SORT
qOrderBy = DataListSqlFilterOrderByBuilder.DataFilterToSQLOrderBy(DataList.FieldDefinitions, ListViewArray); qOrderBy = DataListSqlFilterOrderByBuilder.DataFilterToSQLOrderBy(DataList.FieldDefinitions, dataListSelectionOptions);
//PUT IT ALL TOGETHER //PUT IT ALL TOGETHER
string qDataQuery = string.Empty; string qDataQuery = string.Empty;
@@ -306,16 +314,19 @@ namespace AyaNova.DataList
//GET ID COLUMN ORDINAL //GET ID COLUMN ORDINAL
int IDColumnOrdinal = 0; int IDColumnOrdinal = 0;
foreach (string TemplateField in ListViewFieldList)
{ //NOTE: assuming change of code means id column is *always* the zeroth column
//get the AyaObjectFieldDefinition
AyaDataListFieldDefinition f = DataList.FieldDefinitions.FirstOrDefault(z => z.FieldKey == TemplateField); // foreach (string TemplateField in ListViewFieldList)
if (f.IsRowId) // {
{ // //get the AyaObjectFieldDefinition
IDColumnOrdinal = SelectBuild.map[f.SqlIdColumnName]; // AyaDataListFieldDefinition f = DataList.FieldDefinitions.FirstOrDefault(z => z.FieldKey == TemplateField);
break; // if (f.IsRowId)
} // {
} // IDColumnOrdinal = SelectBuild.map[f.SqlIdColumnName];
// break;
// }
// }
using (var command = ct.Database.GetDbConnection().CreateCommand()) using (var command = ct.Database.GetDbConnection().CreateCommand())
{ {

2
server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs
View File

@@ -11,7 +11,7 @@ namespace AyaNova.DataList
{ {
public static class DataListSqlFilterCriteriaBuilder public static class DataListSqlFilterCriteriaBuilder
{ {
public static string DataFilterToSQLCriteria(List<AyaDataListFieldDefinition> objectFieldsList, DataListTableOptions listOptions) public static string DataFilterToSQLCriteria(List<AyaDataListFieldDefinition> objectFieldsList, DataListBase listOptions)
{ {
if (listOptions.Filter == null || listOptions.Filter.Count == 0) if (listOptions.Filter == null || listOptions.Filter.Count == 0)

2
server/AyaNova/DataList/DataListSqlFilterOrderByBuilder.cs
View File

@@ -10,7 +10,7 @@ namespace AyaNova.DataList
{ {
public static string DataFilterToSQLOrderBy(List<AyaDataListFieldDefinition> objectFieldsList, DataListTableOptions listOptions) public static string DataFilterToSQLOrderBy(List<AyaDataListFieldDefinition> objectFieldsList, DataListBase listOptions)
{ {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();

200
server/AyaNova/DataList/DataListSqlSelectBuilder.cs
View File

@@ -108,106 +108,132 @@ namespace AyaNova.DataList
} }
} }
return new SqlSelectBuilderResult() { map = map, Select = sb.ToString() }; return new SqlSelectBuilderResult() { map = map, Select = sb.ToString() };
}//eof }//eom
//Build the SELECT portion of a list query but only to return rowid's //Build the SELECT portion of a list query but only to return rowid's
internal static SqlSelectBuilderResult BuildForReportIdListOnly(List<AyaDataListFieldDefinition> objectFieldsList, List<string> listViewFieldList) internal static SqlSelectBuilderResult BuildForReportIdListOnly(List<AyaDataListFieldDefinition> objectFieldsList)
{ {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.Append("SELECT "); sb.Append("SELECT ");
//map sql column name to ordinal name //map sql column name to ordinal name
Dictionary<string, int> map = new Dictionary<string, int>(); Dictionary<string, int> map = new Dictionary<string, int>();
int nOrdinal = 0;
var firstColumnAdded = false; //find the rowid in the objectfields list and insert it
foreach (string ColumnName in listViewFieldList) var o = objectFieldsList.FirstOrDefault(z => z.IsRowId == true);
if (o != null)
{ {
AyaDataListFieldDefinition o = objectFieldsList.FirstOrDefault(z => z.FieldKey == ColumnName); var idColumnName = o.SqlIdColumnName;
#if (DEBUG) if (!string.IsNullOrWhiteSpace(idColumnName))
//Developers little helper
if (o == null)
{ {
throw new System.ArgumentNullException($"DEV ERROR in DataListSqlSelectBuilder.cs:BuildForReportIdListOnly() field {ColumnName} specified in template was NOT found in ObjectFields list");
}
#endif
if (o != null && o.IsRowId)//only return the rowid column
{//Ignore missing fields in production
AddTheColumn(sb, map, ref nOrdinal, ref firstColumnAdded, o);
}
}
//insert rowid if it wasn't specified already in the list view
//this is legit as some datalists don't have a rowid visible to user e.g. PartInventoryOnHand
if (map.Count == 0)
{
//find the rowid in the objectfields list and insert it since it wasn't in the view already
var o = objectFieldsList.FirstOrDefault(z => z.IsRowId == true);
if (o != null)
{
// if(!string.IsNullOrWhiteSpace(rowIdColumn.SqlIdColumnName)){
// map.Add(rowIdColumn.SqlIdColumnName, nOrdinal++);
// }else{
// map.Add(rowIdColumn.GetSqlValueColumnName(), nOrdinal++);
// }
AddTheColumn(sb, map, ref nOrdinal, ref firstColumnAdded, o);
}
}
return new SqlSelectBuilderResult() { map = map, Select = sb.ToString() };
}//eof
private static void AddTheColumn(StringBuilder sb, Dictionary<string, int> map, ref int nOrdinal, ref bool firstColumnAdded, AyaDataListFieldDefinition o)
{
// var valueColumnName = o.GetSqlValueColumnName();
// if (!map.ContainsKey(valueColumnName))
// {
// if (firstColumnAdded)
// sb.Append(", ");
// sb.Append(valueColumnName);
// firstColumnAdded = true;
// map.Add(valueColumnName, nOrdinal++);
// }
// //does it also have an ID column?
// var idColumnName = o.SqlIdColumnName;
// if (!string.IsNullOrWhiteSpace(idColumnName))
// {
// if (!map.ContainsKey(idColumnName))
// {
// if (firstColumnAdded)
// sb.Append(", ");
// sb.Append(idColumnName);
// firstColumnAdded = true;
// map.Add(idColumnName, nOrdinal++);
// }
// }
// var valueColumnName = o.GetSqlValueColumnName();
// if (!map.ContainsKey(valueColumnName))
// {
// if (firstColumnAdded)
// sb.Append(", ");
// sb.Append(valueColumnName);
// firstColumnAdded = true;
// map.Add(valueColumnName, nOrdinal++);
// }
//does it also have an ID column?
var idColumnName = o.SqlIdColumnName;
if (!string.IsNullOrWhiteSpace(idColumnName))
{
// if (!map.ContainsKey(idColumnName))
// {
// if (firstColumnAdded)
// sb.Append(", ");
sb.Append(idColumnName); sb.Append(idColumnName);
// firstColumnAdded = true;
map.Add(idColumnName, 0); map.Add(idColumnName, 0);
// } }
} }
}
return new SqlSelectBuilderResult() { map = map, Select = sb.ToString() };
}//eom
// //Build the SELECT portion of a list query but only to return rowid's
// internal static SqlSelectBuilderResult BuildForReportIdListOnly(List<AyaDataListFieldDefinition> objectFieldsList, List<string> listViewFieldList)
// {
// StringBuilder sb = new StringBuilder();
// sb.Append("SELECT ");
// //map sql column name to ordinal name
// Dictionary<string, int> map = new Dictionary<string, int>();
// int nOrdinal = 0;
// var firstColumnAdded = false;
// foreach (string ColumnName in listViewFieldList)
// {
// AyaDataListFieldDefinition o = objectFieldsList.FirstOrDefault(z => z.FieldKey == ColumnName);
// #if (DEBUG)
// //Developers little helper
// if (o == null)
// {
// throw new System.ArgumentNullException($"DEV ERROR in DataListSqlSelectBuilder.cs:BuildForReportIdListOnly() field {ColumnName} specified in template was NOT found in ObjectFields list");
// }
// #endif
// if (o != null && o.IsRowId)//only return the rowid column
// {//Ignore missing fields in production
// AddTheColumn(sb, map, ref nOrdinal, ref firstColumnAdded, o);
// }
// }
// //insert rowid if it wasn't specified already in the list view
// //this is legit as some datalists don't have a rowid visible to user e.g. PartInventoryOnHand
// if (map.Count == 0)
// {
// //find the rowid in the objectfields list and insert it since it wasn't in the view already
// var o = objectFieldsList.FirstOrDefault(z => z.IsRowId == true);
// if (o != null)
// {
// // if(!string.IsNullOrWhiteSpace(rowIdColumn.SqlIdColumnName)){
// // map.Add(rowIdColumn.SqlIdColumnName, nOrdinal++);
// // }else{
// // map.Add(rowIdColumn.GetSqlValueColumnName(), nOrdinal++);
// // }
// AddTheColumn(sb, map, ref nOrdinal, ref firstColumnAdded, o);
// }
// }
// return new SqlSelectBuilderResult() { map = map, Select = sb.ToString() };
// }//eof
// private static void AddTheColumn(StringBuilder sb, Dictionary<string, int> map, ref int nOrdinal, ref bool firstColumnAdded, AyaDataListFieldDefinition o)
// {
// // var valueColumnName = o.GetSqlValueColumnName();
// // if (!map.ContainsKey(valueColumnName))
// // {
// // if (firstColumnAdded)
// // sb.Append(", ");
// // sb.Append(valueColumnName);
// // firstColumnAdded = true;
// // map.Add(valueColumnName, nOrdinal++);
// // }
// // //does it also have an ID column?
// // var idColumnName = o.SqlIdColumnName;
// // if (!string.IsNullOrWhiteSpace(idColumnName))
// // {
// // if (!map.ContainsKey(idColumnName))
// // {
// // if (firstColumnAdded)
// // sb.Append(", ");
// // sb.Append(idColumnName);
// // firstColumnAdded = true;
// // map.Add(idColumnName, nOrdinal++);
// // }
// // }
// // var valueColumnName = o.GetSqlValueColumnName();
// // if (!map.ContainsKey(valueColumnName))
// // {
// // if (firstColumnAdded)
// // sb.Append(", ");
// // sb.Append(valueColumnName);
// // firstColumnAdded = true;
// // map.Add(valueColumnName, nOrdinal++);
// // }
// //does it also have an ID column?
// var idColumnName = o.SqlIdColumnName;
// if (!string.IsNullOrWhiteSpace(idColumnName))
// {
// // if (!map.ContainsKey(idColumnName))
// // {
// // if (firstColumnAdded)
// // sb.Append(", ");
// sb.Append(idColumnName);
// // firstColumnAdded = true;
// map.Add(idColumnName, 0);
// // }
// }
// }
}//eoc }//eoc
}//ens }//ens