rez_core 2.1.6 → 2.1.11

package/src/module/module/repository/module-access.repository.ts

@@ -1,6 +1,6 @@
 import { BadRequestException, Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { In, Not, Repository , IsNull} from 'typeorm';
+import { In, Not, Repository , IsNull, DataSource} from 'typeorm';
 import { Role } from 'src/module/user/entity/role.entity';
 import { ModuleAccess } from '../entity/module-access.entity';
 import { ModuleAction } from '../entity/module-action.entity';
@@ -21,10 +21,13 @@ export class ModuleAccessRepository {
 
     @InjectRepository(ModuleAction)
     private readonly moduleActionRepo: Repository<ModuleAction>,
+
+    private readonly dataSource: DataSource,
   ) {}
 
  
 
+
   async getRoles({
     appcode,
     level_type,
@@ -34,15 +37,23 @@ export class ModuleAccessRepository {
     level_type?: string;
     level_id?: number;
   }) {
-    const where: any = {
-      appcode,
-      is_factory: [Not(1), IsNull()], // Include NULL or anything not 1
-    };
+    const query = this.dataSource
+      .createQueryBuilder()
+      .select('*')
+      .from('cr_role', 'role')
+      .where('role.appcode = :appcode', { appcode })
+      .andWhere('(role.is_factory IS NULL OR role.is_factory != 1)');
+  
+      
+    if (level_type) {
+      query.andWhere('role.level_type = :level_type', { level_type });
+    }
   
-    if (level_type) where.level_type = level_type;
-    if (level_id !== undefined) where.level_id = String(level_id);
+    if (level_id !== undefined) {
+      query.andWhere('role.level_id = :level_id', { level_id: String(level_id) });
+    }
   
-    const roles = await this.roleRepo.find({ where });
+    const roles = await query.getRawMany(); // use getRawMany since you're selecting from a raw table
   
     return roles.map((role) => ({
       label: role.name,
@@ -50,6 +61,7 @@ export class ModuleAccessRepository {
     }));
   }
   
+  
 
   async getModules({ appcode }: { appcode: string }) {
     const modules = await this.moduleRepo.find({
@@ -73,7 +85,7 @@ export class ModuleAccessRepository {
   ) {
     let roles;
   
-    if (roleIds.length === 1 && roleIds[0] === '-1') {
+    if (roleIds.length === 1 && roleIds[0] === -1) {
       // Internally call getRoles
       const fetchedRoles = await this.getRoles({
         appcode,
@@ -118,6 +130,7 @@ export class ModuleAccessRepository {
           access: access.access_flag,
           code: access.module_code,
           level_type: access.level_type,
+          appcode: access.appcode,
         })),
     }));
   }
@@ -214,8 +227,7 @@ export class ModuleAccessRepository {
       access_flag: number;
       appcode: string;
       level_type: string;
-    }[],
-    appcode: string,
+    }[]
   ): Promise<boolean> {
     try {
       for (const access of accessList) {
@@ -224,7 +236,7 @@ export class ModuleAccessRepository {
             role_code: access.role_code,
             module_code: access.module_code,
             action_type: access.action_type,
-            appcode: access.appcode || appcode,
+            appcode: access.appcode,
             level_type: access.level_type,
           },
         });
@@ -234,10 +246,7 @@ export class ModuleAccessRepository {
           await this.moduleAccessRepo.save(existing);
         } else {
           await this.moduleAccessRepo.save(
-            this.moduleAccessRepo.create({
-              ...access,
-              appcode: access.appcode || appcode,
-            }),
+           await this.moduleAccessRepo.create(access),
           );
         }
       }

package/src/module/module/service/module-access.service.ts

@@ -15,6 +15,15 @@ export class ModuleAccessService {
     private readonly menuRepository: MenuRepository,
     private readonly dataSource: DataSource,
   ) {}
+  
+
+  async getModules({ appcode }: { appcode: string }) {
+    return this.moduleAccessRepository.getModules({
+      appcode,
+    });
+  }
+
+  
   async getRoles({
     appcode,
     level_type,
@@ -48,13 +57,6 @@ export class ModuleAccessService {
     }));
   }
   
-  
-
-  async getModules({ appcode }: { appcode: string }) {
-    return this.moduleAccessRepository.getModules({
-      appcode,
-    });
-  }
   async getAccessListing(
     roleIds: number[],
     appcode: string,
@@ -94,7 +96,6 @@ export class ModuleAccessService {
       appcode: string;
       level_type: string;
     }[],
-    appcode: string,
   ): Promise<{ success: boolean; msg: string }> {
     if (!moduleAccessData || moduleAccessData.length === 0) {
       return { success: false, msg: 'No data provided' };
@@ -102,7 +103,6 @@ export class ModuleAccessService {
 
     const result = await this.moduleAccessRepository.updateModuleAccess(
       moduleAccessData,
-      appcode,
     );
 
     if (result) {
@@ -118,3 +118,6 @@ export class ModuleAccessService {
     return this.moduleAccessRepository.getModuleUIConfig(moduleCode, roleIds);
   }
 }
+
+
+//hi

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: {