From bc148b54bb300021777f53e843327917770bbbb5 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Wed, 3 Feb 2021 18:26:57 +0000
Subject: [PATCH]

---
 server/AyaNova/biz/DataListSavedFilterBiz.cs  | 19 ++++---------------
 .../AyaNova/models/dto/NameIdDefaultItem.cs   |  4 ++++
 2 files changed, 8 insertions(+), 15 deletions(-)
 create mode 100644 server/AyaNova/models/dto/NameIdDefaultItem.cs

diff --git a/server/AyaNova/biz/DataListSavedFilterBiz.cs b/server/AyaNova/biz/DataListSavedFilterBiz.cs
index eea5b20f..2c3d49b6 100644
--- a/server/AyaNova/biz/DataListSavedFilterBiz.cs
+++ b/server/AyaNova/biz/DataListSavedFilterBiz.cs
@@ -130,26 +130,15 @@ namespace AyaNova.Biz
 
 
 
-        //get ViewList (NOT PAGED)
-        internal async Task<List<NameIdItem>> GetViewListAsync(string listKey)
+        //GET FILTERLIST 
+        internal async Task<List<NameIdDefaultItem>> GetViewListAsync(string listKey)
         {
             await EnsureDefaultAsync(listKey);
-            List<NameIdItem> items = new List<NameIdItem>();
-
-            //First ensure there is a default
-
-            items = await ct.DataListSavedFilter
+           return await ct.DataListSavedFilter
                             .AsNoTracking()
                             .Where(z => z.ListKey == listKey && (z.Public == true || z.UserId == UserId))
                             .OrderBy(z => z.Name)
-                             .Select(z => new NameIdItem()
-                             {
-                                 Id = z.Id,
-                                 Name = z.Name
-                             }).ToListAsync();
-
-
-            return items;
+                             .Select(z => new NameIdDefaultItem(z.Id, z.Name, z.DefaultFilter)).ToListAsync();
         }
 
 
diff --git a/server/AyaNova/models/dto/NameIdDefaultItem.cs b/server/AyaNova/models/dto/NameIdDefaultItem.cs
new file mode 100644
index 00000000..d51c7170
--- /dev/null
+++ b/server/AyaNova/models/dto/NameIdDefaultItem.cs
@@ -0,0 +1,4 @@
+namespace AyaNova.Models
+{
+    public record NameIdDefaultItem(long Id, string Name, bool Default);
+}