@plusscommunities/pluss-newsletter-aws-sharing 2.0.7 → 2.0.8-beta.2

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-newsletter-aws-sharing",
-  "version": "2.0.7",
+  "version": "2.0.8-beta.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1506,9 +1506,9 @@
       }
     },
     "@plusscommunities/pluss-core-aws": {
-      "version": "2.0.22",
-      "resolved": "https://registry.npmjs.org/@plusscommunities/pluss-core-aws/-/pluss-core-aws-2.0.22.tgz",
-      "integrity": "sha512-i/gOxcb7qAMz0z/LtMe1tot2APDZHwGRbNivpyCJuZb3LXNihvwUb3O+4woNyF7XmVWrdmtXtSe2ckamiC5bow==",
+      "version": "2.0.23-beta.3",
+      "resolved": "https://registry.npmjs.org/@plusscommunities/pluss-core-aws/-/pluss-core-aws-2.0.23-beta.3.tgz",
+      "integrity": "sha512-oBdo29f2w34LXzMa3I0rZJ9TxuSzshRd4Ky7AU/Rnx5jTkSMvd3p0EHsJNUEX5HEukdXItiZmor3tbFxxAilGg==",
       "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-sharing",
-  "version": "2.0.7",
+  "version": "2.0.8-beta.2",
   "description": "Extension package to enable newsletter on Pluss Communities Platform",
   "scripts": {
     "gc": "node ../../tools/gc ./",
@@ -16,7 +16,7 @@
     "copy:get": "echo $npm_package_name",
     "copy:set": "run(){ target='\\@plusscommunities\\/pluss-newsletter-aws'; ext=${1:-default}; [ $ext == 'default' ] && replace=$target || replace=$target'-'$ext; echo 'Setting target to '$replace; test -f values.config.$ext.js && cp -f values.config.$ext.js values.config.js; sed -i '' -e 's/'$target'.*\"/'$replace'\"/g' package.json; }; run",
     "copy:deploy": "for file in `ls ./values.config.*.js`; do dup=`echo $file | sed 's/.*values\\.config\\.\\(.*\\)\\.js/\\1/'`; npm run copy:set $dup; npm run deploy; done; npm run copy:set; npm run gs;",
-    "copy:betaupload": "npm run betapatch; for file in `ls ./values.config.*.js`; do dup=`echo $file | sed 's/.*values\\.config\\.\\(.*\\)\\.js/\\1/'`; npm run copy:set $dup; npm run betaupload; done; npm run copy:set;",
+    "copy:betaupload": "for file in `ls ./values.config.*.js`; do dup=`echo $file | sed 's/.*values\\.config\\.\\(.*\\)\\.js/\\1/'`; npm run copy:set $dup; npm run betaupload; done; npm run copy:set;",
     "copy:upload": "npm run patch; for file in `ls ./values.config.*.js`; do dup=`echo $file | sed 's/.*values\\.config\\.\\(.*\\)\\.js/\\1/'`; npm run copy:set $dup; npm run upload; done; npm run copy:set;",
     "test": "jest tests -i"
   },
@@ -24,7 +24,7 @@
   "license": "ISC",
   "dependencies": {
     "@aws/dynamodb-auto-marshaller": "^0.7.1",
-    "@plusscommunities/pluss-core-aws": "2.0.22",
+    "@plusscommunities/pluss-core-aws": "2.0.23-beta.3",
     "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);
 };