rez_core 4.0.35 → 4.0.37

package/package.json

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

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

@@ -260,20 +260,48 @@ export class FilterService {
     const baseWhere = this.buildWhereClauses(baseFilters, attributeMetaMap);
 
     // check level_id and level_type
-    if (
-      entity_type != 'ORGP' &&
-      level_type &&
-      level_id &&
-      organization_id &&
-      !customLevelType &&
-      !customLevelId
-    ) {
-      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 },
-      });
-    }
+// ✅ Special condition for TEMPLATE entity
+if (entity_type === 'TEM') {
+  if (level_type === 'ORG') {
+    // ORG level → no extra filter
+  } else if (level_type === 'SCH') {
+    baseWhere.push({
+      query: `
+        (
+          (e.level_type = 'SCH' AND e.level_id = :school_id)
+          OR 
+          (
+            e.level_type = 'ORG' 
+            AND e.level_id = :org_id 
+            AND e.template_code NOT IN (
+              SELECT template_code 
+              FROM frm_comm_template 
+              WHERE level_type = 'SCH' AND level_id = :school_id
+            )
+          )
+        )
+      `,
+      params: {
+        school_id: level_id,
+        org_id: organization_id,
+      },
+    });
+  }
+} else if (
+  entity_type != 'ORGP' &&
+  level_type &&
+  level_id &&
+  organization_id &&
+  !customLevelType &&
+  !customLevelId
+) {
+  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 },
+  });
+}
+
 
     if (entity_type == "USR" || entity_type == "UPR") {
       baseWhere.push({

package/.vscode/extensions.json

@@ -1,5 +0,0 @@
-{
-    "recommendations": [
-        "dbaeumer.vscode-eslint"
-    ]
-}