refactor/KD-28 File 및 Carousel 도메인 엔티티 분리 (#269)

* refactor: file 도메인 모델과 엔티티 분리

* refactor: 패키지 구조 정리

* refactor: Carousel 도메인 엔티티 분리

* refactor: ID 상수화 및 날짜 필드 추가

* refactor: 필드명 오탈자 수정

* refactor: 코드래빗 리뷰 반영

* refactor: CarouselJpaEntity toEntity 메서드 빌더 사용

* refactor: 테이블 이름 명시

* refactor: fileId npe 방지

Author: LeeHanEum

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,6 @@ public void init() {
 			new LabQueryService(fakeLabRepository)
 		);
 
-		fakeFileRepository.save(FileEntity.builder().id(TEST_FILE_ID).build());
 		fakeLabRepository.save(Lab.builder()
 			.name("Lab A")
 			.loc("8500")

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/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).build());
-
 		fakeLabRepository.save(
 			Lab.create(
 				"인공지능 연구실",

aics-domain/src/main/java/kgu/developers/domain/carousel/application/command/CarouselCommandService.java

@@ -6,7 +6,8 @@
 import kgu.developers.domain.carousel.domain.Carousel;
 import kgu.developers.domain.carousel.domain.CarouselRepository;
 import kgu.developers.domain.file.application.query.FileQueryService;
-import kgu.developers.domain.file.domain.FileEntity;
+import kgu.developers.domain.file.domain.FileModel;
+import kgu.developers.domain.file.exception.FileIdRequiredException;
 import lombok.RequiredArgsConstructor;
 
 @Service
@@ -16,7 +17,8 @@ public class CarouselCommandService {
 	private final CarouselRepository carouselRepository;
 
 	public Long createCarousel(Long fileId, String text, String link) {
-		FileEntity file = fileQueryService.getFileById(fileId);
+		if (fileId == null) throw new FileIdRequiredException();
+		FileModel file = fileQueryService.getFileById(fileId);
 		Carousel carousel = Carousel.create(text, link, file.getId());
 		return carouselRepository.save(carousel).getId();
 	}

aics-domain/src/main/java/kgu/developers/domain/carousel/domain/Carousel.java

@@ -1,43 +1,35 @@
 package kgu.developers.domain.carousel.domain;
 
-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 kgu.developers.common.domain.BaseTimeEntity;
+import java.time.LocalDateTime;
+
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 
-@Entity
 @Getter
-@Builder
 @AllArgsConstructor
-@NoArgsConstructor(access = PROTECTED)
-public class Carousel extends BaseTimeEntity {
-	@Id
-	@GeneratedValue(strategy = IDENTITY)
-	private Long id;
-
-	@Column(nullable = false)
+public class Carousel {
+	private final Long id;
 	private String text;
-
-	@Column(nullable = false)
 	private String link;
-
-	@Column(nullable = false)
 	private Long fileId;
-
-	public static Carousel create(String text, String link, Long fileId) {
-		return Carousel.builder()
-			.text(text)
-			.link(link)
-			.fileId(fileId)
-			.build();
+	private LocalDateTime createdAt;
+	private LocalDateTime updatedAt;
+	private LocalDateTime deletedAt;
+
+	public static Carousel create(
+		String text,
+		String link,
+		Long fileId
+	) {
+		return new Carousel(
+			null,
+			text,
+			link,
+			fileId,
+			LocalDateTime.now(),
+			LocalDateTime.now(),
+			null
+		);
 	}
 
 	public void updateText(String text) {
@@ -53,3 +45,4 @@ public void updateFileId(Long fileId) {
 	}
 }
 
+

aics-domain/src/main/java/kgu/developers/domain/carousel/infrastructure/CarouselRepositoryImpl.java

@@ -7,6 +7,7 @@
 
 import kgu.developers.domain.carousel.domain.Carousel;
 import kgu.developers.domain.carousel.domain.CarouselRepository;
+import kgu.developers.domain.carousel.infrastructure.entity.CarouselJpaEntity;
 import lombok.RequiredArgsConstructor;
 
 @Repository
@@ -16,7 +17,9 @@ public class CarouselRepositoryImpl implements CarouselRepository {
 
 	@Override
 	public Carousel save(Carousel carousel) {
-		return jpaCarouselRepository.save(carousel);
+		return jpaCarouselRepository.save(
+			CarouselJpaEntity.toEntity(carousel)
+		).toDomain();
 	}
 
 	@Override
@@ -26,11 +29,15 @@ public void deleteById(Long id) {
 
 	@Override
 	public List<Carousel> findAllByFileIsNotNullOrderByCreatedAtDesc() {
-		return jpaCarouselRepository.findAllByFileIdIsNotNullOrderByCreatedAtDesc();
+		return jpaCarouselRepository.findAllByFileIdIsNotNullOrderByCreatedAtDesc()
+			.stream()
+			.map(CarouselJpaEntity::toDomain)
+			.toList();
 	}
 
 	@Override
 	public Optional<Carousel> findById(Long id) {
-		return jpaCarouselRepository.findById(id);
+		return jpaCarouselRepository.findById(id)
+			.map(CarouselJpaEntity::toDomain);
 	}
 }