rez_core 2.1.60 → 2.1.62

package/package.json

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

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

@@ -5,6 +5,7 @@ import { ModuleAccess } from '../entity/module-access.entity';
 import { UserRoleMapping } from 'src/module/user/entity/user-role-mapping.entity';
 import { Role } from 'src/module/user/entity/role.entity';
 import { InjectRepository } from '@nestjs/typeorm';
+import { get } from 'http';
 
 @Injectable()
 export class MenuRepository extends Repository<MenuData> {
@@ -95,6 +96,23 @@ export class MenuRepository extends Repository<MenuData> {
   ): Promise<number[]> {
     const repo = this.dataSource.getRepository(UserRoleMapping);
 
+    if (userId) {
+      // Check if user has any role mappings for the given appcode
+      const getUserDetails = await this.dataSource.query(
+        `
+        SELECT * from cr_user where id = ?
+      `,
+        [userId],
+      );
+
+      if (
+        getUserDetails.length > 0 &&
+        getUserDetails[0].organization_id === 1
+      ) {
+        return [6];
+      }
+    }
+
     // 1. Try exact level match
     let roles = await repo
       .createQueryBuilder('urm')

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

@@ -84,6 +84,10 @@ export class UserSessionService {
       appcode: data.appcode,
     };
 
+    if (payload.organization_id === 1 && payload.level_type === 'ORG') {
+      payload.organization_id = payload.level_id;
+    }
+
     await this.dataSource.query(
       `UPDATE cr_user SET last_app_access  = ? , last_level_type = ?, last_level_id = ? WHERE id = ?`,
       [data.appcode, data.level_type, data.level_id, currentUser.id],
@@ -123,19 +127,19 @@ export class UserSessionService {
       .where('cr_user_role_mapping.user_id = :userId', { userId })
       .andWhere('cr_user_role_mapping.appcode = :appcode', { appcode })
       .getOne();
-  
+
     // If not found or is already ORG/SCH, return directly
     if (!mapping || mapping.level_type !== 'BRN') {
       return mapping;
     }
-  
+
     //DONE
     // If BRN, resolve first SCH under this brand
     const schools = await this.dataSource.query(
       `SELECT id FROM cr_school WHERE brand_id = ? ORDER BY id ASC LIMIT 1`,
       [mapping.level_id],
     );
-  
+
     if (schools.length) {
       return {
         ...mapping,
@@ -143,9 +147,8 @@ export class UserSessionService {
         level_id: schools[0].id,
       };
     }
-  
+
     // No SCH found under BRN
     return null;
   }
-  
 }