feat: community-comment 생성 기능 (#67)

ayoung-dev · 7zrv · web-flow · commit 9ccd6acafcf5 · 2024-11-28T19:37:50.000+09:00
* test(community): communityComment 생성 기능 테스트 작성 * feat(community): communityComment Entity, Repository 추가 * feat(community): communityComment 생성 RequestDto, Usecase 추가 및 Service 구현 * refactor(community): CommunityBoardRepository 네이밍 변경 * refactor(community): community board/comment 폴더 구조 변경 * chore(community): 불필요한 import 및 public 키워드 제거 * Feature/36 s3 이미지 업로드 기능 구현 (#66) * feat: 이미지 업로드 기능 구현 - aws s3 연동을 위한 의존성 추가 - 환경변수 추가 - S3 연결을 위한 config 클래스 구현 - 서비스 레이어에 이미지 업로드 기능 구현 - 업로드 실패 예외와 예외 메세지 추 - test.yml에 테스트에 필요한 환경변수 추가 - 테스트 코드 작성및 검증 완료 * chore: 환경변수 추가 - cicd workflow 에 이미지 업로드 관련 환경변수 추가 - appication.yml에 이미지 업로드 관련 환경변수 이름 변경 * feat: 이미지 파일 검증 기능 구현 - 이미지 크기를 8MB로 제한 - 이미지의 크기 초과를 검증하는 기능 구현 - 이미지의 확장자명을 검증하는 기능 구현 - 이미지 업로드시 검증 기능들을 수행하도록 수정 - 전역 예외처리 핸들러에 이미지 업로드 예외 추가 - 예외 메세지 추가 - 테스트 코드 작성및 검증 완 * fix: 코드 리뷰 사항 반영 - BASE_URL을 S3_BASE_URL라는 더 명시적인 이름으로 변경 - ImageUploadUtils private 생성자의 예외처리 메세지를 ExceptionMessage에 등록하여 사용하도록 수정 - 이미지 업로드 메서드의 내부 기능을 메서드로 추출하여 가독성 향상 - ImageUploadUtils의 일부 기능의 접근 제어자를 private으로 수정 - 테스트 코드의 when, then을 더 명확하게 분 * test(community): 커뮤니티 댓글 생성 테스트 추가 - repository 테스트에 findById 테스트 추가 - service 테스트에 대댓글 예외 테스트 추가 * chore(community): 소문자로 네이밍 변경 * fix(community): 커뮤니티 댓글 생성 requestDto 수정 - parentCommentId Dto 필드로 수정 * feat(community): 커뮤니티 댓글 생성 예외 처리 및 메세지 추가 * refactor(community): 코드 리뷰 사항 반영 - ServiceTest 오타 수정 - validateParentCommentExists 메서드 추출 * test(community): communityComment 생성 기능 테스트 작성 * feat(community): communityComment Entity, Repository 추가 * feat(community): communityComment 생성 RequestDto, Usecase 추가 및 Service 구현 * refactor(community): CommunityBoardRepository 네이밍 변경 * refactor(community): community board/comment 폴더 구조 변경 * chore(community): 불필요한 import 및 public 키워드 제거 * test(community): 커뮤니티 댓글 생성 테스트 추가 - repository 테스트에 findById 테스트 추가 - service 테스트에 대댓글 예외 테스트 추가 * chore(community): 소문자로 네이밍 변경 * fix(community): 커뮤니티 댓글 생성 requestDto 수정 - parentCommentId Dto 필드로 수정 * feat(community): 커뮤니티 댓글 생성 예외 처리 및 메세지 추가 * refactor(community): 코드 리뷰 사항 반영 - ServiceTest 오타 수정 - validateParentCommentExists 메서드 추출 * feat(community): 커뮤니티 댓글 존재 여부 메서드 및 테스트 추가 * chore(community): 불필요한 import 제거 --------- Co-authored-by: seojin Yoon <90759319+7zrv@users.noreply.github.com>
diff --git a/src/main/java/com/somemore/community/domain/CommunityComment.java b/src/main/java/com/somemore/community/domain/CommunityComment.java
@@ -0,0 +1,41 @@
+package com.somemore.community.domain;
+
+import com.somemore.global.common.BaseEntity;
+import jakarta.persistence.*;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.util.UUID;
+
+import static lombok.AccessLevel.PROTECTED;
+
+
+@Getter
+@NoArgsConstructor(access = PROTECTED)
+@Entity
+@Table(name = "community_comment")
+public class CommunityComment extends BaseEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Long id;
+
+    @Column(name = "writer_id", nullable = false, length = 16)
+    private UUID writerId;
+
+    @Lob
+    @Column(name = "content", nullable = false)
+    private String content;
+
+    @Column(name = "parent_comment_id")
+    private Long parentCommentId;
+
+    @Builder
+    public CommunityComment(UUID writerId, String content, Long parentCommentId) {
+        this.writerId = writerId;
+        this.content = content;
+        this.parentCommentId = parentCommentId;
+    }
+}
diff --git a/src/main/java/com/somemore/community/dto/request/CommunityCommentCreateRequestDto.java b/src/main/java/com/somemore/community/dto/request/CommunityCommentCreateRequestDto.java
@@ -0,0 +1,30 @@
+package com.somemore.community.dto.request;
+
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import com.somemore.community.domain.CommunityComment;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.annotation.Nullable;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Builder;
+
+import java.util.UUID;
+
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
+@Builder
+public record CommunityCommentCreateRequestDto(
+        @Schema(description = "커뮤니티 댓글 내용", example = "저도 함께 하고 싶습니다.")
+        @NotBlank(message = "댓글 내용은 필수 값입니다.")
+        String content,
+        @Schema(description = "부모 댓글의 ID", example = "1234", nullable = true)
+        @Nullable
+        Long parentCommentId
+) {
+    public CommunityComment toEntity(UUID writerId) {
+        return CommunityComment.builder()
+                .writerId(writerId)
+                .content(content)
+                .parentCommentId(parentCommentId)
+                .build();
+    }
+}
diff --git a/src/main/java/com/somemore/community/repository/board/CommunityBoardJpaRepository.java b/src/main/java/com/somemore/community/repository/board/CommunityBoardJpaRepository.java
@@ -1,4 +1,4 @@
-package com.somemore.community.repository;
+package com.somemore.community.repository.board;
 
 import com.somemore.community.domain.CommunityBoard;
 import org.springframework.data.jpa.repository.JpaRepository;
diff --git a/src/main/java/com/somemore/community/repository/board/CommunityBoardRepository.java b/src/main/java/com/somemore/community/repository/board/CommunityBoardRepository.java
@@ -1,4 +1,4 @@
-package com.somemore.community.repository;
+package com.somemore.community.repository.board;
 
 import com.somemore.community.domain.CommunityBoard;
 import com.somemore.community.domain.CommunityBoardView;
diff --git a/src/main/java/com/somemore/community/repository/board/CommunityBoardRepositoryImpl.java b/src/main/java/com/somemore/community/repository/board/CommunityBoardRepositoryImpl.java
@@ -1,4 +1,4 @@
-package com.somemore.community.repository;
+package com.somemore.community.repository.board;
 
 import com.querydsl.core.types.Projections;
 import com.querydsl.jpa.impl.JPAQuery;
@@ -16,7 +16,7 @@
 
 @RequiredArgsConstructor
 @Repository
-public class CommunityRepositoryImpl implements CommunityBoardRepository {
+public class CommunityBoardRepositoryImpl implements CommunityBoardRepository {
 
     private final JPAQueryFactory queryFactory;
     private final CommunityBoardJpaRepository communityBoardJpaRepository;
diff --git a/src/main/java/com/somemore/community/repository/comment/CommunityCommentJpaRepository.java b/src/main/java/com/somemore/community/repository/comment/CommunityCommentJpaRepository.java
@@ -0,0 +1,7 @@
+package com.somemore.community.repository.comment;
+
+import com.somemore.community.domain.CommunityComment;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface CommunityCommentJpaRepository extends JpaRepository<CommunityComment, Long> {
+}
diff --git a/src/main/java/com/somemore/community/repository/comment/CommunityCommentRepository.java b/src/main/java/com/somemore/community/repository/comment/CommunityCommentRepository.java
@@ -0,0 +1,12 @@
+package com.somemore.community.repository.comment;
+
+import com.somemore.community.domain.CommunityComment;
+
+import java.util.Optional;
+
+public interface CommunityCommentRepository {
+    CommunityComment save(CommunityComment communityComment);
+    Optional<CommunityComment> findById(Long id);
+    boolean existsById(Long id);
+    void deleteAllInBatch();
+}
diff --git a/src/main/java/com/somemore/community/repository/comment/CommunityCommentRepositoryImpl.java b/src/main/java/com/somemore/community/repository/comment/CommunityCommentRepositoryImpl.java
@@ -0,0 +1,48 @@
+package com.somemore.community.repository.comment;
+
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import com.somemore.community.domain.CommunityComment;
+import com.somemore.community.domain.QCommunityComment;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+
+import java.util.Optional;
+
+@RequiredArgsConstructor
+@Repository
+public class CommunityCommentRepositoryImpl implements CommunityCommentRepository {
+
+    private final JPAQueryFactory queryFactory;
+    private final CommunityCommentJpaRepository communityCommentJpaRepository;
+
+    @Override
+    public CommunityComment save(CommunityComment communityComment) {
+        return communityCommentJpaRepository.save(communityComment);
+    }
+
+    @Override
+    public Optional<CommunityComment> findById(Long id) {
+        QCommunityComment communityComment = QCommunityComment.communityComment;
+
+        return Optional.ofNullable(queryFactory
+                .selectFrom(communityComment)
+                .where(communityComment.id.eq(id)
+                        .and(communityComment.deleted.eq(false)))
+                .fetchOne());
+    }
+
+    @Override
+    public boolean existsById(Long id) {
+        QCommunityComment communityComment = QCommunityComment.communityComment;
+
+        return queryFactory
+                .selectOne()
+                .from(communityComment)
+                .where(communityComment.id.eq(id)
+                        .and(communityComment.deleted.eq(false)))
+                .fetchFirst() != null;
+    }
+
+    @Override
+    public void deleteAllInBatch() { communityCommentJpaRepository.deleteAllInBatch(); }
+}
diff --git a/src/main/java/com/somemore/community/service/board/CommunityBoardQueryService.java b/src/main/java/com/somemore/community/service/board/CommunityBoardQueryService.java
@@ -1,11 +1,11 @@
-package com.somemore.community.service;
+package com.somemore.community.service.board;
 
 import com.somemore.community.domain.CommunityBoard;
 import com.somemore.community.domain.CommunityBoardView;
 import com.somemore.community.dto.response.CommunityBoardGetDetailResponseDto;
 import com.somemore.community.dto.response.CommunityBoardGetResponseDto;
-import com.somemore.community.repository.CommunityBoardRepository;
-import com.somemore.community.usecase.CommunityBoardQueryUseCase;
+import com.somemore.community.repository.board.CommunityBoardRepository;
+import com.somemore.community.usecase.board.CommunityBoardQueryUseCase;
 import com.somemore.global.exception.BadRequestException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/somemore/community/service/board/CreateCommunityBoardService.java b/src/main/java/com/somemore/community/service/board/CreateCommunityBoardService.java
@@ -1,9 +1,9 @@
-package com.somemore.community.service;
+package com.somemore.community.service.board;
 
 import com.somemore.community.domain.CommunityBoard;
 import com.somemore.community.dto.request.CommunityBoardCreateRequestDto;
-import com.somemore.community.repository.CommunityBoardRepository;
-import com.somemore.community.usecase.CreateCommunityBoardUseCase;
+import com.somemore.community.repository.board.CommunityBoardRepository;
+import com.somemore.community.usecase.board.CreateCommunityBoardUseCase;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/src/main/java/com/somemore/community/service/board/DeleteCommunityBoardService.java b/src/main/java/com/somemore/community/service/board/DeleteCommunityBoardService.java
@@ -1,8 +1,8 @@
-package com.somemore.community.service;
+package com.somemore.community.service.board;
 
 import com.somemore.community.domain.CommunityBoard;
-import com.somemore.community.repository.CommunityBoardRepository;
-import com.somemore.community.usecase.DeleteCommunityBoardUseCase;
+import com.somemore.community.repository.board.CommunityBoardRepository;
+import com.somemore.community.usecase.board.DeleteCommunityBoardUseCase;
 import com.somemore.global.exception.BadRequestException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/somemore/community/service/board/UpdateCommunityBoardService.java b/src/main/java/com/somemore/community/service/board/UpdateCommunityBoardService.java
@@ -1,9 +1,9 @@
-package com.somemore.community.service;
+package com.somemore.community.service.board;
 
 import com.somemore.community.domain.CommunityBoard;
 import com.somemore.community.dto.request.CommunityBoardUpdateRequestDto;
-import com.somemore.community.repository.CommunityBoardRepository;
-import com.somemore.community.usecase.UpdateCommunityBoardUseCase;
+import com.somemore.community.repository.board.CommunityBoardRepository;
+import com.somemore.community.usecase.board.UpdateCommunityBoardUseCase;
 import com.somemore.global.exception.BadRequestException;
 
 import java.util.UUID;
diff --git a/src/main/java/com/somemore/community/service/comment/CreateCommunityCommentService.java b/src/main/java/com/somemore/community/service/comment/CreateCommunityCommentService.java
@@ -0,0 +1,37 @@
+package com.somemore.community.service.comment;
+
+import com.somemore.community.domain.CommunityComment;
+import com.somemore.community.dto.request.CommunityCommentCreateRequestDto;
+import com.somemore.community.repository.comment.CommunityCommentRepository;
+import com.somemore.community.usecase.comment.CreateCommunityCommentUseCase;
+import com.somemore.global.exception.BadRequestException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.UUID;
+
+import static com.somemore.global.exception.ExceptionMessage.NOT_EXISTS_COMMUNITY_COMMENT;
+
+@RequiredArgsConstructor
+@Transactional
+@Service
+public class CreateCommunityCommentService implements CreateCommunityCommentUseCase {
+
+    private final CommunityCommentRepository communityCommentRepository;
+
+    @Override
+    public Long createCommunityComment(CommunityCommentCreateRequestDto requestDto, UUID writerId) {
+        CommunityComment communityComment = requestDto.toEntity(writerId);
+
+        validateParentCommentExists(communityComment.getParentCommentId());
+
+        return communityCommentRepository.save(communityComment).getId();
+    }
+
+    private void validateParentCommentExists(Long parentCommentId) {
+        if (parentCommentId != null && !communityCommentRepository.existsById(parentCommentId)) {
+            throw new BadRequestException(NOT_EXISTS_COMMUNITY_COMMENT.getMessage());
+        }
+    }
+}
diff --git a/src/main/java/com/somemore/community/usecase/board/CommunityBoardQueryUseCase.java b/src/main/java/com/somemore/community/usecase/board/CommunityBoardQueryUseCase.java
@@ -1,4 +1,4 @@
-package com.somemore.community.usecase;
+package com.somemore.community.usecase.board;
 
 import com.somemore.community.dto.response.CommunityBoardGetDetailResponseDto;
 import com.somemore.community.dto.response.CommunityBoardGetResponseDto;
diff --git a/src/main/java/com/somemore/community/usecase/board/CreateCommunityBoardUseCase.java b/src/main/java/com/somemore/community/usecase/board/CreateCommunityBoardUseCase.java
@@ -1,4 +1,4 @@
-package com.somemore.community.usecase;
+package com.somemore.community.usecase.board;
 
 import com.somemore.community.dto.request.CommunityBoardCreateRequestDto;
 
diff --git a/src/main/java/com/somemore/community/usecase/board/DeleteCommunityBoardUseCase.java b/src/main/java/com/somemore/community/usecase/board/DeleteCommunityBoardUseCase.java
@@ -1,4 +1,4 @@
-package com.somemore.community.usecase;
+package com.somemore.community.usecase.board;
 
 import java.util.UUID;
 
diff --git a/src/main/java/com/somemore/community/usecase/board/UpdateCommunityBoardUseCase.java b/src/main/java/com/somemore/community/usecase/board/UpdateCommunityBoardUseCase.java
@@ -1,4 +1,4 @@
-package com.somemore.community.usecase;
+package com.somemore.community.usecase.board;
 
 import com.somemore.community.dto.request.CommunityBoardUpdateRequestDto;
 
diff --git a/src/main/java/com/somemore/community/usecase/comment/CreateCommunityCommentUseCase.java b/src/main/java/com/somemore/community/usecase/comment/CreateCommunityCommentUseCase.java
@@ -0,0 +1,11 @@
+package com.somemore.community.usecase.comment;
+
+import com.somemore.community.dto.request.CommunityCommentCreateRequestDto;
+
+import java.util.UUID;
+
+public interface CreateCommunityCommentUseCase {
+    Long createCommunityComment(
+            CommunityCommentCreateRequestDto requestDto,
+            UUID writerId);
+}
diff --git a/src/main/java/com/somemore/domains/CommunityComment.java b/src/main/java/com/somemore/domains/CommunityComment.java
diff --git a/src/main/java/com/somemore/global/exception/ExceptionMessage.java b/src/main/java/com/somemore/global/exception/ExceptionMessage.java
@@ -11,6 +11,7 @@ public enum ExceptionMessage {
     NOT_EXISTS_CENTER("존재하지 않는 기관 ID 입니다."),
     NOT_EXISTS_COMMUNITY_BOARD("존재하지 않는 게시글 입니다."),
     UNAUTHORIZED_COMMUNITY_BOARD("해당 게시글에 권한이 없습니다."),
+    NOT_EXISTS_COMMUNITY_COMMENT("존재하지 않는 댓글 입니다."),
     NOT_EXISTS_LOCATION("존재하지 않는 위치 ID 입니다."),
     NOT_EXISTS_RECRUIT_BOARD("존재하지 않는 봉사 모집글 ID 입니다."),
     UNAUTHORIZED_RECRUIT_BOARD("자신이 작성한 봉사 모집글이 아닙니다."),
diff --git a/src/test/java/com/somemore/community/repository/CommunityBoardRepositoryTest.java b/src/test/java/com/somemore/community/repository/CommunityBoardRepositoryTest.java
@@ -4,6 +4,7 @@
 import com.somemore.auth.oauth.OAuthProvider;
 import com.somemore.community.domain.CommunityBoard;
 import com.somemore.community.domain.CommunityBoardView;
+import com.somemore.community.repository.board.CommunityBoardRepository;
 import com.somemore.volunteer.domain.Volunteer;
 import com.somemore.volunteer.repository.VolunteerRepository;
 import org.junit.jupiter.api.DisplayName;
@@ -18,7 +19,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 @Transactional
-class CommunityRepositoryTest extends IntegrationTestSupport {
+class CommunityBoardRepositoryTest extends IntegrationTestSupport {
 
     @Autowired
     private CommunityBoardRepository communityBoardRepository;
diff --git a/src/test/java/com/somemore/community/repository/CommunityCommentRepositoryTest.java b/src/test/java/com/somemore/community/repository/CommunityCommentRepositoryTest.java
diff --git a/src/test/java/com/somemore/community/service/board/CommunityBoardQueryServiceTest.java b/src/test/java/com/somemore/community/service/board/CommunityBoardQueryServiceTest.java
diff --git a/src/test/java/com/somemore/community/service/board/CreateCommunityBoardServiceTest.java b/src/test/java/com/somemore/community/service/board/CreateCommunityBoardServiceTest.java
diff --git a/src/test/java/com/somemore/community/service/board/DeleteCommunityBoardServiceTest.java b/src/test/java/com/somemore/community/service/board/DeleteCommunityBoardServiceTest.java
diff --git a/src/test/java/com/somemore/community/service/board/UpdateCommunityBoardServiceTest.java b/src/test/java/com/somemore/community/service/board/UpdateCommunityBoardServiceTest.java
diff --git a/src/test/java/com/somemore/community/service/comment/CreateCommunityCommentServiceTest.java b/src/test/java/com/somemore/community/service/comment/CreateCommunityCommentServiceTest.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.somemore.community.repository;`
	`1`	`+package com.somemore.community.repository.board;`
`2`	`2`
`3`	`3`	`import com.somemore.community.domain.CommunityBoard;`
`4`	`4`	`import org.springframework.data.jpa.repository.JpaRepository;`