@plusscommunities/pluss-core-aws 1.5.9-beta.0 → 1.5.10-beta.0

package/db/scheduledActions/getActionQueueByEntityKey.js

@@ -1,4 +1,4 @@
-const indexQuery = require("../common/indexQuery");
+const indexQueryRecursive = require("../common/indexQueryRecursive");
 
 module.exports = async (site, entityKey) => {
   const query = {
@@ -10,6 +10,5 @@ module.exports = async (site, entityKey) => {
     },
   };
 
-  const { Items } = await indexQuery("actionqueue", query);
-  return Items;
+  return await indexQueryRecursive("actionqueue", query);
 };

package/db/scheduledActions/getActionQueueByTriggerAt.js

@@ -0,0 +1,14 @@
+const indexQueryRecursive = require("../common/indexQueryRecursive");
+
+module.exports = async (site, triggerAt) => {
+  const query = {
+    IndexName: "SiteEntityKeyIndex",
+    KeyConditionExpression: "Site = :site and TriggerAt >= :triggerAt",
+    ExpressionAttributeValues: {
+      ":site": site,
+      ":triggerAt": triggerAt,
+    },
+  };
+
+  return await indexQueryRecursive("actionqueue", query);
+};

package/helper/audience/getAudience.js

@@ -1,9 +1,7 @@
 const _ = require("lodash");
 const indexQuery = require("../../db/common/indexQuery");
-const getRef = require("../../db/common/getRef");
 const scanRefRecursive = require("../../db/common/scanRefRecursive");
 const userToUserPreview = require("../userToUserPreview");
-const { getRowId, log } = require("..");
 
 const getUsers = async (site) => {
   if (site === "all") {
@@ -107,42 +105,6 @@ const getTagMatches = async (users, audienceTypeSelection, site) => {
   );
 };
 
-const getEventMatches = async (users, audienceTypeSelection) => {
-  const logId = log("getEventMatches", "input", {
-    usersLength: users.length,
-    audienceTypeSelection,
-  });
-  let eventAudiences = [];
-  if (Array.isArray(audienceTypeSelection)) {
-    eventAudiences = _.filter(
-      audienceTypeSelection,
-      (at) => at.AudienceType === "EventAudience"
-    );
-  } else {
-    eventAudiences.push({ AudienceTypeSelection: audienceTypeSelection });
-  }
-
-  let userIds = [];
-
-  for (let i = 0; i < eventAudiences.length; i++) {
-    log("getEventMatches", "MatchingEventAudience", eventAudiences[i], logId);
-    const eventRep = await getRef(
-      "eventreps",
-      "RowId",
-      getRowId(
-        eventAudiences[i].AudienceTypeSelection.RowId,
-        eventAudiences[i].AudienceTypeSelection.RepId
-      )
-    );
-    if (eventRep && eventRep.Attendees) {
-      userIds = _.concat(userIds, Object.keys(eventRep.Attendees));
-    }
-
-    log("getEventMatches", "userIdsLength", userIds.length, logId);
-  }
-  return _.filter(users, (u) => _.includes(userIds, u.id));
-};
-
 module.exports = async (
   site,
   audienceType,
@@ -176,20 +138,11 @@ module.exports = async (
         audienceTypeSelection,
         site
       );
-      const eventMatches = await getEventMatches(users, audienceTypeSelection);
 
       // console.log("categoryMatches", categoryMatches);
       // console.log("typeMatches", typeMatches);
       // console.log("tagMatches", tagMatches);
-      return _.unionBy(
-        categoryMatches,
-        typeMatches,
-        tagMatches,
-        eventMatches,
-        "id"
-      );
-    case "EventAudience":
-      return await getEventMatches(users, audienceTypeSelection);
+      return _.unionBy(categoryMatches, typeMatches, tagMatches, "id");
     case "Category":
       return await getCategoryMatches(users, audienceTypeSelection, site);
     case "UserType":

package/package.json

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

package/db/auth/getSiteSetting.js

@@ -1,16 +0,0 @@
-const getRef = require("../common/getRef");
-
-module.exports = async (site, key) => {
-  return new Promise((resolve, reject) => {
-    getRef("sites", "Id", site)
-      .then((item) => {
-        if (item && item.Settings) {
-          return resolve(item.Settings[key]);
-        }
-        return resolve(undefined);
-      })
-      .catch((error) => {
-        return resolve(undefined);
-      });
-  });
-};

package/helper/auth/validateSiteSetting.js

@@ -1,11 +0,0 @@
-const getSiteSetting = require("../../db/auth/getSiteSetting");
-
-module.exports = async (site, key, expectedValue) => {
-  return new Promise(async (resolve) => {
-    if (!site) {
-      return resolve(false);
-    }
-    const siteSetting = await getSiteSetting(site, key);
-    return resolve(siteSetting === expectedValue);
-  });
-};