From 2a92f0c284f85e3b9ff94037ae46cc1f1d27eecf Mon Sep 17 00:00:00 2001
From: SJ70 <seojae70@gmail.com>
Date: Fri, 19 Jul 2024 03:04:41 +0900
Subject: [PATCH] =?UTF-8?q?test=20&=20fix:=20=EB=8F=99=EC=98=81=EC=83=81?=
 =?UTF-8?q?=20=EC=82=AD=EC=A0=9C=20=EB=A9=94=EC=84=9C=EB=93=9C=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8,=20=EA=B3=B5=EA=B0=9C=20=EB=8F=99=EC=98=81?=
 =?UTF-8?q?=EC=83=81=20=EC=A1=B0=ED=9A=8C=20=EC=8B=9C=20=EC=82=AD=EC=A0=9C?=
 =?UTF-8?q?=EB=90=98=EC=A7=80=20=EC=95=8A=EC=95=98=EC=9D=84=20=EA=B2=BD?=
 =?UTF-8?q?=EC=9A=B0=EB=A7=8C=20=EC=A1=B0=ED=9A=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/j9/bestmoments/repository/VideoRepository.java |  2 +-
 .../java/com/j9/bestmoments/service/VideoService.java  |  2 +-
 .../com/j9/bestmoments/service/VideoServiceTest.java   | 10 ++++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/j9/bestmoments/repository/VideoRepository.java b/src/main/java/com/j9/bestmoments/repository/VideoRepository.java
index 18640a2..4b1af76 100644
--- 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
index 1c6638c..6b9c6c8 100644
--- 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
index 3c969e2..266c828 100644
--- 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));
+    }
+
 }