@7365admin1/core 2.31.2 → 2.33.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/core
 
+## 2.33.0
+
+### Minor Changes
+
+- 53508a4: get latest changes
+
+## 2.32.0
+
+### Minor Changes
+
+- 03c36fc: get latest changes
+
 ## 2.31.2
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1817,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>>;
@@ -2496,7 +2496,8 @@ declare enum VisitorSort {
 declare enum VisitorStatus {
     REGISTERED = "registered",
     UNREGISTERED = "unregistered",
-    PENDING = "pending"
+    PENDING = "pending",
+    APPROVED = "approved"
 }
 type TKeyRef = {
     keyId: string | ObjectId;
@@ -6304,6 +6305,7 @@ declare function useVerificationRepoV2(): {
         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(): {
@@ -6332,6 +6334,7 @@ declare function useVerificationServiceV2(): {
         siteName: string;
     }) => Promise<bson.ObjectId>;
     createForgetPassword: (email: string) => Promise<string>;
+    cancelUserInvitation: (id: string) => Promise<void>;
 };
 
 declare function useVerificationControllerV2(): {
@@ -6340,6 +6343,7 @@ declare function useVerificationControllerV2(): {
     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

@@ -13296,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({
@@ -13657,7 +13658,8 @@ function useVisitorTransactionRepo() {
                         $project: {
                           _id: 1,
                           prefixPass: 1,
-                          name: 1
+                          name: 1,
+                          remarks: 1
                         }
                       }
                     ],
@@ -13670,6 +13672,9 @@ function useVisitorTransactionRepo() {
                     keyId: "$_id",
                     status: 1,
                     description: 1,
+                    remarks: {
+                      $arrayElemAt: ["$template.remarks", 0]
+                    },
                     templatePrefixPass: {
                       $arrayElemAt: ["$template.prefixPass", 0]
                     },
@@ -13706,7 +13711,8 @@ function useVisitorTransactionRepo() {
                         $project: {
                           _id: 1,
                           prefixPass: 1,
-                          name: 1
+                          name: 1,
+                          remarks: 1
                         }
                       }
                     ],
@@ -13719,6 +13725,9 @@ function useVisitorTransactionRepo() {
                     keyId: "$_id",
                     status: 1,
                     description: 1,
+                    remarks: {
+                      $arrayElemAt: ["$template.remarks", 0]
+                    },
                     templatePrefixPass: {
                       $arrayElemAt: ["$template.prefixPass", 0]
                     },
@@ -17646,6 +17655,9 @@ function useBuildingUnitRepo() {
         return billing;
       });
     }
+    if (value.owner) {
+      value.owner = new import_mongodb48.ObjectId(value.owner);
+    }
     try {
       const res = await collection.updateOne(
         { _id },
@@ -22156,7 +22168,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);
@@ -22959,6 +22971,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.";
@@ -22982,18 +23002,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) {
@@ -46869,6 +46904,37 @@ function useVerificationRepoV2() {
       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,
@@ -46876,7 +46942,8 @@ function useVerificationRepoV2() {
     updateVerificationStatusById,
     getByVerificationCode,
     getVerificationById,
-    getVerifications
+    getVerifications,
+    updateStatusById
   };
 }
 
@@ -46896,7 +46963,8 @@ function useVerificationServiceV2() {
   const {
     add: _add,
     updateVerificationStatusById: _updateVerificationStatusById,
-    getByVerificationCode: _getByVerificationCode
+    getByVerificationCode: _getByVerificationCode,
+    updateStatusById: _updateStatusById
   } = useVerificationRepoV2();
   const {
     getUserByEmailStatus: _getUserByEmailStatus,
@@ -47201,12 +47269,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
   };
 }
 
@@ -47218,7 +47296,8 @@ 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) {
@@ -47373,12 +47452,34 @@ function useVerificationControllerV2() {
       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,
-    getVerifications
+    getVerifications,
+    cancelUserInvitation
   };
 }