rez_core 1.1.5 → 1.1.6

package/package.json

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

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

@@ -249,11 +249,13 @@ export class FilterService {
   ): { query: string; params: any } | null {
     if (!meta) return null;
 
-    const attr = filter.filter_attribute;
+    let attr = filter.filter_attribute;
     const val = filter.filter_value;
     const op = filter.filter_operator;
     const key = `param_${attr}_${Math.random().toString(36).substring(2, 8)}`;
 
+    if (meta.data_source_type === 'entity') attr = `${attr}_id`;
+
     switch (meta.data_type) {
       case 'text':
         return this.buildTextCondition(attr, op, val, key);
@@ -344,16 +346,16 @@ export class FilterService {
   ) {
     switch (op) {
       case 'equal':
-        return { query: `e.${attr}_id = :${key}`, params: { [key]: val } };
+        return { query: `e.${attr} = :${key}`, params: { [key]: val } };
 
       case 'not_equal':
-        return { query: `e.${attr}_id != :${key}`, params: { [key]: val } };
+        return { query: `e.${attr} != :${key}`, params: { [key]: val } };
 
       case 'empty':
-        return { query: `e.${attr}_id IS NULL`, params: {} };
+        return { query: `e.${attr} IS NULL`, params: {} };
 
       case 'not_empty':
-        return { query: `e.${attr}_id IS NOT NULL`, params: {} };
+        return { query: `e.${attr} IS NOT NULL`, params: {} };
 
       default:
         throw new BadRequestException(`Unsupported operator for select: ${op}`);
@@ -361,41 +363,40 @@ export class FilterService {
   }
 
   private buildMultiSelectCondition(
-  attr: string,
-  op: string,
-  val: any,
-  key: string,
-) {
-  if ((op === 'equal' || op === 'not_equal') && !Array.isArray(val)) {
-    throw new BadRequestException(
-      `Value for multi-select must be an array for operator: ${op}`,
-    );
-  }
+    attr: string,
+    op: string,
+    val: any,
+    key: string,
+  ) {
+    if ((op === 'equal' || op === 'not_equal') && !Array.isArray(val)) {
+      throw new BadRequestException(
+        `Value for multi-select must be an array for operator: ${op}`,
+      );
+    }
 
-  switch (op) {
-    case 'equal':
-      return {
-        query: `e.${attr}_id IN (:${key})`, // ✅ use (:key)
-        params: { [key]: val },
-      };
+    switch (op) {
+      case 'equal':
+        return {
+          query: `e.${attr} IN (:${key})`, // ✅ use (:key)
+          params: { [key]: val },
+        };
 
-    case 'not_equal':
-      return {
-        query: `e.${attr}_id NOT IN (:${key})`, // ✅ use (:key)
-        params: { [key]: val },
-      };
+      case 'not_equal':
+        return {
+          query: `e.${attr} NOT IN (:${key})`, // ✅ use (:key)
+          params: { [key]: val },
+        };
 
-    case 'empty':
-      return { query: `e.${attr}_id IS NULL`, params: {} };
+      case 'empty':
+        return { query: `e.${attr} IS NULL`, params: {} };
 
-    case 'not_empty':
-      return { query: `e.${attr}_id IS NOT NULL`, params: {} };
+      case 'not_empty':
+        return { query: `e.${attr} IS NOT NULL`, params: {} };
 
-    default:
-      throw new BadRequestException(
-        `Unsupported operator for multiselect: ${op}`,
-      );
+      default:
+        throw new BadRequestException(
+          `Unsupported operator for multiselect: ${op}`,
+        );
+    }
   }
 }
-
-}

package/src/module/meta/controller/meta.controller.ts

@@ -24,7 +24,6 @@ export class MetaController {
     @Req() req: Request & { user: any },
   ) {
     const userId = req.user.userId;
-
     let entityTableDto =
       await this.entityTableService.getTableMetaDataForListing(
         entityType,