Merge pull request #260 from prgrms-web-devcourse-final-project/refactor/EA3-183-time-vote

[EA3-183] refactor : 모임 일정 조율 관련 검증 로직 및 예외 응답 구조 리팩토링 (강사 피드백 반영)

Author: endorsement0912

src/main/java/grep/neogulcoder/domain/timevote/TimeVote.java

@@ -31,7 +31,7 @@ public class TimeVote extends BaseEntity {
   @Column(nullable = false)
   private LocalDateTime timeSlot;
 
-  protected TimeVote() {};
+  protected TimeVote() {}
 
   @Builder
   public TimeVote(TimeVotePeriod period, Long studyMemberId, LocalDateTime timeSlot) {

src/main/java/grep/neogulcoder/domain/timevote/TimeVotePeriod.java

@@ -30,8 +30,7 @@ public class TimeVotePeriod extends BaseEntity {
   protected TimeVotePeriod() {}
 
   @Builder
-  public TimeVotePeriod(Long periodId, Long studyId, LocalDateTime startDate, LocalDateTime endDate) {
-    this.periodId = periodId;
+  public TimeVotePeriod(Long studyId, LocalDateTime startDate, LocalDateTime endDate) {
     this.studyId = studyId;
     this.startDate = startDate;
     this.endDate = endDate;

src/main/java/grep/neogulcoder/domain/timevote/TimeVoteStat.java

@@ -13,7 +13,9 @@
 import java.time.LocalDateTime;
 import lombok.Builder;
 import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
 
+@Slf4j
 @Getter
 @Entity
 public class TimeVoteStat extends BaseEntity {
@@ -36,7 +38,7 @@ public class TimeVoteStat extends BaseEntity {
   @Column(nullable = false)
   private Long version;
 
-  protected TimeVoteStat() {};
+  protected TimeVoteStat() {}
 
   @Builder
   public TimeVoteStat(TimeVotePeriod period, LocalDateTime timeSlot, Long voteCount, Long version) {
@@ -56,6 +58,7 @@ public static TimeVoteStat of(TimeVotePeriod period, LocalDateTime timeSlot, Lon
   }
 
   public void addVotes(Long countToAdd) {
+    log.debug("addVotes: 이전 voteCount={}, 추가 count={}, 이전 version={}", this.voteCount, countToAdd, this.version);
     this.voteCount += countToAdd;
   }
 }

src/main/java/grep/neogulcoder/domain/timevote/context/TimeVoteContext.java

@@ -0,0 +1,9 @@
+package grep.neogulcoder.domain.timevote.context;
+
+import grep.neogulcoder.domain.study.StudyMember;
+import grep.neogulcoder.domain.timevote.TimeVotePeriod;
+
+public record TimeVoteContext(
+    StudyMember studyMember,
+    TimeVotePeriod period
+) {}

src/main/java/grep/neogulcoder/domain/timevote/controller/TimeVoteController.java

@@ -7,14 +7,16 @@
 import grep.neogulcoder.domain.timevote.dto.response.TimeVoteResponse;
 import grep.neogulcoder.domain.timevote.dto.response.TimeVoteStatResponse;
 import grep.neogulcoder.domain.timevote.dto.response.TimeVoteSubmissionStatusResponse;
-import grep.neogulcoder.domain.timevote.service.TimeVotePeriodService;
-import grep.neogulcoder.domain.timevote.service.TimeVoteService;
-import grep.neogulcoder.domain.timevote.service.TimeVoteStatService;
+import grep.neogulcoder.domain.timevote.service.period.TimeVotePeriodService;
+import grep.neogulcoder.domain.timevote.service.stat.TimeVoteStatService;
+import grep.neogulcoder.domain.timevote.service.vote.TimeVoteService;
 import grep.neogulcoder.global.auth.Principal;
 import grep.neogulcoder.global.response.ApiResponse;
 import jakarta.validation.Valid;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -35,68 +37,74 @@ public class TimeVoteController implements TimeVoteSpecification {
   private final TimeVoteStatService timeVoteStatService;
 
   @PostMapping("/periods")
-  public ApiResponse<TimeVotePeriodResponse> createPeriod(
+  public ResponseEntity<ApiResponse<TimeVotePeriodResponse>> createPeriod(
       @PathVariable("studyId") Long studyId,
       @RequestBody @Valid TimeVotePeriodCreateRequest request,
       @AuthenticationPrincipal Principal userDetails
   ) {
-    TimeVotePeriodResponse response = timeVotePeriodService.createTimeVotePeriodAndReturn(request, studyId, userDetails.getUserId());
-    return ApiResponse.success(response);
+    TimeVotePeriodResponse response = timeVotePeriodService.createTimeVotePeriodAndReturn(
+        request, studyId, userDetails.getUserId()
+    );
+    return ResponseEntity.status(HttpStatus.CREATED).body(ApiResponse.success(response));
   }
 
   @GetMapping("/votes")
-  public ApiResponse<TimeVoteResponse> getMyVotes(
+  public ResponseEntity<ApiResponse<TimeVoteResponse>> getMyVotes(
       @PathVariable("studyId") Long studyId,
       @AuthenticationPrincipal Principal userDetails
   ) {
     TimeVoteResponse response = timeVoteService.getMyVotes(studyId, userDetails.getUserId());
-    return ApiResponse.success(response);
+    return ResponseEntity.ok(ApiResponse.success(response));
   }
 
   @PostMapping("/votes")
-  public ApiResponse<TimeVoteResponse> submitVote(
+  public ResponseEntity<ApiResponse<TimeVoteResponse>> submitVote(
       @PathVariable("studyId") Long studyId,
       @RequestBody @Valid TimeVoteCreateRequest request,
       @AuthenticationPrincipal Principal userDetails
   ) {
-    TimeVoteResponse response = timeVoteService.submitVotes(request, studyId, userDetails.getUserId());
-    return ApiResponse.success(response);
+    TimeVoteResponse response = timeVoteService.submitVotes(request, studyId,
+        userDetails.getUserId());
+    return ResponseEntity.status(HttpStatus.CREATED).body(ApiResponse.success(response));
   }
 
   @PutMapping("/votes")
-  public ApiResponse<TimeVoteResponse> updateVote(
+  public ResponseEntity<ApiResponse<TimeVoteResponse>> updateVote(
       @PathVariable("studyId") Long studyId,
       @RequestBody @Valid TimeVoteUpdateRequest request,
       @AuthenticationPrincipal Principal userDetails
   ) {
-    TimeVoteResponse response = timeVoteService.updateVotes(request, studyId, userDetails.getUserId());
-    return ApiResponse.success(response);
+    TimeVoteResponse response = timeVoteService.updateVotes(request, studyId,
+        userDetails.getUserId());
+    return ResponseEntity.ok(ApiResponse.success(response));
   }
 
   @DeleteMapping("/votes")
-  public ApiResponse<Void> deleteAllVotes(
+  public ResponseEntity<ApiResponse<Void>> deleteAllVotes(
       @PathVariable("studyId") Long studyId,
       @AuthenticationPrincipal Principal userDetails
   ) {
     timeVoteService.deleteAllVotes(studyId, userDetails.getUserId());
-    return ApiResponse.success("성공적으로 투표를 삭제했습니다.");
+    return ResponseEntity.ok(ApiResponse.success("성공적으로 투표를 삭제했습니다."));
   }
 
   @GetMapping("/periods/submissions")
-  public ApiResponse<List<TimeVoteSubmissionStatusResponse>> getSubmissionStatusList(
+  public ResponseEntity<ApiResponse<List<TimeVoteSubmissionStatusResponse>>> getSubmissionStatusList(
       @PathVariable("studyId") Long studyId,
       @AuthenticationPrincipal Principal userDetails
   ) {
-    List<TimeVoteSubmissionStatusResponse> statuses = timeVoteService.getSubmissionStatusList(studyId, userDetails.getUserId());
-    return ApiResponse.success(statuses);
+    List<TimeVoteSubmissionStatusResponse> statuses = timeVoteService.getSubmissionStatusList(
+        studyId, userDetails.getUserId()
+    );
+    return ResponseEntity.ok(ApiResponse.success(statuses));
   }
 
   @GetMapping("/periods/stats")
-  public ApiResponse<TimeVoteStatResponse> getVoteStats(
+  public ResponseEntity<ApiResponse<TimeVoteStatResponse>> getVoteStats(
       @PathVariable("studyId") Long studyId,
       @AuthenticationPrincipal Principal userDetails
   ) {
-    TimeVoteStatResponse response  = timeVoteStatService.getStats(studyId, userDetails.getUserId());
-    return ApiResponse.success(response);
+    TimeVoteStatResponse response = timeVoteStatService.getStats(studyId, userDetails.getUserId());
+    return ResponseEntity.ok(ApiResponse.success(response));
   }
 }

src/main/java/grep/neogulcoder/domain/timevote/controller/TimeVoteSpecification.java

@@ -9,52 +9,53 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import java.util.List;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestBody;
 
 @Tag(name = "Time-Vote", description = "스터디 모임 시간 조율 API")
 public interface TimeVoteSpecification {
 
   @Operation(summary = "스터디 모임 일정 투표 기간 생성", description = "팀장이 가능한 시간 요청을 생성합니다.")
-  ApiResponse<TimeVotePeriodResponse> createPeriod(
+  ResponseEntity<ApiResponse<TimeVotePeriodResponse>> createPeriod(
       @Parameter(description = "스터디 ID", example = "6") Long studyId,
       @RequestBody @Valid TimeVotePeriodCreateRequest request,
       Principal userDetails
   );
 
   @Operation(summary = "사용자가 제출한 시간 목록 조회", description = "해당 사용자가 이전에 제출한 시간대 목록을 조회합니다.")
-  ApiResponse<TimeVoteResponse> getMyVotes(
+  ResponseEntity<ApiResponse<TimeVoteResponse>> getMyVotes(
       @Parameter(description = "스터디 ID", example = "6") Long studyId,
       Principal userDetails
   );
 
   @Operation(summary = "사용자 가능 시간대 제출", description = "스터디 멤버가 가능 시간을 제출합니다.")
-  ApiResponse<TimeVoteResponse> submitVote(
+  ResponseEntity<ApiResponse<TimeVoteResponse>> submitVote(
       @Parameter(description = "스터디 ID", example = "6") Long studyId,
       @RequestBody @Valid TimeVoteCreateRequest request,
       Principal userDetails
   );
 
   @Operation(summary = "사용자 시간대 수정", description = "사용자가 기존에 제출한 시간을 수정합니다.")
-  ApiResponse<TimeVoteResponse> updateVote(
+  ResponseEntity<ApiResponse<TimeVoteResponse>> updateVote(
       @Parameter(description = "스터디 ID", example = "6") Long studyId,
       @RequestBody @Valid TimeVoteUpdateRequest request,
       Principal userDetails
   );
 
   @Operation(summary = "사용자 전체 시간 삭제", description = "사용자가 제출한 시간 전체를 삭제합니다.")
-  ApiResponse<Void> deleteAllVotes(
+  ResponseEntity<ApiResponse<Void>> deleteAllVotes(
       @Parameter(description = "스터디 ID", example = "6") Long studyId,
       Principal userDetails
   );
 
   @Operation(summary = "투표 통계 조회", description = "투표 기간의 시간대별 통계 정보를 조회합니다.")
-  ApiResponse<TimeVoteStatResponse> getVoteStats(
+  ResponseEntity<ApiResponse<TimeVoteStatResponse>> getVoteStats(
       @Parameter(description = "스터디 ID", example = "6") Long studyId,
       Principal userDetails
   );
 
   @Operation(summary = "사용자별 제출 여부 조회", description = "특정 스터디의 모든 멤버별 시간 제출 여부를 반환합니다.")
-  ApiResponse<List<TimeVoteSubmissionStatusResponse>> getSubmissionStatusList(
+  ResponseEntity<ApiResponse<List<TimeVoteSubmissionStatusResponse>>> getSubmissionStatusList(
       @Parameter(description = "스터디 ID", example = "6") Long studyId,
       Principal userDetails
   );

src/main/java/grep/neogulcoder/domain/timevote/dto/request/TimeVoteCreateRequest.java

@@ -1,20 +1,17 @@
 package grep.neogulcoder.domain.timevote.dto.request;
 
-import grep.neogulcoder.domain.timevote.TimeVote;
-import grep.neogulcoder.domain.timevote.TimeVotePeriod;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotEmpty;
 import java.time.LocalDateTime;
 import java.util.List;
-import java.util.stream.Collectors;
 import lombok.Builder;
 import lombok.Getter;
 
 @Getter
 @Schema(description = "스터디 모임 일정 조율 - 가능 시간 제출 요청 DTO")
 public class TimeVoteCreateRequest {
 
-  @NotEmpty
+  @NotEmpty(message = "시간대를 1개 이상 선택해주세요.")
   @Schema(
       description = "시간대 리스트",
       example = "[\"2025-07-25T10:00:00\", \"2025-07-26T11:00:00\"]"
@@ -27,14 +24,4 @@ private TimeVoteCreateRequest() {}
   private TimeVoteCreateRequest(List<LocalDateTime> timeSlots) {
     this.timeSlots = timeSlots;
   }
-
-  public List<TimeVote> toEntities(TimeVotePeriod period, Long studyMemberId) {
-    return timeSlots.stream()
-        .map(slot -> TimeVote.builder()
-            .period(period)
-            .studyMemberId(studyMemberId)
-            .timeSlot(slot)
-            .build())
-        .collect(Collectors.toList());
-  }
 }

src/main/java/grep/neogulcoder/domain/timevote/dto/request/TimeVotePeriodCreateRequest.java

@@ -1,6 +1,5 @@
 package grep.neogulcoder.domain.timevote.dto.request;
 
-import grep.neogulcoder.domain.timevote.TimeVotePeriod;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
 import java.time.LocalDateTime;
@@ -11,11 +10,11 @@
 @Schema(description = "스터디 모임 일정 조율 - 팀장이 가능 시간 요청을 생성할 때 사용하는 요청 DTO")
 public class TimeVotePeriodCreateRequest {
 
-  @NotNull
+  @NotNull(message = "시작일은 필수입니다.")
   @Schema(description = "시작일", example = "2025-07-25T00:00:00")
   private LocalDateTime startDate;
 
-  @NotNull
+  @NotNull(message = "종료일은 필수입니다.")
   @Schema(description = "종료일", example = "2025-07-30T23:59:59")
   private LocalDateTime endDate;
 
@@ -26,16 +25,4 @@ private TimeVotePeriodCreateRequest(LocalDateTime startDate, LocalDateTime endDa
     this.startDate = startDate;
     this.endDate = endDate;
   }
-
-  public TimeVotePeriod toEntity(Long studyId, LocalDateTime adjustedEndDate) {
-    return TimeVotePeriod.builder()
-        .startDate(this.startDate)
-        .endDate(adjustedEndDate)
-        .studyId(studyId)
-        .build();
-  }
-
-  public static TimeVotePeriodCreateRequest of(LocalDateTime startDate, LocalDateTime endDate) {
-    return new TimeVotePeriodCreateRequest(startDate, endDate);
-  }
 }

src/main/java/grep/neogulcoder/domain/timevote/dto/request/TimeVoteUpdateRequest.java

@@ -1,20 +1,17 @@
 package grep.neogulcoder.domain.timevote.dto.request;
 
-import grep.neogulcoder.domain.timevote.TimeVote;
-import grep.neogulcoder.domain.timevote.TimeVotePeriod;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotEmpty;
 import java.time.LocalDateTime;
 import java.util.List;
-import java.util.stream.Collectors;
 import lombok.Builder;
 import lombok.Getter;
 
 @Getter
 @Schema(description = "스터디 모임 일정 조율 - 가능 시간 수정 요청 DTO")
 public class TimeVoteUpdateRequest {
 
-  @NotEmpty
+  @NotEmpty(message = "시간대를 1개 이상 선택해주세요.")
   @Schema(
       description = "시간대 리스트",
       example = "[\"2025-07-27T10:00:00\", \"2025-07-28T11:00:00\"]"
@@ -27,14 +24,4 @@ private TimeVoteUpdateRequest() {}
   private TimeVoteUpdateRequest( List<LocalDateTime> timeSlots) {
     this.timeSlots = timeSlots;
   }
-
-  public List<TimeVote> toEntities(TimeVotePeriod period, Long studyMemberId) {
-    return timeSlots.stream()
-        .map(slot -> TimeVote.builder()
-            .period(period)
-            .studyMemberId(studyMemberId)
-            .timeSlot(slot)
-            .build())
-        .collect(Collectors.toList());
-  }
 }

src/main/java/grep/neogulcoder/domain/timevote/dto/response/TimeVotePeriodResponse.java

@@ -34,4 +34,3 @@ public static TimeVotePeriodResponse from(TimeVotePeriod timeVotePeriod) {
         .build();
   }
 }
-