Merge pull request #1142 from cardstack/cs-6659-support-for-every-fil…

…ter-queries Add "every" filter support for our queries
cardstack · Apr 5, 2024 · 4820358 · 4820358
2 parents 4e3ac0d + 6accd31
commit 4820358
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 0 deletions.
diff --git a/packages/host/tests/unit/query-test.ts b/packages/host/tests/unit/query-test.ts
@@ -532,6 +532,68 @@ module('Unit | query', function (hooks) {
     );
   });
 
+  test(`can use 'every' to combine multiple filters`, async function (assert) {
+    let { mango, vangogh, ringo } = testCards;
+    await setupIndex(client, [
+      {
+        card: mango,
+        data: {
+          search_doc: {
+            name: 'Mango',
+            address: {
+              street: '123 Main Street',
+              city: 'Barksville',
+            },
+          },
+        },
+      },
+      {
+        card: vangogh,
+        data: {
+          search_doc: {
+            name: 'Van Gogh',
+            address: {
+              street: '456 Grand Blvd',
+              city: 'Barksville',
+            },
+          },
+        },
+      },
+      {
+        card: ringo,
+        data: {
+          search_doc: {
+            name: 'Ringo',
+            address: {
+              street: '100 Treat Street',
+              city: 'Waggington',
+            },
+          },
+        },
+      },
+    ]);
+
+    let { cards, meta } = await client.search(
+      {
+        filter: {
+          on: { module: `${testRealmURL}person`, name: 'Person' },
+          every: [
+            {
+              eq: { 'address.city': 'Barksville' },
+            },
+            {
+              not: { eq: { 'address.street': '456 Grand Blvd' } },
+            },
+          ],
+        },
+      },
+      loader,
+    );
+
+    assert.strictEqual(meta.page.total, 1, 'the total results meta is correct');
+    assert.deepEqual(getIds(cards), [mango.id], 'results are correct');
+  });
+
   test(`gives a good error when query refers to missing card`, async function (assert) {
     await setupIndex(client, []);
 

diff --git a/packages/runtime-common/indexer/client.ts b/packages/runtime-common/indexer/client.ts
@@ -251,6 +251,11 @@ export class IndexerDBClient {
       return this.eqCondition(filter, on);
     } else if ('not' in filter) {
       return this.notCondition(filter, on);
+    } else if ('every' in filter) {
+      // on = filter.on ?? on;
+      return every(
+        filter.every.map((i) => this.filterCondition(i, filter.on ?? on)),
+      );
     }
 
     // TODO handle filters for: any, every, contains, and range