Merge: LocalDateTime으로 변환 (#165)

Refactor: LocalDateTime으로 변환

Author: sleepyhoon

src/main/java/io/ejangs/docsa/domain/doc/dto/graph/GraphBranchDto.java

@@ -1,18 +1,21 @@
 package io.ejangs.docsa.domain.doc.dto.graph;
 
 import java.time.LocalDateTime;
-import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
 
-public record GraphBranchDto(Long id, String name, OffsetDateTime createdAt, Long fromCommitId,
+public record GraphBranchDto(Long id, String name, LocalDateTime createdAt, Long fromCommitId,
                              Long rootCommitId, Long leafCommitId, Long saveId
 
 ) {
+
     public GraphBranchDto(Long id, String name, LocalDateTime createdAt, Long fromCommitId,
             Long rootCommitId, Long leafCommitId, Long saveId) {
-        this(id, name, createdAt.atOffset(ZoneOffset.ofHours(9)), fromCommitId, rootCommitId,
-                leafCommitId, saveId);
-
+        this.id = id;
+        this.name = name;
+        this.createdAt = createdAt.plusHours(9L);
+        this.fromCommitId = fromCommitId;
+        this.rootCommitId = rootCommitId;
+        this.leafCommitId = leafCommitId;
+        this.saveId = saveId;
     }
 
 }

src/main/java/io/ejangs/docsa/domain/doc/dto/graph/GraphCommitDto.java

@@ -1,16 +1,16 @@
 package io.ejangs.docsa.domain.doc.dto.graph;
 
 import java.time.LocalDateTime;
-import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
 
 public record GraphCommitDto(Long id, Long branchId, String title, String description,
-                             OffsetDateTime createdAt) {
-    public GraphCommitDto(Long id, Long branchId, String title, String description,
-            LocalDateTime createdAt
+                             LocalDateTime createdAt) {
 
-    ) {
-        this(id, branchId, title, description, createdAt.atOffset(ZoneOffset.ofHours(9)));
+    public GraphCommitDto(Long id, Long branchId, String title, String description,
+            LocalDateTime createdAt) {
+        this.id = id;
+        this.branchId = branchId;
+        this.title = title;
+        this.description = description;
+        this.createdAt = createdAt.plusHours(9L);
     }
-
 }

src/main/java/io/ejangs/docsa/domain/doc/dto/response/DocListResponse.java

@@ -2,21 +2,23 @@
 
 import io.ejangs.docsa.domain.doc.dto.RecentActivityDto;
 import java.time.LocalDateTime;
-import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
 
 public record DocListResponse(
         Long id,
         String title,
-        OffsetDateTime createdAt,
-        OffsetDateTime updatedAt,
+        LocalDateTime createdAt,
+        LocalDateTime updatedAt,
         String preview,
         RecentActivityDto recent
 ) {
 
     public DocListResponse(Long id, String title, LocalDateTime createdAt,
             LocalDateTime updatedAt, String preview, RecentActivityDto recent) {
-        this(id, title, createdAt.atOffset(ZoneOffset.ofHours(9)),
-                updatedAt.atOffset(ZoneOffset.ofHours(9)), preview, recent);
+        this.id = id;
+        this.title = title;
+        this.createdAt = createdAt.plusHours(9L);
+        this.updatedAt = updatedAt.plusHours(9L);
+        this.preview = preview;
+        this.recent = recent;
     }
 }

src/main/java/io/ejangs/docsa/domain/doc/dto/response/DocListSimpleResponse.java

@@ -2,20 +2,21 @@
 
 import io.ejangs.docsa.domain.doc.dto.RecentActivityDto;
 import java.time.LocalDateTime;
-import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
 
 public record DocListSimpleResponse(
         Long id,
         String title,
-        OffsetDateTime createdAt,
-        OffsetDateTime updatedAt,
+        LocalDateTime createdAt,
+        LocalDateTime updatedAt,
         RecentActivityDto recent
 ) {
 
     public DocListSimpleResponse(Long id, String title, LocalDateTime createdAt,
             LocalDateTime updatedAt, RecentActivityDto recent) {
-        this(id, title, createdAt.atOffset(ZoneOffset.ofHours(9)),
-                updatedAt.atOffset(ZoneOffset.ofHours(9)), recent);
+        this.id = id;
+        this.title = title;
+        this.createdAt = createdAt.plusHours(9L);
+        this.updatedAt = updatedAt.plusHours(9L);
+        this.recent = recent;
     }
 }

src/main/java/io/ejangs/docsa/domain/doc/dto/response/DocTitleUpdateResponse.java

@@ -1,20 +1,20 @@
 package io.ejangs.docsa.domain.doc.dto.response;
 
 import java.time.LocalDateTime;
-import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
 
 public record DocTitleUpdateResponse(
         Long id,
         String title,
-        OffsetDateTime updatedAt
+        LocalDateTime updatedAt
 ) {
 
     public DocTitleUpdateResponse(
             Long id,
             String title,
             LocalDateTime updatedAt
     ) {
-        this(id, title, updatedAt.atOffset(ZoneOffset.ofHours(9)));
+        this.id = id;
+        this.title = title;
+        this.updatedAt = updatedAt.plusHours(9L);
     }
 }

src/main/java/io/ejangs/docsa/domain/save/dto/response/SaveGetResponse.java

@@ -1,9 +1,13 @@
 package io.ejangs.docsa.domain.save.dto.response;
 
-import java.time.OffsetDateTime;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
-public record SaveGetResponse(OffsetDateTime updatedAt, List<Map<String, Object>> content) {
+public record SaveGetResponse(LocalDateTime updatedAt, List<Map<String, Object>> content) {
 
+    public SaveGetResponse(LocalDateTime updatedAt, List<Map<String, Object>> content) {
+        this.updatedAt = updatedAt.plusHours(9L);
+        this.content = content;
+    }
 }

src/main/java/io/ejangs/docsa/domain/save/dto/response/SaveUpdateResponse.java

@@ -1,7 +1,10 @@
 package io.ejangs.docsa.domain.save.dto.response;
 
-import java.time.OffsetDateTime;
+import java.time.LocalDateTime;
 
-public record SaveUpdateResponse(OffsetDateTime updatedAt) {
+public record SaveUpdateResponse(LocalDateTime updatedAt) {
 
+    public SaveUpdateResponse(LocalDateTime updatedAt) {
+        this.updatedAt = updatedAt.plusHours(9L);
+    }
 }

src/main/java/io/ejangs/docsa/domain/save/util/SaveMapper.java

@@ -3,23 +3,17 @@
 import io.ejangs.docsa.domain.save.dto.response.SaveGetResponse;
 import io.ejangs.docsa.domain.save.dto.response.SaveUpdateResponse;
 import java.time.LocalDateTime;
-import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
 import java.util.List;
 import java.util.Map;
 
 public class SaveMapper {
 
     public static SaveUpdateResponse toSaveUpdateResponse(LocalDateTime localDateTime) {
-        return new SaveUpdateResponse(toOffsetDateTime(localDateTime));
+        return new SaveUpdateResponse(localDateTime);
     }
 
     public static SaveGetResponse toSaveGetResponse(LocalDateTime localDateTime,
             List<Map<String, Object>> content) {
-        return new SaveGetResponse(toOffsetDateTime(localDateTime), content);
-    }
-
-    private static OffsetDateTime toOffsetDateTime(LocalDateTime localDateTime) {
-        return localDateTime.atOffset(ZoneOffset.ofHours(9));
+        return new SaveGetResponse(localDateTime, content);
     }
 }

src/test/java/io/ejangs/docsa/domain/doc/unit/DocServiceUnitTests.java

@@ -29,7 +29,6 @@
 import io.ejangs.docsa.global.exception.CustomException;
 import java.time.LocalDateTime;
 import java.util.Comparator;
-import java.time.OffsetDateTime;
 import java.util.List;
 import java.util.Optional;
 import org.junit.jupiter.api.DisplayName;
@@ -231,7 +230,7 @@ void getGraph_shouldReturnGraphResponse_whenDocExists() {
                 .thenReturn(Optional.of(new DocTitleOnlyResponse("Test Document")));
 
         // Mock Branch, Commit, Edge 리스트
-        OffsetDateTime now = OffsetDateTime.now();
+        LocalDateTime now = LocalDateTime.now();
         List<GraphBranchDto> branches = List.of(
                 new GraphBranchDto(1L, "main", now, null, null, null, null)
         );

src/test/java/io/ejangs/docsa/domain/save/api/SaveControllerTest.java

@@ -1,12 +1,10 @@
 package io.ejangs.docsa.domain.save.api;
 
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
 import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
@@ -17,7 +15,7 @@
 import io.ejangs.docsa.domain.save.dto.response.SaveGetResponse;
 import io.ejangs.docsa.domain.save.dto.response.SaveUpdateResponse;
 import io.ejangs.docsa.global.security.WithCustomMockUser;
-import java.time.OffsetDateTime;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 import org.junit.jupiter.api.BeforeEach;
@@ -68,7 +66,7 @@ void updateSave_success() throws Exception {
         Long saveId = 1L;
 
         when(saveService.updateSave(dto, request)).thenReturn(new SaveUpdateResponse(
-                OffsetDateTime.now()));
+                LocalDateTime.now()));
 
         mockMvc.perform(
                         put("/api/document/{documentId}/save/{saveId}", documentId, saveId)
@@ -104,7 +102,7 @@ void getSave_success() throws Exception {
         Long saveId = 1L;
 
         when(saveService.getSave(dto)).thenReturn(new SaveGetResponse(
-                OffsetDateTime.now(), data));
+                LocalDateTime.now(), data));
 
         mockMvc.perform(
                         get("/api/document/{documentId}/save/{saveId}", documentId, saveId))