From 556ff25ab69b876f1ed5990a8b4b713971f4660b Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Tue, 17 Mar 2020 15:46:29 +0000
Subject: [PATCH]

---
 server/AyaNova/biz/PickListBiz.cs | 42 +++++++++++++++++++------------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/server/AyaNova/biz/PickListBiz.cs b/server/AyaNova/biz/PickListBiz.cs
index d1fecf20..4996c108 100644
--- a/server/AyaNova/biz/PickListBiz.cs
+++ b/server/AyaNova/biz/PickListBiz.cs
@@ -39,18 +39,32 @@ namespace AyaNova.Biz
         ////////////////////////////////////////////////////////////////////////////////////////////////
         /// GET
 
-        // //Get one
-        // internal async Task<DataListView> GetAsync(long fetchId, bool logTheGetEvent = true)
-        // {
-        //     //This is simple so nothing more here, but often will be copying to a different output object or some other ops           
-        //     var ret = await ct.DataListView.SingleOrDefaultAsync(m => m.Id == fetchId && (m.Public == true || m.UserId == UserId));
-        //     if (logTheGetEvent && ret != null)
-        //     {
-        //         //Log
-        //         await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, fetchId, BizType, AyaEvent.Retrieved), ct);
-        //     }
-        //     return ret;
-        // }
+        //Get one
+        internal async Task<PickListTemplate> GetAsync(AyaType ayaType, bool logTheGetEvent = true)
+        {
+            long lTypeId = (long)ayaType;
+
+            //first try to fetch from db
+            var ret = await ct.PickListTemplate.SingleOrDefaultAsync(m => m.Id == lTypeId);
+            if (logTheGetEvent && ret != null)
+            {
+                //Log
+                await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, lTypeId, BizType, AyaEvent.Retrieved), ct);
+            }
+
+            //not in db then get the default
+            if (ret == null)
+            {
+                var PickList = PickListFactory.GetAyaPickList(ayaType);
+                if (PickList != null)
+                {
+                    ret = new PickListTemplate();
+                    ret.Id = lTypeId;
+                    ret.Template = PickList.DefaultTemplate;
+                }
+            }
+            return ret;
+        }
 
 
 
@@ -129,8 +143,6 @@ namespace AyaNova.Biz
         internal List<NameIdItem> GetListOfAllPickListTypes(long translationId)
         {
             return PickListFactory.GetListOfAllPickListTypes(translationId);
-            // List<NameIdItem> items = await PickListFetcher.GetResponseAsync(ayaType, query, ct, UserId, userRoles);         
-            // return items;
         }
 
 
@@ -143,8 +155,6 @@ namespace AyaNova.Biz
         //put
         internal async Task<bool> ReplaceAsync(AyaType ayaType, string template)
         {
-
-
             var o = await ct.PickListTemplate.FirstOrDefaultAsync(m => m.Id == (long)ayaType);
             if (o == null)
             {