Merge pull request #59 from Sportize/feat/join-match-message

angoroa · web-flow · commit b3a3917c2469 · 2026-02-28T22:35:33.000+09:00
✨ Feat: 동호회 가입 신청서 작성 기능 추가 및 신청 조회 API 개선
diff --git a/src/main/java/com/be/sportizebe/domain/notification/controller/JoinClubRequestController.java b/src/main/java/com/be/sportizebe/domain/notification/controller/JoinClubRequestController.java
@@ -1,16 +1,20 @@
 package com.be.sportizebe.domain.notification.controller;
 
+import com.be.sportizebe.domain.notification.dto.request.JoinClubApplicationRequest;
 import com.be.sportizebe.domain.notification.dto.response.JoinClubRequestResponse;
+import com.be.sportizebe.domain.notification.dto.response.JoinClubRequestSummaryResponse;
 import com.be.sportizebe.domain.notification.service.JoinClubRequestService;
 import com.be.sportizebe.global.cache.dto.UserAuthInfo;
 import com.be.sportizebe.global.response.BaseResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -27,12 +31,22 @@ public class JoinClubRequestController {
   @Operation(summary = "가입 신청", description = "동호회에 가입을 신청합니다. 동호회장에게 알림이 전송됩니다.")
   public ResponseEntity<BaseResponse<JoinClubRequestResponse>> requestJoin(
       @Parameter(description = "동호회 ID") @PathVariable Long clubId,
+      @Valid @RequestBody JoinClubApplicationRequest request,
       @AuthenticationPrincipal UserAuthInfo userAuthInfo) {
-    JoinClubRequestResponse response = joinClubRequestService.requestJoin(clubId, userAuthInfo.getId());
+    JoinClubRequestResponse response = joinClubRequestService.requestJoin(clubId, userAuthInfo.getId(), request.message());
     return ResponseEntity.status(HttpStatus.CREATED)
         .body(BaseResponse.success("가입 신청 완료", response));
   }
 
+  @GetMapping("/join-requests/{requestId}")
+  @Operation(summary = "가입 신청 단건 조회", description = "가입 신청 상세 정보를 조회합니다. 동호회장 또는 신청자 본인만 가능합니다.")
+  public ResponseEntity<BaseResponse<JoinClubRequestResponse>> getJoinRequest(
+      @Parameter(description = "가입 신청 ID") @PathVariable Long requestId,
+      @AuthenticationPrincipal UserAuthInfo userAuthInfo) {
+    JoinClubRequestResponse response = joinClubRequestService.getJoinRequest(requestId, userAuthInfo.getId());
+    return ResponseEntity.ok(BaseResponse.success("가입 신청 조회 성공", response));
+  }
+
   @DeleteMapping("/join-requests/{requestId}")
   @Operation(summary = "가입 신청 취소", description = "본인의 가입 신청을 취소합니다.")
   public ResponseEntity<BaseResponse<Void>> cancelRequest(
@@ -62,10 +76,10 @@ public ResponseEntity<BaseResponse<JoinClubRequestResponse>> rejectRequest(
 
   @GetMapping("/{clubId}/join-requests")
   @Operation(summary = "대기 중인 가입 신청 목록", description = "동호회의 대기 중인 가입 신청 목록을 조회합니다. 동호회장만 가능합니다.")
-  public ResponseEntity<BaseResponse<List<JoinClubRequestResponse>>> getPendingRequests(
+  public ResponseEntity<BaseResponse<List<JoinClubRequestSummaryResponse>>> getPendingRequests(
       @Parameter(description = "동호회 ID") @PathVariable Long clubId,
       @AuthenticationPrincipal UserAuthInfo userAuthInfo) {
-    List<JoinClubRequestResponse> response = joinClubRequestService.getPendingRequests(clubId, userAuthInfo.getId());
+    List<JoinClubRequestSummaryResponse> response = joinClubRequestService.getPendingRequests(clubId, userAuthInfo.getId());
     return ResponseEntity.ok(BaseResponse.success("가입 신청 목록 조회 성공", response));
   }
 
diff --git a/src/main/java/com/be/sportizebe/domain/notification/dto/request/JoinClubApplicationRequest.java b/src/main/java/com/be/sportizebe/domain/notification/dto/request/JoinClubApplicationRequest.java
@@ -0,0 +1,14 @@
+package com.be.sportizebe.domain.notification.dto.request;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+
+@Schema(title = "JoinClubApplicationRequest DTO", description = "가입 신청 요청")
+public record JoinClubApplicationRequest(
+    @NotBlank(message = "가입 신청서를 작성해주세요.")
+    @Schema(description = "가입 신청서", example = "안녕하세요! 열심히 활동하겠습니다.")
+    @Size(max = 200, message = "최대 200자 이하로 작성해주세요.")
+    String message
+) {
+}
diff --git a/src/main/java/com/be/sportizebe/domain/notification/dto/response/JoinClubRequestResponse.java b/src/main/java/com/be/sportizebe/domain/notification/dto/response/JoinClubRequestResponse.java
@@ -12,9 +12,11 @@ public record JoinClubRequestResponse(
     @Schema(description = "가입 신청 ID") Long id,
     @Schema(description = "신청자 ID") Long userId,
     @Schema(description = "신청자 닉네임") String userNickname,
+    @Schema(description = "신청자 한줄 소개") String userIntroduce,
     @Schema(description = "신청자 프로필 이미지") String userProfileImage,
     @Schema(description = "동호회 ID") Long clubId,
     @Schema(description = "동호회 이름") String clubName,
+    @Schema(description = "가입 신청서") String message,
     @Schema(description = "신청 상태") JoinClubRequest.JoinClubRequestStatus status,
     @Schema(description = "신청 일시") LocalDateTime createdAt
 ) {
@@ -23,9 +25,11 @@ public static JoinClubRequestResponse from(JoinClubRequest request) {
         .id(request.getId())
         .userId(request.getUser().getId())
         .userNickname(request.getUser().getNickname())
+        .userIntroduce(request.getUser().getIntroduce())
         .userProfileImage(request.getUser().getProfileImage())
         .clubId(request.getClub().getId())
         .clubName(request.getClub().getName())
+        .message(request.getMessage())
         .status(request.getStatus())
         .createdAt(request.getCreatedAt())
         .build();
diff --git a/src/main/java/com/be/sportizebe/domain/notification/dto/response/JoinClubRequestSummaryResponse.java b/src/main/java/com/be/sportizebe/domain/notification/dto/response/JoinClubRequestSummaryResponse.java
@@ -0,0 +1,25 @@
+package com.be.sportizebe.domain.notification.dto.response;
+
+import com.be.sportizebe.domain.notification.entity.JoinClubRequest;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Builder;
+
+@Builder
+@Schema(title = "JoinClubRequestSummaryResponse DTO", description = "가입 신청 목록 응답 (요약)")
+public record JoinClubRequestSummaryResponse(
+    @Schema(description = "가입 신청 ID") Long id,
+    @Schema(description = "신청자 ID") Long userId,
+    @Schema(description = "신청자 닉네임") String userNickname,
+    @Schema(description = "동호회 ID") Long clubId,
+    @Schema(description = "동호회 이름") String clubName
+) {
+  public static JoinClubRequestSummaryResponse from(JoinClubRequest request) {
+    return JoinClubRequestSummaryResponse.builder()
+        .id(request.getId())
+        .userId(request.getUser().getId())
+        .userNickname(request.getUser().getNickname())
+        .clubId(request.getClub().getId())
+        .clubName(request.getClub().getName())
+        .build();
+  }
+}
diff --git a/src/main/java/com/be/sportizebe/domain/notification/entity/JoinClubRequest.java b/src/main/java/com/be/sportizebe/domain/notification/entity/JoinClubRequest.java
@@ -37,6 +37,9 @@ public enum JoinClubRequestStatus {
   @JoinColumn(name = "club_id", nullable = false)
   private Club club; // 가입 신청 대상 동호회
 
+  @Column(nullable = false, columnDefinition = "TEXT")
+  private String message; // 가입 신청서
+
   @Enumerated(EnumType.STRING)
   @Column(nullable = false)
   @Builder.Default
diff --git a/src/main/java/com/be/sportizebe/domain/notification/service/JoinClubRequestService.java b/src/main/java/com/be/sportizebe/domain/notification/service/JoinClubRequestService.java
@@ -1,13 +1,17 @@
 package com.be.sportizebe.domain.notification.service;
 
 import com.be.sportizebe.domain.notification.dto.response.JoinClubRequestResponse;
+import com.be.sportizebe.domain.notification.dto.response.JoinClubRequestSummaryResponse;
 
 import java.util.List;
 
 public interface JoinClubRequestService {
 
   // 가입 신청
-  JoinClubRequestResponse requestJoin(Long clubId, Long userId);
+  JoinClubRequestResponse requestJoin(Long clubId, Long userId, String message);
+
+  // 가입 신청 단건 조회 (동호회장 또는 신청자 본인)
+  JoinClubRequestResponse getJoinRequest(Long requestId, Long userId);
 
   // 가입 신청 취소
   void cancelRequest(Long requestId, Long userId);
@@ -19,7 +23,7 @@ public interface JoinClubRequestService {
   JoinClubRequestResponse rejectRequest(Long requestId, Long leaderId);
 
   // 동호회의 대기 중인 가입 신청 목록 조회 (동호회장만)
-  List<JoinClubRequestResponse> getPendingRequests(Long clubId, Long leaderId);
+  List<JoinClubRequestSummaryResponse> getPendingRequests(Long clubId, Long leaderId);
 
   // 내 가입 신청 목록 조회
   List<JoinClubRequestResponse> getMyRequests(Long userId);
diff --git a/src/main/java/com/be/sportizebe/domain/notification/service/JoinClubRequestServiceImpl.java b/src/main/java/com/be/sportizebe/domain/notification/service/JoinClubRequestServiceImpl.java
@@ -6,6 +6,7 @@
 import com.be.sportizebe.domain.club.repository.ClubMemberRepository;
 import com.be.sportizebe.domain.club.repository.ClubRepository;
 import com.be.sportizebe.domain.notification.dto.response.JoinClubRequestResponse;
+import com.be.sportizebe.domain.notification.dto.response.JoinClubRequestSummaryResponse;
 import com.be.sportizebe.domain.notification.entity.JoinClubRequest;
 import com.be.sportizebe.domain.notification.exception.JoinClubRequestErrorCode;
 import com.be.sportizebe.domain.notification.repository.JoinClubRequestRepository;
@@ -34,7 +35,7 @@ public class JoinClubRequestServiceImpl implements JoinClubRequestService {
 
   @Override
   @Transactional
-  public JoinClubRequestResponse requestJoin(Long clubId, Long userId) {
+  public JoinClubRequestResponse requestJoin(Long clubId, Long userId, String message) {
     User user = findUserById(userId);
     Club club = findClubById(clubId);
 
@@ -62,6 +63,7 @@ public JoinClubRequestResponse requestJoin(Long clubId, Long userId) {
     JoinClubRequest joinRequest = JoinClubRequest.builder()
         .user(user)
         .club(club)
+        .message(message)
         .build();
     joinClubRequestRepository.save(joinRequest);
 
@@ -75,6 +77,20 @@ public JoinClubRequestResponse requestJoin(Long clubId, Long userId) {
     return JoinClubRequestResponse.from(joinRequest);
   }
 
+  @Override
+  public JoinClubRequestResponse getJoinRequest(Long requestId, Long userId) {
+    JoinClubRequest request = findRequestById(requestId);
+
+    // 동호회장 또는 신청자 본인만 조회 가능
+    boolean isLeader = request.getClub().isLeader(userId);
+    boolean isApplicant = userId.equals(request.getUser().getId());
+    if (!isLeader && !isApplicant) {
+      throw new CustomException(ClubErrorCode.CLUB_UPDATE_DENIED);
+    }
+
+    return JoinClubRequestResponse.from(request);
+  }
+
   @Override
   @Transactional
   public void cancelRequest(Long requestId, Long userId) {
@@ -160,7 +176,7 @@ public JoinClubRequestResponse rejectRequest(Long requestId, Long leaderId) {
   }
 
   @Override
-  public List<JoinClubRequestResponse> getPendingRequests(Long clubId, Long leaderId) {
+  public List<JoinClubRequestSummaryResponse> getPendingRequests(Long clubId, Long leaderId) {
     Club club = findClubById(clubId);
 
     // 동호회장만 조회 가능
@@ -171,7 +187,7 @@ public List<JoinClubRequestResponse> getPendingRequests(Long clubId, Long leader
     return joinClubRequestRepository
         .findByClubAndStatus(club, JoinClubRequest.JoinClubRequestStatus.PENDING)
         .stream()
-        .map(JoinClubRequestResponse::from)
+        .map(JoinClubRequestSummaryResponse::from)
         .toList();
   }
 
diff --git a/src/main/resources b/src/main/resources
@@ -1 +1 @@
-Subproject commit 05d0469d24d5c627fe5a94af9f6a7e797be874e6
+Subproject commit b0b5acaeef6cc2e32624b2f407d152dc2f5b5d4b
