rez_core 2.1.47 → 2.1.48

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "2.1.47",
+  "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()),

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);
   }
 }