refactor/#255 Lab-File 연관관계를 ID 참조로 변경 (#256)

dkdltm221 · web-flow · commit 4e84faea3892 · 2025-09-03T08:50:27.000+09:00
* refactor/#255 Lab-FileEntity 연관 관계를 ID 참조로 변경 * refactor: Lab-FileEntity 연관 관계를 객체 참조에서 ID 참조로 변경 * refactor: LabFacade에 N+1 문제 해결을 위한 조회 로직 적용 * refactor: 변경된 연관 관계를 반영하도록 관련 DTO 수정 (LabListResponse, LabDetailResponse) * refactor: LabCommandService에서 불필요한 FileQueryService 의존성 제거 * refactor: 기존 club에도 불필요한 FileQueryService 의존성 제거 * test: 리팩토링에 따른 테스트 코드 수정 (Lab*Test.java 및 TestContainer) * test/#255 LabAdminFacadeTest, ClubAdminFacadeTest 불필요한 FileQueryService 의존성 제거 * refactor/#255 Lab 도메인의 fileId 필드를 nullable로 변경 * refactor/#255 메서드 명시적으로 변경 * refactor/#255 LabFacade의 파일 처리 로직을 FileQueryService로 위임
diff --git a/aics-admin/src/testFixtures/java/club/application/ClubAdminFacadeTest.java b/aics-admin/src/testFixtures/java/club/application/ClubAdminFacadeTest.java
@@ -17,22 +17,18 @@
 import kgu.developers.domain.club.application.query.ClubQueryService;
 import kgu.developers.domain.club.domain.Club;
 import kgu.developers.domain.club.exception.ClubNotFoundException;
-import kgu.developers.domain.file.application.query.FileQueryService;
 import mock.repository.FakeClubRepository;
