@7365admin1/core 3.32.2-staging.90 → 3.32.2-staging.92

package/dist/index.d.ts

@@ -284,6 +284,7 @@ declare function useRoleRepo(): {
         type?: string | undefined;
         org: string | ObjectId;
     }) => Promise<{}>;
+    getActiveByTypeOrg: (type: string, org: string | ObjectId) => Promise<TRole[]>;
     updateRole: (_id: string | ObjectId, value: TMiniRole, session?: ClientSession) => Promise<ObjectId>;
     updatePermissionsById: (_id: string | ObjectId, permissions: TRole["permissions"], session?: ClientSession) => Promise<string>;
     deleteRole: (_id: string | ObjectId, session?: ClientSession) => Promise<string>;
@@ -298,6 +299,8 @@ declare function useRoleController(): {
     updateRole: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     updatePermissionsById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     deleteRole: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    getDeletionPreview: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    deleteWithReassignments: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
 type TMember = {
@@ -336,6 +339,7 @@ declare function useMemberRepo(): {
     getAllByUserId: (user: string | ObjectId) => Promise<TMember[]>;
     getByUserIdType: (user: string | ObjectId, type: string) => Promise<TMember>;
     getByRoleId: (role: string | ObjectId) => Promise<any>;
+    getAssignedByRoleId: (role: string | ObjectId) => Promise<TMember[]>;
     getAll: ({ search, page, limit, user, org, siteId, type, status, }: {
         search?: string | undefined;
         page?: number | undefined;
@@ -375,6 +379,10 @@ declare function useMemberRepo(): {
     countByOrg: (org: string | ObjectId) => Promise<number | TMember>;
     countUserMembershipById: (user: string | ObjectId) => Promise<number | TMember>;
     updateRoleById: (_id: string | ObjectId, role: string | ObjectId) => Promise<number>;
+    reassignRoles: (reassignments: Array<{
+        memberId: string;
+        roleId: string;
+    }>, session: ClientSession) => Promise<void>;
     getByRoles: (roles: string[] | ObjectId[], type: string) => Promise<TMember[]>;
     updateSiteById: (_id: string | ObjectId, siteId: string | ObjectId, siteName: string) => Promise<number>;
     getByUserIdTypeOrg: (user: string | ObjectId, type: string, org: string | ObjectId) => Promise<TMember>;

package/dist/index.js

@@ -9722,6 +9722,52 @@ function useMemberRepo() {
       throw error;
     }
   }
+  async function getAssignedByRoleId(role) {
+    try {
+      role = new import_mongodb12.ObjectId(role);
+    } catch (error) {
+      throw new import_node_server_utils12.BadRequestError("Invalid role ID format.");
+    }
+    try {
+      return await collection.find({ role, status: { $ne: "deleted" } }).toArray();
+    } catch (error) {
+      throw new import_node_server_utils12.InternalServerError("Failed to retrieve role members.");
+    }
+  }
+  async function reassignRoles(reassignments, session) {
+    const operations = reassignments.map(({ memberId, roleId }) => {
+      let _id;
+      let role;
+      try {
+        _id = new import_mongodb12.ObjectId(memberId);
+        role = new import_mongodb12.ObjectId(roleId);
+      } catch (error) {
+        throw new import_node_server_utils12.BadRequestError("Invalid member or role ID format.");
+      }
+      return {
+        updateOne: {
+          filter: { _id, status: { $ne: "deleted" } },
+          update: {
+            $set: {
+              role,
+              updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+            }
+          }
+        }
+      };
+    });
+    if (!operations.length)
+      return;
+    try {
+      const result = await collection.bulkWrite(operations, { session });
+      if (result.matchedCount !== operations.length) {
+        throw new import_node_server_utils12.BadRequestError("One or more assigned members no longer exist.");
+      }
+      await delNamespace();
+    } catch (error) {
+      throw error;
+    }
+  }
   async function getAll({
     search = "",
     page = 1,
@@ -10351,6 +10397,7 @@ function useMemberRepo() {
     getAllByUserId,
     getByUserIdType,
     getByRoleId,
+    getAssignedByRoleId,
     getAll,
     getOrgsByMembership,
     getOrgsByUserId,
@@ -10360,6 +10407,7 @@ function useMemberRepo() {
     countByOrg,
     countUserMembershipById,
     updateRoleById,
+    reassignRoles,
     getByRoles,
     updateSiteById,
     getByUserIdTypeOrg,
@@ -15572,6 +15620,20 @@ function useRoleRepo() {
       throw error;
     }
   }
+  async function getActiveByTypeOrg(type, org) {
+    try {
+      if (typeof org === "string" && org) {
+        org = new import_mongodb30.ObjectId(org);
+      }
+    } catch (error) {
+      throw new import_node_server_utils32.BadRequestError("Invalid organization ID format.");
+    }
+    try {
+      return await collection.find({ status: "active", type, org }).sort({ name: 1 }).toArray();
+    } catch (error) {
+      throw new import_node_server_utils32.InternalServerError("Failed to retrieve replacement roles.");
+    }
+  }
   async function updateRole(_id, value, session) {
     if (!_id) {
       throw new import_node_server_utils32.BadRequestError("Role ID is required.");
@@ -15691,6 +15753,7 @@ function useRoleRepo() {
     getRoleById,
     getRoleByName,
     getRoles,
+    getActiveByTypeOrg,
     updateRole,
     updatePermissionsById,
     deleteRole,
@@ -17667,8 +17730,12 @@ var import_node_server_utils40 = require("@7365admin1/node-server-utils");
 // src/services/role.service.ts
 var import_node_server_utils39 = require("@7365admin1/node-server-utils");
 function useRoleService() {
-  const { deleteRole: _deleteRole } = useRoleRepo();
-  const { getByRoleId } = useMemberRepo();
+  const {
+    deleteRole: _deleteRole,
+    getActiveByTypeOrg,
+    getRoleById
+  } = useRoleRepo();
+  const { getByRoleId, getAssignedByRoleId, reassignRoles } = useMemberRepo();
   async function deleteRole(_id) {
     try {
       const count = await getByRoleId(_id);
@@ -17682,7 +17749,49 @@ function useRoleService() {
       throw error;
     }
   }
-  return { deleteRole };
+  async function getDeletionPreview(_id) {
+    const role = await getRoleById(_id);
+    if (!role) {
+      throw new import_node_server_utils39.NotFoundError("Role not found.");
+    }
+    const members = await getAssignedByRoleId(_id);
+    const replacementRoles = (await getActiveByTypeOrg(role.type ?? "", role.org ?? "")).filter((replacementRole) => replacementRole._id?.toString() !== _id);
+    return { role, members, replacementRoles };
+  }
+  async function deleteWithReassignments(_id, reassignments) {
+    const session = import_node_server_utils39.useAtlas.getClient()?.startSession();
+    if (!session) {
+      throw new import_node_server_utils39.InternalServerError("Unable to start role deletion transaction.");
+    }
+    try {
+      session.startTransaction();
+      const { members, replacementRoles } = await getDeletionPreview(_id);
+      const memberIds = members.map((member) => member._id?.toString() ?? "");
+      const reassignedMemberIds = reassignments.map(
+        ({ memberId }) => memberId
+      );
+      const replacementRoleIds = new Set(
+        replacementRoles.map((role) => role._id?.toString() ?? "")
+      );
+      const hasExactMemberCoverage = reassignedMemberIds.length === memberIds.length && new Set(reassignedMemberIds).size === reassignedMemberIds.length && memberIds.every((memberId) => reassignedMemberIds.includes(memberId));
+      const hasEligibleReplacementRoles = reassignments.every(
+        ({ roleId }) => replacementRoleIds.has(roleId)
+      );
+      if (!hasExactMemberCoverage || !hasEligibleReplacementRoles) {
+        throw new import_node_server_utils39.BadRequestError("Invalid role reassignment request.");
+      }
+      await reassignRoles(reassignments, session);
+      await _deleteRole(_id, session);
+      await session.commitTransaction();
+      return "Successfully reassigned members and deleted role permission.";
+    } catch (error) {
+      await session.abortTransaction();
+      throw error;
+    } finally {
+      await session.endSession();
+    }
+  }
+  return { deleteRole, getDeletionPreview, deleteWithReassignments };
 }
 
 // src/controllers/role.controller.ts
@@ -17695,7 +17804,11 @@ function useRoleController() {
     updateRole: _updateRole,
     updatePermissionsById: _updatePermissionsById
   } = useRoleRepo();
-  const { deleteRole: _deleteRole } = useRoleService();
+  const {
+    deleteRole: _deleteRole,
+    getDeletionPreview: _getDeletionPreview,
+    deleteWithReassignments: _deleteWithReassignments
+  } = useRoleService();
   async function createRole(req, res, next) {
     const validation = import_joi19.default.object({
       name: import_joi19.default.string().required(),
@@ -17859,6 +17972,57 @@ function useRoleController() {
       return;
     }
   }
+  async function getDeletionPreview(req, res, next) {
+    const validation = import_joi19.default.string().hex().required();
+    const _id = req.params.id;
+    const { error } = validation.validate(_id);
+    if (error) {
+      import_node_server_utils40.logger.log({ level: "error", message: error.message });
+      next(new import_node_server_utils40.BadRequestError(error.message));
+      return;
+    }
+    try {
+      const data = await _getDeletionPreview(_id);
+      res.json({ data });
+      return;
+    } catch (error2) {
+      import_node_server_utils40.logger.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  async function deleteWithReassignments(req, res, next) {
+    const validation = import_joi19.default.object({
+      id: import_joi19.default.string().hex().required(),
+      reassignments: import_joi19.default.array().items(
+        import_joi19.default.object({
+          memberId: import_joi19.default.string().hex().required(),
+          roleId: import_joi19.default.string().hex().required()
+        })
+      ).required()
+    });
+    const { error } = validation.validate({
+      id: req.params.id,
+      reassignments: req.body.reassignments
+    });
+    if (error) {
+      import_node_server_utils40.logger.log({ level: "error", message: error.message });
+      next(new import_node_server_utils40.BadRequestError(error.message));
+      return;
+    }
+    try {
+      const message = await _deleteWithReassignments(
+        req.params.id,
+        req.body.reassignments
+      );
+      res.json({ message });
+      return;
+    } catch (error2) {
+      import_node_server_utils40.logger.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   return {
     createRole,
     getRoles,
@@ -17866,7 +18030,9 @@ function useRoleController() {
     getRoleById,
     updateRole,
     updatePermissionsById,
-    deleteRole
+    deleteRole,
+    getDeletionPreview,
+    deleteWithReassignments
   };
 }
 
@@ -33619,7 +33785,7 @@ function useBuildingController() {
       const requiredFields = ["block", "name"];
       const rowSchema = import_joi52.default.object({
         block: import_joi52.default.number().integer().min(0).required(),
-        name: import_joi52.default.string().trim().required(),
+        name: import_joi52.default.alternatives().try(import_joi52.default.string(), import_joi52.default.number()).custom((value) => String(value).trim()).required(),
         level: import_joi52.default.alternatives().try(import_joi52.default.string(), import_joi52.default.number()).custom((value) => String(value)).optional().allow(null, ""),
         unit: import_joi52.default.alternatives().try(import_joi52.default.string(), import_joi52.default.number()).custom((value) => String(value)).optional().allow(null, ""),
         category: import_joi52.default.string().trim().optional().allow(null, ""),