@7365admin1/core 3.0.2 → 3.2.0

package/dist/index.mjs

@@ -11347,12 +11347,28 @@ function useSiteRepo() {
       { $match: { "buildings.0": { $exists: true } } },
       {
         $lookup: {
-          from: "building-units",
+          from: "building-levels",
           let: { buildingIds: "$buildings._id" },
           pipeline: [
             {
               $match: {
-                $expr: { $in: ["$building", "$$buildingIds"] },
+                $expr: { $in: ["$blockId", "$$buildingIds"] },
+                status: { $ne: "deleted" }
+              }
+            }
+          ],
+          as: "levels"
+        }
+      },
+      { $match: { "levels.0": { $exists: true } } },
+      {
+        $lookup: {
+          from: "building-units",
+          let: { levelIds: "$levels._id" },
+          pipeline: [
+            {
+              $match: {
+                $expr: { $in: ["$level", "$$levelIds"] },
                 status: { $ne: "deleted" }
               }
             },
@@ -24397,7 +24413,7 @@ function usePersonRepo() {
             pipeline: [
               {
                 $match: {
-                  $expr: { $eq: [{ $toString: "$_id" }, "$$blockId"] }
+                  $expr: { $eq: ["$_id", "$$blockId"] }
                 }
               },
               { $project: { _id: 1, name: 1, block: 1 } }
@@ -24413,7 +24429,7 @@ function usePersonRepo() {
             pipeline: [
               {
                 $match: {
-                  $expr: { $eq: [{ $toString: "$_id" }, "$$levelId"] }
+                  $expr: { $eq: ["$_id", "$$levelId"] }
                 }
               },
               { $project: { _id: 1, name: 1 } }
@@ -24644,7 +24660,7 @@ function usePersonRepo() {
             pipeline: [
               {
                 $match: {
-                  $expr: { $eq: [{ $toString: "$_id" }, "$$blockId"] }
+                  $expr: { $eq: ["$_id", "$$blockId"] }
                 }
               },
               { $project: { _id: 1, name: 1, block: 1 } }
@@ -24660,7 +24676,7 @@ function usePersonRepo() {
             pipeline: [
               {
                 $match: {
-                  $expr: { $eq: [{ $toString: "$_id" }, "$$levelId"] }
+                  $expr: { $eq: ["$_id", "$$levelId"] }
                 }
               },
               { $project: { _id: 1, name: 1 } }
@@ -24734,7 +24750,7 @@ function usePersonRepo() {
             pipeline: [
               {
                 $match: {
-                  $expr: { $eq: [{ $toString: "$_id" }, "$$blockId"] }
+                  $expr: { $eq: ["$_id", "$$blockId"] }
                 }
               },
               { $project: { _id: 1, name: 1, block: 1 } }
@@ -24750,7 +24766,7 @@ function usePersonRepo() {
             pipeline: [
               {
                 $match: {
-                  $expr: { $eq: [{ $toString: "$_id" }, "$$levelId"] }
+                  $expr: { $eq: ["$_id", "$$levelId"] }
                 }
               },
               { $project: { _id: 1, name: 1 } }
@@ -25225,6 +25241,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 } = useCache26(
     building_units_namespace_collection
   );
@@ -25306,10 +25325,8 @@ function useBuildingUnitRepo() {
     } catch (error2) {
       throw new BadRequestError74("Invalid ID.");
     }
-    try {
+    if (value.level) {
       value.level = new ObjectId47(value.level);
-    } catch (error2) {
-      throw new BadRequestError74("Invalid level ID.");
     }
     if (value.billing && Array.isArray(value.billing)) {
       value.billing = value.billing.map((billing) => {
@@ -25757,6 +25774,12 @@ function useBuildingUnitRepo() {
       throw new BadRequestError74("Invalid ID.");
     }
     try {
+      const existingResidents = await buildingUnitCollection.find({ unit: _id }).toArray();
+      if (existingResidents && existingResidents.length > 0) {
+        throw new BadRequestError74(
+          `Cannot delete unit: ${existingResidents.length} resident/s is currently assigned.`
+        );
+      }
       const res = await collection.updateOne(
         { _id },
         { $set: { status: "deleted", deletedAt: /* @__PURE__ */ new Date() } },
@@ -27549,6 +27572,9 @@ function useBuildingRepo() {
     throw new Error("Unable to connect to server.");
   }
   const collection = db.collection(buildings_namespace_collection);
+  const buildingUnitCollection = db.collection(
+    building_units_namespace_collection
+  );
   const { getCache, setCache, delNamespace } = useCache28(
     buildings_namespace_collection
   );
@@ -27596,24 +27622,30 @@ function useBuildingRepo() {
     }
   }
   async function updateById(_id, value, session) {
-    const { error } = schemaBuildingUpdateOptions.validate(value);
-    if (error) {
-      logger61.info(`Building Repository: ${error.message}`);
-      throw new BadRequestError80(error.message);
-    }
     try {
-      _id = new ObjectId50(_id);
-    } catch (error2) {
-      throw new BadRequestError80("Invalid ID.");
-    }
-    if (value.levels && Array.isArray(value.levels)) {
+      const { error } = schemaBuildingUpdateOptions.validate(value);
+      if (error) {
+        logger61.info(`Building Repository: ${error.message}`);
+        throw new BadRequestError80(error.message);
+      }
       try {
-        value.levels = value.levels.map((lvl) => new ObjectId50(lvl));
-      } catch {
-        throw new BadRequestError80("Invalid level ID format.");
+        _id = new ObjectId50(_id);
+      } catch (error2) {
+        throw new BadRequestError80("Invalid ID.");
       }
-    }
-    try {
+      if (value.levels && Array.isArray(value.levels)) {
+        try {
+          value.levels = value.levels.map((lvl) => new ObjectId50(lvl));
+        } catch {
+          throw new BadRequestError80("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 },
@@ -27621,17 +27653,17 @@ function useBuildingRepo() {
       );
       delCachedData();
       return res;
-    } catch (error2) {
+    } catch (error) {
       logger61.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 BadRequestError80("Building already exists.");
       }
-      if (error2 instanceof AppError13) {
-        throw error2;
+      if (error instanceof AppError13) {
+        throw error;
       } else {
         throw new Error("Failed to update building.");
       }
@@ -28072,6 +28104,49 @@ function useBuildingRepo() {
       }
     }
   }
+  async function getBuildingWithUnitsList(site) {
+    try {
+      site = new ObjectId50(site);
+    } catch (error) {
+      throw new BadRequestError80("Invalid site ID.");
+    }
+    const buildingUnitsQuery = {
+      site,
+      status: "active" /* ACTIVE */
+    };
+    try {
+      const buildingsWithUnits = await buildingUnitCollection.aggregate([
+        { $match: buildingUnitsQuery },
+        { $project: { building: 1 } }
+      ]).toArray();
+      const buildingIds = [
+        ...new Set(buildingsWithUnits.map((l) => l.building.toString()))
+      ].map((id) => new ObjectId50(id));
+      const result = await collection.aggregate([
+        {
+          $match: {
+            _id: { $in: buildingIds }
+          }
+        },
+        {
+          $project: {
+            name: 1
+          }
+        }
+      ]).toArray();
+      return {
+        success: true,
+        message: "Buildings with units retrieved successfully",
+        data: result
+      };
+    } catch (error) {
+      if (error instanceof AppError13) {
+        throw error;
+      } else {
+        throw new InternalServerError29("Failed to get buildings.");
+      }
+    }
+  }
   return {
     createIndexes,
     add,
@@ -28083,7 +28158,8 @@ function useBuildingRepo() {
     getBuildingLevel,
     getBuildingLevelForResident,
     getBuildingLevelWithUnits,
-    getBuildingList
+    getBuildingList,
+    getBuildingWithUnitsList
   };
 }
 
@@ -28194,6 +28270,32 @@ function useBuildingLevelRepo() {
   const { delNamespace: delBuildingNamespace } = useCache29(
     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(() => {
       logger63.log({
@@ -28534,12 +28636,12 @@ function useBuildingLevelRepo() {
       if (error instanceof AppError14) {
         throw error;
       } else {
-        throw new InternalServerError30("Failed to get building.");
+        throw new InternalServerError30("Failed to get building level.");
       }
     }
   }
   return {
-    // createIndexes,
+    createIndexes,
     add,
     getAll,
     getById,
@@ -28818,7 +28920,8 @@ function useBuildingController() {
     getBuildingLevel: _getBuildingLevel,
     getBuildingLevelForResident: _getBuildingLevelForResident,
     getBuildingLevelWithUnits: _getBuildingLevelWithUnits,
-    getBuildingList: _getBuildingList
+    getBuildingList: _getBuildingList,
+    getBuildingWithUnitsList: _getBuildingWithUnitsList
   } = useBuildingRepo();
   const {
     updateById: _updateById,
@@ -29205,6 +29308,28 @@ function useBuildingController() {
       next(error);
     }
   }
+  async function getBuildingWithUnitsList(req, res, next) {
+    try {
+      const schema2 = Joi46.object({
+        site: Joi46.string().hex().length(24).required()
+      });
+      const { error, value } = schema2.validate({
+        site: req.params.siteId
+      });
+      if (error) {
+        const messages = error.details.map((d) => d.message).join(", ");
+        logger65.log({ level: "error", message: messages });
+        next(new BadRequestError84(messages));
+        return;
+      }
+      const { site } = value;
+      const result = await _getBuildingWithUnitsList(site);
+      res.json(result);
+      return;
+    } catch (error) {
+      next(error);
+    }
+  }
   return {
     createBuilding,
     getAll,
@@ -29216,7 +29341,8 @@ function useBuildingController() {
     getBuildingLevelForResident,
     uploadSpreadsheetBuilding,
     getBuildingLevelWithUnits,
-    getBuildingList
+    getBuildingList,
+    getBuildingWithUnitsList
   };
 }
 
@@ -34713,7 +34839,6 @@ function usePersonService() {
       return "People added successfully.";
     } catch (error) {
       console.log("error message service", error);
-      console.log("error message service", error.message);
       logger84.error("Error in people service add:", error);
       await session.abortTransaction();
       throw error;
@@ -34740,6 +34865,15 @@ function usePersonService() {
       if (value.site && typeof value.site === "string") {
         value.site = new ObjectId65(value.site);
       }
+      if (value.block && typeof value.block === "string") {
+        value.block = new ObjectId65(value.block);
+      }
+      if (value.level && typeof value.level === "string") {
+        value.level = new ObjectId65(value.level);
+      }
+      if (value.unit && typeof value.unit === "string") {
+        value.unit = new ObjectId65(value.unit);
+      }
       const isOrgChanged = value.org && person.org?.toString() !== value.org.toString();
       await _updateById(_id, value, session);
       if (isOrgChanged && person.user) {
@@ -52955,9 +53089,9 @@ var affectedInjuredStatusSchema = Joi101.object({
   contact: Joi101.string().optional().allow(null, ""),
   nric: Joi101.string().optional().allow(null, ""),
   remarks: Joi101.string().optional().allow(null, ""),
-  block: Joi101.number().optional().allow(null, ""),
-  level: Joi101.string().optional().allow(null, ""),
-  unit: Joi101.string().optional().allow(null, ""),
+  block: Joi101.string().hex().length(24).optional().allow(null, ""),
+  level: Joi101.string().hex().length(24).optional().allow(null, ""),
+  unit: Joi101.string().hex().length(24).optional().allow(null, ""),
   incidentLocation: Joi101.string().optional().allow(null, ""),
   isOther: Joi101.boolean().optional().allow(null, ""),
   other: Joi101.string().optional().allow(null, ""),
@@ -52965,9 +53099,9 @@ var affectedInjuredStatusSchema = Joi101.object({
 });
 var anyoneDamageToPropertyStatusSchema = Joi101.object({
   description: Joi101.string().optional().allow(null, ""),
-  block: Joi101.number().optional().allow(null, ""),
-  level: Joi101.string().optional().allow(null, ""),
-  unit: Joi101.string().optional().allow(null, ""),
+  block: Joi101.string().hex().length(24).optional().allow(null, ""),
+  level: Joi101.string().hex().length(24).optional().allow(null, ""),
+  unit: Joi101.string().hex().length(24).optional().allow(null, ""),
   blkLevelUnit: Joi101.string().optional().allow(null, ""),
   name: Joi101.string().optional().allow(null, ""),
   contact: Joi101.string().optional().allow(null, ""),
@@ -52990,9 +53124,9 @@ var schemaIncidentReport = Joi101.object({
       submittedBy: Joi101.string().optional().allow(null, "")
     }).required(),
     placeOfIncident: Joi101.object({
-      block: Joi101.number().optional().allow(null, ""),
-      level: Joi101.string().optional().allow(null, ""),
-      unit: Joi101.string().optional().allow(null, ""),
+      block: Joi101.string().hex().length(24).optional().allow(null, ""),
+      level: Joi101.string().hex().length(24).optional().allow(null, ""),
+      unit: Joi101.string().hex().length(24).optional().allow(null, ""),
       other: Joi101.string().allow(null, "").optional().allow(null, ""),
       isOther: Joi101.boolean().required(),
       incidentLocation: Joi101.string().optional().allow(null, "")
@@ -53071,9 +53205,9 @@ var schemaUpdateIncidentReport = Joi101.object({
       submittedBy: Joi101.string().optional().allow(null, "")
     }).allow(null, ""),
     placeOfIncident: Joi101.object({
-      block: Joi101.number().optional().allow(null, ""),
-      level: Joi101.string().optional().allow(null, ""),
-      unit: Joi101.string().optional().allow(null, ""),
+      block: Joi101.string().hex().length(24).optional().allow(null, ""),
+      level: Joi101.string().hex().length(24).optional().allow(null, ""),
+      unit: Joi101.string().hex().length(24).optional().allow(null, ""),
       other: Joi101.string().allow(null, "").optional().allow(null, ""),
       isOther: Joi101.boolean().allow(null, ""),
       incidentLocation: Joi101.string().optional().allow(null, "")
@@ -53181,6 +53315,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 ObjectId109(placeOfIncident.block);
+      } catch {
+        throw new Error("Invalid placeOfIncident.block ID.");
+      }
+    }
+    if (placeOfIncident.level && typeof placeOfIncident.level === "string") {
+      try {
+        placeOfIncident.level = new ObjectId109(placeOfIncident.level);
+      } catch {
+        throw new Error("Invalid placeOfIncident.level ID.");
+      }
+    }
+    if (placeOfIncident.unit && typeof placeOfIncident.unit === "string") {
+      try {
+        placeOfIncident.unit = new ObjectId109(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 ObjectId109(item.block);
+        } catch {
+          throw new Error("Invalid affectedInjured.block ID.");
+        }
+      }
+      if (item.level && typeof item.level === "string") {
+        try {
+          item.level = new ObjectId109(item.level);
+        } catch {
+          throw new Error("Invalid affectedInjured.level ID.");
+        }
+      }
+      if (item.unit && typeof item.unit === "string") {
+        try {
+          item.unit = new ObjectId109(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 ObjectId109(item.block);
+        } catch {
+          throw new Error("Invalid anyoneDamageToProperty.block ID.");
+        }
+      }
+      if (item.level && typeof item.level === "string") {
+        try {
+          item.level = new ObjectId109(item.level);
+        } catch {
+          throw new Error("Invalid anyoneDamageToProperty.level ID.");
+        }
+      }
+      if (item.unit && typeof item.unit === "string") {
+        try {
+          item.unit = new ObjectId109(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();
   }
@@ -53529,6 +53739,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 ObjectId110(placeOfIncident.block);
+        } catch {
+          throw new Error("Invalid placeOfIncident.block ID.");
+        }
+      }
+      if (placeOfIncident.level && typeof placeOfIncident.level === "string") {
+        try {
+          placeOfIncident.level = new ObjectId110(placeOfIncident.level);
+        } catch {
+          throw new Error("Invalid placeOfIncident.level ID.");
+        }
+      }
+      if (placeOfIncident.unit && typeof placeOfIncident.unit === "string") {
+        try {
+          placeOfIncident.unit = new ObjectId110(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 ObjectId110(item.block);
+          } catch {
+            throw new Error("Invalid affectedInjured.block ID.");
+          }
+        }
+        if (item.level && typeof item.level === "string") {
+          try {
+            item.level = new ObjectId110(item.level);
+          } catch {
+            throw new Error("Invalid affectedInjured.level ID.");
+          }
+        }
+        if (item.unit && typeof item.unit === "string") {
+          try {
+            item.unit = new ObjectId110(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 ObjectId110(item.block);
+          } catch {
+            throw new Error("Invalid anyoneDamageToProperty.block ID.");
+          }
+        }
+        if (item.level && typeof item.level === "string") {
+          try {
+            item.level = new ObjectId110(item.level);
+          } catch {
+            throw new Error("Invalid anyoneDamageToProperty.level ID.");
+          }
+        }
+        if (item.unit && typeof item.unit === "string") {
+          try {
+            item.unit = new ObjectId110(item.unit);
+          } catch {
+            throw new Error("Invalid anyoneDamageToProperty.unit ID.");
+          }
+        }
+      });
+    }
     try {
       const res = await collection.updateOne(
         { _id },