[Feat] 피드 수정 api 개발 및 피드 생성 리펙토링

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

@@ -130,7 +130,8 @@ public enum ErrorCode implements ResponseCode {
     FEED_NOT_FOUND(HttpStatus.NOT_FOUND, 160000, "존재하지 않는 FEED 입니다."),
     TAG_NAME_NOT_MATCH(HttpStatus.BAD_REQUEST, 160001, "일치하는 태그 이름이 없습니다."),
     TAG_NOT_FOUND(HttpStatus.NOT_FOUND, 160002, "존재하지 않는 TAG 입니다."),
-    INVALID_FEED_CREATE(HttpStatus.BAD_REQUEST, 160003, "유효하지 않은 FEED 생성 요청 입니다."),
+    INVALID_FEED_COMMAND(HttpStatus.BAD_REQUEST, 160003, "유효하지 않은 FEED 생성/수정 요청 입니다."),
+    FEED_UPDATE_FORBIDDEN(HttpStatus.FORBIDDEN, 160004, "피드 수정 권한이 없습니다."),
 
     /**
      * 170000 : Image File error

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

@@ -4,13 +4,13 @@
 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.adapter.in.web.request.FeedUpdateRequest;
+import konkuk.thip.feed.adapter.in.web.response.FeedIdResponse;
 import konkuk.thip.feed.application.port.in.FeedCreateUseCase;
+import konkuk.thip.feed.application.port.in.FeedUpdateUseCase;
 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.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -21,11 +21,23 @@
 public class FeedCommandController {
 
     private final FeedCreateUseCase feedCreateUseCase;
+    private final FeedUpdateUseCase feedUpdateUseCase;
 
+    //피드 작성
     @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)));
+    public BaseResponse<FeedIdResponse> createFeed(@RequestPart("request") @Valid final FeedCreateRequest request,
+                                                   @RequestPart(value = "images", required = false) final List<MultipartFile> images,
+                                                   @UserId final Long userId) {
+        return BaseResponse.ok(FeedIdResponse.of(feedCreateUseCase.createFeed(request.toCommand(userId),images)));
+    }
+
+    // 피드 수정 (책 빼고 변경가능)
+    @PatchMapping("/feeds/{feedId}")
+    public BaseResponse<FeedIdResponse> updateFeed(@RequestBody @Valid final FeedUpdateRequest request,
+                                                   @PathVariable("feedId") final Long feedId,
+                                                   @UserId final Long userId) {
+
+        return BaseResponse.ok(FeedIdResponse.of(feedUpdateUseCase.updateFeed(request.toCommand(userId,feedId))));
+
     }
 }

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

@@ -17,16 +17,13 @@ public record FeedCreateRequest(
         @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/request/FeedUpdateRequest.java

@@ -0,0 +1,27 @@
+package konkuk.thip.feed.adapter.in.web.request;
+
+import konkuk.thip.feed.application.port.in.dto.FeedUpdateCommand;
+
+import java.util.List;
+
+public record FeedUpdateRequest(
+
+        String contentBody,
+
+        Boolean isPublic,
+
+        List<String> tagList,
+
+        List<String> remainImageUrls
+) {
+        public FeedUpdateCommand toCommand(Long userId, Long feedId) {
+                return new FeedUpdateCommand(
+                        contentBody,
+                        isPublic,
+                        tagList,
+                        remainImageUrls,
+                        userId,
+                        feedId
+                );
+        }
+}

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

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

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

@@ -3,6 +3,7 @@
 
 import jakarta.persistence.*;
 import konkuk.thip.book.adapter.out.jpa.BookJpaEntity;
+import konkuk.thip.feed.domain.Feed;
 import konkuk.thip.post.adapter.out.jpa.PostJpaEntity;
 import konkuk.thip.user.adapter.out.jpa.UserJpaEntity;
 import lombok.AccessLevel;
@@ -40,4 +41,12 @@ public FeedJpaEntity(String content, Integer likeCount, Integer commentCount, Us
         this.bookJpaEntity = bookJpaEntity;
         this.contentList = contentList;
     }
+
+    public void updateFrom(Feed feed) {
+        this.content = feed.getContent();
+        this.isPublic = feed.getIsPublic();
+        this.reportCount = feed.getReportCount();
+        this.likeCount = feed.getLikeCount();
+        this.commentCount = feed.getCommentCount();
+    }
 }

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

@@ -6,14 +6,18 @@
 import konkuk.thip.feed.domain.Feed;
 import konkuk.thip.feed.domain.Tag;
 import konkuk.thip.user.adapter.out.jpa.UserJpaEntity;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.List;
 
 @Component
+@RequiredArgsConstructor
 public class FeedMapper {
 
+    private final ContentMapper contentMapper;
+
     public FeedJpaEntity toJpaEntity(Feed feed, UserJpaEntity userJpaEntity, BookJpaEntity bookJpaEntity) {
         return FeedJpaEntity.builder()
                 .content(feed.getContent())
@@ -41,6 +45,9 @@ public Feed toDomainEntity(FeedJpaEntity feedJpaEntity, List<TagJpaEntity> tagJp
                         .map(TagJpaEntity::getValue)
                         .map(Tag::from)
                         .toList())
+                .contentList(feedJpaEntity.getContentList().stream()
+                                .map(contentMapper::toDomainEntity)
+                                .toList())
                 .createdAt(feedJpaEntity.getCreatedAt())
                 .modifiedAt(feedJpaEntity.getModifiedAt())
                 .status(feedJpaEntity.getStatus())

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

@@ -18,14 +18,12 @@
 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 {
@@ -38,6 +36,16 @@ public class FeedCommandPersistenceAdapter implements FeedCommandPort {
     private final FeedMapper feedMapper;
     private final ContentMapper contentMapper;
 
+    @Override
+    public Feed findById(Long id) {
+        FeedJpaEntity feedJpaEntity = feedJpaRepository.findById(id)
+                .orElseThrow(() -> new EntityNotFoundException(FEED_NOT_FOUND));
+
+        List<TagJpaEntity> tagJpaEntityList = tagJpaRepository.findAllByFeedId(feedJpaEntity.getPostId());
+
+        return feedMapper.toDomainEntity(feedJpaEntity, tagJpaEntityList);
+    }
+
     @Override
     public Long save(Feed feed) {
 
@@ -53,26 +61,38 @@ public Long save(Feed feed) {
         FeedJpaEntity savedFeed = feedJpaRepository.save(feedJpaEntity);
 
         // Content가 존재하면 ContentJpaEntity 생성 및 Feed 연관관계 설정
-        saveContents(feed, savedFeed);
+        applyFeedContents(feed, savedFeed);
         // 태그가 존재하면 태그 피드 매핑 생성 및 저장
-        saveFeedTags(feed, savedFeed);
+        applyFeedTags(feed, savedFeed);
 
         return savedFeed.getPostId();
     }
 
-    private void saveContents(Feed feed, FeedJpaEntity feedJpaEntity) {
-        if (feed.getContentList().isEmpty()) return;
+    @Override
+    public Long update(Feed feed) {
+        FeedJpaEntity feedJpaEntity = feedJpaRepository.findById(feed.getId())
+                .orElseThrow(() -> new EntityNotFoundException(FEED_NOT_FOUND));
+        feedJpaEntity.updateFrom(feed);
+
+        feedJpaEntity.getContentList().clear(); // 피드 수정시 기존 영속성 컨텍스트 내 엔티티 연결 제거
+        applyFeedContents(feed, feedJpaEntity);
 
-        List<ContentJpaEntity> contentJpaEntities = feed.getContentList().stream()
+        feedTagJpaRepository.deleteAllByFeedJpaEntity(feedJpaEntity); // 피드 수정시 기존 피드의 모든 FeedTag 매핑 row 삭제
+        applyFeedTags(feed, feedJpaEntity);
+
+        return feedJpaEntity.getPostId();
+    }
+
+    private void applyFeedContents(Feed feed, FeedJpaEntity feedJpaEntity) {
+        if (feed.getContentList().isEmpty()) return;
+        List<ContentJpaEntity> contents = feed.getContentList().stream()
                 .map(content -> contentMapper.toJpaEntity(content, feedJpaEntity))
                 .toList();
-
-        contentJpaEntities.forEach(feedJpaEntity.getContentList()::add);
+        feedJpaEntity.getContentList().addAll(contents);
     }
 
-    private void saveFeedTags(Feed feed, FeedJpaEntity feedJpaEntity) {
+    private void applyFeedTags(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));
@@ -86,5 +106,4 @@ private void saveFeedTags(Feed feed, FeedJpaEntity feedJpaEntity) {
         }
     }
 
-
 }

src/main/java/konkuk/thip/feed/adapter/out/persistence/repository/FeedTag/FeedTagJpaRepository.java

@@ -1,7 +1,16 @@
 package konkuk.thip.feed.adapter.out.persistence.repository.FeedTag;
 
+import konkuk.thip.feed.adapter.out.jpa.FeedJpaEntity;
 import konkuk.thip.feed.adapter.out.jpa.FeedTagJpaEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 public interface FeedTagJpaRepository extends JpaRepository<FeedTagJpaEntity, Long>{
+
+    @Modifying
+    @Query("DELETE FROM FeedTagJpaEntity ft WHERE ft.feedJpaEntity = :feedJpaEntity")
+    void deleteAllByFeedJpaEntity(@Param("feedJpaEntity") FeedJpaEntity feedJpaEntity);
+
 }

src/main/java/konkuk/thip/feed/adapter/out/persistence/repository/Tag/TagJpaRepository.java

@@ -2,9 +2,16 @@
 
 import konkuk.thip.feed.adapter.out.jpa.TagJpaEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
+import java.util.List;
 import java.util.Optional;
 
 public interface TagJpaRepository extends JpaRepository<TagJpaEntity, Long>{
     Optional<TagJpaEntity> findByValue(String value);
+
+    @Query("SELECT ft.tagJpaEntity FROM FeedTagJpaEntity ft WHERE ft.feedJpaEntity.postId = :feedId")
+    List<TagJpaEntity> findAllByFeedId(@Param("feedId") Long feedId);
+
 }

src/main/java/konkuk/thip/feed/application/port/in/FeedUpdateUseCase.java

@@ -0,0 +1,7 @@
+package konkuk.thip.feed.application.port.in;
+
+import konkuk.thip.feed.application.port.in.dto.FeedUpdateCommand;
+
+public interface FeedUpdateUseCase {
+    Long updateFeed(FeedUpdateCommand command);
+}

src/main/java/konkuk/thip/feed/application/port/in/dto/FeedCreateCommand.java

@@ -10,8 +10,6 @@ public record FeedCreateCommand(
 
         Boolean isPublic,
 
-        String category,
-
         List<String> tagList,
 
         Long userId

src/main/java/konkuk/thip/feed/application/port/in/dto/FeedUpdateCommand.java

@@ -0,0 +1,20 @@
+package konkuk.thip.feed.application.port.in.dto;
+
+import java.util.List;
+
+public record FeedUpdateCommand(
+
+        String contentBody,
+
+        Boolean isPublic,
+
+        List<String> tagList,
+
+        List<String> remainImageUrls,
+
+        Long userId,
+
+        Long feedId
+)
+{
+}

src/main/java/konkuk/thip/feed/application/port/out/FeedCommandPort.java

@@ -5,4 +5,6 @@
 
 public interface FeedCommandPort {
     Long save(Feed feed);
+    Long update(Feed feed);
+    Feed findById(Long id);
 }