Merge pull request #255 from Gongjakso/fix/team

fix: 팀 상태 조건 변동사항 적용
Gongjakso · Sep 26, 2024 · 352eba4 · 352eba4
2 parents e995d84 + ed50e2e
commit 352eba4
Showing 1 changed file with 7 additions and 1 deletion.
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
@@ -40,6 +40,8 @@ public Optional<Team> findTeamById(Long id) {
     }
 
     public Page<SimpleTeamRes> findPaginationWithContest(Long contestId, String province, String district, Pageable pageable) {
+        List<TeamStatus> teamStatusList = Arrays.asList(TeamStatus.RECRUITING, TeamStatus.EXTENSION);
+
         BooleanBuilder builder = new BooleanBuilder();
 
         if(province != null && !province.isEmpty()) {
@@ -54,6 +56,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
                 )
@@ -79,6 +82,8 @@ public Page<SimpleTeamRes> findPaginationWithContest(Long contestId, String prov
     }
 
     public Page<SimpleTeamRes> findPaginationWithoutContest(String province, String district, String keyword, Pageable pageable) {
+        List<TeamStatus> teamStatusList = Arrays.asList(TeamStatus.RECRUITING, TeamStatus.EXTENSION);
+
         BooleanBuilder builder = new BooleanBuilder();
 
         if(province != null && !province.isEmpty()) {
@@ -95,6 +100,7 @@ public Page<SimpleTeamRes> findPaginationWithoutContest(String province, String
                 .select(team)
                 .from(team)
                 .where(team.deletedAt.isNull()
+                        .and(team.status.in(teamStatusList))
                         .and(builder))
                 .orderBy(getSort(pageable).toArray(OrderSpecifier[]::new))
                 .offset(pageable.getOffset())
@@ -117,7 +123,7 @@ public Page<SimpleTeamRes> findPaginationWithoutContest(String province, String
     }
 
     public Page<SimpleTeamRes> findRecruitPagination(Long memberId, Pageable pageable) {
-        List<TeamStatus> teamStatusList = Arrays.asList(TeamStatus.RECRUITING, TeamStatus.EXTENSION);
+        List<TeamStatus> teamStatusList = Arrays.asList(TeamStatus.RECRUITING, TeamStatus.EXTENSION, TeamStatus.CANCELED, TeamStatus.CLOSED);
 
         List<Team> teamList = queryFactory
                 .select(team)