@7365admin1/core 3.1.0 → 3.3.0

package/dist/index.js

@@ -6064,6 +6064,7 @@ __export(src_exports, {
   poolDashboardCollection: () => poolDashboardCollection,
   promoCodeSchema: () => promoCodeSchema,
   remarksSchema: () => remarksSchema,
+  residentFormEntry: () => residentFormEntry,
   robotSchema: () => robotSchema,
   schema: () => schema,
   schemaApprovedBy: () => schemaApprovedBy,
@@ -25443,6 +25444,9 @@ function useBuildingUnitRepo() {
   }
   const collection = db.collection(building_units_namespace_collection);
   const visitorCollection = db.collection(visitors_namespace_collection);
+  const buildingUnitCollection = db.collection(
+    site_people_namespace_collection
+  );
   const { getCache, setCache, delNamespace, delCache } = (0, import_node_server_utils76.useCache)(
     building_units_namespace_collection
   );
@@ -25524,10 +25528,8 @@ function useBuildingUnitRepo() {
     } catch (error2) {
       throw new import_node_server_utils76.BadRequestError("Invalid ID.");
     }
-    try {
+    if (value.level) {
       value.level = new import_mongodb47.ObjectId(value.level);
-    } catch (error2) {
-      throw new import_node_server_utils76.BadRequestError("Invalid level ID.");
     }
     if (value.billing && Array.isArray(value.billing)) {
       value.billing = value.billing.map((billing) => {
@@ -25975,6 +25977,12 @@ function useBuildingUnitRepo() {
       throw new import_node_server_utils76.BadRequestError("Invalid ID.");
     }
     try {
+      const existingResidents = await buildingUnitCollection.find({ unit: _id }).toArray();
+      if (existingResidents && existingResidents.length > 0) {
+        throw new import_node_server_utils76.BadRequestError(
+          `Cannot delete unit: ${existingResidents.length} resident/s is currently assigned.`
+        );
+      }
       const res = await collection.updateOne(
         { _id },
         { $set: { status: "deleted", deletedAt: /* @__PURE__ */ new Date() } },
@@ -27803,24 +27811,30 @@ function useBuildingRepo() {
     }
   }
   async function updateById(_id, value, session) {
-    const { error } = schemaBuildingUpdateOptions.validate(value);
-    if (error) {
-      import_node_server_utils83.logger.info(`Building Repository: ${error.message}`);
-      throw new import_node_server_utils83.BadRequestError(error.message);
-    }
     try {
-      _id = new import_mongodb50.ObjectId(_id);
-    } catch (error2) {
-      throw new import_node_server_utils83.BadRequestError("Invalid ID.");
-    }
-    if (value.levels && Array.isArray(value.levels)) {
+      const { error } = schemaBuildingUpdateOptions.validate(value);
+      if (error) {
+        import_node_server_utils83.logger.info(`Building Repository: ${error.message}`);
+        throw new import_node_server_utils83.BadRequestError(error.message);
+      }
       try {
-        value.levels = value.levels.map((lvl) => new import_mongodb50.ObjectId(lvl));
-      } catch {
-        throw new import_node_server_utils83.BadRequestError("Invalid level ID format.");
+        _id = new import_mongodb50.ObjectId(_id);
+      } catch (error2) {
+        throw new import_node_server_utils83.BadRequestError("Invalid ID.");
       }
-    }
-    try {
+      if (value.levels && Array.isArray(value.levels)) {
+        try {
+          value.levels = value.levels.map((lvl) => new import_mongodb50.ObjectId(lvl));
+        } catch {
+          throw new import_node_server_utils83.BadRequestError("Invalid level ID format.");
+        }
+      }
+      if (value.name)
+        await buildingUnitCollection.updateMany(
+          { building: _id, status: "active" /* ACTIVE */ },
+          { $set: { buildingName: value.name } },
+          { session }
+        );
       const res = await collection.updateOne(
         { _id },
         { $set: value },
@@ -27828,17 +27842,17 @@ function useBuildingRepo() {
       );
       delCachedData();
       return res;
-    } catch (error2) {
+    } catch (error) {
       import_node_server_utils83.logger.log({
         level: "error",
-        message: error2.message
+        message: error.message
       });
-      const isDuplicated = error2.message.includes("duplicate");
+      const isDuplicated = error.message.includes("duplicate");
       if (isDuplicated) {
         throw new import_node_server_utils83.BadRequestError("Building already exists.");
       }
-      if (error2 instanceof import_node_server_utils83.AppError) {
-        throw error2;
+      if (error instanceof import_node_server_utils83.AppError) {
+        throw error;
       } else {
         throw new Error("Failed to update building.");
       }
@@ -28430,6 +28444,32 @@ function useBuildingLevelRepo() {
   const { delNamespace: delBuildingNamespace } = (0, import_node_server_utils86.useCache)(
     buildings_namespace_collection
   );
+  async function createIndexes() {
+    try {
+      await collection.createIndexes([
+        // Ensure name is unique per blockId
+        {
+          key: { blockId: 1, name: 1 },
+          unique: true,
+          name: "unique_name_per_blockId"
+        },
+        // Other useful indexes
+        { key: { site: 1 }, name: "idx_site" },
+        { key: { blockId: 1 }, name: "idx_blockId" },
+        { key: { status: 1 }, name: "idx_status" },
+        { key: { createdAt: 1 }, name: "idx_createdAt" },
+        // Text index for search
+        {
+          key: {
+            name: "text"
+          },
+          name: "text_search_index"
+        }
+      ]);
+    } catch (error) {
+      throw new Error("Failed to create indexes on building levels.");
+    }
+  }
   function delCachedData() {
     delNamespace().then(() => {
       import_node_server_utils86.logger.log({
@@ -28775,7 +28815,7 @@ function useBuildingLevelRepo() {
     }
   }
   return {
-    // createIndexes,
+    createIndexes,
     add,
     getAll,
     getById,
@@ -35120,10 +35160,37 @@ function usePersonService() {
       session?.endSession();
     }
   }
+  async function suspendResidentById(id) {
+    const session = import_node_server_utils111.useAtlas.getClient()?.startSession();
+    if (!session) {
+      throw new import_node_server_utils111.BadRequestError("Database session not available.");
+    }
+    try {
+      session.startTransaction();
+      const person = await _getByUserId(id.toString());
+      if (!person)
+        throw new import_node_server_utils111.NotFoundError("Person not found.");
+      await _updateById(person._id, { status: "deleted" }, session);
+      if (person.user) {
+        await _updateUserFieldById(
+          { _id: person.user.toString(), field: "status", value: "suspended" },
+          session
+        );
+      }
+      await session.commitTransaction();
+      return "Resident suspended successfully.";
+    } catch (error) {
+      await session.abortTransaction();
+      throw error;
+    } finally {
+      session.endSession();
+    }
+  }
   return {
     add,
     updateById,
-    reviewResidentPerson
+    reviewResidentPerson,
+    suspendResidentById
   };
 }
 
@@ -35143,7 +35210,8 @@ function usePersonController() {
   const {
     add: _add,
     updateById: _updateById,
-    reviewResidentPerson: _reviewResidentPerson
+    reviewResidentPerson: _reviewResidentPerson,
+    suspendResidentById: _suspendResidentById
   } = usePersonService();
   async function add(req, res, next) {
     const payload = { ...req.body };
@@ -35487,6 +35555,26 @@ function usePersonController() {
       const result = await _reviewResidentPerson(_id, req.body);
       res.status(200).json({ message: result });
       return;
+    } catch (error2) {
+      console.log("error", error2.message);
+      console.log("error", error2);
+      import_node_server_utils112.logger.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  async function suspendResidentById(req, res, next) {
+    const _id = req.params.id;
+    const { error } = import_joi60.default.string().hex().required().validate(_id);
+    if (error) {
+      import_node_server_utils112.logger.log({ level: "error", message: error.message });
+      next(new import_node_server_utils112.BadRequestError(error.message));
+      return;
+    }
+    try {
+      const result = await _suspendResidentById(_id);
+      res.status(200).json({ message: result });
+      return;
     } catch (error2) {
       import_node_server_utils112.logger.log({ level: "error", message: error2.message });
       next(error2);
@@ -35505,7 +35593,8 @@ function usePersonController() {
     getPeopleByPlateNumber,
     getPeopleByNRIC,
     getPersonByUserId,
-    reviewResidentPerson
+    reviewResidentPerson,
+    suspendResidentById
   };
 }
 
@@ -52947,9 +53036,9 @@ var affectedInjuredStatusSchema = import_joi101.default.object({
   contact: import_joi101.default.string().optional().allow(null, ""),
   nric: import_joi101.default.string().optional().allow(null, ""),
   remarks: import_joi101.default.string().optional().allow(null, ""),
-  block: import_joi101.default.number().optional().allow(null, ""),
-  level: import_joi101.default.string().optional().allow(null, ""),
-  unit: import_joi101.default.string().optional().allow(null, ""),
+  block: import_joi101.default.string().hex().length(24).optional().allow(null, ""),
+  level: import_joi101.default.string().hex().length(24).optional().allow(null, ""),
+  unit: import_joi101.default.string().hex().length(24).optional().allow(null, ""),
   incidentLocation: import_joi101.default.string().optional().allow(null, ""),
   isOther: import_joi101.default.boolean().optional().allow(null, ""),
   other: import_joi101.default.string().optional().allow(null, ""),
@@ -52957,9 +53046,9 @@ var affectedInjuredStatusSchema = import_joi101.default.object({
 });
 var anyoneDamageToPropertyStatusSchema = import_joi101.default.object({
   description: import_joi101.default.string().optional().allow(null, ""),
-  block: import_joi101.default.number().optional().allow(null, ""),
-  level: import_joi101.default.string().optional().allow(null, ""),
-  unit: import_joi101.default.string().optional().allow(null, ""),
+  block: import_joi101.default.string().hex().length(24).optional().allow(null, ""),
+  level: import_joi101.default.string().hex().length(24).optional().allow(null, ""),
+  unit: import_joi101.default.string().hex().length(24).optional().allow(null, ""),
   blkLevelUnit: import_joi101.default.string().optional().allow(null, ""),
   name: import_joi101.default.string().optional().allow(null, ""),
   contact: import_joi101.default.string().optional().allow(null, ""),
@@ -52982,9 +53071,9 @@ var schemaIncidentReport = import_joi101.default.object({
       submittedBy: import_joi101.default.string().optional().allow(null, "")
     }).required(),
     placeOfIncident: import_joi101.default.object({
-      block: import_joi101.default.number().optional().allow(null, ""),
-      level: import_joi101.default.string().optional().allow(null, ""),
-      unit: import_joi101.default.string().optional().allow(null, ""),
+      block: import_joi101.default.string().hex().length(24).optional().allow(null, ""),
+      level: import_joi101.default.string().hex().length(24).optional().allow(null, ""),
+      unit: import_joi101.default.string().hex().length(24).optional().allow(null, ""),
       other: import_joi101.default.string().allow(null, "").optional().allow(null, ""),
       isOther: import_joi101.default.boolean().required(),
       incidentLocation: import_joi101.default.string().optional().allow(null, "")
@@ -53063,9 +53152,9 @@ var schemaUpdateIncidentReport = import_joi101.default.object({
       submittedBy: import_joi101.default.string().optional().allow(null, "")
     }).allow(null, ""),
     placeOfIncident: import_joi101.default.object({
-      block: import_joi101.default.number().optional().allow(null, ""),
-      level: import_joi101.default.string().optional().allow(null, ""),
-      unit: import_joi101.default.string().optional().allow(null, ""),
+      block: import_joi101.default.string().hex().length(24).optional().allow(null, ""),
+      level: import_joi101.default.string().hex().length(24).optional().allow(null, ""),
+      unit: import_joi101.default.string().hex().length(24).optional().allow(null, ""),
       other: import_joi101.default.string().allow(null, "").optional().allow(null, ""),
       isOther: import_joi101.default.boolean().allow(null, ""),
       incidentLocation: import_joi101.default.string().optional().allow(null, "")
@@ -53173,6 +53262,82 @@ function MIncidentReport(value) {
       throw new Error("Invalid siteInfo.site ID.");
     }
   }
+  const placeOfIncident = incidentInformation?.placeOfIncident;
+  if (placeOfIncident) {
+    if (placeOfIncident.block && typeof placeOfIncident.block === "string") {
+      try {
+        placeOfIncident.block = new import_mongodb109.ObjectId(placeOfIncident.block);
+      } catch {
+        throw new Error("Invalid placeOfIncident.block ID.");
+      }
+    }
+    if (placeOfIncident.level && typeof placeOfIncident.level === "string") {
+      try {
+        placeOfIncident.level = new import_mongodb109.ObjectId(placeOfIncident.level);
+      } catch {
+        throw new Error("Invalid placeOfIncident.level ID.");
+      }
+    }
+    if (placeOfIncident.unit && typeof placeOfIncident.unit === "string") {
+      try {
+        placeOfIncident.unit = new import_mongodb109.ObjectId(placeOfIncident.unit);
+      } catch {
+        throw new Error("Invalid placeOfIncident.unit ID.");
+      }
+    }
+  }
+  const affectedInjured = value.affectedEntities?.affectedInjured;
+  if (Array.isArray(affectedInjured)) {
+    affectedInjured.forEach((item) => {
+      if (item.block && typeof item.block === "string") {
+        try {
+          item.block = new import_mongodb109.ObjectId(item.block);
+        } catch {
+          throw new Error("Invalid affectedInjured.block ID.");
+        }
+      }
+      if (item.level && typeof item.level === "string") {
+        try {
+          item.level = new import_mongodb109.ObjectId(item.level);
+        } catch {
+          throw new Error("Invalid affectedInjured.level ID.");
+        }
+      }
+      if (item.unit && typeof item.unit === "string") {
+        try {
+          item.unit = new import_mongodb109.ObjectId(item.unit);
+        } catch {
+          throw new Error("Invalid affectedInjured.unit ID.");
+        }
+      }
+    });
+  }
+  const anyoneDamageToProperty = value.affectedEntities?.anyoneDamageToProperty;
+  if (Array.isArray(anyoneDamageToProperty)) {
+    anyoneDamageToProperty.forEach((item) => {
+      if (item.block && typeof item.block === "string") {
+        try {
+          item.block = new import_mongodb109.ObjectId(item.block);
+        } catch {
+          throw new Error("Invalid anyoneDamageToProperty.block ID.");
+        }
+      }
+      if (item.level && typeof item.level === "string") {
+        try {
+          item.level = new import_mongodb109.ObjectId(item.level);
+        } catch {
+          throw new Error("Invalid anyoneDamageToProperty.level ID.");
+        }
+      }
+      if (item.unit && typeof item.unit === "string") {
+        try {
+          item.unit = new import_mongodb109.ObjectId(item.unit);
+        } catch {
+          throw new Error("Invalid anyoneDamageToProperty.unit ID.");
+        }
+      }
+    });
+  }
   if (incidentInformation?.incidentTypeAndTime?.dateOfIncident && typeof incidentInformation.incidentTypeAndTime.dateOfIncident !== "string") {
     incidentInformation.incidentTypeAndTime.dateOfIncident = incidentInformation.incidentTypeAndTime.dateOfIncident.toISOString();
   }
@@ -53193,7 +53358,7 @@ function MIncidentReport(value) {
     approvedByName: value.approvedByName ?? "",
     remarks: value.remarks ?? null,
     status: value.status ?? "pending",
-    platForm: value.platform ?? "",
+    platform: value.platform ?? "",
     createdAt: value.createdAt ?? /* @__PURE__ */ new Date(),
     updatedAt: value.updatedAt,
     deletedAt: value.deletedAt
@@ -53508,6 +53673,82 @@ function useIncidentReportRepo() {
         throw new Error("Invalid siteInfo.site ID.");
       }
     }
+    const placeOfIncident = incidentInformation?.placeOfIncident;
+    if (placeOfIncident) {
+      if (placeOfIncident.block && typeof placeOfIncident.block === "string") {
+        try {
+          placeOfIncident.block = new import_mongodb110.ObjectId(placeOfIncident.block);
+        } catch {
+          throw new Error("Invalid placeOfIncident.block ID.");
+        }
+      }
+      if (placeOfIncident.level && typeof placeOfIncident.level === "string") {
+        try {
+          placeOfIncident.level = new import_mongodb110.ObjectId(placeOfIncident.level);
+        } catch {
+          throw new Error("Invalid placeOfIncident.level ID.");
+        }
+      }
+      if (placeOfIncident.unit && typeof placeOfIncident.unit === "string") {
+        try {
+          placeOfIncident.unit = new import_mongodb110.ObjectId(placeOfIncident.unit);
+        } catch {
+          throw new Error("Invalid placeOfIncident.unit ID.");
+        }
+      }
+    }
+    const affectedInjured = value.affectedEntities?.affectedInjured;
+    if (Array.isArray(affectedInjured)) {
+      affectedInjured.forEach((item) => {
+        if (item.block && typeof item.block === "string") {
+          try {
+            item.block = new import_mongodb110.ObjectId(item.block);
+          } catch {
+            throw new Error("Invalid affectedInjured.block ID.");
+          }
+        }
+        if (item.level && typeof item.level === "string") {
+          try {
+            item.level = new import_mongodb110.ObjectId(item.level);
+          } catch {
+            throw new Error("Invalid affectedInjured.level ID.");
+          }
+        }
+        if (item.unit && typeof item.unit === "string") {
+          try {
+            item.unit = new import_mongodb110.ObjectId(item.unit);
+          } catch {
+            throw new Error("Invalid affectedInjured.unit ID.");
+          }
+        }
+      });
+    }
+    const anyoneDamageToProperty = value.affectedEntities?.anyoneDamageToProperty;
+    if (Array.isArray(anyoneDamageToProperty)) {
+      anyoneDamageToProperty.forEach((item) => {
+        if (item.block && typeof item.block === "string") {
+          try {
+            item.block = new import_mongodb110.ObjectId(item.block);
+          } catch {
+            throw new Error("Invalid anyoneDamageToProperty.block ID.");
+          }
+        }
+        if (item.level && typeof item.level === "string") {
+          try {
+            item.level = new import_mongodb110.ObjectId(item.level);
+          } catch {
+            throw new Error("Invalid anyoneDamageToProperty.level ID.");
+          }
+        }
+        if (item.unit && typeof item.unit === "string") {
+          try {
+            item.unit = new import_mongodb110.ObjectId(item.unit);
+          } catch {
+            throw new Error("Invalid anyoneDamageToProperty.unit ID.");
+          }
+        }
+      });
+    }
     try {
       const res = await collection.updateOne(
         { _id },
@@ -64839,6 +65080,26 @@ function MFormEntry(value) {
     deletedAt: value.deletedAt ?? null
   };
 }
+var residentFormEntry = import_joi144.default.object({
+  _id: import_joi144.default.string().hex().optional().allow("", null),
+  typeOfForm: import_joi144.default.string().required(),
+  unitNumber: import_joi144.default.string().optional().allow(null, ""),
+  fields: import_joi144.default.object().pattern(
+    import_joi144.default.string(),
+    import_joi144.default.alternatives().try(
+      import_joi144.default.string(),
+      import_joi144.default.number(),
+      import_joi144.default.boolean(),
+      import_joi144.default.valid(null)
+    )
+  ).required(),
+  status: import_joi144.default.string().optional().allow("", null),
+  org: import_joi144.default.string().hex().optional().allow("", null),
+  site: import_joi144.default.string().hex().optional().allow("", null),
+  createdAt: import_joi144.default.date().optional().allow("", null),
+  updatedAt: import_joi144.default.date().optional().allow("", null),
+  deletedAt: import_joi144.default.date().optional().allow("", null)
+});
 
 // src/repositories/online-forms-v2.repository.ts
 var import_node_server_utils249 = require("@7365admin1/node-server-utils");
@@ -65037,13 +65298,38 @@ function useFormEntryRepo() {
       throw new Error(error.message);
     }
   }
+  async function addResidentForm(value, session) {
+    try {
+      value.site = new import_mongodb146.ObjectId(value.site);
+      value.org = new import_mongodb146.ObjectId(value.org);
+      const res = await collection.insertOne(value, { session });
+      delNamespace().then(() => {
+        import_node_server_utils249.logger.info(
+          `Cache cleared for namespace: ${online_forms_namespace_collection}`
+        );
+      }).catch((err) => {
+        import_node_server_utils249.logger.error(
+          `Failed to clear cache for namespace: ${online_forms_namespace_collection}`,
+          err
+        );
+      });
+      return res.insertedId;
+    } catch (error) {
+      const isDuplicated = error.message.includes("duplicate");
+      if (isDuplicated) {
+        throw new import_node_server_utils249.BadRequestError("Online Form already exists.");
+      }
+      throw error;
+    }
+  }
   return {
     add,
     getAll,
     getFormEntryById,
     updateFormEntryById,
     createTextIndex,
-    deleteOnlineFormById
+    deleteOnlineFormById,
+    addResidentForm
   };
 }
 
@@ -65058,7 +65344,8 @@ function useFormEntryController() {
     getAll: _getAll,
     getFormEntryById: _getFormEntryById,
     updateFormEntryById: _updateFormEntryById,
-    deleteOnlineFormById: _deleteOnlineFormById
+    deleteOnlineFormById: _deleteOnlineFormById,
+    addResidentForm: _addResidentForm
   } = useFormEntryRepo();
   function toCamelCase(str) {
     return str.replace(/\s(.)/g, (_, char) => char.toUpperCase()).replace(/\s+/g, "").replace(/^(.)/, (_, char) => char.toLowerCase());
@@ -65237,13 +65524,35 @@ function useFormEntryController() {
       return;
     }
   }
+  async function residentFormSubmission(req, res, next) {
+    const payload = { ...req.body };
+    const { error } = residentFormEntry.validate(payload, {
+      abortEarly: false
+    });
+    if (error) {
+      const messages = error.details.map((d) => d.message).join(", ");
+      import_node_server_utils250.logger.log({ level: "error", message: messages });
+      next(new import_node_server_utils250.BadRequestError(messages));
+      return;
+    }
+    try {
+      const data = await _addResidentForm(payload);
+      res.status(201).json({ message: data });
+      return;
+    } catch (error2) {
+      import_node_server_utils250.logger.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   return {
     add,
     uploadFormEntrys,
     getAll,
     getFormEntryById,
     updateFormEntryById,
-    deleteFormEntryById
+    deleteFormEntryById,
+    residentFormSubmission
   };
 }
 
@@ -65643,6 +65952,7 @@ function useBuildingLevelController() {
   poolDashboardCollection,
   promoCodeSchema,
   remarksSchema,
+  residentFormEntry,
   robotSchema,
   schema,
   schemaApprovedBy,