Bug: 충돌 해결 (#79)

Team-Clody · Jul 16, 2024 · 419ad78 · 419ad78
1 parent 39553bb
commit 419ad78
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 0 deletions.
diff --git a/src/main/java/com/donkeys_today/server/application/diary/DiaryService.java b/src/main/java/com/donkeys_today/server/application/diary/DiaryService.java
@@ -41,6 +41,8 @@ public class DiaryService {
   private final DiaryRetriever diaryRetriever;
   private final ReplyService replyService;
   private final DiaryCreator diaryCreator;
+  private final DiaryRemover diaryRemover;
+
   public DiaryListGetResponse getDiaryList(int year, int month) {
     Map<LocalDate, List<Diary>> diariesByDate = getDiariesMap(year, month);
     Map<LocalDate, Reply> repliesByDate = getRepliesMap(year, month);

diff --git a/src/main/java/com/donkeys_today/server/application/reply/ReplyRetriever.java b/src/main/java/com/donkeys_today/server/application/reply/ReplyRetriever.java
@@ -30,4 +30,9 @@ public List<Reply> getRepliesByUserAndDateBetween(User user, LocalDate start, Lo
 
     return replyRepository.findByUserIdAndDiaryCreatedDateBetween(user.getId(), start, end);
   }
+
+  public boolean isReplyExist(Long userId, int year, int month, int date) {
+    LocalDate localDate = LocalDate.of(year, month, date);
+    return replyRepository.existsByUserIdAndDiaryCreatedDate(userId, localDate);
+  }
 }
diff --git a/src/main/java/com/donkeys_today/server/application/reply/ReplyService.java b/src/main/java/com/donkeys_today/server/application/reply/ReplyService.java
@@ -28,4 +28,12 @@ public List<Reply> getRepliesByUserAndDateBetween(User user, LocalDate start, Lo
 
     return replyRetriever.getRepliesByUserAndDateBetween(user, start, end);
   }
+
+  public boolean isReplyExist(Long userId, int year, int month, int date) {
+    return replyRetriever.isReplyExist(userId, year, month, date);
+  }
+
+  public void removeReply(Long userId, int year, int month, int date) {
+    replyRemover.removeReplyUserIdAndDate(userId, year, month, date);
+  }
 }
diff --git a/src/main/java/com/donkeys_today/server/presentation/api/DiaryController.java b/src/main/java/com/donkeys_today/server/presentation/api/DiaryController.java
@@ -61,4 +61,12 @@ ResponseEntity<ApiResponse<DiaryCreatedTimeGetResponse>> getDiaryCreatedTime(
             @RequestParam @Parameter(name = "달", description = "조회할 달", required = true) final int month,
             @RequestParam @Parameter(name = "일", description = "조회할 일", required = true) final int day
     );
+
+    @Operation(summary = "일기 삭제 ", description = "년/월/일을 이용하여 일기와 답변까지 삭제합니다. 만약 답변이 요청 중인 상태라면, 답변을 요청하지 않습니다.")
+    @DeleteMapping("/diary")
+    ResponseEntity<ApiResponse<?>> deleteDiary(
+            @RequestParam @Parameter(name = "연도", description = "삭제할 연도", required = true) final int year,
+            @RequestParam @Parameter(name = "달", description = "삭제할 달", required = true) final int month,
+            @RequestParam @Parameter(name = "일", description = "삭제할 일", required = true) final int day
+    );
 }