[api-server-v1] fix: @RequestBody 정리, @transactional 어노테이션 추가

JoberChipFrappuccino · Oct 5, 2023 · 01f0a5f · 01f0a5f
1 parent a9b78a4
commit 01f0a5f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/...server-v1/src/main/java/kr/joberchip/server/v1/block/controller/VideoBlockController.java b/...server-v1/src/main/java/kr/joberchip/server/v1/block/controller/VideoBlockController.java
@@ -42,7 +42,7 @@ public ApiResponse.Result<BlockResponseDTO> modifyVideoBlock(
       @AuthenticationPrincipal CustomUserDetails loginUser,
       @PathVariable UUID pageId,
       @PathVariable UUID blockId,
-      @RequestBody VideoBlockDTO videoBlockRequestDTO) {
+      VideoBlockDTO videoBlockRequestDTO) {
 
     log.info("[TextBlockController] Login User : {}", loginUser);
     log.info("[TextBlockController] Current Page Id : {}", pageId);

diff --git a/api/server-v1/src/main/java/kr/joberchip/server/v1/block/service/VideoBlockService.java b/api/server-v1/src/main/java/kr/joberchip/server/v1/block/service/VideoBlockService.java
@@ -13,6 +13,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Slf4j
 @Service
@@ -23,6 +24,7 @@ public class VideoBlockService {
   private final SharePageRepository sharePageRepository;
   private final S3StorageService s3StorageService;
 
+  @Transactional
   public BlockResponseDTO createVideoBlock(UUID pageId, VideoBlockDTO videoBlockDTO) {
 
     SharePage parentPage =
@@ -44,6 +46,7 @@ public BlockResponseDTO createVideoBlock(UUID pageId, VideoBlockDTO videoBlockDT
     return BlockResponseDTO.fromEntity(videoBlock);
   }
 
+  @Transactional
   public BlockResponseDTO modifyVideoBlock(UUID blockId, VideoBlockDTO videoBlockDTO) {
     VideoBlock videoBlock =
         videoBlockRepository
@@ -54,6 +57,11 @@ public BlockResponseDTO modifyVideoBlock(UUID blockId, VideoBlockDTO videoBlockD
 
     if (videoBlockDTO.description() != null) videoBlock.setDescription(videoBlockDTO.description());
 
+    if (videoBlockDTO.videoLink() != null) {
+      s3StorageService.delete(videoBlock.getVideoLink());
+      videoBlock.setVideoLink(videoBlockDTO.videoLink());
+    }
+
     if (videoBlockDTO.attachedVideo() != null) {
       s3StorageService.delete(videoBlock.getVideoLink());
       videoBlock.setVideoLink(s3StorageService.store(videoBlockDTO.attachedVideo()));
@@ -66,6 +74,7 @@ public BlockResponseDTO modifyVideoBlock(UUID blockId, VideoBlockDTO videoBlockD
     return BlockResponseDTO.fromEntity(videoBlock);
   }
 
+  @Transactional
   public void deleteVideoBlock(UUID pageId, UUID blockId) {
     SharePage sharePage =
         sharePageRepository