Dev > main 브랜치 병합

댓글 response 추가 후 테스트 과정 거친 후에 Dev 브랜치에서 main 브랜치로 병합합니다.

Author: NamDoHyeon2

src/main/java/hs/kr/backend/devpals/domain/project/dto/CommentDTO.java

@@ -28,14 +28,14 @@ public class CommentDTO {
 
     @JsonProperty(access = JsonProperty.Access.READ_ONLY)
     @Schema(description = "대댓글 수", example = "0", accessMode = Schema.AccessMode.READ_ONLY)
-    private int commentCount;
+    private int recommentCount;
 
-    public static CommentDTO fromEntity(CommentEntity comment) {
+    public static CommentDTO fromEntity(CommentEntity comment, int recommentCount) {
         return CommentDTO.builder()
                 .id(comment.getId())
                 .content(comment.getContent())
                 .user(ProjectUserResponse.fromEntity(comment.getUser()))
-                .commentCount(0)
+                .recommentCount(recommentCount)
                 .build();
     }
 }

src/main/java/hs/kr/backend/devpals/domain/project/repository/RecommentRepository.java

@@ -7,4 +7,5 @@
 
 public interface RecommentRepository extends JpaRepository<RecommentEntity, Long> {
     List<RecommentEntity> findAllByCommentId(Long commentId);
+    int countByCommentId(Long commentId);
 }

src/main/java/hs/kr/backend/devpals/domain/project/service/ProjectCommentService.java

@@ -57,8 +57,11 @@ public ResponseEntity<ApiResponse<List<CommentDTO>>> getComment(Long projectId)
 
         List<CommentEntity> comments = commentRepoisitory.findAllByProjectId(projectId);
 
-        List<CommentDTO> response = commentRepoisitory.findAllByProjectId(projectId).stream()
-                .map(CommentDTO::fromEntity)
+        List<CommentDTO> response = comments.stream()
+                .map(comment -> {
+                    int recommentCount = recommentRepository.countByCommentId(comment.getId());
+                    return CommentDTO.fromEntity(comment, recommentCount);
+                })
                 .collect(Collectors.toList());
 
         return ResponseEntity.ok(new ApiResponse<>(true, "댓글 가져오기 성공", response));

src/main/java/hs/kr/backend/devpals/domain/user/service/AlarmService.java

@@ -124,7 +124,7 @@ private String makeMessage(ProjectEntity project,UserEntity commenter) {
 
     private String makeMessage(ApplicantEntity applicant) {
         String result = applicant.getStatus().equals(ApplicantStatus.ACCEPTED) ? "합격" : "불합격";
-      
+
         return "내가 지원한 '"+applicant.getProject().getTitle()+"'에 "+ result +"하셨습니다.";
     }