Merge pull request #330 from prgrms-web-devcourse-final-project/refactor/timevote

endorsement0912 · web-flow · commit 149e6902a536 · 2025-11-20T19:54:59.000+09:00
refactor : 최적 시간 투표 API를 비트마스크 포맷으로 리팩터링
diff --git a/src/main/java/grep/neogulcoder/domain/timevote/dto/request/TimeVoteCreateRequest.java b/src/main/java/grep/neogulcoder/domain/timevote/dto/request/TimeVoteCreateRequest.java
@@ -7,21 +7,30 @@
 import lombok.Builder;
 import lombok.Getter;
 
+import static grep.neogulcoder.domain.timevote.provider.TimeSlotBitmaskConverter.expand;
+
 @Getter
 @Schema(description = "스터디 모임 일정 조율 - 가능 시간 제출 요청 DTO")
 public class TimeVoteCreateRequest {
 
-  @NotEmpty(message = "시간대를 1개 이상 선택해주세요.")
+  @NotEmpty(message = "시간대는 최소 한 개 이상의 일자 정보를 포함해야 합니다.")
   @Schema(
-      description = "시간대 리스트",
-      example = "[\"2025-07-25T10:00:00\", \"2025-07-26T11:00:00\"]"
+      description = "일자별 시간 bitmask 리스트 (LSB=0시, 1시간 단위)",
+      example = "[" +
+          "{\"date\": \"2025-08-11\", \"timeMask\": 10}," +
+          "{\"date\": \"2025-08-12\", \"timeMask\": 384}" +
+          "]"
   )
-  private List<LocalDateTime> timeSlots;
+  private List<TimeVoteDateMaskRequest> timeMasks;
 
   private TimeVoteCreateRequest() {}
 
   @Builder
-  private TimeVoteCreateRequest(List<LocalDateTime> timeSlots) {
-    this.timeSlots = timeSlots;
+  private TimeVoteCreateRequest(List<TimeVoteDateMaskRequest> timeMasks) {
+    this.timeMasks = timeMasks;
+  }
+
+  public List<LocalDateTime> toTimeSlots() {
+    return expand(timeMasks);
   }
 }
diff --git a/src/main/java/grep/neogulcoder/domain/timevote/dto/request/TimeVoteDateMaskRequest.java b/src/main/java/grep/neogulcoder/domain/timevote/dto/request/TimeVoteDateMaskRequest.java
@@ -0,0 +1,32 @@
+package grep.neogulcoder.domain.timevote.dto.request;
+
+import java.time.LocalDate;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Schema(description = "단일 일자에 대한 시간대 비트마스크 DTO")
+public class TimeVoteDateMaskRequest {
+
+  @NotNull(message = "날짜는 비어 있을 수 없습니다.")
+  @Schema(description = "투표 일자", example = "2025-08-11")
+  private LocalDate date;
+
+  @NotNull(message = "시간 비트마스크는 비어 있을 수 없습니다.")
+  @Schema(
+      description = "시간 비트마스크 (LSB=0시, 1시간 단위, 10진수 표현)",
+      example = "1024"
+  )
+  private Long timeMask;
+
+  @Builder
+  private TimeVoteDateMaskRequest(LocalDate date, Long timeMask) {
+    this.date = date;
+    this.timeMask = timeMask;
+  }
+}
diff --git a/src/main/java/grep/neogulcoder/domain/timevote/dto/request/TimeVoteUpdateRequest.java b/src/main/java/grep/neogulcoder/domain/timevote/dto/request/TimeVoteUpdateRequest.java
@@ -7,21 +7,30 @@
 import lombok.Builder;
 import lombok.Getter;
 
+import static grep.neogulcoder.domain.timevote.provider.TimeSlotBitmaskConverter.expand;
+
 @Getter
 @Schema(description = "스터디 모임 일정 조율 - 가능 시간 수정 요청 DTO")
 public class TimeVoteUpdateRequest {
 
-  @NotEmpty(message = "시간대를 1개 이상 선택해주세요.")
+  @NotEmpty(message = "시간대는 최소 한 개 이상의 일자 정보를 포함해야 합니다.")
   @Schema(
-      description = "시간대 리스트",
-      example = "[\"2025-07-27T10:00:00\", \"2025-07-28T11:00:00\"]"
+      description = "일자별 시간 비트마스크 리스트 (LSB=0시, 1시간 단위)",
+      example = "[" +
+          "{\"date\": \"2025-08-11\", \"timeMask\": 10}," +
+          "{\"date\": \"2025-08-12\", \"timeMask\": 384}" +
+          "]"
   )
-  private List<LocalDateTime> timeSlots;
+  private List<TimeVoteDateMaskRequest> timeMasks;
 
   private TimeVoteUpdateRequest() {}
 
   @Builder
-  private TimeVoteUpdateRequest( List<LocalDateTime> timeSlots) {
-    this.timeSlots = timeSlots;
+  private TimeVoteUpdateRequest(List<TimeVoteDateMaskRequest> timeMasks) {
+    this.timeMasks = timeMasks;
+  }
+
+  public List<LocalDateTime> toTimeSlots() {
+    return expand(timeMasks);
   }
 }
diff --git a/src/main/java/grep/neogulcoder/domain/timevote/dto/response/TimeVoteResponse.java b/src/main/java/grep/neogulcoder/domain/timevote/dto/response/TimeVoteResponse.java
@@ -1,9 +1,13 @@
 package grep.neogulcoder.domain.timevote.dto.response;
 
+import static grep.neogulcoder.domain.timevote.provider.TimeSlotBitmaskConverter.compress;
+
 import grep.neogulcoder.domain.timevote.TimeVote;
 import io.swagger.v3.oas.annotations.media.Schema;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 import lombok.Builder;
 import lombok.Getter;
@@ -16,25 +20,35 @@ public class TimeVoteResponse {
   private Long studyMemberId;
 
   @Schema(
-      description = "시간대 리스트",
-      example = "[\"2025-07-26T10:00:00\", \"2025-07-26T11:00:00\", \"2025-07-26T13:00:00\", \"2025-07-28T11:00:00\"]"
+      description = "사용자가 제출한 개별 시간대 리스트",
+      example = "[\"2025-07-26T10:00:00\", \"2025-07-26T11:00:00\"]"
   )
   private List<LocalDateTime> timeSlots;
 
+  @Schema(
+      description = "일자별 시간 비트마스크 (LSB=0시, 1시간 단위)",
+      example = "{\"2025-07-26\": 3, \"2025-07-27\": 384}"
+  )
+  private Map<LocalDate, Long> timeMasks;
+
   @Builder
-  private TimeVoteResponse(Long studyMemberId, List<LocalDateTime> timeSlots) {
+  private TimeVoteResponse(Long studyMemberId, List<LocalDateTime> timeSlots, Map<LocalDate, Long> timeMasks) {
     this.studyMemberId = studyMemberId;
     this.timeSlots = timeSlots;
+    this.timeMasks = timeMasks;
   }
 
   public static TimeVoteResponse from(Long studyMemberId, List<TimeVote> votes) {
     List<LocalDateTime> timeSlots = votes.stream()
         .map(TimeVote::getTimeSlot)
         .collect(Collectors.toList());
 
+    Map<LocalDate, Long> timeMasks = compress(votes);
+
     return TimeVoteResponse.builder()
         .studyMemberId(studyMemberId)
         .timeSlots(timeSlots)
+        .timeMasks(timeMasks)
         .build();
   }
 }
diff --git a/src/main/java/grep/neogulcoder/domain/timevote/exception/code/TimeVoteErrorCode.java b/src/main/java/grep/neogulcoder/domain/timevote/exception/code/TimeVoteErrorCode.java
@@ -28,6 +28,7 @@ public enum TimeVoteErrorCode implements ErrorCode {
   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_INVALID_TIME_MASK("TV_006", HttpStatus.BAD_REQUEST, "시간 비트마스크 값이 유효하지 않습니다."),
 
   // Time Vote Stats (e.g. 통계 충돌 등)
   TIME_VOTE_STAT_CONFLICT("TVS_001", HttpStatus.CONFLICT, "투표 통계 저장 중 오류가 발생했습니다. 잠시 후 다시 시도해주세요."),
diff --git a/src/main/java/grep/neogulcoder/domain/timevote/provider/TimeSlotBitmaskConverter.java b/src/main/java/grep/neogulcoder/domain/timevote/provider/TimeSlotBitmaskConverter.java
@@ -0,0 +1,80 @@
+package grep.neogulcoder.domain.timevote.provider;
+
+import static grep.neogulcoder.domain.timevote.exception.code.TimeVoteErrorCode.TIME_VOTE_INVALID_TIME_MASK;
+
+import grep.neogulcoder.domain.timevote.TimeVote;
+import grep.neogulcoder.domain.timevote.dto.request.TimeVoteDateMaskRequest;
+import grep.neogulcoder.global.exception.business.BusinessException;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+public final class TimeSlotBitmaskConverter {
+
+  private static final int HOURS_PER_DAY = 24;
+  private static final long VALID_MASK_RANGE = (1L << HOURS_PER_DAY) - 1;
+
+  private TimeSlotBitmaskConverter() {}
+
+  // 비트마스크 형식의 시간 정보를 개별 LocalDateTime 리스트로 확장
+  public static List<LocalDateTime> expand(List<TimeVoteDateMaskRequest> masks) {
+    if (masks == null || masks.isEmpty()) {
+      return Collections.emptyList();
+    }
+
+    List<LocalDateTime> timeSlots = new ArrayList<>();
+
+    for (TimeVoteDateMaskRequest request : masks) {
+      if (request.getDate() == null || request.getTimeMask() == null) {
+        throw new BusinessException(TIME_VOTE_INVALID_TIME_MASK);
+      }
+
+      long mask = request.getTimeMask();
+      validateMask(mask);
+
+      LocalDate date = request.getDate();
+      for (int hour = 0; hour < HOURS_PER_DAY; hour++) {
+        if ((mask & (1L << hour)) != 0) {
+          timeSlots.add(date.atTime(hour, 0));
+        }
+      }
+    }
+
+    Collections.sort(timeSlots);
+    return timeSlots;
+  }
+
+  // 개별 TimeVote 객체 리스트를 날짜별 비트마스크로 압축
+  public static Map<LocalDate, Long> compress(List<TimeVote> votes) {
+    if (votes == null || votes.isEmpty()) {
+      return Collections.emptyMap();
+    }
+
+    Map<LocalDate, Long> compressed = new TreeMap<>();
+
+    for (TimeVote vote : votes) {
+      LocalDateTime timeSlot = vote.getTimeSlot();
+      LocalDate date = timeSlot.toLocalDate();
+      int hour = timeSlot.getHour();
+
+      if (hour < 0 || hour >= HOURS_PER_DAY) {
+        throw new BusinessException(TIME_VOTE_INVALID_TIME_MASK);
+      }
+
+      long bit = 1L << hour;
+      compressed.merge(date, bit, (prev, curr) -> prev | curr);
+    }
+
+    return compressed;
+  }
+
+  private static void validateMask(long mask) {
+    if (mask < 0 || (mask & ~VALID_MASK_RANGE) != 0) {
+      throw new BusinessException(TIME_VOTE_INVALID_TIME_MASK);
+    }
+  }
+}
diff --git a/src/main/java/grep/neogulcoder/domain/timevote/repository/TimeVoteRepository.java b/src/main/java/grep/neogulcoder/domain/timevote/repository/TimeVoteRepository.java
@@ -11,7 +11,13 @@
 public interface TimeVoteRepository extends JpaRepository<TimeVote, Long> {
 
   @Modifying(clearAutomatically = true)
-  @Query("UPDATE TimeVote v SET v.activated = false WHERE v.period.studyId = :studyId")
+  @Query(
+      value =
+          "UPDATE time_vote tv "
+              + "JOIN time_vote_period p ON p.period_id = tv.period_id "
+              + "SET tv.activated = false "
+              + "WHERE p.study_id = :studyId",
+      nativeQuery = true)
   void deactivateAllByPeriod_StudyId(@Param("studyId") Long studyId);
 
   List<TimeVote> findByPeriodAndStudyMemberIdAndActivatedTrue(TimeVotePeriod period, Long studyMemberId);
diff --git a/src/main/java/grep/neogulcoder/domain/timevote/repository/TimeVoteStatRepository.java b/src/main/java/grep/neogulcoder/domain/timevote/repository/TimeVoteStatRepository.java
@@ -12,7 +12,13 @@
 public interface TimeVoteStatRepository extends JpaRepository<TimeVoteStat, Long> {
 
   @Modifying
-  @Query("UPDATE TimeVoteStat s SET s.activated = false WHERE s.period.studyId = :studyId")
+  @Query(
+      value =
+          "UPDATE time_vote_stat tvs "
+              + "JOIN time_vote_period p ON p.period_id = tvs.period_id "
+              + "SET tvs.activated = false "
+              + "WHERE p.study_id = :studyId",
+      nativeQuery = true)
   void deactivateAllByPeriod_StudyId(@Param("studyId") Long studyId);
 
   @Modifying
diff --git a/src/main/java/grep/neogulcoder/domain/timevote/service/TimeVoteMapper.java b/src/main/java/grep/neogulcoder/domain/timevote/service/TimeVoteMapper.java
@@ -1,8 +1,6 @@
 package grep.neogulcoder.domain.timevote.service;
 
-import grep.neogulcoder.domain.timevote.dto.request.TimeVoteCreateRequest;
 import grep.neogulcoder.domain.timevote.dto.request.TimeVotePeriodCreateRequest;
-import grep.neogulcoder.domain.timevote.dto.request.TimeVoteUpdateRequest;
 import grep.neogulcoder.domain.timevote.TimeVote;
 import grep.neogulcoder.domain.timevote.TimeVotePeriod;
 import java.time.LocalDateTime;
@@ -23,26 +21,6 @@ public TimeVotePeriod toEntity(TimeVotePeriodCreateRequest request, Long studyId
         .build();
   }
 
-  public List<TimeVote> toEntities(TimeVoteCreateRequest request, TimeVotePeriod period, Long studyMemberId) {
-    return request.getTimeSlots().stream()
-        .map(slot -> TimeVote.builder()
-            .period(period)
-            .studyMemberId(studyMemberId)
-            .timeSlot(slot)
-            .build())
-        .collect(Collectors.toList());
-  }
-
-  public List<TimeVote> toEntities(TimeVoteUpdateRequest request, TimeVotePeriod period, Long studyMemberId) {
-    return request.getTimeSlots().stream()
-        .map(slot -> TimeVote.builder()
-            .period(period)
-            .studyMemberId(studyMemberId)
-            .timeSlot(slot)
-            .build())
-        .collect(Collectors.toList());
-  }
-
   public List<TimeVote> toEntities(List<LocalDateTime> timeSlots, TimeVotePeriod period, Long studyMemberId) {
     return timeSlots.stream()
         .map(slot -> TimeVote.builder()
diff --git a/src/main/java/grep/neogulcoder/domain/timevote/service/vote/TimeVoteService.java b/src/main/java/grep/neogulcoder/domain/timevote/service/vote/TimeVoteService.java
@@ -45,13 +45,15 @@ public TimeVoteResponse getMyVotes(Long studyId, Long userId) {
   }
 
   public TimeVoteResponse submitVotes(TimeVoteCreateRequest request, Long studyId, Long userId) {
-    TimeVoteContext context = timeVoteValidator.getSubmitContext(studyId, userId, request.getTimeSlots());
-    return executeVoteSubmission(context, request.getTimeSlots());
+    List<LocalDateTime> timeSlots = request.toTimeSlots();
+    TimeVoteContext context = timeVoteValidator.getSubmitContext(studyId, userId, timeSlots);
+    return executeVoteSubmission(context, timeSlots);
   }
 
   public TimeVoteResponse updateVotes(TimeVoteUpdateRequest request, Long studyId, Long userId) {
-    TimeVoteContext context = timeVoteValidator.getUpdateContext(studyId, userId, request.getTimeSlots());
-    return executeVoteSubmission(context, request.getTimeSlots());
+    List<LocalDateTime> timeSlots = request.toTimeSlots();
+    TimeVoteContext context = timeVoteValidator.getUpdateContext(studyId, userId, timeSlots);
+    return executeVoteSubmission(context, timeSlots);
   }
 
   public void deleteAllVotes(Long studyId, Long userId) {
diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql
@@ -6,3 +6,12 @@ CREATE UNIQUE INDEX uq_time_vote_stat_period_slot ON time_vote_stat (period_id,
 -- 사용자 기준 삭제 성능 향상을 위해 추가
 -- getSubmissionStatusList() 쿼리의 성능 최적화 목적
 CREATE INDEX idx_time_vote_period_member ON time_vote (period_id, study_member_id);
+
+-- 스터디별 활성화된 투표 기간 조회/삭제 최적화
+CREATE INDEX idx_time_vote_period_study_activated ON time_vote_period (study_id, activated);
+
+-- 기간/활성화 상태 기준의 투표 데이터 조회/삭제 최적화
+CREATE INDEX idx_time_vote_period_activated ON time_vote (period_id, activated);
+
+-- 기간/활성화 상태 기준의 통계 조회/삭제 최적화
+CREATE INDEX idx_time_vote_stat_period_activated ON time_vote_stat (period_id, activated);

Original file line number	Diff line number	Diff line change
`@@ -45,13 +45,15 @@ public TimeVoteResponse getMyVotes(Long studyId, Long userId) {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`public TimeVoteResponse submitVotes(TimeVoteCreateRequest request, Long studyId, Long userId) {`
`48`		`- TimeVoteContext context = timeVoteValidator.getSubmitContext(studyId, userId, request.getTimeSlots());`
`49`		`- return executeVoteSubmission(context, request.getTimeSlots());`
	`48`	`+ List<LocalDateTime> timeSlots = request.toTimeSlots();`
	`49`	`+ TimeVoteContext context = timeVoteValidator.getSubmitContext(studyId, userId, timeSlots);`
	`50`	`+ return executeVoteSubmission(context, timeSlots);`
`50`	`51`	`}`
`51`	`52`
`52`	`53`	`public TimeVoteResponse updateVotes(TimeVoteUpdateRequest request, Long studyId, Long userId) {`
`53`		`- TimeVoteContext context = timeVoteValidator.getUpdateContext(studyId, userId, request.getTimeSlots());`
`54`		`- return executeVoteSubmission(context, request.getTimeSlots());`
	`54`	`+ List<LocalDateTime> timeSlots = request.toTimeSlots();`
	`55`	`+ TimeVoteContext context = timeVoteValidator.getUpdateContext(studyId, userId, timeSlots);`
	`56`	`+ return executeVoteSubmission(context, timeSlots);`
`55`	`57`	`}`
`56`	`58`
`57`	`59`	`public void deleteAllVotes(Long studyId, Long userId) {`