Merge pull request #38 from HyeJiJUN11/feature/32-Comment

feat: 댓글/알림 API 구현

src/main/java/com/potatocake/everymoment/controller/CommentController.java

@@ -0,0 +1,51 @@
+package com.potatocake.everymoment.controller;
+
+import com.potatocake.everymoment.dto.SuccessResponse;
+import com.potatocake.everymoment.dto.request.CommentRequest;
+import com.potatocake.everymoment.security.MemberDetails;
+import com.potatocake.everymoment.service.CommentService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PatchMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/api/comments")
+public class CommentController {
+
+    private final CommentService commentService;
+
+    //댓글 수정
+    @PatchMapping("/{commentId}")
+    public ResponseEntity<SuccessResponse<Void>> updateComment(
+            @AuthenticationPrincipal MemberDetails memberDetails,
+            @PathVariable Long commentId,
+            @RequestBody CommentRequest commentRequest) {
+        Long memberId = memberDetails.getId();
+
+        commentService.updateComment(memberId, commentId, commentRequest);
+
+        return ResponseEntity.ok()
+                .body(SuccessResponse.ok());
+    }
+
+    //댓글 삭제
+    @DeleteMapping("/{commentId}")
+    public ResponseEntity<SuccessResponse<Void>> deleteComment(
+            @AuthenticationPrincipal MemberDetails memberDetails,
+            @PathVariable Long commentId) {
+        Long memberId = memberDetails.getId();
+
+        commentService.deleteComment(memberId, commentId);
+
+        return ResponseEntity.ok()
+                .body(SuccessResponse.ok());
+    }
+}

src/main/java/com/potatocake/everymoment/controller/DiaryController.java

@@ -1,21 +1,27 @@
 package com.potatocake.everymoment.controller;
 
 import com.potatocake.everymoment.dto.SuccessResponse;
+import com.potatocake.everymoment.dto.request.CommentRequest;
 import com.potatocake.everymoment.dto.request.DiaryAutoCreateRequest;
 import com.potatocake.everymoment.dto.request.DiaryFilterRequest;
 import com.potatocake.everymoment.dto.request.DiaryManualCreateRequest;
+import com.potatocake.everymoment.dto.response.CommentsResponse;
 import com.potatocake.everymoment.dto.response.FriendDiariesResponse;
 import com.potatocake.everymoment.dto.response.FriendDiaryResponse;
+import com.potatocake.everymoment.dto.response.MemberDetailResponse;
 import com.potatocake.everymoment.dto.response.MyDiariesResponse;
 import com.potatocake.everymoment.dto.response.MyDiaryResponse;
 import com.potatocake.everymoment.dto.response.NotificationResponse;
+import com.potatocake.everymoment.security.MemberDetails;
+import com.potatocake.everymoment.service.CommentService;
 import com.potatocake.everymoment.service.DiaryService;
 import com.potatocake.everymoment.service.FriendDiaryService;
 import java.time.LocalDate;
 import lombok.RequiredArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PatchMapping;
