rez_core 2.1.24 → 2.1.26

package/package.json

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

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

@@ -153,16 +153,25 @@ export class FilterService {
       [user_id, entity_type],
     );
 
-    const allTabs = await this.gettab_value_counts(
-      getTableMeta.data_source,
-      tabs?.columnName,
-      baseWhere,
-    );
-
     // 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) {
+      allTabs = await this.gettab_value_counts(
+        getTableMeta.data_source,
+        layout.attribute,
+        baseWhere,
+      );
+    } else {
+      allTabs = await this.gettab_value_counts(
+        getTableMeta.data_source,
+        tabs?.columnName,
+        baseWhere,
+      );
+    }
+
     let filteredTabs;
 
     if (showList?.length > 0) {
@@ -201,20 +210,42 @@ export class FilterService {
       filteredTabs = allTabs;
     }
 
-    // Add tab.value filter only if present
     const dataWhere = [...baseWhere];
+
     if (tabs?.columnName && tabs?.value) {
       const tabAttrMeta = attributeMetaMap[tabs.columnName];
-      const tabCondition = this.buildCondition(
-        {
-          filter_attribute: tabs.columnName,
-          filter_operator: 'equal',
-          filter_value: tabs.value,
-        },
-        tabAttrMeta,
-      );
-      if (tabCondition) {
-        if (tabs.value.toLowerCase() !== 'all') dataWhere.push(tabCondition);
+      const tabValue = tabs.value.toLowerCase();
+
+      if (tabValue === 'others') {
+        const valuesToExclude = showList.filter((v) => v !== 'all');
+        if (valuesToExclude.length > 0) {
+          valuesToExclude.forEach((value) => {
+            const tabCondition = this.buildCondition(
+              {
+                filter_attribute: tabs.columnName,
+                filter_operator: 'not_equal',
+                filter_value: value,
+              },
+              tabAttrMeta,
+            );
+            if (tabCondition) {
+              dataWhere.push(tabCondition);
+            }
+          });
+        }
+      } else if (tabValue !== 'all') {
+        // Normal case: filter by equality
+        const tabCondition = this.buildCondition(
+          {
+            filter_attribute: tabs.columnName,
+            filter_operator: 'equal',
+            filter_value: tabs.value,
+          },
+          tabAttrMeta,
+        );
+        if (tabCondition) {
+          dataWhere.push(tabCondition);
+        }
       }
     }
 

package/src/module/layout_preference/service/layout_preference.service.ts

@@ -15,6 +15,8 @@ export class LayoutPreferenceService extends EntityServiceImpl {
   }
 
   async createEntity(entityData: BaseEntity, loggedInUser: UserData | null) {
+    console.log('lap api called', entityData);
+
     const { mapped_entity_type } = entityData as any;
     const userId = loggedInUser?.id;
 

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

@@ -129,6 +129,7 @@ export class ModuleAccessService {
     level_type: string;
     level_id: number;
   }) {
+    // Step 1: Resolve roles
     const roleCodes = await this.menuRepository.resolveUserRoles(
       userId,
       appcode,
@@ -141,8 +142,34 @@ export class ModuleAccessService {
     }
   
     const roleIds = roleCodes.map(Number);
-    return this.moduleAccessRepository.getModuleAccessByRoles(roleIds, appcode);
+  
+    // Step 2: Get full permissions
+    const allPermissions = await this.moduleAccessRepository.getModuleAccessByRoles(
+      roleIds,
+      appcode,
+    );
+  
+    // Step 3: If level_type is SCH, check school status using raw query
+    if (level_type === 'SCH') {
+      const result = await this.dataSource.query(
+        `SELECT * FROM cr_school WHERE id = ${level_id}`,
+        [level_id],
+      );
+  
+      const school = result?.[0];
+  
+      if (!school || school.status === "INACTIVE") {
+        // Return only VIEW permissions
+        return allPermissions.filter(
+          (perm) => perm.action === 'VIEW'
+        );
+      }
+    }
+  
+    // Step 4: Return all permissions normally
+    return allPermissions;
   }
   
   
+  
 }

package/src/module/user/entity/user.entity.ts

@@ -44,4 +44,10 @@ export class UserData extends BaseEntity {
 
   @Column({ type: 'varchar', nullable: true })
   last_app_access: string;
+
+  @Column({ type: 'varchar', nullable: true })
+  last_level_type: string;
+
+  @Column({ type: 'varchar', nullable: true })
+  last_level_id: string;
 }

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

@@ -59,25 +59,41 @@ export class LoginService {
       };
     }
 
-    // ✅ Get user-role mappings for this app
-    const roleMappings = await this.userRoleMappingRepository.find({
-      where: {
-        user_id: user.id,
-        appcode: user.last_app_access,
-      },
-    });
+    let defaultAccess;
 
-    if (!roleMappings.length) {
-      throw new BadRequestException(
-        'User does not have any access mapped for this app.',
-      );
-    }
+    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 };
-    const defaultAccess = roleMappings.sort(
-      (a, b) => priority[a.level_type] - priority[b.level_type],
-    )[0];
+      // ✅ 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
 

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

@@ -85,8 +85,8 @@ export class UserSessionService {
     };
 
     await this.dataSource.query(
-      `UPDATE cr_user SET last_app_access = ? WHERE id = ?`,
-      [data.appcode, currentUser.id],
+      `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],
     );
 
     return {

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

@@ -249,4 +249,21 @@ export class UserService extends EntityServiceImpl {
 
     await this.userRepository.saveUser(user); // This persists the updated field
   }
+
+  async setLastLevelTypeAndId(
+    userId: number,
+    levelType: string,
+    levelId: string,
+  ): Promise<void> {
+    const user = await this.userRepository.findById(userId);
+
+    if (!user) {
+      throw new BadRequestException('User not found');
+    }
+
+    user.last_level_type = levelType;
+    user.last_level_id = levelId;
+
+    await this.userRepository.saveUser(user); // This persists the updated field
+  }
 }