rez_core 2.1.46 → 2.1.48

package/package.json

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

package/src/module/filter/entity/saved-filter-detail.entity.ts

@@ -1,6 +1,6 @@
-import { ENTITYTYPE_SAVEDFILTERDETAIL } from "src/constant/global.constant";
-import { BaseEntity } from "src/module/meta/entity/base-entity.entity";
-import { Column, Entity } from "typeorm";
+import { ENTITYTYPE_SAVEDFILTERDETAIL } from 'src/constant/global.constant';
+import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
+import { Column, Entity } from 'typeorm';
 
 @Entity({ name: 'cr_saved_filter_detail' })
 export class SavedFilterDetail extends BaseEntity {
@@ -20,4 +20,7 @@ export class SavedFilterDetail extends BaseEntity {
 
   @Column()
   filter_value: string;
+
+  @Column({ nullable: true })
+  data_type: string;
 }

package/src/module/filter/repository/saved-filter.repository.ts

@@ -91,7 +91,7 @@ export class SavedFilterRepositoryService {
     {
       filter_attribute: string;
       filter_operator: string;
-      filter_value: string;
+      filter_value: string | string[];
     }[]
   > {
     const saveFilterMasterData = await this.savedFilterMasterRepo.findOne({
@@ -107,7 +107,14 @@ export class SavedFilterRepositoryService {
     return filterDetails.map((detail) => ({
       filter_attribute: detail.filter_attribute,
       filter_operator: detail.filter_operator,
-      filter_value: detail.filter_value,
+      filter_value:
+        detail.data_type === 'multiselect'
+          ? detail.filter_value?.trim() === ''
+            ? []
+            : detail.filter_value.split(',')
+          : detail.filter_value?.trim() === ''
+            ? []
+            : detail.filter_value,
     }));
   }
 }

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

@@ -121,7 +121,7 @@ export class FilterService {
       {} as Record<string, any>,
     );
 
-    // Get and parse filters
+    // Get and parse saved filters
     const savedFilters = await this.getSavedFilters(savedFilterCode);
     const baseFilters = [
       ...(quickFilter || []).filter((f) => f.filter_value !== ''),
@@ -129,8 +129,10 @@ export class FilterService {
       ...(attributeFilter || []).filter((f) => f.filter_value !== ''),
     ];
 
+    // Build where clauses
     const baseWhere = this.buildWhereClauses(baseFilters, attributeMetaMap);
 
+    // check level_id and level_type
     if (level_type && level_id) {
       baseWhere.push({
         query: 'e.level_type = :level_type AND e.level_id = :level_id',
@@ -148,10 +150,11 @@ export class FilterService {
       });
     }
 
+    // layout preference query
     const layoutPreference = await this.dataSource.query(
       `SELECT layout_json
-   FROM cr_layout_preference
-   WHERE user_id = ? AND mapped_entity_type = ?`,
+      FROM cr_layout_preference
+      WHERE user_id = ? AND mapped_entity_type = ?`,
       [user_id, entity_type],
     );
 
@@ -197,7 +200,7 @@ export class FilterService {
         (tab) => tab.tab_value.toLowerCase() !== 'all',
       );
 
-      // 🔽 SORTING LOGIC
+      // SORTING LOGIC
       if (layout.sorting === 'asc') {
         filteredTabs.sort((a, b) =>
           a.tab_value.toLowerCase().localeCompare(b.tab_value.toLowerCase()),
@@ -210,6 +213,22 @@ export class FilterService {
         filteredTabs.sort((a, b) => a.tab_value_count - b.tab_value_count);
       } else if (layout.sorting === 'count_dsc') {
         filteredTabs.sort((a, b) => b.tab_value_count - a.tab_value_count);
+      } else if (layout.sorting === 'custom') {
+        const orderMap = new Map<string, number>(
+          showList.map((val, index) => [val.toLowerCase(), index]),
+        );
+
+        filteredTabs.sort((a, b) => {
+          const aIndex = orderMap.has(a.tab_value.toLowerCase())
+            ? orderMap.get(a.tab_value.toLowerCase())!
+            : Infinity;
+
+          const bIndex = orderMap.has(b.tab_value.toLowerCase())
+            ? orderMap.get(b.tab_value.toLowerCase())!
+            : Infinity;
+
+          return aIndex - bIndex;
+        });
       }
 
       // Re-insert 'all' at the beginning
@@ -460,7 +479,7 @@ export class FilterService {
       case 'date':
         return this.buildDateCondition(attr, op, val, key);
       case 'select':
-        return this.buildSelectCondition(attr, op, val, key);
+        return this.buildMultiSelectCondition(attr, op, val, key);
       case 'multiselect':
         return this.buildMultiSelectCondition(attr, op, val, key);
       case 'year':

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

@@ -6,6 +6,7 @@ import { SavedFilterMaster } from '../entity/saved-filter-master.entity';
 import { SavedFilterDetail } from '../entity/saved-filter-detail.entity';
 import { ENTITYTYPE_SAVEDFILTERMASTER } from 'src/constant/global.constant';
 import { SavedFilterRepositoryService } from '../repository/saved-filter.repository';
+import { isArray } from 'class-validator';
 
 @Injectable()
 export class SavedFilterService extends EntityServiceImpl {
@@ -32,6 +33,7 @@ export class SavedFilterService extends EntityServiceImpl {
     }
 
     entityData.user_id = loggedInUser?.id ?? null;
+
     // Save the master record without code
     const savedMaster = await super.createEntity(master, loggedInUser);
 
@@ -45,10 +47,22 @@ export class SavedFilterService extends EntityServiceImpl {
     // Save filter details using generated code
     const details = (entityData as any).filterDetails ?? [];
     if (details.length) {
-      const prepared = details.map((detail: any) => ({
-        ...detail,
-        mapped_filter_code: savedMaster.code,
-      }));
+      const prepared = details.map((detail: any) => {
+        // If detail.filter_value is an array, join it with comma
+        if (Array.isArray(detail.filter_value)) {
+          return {
+            ...detail,
+            mapped_filter_code: savedMaster.code,
+            filter_value: detail.filter_value.join(','),
+            data_type: 'multiselect',
+          };
+        }
+        // Otherwise, just add mapped_filter_code
+        return {
+          ...detail,
+          mapped_filter_code: savedMaster.code,
+        };
+      });
 
       await this.savedFilterRepo.saveDetails(prepared);
     }
@@ -103,6 +117,6 @@ export class SavedFilterService extends EntityServiceImpl {
   }
 
   async getFilterById(id: number) {
-    return this.savedFilterRepo.getFilterById(id);
+    return await this.savedFilterRepo.getFilterById(id);
   }
 }

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

@@ -25,14 +25,19 @@ export class ModuleAccessController {
 
   @Get('roles')
   async getRoles(@Query('appcode') appcode: string, @Request() req) {
-    let level_type= req.user.userData.level_type
-    let level_id= req.user.userData.level_id
+    let level_type = req.user.userData.level_type;
+    let level_id = req.user.userData.level_id;
     let organization_id = req.user.userData.organization_id;
-    return this.moduleAccessService.getRoles({ appcode,level_type, level_id ,organization_id});
+    return this.moduleAccessService.getRoles({
+      appcode,
+      level_type,
+      level_id,
+      organization_id,
+    });
   }
 
   @Get('modules')
-  async getModules(  @Query('appcode') appcode: string,@Request() req) {
+  async getModules(@Query('appcode') appcode: string, @Request() req) {
     return this.moduleAccessService.getModules({
       appcode,
     });
@@ -46,9 +51,14 @@ export class ModuleAccessController {
   ) {
     const roleIdArray = roleIds.split(',').map(Number);
     const appcode = queryAppcode || req.user.userData.appcode;
-    const level_type =  req.user.userData.level_type;
-    const level_id =  req.user.userData.level_id;
-    return this.moduleAccessService.getAccessListing(roleIdArray, appcode, level_type, level_id);
+    const level_type = req.user.userData.level_type;
+    const level_id = req.user.userData.level_id;
+    return this.moduleAccessService.getAccessListing(
+      roleIdArray,
+      appcode,
+      level_type,
+      level_id,
+    );
   }
 
   @Get('menu-listing')
@@ -69,9 +79,7 @@ export class ModuleAccessController {
 
   @Post('update')
   async updateModuleAccess(@Body() moduleAccessData: any[], @Request() req) {
-    return this.moduleAccessService.updateModuleAccess(
-      moduleAccessData
-    );
+    return this.moduleAccessService.updateModuleAccess(moduleAccessData);
   }
 
   // src/module/module-access/controller/module-access.controller.ts
@@ -98,16 +106,16 @@ export class ModuleAccessController {
   @Get('user-permissions')
   async getUserPermissions(@Request() req) {
     const userData = req.user.userData;
-  
+
     const userId = userData?.id;
     const appcode = userData?.appcode;
     const level_type = userData?.level_type;
     const level_id = userData?.level_id;
-  
+
     if (!userId || !appcode || !level_type || !level_id) {
       throw new BadRequestException('Invalid token data');
     }
-  
+
     return this.moduleAccessService.getUserPermissions({
       userId,
       appcode,
@@ -115,6 +123,4 @@ export class ModuleAccessController {
       level_id,
     });
   }
-  
-
 }

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

@@ -15,7 +15,6 @@ export class ModuleAccessService {
     private readonly menuRepository: MenuRepository,
     private readonly dataSource: DataSource,
   ) {}
-  
 
   async getModules({ appcode }: { appcode: string }) {
     return this.moduleAccessRepository.getModules({
@@ -64,7 +63,7 @@ export class ModuleAccessService {
       value: role.id,
     }));
   }
-  
+
   async getAccessListing(
     roleIds: number[],
     appcode: string,
@@ -75,7 +74,7 @@ export class ModuleAccessService {
       roleIds,
       appcode,
       levelType,
-      level_id
+      level_id,
     );
   }
 
@@ -109,9 +108,8 @@ export class ModuleAccessService {
       return { success: false, msg: 'No data provided' };
     }
 
-    const result = await this.moduleAccessRepository.updateModuleAccess(
-      moduleAccessData,
-    );
+    const result =
+      await this.moduleAccessRepository.updateModuleAccess(moduleAccessData);
 
     if (result) {
       return { success: true, msg: 'Module access updated successfully' };
@@ -144,40 +142,36 @@ export class ModuleAccessService {
       level_type,
       level_id,
     );
-  
+
     if (!roleCodes || roleCodes.length === 0) {
       return [];
     }
-  
+
     const roleIds = roleCodes.map(Number);
-  
+
     // Step 2: Get full permissions
-    const allPermissions = await this.moduleAccessRepository.getModuleAccessByRoles(
-      roleIds,
-      appcode,
-    );
-  
+    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") {
+
+      if (!school || school.status === 'INACTIVE') {
         // Return only VIEW permissions
-        return allPermissions.filter(
-          (perm) => perm.action === 'VIEW'
-        );
+        return allPermissions.filter((perm) => perm.action === 'VIEW');
       }
     }
-  
+
     // Step 4: Return all permissions normally
     return allPermissions;
   }
-  
-  
-  
 }