From 1f3b124d4ef9e1a68e72d36350c6e5eda69c50a7 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 21 Jan 2020 18:21:54 +0000 Subject: [PATCH] --- .../DataListSqlFilterCriteriaBuilder.cs} | 8 ++++---- server/AyaNova/biz/WidgetBiz.cs | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) rename server/AyaNova/{biz/SqlFilterCriteriaBuilder.cs => DataList/DataListSqlFilterCriteriaBuilder.cs} (99%) diff --git a/server/AyaNova/biz/SqlFilterCriteriaBuilder.cs b/server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs similarity index 99% rename from server/AyaNova/biz/SqlFilterCriteriaBuilder.cs rename to server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs index 03689051..4bebc56f 100644 --- a/server/AyaNova/biz/SqlFilterCriteriaBuilder.cs +++ b/server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs @@ -5,13 +5,13 @@ using System.Text; using Newtonsoft.Json.Linq; using System.Linq; using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.Logging; +using AyaNova.Biz; -namespace AyaNova.Biz +namespace AyaNova.DataList { - public static class SqlFilterCriteriaBuilder + public static class DataListSqlFilterCriteriaBuilder { - public static string DataFilterToSQLCriteria(AyaNova.Models.DataFilter dataFilter, List objectFields, long userId) + public static string DataFilterToSQLCriteria(AyaNova.Models.DataFilter dataFilter, List objectFields, long userId) { if (string.IsNullOrWhiteSpace(dataFilter.Filter)) diff --git a/server/AyaNova/biz/WidgetBiz.cs b/server/AyaNova/biz/WidgetBiz.cs index 028c3531..8358eb4e 100644 --- a/server/AyaNova/biz/WidgetBiz.cs +++ b/server/AyaNova/biz/WidgetBiz.cs @@ -419,7 +419,7 @@ namespace AyaNova.Biz // var AyaObjectFields = AyaObjectFieldDefinitions.AyaObjectFields(AyaObjectFieldDefinitions.TEST_WIDGET_USER_EMAIL_ADDRESS_LIST_KEY); var DataList=DataListFactory.GetAyaDataList(nameof(TestWidgetUserEmailDataList)); - + //TODO: PUt this in the template biz class ultimately and modify sqlselectbuilder to use it @@ -449,7 +449,7 @@ namespace AyaNova.Biz */ //SELECT FRAGMENT COLUMNS FROM TEMPLATE //"select clm,clm,clm" - var qSelectColumns = SqlSelectBuilder.Build(AyaObjectFields, 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 //this is where the full SQL statement needs to be made with JOINS etc @@ -464,7 +464,7 @@ namespace AyaNova.Biz { TheFilter = await ct.DataFilter.FirstOrDefaultAsync(x => x.Id == listOptions.DataFilterId); //WHERE CLAUSE - FILTER - qWhere = SqlFilterCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, AyaObjectFields, UserId); + qWhere = DataListSqlFilterCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, DataList.FieldDefinitions, UserId); //ORDER BY CLAUSE - SORT //BUILD ORDER BY AND APPEND IT qOrderBy = SqlFilterOrderByBuilder.DataFilterToSQLOrderBy(TheFilter); @@ -519,7 +519,7 @@ namespace AyaNova.Biz foreach (string TemplateField in templateFieldList) { //get the AyaObjectFieldDefinition - AyaObjectFieldDefinition f = AyaObjectFields.FirstOrDefault(x => x.FieldKey == TemplateField); + AyaDataListFieldDefinition f = DataList.FieldDefinitions.FirstOrDefault(x => x.FieldKey == TemplateField); AyaFieldData AyaField = new AyaFieldData(); AyaField.v = dr.GetValue(nCurrentColumnPointer); @@ -558,7 +558,7 @@ namespace AyaNova.Biz } else { - ColumnsJSON = AyaObjectFieldDefinitions.GenerateListColumnsJSONFromTemplate(AyaType.Widget, AyaObjectFields, MOCK_WIDGET_USER_EMAIL_DISPLAY_TEMPLATE_JSON); + ColumnsJSON = AyaObjectFieldDefinitions.GenerateListColumnsJSONFromTemplate(AyaType.Widget, DataList.FieldDefinitions, MOCK_WIDGET_USER_EMAIL_DISPLAY_TEMPLATE_JSON); }