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

hyeunS-P · web-flow · commit 493fe8d4541e · 2025-07-22T20:00:07.000+09:00
[EA3-168] feature: 스터디 신청 기능 및 테스트
diff --git a/src/main/java/grep/neogul_coder/domain/recruitment/post/service/RecruitmentPostService.java b/src/main/java/grep/neogul_coder/domain/recruitment/post/service/RecruitmentPostService.java
@@ -15,7 +15,7 @@
 import grep.neogul_coder.domain.study.Study;
 import grep.neogul_coder.domain.study.repository.StudyRepository;
 import grep.neogul_coder.domain.studyapplication.StudyApplication;
-import grep.neogul_coder.domain.studyapplication.repository.StudyApplicationRepository;
+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;
@@ -40,7 +40,7 @@ public class RecruitmentPostService {
     private final RecruitmentPostRepository postRepository;
     private final RecruitmentPostQueryRepository postQueryRepository;
 
-    private final StudyApplicationRepository studyApplicationRepository;
+    private final ApplicationRepository applicationRepository;
     private final RecruitmentPostCommentQueryRepository commentQueryRepository;
 
     public RecruitmentPostInfo get(long recruitmentPostId) {
@@ -49,7 +49,7 @@ public RecruitmentPostInfo get(long recruitmentPostId) {
 
         RecruitmentPostWithStudyInfo postInfo = postQueryRepository.findPostWithStudyInfo(post.getId());
         List<CommentsWithWriterInfo> comments = findCommentsWithWriterInfo(post);
-        List<StudyApplication> applications = studyApplicationRepository.findByRecruitmentPostId(post.getId());
+        List<StudyApplication> applications = applicationRepository.findByRecruitmentPostId(post.getId());
 
         return new RecruitmentPostInfo(postInfo, comments, applications.size());
     }
diff --git a/src/main/java/grep/neogul_coder/domain/study/Study.java b/src/main/java/grep/neogul_coder/domain/study/Study.java
@@ -86,6 +86,10 @@ public long calculateRemainSlots(long currentCount) {
         return this.capacity - currentCount;
     }
 
+    public void increaseMemberCount() {
+        currentCount++;
+    }
+
     public void decreaseMemberCount() {
         currentCount--;
     }
diff --git a/src/main/java/grep/neogul_coder/domain/study/StudyMember.java b/src/main/java/grep/neogul_coder/domain/study/StudyMember.java
@@ -36,6 +36,14 @@ public StudyMember(Study study, Long userId, StudyMemberRole role) {
         this.participated = false;
     }
 
+    public static StudyMember createMember(Study study, Long userId) {
+        return StudyMember.builder()
+            .study(study)
+            .userId(userId)
+            .role(StudyMemberRole.MEMBER)
+            .build();
+    }
+
     public void delete() {
         this.activated = false;
     }
diff --git a/src/main/java/grep/neogul_coder/domain/study/repository/StudyMemberRepository.java b/src/main/java/grep/neogul_coder/domain/study/repository/StudyMemberRepository.java
@@ -2,6 +2,7 @@
 
 import grep.neogul_coder.domain.study.Study;
 import grep.neogul_coder.domain.study.StudyMember;
+import grep.neogul_coder.domain.study.enums.StudyMemberRole;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
@@ -37,4 +38,6 @@ public interface StudyMemberRepository extends JpaRepository<StudyMember, Long>
     LocalDateTime findCreatedDateByStudyIdAndUserId(@Param("studyId") Long studyId, @Param("userId") Long userId);
 
     boolean existsByStudyIdAndUserId(Long studyId, Long id);
+
+    boolean existsByStudyIdAndUserIdAndRole(Long studyId, Long userId, StudyMemberRole role);
 }
diff --git a/src/main/java/grep/neogul_coder/domain/studyapplication/StudyApplication.java b/src/main/java/grep/neogul_coder/domain/studyapplication/StudyApplication.java
@@ -3,13 +3,15 @@
 import grep.neogul_coder.global.entity.BaseEntity;
 import jakarta.persistence.*;
 import lombok.Builder;
+import lombok.Getter;
 
+@Getter
 @Entity
 public class StudyApplication extends BaseEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long studyApplicationId;
+    private Long id;
 
     @Column(nullable = false)
     private Long recruitmentPostId;
@@ -35,4 +37,12 @@ private StudyApplication(Long recruitmentPostId, String applicationReason, Appli
     }
 
     protected StudyApplication() {}
+
+    public void approve() {
+        this.status = ApplicationStatus.APPROVED;
+    }
+
+    public void reject() {
+        this.status = ApplicationStatus.REJECTED;
+    }
 }
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
@@ -2,33 +2,48 @@
 
 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.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.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-@RequestMapping("/api/applications")
