From 153ca6995b595e0cbaa9ce6d8f7dd7c18bc6cffe Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Fri, 17 Feb 2023 12:13:20 +0800
Subject: [PATCH] Refactor exclude labels query

---
 packages/api/src/elastic/pages.ts | 13 ++++++-------
 packages/api/src/elastic/types.ts |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/packages/api/src/elastic/pages.ts b/packages/api/src/elastic/pages.ts
index 60bb5da89..40e4300e7 100644
--- a/packages/api/src/elastic/pages.ts
+++ b/packages/api/src/elastic/pages.ts
@@ -114,16 +114,15 @@ const appendExcludeLabelFilter = (
   body: SearchBody,
   filters: LabelFilter[]
 ): void => {
+  const labels = filters.map((filter) => filter.labels).flat()
   body.query.bool.must_not.push({
     nested: {
       path: 'labels',
-      query: filters.map((filter) => {
-        return {
-          terms: {
-            'labels.name': filter.labels,
-          },
-        }
-      }),
+      query: {
+        terms: {
+          'labels.name': labels,
+        },
+      },
     },
   })
 }
diff --git a/packages/api/src/elastic/types.ts b/packages/api/src/elastic/types.ts
index 717ace7ce..bd238e7d6 100644
--- a/packages/api/src/elastic/types.ts
+++ b/packages/api/src/elastic/types.ts
@@ -103,7 +103,7 @@ export interface SearchBody {
                 terms: {
                   'labels.name': string[]
                 }
-              }[]
+              }
             }
           }
       )[]