Merge pull request #18 from Ha-dam/feat/11-monthlyDiary

fix: add diary title
Ha-dam · Dec 11, 2023 · 239de94 · 239de94
2 parents 6248bb0 + 8cf1753
commit 239de94
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/java/com/hadam/hadam/domain/Diary.java b/src/main/java/com/hadam/hadam/domain/Diary.java
@@ -23,6 +23,8 @@ public class Diary extends BaseTimeEntity {
     @Column(columnDefinition = "LONGTEXT")
     private String img;
 
+    private String title;
+
     @Column(columnDefinition = "TEXT")
     private String content;
 

diff --git a/src/main/java/com/hadam/hadam/service/DiaryService.java b/src/main/java/com/hadam/hadam/service/DiaryService.java
@@ -94,7 +94,7 @@ public List<MonthlyListReq> getMonthlyAllDiaryNew(Long memberId, int year, int m
                 .map(diary -> new MonthlyListReq(
                         diary.getId(),
                         diary.getImg(),
-                        truncateContent(diary.getContent()),  // truncateContent 메서드 사용
+                        truncateContent(diary.getTitle()),  // truncateContent 메서드 사용
                         diary.getDate().format(formatter)
                 ))
                 .sorted(Comparator.comparing(MonthlyListReq::date).reversed())
@@ -114,7 +114,7 @@ public List<MonthlyListReq> getMonthlyAllDiaryOld(Long memberId, int year, int m
                 .map(diary -> new MonthlyListReq(
                         diary.getId(),
                         diary.getImg(),
-                        truncateContent(diary.getContent()),  // truncateContent 메서드 사용
+                        truncateContent(diary.getTitle()),  // truncateContent 메서드 사용
                         diary.getDate().format(formatter)
                 ))
                 .sorted(Comparator.comparing(MonthlyListReq::date))