Merge pull request #169 from prgrms-web-devcourse-final-project/feature/EA3-134-study-optimal-time-vote

[EA3-134] refactor: 스터디 모임시간 조율 전체 구조 리팩터링 및 응답/요청 구조 개선

Author: pia01190

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

@@ -1,87 +1,86 @@
 package grep.neogul_coder.domain.timevote.controller;
 
-import grep.neogul_coder.domain.timevote.dto.request.*;
-import grep.neogul_coder.domain.timevote.dto.response.*;
+import grep.neogul_coder.domain.timevote.dto.request.TimeVoteCreateRequest;
+import grep.neogul_coder.domain.timevote.dto.request.TimeVoteDeleteRequest;
+import grep.neogul_coder.domain.timevote.dto.request.TimeVotePeriodCreateRequest;
+import grep.neogul_coder.domain.timevote.dto.request.TimeVoteUpdateRequest;
+import grep.neogul_coder.domain.timevote.dto.response.TimeVotePeriodResponse;
+import grep.neogul_coder.domain.timevote.dto.response.TimeVoteResponse;
+import grep.neogul_coder.domain.timevote.dto.response.TimeVoteStatListResponse;
+import grep.neogul_coder.domain.timevote.dto.response.TimeVoteSubmissionStatusResponse;
+import grep.neogul_coder.domain.timevote.service.TimeVotePeriodService;
+import grep.neogul_coder.global.auth.Principal;
 import grep.neogul_coder.global.response.ApiResponse;
 import jakarta.validation.Valid;
+import java.util.Collections;
 import java.util.List;
