From 818c7bffb9bec07f428cdf89eefb1cc58977af83 Mon Sep 17 00:00:00 2001
From: Henry <henry_ball@hotmail.co.uk>
Date: Thu, 30 Jan 2025 09:24:45 +0000
Subject: [PATCH] fix: prevent filters from hiding other labels or members on
 cards

---
 packages/db/src/repository/board.repo.ts | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/db/src/repository/board.repo.ts b/packages/db/src/repository/board.repo.ts
index 8047d365..eec80113 100644
--- a/packages/db/src/repository/board.repo.ts
+++ b/packages/db/src/repository/board.repo.ts
@@ -59,18 +59,24 @@ export const getByPublicId = async (
             description,
             listId,
             index,
-            labels:label${filters.labels.length > 0 ? "!inner" : ""} (
+            labels:label(
               publicId,
               name,
               colourCode
             ),
-            members:workspace_members${filters.members.length > 0 ? "!inner" : ""} (
+            _filteredLabels:label${filters.labels.length > 0 ? "!inner" : ""} (
+              publicId
+            ),
+            members:workspace_members (
               publicId,
               user!workspace_members_userId_user_id_fk (
                 name,
                 email,
                 image
               )
+            ),
+            _filteredMembers:workspace_members${filters.members.length > 0 ? "!inner" : ""} (
+              publicId
             )
           )
         )
@@ -84,11 +90,11 @@ export const getByPublicId = async (
     .is("lists.cards.members.deletedAt", null);
 
   if (filters.labels.length > 0) {
-    query = query.in("lists.cards.labels.publicId", filters.labels);
+    query = query.in("lists.cards._filteredLabels.publicId", filters.labels);
   }
 
   if (filters.members.length > 0) {
-    query = query.in("lists.cards.members.publicId", filters.members);
+    query = query.in("lists.cards._filteredMembers.publicId", filters.members);
   }
 
   const { data } = await query