rez_core 6.5.33 → 6.5.35

package/package.json

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

package/src/module/dashboard/service/dashboard.service.ts

@@ -17,7 +17,7 @@ export class DashboardService {
 
     const access = await this.moduleAccessService.getUserPermissions({
       userId: loggedInUser.id,
-      app_id: loggedInUser.app_id,
+      appcode: loggedInUser.appcode,
       level_type: loggedInUser.level_type,
       level_id: loggedInUser.level_id
     });

package/src/module/module/controller/menu.controller.ts

@@ -9,7 +9,7 @@ export class MenuController {
   @UseGuards(JwtAuthGuard)
   @Get()
   async getMenu(@Request() req) {
-    const { id: userId, app_id, level_type, level_id } = req.user.userData;
-    return this.menuService.getUserMenu(userId, app_id, level_type, level_id);
+    const { id: userId, appcode, level_type, level_id } = req.user.userData;
+    return this.menuService.getUserMenu(userId, appcode, level_type, level_id);
   }
 }

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

@@ -120,17 +120,17 @@ export class ModuleAccessController {
     const userData = req.user.userData;
 
     const userId = userData?.id;
-    const app_id = userData?.app_id;
+    const appcode = userData?.appcode;
     const level_type = userData?.level_type;
     const level_id = userData?.level_id;
 
-    if (!userId || !app_id || !level_type || !level_id) {
+    if (!userId || !appcode || !level_type || !level_id) {
       throw new BadRequestException('Invalid token data');
     }
 
     return this.moduleAccessService.getUserPermissions({
       userId,
-      app_id,
+      appcode,
       level_type,
       level_id
     });

package/src/module/module/repository/menu.repository.ts

@@ -34,15 +34,22 @@ export class MenuRepository extends Repository<MenuData> {
 
   async getAccessibleModules(
     roleIds: number[],
-    app_id: number,
+    appcode: string,
   ): Promise<number[]> {
 
+    const appMasterRepo = this.reflectionHelper.getRepoService('AppMaster');
+    const appMaster = await appMasterRepo.findOne({
+      where: {
+        code: appcode
+      }
+    });
+
     const modules = await this.moduleAccessRepo
       .createQueryBuilder('moduleAccess')
       .select('moduleAccess.module_id')
       .where('moduleAccess.role_id IN (:...roleIds)', { roleIds })
       .andWhere('moduleAccess.access_flag > 0')
-      .andWhere('moduleAccess.app_id = :app_id', { app_id: app_id })
+      .andWhere('moduleAccess.app_id = :app_id', { app_id: appMaster.id })
       .getMany();
 
     return Array.from(new Set(modules.map((module) => module.module_id)));
@@ -53,22 +60,30 @@ export class MenuRepository extends Repository<MenuData> {
    */
   async getMenuItems(
     modules: number[],
-    app_id: number,
+    appcode: string,
     levelType: string,
   ) {
+    const appMasterRepo = this.reflectionHelper.getRepoService('AppMaster');
+
+    const appMaster = await appMasterRepo.findOne({
+      where: {
+        code: appcode
+      }
+    })
+
     return await this.menuData
       .createQueryBuilder('menu')
       .leftJoin(
         'sso_module',
         'module',
         `
-          menu.module_code = module.module_code
+          menu.module_id = module.id
           AND menu.app_id = module.app_id
           AND menu.level_type = module.level_type
         `,
       )
       .where('menu.module_id IN (:...modules)', { modules: modules })
-      .andWhere('menu.app_id = :app_id', { app_id: app_id })
+      .andWhere('menu.app_id = :app_id', { app_id: appMaster.id })
       .andWhere('menu.level_type = :levelType', { levelType })
       .andWhere('menu.ui_visible = 1')
       .select([
@@ -83,10 +98,18 @@ export class MenuRepository extends Repository<MenuData> {
 
   async resolveUserRoles(
     userId: number,
-    app_id: number,
+    appcode: string,
     levelType: string,
     levelId: number,
   ): Promise<number[]> {
+    const appMasterRepo = this.reflectionHelper.getRepoService('AppMaster');
+
+    const appMaster = await appMasterRepo.findOne({
+      where: {
+        code: appcode
+      }
+    })
+
     const repo = this.reflectionHelper.getRepoService('UserRoleMapping');
 
     if (userId) {
@@ -102,7 +125,9 @@ export class MenuRepository extends Repository<MenuData> {
       const getUserUrm = await repo.findOne({
         where: {
           user_id: userId,
-          app_id: app_id,
+          app: {
+            code: appcode
+          },
         },
       });
 
@@ -123,7 +148,7 @@ export class MenuRepository extends Repository<MenuData> {
       .where('urm.user_id = :userId', { userId: userId })
       .andWhere('urm.level_type = :levelType', { levelType })
       .andWhere('urm.level_id = :levelId', { levelId: levelId })
-      .andWhere('role.app_id = :app_id', { app_id: app_id })
+      .andWhere('role.app_id = :app_id', { app_id: appMaster.id })
       .getRawMany();
 
     if (roles.length) return roles.map((r) => r.urm_role_id);
@@ -148,7 +173,7 @@ export class MenuRepository extends Repository<MenuData> {
           .where('urm.user_id = :userId', { userId })
           .andWhere('urm.level_type = :levelType', { levelType: 'BRN' })
           .andWhere('urm.level_id = :levelId', { levelId: brandId })
-          .andWhere('role.app_id = :app_id', { app_id: app_id })
+          .andWhere('role.app_id = :app_id', { app_id: appMaster.id })
           .getRawMany();
 
         if (roles.length) return roles.map((r) => r.urm_role_id);
@@ -162,7 +187,7 @@ export class MenuRepository extends Repository<MenuData> {
           .where('urm.user_id = :userId', { userId })
           .andWhere('urm.level_type = :levelType', { levelType: 'ORG' })
           .andWhere('urm.level_id = :levelId', { levelId: orgId })
-          .andWhere('role.app_id = :app_id', { app_id: app_id })
+          .andWhere('role.app_id = :app_id', { app_id: appMaster.id })
           .getRawMany();
 
         if (roles.length) return roles.map((r) => r.urm_role_id);

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

@@ -342,12 +342,14 @@ export class ModuleAccessRepository {
     };
   }
 
-  async getModuleAccessByRoles(roleIds: number[], app_id: number) {
+  async getModuleAccessByRoles(roleIds: number[], appcode: string) {
     // Step 1: Get role codes from sso_role
     const roles = await this.roleRepo.find({
       where: {
         id: In(roleIds),
-        app_id,
+        app: {
+          code: appcode
+        },
       },
       select: ['id', 'code'],
     });
@@ -355,6 +357,13 @@ export class ModuleAccessRepository {
     const roleCodes = roles.map((r) => r.code);
     if (!roleCodes.length) return [];
 
+    const appMasterRepo = this.reflectionHelper.getRepoService('AppMaster');
+    const appMaster =await appMasterRepo.findOne({
+      where: {
+        code: appcode
+      }
+    })
+
     // Step 2: Fetch full access data
     const accessRecords = await this.moduleAccessRepo
       .createQueryBuilder('access')
@@ -366,7 +375,7 @@ export class ModuleAccessRepository {
         'access.appcode AS appcode',
       ])
       .where('access.role_code IN (:...roleCodes)', { roleCodes })
-      .andWhere('access.app_id = :app_id', { app_id })
+      .andWhere('access.app_id = :app_id', { app_id: appMaster.id })
       .getRawMany();
 
     // Step 3: Format output

package/src/module/module/service/menu.service.ts

@@ -14,14 +14,14 @@ export class MenuService {
    */
   async getUserMenu(
     userId: number,
-    app_id: number,
+    appcode: string,
     levelType: 'ORG' | 'SCH',
     levelId: number,
   ): Promise<{ menu: any[] }> {
     // Step 1: Resolve roles (with fallback logic inside)
     const roleCodes = await this.menuRepository.resolveUserRoles(
       userId,
-      app_id,
+      appcode,
       levelType,
       levelId,
     );
@@ -30,14 +30,14 @@ export class MenuService {
     // Step 2: Get accessible modules
     const modules = await this.menuRepository.getAccessibleModules(
       roleCodes,
-      app_id,
+      appcode,
     );
     if (!modules.length) return { menu: [] };
 
     // Step 3: Get menu items for the given level type
     const menuItems = await this.menuRepository.getMenuItems(
       modules,
-      app_id,
+      appcode,
       levelType,
     );
 

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

@@ -125,19 +125,19 @@ export class ModuleAccessService {
 
   async getUserPermissions({
                              userId,
-                             app_id,
+                             appcode,
                              level_type,
                              level_id,
                            }: {
     userId: number;
-    app_id: number;
+    appcode: string;
     level_type: string;
     level_id: number;
   }) {
     // Step 1: Resolve roles
     const roleCodes = await this.menuRepository.resolveUserRoles(
       userId,
-      app_id,
+      appcode,
       level_type,
       level_id,
     );
@@ -152,7 +152,7 @@ export class ModuleAccessService {
     const allPermissions =
       await this.moduleAccessRepository.getModuleAccessByRoles(
         roleIds,
-        app_id,
+        appcode,
       );
 
     // Step 3: If level_type is SCH, check school status using raw query