@7365admin1/core 3.0.1 → 3.1.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/core
 
+## 3.1.0
+
+### Minor Changes
+
+- 495dd90: release new changes for person API, user API, etc.
+
+## 3.0.2
+
+### Patch Changes
+
+- b35fe2a: fix block level unit vehicle
+
 ## 3.0.1
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1952,6 +1952,11 @@ declare function useBuildingRepo(): {
         message: string;
         data: bson.Document[];
     }>;
+    getBuildingWithUnitsList: (site: string | ObjectId) => Promise<{
+        success: boolean;
+        message: string;
+        data: bson.Document[];
+    }>;
 };
 
 declare function useBuildingService(): {
@@ -1981,6 +1986,7 @@ declare function useBuildingController(): {
     uploadSpreadsheetBuilding: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getBuildingLevelWithUnits: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getBuildingList: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    getBuildingWithUnitsList: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
 declare const building_units_namespace_collection = "building-units";

package/dist/index.js

@@ -11725,12 +11725,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" }
               }
             },
@@ -22299,7 +22315,7 @@ function useVehicleRepo() {
           pipeline: [
             {
               $match: {
-                $expr: { $eq: [{ $toString: "$_id" }, "$$blockId"] }
+                $expr: { $eq: ["$_id", "$$blockId"] }
               }
             },
             { $project: { _id: 1, name: 1, block: 1 } }
@@ -22315,7 +22331,7 @@ function useVehicleRepo() {
           pipeline: [
             {
               $match: {
-                $expr: { $eq: [{ $toString: "$_id" }, "$$levelId"] }
+                $expr: { $eq: ["$_id", "$$levelId"] }
               }
             },
             { $project: { _id: 1, name: 1 } }
@@ -22327,11 +22343,11 @@ function useVehicleRepo() {
       {
         $lookup: {
           from: "building-units",
-          let: { unitId: { $toString: "$unit" } },
+          let: { unitId: "$unit" },
           pipeline: [
             {
               $match: {
-                $expr: { $eq: [{ $toString: "$_id" }, "$$unitId"] }
+                $expr: { $eq: ["$_id", "$$unitId"] }
               }
             },
             { $project: { _id: 1, name: 1 } }
@@ -24609,7 +24625,7 @@ function usePersonRepo() {
             pipeline: [
               {
                 $match: {
-                  $expr: { $eq: [{ $toString: "$_id" }, "$$blockId"] }
+                  $expr: { $eq: ["$_id", "$$blockId"] }
                 }
               },
               { $project: { _id: 1, name: 1, block: 1 } }
@@ -24625,7 +24641,7 @@ function usePersonRepo() {
             pipeline: [
               {
                 $match: {
-                  $expr: { $eq: [{ $toString: "$_id" }, "$$levelId"] }
+                  $expr: { $eq: ["$_id", "$$levelId"] }
                 }
               },
               { $project: { _id: 1, name: 1 } }
@@ -24856,7 +24872,7 @@ function usePersonRepo() {
             pipeline: [
               {
                 $match: {
-                  $expr: { $eq: [{ $toString: "$_id" }, "$$blockId"] }
+                  $expr: { $eq: ["$_id", "$$blockId"] }
                 }
               },
               { $project: { _id: 1, name: 1, block: 1 } }
@@ -24872,7 +24888,7 @@ function usePersonRepo() {
             pipeline: [
               {
                 $match: {
-                  $expr: { $eq: [{ $toString: "$_id" }, "$$levelId"] }
+                  $expr: { $eq: ["$_id", "$$levelId"] }
                 }
               },
               { $project: { _id: 1, name: 1 } }
@@ -24946,7 +24962,7 @@ function usePersonRepo() {
             pipeline: [
               {
                 $match: {
-                  $expr: { $eq: [{ $toString: "$_id" }, "$$blockId"] }
+                  $expr: { $eq: ["$_id", "$$blockId"] }
                 }
               },
               { $project: { _id: 1, name: 1, block: 1 } }
@@ -24962,7 +24978,7 @@ function usePersonRepo() {
             pipeline: [
               {
                 $match: {
-                  $expr: { $eq: [{ $toString: "$_id" }, "$$levelId"] }
+                  $expr: { $eq: ["$_id", "$$levelId"] }
                 }
               },
               { $project: { _id: 1, name: 1 } }
@@ -27737,6 +27753,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 } = (0, import_node_server_utils83.useCache)(
     buildings_namespace_collection
   );
@@ -28260,6 +28279,49 @@ function useBuildingRepo() {
       }
     }
   }
+  async function getBuildingWithUnitsList(site) {
+    try {
+      site = new import_mongodb50.ObjectId(site);
+    } catch (error) {
+      throw new import_node_server_utils83.BadRequestError("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 import_mongodb50.ObjectId(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 import_node_server_utils83.AppError) {
+        throw error;
+      } else {
+        throw new import_node_server_utils83.InternalServerError("Failed to get buildings.");
+      }
+    }
+  }
   return {
     createIndexes,
     add,
@@ -28271,7 +28333,8 @@ function useBuildingRepo() {
     getBuildingLevel,
     getBuildingLevelForResident,
     getBuildingLevelWithUnits,
-    getBuildingList
+    getBuildingList,
+    getBuildingWithUnitsList
   };
 }
 
@@ -28707,7 +28770,7 @@ function useBuildingLevelRepo() {
       if (error instanceof import_node_server_utils86.AppError) {
         throw error;
       } else {
-        throw new import_node_server_utils86.InternalServerError("Failed to get building.");
+        throw new import_node_server_utils86.InternalServerError("Failed to get building level.");
       }
     }
   }
@@ -28991,7 +29054,8 @@ function useBuildingController() {
     getBuildingLevel: _getBuildingLevel,
     getBuildingLevelForResident: _getBuildingLevelForResident,
     getBuildingLevelWithUnits: _getBuildingLevelWithUnits,
-    getBuildingList: _getBuildingList
+    getBuildingList: _getBuildingList,
+    getBuildingWithUnitsList: _getBuildingWithUnitsList
   } = useBuildingRepo();
   const {
     updateById: _updateById,
@@ -29378,6 +29442,28 @@ function useBuildingController() {
       next(error);
     }
   }
+  async function getBuildingWithUnitsList(req, res, next) {
+    try {
+      const schema2 = import_joi46.default.object({
+        site: import_joi46.default.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(", ");
+        import_node_server_utils88.logger.log({ level: "error", message: messages });
+        next(new import_node_server_utils88.BadRequestError(messages));
+        return;
+      }
+      const { site } = value;
+      const result = await _getBuildingWithUnitsList(site);
+      res.json(result);
+      return;
+    } catch (error) {
+      next(error);
+    }
+  }
   return {
     createBuilding,
     getAll,
@@ -29389,7 +29475,8 @@ function useBuildingController() {
     getBuildingLevelForResident,
     uploadSpreadsheetBuilding,
     getBuildingLevelWithUnits,
-    getBuildingList
+    getBuildingList,
+    getBuildingWithUnitsList
   };
 }
 
@@ -34823,7 +34910,6 @@ function usePersonService() {
       return "People added successfully.";
     } catch (error) {
       console.log("error message service", error);
-      console.log("error message service", error.message);
       import_node_server_utils111.logger.error("Error in people service add:", error);
       await session.abortTransaction();
       throw error;
@@ -34850,6 +34936,15 @@ function usePersonService() {
       if (value.site && typeof value.site === "string") {
         value.site = new import_mongodb65.ObjectId(value.site);
       }
+      if (value.block && typeof value.block === "string") {
+        value.block = new import_mongodb65.ObjectId(value.block);
+      }
+      if (value.level && typeof value.level === "string") {
+        value.level = new import_mongodb65.ObjectId(value.level);
+      }
+      if (value.unit && typeof value.unit === "string") {
+        value.unit = new import_mongodb65.ObjectId(value.unit);
+      }
       const isOrgChanged = value.org && person.org?.toString() !== value.org.toString();
       await _updateById(_id, value, session);
       if (isOrgChanged && person.user) {