Merge pull request #22 from Ha-dam/feat/21-searchDiary

feat: diary title search API
Ha-dam · Dec 12, 2023 · 08e9076 · 08e9076
2 parents 6e1dbfb + 4dac19c
commit 08e9076
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/src/main/java/com/hadam/hadam/controller/DiaryController.java b/src/main/java/com/hadam/hadam/controller/DiaryController.java
@@ -60,4 +60,10 @@ public ResponseEntity<BaseResponse<?>> detailDiary(@PathVariable Long diaryId){
                 .body(BaseResponse.of(SuccessCode.OK, diaryService.getDetailDiary(diaryId)));
     }
 
+    @GetMapping("/search")
+    public ResponseEntity<BaseResponse<?>> searchDiary(@RequestParam String keyword, @RequestParam Long memberId, @RequestParam int year, @RequestParam int month){
+        return ResponseEntity.status(HttpStatus.OK)
+                .body(BaseResponse.of(SuccessCode.OK, diaryService.getSearchDiary(keyword, memberId, year, month)));
+    }
+
 }
diff --git a/src/main/java/com/hadam/hadam/service/DiaryService.java b/src/main/java/com/hadam/hadam/service/DiaryService.java
@@ -141,5 +141,24 @@ public DiaryDetailRes getDetailDiary(Long diaryId){
         );
     }
 
+    @Transactional(readOnly = true)
+    public List<MonthlyListReq> getSearchDiary(String keyword, Long memberId, int year, int month){
+
+        List<Diary> diaries = diaryRepository.findDiariesByMemberIdAndYearMonth(
+                memberId,
+                year,
+                month
+        );
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("d");
+        return diaries.stream()
+                .filter(diary -> diary.getTitle().contains(keyword))
+                .map(diary -> new MonthlyListReq(
+                        diary.getId(),
+                        diary.getImg(),
+                        truncateContent(diary.getTitle()), // truncateContent 메서드 사용
+                        diary.getDate().format(formatter)
+                ))
+                .collect(Collectors.toList());
+    }
 
 }