fix: filter params being replaced by undefined (#44)

* fix: filter params being replaced by undefined

* update tests

* bump versions

Author: kunal-mohta-99

meerkat-browser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devrev/meerkat-browser",
-  "version": "0.0.59",
+  "version": "0.0.60",
   "dependencies": {
     "@swc/helpers": "~0.5.0",
     "@devrev/meerkat-core": "*",

meerkat-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devrev/meerkat-core",
-  "version": "0.0.59",
+  "version": "0.0.60",
   "dependencies": {
     "@swc/helpers": "~0.5.0"
   },

meerkat-core/src/filter-params/filter-params-ast.spec.ts

@@ -68,11 +68,7 @@ describe('getFilterByMemberKey', () => {
       },
     ];
     const result = getFilterByMemberKey(filters, 'memberKey');
-    expect(result).toEqual([
-      {
-        and: [],
-      },
-    ]);
+    expect(result).toEqual([]);
   });
 });
 

meerkat-core/src/filter-params/filter-params-ast.ts

@@ -25,9 +25,7 @@ const traverseAndFilter = (
       .map((subFilter) => traverseAndFilter(subFilter, memberKey))
       .filter(Boolean) as GenericFilter[];
     const obj =
-      filteredAndFilters.length > 0
-        ? { and: filteredAndFilters }
-        : { and: filteredAndFilters };
+      filteredAndFilters.length > 0 ? { and: filteredAndFilters } : null;
     return obj as LogicalAndFilter;
   }
 

meerkat-node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devrev/meerkat-node",
-  "version": "0.0.59",
+  "version": "0.0.60",
   "dependencies": {
     "@swc/helpers": "~0.5.0",
     "@devrev/meerkat-core": "*",

meerkat-node/src/__tests__/cube-filter-params.spec.ts

@@ -97,7 +97,7 @@ describe('filter-param-tests', () => {
     expect(output[0].id).toBe(6);
   });
 
-  it('Should apply true filter if filters are not matching', async () => {
+  it('Should apply true filter if no filters are present', async () => {
     const query = {
       measures: ['*'],
       filters: [],
@@ -109,4 +109,36 @@ describe('filter-param-tests', () => {
     const output: any = await duckdbExec(sql);
     expect(output).toHaveLength(7);
   });
+
+  it('Should apply true filter if filters are present but are not matching', async () => {
+    const query = {
+      measures: ['*'],
+      filters: [
+        {
+          and: [
+            {
+              member: 'orders.amount',
+              operator: 'gt',
+              values: ['40'],
+            },
+            {
+              or: [
+                {
+                  member: 'orders.amount',
+                  operator: 'lt',
+                  values: ['200'],
+                },
+              ],
+            },
+          ],
+        },
+      ],
+      dimensions: [],
+    };
+
+    const sql = await cubeQueryToSQL(query, SCHEMA);
+    console.info('SQL: ', sql);
+    const output: any = await duckdbExec(sql);
+    expect(output).toHaveLength(4);
+  });
 });