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

[EA3-134] feature : 시간 투표 통계 로직 구현 및 관련 예외 처리/검증 로직 정비

Author: Tokwasp

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

@@ -5,11 +5,12 @@
 import grep.neogulcoder.domain.timevote.dto.request.TimeVoteUpdateRequest;
 import grep.neogulcoder.domain.timevote.dto.response.TimeVotePeriodResponse;
 import grep.neogulcoder.domain.timevote.dto.response.TimeVoteResponse;
-import grep.neogulcoder.domain.timevote.dto.response.TimeVoteStatListResponse;
+import grep.neogulcoder.domain.timevote.dto.response.TimeVoteStatResponse;
 import grep.neogulcoder.domain.timevote.dto.response.TimeVoteSubmissionStatusResponse;
 import grep.neogulcoder.domain.timevote.entity.TimeVotePeriod;
 import grep.neogulcoder.domain.timevote.service.TimeVotePeriodService;
 import grep.neogulcoder.domain.timevote.service.TimeVoteService;
+import grep.neogulcoder.domain.timevote.service.TimeVoteStatService;
 import grep.neogulcoder.global.auth.Principal;
 import grep.neogulcoder.global.response.ApiResponse;
 import jakarta.validation.Valid;
@@ -32,7 +33,7 @@ public class TimeVoteController implements TimeVoteSpecification {
 
   private final TimeVotePeriodService timeVotePeriodService;
   private final TimeVoteService timeVoteService;
-//  private final TimeVoteStatService timeVoteStatService;
+  private final TimeVoteStatService timeVoteStatService;
 
   @PostMapping("/periods")
   public ApiResponse<TimeVotePeriodResponse> createPeriod(
@@ -92,10 +93,11 @@ public ApiResponse<List<TimeVoteSubmissionStatusResponse>> getSubmissionStatusLi
   }
 
   @GetMapping("/periods/stats")
-  public ApiResponse<TimeVoteStatListResponse> getVoteStats(
+  public ApiResponse<TimeVoteStatResponse> getVoteStats(
       @PathVariable("studyId") Long studyId,
       @AuthenticationPrincipal Principal userDetails
   ) {
-    return ApiResponse.success(new TimeVoteStatListResponse());  // mock response
+    TimeVoteStatResponse response  = timeVoteStatService.getStats(studyId, userDetails.getUserId());
+    return ApiResponse.success(response);
   }
 }

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

@@ -16,46 +16,46 @@ public interface TimeVoteSpecification {
 
   @Operation(summary = "스터디 모임 일정 투표 기간 생성", description = "팀장이 가능한 시간 요청을 생성합니다.")
   ApiResponse<TimeVotePeriodResponse> createPeriod(
-      @Parameter(description = "스터디 ID", example = "1") Long studyId,
+      @Parameter(description = "스터디 ID", example = "6") Long studyId,
       @RequestBody @Valid TimeVotePeriodCreateRequest request,
       Principal userDetails
   );
 
   @Operation(summary = "사용자가 제출한 시간 목록 조회", description = "해당 사용자가 이전에 제출한 시간대 목록을 조회합니다.")
   ApiResponse<TimeVoteResponse> getMyVotes(
-      @Parameter(description = "스터디 ID", example = "1") Long studyId,
+      @Parameter(description = "스터디 ID", example = "6") Long studyId,
       Principal userDetails
   );
 
   @Operation(summary = "사용자 가능 시간대 제출", description = "스터디 멤버가 가능 시간을 제출합니다.")
   ApiResponse<TimeVoteResponse> submitVote(
-      @Parameter(description = "스터디 ID", example = "1") Long studyId,
+      @Parameter(description = "스터디 ID", example = "6") Long studyId,
       @RequestBody @Valid TimeVoteCreateRequest request,
       Principal userDetails
   );
 
   @Operation(summary = "사용자 시간대 수정", description = "사용자가 기존에 제출한 시간을 수정합니다.")
   ApiResponse<TimeVoteResponse> updateVote(
-      @Parameter(description = "스터디 ID", example = "1") Long studyId,
+      @Parameter(description = "스터디 ID", example = "6") Long studyId,
       @RequestBody @Valid TimeVoteUpdateRequest request,
       Principal userDetails
   );
 
   @Operation(summary = "사용자 전체 시간 삭제", description = "사용자가 제출한 시간 전체를 삭제합니다.")
   ApiResponse<Void> deleteAllVotes(
-      @Parameter(description = "스터디 ID", example = "1") Long studyId,
+      @Parameter(description = "스터디 ID", example = "6") Long studyId,
       Principal userDetails
   );
 
   @Operation(summary = "투표 통계 조회", description = "투표 기간의 시간대별 통계 정보를 조회합니다.")
-  ApiResponse<TimeVoteStatListResponse> getVoteStats(
-      @Parameter(description = "스터디 ID", example = "1") Long studyId,
+  ApiResponse<TimeVoteStatResponse> getVoteStats(
+      @Parameter(description = "스터디 ID", example = "6") Long studyId,
       Principal userDetails
   );
 
   @Operation(summary = "사용자별 제출 여부 조회", description = "특정 스터디의 모든 멤버별 시간 제출 여부를 반환합니다.")
   ApiResponse<List<TimeVoteSubmissionStatusResponse>> getSubmissionStatusList(
-      @Parameter(description = "스터디 ID", example = "1") Long studyId,
+      @Parameter(description = "스터디 ID", example = "6") Long studyId,
       Principal userDetails
   );
 }

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

@@ -1,31 +1,69 @@
 package grep.neogulcoder.domain.timevote.dto.response;
 
 import grep.neogulcoder.domain.timevote.entity.TimeVoteStat;
+import grep.neogulcoder.domain.timevote.entity.TimeVotePeriod;
 import io.swagger.v3.oas.annotations.media.Schema;
-import java.time.LocalDateTime;
+import java.util.Comparator;
 import lombok.Builder;
 import lombok.Getter;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.stream.Collectors;
 
 @Getter
 @Schema(description = "스터디 모임 일정 조율 - 시간대별 통계 응답 DTO")
 public class TimeVoteStatResponse {
 
-  @Schema(description = "시간대", example = "2025-07-16T10:00:00")
-  private LocalDateTime timeSlot;
+  @Schema(description = "시작일", example = "2025-07-15")
+  private LocalDateTime startDate;
 
-  @Schema(description = "해당 시간대의 투표 수", example = "3")
-  private Long voteCount;
+  @Schema(description = "종료일", example = "2025-07-22")
+  private LocalDateTime endDate;
+
+  @Schema(
+      description = "투표 통계 리스트",
+      example = "[" +
+          "{\"timeSlot\": \"2025-07-16T10:00:00\", \"voteCount\": 3}," +
+          "{\"timeSlot\": \"2025-07-16T11:00:00\", \"voteCount\": 2}" +
+          "]"
+  )
+  private List<TimeSlotStat> stats;
 
   @Builder
-  private TimeVoteStatResponse(LocalDateTime timeSlot, Long voteCount) {
-    this.timeSlot = timeSlot;
-    this.voteCount = voteCount;
+  private TimeVoteStatResponse(LocalDateTime startDate, LocalDateTime endDate, List<TimeSlotStat> stats) {
+    this.startDate = startDate;
+    this.endDate = endDate;
+    this.stats = stats;
+  }
+
+  @Getter
+  @Schema(description = "개별 시간대별 통계 DTO")
+  public static class TimeSlotStat {
+
+    @Schema(description = "시간대", example = "2025-07-16T10:00:00")
+    private LocalDateTime timeSlot;
+
+    @Schema(description = "해당 시간대의 투표 수", example = "3")
+    private Long voteCount;
+
+    @Builder
+    public TimeSlotStat(LocalDateTime timeSlot, Long voteCount) {
+      this.timeSlot = timeSlot;
+      this.voteCount = voteCount;
+    }
   }
 
-  public static TimeVoteStatResponse from(TimeVoteStat stat) {
+  public static TimeVoteStatResponse from(TimeVotePeriod period, List<TimeVoteStat> stats) {
     return TimeVoteStatResponse.builder()
-        .timeSlot(stat.getTimeSlot())
-        .voteCount(stat.getVoteCount())
+        .startDate(period.getStartDate())
+        .endDate(period.getEndDate())
+        .stats(stats.stream()
+            .sorted(Comparator.comparing(TimeVoteStat::getTimeSlot))
+            .map(s -> TimeSlotStat.builder()
+                .timeSlot(s.getTimeSlot())
+                .voteCount(s.getVoteCount())
+                .build())
+            .collect(Collectors.toList()))
         .build();
   }
 }

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

@@ -36,4 +36,17 @@ public TimeVotePeriod(Long periodId, Long studyId, LocalDateTime startDate, Loca
     this.startDate = startDate;
     this.endDate = endDate;
   }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    TimeVotePeriod that = (TimeVotePeriod) o;
+    return periodId != null && periodId.equals(that.periodId);
+  }
+
+  @Override
+  public int hashCode() {
+    return periodId != null ? periodId.hashCode() : 0;
+  }
 }

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

@@ -9,6 +9,7 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Version;
 import java.time.LocalDateTime;
 import lombok.Builder;
 import lombok.Getter;
@@ -19,7 +20,7 @@ public class TimeVoteStat extends BaseEntity {
 
   @Id
   @GeneratedValue(strategy = GenerationType.IDENTITY)
-  private Long id;
+  private Long statId;
 
   @ManyToOne(fetch = FetchType.LAZY)
   @JoinColumn(name = "period_id", nullable = false)
@@ -31,6 +32,9 @@ public class TimeVoteStat extends BaseEntity {
   @Column(nullable = false)
   private Long voteCount;
 
+  @Version
+  private Long version;
+
   protected TimeVoteStat() {};
 
   @Builder
@@ -39,4 +43,16 @@ public TimeVoteStat(TimeVotePeriod period, LocalDateTime timeSlot, Long voteCoun
     this.timeSlot = timeSlot;
     this.voteCount = voteCount;
   }
+
+  public static TimeVoteStat of(TimeVotePeriod period, LocalDateTime timeSlot, Long voteCount) {
+    return TimeVoteStat.builder()
+        .period(period)
+        .timeSlot(timeSlot)
+        .voteCount(voteCount)
+        .build();
+  }
+
+  public void addVotes(Long countToAdd) {
+    this.voteCount += countToAdd;
+  }
 }

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

@@ -7,16 +7,30 @@
 @Getter
 public enum TimeVoteErrorCode implements ErrorCode {
 
-  FORBIDDEN_TIME_VOTE_CREATE("T001", HttpStatus.BAD_REQUEST, "모임 일정 조율 투표 생성은 스터디장만 가능합니다."),
-  STUDY_NOT_FOUND("T002", HttpStatus.NOT_FOUND, "해당 스터디를 찾을 수 없습니다."),
-  STUDY_MEMBER_NOT_FOUND("T003", HttpStatus.NOT_FOUND, "해당 스터디의 멤버가 아닙니다."),
-  TIME_VOTE_PERIOD_NOT_FOUND("T004", HttpStatus.NOT_FOUND, "해당 스터디에 대한 투표 기간이 존재하지 않습니다."),
-  INVALID_TIME_VOTE_PERIOD("T005", HttpStatus.BAD_REQUEST, "모일 일정 조율 기간은 최대 7일까지 설정할 수 있습니다."),
-  TIME_VOTE_ALREADY_SUBMITTED("T006", HttpStatus.CONFLICT, "이미 투표를 제출했습니다. PUT 요청으로 기존의 제출한 투표를 수정하세요."),
-  TIME_VOTE_OUT_OF_RANGE("T007", HttpStatus.BAD_REQUEST, "선택한 시간이 투표 기간을 벗어났습니다."),
-  TIME_VOTE_NOT_FOUND("T008", HttpStatus.BAD_REQUEST, "시간 투표 이력이 존재하지 않습니다."),
-  TIME_VOTE_STAT_CONFLICT("T009", HttpStatus.CONFLICT, "투표 통계 저장 중 충돌이 발생했습니다. 다시 시도해주세요."),
-  TIME_VOTE_THREAD_INTERRUPTED("T010", HttpStatus.INTERNAL_SERVER_ERROR, "서버 내부 스레드 오류가 발생했습니다. 다시 시도해주세요.");
+  // Access To Vote (e.g. 멤버 아님 등 접근 문제)
+  STUDY_MEMBER_NOT_FOUND("ATV_001", HttpStatus.NOT_FOUND, "해당 스터디의 멤버가 아닙니다."),
+  TIME_VOTE_PERIOD_NOT_FOUND("ATV_002", HttpStatus.NOT_FOUND, "해당 스터디에 대한 투표 기간이 존재하지 않습니다."),
+
+  // Time Vote Period (e.g. 기간 생성 관련)
+  FORBIDDEN_TIME_VOTE_CREATE("TVP_001", HttpStatus.BAD_REQUEST, "모임 일정 조율 투표 생성은 스터디장만 가능합니다."),
+  STUDY_NOT_FOUND("TVP_002", HttpStatus.NOT_FOUND, "해당 스터디를 찾을 수 없습니다."),
+  INVALID_TIME_VOTE_PERIOD("TVP_003", HttpStatus.BAD_REQUEST, "모일 일정 조율 기간은 최대 7일까지 설정할 수 있습니다."),
+  TIME_VOTE_PERIOD_START_DATE_IN_PAST("TVP_004", HttpStatus.BAD_REQUEST, "투표 시작일은 현재 시각보다 이전일 수 없습니다."),
+  TIME_VOTE_INVALID_DATE_RANGE("TVP_005", HttpStatus.BAD_REQUEST, "종료일은 시작일보다 이후여야 합니다."),
+
+  // Time Vote, Time Vote Stats (e.g. 투표 기간 관련)
+  TIME_VOTE_OUT_OF_RANGE("TVAS_001", HttpStatus.BAD_REQUEST, "선택한 시간이 투표 기간을 벗어났습니다."),
+
+  // Time Vote (e.g. 투표 제출, 수정)
+  TIME_VOTE_ALREADY_SUBMITTED("TV_001", HttpStatus.CONFLICT, "이미 투표를 제출했습니다. PUT 요청으로 기존의 제출한 투표를 수정하세요."),
+  TIME_VOTE_NOT_FOUND("TV_002", HttpStatus.BAD_REQUEST, "시간 투표 이력이 존재하지 않습니다."),
+  TIME_VOTE_DUPLICATED_TIME_SLOT("TV_003", HttpStatus.BAD_REQUEST, "중복된 시간이 포함되어 있습니다."),
+  TIME_VOTE_PERIOD_EXPIRED("TV_004", HttpStatus.BAD_REQUEST, "투표 기간이 만료되었습니다."),
+  TIME_VOTE_EMPTY("TV_005", HttpStatus.BAD_REQUEST, "한 개 이상의 시간을 선택해주세요."),
+
+  // Time Vote Stats (e.g. 통계 충돌 등)
+  TIME_VOTE_STAT_CONFLICT("TVS_001", HttpStatus.CONFLICT, "투표 통계 저장 중 충돌이 발생했습니다. 다시 시도해주세요."),
+  TIME_VOTE_THREAD_INTERRUPTED("TVS_002", HttpStatus.INTERNAL_SERVER_ERROR, "서버 내부 스레드 오류가 발생했습니다. 다시 시도해주세요.");
 
   private final String code;
   private final HttpStatus status;

src/main/java/grep/neogulcoder/domain/timevote/exception/code/TimeVoteErrorCode.java

@@ -0,0 +1,56 @@
+package grep.neogulcoder.domain.timevote.repository;
+
+import com.querydsl.core.Tuple;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import grep.neogulcoder.domain.timevote.entity.QTimeVote;
+import grep.neogulcoder.domain.timevote.entity.QTimeVoteStat;
+import grep.neogulcoder.domain.timevote.entity.TimeVotePeriod;
+import grep.neogulcoder.domain.timevote.entity.TimeVoteStat;
+import jakarta.persistence.EntityManager;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public class TimeVoteStatQueryRepository {
+
+  private final JPAQueryFactory queryFactory;
+  private final EntityManager em;
+
+  public TimeVoteStatQueryRepository(EntityManager em) {
+    this.em = em;
+    this.queryFactory = new JPAQueryFactory(em);
+  }
+
+  public List<TimeVoteStat> countStatsByPeriod(TimeVotePeriod period) {
+    QTimeVote timeVote = QTimeVote.timeVote;
+
+    List<Tuple> result = queryFactory
+        .select(timeVote.timeSlot, timeVote.count())
+        .from(timeVote)
+        .where(timeVote.period.eq(period))
+        .groupBy(timeVote.timeSlot)
+        .fetch();
+
+    return result.stream()
+        .map(tuple -> TimeVoteStat.of(period, tuple.get(timeVote.timeSlot), tuple.get(timeVote.count())))
+        .collect(Collectors.toList());
+  }
+
+  public void incrementOrInsert(TimeVotePeriod period, LocalDateTime slot, Long countToAdd) {
+    QTimeVoteStat stat = QTimeVoteStat.timeVoteStat;
+
+    TimeVoteStat existing = queryFactory
+        .selectFrom(stat)
+        .where(stat.period.eq(period), stat.timeSlot.eq(slot))
+        .fetchOne();
+
+    if (existing != null) {
+      existing.addVotes(countToAdd);
+    } else {
+      TimeVoteStat newStat = TimeVoteStat.of(period, slot, countToAdd);
+      em.persist(newStat);
+    }
+  }
+}

src/main/java/grep/neogulcoder/domain/timevote/repository/TimeVoteStatQueryRepository.java

@@ -1,9 +1,18 @@
 package grep.neogulcoder.domain.timevote.repository;
 
+import grep.neogulcoder.domain.timevote.entity.TimeVotePeriod;
 import grep.neogulcoder.domain.timevote.entity.TimeVoteStat;
+import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 public interface TimeVoteStatRepository extends JpaRepository<TimeVoteStat, Long> {
 
   void deleteAllByPeriod_StudyId(Long studyId);
+
+  void deleteByPeriod(TimeVotePeriod period);
+
+  @Query("SELECT s FROM TimeVoteStat s WHERE s.period.periodId = :periodId")
+  List<TimeVoteStat> findAllByPeriodId(@Param("periodId") Long periodId);
 }