Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Nov 28, 2024
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion ...p/kkeujeok/kkeujeokbackend/dashboard/domain/repository/DashboardCustomRepositoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import static shop.kkeujeok.kkeujeokbackend.dashboard.team.domain.QTeamDashboardMemberMapping.teamDashboardMemberMapping;
import static shop.kkeujeok.kkeujeokbackend.member.domain.QMember.member;

import com.querydsl.jpa.JPAExpressions;
import com.querydsl.jpa.impl.JPAQueryFactory;
import java.util.List;
import java.util.Set;
Expand Down Expand Up @@ -76,7 +77,16 @@ public Set<String> findCategoriesForDashboard(Member member) {
public Page<TeamDashboard> findForTeamDashboard(Member member, Pageable pageable) {
long total = queryFactory
.selectFrom(teamDashboard)
.where(teamDashboard._super.member.eq(member))
.where(
teamDashboard._super.member.eq(member)
.or(
teamDashboard.id.in(
JPAExpressions.select(teamDashboardMemberMapping.teamDashboard.id)
.from(teamDashboardMemberMapping)
.where(teamDashboardMemberMapping.member.id.eq(member.getId()))
)
)
)
.stream()
.count();

Expand Down