[merge] dateTimeFormat 제거 - #147

[FIX] dateTimeFormat 제거 - #147
TeamDATEROAD · Jul 17, 2024 · bac8ba8 · bac8ba8
2 parents ac843a8 + bb647b6
commit bac8ba8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/dateroad-api/src/main/java/org/dateroad/course/dto/request/CourseCreateReq.java b/dateroad-api/src/main/java/org/dateroad/course/dto/request/CourseCreateReq.java
@@ -21,14 +21,12 @@
 public class CourseCreateReq {
     private String title;
 
-    @DateTimeFormat(pattern = "yyyy.MM.dd")
     @Schema(description = "데이트 시작 날짜", example = "2024.07.04", pattern = "yyyy.MM.dd", type = "string")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy.MM.dd", timezone = "Asia/Seoul")
     private LocalDate date;
 
-    @DateTimeFormat(pattern = "HH:mm")
-    @Schema(description = "데이트 시작 시간", example = "12:30 PM", pattern = "HH:mm a", type = "string")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "HH:mm a", timezone = "Asia/Seoul")
+    @Schema(description = "데이트 시작 시간", example = "12:30 PM", pattern = "hh:mm a", type = "string")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "hh:mm a", timezone = "Asia/Seoul", locale = "en")
     private LocalTime startAt;
 
     private Region.MainRegion country;

diff --git a/dateroad-api/src/main/java/org/dateroad/date/dto/request/DateCreateReq.java b/dateroad-api/src/main/java/org/dateroad/date/dto/request/DateCreateReq.java
@@ -11,7 +11,7 @@ public record DateCreateReq(
         String title,
         @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy.MM.dd", timezone = "Asia/Seoul")
         LocalDate date,
-        @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "HH:mm a", timezone = "Asia/Seoul")
+        @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "hh:mm a", timezone = "Asia/Seoul", locale = "en")
         LocalTime startAt,
         List<TagCreateReq> tags,
         Region.MainRegion country,

diff --git a/dateroad-api/src/main/java/org/dateroad/date/dto/response/DateDetailRes.java b/dateroad-api/src/main/java/org/dateroad/date/dto/response/DateDetailRes.java
@@ -15,7 +15,7 @@
 public record DateDetailRes(
     Long dateId,
     String title,
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "HH:mm a", timezone = "Asia/Seoul")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "hh:mm a", timezone = "Asia/Seoul" ,locale = "en")
     LocalTime startAt,
     String city,
     List<TagGetRes> tags,

diff --git a/dateroad-api/src/main/java/org/dateroad/date/dto/response/DateGetNearestRes.java b/dateroad-api/src/main/java/org/dateroad/date/dto/response/DateGetNearestRes.java
@@ -14,7 +14,7 @@ public record DateGetNearestRes(
         String dateName,
         int month,
         int day,
-        @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "hh:mm a", timezone = "Asia/Seoul")
+        @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "hh:mm a", timezone = "Asia/Seoul", locale = "en")
         LocalTime startAt
 ) {
     public static DateGetNearestRes of(Date date, int dDay) {