@plusscommunities/pluss-core-aws 1.2.2 → 1.2.6

package/helper/audience/filterByAudienceType.js

@@ -0,0 +1,38 @@
+const _ = require("lodash");
+const getSessionUser = require("../auth/getSessionUser");
+const getMatchingAudienceTypes = require("./getMatchingAudienceTypes");
+const getMatchingTags = require("./getMatchingTags");
+const isValidAudience = require("./isValidAudience");
+
+module.exports = async (items, authkey, site) => {
+  const validTypes = await getMatchingAudienceTypes(authkey);
+  let validTags = [];
+  if (site) {
+    const userId = await getSessionUser(authkey);
+    validTags = await getMatchingTags(userId, site);
+  }
+
+  return _.filter(items, (item) => {
+    if (!item.AudienceType) return true;
+
+    if (item.AudienceType === "Custom") {
+      return _.some(item.AudienceTypeSelection, (at) =>
+        isValidAudience(
+          site,
+          at.AudienceType,
+          at.AudienceTypeSelection,
+          validTypes,
+          validTags
+        )
+      );
+    }
+
+    return isValidAudience(
+      site,
+      item.AudienceType,
+      item.AudienceTypeSelection,
+      validTypes,
+      validTags
+    );
+  });
+};

package/helper/audience/filterOnAudienceType.js

@@ -1,25 +1,36 @@
 const _ = require("lodash");
-const getMatchingAudienceTags = require("./getMatchingAudienceTags");
+const getSessionUser = require("../auth/getSessionUser");
+const getMatchingTags = require("./getMatchingTags");
+const isValidAudience = require("./isValidAudience");
 
-module.exports = async (items, types, authkey) => {
-  const matchingTags = authkey ? await getMatchingAudienceTags(authkey) : [];
-  console.log("items", items);
-  console.log("types", types);
-  console.log("matchingTags", matchingTags);
+module.exports = async (items, validTypes, authkey, site) => {
+  let validTags = [];
+  if (authkey) {
+    const userId = await getSessionUser(authkey);
+    validTags = await getMatchingTags(userId, site);
+  }
 
   return _.filter(items, (item) => {
-    if (!item.AudienceType) {
-      return true;
-    }
-    const matchingType = _.find(types, (t) => {
-      return t.type === item.AudienceType;
-    });
-    if (!matchingType) {
-      return false;
-    }
-    if (!matchingType.selection && !item.AudienceTypeSelection) {
-      return true;
+    if (!item.AudienceType) return true;
+
+    if (item.AudienceType === "Custom") {
+      return _.some(item.AudienceTypeSelection, (at) =>
+        isValidAudience(
+          site,
+          at.AudienceType,
+          at.AudienceTypeSelection,
+          validTypes,
+          validTags
+        )
+      );
     }
-    return matchingType.selection === item.AudienceTypeSelection;
+
+    return isValidAudience(
+      site,
+      item.AudienceType,
+      item.AudienceTypeSelection,
+      validTypes,
+      validTags
+    );
   });
 };

package/helper/audience/getAudience.js

@@ -132,6 +132,9 @@ module.exports = async (site, audienceType, audienceTypeSelection) => {
         site
       );
 
+      // console.log("categoryMatches", categoryMatches);
+      // console.log("typeMatches", typeMatches);
+      // console.log("tagMatches", tagMatches);
       return _.unionBy(categoryMatches, typeMatches, tagMatches, "id");
     case "Category":
       return await getCategoryMatches(users, audienceTypeSelection, site);

package/helper/audience/getMatchingTags.js

@@ -0,0 +1,20 @@
+const indexQuery = require("../../db/common/indexQuery");
+const { log } = require("../");
+
+module.exports = async (userId, site) => {
+  return new Promise(async (resolve) => {
+    const query = {
+      IndexName: "UserIndex",
+      KeyConditionExpression: `UserId = :userId${
+        !site ? "" : " AND Site = :site"
+      }`,
+      ExpressionAttributeValues: {
+        ":userId": userId,
+        ":site": site,
+      },
+    };
+    const result = await indexQuery("usertagusers", query);
+    log("getMatchingTags", "ResultLength", result.Items.length);
+    return resolve(result.Items);
+  });
+};

package/helper/audience/isValidAudience.js

@@ -0,0 +1,25 @@
+const _ = require("lodash");
+
+module.exports = (site, type, selection, validTypes, validTags) => {
+  // console.log("isValidAudience - site", site);
+  // console.log("isValidAudience - type", type);
+  // console.log("isValidAudience - selection", selection);
+  // console.log("isValidAudience - validTypes", validTypes);
+  // console.log("isValidAudience - validTags", validTags);
+
+  switch (type) {
+    case "Category":
+    case "UserType":
+      return _.some(
+        validTypes,
+        (t) =>
+          t.site === site &&
+          t.type === type &&
+          (_.isEmpty(selection) || t.selection === selection)
+      );
+    case "UserTags":
+      return _.some(validTags, (t) => t.Site === site && t.TagId === selection);
+    default:
+      return true;
+  }
+};

package/notification/prepNotification.js

@@ -14,6 +14,11 @@ module.exports = (noti) => {
       thisNoti.Subtext = noti.Data.title || noti.Data.description;
       thisNoti.Icon = "wrench";
       break;
+    case "EntityCommented":
+      thisNoti.Text = noti.Data.comment;
+      thisNoti.Subtext = noti.Data.title || noti.Data.description;
+      thisNoti.Icon = "commenting";
+      break;
     case "EventRepChange":
       let eventChangeText = "";
       if (noti.Data.LocationChanged && noti.Data.TimeChanged) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-core-aws",
-  "version": "1.2.2",
+  "version": "1.2.6",
   "description": "Core extension package for Pluss Communities platform",
   "scripts": {
     "patch": "npm version patch",

package/helper/audience/getMatchingAudienceTags.js

@@ -1,22 +0,0 @@
-const getUserPreview = require("../getUserPreview");
-const getSessionUser = require("../auth/getSessionUser");
-
-const getUserTags = async (userId) => {
-  const query = {
-    IndexName: "UserIndex",
-    KeyConditionExpression: "UserId = :userId",
-    ExpressionAttributeValues: {
-      ":userId": userId,
-    },
-  };
-
-  const { Items } = await indexQuery("usertagusers", query);
-  return Items;
-};
-
-module.exports = async (authkey) => {
-  const uid = await getSessionUser(authkey);
-  // const user = await getUserPreview(uid, true, true);
-
-  return await getUserTags(uid);
-};