rez_core 5.0.210 → 5.0.212

package/package.json

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

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

@@ -26,8 +26,7 @@ export class FilterService {
     @Inject() protected readonly loggingService: LoggingService,
     private readonly configService: ConfigService,
     private readonly reflectionHelper: ReflectionHelper,
-  ) {
-  }
+  ) {}
 
   schema = this.configService.get('DB_SCHEMA');
 
@@ -38,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));
           }
@@ -82,7 +117,6 @@ export class FilterService {
         GROUP BY ${column}
     `;
 
-
     const rows = await this.entityManager.query(rawSQL, values);
 
     const total = rows.reduce(
@@ -284,7 +318,6 @@ export class FilterService {
 
     // Handle TEMPLATE entity special condition
     if (entity_type === 'TEMP' || entity_type === 'TEM') {
-
       if (level_type === 'ORG') {
         baseWhere.push({
           query: `  ((e.level_type = 'ORG' AND e.level_id = '${loggedInUser.enterprise_id}'))`,
@@ -325,8 +358,7 @@ export class FilterService {
       !customLevelId
     ) {
       baseWhere.push({
-        query:
-          'e.level_type = :level_type AND e.level_id = :level_id',
+        query: 'e.level_type = :level_type AND e.level_id = :level_id',
         params: {
           level_type,
           level_id,
@@ -694,30 +726,28 @@ export class FilterService {
     layoutPreference: any,
     tabs: any,
   ) {
-    if (layoutPreference && layoutPreference[0]?.mapped_json?.sorting) {
-      if (Array.isArray(layoutPreference[0]?.mapped_json?.sorting?.tabs)) {
-        const preferenceTabArray =
-          layoutPreference[0]?.mapped_json?.sorting?.tabs;
+    const sorting = layoutPreference?.mapped_json?.sorting;
+
+    if (sorting) {
+      if (Array.isArray(sorting?.tabs)) {
+        const preferenceTabArray = sorting?.tabs;
         const tabFilter = preferenceTabArray.find(
-          (tabData) => tabData.tab_name === tabs?.value,
+          (tabData) => tabData.tab_name?.value === tabs?.value,
         );
-        tabFilter?.sortby.forEach(({ column, order }) => {
+
+        tabFilter?.sortby?.forEach(({ column, order }) => {
+          qb.addOrderBy(
+            `e.${column}`,
+            order?.toUpperCase() === 'DSC' ? 'DESC' : 'ASC',
+          );
+        });
+      } else if (Array.isArray(sorting.sortby)) {
+        sorting?.sortby?.forEach(({ column, order }) => {
           qb.addOrderBy(
             `e.${column}`,
             order?.toUpperCase() === 'DSC' ? 'DESC' : 'ASC',
           );
         });
-      } else if (
-        Array.isArray(layoutPreference[0]?.mapped_json?.sorting?.sortby)
-      ) {
-        layoutPreference[0]?.mapped_json?.sorting?.sortby?.forEach(
-          ({ column, order }) => {
-            qb.addOrderBy(
-              `e.${column}`,
-              order?.toUpperCase() === 'DSC' ? 'DESC' : 'ASC',
-            );
-          },
-        );
       }
     }