refactor/#KD-29 병합 충돌 해결

Author: dkdltm221

aics-admin/src/main/java/kgu/developers/admin/file/application/FileAdminFacade.java

@@ -6,8 +6,8 @@
 import kgu.developers.domain.file.application.response.FilePathResponse;
 import kgu.developers.domain.file.application.command.FileCommandService;
 import kgu.developers.domain.file.domain.FileDomain;
-import kgu.developers.domain.file.domain.FileEntity;
-import kgu.developers.domain.file.infrastructure.FileStorageService;
+import kgu.developers.domain.file.domain.FileModel;
+import kgu.developers.domain.file.infrastructure.repository.FileStorageService;
 import lombok.RequiredArgsConstructor;
 
 @Component
@@ -18,7 +18,7 @@ public class FileAdminFacade {
 
 	public FilePathResponse saveFile(MultipartFile file, FileDomain fileDomain) {
 		String storedPath = fileStorageService.store(file, fileDomain);
-		FileEntity savedFile = fileCommandService.saveFile(file, storedPath);
+		FileModel savedFile = fileCommandService.saveFile(file, storedPath);
 		return FilePathResponse.from(savedFile);
 	}
 }

aics-admin/src/testFixtures/java/carousel/application/CarouselAdminFacadeTest.java

@@ -16,7 +16,7 @@
 import kgu.developers.domain.carousel.domain.Carousel;
 import kgu.developers.domain.carousel.exception.CarouselNotFoundException;
 import kgu.developers.domain.file.application.query.FileQueryService;
-import kgu.developers.domain.file.domain.FileEntity;
+import kgu.developers.domain.file.domain.FileModel;
 import mock.repository.FakeCarouselRepository;
 import mock.repository.FakeFileRepository;
 
@@ -48,7 +48,7 @@ private void initializeCarouselAdminFacade() {
 
 	private static void saveTestFile(FakeFileRepository fakeFileRepository) {
 		fakeFileRepository.save(
-			FileEntity.create(
+			FileModel.create(
 				"경기대학교 AI컴퓨터공학부 메인 이미지",
 				"/files/carousel/main_image.jpg",
 				1234L,

aics-admin/src/testFixtures/java/lab/application/LabAdminFacadeTest.java

@@ -14,7 +14,6 @@
 import kgu.developers.admin.lab.presentation.request.LabCreateRequest;
 import kgu.developers.admin.lab.presentation.request.LabUpdateRequest;
 import kgu.developers.admin.lab.presentation.response.LabPersistResponse;
-import kgu.developers.domain.file.domain.FileEntity;
 import kgu.developers.domain.lab.application.command.LabCommandService;
 import kgu.developers.domain.lab.application.query.LabQueryService;
 import kgu.developers.domain.lab.domain.Lab;
@@ -36,7 +35,7 @@ public void init() {
 			new LabQueryService(fakeLabRepository)
 		);
 
-		fakeFileRepository.save(FileEntity.builder().id(TEST_FILE_ID).physicalPath("test_path").build());
+
 		fakeLabRepository.save(Lab.builder()
 			.name("Lab A")
 			.loc("8500")

aics-admin/src/testFixtures/java/post/application/PostAdminFacadeTest.java

@@ -43,7 +43,7 @@ public void init() {
 		UserQueryService userQueryService = new UserQueryService(fakeUserRepository);
 		FileQueryService fileQueryService = new FileQueryService(fakeFileRepository);
 		this.postAdminFacade = new PostAdminFacade(
-			new PostCommandService(userQueryService, fakePostRepository, fileQueryService),
+			new PostCommandService(userQueryService, fakePostRepository),
 			new PostQueryService(fakePostRepository, fakeFileRepository, fakeUserRepository),
 			new PostSchedulingService(fakePostRepository)
 		);

aics-api/src/main/java/kgu/developers/api/club/presentation/response/ClubDetailResponse.java

@@ -6,7 +6,6 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import kgu.developers.domain.club.domain.Club;
 import kgu.developers.domain.file.application.response.FilePathResponse;
-import kgu.developers.domain.file.domain.FileEntity;
 import lombok.Builder;
 
 @Builder

aics-api/src/main/java/kgu/developers/api/club/presentation/response/ClubListResponse.java

@@ -5,7 +5,6 @@
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import kgu.developers.domain.club.domain.Club;
-import kgu.developers.domain.file.domain.FileEntity;
 import lombok.Builder;
 
 import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;

aics-api/src/testFixtures/java/carousel/application/CarouselFacadeTest.java

@@ -11,7 +11,6 @@
 import kgu.developers.domain.carousel.application.query.CarouselQueryService;
 import kgu.developers.domain.carousel.domain.Carousel;
 import kgu.developers.domain.file.application.query.FileQueryService;
-import kgu.developers.domain.file.domain.FileEntity;
 import mock.repository.FakeCarouselRepository;
 import mock.repository.FakeFileRepository;
 

aics-api/src/testFixtures/java/comment/application/CommentFacadeTest.java

@@ -78,6 +78,7 @@ public void init() {
 			"test2", author.getId(), post.getId()
 		));
 		delete.delete();
+		fakeCommentRepository.save(delete);
 
 		UserDetails user = userQueryService.getUserById("202411345");
 		SecurityContext context = SecurityContextHolder.getContext();

aics-api/src/testFixtures/java/lab/application/LabFacadeTest.java

@@ -5,7 +5,6 @@
 import java.util.List;
 
 import kgu.developers.domain.file.application.query.FileQueryService;
-import kgu.developers.domain.file.domain.FileEntity;
 import mock.repository.FakeFileRepository;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
@@ -31,8 +30,6 @@ public void init() {
 			new LabQueryService(fakeLabRepository),new FileQueryService(fakeFileRepository)
 		);
 
-		fakeFileRepository.save(FileEntity.builder().id(TEST_FILE_ID).physicalPath("test_path").build());
-
 		fakeLabRepository.save(
 			Lab.create(
 				"인공지능 연구실",

aics-api/src/testFixtures/java/post/application/PostFacadeTest.java

@@ -44,10 +44,9 @@ public void init() {
 		FakeFileRepository fakeFileRepository = new FakeFileRepository();
 
 		UserQueryService userQueryService = new UserQueryService(fakeUserRepository);
-		FileQueryService fileQueryService = new FileQueryService(fakeFileRepository);
 
 		postFacade = new PostFacade(
-			new PostCommandService(userQueryService, fakePostRepository, fileQueryService),
+			new PostCommandService(userQueryService, fakePostRepository),
 			new PostQueryService(fakePostRepository, fakeFileRepository, fakeUserRepository),
 			new UserQueryService(fakeUserRepository)
 		);
@@ -75,6 +74,7 @@ public void init() {
 			"second title", "second content", NEWS, author.getId(), null, false
 		));
 		delete.delete();
+		fakePostRepository.save(delete);
 
 		fakePostRepository.save(Post.create(
 			"third title", "third content", NEWS, author.getId(), null, false