@7365admin1/core 2.56.0 → 2.57.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/core
 
+## 2.57.0
+
+### Minor Changes
+
+- 72c98df: get latest changes 12-05-2026
+
 ## 2.56.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -850,15 +850,15 @@ declare const TInvoice: z.ZodObject<{
         total: z.ZodNumber;
     }, "strip", z.ZodTypeAny, {
         description: string;
+        total: number;
         unitPrice: number;
         quantity: number;
-        total: number;
         seats?: number | undefined;
     }, {
         description: string;
+        total: number;
         unitPrice: number;
         quantity: number;
-        total: number;
         seats?: number | undefined;
     }>, "many">;
     metadata: z.ZodEffects<z.ZodOptional<z.ZodDefault<z.ZodObject<{
@@ -908,9 +908,9 @@ declare const TInvoice: z.ZodObject<{
     dueDate: Date;
     items: {
         description: string;
+        total: number;
         unitPrice: number;
         quantity: number;
-        total: number;
         seats?: number | undefined;
     }[];
     createdAt?: Date | undefined;
@@ -931,9 +931,9 @@ declare const TInvoice: z.ZodObject<{
     dueDate: Date;
     items: {
         description: string;
+        total: number;
         unitPrice: number;
         quantity: number;
-        total: number;
         seats?: number | undefined;
     }[];
     createdAt?: Date | undefined;
@@ -962,9 +962,9 @@ declare function useInvoiceModel(db: Db): {
         dueDate: Date;
         items: {
             description: string;
+            total: number;
             unitPrice: number;
             quantity: number;
-            total: number;
             seats?: number | undefined;
         }[];
         createdAt?: Date | undefined;
@@ -994,9 +994,9 @@ declare function useInvoiceRepo(): {
         dueDate: Date;
         items: {
             description: string;
+            total: number;
             unitPrice: number;
             quantity: number;
-            total: number;
             seats?: number | undefined;
         }[];
         createdAt?: Date | undefined;
@@ -1030,9 +1030,9 @@ declare function useInvoiceRepo(): {
         dueDate: Date;
         items: {
             description: string;
+            total: number;
             unitPrice: number;
             quantity: number;
-            total: number;
             seats?: number | undefined;
         }[];
         createdAt?: Date | undefined;
@@ -1056,9 +1056,9 @@ declare function useInvoiceRepo(): {
         dueDate: Date;
         items: {
             description: string;
+            total: number;
             unitPrice: number;
             quantity: number;
-            total: number;
             seats?: number | undefined;
         }[];
         createdAt?: Date | undefined;
@@ -1756,7 +1756,7 @@ declare enum BuildingStatus {
 }
 type TBuilding = {
     _id?: ObjectId;
-    site: ObjectId;
+    site: string | ObjectId;
     name?: string;
     block: number;
     levels: string[];
@@ -1852,6 +1852,18 @@ declare function useBuildingRepo(): {
         site?: string | undefined;
         status?: BuildingStatus | undefined;
     }) => Promise<Record<string, any>>;
+    getAllBuildingForResident: ({ search, page, limit, sort, site, status, }?: {
+        search?: string | undefined;
+        page?: number | undefined;
+        limit?: number | undefined;
+        sort?: {} | undefined;
+        site?: string | undefined;
+        status?: BuildingStatus | undefined;
+    }) => Promise<{
+        items: any[];
+        pages: number;
+        pageRange: string;
+    }>;
     getById: (_id: string | ObjectId) => Promise<TBuilding | null>;
     updateById: (_id: ObjectId | string, value: Pick<TBuilding, "name" | "block" | "levels" | "buildingFiles">, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
     deleteById: (_id: string | ObjectId, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
@@ -1860,14 +1872,21 @@ declare function useBuildingRepo(): {
 };
 
 declare function useBuildingService(): {
-    add: (value: TBuilding) => Promise<bson.ObjectId>;
+    add: (value: TBuilding) => Promise<ObjectId>;
     updateById: (id: string, data: Pick<TBuilding, "name" | "block" | "levels" | "buildingFiles">) => Promise<mongodb.UpdateResult<bson.Document>>;
     deleteById: (id: string) => Promise<string>;
+    uploadSpreadsheetBuilding: (data: any[], site: string) => Promise<{
+        site: string;
+        block: number;
+        name: string;
+        levels: string[];
+    }[]>;
 };
 
 declare function useBuildingController(): {
     createBuilding: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getAll: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    getAllBuildingForResident: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     updateById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     deleteById: (req: Request, res: Response, next: NextFunction) => Promise<void>;

package/dist/index.js

@@ -5250,34 +5250,55 @@ function useSiteRepo() {
     const query = {
       status: { $ne: "deleted" }
     };
-    const cacheOptions = {
-      status: { $ne: "deleted" },
-      page,
-      limit
-    };
     if (search) {
       query.$or = [{ name: { $regex: search, $options: "i" } }];
-      cacheOptions.search = search;
-    }
-    const cacheKey = (0, import_node_server_utils19.makeCacheKey)(namespace_collection, cacheOptions);
-    const cachedData = await getCache(cacheKey);
-    if (cachedData) {
-      import_node_server_utils19.logger.info(`Cache hit for key: ${cacheKey}`);
-      return cachedData;
     }
+    const basePipeline = [
+      { $match: query },
+      {
+        $lookup: {
+          from: "buildings",
+          let: { siteId: "$_id" },
+          pipeline: [
+            {
+              $match: {
+                $expr: { $eq: ["$site", "$$siteId"] },
+                status: { $ne: "deleted" }
+              }
+            }
+          ],
+          as: "buildings"
+        }
+      },
+      { $match: { "buildings.0": { $exists: true } } },
+      {
+        $lookup: {
+          from: "building-units",
+          let: { buildingIds: "$buildings._id" },
+          pipeline: [
+            {
+              $match: {
+                $expr: { $in: ["$building", "$$buildingIds"] },
+                status: { $ne: "deleted" }
+              }
+            },
+            { $limit: 1 }
+          ],
+          as: "units"
+        }
+      },
+      { $match: { "units.0": { $exists: true } } }
+    ];
     try {
       const items = await collection.aggregate([
-        { $match: query },
+        ...basePipeline,
+        { $project: { _id: 1, name: 1 } },
         { $skip: page * limit },
         { $limit: limit }
       ]).toArray();
-      const length = await collection.countDocuments(query);
+      const countResult = await collection.aggregate([...basePipeline, { $count: "total" }]).toArray();
+      const length = countResult[0]?.total ?? 0;
       const data = (0, import_node_server_utils19.paginate)(items, page, limit, length);
-      setCache(cacheKey, data, 15 * 60).then(() => {
-        import_node_server_utils19.logger.info(`Cache set for key: ${cacheKey}`);
-      }).catch((err) => {
-        import_node_server_utils19.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
-      });
       return data;
     } catch (error) {
       throw error;
@@ -19527,6 +19548,66 @@ function useBuildingRepo() {
       throw error;
     }
   }
+  async function getAllBuildingForResident({
+    search = "",
+    page = 1,
+    limit = 10,
+    sort = {},
+    site = "",
+    status = "active" /* ACTIVE */
+  } = {}) {
+    page = page > 0 ? page - 1 : 0;
+    let siteId;
+    if (site) {
+      try {
+        siteId = new import_mongodb49.ObjectId(site);
+      } catch (error) {
+        throw new import_node_server_utils82.BadRequestError("Invalid site ID.");
+      }
+    }
+    const query = {
+      status,
+      ...search && { $text: { $search: search } },
+      ...siteId && { site: siteId }
+    };
+    sort = Object.keys(sort).length ? sort : { _id: -1 };
+    const basePipeline = [
+      { $match: query },
+      { $match: { $expr: { $gt: [{ $size: "$levels" }, 0] } } },
+      {
+        $lookup: {
+          from: "building-units",
+          let: { buildingId: "$_id" },
+          pipeline: [
+            {
+              $match: {
+                $expr: { $eq: ["$building", "$$buildingId"] },
+                status: { $ne: "deleted" }
+              }
+            },
+            { $limit: 1 }
+          ],
+          as: "units"
+        }
+      },
+      { $match: { "units.0": { $exists: true } } }
+    ];
+    try {
+      const items = await collection.aggregate([
+        ...basePipeline,
+        { $project: { units: 0 } },
+        { $sort: sort },
+        { $skip: page * limit },
+        { $limit: limit }
+      ]).toArray();
+      const countResult = await collection.aggregate([...basePipeline, { $count: "total" }]).toArray();
+      const length = countResult[0]?.total ?? 0;
+      return (0, import_node_server_utils82.paginate)(items, page, limit, length);
+    } catch (error) {
+      import_node_server_utils82.logger.log({ level: "error", message: `${error}` });
+      throw error;
+    }
+  }
   async function getById(_id) {
     try {
       _id = new import_mongodb49.ObjectId(_id);
@@ -19648,7 +19729,6 @@ function useBuildingRepo() {
     const cacheOptions = { ...query };
     const cacheKey = (0, import_node_server_utils82.makeCacheKey)(buildings_namespace_collection, cacheOptions);
     try {
-      console.log(query);
       const result = await collection.aggregate([
         {
           $match: {
@@ -19698,16 +19778,16 @@ function useBuildingRepo() {
         },
         {
           $project: {
-            "_id": 1,
-            "site": 1,
-            "name": 1,
-            "block": 1,
-            "status": 1,
-            "buildingFloorPlan": 1,
-            "createdAt": 1,
-            "updatedAt": 1,
-            "deletedAt": 1,
-            "levels": "$buildingLevels"
+            _id: 1,
+            site: 1,
+            name: 1,
+            block: 1,
+            status: 1,
+            buildingFloorPlan: 1,
+            createdAt: 1,
+            updatedAt: 1,
+            deletedAt: 1,
+            levels: "$buildingLevels"
           }
         }
       ]).toArray();
@@ -19740,6 +19820,7 @@ function useBuildingRepo() {
     createIndexes,
     add,
     getAll,
+    getAllBuildingForResident,
     getById,
     updateById,
     deleteById,
@@ -19881,10 +19962,56 @@ function useBuildingService() {
       throw error;
     }
   }
+  async function uploadSpreadsheetBuilding(data, site) {
+    const session = import_node_server_utils83.useAtlas.getClient()?.startSession();
+    if (!session) {
+      throw new import_node_server_utils83.BadRequestError("Database session not available.");
+    }
+    try {
+      session?.startTransaction();
+      const blockMap = /* @__PURE__ */ new Map();
+      for (const row of data) {
+        const block = row.block;
+        const name = row.name;
+        const rawLevel = row.level?.toString().trim();
+        const normalizedLevel = /^(na|n\/a)$/i.test(rawLevel) ? null : `Lvl${rawLevel}`;
+        if (!blockMap.has(block)) {
+          blockMap.set(block, { name, levels: [] });
+        }
+        const blockEntry = blockMap.get(block);
+        if (blockEntry.name !== name) {
+          blockEntry.name = `${blockEntry.name}, ${name}`;
+        }
+        if (normalizedLevel && !blockEntry.levels.includes(normalizedLevel)) {
+          blockEntry.levels.push(normalizedLevel);
+        }
+      }
+      const buildingPayloads = Array.from(blockMap.entries()).map(
+        ([block, { name, levels }]) => ({
+          site,
+          block,
+          name,
+          levels
+        })
+      );
+      for (const buildingPayload of buildingPayloads) {
+        const result = await _add(buildingPayload);
+        console.log("Inserted:", result);
+      }
+      await session?.commitTransaction();
+      return buildingPayloads;
+    } catch (error) {
+      await session?.abortTransaction();
+      throw error;
+    } finally {
+      session?.endSession();
+    }
+  }
   return {
     add,
     updateById,
-    deleteById
+    deleteById,
+    uploadSpreadsheetBuilding
   };
 }
 
@@ -19897,6 +20024,7 @@ var import_fs2 = __toESM(require("fs"));
 function useBuildingController() {
   const {
     getAll: _getAll,
+    getAllBuildingForResident: _getAllBuildingForResident,
     getById: _getById,
     getBuildingLevel: _getBuildingLevel,
     getBuildingLevelWithUnits: _getBuildingLevelWithUnits
@@ -19904,7 +20032,8 @@ function useBuildingController() {
   const {
     updateById: _updateById,
     deleteById: _deleteById,
-    add: _add
+    add: _add,
+    uploadSpreadsheetBuilding: _uploadSpreadsheetBuilding
   } = useBuildingService();
   async function createBuilding(req, res, next) {
     const value = req.body;
@@ -19997,6 +20126,40 @@ function useBuildingController() {
       next(error2);
     }
   }
+  async function getAllBuildingForResident(req, res, next) {
+    const query = req.query;
+    const validation = import_joi44.default.object({
+      page: import_joi44.default.number().min(1).optional().default(1),
+      limit: import_joi44.default.number().min(1).optional().default(10),
+      search: import_joi44.default.string().optional().allow("", null),
+      site: import_joi44.default.string().hex().optional().allow("", null),
+      status: import_joi44.default.string().valid(...Object.values(BuildingStatus)).default("active" /* ACTIVE */),
+      sort: import_joi44.default.string().valid(...Object.values(SortFields)).default("_id" /* ID */),
+      order: import_joi44.default.string().valid(...Object.values(SortOrder)).default("asc" /* ASC */)
+    });
+    const { error, value } = validation.validate(query);
+    if (error) {
+      next(new import_node_server_utils84.BadRequestError(error.message));
+      return;
+    }
+    const sortObj = {
+      [value.sort]: value.order === "asc" /* ASC */ ? 1 : -1
+    };
+    try {
+      const buildings = await _getAllBuildingForResident({
+        page: value.page,
+        limit: value.limit,
+        sort: sortObj,
+        status: value.status,
+        site: value.site ?? "",
+        search: value.search ?? ""
+      });
+      res.json(buildings);
+      return;
+    } catch (error2) {
+      next(error2);
+    }
+  }
   async function getById(req, res, next) {
     const id = req.params.id;
     const validation = import_joi44.default.object({
@@ -20151,6 +20314,7 @@ function useBuildingController() {
           validRows.push(value);
         }
       });
+      await _uploadSpreadsheetBuilding(validRows, site);
       res.status(200).json({
         message: "Spreadsheet import completed (buildings).",
         fileName: originalname,
@@ -20191,6 +20355,7 @@ function useBuildingController() {
   return {
     createBuilding,
     getAll,
+    getAllBuildingForResident,
     getById,
     updateById,
     deleteById,