rez_core 5.0.211 → 5.0.213

package/package.json

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

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

@@ -238,6 +238,8 @@ export class SavedFilterRepositoryService {
     }
 
     const filterDetails = await this.getDetailsByCode(filterMaster.code);
+    filterMaster.is_owner =
+      loggedInUser.id == filterMaster.user_id ? true : false;
 
     return {
       ...filterMaster,

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

@@ -37,33 +37,69 @@ export class FilterService {
   ) {
     if (!column) return [];
 
+    // let whereSQL = '';
+    // const values: any[] = [];
+    // let paramIndex = 1; // PostgreSQL placeholders start at $1
+
+    // if (whereClauses.length > 0) {
+    //   const clauseParts = whereClauses.map((clause) => {
+    //     let parsedQuery = clause.query.replace(/\be\./g, ''); // remove e.
+
+    //     Object.entries(clause.params).forEach(([key, val]) => {
+    //       if (Array.isArray(val)) {
+    //         // Create ($1,$2,$3)
+    //         const placeholders = val.map(() => `$${paramIndex++}`).join(', ');
+
+    //         parsedQuery = parsedQuery.replace(
+    //           new RegExp(`:${key}`, 'g'),
+    //           `(${placeholders})`,
+    //         );
+
+    //         values.push(...val.map((v) => String(v)));
+    //       } else {
+    //         // Create $1
+    //         const placeholder = `$${paramIndex++}`;
+
+    //         parsedQuery = parsedQuery.replace(
+    //           new RegExp(`:${key}`, 'g'),
+    //           placeholder,
+    //         );
+
+    //         values.push(String(val));
+    //       }
+    //     });
+
+    //     return parsedQuery;
+    //   });
+
+    //   whereSQL = `WHERE ${clauseParts.join(' AND ')}`;
+    // }
+
     let whereSQL = '';
     const values: any[] = [];
-    let paramIndex = 1; // PostgreSQL placeholders start at $1
+    let paramIndex = 1;
 
     if (whereClauses.length > 0) {
       const clauseParts = whereClauses.map((clause) => {
-        let parsedQuery = clause.query.replace(/\be\./g, ''); // remove e.
+        let parsedQuery = clause.query.replace(/\be\./g, '');
 
         Object.entries(clause.params).forEach(([key, val]) => {
           if (Array.isArray(val)) {
             // Create ($1,$2,$3)
             const placeholders = val.map(() => `$${paramIndex++}`).join(', ');
 
-            parsedQuery = parsedQuery.replace(
-              new RegExp(`:${key}`, 'g'),
-              `(${placeholders})`,
-            );
+            parsedQuery = parsedQuery
+              .replace(new RegExp(`:...${key}`, 'g'), `(${placeholders})`)
+              .replace(new RegExp(`:${key}`, 'g'), `(${placeholders})`);
 
             values.push(...val.map((v) => String(v)));
           } else {
             // Create $1
             const placeholder = `$${paramIndex++}`;
 
-            parsedQuery = parsedQuery.replace(
-              new RegExp(`:${key}`, 'g'),
-              placeholder,
-            );
+            parsedQuery = parsedQuery
+              .replace(new RegExp(`:...${key}`, 'g'), placeholder)
+              .replace(new RegExp(`:${key}`, 'g'), placeholder);
 
             values.push(String(val));
           }
@@ -310,7 +346,7 @@ export class FilterService {
       }
     }
 
-    // Default org/level clause — skip TEMPLATE entity
+    // Default org/level clause — skip Tsaved-filEMPLATE entity
     if (
       entity_type !== 'ORGP' &&
       entity_type !== 'TEMP' &&