-import org.springframework.web.bind.annotation.*;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 @RestController
+@RequiredArgsConstructor
 @RequestMapping("/api/studies/{studyId}/time-vote")
 public class TimeVoteController implements TimeVoteSpecification {
 
+  private final TimeVotePeriodService timeVotePeriodService;
+
   @PostMapping("/periods")
   public ApiResponse<TimeVotePeriodResponse> createPeriod(
       @PathVariable("studyId") Long studyId,
-      @RequestBody @Valid TimeVotePeriodCreateRequest request
-  ) {
-    return ApiResponse.success(new TimeVotePeriodResponse());
-  }
-
-  @GetMapping("/periods/{periodId}/stats")
-  public ApiResponse<List<TimeVoteStatResponse>> getVoteStats(
-      @PathVariable("studyId") Long studyId,
-      @PathVariable("periodId") Long periodId
+      @RequestBody @Valid TimeVotePeriodCreateRequest request,
+      @AuthenticationPrincipal Principal userDetails
   ) {
-    return ApiResponse.success(List.of(new TimeVoteStatResponse()));
+    return ApiResponse.success(new TimeVotePeriodResponse());  // mock response
   }
 
-  @PostMapping("/single")
+  @PostMapping("/votes")
   public ApiResponse<TimeVoteResponse> submitVote(
       @PathVariable("studyId") Long studyId,
-      @RequestBody @Valid TimeVoteCreateRequest request
-  ) {
-    return ApiResponse.success(new TimeVoteResponse());
-  }
-
-  @PostMapping("/bulk")
-  public ApiResponse<List<TimeVoteResponse>> submitVotes(
-      @PathVariable("studyId") Long studyId,
-      @RequestBody @Valid TimeVoteBulkCreateRequest request
+      @RequestBody @Valid TimeVoteCreateRequest request,
+      @AuthenticationPrincipal Principal userDetails
   ) {
-    return ApiResponse.success(List.of(new TimeVoteResponse()));
+    return ApiResponse.success(new TimeVoteResponse());  // mock response
   }
 
-  @PutMapping("/single")
+  @PutMapping("/votes")
   public ApiResponse<TimeVoteResponse> updateVote(
       @PathVariable("studyId") Long studyId,
-      @RequestBody @Valid TimeVoteUpdateRequest request
-  ) {
-    return ApiResponse.success(new TimeVoteResponse());
-  }
-
-  @PutMapping("/bulk")
-  public ApiResponse<List<TimeVoteResponse>> updateVotes(
-      @PathVariable("studyId") Long studyId,
-      @RequestBody @Valid TimeVoteBulkUpdateRequest request
+      @RequestBody @Valid TimeVoteUpdateRequest request,
+      @AuthenticationPrincipal Principal userDetails
   ) {
-    return ApiResponse.success(List.of(new TimeVoteResponse()));
+    return ApiResponse.success(new TimeVoteResponse());  // mock response
   }
 
-
-  @DeleteMapping("/single")
-  public ApiResponse<Void> deleteVotes(
+  @DeleteMapping("/votes")
+  public ApiResponse<Void> deleteAllVotes(
       @PathVariable("studyId") Long studyId,
-      @RequestBody @Valid TimeVoteDeleteRequest request
+      @RequestBody @Valid TimeVoteDeleteRequest request,
+      @AuthenticationPrincipal Principal userDetails
   ) {
-    return ApiResponse.noContent();
+    return ApiResponse.noContent();  // mock response
   }
 
-  @DeleteMapping("/bulk")
-  public ApiResponse<Void> deleteMultipleVotes(
+  @GetMapping("/periods/stats")
+  public ApiResponse<TimeVoteStatListResponse> getVoteStats(
       @PathVariable("studyId") Long studyId,
-      @RequestBody @Valid TimeVoteBulkDeleteRequest request
+      @AuthenticationPrincipal Principal userDetails
   ) {
-    return ApiResponse.noContent();
+    return ApiResponse.success(new TimeVoteStatListResponse());  // mock response
   }
 
-  @DeleteMapping("/all")
-  public ApiResponse<Void> deleteAllVotes(
+  @GetMapping("/periods/submissions")
+  public ApiResponse<List<TimeVoteSubmissionStatusResponse>> getSubmissionStatusList(
       @PathVariable("studyId") Long studyId,
-      @RequestParam("periodId") Long periodId,
-      @RequestParam("studyMemberId") Long studyMemberId
+      @AuthenticationPrincipal Principal userDetails
   ) {
-    return ApiResponse.noContent();
+    return ApiResponse.success(Collections.emptyList());  // mock response
   }
 }

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

@@ -2,6 +2,7 @@
 
 import grep.neogul_coder.domain.timevote.dto.request.*;
 import grep.neogul_coder.domain.timevote.dto.response.*;
+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.Parameter;
@@ -10,61 +11,46 @@
 import java.util.List;
 import org.springframework.web.bind.annotation.RequestBody;
 
-@Tag(name = "Time-Vote", description = "스터디 모임 최적 시간 조율 API")
+@Tag(name = "Time-Vote", description = "스터디 모임 시간 조율 API")
 public interface TimeVoteSpecification {
 
-  @Operation(summary = "최적 시간 투표 기간 생성", description = "팀장이 가능한 시간 요청을 생성합니다.")
+  @Operation(summary = "스터디 모임 일정 투표 기간 생성", description = "팀장이 가능한 시간 요청을 생성합니다.")
   ApiResponse<TimeVotePeriodResponse> createPeriod(
       @Parameter(description = "스터디 ID", example = "1") Long studyId,
-      @RequestBody @Valid TimeVotePeriodCreateRequest request
+      @RequestBody @Valid TimeVotePeriodCreateRequest request,
+      Principal userDetails
   );
 
-  @Operation(summary = "사용자 특정 가능 시간대 제출", description = "스터디 멤버가 단일 가능 시간을 제출합니다.")
+  @Operation(summary = "사용자 가능 시간대 제출", description = "스터디 멤버가 가능 시간을 제출합니다.")
   ApiResponse<TimeVoteResponse> submitVote(
       @Parameter(description = "스터디 ID", example = "1") Long studyId,
-      @RequestBody @Valid TimeVoteCreateRequest request
+      @RequestBody @Valid TimeVoteCreateRequest request,
+      Principal userDetails
   );
 
-  @Operation(summary = "사용자 여러 가능 시간대 제출", description = "스터디 멤버가 여러 가능 시간을 제출합니다.")
-  ApiResponse<List<TimeVoteResponse>> submitVotes(
-      @Parameter(description = "스터디 ID", example = "1") Long studyId,
-      @RequestBody @Valid TimeVoteBulkCreateRequest request
-  );
-
-  @Operation(summary = "사용자 특정 시간대 수정", description = "사용자가 기존 제출한 시간 중 하나를 수정합니다.")
+  @Operation(summary = "사용자 시간대 수정", description = "사용자가 기존에 제출한 시간을 수정합니다.")
   ApiResponse<TimeVoteResponse> updateVote(
-      @Parameter(description = "스터디 ID") Long studyId,
-      @RequestBody @Valid TimeVoteUpdateRequest request
-  );
-
-  @Operation(summary = "사용자 여러 시간대 수정", description = "사용자가 제출한 여러 시간대를 수정합니다.")
-  ApiResponse<List<TimeVoteResponse>> updateVotes(
-      @Parameter(description = "스터디 ID") Long studyId,
-      @RequestBody @Valid TimeVoteBulkUpdateRequest request
-  );
-
-  @Operation(summary = "사용자 특정 시간대 삭제", description = "사용자가 특정 시간대만 삭제합니다.")
-  ApiResponse<Void> deleteVotes(
-      @Parameter(description = "스터디 ID") Long studyId,
-      @RequestBody @Valid TimeVoteDeleteRequest request
-  );
-
-  @Operation(summary = "사용자 여러 시간대 삭제", description = "사용자가 선택한 여러 시간대를 삭제합니다.")
-  ApiResponse<Void> deleteMultipleVotes(
-      @Parameter(description = "스터디 ID") Long studyId,
-      @RequestBody @Valid TimeVoteBulkDeleteRequest request
+      @Parameter(description = "스터디 ID", example = "1") Long studyId,
+      @RequestBody @Valid TimeVoteUpdateRequest request,
+      Principal userDetails
   );
 
   @Operation(summary = "사용자 전체 시간 삭제", description = "사용자가 제출한 시간 전체를 삭제합니다.")
   ApiResponse<Void> deleteAllVotes(
-      @Parameter(description = "스터디 ID") Long studyId,
-      @Parameter(description = "투표 기간 ID") Long periodId,
-      @Parameter(description = "스터디 멤버 ID") Long studyMemberId
+      @Parameter(description = "스터디 ID", example = "1") Long studyId,
+      @RequestBody @Valid TimeVoteDeleteRequest request,
+      Principal userDetails
+  );
+
+  @Operation(summary = "투표 통계 조회", description = "투표 기간의 시간대별 통계 정보를 조회합니다.")
+  ApiResponse<TimeVoteStatListResponse> getVoteStats(
+      @Parameter(description = "스터디 ID", example = "1") Long studyId,
+      Principal userDetails
   );
 
-  @Operation(summary = "투표 통계 조회", description = "특정 투표 기간의 시간대별 통계 정보를 조회합니다.")
-  ApiResponse<List<TimeVoteStatResponse>> getVoteStats(
+  @Operation(summary = "사용자별 제출 여부 조회", description = "특정 스터디의 모든 멤버별 시간 제출 여부를 반환합니다.")
+  ApiResponse<List<TimeVoteSubmissionStatusResponse>> getSubmissionStatusList(
       @Parameter(description = "스터디 ID", example = "1") Long studyId,
-      @Parameter(description = "투표 기간 ID", example = "5") Long periodId
+      Principal userDetails
   );
 }

src/main/java/grep/neogul_coder/domain/timevote/dto/request/TimeVoteBulkCreateRequest.java

@@ -1,27 +1,30 @@
 package grep.neogul_coder.domain.timevote.dto.request;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import java.time.LocalDateTime;
+import java.util.List;
+import lombok.Builder;
 import lombok.Getter;
 
 @Getter
-@Schema(description = "스터디 모임 일정 조율 - 단일 가능 시간 제출 요청 DTO")
+@Schema(description = "스터디 모임 일정 조율 - 가능 시간 제출 요청 DTO")
 public class TimeVoteCreateRequest {
 
-  @NotNull
-  @Schema(description = "기간 ID", example = "5")
-  private Long periodId;
-
   @NotNull
   @Schema(description = "스터디 멤버 ID", example = "12")
   private Long studyMemberId;
 
-  @NotNull
-  @Schema(description = "시작 시간", example = "2025-07-16T10:00:00")
-  private LocalDateTime startTime;
+  @NotEmpty
+  @Schema(description = "시간대 리스트", example = "[2025-07-15T10:00:00, 2025-07-15T11:00:00]")
+  private List<LocalDateTime> timeSlots;
 
-  @NotNull
-  @Schema(description = "종료 시간", example = "2025-07-16T13:00:00")
-  private LocalDateTime endTime;
+  private TimeVoteCreateRequest() {}
+
+  @Builder
+  private TimeVoteCreateRequest(Long studyMemberId, List<LocalDateTime> timeSlots) {
+    this.studyMemberId = studyMemberId;
+    this.timeSlots = timeSlots;
+  }
 }