refactor/#257 Carousel, FileEntity간 ID 참조 방식으로 관계 매핑 변경 (#258)

LeeHanEum · web-flow · commit 85246d260459 · 2025-09-03T14:00:03.000+09:00
* refactor: Carousel, FileEntity 간 ID 참조 관게 매핑으로 변경 * refactor: 리팩토링으로 인한 테스트 코드 의존성 변경 * refactor: jacoco 버전 호환성 문제로 인해 0.8.12로 업그레이드 * refactor: CarouselFacade Stream NPE 방지 * refactor: Carousel FileId 컬럼 NOT NULL 제약조건 설정 * refactor: findPhysicalPathById ID로 인한 NPE 방지 * refactor: CarouselAdminFacade 클래스 레벨에 @transactional 어노테이션 적용
diff --git a/aics-admin/src/main/java/kgu/developers/admin/carousel/application/CarouselAdminFacade.java b/aics-admin/src/main/java/kgu/developers/admin/carousel/application/CarouselAdminFacade.java
@@ -12,18 +12,17 @@
 import lombok.RequiredArgsConstructor;
 
 @Component
+@Transactional
 @RequiredArgsConstructor
 public class CarouselAdminFacade {
 	private final CarouselCommandService carouselCommandService;
 	private final CarouselQueryService carouselQueryService;
 
-	@Transactional
 	public CarouselPersistResponse createCarousel(Long fileId, CarouselRequest request) {
 		Long id = carouselCommandService.createCarousel(fileId, request.text(), request.link());
 		return CarouselPersistResponse.of(id);
 	}
 
-	@Transactional
 	public void updateCarousel(Long id, CarouselUpdateRequest request) {
 		Carousel carousel = carouselQueryService.getById(id);
 		carouselCommandService.updateCarousel(carousel, request.link(), request.text(), request.fileId());
diff --git a/aics-admin/src/testFixtures/java/carousel/application/CarouselAdminFacadeTest.java b/aics-admin/src/testFixtures/java/carousel/application/CarouselAdminFacadeTest.java
@@ -25,7 +25,6 @@ public class CarouselAdminFacadeTest {
 	private Carousel carousel;
 
 	private static final Long TEST_FILE_ID = 1L;
-	private static final Long SAVE_TARGET_ID = 1L;
 
 	@BeforeEach
 	public void init() {
@@ -83,7 +82,7 @@ public void updateCarousel_Success() {
 		// then
 		assertEquals(request.text(), carousel.getText());
 		assertEquals(request.link(), carousel.getLink());
-		assertEquals(request.fileId(), carousel.getFile().getId());
+		assertEquals(request.fileId(), carousel.getFileId());
 	}
 
 	@Test
diff --git a/aics-api/src/main/java/kgu/developers/api/carousel/application/CarouselFacade.java b/aics-api/src/main/java/kgu/developers/api/carousel/application/CarouselFacade.java
@@ -5,17 +5,28 @@
 import org.springframework.stereotype.Component;
 
 import kgu.developers.api.carousel.presentation.response.CarouselListResponse;
+import kgu.developers.api.carousel.presentation.response.CarouselResponse;
 import kgu.developers.domain.carousel.application.query.CarouselQueryService;
-import kgu.developers.domain.carousel.domain.Carousel;
+import kgu.developers.domain.file.application.query.FileQueryService;
 import lombok.RequiredArgsConstructor;
 
 @Component
 @RequiredArgsConstructor
 public class CarouselFacade {
 	private final CarouselQueryService carouselQueryService;
+	private final FileQueryService fileQueryService;
 
 	public CarouselListResponse getCarousels() {
-		List<Carousel> carousels = carouselQueryService.getAllCarousels();
+		List<CarouselResponse> carousels = carouselQueryService.getAllCarousels()
+			.stream()
+			.map(carousel -> {
+				Long fileId = carousel.getFileId();
+				String filePath = (fileId != null) ? fileQueryService.getFilePhysicalPath(fileId) : null;
+				return CarouselResponse.of(carousel, filePath);
+			})
+			.toList();
+
 		return CarouselListResponse.from(carousels);
 	}
 }
+
diff --git a/aics-api/src/main/java/kgu/developers/api/carousel/presentation/response/CarouselListResponse.java b/aics-api/src/main/java/kgu/developers/api/carousel/presentation/response/CarouselListResponse.java
@@ -5,7 +5,6 @@
 import java.util.List;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import kgu.developers.domain.carousel.domain.Carousel;
 import lombok.Builder;
 
 @Builder
@@ -25,11 +24,9 @@ public record CarouselListResponse(
 		requiredMode = REQUIRED)
 	List<CarouselResponse> contents
 ) {
-	public static CarouselListResponse from(List<Carousel> carousels) {
+	public static CarouselListResponse from(List<CarouselResponse> carousels) {
 		return CarouselListResponse.builder()
-			.contents(carousels.stream()
-				.map(CarouselResponse::from)
-				.toList())
+			.contents(carousels)
 			.build();
 	}
 }
diff --git a/aics-api/src/main/java/kgu/developers/api/carousel/presentation/response/CarouselResponse.java b/aics-api/src/main/java/kgu/developers/api/carousel/presentation/response/CarouselResponse.java
@@ -25,12 +25,12 @@ public record CarouselResponse(
 		requiredMode = NOT_REQUIRED)
 	FilePathResponse file
 ) {
-	public static CarouselResponse from(Carousel carousel) {
+	public static CarouselResponse of(Carousel carousel, String physicalPath) {
 		return CarouselResponse.builder()
 			.id(carousel.getId())
 			.text(carousel.getText())
 			.link(carousel.getLink())
-			.file(carousel.getFile() != null ? FilePathResponse.from(carousel.getFile()) : null)
+			.file(carousel.getFileId() != null ? FilePathResponse.of(carousel.getFileId(), physicalPath) : null)
 			.build();
 	}
 }
diff --git a/aics-api/src/testFixtures/java/carousel/application/CarouselFacadeTest.java b/aics-api/src/testFixtures/java/carousel/application/CarouselFacadeTest.java
@@ -10,13 +10,16 @@
 import kgu.developers.api.carousel.presentation.response.CarouselListResponse;
 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;
 
 public class CarouselFacadeTest {
 	private CarouselFacade carouselFacade;
 
 	private static final int TARGET_CAROUSEL_SIZE = 2;
+	private static final Long FAKE_FILE_ID = 1L;
 
 	@BeforeEach
 	public void init() {
@@ -25,19 +28,21 @@ public void init() {
 
 	private void initializeCarouselFacade() {
 		FakeCarouselRepository fakeCarouselRepository = new FakeCarouselRepository();
+		FakeFileRepository fakeFileRepository = new FakeFileRepository();
 		carouselFacade = new CarouselFacade(
-			new CarouselQueryService(fakeCarouselRepository)
+			new CarouselQueryService(fakeCarouselRepository),
+			new FileQueryService(fakeFileRepository)
 		);
 		saveTestCarousel(fakeCarouselRepository);
 	}
 
 	private static void saveTestCarousel(FakeCarouselRepository fakeCarouselRepository) {
 		fakeCarouselRepository.save(
-			Carousel.create("컴퓨터공학부 홈페이지 메인 이미지", "https://kgu.ac.kr", FileEntity.builder().build())
+			Carousel.create("컴퓨터공학부 홈페이지 메인 이미지", "https://kgu.ac.kr", FAKE_FILE_ID)
 		);
 
 		fakeCarouselRepository.save(
-			Carousel.create("SW 중심대학 선정", "https://kgu.ac.kr", FileEntity.builder().build())
+			Carousel.create("SW 중심대학 선정", "https://kgu.ac.kr", FAKE_FILE_ID)
 		);
 	}
 
diff --git a/aics-domain/src/main/java/kgu/developers/domain/carousel/application/command/CarouselCommandService.java b/aics-domain/src/main/java/kgu/developers/domain/carousel/application/command/CarouselCommandService.java
@@ -17,22 +17,17 @@ public class CarouselCommandService {
 
 	public Long createCarousel(Long fileId, String text, String link) {
 		FileEntity file = fileQueryService.getFileById(fileId);
-		Carousel carousel = Carousel.create(text, link, file);
+		Carousel carousel = Carousel.create(text, link, file.getId());
 		return carouselRepository.save(carousel).getId();
 	}
 
 	@Transactional
 	public void updateCarousel(Carousel carousel, String link, String text, Long fileId) {
 		carousel.updateText(text);
 		carousel.updateLink(link);
-
-		FileEntity file = null;
-		if (fileId != null) {
-			file = fileQueryService.getFileById(fileId);
-		}
-
-		carousel.updateFile(file);
+		carousel.updateFileId(fileId);
 	}
+
 	public void deleteCarouselById(Long id) {
 		carouselRepository.deleteById(id);
 	}
diff --git a/aics-domain/src/main/java/kgu/developers/domain/carousel/domain/Carousel.java b/aics-domain/src/main/java/kgu/developers/domain/carousel/domain/Carousel.java
@@ -1,17 +1,13 @@
 package kgu.developers.domain.carousel.domain;
 
-import static jakarta.persistence.CascadeType.REMOVE;
 import static jakarta.persistence.GenerationType.IDENTITY;
 import static lombok.AccessLevel.PROTECTED;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.OneToOne;
 import kgu.developers.common.domain.BaseTimeEntity;
-import kgu.developers.domain.file.domain.FileEntity;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -33,15 +29,14 @@ public class Carousel extends BaseTimeEntity {
 	@Column(nullable = false)
 	private String link;
 
-	@OneToOne(cascade = REMOVE)
-	@JoinColumn(name = "file_id", nullable = false)
-	private FileEntity file;
+	@Column(nullable = false)
+	private Long fileId;
 
-	public static Carousel create(String text, String link, FileEntity file) {
+	public static Carousel create(String text, String link, Long fileId) {
 		return Carousel.builder()
 			.text(text)
 			.link(link)
-			.file(file)
+			.fileId(fileId)
 			.build();
 	}
 
@@ -53,8 +48,8 @@ public void updateLink(String link) {
 		this.link = link;
 	}
 
-	public void updateFile(FileEntity file) {
-		this.file = file;
+	public void updateFileId(Long fileId) {
+		this.fileId = fileId;
 	}
 }
 
diff --git a/aics-domain/src/main/java/kgu/developers/domain/carousel/infrastructure/CarouselRepositoryImpl.java b/aics-domain/src/main/java/kgu/developers/domain/carousel/infrastructure/CarouselRepositoryImpl.java
@@ -26,7 +26,7 @@ public void deleteById(Long id) {
 
 	@Override
 	public List<Carousel> findAllByFileIsNotNullOrderByCreatedAtDesc() {
-		return jpaCarouselRepository.findAllByFileIsNotNullOrderByCreatedAtDesc();
+		return jpaCarouselRepository.findAllByFileIdIsNotNullOrderByCreatedAtDesc();
 	}
 
 	@Override
diff --git a/aics-domain/src/main/java/kgu/developers/domain/carousel/infrastructure/JpaCarouselRepository.java b/aics-domain/src/main/java/kgu/developers/domain/carousel/infrastructure/JpaCarouselRepository.java
@@ -7,5 +7,5 @@
 import kgu.developers.domain.carousel.domain.Carousel;
 
 public interface JpaCarouselRepository extends JpaRepository<Carousel, Long> {
-	List<Carousel> findAllByFileIsNotNullOrderByCreatedAtDesc();
+	List<Carousel> findAllByFileIdIsNotNullOrderByCreatedAtDesc();
 }
diff --git a/aics-domain/src/main/java/kgu/developers/domain/file/application/query/FileQueryService.java b/aics-domain/src/main/java/kgu/developers/domain/file/application/query/FileQueryService.java
@@ -25,4 +25,9 @@ public Map<Long,FileEntity> findFileEntityMapByIds(List<Long> ids) {
 				.stream()
 				.collect(Collectors.toMap(FileEntity::getId, Function.identity()));
 	}
+
+	public String getFilePhysicalPath(Long id) {
+		return fileRepository.findPhysicalPathById(id)
+			.orElse(null);
+	}
 }
diff --git a/aics-domain/src/main/java/kgu/developers/domain/file/application/response/FilePathResponse.java b/aics-domain/src/main/java/kgu/developers/domain/file/application/response/FilePathResponse.java
@@ -1,6 +1,6 @@
 package kgu.developers.domain.file.application.response;
 
-import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.*;
+import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import kgu.developers.domain.file.domain.FileEntity;
@@ -22,4 +22,12 @@ public static FilePathResponse from(FileEntity fileEntity) {
 			.physicalPath(decryptedPath)
 			.build();
 	}
+
+	public static FilePathResponse of(Long id, String physicalPath) {
+		String decryptedPath = AesUtil.decrypt(physicalPath);
+		return FilePathResponse.builder()
+			.id(id)
+			.physicalPath(decryptedPath)
+			.build();
+	}
 }
diff --git a/aics-domain/src/main/java/kgu/developers/domain/file/domain/FileRepository.java b/aics-domain/src/main/java/kgu/developers/domain/file/domain/FileRepository.java
@@ -7,4 +7,5 @@ public interface FileRepository {
 	FileEntity save(FileEntity fileEntity);
 	Optional<FileEntity> findById(Long id);
 	List<FileEntity> findAllByIds(List<Long> ids);
+	Optional<String> findPhysicalPathById(Long id);
 }
diff --git a/aics-domain/src/main/java/kgu/developers/domain/file/infrastructure/FileRepositoryImpl.java b/aics-domain/src/main/java/kgu/developers/domain/file/infrastructure/FileRepositoryImpl.java
@@ -12,6 +12,7 @@
 @RequiredArgsConstructor
 public class FileRepositoryImpl implements FileRepository {
 	private final JpaFileRepository jpaFileRepository;
+	private final QueryFileRepository queryFileRepository;
 
 	@Override
 	public FileEntity save(FileEntity fileEntity) {
@@ -27,4 +28,9 @@ public Optional<FileEntity> findById(Long id) {
 	public List<FileEntity> findAllByIds(List<Long> ids) {
 		return jpaFileRepository.findAllById(ids);
 	}
+
+	@Override
+	public Optional<String> findPhysicalPathById(Long id) {
+		return queryFileRepository.findPhysicalPathById(id);
+	}
 }
diff --git a/aics-domain/src/main/java/kgu/developers/domain/file/infrastructure/QueryFileRepository.java b/aics-domain/src/main/java/kgu/developers/domain/file/infrastructure/QueryFileRepository.java
@@ -0,0 +1,27 @@
+package kgu.developers.domain.file.infrastructure;
+
+import static kgu.developers.domain.file.domain.QFileEntity.fileEntity;
+
+import java.util.Optional;
+
+import org.springframework.stereotype.Repository;
+
+import com.querydsl.jpa.impl.JPAQueryFactory;
+
+import lombok.RequiredArgsConstructor;
+
+@Repository
+@RequiredArgsConstructor
+public class QueryFileRepository {
+	private final JPAQueryFactory queryFactory;
+
+	public Optional<String> findPhysicalPathById(Long id) {
+		return Optional.ofNullable(id)
+			.map(i -> queryFactory
+				.select(fileEntity.physicalPath)
+				.from(fileEntity)
+				.where(fileEntity.id.eq(i))
+				.fetchOne()
+			);
+	}
+}
diff --git a/aics-domain/src/testFixtures/java/carousel/application/CarouselCommandServiceTest.java b/aics-domain/src/testFixtures/java/carousel/application/CarouselCommandServiceTest.java
@@ -73,6 +73,6 @@ public void updateCarousel_success() {
 		// then
 		assertEquals(text, carousel.getText());
 		assertEquals(link, carousel.getLink());
-		assertNull(carousel.getFile());
+		assertNull(carousel.getFileId());
 	}
 }
diff --git a/aics-domain/src/testFixtures/java/carousel/application/CarouselQueryServiceTest.java b/aics-domain/src/testFixtures/java/carousel/application/CarouselQueryServiceTest.java
@@ -17,6 +17,8 @@ public class CarouselQueryServiceTest {
 	private CarouselQueryService carouselQueryService;
 	private static Carousel carousel;
 
+	private static final Long FAKE_FILE_ID = 1L;
+
 	@BeforeEach
 	public void init() {
 		FakeCarouselRepository fakeCarouselRepository = new FakeCarouselRepository();
@@ -26,11 +28,11 @@ public void init() {
 
 	private static void saveTestCarousel(FakeCarouselRepository fakeCarouselRepository) {
 		carousel = fakeCarouselRepository.save(
-			Carousel.create("컴퓨터공학부 홈페이지 메인 이미지", "https://kgu.ac.kr", FileEntity.builder().build())
+			Carousel.create("컴퓨터공학부 홈페이지 메인 이미지", "https://kgu.ac.kr", FAKE_FILE_ID)
 		);
 
 		fakeCarouselRepository.save(
-			Carousel.create("SW 중심대학 선정", "https://kgu.ac.kr", FileEntity.builder().build())
+			Carousel.create("SW 중심대학 선정", "https://kgu.ac.kr", FAKE_FILE_ID)
 		);
 	}
 
diff --git a/aics-domain/src/testFixtures/java/carousel/domain/CarouselDomainTest.java b/aics-domain/src/testFixtures/java/carousel/domain/CarouselDomainTest.java
@@ -12,14 +12,14 @@
 public class CarouselDomainTest {
 	private static final String TARGET_CAROUSEL_TEXT = "컴퓨터공학부 대표 이미지";
 	private static final String TARGET_CAROUSEL_LINK = "https://kgu.ac.kr";
+	private static final Long FAKE_FILE_ID = 1L;
 
 	@Test
 	@DisplayName("create 정적 팩토리 메서드는 Carousel 객체를 생성할 수 있다")
 	public void createCarousel_success() {
 		//given
 		//when
-		Carousel createdCarousel = Carousel.create(TARGET_CAROUSEL_TEXT, TARGET_CAROUSEL_LINK,
-			FileEntity.builder().build());
+		Carousel createdCarousel = Carousel.create(TARGET_CAROUSEL_TEXT, TARGET_CAROUSEL_LINK, FAKE_FILE_ID);
 
 		//then
 		assertNotNull(createdCarousel);
@@ -63,9 +63,9 @@ public void updateFile_success() {
 		FileEntity file = FileEntity.builder().build();
 
 		// when
-		carousel.updateFile(file);
+		carousel.updateFileId(file.getId());
 
 		// then
-		assertEquals(file, carousel.getFile());
+		assertEquals(file.getId(), carousel.getFileId());
 	}
 }
diff --git a/aics-domain/src/testFixtures/java/mock/repository/FakeCarouselRepository.java b/aics-domain/src/testFixtures/java/mock/repository/FakeCarouselRepository.java
@@ -21,7 +21,7 @@ public Carousel save(Carousel carousel) {
 			.id(sequence.getAndIncrement())
 			.text(carousel.getText())
 			.link(carousel.getLink())
-			.file(carousel.getFile())
+			.fileId(carousel.getFileId())
 			.build();
 
 		TestEntityUtils.setCreatedAt(savedCarousel, LocalDateTime.now());
@@ -38,7 +38,7 @@ public void deleteById(Long id) {
 	@Override
 	public List<Carousel> findAllByFileIsNotNullOrderByCreatedAtDesc() {
 		return data.stream()
-			.filter(carousel -> carousel.getFile() != null)
+			.filter(carousel -> carousel.getFileId() != null)
 			.sorted((c1, c2) -> c2.getCreatedAt().compareTo(c1.getCreatedAt()))
 			.toList();
 	}
diff --git a/aics-domain/src/testFixtures/java/mock/repository/FakeFileRepository.java b/aics-domain/src/testFixtures/java/mock/repository/FakeFileRepository.java
diff --git a/gradle/jacoco.gradle b/gradle/jacoco.gradle

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public void deleteById(Long id) {`
`26`	`26`
`27`	`27`	`@Override`
`28`	`28`	`public List<Carousel> findAllByFileIsNotNullOrderByCreatedAtDesc() {`
`29`		`- return jpaCarouselRepository.findAllByFileIsNotNullOrderByCreatedAtDesc();`
	`29`	`+ return jpaCarouselRepository.findAllByFileIdIsNotNullOrderByCreatedAtDesc();`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,5 @@`
`7`	`7`	`import kgu.developers.domain.carousel.domain.Carousel;`
`8`	`8`
`9`	`9`	`public interface JpaCarouselRepository extends JpaRepository<Carousel, Long> {`
`10`		`- List<Carousel> findAllByFileIsNotNullOrderByCreatedAtDesc();`
	`10`	`+ List<Carousel> findAllByFileIdIsNotNullOrderByCreatedAtDesc();`
`11`	`11`	`}`