[CHORE]: develop 브랜치 최신 변경사항 main 반영

src/main/java/com/eatsfine/eatsfine/domain/booking/repository/BookingRepository.java

@@ -2,6 +2,7 @@
 
 import com.eatsfine.eatsfine.domain.booking.entity.Booking;
 import com.eatsfine.eatsfine.domain.booking.enums.BookingStatus;
+import com.eatsfine.eatsfine.domain.store.entity.Store;
 import com.eatsfine.eatsfine.domain.user.entity.User;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -78,4 +79,54 @@ List<Booking> findActiveBookingsByTableAndDate(
      * @return 만료된 예약 리스트
      */
     List<Booking> findAllByStatusAndCreatedAtBefore(BookingStatus status, LocalDateTime threshold);
+
+
+    /**
+     * 특정 식당의 브레이크 타임과 겹치는 가장 늦은 예약 날짜를 조회합니다.
+     * @param adjustedBreakStart 브레이크 시작 시간에서 식당의 예약 간격(bookingIntervalMinutes)을 뺀 시간
+     */
+    @Query("select max(b.bookingDate) from Booking b " +
+            "where b.store.id = :storeId " +
+            "and b.status IN (com.eatsfine.eatsfine.domain.booking.enums.BookingStatus.CONFIRMED, com.eatsfine.eatsfine.domain.booking.enums.BookingStatus.PENDING) " +
+            "and b.bookingDate >= CURRENT_DATE " +
+            "and (" +
+            "   (b.bookingTime >= :breakStart and b.bookingTime < :breakEnd) " + // 1. 브레이크 타임 내 시작
+            "   OR " +
+            "   (:adjustedBreakStart < :breakStart and b.bookingTime >= :adjustedBreakStart and b.bookingTime < :breakStart) " + // 2. 일반적인 경우 (낮)
+            "   OR " +
+            "   (:adjustedBreakStart > :breakStart and (b.bookingTime >= :adjustedBreakStart or b.bookingTime < :breakStart)) " + // 3. 자정 넘어가는 경우 (밤)
+            ")"
+    )
+    Optional<LocalDate> findLastConflictingDate(
+            @Param("storeId") Long storeId,
+            @Param("breakStart") LocalTime breakStart,
+            @Param("breakEnd") LocalTime breakEnd,
+            @Param("adjustedBreakStart") LocalTime adjustedBreakStart
+    );
+
+    @Query("SELECT DISTINCT bt.storeTable.id FROM BookingTable bt " +
+            "JOIN bt.booking b " +
+            "WHERE bt.storeTable.id IN :tableIds " +
+            "AND (b.bookingDate > :currentDate " +
+            "     OR (b.bookingDate = :currentDate AND b.bookingTime >= :currentTime)) " +
+            "AND b.status IN ('CONFIRMED', 'PENDING')")
+    List<Long> findTableIdsWithFutureBookings(
+            @Param("tableIds") List<Long> tableIds,
+            @Param("currentDate") LocalDate currentDate,
+            @Param("currentTime") LocalTime currentTime
+    );
+    @Query("select count(b) from Booking b " +
+            "where b.store = :store " +
+            "and b.status in (com.eatsfine.eatsfine.domain.booking.enums.BookingStatus.CONFIRMED, " +
+            "com.eatsfine.eatsfine.domain.booking.enums.BookingStatus.PENDING, " +
+            "com.eatsfine.eatsfine.domain.booking.enums.BookingStatus.COMPLETED)")
+    Long countActiveBookings(@Param("store") Store store);
+
+    @Query("select b.store.id, count(b) from Booking b " +
+            "where b.store in :stores " +
+            "and b.status in (com.eatsfine.eatsfine.domain.booking.enums.BookingStatus.CONFIRMED, " +
+            "com.eatsfine.eatsfine.domain.booking.enums.BookingStatus.PENDING, " +
+            "com.eatsfine.eatsfine.domain.booking.enums.BookingStatus.COMPLETED) " +
+            "group by b.store.id")
+    List<Object[]> countActiveBookingsByStores(@Param("stores") List<Store> stores);
 }

src/main/java/com/eatsfine/eatsfine/domain/businesshours/controller/BusinessHoursController.java

