@plusscommunities/pluss-core-aws 1.2.3 → 1.3.0

package/db/notifications/getNotificationSetting.js

@@ -0,0 +1,18 @@
+const indexQuery = require("../common/indexQuery");
+
+module.exports = async (userId, type = null, id = null) => {
+  const query = {
+    IndexName: "UserIndex",
+    KeyConditionExpression: "UserId = :userId",
+    ExpressionAttributeValues: {
+      ":userId": userId,
+    },
+  };
+  const { Items } = await indexQuery("notificationsettings", query);
+  if (type) {
+    return Items.find(
+      (i) => i.EntityType === type && (!id || i.EntityId === id)
+    );
+  }
+  return Items;
+};

package/db/notifications/publishNotifications.js

@@ -21,7 +21,15 @@ const saveNotification = (receiver, notification) => {
     });
 };
 
-module.exports = (receivers, type, site, id, data, sendPush) => {
+module.exports = (
+  receivers,
+  type,
+  site,
+  id,
+  data,
+  sendPush,
+  config = { type: "app", id: null, ignoreMute: false }
+) => {
   const notification = {};
   notification.Timestamp = moment.utc().valueOf();
   notification.Type = type;
@@ -34,6 +42,6 @@ module.exports = (receivers, type, site, id, data, sendPush) => {
   });
   if (sendPush) {
     const notiData = prepNotification(notification);
-    sendNotifications(receivers, notiData.Text, type, id, notiData);
+    sendNotifications(receivers, notiData.Text, type, id, notiData, config);
   }
 };

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/notification/sendNotifications.js

@@ -1,15 +1,18 @@
 const { Expo } = require("expo-server-sdk");
 const _ = require("lodash");
+const moment = require("moment");
 const getUser = require("../db/users/getUser");
+const getNotificationSetting = require("../db/notifications/getNotificationSetting");
 const { log } = require("../helper");
 
-const SendNotification = (tokens, message, type, key, params) => {
+const SendNotification = (tokens, message, type, key, params, config) => {
   const logId = log("SendNotification", "input", {
     tokens,
     message,
     type,
     key,
     params,
+    config,
   });
 
   const expo = new Expo();
@@ -21,16 +24,23 @@ const SendNotification = (tokens, message, type, key, params) => {
   Object.keys(params).forEach((paramKey) => {
     data[paramKey] = params[paramKey];
   });
+  data.muteConfig = config;
   log("SendNotification", "params", data, logId);
 
   for (const token of tokens) {
     if (Expo.isExpoPushToken(token)) {
+      const categoryId =
+        data.muteConfig && data.muteConfig.type
+          ? `mute_${data.muteConfig.type === "app" ? "app" : "entity"}`
+          : null;
+
       messages.push({
         to: token,
         sound: "default",
         body: message,
         data,
         badge: 1,
+        categoryId,
       });
     } else {
       log(
@@ -42,6 +52,7 @@ const SendNotification = (tokens, message, type, key, params) => {
     }
   }
 
+  log("SendNotification", "messages", messages);
   const chunks = expo.chunkPushNotifications(messages);
   for (const chunk of chunks) {
     expo
@@ -59,7 +70,7 @@ const SendNotification = (tokens, message, type, key, params) => {
           );
           // send separately
           _.values(error.details).forEach((appTokens) => {
-            SendNotification(appTokens, message, type, key, params);
+            SendNotification(appTokens, message, type, key, params, config);
           });
         } else {
           log("SendNotification", "SendError", error, logId);
@@ -68,22 +79,69 @@ const SendNotification = (tokens, message, type, key, params) => {
   }
 };
 
-module.exports = (receiverKeys, message, type, key, value) => {
+const checkMuted = async (userId, config) => {
+  if (!config.ignoreMute) {
+    const notiSettings = await getNotificationSetting(userId);
+    const logId = log("checkMuted", "notiSettings", notiSettings);
+
+    const appSetting = notiSettings.find((n) => n.EntityType === "app");
+    const isAppMuted = appSetting
+      ? moment() <= moment(appSetting.Expiry)
+      : false;
+    log("checkMuted", "isAppMuted", isAppMuted, logId);
+    if (isAppMuted) return true;
+
+    const entitySetting = notiSettings.find(
+      (n) => n.EntityType === config.type && n.EntityId === config.id
+    );
+    const isEntityMuted = entitySetting
+      ? moment() <= moment(entitySetting.Expiry)
+      : false;
+    log("checkMuted", "isEntityMuted", isEntityMuted, logId);
+    if (isEntityMuted) return true;
+  }
+
+  return false;
+};
+
+module.exports = (
+  receiverKeys,
+  message,
+  type,
+  key,
+  value,
+  config = { type: "app", id: null, ignoreMute: false }
+) => {
+  const logId = log("sendNotifications", "input", {
+    receiverKeys,
+    message,
+    type,
+    key,
+    value,
+    config,
+  });
   const tokens = [];
   const promises = [];
   receiverKeys.forEach((uid) => {
     promises.push(
       new Promise((resolve, reject) => {
         getUser(uid)
-          .then((user) => {
-            if (!user.tokens) {
-              if (user.token) {
-                tokens.push(user.token);
+          .then(async (user) => {
+            try {
+              const isMuted = await checkMuted(user.Id, config);
+              if (!isMuted) {
+                if (!user.tokens) {
+                  if (user.token) {
+                    tokens.push(user.token);
+                  }
+                } else {
+                  _.values(user.tokens).forEach((entry) => {
+                    tokens.push(entry.Token);
+                  });
+                }
               }
-            } else {
-              _.values(user.tokens).forEach((entry) => {
-                tokens.push(entry.Token);
-              });
+            } catch (error) {
+              log("sendNotifications", "error", error.toString());
             }
             resolve();
           })
@@ -94,6 +152,6 @@ module.exports = (receiverKeys, message, type, key, value) => {
     );
   });
   Promise.all(promises).then((res) => {
-    SendNotification(tokens, message, type, key, value);
+    SendNotification(tokens, message, type, key, value, config);
   });
 };

package/package.json

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

package/helper/audience/getMatchingAudienceTags.js

@@ -1,23 +0,0 @@
-const indexQuery = require("../../db/common/indexQuery");
-const getSessionUser = require("../auth/getSessionUser");
-const getUserPreview = require("../getUserPreview");
-
-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);
-};