@7365admin1/core 2.31.1 → 2.32.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/core
 
+## 2.32.0
+
+### Minor Changes
+
+- 03c36fc: get latest changes
+
+## 2.31.2
+
+### Patch Changes
+
+- 6f8eaf7: Update package core due to missing function
+
 ## 2.31.1
 
 ### Patch Changes

package/dist/index.d.ts

@@ -475,6 +475,7 @@ declare function useOrgRepo(): {
 
 declare function useOrgController(): {
     add: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    addOnboardingOrg: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getAll: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getOrgsByUserId: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getByName: (req: Request, res: Response, next: NextFunction) => Promise<void>;
@@ -1816,7 +1817,7 @@ declare function useBuildingUnitRepo(): {
     }) => Promise<Record<string, any>>;
     getById: (_id: string | ObjectId, session?: ClientSession) => Promise<TBuildingUnit>;
     getByBuildingLevel: (building: string | ObjectId, level: string) => Promise<TBuildingUnit | null>;
-    updateById: (_id: string | ObjectId, value: Partial<Pick<TBuildingUnit, "name" | "level" | "category" | "buildingName" | "block" | "buildingUnitFiles" | "ownerName" | "billing">>, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
+    updateById: (_id: string | ObjectId, value: Partial<Pick<TBuildingUnit, "name" | "level" | "category" | "buildingName" | "block" | "buildingUnitFiles" | "ownerName" | "billing" | "owner">>, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
     getByBuilding: (building: string | ObjectId) => Promise<TBuildingUnit | null>;
     deleteById: (_id: string | ObjectId, session?: ClientSession) => Promise<string>;
     updateLevelByBuildingLevel: (building: string | ObjectId, level: string, newLevel: string, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
@@ -2495,7 +2496,8 @@ declare enum VisitorSort {
 declare enum VisitorStatus {
     REGISTERED = "registered",
     UNREGISTERED = "unregistered",
-    PENDING = "pending"
+    PENDING = "pending",
+    APPROVED = "approved"
 }
 type TKeyRef = {
     keyId: string | ObjectId;
@@ -4795,6 +4797,22 @@ declare function useStatementOfAccountRepo(): {
     updateById: (_id: string | ObjectId, value: Partial<TStatementOfAccount>, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
     deleteById: (_id: string | ObjectId) => Promise<number>;
     updateStatusById: (_id: string | ObjectId, value: Pick<TStatementOfAccount, "status">, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
+    getResidentUserSoa: ({ search, page, limit, sort, status, site, dateFrom, dateTo, unitId, category, }: {
+        search?: string | undefined;
+        page?: number | undefined;
+        limit?: number | undefined;
+        sort?: Record<string, any> | undefined;
+        status: string;
+        site?: string | undefined;
+        dateFrom?: string | undefined;
+        dateTo?: string | undefined;
+        unitId: string;
+        category: string;
+    }, session?: ClientSession) => Promise<{
+        items: any[];
+        pages: number;
+        pageRange: string;
+    }>;
 };
 
 declare function useStatementOfAccountController(): {
@@ -4805,6 +4823,7 @@ declare function useStatementOfAccountController(): {
     deleteById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     generatePDF: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     updateStatusById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    getResidentUserSoa: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
 type TEntryPassSettings = {
@@ -6276,6 +6295,17 @@ declare function useVerificationRepoV2(): {
     updateVerificationStatusById: (_id: string | ObjectId, status: string, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
     getByVerificationCode: (verificationCode: string) => Promise<TVerification | null>;
     getVerificationById: (id: string | ObjectId) => Promise<TVerificationV2 | null>;
+    getVerifications: ({ search, page, limit, sort, status, app, type, email, }: {
+        search?: string | undefined;
+        page?: number | undefined;
+        limit?: number | undefined;
+        sort?: Record<string, any> | undefined;
+        status: string;
+        app?: string | undefined;
+        type?: Record<string, any> | undefined;
+        email?: string | undefined;
+    }) => Promise<{}>;
+    updateStatusById: (_id: string | ObjectId, status: string, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
 };
 
 declare function useVerificationServiceV2(): {
@@ -6304,6 +6334,7 @@ declare function useVerificationServiceV2(): {
         siteName: string;
     }) => Promise<bson.ObjectId>;
     createForgetPassword: (email: string) => Promise<string>;
+    cancelUserInvitation: (id: string) => Promise<void>;
 };
 
 declare function useVerificationControllerV2(): {
@@ -6311,6 +6342,8 @@ declare function useVerificationControllerV2(): {
     createUserInvite: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     createServiceProviderInvite: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     createForgetPassword: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    getVerifications: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    cancelUserInvitation: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
 declare function useAuthControllerV2(): {

package/dist/index.js

@@ -7722,6 +7722,34 @@ function useOrgController() {
       return;
     }
   }
+  async function addOnboardingOrg(req, res, next) {
+    const validation = import_joi18.default.object({
+      name: import_joi18.default.string().required(),
+      type: import_joi18.default.string().required(),
+      nature: import_joi18.default.string().valid(...allowedNatures).required(),
+      email: import_joi18.default.string().email().optional().allow("", null),
+      contact: import_joi18.default.string().optional().allow("", null)
+    });
+    const { error } = validation.validate(req.body);
+    if (error) {
+      import_node_server_utils34.logger.log({ level: "error", message: error.message });
+      next(new import_node_server_utils34.BadRequestError(error.message));
+      return;
+    }
+    try {
+      const _id = await _add(req.body);
+      const data = await _getById(_id);
+      res.status(201).json({
+        message: "Successfully created organization.",
+        data
+      });
+      return;
+    } catch (error2) {
+      import_node_server_utils34.logger.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   async function getOrgsByUserId(req, res, next) {
     const validation = import_joi18.default.object({
       search: import_joi18.default.string().optional().allow("", null),
@@ -7820,6 +7848,7 @@ function useOrgController() {
   }
   return {
     add,
+    addOnboardingOrg,
     getAll,
     getOrgsByUserId,
     getByName,
@@ -13267,6 +13296,7 @@ var VisitorStatus = /* @__PURE__ */ ((VisitorStatus2) => {
   VisitorStatus2["REGISTERED"] = "registered";
   VisitorStatus2["UNREGISTERED"] = "unregistered";
   VisitorStatus2["PENDING"] = "pending";
+  VisitorStatus2["APPROVED"] = "approved";
   return VisitorStatus2;
 })(VisitorStatus || {});
 var schemaVisitorTransaction = import_joi36.default.object({
@@ -17617,6 +17647,9 @@ function useBuildingUnitRepo() {
         return billing;
       });
     }
+    if (value.owner) {
+      value.owner = new import_mongodb48.ObjectId(value.owner);
+    }
     try {
       const res = await collection.updateOne(
         { _id },
@@ -22127,7 +22160,7 @@ function useVisitorTransactionService() {
         unitName: unit?.name,
         org: inviter?.org.toString(),
         site: inviter?.site.toString(),
-        status: "pending" /* PENDING */,
+        status: "approved" /* APPROVED */,
         invitedId: inviter?._id
       };
       const result = await _add(payload);
@@ -22930,6 +22963,14 @@ function usePersonService() {
           );
         }
       }
+      if (value.isOwner && value.unit) {
+        const unit = await _getUnitById(value.unit.toString());
+        await updateUnitById(
+          unit?._id?.toString() || "",
+          { ownerName: value.name, owner: value._id },
+          session
+        );
+      }
       await _add(value, session);
       await session.commitTransaction();
       return "People added successfully.";
@@ -22953,18 +22994,33 @@ function usePersonService() {
         throw new import_node_server_utils106.BadRequestError("Person not found.");
       }
       const isNameUpdated = typeof value.name === "string" && value.name.trim() !== person.name;
-      let unit;
-      if (isNameUpdated && value.unit) {
-        unit = await _getUnitById(value.unit.toString());
-      }
-      if (unit && unit.owner?.toString() === _id.toString()) {
-        await updateUnitById(
-          unit?._id?.toString() || "",
-          { ownerName: value.name },
-          session
-        );
-      }
+      const isOwnerChanged = value.isOwner !== person.isOwner;
       await _updateById(_id, value, session);
+      if (value.unit && (isNameUpdated || isOwnerChanged || value.isOwner)) {
+        const unit = await _getUnitById(value.unit.toString());
+        if (unit) {
+          let updatePayload = {};
+          if (isOwnerChanged) {
+            if (value.isOwner) {
+              updatePayload.owner = _id;
+              updatePayload.ownerName = value.name || "";
+            } else {
+              updatePayload.owner = "";
+              updatePayload.ownerName = "";
+            }
+          }
+          if (isNameUpdated && value.isOwner && unit.owner?.toString() === _id.toString()) {
+            updatePayload.ownerName = value.name;
+          }
+          if (value.isOwner && (!unit.owner || !unit.ownerName)) {
+            updatePayload.owner = _id;
+            updatePayload.ownerName = value.name || "";
+          }
+          if (Object.keys(updatePayload).length > 0 && unit && unit._id) {
+            await updateUnitById(unit._id.toString(), updatePayload, session);
+          }
+        }
+      }
       await session.commitTransaction();
       return "Person updated successfully.";
     } catch (error) {
@@ -36717,6 +36773,81 @@ function useStatementOfAccountRepo() {
       throw new import_node_server_utils164.InternalServerError("Failed to update soa request.");
     }
   }
+  async function getResidentUserSoa({
+    search = "",
+    page = 1,
+    limit = 10,
+    sort = {},
+    status = "pending",
+    site = "",
+    dateFrom,
+    dateTo,
+    unitId,
+    category
+  }, session) {
+    page = page > 0 ? page - 1 : 0;
+    let dateExpr = {};
+    if (dateFrom && dateTo) {
+      let startDate = new Date(dateFrom);
+      startDate.setHours(0, 0, 0, 0);
+      let endDate = new Date(dateTo);
+      endDate.setHours(23, 59, 59, 999);
+      dateExpr = {
+        $expr: {
+          $and: [
+            { $gte: ["$createdAt", startDate] },
+            { $lte: ["$createdAt", endDate] }
+          ]
+        }
+      };
+    }
+    const unitSearchRegex = search ? search.trim().replace(/\s+/g, "").replace(/\//g, "\\s*/\\s*") : null;
+    const query = {
+      ...status && status !== "all" && { status },
+      ...search && {
+        $or: [
+          { unitOwner: { $regex: search, $options: "i" } },
+          { unit: { $regex: unitSearchRegex, $options: "i" } },
+          { email: { $regex: search, $options: "i" } },
+          { category: { $regex: search, $options: "i" } }
+        ]
+      },
+      ...import_mongodb97.ObjectId.isValid(site) && { site: new import_mongodb97.ObjectId(site) },
+      ...dateExpr,
+      ...import_mongodb97.ObjectId.isValid(unitId) && { unitId: new import_mongodb97.ObjectId(unitId) },
+      ...category && { category }
+    };
+    sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
+    try {
+      const basePipeline = [
+        { $match: query },
+        {
+          $addFields: {
+            sortPriority: {
+              $cond: [{ $eq: ["$status", "pending"] }, 1, 2]
+            }
+          }
+        },
+        {
+          $sort: {
+            sortPriority: 1,
+            ...sort
+          }
+        },
+        { $skip: page * limit },
+        { $limit: limit }
+      ];
+      const [items, countResult] = await Promise.all([
+        collection.aggregate(basePipeline, { session }).toArray(),
+        collection.aggregate([{ $match: query }, { $count: "total" }], { session }).toArray()
+      ]);
+      const totalCount = countResult[0]?.total || 0;
+      const data = (0, import_node_server_utils164.paginate)(items, page, limit, totalCount);
+      return data;
+    } catch (error) {
+      throw error;
+    }
+  }
   function delCachedData() {
     delNamespace().then(() => {
       import_node_server_utils164.logger.log({
@@ -36737,7 +36868,8 @@ function useStatementOfAccountRepo() {
     getById,
     updateById,
     deleteById,
-    updateStatusById
+    updateStatusById,
+    getResidentUserSoa
   };
 }
 
@@ -36890,7 +37022,8 @@ function useStatementOfAccountController() {
     getById: _getById,
     updateById: _updateById,
     deleteById: _deleteById,
-    updateStatusById: _updateStatusById
+    updateStatusById: _updateStatusById,
+    getResidentUserSoa: _getResidentUserSoa
   } = useStatementOfAccountRepo();
   const { add: _add, generatePDF: _generatePDF } = useStatementOfAccountService();
   async function add(req, res, next) {
@@ -37141,6 +37274,57 @@ function useStatementOfAccountController() {
       return;
     }
   }
+  async function getResidentUserSoa(req, res, next) {
+    const validation = import_joi93.default.object({
+      page: import_joi93.default.number().integer().min(1).allow("", null).default(1),
+      limit: import_joi93.default.number().integer().min(1).max(100).allow("", null).default(10),
+      status: import_joi93.default.string().optional().allow(null, ""),
+      search: import_joi93.default.string().optional().allow(null, ""),
+      site: import_joi93.default.string().required(),
+      dateFrom: import_joi93.default.string().optional().allow(null, ""),
+      dateTo: import_joi93.default.string().optional().allow(null, ""),
+      unitId: import_joi93.default.string().required(),
+      category: import_joi93.default.string().optional().allow(null, "")
+    });
+    const query = { ...req.query };
+    const { error } = validation.validate(query, {
+      abortEarly: false
+    });
+    if (error) {
+      const messages = error.details.map((d) => d.message).join(", ");
+      import_node_server_utils166.logger.log({ level: "error", message: messages });
+      next(new import_node_server_utils166.BadRequestError(messages));
+      return;
+    }
+    const search = req.query.search ?? "";
+    const page = parseInt(req.query.page ?? "1");
+    const limit = parseInt(req.query.limit ?? "10");
+    const status = req.query.status ?? "active";
+    const site = req.query.site;
+    const dateFrom = req.query.dateFrom ?? "";
+    const dateTo = req.query.dateTo ?? "";
+    const unitId = req.query.unitId;
+    const category = req.query.category ?? "";
+    try {
+      const data = await _getResidentUserSoa({
+        search,
+        page,
+        limit,
+        status,
+        site,
+        dateFrom,
+        dateTo,
+        unitId,
+        category
+      });
+      res.status(200).json(data);
+      return;
+    } catch (error2) {
+      import_node_server_utils166.logger.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   return {
     add,
     getAll,
@@ -37148,7 +37332,8 @@ function useStatementOfAccountController() {
     updateById,
     deleteById,
     generatePDF,
-    updateStatusById
+    updateStatusById,
+    getResidentUserSoa
   };
 }
 
@@ -40231,7 +40416,7 @@ function useOccurrenceEntryService() {
       value.signature = value.signature ? new import_mongodb108.ObjectId(value.signature) : occurrenceEntry.signature._id;
       value.eSignature = value.eSignature ? new import_mongodb108.ObjectId(value.eSignature) : occurrenceEntry.eSignature;
       value.createdAt = /* @__PURE__ */ new Date();
-      value.date = /* @__PURE__ */ new Date();
+      value.date = value.date ? value.date : occurrenceEntry.date;
       value.userName = value.userName ? value.userName : occurrenceEntry.signature.name;
       value.createdByName = value.createdByName ? value.createdByName : occurrenceEntry.createdByName;
       await _updateOccurrenceBookById(dobId, {
@@ -46640,13 +46825,117 @@ function useVerificationRepoV2() {
       );
     }
   }
+  async function getVerifications({
+    search = "",
+    page = 1,
+    limit = 10,
+    sort = {},
+    status = "active",
+    app = "",
+    type = {},
+    email = ""
+  }) {
+    page = page > 0 ? page - 1 : 0;
+    const query = { status };
+    const cacheOptions = {
+      page,
+      limit,
+      status
+    };
+    sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
+    cacheOptions.sort = JSON.stringify(sort);
+    if (search) {
+      query.$text = { $search: search };
+      cacheOptions.search = search;
+    }
+    if (app) {
+      query["metadata.app"] = app;
+      cacheOptions["metadata.app"] = app;
+    }
+    if (type && Object.keys(type).length > 0) {
+      query.type = { $in: Object.keys(type) };
+      cacheOptions.type = JSON.stringify(type);
+    }
+    if (email) {
+      query.email = email;
+      cacheOptions.email = email;
+    }
+    const cacheKey = (0, import_node_server_utils218.makeCacheKey)(namespace_collection, cacheOptions);
+    const cachedData = await getCache(cacheKey);
+    if (cachedData) {
+      import_node_server_utils218.logger.info(`Cache hit for key: ${cacheKey}`);
+      return cachedData;
+    }
+    try {
+      const items = await collection.aggregate([
+        { $match: query },
+        { $sort: sort },
+        { $skip: page * limit },
+        { $limit: limit },
+        {
+          $project: {
+            _id: 1,
+            createdAt: 1,
+            email: 1,
+            type: 1,
+            metadata: 1,
+            status: 1
+          }
+        }
+      ]).toArray();
+      const length = await collection.countDocuments(query);
+      const data = (0, import_node_server_utils218.paginate)(items, page, limit, length);
+      setCache(cacheKey, data, 15 * 60).then(() => {
+        import_node_server_utils218.logger.info(`Cache set for key: ${cacheKey}`);
+      }).catch((err) => {
+        import_node_server_utils218.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
+      });
+      return data;
+    } catch (error) {
+      import_node_server_utils218.logger.log({ level: "error", message: `${error}` });
+      throw error;
+    }
+  }
+  async function updateStatusById(_id, status, session) {
+    try {
+      _id = new import_mongodb127.ObjectId(_id);
+    } catch (error) {
+      throw new import_node_server_utils218.BadRequestError("Invalid verification ID format.");
+    }
+    try {
+      const result = await collection.updateOne(
+        { _id },
+        { $set: { status, updatedAt: (/* @__PURE__ */ new Date()).toISOString() } },
+        { session }
+      );
+      delNamespace().then(() => {
+        import_node_server_utils218.logger.info(`Cache cleared for namespace: ${namespace_collection}`);
+      }).catch((err) => {
+        import_node_server_utils218.logger.error(
+          `Failed to clear cache for namespace: ${namespace_collection}`,
+          err
+        );
+      });
+      const cacheKey = (0, import_node_server_utils218.makeCacheKey)(namespace_collection, { _id });
+      delCache(cacheKey).then(() => {
+        import_node_server_utils218.logger.info(`Cache deleted for key: ${cacheKey}`);
+      }).catch((err) => {
+        import_node_server_utils218.logger.error(`Failed to delete cache for key: ${cacheKey}`, err);
+      });
+      return result;
+    } catch (error) {
+      throw new import_node_server_utils218.InternalServerError("Error updating verification status.");
+    }
+  }
   return {
     createIndex,
     createTextIndex,
     add,
     updateVerificationStatusById,
     getByVerificationCode,
-    getVerificationById
+    getVerificationById,
+    getVerifications,
+    updateStatusById
   };
 }
 
@@ -46666,7 +46955,8 @@ function useVerificationServiceV2() {
   const {
     add: _add,
     updateVerificationStatusById: _updateVerificationStatusById,
-    getByVerificationCode: _getByVerificationCode
+    getByVerificationCode: _getByVerificationCode,
+    updateStatusById: _updateStatusById
   } = useVerificationRepoV2();
   const {
     getUserByEmailStatus: _getUserByEmailStatus,
@@ -46971,12 +47261,22 @@ function useVerificationServiceV2() {
       throw new import_node_server_utils219.InternalServerError("Failed to create forget password link.");
     }
   }
+  async function cancelUserInvitation(id) {
+    try {
+      await _updateStatusById(id, "cancelled");
+    } catch (error) {
+      throw new import_node_server_utils219.InternalServerError(
+        `Error cancelling user invitation: ${error}`
+      );
+    }
+  }
   return {
     signUp,
     verify,
     createUserInvite,
     createServiceProviderInvite,
-    createForgetPassword
+    createForgetPassword,
+    cancelUserInvitation
   };
 }
 
@@ -46988,8 +47288,10 @@ function useVerificationControllerV2() {
     verify: _verify,
     createUserInvite: _createUserInvite,
     createServiceProviderInvite: _createServiceProviderInvite,
-    createForgetPassword: _createForgetPassword
+    createForgetPassword: _createForgetPassword,
+    cancelUserInvitation: _cancelUserInvitation
   } = useVerificationServiceV2();
+  const { getVerifications: _getVerifications } = useVerificationRepoV2();
   async function verify(req, res, next) {
     try {
       const schema2 = import_joi126.default.object({ verificationCode: import_joi126.default.string().required() });
@@ -47105,11 +47407,71 @@ function useVerificationControllerV2() {
       return;
     }
   }
+  async function getVerifications(req, res, next) {
+    const schema2 = import_joi126.default.object({
+      search: import_joi126.default.string().optional().allow("", null),
+      page: import_joi126.default.number().integer().min(1).allow("", null).default(1),
+      status: import_joi126.default.string().required(),
+      app: import_joi126.default.string().optional().allow("", null),
+      type: import_joi126.default.alternatives().try(
+        import_joi126.default.array().items(import_joi126.default.string()),
+        import_joi126.default.string().custom((value2) => value2.split(","))
+      ).optional().allow("", null),
+      email: import_joi126.default.string().optional().allow("", null)
+    });
+    const { error, value } = schema2.validate(req.query);
+    if (error) {
+      const messages = error.details.map((d) => d.message).join(", ");
+      import_node_server_utils220.logger.log({ level: "error", message: messages });
+      next(new import_node_server_utils220.BadRequestError(messages));
+      return;
+    }
+    const { search, page, status, app, email, type } = value;
+    try {
+      const data = await _getVerifications({
+        search,
+        page,
+        status,
+        app,
+        type,
+        email
+      });
+      res.json(data);
+      return;
+    } catch (error2) {
+      import_node_server_utils220.logger.log({ level: "error", message: `${error2.message}` });
+      next(error2);
+      return;
+    }
+  }
+  async function cancelUserInvitation(req, res, next) {
+    const validation = import_joi126.default.string().hex().required();
+    const otpId = req.params.id;
+    const { error } = validation.validate(otpId);
+    if (error) {
+      import_node_server_utils220.logger.log({ level: "error", message: `${error.message}` });
+      next(new import_node_server_utils220.BadRequestError(error.message));
+      return;
+    }
+    try {
+      await _cancelUserInvitation(otpId);
+      res.json({
+        message: "User invite has been cancelled."
+      });
+      return;
+    } catch (error2) {
+      import_node_server_utils220.logger.log({ level: "error", message: `${error2.message}` });
+      next(error2);
+      return;
+    }
+  }
   return {
     verify,
     createUserInvite,
     createServiceProviderInvite,
-    createForgetPassword
+    createForgetPassword,
+    getVerifications,
+    cancelUserInvitation
   };
 }