@7365admin1/core 2.61.0 → 2.62.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/core
 
+## 2.62.0
+
+### Minor Changes
+
+- 28c46de: get latest changes today
+
 ## 2.61.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -2081,7 +2081,7 @@ declare function useDahuaService(): {
     }) => Promise<urllib.HttpClientResponse<any>>;
 };
 
-type TVehicleUpdate = Partial<Pick<TVehicle, "name" | "phoneNumber" | "block" | "level" | "unit" | "plateNumber" | "recNo">>;
+type TVehicleUpdate = Partial<Pick<TVehicle, "name" | "phoneNumber" | "block" | "level" | "unit" | "plateNumber" | "recNo" | "type">>;
 declare enum VehicleType {
     WHITELIST = "whitelist",
     BLOCKLIST = "blocklist"
@@ -2300,6 +2300,8 @@ declare function useVehicleService(): {
             [key: number]: any;
         };
     }>;
+    blocklistVehicles: (_id: string, value: TVehicle) => Promise<void>;
+    removeFromBlocklist: (_id: string, value: TVehicle) => Promise<void>;
 };
 
 declare function useVehicleController(): {
@@ -2316,6 +2318,8 @@ declare function useVehicleController(): {
     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>;
+    blocklistVehicles: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    removeFromBlocklist: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
 declare function useSiteCameraRepo(): {
@@ -4733,6 +4737,11 @@ declare function UseAccessManagementRepo(): {
     visitorCheckoutRepo: ({ userId }: {
         userId: string;
     }) => Promise<string>;
+    uploadTemplateRepo: ({ site, id, name }: {
+        site: string | ObjectId;
+        id: string | ObjectId;
+        name: string;
+    }) => Promise<mongodb.UpdateResult<bson.Document>>;
 };
 
 declare function useAccessManagementController(): {
@@ -4775,6 +4784,7 @@ declare function useAccessManagementController(): {
     getTransactions: (req: Request, res: Response) => Promise<Response<any, Record<string, any>>>;
     assignMultipleCards: (req: Request, res: Response) => Promise<Response<any, Record<string, any>>>;
     visitorCheckout: (req: Request, res: Response) => Promise<Response<any, Record<string, any>>>;
+    uploadTemplate: (req: Request, res: Response) => Promise<Response<any, Record<string, any>>>;
 };
 
 declare const DEVICE_STATUS: {

package/dist/index.js

@@ -18292,6 +18292,167 @@ function useVehicleService() {
       throw error;
     }
   }
+  async function blocklistVehicles(_id, value) {
+    const session = import_node_server_utils75.useAtlas.getClient()?.startSession();
+    if (!session) {
+      throw new Error("Unable to start session for vehicle service.");
+    }
+    try {
+      session.startTransaction();
+      const vehicle = await _getVehicleById(_id);
+      const plate = vehicle.plates.find((p) => p._id.toString() === _id);
+      const _name = value.name ? value.name : vehicle.name;
+      const _plateNumber = plate?.plateNumber;
+      const _start = vehicle.start;
+      const _end = vehicle.end;
+      const _recNo = plate.recNo;
+      const _type = plate.type;
+      if (value.peopleId) {
+        value.peopleId = new import_mongodb46.ObjectId(value.peopleId);
+      }
+      const { site } = value;
+      const startDahua = formatDahuaDate(_start);
+      const endPlus24Hours = _end ? _end : new Date(new Date(_end).getTime() + 24 * 60 * 60 * 1e3);
+      const endDahua = formatDahuaDate(endPlus24Hours);
+      if (_plateNumber) {
+        const siteCameras = [];
+        let page = 1;
+        let pages = 1;
+        const limit = 20;
+        do {
+          const siteCameraReq = await _getAllSiteCameras({
+            site,
+            type: "anpr",
+            direction: ["both", "entry"],
+            page,
+            limit
+          });
+          pages = siteCameraReq.pages || 1;
+          siteCameras.push(...siteCameraReq.items);
+          page++;
+        } while (page < pages);
+        if (!siteCameras.length) {
+          throw new import_node_server_utils75.BadRequestError("No site cameras found.");
+        }
+        for (const camera of siteCameras) {
+          const { host, username, password } = camera;
+          const removePlateNumber = {
+            host,
+            username,
+            password,
+            mode: _type === "blocklist" /* BLOCKLIST */ ? "TrafficBlackList" /* TRAFFIC_BLACKLIST */ : "TrafficRedList" /* TRAFFIC_REDLIST */,
+            recno: _recNo
+          };
+          const responseForDeletion = await _removePlateNumber(
+            removePlateNumber
+          );
+          if (responseForDeletion?.statusCode !== 200) {
+            throw new import_node_server_utils75.BadRequestError("Failed to delete plate number to ANPR");
+          }
+          const dahuaPayload = {
+            host,
+            username,
+            password,
+            plateNumber: _plateNumber,
+            mode: "TrafficBlackList" /* TRAFFIC_BLACKLIST */,
+            owner: _name,
+            ...startDahua ? { start: startDahua } : {},
+            ...endDahua ? { end: endDahua } : {}
+          };
+          const dahuaResponse = await _addPlateNumber(dahuaPayload);
+          if (dahuaResponse?.statusCode !== 200) {
+            throw new import_node_server_utils75.BadRequestError("Failed to update plate number to ANPR");
+          }
+          const responseData = dahuaResponse?.data?.toString("utf-8") ?? "";
+          value.recNo = responseData.split("=")[1]?.trim();
+          const normalizedPlateNumber = _plateNumber;
+          if (value.peopleId && value.recNo) {
+            await _pushVehicleById(
+              value.peopleId,
+              {
+                plateNumber: normalizedPlateNumber,
+                recNo: value.recNo
+              },
+              session
+            );
+          }
+        }
+      }
+      const formattedValue = {
+        type: "blocklist" /* BLOCKLIST */,
+        recNo: value.recNo
+      };
+      await _updateVehicleById(_id, formattedValue, session);
+      await session.commitTransaction();
+    } catch (error) {
+      await session.abortTransaction();
+      throw error;
+    } finally {
+      session.endSession();
+    }
+  }
+  async function removeFromBlocklist(_id, value) {
+    const session = import_node_server_utils75.useAtlas.getClient()?.startSession();
+    if (!session) {
+      throw new Error("Unable to start session for vehicle service.");
+    }
+    try {
+      session.startTransaction();
+      const vehicle = await _getVehicleById(_id);
+      const plate = vehicle.plates.find((p) => p._id.toString() === _id);
+      const _plateNumber = plate?.plateNumber;
+      const _recNo = plate.recNo;
+      if (value.peopleId) {
+        value.peopleId = new import_mongodb46.ObjectId(value.peopleId);
+      }
+      const { site } = value;
+      if (_plateNumber) {
+        const siteCameras = [];
+        let page = 1;
+        let pages = 1;
+        const limit = 20;
+        do {
+          const siteCameraReq = await _getAllSiteCameras({
+            site,
+            type: "anpr",
+            direction: ["both", "entry"],
+            page,
+            limit
+          });
+          pages = siteCameraReq.pages || 1;
+          siteCameras.push(...siteCameraReq.items);
+          page++;
+        } while (page < pages);
+        if (!siteCameras.length) {
+          throw new import_node_server_utils75.BadRequestError("No site cameras found.");
+        }
+        for (const camera of siteCameras) {
+          const { host, username, password } = camera;
+          const removePlateNumber = {
+            host,
+            username,
+            password,
+            mode: "TrafficBlackList" /* TRAFFIC_BLACKLIST */,
+            recno: _recNo
+          };
+          console.log(removePlateNumber);
+          const responseForDeletion = await _removePlateNumber(
+            removePlateNumber
+          );
+          if (responseForDeletion?.statusCode !== 200) {
+            throw new import_node_server_utils75.BadRequestError("Failed to delete plate number to ANPR");
+          }
+        }
+      }
+      await _deleteVehicle(_id, session);
+      await session.commitTransaction();
+    } catch (error) {
+      await session.abortTransaction();
+      throw error;
+    } finally {
+      session.endSession();
+    }
+  }
   return {
     add,
     deleteVehicle,
@@ -18299,7 +18460,9 @@ function useVehicleService() {
     processDeletingExpiredVehicles,
     reactivateVehicleById,
     updateVehicleById,
-    bulkUpsertVehicles
+    bulkUpsertVehicles,
+    blocklistVehicles,
+    removeFromBlocklist
   };
 }
 
@@ -20650,7 +20813,7 @@ function useBuildingService() {
     getByBuildingLevel,
     updateLevelByBuildingLevel,
     updateByBuildingId,
-    add: _addBuildingUnit
+    bulkAddBuildingUnits: _bulkAddBuildingUnits
   } = useBuildingUnitRepo();
   const { updateStatusById } = useFileRepo();
   const { deleteFile } = useFileService();
@@ -20839,15 +21002,16 @@ function useBuildingService() {
                 companyName: "",
                 companyRegistrationNumber: "",
                 billing: [],
-                unitNumber: parseInt(unit.replace("Unit ", ""), 10) || null
+                unitNumber: parseInt(unit.replace("Unit ", ""), 10) || null,
+                createdAt: /* @__PURE__ */ new Date(),
+                updatedAt: "",
+                deletedAt: ""
               });
             });
           });
         }
       );
