fix: 주간 스케줄 저장 시 500에러 해결 (#46)

* fix: 주간 스케줄 저장 시 500에러 해결 * chore: 스케줄 시간 반환 포맷 변경 * chore: Reservation 엔티티 FK nullable 작성 * chore: nullable 삭제
KeunSori · Feb 7, 2025 · 0209667 · 0209667
1 parent a2a2ce4
commit 0209667
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/...sori/keunsoriserver/domain/admin/reservation/dto/request/WeeklyScheduleUpdateRequest.java b/...sori/keunsoriserver/domain/admin/reservation/dto/request/WeeklyScheduleUpdateRequest.java
@@ -5,13 +5,12 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
-import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 
-import java.time.DayOfWeek;
 import java.time.LocalTime;
 
 public record WeeklyScheduleUpdateRequest(
-        @NotBlank
+        @NotNull
         @Min(value = 0) @Max(value = 7)
         int dayOfWeekNum, // 0 = 일요일, 1 = 월요일, ...
         boolean isActive,

diff --git a/...keunsori/keunsoriserver/domain/admin/reservation/dto/response/DailyAvailableResponse.java b/...keunsori/keunsoriserver/domain/admin/reservation/dto/response/DailyAvailableResponse.java
@@ -4,29 +4,29 @@
 import com.keunsori.keunsoriserver.domain.admin.reservation.domain.WeeklySchedule;
 
 import java.time.LocalDate;
-import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
 
 public record DailyAvailableResponse(
         LocalDate date,
         boolean isActive,
-        LocalTime startTime,
-        LocalTime endTime
+        String startTime,
+        String endTime
 ) {
     public static DailyAvailableResponse from(DailySchedule dailySchedule){
         return new DailyAvailableResponse(
                 dailySchedule.getDate(),
                 dailySchedule.isActive(),
-                dailySchedule.getStartTime(),
-                dailySchedule.getEndTime()
+                dailySchedule.getStartTime().format(DateTimeFormatter.ofPattern("HH:mm")),
+                dailySchedule.getEndTime().format(DateTimeFormatter.ofPattern("HH:mm"))
         );
     }
 
     public static DailyAvailableResponse of(LocalDate date, WeeklySchedule weeklySchedule){
         return new DailyAvailableResponse(
                 date,
                 weeklySchedule.isActive(),
-                weeklySchedule.getStartTime(),
-                weeklySchedule.getEndTime()
+                weeklySchedule.getStartTime().format(DateTimeFormatter.ofPattern("HH:mm")),
+                weeklySchedule.getEndTime().format(DateTimeFormatter.ofPattern("HH:mm"))
         );
     }
 

diff --git a/...keunsori/keunsoriserver/domain/admin/reservation/dto/response/WeeklyScheduleResponse.java b/...keunsori/keunsoriserver/domain/admin/reservation/dto/response/WeeklyScheduleResponse.java
@@ -3,20 +3,20 @@
 import com.keunsori.keunsoriserver.domain.admin.reservation.domain.WeeklySchedule;
 import com.keunsori.keunsoriserver.global.util.DayOfWeekUtil;
 
-import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
 
 public record WeeklyScheduleResponse(
         int dayOfWeekNum, // 0 = 일요일, 1 = 월요일, ...
         boolean isActive,
-        LocalTime startTime,
-        LocalTime endTime
+        String startTime,
+        String endTime
 ) {
     public static WeeklyScheduleResponse from(WeeklySchedule weeklySchedule){
         return new WeeklyScheduleResponse(
                 DayOfWeekUtil.getCustomDayValue(weeklySchedule.getDayOfWeek()),
                 weeklySchedule.isActive(),
-                weeklySchedule.getStartTime(),
-                weeklySchedule.getEndTime()
+                weeklySchedule.getStartTime().format(DateTimeFormatter.ofPattern("HH:mm")),
+                weeklySchedule.getEndTime().format(DateTimeFormatter.ofPattern("HH:mm"))
         );
     }
 }