diff --git a/src/main/java/com/gongjakso/server/domain/team/repository/TeamRepositoryImpl.java b/src/main/java/com/gongjakso/server/domain/team/repository/TeamRepositoryImpl.java index 3fdaae1..56effde 100644 --- a/src/main/java/com/gongjakso/server/domain/team/repository/TeamRepositoryImpl.java +++ b/src/main/java/com/gongjakso/server/domain/team/repository/TeamRepositoryImpl.java @@ -78,6 +78,7 @@ public Page findPaginationWithContest(Long contestId, String prov .from(team) .where( team.contest.id.eq(contestId), + team.status.in(teamStatusList), team.deletedAt.isNull(), builder ) @@ -118,9 +119,9 @@ public Page findPaginationWithoutContest(String province, String Long total = queryFactory.select(team.count()) .from(team) - .where( - team.deletedAt.isNull(), - builder + .where(team.deletedAt.isNull() + .and(team.status.in(teamStatusList)) + .and(builder) ) .fetchOne(); @@ -151,6 +152,7 @@ public Page findRecruitPagination(Long memberId, Pageable pageabl .from(team) .where( team.member.id.eq(memberId), + team.status.in(teamStatusList), team.deletedAt.isNull() ) .fetchOne(); @@ -230,8 +232,17 @@ public Page findParticipatePagination(Long memberId, Pageable pag Long total = queryFactory.select(team.count()) .from(team) .where( - team.status.in(teamStatusList), - team.deletedAt.isNull() + ( + team.member.id.eq(memberId) + .and(team.status.in(teamStatusList)) + .and(team.deletedAt.isNull()) + ) + .or( + apply.member.id.eq(memberId) + .and(apply.status.eq(ApplyStatus.ACCEPTED)) + .and(apply.team.status.in(teamStatusList)) + .and(apply.team.deletedAt.isNull()) + ) ) .fetchOne();