-      for (const buildingUnitPayload of buildingUnitPayloads) {
-        const result = await _addBuildingUnit(buildingUnitPayload);
-      }
+      await _bulkAddBuildingUnits(buildingUnitPayloads);
       await session?.commitTransaction();
       return { buildingPayloads, buildingUnitPayloads };
     } catch (error) {
@@ -21588,7 +21752,9 @@ function useVehicleController() {
     approveVehicleById: _approveVehicleById,
     reactivateVehicleById: _reactivateVehicleById,
     updateVehicleById: _updateVehicleById,
-    bulkUpsertVehicles: _bulkUpsertVehicles
+    bulkUpsertVehicles: _bulkUpsertVehicles,
+    blocklistVehicles: _blocklistVehicles,
+    removeFromBlocklist: _removeFromBlocklist
   } = useVehicleService();
   const {
     getSeasonPassTypes: _getSeasonPassTypes,
@@ -22165,6 +22331,68 @@ function useVehicleController() {
       return;
     }
   }
+  async function blocklistVehicles(req, res, next) {
+    try {
+      const schema2 = import_joi47.default.object({
+        _id: import_joi47.default.string().hex().length(24).required(),
+        site: import_joi47.default.string().hex().length(24).required(),
+        peopleId: import_joi47.default.string().hex().length(24).optional().allow(null, ""),
+        remarks: import_joi47.default.string().optional().allow("", null)
+      });
+      const { error, value } = schema2.validate(
+        {
+          _id: req.params.id,
+          ...req.body
+        },
+        { abortEarly: false }
+      );
+      if (error) {
+        const messages = error.details.map((d) => d.message).join(", ");
+        import_node_server_utils88.logger.log({ level: "error", message: messages });
+        next(new import_node_server_utils88.BadRequestError(messages));
+        return;
+      }
+      const { _id, ...rest } = value;
+      await _blocklistVehicles(_id, rest);
+      res.json({ message: "Successfully blocked vehicle." });
+      return;
+    } catch (error) {
+      import_node_server_utils88.logger.log({ level: "error", message: error.message });
+      next(error);
+      return;
+    }
+  }
+  async function removeFromBlocklist(req, res, next) {
+    try {
+      const schema2 = import_joi47.default.object({
+        _id: import_joi47.default.string().hex().length(24).required(),
+        site: import_joi47.default.string().hex().length(24).required(),
+        peopleId: import_joi47.default.string().hex().length(24).optional().allow(null, ""),
+        remarks: import_joi47.default.string().optional().allow("", null)
+      });
+      const { error, value } = schema2.validate(
+        {
+          _id: req.params.id,
+          ...req.body
+        },
+        { abortEarly: false }
+      );
+      if (error) {
+        const messages = error.details.map((d) => d.message).join(", ");
+        import_node_server_utils88.logger.log({ level: "error", message: messages });
+        next(new import_node_server_utils88.BadRequestError(messages));
+        return;
+      }
+      const { _id, ...rest } = value;
+      await _removeFromBlocklist(_id, rest);
+      res.json({ message: "Successfully removed vehicle from blocklist." });
+      return;
+    } catch (error) {
+      import_node_server_utils88.logger.log({ level: "error", message: error.message });
+      next(error);
+      return;
+    }
+  }
   return {
     add,
     getVehicles,
@@ -22178,7 +22406,9 @@ function useVehicleController() {
     getAllVehiclesByUnitId,
     uploadSpreadsheetVehicles,
     getSpecificVehicleById,
-    getBlocklistedVehicles
+    getBlocklistedVehicles,
+    blocklistVehicles,
+    removeFromBlocklist
   };
 }
 
@@ -31669,6 +31899,18 @@ function MBulletinBoard(value) {
       throw new Error("Invalid org ID.");
     }
   }
