From 287d1330801f5cc84b81dbfa8bcb0ea31f4a050f Mon Sep 17 00:00:00 2001 From: Klaus Date: Fri, 14 Mar 2025 02:13:42 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20-=20=EC=9D=B4?= =?UTF-8?q?=EB=B2=A4=ED=8A=B8=20=EB=B0=B0=EB=84=88=20-=20=EC=9D=B4?= =?UTF-8?q?=EB=B2=A4=ED=8A=B8=20=EA=B8=B0=EA=B0=84=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=EC=9D=84=20=EC=8B=9C=EA=B0=84:=EB=B6=84=20=EA=B9=8C=EC=A7=80?= =?UTF-8?q?=20=EC=84=A4=EC=A0=95=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/banner/AdminEventBannerRepository.kt | 2 +- .../admin/event/banner/AdminEventBannerService.kt | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/banner/AdminEventBannerRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/banner/AdminEventBannerRepository.kt index 1c62345..bdc750d 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/banner/AdminEventBannerRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/banner/AdminEventBannerRepository.kt @@ -59,7 +59,7 @@ class AdminEventBannerQueryRepositoryImpl( "UTC", "Asia/Seoul" ), - "%Y-%m-%d" + "%Y-%m-%d %H:%i" ) } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/banner/AdminEventBannerService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/banner/AdminEventBannerService.kt index c3b0910..224c9e8 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/banner/AdminEventBannerService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/event/banner/AdminEventBannerService.kt @@ -10,7 +10,7 @@ import org.springframework.data.repository.findByIdOrNull import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional import org.springframework.web.multipart.MultipartFile -import java.time.LocalDate +import java.time.LocalDateTime import java.time.ZoneId import java.time.format.DateTimeFormatter @@ -36,13 +36,13 @@ class AdminEventBannerService( ): Long { if (detail == null && link.isNullOrBlank()) throw SodaException("상세이미지 혹은 링크를 등록하세요") - val dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd") - val startDate = LocalDate.parse(startDateString, dateTimeFormatter).atTime(0, 0) + val dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm") + val startDate = LocalDateTime.parse(startDateString, dateTimeFormatter) .atZone(ZoneId.of("Asia/Seoul")) .withZoneSameInstant(ZoneId.of("UTC")) .toLocalDateTime() - val endDate = LocalDate.parse(endDateString, dateTimeFormatter).atTime(23, 59, 59) + val endDate = LocalDateTime.parse(endDateString, dateTimeFormatter).withSecond(59) .atZone(ZoneId.of("Asia/Seoul")) .withZoneSameInstant(ZoneId.of("UTC")) .toLocalDateTime() @@ -172,16 +172,16 @@ class AdminEventBannerService( event.isAdult = isAdult } - val dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd") + val dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm") if (startDateString != null) { - event.startDate = LocalDate.parse(startDateString, dateTimeFormatter).atTime(0, 0) + event.startDate = LocalDateTime.parse(startDateString, dateTimeFormatter) .atZone(ZoneId.of("Asia/Seoul")) .withZoneSameInstant(ZoneId.of("UTC")) .toLocalDateTime() } if (endDateString != null) { - event.endDate = LocalDate.parse(endDateString, dateTimeFormatter).atTime(23, 59, 59) + event.endDate = LocalDateTime.parse(endDateString, dateTimeFormatter).withSecond(59) .atZone(ZoneId.of("Asia/Seoul")) .withZoneSameInstant(ZoneId.of("UTC")) .toLocalDateTime()