@7365admin1/core 3.0.2 → 3.1.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 } }
@@ -27549,6 +27565,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
   );
@@ -28072,6 +28091,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 +28145,8 @@ function useBuildingRepo() {
     getBuildingLevel,
     getBuildingLevelForResident,
     getBuildingLevelWithUnits,
-    getBuildingList
+    getBuildingList,
+    getBuildingWithUnitsList
   };
 }
 
@@ -28534,7 +28597,7 @@ function useBuildingLevelRepo() {
       if (error instanceof AppError14) {
         throw error;
       } else {
-        throw new InternalServerError30("Failed to get building.");
+        throw new InternalServerError30("Failed to get building level.");
       }
     }
   }
@@ -28818,7 +28881,8 @@ function useBuildingController() {
     getBuildingLevel: _getBuildingLevel,
     getBuildingLevelForResident: _getBuildingLevelForResident,
     getBuildingLevelWithUnits: _getBuildingLevelWithUnits,
-    getBuildingList: _getBuildingList
+    getBuildingList: _getBuildingList,
+    getBuildingWithUnitsList: _getBuildingWithUnitsList
   } = useBuildingRepo();
   const {
     updateById: _updateById,
@@ -29205,6 +29269,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 +29302,8 @@ function useBuildingController() {
     getBuildingLevelForResident,
     uploadSpreadsheetBuilding,
     getBuildingLevelWithUnits,
-    getBuildingList
+    getBuildingList,
+    getBuildingWithUnitsList
   };
 }
 
@@ -34713,7 +34800,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 +34826,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) {