From f9cc8d5e818c1e83cf0391d5b8b03e515055d1f6 Mon Sep 17 00:00:00 2001
From: Konstantin Burkalev <KSDaemon@gmail.com>
Date: Tue, 17 Sep 2024 23:16:30 +0300
Subject: [PATCH] =?UTF-8?q?fix(schema-compiler):=20fix=20FILTER=5FPARAMS?=
 =?UTF-8?q?=20propagation=20from=20view=20to=C2=A0cube's=20SQL=20query?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/adapter/BaseQuery.js                  | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/packages/cubejs-schema-compiler/src/adapter/BaseQuery.js b/packages/cubejs-schema-compiler/src/adapter/BaseQuery.js
index 3bb6734aaddef..ede49e5986b7e 100644
--- a/packages/cubejs-schema-compiler/src/adapter/BaseQuery.js
+++ b/packages/cubejs-schema-compiler/src/adapter/BaseQuery.js
@@ -3716,6 +3716,9 @@ export class BaseQuery {
       return null;
     }
     const filterMembers = BaseQuery.extractFilterMembers(filter);
+    console.log('filterMembers:', filterMembers, '\ngroupMembers:', groupMembers, '\naliases:', aliases);
+    console.log('filterMembers.every(m => (groupMembers.indexOf(m) !== -1)):', Object.keys(filterMembers).every(m => (groupMembers.indexOf(m) !== -1)));
+    console.log('filterMembers.every(m => (groupMembers.indexOf(m) !== -1 || aliases.indexOf(m) !== -1)):', Object.keys(filterMembers).every(m => (groupMembers.indexOf(m) !== -1 || aliases.indexOf(m) !== -1)));
     if (filterMembers && Object.keys(filterMembers).every(m => (groupMembers.indexOf(m) !== -1 || aliases.indexOf(m) !== -1))) {
       return filter;
     }
@@ -3758,7 +3761,7 @@ export class BaseQuery {
       return newGroupFilter({ operator: filter.operator, values }).filterToWhere();
     }
 
-    const filterParams = filter.filterParams();
+    const filterParams = filter && filter.filterParams();
     const filterParamArg = filterParamArgs.filter(p => {
       const member = p.__member();
       return member === filter.measure ||
@@ -3806,11 +3809,15 @@ export class BaseQuery {
           .map(v => (v.query ? v.query.allBackAliasMembersExceptSegments() : {}))
           .reduce((a, b) => ({ ...a, ...b }), {})
         : {};
+      // Filtering aliases that somehow relate to this group members
+      const aliasesForGroupMembers = Object.entries(aliases)
+        .filter(([key, value]) => groupMembers.includes(key))
+        .map(([_key, value]) => value);
       const filter = BaseQuery.findAndSubTreeForFilterGroup(
         newGroupFilter({ operator: 'and', values: allFilters }),
         groupMembers,
         newGroupFilter,
-        Object.values(aliases)
+        aliasesForGroupMembers
       );
 
       return `(${BaseQuery.renderFilterParams(filter, filterParamArgs, allocateParam, newGroupFilter, aliases)})`;
@@ -3846,15 +3853,16 @@ export class BaseQuery {
                     .map(v => (v.query ? v.query.allBackAliasMembersExceptSegments() : {}))
                     .reduce((a, b) => ({ ...a, ...b }), {})
                   : {};
-                // Filtering aliases that somehow relate to this cube
-                const filteredAliases = Object.entries(aliases)
-                  .filter(([key, value]) => key.startsWith(cubeNameObj.cube) || value.startsWith(cubeNameObj.cube))
-                  .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {});
+                // Filtering aliases that somehow relate to this group member
+                const groupMember = cubeEvaluator.pathFromArray([cubeNameObj.cube, propertyName]);
+                const aliasesForGroupMembers = Object.entries(aliases)
+                  .filter(([key, _value]) => key === groupMember)
+                  .map(([_key, value]) => value);
                 const filter = BaseQuery.findAndSubTreeForFilterGroup(
                   newGroupFilter({ operator: 'and', values: allFilters }),
-                  [cubeEvaluator.pathFromArray([cubeNameObj.cube, propertyName])],
+                  [groupMember],
                   newGroupFilter,
-                  Object.values(filteredAliases)
+                  aliasesForGroupMembers
                 );
 
                 return `(${BaseQuery.renderFilterParams(filter, [this], allocateParam, newGroupFilter, aliases)})`;