@plusscommunities/pluss-core-aws 2.0.11 → 2.0.13-beta.0

package/db/analytics/checkActivityExists.js

@@ -2,7 +2,15 @@ const _ = require("lodash");
 const { getMultiRowId } = require("../../helper");
 const indexQuery = require("../common/indexQuery");
 
-module.exports = async (entityId, entityType, actionType) => {
+/**
+ * Check if the activity exists
+ * @param {*} entityId Id of the entity
+ * @param {*} entityType Type of the entity
+ * @param {*} actionType Type of the analytics action
+ * @param {*} userId Id of user to check against (optional)
+ * @returns Whether there is any matching analytics activity
+ */
+module.exports = async (entityId, entityType, actionType, userId) => {
   const result = await indexQuery("analytics", {
     IndexName: "AnalyticsActivityIndex",
     KeyConditionExpression: "ActivityId = :activityId",
@@ -11,6 +19,10 @@ module.exports = async (entityId, entityType, actionType) => {
     },
   });
   if (result && !_.isEmpty(result.Items)) {
+    if (userId) {
+      // check if there is matching analytics activity for that user
+      return result.Items.some((item) => item.UserId === userId);
+    }
     return true;
   }
   return false;

package/db/analytics/logAnalyticsActivity.js

@@ -4,6 +4,19 @@ const checkActivityExists = require("./checkActivityExists");
 const updateRef = require("../common/updateRef");
 const { getMultiRowId, getRowId } = require("../../helper");
 
+/**
+ * Creates an analytics entry
+ * @param {*} actionType Type of action to log
+ * @param {*} entityType Type of entity the action is against
+ * @param {*} site Site to log with
+ * @param {*} user User performing the action
+ * @param {*} entityId Id of the entity the action is against
+ * @param {*} data Other data to log
+ * @param {*} timestamp Timestamp of the activity
+ * @param {*} uniqueActivity If true, will only log if the activity doesn't already exist
+ * @param {*} uniqueToUser If true, will only log if the activity doesn't already exist for the user
+ * @returns Whether the activity was logged
+ */
 module.exports = async (
   actionType,
   entityType,
@@ -12,11 +25,17 @@ module.exports = async (
   entityId,
   data,
   timestamp,
-  uniqueActivity
+  uniqueActivity,
+  uniqueToUser
 ) => {
   // Check if the activity already exists
   if (uniqueActivity) {
-    const exists = await checkActivityExists(entityId, entityType, actionType);
+    const exists = await checkActivityExists(
+      entityId,
+      entityType,
+      actionType,
+      uniqueToUser ? user.id : null
+    );
     if (exists) {
       return false;
     }

package/package.json

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