rez_core 4.0.39 → 4.0.41

package/package.json

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

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

@@ -256,45 +256,40 @@ export class FilterService {
       ),
     ];
 
-    // Build where clauses
-    const baseWhere = this.buildWhereClauses(baseFilters, attributeMetaMap);
+// 🧱 Build where clauses
+const baseWhere = this.buildWhereClauses(baseFilters, attributeMetaMap);
 
-    // check level_id and level_type
-// ✅ Special condition for TEMPLATE entity
-// ✅ Special condition for TEMPLATE entity
+// ✅ Handle TEMPLATE entity special condition
 if (entity_type === 'TEMP' || entity_type === 'TEM') {
-  const templateTable = entityMeta?.data_source || 'frm_comm_template'; // fallback
+  const templateTable = entityMeta?.data_source || 'frm_wf_comm_template'; // corrected default
 
   if (level_type === 'ORG') {
-    // ORG level → no filter
+    // ORG level → no additional filter
   } else if (level_type === 'SCH') {
     baseWhere.push({
       query: `
         (
-          (e.level_type = 'SCH' AND e.level_id = :sch_level_id)
+          (e.level_type = 'SCH' AND e.level_id = ?)
           OR 
           (
             e.level_type = 'ORG'
-            AND e.level_id = :org_level_id
+            AND e.level_id = ?
             AND e.template_code NOT IN (
               SELECT sub.template_code 
               FROM ${templateTable} AS sub 
-              WHERE sub.level_type = 'SCH' AND sub.level_id = :sch_level_id
+              WHERE sub.level_type = 'SCH' AND sub.level_id = ?
             )
           )
         )
       `,
-      params: {
-        sch_level_id: level_id,
-        org_level_id: organization_id,
-      },
+      params: [level_id, organization_id, level_id], // positional order
     });
   }
 }
 
-
+// ✅ Default org/level clause
 if (
-  entity_type != 'ORGP' &&
+  entity_type !== 'ORGP' &&
   level_type &&
   level_id &&
   organization_id &&
@@ -304,11 +299,13 @@ if (
   baseWhere.push({
     query:
       'e.organization_id = :organization_id AND e.level_type = :level_type AND e.level_id = :level_id',
-    params: { organization_id, level_type, level_id },
+    params: { organization_id, level_type, level_id }, // named params
   });
 }
 
 
+
+
     if (entity_type == "USR" || entity_type == "UPR") {
       baseWhere.push({
         query: 'e.is_customer is NULL',