@7365admin1/core 3.1.0 → 3.2.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/core
 
+## 3.2.0
+
+### Minor Changes
+
+- 6a87d22: release new changes for building, incident report, etc.
+
 ## 3.1.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -5433,9 +5433,9 @@ type TSiteInfo = {
     submittedBy?: string;
 };
 type TPlaceOfIncident = {
-    block?: number;
-    level?: string;
-    unit?: string | ObjectId;
+    block?: string | ObjectId | null;
+    level?: string | ObjectId | null;
+    unit?: string | ObjectId | null;
     other?: string | null;
     isOther: boolean;
     incidentLocation: string;
@@ -5490,9 +5490,9 @@ type TAffectedInjured = {
     name: string;
     contact?: string;
     nric?: string;
-    block?: number;
-    level?: string;
-    unit?: string | ObjectId;
+    block?: string | ObjectId | null;
+    level?: string | ObjectId | null;
+    unit?: string | ObjectId | null;
     other?: string | null;
     isOther: boolean;
     incidentLocation: string;
@@ -5501,9 +5501,9 @@ type TAffectedInjured = {
 };
 type TanyoneDamageToProperty = {
     description: string;
-    block: number;
-    level: string;
-    unit: string;
+    block?: string | ObjectId | null;
+    level?: string | ObjectId | null;
+    unit?: string | ObjectId | null;
     blkLevelUnit: string;
     name: string;
     contact: string;
@@ -7348,6 +7348,7 @@ declare function MBuildingLevel(value: TBuildingLevel): {
 
 declare const building_level_namespace_collection = "building-levels";
 declare function useBuildingLevelRepo(): {
+    createIndexes: () => Promise<void>;
     add: (value: TBuildingLevel, session?: ClientSession) => Promise<ObjectId>;
     getAll: ({ search, page, limit, sort, site, status, }?: {
         search?: string | undefined;

package/dist/index.js

@@ -25443,6 +25443,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 +25527,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 +25976,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 +27810,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 +27841,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 +28443,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 +28814,7 @@ function useBuildingLevelRepo() {
     }
   }
   return {
-    // createIndexes,
+    createIndexes,
     add,
     getAll,
     getById,
@@ -52947,9 +52986,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 +52996,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 +53021,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 +53102,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 +53212,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();
   }
@@ -53508,6 +53623,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 },