diff --git a/cakey-api/src/main/java/com/cakey/store/service/StoreService.java b/cakey-api/src/main/java/com/cakey/store/service/StoreService.java index a3ab896..d008a88 100644 --- a/cakey-api/src/main/java/com/cakey/store/service/StoreService.java +++ b/cakey-api/src/main/java/com/cakey/store/service/StoreService.java @@ -18,8 +18,6 @@ import com.cakey.store.exception.StoreNotfoundException; import com.cakey.store.facade.StoreFacade; -import java.time.LocalTime; -import java.time.format.DateTimeFormatter; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -28,7 +26,6 @@ import java.util.Arrays; import java.util.List; import java.util.Map; -import java.util.function.Function; import java.util.stream.Collectors; import static com.cakey.store.exception.StoreErrorCode.STORE_KAKAO_LINK_NOT_FOUND; @@ -247,31 +244,26 @@ public StoreDetailInfoRes getStoreDetailInfo(final long storeId) { throw new StoreNotfoundException(STORE_OPERATION_TIME_NOT_FOUND); } - final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm"); - - final Function formatTime = time -> time == null ? null : time.format(formatter); - return StoreDetailInfoRes.of( - formatTime.apply(LocalTime.from(storeOperationTimeDto.monOpen())), - formatTime.apply(LocalTime.from(storeOperationTimeDto.monClose())), - formatTime.apply(LocalTime.from(storeOperationTimeDto.tueOpen())), - formatTime.apply(LocalTime.from(storeOperationTimeDto.tueClose())), - formatTime.apply(LocalTime.from(storeOperationTimeDto.wedOpen())), - formatTime.apply(LocalTime.from(storeOperationTimeDto.wedClose())), - formatTime.apply(LocalTime.from(storeOperationTimeDto.thuOpen())), - formatTime.apply(LocalTime.from(storeOperationTimeDto.thuClose())), - formatTime.apply(LocalTime.from(storeOperationTimeDto.friOpen())), - formatTime.apply(LocalTime.from(storeOperationTimeDto.friClose())), - formatTime.apply(LocalTime.from(storeOperationTimeDto.satOpen())), - formatTime.apply(LocalTime.from(storeOperationTimeDto.satClose())), - formatTime.apply(LocalTime.from(storeOperationTimeDto.sunOpen())), - formatTime.apply(LocalTime.from(storeOperationTimeDto.sunClose())), + storeOperationTimeDto.monOpen(), + storeOperationTimeDto.monClose(), + storeOperationTimeDto.tueOpen(), + storeOperationTimeDto.tueClose(), + storeOperationTimeDto.wedOpen(), + storeOperationTimeDto.wedClose(), + storeOperationTimeDto.thuOpen(), + storeOperationTimeDto.thuClose(), + storeOperationTimeDto.friOpen(), + storeOperationTimeDto.friClose(), + storeOperationTimeDto.satOpen(), + storeOperationTimeDto.satClose(), + storeOperationTimeDto.sunOpen(), + storeOperationTimeDto.sunClose(), storeDetailInfoDto.address(), storeDetailInfoDto.phone() ); } - - + public StoreListByPopularityRes getStoreByRank() { final List storeByPopularityDtoList; try { diff --git a/cakey-domain/src/main/java/com/cakey/operationtime/dto/StoreOperationTimeDto.java b/cakey-domain/src/main/java/com/cakey/operationtime/dto/StoreOperationTimeDto.java index 8777201..e892216 100644 --- a/cakey-domain/src/main/java/com/cakey/operationtime/dto/StoreOperationTimeDto.java +++ b/cakey-domain/src/main/java/com/cakey/operationtime/dto/StoreOperationTimeDto.java @@ -6,35 +6,35 @@ @Builder(access = AccessLevel.PRIVATE) public record StoreOperationTimeDto( - LocalDateTime monOpen, - LocalDateTime monClose, - LocalDateTime tueOpen, - LocalDateTime tueClose, - LocalDateTime wedOpen, - LocalDateTime wedClose, - LocalDateTime thuOpen, - LocalDateTime thuClose, - LocalDateTime friOpen, - LocalDateTime friClose, - LocalDateTime satOpen, - LocalDateTime satClose, - LocalDateTime sunOpen, - LocalDateTime sunClose + String monOpen, + String monClose, + String tueOpen, + String tueClose, + String wedOpen, + String wedClose, + String thuOpen, + String thuClose, + String friOpen, + String friClose, + String satOpen, + String satClose, + String sunOpen, + String sunClose ) { - public static StoreOperationTimeDto of(final LocalDateTime monOpen, - final LocalDateTime monClose, - final LocalDateTime tueOpen, - final LocalDateTime tueClose, - final LocalDateTime wedOpen, - final LocalDateTime wedClose, - final LocalDateTime thuOpen, - final LocalDateTime thuClose, - final LocalDateTime friOpen, - final LocalDateTime friClose, - final LocalDateTime satOpen, - final LocalDateTime satClose, - final LocalDateTime sunOpen, - final LocalDateTime sunClose) { + public static StoreOperationTimeDto of(final String monOpen, + final String monClose, + final String tueOpen, + final String tueClose, + final String wedOpen, + final String wedClose, + final String thuOpen, + final String thuClose, + final String friOpen, + final String friClose, + final String satOpen, + final String satClose, + final String sunOpen, + final String sunClose) { return StoreOperationTimeDto.builder() .monOpen(monOpen) .monClose(monClose)