@7365admin1/core 2.62.0 → 2.63.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/core
 
+## 2.63.0
+
+### Minor Changes
+
+- cb66856: get latest changes today
+
 ## 2.62.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -382,7 +382,7 @@ declare function useVerificationRepo(): {
     createTextIndex: () => Promise<void>;
     add: (value: TVerification, session?: ClientSession) => Promise<ObjectId>;
     getById: (_id: string | ObjectId) => Promise<TVerification | null>;
-    getVerifications: ({ search, page, limit, sort, status, app, type, email, }: {
+    getVerifications: ({ search, page, limit, sort, status, app, type, email, siteId, orgId, }: {
         search?: string | undefined;
         page?: number | undefined;
         limit?: number | undefined;
@@ -391,6 +391,8 @@ declare function useVerificationRepo(): {
         app?: string | undefined;
         type?: Record<string, any> | undefined;
         email?: string | undefined;
+        siteId?: string | undefined;
+        orgId?: string | undefined;
     }) => Promise<{}>;
     getByIdByType: (type: string) => Promise<TVerification[]>;
     updateStatusById: (_id: string | ObjectId, status: string, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
@@ -3861,7 +3863,7 @@ declare function MBulletinBoard(value: TBulletinBoard): {
 declare const bulletin_boards_namespace_collection = "bulletin-boards";
 declare function useBulletinBoardRepo(): {
     add: (value: TBulletinBoard, session?: ClientSession) => Promise<ObjectId>;
-    getAll: ({ search, page, limit, sort, site, status, recipients, }: {
+    getAll: ({ search, page, limit, sort, site, status, recipients, expiration, }: {
         search?: string | undefined;
         page?: number | undefined;
         limit?: number | undefined;
@@ -3869,6 +3871,7 @@ declare function useBulletinBoardRepo(): {
         site: string | ObjectId;
         status: string;
         recipients: Array<string>;
+        expiration?: "yes" | "no" | undefined;
     }, session?: ClientSession) => Promise<{
         items: any[];
         pages: number;
@@ -4986,12 +4989,14 @@ declare function MBulletinVideo(value: TBulletinVideo): {
 
 declare function useBulletinVideoRepo(): {
     add: (value: TBulletinVideo, session?: ClientSession) => Promise<ObjectId>;
-    getAll: ({ search, page, limit, sort, site, }: {
+    getAll: ({ search, page, limit, sort, site, startDate, endDate, }: {
         search?: string | undefined;
         page?: number | undefined;
         limit?: number | undefined;
         sort?: Record<string, any> | undefined;
         site: string | ObjectId;
+        startDate?: string | undefined;
+        endDate?: string | undefined;
     }, session?: ClientSession) => Promise<{
         items: any[];
         pages: number;

package/dist/index.js

@@ -4301,7 +4301,9 @@ function useVerificationRepo() {
     status = "active",
     app = "",
     type = {},
-    email = ""
+    email = "",
+    siteId = "",
+    orgId = ""
   }) {
     page = page > 0 ? page - 1 : 0;
     const query = { status };
@@ -4328,6 +4330,24 @@ function useVerificationRepo() {
       query.email = email;
       cacheOptions.email = email;
     }
+    if (siteId) {
+      const siteCandidates = [siteId];
+      try {
+        siteCandidates.push(new import_mongodb13.ObjectId(siteId));
+      } catch {
+      }
+      query["metadata.siteId"] = { $in: siteCandidates };
+      cacheOptions.siteId = siteId;
+    }
+    if (orgId) {
+      const orgCandidates = [orgId];
+      try {
+        orgCandidates.push(new import_mongodb13.ObjectId(orgId));
+      } catch {
+      }
+      query["metadata.org"] = { $in: orgCandidates };
+      cacheOptions.orgId = orgId;
+    }
     const cacheKey = (0, import_node_server_utils15.makeCacheKey)(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
@@ -8547,7 +8567,10 @@ function useVerificationController() {
       status: import_joi16.default.string().required(),
       app: import_joi16.default.string().optional().allow("", null),
       type: import_joi16.default.alternatives().try(import_joi16.default.string(), import_joi16.default.array().items(import_joi16.default.string())).optional().allow("", null),
-      email: import_joi16.default.string().optional().allow("", null)
+      email: import_joi16.default.string().optional().allow("", null),
+      siteId: import_joi16.default.string().hex().optional().allow("", null),
+      orgId: import_joi16.default.string().hex().optional().allow("", null),
+      limit: import_joi16.default.number().integer().min(1).allow("", null).default(10)
     });
     const query = { ...req.query };
     const { error } = validation.validate(query);
@@ -8561,6 +8584,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) {
@@ -8575,7 +8601,10 @@ function useVerificationController() {
         status,
         app,
         type: typeObj,
-        email
+        email,
+        siteId,
+        orgId,
+        limit
       });
       res.json(data);
       return;
@@ -12260,6 +12289,7 @@ function useServiceProviderRepo() {
         throw new import_node_server_utils56.BadRequestError("Invalid site ID format.");
       }
     }
+    cacheOptions.membersLookup = "1";
     const cacheKey = (0, import_node_server_utils56.makeCacheKey)(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
@@ -12275,7 +12305,7 @@ function useServiceProviderRepo() {
             localField: "serviceProviderOrgId",
             foreignField: "_id",
             as: "organization",
-            pipeline: [{ $project: { nature: 1 } }]
+            pipeline: [{ $project: { nature: 1, email: 1 } }]
           }
         },
         {
@@ -12284,17 +12314,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 },
@@ -31979,7 +32042,8 @@ function useBulletinBoardRepo() {
     sort = {},
     site = "",
     status = "active",
-    recipients = []
+    recipients = [],
+    expiration
   }, session) {
     page = page > 0 ? page - 1 : 0;
     try {
@@ -31990,8 +32054,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 = {
@@ -32001,7 +32070,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 = (0, import_node_server_utils136.makeCacheKey)(
       bulletin_boards_namespace_collection,
@@ -32189,7 +32259,9 @@ function useBulletinBoardRepo() {
         { session }
       );
       if (res.matchedCount === 0) {
-        throw new import_node_server_utils136.NotFoundError("No upcoming bulletin boards found to activate.");
+        throw new import_node_server_utils136.NotFoundError(
+          "No upcoming bulletin boards found to activate."
+        );
       }
       delNamespace().then(() => {
         import_node_server_utils136.logger.info(
@@ -32375,32 +32447,35 @@ function useBulletinBoardController() {
       order: import_joi77.default.string().valid(...Object.values(BulletinOrder)).default("desc" /* DESC */),
       site: import_joi77.default.string().hex().length(24).required(),
       status: import_joi77.default.string().valid(...Object.values(BulletinStatus)).optional().default("active" /* ACTIVE */),
-      recipients: import_joi77.default.alternatives().try(
-        import_joi77.default.array().items(
-          import_joi77.default.string().valid(...Object.values(BulletinRecipient))
-        ),
-        import_joi77.default.string().allow("")
-      ).optional().allow(null).custom((value2, helpers) => {
-        if (!value2 || value2 === "") {
+      recipients: import_joi77.default.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: import_joi77.default.string().valid("yes", "no").optional().allow("", null)
     });
     const { error, value } = validation.validate(req.query, {
       abortEarly: false
@@ -32411,7 +32486,17 @@ function useBulletinBoardController() {
       next(new import_node_server_utils138.BadRequestError(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
     };
@@ -32423,7 +32508,8 @@ function useBulletinBoardController() {
         sort: sortObj,
         site,
         status,
-        recipients
+        recipients,
+        expiration
       });
       res.status(200).json(data);
       return;
@@ -40619,7 +40705,9 @@ function useBulletinVideoRepo() {
     page = 1,
     limit = 10,
     sort = {},
-    site = ""
+    site = "",
+    startDate,
+    endDate
   }, session) {
     page = page > 0 ? page - 1 : 0;
     try {
@@ -40627,10 +40715,33 @@ function useBulletinVideoRepo() {
     } catch (error) {
       throw new import_node_server_utils162.BadRequestError("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 = {
@@ -40639,7 +40750,9 @@ function useBulletinVideoRepo() {
       page,
       limit,
       status: { $ne: "deleted" },
-      ...search && { search }
+      ...search && { search },
+      ...startDate && { startDate },
+      ...endDate && { endDate }
     };
     if (search) {
       query.$or = [
@@ -40898,7 +41011,9 @@ function useBulletinVideoController() {
       limit: import_joi92.default.number().integer().min(1).max(100).allow("", null).default(10),
       sort: import_joi92.default.string().valid(...Object.values(BulletinVideoSort)).default("_id" /* ID */),
       order: import_joi92.default.string().valid(...Object.values(BulletinVideoOrder)).default("desc" /* DESC */),
-      site: import_joi92.default.string().hex().length(24).required()
+      site: import_joi92.default.string().hex().length(24).required(),
+      startDate: import_joi92.default.string().optional().allow("", null),
+      endDate: import_joi92.default.string().optional().allow("", null)
     });
     const { error, value } = validation.validate(req.query, {
       abortEarly: false
@@ -40909,7 +41024,7 @@ function useBulletinVideoController() {
       next(new import_node_server_utils164.BadRequestError(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
     };
@@ -40919,7 +41034,9 @@ function useBulletinVideoController() {
         page,
         limit,
         sort: sortObj,
-        site
+        site,
+        startDate,
+        endDate
       });
       res.status(200).json(data);
       return;