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

dbrkdgus00 · web-flow · commit 1588bd70110b · 2025-07-25T12:25:51.000+09:00
[EA3-134] fix: TimeVoteStat 저장 시 version=null 방지를 위한 flush 및 기본값 설정 + 투표 기간 생성시 마지막날 23:59:59로 자동 보정되게 수정
diff --git a/src/main/java/grep/neogulcoder/domain/timevote/controller/TimeVoteController.java b/src/main/java/grep/neogulcoder/domain/timevote/controller/TimeVoteController.java
@@ -41,8 +41,8 @@ public ApiResponse<TimeVotePeriodResponse> createPeriod(
       @RequestBody @Valid TimeVotePeriodCreateRequest request,
       @AuthenticationPrincipal Principal userDetails
   ) {
-    TimeVotePeriod saved = timeVotePeriodService.createTimeVotePeriodAndReturn(request, studyId, userDetails.getUserId());
-    return ApiResponse.success(TimeVotePeriodResponse.from(saved));
+    TimeVotePeriodResponse response = timeVotePeriodService.createTimeVotePeriodAndReturn(request, studyId, userDetails.getUserId());
+    return ApiResponse.success(response);
   }
 
   @GetMapping("/votes")
diff --git a/src/main/java/grep/neogulcoder/domain/timevote/dto/request/TimeVotePeriodCreateRequest.java b/src/main/java/grep/neogulcoder/domain/timevote/dto/request/TimeVotePeriodCreateRequest.java
@@ -27,11 +27,15 @@ private TimeVotePeriodCreateRequest(LocalDateTime startDate, LocalDateTime endDa
     this.endDate = endDate;
   }
 
-  public TimeVotePeriod toEntity(Long studyId) {
+  public TimeVotePeriod toEntity(Long studyId, LocalDateTime adjustedEndDate) {
     return TimeVotePeriod.builder()
         .startDate(this.startDate)
-        .endDate(this.endDate)
+        .endDate(adjustedEndDate)
         .studyId(studyId)
         .build();
   }
+
+  public static TimeVotePeriodCreateRequest of(LocalDateTime startDate, LocalDateTime endDate) {
+    return new TimeVotePeriodCreateRequest(startDate, endDate);
+  }
 }
diff --git a/src/main/java/grep/neogulcoder/domain/timevote/entity/TimeVoteStat.java b/src/main/java/grep/neogulcoder/domain/timevote/entity/TimeVoteStat.java
@@ -33,22 +33,25 @@ public class TimeVoteStat extends BaseEntity {
   private Long voteCount;
 
   @Version
+  @Column(nullable = false)
   private Long version;
 
   protected TimeVoteStat() {};
 
   @Builder
-  public TimeVoteStat(TimeVotePeriod period, LocalDateTime timeSlot, Long voteCount) {
+  public TimeVoteStat(TimeVotePeriod period, LocalDateTime timeSlot, Long voteCount, Long version) {
     this.period = period;
     this.timeSlot = timeSlot;
     this.voteCount = voteCount;
+    this.version = version;
   }
 
   public static TimeVoteStat of(TimeVotePeriod period, LocalDateTime timeSlot, Long voteCount) {
     return TimeVoteStat.builder()
         .period(period)
         .timeSlot(timeSlot)
         .voteCount(voteCount)
+        .version(0L)
         .build();
   }
 
diff --git a/src/main/java/grep/neogulcoder/domain/timevote/repository/TimeVoteStatQueryRepository.java b/src/main/java/grep/neogulcoder/domain/timevote/repository/TimeVoteStatQueryRepository.java
@@ -51,6 +51,7 @@ public void incrementOrInsert(TimeVotePeriod period, LocalDateTime slot, Long co
     } else {
       TimeVoteStat newStat = TimeVoteStat.of(period, slot, countToAdd);
       em.persist(newStat);
+      em.flush();
     }
   }
 }
