refactor: change localdatetime to localdate

Unithon11th-Team5 · Apr 6, 2024 · ad4725e · ad4725e
1 parent c51384b
commit ad4725e
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 25 deletions.
diff --git a/src/main/java/unithon/team5/common/BaseEntity.java b/src/main/java/unithon/team5/common/BaseEntity.java
@@ -6,7 +6,7 @@
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
-import java.time.Instant;
+import java.time.LocalDateTime;
 import java.util.Objects;
 import java.util.UUID;
 
@@ -20,11 +20,11 @@ public class BaseEntity {
 
     @Column(name = "created_at", updatable = false)
     @CreatedDate
-    private Instant createdAt;
+    private LocalDateTime createdAt;
 
     @Column(name = "last_modified_at")
     @LastModifiedDate
-    private Instant lastModifiedAt;
+    private LocalDateTime lastModifiedAt;
 
     public BaseEntity(UUID id) {
         this.id = id;

diff --git a/src/main/java/unithon/team5/event/Event.java b/src/main/java/unithon/team5/event/Event.java
@@ -6,7 +6,7 @@
 import lombok.Getter;
 import unithon.team5.common.BaseEntity;
 
-import java.time.LocalDateTime;
+import java.time.LocalDate;
 import java.util.UUID;
 
 @Entity
@@ -17,15 +17,15 @@ protected Event() {
         super(null);
     }
 
-    private Event(final UUID id, final UUID memberId, final String content, final LocalDateTime plannedAt) {
+    private Event(final UUID id, final UUID memberId, final String content, final LocalDate plannedAt) {
         super(id);
         this.memberId = memberId;
         this.content = content;
         this.plannedAt = plannedAt;
     }
 
     @Builder
-    public Event(final UUID memberId, final String content, final LocalDateTime plannedAt) {
+    public Event(final UUID memberId, final String content, final LocalDate plannedAt) {
         this(null, memberId, content, plannedAt);
     }
 
@@ -36,9 +36,9 @@ public Event(final UUID memberId, final String content, final LocalDateTime plan
     private String content;
 
     @Column(nullable = false)
-    private LocalDateTime plannedAt;
+    private LocalDate plannedAt;
 
-    public static Event create(final UUID memberId, final String content, final LocalDateTime plannedAt) {
+    public static Event create(final UUID memberId, final String content, final LocalDate plannedAt) {
         return new Event(null, memberId, content, plannedAt);
     }
 }
diff --git a/src/main/java/unithon/team5/event/dto/EventResponse.java b/src/main/java/unithon/team5/event/dto/EventResponse.java
@@ -14,6 +14,6 @@ public static List<EventResponse> createList(final List<Event> event) {
     }
 
     public static EventResponse from(final Event event) {
-        return new EventResponse(event.getContent(), event.getPlannedAt().toLocalDate());
+        return new EventResponse(event.getContent(), event.getPlannedAt());
     }
 }
diff --git a/src/main/java/unithon/team5/event/repository/EventRepository.java b/src/main/java/unithon/team5/event/repository/EventRepository.java
@@ -4,7 +4,7 @@
 import org.springframework.data.jpa.repository.Query;
 import unithon.team5.event.Event;
 
-import java.time.LocalDateTime;
+import java.time.LocalDate;
 import java.util.Optional;
 import java.util.UUID;
 
@@ -17,5 +17,5 @@ public interface EventRepository extends JpaRepository<Event, UUID> {
             AND event.plannedAt >= :today
             order by event.plannedAt
             """)
-    Optional<Event> findEventAfterToday(final UUID memberId, final LocalDateTime today);
+    Optional<Event> findEventAfterToday(final UUID memberId, final LocalDate today);
 }
diff --git a/src/main/java/unithon/team5/event/service/EventService.java b/src/main/java/unithon/team5/event/service/EventService.java
@@ -21,7 +21,7 @@ public class EventService {
     public String addEvent(final Member member, final LocalDate plannedAt, final String content) {
         final Event event = Event.builder()
                 .memberId(member.getId())
-                .plannedAt(plannedAt.atStartOfDay())
+                .plannedAt(plannedAt)
                 .content(content)
                 .build();
         final UUID eventId = eventRepository.save(event).getId();
@@ -31,6 +31,6 @@ public String addEvent(final Member member, final LocalDate plannedAt, final Str
     @Transactional(readOnly = true)
     public Optional<Event> findMemberEventAfterToday(final String memberId) {
         final UUID memberUUID = UUID.fromString(memberId);
-        return eventRepository.findEventAfterToday(memberUUID, LocalDate.now().atStartOfDay());
+        return eventRepository.findEventAfterToday(memberUUID, LocalDate.now());
     }
 }
diff --git a/src/main/java/unithon/team5/message/Message.java b/src/main/java/unithon/team5/message/Message.java
@@ -7,7 +7,7 @@
 import lombok.Getter;
 import unithon.team5.common.BaseEntity;
 
-import java.time.LocalDateTime;
+import java.time.LocalDate;
 import java.util.UUID;
 
 @Entity
@@ -23,7 +23,7 @@ private Message(final UUID senderId,
                     final String senderName,
                     final String content,
                     final MessageType type,
-                    final LocalDateTime sendPlannedAt) {
+                    final LocalDate sendPlannedAt) {
         super(null);
         this.senderId = senderId;
         this.receiverId = receiverId;
@@ -49,7 +49,7 @@ private Message(final UUID senderId,
     private MessageType type;
 
     @Column(nullable = false)
-    private LocalDateTime sendPlannedAt;
+    private LocalDate sendPlannedAt;
 
     private Boolean isRead;
 
@@ -62,7 +62,7 @@ public static Message create(final UUID senderId,
                                  final String senderName,
                                  final String content,
                                  final MessageType type,
-                                 final LocalDateTime sendPlannedAt) {
+                                 final LocalDate sendPlannedAt) {
         return new Message(senderId, receiverId, senderName, content, type, sendPlannedAt);
     }
 }
diff --git a/src/main/java/unithon/team5/message/dto/MessageRequest.java b/src/main/java/unithon/team5/message/dto/MessageRequest.java
@@ -1,14 +1,13 @@
 package unithon.team5.message.dto;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import unithon.team5.message.MessageType;
 
-import java.time.LocalDateTime;
+import java.time.LocalDate;
 
 @Getter
 @AllArgsConstructor
@@ -24,6 +23,5 @@ public class MessageRequest {
     @NotNull
     private MessageType type;
     @NotNull
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
-    private LocalDateTime sendPlannedAt;
+    private LocalDate sendPlannedAt;
 }
diff --git a/src/main/java/unithon/team5/message/dto/MessageResponse.java b/src/main/java/unithon/team5/message/dto/MessageResponse.java
@@ -1,13 +1,12 @@
 package unithon.team5.message.dto;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import unithon.team5.message.Message;
 import unithon.team5.message.MessageType;
 
-import java.time.LocalDateTime;
+import java.time.LocalDate;
 import java.util.UUID;
 
 @Getter
@@ -18,8 +17,7 @@ public class MessageResponse {
     private UUID id;
     private String senderName;
     private String content;
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
-    private LocalDateTime sentAt;
+    private LocalDate sentAt;
     private MessageType type;
 
     public static MessageResponse of(final Message message) {