@7365admin1/core 2.44.0 → 2.45.0

package/dist/index.mjs

@@ -2606,7 +2606,8 @@ function useUserRepo() {
       "dateOfBirth",
       "profile",
       "gender",
-      "defaultOrg"
+      "defaultOrg",
+      "status"
     ];
     if (!allowedFields.includes(field)) {
       throw new BadRequestError9(
@@ -16558,10 +16559,13 @@ function useVehicleService() {
     pullVehicleByRecNo: _pullVehicleByRecNo
   } = usePersonRepo();
   const { getUnitByBlockLevelUnitNumber: _getUnitByBlockLevelUnitNumber } = useBuildingUnitRepo();
-  async function add(value) {
-    const session = useAtlas35.getClient()?.startSession();
+  async function add(value, session) {
+    const isExternalSession = !!session;
     if (!session) {
-      throw new Error("Unable to start session for vehicle service.");
+      session = await useAtlas35.getClient()?.startSession();
+      if (!session) {
+        throw new Error("Unable to start session for vehicle service.");
+      }
     }
     const [_vehiclePlateNumber] = value.plateNumber;
     const [existingPlateNumber, org] = await Promise.all([
@@ -16618,7 +16622,9 @@ function useVehicleService() {
     const owner = value.name;
     const plateNumbers = value.plateNumber;
     try {
-      session.startTransaction();
+      if (!isExternalSession) {
+        session.startTransaction();
+      }
       let message = "Vehicle plate number needs approval from property management.";
       let siteCameras = [];
       if (value.status && value.status !== "pending" /* PENDING */) {
@@ -16716,14 +16722,20 @@ function useVehicleService() {
         }
         await _add(vehicleValue, session);
       }
-      await session.commitTransaction();
+      if (!isExternalSession) {
+        await session.commitTransaction();
+      }
       return message;
     } catch (error) {
       logger54.error("Error in vehicle service add:", error);
-      await session.abortTransaction();
+      if (!isExternalSession) {
+        await session.abortTransaction();
+      }
       throw error;
     } finally {
-      session.endSession();
+      if (!isExternalSession) {
+        session.endSession();
+      }
     }
   }
   async function deleteVehicle(_id, recno, site, type, bypass = false) {
@@ -23994,6 +24006,7 @@ function usePersonService() {
   const { updateStatusById } = useFileRepo();
   const { getById: getOrgById } = useOrgRepo();
   const { getSiteById } = useSiteRepo();
+  const { add: addVehicle } = useVehicleService();
   async function add(value) {
     const session = useAtlas52.getClient()?.startSession();
     if (!session) {
@@ -24027,7 +24040,7 @@ function usePersonService() {
           email: value.email,
           password: hashedPassword,
           name: value.name,
-          status: value.platform == "mobile" ? "deleted" : "active",
+          status: value.platform == "mobile" ? "pending" : "active",
           defaultOrg: value.org?.toString() || ""
         };
         const userId = await addUser(user, session);
@@ -24148,6 +24161,9 @@ function usePersonService() {
     const session = useAtlas52.getClient()?.startSession();
     session?.startTransaction();
     try {
+      const person = await _getById(id.toString());
+      if (!person)
+        throw new BadRequestError101("Person not found.");
       if (value.approvedBy) {
         const approvedBy = await getUserById(value.approvedBy.id);
         if (!approvedBy || !approvedBy.name)
@@ -24155,9 +24171,51 @@ function usePersonService() {
         value.approvedBy.name = approvedBy.name;
         value.approvedBy.id = approvedBy._id;
       }
+      const vehicle = {
+        plateNumber: person.plateNumber || "",
+        type: "whitelist",
+        category: person.type || "",
+        name: person.name,
+        phoneNumber: person.contact,
+        org: person.org.toString(),
+        site: person.site.toString(),
+        block: person.block,
+        level: person.level,
+        unit: person.unit.toString(),
+        nric: person.nric,
+        status: "active",
+        peopleId: person._id?.toString()
+      };
+      const reviewStatus = value.status;
+      if (reviewStatus === "approved") {
+        value.status = "active";
+      }
       await _reviewResidentPerson(id, value, session);
+      if (person.user) {
+        let userStatus;
+        switch (reviewStatus) {
+          case "approved":
+            userStatus = "active";
+            if (person.plateNumber && person.plateNumber.trim() !== "") {
+              await addVehicle(vehicle, session);
+            }
+            break;
+          case "resubmit":
+            userStatus = "resubmit";
+            break;
+          case "rejected":
+            userStatus = "rejected";
+            break;
+          default:
+            throw new Error("Invalid review status");
+        }
+        await _updateUserFieldById(
+          { _id: person.user.toString(), field: "status", value: userStatus },
+          session
+        );
+      }
       await session?.commitTransaction();
-      return `Successfully ${value.status} person`;
+      return `Successfully ${reviewStatus} person`;
     } catch (error) {
       await session?.abortTransaction();
       throw error;
@@ -29823,21 +29881,23 @@ function useBulletinBoardController() {
     }
   }
   async function getBulletinBoardById(req, res, next) {
-    const validation = Joi76.string().hex().required();
-    const _id = req.params.id;
-    const { error } = validation.validate(_id);
-    if (error) {
-      logger106.log({ level: "error", message: error.message });
-      next(new BadRequestError127(error.message));
-      return;
-    }
     try {
+      const schema2 = Joi76.object({
+        _id: Joi76.string().hex().length(24).required()
+      });
+      const { error, value } = schema2.validate({ _id: req.params.id });
+      if (error) {
+        logger106.log({ level: "error", message: error.message });
+        next(new BadRequestError127(error.message));
+        return;
+      }
+      const { _id } = value;
       const data = await _getBulletinBoardById(_id);
       res.status(200).json(data);
       return;
-    } catch (error2) {
-      logger106.log({ level: "error", message: error2.message });
-      next(error2);
+    } catch (error) {
+      logger106.log({ level: "error", message: error.message });
+      next(error);
       return;
     }
   }
@@ -31171,7 +31231,7 @@ var schemaEventManagement = Joi81.object({
   site: Joi81.string().required(),
   title: Joi81.string().required(),
   description: Joi81.string().optional().allow(""),
-  dateTime: Joi81.alternatives().try(Joi81.string(), Joi81.date()).required(),
+  dateTime: Joi81.date().iso().required(),
   status: Joi81.string().optional().default("planned"),
   type: Joi81.string().optional().default("TASK")
 });
@@ -31179,7 +31239,7 @@ var schemaUpdateEventManagement = Joi81.object({
   _id: Joi81.string().hex().required(),
   title: Joi81.string().optional().allow(null, ""),
   description: Joi81.string().optional().allow(null, ""),
-  dateTime: Joi81.alternatives().try(Joi81.string(), Joi81.date()).optional().allow(null, ""),
+  dateTime: Joi81.date().iso().optional().allow(null, ""),
   status: Joi81.string().optional().allow(null, ""),
   type: Joi81.string().optional().allow(null, "")
 });
@@ -31203,10 +31263,10 @@ function MEventManagement(value) {
     site: value.site,
     title: value.title,
     description: value.description ?? "",
-    dateTime: value.dateTime,
+    dateTime: new Date(value.dateTime),
     status: value.status ?? "planned",
     type: value.type ?? "TASK",
-    createdAt: value.createdAt ?? (/* @__PURE__ */ new Date()).toISOString(),
+    createdAt: value.createdAt ?? /* @__PURE__ */ new Date(),
     updatedAt: value.updatedAt,
     deletedAt: value.deletedAt
   };
@@ -31393,7 +31453,7 @@ function useEventManagementRepo() {
     }
   }
   async function updateEventManagementById(_id, value, session) {
-    value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+    value.updatedAt = /* @__PURE__ */ new Date();
     try {
       _id = new ObjectId85(_id);
     } catch (error) {
@@ -31439,8 +31499,7 @@ function useEventManagementRepo() {
     try {
       const updateValue = {
         status: "deleted",
-        updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
-        deletedAt: (/* @__PURE__ */ new Date()).toISOString()
+        deletedAt: /* @__PURE__ */ new Date()
       };
       const res = await collection.updateOne({ _id }, { $set: updateValue });
       if (res.modifiedCount === 0) {
@@ -31533,7 +31592,12 @@ function useEventManagementService() {
     const session = useAtlas73.getClient()?.startSession();
     session?.startTransaction();
     try {
-      await _updateEventManagementById(id, value, session);
+      const updatedValue = {
+        ...value.dateTime && { dateTime: new Date(value.dateTime) },
+        ...value.title && { title: value.title },
+        ...value.description && { description: value.description }
+      };
+      await _updateEventManagementById(id, updatedValue, session);
       await session?.commitTransaction();
       return "Successfully updated event.";
     } catch (error) {
@@ -33062,7 +33126,7 @@ var minifyXml = (xml) => {
 };
 var readTemplate = (name, params) => {
   const template = fs2.readFileSync(
-    path2.join(__dirname, `../src/public/xml-templates/${name}.xml`),
+    path2.join(__dirname, `../dist/public/xml-templates/${name}.xml`),
     "utf-8"
   );
   if (!params)
@@ -37500,6 +37564,17 @@ function useOccurrenceBookController() {
 // src/models/bulletin-video.model.ts
 import { ObjectId as ObjectId95 } from "mongodb";
 import Joi90 from "joi";
+var BulletinVideoSort = /* @__PURE__ */ ((BulletinVideoSort2) => {
+  BulletinVideoSort2["CREATED_AT"] = "createdAt";
+  BulletinVideoSort2["NAME"] = "name";
+  BulletinVideoSort2["ID"] = "_id";
+  return BulletinVideoSort2;
+})(BulletinVideoSort || {});
+var BulletinVideoOrder = /* @__PURE__ */ ((BulletinVideoOrder2) => {
+  BulletinVideoOrder2["ASC"] = "asc";
+  BulletinVideoOrder2["DESC"] = "desc";
+  return BulletinVideoOrder2;
+})(BulletinVideoOrder || {});
 var schemaBulletinVideo = Joi90.object({
   site: Joi90.string().hex().required(),
   title: Joi90.string().optional().allow(null, ""),
@@ -37837,39 +37912,35 @@ function useBulletinVideoController() {
     deleteBulletinVideoById: _deleteBulletinVideoById
   } = useBulletinVideoRepo();
   async function add(req, res, next) {
-    const payload = { ...req.body };
-    const { error } = schemaBulletinVideo.validate(payload, {
-      abortEarly: false
-    });
-    if (error) {
-      const messages = error.details.map((d) => d.message).join(", ");
-      logger127.log({ level: "error", message: messages });
-      next(new BadRequestError150(messages));
-      return;
-    }
     try {
-      const data = await _add(payload);
+      const { error, value } = schemaBulletinVideo.validate(req.body, {
+        abortEarly: false
+      });
+      if (error) {
+        const messages = error.details.map((d) => d.message).join(", ");
+        logger127.log({ level: "error", message: messages });
+        next(new BadRequestError150(messages));
+        return;
+      }
+      const data = await _add(value);
       res.status(201).json(data);
       return;
-    } catch (error2) {
-      logger127.log({ level: "error", message: error2.message });
-      next(error2);
+    } catch (error) {
+      logger127.log({ level: "error", message: error.message });
+      next(error);
       return;
     }
   }
   async function getAll(req, res, next) {
-    const allowedFields = ["createdAt", "name"];
-    const allowedOrder = ["asc", "desc"];
     const validation = Joi91.object({
       search: Joi91.string().optional().allow("", null),
       page: Joi91.number().integer().min(1).allow("", null).default(1),
       limit: Joi91.number().integer().min(1).max(100).allow("", null).default(10),
-      sort: Joi91.string().pattern(/^([a-zA-Z0-9_]+)(,[a-zA-Z0-9_]+)*$/).optional().allow("", ...allowedFields),
-      order: Joi91.string().pattern(/^(asc|desc)(,(asc|desc))*$/).optional().allow("", ...allowedOrder),
-      site: Joi91.string().hex().required()
+      sort: Joi91.string().valid(...Object.values(BulletinVideoSort)).default("_id" /* ID */),
+      order: Joi91.string().valid(...Object.values(BulletinVideoOrder)).default("desc" /* DESC */),
+      site: Joi91.string().hex().length(24).required()
     });
-    const query = { ...req.query };
-    const { error } = validation.validate(query, {
+    const { error, value } = validation.validate(req.query, {
       abortEarly: false
     });
     if (error) {
@@ -37878,19 +37949,10 @@ function useBulletinVideoController() {
       next(new BadRequestError150(messages));
       return;
     }
-    const search = req.query.search ?? "";
-    const page = parseInt(req.query.page ?? "1");
-    const limit = parseInt(req.query.limit ?? "10");
-    const site = req.query.site ?? "";
-    const sortObj = {};
-    const sortFields = String(req.query.sort).split(",");
-    const sortOrders = String(req.query.order).split(",");
-    sortFields.forEach((field, index) => {
-      if (allowedFields.includes(field)) {
-        const order = sortOrders[index] === "asc" ? 1 : -1;
-        sortObj[field] = order;
-      }
-    });
+    const { search, page, limit, site, sort, order } = value;
+    const sortObj = {
+      [sort ?? "_id" /* ID */]: order === "asc" /* ASC */ ? 1 : -1
+    };
     try {
       const data = await _getAll({
         search,
@@ -37908,21 +37970,23 @@ function useBulletinVideoController() {
     }
   }
   async function getBulletinVideoById(req, res, next) {
-    const validation = Joi91.string().hex().required();
-    const _id = req.params.id;
-    const { error } = validation.validate(_id);
-    if (error) {
-      logger127.log({ level: "error", message: error.message });
-      next(new BadRequestError150(error.message));
-      return;
-    }
     try {
+      const schema2 = Joi91.object({
+        _id: Joi91.string().hex().length(24).required()
+      });
+      const { error, value } = schema2.validate({ _id: req.params.id });
+      if (error) {
+        logger127.log({ level: "error", message: error.message });
+        next(new BadRequestError150(error.message));
+        return;
+      }
+      const { _id } = value;
       const data = await _getBulletinVideoById(_id);
       res.status(200).json(data);
       return;
-    } catch (error2) {
-      logger127.log({ level: "error", message: error2.message });
-      next(error2);
+    } catch (error) {
+      logger127.log({ level: "error", message: error.message });
+      next(error);
       return;
     }
   }
@@ -37949,21 +38013,23 @@ function useBulletinVideoController() {
     }
   }
   async function deleteBulletinVideoById(req, res, next) {
-    const validation = Joi91.string().hex().required();
-    const _id = req.params.id;
-    const { error } = validation.validate(_id);
-    if (error) {
-      logger127.log({ level: "error", message: error.message });
-      next(new BadRequestError150(error.message));
-      return;
-    }
     try {
+      const schema2 = Joi91.object({
+        _id: Joi91.string().hex().length(24).required()
+      });
+      const { error, value } = schema2.validate({ _id: req.params.id });
+      if (error) {
+        logger127.log({ level: "error", message: error.message });
+        next(new BadRequestError150(error.message));
+        return;
+      }
+      const { _id } = value;
       await _deleteBulletinVideoById(_id);
       res.status(200).json({ message: "Successfully deleted bulletin video." });
       return;
-    } catch (error2) {
-      logger127.log({ level: "error", message: error2.message });
-      next(error2);
+    } catch (error) {
+      logger127.log({ level: "error", message: error.message });
+      next(error);
       return;
     }
   }
@@ -50386,6 +50452,8 @@ export {
   BulletinRecipient,
   BulletinSort,
   BulletinStatus,
+  BulletinVideoOrder,
+  BulletinVideoSort,
   CameraType,
   DEVICE_STATUS,
   DOBStatus,