rez_core 3.1.21 → 3.1.23

package/package.json

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

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

@@ -456,42 +456,56 @@ export class FilterService {
     if (tabs?.columnName && tabs?.value) {
       const tabAttrMeta = attributeMetaMap[tabs.columnName];
       const tabValue = tabs.value.toLowerCase();
-
+    
       if (tabValue === 'others') {
+        // existing 'others' logic
         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],
-                skip_id: true,
-              },
-              tabAttrMeta,
+          for (const value of valuesToExclude) {
+            const resolvedId = await this.resolverService.getResolvedId(
+              loggedInUser,
+              tabs.columnName,
+              value,
+              entity_type,
             );
-            if (tabCondition) {
-              dataWhere.push(tabCondition);
+            if (resolvedId) {
+              const tabCondition = this.buildCondition(
+                {
+                  filter_attribute: tabs.columnName,
+                  filter_operator: 'not_equal',
+                  filter_value: [resolvedId],
+                  skip_id: true,
+                },
+                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],
-            skip_id: true,
-          },
-          tabAttrMeta,
+        // normal tab case
+        const resolvedId = await this.resolverService.getResolvedId(
+          loggedInUser,
+          tabs.columnName,
+          tabs.value,
+          entity_type,
         );
-
-        if (tabCondition) {
-          dataWhere.push(tabCondition);
+    
+        if (resolvedId) {
+          const tabCondition = this.buildCondition(
+            {
+              filter_attribute: tabs.columnName,
+              filter_operator: 'equal',
+              filter_value: [resolvedId],
+              skip_id: true,
+            },
+            tabAttrMeta,
+          );
+          if (tabCondition) dataWhere.push(tabCondition);
         }
       }
     }
+    
 
     // Build raw SQL base
     const qb = this.dataSource

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

@@ -1,4 +1,5 @@
 import { Injectable } from '@nestjs/common';
+import { UserData } from 'src/module/user/entity/user.entity';
 import { DataSource } from 'typeorm';
 
 @Injectable()
@@ -194,4 +195,62 @@ export class ResolverService {
     return rawValue;
   }
   
+  async getResolvedId(
+    loggedInUser: UserData,
+    attrKey: string,
+    displayValue: any,
+    entityType: string,
+  ): Promise<any> {
+    if (displayValue === null || displayValue === undefined || displayValue === '') {
+      return displayValue;
+    }
+  
+    // fetch attribute meta
+    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 displayValue;
+  
+    // -------- 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 displayValue;
+  
+      const tableName = entityDef.db_table_name;
+  
+      const query =
+        tableName === 'cr_organization'
+          ? `SELECT id FROM ${tableName} WHERE ${attr.data_source_attribute} = ?`
+          : `SELECT id FROM ${tableName} WHERE ${attr.data_source_attribute} = ? AND organization_id = ?`;
+  
+      const params =
+        tableName === 'cr_organization'
+          ? [displayValue]
+          : [displayValue, loggedInUser.organization_id];
+  
+      const [item] = await this.dataSource.query(query, params);
+      return item?.id ?? displayValue;
+    }
+  
+    // -------- MASTER data_source_type --------
+    else if (attr.data_source_type === 'master') {
+      const [item] = await this.dataSource.query(
+        `SELECT id FROM cr_list_master_items 
+         WHERE ${attr.data_source_attribute} = ? AND organization_id = ?`,
+        [displayValue, loggedInUser.organization_id],
+      );
+      return item?.id ?? displayValue;
+    }
+  
+    return displayValue;
+  }
+  
 }