From 76c920c58f6044757eaf802d1f7f0241db0cd7cc Mon Sep 17 00:00:00 2001 From: Jin Geonwoo Date: Tue, 16 Jul 2024 19:23:54 +0900 Subject: [PATCH] =?UTF-8?q?[hotfix]=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=ED=86=B5=EA=B3=BC=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20(#91)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/record/service/impl/RecordServiceImpl.java | 4 +--- .../java/org/recordy/server/mock/FakeContainer.java | 10 ++++++++-- .../recordy/server/mock/record/FakeFileService.java | 3 ++- .../java/org/recordy/server/util/DomainFixture.java | 11 +++++------ 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/recordy/server/record/service/impl/RecordServiceImpl.java b/src/main/java/org/recordy/server/record/service/impl/RecordServiceImpl.java index 407139bb..50f2de07 100644 --- a/src/main/java/org/recordy/server/record/service/impl/RecordServiceImpl.java +++ b/src/main/java/org/recordy/server/record/service/impl/RecordServiceImpl.java @@ -36,10 +36,8 @@ public class RecordServiceImpl implements RecordService { private final RecordRepository recordRepository; private final ViewRepository viewRepository; - private final UserService userService; - private final S3Service s3Service; private final FileService fileService; - private final RecordStatService recordStatService; + private final UserService userService; @Override public Record create(RecordCreate recordCreate, File file) { diff --git a/src/test/java/org/recordy/server/mock/FakeContainer.java b/src/test/java/org/recordy/server/mock/FakeContainer.java index f8f55b04..7ec53755 100644 --- a/src/test/java/org/recordy/server/mock/FakeContainer.java +++ b/src/test/java/org/recordy/server/mock/FakeContainer.java @@ -1,6 +1,7 @@ package org.recordy.server.mock; import com.fasterxml.jackson.databind.ObjectMapper; +import org.mockito.Mockito; import org.recordy.server.auth.repository.AuthRepository; import org.recordy.server.auth.security.filter.TokenAuthenticationFilter; import org.recordy.server.auth.security.handler.AuthFilterExceptionHandler; @@ -13,6 +14,7 @@ import org.recordy.server.auth.service.impl.token.AuthTokenServiceImpl; import org.recordy.server.auth.service.impl.token.AuthTokenSigningKeyProvider; import org.recordy.server.mock.subscribe.FakeSubscribeRepository; +import org.recordy.server.record.service.FileService; import org.recordy.server.record.service.S3Service; import org.recordy.server.keyword.repository.KeywordRepository; import org.recordy.server.keyword.service.KeywordService; @@ -23,12 +25,12 @@ import org.recordy.server.mock.auth.FakeKakaoFeignClient; import org.recordy.server.mock.bookmark.FakeBookmarkRepository; import org.recordy.server.mock.keyword.FakeKeywordRepository; -import org.recordy.server.mock.record.FakeFileService; import org.recordy.server.mock.record.FakeRecordRepository; import org.recordy.server.mock.user.FakeUserRepository; import org.recordy.server.mock.view.FakeViewRepository; import org.recordy.server.record.repository.RecordRepository; import org.recordy.server.record.service.RecordService; +import org.recordy.server.record.service.impl.FileServiceImpl; import org.recordy.server.record.service.impl.RecordServiceImpl; import org.recordy.server.record_stat.repository.BookmarkRepository; import org.recordy.server.record_stat.repository.ViewRepository; @@ -42,6 +44,7 @@ import org.recordy.server.user.service.UserService; import org.recordy.server.user.service.impl.UserServiceImpl; import org.recordy.server.util.DomainFixture; +import software.amazon.awssdk.services.s3.S3Client; import java.util.List; @@ -72,6 +75,7 @@ public class FakeContainer { public final AuthTokenService authTokenService; public final AuthService authService; public final UserService userService; + public final FileService fileService; public final RecordService recordService; public final KeywordService keywordService; public final RecordStatService recordStatService; @@ -117,9 +121,11 @@ public FakeContainer() { ); this.authService = new AuthServiceImpl(authRepository, authPlatformServiceFactory, authTokenService); this.userService = new UserServiceImpl(ROOT_USER_ID, userRepository, subscribeRepository, recordRepository, authService, authTokenService); + + this.fileService = new FileServiceImpl(Mockito.mock(S3Client.class)); this.keywordService = new KeywordServiceImpl(keywordRepository); this.recordStatService = new RecordStatServiceImpl(userRepository, recordRepository, bookmarkRepository); - this.recordService = new RecordServiceImpl(recordRepository, viewRepository, fileService, userService, recordStatService); + this.recordService = new RecordServiceImpl(recordRepository, viewRepository, fileService, userService); this.subscribeService = new SubscribeServiceImpl(subscribeRepository, userRepository); this.s3Service = mock(S3Service.class); // S3Service mock 사용 diff --git a/src/test/java/org/recordy/server/mock/record/FakeFileService.java b/src/test/java/org/recordy/server/mock/record/FakeFileService.java index 296e8043..8690a71f 100644 --- a/src/test/java/org/recordy/server/mock/record/FakeFileService.java +++ b/src/test/java/org/recordy/server/mock/record/FakeFileService.java @@ -1,10 +1,11 @@ package org.recordy.server.mock.record; import org.recordy.server.record.domain.File; +import org.recordy.server.record.service.FileService; import org.recordy.server.record.service.dto.FileUrl; import org.recordy.server.util.DomainFixture; -public class FakeFileService { +public class FakeFileService implements FileService { @Override public FileUrl save(File file) { diff --git a/src/test/java/org/recordy/server/util/DomainFixture.java b/src/test/java/org/recordy/server/util/DomainFixture.java index 60d5c1a2..e3fd48a3 100644 --- a/src/test/java/org/recordy/server/util/DomainFixture.java +++ b/src/test/java/org/recordy/server/util/DomainFixture.java @@ -219,7 +219,8 @@ public static RecordCreate createRecordCreate() { USER_ID, LOCATION, CONTENT, - KEYWORDS + KEYWORDS, + new FileUrl(VIDEO_URL, THUMBNAIL_URL) ); } @@ -228,15 +229,13 @@ public static RecordCreate createRecordCreateByOtherUser() { 2, LOCATION, CONTENT, - KEYWORDS + KEYWORDS, + new FileUrl(VIDEO_URL, THUMBNAIL_URL) ); } public static File createFile() { - return new File( - new MockMultipartFile("file", "file.mp4", "video/mp4", new byte[0]), - new MockMultipartFile("thumbnail", "thumbnail.jpg", "image/jpeg", new byte[0]) - ); + return new File(VIDEO_URL, THUMBNAIL_URL); } public static Record createRecord() {