@plusscommunities/pluss-core-aws 1.6.7 → 1.6.9

package/db/analytics/checkActivityExists.js

@@ -0,0 +1,17 @@
+const _ = require("lodash");
+const { getMultiRowId } = require("../../helper");
+const indexQuery = require("../common/indexQuery");
+
+module.exports = async (entityId, entityType, actionType) => {
+  const result = await indexQuery("analytics", {
+    IndexName: "AnalyticsActivityIndex",
+    KeyConditionExpression: "ActivityId = :activityId",
+    ExpressionAttributeValues: {
+      ":activityId": getMultiRowId([entityId, entityType, actionType]),
+    },
+  });
+  if (result && !_.isEmpty(result.Items)) {
+    return true;
+  }
+  return false;
+};

package/db/analytics/logAnalyticsActivity.js

@@ -3,12 +3,20 @@ const moment = require("moment");
 const updateRef = require("../common/updateRef");
 const { getMultiRowId, getRowId } = require("../../helper");
 
-module.exports = (actionType, entityType, site, user, entityId, data) => {
+module.exports = (
+  actionType,
+  entityType,
+  site,
+  user,
+  entityId,
+  data,
+  timestamp
+) => {
   return new Promise((resolve, reject) => {
     const activity = {
       Id: uuid.v1(),
       Type: actionType,
-      Timestamp: moment.utc().valueOf(),
+      Timestamp: timestamp || moment.utc().valueOf(),
       EntityType: entityType,
       SubjectId: entityId,
       UserId: user.id,

package/db/common/scanRefRecursive.js

@@ -1,27 +1,30 @@
-const _ = require("lodash");
 const scanRef = require("./scanRef");
 
-const scanRefRecursive = (table, result, tempResult) => {
-  return new Promise((resolve) => {
-    if (!tempResult) {
-      tempResult = [];
-    }
-    let lastKey;
-    if (result) {
-      tempResult = _.concat(tempResult, result.Items);
-      if (!result.LastEvaluatedKey) {
-        return resolve(tempResult);
-      } else {
-        lastKey = result.LastEvaluatedKey;
-      }
-    }
+const scanRefRecursive = async (tableName, query, startKey) => {
+  if (!query) {
+    query = {};
+  }
+  // Set the ExclusiveStartKey in the params
+  query.ExclusiveStartKey = startKey;
 
-    scanRef(table, lastKey).then((scanResult) => {
-      scanRefRecursive(table, scanResult, tempResult).then((innerRes) => {
-        resolve(innerRes);
-      });
-    });
-  });
+  // Perform the scan and await the results
+  const data = await scanRef(tableName, query);
+
+  // Extract the Items from the results
+  let items = data.Items;
+
+  // If the LastEvaluatedKey is present, that means there are more items to fetch
+  if (data.LastEvaluatedKey) {
+    // Recursively call the function to fetch the next batch of items, and await the results
+    // Concatenate the new items with the ones we have already fetched
+    items = [
+      ...items,
+      ...(await scanRefRecursive(tableName, query, data.LastEvaluatedKey)),
+    ];
+  }
+
+  // Return the complete list of items
+  return items;
 };
 
 module.exports = scanRefRecursive;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-core-aws",
-  "version": "1.6.7",
+  "version": "1.6.9",
   "description": "Core extension package for Pluss Communities platform",
   "scripts": {
     "betapatch": "npm version prepatch --preid=beta",