From e6231859bccec657d12694ab139c9908cd595c40 Mon Sep 17 00:00:00 2001
From: Vincenzo Scamporlino <vincenzos@spotify.com>
Date: Wed, 26 Apr 2023 23:50:03 +0200
Subject: [PATCH] catalog-backend: fix filters clashing with pagination clause

Signed-off-by: Vincenzo Scamporlino <vincenzos@spotify.com>
---
 .../service/DefaultEntitiesCatalog.test.ts    | 86 ++++++++++++++++++-
 1 file changed, 84 insertions(+), 2 deletions(-)

diff --git a/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.test.ts b/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.test.ts
index 08ae295834..18796ab24f 100644
--- a/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.test.ts
+++ b/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.test.ts
@@ -1418,6 +1418,87 @@ describe('DefaultEntitiesCatalog', () => {
       },
     );
 
+    it.each(databases.eachSupportedId())(
+      'should exclude filtered entities when paginating, %p',
+      async databaseId => {
+        await createDatabase(databaseId);
+
+        await Promise.all([
+          addEntityToSearch(entityFrom('AA', { uid: '1' })),
+          addEntityToSearch(
+            entityFrom('AA', {
+              namespace: 'namespace2',
+              kind: 'included',
+              uid: '2',
+            }),
+          ),
+          addEntityToSearch(
+            entityFrom('AA', {
+              namespace: 'ns',
+              kind: 'excluded',
+              uid: '3',
+            }),
+          ),
+          addEntityToSearch(
+            entityFrom('AA', {
+              namespace: 'namespace3',
+              uid: '4',
+              kind: 'included',
+            }),
+          ),
+          addEntityToSearch(
+            entityFrom('AA', {
+              namespace: 'namespace4',
+              uid: '5',
+              kind: 'included',
+            }),
+          ),
+          addEntityToSearch(entityFrom('CC', { uid: '6', kind: 'included' })),
+          addEntityToSearch(entityFrom('DD', { uid: '7', kind: 'included' })),
+        ]);
+
+        const catalog = new DefaultEntitiesCatalog({
+          database: knex,
+          logger: getVoidLogger(),
+          stitcher,
+        });
+
+        const limit = 2;
+
+        // initial request
+        const request1: QueryEntitiesInitialRequest = {
+          limit,
+          filter: {
+            key: 'kind',
+            values: ['included'],
+          },
+          orderFields: [{ field: 'metadata.name', order: 'asc' }],
+        };
+        const response1 = await catalog.queryEntities(request1);
+        expect(response1.items).toMatchObject([
+          entityFrom('AA', { uid: '1' }),
+          entityFrom('AA', { uid: '2' }),
+        ]);
+        expect(response1.pageInfo.nextCursor).toBeDefined();
+        expect(response1.pageInfo.prevCursor).toBeUndefined();
+        expect(response1.totalItems).toBe(6);
+
+        // second request (forward)
+        const request2: QueryEntitiesCursorRequest = {
+          cursor: response1.pageInfo.nextCursor!,
+          limit,
+        };
+        const response2 = await catalog.queryEntities(request2);
+        expect(response2.items).toMatchObject([
+          entityFrom('AA', { uid: '4' }),
+          entityFrom('AA', { uid: '5' }),
+        ]);
+        expect(response2.pageInfo.nextCursor).toBeDefined();
+        expect(response2.pageInfo.prevCursor).toBeDefined();
+        expect(response2.totalItems).toBe(6);
+      },
+    );
+
     it.each(databases.eachSupportedId())(
       'should paginate results without sort fields, %p',
       async databaseId => {
@@ -1754,11 +1835,12 @@ function entityFrom(
     uid,
     namespace,
     title,
-  }: { uid?: string; namespace?: string; title?: string } = {},
+    kind = 'k',
+  }: { uid?: string; namespace?: string; title?: string; kind?: string } = {},
 ) {
   return {
     apiVersion: 'a',
-    kind: 'k',
+    kind,
     metadata: {
       name,
       ...(!!namespace && { namespace }),