diff --git a/src/main/java/grep/neogulcoder/domain/timevote/service/TimeVotePeriodService.java b/src/main/java/grep/neogulcoder/domain/timevote/service/TimeVotePeriodService.java
@@ -8,12 +8,14 @@
 import grep.neogulcoder.domain.study.repository.StudyMemberRepository;
 import grep.neogulcoder.domain.study.repository.StudyRepository;
 import grep.neogulcoder.domain.timevote.dto.request.TimeVotePeriodCreateRequest;
+import grep.neogulcoder.domain.timevote.dto.response.TimeVotePeriodResponse;
 import grep.neogulcoder.domain.timevote.entity.TimeVotePeriod;
 import grep.neogulcoder.domain.timevote.repository.TimeVotePeriodRepository;
 import grep.neogulcoder.domain.timevote.repository.TimeVoteRepository;
 import grep.neogulcoder.domain.timevote.repository.TimeVoteStatRepository;
 import grep.neogulcoder.global.exception.business.BusinessException;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.time.temporal.ChronoUnit;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -25,38 +27,45 @@
 public class TimeVotePeriodService {
 
   private final TimeVotePeriodRepository timeVotePeriodRepository;
-  private final StudyRepository studyRepository;
   private final TimeVoteRepository timeVoteRepository;
   private final TimeVoteStatRepository timeVoteStatRepository;
+  private final StudyRepository studyRepository;
   private final StudyMemberRepository studyMemberRepository;
 
-  public TimeVotePeriod createTimeVotePeriodAndReturn(TimeVotePeriodCreateRequest request, Long studyId, Long userId) {
+  public TimeVotePeriodResponse createTimeVotePeriodAndReturn(TimeVotePeriodCreateRequest request, Long studyId, Long userId) {
     StudyMember studyMember = getValidStudyMember(studyId, userId);
     validateStudyLeader(studyMember);
 
     validateStartDateNotPast(request.getStartDate());
     validatePeriodRange(request.getStartDate(), request.getEndDate());
     validateMaxPeriod(request.getStartDate(), request.getEndDate());
 
+    LocalDateTime adjustedEndDate = adjustEndDate(request.getEndDate());
+
     if (timeVotePeriodRepository.existsByStudyId(studyId)) {
       deleteAllTimeVoteDate(studyId);
     }
 
-    TimeVotePeriod savedPeriod = timeVotePeriodRepository.save(request.toEntity(studyId));
+    TimeVotePeriod savedPeriod = timeVotePeriodRepository.save(request.toEntity(studyId, adjustedEndDate));
 
-    return savedPeriod;
+    return TimeVotePeriodResponse.from(savedPeriod);
   }
 
   public void deleteAllTimeVoteDate(Long studyId) {
-    Study study = studyRepository.findById(studyId)
-        .orElseThrow(() -> new BusinessException(STUDY_NOT_FOUND));
+    getValidStudy(studyId);
 
     timeVoteRepository.deleteAllByPeriod_StudyId(studyId);
     timeVoteStatRepository.deleteAllByPeriod_StudyId(studyId);
     timeVotePeriodRepository.deleteAllByStudyId(studyId);
   }
 
   // ================================= 검증 로직 ================================
+  // 주어진 ID의 스터디가 존재하는지 검증 (존재하지 않으면 예외 발생)
+  private Study getValidStudy(Long studyId) {
+    return studyRepository.findById(studyId)
+        .orElseThrow(() -> new BusinessException(STUDY_NOT_FOUND));
+  }
+
   // 유효한 스터디 멤버인지 확인 (활성화된 멤버만 허용)
   private StudyMember getValidStudyMember(Long studyId, Long userId) {
     return studyMemberRepository.findByStudyIdAndUserIdAndActivatedTrue(studyId, userId)
@@ -79,6 +88,11 @@ private void validateMaxPeriod(LocalDateTime startDate, LocalDateTime endDate) {
     }
   }
 
+  // 투표 기간 종료일을 마지막 날 23:59:59로 보정
+  private LocalDateTime adjustEndDate(LocalDateTime endDate) {
+    return endDate.with(LocalTime.of(23, 59, 59));
+  }
+
   // 시작일이 종료일보다 늦은 비정상적인 입력 방지
   private void validatePeriodRange(LocalDateTime startDate, LocalDateTime endDate) {
     if (startDate.isAfter(endDate)) {
diff --git a/src/main/java/grep/neogulcoder/domain/timevote/service/TimeVoteService.java b/src/main/java/grep/neogulcoder/domain/timevote/service/TimeVoteService.java
@@ -15,6 +15,7 @@
 import grep.neogulcoder.domain.timevote.repository.TimeVoteQueryRepository;
 import grep.neogulcoder.global.exception.business.BusinessException;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -119,7 +120,8 @@ private TimeVotePeriod getValidTimeVotePeriod(Long studyId) {
   // 각 투표 시간이 투표 기간 내에 포함되는지 확인
   private void validateVoteWithinPeriod(TimeVotePeriod period, List<LocalDateTime> dateTimes) {
     for (LocalDateTime dateTime : dateTimes) {
-      if (dateTime.isBefore(period.getStartDate()) || dateTime.isAfter(period.getEndDate())) {
+      if (dateTime.isBefore(period.getStartDate()) || dateTime.isAfter(period.getEndDate().with(
+          LocalTime.of(23, 59, 59)))) {
         throw new BusinessException(TIME_VOTE_OUT_OF_RANGE);
       }
     }
diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql
@@ -65,7 +65,7 @@ INSERT INTO team_calendar (study_id, user_id, calendar_id, activated) VALUES (1,
 INSERT INTO team_calendar (study_id, user_id, calendar_id, activated) VALUES (3, 3, 4, TRUE);
 INSERT INTO team_calendar (study_id, user_id, calendar_id, activated) VALUES (4, 4, 5, TRUE);
 
-INSERT INTO time_vote_period (study_id, start_date, end_date, activated) VALUES (6, '2025-07-25 00:00:00', '2025-07-30 00:00:00', TRUE);
+INSERT INTO time_vote_period (study_id, start_date, end_date, activated) VALUES (6, '2025-07-25 00:00:00', '2025-07-30 23:59:59', TRUE);
 
 -- 2025-07-25 10:00:00 - 2명
 INSERT INTO time_vote (period_id, study_member_id, time_slot, activated) VALUES (1, 6, '2025-07-25 10:00:00', TRUE);

Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,15 @@ private TimeVotePeriodCreateRequest(LocalDateTime startDate, LocalDateTime endDa`
`27`	`27`	`this.endDate = endDate;`
`28`	`28`	`}`
`29`	`29`
`30`		`- public TimeVotePeriod toEntity(Long studyId) {`
	`30`	`+ public TimeVotePeriod toEntity(Long studyId, LocalDateTime adjustedEndDate) {`
`31`	`31`	`return TimeVotePeriod.builder()`
`32`	`32`	`.startDate(this.startDate)`
`33`		`- .endDate(this.endDate)`
	`33`	`+ .endDate(adjustedEndDate)`
`34`	`34`	`.studyId(studyId)`
`35`	`35`	`.build();`
`36`	`36`	`}`
	`37`	`+`
	`38`	`+ public static TimeVotePeriodCreateRequest of(LocalDateTime startDate, LocalDateTime endDate) {`
	`39`	`+ return new TimeVotePeriodCreateRequest(startDate, endDate);`
	`40`	`+ }`
`37`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ public void incrementOrInsert(TimeVotePeriod period, LocalDateTime slot, Long co`
`51`	`51`	`} else {`
`52`	`52`	`TimeVoteStat newStat = TimeVoteStat.of(period, slot, countToAdd);`
`53`	`53`	`em.persist(newStat);`
	`54`	`+ em.flush();`
`54`	`55`	`}`
`55`	`56`	`}`
`56`	`57`	`}`