🐞 BugFix: 일기 필드 타입 변경 및 날짜 중복 검사 로직 수정 (#64)

* 🐞 BugFix: 일기 date 필드 타입 LocalDate로 변경

* 🐞 BugFix: 일기 날짜 중복 검사 로직 수정

moodoodle-api/src/main/java/zzangdol/diary/business/DiaryMapper.java

@@ -28,7 +28,7 @@ public static DiaryResponse toDiaryResponse(Diary diary) {
 
     public static DiarySummaryResponse toDiarySummaryResponse(Diary diary) {
         return DiarySummaryResponse.builder()
-                .date(diary.getDate().toLocalDate())
+                .date(diary.getDate())
                 .id(diary.getId())
                 .imageUrl(diary.getPainting().getImageUrl())
                 .build();
@@ -41,7 +41,7 @@ public static DiaryListResponse toDiaryListResponse(List<Diary> diaries, int yea
 
         Map<LocalDate, Diary> diaryMap = diaries.stream()
                 .collect(Collectors.toMap(
-                        diary -> diary.getDate().toLocalDate(),
+                        diary -> diary.getDate(),
                         diary -> diary,
                         (existing, replacement) -> existing
                 ));

moodoodle-api/src/main/java/zzangdol/diary/implement/DiaryCommandServiceImpl.java

@@ -2,7 +2,6 @@
 
 import groovy.util.logging.Slf4j;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -38,13 +37,13 @@ public Diary createDiary(User user, DiaryCreateRequest request, String color,
         return diaryRepository.save(diary);
     }
 
-    private void validateDiaryDate(LocalDateTime date) {
-        if (date.toLocalDate().isAfter(LocalDate.now())) {
+    private void validateDiaryDate(LocalDate date) {
+        if (date.isAfter(LocalDate.now())) {
             throw DiaryDateOutOfBoundsException.EXCEPTION;
         }
     }
 
-    private void checkDiaryDuplication(User user, LocalDateTime date) {
+    private void checkDiaryDuplication(User user, LocalDate date) {
         if (diaryRepository.existsByDateAndUserId(date, user.getId())) {
             throw DiaryDuplicateDateException.EXCEPTION;
         }
@@ -84,13 +83,19 @@ public Diary updateDiary(User user, Long diaryId, DiaryUpdateRequest request) {
         checkDiaryOwnership(user, diary);
         if (request.getDate() != null) {
             validateDiaryDate(request.getDate());
-            checkDiaryDuplication(user, request.getDate());
+            checkDuplicateDiaryExcludingSelf(user, request.getDate(), diaryId);
         }
         diary.updateDate(request.getDate());
         diary.updateContent(request.getContent());
         return diary;
     }
 
+    private void checkDuplicateDiaryExcludingSelf(User user, LocalDate date, Long diaryId) {
+        if (diaryRepository.existsByDateAndUserIdAndIdNot(date, user.getId(), diaryId)) {
+            throw DiaryDuplicateDateException.EXCEPTION;
+        }
+    }
+
     @Override
     public void deleteDiary(User user, Long diaryId) {
         Diary diary = diaryRepository.findById(diaryId)

moodoodle-api/src/main/java/zzangdol/diary/presentation/dto/request/DiaryCreateRequest.java

@@ -3,7 +3,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
-import java.time.LocalDateTime;
+import java.time.LocalDate;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -15,9 +15,9 @@
 @AllArgsConstructor
 public class DiaryCreateRequest {
 
-    @Schema(example = "2024-04-21T21:10", type = "string")
+    @Schema(example = "2024-04-21", type = "string")
     @NotNull(message = "date는 필수값입니다.")
-    private LocalDateTime date;
+    private LocalDate date;
 
     @Schema(example = "오늘은 오랜만에 친구들과 놀이공원에 다녀왔다. 정말 신나는 하루였다. 집에 돌아오는 길에는 조금 허전하고 아쉬운 마음도 들었지만, 오늘 하루 친구들과 함께 할 수 있어서 정말 행복했다.")
     @NotEmpty(message = "content는 필수값입니다.")

moodoodle-api/src/main/java/zzangdol/diary/presentation/dto/request/DiaryUpdateRequest.java

@@ -1,7 +1,7 @@
 package zzangdol.diary.presentation.dto.request;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import java.time.LocalDateTime;
+import java.time.LocalDate;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -13,8 +13,8 @@
 @AllArgsConstructor
 public class DiaryUpdateRequest {
 
-    @Schema(example = "2024-04-20T21:10", type = "string")
-    private LocalDateTime date;
+    @Schema(example = "2024-04-20", type = "string")
+    private LocalDate date;
 
     @Schema(example = "오늘은 오랜만에 친구들과 놀이공원에 다녀왔다. 츄러스도 먹고 정말 신나는 하루였다. 집에 돌아오는 길에는 조금 허전하고 아쉬운 마음도 들었지만, 오늘 하루 친구들과 함께 할 수 있어서 정말 행복했다.")
     private String content;

moodoodle-api/src/main/java/zzangdol/diary/presentation/dto/response/DiaryResponse.java

@@ -1,6 +1,6 @@
 package zzangdol.diary.presentation.dto.response;
 
-import java.time.LocalDateTime;
+import java.time.LocalDate;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -13,7 +13,7 @@
 public class DiaryResponse {
 
     private Long id;
-    private LocalDateTime date;
+    private LocalDate date;
     private String content;
     private String imageUrl;
     private String color;

moodoodle-domain/src/main/java/zzangdol/diary/dao/DiaryRepository.java

@@ -1,13 +1,15 @@
 package zzangdol.diary.dao;
 
-import java.time.LocalDateTime;
+import java.time.LocalDate;
 import org.springframework.data.jpa.repository.JpaRepository;
 import zzangdol.diary.domain.Diary;
 import zzangdol.user.domain.User;
 
 public interface DiaryRepository extends JpaRepository<Diary, Long> {
 
-    boolean existsByDateAndUserId(LocalDateTime date, Long userId);
+    boolean existsByDateAndUserId(LocalDate date, Long userId);
+
+    boolean existsByDateAndUserIdAndIdNot(LocalDate date, Long userId, Long id);
 
     void deleteByUser(User user);
 

moodoodle-domain/src/main/java/zzangdol/diary/dao/querydsl/DiaryQueryRepositoryImpl.java

@@ -1,11 +1,12 @@
 package zzangdol.diary.dao.querydsl;
 
+import static zzangdol.diary.domain.QDiary.diary;
+
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 import zzangdol.diary.domain.Diary;
-import zzangdol.diary.domain.QDiary;
 
 @Repository
 @RequiredArgsConstructor
@@ -14,13 +15,11 @@ public class DiaryQueryRepositoryImpl implements DiaryQueryRepository {
     private final JPAQueryFactory queryFactory;
 
     public List<Diary> findDiariesByUserAndYearAndMonth(Long userId, int year, int month) {
-        QDiary qDiary = QDiary.diary;
-
-        return queryFactory.selectFrom(qDiary)
-                .where(qDiary.user.id.eq(userId)
-                        .and(qDiary.date.year().eq(year))
-                        .and(qDiary.date.month().eq(month)))
-                .orderBy(qDiary.date.asc())
+        return queryFactory.selectFrom(diary)
+                .where(diary.user.id.eq(userId)
+                        .and(diary.date.year().eq(year))
+                        .and(diary.date.month().eq(month)))
+                .orderBy(diary.date.asc())
                 .fetch();
     }
 

moodoodle-domain/src/main/java/zzangdol/diary/domain/Diary.java

@@ -10,7 +10,7 @@
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
-import java.time.LocalDateTime;
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 import lombok.AccessLevel;
@@ -29,7 +29,7 @@ public class Diary extends BaseTimeEntity {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    private LocalDateTime date;
+    private LocalDate date;
     private String content;
 
     @ManyToOne(fetch = FetchType.LAZY)
@@ -44,14 +44,14 @@ public class Diary extends BaseTimeEntity {
     private List<DiaryEmotion> diaryEmotions = new ArrayList<>();
 
     @Builder
-    public Diary(LocalDateTime date, String content, User user, Painting painting) {
+    public Diary(LocalDate date, String content, User user, Painting painting) {
         this.date = date;
         this.content = content;
         this.user = user;
         this.painting = painting;
     }
 
-    public void updateDate(LocalDateTime date) {
+    public void updateDate(LocalDate date) {
         if (date != null) {
             this.date = date;
         }