refactor: 댓글 부분 구조 변경

Author: ense333

src/main/java/com/threestar/trainus/domain/comment/controller/CommentController.java

@@ -14,9 +14,12 @@
 
 import com.threestar.trainus.domain.comment.dto.CommentCreateRequestDto;
 import com.threestar.trainus.domain.comment.dto.CommentPageResponseDto;
+import com.threestar.trainus.domain.comment.dto.CommentPageWrapperDto;
 import com.threestar.trainus.domain.comment.dto.CommentResponseDto;
+import com.threestar.trainus.domain.comment.mapper.CommentMapper;
 import com.threestar.trainus.domain.comment.service.CommentService;
 import com.threestar.trainus.global.unit.BaseResponse;
+import com.threestar.trainus.global.unit.PagedResponse;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -45,13 +48,14 @@ public ResponseEntity<BaseResponse<CommentResponseDto>> createComment(@PathVaria
 
 	@GetMapping("/{lessonId}")
 	@Operation(summary = "댓글 조회", description = "레슨 ID에 해당되는 댓글들을 조회합니다.")
-	public ResponseEntity<BaseResponse<CommentPageResponseDto>> readAll(@PathVariable Long lessonId,
+	public ResponseEntity<PagedResponse<CommentPageWrapperDto>> readAll(@PathVariable Long lessonId,
 		@RequestParam("page") int page,
 		@RequestParam("pageSize") int pageSize) {
 		int correctPage = Math.max(page, 1);
 		int correctPageSize = Math.max(1, Math.max(pageSize, pageSizeLimit));
-		return BaseResponse.ok("댓글 조회 성공", commentService.readAll(lessonId, correctPage, correctPageSize),
-			HttpStatus.OK);
+		CommentPageResponseDto commentsInfo = commentService.readAll(lessonId, correctPage, correctPageSize);
+		CommentPageWrapperDto comments = CommentMapper.toCommentPageWrapperDto(commentsInfo);
+		return PagedResponse.ok("댓글 조회 성공", comments, commentsInfo.getCount(), HttpStatus.OK);
 	}
 
 	@DeleteMapping("/{commentId}")

src/main/java/com/threestar/trainus/domain/comment/dto/CommentPageResponseDto.java

@@ -10,5 +10,5 @@
 public class CommentPageResponseDto {
 
 	private List<CommentResponseDto> comments;
-	private Long count;
+	private Integer count;
 }

src/main/java/com/threestar/trainus/domain/comment/dto/CommentPageWrapperDto.java

@@ -0,0 +1,12 @@
+package com.threestar.trainus.domain.comment.dto;
+
+import java.util.List;
+
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@Builder
+public class CommentPageWrapperDto {
+	private List<CommentResponseDto> comments;
+}

src/main/java/com/threestar/trainus/domain/comment/mapper/CommentMapper.java

@@ -3,6 +3,7 @@
 import java.util.List;
 
 import com.threestar.trainus.domain.comment.dto.CommentPageResponseDto;
+import com.threestar.trainus.domain.comment.dto.CommentPageWrapperDto;
 import com.threestar.trainus.domain.comment.dto.CommentResponseDto;
 import com.threestar.trainus.domain.comment.entity.Comment;
 
@@ -22,10 +23,16 @@ public static CommentResponseDto toCommentResponseDto(Comment comment) {
 			.build();
 	}
 
-	public static CommentPageResponseDto toCommentPageResponseDto(List<CommentResponseDto> comments, Long count) {
+	public static CommentPageResponseDto toCommentPageResponseDto(List<CommentResponseDto> comments, Integer count) {
 		return CommentPageResponseDto.builder()
 			.comments(comments)
 			.count(count)
 			.build();
 	}
+
+	public static CommentPageWrapperDto toCommentPageWrapperDto(CommentPageResponseDto commentPageResponseDto) {
+		return CommentPageWrapperDto.builder()
+			.comments(commentPageResponseDto.getComments())
+			.build();
+	}
 }

src/main/java/com/threestar/trainus/domain/comment/repository/CommentRepository.java

@@ -23,7 +23,7 @@ public interface CommentRepository extends JpaRepository<Comment, Long> {
 	@Query(value = """
 		select count(*) from ( select comment_id from comments where lesson_id = :lessonId limit :limit) t
 		""", nativeQuery = true)
-	Long count(@Param("lessonId") Long lessonId, @Param("limit") int limit);
+	Integer count(@Param("lessonId") Long lessonId, @Param("limit") int limit);
 
 	@Query(value = """
 		select count(*) from (select comment_id from comments where lesson_id = :lessonId and parent_comment_id = :parentCommentId limit :limit) t