rez_core 2.1.26 → 2.1.28

package/package.json

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

package/src/module/filter/service/filter.service.ts

@@ -25,6 +25,7 @@ export class FilterService {
     column: string | undefined,
     whereClauses: { query: string; params: Record<string, any> }[],
   ) {
+    console.log('GTETABCOUNTS', tableName, column, whereClauses);
     if (!column) return [];
 
     let whereSQL = '';
@@ -95,6 +96,8 @@ export class FilterService {
         'LIST',
       );
 
+    console.log(getTableMeta, 'GETTABLEMETA');
+
     if (!getTableMeta) {
       throw new BadRequestException(
         `Table meta not found for entity_type: ${entity_type}`,
@@ -107,6 +110,7 @@ export class FilterService {
         true,
       );
 
+    console.log(getTableColumnMeta, 'GETTABLECOLUMNMETA');
     // const attributeMeta =
     //   await this.attributeMasterService.findAttributesByMappedEntityType(
     //     entity_type,
@@ -119,6 +123,7 @@ export class FilterService {
       {} as Record<string, any>,
     );
 
+    console.log(attributeMetaMap, 'ATTRIBUTEMETAMAP');
     // Get and parse filters
     const savedFilters = await this.getSavedFilters(savedFilterCode);
     const baseFilters = [
@@ -128,7 +133,7 @@ export class FilterService {
     ];
 
     const baseWhere = this.buildWhereClauses(baseFilters, attributeMetaMap);
-
+    console.log(baseWhere, 'BASEWHERE', level_type, level_id);
     if (level_type && level_id) {
       baseWhere.push({
         query: 'e.level_type = :level_type AND e.level_id = :level_id',
@@ -139,7 +144,9 @@ export class FilterService {
       });
     }
 
+    console.log('OUSTSIDE SKIP');
     if (this.skipLevelFilterEntities.includes(entity_type)) {
+      console.log('INSIDE SKIP');
       baseWhere.push({
         query: 'e.appcode = :appcode',
         params: { appcode },
@@ -153,12 +160,15 @@ export class FilterService {
       [user_id, entity_type],
     );
 
+    console.log('LAYOUTPREFERNECE', layoutPreference);
+
     // Extract layout preference
     const layout = layoutPreference?.[0]?.layout_json?.quick_tab || {};
     let showList = layout?.show_list?.map((val) => val.toLowerCase()) || [];
 
     let allTabs;
     if (layout.attribute) {
+      console.log('IN LAYOUT');
       allTabs = await this.gettab_value_counts(
         getTableMeta.data_source,
         layout.attribute,
@@ -210,6 +220,8 @@ export class FilterService {
       filteredTabs = allTabs;
     }
 
+    console.log(allTabs, 'ALLTABSE');
+
     const dataWhere = [...baseWhere];
 
     if (tabs?.columnName && tabs?.value) {

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

@@ -28,7 +28,7 @@ export class LoginService {
 
   async login(email: string, password: string) {
     const user = await this.userService.findByEmailId(email);
-
+  
     if (!user) {
       return {
         success: false,
@@ -36,7 +36,7 @@ export class LoginService {
         type: 'email',
       };
     }
-
+  
     if (user.status !== 'ACTIVE') {
       return {
         success: false,
@@ -44,13 +44,13 @@ export class LoginService {
         type: 'email',
       };
     }
-
+  
     const encryptedPassword = EncryptUtilService.encryptGCM(
       password,
       this.masterKey,
       this.masterIv,
     );
-
+  
     if (encryptedPassword !== user.password) {
       return {
         success: false,
@@ -58,64 +58,67 @@ export class LoginService {
         type: 'password',
       };
     }
-
+  
     let defaultAccess;
-
-    if (!user.last_level_type && !user.last_level_id) {
-      const roleMappings = await this.userRoleMappingRepository.find({
-        where: {
-          user_id: user.id,
-          appcode: user.last_app_access,
-        },
-      });
-
-      if (!roleMappings.length) {
-        throw new BadRequestException(
-          'User does not have any access mapped for this app.',
-        );
-      }
-
-      // ✅ Pick default access based on priority
-      const priority = { org: 1, sch: 2, brn: 3 };
-      defaultAccess = roleMappings.sort(
-        (a, b) => priority[a.level_type] - priority[b.level_type],
-      )[0];
-
-      if ((defaultAccess.level_type, defaultAccess.level_id)) {
-        await this.userService.setLastLevelTypeAndId(
-          user.id,
-          defaultAccess.level_type,
-          defaultAccess.level_id,
-        );
-      }
-    } else {
-      defaultAccess = {
-        level_type: user.last_level_type,
-        level_id: user.last_level_id,
-      };
-    }
-
-    //appcode
-
     let appcode = user.last_app_access;
-
+  
     if (!appcode) {
       appcode = 'ADM';
       await this.userService.setDefaultLastAccess(user.id, appcode);
     }
-
+  
+    // ✅ Always fetch role mappings for the user + app
+    const roleMappings = await this.userRoleMappingRepository.find({
+      where: {
+        user_id: user.id,
+        appcode,
+      },
+    });
+  
+    if (!roleMappings.length) {
+      throw new BadRequestException(
+        'User does not have any access mapped for this app.',
+      );
+    }
+  
+    // 🔍 If user.last_level_type & level_id exist, validate them against URM
+    const validURM = roleMappings.find(
+      (r) =>
+        r.level_type === user.last_level_type &&
+        r.level_id === user.last_level_id,
+    );
+  
+    if (user.last_level_type && user.last_level_id && validURM) {
+      defaultAccess = {
+        level_type: user.last_level_type,
+        level_id: user.last_level_id,
+      };
+    } else {
+      // ❌ Fallback: Pick default based on priority
+      const priority = { org: 1, sch: 2, brn: 3 };
+      defaultAccess = roleMappings.sort(
+        (a, b) => priority[a.level_type] - priority[b.level_type],
+      )[0];
+  
+      await this.userService.setLastLevelTypeAndId(
+        user.id,
+        defaultAccess.level_type,
+        defaultAccess.level_id,
+      );
+    }
+  
     const token = await this.userSessionService.createSession(user, appcode, {
       level_type: defaultAccess.level_type,
       level_id: defaultAccess.level_id,
     });
-
+  
     if (user.is_firstlogin === 1) {
       user.invitation_status = 'ACCEPTED';
       user.is_firstlogin = 0;
       const { password, ...userWithoutPassword } = user;
       await this.userService.updateEntity(userWithoutPassword, user);
     }
-
+  
     return {
       success: true,
       accessToken: token,
@@ -124,6 +127,7 @@ export class LoginService {
       level_id: defaultAccess.level_id,
     };
   }
+  
 
   async loginWithGoogle(email: string, name) {
     let user = await this.userService.findByEmailId(email);