rez_core 4.0.58 → 4.0.60

package/package.json

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

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

@@ -28,45 +28,65 @@ export class FilterService {
   private readonly skipAppCodeFilterEntities = ['ORGP'];
   private readonly skipOrgFilterEntities = ['ORGP'];
 
+
   private async gettab_value_counts(
     tableName: string,
     column: string | undefined,
     whereClauses: { query: string; params: Record<string, any> }[],
   ) {
     if (!column) return [];
-
+  
     let whereSQL = '';
     const values: any[] = [];
-
-    // Convert whereClauses to SQL
+  
     if (whereClauses.length > 0) {
       const clauseParts = whereClauses.map((clause) => {
-        let parsedQuery = clause.query.replace(/\be\./g, ''); // removes e. prefix
+        let parsedQuery = clause.query.replace(/\be\./g, ''); // remove e. prefix
+  
         Object.entries(clause.params).forEach(([key, val]) => {
-          parsedQuery = parsedQuery.replace(new RegExp(`:${key}`, 'g'), '?');
-          values.push(val);
+          if (Array.isArray(val)) {
+            // if the query uses '=' but the param is array → convert to IN
+            if (parsedQuery.includes(`= :${key}`)) {
+              parsedQuery = parsedQuery.replace(`= :${key}`, `IN (:${key})`);
+            }
+  
+            // generate (?, ?, ?) placeholders
+            const placeholders = val.map(() => '?').join(', ');
+            parsedQuery = parsedQuery.replace(
+              new RegExp(`:\\b${key}\\b`, 'g'),
+              placeholders,
+            );
+  
+            values.push(...val);
+          } else {
+            parsedQuery = parsedQuery.replace(
+              new RegExp(`:\\b${key}\\b`, 'g'),
+              '?',
+            );
+            values.push(val);
+          }
         });
+  
         return parsedQuery;
       });
-
+  
       whereSQL = `WHERE ${clauseParts.join(' AND ')}`;
     }
-
-    // Construct raw SQL
+  
     const rawSQL = `
-  SELECT ${column} AS tab_value, COUNT(*) AS tab_value_count
-  FROM ${tableName}
-  ${whereSQL}
-  GROUP BY ${column}
-`;
-
+      SELECT ${column} AS tab_value, COUNT(*) AS tab_value_count
+      FROM ${tableName}
+      ${whereSQL}
+      GROUP BY ${column}
+    `;
+  
     const rows = await this.dataSource.query(rawSQL, values);
-
+  
     const total = rows.reduce(
       (sum, r) => sum + parseInt(r.tab_value_count, 10),
       0,
     );
-
+  
     return [
       { tab_value: 'All', tab_value_count: total },
       ...rows.map((r) => ({
@@ -75,6 +95,8 @@ export class FilterService {
       })),
     ];
   }
+  
+  
 
   async applyFilterWrapper(dto: FilterRequestDto) {
     const {