@plusscommunities/pluss-newsletter-aws 1.4.7 → 1.4.8

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-newsletter-aws",
-  "version": "1.4.7",
+  "version": "1.4.8",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -13,9 +13,9 @@
       }
     },
     "@plusscommunities/pluss-core-aws": {
-      "version": "1.6.4",
-      "resolved": "https://registry.npmjs.org/@plusscommunities/pluss-core-aws/-/pluss-core-aws-1.6.4.tgz",
-      "integrity": "sha512-pWMKIq5yE53VuluV1U6Ft67kNcZ43z+MT2neU8Tds2HLVzaAHcsE5jl57T56nktIDUIWggXWqY3MkPsjNbtarA==",
+      "version": "1.6.10",
+      "resolved": "https://registry.npmjs.org/@plusscommunities/pluss-core-aws/-/pluss-core-aws-1.6.10.tgz",
+      "integrity": "sha512-O2n00I+HW1woK6n/U4nbzI4PZg0OoP16+QYrKgVy3NguQMxTaeijr8Yd8ML2SPMb2xF74u7iOkK6LIXIdVXH3A==",
       "requires": {
         "@aws/dynamodb-auto-marshaller": "^0.7.1",
         "amazon-cognito-identity-js": "^2.0.19",
@@ -1451,9 +1451,9 @@
       "integrity": "sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ=="
     },
     "html-entities": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz",
-      "integrity": "sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA=="
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.5.tgz",
+      "integrity": "sha512-72TJlcMkYsEJASa/3HnX7VT59htM7iSHbH59NSZbtc+22Ap0Txnlx91sfeB+/A7wNZg7UxtZdhAW4y+/jimrdg=="
     },
     "htmlparser2": {
       "version": "3.10.1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-newsletter-aws",
-  "version": "1.4.7",
+  "version": "1.4.8",
   "description": "Extension package to enable newsletter on Pluss Communities Platform",
   "scripts": {
     "gc": "node ../../tools/gc ./",
@@ -23,7 +23,7 @@
   "license": "ISC",
   "dependencies": {
     "@aws/dynamodb-auto-marshaller": "^0.7.1",
-    "@plusscommunities/pluss-core-aws": "1.6.4",
+    "@plusscommunities/pluss-core-aws": "1.6.10",
     "amazon-cognito-identity-js": "^2.0.19",
     "axios": "^0.18.0",
     "expo-server-sdk": "^3.0.1",

package/watchNewsletter.js

@@ -1,10 +1,18 @@
 const moment = require("moment");
+const _ = require("lodash");
 const initConfig = require("./initConfig");
 const indexQuery = require("./common/db/common/indexQuery");
 const publishNotifications = require("./common/db/notifications/publishNotifications");
 const getAudience = require("./common/helper/audience/getAudience");
 const updateAttribute = require("./common/db/common/updateAttribute");
 const { values } = require("./values.config");
+const scanRefRecursive = require("@plusscommunities/pluss-core-aws/db/common/scanRefRecursive");
+const logAnalyticsActivity = require("@plusscommunities/pluss-core-aws/db/analytics/logAnalyticsActivity");
+const checkActivityExists = require("@plusscommunities/pluss-core-aws/db/analytics/checkActivityExists");
+const updateRef = require("@plusscommunities/pluss-core-aws/db/common/updateRef");
+const editRef = require("@plusscommunities/pluss-core-aws/db/common/editRef");
+const getRef = require("@plusscommunities/pluss-core-aws/db/common/getRef");
+const { getRowId, log } = require("@plusscommunities/pluss-core-aws/helper");
 
 const setUnsentNotification = (update) => {
   update.UnsentNotification = undefined;
@@ -59,9 +67,125 @@ const sendNotifications = (update) => {
   });
 };
 
-module.exports.watchNewsletter = (event, context, callback) => {
+const fixActivityLog = async (post, startTime) => {
+  const now = moment().unix();
+  if (now - startTime > 240) {
+    return false;
+  }
+
+  // check whether it's already been logged
+  const exists = await checkActivityExists(
+    post.Id,
+    values.entityKey,
+    post.Private ? "PrivatePost" : "Post"
+  );
+  const logId = log("fixActivityLog", "exists", exists);
+
+  if (!exists) {
+    // add old log
+    await logAnalyticsActivity(
+      post.Private ? "PrivatePost" : "Post",
+      values.entityKey,
+      post.Site,
+      post.SubmittedBy,
+      post.Id,
+      null,
+      moment(post.Timestamp).valueOf()
+    );
+    log("fixActivityLog", "Logged", true, logId);
+
+    // tell system to aggregate this date again
+    const date = moment(post.Timestamp).local().format("DD-MM-YYYY");
+    log("fixActivityLog", "QueueingDate", date, logId);
+    await updateRef("analyticsqueue", {
+      Id: getRowId(post.Site, date),
+      Site: post.Site,
+      Date: date,
+    });
+  }
+
+  // update entry to show it's been logged
+  await editRef(values.tableNameNewsletterEntries, "RowId", post.RowId, {
+    ActivityLogged: true,
+  });
+
+  return true;
+};
+
+const checkFixLog = async (startTime) => {
+  // Check whether all posts have been logged
+  const logId = log("checkFixLog", "StartTime", startTime);
+  const stringSite = "plussSpace";
+  const stringId = `${values.entityKey}ActivityLogged`;
+  const stringRowId = getRowId(stringSite, stringId);
+  try {
+    const string = await getRef("strings", "RowId", stringRowId);
+    if (string && string.Value === "true") {
+      log("checkFixLog", "ActivityLogged", true, logId);
+      return true;
+    }
+  } catch (e) {
+    // ignore error
+  }
+
+  // Scans the DynamoDB table and fetch all items. The parameters describe which attributes to get.
+  const items = await scanRefRecursive(values.tableNameNewsletterEntries, {
+    ProjectionExpression: "#id, RowId, Site, SubmittedBy, #ts, ActivityLogged",
+    ExpressionAttributeNames: {
+      "#id": "Id",
+      "#ts": "Timestamp",
+    },
+  });
+  log(
+    "checkFixLog",
+    "FetchedItemsCount",
+    {
+      count: items.length,
+    },
+    logId
+  );
+
+  // Filters out items which have already had the activity log operation applied.
+  const itemsToProcess = items.filter((item) => !item.ActivityLogged);
+  log(
+    "checkFixLog",
+    "ItemsToProcessCount",
+    { count: itemsToProcess.length },
+    logId
+  );
+
+  // Finished logging old entries. Save to avoid continuous full scans of the table.
+  if (_.isEmpty(itemsToProcess)) {
+    const entry = {
+      Site: stringSite,
+      StringId: stringId,
+      Value: "true",
+      RowId: stringRowId,
+    };
+
+    await updateRef("strings", entry);
+  }
+
+  // The loop goes through the remaining items and applies the fixActivityLog operation on each item.
+  // If the operation fails on an item, it logs the error but continues with the remaining items.
+  for (let item of itemsToProcess) {
+    try {
+      await fixActivityLog(item, startTime);
+      log("checkFixLog", "SuccessFixActivityLog", { id: item.Id }, logId);
+    } catch (err) {
+      log("checkFixLog", `Error:${item.Id}`, err, logId);
+    }
+  }
+
+  log("checkFixLog", "End", "All items processed", logId);
+  return true;
+};
+
+module.exports.watchNewsletter = async (event, context, callback) => {
   initConfig();
 
+  const startTime = moment().unix();
+
   const query = {
     IndexName: "NewsletterEntriesUnsentNotiIndex",
     KeyConditionExpression:
@@ -81,4 +205,6 @@ module.exports.watchNewsletter = (event, context, callback) => {
       sendNotifications(update);
     });
   });
+
+  await checkFixLog(startTime);
 };