From d7a2659fc4ae83fd71944dc2d71e79bbe9c6e069 Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Tue, 19 Apr 2022 12:13:47 +0800
Subject: [PATCH] fix searching for multiple labels (#444)

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

diff --git a/packages/api/src/elastic/pages.ts b/packages/api/src/elastic/pages.ts
index 658abffc7..119c3c1f4 100644
--- a/packages/api/src/elastic/pages.ts
+++ b/packages/api/src/elastic/pages.ts
@@ -128,21 +128,17 @@ const appendIncludeLabelFilter = (
   body: SearchBody,
   filters: LabelFilter[]
 ): void => {
-  body.query.bool.filter.push({
-    nested: {
-      path: 'labels',
-      query: {
-        bool: {
-          filter: filters.map((filter) => {
-            return {
-              terms: {
-                'labels.name': filter.labels,
-              },
-            }
-          }),
+  filters.forEach((filter) => {
+    body.query.bool.filter.push({
+      nested: {
+        path: 'labels',
+        query: {
+          terms: {
+            'labels.name': filter.labels,
+          },
         },
       },
-    },
+    })
   })
 }
 
diff --git a/packages/api/src/elastic/types.ts b/packages/api/src/elastic/types.ts
index 9d9e5f74a..c550367a8 100644
--- a/packages/api/src/elastic/types.ts
+++ b/packages/api/src/elastic/types.ts
@@ -32,12 +32,8 @@ export interface SearchBody {
             nested: {
               path: 'labels'
               query: {
-                bool: {
-                  filter: {
-                    terms: {
-                      'labels.name': string[]
-                    }
-                  }[]
+                terms: {
+                  'labels.name': string[]
                 }
               }
             }