From fc757674a97ebb13bc9472ee90897c7e732ceb94 Mon Sep 17 00:00:00 2001
From: Abdullah Atta <abdullahatta@streetwriters.co>
Date: Sat, 9 Sep 2023 20:23:16 +0500
Subject: [PATCH] sync: improve announcements & monograph query performance

---
 Notesnook.API/Controllers/AnnouncementController.cs | 6 ++----
 Notesnook.API/Controllers/MonographsController.cs   | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Notesnook.API/Controllers/AnnouncementController.cs b/Notesnook.API/Controllers/AnnouncementController.cs
index c117818..29b6c60 100644
--- a/Notesnook.API/Controllers/AnnouncementController.cs
+++ b/Notesnook.API/Controllers/AnnouncementController.cs
@@ -42,10 +42,8 @@ namespace Notesnook.API.Controllers
         [AllowAnonymous]
         public async Task<IActionResult> GetActiveAnnouncements([FromQuery] string userId)
         {
-            var announcements = await Announcements.FindAsync((a) => a.IsActive);
-            return Ok(announcements.Where((a) => a.UserIds != null && a.UserIds.Length > 0
-                                                    ? a.UserIds.Contains(userId)
-                                                    : true));
+            var announcements = await Announcements.FindAsync((a) => a.IsActive && (a.UserIds == null || a.UserIds.Length == 0 || a.UserIds.Contains(userId)));
+            return Ok(announcements);
         }
     }
 }
diff --git a/Notesnook.API/Controllers/MonographsController.cs b/Notesnook.API/Controllers/MonographsController.cs
index 5d6d425..372288f 100644
--- a/Notesnook.API/Controllers/MonographsController.cs
+++ b/Notesnook.API/Controllers/MonographsController.cs
@@ -104,7 +104,7 @@ namespace Notesnook.API.Controllers
         [AllowAnonymous]
         public async Task<IActionResult> GetMonographAsync([FromRoute] string id)
         {
-            var monograph = await Monographs.FindOneAsync((m) => m.Id == id);
+            var monograph = await Monographs.GetAsync(id);
             if (monograph == null)
             {
                 return NotFound(new