rez_core 2.0.93 → 2.0.95

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "2.0.93",
+  "version": "2.0.95",
   "description": "",
   "author": "",
   "private": false,

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

@@ -13,10 +13,6 @@ import {
 } from '@nestjs/common';
 import { ModuleAccessService } from '../service/module-access.service';
 import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
-import { ENTITYTYPE_USER } from '../../../constant/global.constant';
-import { UserService } from '../../user/service/user.service';
-import { UserData } from '../../user/entity/user.entity';
-import { MenuRepository } from '../repository/menu.repository';
 import { MenuService } from '../service/menu.service';
 
 @Controller('module-access')
@@ -28,15 +24,14 @@ export class ModuleAccessController {
   ) {}
 
   @Get('roles')
-  async getRoles(@Request() req) {
-    const appcode = req.user.userData.appcode;
-    return this.moduleAccessService.getRoles({ appcode });
+  async getRoles(@Query('appcode') appcode: string, @Request() req) {
+    let level_type= req.user.userData.level_type
+    let level_id= req.user.userData.level_id
+    return this.moduleAccessService.getRoles({ appcode,level_type, level_id });
   }
 
   @Get('modules')
-  async getModules(@Request() req) {
-    const appcode = req.user.userData.appcode;
-
+  async getModules(  @Query('appcode') appcode: string,@Request() req) {
     return this.moduleAccessService.getModules({
       appcode,
     });
@@ -50,9 +45,9 @@ export class ModuleAccessController {
   ) {
     const roleIdArray = roleIds.split(',').map(Number);
     const appcode = queryAppcode || req.user.userData.appcode;
-    return this.moduleAccessService.getAccessListing(roleIdArray, appcode,"");
+    return this.moduleAccessService.getAccessListing(roleIdArray, appcode, '');
   }
-  
+
   @Get('menu-listing')
   async getMenuListing(
     @Query('mainmod') mainModIds: string,
@@ -60,16 +55,14 @@ export class ModuleAccessController {
     @Request() req,
   ) {
     const mainModArray = mainModIds.split(',').map(String);
-    const { level_type} = req.user.userData;
-  
+    const { level_type } = req.user.userData;
+
     return this.moduleAccessService.getMenuListing(
       mainModArray,
       appcode,
-      level_type
+      level_type,
     );
   }
-  
-  
 
   @Post('update')
   async updateModuleAccess(@Body() moduleAccessData: any[], @Request() req) {

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

@@ -22,18 +22,43 @@ export class ModuleAccessRepository {
     private readonly moduleActionRepo: Repository<ModuleAction>,
   ) {}
 
-  async getRoles({ appcode }: { appcode: string }) {
-    const roles = await this.roleRepo.find({ where: { appcode } });
-    return roles.map((role) => ({ label: role.name, value: role.id }));
+  async getRoles({
+    appcode,
+    level_type,
+    level_id,
+  }: {
+    appcode: string;
+    level_type?: string;
+    level_id?: number;
+  }) {
+    const where: any = { appcode };
+    if (level_type) where.level_type = level_type;
+    if (level_id !== undefined) where.level_id = String(level_id);
+  
+    const roles = await this.roleRepo.find({ where });
+  
+    return roles.map((role) => ({
+      label: role.name,
+      value: role.id,
+    }));
   }
+  
+  
 
   async getModules({ appcode }: { appcode: string }) {
     const modules = await this.moduleRepo.find({
       where: { module_level: 'MAINMOD', appcode },
     });
-    return modules.map((mod) => ({ label: mod.name, value: mod.id }));
+  
+    return modules
+      .map((mod) => ({
+        label: mod.name,
+        value: mod.id,
+        group: mod.level_type,
+      }))
+      .sort((a, b) => a.group.localeCompare(b.group));
   }
-
+  
   async getAccessListing(roleIds: number[], appcode: string, levelType: string) {
     const roles = await this.roleRepo.find({
       where: { id: In(roleIds), appcode },
@@ -62,7 +87,6 @@ export class ModuleAccessRepository {
     }));
   }
 
-
   async getAllModulesByLevel(mainModIds: string[], appcode: string, levelType) {
     const mainModules =
       mainModIds.length === 1 && mainModIds[0] === '-1'
@@ -84,6 +108,23 @@ export class ModuleAccessRepository {
       .andWhere('module.appcode = :appcode', { appcode })
       .getMany();
   
+    const moduleCodes = allModules.map((m) => m.module_code);
+  
+    const allActions = await this.moduleActionRepo.find({
+      where: { module_code: In(moduleCodes) },
+    });
+  
+    // Map actions by module_code with full permission object
+    const actionMap = allActions.reduce((acc, action) => {
+      if (!acc[action.module_code]) acc[action.module_code] = [];
+      acc[action.module_code].push({
+        action: action.action_type,
+        name: action.action_name,
+        // You can also include action_type here if needed
+      });
+      return acc;
+    }, {} as Record<string, { action: string; name: string }[]>);
+  
     const levelsToReturn = levelType === 'ORG' ? ['ORG', 'SCH'] : ['SCH'];
   
     const groupedByLevel: Record<string, any[]> = {};
@@ -101,7 +142,7 @@ export class ModuleAccessRepository {
           .map((mod) => ({
             name: mod.name,
             code: mod.module_code,
-            permission: [], // No actions, since you're not using role filtering
+            permission: actionMap[mod.module_code] || [],
             submod: buildHierarchy(mod.wbs_code),
           }));
   
@@ -110,7 +151,7 @@ export class ModuleAccessRepository {
         .map((mod) => ({
           name: mod.name,
           code: mod.module_code,
-          permission: [],
+          permission: actionMap[mod.module_code] || [],
           submod: buildHierarchy(mod.wbs_code),
         }));
   
@@ -118,10 +159,9 @@ export class ModuleAccessRepository {
         groupedByLevel[lvl] = levelModules;
       }
     }
-  
     return groupedByLevel;
   }
-
+  
 
   async updateModuleAccess(
     accessList: {

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

@@ -15,8 +15,20 @@ export class ModuleAccessService {
     private readonly menuRepository: MenuRepository,
   ) {}
 
-  async getRoles({ appcode }: { appcode: string }) {
-    return this.moduleAccessRepository.getRoles({ appcode });
+  async getRoles({
+    appcode,
+    level_type,
+    level_id,
+  }: {
+    appcode: string;
+    level_type?: string;
+    level_id?: number;
+  }) {
+    return this.moduleAccessRepository.getRoles({
+      appcode,
+      level_type,
+      level_id,
+    });
   }
 
   async getModules({ appcode }: { appcode: string }) {
@@ -29,9 +41,13 @@ export class ModuleAccessService {
     appcode: string,
     levelType: string,
   ) {
-    return this.moduleAccessRepository.getAccessListing(roleIds, appcode, levelType);
+    return this.moduleAccessRepository.getAccessListing(
+      roleIds,
+      appcode,
+      levelType,
+    );
   }
-  
+
   async getMenuListing(
     mainModIds: string[],
     appcode: string,
@@ -40,11 +56,13 @@ export class ModuleAccessService {
     if (!appcode) {
       throw new BadRequestException('Appcode is required');
     }
-  
-    return this.moduleAccessRepository.getAllModulesByLevel(mainModIds, appcode, levelType);
+
+    return this.moduleAccessRepository.getAllModulesByLevel(
+      mainModIds,
+      appcode,
+      levelType,
+    );
   }
-  
-  
 
   async updateModuleAccess(
     moduleAccessData: {
@@ -60,12 +78,12 @@ export class ModuleAccessService {
     if (!moduleAccessData || moduleAccessData.length === 0) {
       return { success: false, msg: 'No data provided' };
     }
-  
+
     const result = await this.moduleAccessRepository.updateModuleAccess(
       moduleAccessData,
       appcode,
     );
-  
+
     if (result) {
       return { success: true, msg: 'Module access updated successfully' };
     } else {
@@ -73,7 +91,6 @@ export class ModuleAccessService {
     }
   }
 
-
   // src/module/module-access/service/module-access.service.ts
 
   async getModuleUIConfig(moduleCode: string, roleIds: number[]) {