+@RequestMapping("/api/recruitment-posts")
+@RequiredArgsConstructor
 @RestController
 public class ApplicationController implements ApplicationSpecification {
 
-    @GetMapping("/me")
-    public ApiResponse<List<MyApplicationResponse>> getMyStudyApplications() {
-        return ApiResponse.success(List.of(new MyApplicationResponse()));
+    private final ApplicationService applicationService;
+
+    @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
-    public ApiResponse<Void> createApplication(@RequestBody @Valid ApplicationCreateRequest request) {
-        return ApiResponse.noContent();
+    @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")
-    public ApiResponse<Void> approveApplication(@PathVariable("applicationId") Long applicationId) {
+    @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")
-    public ApiResponse<Void> rejectApplication(@PathVariable("applicationId") Long applicationId) {
+    @PostMapping("/applications/{applicationId}/reject")
+    public ApiResponse<Void> rejectApplication(@PathVariable("applicationId") Long applicationId,
+                                               @AuthenticationPrincipal Principal userDetails) {
+        applicationService.rejectApplication(applicationId, userDetails.getUserId());
         return ApiResponse.noContent();
     }
 }
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
@@ -2,6 +2,7 @@
 
 import grep.neogul_coder.domain.studyapplication.controller.dto.request.ApplicationCreateRequest;
 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;
@@ -12,14 +13,14 @@
 public interface ApplicationSpecification {
 
     @Operation(summary = "내 스터디 신청 목록 조회", description = "내가 신청한 스터디의 목록을 조회합니다.")
-    ApiResponse<List<MyApplicationResponse>> getMyStudyApplications();
+    ApiResponse<List<MyApplicationResponse>> getMyStudyApplications(Long recruitmentPostId, Principal userDetails);
 
     @Operation(summary = "스터디 신청 생성", description = "스터디를 신청합니다.")
-    ApiResponse<Void> createApplication(ApplicationCreateRequest request);
+    ApiResponse<Long> createApplication(Long recruitmentPostId, ApplicationCreateRequest request, Principal userDetails);
 
     @Operation(summary = "스터디 신청 승인", description = "스터디장이 스터디 신청을 승인합니다.")
-    ApiResponse<Void> approveApplication(Long applicationId);
+    ApiResponse<Void> approveApplication(Long applicationId, Principal userDetails);
 
     @Operation(summary = "스터디 신청 거절", description = "스터디장이 스터디 신청을 거절합니다.")
-    ApiResponse<Void> rejectApplication(Long applicationId);
+    ApiResponse<Void> rejectApplication(Long applicationId, Principal userDetails);
 }
diff --git a/src/main/java/grep/neogul_coder/domain/studyapplication/controller/dto/request/ApplicationCreateRequest.java b/src/main/java/grep/neogul_coder/domain/studyapplication/controller/dto/request/ApplicationCreateRequest.java
@@ -1,7 +1,10 @@
 package grep.neogul_coder.domain.studyapplication.controller.dto.request;
 
+import grep.neogul_coder.domain.studyapplication.ApplicationStatus;
+import grep.neogul_coder.domain.studyapplication.StudyApplication;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
+import lombok.Builder;
 import lombok.Getter;
 
 @Getter
@@ -10,4 +13,22 @@ public class ApplicationCreateRequest {
     @NotBlank
     @Schema(description = "스터디 신청 지원 동기", example = "자바를 더 공부하고싶어 지원하였습니다.")
     private String applicationReason;
+
+    private ApplicationCreateRequest() {
+    }
+
+    @Builder
+    private ApplicationCreateRequest(String applicationReason) {
+        this.applicationReason = applicationReason;
+    }
+
+    public StudyApplication toEntity(Long recruitmentPostId, Long userId) {
+        return StudyApplication.builder()
+            .recruitmentPostId(recruitmentPostId)
+            .userId(userId)
+            .applicationReason(this.applicationReason)
+            .isRead(false)
+            .status(ApplicationStatus.APPLYING)
+            .build();
+    }
 }
diff --git a/src/main/java/grep/neogul_coder/domain/studyapplication/controller/dto/response/MyApplicationResponse.java b/src/main/java/grep/neogul_coder/domain/studyapplication/controller/dto/response/MyApplicationResponse.java
@@ -1,16 +1,20 @@
 package grep.neogul_coder.domain.studyapplication.controller.dto.response;
 
+import com.querydsl.core.annotations.QueryProjection;
 import grep.neogul_coder.domain.study.enums.Category;
 import grep.neogul_coder.domain.study.enums.StudyType;
 import grep.neogul_coder.domain.studyapplication.ApplicationStatus;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 
-import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 @Getter
 public class MyApplicationResponse {
 
+    @Schema(description = "신청 번호", example = "1")
+    private Long applicationId;
+
     @Schema(description = "스터디 이름", example = "자바 스터디")
     private String name;
 
@@ -24,7 +28,7 @@ public class MyApplicationResponse {
     private int currentCount;
 
     @Schema(description = "시작일", example = "2025-07-15")
-    private LocalDate startDate;
+    private LocalDateTime startDate;
 
     @Schema(description = "대표 이미지", example = "http://localhost:8083/image.jpg")
     private String imageUrl;
@@ -43,4 +47,21 @@ public class MyApplicationResponse {
 
     @Schema(description = "신청 상태", example = "PENDING")
     private ApplicationStatus status;
+
+    @QueryProjection
+    public MyApplicationResponse(Long applicationId, String name, String leaderNickname, int capacity, int currentCount, LocalDateTime startDate,
+                                  String imageUrl,String introduction, Category category, StudyType studyType, boolean isRead, ApplicationStatus status) {
+        this.applicationId = applicationId;
+        this.name = name;
+        this.leaderNickname = leaderNickname;
+        this.capacity = capacity;
+        this.currentCount = currentCount;
+        this.startDate = startDate;
+        this.imageUrl = imageUrl;
+        this.introduction = introduction;
+        this.category = category;
+        this.studyType = studyType;
+        this.isRead = isRead;
+        this.status = status;
+    }
 }
diff --git a/src/main/java/grep/neogul_coder/domain/studyapplication/exception/code/ApplicationErrorCode.java b/src/main/java/grep/neogul_coder/domain/studyapplication/exception/code/ApplicationErrorCode.java
@@ -0,0 +1,27 @@
+package grep.neogul_coder.domain.studyapplication.exception.code;
+
+import grep.neogul_coder.global.response.code.ErrorCode;
+import lombok.Getter;
+import org.springframework.http.HttpStatus;
+
+@Getter
+public enum ApplicationErrorCode implements ErrorCode {
+    APPLICATION_NOT_FOUND("SA001",HttpStatus.NOT_FOUND,"신청서를 찾을 수 없습니다."),
+
+    ALREADY_APPLICATION("SA002", HttpStatus.BAD_REQUEST, "이미 지원한 모집글입니다."),
+    APPLICATION_NOT_APPLYING("SA003", HttpStatus.BAD_REQUEST, "신청 상태가 APPLYING이 아닙니다."),
+
+    LEADER_CANNOT_APPLY("SA004", HttpStatus.BAD_REQUEST, "스터디장은 스터디를 신청할 수 없습니다."),
+    LEADER_ONLY_APPROVED("SA005", HttpStatus.BAD_REQUEST, "스터디장만 승인이 가능합니다."),
+    LEADER_ONLY_REJECTED("SA006", HttpStatus.BAD_REQUEST, "스터디장만 거절이 가능합니다.");
+
+    private final String code;
+    private final HttpStatus status;
+    private final String message;
+
+    ApplicationErrorCode(String code, HttpStatus status, String message) {
+        this.code = code;
+        this.status = status;
+        this.message = message;
+    }
+}
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
@@ -0,0 +1,51 @@
+package grep.neogul_coder.domain.studyapplication.repository;
+
+import com.querydsl.jpa.impl.JPAQueryFactory;
+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.stereotype.Repository;
+
+import java.util.List;
+
+import static grep.neogul_coder.domain.recruitment.post.QRecruitmentPost.recruitmentPost;
+import static grep.neogul_coder.domain.study.QStudy.study;
+import static grep.neogul_coder.domain.study.QStudyMember.studyMember;
+import static grep.neogul_coder.domain.study.enums.StudyMemberRole.LEADER;
+import static grep.neogul_coder.domain.studyapplication.QStudyApplication.studyApplication;
+import static grep.neogul_coder.domain.users.entity.QUser.user;
+
+@Repository
+public class ApplicationQueryRepository {
+
+    private final JPAQueryFactory queryFactory;
+
+    public ApplicationQueryRepository(EntityManager em) {
+        this.queryFactory = new JPAQueryFactory(em);
+    }
+
+    public List<MyApplicationResponse> findMyApplications(Long userId) {
+        return queryFactory
+            .select(new QMyApplicationResponse(
+                studyApplication.id,
+                study.name,
+                user.nickname,
+                study.capacity,
+                study.currentCount,
+                study.startDate,
+                study.imageUrl,
+                study.introduction,
+                study.category,
+                study.studyType,
+                studyApplication.isRead,
+                studyApplication.status
+            ))
+            .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))
+            .join(user).on(user.id.eq(studyMember.userId))
+            .where(studyApplication.userId.eq(userId))
+            .fetch();
+    }
+}
diff --git a/src/main/java/grep/neogul_coder/domain/studyapplication/repository/ApplicationRepository.java b/src/main/java/grep/neogul_coder/domain/studyapplication/repository/ApplicationRepository.java
@@ -4,7 +4,12 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
+import java.util.Optional;
 
-public interface StudyApplicationRepository extends JpaRepository<StudyApplication, Long> {
+public interface ApplicationRepository extends JpaRepository<StudyApplication, Long> {
     List<StudyApplication> findByRecruitmentPostId(Long recruitmentPostId);
+
+    boolean existsByRecruitmentPostIdAndUserId(Long recruitmentPostId, Long userId);
+
+    Optional<StudyApplication> findByIdAndActivatedTrue(Long applicationId);
 }
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
diff --git a/src/main/java/grep/neogul_coder/global/auth/entity/RefreshToken.java b/src/main/java/grep/neogul_coder/global/auth/entity/RefreshToken.java
diff --git a/src/test/java/grep/neogul_coder/domain/recruitment/post/service/RecruitmentPostServiceTest.java b/src/test/java/grep/neogul_coder/domain/recruitment/post/service/RecruitmentPostServiceTest.java
diff --git a/src/test/java/grep/neogul_coder/domain/studyapplication/service/ApplicationServiceTest.java b/src/test/java/grep/neogul_coder/domain/studyapplication/service/ApplicationServiceTest.java

Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,10 @@ public long calculateRemainSlots(long currentCount) {`
`86`	`86`	`return this.capacity - currentCount;`
`87`	`87`	`}`
`88`	`88`
	`89`	`+ public void increaseMemberCount() {`
	`90`	`+ currentCount++;`
	`91`	`+ }`
	`92`	`+`
`89`	`93`	`public void decreaseMemberCount() {`
`90`	`94`	`currentCount--;`
`91`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,14 @@ public StudyMember(Study study, Long userId, StudyMemberRole role) {`
`36`	`36`	`this.participated = false;`
`37`	`37`	`}`
`38`	`38`
	`39`	`+ public static StudyMember createMember(Study study, Long userId) {`
	`40`	`+ return StudyMember.builder()`
	`41`	`+ .study(study)`
	`42`	`+ .userId(userId)`
	`43`	`+ .role(StudyMemberRole.MEMBER)`
	`44`	`+ .build();`
	`45`	`+ }`
	`46`	`+`
`39`	`47`	`public void delete() {`
`40`	`48`	`this.activated = false;`
`41`	`49`	`}`