Merge pull request #190 from prgrms-web-devcourse-final-project/feature/EA3-168-study-application

endorsement0912 · web-flow · commit e8960085f56b · 2025-07-23T20:14:54.000+09:00
[EA3-168] feature: 스터디 신청 목록 페이지네이션 및 필터링
diff --git a/src/main/java/grep/neogul_coder/domain/studyapplication/controller/ApplicationController.java b/src/main/java/grep/neogul_coder/domain/studyapplication/controller/ApplicationController.java
@@ -1,17 +1,19 @@
 package grep.neogul_coder.domain.studyapplication.controller;
 
+import grep.neogul_coder.domain.study.enums.Category;
+import grep.neogul_coder.domain.studyapplication.ApplicationStatus;
 import grep.neogul_coder.domain.studyapplication.controller.dto.request.ApplicationCreateRequest;
-import grep.neogul_coder.domain.studyapplication.controller.dto.response.MyApplicationResponse;
+import grep.neogul_coder.domain.studyapplication.controller.dto.response.MyApplicationPagingResponse;
 import grep.neogul_coder.domain.studyapplication.service.ApplicationService;
 import grep.neogul_coder.global.auth.Principal;
 import grep.neogul_coder.global.response.ApiResponse;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.web.PageableDefault;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 @RequestMapping("/api/recruitment-posts")
 @RequiredArgsConstructor
 @RestController