@@ -33,36 +39,37 @@ public class DiaryController {
 
     private final DiaryService diaryService;
     private final FriendDiaryService friendDiaryService;
+    private final CommentService commentService;
 
     //자동 일기 작성
     @PostMapping("/auto")
     public ResponseEntity<SuccessResponse<NotificationResponse>> createDiaryAuto(
+            @AuthenticationPrincipal MemberDetails memberDetails,
             @RequestBody DiaryAutoCreateRequest diaryAutoCreateRequest) {
-        NotificationResponse notificationResponse = diaryService.createDiaryAuto(diaryAutoCreateRequest);
-        SuccessResponse<NotificationResponse> response = SuccessResponse.<NotificationResponse>builder()
-                .code(HttpStatus.OK.value())
-                .message("success")
-                .info(notificationResponse)
-                .build();
-        return ResponseEntity.ok(response);
+        Long memberId = memberDetails.getId();
+
+        NotificationResponse response = diaryService.createDiaryAuto(memberId, diaryAutoCreateRequest);
+
+        return ResponseEntity.ok()
+                .body(SuccessResponse.ok(response));
     }
 
     //수기 일기 작성
     @PostMapping("/manual")
     public ResponseEntity<SuccessResponse<Void>> createDiaryManual(
+            @AuthenticationPrincipal MemberDetails memberDetails,
             @RequestBody DiaryManualCreateRequest diaryManualCreateRequest) {
-        diaryService.createDiaryManual(diaryManualCreateRequest);
-        SuccessResponse<Void> response = SuccessResponse.<Void>builder()
-                .code(HttpStatus.OK.value())
-                .message("success")
-                .info(null)
-                .build();
-        return ResponseEntity.ok(response);
+        Long memberId = memberDetails.getId();
+        diaryService.createDiaryManual(memberId, diaryManualCreateRequest);
+
+        return ResponseEntity.ok()
+                .body(SuccessResponse.ok());
     }
 
     //내 일기 전체 조회(타임라인)
     @GetMapping("/my")
     public ResponseEntity<SuccessResponse<MyDiariesResponse>> getMyDiaries(
+            @AuthenticationPrincipal MemberDetails memberDetails,
             @RequestParam(required = false) String keyword,
             @RequestParam(required = false) String emoji,
             @RequestParam(required = false) Long category,
@@ -73,6 +80,7 @@ public ResponseEntity<SuccessResponse<MyDiariesResponse>> getMyDiaries(
             @RequestParam(defaultValue = "0") int key,
             @RequestParam(defaultValue = "10") int size
     ) {
+        Long memberId = memberDetails.getId();
         DiaryFilterRequest diaryFilterRequest = DiaryFilterRequest.builder()
                 .keyword(keyword)
                 .emoji(emoji)
@@ -85,79 +93,82 @@ public ResponseEntity<SuccessResponse<MyDiariesResponse>> getMyDiaries(
                 .size(size)
                 .build();
 
-        MyDiariesResponse myDiariesResponse = diaryService.getMyDiaries(diaryFilterRequest);
-        SuccessResponse<MyDiariesResponse> response = SuccessResponse.<MyDiariesResponse>builder()
-                .code(HttpStatus.OK.value())
-                .message("success")
-                .info(myDiariesResponse)
-                .build();
-        return ResponseEntity.ok(response);
+        MyDiariesResponse response = diaryService.getMyDiaries(memberId, diaryFilterRequest);
+
+        return ResponseEntity.ok()
+                .body(SuccessResponse.ok(response));
     }
 
     //내 일기 상세 조회
-    @GetMapping("/my/{id}")
-    public ResponseEntity<SuccessResponse<MyDiaryResponse>> getMyDiary(@PathVariable Long id) {
-        MyDiaryResponse myDiaryResponse = diaryService.getMyDiary(id);
-        SuccessResponse<MyDiaryResponse> response = SuccessResponse.<MyDiaryResponse>builder()
-                .code(HttpStatus.OK.value())
-                .message("success")
-                .info(myDiaryResponse)
-                .build();
-        return ResponseEntity.ok(response);
+    @GetMapping("/my/{diaryId}")
+    public ResponseEntity<SuccessResponse<MyDiaryResponse>> getMyDiary(
+            @AuthenticationPrincipal MemberDetails memberDetails,
+            @PathVariable Long diaryId) {
+        Long memberId = memberDetails.getId();
+
+        MyDiaryResponse response = diaryService.getMyDiary(memberId, diaryId);
+
+        return ResponseEntity.ok()
+                .body(SuccessResponse.ok(response));
     }
 
     //일기 수정
-    @PatchMapping("/{id}")
-    public ResponseEntity<SuccessResponse<Void>> updateDiary(@PathVariable Long id,
-                                                             @RequestBody DiaryManualCreateRequest diaryManualCreateRequest) {
-        diaryService.updateDiary(id, diaryManualCreateRequest);
-        SuccessResponse<Void> response = SuccessResponse.<Void>builder()
-                .code(HttpStatus.OK.value())
-                .message("success")
-                .info(null)
-                .build();
-        return ResponseEntity.ok(response);
+    @PatchMapping("/{diaryId}")
+    public ResponseEntity<SuccessResponse<Void>> updateDiary(
+            @AuthenticationPrincipal MemberDetails memberDetails,
+            @PathVariable Long diaryId,
+            @RequestBody DiaryManualCreateRequest diaryManualCreateRequest) {
+        Long memberId = memberDetails.getId();
+
+        diaryService.updateDiary(memberId, diaryId, diaryManualCreateRequest);
+
+        return ResponseEntity.ok()
+                .body(SuccessResponse.ok());
     }
 
     //일기 삭제
-    @DeleteMapping("/{id}")
-    public ResponseEntity<SuccessResponse<Void>> deleteDiary(@PathVariable Long id) {
-        diaryService.deleteDiary(id);
-        SuccessResponse<Void> response = SuccessResponse.<Void>builder()
-                .code(HttpStatus.OK.value())
-                .message("success")
-                .info(null)
-                .build();
-        return ResponseEntity.ok(response);
+    @DeleteMapping("/{diaryId}")
+    public ResponseEntity<SuccessResponse<Void>> deleteDiary(
+            @AuthenticationPrincipal MemberDetails memberDetails,
+            @PathVariable Long diaryId) {
+        Long memberId = memberDetails.getId();
+
+        diaryService.deleteDiary(memberId, diaryId);
+
+        return ResponseEntity.ok()
+                .body(SuccessResponse.ok());
     }
 
     //북마크 설정 토글
-    @PatchMapping("/{id}/bookmark")
-    public ResponseEntity<SuccessResponse<Void>> toggleBookmark(@PathVariable Long id) {
-        diaryService.toggleBookmark(id);
-        SuccessResponse<Void> response = SuccessResponse.<Void>builder()
-                .code(HttpStatus.OK.value())
-                .message("success")
-                .info(null)
-                .build();
-        return ResponseEntity.ok(response);
+    @PatchMapping("/{diaryId}/bookmark")
+    public ResponseEntity<SuccessResponse<Void>> toggleBookmark(
+            @AuthenticationPrincipal MemberDetails memberDetails,
+            @PathVariable Long diaryId) {
+        Long memberId = memberDetails.getId();
+
+        diaryService.toggleBookmark(memberId, diaryId);
+
+        return ResponseEntity.ok()
+                .body(SuccessResponse.ok());
     }
 
     //공개 설정 토글
-    @PatchMapping("/{id}/privacy")
-    public ResponseEntity<SuccessResponse<Void>> togglePrivacy(@PathVariable Long id) {
-        diaryService.togglePrivacy(id);
-        SuccessResponse<Void> response = SuccessResponse.<Void>builder()
-                .code(HttpStatus.OK.value())
-                .message("success")
-                .info(null)
-                .build();
-        return ResponseEntity.ok(response);
+    @PatchMapping("/{diaryId}/privacy")
+    public ResponseEntity<SuccessResponse<Void>> togglePrivacy(
+            @AuthenticationPrincipal MemberDetails memberDetails,
+            @PathVariable Long diaryId) {
+        Long memberId = memberDetails.getId();
+
+        diaryService.togglePrivacy(memberId, diaryId);
+
+        return ResponseEntity.ok()
+                .body(SuccessResponse.ok());
     }
 
     //전체 친구 일기 조회
     @GetMapping("/friend")
     public ResponseEntity<SuccessResponse<FriendDiariesResponse>> getFriendDiaries(
+            @AuthenticationPrincipal MemberDetails memberDetails,
             @RequestParam(required = false) String keyword,
             @RequestParam(required = false) String emoji,
             @RequestParam(required = false) Long category,
@@ -168,6 +179,7 @@ public ResponseEntity<SuccessResponse<FriendDiariesResponse>> getFriendDiaries(
             @RequestParam(defaultValue = "0") int key,
             @RequestParam(defaultValue = "10") int size
     ) {
+        Long memberId = memberDetails.getId();
         DiaryFilterRequest diaryFilterRequest = DiaryFilterRequest.builder()
                 .keyword(keyword)
                 .emoji(emoji)
@@ -180,24 +192,49 @@ public ResponseEntity<SuccessResponse<FriendDiariesResponse>> getFriendDiaries(
                 .size(size)
                 .build();
 
-        FriendDiariesResponse diaries = friendDiaryService.getFriendDiaries(diaryFilterRequest);
-        SuccessResponse<FriendDiariesResponse> response = SuccessResponse.<FriendDiariesResponse>builder()
-                .code(HttpStatus.OK.value())
-                .message("success")
-                .info(diaries)
-                .build();
-        return ResponseEntity.ok(response);
+        FriendDiariesResponse response = friendDiaryService.getFriendDiaries(memberId, diaryFilterRequest);
+
+        return ResponseEntity.ok()
+                .body(SuccessResponse.ok(response));
     }
 
     //친구 일기 상제 조회
-    @GetMapping("/friend/{id}")
-    public ResponseEntity<SuccessResponse<FriendDiaryResponse>> getFriendDiary(@PathVariable Long id) {
-        FriendDiaryResponse diary = friendDiaryService.getFriendDiary(id);
-        SuccessResponse<FriendDiaryResponse> response = SuccessResponse.<FriendDiaryResponse>builder()
-                .code(HttpStatus.OK.value())
-                .message("success")
-                .info(diary)
-                .build();
-        return ResponseEntity.ok(response);
+    @GetMapping("/friend/{diaryId}")
+    public ResponseEntity<SuccessResponse<FriendDiaryResponse>> getFriendDiary(
+            @AuthenticationPrincipal MemberDetails memberDetails,
+            @PathVariable Long diaryId) {
+        Long memberId = memberDetails.getId();
+
+        FriendDiaryResponse response = friendDiaryService.getFriendDiary(memberId, diaryId);
+
+        return ResponseEntity.ok()
+                .body(SuccessResponse.ok(response));
+    }
+
+    //댓글 조회
+    @GetMapping("/{diaryId}/comments")
+    public ResponseEntity<SuccessResponse<CommentsResponse>> getComments(
+            @PathVariable Long diaryId,
+            @RequestParam(defaultValue = "0") int key,
+            @RequestParam(defaultValue = "10") int size
+    ) {
+        CommentsResponse response = commentService.getComments(diaryId, key, size);
+
+        return ResponseEntity.ok()
+                .body(SuccessResponse.ok(response));
+    }
+
+    //댓글 작성
+    @PostMapping("/{diaryId}/comments")
+    public ResponseEntity<SuccessResponse<Void>> createComment(
+            @AuthenticationPrincipal MemberDetails memberDetails,
+            @PathVariable Long diaryId,
+            @RequestBody CommentRequest commentRequest) {
+        Long memberId = memberDetails.getId();
+
+        commentService.createComment(memberId, diaryId, commentRequest);
+
+        return ResponseEntity.ok()
+                .body(SuccessResponse.ok());
     }
 }