Merge pull request #117 from GamSungPing/dev

예약 가능 조회에 휴무일 적용

Author: harriet221

src/main/java/com/rocket/toucheese_be/domain/reservation/service/ReservationService.java

@@ -28,6 +28,7 @@
 import java.time.LocalTime;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -44,6 +45,16 @@ public class ReservationService {
     private final FcmService fcmService;
     private final DeviceService deviceService;
 
+    private static final Map<String, String> DAY_MAPPING = Map.of(
+            "1", "일",
+            "2", "월",
+            "3", "화",
+            "4", "수",
+            "5", "목",
+            "6", "금",
+            "7", "토"
+    );
+
     // 스튜디오 예약 단일 조회
     public ReservationDto getReservationById(Long reservationId) {
         Reservation reservation = reservationRepository.findById(reservationId)
@@ -65,8 +76,19 @@ public AvailableTimeListDto getAvailableTimeSlots(Long studioId, LocalDate date)
                 .filter(reservation -> reservation.getStatus() != ReservationStatus.cancel)
                 .toList();
 
+        // 휴무일 정보
+        String holidays = studio.getHolidays();
+        if(holidays == null) holidays = "";
+        else {
+            holidays = holidays.replaceAll("&", "");
+            holidays  = holidays.chars()
+                    .mapToObj(c -> String.valueOf((char) c)) // 문자 하나씩 처리
+                    .map(c -> String.valueOf((Integer.parseInt(c) + 5) % 7 + 1)) // 변환 로직
+                    .collect(Collectors.joining());
+        }
+
         // 스튜디오의 예약 가능한 시간 계산
-        List<LocalTime> availableSlots = studio.getAvailableTimeSlots(date, activeReservations);
+        List<LocalTime> availableSlots = studio.getAvailableTimeSlots(date, activeReservations, holidays);
 
         LocalTime lastSlot = availableSlots.isEmpty() ? null : availableSlots.get(availableSlots.size() - 1);
 

src/main/java/com/rocket/toucheese_be/domain/studio/studio/entity/Studio.java

@@ -111,9 +111,13 @@ private String calculatePriceCategoryBasedOnProfilePrice(int price) {
     }
 
     // 예약 가능한 시간 조회 메서드
-    public List<LocalTime> getAvailableTimeSlots(LocalDate date, List<Reservation> reservations) {
+    public List<LocalTime> getAvailableTimeSlots(LocalDate date, List<Reservation> reservations, String holidays) {
         List<LocalTime> availableSlots = new ArrayList<>();
 
+        if (holidays.contains(date.getDayOfWeek().getValue()+"")) {
+            return availableSlots; // 휴무일이면 빈 리스트 반환
+        }
+
         if (reservations == null) {
             reservations = new ArrayList<>();
         }