+  if (value.file && Array.isArray(value.file)) {
+    value.file = value.file.map((f) => {
+      if (f._id && typeof f._id === "string") {
+        try {
+          return { ...f, _id: new import_mongodb78.ObjectId(f._id) };
+        } catch {
+          throw new Error("Invalid file ID.");
+        }
+      }
+      return f;
+    });
+  }
   return {
     _id: value._id ?? new import_mongodb78.ObjectId(),
     site: value.site ?? "",
@@ -31987,7 +32229,7 @@ function useBulletinBoardService() {
     deleteBulletinBoardById: _deleteBulletinBoardById,
     getBulletinBoardById: _getBulletinBoardById
   } = useBulletinBoardRepo();
-  const { deleteFileById: _deleteFileById } = useFileRepo();
+  const { deleteFileById: _deleteFileById, updateStatusById } = useFileRepo();
   async function add(value) {
     const session = import_node_server_utils137.useAtlas.getClient()?.startSession();
     session?.startTransaction();
@@ -31995,6 +32237,21 @@ function useBulletinBoardService() {
       value.status = "upcoming" /* UPCOMING */;
     }
     try {
+      const bulletinFiles = value?.file ?? [];
+      if (bulletinFiles.length > 0) {
+        for (const bulletinFile of bulletinFiles) {
+          if (!bulletinFile._id)
+            continue;
+          const file = await updateStatusById(
+            bulletinFile._id.toString(),
+            { status: "active" },
+            session
+          );
+          if (!file) {
+            throw new import_node_server_utils137.NotFoundError("File not found.");
+          }
+        }
+      }
       await _add(value, session);
       await session?.commitTransaction();
       return "Successfully added bulletin board.";
@@ -37756,6 +38013,19 @@ function UseAccessManagementRepo() {
       await session?.endSession();
     }
   }
+  async function uploadTemplateRepo({ site, id, name }) {
+    site = new import_mongodb90.ObjectId(site);
+    id = new import_mongodb90.ObjectId(id);
+    try {
+      const result = await collectionName("sites").updateOne(
+        { _id: site },
+        { $set: { "siteSettings.entryPass.settings.template": { id, name } } }
+      );
+      return result;
+    } catch (error) {
+      throw new Error(error.message);
+    }
+  }
   return {
     createIndexes,
     createIndexForEntrypass,
@@ -37790,7 +38060,8 @@ function UseAccessManagementRepo() {
     indexCombination,
     getTransactionsRepo,
     assignMultipleCardsRepo,
-    visitorCheckoutRepo
+    visitorCheckoutRepo,
+    uploadTemplateRepo
   };
 }
 
@@ -37833,7 +38104,8 @@ function useAccessManagementSvc() {
     getBlockLevelAndUnitListRepo,
     getTransactionsRepo,
     assignMultipleCardsRepo,
-    visitorCheckoutRepo
+    visitorCheckoutRepo,
+    uploadTemplateRepo
   } = UseAccessManagementRepo();
   const addPhysicalCardSvc = async (payload) => {
     try {
@@ -38146,7 +38418,15 @@ function useAccessManagementSvc() {
       const response = await visitorCheckoutRepo({ userId });
       return response;
     } catch (err) {
-      return Promise.reject("Server internal error.");
+      throw new Error(err.message);
+    }
+  };
+  const uploadTemplateSvc = async ({ site, id, name }) => {
+    try {
+      const response = await uploadTemplateRepo({ site, id, name });
+      return response;
+    } catch (err) {
+      throw new Error(err.message);
     }
   };
   return {
@@ -38186,7 +38466,8 @@ function useAccessManagementSvc() {
     getBlockLevelAndUnitListSvc,
     getTransactionsSvc,
     assignMultipleCardsSvc,
-    visitorCheckoutSvc
+    visitorCheckoutSvc,
+    uploadTemplateSvc
   };
 }
 
@@ -38229,7 +38510,8 @@ function useAccessManagementController() {
     getBlockLevelAndUnitListSvc,
     getTransactionsSvc,
     assignMultipleCardsSvc,
-    visitorCheckoutSvc
+    visitorCheckoutSvc,
+    uploadTemplateSvc
   } = useAccessManagementSvc();
   const addPhysicalCard = async (req, res) => {
     try {
@@ -39046,7 +39328,32 @@ function useAccessManagementController() {
       const result = await visitorCheckoutSvc({ userId });
       return res.status(200).json({ message: "Success", data: result });
     } catch (error) {
-      return Promise.reject("Internal Server Error");
+      return res.status(400).json({
+        data: null,
+        message: error.message
+      });
+    }
+  };
+  const uploadTemplate = async (req, res) => {
+    try {
+      const { site } = req.query;
+      const { id, name } = req.body;
+      const schema2 = import_joi86.default.object({
+        site: import_joi86.default.string().hex().required(),
+        id: import_joi86.default.string().hex().required(),
+        name: import_joi86.default.string().required()
+      });
+      const { error } = schema2.validate({ site, id, name });
+      if (error) {
+        return res.status(400).json({ message: error.message });
+      }
+      const result = await uploadTemplateSvc({ site, id, name });
+      return res.status(200).json({ message: "Success", data: result });
+    } catch (error) {
+      return res.status(400).json({
+        data: null,
+        message: error.message
+      });
     }
   };
   return {
@@ -39084,7 +39391,8 @@ function useAccessManagementController() {
     getBlockLevelAndUnitList,
     getTransactions: getTransactions2,
     assignMultipleCards,
-    visitorCheckout
+    visitorCheckout,
+    uploadTemplate
   };
 }
 
@@ -40487,11 +40795,22 @@ function useBulletinVideoService() {
     deleteBulletinVideoById: _deleteBulletinVideoById,
     getBulletinVideoById: _getBulletinVideoById
   } = useBulletinVideoRepo();
-  const { deleteFileById: _deleteFileById } = useFileRepo();
+  const { deleteFileById: _deleteFileById, updateStatusById } = useFileRepo();
   async function add(value) {
     const session = import_node_server_utils163.useAtlas.getClient()?.startSession();
     session?.startTransaction();
     try {
+      const bulletinVideo = value.file;
+      if (bulletinVideo) {
+        const file = await updateStatusById(
+          bulletinVideo,
+          { status: "active" },
+          session
+        );
+        if (!file) {
+          throw new import_node_server_utils163.NotFoundError("File not found.");
+        }
+      }
       await _add(value, session);
       await session?.commitTransaction();
       return "Successfully added bulletin video.";