[Feat] 피드 작성 api 개발 및 S3 관련 설정 및 feed 패키지 구조 리펙토링

build.gradle

@@ -61,6 +61,9 @@ dependencies {
 	annotationProcessor "com.querydsl:querydsl-apt:5.0.0:jakarta"
 	annotationProcessor "jakarta.annotation:jakarta.annotation-api"
 	annotationProcessor "jakarta.persistence:jakarta.persistence-api"
+
+	//s3 버킷
+	implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
 }
 
 def querydslDir = layout.buildDirectory.dir("generated/querydsl").get().asFile

src/main/java/konkuk/thip/book/adapter/out/jpa/BookJpaEntity.java

@@ -36,7 +36,7 @@ public class BookJpaEntity extends BaseJpaEntity {
     @Column(name = "page_count")
     private Integer pageCount;
 
-    @Column(length = 1000)
+    @Column(length = 3000)
     private String description;
 
     public void changePageCount(Integer pageCount) {

src/main/java/konkuk/thip/common/exception/code/ErrorCode.java

@@ -117,11 +117,20 @@ public enum ErrorCode implements ResponseCode {
     CATEGORY_NOT_MATCH(HttpStatus.BAD_REQUEST, 150001, "일치하는 카테고리 이름이 없습니다."),
 
     /**
-     * 160000 : Feed error
+     * 160000 : Feed,Tag error
      */
     FEED_NOT_FOUND(HttpStatus.NOT_FOUND, 160000, "존재하지 않는 FEED 입니다."),
-    TAG_NAME_NOT_MATCH(HttpStatus.BAD_REQUEST, 160001, "일치하는 태그 이름이 없습니다.")
+    TAG_NAME_NOT_MATCH(HttpStatus.BAD_REQUEST, 160001, "일치하는 태그 이름이 없습니다."),
+    TAG_NOT_FOUND(HttpStatus.NOT_FOUND, 160002, "존재하지 않는 TAG 입니다."),
+    INVALID_FEED_CREATE(HttpStatus.BAD_REQUEST, 160003, "유효하지 않은 FEED 생성 요청 입니다."),
 
+    /**
+     * 170000 : Image File error
+     */
+    EMPTY_FILE_EXCEPTION(HttpStatus.BAD_REQUEST, 170001, "업로드하려는 이미지가 비어있습니다."),
+    EXCEPTION_ON_IMAGE_UPLOAD(HttpStatus.BAD_REQUEST, 170002, "이미지 업로드에 실패하였습니다."),
+    INVALID_FILE_EXTENSION(HttpStatus.BAD_REQUEST, 170003, "올바르지 않은 파일 형식입니다."),
+    IO_EXCEPTION_ON_IMAGE_DELETE(HttpStatus.BAD_REQUEST, 170004, "파일 삭제에 실패하였습니다.")
     ;
 
     private final HttpStatus httpStatus;

src/main/java/konkuk/thip/config/S3Config.java

@@ -0,0 +1,34 @@
+package konkuk.thip.config;
+
+import com.amazonaws.auth.AWSStaticCredentialsProvider;
+import com.amazonaws.auth.BasicAWSCredentials;
+import com.amazonaws.services.s3.AmazonS3Client;
+import com.amazonaws.services.s3.AmazonS3ClientBuilder;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class S3Config {
+
+    @Value("${cloud.aws.credentials.access-key}")
+    private String accessKey;
+
+    @Value("${cloud.aws.credentials.secret-key}")
+    private String secretKey;
+
+    @Value("${cloud.aws.region.static}")
+    private String region;
+
+    @Bean
+    public AmazonS3Client amazonS3Client() {
+        //accessKey, secretKey, region 값으로 S3에 접근 가능한 객체 등록
+        BasicAWSCredentials credentials = new BasicAWSCredentials(accessKey, secretKey);
+
+        return (AmazonS3Client) AmazonS3ClientBuilder
+                .standard()
+                .withRegion(region)
+                .withCredentials(new AWSStaticCredentialsProvider(credentials))
+                .build();
+    }
+}

src/main/java/konkuk/thip/feed/adapter/in/web/FeedCommandController.java

@@ -1,10 +1,31 @@
 package konkuk.thip.feed.adapter.in.web;
 
+import jakarta.validation.Valid;
+import konkuk.thip.common.dto.BaseResponse;
+import konkuk.thip.common.security.annotation.UserId;
+import konkuk.thip.feed.adapter.in.web.request.FeedCreateRequest;
+import konkuk.thip.feed.adapter.in.web.response.FeedCreateResponse;
+import konkuk.thip.feed.application.port.in.FeedCreateUseCase;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.util.List;
+
+@Slf4j
 @RestController
 @RequiredArgsConstructor
 public class FeedCommandController {
 
+    private final FeedCreateUseCase feedCreateUseCase;
+
+    @PostMapping("/feeds")
+    public BaseResponse<FeedCreateResponse> createFeed(@RequestPart("request") @Valid final FeedCreateRequest request,
+                                                       @RequestPart(value = "images", required = false) final List<MultipartFile> images,
+                                                       @UserId final Long userId) {
+        return BaseResponse.ok(FeedCreateResponse.of(feedCreateUseCase.createFeed(request.toCommand(userId),images)));
+    }
 }

src/main/java/konkuk/thip/feed/adapter/in/web/request/FeedCreateRequest.java

@@ -0,0 +1,34 @@
+package konkuk.thip.feed.adapter.in.web.request;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import konkuk.thip.feed.application.port.in.dto.FeedCreateCommand;
+
+import java.util.List;
+
+public record FeedCreateRequest(
+
+        @NotBlank(message = "ISBN은 필수입니다.")
+        String isbn,
+
+        @NotBlank(message = "콘텐츠 내용은 필수입니다.")
+        String contentBody,
+
+        @NotNull(message = "방 공개 설정 여부는 필수입니다.")
+        Boolean isPublic,
+
+        String category,
+
+        List<String> tagList
+) {
+        public FeedCreateCommand toCommand(Long userId) {
+                return new FeedCreateCommand(
+                        isbn,
+                        contentBody,
+                        isPublic,
+                        category,
+                        tagList,
+                        userId
+                );
+        }
+}

src/main/java/konkuk/thip/feed/adapter/in/web/response/FeedCreateResponse.java

@@ -0,0 +1,7 @@
+package konkuk.thip.feed.adapter.in.web.response;
+
+public record FeedCreateResponse(Long feedId) {
+    public static FeedCreateResponse of(Long feedId) {
+        return new FeedCreateResponse(feedId);
+    }
+}

src/main/java/konkuk/thip/post/adapter/out/jpa/ContentJpaEntity.java → src/main/java/konkuk/thip/feed/adapter/out/jpa/ContentJpaEntity.java

@@ -1,7 +1,8 @@
-package konkuk.thip.post.adapter.out.jpa;
+package konkuk.thip.feed.adapter.out.jpa;
 
 import jakarta.persistence.*;
 import konkuk.thip.common.entity.BaseJpaEntity;
+import konkuk.thip.post.adapter.out.jpa.PostJpaEntity;
 import lombok.*;
 
 

src/main/java/konkuk/thip/feed/adapter/out/jpa/FeedJpaEntity.java

@@ -10,6 +10,8 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 @Entity
 @Table(name = "feeds")
 @DiscriminatorValue("FEED")
@@ -27,11 +29,15 @@ public class FeedJpaEntity extends PostJpaEntity {
     @JoinColumn(name = "book_id", nullable = false)
     private BookJpaEntity bookJpaEntity;
 
+    @OneToMany(mappedBy = "postJpaEntity", cascade = CascadeType.ALL, orphanRemoval = true)
+    private List<ContentJpaEntity> contentList;
+
     @Builder
-    public FeedJpaEntity(String content, Integer likeCount, Integer commentCount, UserJpaEntity userJpaEntity, Boolean isPublic, int reportCount, BookJpaEntity bookJpaEntity) {
+    public FeedJpaEntity(String content, Integer likeCount, Integer commentCount, UserJpaEntity userJpaEntity, Boolean isPublic, int reportCount, BookJpaEntity bookJpaEntity, List<ContentJpaEntity> contentList) {
         super(content, likeCount, commentCount, userJpaEntity);
         this.isPublic = isPublic;
         this.reportCount = reportCount;
         this.bookJpaEntity = bookJpaEntity;
+        this.contentList = contentList;
     }
 }

src/main/java/konkuk/thip/feed/adapter/out/jpa/TagJpaEntity.java

@@ -2,7 +2,6 @@
 
 import jakarta.persistence.*;
 import konkuk.thip.common.entity.BaseJpaEntity;
-import konkuk.thip.post.adapter.out.jpa.PostJpaEntity;
 import konkuk.thip.room.adapter.out.jpa.CategoryJpaEntity;
 import lombok.*;
 
@@ -22,10 +21,6 @@ public class TagJpaEntity extends BaseJpaEntity {
     @Column(name = "tag_value",length = 50, nullable = false)
     private String value;
 
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "post_id", nullable = false)
-    private PostJpaEntity postJpaEntity;
-
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "category_id", nullable = false)
     private CategoryJpaEntity categoryJpaEntity;

src/main/java/konkuk/thip/post/adapter/out/mapper/ContentMapper.java → src/main/java/konkuk/thip/feed/adapter/out/mapper/ContentMapper.java

@@ -1,8 +1,8 @@
-package konkuk.thip.post.adapter.out.mapper;
+package konkuk.thip.feed.adapter.out.mapper;
 
-import konkuk.thip.post.adapter.out.jpa.ContentJpaEntity;
+import konkuk.thip.feed.adapter.out.jpa.ContentJpaEntity;
+import konkuk.thip.feed.domain.Content;
 import konkuk.thip.post.adapter.out.jpa.PostJpaEntity;
-import konkuk.thip.post.domain.Content;
 import org.springframework.stereotype.Component;
 
 @Component

src/main/java/konkuk/thip/feed/adapter/out/mapper/FeedMapper.java

@@ -8,6 +8,7 @@
 import konkuk.thip.user.adapter.out.jpa.UserJpaEntity;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Component
@@ -22,6 +23,7 @@ public FeedJpaEntity toJpaEntity(Feed feed, UserJpaEntity userJpaEntity, BookJpa
                 .likeCount(feed.getLikeCount())
                 .commentCount(feed.getCommentCount())
                 .bookJpaEntity(bookJpaEntity)
+                .contentList(new ArrayList<>())
                 .build();
     }
 

src/main/java/konkuk/thip/feed/adapter/out/persistence/FeedCommandPersistenceAdapter.java

@@ -1,15 +1,90 @@
 package konkuk.thip.feed.adapter.out.persistence;
 
+import konkuk.thip.book.adapter.out.jpa.BookJpaEntity;
+import konkuk.thip.book.adapter.out.persistence.repository.BookJpaRepository;
+import konkuk.thip.common.exception.EntityNotFoundException;
+import konkuk.thip.feed.adapter.out.jpa.ContentJpaEntity;
+import konkuk.thip.feed.adapter.out.jpa.FeedJpaEntity;
+import konkuk.thip.feed.adapter.out.jpa.FeedTagJpaEntity;
+import konkuk.thip.feed.adapter.out.jpa.TagJpaEntity;
+import konkuk.thip.feed.adapter.out.mapper.ContentMapper;
 import konkuk.thip.feed.adapter.out.mapper.FeedMapper;
+import konkuk.thip.feed.adapter.out.persistence.repository.FeedJpaRepository;
+import konkuk.thip.feed.adapter.out.persistence.repository.FeedTag.FeedTagJpaRepository;
+import konkuk.thip.feed.adapter.out.persistence.repository.Tag.TagJpaRepository;
 import konkuk.thip.feed.application.port.out.FeedCommandPort;
+import konkuk.thip.feed.domain.Feed;
+import konkuk.thip.feed.domain.Tag;
+import konkuk.thip.user.adapter.out.jpa.UserJpaEntity;
+import konkuk.thip.user.adapter.out.persistence.repository.UserJpaRepository;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
+import static konkuk.thip.common.exception.code.ErrorCode.*;
+
+@Slf4j
 @Repository
 @RequiredArgsConstructor
 public class FeedCommandPersistenceAdapter implements FeedCommandPort {
 
-    private final FeedJpaRepository jpaRepository;
-    private final FeedMapper userMapper;
+    private final FeedJpaRepository feedJpaRepository;
+    private final UserJpaRepository userJpaRepository;
+    private final BookJpaRepository bookJpaRepository;
+    private final TagJpaRepository tagJpaRepository;
+    private final FeedTagJpaRepository feedTagJpaRepository;
+    private final FeedMapper feedMapper;
+    private final ContentMapper contentMapper;
+
+    @Override
+    public Long save(Feed feed) {
+
+        UserJpaEntity userJpaEntity = userJpaRepository.findById(feed.getCreatorId()).orElseThrow(
+                () -> new EntityNotFoundException(USER_NOT_FOUND)
+        );
+        BookJpaEntity bookJpaEntity = bookJpaRepository.findById(feed.getTargetBookId()).orElseThrow(
+                () -> new EntityNotFoundException(BOOK_NOT_FOUND)
+        );
+        FeedJpaEntity feedJpaEntity = feedMapper.toJpaEntity(feed,userJpaEntity,bookJpaEntity);
+
+        // Feed 먼저 영속화 → ID 생성
+        FeedJpaEntity savedFeed = feedJpaRepository.save(feedJpaEntity);
+
+        // Content가 존재하면 ContentJpaEntity 생성 및 Feed 연관관계 설정
+        saveContents(feed, savedFeed);
+        // 태그가 존재하면 태그 피드 매핑 생성 및 저장
+        saveFeedTags(feed, savedFeed);
+
+        return savedFeed.getPostId();
+    }
+
+    private void saveContents(Feed feed, FeedJpaEntity feedJpaEntity) {
+        if (feed.getContentList().isEmpty()) return;
+
+        List<ContentJpaEntity> contentJpaEntities = feed.getContentList().stream()
+                .map(content -> contentMapper.toJpaEntity(content, feedJpaEntity))
+                .toList();
+
+        contentJpaEntities.forEach(feedJpaEntity.getContentList()::add);
+    }
+
+    private void saveFeedTags(Feed feed, FeedJpaEntity feedJpaEntity) {
+        if (feed.getTagList().isEmpty()) return;
+
+        for (Tag tag : feed.getTagList()) {
+            TagJpaEntity tagJpaEntity = tagJpaRepository.findByValue(tag.getValue())
+                    .orElseThrow(() -> new EntityNotFoundException(TAG_NOT_FOUND));
+
+            FeedTagJpaEntity feedTagJpaEntity = FeedTagJpaEntity.builder()
+                    .feedJpaEntity(feedJpaEntity)
+                    .tagJpaEntity(tagJpaEntity)
+                    .build();
+
+            feedTagJpaRepository.save(feedTagJpaEntity);
+        }
+    }
+
 
 }

src/main/java/konkuk/thip/feed/adapter/out/persistence/FeedQueryPersistenceAdapter.java

@@ -1,6 +1,7 @@
 package konkuk.thip.feed.adapter.out.persistence;
 
 import konkuk.thip.feed.adapter.out.mapper.FeedMapper;
+import konkuk.thip.feed.adapter.out.persistence.repository.FeedJpaRepository;
 import konkuk.thip.feed.application.port.out.FeedQueryPort;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;

src/main/java/konkuk/thip/feed/adapter/out/persistence/S3CommandPersistenceAdapter.java

@@ -0,0 +1,28 @@
+package konkuk.thip.feed.adapter.out.persistence;
+
+import konkuk.thip.feed.adapter.out.s3.S3Service;
+import konkuk.thip.feed.application.port.out.S3CommandPort;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+@Repository
+@RequiredArgsConstructor
+public class S3CommandPersistenceAdapter implements S3CommandPort {
+
+    private final S3Service s3Service;
+
+    @Override
+    public List<String> uploadImages(List<MultipartFile> images) {
+        return images.stream()
+                .map(s3Service::uploadUserImageAndGetUrl)
+                .toList();
+    }
+
+    @Override
+    public void deleteImages(List<String> imageUrls) {
+        imageUrls.forEach(s3Service::deleteImageFromS3);
+    }
+}

src/main/java/konkuk/thip/feed/adapter/out/persistence/repository/Content/ContentJpaRepository.java

@@ -0,0 +1,7 @@
+package konkuk.thip.feed.adapter.out.persistence.repository.Content;
+
+import konkuk.thip.feed.adapter.out.jpa.ContentJpaEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface ContentJpaRepository extends JpaRepository<ContentJpaEntity, Long>{
+}

src/main/java/konkuk/thip/feed/adapter/out/persistence/FeedJpaRepository.java → src/main/java/konkuk/thip/feed/adapter/out/persistence/repository/FeedJpaRepository.java

@@ -1,7 +1,7 @@
-package konkuk.thip.feed.adapter.out.persistence;
+package konkuk.thip.feed.adapter.out.persistence.repository;
 
 import konkuk.thip.feed.adapter.out.jpa.FeedJpaEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface FeedJpaRepository extends JpaRepository<FeedJpaEntity, Long>, FeedQueryRepository{
+public interface FeedJpaRepository extends JpaRepository<FeedJpaEntity, Long>, FeedQueryRepository {
 }