-import mock.repository.FakeFileRepository;
 
 public class ClubAdminFacadeTest {
 	private ClubAdminFacade clubAdminFacade;
 	private FakeClubRepository fakeClubRepository;
 
 	@BeforeEach
 	public void init() {
-		FakeFileRepository fakeFileRepository = new FakeFileRepository();
-		FileQueryService fileQueryService = new FileQueryService(fakeFileRepository);
 
 		this.fakeClubRepository = new FakeClubRepository();
 		this.clubAdminFacade = new ClubAdminFacade(
-			new ClubCommandService(fakeClubRepository, fileQueryService),
+			new ClubCommandService(fakeClubRepository),
 			new ClubQueryService(fakeClubRepository)
 		);
 
diff --git a/aics-admin/src/testFixtures/java/lab/application/LabAdminFacadeTest.java b/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.application.query.FileQueryService;
 import kgu.developers.domain.file.domain.FileEntity;
 import kgu.developers.domain.lab.application.command.LabCommandService;
 import kgu.developers.domain.lab.application.query.LabQueryService;
@@ -33,17 +32,17 @@ public void init() {
 		FakeFileRepository fakeFileRepository = new FakeFileRepository();
 		fakeLabRepository = new FakeLabRepository();
 		labAdminFacade = new LabAdminFacade(
-			new LabCommandService(new FileQueryService(fakeFileRepository), fakeLabRepository),
+			new LabCommandService(fakeLabRepository),
 			new LabQueryService(fakeLabRepository)
 		);
 
-		FileEntity testFile = fakeFileRepository.save(FileEntity.builder().id(TEST_FILE_ID).build());
+		fakeFileRepository.save(FileEntity.builder().id(TEST_FILE_ID).build());
 		fakeLabRepository.save(Lab.builder()
 			.name("Lab A")
 			.loc("8500")
 			.site("http://labA.kyonggi.ac.kr")
 			.advisor("박민준")
-			.file(testFile)
+			.fileId(TEST_FILE_ID)
 			.build()
 		);
 	}
diff --git a/aics-api/src/main/java/kgu/developers/api/club/application/ClubFacade.java b/aics-api/src/main/java/kgu/developers/api/club/application/ClubFacade.java
@@ -1,13 +1,9 @@
 package kgu.developers.api.club.application;
 
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 
 import kgu.developers.domain.file.application.query.FileQueryService;
-import kgu.developers.domain.file.domain.FileEntity;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -31,12 +27,6 @@ public ClubListResponse getClubs() {
 				.filter(Objects::nonNull)
 				.toList();
 
-		Map<Long, FileEntity> fileMap =
-				fileQueryService.findAllByIds(fileIds)
-						.stream()
-						.collect(Collectors.toMap(FileEntity::getId,
-				Function.identity()));
-
-		return ClubListResponse.from(clubs,fileMap);
+		return ClubListResponse.from(clubs,fileQueryService.findFileEntityMapByIds(fileIds));
 	}
 }
diff --git a/aics-api/src/main/java/kgu/developers/api/lab/application/LabFacade.java b/aics-api/src/main/java/kgu/developers/api/lab/application/LabFacade.java
@@ -1,7 +1,9 @@
 package kgu.developers.api.lab.application;
 
 import java.util.List;
+import java.util.Objects;
 
+import kgu.developers.domain.file.application.query.FileQueryService;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -15,9 +17,17 @@
 @Transactional(readOnly = true)
 public class LabFacade {
 	private final LabQueryService labQueryService;
+	private final FileQueryService fileQueryService;
 
 	public LabListResponse getLabs() {
 		List<Lab> labs = labQueryService.getLabsByName();
-		return LabListResponse.from(labs);
+
+		List<Long> fileIds = labs.stream()
+				.map(Lab::getFileId)
+				.filter(Objects::nonNull)
+				.toList();
+
+
+		return LabListResponse.from(labs,fileQueryService.findFileEntityMapByIds(fileIds));
 	}
 }
diff --git a/aics-api/src/main/java/kgu/developers/api/lab/presentation/response/LabDetailResponse.java b/aics-api/src/main/java/kgu/developers/api/lab/presentation/response/LabDetailResponse.java
@@ -5,6 +5,7 @@
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import kgu.developers.domain.file.application.response.FilePathResponse;
+import kgu.developers.domain.file.domain.FileEntity;
 import kgu.developers.domain.lab.domain.Lab;
 import lombok.Builder;
 
@@ -32,15 +33,15 @@ public record LabDetailResponse(
 		requiredMode = NOT_REQUIRED)
 	FilePathResponse img
 ) {
-	public static LabDetailResponse from(Lab lab) {
+	public static LabDetailResponse from(Lab lab, FileEntity file) {
 		return LabDetailResponse.builder()
 			.id(lab.getId())
 			.name(lab.getName())
 			.loc(lab.getLoc())
 			.site(lab.getSite())
 			.advisor(lab.getAdvisor())
-			.img(lab.getFile() != null ?
-				FilePathResponse.from(lab.getFile()) : null)
+			.img(file != null ?
+				FilePathResponse.from(file) : null)
 			.build();
 	}
 }
diff --git a/aics-api/src/main/java/kgu/developers/api/lab/presentation/response/LabListResponse.java b/aics-api/src/main/java/kgu/developers/api/lab/presentation/response/LabListResponse.java
@@ -3,8 +3,10 @@
 import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
 
 import java.util.List;
+import java.util.Map;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import kgu.developers.domain.file.domain.FileEntity;
 import kgu.developers.domain.lab.domain.Lab;
 import lombok.Builder;
 
@@ -22,10 +24,10 @@ public record LabListResponse(
 		requiredMode = REQUIRED)
 	List<LabDetailResponse> contents
 ) {
-	public static LabListResponse from(List<Lab> labs) {
+	public static LabListResponse from(List<Lab> labs, Map<Long, FileEntity> fileMap) {
 		return LabListResponse.builder()
 			.contents(labs.stream()
-				.map(LabDetailResponse::from)
+				.map(lab -> LabDetailResponse.from(lab,fileMap.get(lab.getFileId())))
 				.toList())
 			.build();
 	}
diff --git a/aics-api/src/testFixtures/java/lab/application/LabFacadeTest.java b/aics-api/src/testFixtures/java/lab/application/LabFacadeTest.java
@@ -4,6 +4,7 @@
 
 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;
@@ -19,24 +20,26 @@
 
 public class LabFacadeTest {
 	private LabFacade labFacade;
+	private static final Long TEST_FILE_ID = 1L;
 
 	@BeforeEach
 	public void init() {
 		FakeLabRepository fakeLabRepository = new FakeLabRepository();
 		FakeFileRepository fakeFileRepository = new FakeFileRepository();
+
 		labFacade = new LabFacade(
-			new LabQueryService(fakeLabRepository)
+			new LabQueryService(fakeLabRepository),new FileQueryService(fakeFileRepository)
 		);
 
-		FileEntity testFile = fakeFileRepository.save(FileEntity.builder().id(1L).build());
+		fakeFileRepository.save(FileEntity.builder().id(TEST_FILE_ID).build());
 
 		fakeLabRepository.save(
 			Lab.create(
 				"인공지능 연구실",
 				"8502, 8503",
 				"http://ailab.kyonggi.ac.kr",
 				"김인철",
-				testFile
+				TEST_FILE_ID
 			)
 		);
 
@@ -46,7 +49,7 @@ public void init() {
 				"8504",
 				"http://algeo.kyonggi.ac.kr/",
 				"배상원",
-				testFile
+				TEST_FILE_ID
 			)
 		);
 	}
diff --git a/aics-domain/src/main/java/kgu/developers/domain/club/application/command/ClubCommandService.java b/aics-domain/src/main/java/kgu/developers/domain/club/application/command/ClubCommandService.java
@@ -5,15 +5,13 @@
 
 import kgu.developers.domain.club.domain.Club;
 import kgu.developers.domain.club.domain.ClubRepository;
-import kgu.developers.domain.file.application.query.FileQueryService;
 import lombok.RequiredArgsConstructor;
 
 @Service
 @Transactional
 @RequiredArgsConstructor
 public class ClubCommandService {
 	private final ClubRepository clubRepository;
-	private final FileQueryService fileQueryService;
 
 	public Long createClub(String name, String description, String site, Long fileId) {
 
@@ -27,7 +25,7 @@ public void updateClub(Club club, String name, String description, String site,
 		club.updateDescription(description);
 		club.updateSite(site);
 
-		club.updateFile(fileId);
+		club.updateFileId(fileId);
 	}
 
 	public void deleteClubById(Long id) {
diff --git a/aics-domain/src/main/java/kgu/developers/domain/club/domain/Club.java b/aics-domain/src/main/java/kgu/developers/domain/club/domain/Club.java
@@ -59,7 +59,7 @@ public void updateSite(String site) {
 		this.site = site;
 	}
 
-	public void updateFile(Long fileId) {
+	public void updateFileId(Long fileId) {
 		this.fileId = fileId;
 	}
 }
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
@@ -6,6 +6,9 @@
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
@@ -16,7 +19,10 @@ public FileEntity getFileById(Long id) {
 		return fileRepository.findById(id).orElse(null);
 	}
 
-	public List<FileEntity> findAllByIds(List<Long> ids) {
-		return fileRepository.findAllByIds(ids);
+
+	public Map<Long,FileEntity> findFileEntityMapByIds(List<Long> ids) {
+		return fileRepository.findAllByIds(ids)
+				.stream()
+				.collect(Collectors.toMap(FileEntity::getId, Function.identity()));
 	}
 }
diff --git a/aics-domain/src/main/java/kgu/developers/domain/lab/application/command/LabCommandService.java b/aics-domain/src/main/java/kgu/developers/domain/lab/application/command/LabCommandService.java
@@ -2,21 +2,17 @@
 
 import org.springframework.stereotype.Service;
 
-import kgu.developers.domain.file.application.query.FileQueryService;
-import kgu.developers.domain.file.domain.FileEntity;
 import kgu.developers.domain.lab.domain.Lab;
 import kgu.developers.domain.lab.domain.LabRepository;
 import lombok.RequiredArgsConstructor;
 
 @Service
 @RequiredArgsConstructor
 public class LabCommandService {
-	private final FileQueryService fileQueryService;
 	private final LabRepository labRepository;
 
 	public Long createLab(Long fileId, String name, String location, String site, String advisor) {
-		FileEntity labImageFile = fileQueryService.getFileById(fileId);
-		Lab lab = Lab.create(name, location, site, advisor, labImageFile);
+		Lab lab = Lab.create(name, location, site, advisor, fileId);
 		return labRepository.save(lab).getId();
 	}
 
@@ -25,13 +21,7 @@ public void updateLab(Lab lab, String name, String loc, String site, String advi
 		lab.updateLoc(loc);
 		lab.updateSite(site);
 		lab.updateAdvisor(advisor);
-
-		FileEntity file = null;
-		if (fileId != null) {
-			file = fileQueryService.getFileById(fileId);
-		}
-
-		lab.updateFile(file);
+		lab.updateFileId(fileId);
 	}
 
 	public void deleteLabById(Long id) {
diff --git a/aics-domain/src/main/java/kgu/developers/domain/lab/domain/Lab.java b/aics-domain/src/main/java/kgu/developers/domain/lab/domain/Lab.java
@@ -7,10 +7,7 @@
 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;
@@ -38,17 +35,16 @@ public class Lab extends BaseTimeEntity {
 	@Column(nullable = false, length = 16)
 	private String advisor;
 
-	@OneToOne
-	@JoinColumn(name = "file_id", nullable = false)
-	private FileEntity file;
+	@Column(name = "file_id")
+	private Long fileId;
 
-	public static Lab create(String name, String loc, String site, String advisor, FileEntity file) {
+	public static Lab create(String name, String loc, String site, String advisor, Long fileId) {
 		return Lab.builder()
 			.name(name)
 			.loc(loc)
 			.site(site)
 			.advisor(advisor)
-			.file(file)
+			.fileId(fileId)
 			.build();
 	}
 
@@ -68,7 +64,7 @@ public void updateAdvisor(String advisor) {
 		this.advisor = advisor;
 	}
 
-	public void updateFile(FileEntity file) {
-		this.file = file;
+	public void updateFileId(Long fileId) {
+		this.fileId = fileId;
 	}
 }
diff --git a/aics-domain/src/testFixtures/java/club/application/ClubCommandServiceTest.java b/aics-domain/src/testFixtures/java/club/application/ClubCommandServiceTest.java
@@ -22,7 +22,7 @@ public void init() {
 		FakeFileRepository fakeFileRepository = new FakeFileRepository();
 		FileQueryService fileQueryService = new FileQueryService(fakeFileRepository);
 		fakeClubRepository = new FakeClubRepository();
-		clubCommandService = new ClubCommandService(fakeClubRepository, fileQueryService);
+		clubCommandService = new ClubCommandService(fakeClubRepository);
 
 		fakeClubRepository.save(
 			Club.create("club",
diff --git a/aics-domain/src/testFixtures/java/lab/application/LabCommandServiceTest.java b/aics-domain/src/testFixtures/java/lab/application/LabCommandServiceTest.java
@@ -9,7 +9,6 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
-import kgu.developers.domain.file.application.query.FileQueryService;
 import kgu.developers.domain.file.domain.FileEntity;
 import kgu.developers.domain.lab.application.command.LabCommandService;
 import kgu.developers.domain.lab.domain.Lab;
@@ -31,14 +30,14 @@ public void init() {
 	private void initializeLabCommandService() {
 		FakeFileRepository fakeFileRepository = new FakeFileRepository();
 		fakeLabRepository = new FakeLabRepository();
-		labCommandService = new LabCommandService(new FileQueryService(fakeFileRepository), fakeLabRepository);
+		labCommandService = new LabCommandService(fakeLabRepository);
 		fakeFileRepository.save(FileEntity.builder().id(1L).build());
 		fakeLabRepository.save(saveTestLab());
 	}
 
 	private static Lab saveTestLab() {
 		return Lab.create("인공지능 연구실", "8502, 8503", "http://ailab.kyonggi.ac.kr", "김인철",
-			FileEntity.builder().id(TEST_FILE_ID).build());
+			TEST_FILE_ID);
 	}
 
 	@Test
@@ -75,7 +74,7 @@ public void updateLab_Success() {
 		assertEquals(targetLoc, lab.getLoc());
 		assertEquals(targetSite, lab.getSite());
 		assertEquals(targetAdvisor, lab.getAdvisor());
-		assertNull(lab.getFile());
+		assertNull(lab.getFileId());
 	}
 
 	@Test
diff --git a/aics-domain/src/testFixtures/java/lab/application/LabQueryServiceTest.java b/aics-domain/src/testFixtures/java/lab/application/LabQueryServiceTest.java
diff --git a/aics-domain/src/testFixtures/java/lab/domain/LabDomainTest.java b/aics-domain/src/testFixtures/java/lab/domain/LabDomainTest.java
diff --git a/aics-domain/src/testFixtures/java/mock/FakeTestContainer.java b/aics-domain/src/testFixtures/java/mock/FakeTestContainer.java
diff --git a/aics-domain/src/testFixtures/java/mock/TestContainer.java b/aics-domain/src/testFixtures/java/mock/TestContainer.java

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public void updateSite(String site) {`
`59`	`59`	`this.site = site;`
`60`	`60`	`}`
`61`	`61`
`62`		`- public void updateFile(Long fileId) {`
	`62`	`+ public void updateFileId(Long fileId) {`
`63`	`63`	`this.fileId = fileId;`
`64`	`64`	`}`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,9 @@`
`6`	`6`	`import org.springframework.stereotype.Service;`
`7`	`7`
`8`	`8`	`import java.util.List;`
	`9`	`+import java.util.Map;`
	`10`	`+import java.util.function.Function;`
	`11`	`+import java.util.stream.Collectors;`
`9`	`12`
`10`	`13`	`@Service`
`11`	`14`	`@RequiredArgsConstructor`
`@@ -16,7 +19,10 @@ public FileEntity getFileById(Long id) {`
`16`	`19`	`return fileRepository.findById(id).orElse(null);`
`17`	`20`	`}`
`18`	`21`
`19`		`- public List<FileEntity> findAllByIds(List<Long> ids) {`
`20`		`- return fileRepository.findAllByIds(ids);`
	`22`	`+`
	`23`	`+ public Map<Long,FileEntity> findFileEntityMapByIds(List<Long> ids) {`
	`24`	`+ return fileRepository.findAllByIds(ids)`
	`25`	`+ .stream()`
	`26`	`+ .collect(Collectors.toMap(FileEntity::getId, Function.identity()));`
`21`	`27`	`}`
`22`	`28`	`}`