@plusscommunities/pluss-core-aws 2.0.7-beta.3 → 2.0.7-beta.5

package/helper/audience/getAudience.js

@@ -155,6 +155,8 @@ const getEventMatches = async (users, audienceTypeSelection) => {
  * @param {string} audienceType - The type of audience to retrieve.
  * @param {string | Array} audienceTypeSelection - The selection criteria for the audience.
  * @param {boolean} [preview=true] - Indicates whether to retrieve a preview of the users in the audience.
+ * @param {boolean} [includeType=true] - Indicates whether to include the user type in the preview.
+ * @param {boolean} [includeSite=true] - Indicates whether to include the site in the preview.
  * @returns {Array} - The audience that matches the specified criteria.
  */
 module.exports = async (
@@ -171,44 +173,57 @@ module.exports = async (
     _.filter(userData, (u) => !u.Deleted),
     (u) => {
       return preview
-        ? userToUserPreview(u, includeType, includeSite)
+        ? userToUserPreview(u, true, true)
         : { id: u.Id || u.userId, ...u };
     }
   );
-  if (!audienceType) return users;
-
-  switch (audienceType) {
-    case "All":
-      return users;
-    case "Custom":
-      const categoryMatches = await getCategoryMatches(
-        users,
-        audienceTypeSelection,
-        site
-      );
-      const typeMatches = getTypeMatches(users, audienceTypeSelection);
-      const tagMatches = await getTagMatches(
-        users,
-        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);
-    case "Category":
-      return await getCategoryMatches(users, audienceTypeSelection, site);
-    case "UserType":
-      return getTypeMatches(users, audienceTypeSelection);
+  result = users;
+  if (audienceType) {
+    switch (audienceType) {
+      case "All":
+        break;
+      case "Custom":
+        const categoryMatches = await getCategoryMatches(
+          users,
+          audienceTypeSelection,
+          site
+        );
+        const typeMatches = getTypeMatches(users, audienceTypeSelection);
+        const tagMatches = await getTagMatches(
+          users,
+          audienceTypeSelection,
+          site
+        );
+        const eventMatches = await getEventMatches(
+          users,
+          audienceTypeSelection
+        );
+
+        // console.log("categoryMatches", categoryMatches);
+        // console.log("typeMatches", typeMatches);
+        // console.log("tagMatches", tagMatches);
+        result = _.unionBy(
+          categoryMatches,
+          typeMatches,
+          tagMatches,
+          eventMatches,
+          "id"
+        );
+        break;
+      case "EventAudience":
+        result = await getEventMatches(users, audienceTypeSelection);
+        break;
+      case "Category":
+        result = await getCategoryMatches(users, audienceTypeSelection, site);
+        break;
+      case "UserType":
+        result = getTypeMatches(users, audienceTypeSelection);
+        break;
+      default:
+        break;
+    }
   }
+  return result.map((user) => {
+    return userToUserPreview(user, includeType, includeSite);
+  });
 };

package/helper/users/getUsersByPermission.js

@@ -20,7 +20,14 @@ module.exports = async (site, permissions) => {
     };
   });
   log("getUsersByPermission", "audienceMatches", audienceMatches, logId);
-  const audience = await getAudience(site, "Custom", audienceMatches);
+  const audience = await getAudience(
+    site,
+    "Custom",
+    audienceMatches,
+    true,
+    false,
+    false
+  );
   log("getUsersByPermission", "audienceLength", audience.length, logId);
 
   return audience;

package/package.json

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