From 0625d3fdef5844e80d200bf273cef129c4933709 Mon Sep 17 00:00:00 2001 From: soohyun Date: Mon, 23 Sep 2024 15:52:58 +0900 Subject: [PATCH] =?UTF-8?q?[#6]=20fix:=20timeInfo=20=EC=9E=98=EB=AA=BB?= =?UTF-8?q?=EB=90=9C=20=ED=83=80=EC=9E=85=EC=BB=AC=EB=9F=BC=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 --- .../controller/dto/request/GatheringDto.java | 6 ++++-- .../dto/request/GatheringModifyDto.java | 6 ++++-- .../gathering/entity/TimeInfo.java | 18 ++++++++---------- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/Network-Office/src/main/java/dev/office/networkoffice/gathering/controller/dto/request/GatheringDto.java b/Network-Office/src/main/java/dev/office/networkoffice/gathering/controller/dto/request/GatheringDto.java index 742cf12..b54e25e 100644 --- a/Network-Office/src/main/java/dev/office/networkoffice/gathering/controller/dto/request/GatheringDto.java +++ b/Network-Office/src/main/java/dev/office/networkoffice/gathering/controller/dto/request/GatheringDto.java @@ -1,5 +1,7 @@ package dev.office.networkoffice.gathering.controller.dto.request; +import java.time.LocalDateTime; + import org.springframework.format.annotation.DateTimeFormat; import org.springframework.security.core.parameters.P; @@ -24,8 +26,8 @@ public record GatheringDto( Double y, String date, - String startTime, - String endTime + LocalDateTime startTime, + LocalDateTime endTime ) { public PlaceInfo placeInfoConstructor(){ return PlaceInfo.setPlaceInfo(place,detailPlace,si,dong,gu,x,y); diff --git a/Network-Office/src/main/java/dev/office/networkoffice/gathering/controller/dto/request/GatheringModifyDto.java b/Network-Office/src/main/java/dev/office/networkoffice/gathering/controller/dto/request/GatheringModifyDto.java index 67e3bcb..c19fb62 100644 --- a/Network-Office/src/main/java/dev/office/networkoffice/gathering/controller/dto/request/GatheringModifyDto.java +++ b/Network-Office/src/main/java/dev/office/networkoffice/gathering/controller/dto/request/GatheringModifyDto.java @@ -1,5 +1,7 @@ package dev.office.networkoffice.gathering.controller.dto.request; +import java.time.LocalDateTime; + import dev.office.networkoffice.gathering.entity.PlaceInfo; import dev.office.networkoffice.gathering.entity.TimeInfo; @@ -19,8 +21,8 @@ public record GatheringModifyDto( Double y, String date, - String startTime, - String endTime + LocalDateTime startTime, + LocalDateTime endTime ) { diff --git a/Network-Office/src/main/java/dev/office/networkoffice/gathering/entity/TimeInfo.java b/Network-Office/src/main/java/dev/office/networkoffice/gathering/entity/TimeInfo.java index 8b5aa34..ef3d28e 100644 --- a/Network-Office/src/main/java/dev/office/networkoffice/gathering/entity/TimeInfo.java +++ b/Network-Office/src/main/java/dev/office/networkoffice/gathering/entity/TimeInfo.java @@ -1,6 +1,6 @@ package dev.office.networkoffice.gathering.entity; -import java.sql.Time; +import java.time.LocalDateTime; import org.springframework.format.annotation.DateTimeFormat; @@ -18,23 +18,21 @@ public class TimeInfo { @Column(name = "date") private String date; - @DateTimeFormat() @Column(name = "start_time") - private String startTime; - @DateTimeFormat() - @Column(name = "end_time") - private String endTime; - + @DateTimeFormat(iso = DateTimeFormat.ISO.TIME) + private LocalDateTime startTime; + @Column(name = "end_time") + @DateTimeFormat(iso = DateTimeFormat.ISO.TIME) + private LocalDateTime endTime; - private TimeInfo(String date, String startTime , String endTime) { + private TimeInfo(String date, LocalDateTime startTime , LocalDateTime endTime) { this.date = date; this.startTime = startTime; this.endTime = endTime; } - public static TimeInfo setTimeInfo(String date, String startTime , String endTime) { + public static TimeInfo setTimeInfo(String date, LocalDateTime startTime , LocalDateTime endTime) { return new TimeInfo(date, startTime, endTime); } } -