@@ -14,6 +14,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.security.Principal;
+import java.time.LocalDate;
 
 @Tag(name = "BusinessHours", description = "영업시간 관련 API")
 @RequestMapping("/api/v1")
@@ -51,6 +52,14 @@ public ApiResponse<BusinessHoursResDto.UpdateBreakTimeDto> updateBreakTime(
             @RequestBody BusinessHoursReqDto.UpdateBreakTimeDto dto,
             @CurrentUser User user
     ){
+        BusinessHoursResDto.UpdateBreakTimeDto result = businessHoursCommandService.updateBreakTime(storeId, dto, user.getUsername());
+
+        // 1. 날짜가 미래라면 DELAYED(지연) 코드 반환
+        if (result.effectiveDate().isAfter(LocalDate.now())) {
+            return ApiResponse.of(
+                    BusinessHoursSuccessStatus._UPDATE_BREAKTIME_DELAYED,
+                    result);
+        }
         return ApiResponse.of(
                 BusinessHoursSuccessStatus._UPDATE_BREAKTIME_SUCCESS,
                 businessHoursCommandService.updateBreakTime(storeId, dto, user.getUsername())

src/main/java/com/eatsfine/eatsfine/domain/businesshours/converter/BusinessHoursConverter.java

@@ -4,6 +4,7 @@
 import com.eatsfine.eatsfine.domain.businesshours.dto.BusinessHoursResDto;
 import com.eatsfine.eatsfine.domain.businesshours.entity.BusinessHours;
 
+import java.time.LocalDate;
 import java.util.List;
 
 public class BusinessHoursConverter {
@@ -49,11 +50,12 @@ public static BusinessHoursResDto.UpdateBusinessHoursDto toUpdateBusinessHoursDt
                 .build();
     }
 
-    public static BusinessHoursResDto.UpdateBreakTimeDto toUpdateBreakTimeDto(Long storeId, BusinessHoursReqDto.UpdateBreakTimeDto dto) {
+    public static BusinessHoursResDto.UpdateBreakTimeDto toUpdateBreakTimeDto(Long storeId, BusinessHoursReqDto.UpdateBreakTimeDto dto, LocalDate effectiveDate) {
         return BusinessHoursResDto.UpdateBreakTimeDto.builder()
                 .storeId(storeId)
                 .breakStartTime(dto.breakStartTime())
                 .breakEndTime(dto.breakEndTime())
+                .effectiveDate(effectiveDate)
                 .build();
     }
 }

src/main/java/com/eatsfine/eatsfine/domain/businesshours/dto/BusinessHoursReqDto.java

@@ -1,6 +1,7 @@
 package com.eatsfine.eatsfine.domain.businesshours.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 import lombok.Builder;
@@ -15,14 +16,18 @@ public class BusinessHoursReqDto {
     public record Summary(
 
             @NotNull(message = "요일은 필수입니다.")
+            @Schema(description = "요일", example = "MONDAY")
             DayOfWeek day,
 
+            @Schema(description = "영업 시작 시간", type = "string", example = "09:00")
             @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "HH:mm")
             LocalTime openTime,
 
+            @Schema(description = "영업 종료 시간", type = "string", example = "22:00")
             @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "HH:mm")
             LocalTime closeTime,
 
+            @Schema(description = "휴무 여부", example = "false")
             boolean isClosed
     ){}
 
@@ -36,10 +41,12 @@ public record UpdateBusinessHoursDto(
     public record UpdateBreakTimeDto(
 
             @NotNull(message = "브레이크타임 시작 시간은 필수입니다.")
+            @Schema(description = "브레이크 시작 시간", type = "string", example = "15:00")
             @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "HH:mm")
             LocalTime breakStartTime,
 
             @NotNull(message = "브레이크타임 종료 시간은 필수입니다.")
+            @Schema(description = "브레이크 종료 시간", type = "string", example = "17:00")
             @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "HH:mm")
             LocalTime breakEndTime
     ){}

src/main/java/com/eatsfine/eatsfine/domain/businesshours/dto/BusinessHoursResDto.java

@@ -1,9 +1,11 @@
 package com.eatsfine.eatsfine.domain.businesshours.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Builder;
 
 import java.time.DayOfWeek;
+import java.time.LocalDate;
 import java.time.LocalTime;
 import java.util.List;
 
