rez_core 2.1.10 → 2.1.12

package/src/module/user/service/role.service.ts

@@ -8,6 +8,7 @@ import { RoleRepository } from '../repository/role.repository';
 import { EntityManager, Repository } from 'typeorm';
 import { InjectRepository } from '@nestjs/typeorm';
 import { ModuleAccess } from '../../module/entity/module-access.entity';
+import { ServiceResult } from 'src/dtos/response';
 
 @Injectable()
 export class RoleService extends EntityServiceImpl {
@@ -23,7 +24,7 @@ export class RoleService extends EntityServiceImpl {
   async createEntity(
     entityData: BaseEntity,
     loggedInUser: UserData,
-  ): Promise<BaseEntity> {
+  ): Promise<ServiceResult<BaseEntity>> {
     let role = entityData as Role;
 
     // if level_type and level_id are not provided, use loggedInUser's values
@@ -40,7 +41,7 @@ export class RoleService extends EntityServiceImpl {
           parseInt(loggedInUser?.level_id || '', 10),
       })
     ) {
-      throw new BadRequestException('Role code already exists.');
+      return { success: false, error: 'Role code already exists.' };
     }
 
     const sourceRole = role.copy_from_role_id
@@ -48,7 +49,7 @@ export class RoleService extends EntityServiceImpl {
       : null;
 
     if (role.copy_from_role_id && !sourceRole) {
-      throw new BadRequestException('Source role not found.');
+      return { success: false, error: 'Source role not found.' };
     }
 
     const savedRole = await super.createEntity(role, loggedInUser);
@@ -70,15 +71,15 @@ export class RoleService extends EntityServiceImpl {
 
       await this.moduleAccessRepo.save(clonedPermissions);
     }
-    return savedRole;
+    return { success: true, data: savedRole };
   }
 
   async updateEntity(
     entityData: BaseEntity,
     loggedInUser: UserData | null,
-  ): Promise<BaseEntity> {
+  ): Promise<ServiceResult<BaseEntity>> {
     if (!entityData.name) {
-      throw new BadRequestException('Role name is required');
+      return { success: false, error: 'Role name is required' };
     }
     const role = entityData as Role;
 
@@ -90,7 +91,7 @@ export class RoleService extends EntityServiceImpl {
       );
 
       if (!existingRole) {
-        throw new BadRequestException('Role not found');
+        return { success: false, error: 'Role not found' };
       }
 
       const associatedUsers = await this.entityManager.query(`SELECT map.*
@@ -100,13 +101,17 @@ export class RoleService extends EntityServiceImpl {
                                                                 and map.role_id = ${existingRole?.id}`);
 
       if (associatedUsers.length > 0) {
-        throw new BadRequestException(
-          'Cannot deactivate role as it is associated with active users',
-        );
+        return {
+          success: false,
+          error: 'Cannot deactivate role as it is associated with active users',
+        };
       }
 
       if (role.is_system === 1) {
-        throw new BadRequestException('Cannot deactivate system role');
+        return {
+          success: false,
+          error: 'Cannot deactivate system role',
+        };
       }
     }
 
@@ -116,7 +121,10 @@ export class RoleService extends EntityServiceImpl {
         organization_id: loggedInUser?.organization_id,
       })
     ) {
-      throw new BadRequestException('Role name already exists.');
+      return {
+        success: false,
+        error: 'Role name already exists.',
+      };
     }
 
     const { copy_from_role_id, ...persistableData } = role;
@@ -129,7 +137,10 @@ export class RoleService extends EntityServiceImpl {
       );
 
       if (!sourceRole) {
-        throw new BadRequestException('Source role not found');
+        return {
+          success: false,
+          error: 'Source role not found',
+        };
       }
 
       await this.moduleAccessRepo.delete({ role_code: role.code });
@@ -151,7 +162,7 @@ export class RoleService extends EntityServiceImpl {
 
       await this.moduleAccessRepo.save(clonedPermissions);
     }
-    return updatedRole;
+    return { success: true, data: updatedRole };
   }
 
   async getDefaultRole(data: {