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-03-12 22:36:20 +00:00
parent e0b5ea0dc3
commit 883e10fcd7
10 changed files with 239 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/AyaNova/Controllers/AttachmentController.cs
View File

@@ -175,7 +175,7 @@ namespace AyaNova.Api.Controllers
//Is it an attachable type of object? //Is it an attachable type of object?
if (!badRequest) if (!badRequest)
{ {
if (!attachToObject.IsAttachable) if (!attachToObject.IsCoreBizObject)
{ {
badRequest = true; badRequest = true;
errorMessage = attachToObject.ObjectType.ToString() + " - AttachToObjectType does not support attachments"; errorMessage = attachToObject.ObjectType.ToString() + " - AttachToObjectType does not support attachments";

2
server/AyaNova/Controllers/EnumPickListController.cs
View File

@@ -83,7 +83,7 @@ namespace AyaNova.Api.Controllers
string name = t.ToString(); string name = t.ToString();
if (t.HasAttribute(typeof(CoreBizObjectAttribute))) if (t.HasAttribute(typeof(CoreBizObjectAttribute)))
{ {
name += " [Attachable]"; name += " [CoreBizObject]";
} }
ReturnList.Add(new NameIdItem() { Name = name, Id = (long)t }); ReturnList.Add(new NameIdItem() { Name = name, Id = (long)t });
} }

12
server/AyaNova/PickList/AyaPickList.cs
View File

@@ -24,17 +24,17 @@ namespace AyaNova.PickList
public AuthorizationRoles AllowedRoles { get; set; } public AuthorizationRoles AllowedRoles { get; set; }
public AyaType DefaultListObjectType { get; set; } public AyaType DefaultListObjectType { get; set; }
public string DefaultListView { get; set; } public string DefaultTemplate { get; set; }
//return array of field keys in list view //return array of field keys in list view
public List<string> GetFieldListFromListView(JArray listViewArray) public List<string> GetFieldListFromTemplate(JArray template)
{ {
// [{key:"COLUMN UNIQUE KEY ID",sort:"-" or "+",filter:{any:true/false,items:[{FILTER OBJECT SEE BELOW}]} }, {key:"second column unique key"},{...etc...}] // [{key:"COLUMN UNIQUE KEY ID",sort:"-" or "+",filter:{any:true/false,items:[{FILTER OBJECT SEE BELOW}]} }, {key:"second column unique key"},{...etc...}]
List<string> ret = new List<string>(); List<string> ret = new List<string>();
for (int i = 0; i < listViewArray.Count; i++) for (int i = 0; i < template.Count; i++)
{ {
var cm = listViewArray[i]; var cm = template[i];
ret.Add(cm["fld"].Value<string>()); ret.Add(cm["fld"].Value<string>());
} }
return ret; return ret;
@@ -42,10 +42,10 @@ namespace AyaNova.PickList
public Newtonsoft.Json.Linq.JArray GenerateListColumnsJSONFromListView(JArray listViewArray) public Newtonsoft.Json.Linq.JArray GenerateListColumnsJSONFromTemplate(JArray template)
{ {
var ListViewFieldKeys = GetFieldListFromListView(listViewArray); var ListViewFieldKeys = GetFieldListFromTemplate(template);
var CustomFieldDefinitions = GetCustomFieldDefinitionsForList(); var CustomFieldDefinitions = GetCustomFieldDefinitionsForList();
//Generate JSON fragment to return with column definitions //Generate JSON fragment to return with column definitions

6
server/AyaNova/PickList/IAyaPickList.cs
View File

@@ -19,10 +19,10 @@ namespace AyaNova.PickList
AyaType DefaultListObjectType { get; set; } AyaType DefaultListObjectType { get; set; }
//Default / STOCK DataListView when none is specified //Default / STOCK DataListView when none is specified
string DefaultListView { get; set; } string DefaultTemplate { get; set; }
Newtonsoft.Json.Linq.JArray GenerateListColumnsJSONFromListView(JArray listViewArray); Newtonsoft.Json.Linq.JArray GenerateListColumnsJSONFromTemplate(JArray listViewArray);
List<string> GetFieldListFromListView(JArray listViewArray); List<string> GetFieldListFromTemplate(JArray listViewArray);
} }

18
server/AyaNova/PickList/PickListFactory.cs
View File

@@ -1,6 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using AyaNova.Biz; using AyaNova.Biz;
using AyaNova.Models;
namespace AyaNova.PickList namespace AyaNova.PickList
@@ -19,20 +20,19 @@ namespace AyaNova.PickList
return null; return null;
} }
//List all the datalist types available //List all the PickList-able object types available
internal static List<string> GetListOfAllPickListKeyNames() internal static List<NameIdItem> GetListOfAllPickListKeyNames()
{ {
//https://stackoverflow.com/a/42574373/8939
List<string> ret = new List<string>(); List<NameIdItem> ret = new List<NameIdItem>();
System.Reflection.Assembly ass = System.Reflection.Assembly.GetEntryAssembly(); var values = System.Enum.GetValues(typeof(AyaType));
foreach (AyaType t in values)
foreach (System.Reflection.TypeInfo ti in ass.DefinedTypes)
{ {
if (!ti.IsAbstract && ti.ImplementedInterfaces.Contains(typeof(IAyaPickList))) if (t.HasAttribute(typeof(CoreBizObjectAttribute)))
{ {
ret.Add(ti.Name); ret.Add(new NameIdItem() { Name = t.ToString(), Id = (long)t });
} }
} }
return ret; return ret;
} }

186
server/AyaNova/PickList/PickListFetcher.cs
View File

@@ -9,12 +9,13 @@ using System.Threading.Tasks;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using EnumsNET; using EnumsNET;
namespace AyaNova.PickList namespace AyaNova.PickList
{ {
internal static class PickListFetcher internal static class PickListFetcher
{ {
internal static async Task<ApiPickListResponse> GetResponseAsync(AyaType ayaType, string query, AuthorizationRoles userRoles) internal static async Task<List<NameIdActiveItem>> GetResponseAsync(AyaType ayaType, string query, AyContext ct, AuthorizationRoles userRoles)
//string PickListKey, AyContext ct, ListOptions listOptions, long UserId, AuthorizationRoles UserRoles)
{ {
var PickList = PickListFactory.GetAyaPickList(ayaType); var PickList = PickListFactory.GetAyaPickList(ayaType);
@@ -22,60 +23,43 @@ namespace AyaNova.PickList
//was the name not found as a list? //was the name not found as a list?
if (PickList == null) if (PickList == null)
{ {
throw new System.ArgumentOutOfRangeException($"PickList \"{PickListKey}\" specified does not exist"); throw new System.ArgumentOutOfRangeException($"PickList for type \"{ayaType}\" specified does not exist");
} }
//check rights //check rights
if (!UserRoles.HasAnyFlags(PickList.AllowedRoles)) if (!userRoles.HasAnyFlags(PickList.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? //Template
if (string.IsNullOrWhiteSpace(listOptions.ListView)) string Template = null;
//Attempt to fetch custom template
var t = await ct.PickListTemplate.FirstOrDefaultAsync(m => m.Id == ((long)ayaType));
if (t == null)
{ {
listOptions.ListView = PickList.DefaultListView; Template = PickList.DefaultTemplate;
}
else
{
Template = t.Template;
} }
//parse the list view //parse the list view
var ListViewArray = JArray.Parse(listOptions.ListView); var ListViewArray = JArray.Parse(Template);
//Get the field key names in a list from the listview //Get the field key names in a list from the listview
List<string> ListViewFieldList = PickList.GetFieldListFromListView(ListViewArray); List<string> ListViewFieldList = PickList.GetFieldListFromTemplate(ListViewArray);
//BUILD THE QUERY //BUILD THE QUERY
//SELECT FRAGMENT COLUMNS FROM TEMPLATE
var SelectBuild = PickListSqlSelectBuilder.Build(PickList.FieldDefinitions, ListViewFieldList);
//FROM CLAUSE var q = PickListSqlBuilder.Build(PickList.FieldDefinitions, ListViewFieldList);
var qFrom = PickList.SQLFrom;
var qWhere = string.Empty;
var qOrderBy = string.Empty;
//WHERE CLAUSE - FILTER
qWhere = PickListSqlFilterCriteriaBuilder.DataFilterToSQLCriteria(PickList.FieldDefinitions, ListViewArray, UserId);
//ORDER BY CLAUSE - SORT
//BUILD ORDER BY
qOrderBy = PickListSqlFilterOrderByBuilder.DataFilterToSQLOrderBy(PickList.FieldDefinitions, ListViewArray);
//LIMIT AND OFFSET CLAUSE - PAGING
listOptions.Offset = listOptions.Offset ?? ListOptions.DefaultOffset;
listOptions.Limit = listOptions.Limit ?? ListOptions.DefaultLimit;
var qLimitOffset = $"LIMIT {listOptions.Limit} OFFSET {listOptions.Offset}";
//PUT IT ALL TOGETHER
string qDataQuery = string.Empty;
string qTotalRecordsQuery = string.Empty;
qDataQuery = $"{SelectBuild.Select} {qFrom} {qWhere} {qOrderBy} {qLimitOffset}".Replace(" ", " ");
qTotalRecordsQuery = $"SELECT COUNT(*) {qFrom} {qWhere}".Replace(" ", " ");
//RETURN OBJECTS //RETURN OBJECTS
int returnRowColumnCount = ListViewFieldList.Count(); var ret=new List<NameIdActiveItem>();
List<List<AyaFieldData>> rows = new List<List<AyaFieldData>>();
long totalRecordCount = 0;
//QUERY THE DB //QUERY THE DB
using (var command = ct.Database.GetDbConnection().CreateCommand()) using (var command = ct.Database.GetDbConnection().CreateCommand())
@@ -83,99 +67,85 @@ namespace AyaNova.PickList
await ct.Database.OpenConnectionAsync(); await ct.Database.OpenConnectionAsync();
//GET DATA RETURN ROWS //GET DATA RETURN ROWS
command.CommandText = qDataQuery; command.CommandText = q;
using (var dr = await command.ExecuteReaderAsync()) using (var dr = await command.ExecuteReaderAsync())
{ {
while (dr.Read()) while (dr.Read())
{ {
List<AyaFieldData> row = new List<AyaFieldData>(returnRowColumnCount); // List<AyaFieldData> row = new List<AyaFieldData>(returnRowColumnCount);
//INSERT REMAINING FIELDS FROM TEMPLATE INTO THE RETURN ROWS LIST // //INSERT REMAINING FIELDS FROM TEMPLATE INTO THE RETURN ROWS LIST
foreach (string TemplateField in ListViewFieldList) // foreach (string TemplateField in ListViewFieldList)
{ // {
//get the AyaObjectFieldDefinition // //get the AyaObjectFieldDefinition
AyaPickListFieldDefinition f = PickList.FieldDefinitions.FirstOrDefault(x => x.FieldKey == TemplateField); // AyaPickListFieldDefinition f = PickList.FieldDefinitions.FirstOrDefault(x => x.FieldKey == TemplateField);
if (f.IsCustomField) // if (f.IsCustomField)
{ // {
AyaFieldData AyaField = new AyaFieldData(); // AyaFieldData AyaField = new AyaFieldData();
var cust = dr.GetString(SelectBuild.map[f.GetSqlValueColumnName()]); // var cust = dr.GetString(SelectBuild.map[f.GetSqlValueColumnName()]);
if (!string.IsNullOrWhiteSpace(cust)) // if (!string.IsNullOrWhiteSpace(cust))
{ // {
JObject j = JObject.Parse(cust); // JObject j = JObject.Parse(cust);
//convert field name to cust name then get value // //convert field name to cust name then get value
var InternalCustomFieldName = AyaFormFieldDefinitions.TranslateLTCustomFieldToInternalCustomFieldName(TemplateField); // var InternalCustomFieldName = AyaFormFieldDefinitions.TranslateLTCustomFieldToInternalCustomFieldName(TemplateField);
//Sometimes a custom field is specified but doesn't exist in the collection so don't assume it's there // //Sometimes a custom field is specified but doesn't exist in the collection so don't assume it's there
// AyaField.v = j[InternalCustomFieldName].Value<object>(); // // AyaField.v = j[InternalCustomFieldName].Value<object>();
JToken o = j[InternalCustomFieldName]; // JToken o = j[InternalCustomFieldName];
if (o != null) // if (o != null)
AyaField.v = o.Value<object>(); // AyaField.v = o.Value<object>();
else // else
AyaField.v = null; // AyaField.v = null;
row.Add(AyaField); // row.Add(AyaField);
} // }
/* // /*
TODO: Custom field handling // TODO: Custom field handling
GetName works just not with multipart identifiers // GetName works just not with multipart identifiers
I could force naming by making all fields and AS, or // I could force naming by making all fields and AS, or
I could map the ordinal when generating the Select fields so that I have a map to refer to here // I could map the ordinal when generating the Select fields so that I have a map to refer to here
mapping in advance actually makes a lot of sense, then no more of this fragility of going by pointer index and hoping for the best // mapping in advance actually makes a lot of sense, then no more of this fragility of going by pointer index and hoping for the best
it would just be premapped out. // it would just be premapped out.
dr.GetOrdinal(f.SqlValueColumnName) // dr.GetOrdinal(f.SqlValueColumnName)
'dr.GetOrdinal(f.SqlValueColumnName)' threw an exception of type 'System.IndexOutOfRangeException' // 'dr.GetOrdinal(f.SqlValueColumnName)' threw an exception of type 'System.IndexOutOfRangeException'
f.SqlValueColumnName // f.SqlValueColumnName
"awidget.customfields" // "awidget.customfields"
dr.GetName(nCurrentColumnPointer) // dr.GetName(nCurrentColumnPointer)
"customfields" // "customfields"
dr.GetOrdinal("customfields"); // dr.GetOrdinal("customfields");
5 // 5
*/ // */
} // }
else // else
{ // {
AyaFieldData AyaField = new AyaFieldData(); // AyaFieldData AyaField = new AyaFieldData();
AyaField.v = dr.GetValue(SelectBuild.map[f.GetSqlValueColumnName()]); // AyaField.v = dr.GetValue(SelectBuild.map[f.GetSqlValueColumnName()]);
if (f.SqlIdColumnName != null) // if (f.SqlIdColumnName != null)
{ // {
var ordinal = SelectBuild.map[f.SqlIdColumnName]; // var ordinal = SelectBuild.map[f.SqlIdColumnName];
if (!await dr.IsDBNullAsync(ordinal)) // if (!await dr.IsDBNullAsync(ordinal))
AyaField.i = dr.GetInt64(ordinal); // AyaField.i = dr.GetInt64(ordinal);
} // }
row.Add(AyaField); // row.Add(AyaField);
} // }
} // }
rows.Add(row); // rows.Add(row);
} }
} }
//GET TOTAL RECORD COUNT
command.CommandText = qTotalRecordsQuery;
using (var dr = await command.ExecuteReaderAsync())
{
if (dr.Read())
{
totalRecordCount = dr.GetInt64(0);
}
}
} }
//BUILD THE COLUMNS RETURN PROPERTY JSON FRAGMENT return ret;
Newtonsoft.Json.Linq.JArray ColumnsJSON = null;
ColumnsJSON = PickList.GenerateListColumnsJSONFromListView(ListViewArray);
return new ApiPickListResponse(rows, totalRecordCount, ColumnsJSON);
} }

127
server/AyaNova/PickList/PickListSqlBuilder.cs Normal file
View File

@@ -0,0 +1,127 @@
using System.Collections.Generic;
using System;
using System.Globalization;
using System.Text;
using Newtonsoft.Json.Linq;
using System.Linq;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
namespace AyaNova.PickList
{
internal static class PickListSqlBuilder
{
//Build the SELECT portion of a list query based on the ListView fields
internal static string Build(List<AyaPickListFieldDefinition> objectFieldsList, List<string> listViewFieldList)
{
throw new System.NotImplementedException();
// StringBuilder sb = new StringBuilder();
// sb.Append("SELECT ");
// //DEPRECATED
// // //Default ID column for each row (always is aliased as df)
// // AyaPickListFieldDefinition def = objectFieldsList.FirstOrDefault(x => x.FieldKey == "df");
// // if (def == null)
// // {
// // throw new System.ArgumentNullException("PickListSqlSelectBuilder: objectFieldList is missing the df default field");
// // }
// // if (string.IsNullOrEmpty(def.SqlIdColumnName))
// // {
// // sb.Append("id");//default when no alternate column is specified
// // }
// // else
// // {
// // sb.Append(def.SqlIdColumnName);
// // }
// // sb.Append(" AS df");
// //keep track of which custom fields columns were added already
// //this ensures that if there is more than one set of custom fields like from two different objects in the list
// //only unique ones will be returned by query
// // Dictionary<string, int> CustomFieldColumnsAddedToQuery = new Dictionary<string, int>();
// //map sql column name to ordinal name
// Dictionary<string, int> map = new Dictionary<string, int>();
// //DEPRECATED map.Add("df", 0);
// int nOrdinal = 0;
// var firstColumnAdded = false;
// foreach (string ColumnName in listViewFieldList)
// {
// // //skip the df column, it's already been processed above
// // if (ColumnName == "df")
// // continue;
// AyaPickListFieldDefinition o = objectFieldsList.FirstOrDefault(x => x.FieldKey == ColumnName);
// #if (DEBUG)
// //Developers little helper
// if (o == null)
// {
// throw new System.ArgumentNullException($"DEV ERROR in PickListSqlSelectBuilder.cs: field {ColumnName} specified in template was NOT found in ObjectFields list");
// }
// #endif
// if (o != null)
// {//Ignore missing fields in production
// if (o.IsCustomField)
// { //if any are custom field then add custom fields column to query
// var CustomFieldSqlColumnName = o.GetSqlValueColumnName();
// //has it been added yet?
// if (!map.ContainsKey(CustomFieldSqlColumnName))
// { //nope
// if (firstColumnAdded)
// sb.Append(", ");
// sb.Append(CustomFieldSqlColumnName);
// firstColumnAdded = true;
// map.Add(CustomFieldSqlColumnName, nOrdinal++);
// }
// //if it was already added then can just ignore it
// // else
// // {
// // map.Add(ColumnName, CustomFieldColumnsAddedToQuery[CustomFieldSqlColumnName]);
// // }
// }
// else
// {
// 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++);
// }
// }
// }
// }
// }
// // return new SqlSelectBuilderResult() { map = map, Select = sb.ToString() };
}
}//eoc
}//ens

2
server/AyaNova/PickList/WidgetPickList.cs
View File

@@ -43,7 +43,7 @@ namespace AyaNova.PickList
cm.fld = "username"; cm.fld = "username";
dlistView.Add(cm); dlistView.Add(cm);
DefaultListView = dlistView.ToString(Newtonsoft.Json.Formatting.None); DefaultTemplate = dlistView.ToString(Newtonsoft.Json.Formatting.None);

4
server/AyaNova/biz/AyaTypeId.cs
View File

@@ -88,10 +88,10 @@ namespace AyaNova.Biz
//Custom attribute checking //Custom attribute checking
/// <summary> /// <summary>
/// Is object attachable /// Is object a core biz object
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public bool IsAttachable public bool IsCoreBizObject
{ {
get get
{ {

8
server/AyaNova/biz/PickListBiz.cs
View File

@@ -56,11 +56,11 @@ namespace AyaNova.Biz
//get picklist //get picklist
internal async Task<List<NameIdItem>> GetPickListAsync(AyaType ayaType, string query, AuthorizationRoles userRoles) internal async Task<List<NameIdActiveItem>> GetPickListAsync(AyaType ayaType, string query, AuthorizationRoles userRoles)
{ {
throw new System.NotImplementedException();
// List<NameIdItem> items = await PickListFetcher.GetResponseAsync(ayaType, query, ct, UserId, userRoles); List<NameIdActiveItem> items = await PickListFetcher.GetResponseAsync(ayaType, query, ct, userRoles);
// return items; return items;
} }