@@ -38,6 +40,9 @@ public record UpdateBreakTimeDto(
             LocalTime breakStartTime,
 
             @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "HH:mm")
-            LocalTime breakEndTime
+            LocalTime breakEndTime,
+
+            @JsonIgnore
+            LocalDate effectiveDate
     ){}
 }

src/main/java/com/eatsfine/eatsfine/domain/businesshours/entity/BusinessHours.java

@@ -6,6 +6,7 @@
 import lombok.*;
 
 import java.time.DayOfWeek;
+import java.time.LocalDate;
 import java.time.LocalTime;
 
 @Entity
@@ -39,25 +40,66 @@ public class BusinessHours extends BaseEntity {
     @Column(name = "break_end_time")
     private LocalTime breakEndTime;
 
+    @Column(name = "new_break_start_time")
+    private LocalTime newBreakStartTime;
+
+    @Column(name = "new_break_end_time")
+    private LocalTime newBreakEndTime;
+
+    @Column(name = "effective_date")
+    private LocalDate effectiveDate;
+
     // 휴일 여부 (특정 요일 고정 휴무)
     @Builder.Default
     @Column(name = "is_closed", nullable = false)
     private boolean isClosed = false;
 
-    public void assignStore(Store store){
+    public void assignStore(Store store) {
         this.store = store;
     }
 
     // 영업시간 변경
-    public void update(LocalTime open, LocalTime close, boolean isClosed){
+    public void update(LocalTime open, LocalTime close, boolean isClosed) {
         this.openTime = open;
         this.closeTime = close;
         this.isClosed = isClosed;
     }
 
     // 브레이크타임 변경
-    public void updateBreakTime(LocalTime breakStart, LocalTime breakEnd){
-        this.breakStartTime = breakStart;
-        this.breakEndTime = breakEnd;
+    public void updateBreakTime(LocalTime startTime, LocalTime endTime, LocalDate effectiveDate) {
+        // 오늘(혹은 과거) 날짜라면 -> 즉시 반영
+        if (effectiveDate == null || !effectiveDate.isAfter(LocalDate.now())) {
+            this.breakStartTime = startTime;
+            this.breakEndTime = endTime;
+            // 대기 중인 데이터 초기화
+            this.newBreakStartTime = null;
+            this.newBreakEndTime = null;
+            this.effectiveDate = null;
+        }
+        // 미래 날짜라면 -> 대기열에 저장
+        else {
+            this.newBreakStartTime = startTime;
+            this.newBreakEndTime = endTime;
+            this.effectiveDate = effectiveDate;
+        }
+    }
+
+    // 대기열 -> 실제 반영 (스케줄러 호출)
+    public void applyPendingBreakTime() {
+        if (this.newBreakStartTime != null && this.newBreakEndTime != null) {
+            this.breakStartTime = newBreakStartTime;
+            this.breakEndTime = newBreakEndTime;
+
+            // 반영 후 대기열 비우기
+            this.newBreakStartTime = null;
+            this.newBreakEndTime = null;
+            this.effectiveDate = null;
+        }
+    }
+
+    public void clearPendingBreakTime() {
+        this.newBreakStartTime = null;
+        this.newBreakEndTime = null;
+        this.effectiveDate = null;
     }
 }

src/main/java/com/eatsfine/eatsfine/domain/businesshours/repository/BusinessHoursRepository.java

@@ -5,8 +5,11 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.util.List;
 import java.util.Optional;
 
 public interface BusinessHoursRepository extends JpaRepository<BusinessHours, Long> {
     Optional<BusinessHours> findByStoreAndDayOfWeek(Store store, DayOfWeek dayOfWeek);
+    List<BusinessHours> findAllByEffectiveDateLessThanEqualAndEffectiveDateIsNotNull(LocalDate date);
 }

src/main/java/com/eatsfine/eatsfine/domain/businesshours/service/BusinessHoursCommandServiceImpl.java

@@ -1,9 +1,12 @@
 package com.eatsfine.eatsfine.domain.businesshours.service;
 
+import com.eatsfine.eatsfine.domain.booking.repository.BookingRepository;
 import com.eatsfine.eatsfine.domain.businesshours.converter.BusinessHoursConverter;
 import com.eatsfine.eatsfine.domain.businesshours.dto.BusinessHoursReqDto;
 import com.eatsfine.eatsfine.domain.businesshours.dto.BusinessHoursResDto;
 import com.eatsfine.eatsfine.domain.businesshours.entity.BusinessHours;
+import com.eatsfine.eatsfine.domain.businesshours.exception.BusinessHoursException;
+import com.eatsfine.eatsfine.domain.businesshours.status.BusinessHoursErrorStatus;
 import com.eatsfine.eatsfine.domain.businesshours.validator.BreakTimeValidator;
 import com.eatsfine.eatsfine.domain.businesshours.validator.BusinessHoursValidator;
 import com.eatsfine.eatsfine.domain.store.entity.Store;
@@ -12,16 +15,23 @@
 import com.eatsfine.eatsfine.domain.store.status.StoreErrorStatus;
 import com.eatsfine.eatsfine.domain.store.validator.StoreValidator;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.util.Optional;
+
 @Service
 @Transactional
 @RequiredArgsConstructor
+@Slf4j
 public class BusinessHoursCommandServiceImpl implements BusinessHoursCommandService {
 
     private final StoreRepository storeRepository;
     private final StoreValidator storeValidator;
+    private final BookingRepository bookingRepository;
 
     @Override
     public BusinessHoursResDto.UpdateBusinessHoursDto updateBusinessHours(
@@ -59,17 +69,52 @@ public BusinessHoursResDto.UpdateBreakTimeDto updateBreakTime(
 
         Store store = storeValidator.validateStoreOwner(storeId, email);
 
+
         for(BusinessHours bh : store.getBusinessHours()) {
             if(bh.isClosed()) continue;
-            BreakTimeValidator.validateBreakTime(bh.getOpenTime(), bh.getCloseTime(), dto.breakStartTime(), dto.breakEndTime());
+            try {
+                BreakTimeValidator.validateBreakTime(bh.getOpenTime(), bh.getCloseTime(), dto.breakStartTime(), dto.breakEndTime());
+            } catch (BusinessHoursException e) {
+                log.error("브레이크 타임 검증 실패 - 요일: {}, 영업시간: {}~{}, 브레이크: {}~{}",
+                        bh.getDayOfWeek(), bh.getOpenTime(), bh.getCloseTime(),
+                        dto.breakStartTime(), dto.breakEndTime());
+                throw e;
+            }
+        }
+
+        // 브레이크 타임 해제 요청인 경우 (두 시간 모두 null)
+        if (dto.breakStartTime() == null && dto.breakEndTime() == null) {
+            for(BusinessHours bh : store.getBusinessHours()) {
+                bh.updateBreakTime(null, null, LocalDate.now());
+            }
+            return BusinessHoursConverter.toUpdateBreakTimeDto(storeId, dto, null);
+
         }
 
+        // 한쪽만 null인 비정상 요청 방어
+        if (dto.breakStartTime() == null || dto.breakEndTime() == null) {
+            throw new BusinessHoursException(BusinessHoursErrorStatus._INVALID_BREAK_TIME);
+        }
+
+        LocalTime adjustedBreakStart = dto.breakStartTime().minusMinutes(store.getBookingIntervalMinutes());
+
+        // 1. 예약 충돌 확인
+        Optional<LocalDate> lastConflictDate = bookingRepository.findLastConflictingDate(
+                storeId, dto.breakStartTime(), dto.breakEndTime(), adjustedBreakStart
+        );
+        LocalDate effectiveDate;
+
+        effectiveDate = lastConflictDate.map(
+                localDate -> localDate.plusDays(1)) // 예약이 있으면 그 다음날 부터
+                .orElseGet(LocalDate::now); // 예약 없으면 오늘부터
+
+
         store.getBusinessHours().forEach(s -> {
             if(!s.isClosed()) {
-                s.updateBreakTime(dto.breakStartTime(), dto.breakEndTime());
+                s.updateBreakTime(dto.breakStartTime(), dto.breakEndTime(), effectiveDate);
             }
         });
 
-        return BusinessHoursConverter.toUpdateBreakTimeDto(storeId, dto);
+        return BusinessHoursConverter.toUpdateBreakTimeDto(storeId, dto, effectiveDate);
     }
 }