rez_core 3.1.19 → 3.1.21

package/package.json

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

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

@@ -12,7 +12,7 @@ import { FilterEvaluatorService } from './service/filter-evaluator.service';
 @Module({
   imports: [
     TypeOrmModule.forFeature([SavedFilterDetail, SavedFilterMaster]),
-    forwardRef(() => EntityModule),
+    forwardRef(() => EntityModule)
   ],
   controllers: [FilterController],
   providers: [

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

@@ -9,6 +9,7 @@ import { SavedFilterService } from './saved-filter.service';
 
 import * as moment from 'moment';
 import { EntityRelationService } from 'src/module/meta/service/entity-relation.service';
+import { ResolverService } from 'src/module/meta/service/resolver.service';
 
 @Injectable()
 export class FilterService {
@@ -20,6 +21,7 @@ export class FilterService {
     private readonly savedFilterService: SavedFilterService,
     @Inject('EntityRelationService')
     private readonly entityRelationService: EntityRelationService,
+    private readonly resolverService: ResolverService,
   ) {}
   private readonly skipAppCodeFilterEntities = ['ORGP'];
   private readonly skipOrgFilterEntities = ['ORGP'];
@@ -576,6 +578,38 @@ export class FilterService {
     // 4. Final transformation
     const formattedEntityList = entity_list.map(formatDatesInRow);
 
+    // 5. Resolve reference values using ResolverService
+const resolvedEntityList = await Promise.all(
+  formattedEntityList.map((row) =>
+    this.resolverService.getResolvedData(loggedInUser, row, entity_type),
+  ),
+);
+
+
+// 6. Resolve tab values (tab_value field)
+const resolvedTabs = await Promise.all(
+  filteredTabs.map(async (tab) => {
+    // pick attribute used for tabs
+    const tabAttrKey = layout?.attribute || tabs?.columnName;
+
+    if (!tabAttrKey || tab.tab_value?.toLowerCase() === 'all' || tab.tab_value?.toLowerCase() === 'others') {
+      return tab; // skip special cases
+    }
+
+    const resolvedVal = await this.resolverService.getResolvedValue(
+      loggedInUser,
+      tabAttrKey,
+      tab.tab_value,
+      entity_type,
+    );
+
+    return {
+      ...tab,
+      tab_value: resolvedVal ?? tab.tab_value,
+    };
+  }),
+);
+
     // Count query (without pagination)
     const countQb = this.dataSource
       .createQueryBuilder()
@@ -590,8 +624,8 @@ export class FilterService {
     return {
       success: true,
       data: {
-        entity_tabs: filteredTabs,
-        entity_list: formattedEntityList,
+        entity_tabs: resolvedTabs,
+        entity_list: resolvedEntityList,
         pagination: {
           total,
           page,

package/src/module/meta/service/resolver.service.ts

@@ -3,7 +3,9 @@ import { DataSource } from 'typeorm';
 
 @Injectable()
 export class ResolverService {
-  constructor(private readonly dataSource: DataSource) {}
+  constructor(private readonly dataSource: DataSource,
+
+  ) {}
 
   async getResolvedData(
     loggedInUser: any,
@@ -105,4 +107,91 @@ export class ResolverService {
 
     return resolvedEntityData;
   }
+
+  async getResolvedValue(
+    loggedInUser: UserData,
+    attrKey: string,
+    rawValue: any,
+    entityType: string,
+  ): Promise<any> {
+    if (rawValue === null || rawValue === undefined || rawValue === '') {
+      return rawValue;
+    }
+  
+    // fetch attribute meta only for the given attributeKey
+    const [attr] = await this.dataSource.query(
+      `SELECT * FROM cr_attribute_master WHERE mapped_entity_type = ? AND organization_id = ? AND attribute_key = ?`,
+      [entityType, loggedInUser.organization_id, attrKey],
+    );
+  
+    if (!attr) return rawValue;
+  
+    // -------- ENTITY data_source_type --------
+    if (attr.data_source_type === 'entity') {
+      const [entityDef] = await this.dataSource.query(
+        `SELECT * FROM cr_entity_master WHERE mapped_entity_type = ? AND organization_id = ?`,
+        [attr.datasource_list, loggedInUser.organization_id],
+      );
+  
+      if (!entityDef) return rawValue;
+  
+      const tableName = entityDef.db_table_name;
+  
+      if (Array.isArray(rawValue)) {
+        const resolvedValues: string[] = [];
+        for (const code of rawValue) {
+          const query =
+            tableName === 'cr_organization'
+              ? `SELECT * FROM ${tableName} WHERE code = ?`
+              : `SELECT * FROM ${tableName} WHERE id = ? AND organization_id = ?`;
+  
+          const params =
+            tableName === 'cr_organization'
+              ? [code]
+              : [code, loggedInUser.organization_id];
+  
+          const [item] = await this.dataSource.query(query, params);
+          resolvedValues.push(item?.[attr.data_source_attribute] ?? code);
+        }
+        return resolvedValues;
+      } else {
+        const query =
+          tableName === 'cr_organization'
+            ? `SELECT * FROM ${tableName} WHERE id = ?`
+            : `SELECT * FROM ${tableName} WHERE id = ? AND organization_id = ?`;
+  
+        const params =
+          tableName === 'cr_organization'
+            ? [rawValue]
+            : [rawValue, loggedInUser.organization_id];
+  
+        const [item] = await this.dataSource.query(query, params);
+        return item?.[attr.data_source_attribute] ?? rawValue;
+      }
+    }
+  
+    // -------- MASTER data_source_type --------
+    else if (attr.data_source_type === 'master') {
+      if (Array.isArray(rawValue)) {
+        const resolvedValues: string[] = [];
+        for (const code of rawValue) {
+          const [item] = await this.dataSource.query(
+            `SELECT * FROM cr_list_master_items WHERE id = ? AND organization_id = ?`,
+            [code, loggedInUser.organization_id],
+          );
+          resolvedValues.push(item?.[attr.data_source_attribute] ?? code);
+        }
+        return resolvedValues;
+      } else {
+        const [item] = await this.dataSource.query(
+          `SELECT * FROM cr_list_master_items WHERE id = ? AND organization_id = ?`,
+          [rawValue, loggedInUser.organization_id],
+        );
+        return item?.[attr.data_source_attribute] ?? rawValue;
+      }
+    }
+  
+    return rawValue;
+  }
+  
 }