Feature/65 커뮤니티 댓글 생성 기능

.github/workflows/CD.yml

@@ -27,6 +27,11 @@ jobs:
       JWT_SECRET: ${{ secrets.JWT_SECRET }}
       FRONT_URL: ${{secrets.FRONT_URL}}
       BACK_URL: ${{secrets.BACK_URL}}
+      BUCKET_NAME: ${{secrets.BUCKET_NAME}}
+      BUCKET_REGION: ${{secrets.BUCKET_REGION}}
+      IMG_BASE_URL: ${{secrets.BASE_URL}}
+      S3_ACCESS_KEY: ${{secrets.S3_ACCESS_KEY}}
+      S3_SECRET_KEY: ${{secrets.S3_SECRET_KEY}}
 
     steps:
       - name: Github Repository 파일 불러오기

.github/workflows/CI.yml

@@ -35,6 +35,11 @@ jobs:
       JWT_SECRET: ${{ secrets.JWT_SECRET }}
       FRONT_URL: ${{secrets.FRONT_URL}}
       BACK_URL: ${{secrets.BACK_URL}}
+      BUCKET_NAME: ${{secrets.BUCKET_NAME}}
+      BUCKET_REGION: ${{secrets.BUCKET_REGION}}
+      IMG_BASE_URL: ${{secrets.BASE_URL}}
+      S3_ACCESS_KEY: ${{secrets.S3_ACCESS_KEY}}
+      S3_SECRET_KEY: ${{secrets.S3_SECRET_KEY}}
 
 
     steps:

build.gradle

@@ -52,6 +52,9 @@ dependencies {
     runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.12.6'
     runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.12.6'
 
+    // AWS
+    implementation(platform("software.amazon.awssdk:bom:2.29.20"))
+    implementation("software.amazon.awssdk:s3")
 
     // Web Layer
     implementation 'org.springframework.boot:spring-boot-starter-web'
@@ -61,7 +64,6 @@ dependencies {
     annotationProcessor 'org.projectlombok:lombok'
     implementation group: 'org.springdoc', name: 'springdoc-openapi-starter-webmvc-ui', version: '2.6.0'
 
-
     //test
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.springframework.security:spring-security-test'

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;
+    }
+}

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();
+    }
+}

src/main/java/com/somemore/community/repository/CommunityBoardJpaRepository.java → 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;

src/main/java/com/somemore/community/repository/CommunityBoardRepository.java → 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;

src/main/java/com/somemore/community/repository/CommunityRepositoryImpl.java → 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;

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> {
+}

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();
+}

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(); }
+}

src/main/java/com/somemore/community/service/CommunityBoardQueryService.java → 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;

src/main/java/com/somemore/community/service/CreateCommunityBoardService.java → 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;

src/main/java/com/somemore/community/service/DeleteCommunityBoardService.java → 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;

src/main/java/com/somemore/community/service/UpdateCommunityBoardService.java → 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;

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());
+        }
+    }
+}

src/main/java/com/somemore/community/usecase/CommunityBoardQueryUseCase.java → 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;

src/main/java/com/somemore/community/usecase/CreateCommunityBoardUseCase.java → 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;
 

src/main/java/com/somemore/community/usecase/DeleteCommunityBoardUseCase.java → 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;
 

src/main/java/com/somemore/community/usecase/UpdateCommunityBoardUseCase.java → 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;
 

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);
+}