@7365admin1/core 2.62.0 → 2.63.0

package/dist/index.mjs

@@ -3918,7 +3918,9 @@ function useVerificationRepo() {
     status = "active",
     app = "",
     type = {},
-    email = ""
+    email = "",
+    siteId = "",
+    orgId = ""
   }) {
     page = page > 0 ? page - 1 : 0;
     const query = { status };
@@ -3945,6 +3947,24 @@ function useVerificationRepo() {
       query.email = email;
       cacheOptions.email = email;
     }
+    if (siteId) {
+      const siteCandidates = [siteId];
+      try {
+        siteCandidates.push(new ObjectId13(siteId));
+      } catch {
+      }
+      query["metadata.siteId"] = { $in: siteCandidates };
+      cacheOptions.siteId = siteId;
+    }
+    if (orgId) {
+      const orgCandidates = [orgId];
+      try {
+        orgCandidates.push(new ObjectId13(orgId));
+      } catch {
+      }
+      query["metadata.org"] = { $in: orgCandidates };
+      cacheOptions.orgId = orgId;
+    }
     const cacheKey = makeCacheKey7(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
@@ -8222,7 +8242,10 @@ function useVerificationController() {
       status: Joi16.string().required(),
       app: Joi16.string().optional().allow("", null),
       type: Joi16.alternatives().try(Joi16.string(), Joi16.array().items(Joi16.string())).optional().allow("", null),
-      email: Joi16.string().optional().allow("", null)
+      email: Joi16.string().optional().allow("", null),
+      siteId: Joi16.string().hex().optional().allow("", null),
+      orgId: Joi16.string().hex().optional().allow("", null),
+      limit: Joi16.number().integer().min(1).allow("", null).default(10)
     });
     const query = { ...req.query };
     const { error } = validation.validate(query);
@@ -8236,6 +8259,9 @@ function useVerificationController() {
     const status = req.query.status ?? "pending";
     const app = req.query.app ?? "";
     const email = req.query.email ?? "";
+    const siteId = req.query.siteId ?? "";
+    const orgId = req.query.orgId ?? "";
+    const limit = parseInt(req.query.limit ?? "10");
     const type = req.query.type ? String(req.query.type).split(",") : "";
     const typeObj = {};
     if (type && Array.isArray(type) && type.length) {
@@ -8250,7 +8276,10 @@ function useVerificationController() {
         status,
         app,
         type: typeObj,
-        email
+        email,
+        siteId,
+        orgId,
+        limit
       });
       res.json(data);
       return;
@@ -12008,6 +12037,7 @@ function useServiceProviderRepo() {
         throw new BadRequestError54("Invalid site ID format.");
       }
     }
+    cacheOptions.membersLookup = "1";
     const cacheKey = makeCacheKey20(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
@@ -12023,7 +12053,7 @@ function useServiceProviderRepo() {
             localField: "serviceProviderOrgId",
             foreignField: "_id",
             as: "organization",
-            pipeline: [{ $project: { nature: 1 } }]
+            pipeline: [{ $project: { nature: 1, email: 1 } }]
           }
         },
         {
@@ -12032,17 +12062,50 @@ function useServiceProviderRepo() {
             preserveNullAndEmptyArrays: true
           }
         },
+        {
+          $lookup: {
+            from: "members",
+            let: { spOrgId: "$serviceProviderOrgId" },
+            pipeline: [
+              {
+                $match: {
+                  $expr: { $eq: ["$org", "$$spOrgId"] },
+                  status: "active"
+                }
+              },
+              { $count: "c" }
+            ],
+            as: "_memberCount"
+          }
+        },
         {
           $project: {
             name: 1,
             type: 1,
+            email: {
+              $cond: {
+                if: {
+                  $gt: [{ $strLenCP: { $ifNull: ["$email", ""] } }, 0]
+                },
+                then: "$email",
+                else: { $ifNull: ["$organization.email", ""] }
+              }
+            },
             nature: "$organization.nature",
             orgId: 1,
             siteId: 1,
             siteName: 1,
             serviceProviderOrgId: 1,
             status: 1,
-            category: 1
+            category: 1,
+            members: {
+              $let: {
+                vars: {
+                  mc: { $arrayElemAt: ["$_memberCount", 0] }
+                },
+                in: { $ifNull: ["$$mc.c", 0] }
+              }
+            }
           }
         },
         { $sort: sort },
@@ -31970,7 +32033,8 @@ function useBulletinBoardRepo() {
     sort = {},
     site = "",
     status = "active",
-    recipients = []
+    recipients = [],
+    expiration
   }, session) {
     page = page > 0 ? page - 1 : 0;
     try {
@@ -31981,8 +32045,13 @@ function useBulletinBoardRepo() {
     const query = {
       site,
       status,
-      ...search && { $text: { $search: search } },
-      ...recipients?.length && { recipients: { $in: recipients } }
+      ...search && {
+        $or: [{ title: { $regex: search, $options: "i" } }]
+      },
+      ...recipients?.length && { recipients: { $all: recipients } },
+      ...expiration !== void 0 && {
+        noExpiration: expiration === "yes"
+      }
     };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     const cacheOptions = {
@@ -31992,7 +32061,8 @@ function useBulletinBoardRepo() {
       page,
       limit,
       ...search && { search },
-      ...recipients?.length && { recipients: recipients.sort().join(",") }
+      ...recipients?.length && { recipients: recipients.sort().join(",") },
+      ...expiration !== void 0 && { expiration }
     };
     const cacheKey = makeCacheKey39(
       bulletin_boards_namespace_collection,
@@ -32180,7 +32250,9 @@ function useBulletinBoardRepo() {
         { session }
       );
       if (res.matchedCount === 0) {
-        throw new NotFoundError30("No upcoming bulletin boards found to activate.");
+        throw new NotFoundError30(
+          "No upcoming bulletin boards found to activate."
+        );
       }
       delNamespace().then(() => {
         logger105.info(
@@ -32366,32 +32438,35 @@ function useBulletinBoardController() {
       order: Joi77.string().valid(...Object.values(BulletinOrder)).default("desc" /* DESC */),
       site: Joi77.string().hex().length(24).required(),
       status: Joi77.string().valid(...Object.values(BulletinStatus)).optional().default("active" /* ACTIVE */),
-      recipients: Joi77.alternatives().try(
-        Joi77.array().items(
-          Joi77.string().valid(...Object.values(BulletinRecipient))
-        ),
-        Joi77.string().allow("")
-      ).optional().allow(null).custom((value2, helpers) => {
-        if (!value2 || value2 === "") {
+      recipients: Joi77.any().optional().allow(null, "").custom((value2, helpers) => {
+        if (!value2 || value2 === "")
           return [];
-        }
-        let parsed = [];
+        let parsed;
         if (Array.isArray(value2)) {
           parsed = value2;
-        } else if (typeof value2 === "string") {
-          parsed = value2.split(",").map((v) => v.trim()).filter(Boolean);
-        }
-        for (const r of parsed) {
-          if (!Object.values(BulletinRecipient).includes(r)) {
-            return helpers.error("any.only");
+        } else if (typeof value2 === "string" && value2.trim().startsWith("[")) {
+          try {
+            const result = JSON.parse(value2);
+            parsed = Array.isArray(result) ? result : [value2];
+          } catch {
+            return helpers.error("any.invalid");
           }
+        } else {
+          parsed = [value2];
         }
+        const validValues = Object.values(BulletinRecipient);
+        const isValid = parsed.every(
+          (r) => validValues.includes(r)
+        );
+        if (!isValid)
+          return helpers.error("any.invalid");
         return parsed;
       }).messages({
-        "any.only": `Recipients must be one of: ${Object.values(
+        "any.invalid": `Recipients must be one of: ${Object.values(
           BulletinRecipient
         ).join(", ")}`
-      })
+      }),
+      expiration: Joi77.string().valid("yes", "no").optional().allow("", null)
     });
     const { error, value } = validation.validate(req.query, {
       abortEarly: false
@@ -32402,7 +32477,17 @@ function useBulletinBoardController() {
       next(new BadRequestError128(messages));
       return;
     }
-    const { search, page, limit, site, status, recipients, sort, order } = value;
+    const {
+      search,
+      page,
+      limit,
+      site,
+      status,
+      recipients,
+      sort,
+      order,
+      expiration
+    } = value;
     const sortObj = {
       [sort ? sort : "_id" /* ID */]: order === "asc" /* ASC */ ? 1 : -1
     };
@@ -32414,7 +32499,8 @@ function useBulletinBoardController() {
         sort: sortObj,
         site,
         status,
-        recipients
+        recipients,
+        expiration
       });
       res.status(200).json(data);
       return;
@@ -40689,7 +40775,9 @@ function useBulletinVideoRepo() {
     page = 1,
     limit = 10,
     sort = {},
-    site = ""
+    site = "",
+    startDate,
+    endDate
   }, session) {
     page = page > 0 ? page - 1 : 0;
     try {
@@ -40697,10 +40785,33 @@ function useBulletinVideoRepo() {
     } catch (error) {
       throw new BadRequestError150("Invalid site ID format.");
     }
+    let dateExpr = {};
+    if (startDate && endDate) {
+      const startingDate = new Date(startDate);
+      startingDate.setUTCHours(0, 0, 0, 0);
+      const endingDate = new Date(endDate);
+      endingDate.setUTCHours(23, 59, 59, 999);
+      const parsedCreatedAt = {
+        $dateFromString: {
+          dateString: "$createdAt",
+          onError: /* @__PURE__ */ new Date(0),
+          onNull: /* @__PURE__ */ new Date(0)
+        }
+      };
+      dateExpr = {
+        $expr: {
+          $and: [
+            { $gte: [parsedCreatedAt, startingDate] },
+            { $lte: [parsedCreatedAt, endingDate] }
+          ]
+        }
+      };
+    }
     const query = {
       site,
       status: { $ne: "deleted" },
-      ...search && { $text: { $search: search } }
+      ...search && { $text: { $search: search } },
+      ...dateExpr
     };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     const cacheOptions = {
@@ -40709,7 +40820,9 @@ function useBulletinVideoRepo() {
       page,
       limit,
       status: { $ne: "deleted" },
-      ...search && { search }
+      ...search && { search },
+      ...startDate && { startDate },
+      ...endDate && { endDate }
     };
     if (search) {
       query.$or = [
@@ -40968,7 +41081,9 @@ function useBulletinVideoController() {
       limit: Joi92.number().integer().min(1).max(100).allow("", null).default(10),
       sort: Joi92.string().valid(...Object.values(BulletinVideoSort)).default("_id" /* ID */),
       order: Joi92.string().valid(...Object.values(BulletinVideoOrder)).default("desc" /* DESC */),
-      site: Joi92.string().hex().length(24).required()
+      site: Joi92.string().hex().length(24).required(),
+      startDate: Joi92.string().optional().allow("", null),
+      endDate: Joi92.string().optional().allow("", null)
     });
     const { error, value } = validation.validate(req.query, {
       abortEarly: false
@@ -40979,7 +41094,7 @@ function useBulletinVideoController() {
       next(new BadRequestError151(messages));
       return;
     }
-    const { search, page, limit, site, sort, order } = value;
+    const { search, page, limit, site, sort, order, startDate, endDate } = value;
     const sortObj = {
       [sort ?? "_id" /* ID */]: order === "asc" /* ASC */ ? 1 : -1
     };
@@ -40989,7 +41104,9 @@ function useBulletinVideoController() {
         page,
         limit,
         sort: sortObj,
-        site
+        site,
+        startDate,
+        endDate
       });
       res.status(200).json(data);
       return;