diff --git a/src/main/java/com/keunsori/keunsoriserver/domain/admin/reservation/dto/request/WeeklyScheduleUpdateRequest.java b/src/main/java/com/keunsori/keunsoriserver/domain/admin/reservation/dto/request/WeeklyScheduleUpdateRequest.java index e4f9100..84da2cd 100644 --- a/src/main/java/com/keunsori/keunsoriserver/domain/admin/reservation/dto/request/WeeklyScheduleUpdateRequest.java +++ b/src/main/java/com/keunsori/keunsoriserver/domain/admin/reservation/dto/request/WeeklyScheduleUpdateRequest.java @@ -1,6 +1,7 @@ package com.keunsori.keunsoriserver.domain.admin.reservation.dto.request; import com.keunsori.keunsoriserver.domain.admin.reservation.domain.WeeklySchedule; +import com.keunsori.keunsoriserver.global.util.DayOfWeekUtil; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Max; import jakarta.validation.constraints.Min; @@ -21,16 +22,11 @@ public record WeeklyScheduleUpdateRequest( ) { public WeeklySchedule toEntity(){ return WeeklySchedule.builder() - .dayOfWeek(DayOfWeek.of((convertToDowValue(dayOfWeekNum)))) + .dayOfWeek(DayOfWeekUtil.fromCustomValue(dayOfWeekNum)) .isActive(isActive) .startTime(startTime) .endTime(endTime) .build(); } - - private int convertToDowValue(int dayOfWeekNum){ - if(dayOfWeekNum == 0) dayOfWeekNum = 7; - return dayOfWeekNum; - } } diff --git a/src/main/java/com/keunsori/keunsoriserver/domain/admin/reservation/dto/response/WeeklyScheduleResponse.java b/src/main/java/com/keunsori/keunsoriserver/domain/admin/reservation/dto/response/WeeklyScheduleResponse.java index 5551c8a..97a557c 100644 --- a/src/main/java/com/keunsori/keunsoriserver/domain/admin/reservation/dto/response/WeeklyScheduleResponse.java +++ b/src/main/java/com/keunsori/keunsoriserver/domain/admin/reservation/dto/response/WeeklyScheduleResponse.java @@ -1,6 +1,7 @@ package com.keunsori.keunsoriserver.domain.admin.reservation.dto.response; import com.keunsori.keunsoriserver.domain.admin.reservation.domain.WeeklySchedule; +import com.keunsori.keunsoriserver.global.util.DayOfWeekUtil; import java.time.LocalTime; @@ -12,7 +13,7 @@ public record WeeklyScheduleResponse( ) { public static WeeklyScheduleResponse from(WeeklySchedule weeklySchedule){ return new WeeklyScheduleResponse( - weeklySchedule.getDayOfWeek().getValue()%7, + DayOfWeekUtil.getCustomValue(weeklySchedule.getDayOfWeek()), weeklySchedule.isActive(), weeklySchedule.getStartTime(), weeklySchedule.getEndTime() diff --git a/src/main/java/com/keunsori/keunsoriserver/global/util/DayOfWeekUtil.java b/src/main/java/com/keunsori/keunsoriserver/global/util/DayOfWeekUtil.java new file mode 100644 index 0000000..77bbff6 --- /dev/null +++ b/src/main/java/com/keunsori/keunsoriserver/global/util/DayOfWeekUtil.java @@ -0,0 +1,13 @@ +package com.keunsori.keunsoriserver.global.util; + +import java.time.DayOfWeek; + +public class DayOfWeekUtil { + public static int getCustomValue(DayOfWeek dayOfWeek){ + return dayOfWeek.getValue() % 7; + } + + public static DayOfWeek fromCustomValue(int customValue){ + return DayOfWeek.of((customValue == 0) ? 7 : customValue); + } +}