@plusscommunities/pluss-core-aws 1.5.17-beta.0 → 1.5.18-beta.0

package/db/auth/getSiteSetting.js

@@ -0,0 +1,16 @@
+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/db/common/getTableCount.js

@@ -0,0 +1,25 @@
+const AWS = require("aws-sdk");
+const dynamoDb = new AWS.DynamoDB.DocumentClient({ convertEmptyValues: true });
+const { log, generateLogId } = require("../../helper");
+
+module.exports = (table) => {
+  return new Promise((resolve, reject) => {
+    const logId = generateLogId();
+    const query = {
+      TableName: `${process.env.tablePrefix}${table}`,
+      Select: "COUNT",
+    };
+
+    dynamoDb.scan(query, (error, result) => {
+      // handle potential errors
+      if (error) {
+        log("getTableCount", "Error", error, logId);
+        reject();
+        return;
+      } else {
+        resolve(result);
+        return;
+      }
+    });
+  });
+};

package/helper/audience/getAudience.js

@@ -1,7 +1,9 @@
 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") {
@@ -105,6 +107,47 @@ 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) => {
+    log("getEventMatches", "userId", u.id, logId);
+    log("getEventMatches", "containsUserId", _.includes(userIds, u.id), logId);
+
+    return _.includes(userIds, u.id);
+  });
+};
+
 module.exports = async (
   site,
   audienceType,
@@ -138,11 +181,20 @@ 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, "id");
+      return _.unionBy(
+        categoryMatches,
+        typeMatches,
+        tagMatches,
+        eventMatches,
+        "id"
+      );
+    case "EventAudience":
+      return await getEventMatches(users, audienceTypeSelection);
     case "Category":
       return await getCategoryMatches(users, audienceTypeSelection, site);
     case "UserType":

package/helper/auth/validateSiteSetting.js

@@ -0,0 +1,11 @@
+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);
+  });
+};

package/helper/sendEmail.js

@@ -36,9 +36,7 @@ module.exports = async (
     bcc = null,
   } = {}
 ) => {
-  console.log("sendEmail", { toEmail, subject, content, useTemplate });
   const { communityConfig, serverlessConfig, emailConfig } = getConfig();
-  console.log("emailConfig", emailConfig);
 
   if (useTemplate) {
     content = `<div style="padding: 24px; padding-top: 0px; background-color: #f2f4f8;margin: 0px;">
@@ -59,10 +57,10 @@ module.exports = async (
                     </div>
                     <div style='margin-top: 30px;'>
                         <div style='margin: 0 auto; width: fit-content;'>
-                            <div style='vertical-align: top; height: 29px; margin-right: 10px; color: #828282; display: inline-block;'>
-                                <span style=' font-size: 13px; line-height: 29px;'>powered by</span>
+                            <div style='vertical-align: top; height: 20px; margin-right: 10px; color: #828282; display: inline-block;'>
+                                <span style=' font-size: 13px; line-height: 20px;'>powered by</span>
                             </div>
-                            <img src="https://pluss-prd-uploads.s3.ap-southeast-2.amazonaws.com/uploads/users/ap-southeast-2:80aecdcb-9955-493e-a341-2f2263f64777/public/04ee254a473dab894f9a15c418/plusslogo.png" style="display: inline-block; height: 29px; width: 71px; background-repeat: no-repeat; background-size:contain;"></img>
+                            <img src="https://pluss-prd-uploads.s3.ap-southeast-2.amazonaws.com/uploads/users/ap-southeast-2:80aecdcb-9955-493e-a341-2f2263f64777/public/d99198114e20a1245693e48790/plusslogo.png" style="display: inline-block; height: 20px; width: 237px; background-repeat: no-repeat; background-size:contain;"></img>
                         </div>
                     </div>
                 </div>`;
@@ -79,12 +77,10 @@ module.exports = async (
     html: content,
   };
 
-  console.log("checking email service", serverlessConfig);
   const sesInfo = await getEmailServiceInfo(
     serverlessConfig.key,
     serverlessConfig.secret
   );
-  console.log("sesInfo", sesInfo);
 
   if (sesInfo.enabled) {
     try {

package/package.json

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