rez_core 5.0.135 → 5.0.136

package/package.json

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

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

@@ -71,6 +71,7 @@ export class UserSessionService {
     await this.userSessionRepository.saveSession(userSession);
   }
 
+
   async switchCurrentLevelService(
     currentUser: any,
     data: any,
@@ -122,82 +123,78 @@ export class UserSessionService {
   }
 
   async checkIfUserHasMapping(
-  userId: number,
-  appcode: string,
-  levelType: string,
-  levelId: string,
-): Promise<boolean> {
-  // Get repositories dynamically via reflectionHelper
-  const userRoleMappingRepo =
-    this.reflectionHelper.getRepoService('UserRoleMapping');
-  const appMasterRepo =
-    this.reflectionHelper.getRepoService('AppMaster');
-
-  // Use QueryBuilder with proper aliases
-  const count = await userRoleMappingRepo
-    .createQueryBuilder('urm')
-    .innerJoin(
-      appMasterRepo.metadata.tableName,
-      'app',
-      'app.appcode = urm.appcode',
-    )
-    .where('urm.user_id = :userId', { userId })
-    .andWhere('urm.appcode = :appcode', { appcode })
-    .andWhere('urm.level_type = :levelType', { levelType })
-    .andWhere('urm.level_id = :levelId', { levelId })
-    .andWhere('app.show_in_ui = true')
-    .getCount();
-
-  return count > 0;
-}
-
+    userId: number,
+    appcode: string,
+    levelType: string,
+    levelId: string,
+  ): Promise<boolean> {
+    // Get repositories dynamically via reflectionHelper
+    const userRoleMappingRepo =
+      this.reflectionHelper.getRepoService('UserRoleMapping');
+    const appMasterRepo = this.reflectionHelper.getRepoService('AppMaster');
+
+    // Use QueryBuilder with proper aliases
+    const count = await userRoleMappingRepo
+      .createQueryBuilder('urm')
+      .innerJoin(
+        appMasterRepo.metadata.tableName,
+        'app',
+        'app.appcode = urm.appcode',
+      )
+      .where('urm.user_id = :userId', { userId })
+      .andWhere('urm.appcode = :appcode', { appcode })
+      .andWhere('urm.level_type = :levelType', { levelType })
+      .andWhere('urm.level_id = :levelId', { levelId })
+      .andWhere('app.show_in_ui = true')
+      .getCount();
+
+    return count > 0;
+  }
 
   async getUserRoleMappingForApp(userId: number, appcode: string) {
-  // Get repos dynamically
-  const userRoleMappingRepo =
-    this.reflectionHelper.getRepoService('UserRoleMapping');
-
-  const appMasterRepo =
-    this.reflectionHelper.getRepoService('AppMaster');
-
-  // Build dynamic join using metadata
-  const mapping = await userRoleMappingRepo
-    .createQueryBuilder('urm')
-    .innerJoin(
-      appMasterRepo.metadata.tableName,
-      'app',
-      'app.appcode = urm.appcode',
-    )
-    .where('urm.user_id = :userId', { userId })
-    .andWhere('urm.appcode = :appcode', { appcode })
-    .andWhere('app.show_in_ui = true')
-    .getOne();
-
-  // If not found or level_type is not BRN → return
-  if (!mapping || mapping.level_type !== 'BRN') {
-    return mapping;
-  }
+    const userRoleMappingRepo =
+      this.reflectionHelper.getRepoService('UserRoleMapping');
+    const appMasterRepo = this.reflectionHelper.getRepoService('AppMaster');
+
+    const mapping = await userRoleMappingRepo
+      .createQueryBuilder('urm')
+      .innerJoin(
+        appMasterRepo.metadata.tableName,
+        'app',
+        'app.appcode = urm.appcode',
+      )
+      .where('urm.user_id = :userId', { userId })
+      .andWhere('urm.appcode = :appcode', { appcode })
+      .andWhere('app.show_in_ui = true')
+      .getOne();
+
+    if (!mapping) {
+      throw new BadRequestException(
+        `User does not have visible access to app ${appcode}`,
+      );
+    }
 
-  // Resolve SCH under BRN
-  const schoolRepo = this.reflectionHelper.getRepoService('SSOSchool');
+    if (mapping.level_type !== 'BRN') {
+      return mapping;
+    }
 
-  const school = await schoolRepo.findOne({
-    where: {
-      brand_id: mapping.level_id,
-    },
-    order: { id: 'ASC' },
-  });
+    // Resolve SCH under brand
+    const schoolRepo = this.reflectionHelper.getRepoService('SSOSchool');
+    const school = await schoolRepo.findOne({
+      where: { brand_id: mapping.level_id },
+      order: { id: 'ASC' },
+    });
+
+    if (!school) {
+      throw new BadRequestException(
+        `No schools found under brand ${mapping.level_id}`,
+      );
+    }
 
-  if (school) {
     return {
       ...mapping,
       level_type: 'SCH',
       level_id: school.id,
     };
   }
-
-  // If no SCH found
-  return null;
-}
-
 }

package/.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
-  </profile>
-</component>

package/.idea/prettier.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PrettierConfiguration">
-    <option name="myConfigurationMode" value="AUTOMATIC" />
-  </component>
-</project>