@plusscommunities/pluss-core-aws 1.4.10-beta.0 → 1.4.13-beta.0

package/aws/sendEmail.js

@@ -1,7 +1,7 @@
 const AWS = require("aws-sdk");
 const { getConfig } = require("../config");
 
-module.exports = (from, to, subject, content, access = null) => {
+module.exports = (from, to, subject, content, access = null, bcc = null) => {
   return new Promise((resolve, reject) => {
     const { serverlessConfig } = getConfig();
     AWS.config.update({
@@ -25,6 +25,7 @@ module.exports = (from, to, subject, content, access = null) => {
       },
       Destination: {
         ToAddresses: to.split(",").map((i) => i.trim()),
+        BccAddresses: bcc ? bcc.split(",").map((i) => i.trim()) : [],
       },
       FromEmailAddress: from,
     };

package/db/common/deleteRef.js

@@ -1,16 +1,17 @@
 const AWS = require("aws-sdk");
 const dynamoDb = new AWS.DynamoDB.DocumentClient({ convertEmptyValues: true });
-const { log } = require("../../helper");
+const { log, generateLogId } = require("../../helper");
 
 module.exports = async (table, key, value) => {
   return new Promise((resolve, reject) => {
+    const logId = generateLogId();
     const params = {
       TableName: `${process.env.tablePrefix}${table}`,
       Key: {},
     };
     params.Key[key] = value;
 
-    const logId = log("deleteRef", "Params", JSON.stringify(params));
+    // log("deleteRef", "Params", JSON.stringify(params), logId);
 
     // write the todo to the database
     dynamoDb.delete(params, (error, data) => {
@@ -20,7 +21,7 @@ module.exports = async (table, key, value) => {
         reject(error);
         return;
       }
-      log("deleteRef", "Success", "Deleted item", logId);
+      // log("deleteRef", "Success", "Deleted item", logId);
       resolve(data);
       return;
     });

package/db/common/editRef.js

@@ -1,24 +1,25 @@
 const _ = require("lodash");
 const getRef = require("./getRef");
 const updateRef = require("./updateRef");
-const { log } = require("../../helper");
+const { log, generateLogId } = require("../../helper");
 
 module.exports = async (table, keyCol, id, updates) => {
   const cloneUpdates = _.cloneDeep(updates);
 
   return new Promise((resolve, reject) => {
+    const logId = generateLogId();
     updates[keyCol] = id;
 
-    const logId = log("editRef", "Params", { table, keyCol, id, updates });
+    // log("editRef", "Params", { table, keyCol, id, updates }, logId);
     getRef(table, keyCol, id)
       .then((item) => {
-        log("editRef", "GotItem", item);
+        // log("editRef", "GotItem", item);
         Object.keys(cloneUpdates).forEach((key) => {
           item[key] = cloneUpdates[key];
         });
         updateRef(table, item)
           .then((res) => {
-            log("editRef", "Result", res, logId);
+            // log("editRef", "Result", res, logId);
             resolve(res);
           })
           .catch((error) => {
@@ -27,13 +28,13 @@ module.exports = async (table, keyCol, id, updates) => {
           });
       })
       .catch((error) => {
-        log("editRef", "NoEntry", "Existing entry doesn't exist", logId);
+        // log("editRef", "NoEntry", "Existing entry doesn't exist", logId);
         cloneUpdates[keyCol] = id;
 
         // insert if doesn't exit
         updateRef(table, cloneUpdates)
           .then((res) => {
-            log("editRef", "Result", res, logId);
+            // log("editRef", "Result", res, logId);
             resolve(res);
           })
           .catch((error) => {

package/db/common/getRef.js

@@ -12,7 +12,7 @@ module.exports = async (table, key, value) => {
       };
       query.Key[key] = value;
 
-      log("getRef", "Query", query, logId);
+      // log("getRef", "Query", query, logId);
 
       dynamoDb.get(query, (error, data) => {
         if (error) {
@@ -20,7 +20,7 @@ module.exports = async (table, key, value) => {
           reject(error);
           return;
         }
-        log("getRef", "Success", data.Item, logId);
+        // log("getRef", "Success", data.Item, logId);
         resolve(data.Item);
         return;
       });

package/db/common/indexQuery.js

@@ -1,12 +1,13 @@
 const AWS = require("aws-sdk");
 const dynamoDb = new AWS.DynamoDB.DocumentClient({ convertEmptyValues: true });
-const { log } = require("../../helper");
+const { log, generateLogId } = require("../../helper");
 
 module.exports = async (table, query) => {
   return new Promise((resolve, reject) => {
+    const logId = generateLogId();
     query.TableName = `${process.env.tablePrefix}${table}`;
 
-    const logId = log("indexQuery", "Query", JSON.stringify(query));
+    // log("indexQuery", "Query", JSON.stringify(query), logId);
 
     // write the todo to the database
     dynamoDb.query(query, (error, data) => {
@@ -16,7 +17,7 @@ module.exports = async (table, query) => {
         reject(error);
         return;
       }
-      log("indexQuery", "ResultLength", data.Items.length, logId);
+      // log("indexQuery", "ResultLength", data.Items.length, logId);
       resolve(data);
       return;
     });

package/db/common/updateAttribute.js

@@ -1,6 +1,6 @@
 const AWS = require("aws-sdk");
 const dynamoDb = new AWS.DynamoDB.DocumentClient({ convertEmptyValues: true });
-const { log } = require("../../helper");
+const { log, generateLogId } = require("../../helper");
 
 module.exports = (
   table,
@@ -11,6 +11,7 @@ module.exports = (
   action
 ) => {
   return new Promise((resolve, reject) => {
+    const logId = generateLogId();
     const params = {
       TableName: `${process.env.tablePrefix}${table}`,
       Key: {
@@ -20,14 +21,14 @@ module.exports = (
         [attributeKey]: { Action: action, Value: attributeValue },
       },
     };
-    const logId = log("updateAttribute", "Params", params);
+    // log("updateAttribute", "Params", params, logId);
 
     dynamoDb.update(params, (err, data) => {
       if (err) {
         log("updateAttribute", "Error", err, logId);
         return reject(err);
       }
-      log("updateAttribute", "Success", data, logId);
+      // log("updateAttribute", "Success", data, logId);
       return resolve(data);
     });
   });

package/db/common/updateRef.js

@@ -1,15 +1,16 @@
 const AWS = require("aws-sdk");
 const dynamoDb = new AWS.DynamoDB.DocumentClient({ convertEmptyValues: true });
-const { log } = require("../../helper");
+const { log, generateLogId } = require("../../helper");
 
 module.exports = async (table, data) => {
   return new Promise((resolve, reject) => {
+    const logId = generateLogId();
     const params = {
       TableName: `${process.env.tablePrefix}${table}`,
       Item: data,
     };
 
-    const logId = log("updateRef", "Params", params);
+    // log("updateRef", "Params", params, logId);
 
     // write the todo to the database
     dynamoDb.put(params, (error) => {
@@ -19,7 +20,7 @@ module.exports = async (table, data) => {
         reject(error);
         return;
       }
-      log("updateRef", "Result", data, logId);
+      // log("updateRef", "Result", data, logId);
       resolve(data);
       return;
     });

package/db/scheduledActions/updateActionQueue.js

@@ -6,7 +6,7 @@ module.exports = (rowId, update) => {
   return new Promise(async (resolve, reject) => {
     try {
       const now = moment().valueOf();
-      const { Created, Updated, TriggerAt, Status, Recipients, Site } = update;
+      const { Created, Updated, TriggerAt, Status, Recipients } = update;
       if (!rowId) {
         rowId = uuid.v1();
         if (!Created) update.Created = now;
@@ -14,7 +14,6 @@ module.exports = (rowId, update) => {
       } else {
         if (!Updated) update.Updated = now;
       }
-      update.EntityId = `${rowId}${Site}`;
       if (TriggerAt) {
         update.TriggerAt =
           typeof TriggerAt === "string"

package/helper/sendEmail.js

@@ -8,9 +8,12 @@ module.exports = async (
   subject,
   content,
   useTemplate,
-  fromEmail,
-  excludeClientBranding,
-  brandingImage
+  {
+    fromEmail = null,
+    excludeClientBranding = false,
+    brandingImage = null,
+    bcc = null,
+  }
 ) => {
   const { communityConfig, serverlessConfig } = getConfig();
 
@@ -47,6 +50,7 @@ module.exports = async (
       fromEmail ||
       `"${communityConfig.name}" noreply@${communityConfig.subdomain}.plusscommunities.com'`,
     to: toEmail,
+    bcc,
     subject,
     text: content,
     html: content,
@@ -67,7 +71,8 @@ module.exports = async (
         mailOptions.to,
         mailOptions.subject,
         mailOptions.html,
-        serverlessConfig
+        serverlessConfig,
+        mailOptions.bcc
       );
       console.log("Email success", toEmail, subject, result);
     } catch (error) {

package/package.json

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