@@ -20,9 +22,11 @@ public class ApplicationController implements ApplicationSpecification {
     private final ApplicationService applicationService;
 
     @GetMapping("/{recruitment-post-id}/applications")
-    public ApiResponse<List<MyApplicationResponse>> getMyStudyApplications(@PathVariable("recruitment-post-id") Long recruitmentPostId,
+    public ApiResponse<MyApplicationPagingResponse> getMyStudyApplications(@PathVariable("recruitment-post-id") Long recruitmentPostId,
+                                                                           @PageableDefault(size = 12) Pageable pageable,
+                                                                           @RequestParam(required = false) ApplicationStatus status,
                                                                            @AuthenticationPrincipal Principal userDetails) {
-        return ApiResponse.success(applicationService.getMyStudyApplications(userDetails.getUserId()));
+        return ApiResponse.success(applicationService.getMyStudyApplicationsPaging(pageable, userDetails.getUserId(), status));
     }
 
     @PostMapping("/{recruitment-post-id}/applications")
diff --git a/src/main/java/grep/neogul_coder/domain/studyapplication/controller/ApplicationSpecification.java b/src/main/java/grep/neogul_coder/domain/studyapplication/controller/ApplicationSpecification.java
@@ -1,19 +1,23 @@
 package grep.neogul_coder.domain.studyapplication.controller;
 
+import grep.neogul_coder.domain.study.enums.Category;
+import grep.neogul_coder.domain.studyapplication.ApplicationStatus;
 import grep.neogul_coder.domain.studyapplication.controller.dto.request.ApplicationCreateRequest;
+import grep.neogul_coder.domain.studyapplication.controller.dto.response.MyApplicationPagingResponse;
 import grep.neogul_coder.domain.studyapplication.controller.dto.response.MyApplicationResponse;
 import grep.neogul_coder.global.auth.Principal;
 import grep.neogul_coder.global.response.ApiResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.data.domain.Pageable;
 
 import java.util.List;
 
 @Tag(name = "StudyApplication", description = "스터디 신청 API")
 public interface ApplicationSpecification {
 
     @Operation(summary = "내 스터디 신청 목록 조회", description = "내가 신청한 스터디의 목록을 조회합니다.")
-    ApiResponse<List<MyApplicationResponse>> getMyStudyApplications(Long recruitmentPostId, Principal userDetails);
+    ApiResponse<MyApplicationPagingResponse> getMyStudyApplications(Long recruitmentPostId, Pageable pageable, ApplicationStatus status, Principal userDetails);
 
     @Operation(summary = "스터디 신청 생성", description = "스터디를 신청합니다.")
     ApiResponse<Long> createApplication(Long recruitmentPostId, ApplicationCreateRequest request, Principal userDetails);
diff --git a/src/main/java/grep/neogul_coder/domain/studyapplication/controller/dto/response/MyApplicationPagingResponse.java b/src/main/java/grep/neogul_coder/domain/studyapplication/controller/dto/response/MyApplicationPagingResponse.java
@@ -0,0 +1,54 @@
+package grep.neogul_coder.domain.studyapplication.controller.dto.response;
+
+import grep.neogul_coder.domain.study.controller.dto.response.StudyItemPagingResponse;
+import grep.neogul_coder.domain.study.controller.dto.response.StudyItemResponse;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Builder;
+import lombok.Getter;
+import org.springframework.data.domain.Page;
+
+import java.util.List;
+
+@Getter
+public class MyApplicationPagingResponse {
+
+    @Schema(
+        description = "내가 신청한 스터디 목록",
+        example = "[{" +
+            "\"applicationId\": 1," +
+            "\"name\": \"자바 스터디\"," +
+            "\"leaderNickname\": \"너굴\"," +
+            "\"capacity\": 4," +
+            "\"currentCount\": 3," +
+            "\"startDate\": \"2025-07-15T00:00:00\"," +
+            "\"imageUrl\": \"http://localhost:8083/image.jpg\"," +
+            "\"introduction\": \"자바 스터디입니다.\"," +
+            "\"category\": \"IT\"," +
+            "\"studyType\": \"ONLINE\"," +
+            "\"isRead\": true," +
+            "\"status\": \"PENDING\"" +
+            "}]"
+    )
+    private List<MyApplicationResponse> applications;
+
+    @Schema(description = "총 페이지 수", example = "2")
+    private int totalPage;
+
+    @Schema(description = "총 요소 개수", example = "10")
+    private int totalElementCount;
+
+    @Schema(example = "false", description = "다음 페이지 여부")
+    private boolean hasNext;
+
+    @Builder
+    private MyApplicationPagingResponse(Page<MyApplicationResponse> page) {
+        this.applications = page.getContent();
+        this.totalPage = page.getTotalPages();
+        this.totalElementCount = (int) page.getTotalElements();
+        this.hasNext = page.hasNext();
+    }
+
+    public static MyApplicationPagingResponse of(Page<MyApplicationResponse> page) {
+        return new MyApplicationPagingResponse(page);
+    }
+}
diff --git a/src/main/java/grep/neogul_coder/domain/studyapplication/repository/ApplicationQueryRepository.java b/src/main/java/grep/neogul_coder/domain/studyapplication/repository/ApplicationQueryRepository.java
@@ -1,12 +1,20 @@
 package grep.neogul_coder.domain.studyapplication.repository;
 
+import com.querydsl.core.BooleanBuilder;
+import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.jpa.impl.JPAQueryFactory;
+import grep.neogul_coder.domain.study.enums.Category;
+import grep.neogul_coder.domain.studyapplication.ApplicationStatus;
 import grep.neogul_coder.domain.studyapplication.controller.dto.response.MyApplicationResponse;
 import grep.neogul_coder.domain.studyapplication.controller.dto.response.QMyApplicationResponse;
 import jakarta.persistence.EntityManager;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.function.Supplier;
 
 import static grep.neogul_coder.domain.recruitment.post.QRecruitmentPost.recruitmentPost;
 import static grep.neogul_coder.domain.study.QStudy.study;
@@ -24,8 +32,8 @@ public ApplicationQueryRepository(EntityManager em) {
         this.queryFactory = new JPAQueryFactory(em);
     }
 
-    public List<MyApplicationResponse> findMyApplications(Long userId) {
-        return queryFactory
+    public Page<MyApplicationResponse> findMyStudyApplicationsPaging(Pageable pageable, Long userId, ApplicationStatus status) {
+        List<MyApplicationResponse> applications = queryFactory
             .select(new QMyApplicationResponse(
                 studyApplication.id,
                 study.name,
@@ -45,7 +53,38 @@ public List<MyApplicationResponse> findMyApplications(Long userId) {
             .join(study).on(study.id.eq(recruitmentPost.studyId))
             .join(studyMember).on(studyMember.study.id.eq(study.id), studyMember.role.eq(LEADER))
             .join(user).on(user.id.eq(studyMember.userId))
-            .where(studyApplication.userId.eq(userId))
+            .where(
+                studyApplication.userId.eq(userId),
+                equalsApplicationStatus(status)
+            )
+            .offset(pageable.getOffset())
+            .limit(pageable.getPageSize())
             .fetch();
+
+        Long total = queryFactory
+            .select(studyApplication.count())
+            .from(studyApplication)
+            .join(recruitmentPost).on(recruitmentPost.id.eq(studyApplication.recruitmentPostId))
+            .join(study).on(study.id.eq(recruitmentPost.studyId))
+            .join(studyMember).on(studyMember.study.id.eq(study.id), studyMember.role.eq(LEADER))
+            .where(
+                studyApplication.userId.eq(userId),
+                equalsApplicationStatus(status)
+            )
+            .fetchOne();
+
+        return new PageImpl<>(applications, pageable, total == null ? 0 : total);
+    }
+
+    private BooleanBuilder equalsApplicationStatus(ApplicationStatus status) {
+        return nullSafeBuilder(() -> studyApplication.status.eq(status));
+    }
+
+    private BooleanBuilder nullSafeBuilder(Supplier<BooleanExpression> supplier) {
+        try {
+            return new BooleanBuilder(supplier.get());
+        } catch (Exception e) {
+            return new BooleanBuilder();
+        }
     }
 }
diff --git a/src/main/java/grep/neogul_coder/domain/studyapplication/service/ApplicationService.java b/src/main/java/grep/neogul_coder/domain/studyapplication/service/ApplicationService.java
@@ -4,23 +4,25 @@
 import grep.neogul_coder.domain.recruitment.post.repository.RecruitmentPostRepository;
 import grep.neogul_coder.domain.study.Study;
 import grep.neogul_coder.domain.study.StudyMember;
+import grep.neogul_coder.domain.study.enums.Category;
 import grep.neogul_coder.domain.study.enums.StudyMemberRole;
 import grep.neogul_coder.domain.study.repository.StudyMemberRepository;
 import grep.neogul_coder.domain.study.repository.StudyRepository;
 import grep.neogul_coder.domain.studyapplication.ApplicationStatus;
 import grep.neogul_coder.domain.studyapplication.StudyApplication;
 import grep.neogul_coder.domain.studyapplication.controller.dto.request.ApplicationCreateRequest;
+import grep.neogul_coder.domain.studyapplication.controller.dto.response.MyApplicationPagingResponse;
 import grep.neogul_coder.domain.studyapplication.controller.dto.response.MyApplicationResponse;
 import grep.neogul_coder.domain.studyapplication.repository.ApplicationQueryRepository;
 import grep.neogul_coder.domain.studyapplication.repository.ApplicationRepository;
 import grep.neogul_coder.global.exception.business.BusinessException;
 import grep.neogul_coder.global.exception.business.NotFoundException;
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
-
 import static grep.neogul_coder.domain.recruitment.RecruitmentErrorCode.NOT_FOUND;
 import static grep.neogul_coder.domain.study.exception.code.StudyErrorCode.STUDY_NOT_FOUND;
 import static grep.neogul_coder.domain.studyapplication.exception.code.ApplicationErrorCode.*;
@@ -36,8 +38,9 @@ public class ApplicationService {
     private final StudyMemberRepository studyMemberRepository;
     private final StudyRepository studyRepository;
 
-    public List<MyApplicationResponse> getMyStudyApplications(Long userId) {
-        return applicationQueryRepository.findMyApplications(userId);
+    public MyApplicationPagingResponse getMyStudyApplicationsPaging(Pageable pageable, Long userId, ApplicationStatus status) {
+        Page<MyApplicationResponse> page = applicationQueryRepository.findMyStudyApplicationsPaging(pageable, userId, status);
+        return MyApplicationPagingResponse.of(page);
     }
 
     @Transactional
