[EA3-168] refactor: ApplicationCreateRequest 변경 및 코드 리팩터링

Author: pia01190

src/main/java/grep/neogul_coder/domain/studyapplication/controller/ApplicationController.java

@@ -12,32 +12,35 @@
 
 import java.util.List;
 
-@RequestMapping("/api/studies")
+@RequestMapping("/api/recruitment-posts")
 @RequiredArgsConstructor
 @RestController
 public class ApplicationController implements ApplicationSpecification {
 
     private final ApplicationService applicationService;
 
-    @GetMapping("/{studyId}/applications")
-    public ApiResponse<List<MyApplicationResponse>> getMyStudyApplications(@AuthenticationPrincipal Principal userDetails) {
+    @GetMapping("/{recruitment-post-id}/applications")
+    public ApiResponse<List<MyApplicationResponse>> getMyStudyApplications(@PathVariable("recruitment-post-id") Long recruitmentPostId,
+                                                                           @AuthenticationPrincipal Principal userDetails) {
         return ApiResponse.success(applicationService.getMyStudyApplications(userDetails.getUserId()));
     }
 
-    @PostMapping("/{studyId}/applications")
-    public ApiResponse<Long> createApplication(@RequestBody @Valid ApplicationCreateRequest request) {
-        Long id = applicationService.createApplication(request);
+    @PostMapping("/{recruitment-post-id}/applications")
+    public ApiResponse<Long> createApplication(@PathVariable("recruitment-post-id") Long recruitmentPostId,
+                                               @RequestBody @Valid ApplicationCreateRequest request,
+                                               @AuthenticationPrincipal Principal userDetails) {
+        Long id = applicationService.createApplication(recruitmentPostId, request, userDetails.getUserId());
         return ApiResponse.success(id);
     }
 
-    @PostMapping("/{applicationId}/approve")
+    @PostMapping("/applications/{applicationId}/approve")
     public ApiResponse<Void> approveApplication(@PathVariable("applicationId") Long applicationId,
                                                 @AuthenticationPrincipal Principal userDetails) {
         applicationService.approveApplication(applicationId, userDetails.getUserId());
         return ApiResponse.noContent();
     }
 
-    @PostMapping("/{applicationId}/reject")
+    @PostMapping("/applications/{applicationId}/reject")
     public ApiResponse<Void> rejectApplication(@PathVariable("applicationId") Long applicationId,
                                                @AuthenticationPrincipal Principal userDetails) {
         applicationService.rejectApplication(applicationId, userDetails.getUserId());

src/main/java/grep/neogul_coder/domain/studyapplication/controller/ApplicationSpecification.java

@@ -13,10 +13,10 @@
 public interface ApplicationSpecification {
 
     @Operation(summary = "내 스터디 신청 목록 조회", description = "내가 신청한 스터디의 목록을 조회합니다.")
-    ApiResponse<List<MyApplicationResponse>> getMyStudyApplications(Principal userDetails);
+    ApiResponse<List<MyApplicationResponse>> getMyStudyApplications(Long recruitmentPostId, Principal userDetails);
 
     @Operation(summary = "스터디 신청 생성", description = "스터디를 신청합니다.")
-    ApiResponse<Long> createApplication(ApplicationCreateRequest request);
+    ApiResponse<Long> createApplication(Long recruitmentPostId, ApplicationCreateRequest request, Principal userDetails);
 
     @Operation(summary = "스터디 신청 승인", description = "스터디장이 스터디 신청을 승인합니다.")
     ApiResponse<Void> approveApplication(Long applicationId, Principal userDetails);

src/main/java/grep/neogul_coder/domain/studyapplication/controller/dto/request/ApplicationCreateRequest.java

@@ -12,13 +12,6 @@
 @Getter
 public class ApplicationCreateRequest {
 
-    @Schema(description = "모집글 번호", example = "1")
-    private Long recruitmentPostId;
-
-    @NotNull
-    @Schema(description = "유저 번호", example = "1")
-    private Long userId;
-
     @NotBlank
     @Schema(description = "스터디 신청 지원 동기", example = "자바를 더 공부하고싶어 지원하였습니다.")
     private String applicationReason;
@@ -27,16 +20,14 @@ private ApplicationCreateRequest() {
     }
 
     @Builder
-    private ApplicationCreateRequest(Long recruitmentPostId, Long userId, String applicationReason) {
-        this.recruitmentPostId = recruitmentPostId;
-        this.userId = userId;
+    private ApplicationCreateRequest(String applicationReason) {
         this.applicationReason = applicationReason;
     }
 
-    public StudyApplication toEntity() {
+    public StudyApplication toEntity(Long recruitmentPostId, Long userId) {
         return StudyApplication.builder()
-            .recruitmentPostId(this.recruitmentPostId)
-            .userId(this.userId)
+            .recruitmentPostId(recruitmentPostId)
+            .userId(userId)
             .applicationReason(this.applicationReason)
             .isRead(false)
             .status(ApplicationStatus.APPLYING)

src/main/java/grep/neogul_coder/domain/studyapplication/service/ApplicationService.java

@@ -41,13 +41,13 @@ public List<MyApplicationResponse> getMyStudyApplications(Long userId) {
     }
 
     @Transactional
-    public Long createApplication(ApplicationCreateRequest request) {
-        RecruitmentPost recruitmentPost = findValidRecruimentPost(request.getRecruitmentPostId());
+    public Long createApplication(Long recruitmentPostId, ApplicationCreateRequest request, Long userId) {
+        RecruitmentPost recruitmentPost = findValidRecruimentPost(recruitmentPostId);
 
-        validateNotLeaderApply(request, recruitmentPost);
-        validateNotAlreadyApplied(request);
+        validateNotLeaderApply(recruitmentPost, userId);
+        validateNotAlreadyApplied(recruitmentPostId, userId);
 
-        StudyApplication application = request.toEntity();
+        StudyApplication application = request.toEntity(recruitmentPostId, userId);
         applicationRepository.save(application);
 
         return application.getId();
@@ -59,7 +59,7 @@ public void approveApplication(Long applicationId, Long userId) {
         RecruitmentPost post = findValidRecruimentPost(application.getRecruitmentPostId());
         Study study = findValidStudy(post);
 
-        validateOnlyLeaderCanApproved(study, userId);
+        validateOnlyLeaderCanApprove(study, userId);
         validateStatusIsApplying(application);
 
         application.approve();
@@ -75,7 +75,7 @@ public void rejectApplication(Long applicationId, Long userId) {
         RecruitmentPost post = findValidRecruimentPost(application.getRecruitmentPostId());
         Study study = findValidStudy(post);
 
-        validateOnlyLeaderCanRejected(study, userId);
+        validateOnlyLeaderCanReject(study, userId);
         validateStatusIsApplying(application);
 
         application.reject();
@@ -93,21 +93,21 @@ private StudyApplication findValidApplication(Long applicationId) {
         return application;
     }
 
-    private RecruitmentPost findValidRecruimentPost(Long applicationId) {
-        RecruitmentPost post = recruitmentPostRepository.findByIdAndActivatedTrue(applicationId)
+    private RecruitmentPost findValidRecruimentPost(Long recruitmentPostId) {
+        RecruitmentPost post = recruitmentPostRepository.findByIdAndActivatedTrue(recruitmentPostId)
             .orElseThrow(() -> new NotFoundException(NOT_FOUND));
         return post;
     }
 
-    private void validateNotLeaderApply(ApplicationCreateRequest request, RecruitmentPost recruitmentPost) {
-        boolean isLeader = studyMemberRepository.existsByStudyIdAndUserIdAndRole(recruitmentPost.getStudyId(), request.getUserId(), StudyMemberRole.LEADER);
+    private void validateNotLeaderApply(RecruitmentPost recruitmentPost, Long userId) {
+        boolean isLeader = studyMemberRepository.existsByStudyIdAndUserIdAndRole(recruitmentPost.getStudyId(), userId, StudyMemberRole.LEADER);
         if (isLeader) {
             throw new BusinessException(LEADER_CANNOT_APPLY);
         }
     }
 
-    private void validateNotAlreadyApplied(ApplicationCreateRequest request) {
-        boolean alreadyApplied = applicationRepository.existsByRecruitmentPostIdAndUserId(request.getRecruitmentPostId(), request.getUserId());
+    private void validateNotAlreadyApplied(Long recruitmentPostId, Long userId) {
+        boolean alreadyApplied = applicationRepository.existsByRecruitmentPostIdAndUserId(recruitmentPostId, userId);
         if (alreadyApplied) {
             throw new BusinessException(ALREADY_APPLICATION);
         }
@@ -119,14 +119,14 @@ private static void validateStatusIsApplying(StudyApplication application) {
         }
     }
 
-    private void validateOnlyLeaderCanApproved(Study study, Long userId) {
+    private void validateOnlyLeaderCanApprove(Study study, Long userId) {
         boolean isLeader = studyMemberRepository.existsByStudyIdAndUserIdAndRole(study.getId(), userId, StudyMemberRole.LEADER);
         if (!isLeader) {
             throw new BusinessException(LEADER_ONLY_APPROVED);
         }
     }
 
-    private void validateOnlyLeaderCanRejected(Study study, Long userId) {
+    private void validateOnlyLeaderCanReject(Study study, Long userId) {
         boolean isLeader = studyMemberRepository.existsByStudyIdAndUserIdAndRole(study.getId(), userId, StudyMemberRole.LEADER);
         if (!isLeader) {
             throw new BusinessException(LEADER_ONLY_REJECTED);