Merge pull request #289 from Gongjakso/fix/pagination

fix: 페이지네이션 반환 오류 수정

Author: dl-00-e8

src/main/java/com/gongjakso/server/domain/team/repository/TeamRepositoryImpl.java

@@ -78,6 +78,7 @@ public Page<SimpleTeamRes> 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<SimpleTeamRes> 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<SimpleTeamRes> 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<SimpleTeamRes> 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();