From 31e6346b4a190463c87b1a3e3ec5e18a8cb0f52b Mon Sep 17 00:00:00 2001
From: choi inho <129029251+inhooo00@users.noreply.github.com>
Date: Thu, 28 Nov 2024 23:58:49 +0900
Subject: [PATCH] =?UTF-8?q?Feat(#229):=20=EB=A7=88=EC=9D=B4=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=97=90=EC=84=9C=20=ED=8C=80=20=EB=8C=80?=
 =?UTF-8?q?=EC=8B=9C=EB=B3=B4=EB=93=9C=20=EB=82=B4=EA=B0=80=20=EC=B0=B8?=
 =?UTF-8?q?=EC=97=AC=ED=95=9C=20=EA=B2=83=EB=8F=84=20=EB=B3=B4=EC=9D=B4?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95=20(#231)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Feat(#229): 마이페이지에서 팀 대시보드 내가 참여한 것도 보이도록 수정

* Feat(#229): 마이페이지에서 팀 대시보드 내가 참여한 것도 보이도록 수정
---
 .../repository/DashboardCustomRepositoryImpl.java   | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/shop/kkeujeok/kkeujeokbackend/dashboard/domain/repository/DashboardCustomRepositoryImpl.java b/src/main/java/shop/kkeujeok/kkeujeokbackend/dashboard/domain/repository/DashboardCustomRepositoryImpl.java
index 64c6e54..3c72b96 100644
--- a/src/main/java/shop/kkeujeok/kkeujeokbackend/dashboard/domain/repository/DashboardCustomRepositoryImpl.java
+++ b/src/main/java/shop/kkeujeok/kkeujeokbackend/dashboard/domain/repository/DashboardCustomRepositoryImpl.java
@@ -92,8 +92,17 @@ public Page<TeamDashboard> findForTeamDashboard(Member member, Pageable pageable
 
         List<TeamDashboard> dashboards = queryFactory
                 .selectFrom(teamDashboard)
-                .where(teamDashboard._super.member.eq(member)
-                        .and(teamDashboard._super.status.eq(Status.ACTIVE)))
+                .where(
+                        teamDashboard._super.member.eq(member)
+                                .or(
+                                        teamDashboard.id.in(
+                                                JPAExpressions.select(teamDashboardMemberMapping.teamDashboard.id)
+                                                        .from(teamDashboardMemberMapping)
+                                                        .where(teamDashboardMemberMapping.member.id.eq(member.getId()))
+                                        )
+                                )
+                                .and(teamDashboard._super.status.eq(Status.ACTIVE))
+                )
                 .offset(pageable.getOffset())
                 .limit(pageable.getPageSize())
                 .fetch();