test & fix: 동영상 삭제 메서드 테스트, 공개 동영상 조회 시 삭제되지 않았을 경우만 조회

Team-J9 · Jul 18, 2024 · 2a92f0c · 2a92f0c
1 parent 825eb51
commit 2a92f0c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/src/main/java/com/j9/bestmoments/repository/VideoRepository.java b/src/main/java/com/j9/bestmoments/repository/VideoRepository.java
@@ -20,7 +20,7 @@ public interface VideoRepository extends JpaRepository<Video, UUID> {
 
     Optional<Video> findByIdAndUploaderIdAndDeletedAtIsNotNull(UUID id, UUID uploaderId);
 
-    Optional<Video> findByIdAndVideoStatus(UUID id, VideoStatus videoStatus);
+    Optional<Video> findByIdAndVideoStatusAndDeletedAtIsNull(UUID id, VideoStatus videoStatus);
 
     Optional<Video> findByIdAndUploaderId(UUID id, UUID uploaderId);
 

diff --git a/src/main/java/com/j9/bestmoments/service/VideoService.java b/src/main/java/com/j9/bestmoments/service/VideoService.java
@@ -64,7 +64,7 @@ public Video findDeletedByIdAndUploaderId(UUID id, UUID memberId) {
     }
 
     public Video findPublicById(UUID id) {
-        return videoRepository.findByIdAndVideoStatus(id, VideoStatus.PUBLIC)
+        return videoRepository.findByIdAndVideoStatusAndDeletedAtIsNull(id, VideoStatus.PUBLIC)
                 .orElseThrow(EntityNotFoundException::new);
     }
 

diff --git a/src/test/java/com/j9/bestmoments/service/VideoServiceTest.java b/src/test/java/com/j9/bestmoments/service/VideoServiceTest.java
@@ -142,4 +142,14 @@ void update() {
         Assertions.assertEquals(changedVideoStatus, foundVideo.getVideoStatus());
     }
 
+    @Test
+    @Transactional
+    void softDelete() {
+        videoService.softDelete(publicVideo);
+        UUID id = publicVideo.getId();
+        UUID uploaderId = publicVideo.getUploader().getId();
+        Assertions.assertThrows(EntityNotFoundException.class, () -> videoService.findPublicById(id));
+        Assertions.assertDoesNotThrow(() -> videoService.findDeletedByIdAndUploaderId(id, uploaderId));
+    }
+
 }