From c5c48a3de38cfa23abe7e3d9abb8bc24db1ebf10 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Wed, 23 Dec 2020 16:19:50 +0000
Subject: [PATCH]

---
 server/AyaNova/Controllers/NotifyController.cs | 3 ++-
 server/AyaNova/models/NotifyEvent.cs           | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/server/AyaNova/Controllers/NotifyController.cs b/server/AyaNova/Controllers/NotifyController.cs
index b9c50e71..03bd0fd3 100644
--- a/server/AyaNova/Controllers/NotifyController.cs
+++ b/server/AyaNova/Controllers/NotifyController.cs
@@ -133,13 +133,14 @@ namespace AyaNova.Api.Controllers
                 return BadRequest(new ApiErrorResponse(ModelState));
             }
 
-            var ret = await ct.NotifyEvent.AsNoTracking().Include(z => z.NotifySubscription).Select(z => new
+            var ret = await ct.NotifyEvent.AsNoTracking().Include(z => z.NotifySubscription).Include(z=>z.User).Select(z => new
             {
                 z.Id,
                 z.Created,
                 z.EventDate,
                 DeliverAfter = (z.EventDate + z.NotifySubscription.AgeValue - z.NotifySubscription.AdvanceNotice),
                 z.UserId,
+                user=z.User.Name,
                 z.EventType,
                 z.AyaType,
                 z.Name
diff --git a/server/AyaNova/models/NotifyEvent.cs b/server/AyaNova/models/NotifyEvent.cs
index 3c3e3ce3..1a385a2c 100644
--- a/server/AyaNova/models/NotifyEvent.cs
+++ b/server/AyaNova/models/NotifyEvent.cs
@@ -58,6 +58,7 @@ namespace AyaNova.Models
 
         //linked entity
         public NotifySubscription NotifySubscription { get; set; }
+        public User User { get; set; }
 
     }//eoc