Merge pull request #12 from SM-LCK/feature/history

[FIX]: Json 포맷 타임존 설정
SM-LCK · Oct 5, 2023 · e33f776 · e33f776
2 parents 4047979 + 51d5da8
commit e33f776
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 8 deletions.
diff --git a/src/main/java/LCK/snowTaxi2/domain/Member.java b/src/main/java/LCK/snowTaxi2/domain/Member.java
@@ -1,6 +1,5 @@
 package LCK.snowTaxi2.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.persistence.*;
 import lombok.*;
 

diff --git a/src/main/java/LCK/snowTaxi2/domain/chat/Message.java b/src/main/java/LCK/snowTaxi2/domain/chat/Message.java
@@ -33,7 +33,7 @@ public class Message {
 
     private String content;
 
-    @JsonFormat(pattern = "a hh:mm")
+    @JsonFormat(pattern = "a hh:mm", timezone = "Asia/Seoul")
     private LocalTime sentTime;
 
 }
diff --git a/src/main/java/LCK/snowTaxi2/domain/pot/TaxiPot.java b/src/main/java/LCK/snowTaxi2/domain/pot/TaxiPot.java
@@ -31,7 +31,7 @@ public class TaxiPot {
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate ridingDate;
 
-    @JsonFormat(pattern = "a hh:mm")
+    @JsonFormat(pattern = "a hh:mm", timezone = "Asia/Seoul")
     private LocalTime ridingTime;
 
     private int headCount;

diff --git a/src/main/java/LCK/snowTaxi2/dto/chat/MessageResponseDto.java b/src/main/java/LCK/snowTaxi2/dto/chat/MessageResponseDto.java
@@ -11,7 +11,7 @@
 @Builder
 public class MessageResponseDto {
 
-    @JsonFormat(pattern = "a hh:mm")
+    @JsonFormat(pattern = "a hh:mm", timezone = "Asia/Seoul")
     private LocalTime sentTime;
 
     private String sender;

diff --git a/src/main/java/LCK/snowTaxi2/dto/pot/MyPotsResponseDto.java b/src/main/java/LCK/snowTaxi2/dto/pot/MyPotsResponseDto.java
@@ -13,10 +13,10 @@ public class MyPotsResponseDto {
 
     private long id;
 
-    @JsonFormat(pattern = "yyyy.MM.dd (E)")
+    @JsonFormat(pattern = "yyyy.MM.dd (E)", timezone = "Asia/Seoul")
     private LocalDate ridingDate;
 
-    @JsonFormat(pattern = "a hh:mm")
+    @JsonFormat(pattern = "a hh:mm", timezone = "Asia/Seoul")
     private LocalTime ridingTime;
 
     private int headCount;

diff --git a/src/main/java/LCK/snowTaxi2/dto/pot/TaxiPotInfo.java b/src/main/java/LCK/snowTaxi2/dto/pot/TaxiPotInfo.java
@@ -12,7 +12,7 @@ public class TaxiPotInfo {
 
     private long potId;
 
-    @JsonFormat(pattern = "a hh:mm")
+    @JsonFormat(pattern = "a hh:mm", timezone = "Asia/Seoul")
     private LocalTime ridingTime;
 
 }
diff --git a/src/main/java/LCK/snowTaxi2/dto/pot/TaxiPotResponseDto.java b/src/main/java/LCK/snowTaxi2/dto/pot/TaxiPotResponseDto.java
@@ -14,7 +14,7 @@ public class TaxiPotResponseDto implements Comparable<TaxiPotResponseDto> {
 
     private long id;
 
-    @JsonFormat(pattern = "a hh:mm")
+    @JsonFormat(pattern = "a hh:mm", timezone = "Asia/Seoul")
     private LocalTime ridingTime;
 
     private int headCount;