댓글 기능 추가 / 기존 기능 리팩토링 / 조회수 기능 추가

src/main/java/com/board/BoardApplication.java → src/main/java/com/BoardApplication.java

@@ -1,4 +1,4 @@
-package com.board;
+package com;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

src/main/java/com/board/board/controller/BlogApiController.java → src/main/java/com/board/controller/ArticleController.java

@@ -1,14 +1,16 @@
-package com.board.board.controller;
+package com.board.controller;
 
-import com.board.board.dto.request.ArticleCreateRequest;
-import com.board.board.dto.request.ArticleUpdateRequest;
-import com.board.board.dto.response.ArticleResponse;
-import com.board.board.entity.ArticleEntity;
-import com.board.board.service.BlogService;
-import com.board.config.auth.annotation.AuthenticatedMember;
+import com.board.dto.request.ArticleCreateRequest;
+import com.board.dto.request.ArticleUpdateRequest;
+import com.board.dto.response.ArticleResponse;
+import com.board.entity.ArticleEntity;
+import com.board.service.ArticleService;
+import com.config.auth.annotation.AuthenticatedMember;
+import com.util.page.PageResponse;
+import com.util.sort.SortUtils;
 import jakarta.validation.Valid;
-import java.util.List;
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -26,36 +28,35 @@
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/articles")
-public class BlogApiController {
+public class ArticleController {
 
-    private final BlogService blogService;
+    private final ArticleService articleService;
 
     @PostMapping("")
     public ResponseEntity<ArticleResponse> addArticle(@Valid @RequestBody ArticleCreateRequest request,
                                                       @AuthenticatedMember Long memberId) {
-        ArticleEntity savedArticle = blogService.save(request, memberId);
+        ArticleEntity savedArticle = articleService.save(request, memberId);
 
         return ResponseEntity.status(HttpStatus.CREATED)
                 .body(new ArticleResponse(savedArticle));
     }
 
     @GetMapping("")
-    public ResponseEntity<List<ArticleResponse>> findAllArticles(@RequestParam(defaultValue = "0") int page,
-                                                                 @RequestParam(defaultValue = "10") int size) {
-        Pageable pageable = PageRequest.of(page, size);
+    public ResponseEntity<PageResponse<ArticleResponse>> findAllArticles(@RequestParam(defaultValue = "0") int page,
+                                                                         @RequestParam(defaultValue = "10") int size,
+                                                                         @RequestParam(defaultValue = "latest") String sort) {
+        Pageable pageable = PageRequest.of(page, size, SortUtils.getArticleSort(sort));
 
-        List<ArticleResponse> articles = blogService.findAll(pageable)
-                .stream()
-                .map(ArticleResponse::new)
-                .toList();
+        Page<ArticleResponse> articlePage = articleService.findAll(pageable)
+                .map(ArticleResponse::withoutContent);
 
         return ResponseEntity.ok()
-                .body(articles);
+                .body(PageResponse.from(articlePage));
     }
 
     @GetMapping("/{id}")
     public ResponseEntity<ArticleResponse> findArticle(@PathVariable long id) {
-        ArticleEntity article = blogService.findById(id);
+        ArticleEntity article = articleService.findByIdAndIncreaseViewCount(id);
 
         return ResponseEntity.ok()
                 .body(new ArticleResponse(article));
@@ -64,7 +65,7 @@ public ResponseEntity<ArticleResponse> findArticle(@PathVariable long id) {
     @DeleteMapping("/{id}")
     public ResponseEntity<Void> deleteArticle(@PathVariable long id,
                                               @AuthenticatedMember Long memberId) {
-        blogService.delete(id, memberId);
+        articleService.delete(id, memberId);
 
         return ResponseEntity.noContent()
                 .build();
@@ -74,7 +75,7 @@ public ResponseEntity<Void> deleteArticle(@PathVariable long id,
     public ResponseEntity<ArticleResponse> updateArticle(@PathVariable long id,
                                                          @AuthenticatedMember Long memberId,
                                                          @Valid @RequestBody ArticleUpdateRequest request) {
-        ArticleEntity updateArticle = blogService.update(id, memberId, request);
+        ArticleEntity updateArticle = articleService.update(id, memberId, request);
 
         return ResponseEntity.ok()
                 .body(new ArticleResponse(updateArticle));

src/main/java/com/board/controller/CommentController.java

@@ -0,0 +1,73 @@
+package com.board.controller;
+
+import com.board.dto.request.CommentCreateRequest;
+import com.board.dto.request.CommentUpdateRequest;
+import com.board.dto.response.CommentResponse;
+import com.board.entity.CommentEntity;
+import com.board.service.CommentService;
+import com.config.auth.annotation.AuthenticatedMember;
+import com.util.page.PageResponse;
+import com.util.sort.SortUtils;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PatchMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/comments")
+public class CommentController {
+
+    private final CommentService commentService;
+
+    @GetMapping
+    public ResponseEntity<PageResponse<CommentResponse>> findAllComments(@RequestParam Long articleId,
+                                                                         @RequestParam(defaultValue = "0") int page,
+                                                                         @RequestParam(defaultValue = "10") int size,
+                                                                         @RequestParam(defaultValue = "latest") String sort) {
+        Pageable pageable = PageRequest.of(page, size, SortUtils.getCommentSort(sort));
+        Page<CommentResponse> commentPage = commentService.findAllComments(articleId, pageable)
+                .map(CommentResponse::new);
+
+        return ResponseEntity.ok(PageResponse.from(commentPage));
+    }
+
+    @PostMapping
+    public ResponseEntity<CommentResponse> addComment(@Valid @RequestBody CommentCreateRequest request,
+                                                      @AuthenticatedMember Long memberId) {
+        CommentEntity savedComment = commentService.createComment(request, memberId);
+
+        return ResponseEntity.status(HttpStatus.CREATED)
+                .body(new CommentResponse(savedComment));
+    }
+
+    @PatchMapping("/{commentId}")
+    public ResponseEntity<CommentResponse> updateComment(@PathVariable long commentId,
+                                                         @Valid @RequestBody CommentUpdateRequest request,
+                                                         @AuthenticatedMember Long memberId) {
+        request.setCommentId(commentId);
+        CommentEntity updatedComment = commentService.updateComment(request, memberId);
+        return ResponseEntity.ok()
+                .body(new CommentResponse(updatedComment));
+    }
+
+    @DeleteMapping("/{commentId}")
+    public ResponseEntity<Void> deleteComment(@PathVariable long commentId,
+                                              @AuthenticatedMember Long memberId) {
+        commentService.deleteComment(commentId, memberId);
+        return ResponseEntity.noContent()
+                .build();
+    }
+}

src/main/java/com/board/board/dto/request/ArticleCreateRequest.java → src/main/java/com/board/dto/request/ArticleCreateRequest.java

@@ -1,4 +1,4 @@
-package com.board.board.dto.request;
+package com.board.dto.request;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.Builder;

src/main/java/com/board/board/dto/request/ArticleUpdateRequest.java → src/main/java/com/board/dto/request/ArticleUpdateRequest.java

@@ -1,4 +1,4 @@
-package com.board.board.dto.request;
+package com.board.dto.request;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.Getter;

src/main/java/com/board/dto/request/CommentCreateRequest.java

@@ -0,0 +1,21 @@
+package com.board.dto.request;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+public class CommentCreateRequest {
+
+    @NotBlank(message = "내용을 입력해주세요")
+    private String content;
+    private Long articleId;
+
+    @Builder
+    public CommentCreateRequest(String content, Long articleId) {
+        this.content = content;
+        this.articleId = articleId;
+    }
+}

src/main/java/com/board/dto/request/CommentUpdateRequest.java

@@ -0,0 +1,23 @@
+package com.board.dto.request;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CommentUpdateRequest {
+
+    @NotBlank(message = "내용을 입력해주세요")
+    private String content;
+    private Long commentId;
+
+    @Builder
+    public CommentUpdateRequest(String content, Long commentId) {
+        this.content = content;
+        this.commentId = commentId;
+    }
+}

src/main/java/com/board/dto/response/ArticleResponse.java

@@ -0,0 +1,44 @@
+package com.board.dto.response;
+
+import com.board.entity.ArticleEntity;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Getter
+public class ArticleResponse {
+
+    private final Long id;
+    private final String title;
+    private String content;
+    private final Long memberId;
+    private final long viewCount;
+
+    @Builder
+    public ArticleResponse(Long id, String title, String content, Long memberId, long viewCount) {
+        this.id = id;
+        this.title = title;
+        this.content = content;
+        this.memberId = memberId;
+        this.viewCount = viewCount;
+    }
+
+    public ArticleResponse(ArticleEntity article) {
+        this.id = article.getId();
+        this.title = article.getTitle();
+        this.content = article.getContent();
+        this.memberId = article.getMember().getId();
+        this.viewCount = article.getViewCount();
+    }
+
+    public static ArticleResponse withoutContent(ArticleEntity article) {
+        return ArticleResponse.builder()
+                .id(article.getId())
+                .title(article.getTitle())
+                .content(null) // content 포함 안함
+                .memberId(article.getMember().getId())
+                .viewCount(article.getViewCount())
+                .build();
+    }
+}

src/main/java/com/board/dto/response/CommentResponse.java

@@ -0,0 +1,27 @@
+package com.board.dto.response;
+
+import com.board.entity.CommentEntity;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Getter
+public class CommentResponse {
+
+    private final Long id;
+    private final String content;
+    private final Long authorId;
+    private final String authorName;
+    private final LocalDateTime createdAt;
+    private final boolean deleted;
+
+    public CommentResponse(CommentEntity comment) {
+        this.id = comment.getId();
+        this.content = comment.getContent();
+        this.authorId = comment.getMember().getId();
+        this.authorName = comment.getMember().getNickName();
+        this.createdAt = comment.getCreatedAt();
+        this.deleted = comment.isDeleted();
+    }
+}