@plusscommunities/pluss-newsletter-aws 2.0.9-beta.0 → 2.0.9

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-newsletter-aws",
-  "version": "2.0.9-beta.0",
+  "version": "2.0.9",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1506,9 +1506,9 @@
       }
     },
     "@plusscommunities/pluss-core-aws": {
-      "version": "2.0.23-beta.2",
-      "resolved": "https://registry.npmjs.org/@plusscommunities/pluss-core-aws/-/pluss-core-aws-2.0.23-beta.2.tgz",
-      "integrity": "sha512-ZCWDvQirCZ6PDq8j27hgm8rjAwpDZupix5c50709SGHG10Melv4uMHM1o0q4KbYBysBvCHMubWtUhDBtDdakow==",
+      "version": "2.0.23",
+      "resolved": "https://registry.npmjs.org/@plusscommunities/pluss-core-aws/-/pluss-core-aws-2.0.23.tgz",
+      "integrity": "sha512-pqZvjIvhkrMS37oazUmkXsItI4h1OcEQTikCBp4/zkzlsOY4GYJT91MGgROVficIeFKzlEI97PqswD2UiR+8Hg==",
       "requires": {
         "@aws/dynamodb-auto-marshaller": "^0.7.1",
         "amazon-cognito-identity-js": "^2.0.19",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-newsletter-aws",
-  "version": "2.0.9-beta.0",
+  "version": "2.0.9",
   "description": "Extension package to enable newsletter on Pluss Communities Platform",
   "scripts": {
     "gc": "node ../../tools/gc ./",
@@ -24,7 +24,7 @@
   "license": "ISC",
   "dependencies": {
     "@aws/dynamodb-auto-marshaller": "^0.7.1",
-    "@plusscommunities/pluss-core-aws": "2.0.23-beta.2",
+    "@plusscommunities/pluss-core-aws": "2.0.23",
     "amazon-cognito-identity-js": "^2.0.19",
     "axios": "^1.6.8",
     "aws-sdk": "^2.1591.0",

package/watchNewsletter.js

@@ -27,13 +27,13 @@ const setUnsentNotification = (update) => {
   return;
 };
 
-const sendNotifications = (update) => {
-  return new Promise(() => {
+const sendNotifications = async (update) => {
+  if (!update.Notification) return; // no notification
+  if (update.UnsentNotification !== "X") return; // already sent notification
+
+  try {
     if (update.Private) {
-      update.Tagged.map((user) => {
-        return user.userId;
-      });
-      publishNotifications(
+      await publishNotifications(
         update.Tagged.map((user) => {
           return user.userId;
         }),
@@ -47,24 +47,35 @@ const sendNotifications = (update) => {
       return;
     }
 
-    getAudience(
+    const audience = await getAudience(
       update.Site,
       update.AudienceType,
       update.AudienceTypeSelection
-    ).then((audience) => {
-      publishNotifications(
-        audience.map((u) => {
-          return u.id;
-        }),
-        values.notificationNewsletterPublished,
-        update.Site,
-        update.RowId,
-        update,
-        true
-      );
-      setUnsentNotification(update);
+    );
+
+    await publishNotifications(
+      audience.map((u) => {
+        return u.id;
+      }),
+      values.notificationNewsletterPublished,
+      update.Site,
+      update.RowId,
+      update,
+      true
+    );
+
+    setUnsentNotification(update);
+  } catch (error) {
+    console.error("sendNotifications error:", {
+      newsletterId: update.RowId,
+      site: update.Site,
+      title: update.Title,
+      error: error.message,
+      stack: error.stack,
     });
-  });
+    // Don't re-throw - allow other newsletters to process
+    // But log the failure so we can investigate
+  }
 };
 
 const fixActivityLog = async (post, startTime) => {
@@ -197,14 +208,21 @@ module.exports.watchNewsletter = async (event, context, callback) => {
   };
   console.log("running query");
   console.log(query);
-  indexQuery(values.tableNameNewsletterEntries, query).then((res) => {
-    res.Items.forEach((update) => {
-      console.log(
-        `sending notifications for ${update.RowId} - ${update.Title}`
-      );
-      sendNotifications(update);
-    });
-  });
+
+  // Wait for query to complete
+  const res = await indexQuery(values.tableNameNewsletterEntries, query);
+
+  console.log(`Found ${res.Items.length} newsletters to send notifications for`);
+
+  // Process newsletters sequentially to ensure each completes before next starts
+  for (const update of res.Items) {
+    console.log(
+      `sending notifications for ${update.RowId} - ${update.Title}`
+    );
+
+    // Wait for each newsletter's notifications to complete
+    await sendNotifications(update);
+  }
 
   await checkFixLog(startTime);
 };