rez_core 2.0.97 → 2.0.99

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "2.0.97",
+  "version": "2.0.99",
   "description": "",
   "author": "",
   "private": false,
@@ -89,7 +89,6 @@
       "js",
       "json",
       "ts"
-      
     ],
     "rootDir": "src",
     "testRegex": ".*\\.spec\\.ts$",

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

@@ -6,8 +6,9 @@ import { UserRoleMapping } from 'src/module/user/entity/user-role-mapping.entity
 
 @Injectable()
 export class MenuService {
-  constructor(private readonly menuRepository: MenuRepository,
-    private readonly datasource:DataSource
+  constructor(
+    private readonly menuRepository: MenuRepository,
+    private readonly datasource: DataSource,
   ) {}
 
   /**
@@ -20,25 +21,34 @@ export class MenuService {
     levelId: number,
   ): Promise<{ menu: any[] }> {
     // Step 1: Resolve roles (with fallback logic inside)
-    const roleCodes = await this.menuRepository.resolveUserRoles(userId, appcode, levelType, levelId);
-    console.log(roleCodes)
+    const roleCodes = await this.menuRepository.resolveUserRoles(
+      userId,
+      appcode,
+      levelType,
+      levelId,
+    );
     if (!roleCodes.length) return { menu: [] };
-  
+
     // Step 2: Get accessible modules
-    const moduleCodes = await this.menuRepository.getAccessibleModules(roleCodes, appcode);
-    console.log(moduleCodes)
+    const moduleCodes = await this.menuRepository.getAccessibleModules(
+      roleCodes,
+      appcode,
+    );
     if (!moduleCodes.length) return { menu: [] };
-  
+
     // Step 3: Get menu items for the given level type
-    const menuItems = await this.menuRepository.getMenuItems(moduleCodes, appcode, levelType);
-    console.log(menuItems)
-  
+    const menuItems = await this.menuRepository.getMenuItems(
+      moduleCodes,
+      appcode,
+      levelType,
+    );
+
     // Step 4: Build hierarchy
     const menuTree = this.buildMenuHierarchy(menuItems);
-  
+
     return { menu: menuTree };
   }
-  
+
   /**
    * Converts a flat list of menu items into a hierarchical tree.
    */
@@ -69,8 +79,4 @@ export class MenuService {
   async getUserRoles(userId: number, appcode: string): Promise<any> {
     return this.menuRepository.getUserRoles(userId, appcode);
   }
-
-
-
-  
 }

package/src/module/user/controller/login.controller.ts

@@ -1,4 +1,5 @@
 import {
+  BadRequestException,
   Body,
   Controller,
   Get,
@@ -68,6 +69,45 @@ export class LoginController {
     },
   ): Promise<any> {
     const currentUser = req.user.userData;
+    const currentAppcode = currentUser.appcode;
+
+    console.log(currentUser, 'DEBUG USER', data);
+
+    // If appcode is changing, validate the new level_id/level_type
+    if (data.appcode !== currentAppcode) {
+      console.log('inside if', data.appcode, currentAppcode);
+      const isValidAccess = await this.userSessionService.checkIfUserHasMapping(
+        currentUser.id,
+        data.appcode,
+        data.level_type,
+        data.level_id,
+      );
+
+      console.log('isValidAccess', isValidAccess);
+
+      if (!isValidAccess) {
+        // If not valid, fetch the default one
+        const userMapping =
+          await this.userSessionService.getUserRoleMappingForApp(
+            currentUser.id,
+            data.appcode,
+          );
+
+        if (!userMapping) {
+          throw new BadRequestException(
+            `No mapping found for user in app ${data.appcode}`,
+          );
+        }
+
+        data.level_type = userMapping.level_type;
+        data.level_id = userMapping.level_id;
+      }
+      console.log(
+        data.level_type,
+        data.level_id,
+        'data.level_type, data.level_id',
+      );
+    }
 
     return await this.userSessionService.switchCurrentLevelService(
       currentUser,

package/src/module/user/service/user-session.service.ts

@@ -6,6 +6,7 @@ import { JwtAuthService } from 'src/module/auth/services/jwt.service';
 import { ConfigService } from '@nestjs/config';
 import { UserRoleMappingService } from './user-role-mapping.service';
 import { DataSource } from 'typeorm';
+import { UserRoleMapping } from '../entity/user-role-mapping.entity';
 
 @Injectable()
 export class UserSessionService {
@@ -96,4 +97,31 @@ export class UserSessionService {
       level_id: data.level_id,
     };
   }
+
+  async checkIfUserHasMapping(
+    userId: number,
+    appcode: string,
+    levelType: string,
+    levelId: string,
+  ): Promise<boolean> {
+    const count = await this.dataSource
+      .getRepository(UserRoleMapping)
+      .createQueryBuilder('cr_user_role_mapping')
+      .where('cr_user_role_mapping.user_id = :userId', { userId })
+      .andWhere('cr_user_role_mapping.appcode = :appcode', { appcode })
+      .andWhere('cr_user_role_mapping.level_type = :levelType', { levelType })
+      .andWhere('cr_user_role_mapping.level_id = :levelId', { levelId })
+      .getCount();
+
+    return count > 0;
+  }
+
+  async getUserRoleMappingForApp(userId: number, appcode: string) {
+    return await this.dataSource
+      .getRepository(UserRoleMapping)
+      .createQueryBuilder('cr_user_role_mapping')
+      .where('cr_user_role_mapping.user_id = :userId', { userId })
+      .andWhere('cr_user_role_mapping.appcode = :appcode', { appcode })
+      .getOne(); // You can return .getMany() if you want to let user choose
+  }
 }