From 9f72d08c00db0f3878799453e0659246aad2aae5 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Tue, 28 Aug 2018 17:34:54 +0000
Subject: [PATCH]

---
 .../AyaNova/Controllers/EventLogController.cs |  2 +-
 server/AyaNova/biz/EventLogProcessor.cs       | 32 +++++++++++++++++--
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/server/AyaNova/Controllers/EventLogController.cs b/server/AyaNova/Controllers/EventLogController.cs
index 7624265f..fab9f960 100644
--- a/server/AyaNova/Controllers/EventLogController.cs
+++ b/server/AyaNova/Controllers/EventLogController.cs
@@ -140,7 +140,7 @@ namespace AyaNova.Api.Controllers
         {
             //DateTime, ObjectType, ObjectId, Event, Textra       
             public DateTime Date { get; set; }
-            public AyaType Type { get; set; }
+            public AyaType ObjectType { get; set; }
             public long ObjectId { get; set; }
             public AyaEvent Event { get; set; }
             public string Textra { get; set; }
diff --git a/server/AyaNova/biz/EventLogProcessor.cs b/server/AyaNova/biz/EventLogProcessor.cs
index 8d1b6629..1e2858c4 100644
--- a/server/AyaNova/biz/EventLogProcessor.cs
+++ b/server/AyaNova/biz/EventLogProcessor.cs
@@ -54,7 +54,6 @@ namespace AyaNova.Biz
             //Set up the query
             var q = ct.Event.Select(m => m);
 
-
             q = q.Where(m => m.AyId == opt.AyId);
 
             if (opt.StartDate != null)
@@ -84,9 +83,36 @@ namespace AyaNova.Biz
 
 
 
-        internal static Task<string> GetLogForUser(AyaNova.Api.Controllers.EventLogController.EventLogOptions opt, AyContext ct)
+        internal static async Task<AyaNova.Api.Controllers.EventLogController.UserEventLogItem[]> GetLogForUser(AyaNova.Api.Controllers.EventLogController.EventLogOptions opt, AyContext ct)
         {
-            throw new NotImplementedException();
+            //Set up the query
+            var q = ct.Event.Select(m => m);
+
+            q = q.Where(m => m.OwnerId == opt.AyId);
+
+            if (opt.StartDate != null)
+                q = q.Where(m => m.Created > opt.StartDate);
+
+            if (opt.EndDate != null)
+                q = q.Where(m => m.Created < opt.EndDate);
+
+            q = q.OrderBy(m => m.Created);
+
+            //Execute the query
+            var EventItems = await q.ToArrayAsync();
+
+            //convert the Event array to the correct return type array 
+            //DateTime, ObjectType, ObjectId, Event, Textra    
+            var ret = EventItems.Select(m => new AyaNova.Api.Controllers.EventLogController.UserEventLogItem()
+            {
+                Date = m.Created,
+                ObjectType=m.AyType,
+                ObjectId= m.AyId,
+                Event = m.AyEvent,
+                Textra = m.Textra
+            }).ToArray();
+
+            return ret;
         }