[HOTFIX] localdatetime 수정 완료

HongDam-org · Jan 13, 2024 · 5fd23c5 · 5fd23c5
1 parent 7abc782
commit 5fd23c5
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 11 deletions.
diff --git a/backend/src/main/java/com/twtw/backend/domain/plan/dto/request/SavePlanRequest.java b/backend/src/main/java/com/twtw/backend/domain/plan/dto/request/SavePlanRequest.java
@@ -1,11 +1,10 @@
 package com.twtw.backend.domain.plan.dto.request;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.twtw.backend.domain.plan.dto.response.PlaceDetails;
-
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
@@ -18,11 +17,9 @@
 public class SavePlanRequest {
     private String name;
     private UUID groupId;
-
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm", timezone = "Asia/Seoul")
     private LocalDateTime planDay;
-
     private PlaceDetails placeDetails;
-
     private List<UUID> memberIds;
 }
diff --git a/backend/src/main/java/com/twtw/backend/domain/plan/dto/request/UpdatePlanDayRequest.java b/backend/src/main/java/com/twtw/backend/domain/plan/dto/request/UpdatePlanDayRequest.java
@@ -1,9 +1,9 @@
 package com.twtw.backend.domain.plan.dto.request;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
@@ -14,7 +14,7 @@
 @AllArgsConstructor
 public class UpdatePlanDayRequest {
     private UUID planId;
-
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm", timezone = "Asia/Seoul")
     private LocalDateTime changeDay;
 }
diff --git a/backend/src/main/java/com/twtw/backend/domain/plan/dto/request/UpdatePlanRequest.java b/backend/src/main/java/com/twtw/backend/domain/plan/dto/request/UpdatePlanRequest.java
@@ -1,11 +1,10 @@
 package com.twtw.backend.domain.plan.dto.request;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.twtw.backend.domain.place.entity.CategoryGroupCode;
-
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
@@ -17,10 +16,9 @@
 @AllArgsConstructor
 public class UpdatePlanRequest {
     private UUID planId;
-
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm", timezone = "Asia/Seoul")
     private LocalDateTime planDay;
-
     private String name;
     private String placeName;
     private String placeUrl;

diff --git a/backend/src/test/java/com/twtw/backend/domain/plan/controller/LocalDateTimeDtoTest.java b/backend/src/test/java/com/twtw/backend/domain/plan/controller/LocalDateTimeDtoTest.java
@@ -0,0 +1,53 @@
+package com.twtw.backend.domain.plan.controller;
+
+import com.twtw.backend.domain.plan.dto.response.PlanResponse;
+import com.twtw.backend.domain.plan.service.PlanService;
+import com.twtw.backend.support.docs.RestDocsTest;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.http.MediaType;
+
+import java.util.UUID;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@WebMvcTest(PlanController.class)
+@DisplayName("LocalDateTimeDto 변환")
+class LocalDateTimeDtoTest extends RestDocsTest {
+
+    @MockBean private PlanService planService;
+
+    @Test
+    @DisplayName("LocalDateTimeDto 변환 성공")
+    void formatSuccess() throws Exception {
+
+        when(planService.savePlan(any())).thenReturn(new PlanResponse(UUID.randomUUID(), UUID.randomUUID()));
+
+        mockMvc.perform(post("/plans")
+                .content("{\n" +
+                        "  \"name\": \"name_c195e577132b\",\n" +
+                        "  \"groupId\": \"63fcf33b-55a7-49fc-b8e7-97c993e43632\",\n" +
+                        "  \"planDay\": \"2024-01-13 20:22\",\n" +
+                        "  \"placeDetails\": {\n" +
+                        "    \"placeName\": \"placeName_2bd877f5726b\",\n" +
+                        "    \"placeUrl\": \"placeUrl_fd39b3850bfe\",\n" +
+                        "    \"roadAddressName\": \"roadAddressName_d020d911090a\",\n" +
+                        "    \"longitude\": 0.00,\n" +
+                        "    \"latitude\": 0.00\n" +
+                        "  },\n" +
+                        "  \"memberIds\": [\n" +
+                        "    \"6fc8d409-7010-42b9-8c6f-e807f4028242\"\n" +
+                        "  ]\n" +
+                        "}")
+                .contentType(MediaType.APPLICATION_JSON)
+                .header(
+                "Authorization",
+                "Bearer wefa3fsdczf32.gaoiuergf92.gb5hsa2jgh"))
+                .andExpect(status().isOk());
+    }
+}