@7365admin1/core 2.57.0 → 2.59.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/core
 
+## 2.59.0
+
+### Minor Changes
+
+- 2da0ba6: get latest changes 13-05-2026 16:18
+
+## 2.58.0
+
+### Minor Changes
+
+- 36f6c2d: get latest changes for bulletin board api,etc.
+
 ## 2.57.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -2217,6 +2217,16 @@ declare function useVehicleRepo(): {
         };
     }>;
     getSpecificVehicleById: (_id: string | ObjectId) => Promise<mongodb.WithId<bson.Document>>;
+    getBlocklistedVehicles: ({ page, limit, search, site, }: {
+        page?: number | undefined;
+        limit?: number | undefined;
+        search?: string | undefined;
+        site?: string | undefined;
+    }) => Promise<{
+        items: any[];
+        pages: number;
+        pageRange: string;
+    }>;
 };
 
 declare function formatDahuaDate(date: Date): string;
@@ -2264,6 +2274,7 @@ declare function useVehicleController(): {
     getAllVehiclesByUnitId: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     uploadSpreadsheetVehicles: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getSpecificVehicleById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    getBlocklistedVehicles: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
 declare function useSiteCameraRepo(): {
@@ -3746,6 +3757,7 @@ declare enum BulletinRecipient {
 }
 declare enum BulletinStatus {
     ACTIVE = "active",
+    UPCOMING = "upcoming",
     EXPIRED = "expired",
     DELETED = "deleted"
 }
@@ -3820,6 +3832,7 @@ declare function useBulletinBoardRepo(): {
     getBulletinBoardById: (_id: string | ObjectId, session?: ClientSession) => Promise<mongodb.WithId<bson.Document> | TBulletinBoard>;
     updateBulletinBoardById: (_id: ObjectId | string, value: Partial<TBulletinBoard>, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
     processExpiredBulletinBoards: (session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
+    processUpcomingBulletinBoards: (session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
     deleteBulletinBoardById: (_id: string | ObjectId, session?: ClientSession) => Promise<number>;
     createIndexes: () => Promise<void>;
 };
@@ -3828,6 +3841,7 @@ declare function useBulletinBoardService(): {
     add: (value: TBulletinBoard) => Promise<string>;
     updateBulletinBoardById: (id: string | ObjectId, value: Partial<TBulletinBoard>) => Promise<string>;
     processExpiredBulletinBoards: () => Promise<void>;
+    processUpcomingBulletinBoards: () => Promise<void>;
     deleteBulletinBoardById: (id: string | ObjectId) => Promise<string>;
 };
 

package/dist/index.js

@@ -15243,6 +15243,74 @@ function useVehicleRepo() {
       throw new Error("Failed to bulk upsert vehicles.");
     }
   }
+  async function getBlocklistedVehicles({
+    page = 1,
+    limit = 10,
+    search = "",
+    site = ""
+  }) {
+    page = page > 0 ? page - 1 : 0;
+    const baseQuery = {
+      type: "blocklist" /* BLOCKLIST */,
+      ...site && {
+        site: typeof site === "string" ? new import_mongodb42.ObjectId(site) : site
+      }
+    };
+    let query = {
+      ...baseQuery,
+      ...search && { $text: { $search: search } }
+    };
+    const escapeRegex = (input) => input.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    const buildPipeline = (matchQuery) => [
+      { $match: matchQuery },
+      {
+        $addFields: {
+          latestDate: { $max: ["$createdAt", "$updatedAt"] }
+        }
+      },
+      { $sort: { latestDate: -1 } },
+      { $skip: page * limit },
+      { $limit: limit },
+      {
+        $project: {
+          latestDate: 0
+        }
+      }
+    ];
+    const buildCountPipeline = (matchQuery) => [
+      { $match: matchQuery },
+      { $count: "total" }
+    ];
+    try {
+      let items = [];
+      let length = 0;
+      items = await collection.aggregate(buildPipeline(query)).toArray();
+      const countResult = await collection.aggregate(buildCountPipeline(query)).toArray();
+      length = countResult[0]?.total || 0;
+      if ((!items || items.length === 0) && search) {
+        const escaped = escapeRegex(search);
+        const regexQuery = {
+          ...baseQuery,
+          $or: [
+            { name: { $regex: escaped, $options: "i" } },
+            { plateNumber: { $regex: escaped, $options: "i" } },
+            { company: { $regex: escaped, $options: "i" } },
+            { level: { $regex: escaped, $options: "i" } },
+            { unitName: { $regex: escaped, $options: "i" } },
+            { contact: { $regex: escaped, $options: "i" } },
+            { nric: { $regex: escaped, $options: "i" } }
+          ]
+        };
+        items = await collection.aggregate(buildPipeline(regexQuery)).toArray();
+        const regexCountResult = await collection.aggregate(buildCountPipeline(regexQuery)).toArray();
+        length = regexCountResult[0]?.total || 0;
+      }
+      const data = (0, import_node_server_utils70.paginate)(items, page, limit, length);
+      return data;
+    } catch (error) {
+      throw error;
+    }
+  }
   return {
     createIndex,
     createTextIndex,
@@ -15259,7 +15327,8 @@ function useVehicleRepo() {
     getAllVehiclesByUnitId,
     getAllExpiredVehicles,
     bulkUpsertVehicles,
-    getSpecificVehicleById
+    getSpecificVehicleById,
+    getBlocklistedVehicles
   };
 }
 
@@ -20695,7 +20764,8 @@ function useVehicleController() {
     getVehicleById: _getVehicleById,
     getVehiclesByNRIC: _getVehiclesByNRIC,
     getAllVehiclesByUnitId: _getAllVehiclesByUnitId,
-    getSpecificVehicleById: _getSpecificVehicleById
+    getSpecificVehicleById: _getSpecificVehicleById,
+    getBlocklistedVehicles: _getBlocklistedVehicles
   } = useVehicleRepo();
   function normalizeRow(row) {
     return Object.fromEntries(
@@ -21231,6 +21301,38 @@ function useVehicleController() {
       return;
     }
   }
+  async function getBlocklistedVehicles(req, res, next) {
+    const schema2 = import_joi46.default.object({
+      search: import_joi46.default.string().optional().allow("", null),
+      page: import_joi46.default.number().integer().min(1).optional().default(1),
+      limit: import_joi46.default.number().integer().min(1).max(100).optional().default(10),
+      site: import_joi46.default.string().hex().length(24).optional().allow(null, "")
+    });
+    const { error, value } = schema2.validate(req.query, {
+      abortEarly: false
+    });
+    if (error) {
+      const messages = error.details.map((d) => d.message).join(", ");
+      import_node_server_utils87.logger.log({ level: "error", message: messages });
+      next(new import_node_server_utils87.BadRequestError(messages));
+      return;
+    }
+    const { search, page, limit, site } = value;
+    try {
+      const data = await _getBlocklistedVehicles({
+        search,
+        page,
+        limit,
+        site
+      });
+      res.json(data);
+      return;
+    } catch (error2) {
+      import_node_server_utils87.logger.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   return {
     add,
     getVehicles,
@@ -21243,7 +21345,8 @@ function useVehicleController() {
     reactivateVehicleById,
     getAllVehiclesByUnitId,
     uploadSpreadsheetVehicles,
-    getSpecificVehicleById
+    getSpecificVehicleById,
+    getBlocklistedVehicles
   };
 }
 
@@ -30649,6 +30752,7 @@ var BulletinRecipient = /* @__PURE__ */ ((BulletinRecipient2) => {
 })(BulletinRecipient || {});
 var BulletinStatus = /* @__PURE__ */ ((BulletinStatus2) => {
   BulletinStatus2["ACTIVE"] = "active";
+  BulletinStatus2["UPCOMING"] = "upcoming";
   BulletinStatus2["EXPIRED"] = "expired";
   BulletinStatus2["DELETED"] = "deleted";
   return BulletinStatus2;
@@ -30993,12 +31097,48 @@ function useBulletinBoardRepo() {
       throw error;
     }
   }
+  async function processUpcomingBulletinBoards(session) {
+    const now = (/* @__PURE__ */ new Date()).toISOString();
+    const query = {
+      status: "upcoming" /* UPCOMING */,
+      startDate: { $lte: now }
+    };
+    try {
+      const res = await collection.updateMany(
+        query,
+        {
+          $set: {
+            status: "active" /* ACTIVE */,
+            updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+          }
+        },
+        { session }
+      );
+      if (res.matchedCount === 0) {
+        throw new import_node_server_utils135.NotFoundError("No upcoming bulletin boards found to activate.");
+      }
+      delNamespace().then(() => {
+        import_node_server_utils135.logger.info(
+          `Cache cleared for namespace: ${bulletin_boards_namespace_collection}`
+        );
+      }).catch((err) => {
+        import_node_server_utils135.logger.error(
+          `Failed to clear cache for namespace: ${bulletin_boards_namespace_collection}`,
+          err
+        );
+      });
+      return res;
+    } catch (error) {
+      throw error;
+    }
+  }
   return {
     add,
     getAll,
     getBulletinBoardById,
     updateBulletinBoardById,
     processExpiredBulletinBoards,
+    processUpcomingBulletinBoards,
     deleteBulletinBoardById,
     createIndexes
   };
@@ -31011,6 +31151,7 @@ function useBulletinBoardService() {
     add: _add,
     updateBulletinBoardById: _updateBulletinBoardById,
     processExpiredBulletinBoards: _processExpiredBulletinBoards,
+    processUpcomingBulletinBoards: _processUpcomingBulletinBoards,
     deleteBulletinBoardById: _deleteBulletinBoardById,
     getBulletinBoardById: _getBulletinBoardById
   } = useBulletinBoardRepo();
@@ -31018,6 +31159,9 @@ function useBulletinBoardService() {
   async function add(value) {
     const session = import_node_server_utils136.useAtlas.getClient()?.startSession();
     session?.startTransaction();
+    if (value.startDate && new Date(value.startDate) > /* @__PURE__ */ new Date()) {
+      value.status = "upcoming" /* UPCOMING */;
+    }
     try {
       await _add(value, session);
       await session?.commitTransaction();
@@ -31043,6 +31187,20 @@ function useBulletinBoardService() {
       session?.endSession();
     }
   }
+  async function processUpcomingBulletinBoards() {
+    const session = import_node_server_utils136.useAtlas.getClient()?.startSession();
+    session?.startTransaction();
+    try {
+      await _processUpcomingBulletinBoards(session);
+      await session?.commitTransaction();
+      return;
+    } catch (error) {
+      await session?.abortTransaction();
+      throw error;
+    } finally {
+      session?.endSession();
+    }
+  }
   async function processExpiredBulletinBoards() {
     const session = import_node_server_utils136.useAtlas.getClient()?.startSession();
     session?.startTransaction();
@@ -31084,6 +31242,7 @@ function useBulletinBoardService() {
     add,
     updateBulletinBoardById,
     processExpiredBulletinBoards,
+    processUpcomingBulletinBoards,
     deleteBulletinBoardById
   };
 }
@@ -32676,14 +32835,15 @@ function useEventManagementRepo() {
     } catch (error) {
       throw new import_node_server_utils146.BadRequestError("Invalid site ID format.");
     }
+    const datePart = date ? new Date(date).toISOString().split("T")[0] : "";
     const baseQuery = {
       site,
       status: status ? status : { $ne: "deleted" },
       ...type && { type },
-      ...date && {
+      ...datePart && {
         dateTime: {
-          $gte: `${date}T00:00:00.000Z`,
-          $lt: `${date}T23:59:59.999Z`
+          $gte: /* @__PURE__ */ new Date(`${datePart}T00:00:00.000Z`),
+          $lte: /* @__PURE__ */ new Date(`${datePart}T23:59:59.999Z`)
         }
       }
     };
@@ -32696,7 +32856,7 @@ function useEventManagementRepo() {
       page,
       limit,
       ...type && { type },
-      ...date && { dateTime: date }
+      ...datePart && { dateTime: datePart }
     };
     if (search) {
       query.$or = [{ title: { $regex: search, $options: "i" } }];