@7365admin1/core 3.34.1 → 3.34.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/core
 
+## 3.34.3
+
+### Patch Changes
+
+- 195c268: Fix manpower alert email flood: dedupe daily remark creation per site, skip alerts for sites without recipient emails, send one alert per site per alert time, and enforce a configurable daily alert limit (MANPOWER_ALERT_DAILY_LIMIT, default 50)
+
+## 3.34.2
+
+### Patch Changes
+
+- d81eaf1: Add request payload and response logging to the three invite endpoints (`createSimpleUserInvite`, `createSimpleMemberInvite`, `createServiceProviderInvite`) to diagnose reports of invites not sending. Logs at info level on success, and includes the payload alongside the existing error log on failure.
+
 ## 3.34.1
 
 ### Patch Changes

package/dist/index.js

@@ -9208,6 +9208,9 @@ var MAILER_TRANSPORT_SECURE = process.env.MAILER_TRANSPORT_SECURE === "true";
 var MAILER_EMAIL = process.env.MAILER_EMAIL ?? "default@gmail.com";
 var MAILER_PASSWORD = process.env.MAILER_PASSWORD ?? "password";
 var MAILER_FROM_EMAIL = process.env.MAILER_FROM_EMAIL || void 0;
+var MANPOWER_ALERT_DAILY_LIMIT = Number(
+  process.env.MANPOWER_ALERT_DAILY_LIMIT ?? 50
+);
 var ACCESS_TOKEN_SECRET = process.env.ACCESS_TOKEN_SECRET ?? "access_token_secret";
 var REFRESH_TOKEN_SECRET = process.env.REFRESH_TOKEN_SECRET ?? "refresh_token_secret";
 var ACCESS_TOKEN_EXPIRY = process.env.ACCESS_TOKEN_EXPIRY ?? "15s";
