@7365admin1/core 2.52.0 → 2.54.0

package/dist/index.mjs

@@ -4114,12 +4114,13 @@ function useOrgRepo() {
     status = "active",
     nature = ""
   }) {
-    page = page > 0 ? page - 1 : 0;
     const query = { status };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     const cacheOptions = {
       status,
-      sort
+      sort,
+      page,
+      limit
     };
     if (search) {
       query.$text = { $search: search };
@@ -4135,11 +4136,12 @@ function useOrgRepo() {
       logger10.info(`Cache hit for key: ${cacheKey}`);
       return cachedData;
     }
+    const normalizedPage = page > 0 ? page - 1 : 0;
     try {
       const items = await collection.aggregate([
         { $match: query },
         { $sort: sort },
-        { $skip: page * limit },
+        { $skip: normalizedPage * limit },
         { $limit: limit },
         {
           $project: {
@@ -4153,7 +4155,7 @@ function useOrgRepo() {
         }
       ]).toArray();
       const length = await collection.countDocuments(query);
-      const data = paginate7(items, page, limit, length);
+      const data = paginate7(items, normalizedPage, limit, length);
       setCache(cacheKey, data, 15 * 60).then(() => {
         logger10.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
@@ -5310,11 +5312,16 @@ function useVerificationService() {
     const existing = await useVerificationRepo().findOne({
       type,
       email,
-      "metadata.org": metadata?.org,
-      "metadata.siteId": metadata?.siteId
+      "metadata.app": metadata.app
     });
-    if (existing)
+    if (existing) {
+      if (existing.status === "complete") {
+        throw new BadRequestError20(
+          `User already completed invite for app: ${metadata.app}`
+        );
+      }
       return existing._id;
+    }
     const value = {
       type,
       email,
@@ -7571,6 +7578,7 @@ function useVerificationController() {
     createServiceProviderInvite: _createServiceProviderInvite,
     createForgetPassword: _createForgetPassword,
     verify: _verify,
+    updateStatusById: _updateStatusById,
     cancelUserInvitation: _cancelUserInvitation
   } = useVerificationService();
   const { getVerifications: _getVerifications } = useVerificationRepo();
@@ -7784,6 +7792,28 @@ function useVerificationController() {
       return;
     }
   }
+  async function updateVerificationStatus(req, res, next) {
+    const validation = Joi16.object({
+      id: Joi16.string().hex().required(),
+      status: Joi16.string().valid("pending", "complete", "expired", "cancelled").required()
+    });
+    const { error } = validation.validate(req.body);
+    if (error) {
+      logger22.log({ level: "error", message: error.message });
+      next(new BadRequestError31(error.message));
+      return;
+    }
+    try {
+      const { id, status } = req.body;
+      const result = await _updateStatusById(id, status);
+      res.json({ message: result });
+      return;
+    } catch (error2) {
+      logger22.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   async function cancelUserInvitation(req, res, next) {
     const validation = Joi16.string().hex().required();
     const otpId = req.params.id;
@@ -7811,6 +7841,7 @@ function useVerificationController() {
     createServiceProviderInvite,
     createForgetPassword,
     verify,
+    updateVerificationStatus,
     cancelUserInvitation,
     createSimpleUserInvite
   };
@@ -13708,9 +13739,26 @@ function useVisitorTransactionRepo() {
       ...status && { status },
       ...tab == "Overnight Parking" && { isOvernightParking: true }
     };
-    sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
+    sort = Object.keys(sort).length > 0 ? sort : { latestDate: -1 };
     try {
-      const basePipeline = [{ $match: query }];
+      const basePipeline = [
+        { $match: query },
+        {
+          $addFields: {
+            latestDate: {
+              $max: ["$createdAt", "$updatedAt"]
+            }
+          }
+        },
+        { $sort: { latestDate: -1 } },
+        { $skip: skip },
+        { $limit: limit },
+        {
+          $project: {
+            latestDate: 0
+          }
+        }
+      ];
       const [items, countResult] = await Promise.all([
         collection.aggregate([
           ...basePipeline,
@@ -13850,9 +13898,6 @@ function useVisitorTransactionRepo() {
               as: "passKeys"
             }
           },
-          { $sort: sort },
-          { $skip: skip },
-          { $limit: limit },
           {
             $lookup: {
               from: "users",
@@ -15863,14 +15908,16 @@ function MBuildingUnit(value) {
 
 // src/repositories/building-unit.repository.ts
 import { ObjectId as ObjectId45 } from "mongodb";
+var building_units_namespace_collection = "building-units";
 function useBuildingUnitRepo() {
   const db = useAtlas33.getDb();
   if (!db) {
     throw new Error("Unable to connect to server.");
   }
-  const namespace_collection = "building-units";
-  const collection = db.collection(namespace_collection);
-  const { getCache, setCache, delNamespace, delCache } = useCache25(namespace_collection);
+  const collection = db.collection(building_units_namespace_collection);
+  const { getCache, setCache, delNamespace, delCache } = useCache25(
+    building_units_namespace_collection
+  );
   async function createIndexes() {
     try {
       await collection.createIndexes([
@@ -15896,12 +15943,12 @@ function useBuildingUnitRepo() {
     delNamespace().then(() => {
       logger52.log({
         level: "info",
-        message: `Cache namespace cleared for ${namespace_collection}`
+        message: `Cache namespace cleared for ${building_units_namespace_collection}`
       });
     }).catch((err) => {
       logger52.log({
         level: "error",
-        message: `Failed to clear cache namespace for ${namespace_collection}: ${err.message}`
+        message: `Failed to clear cache namespace for ${building_units_namespace_collection}: ${err.message}`
       });
     });
   }
@@ -16048,7 +16095,10 @@ function useBuildingUnitRepo() {
       ...building && { building },
       ...status && { status }
     };
-    const cacheKey = makeCacheKey24(namespace_collection, cacheParams);
+    const cacheKey = makeCacheKey24(
+      building_units_namespace_collection,
+      cacheParams
+    );
     logger52.log({
       level: "info",
       message: `Cache key for getAll building units: ${cacheKey}`
@@ -16119,7 +16169,9 @@ function useBuildingUnitRepo() {
     } catch (error) {
       throw new BadRequestError71("Invalid ID.");
     }
-    const cacheKey = makeCacheKey24(namespace_collection, { _id: String(_id) });
+    const cacheKey = makeCacheKey24(building_units_namespace_collection, {
+      _id: String(_id)
+    });
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
@@ -16162,7 +16214,7 @@ function useBuildingUnitRepo() {
     } catch (error) {
       throw new BadRequestError71("Invalid building ID.");
     }
-    const cacheKey = makeCacheKey24(namespace_collection, {
+    const cacheKey = makeCacheKey24(building_units_namespace_collection, {
       building: String(building),
       level
     });
@@ -16236,7 +16288,7 @@ function useBuildingUnitRepo() {
     } catch (error) {
       throw new BadRequestError71("Invalid building ID.");
     }
-    const cacheKey = makeCacheKey24(namespace_collection, {
+    const cacheKey = makeCacheKey24(building_units_namespace_collection, {
       building: String(building)
     });
     try {
@@ -16310,7 +16362,10 @@ function useBuildingUnitRepo() {
       block,
       level
     };
-    const cacheKey = makeCacheKey24(namespace_collection, cacheOptions);
+    const cacheKey = makeCacheKey24(
+      building_units_namespace_collection,
+      cacheOptions
+    );
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger52.info(`Cache hit for key: ${cacheKey}`);
@@ -16348,7 +16403,10 @@ function useBuildingUnitRepo() {
     const cacheOptions = {
       site: site.toString()
     };
-    const cacheKey = makeCacheKey24(namespace_collection, cacheOptions);
+    const cacheKey = makeCacheKey24(
+      building_units_namespace_collection,
+      cacheOptions
+    );
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger52.info(`Cache hit for key: ${cacheKey}`);
@@ -16396,7 +16454,10 @@ function useBuildingUnitRepo() {
         { deletedAt: "" }
       ]
     };
-    const cacheKey = makeCacheKey24(namespace_collection, cacheOptions);
+    const cacheKey = makeCacheKey24(
+      building_units_namespace_collection,
+      cacheOptions
+    );
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
@@ -16432,6 +16493,54 @@ function useBuildingUnitRepo() {
       }
     }
   }
+  async function getBySiteBuildingLevel(site, block, level) {
+    try {
+      site = new ObjectId45(site);
+    } catch (error) {
+      throw new BadRequestError71("Invalid site ID.");
+    }
+    const cacheKey = makeCacheKey24(building_units_namespace_collection, {
+      site: site.toString(),
+      block,
+      level
+    });
+    try {
+      const cached = await getCache(cacheKey);
+      if (cached) {
+        logger52.log({
+          level: "info",
+          message: `Cache hit for getById building unit: ${cacheKey}`
+        });
+        return cached;
+      }
+      const query = {
+        site,
+        block,
+        level,
+        status: "active"
+      };
+      console.log(query);
+      const result = await collection.findOne(query);
+      setCache(cacheKey, result, 300).then(() => {
+        logger52.log({
+          level: "info",
+          message: `Cache set for building unit by id: ${cacheKey}`
+        });
+      }).catch((err) => {
+        logger52.log({
+          level: "error",
+          message: `Failed to set cache for building unit by id: ${err.message}`
+        });
+      });
+      return result;
+    } catch (error) {
+      if (error instanceof AppError10) {
+        throw error;
+      } else {
+        throw new InternalServerError27("Failed to get building unit.");
+      }
+    }
+  }
   return {
     createIndexes,
     add,
@@ -16445,7 +16554,8 @@ function useBuildingUnitRepo() {
     updateByBuildingId,
     getBuildingUnits,
     getBuildingUnitsWithOwner,
-    getUnitByBlockLevelUnitNumber
+    getUnitByBlockLevelUnitNumber,
+    getBySiteBuildingLevel
   };
 }
 
@@ -19121,6 +19231,7 @@ function useBuildingRepo() {
       throw new Error("Failed to create index on buildings. " + error.message);
     }
   }
+  const { getBySiteBuildingLevel: _getBySiteBuildingLevel } = useBuildingUnitRepo();
   async function add(value, session) {
     try {
       value = MBuilding(value);
@@ -19314,7 +19425,7 @@ function useBuildingRepo() {
       }
     }
   }
-  async function getBuildingLevel(site, block, isVMS) {
+  async function getBuildingLevel(site, block) {
     try {
       site = new ObjectId49(site);
     } catch (error) {
@@ -19324,7 +19435,8 @@ function useBuildingRepo() {
       site,
       block
     };
-    const cacheKey = makeCacheKey26(buildings_namespace_collection, { ...query, isVMS });
+    const cacheOptions = { ...query };
+    const cacheKey = makeCacheKey26(buildings_namespace_collection, cacheOptions);
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
@@ -19334,24 +19446,65 @@ function useBuildingRepo() {
         });
         return cached;
       }
-      const pipeline = [{ $match: { ...query } }];
-      if (isVMS) {
-        pipeline.push({
-          $lookup: {
-            from: "building-levels",
-            let: { id: "$_id" },
-            pipeline: [
-              {
-                $match: {
-                  $expr: { $eq: ["$block", "$$id"] }
-                }
-              }
-            ],
-            as: "building_levels"
-          }
+      const result = await collection.findOne(query);
+      setCache(cacheKey, result, 300).then(() => {
+        logger60.log({
+          level: "info",
+          message: `Cache set for building by id: ${cacheKey}`
         });
+      }).catch((err) => {
+        logger60.log({
+          level: "error",
+          message: `Failed to set cache for building by id: ${err.message}`
+        });
+      });
+      return result;
+    } catch (error) {
+      if (error instanceof AppError13) {
+        throw error;
+      } else {
+        throw new InternalServerError29("Failed to get building.");
       }
-      const result = await collection.aggregate(pipeline).toArray();
+    }
+  }
+  async function getBuildingLevelWithUnits(site, block) {
+    try {
+      site = new ObjectId49(site);
+    } catch (error) {
+      throw new BadRequestError79("Invalid ID.");
+    }
+    const query = {
+      site,
+      block
+    };
+    const cacheOptions = { ...query };
+    const cacheKey = makeCacheKey26(buildings_namespace_collection, cacheOptions);
+    try {
+      const cached = await getCache(cacheKey);
+      if (cached) {
+        logger60.log({
+          level: "info",
+          message: `Cache hit for getById building: ${cacheKey}`
+        });
+        return cached;
+      }
+      const result = await collection.findOne(query);
+      if (!result) {
+        throw new BadRequestError79("Building not found.");
+      }
+      const validLevels = [];
+      for (const level of result.levels ?? []) {
+        const units = await _getBySiteBuildingLevel(
+          result.site,
+          result.block,
+          level
+        );
+        if (units) {
+          validLevels.push(level);
+        }
+      }
+      result.levels = validLevels;
+      console.log(result);
       setCache(cacheKey, result, 300).then(() => {
         logger60.log({
           level: "info",
@@ -19392,7 +19545,8 @@ function useBuildingRepo() {
     getById,
     updateById,
     deleteById,
-    getBuildingLevel
+    getBuildingLevel,
+    getBuildingLevelWithUnits
   };
 }
 
@@ -19551,7 +19705,8 @@ function useBuildingController() {
   const {
     getAll: _getAll,
     getById: _getById,
-    getBuildingLevel: _getBuildingLevel
+    getBuildingLevel: _getBuildingLevel,
+    getBuildingLevelWithUnits: _getBuildingLevelWithUnits
   } = useBuildingRepo();
   const {
     updateById: _updateById,
@@ -19691,7 +19846,6 @@ function useBuildingController() {
   async function getBuildingLevel(req, res, next) {
     const site = req.params.site ?? "";
     let block = req.query.block;
-    const isVMS = req.query.isVMS;
     const validation = Joi44.object({
       site: Joi44.string().hex().required(),
       block: Joi44.number().required()
@@ -19703,7 +19857,7 @@ function useBuildingController() {
     }
     block = parseInt(block) ?? 0;
     try {
-      const siteBlock = await _getBuildingLevel(site, block, isVMS);
+      const siteBlock = await _getBuildingLevel(site, block);
       res.json(siteBlock);
       return;
     } catch (error2) {
@@ -19821,6 +19975,27 @@ function useBuildingController() {
       next(error);
     }
   }
+  async function getBuildingLevelWithUnits(req, res, next) {
+    const site = req.params.site ?? "";
+    let block = req.query.block;
+    const validation = Joi44.object({
+      site: Joi44.string().hex().required(),
+      block: Joi44.number().required()
+    });
+    const { error } = validation.validate({ site, block });
+    if (error) {
+      next(new BadRequestError81(error.message));
+      return;
+    }
+    block = parseInt(block) ?? 0;
+    try {
+      const siteBlock = await _getBuildingLevelWithUnits(site, block);
+      res.json(siteBlock);
+      return;
+    } catch (error2) {
+      next(error2);
+    }
+  }
   return {
     createBuilding,
     getAll,
@@ -19828,7 +20003,8 @@ function useBuildingController() {
     updateById,
     deleteById,
     getBuildingLevel,
-    uploadSpreadsheetBuilding
+    uploadSpreadsheetBuilding,
+    getBuildingLevelWithUnits
   };
 }
 
@@ -20511,7 +20687,8 @@ function useVehicleController() {
         recNo: Joi46.string().optional().allow(null, ""),
         type: Joi46.string().optional().valid(...Object.values(VehicleType)).allow(null, ""),
         peopleId: Joi46.string().hex().length(24).optional().allow(null, ""),
-        seasonPassType: Joi46.string().optional().allow("", null)
+        seasonPassType: Joi46.string().optional().allow("", null),
+        remarks: Joi46.string().optional().allow("", null)
       });
       const { error, value } = schema2.validate(
         {
@@ -23866,6 +24043,8 @@ function useVisitorTransactionService() {
       }
       if (value.unit) {
         value.unit = typeof value.unit === "string" ? new ObjectId59(value.unit) : value.unit;
+        const unit = await _getUnitById(value.unit);
+        value.unitName = unit?.name;
       }
       await _updateVisitorTansactionById(id, value, session);
       await session?.commitTransaction();
@@ -51866,6 +52045,7 @@ export {
   allowedNatures,
   attendanceSchema,
   attendanceSettingsSchema,
+  building_units_namespace_collection,
   buildings_namespace_collection,
   bulletin_boards_namespace_collection,
   calculatePercentage,