Merge branch 'feat/#30' into release

Author: heygeeji

src/main/java/com/back/web7_9_codecrete_be/domain/community/comment/controller/CommentController.java

@@ -1,6 +1,7 @@
 package com.back.web7_9_codecrete_be.domain.community.comment.controller;
 
 import com.back.web7_9_codecrete_be.domain.community.comment.dto.request.CommentCreateRequest;
+import com.back.web7_9_codecrete_be.domain.community.comment.dto.request.CommentUpdateRequest;
 import com.back.web7_9_codecrete_be.domain.community.comment.service.CommentService;
 import com.back.web7_9_codecrete_be.domain.users.entity.User;
 import com.back.web7_9_codecrete_be.global.rq.Rq;
@@ -50,4 +51,16 @@ public RsData<?> deleteComment(
         commentService.delete(commentId, user.getId());
         return RsData.success("댓글이 삭제되었습니다.");
     }
+
+    @Operation(summary = "댓글 수정", description = "작성자 본인만 댓글을 수정할 수 있습니다.")
+    @PatchMapping("/{commentId}")
+    public RsData<?> updateComment(
+            @PathVariable Long postId,
+            @PathVariable Long commentId,
+            @Valid @RequestBody CommentUpdateRequest req
+    ) {
+        User user = rq.getUser();
+        commentService.update(commentId, req, user.getId());
+        return RsData.success("댓글이 수정되었습니다.");
+    }
 }

src/main/java/com/back/web7_9_codecrete_be/domain/community/comment/dto/request/CommentUpdateRequest.java

@@ -0,0 +1,16 @@
+package com.back.web7_9_codecrete_be.domain.community.comment.dto.request;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+@Schema(description = "댓글 수정 요청 DTO")
+public class CommentUpdateRequest {
+
+    @NotBlank(message = "댓글 내용은 비어 있을 수 없습니다.")
+    @Schema(description = "수정할 댓글 내용", example = "내용을 수정했습니다.")
+    private String content;
+}

src/main/java/com/back/web7_9_codecrete_be/domain/community/comment/dto/response/CommentResponse.java

@@ -24,12 +24,31 @@ public class CommentResponse {
     @Schema(description = "작성일시", example = "2025-01-03T18:40:00")
     private LocalDateTime createdDate;
 
+    @Schema(description = "수정일시", example = "2025-01-04T10:15:00")
+    private LocalDateTime modifiedDate;
+
+    @Schema(description = "수정 여부", example = "true")
+    private Boolean isEdited;
+
     public static CommentResponse from(Comment comment) {
         return CommentResponse.builder()
                 .commentId(comment.getCommentId())
                 .userId(comment.getUserId())
                 .content(comment.getContent())
                 .createdDate(comment.getCreatedDate())
+                .modifiedDate(comment.getModifiedDate())
+                .isEdited(isEdited(comment))
                 .build();
     }
+
+    private static boolean isEdited(Comment comment) {
+        if (comment.getModifiedDate() == null) {
+            return false;
+        }
+
+        LocalDateTime created = comment.getCreatedDate().withNano(0);
+        LocalDateTime modified = comment.getModifiedDate().withNano(0);
+
+        return !created.isEqual(modified);
+    }
 }

src/main/java/com/back/web7_9_codecrete_be/domain/community/comment/service/CommentService.java

@@ -1,14 +1,14 @@
 package com.back.web7_9_codecrete_be.domain.community.comment.service;
 
 import com.back.web7_9_codecrete_be.domain.community.comment.dto.request.CommentCreateRequest;
+import com.back.web7_9_codecrete_be.domain.community.comment.dto.request.CommentUpdateRequest;
 import com.back.web7_9_codecrete_be.domain.community.comment.dto.response.CommentPageResponse;
 import com.back.web7_9_codecrete_be.domain.community.comment.dto.response.CommentResponse;
 import com.back.web7_9_codecrete_be.domain.community.comment.entity.Comment;
 import com.back.web7_9_codecrete_be.domain.community.comment.repository.CommentRepository;
 import com.back.web7_9_codecrete_be.domain.community.post.entity.Post;
-import com.back.web7_9_codecrete_be.domain.community.post.repository.PostRepository;
+import com.back.web7_9_codecrete_be.domain.community.post.service.PostService;
 import com.back.web7_9_codecrete_be.global.error.code.CommentErrorCode;
-import com.back.web7_9_codecrete_be.global.error.code.PostErrorCode;
 import com.back.web7_9_codecrete_be.global.error.exception.BusinessException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
@@ -24,13 +24,12 @@
 public class CommentService {
 
     private final CommentRepository commentRepository;
-    private final PostRepository postRepository;
+    private final PostService postService;
 
     // 댓글 생성
     @Transactional
     public Long create(Long postId, CommentCreateRequest req, Long userId) {
-        Post post = postRepository.findById(postId)
-                .orElseThrow(() -> new BusinessException(PostErrorCode.POST_NOT_FOUND));
+        Post post = postService.getPostOrThrow(postId);
 
         Comment comment = Comment.create(
                 post,
@@ -44,6 +43,8 @@ public Long create(Long postId, CommentCreateRequest req, Long userId) {
     // 댓글 조회
     public CommentPageResponse<CommentResponse> getComments(Long postId, int page) {
 
+        postService.validatePostExists(postId);
+
         Pageable pageable = PageRequest.of(
                 page - 1,
                 20,
@@ -63,10 +64,24 @@ public void delete(Long commentId, Long userId) {
         Comment comment = commentRepository.findById(commentId)
                 .orElseThrow(() -> new BusinessException(CommentErrorCode.COMMENT_NOT_FOUND));
 
+        validateOwner(comment, userId);
+
+        commentRepository.delete(comment);
+    }
+
+    @Transactional
+    public void update(Long commentId, CommentUpdateRequest req, Long userId) {
+        Comment comment = commentRepository.findById(commentId)
+                .orElseThrow(() -> new BusinessException(CommentErrorCode.COMMENT_NOT_FOUND));
+
+        validateOwner(comment, userId);
+
+        comment.update(req.getContent());
+    }
+
+    private void validateOwner(Comment comment, Long userId) {
         if (!comment.getUserId().equals(userId)) {
             throw new BusinessException(CommentErrorCode.NO_COMMENT_PERMISSION);
         }
-
-        commentRepository.delete(comment);
     }
 }

src/main/java/com/back/web7_9_codecrete_be/domain/community/post/service/PostService.java

@@ -121,4 +121,17 @@ public PostPageResponse<PostResponse> getPostsByCategory(
 
         return PostPageResponse.from(result);
     }
+
+    @Transactional(readOnly = true)
+    public void validatePostExists(Long postId) {
+        if (!postRepository.existsById(postId)) {
+            throw new BusinessException(PostErrorCode.POST_NOT_FOUND);
+        }
+    }
+
+    @Transactional(readOnly = true)
+    public Post getPostOrThrow(Long postId) {
+        return postRepository.findById(postId)
+                .orElseThrow(() -> new BusinessException(PostErrorCode.POST_NOT_FOUND));
+    }
 }