@@ -15062,6 +15065,10 @@ function useVerificationController() {
   }
   async function createSimpleUserInvite(req, res, next) {
     const payload = { ...req.body };
+    import_node_server_utils32.logger.log({
+      level: "info",
+      message: `[invite/user] payload: ${JSON.stringify(payload)}`
+    });
     const validation = import_joi16.default.object({
       email: import_joi16.default.string().email().required(),
       app: import_joi16.default.array().items(import_joi16.default.string()).min(1).required(),
@@ -15101,16 +15108,21 @@ function useVerificationController() {
           siteName
         }
       });
-      res.status(201).json({
+      const responseBody = {
         message: "Successfully invited user.",
         totalInvites: verificationIds.length,
         verificationIds
+      };
+      import_node_server_utils32.logger.log({
+        level: "info",
+        message: `[invite/user] response: ${JSON.stringify(responseBody)}`
       });
+      res.status(201).json(responseBody);
       return;
     } catch (error2) {
       import_node_server_utils32.logger.log({
         level: "error",
-        message: `${error2.message}`
+        message: `[invite/user] error for payload ${JSON.stringify(payload)}: ${error2.message}`
       });
       next(error2);
       return;
@@ -15118,6 +15130,10 @@ function useVerificationController() {
   }
   async function createSimpleMemberInvite(req, res, next) {
     const payload = { ...req.body };
+    import_node_server_utils32.logger.log({
+      level: "info",
+      message: `[invite/member] payload: ${JSON.stringify(payload)}`
+    });
     const validation = import_joi16.default.object({
       email: import_joi16.default.string().email().required(),
       app: import_joi16.default.string().optional().allow("", null),
@@ -15155,14 +15171,19 @@ function useVerificationController() {
           siteName
         }
       });
-      res.status(201).json({
+      const responseBody = {
         message: "Successfully invited member."
+      };
+      import_node_server_utils32.logger.log({
+        level: "info",
+        message: `[invite/member] response: ${JSON.stringify(responseBody)}`
       });
+      res.status(201).json(responseBody);
       return;
     } catch (error2) {
       import_node_server_utils32.logger.log({
         level: "error",
-        message: `${error2.message}`
+        message: `[invite/member] error for payload ${JSON.stringify(payload)}: ${error2.message}`
       });
       next(error2);
       return;
@@ -15170,6 +15191,10 @@ function useVerificationController() {
   }
   async function createServiceProviderInvite(req, res, next) {
     const payload = req.body;
+    import_node_server_utils32.logger.log({
+      level: "info",
+      message: `[service-providers/invite] payload: ${JSON.stringify(payload)}`
+    });
     const validation = import_joi16.default.object({
       email: import_joi16.default.string().email().required(),
       orgId: import_joi16.default.string().hex().required(),
@@ -15209,14 +15234,19 @@ function useVerificationController() {
         secure: true,
         maxAge: 4 * 60 * 60 * 1e3
       };
-      res.cookie("service-provider-email", email, cookieOptions).json({
+      const responseBody = {
         message: "Successfully invited service provider."
+      };
+      import_node_server_utils32.logger.log({
+        level: "info",
+        message: `[service-providers/invite] response: ${JSON.stringify(responseBody)}`
       });
+      res.cookie("service-provider-email", email, cookieOptions).json(responseBody);
       return;
     } catch (error2) {
       import_node_server_utils32.logger.log({
         level: "error",
-        message: `controller - ${error2.message}`
+        message: `[service-providers/invite] error for payload ${JSON.stringify(payload)}: ${error2.message}`
       });
       next(error2);
       return;
@@ -63791,7 +63821,16 @@ var createManpowerRemarksDaily = async () => {
       serviceProviderId: servideProvider._id,
       status: "active"
     }).toArray();
+    const existingToday = await remarks.find({ createdAtSGT: nowSGT.format("DD-MM-YYYY") }).project({ siteId: 1 }).toArray();
+    const skipSiteIds = new Set(
+      existingToday.map((doc) => doc.siteId.toString())
+    );
     for (const site of remark) {
+      const siteKey = site.siteId.toString();
+      if (skipSiteIds.has(siteKey)) {
+        continue;
+      }
+      skipSiteIds.add(siteKey);
       const existingRemark = await settings.findOne({
         siteId: site.siteId,
         enabled: true
@@ -63858,7 +63897,7 @@ var createManpowerRemarksDaily = async () => {
       }
     }
     if (items.length > 0) {
-      await remarks.insertMany(items);
+      await remarks.insertMany(items, { ordered: false });
     }
     console.log("Daily manpower remarks created successfully.");
   } catch (error) {
@@ -63922,12 +63961,30 @@ var updateRemarksisAcknowledged = async () => {
       },
       { $set: { "remarks.2.remark.isAcknowledged": false } }
     );
+    const { getCache, setCache } = (0, import_node_server_utils221.useCache)("manpower-alerts");
+    const capKey = `manpower-alert-count:${nowSGT}`;
+    let sentToday = await getCache(capKey) ?? 0;
+    const emailedSites = /* @__PURE__ */ new Set();
     for (const id of updatedIds) {
       const doc = await remarks.findOne({ _id: id });
+      const docSiteKey = doc?.siteId?.toString() ?? "";
+      if (emailedSites.has(docSiteKey)) {
+        continue;
+      }
       const setting = await settings.findOne(
         { siteId: new import_mongodb131.ObjectId(doc?.siteId) },
         { projection: { emails: 1 } }
       );
+      if (!setting?.emails?.length) {
+        continue;
+      }
+      if (sentToday >= MANPOWER_ALERT_DAILY_LIMIT) {
+        import_node_server_utils221.logger.log({
+          level: "warn",
+          message: `Manpower alert daily limit (${MANPOWER_ALERT_DAILY_LIMIT}) reached, skipping remaining alerts for ${nowSGT}`
+        });
+        break;
+      }
       const payload = {
         startDate: doc?.createdAtSGT,
         endDate: doc?.createdAtSGT,
@@ -63968,6 +64025,9 @@ var updateRemarksisAcknowledged = async () => {
         expected,
         status: newStatus
       });
+      emailedSites.add(docSiteKey);
+      sentToday++;
+      await setCache(capKey, sentToday, 86400);
     }
   } catch (error) {
     console.error("Error updating remarks:", error);