@7365admin1/core 3.52.3-staging.244 → 3.52.3-staging.245

package/.changeset/bulletin-board-create-rollback.md

@@ -0,0 +1,16 @@
+---
+"@7365admin1/core": patch
+---
+
+Stop silently discarding a bulletin whose recipients include a service app with no users.
+
+`POST /api/bulletin-boards` inserts the announcement inside a Mongo transaction and then
+notifies each recipient group. The five per-service-app blocks each carried a bare `return;` for
+"this site has no id" and "this app has no registered users". Those returns left the enclosing
+`try` before `commitTransaction()`, so the session was ended with the transaction still open and
+the announcement was rolled back — while the controller still answered `201 Created`. Selecting
+Cleaning, M&E, Pest Control, Landscaping or Pool Maintenance at an estate with no users of that
+app therefore made the announcement vanish with no error anywhere.
+
+The five blocks are now one loop over a recipient-to-app-slug map, and a missing push audience
+skips one notification instead of ending the request. Same apps, same order, same payloads.

package/dist/index.d.ts

@@ -6487,7 +6487,7 @@ declare function useBulletinBoardRepo(): {
 };
 
 declare function useBulletinBoardService(): {
-    add: (value: TBulletinBoard) => Promise<"Successfully added bulletin board." | undefined>;
+    add: (value: TBulletinBoard) => Promise<string>;
     updateBulletinBoardById: (id: string | ObjectId, value: Partial<TBulletinBoard>) => Promise<string>;
     processExpiredBulletinBoards: () => Promise<void>;
     processUpcomingBulletinBoards: () => Promise<void>;

package/dist/index.js

@@ -64576,6 +64576,24 @@ function useBulletinBoardRepo() {
 // src/services/bulletin-board.service.ts
 var import_node_server_utils177 = require("@7365admin1/node-server-utils");
 var import_mongodb112 = require("mongodb");
+
+// src/utils/bulletin-service-apps.util.ts
+var BULLETIN_SERVICE_APPS = [
+  ["mechanical_electrical", "iservice365-m-and-e-mobile-app"],
+  ["pest_control_services", "iservice365-pest-control-mobile-app"],
+  ["pool_maintenance_services", "iservice365-pool-maintenance-mobile-app"],
+  ["landscaping_services", "iservice365-landscaping-mobile-app"],
+  ["cleaning_services", "iservice365-hygiene-mobile-app"]
+];
+function serviceAppsForRecipients(recipients) {
+  if (!Array.isArray(recipients))
+    return [];
+  return BULLETIN_SERVICE_APPS.filter(
+    ([recipient]) => recipients.includes(recipient)
+  ).map(([recipient, appSlug]) => ({ recipient, appSlug }));
+}
+
+// src/services/bulletin-board.service.ts
 function useBulletinBoardService() {
   const {
     add: _add,
@@ -64651,105 +64669,25 @@ function useBulletinBoardService() {
           siteId
         });
       }
-      if (recipients?.find((item) => item === "mechanical_electrical")) {
-        if (!siteId)
-          return;
-        const users2 = await PushTokenRepo.findUserIdsBySiteIdAndAppSlug(
-          siteId.toString(),
-          "iservice365-m-and-e-mobile-app"
-        );
-        if (users2.length <= 0)
-          return;
-        NotificationService.bulletinBoardCreatedForServiceApps(
-          {
-            to: users2,
-            bulletinId: bulletinBoardId,
-            subject: "Bulletin Board",
-            status: bulletinBoardStatus,
-            siteId
-          },
-          "iservice365-m-and-e-mobile-app"
-        );
-      }
-      if (recipients?.find((item) => item === "pest_control_services")) {
-        if (!siteId)
-          return;
-        const users2 = await PushTokenRepo.findUserIdsBySiteIdAndAppSlug(
-          siteId.toString(),
-          "iservice365-pest-control-mobile-app"
-        );
-        if (users2.length <= 0)
-          return;
-        NotificationService.bulletinBoardCreatedForServiceApps(
-          {
-            to: users2,
-            bulletinId: bulletinBoardId,
-            subject: "Bulletin Board",
-            status: bulletinBoardStatus,
-            siteId
-          },
-          "iservice365-pest-control-mobile-app"
-        );
-      }
-      if (recipients?.find((item) => item === "pool_maintenance_services")) {
-        if (!siteId)
-          return;
-        const users2 = await PushTokenRepo.findUserIdsBySiteIdAndAppSlug(
-          siteId.toString(),
-          "iservice365-pool-maintenance-mobile-app"
-        );
-        if (users2.length <= 0)
-          return;
-        NotificationService.bulletinBoardCreatedForServiceApps(
-          {
-            to: users2,
-            bulletinId: bulletinBoardId,
-            subject: "Bulletin Board",
-            status: bulletinBoardStatus,
-            siteId
-          },
-          "iservice365-pool-maintenance-mobile-app"
-        );
-      }
-      if (recipients?.find((item) => item === "landscaping_services")) {
-        if (!siteId)
-          return;
-        const users2 = await PushTokenRepo.findUserIdsBySiteIdAndAppSlug(
-          siteId.toString(),
-          "iservice365-landscaping-mobile-app"
-        );
-        if (users2.length <= 0)
-          return;
-        NotificationService.bulletinBoardCreatedForServiceApps(
-          {
-            to: users2,
-            bulletinId: bulletinBoardId,
-            subject: "Bulletin Board",
-            status: bulletinBoardStatus,
-            siteId
-          },
-          "iservice365-landscaping-mobile-app"
-        );
-      }
-      if (recipients?.find((item) => item === "cleaning_services")) {
-        if (!siteId)
-          return;
-        const users2 = await PushTokenRepo.findUserIdsBySiteIdAndAppSlug(
-          siteId.toString(),
-          "iservice365-hygiene-mobile-app"
-        );
-        if (users2.length <= 0)
-          return;
-        NotificationService.bulletinBoardCreatedForServiceApps(
-          {
-            to: users2,
-            bulletinId: bulletinBoardId,
-            subject: "Bulletin Board",
-            status: bulletinBoardStatus,
-            siteId
-          },
-          "iservice365-hygiene-mobile-app"
-        );
+      if (siteId) {
+        for (const { appSlug } of serviceAppsForRecipients(recipients)) {
+          const appUsers = await PushTokenRepo.findUserIdsBySiteIdAndAppSlug(
+            siteId.toString(),
+            appSlug
+          );
+          if (appUsers.length <= 0)
+            continue;
+          NotificationService.bulletinBoardCreatedForServiceApps(
+            {
+              to: appUsers,
+              bulletinId: bulletinBoardId,
+              subject: "Bulletin Board",
+              status: bulletinBoardStatus,
+              siteId
+            },
+            appSlug
+          );
+        }
       }
       await session?.commitTransaction();
       return "Successfully added bulletin board.";