fix/#172 관리자 모듈 분리에 따른 테스트 코드 개선

.github/workflows/pull-request-test-coverage.yml

@@ -42,12 +42,12 @@ jobs:
             ${{ github.workspace }}/aics-domain/build/jacoco/test/jacocoTestReport.xml
             ${{ github.workspace }}/aics-api/build/jacoco/test/jacocoTestReport.xml
           token: ${{ secrets.GITHUB_TOKEN }}
-          min-coverage-overall: 10
-          min-coverage-changed-files: 80
+          min-coverage-overall: 80
+          min-coverage-changed-files: 70
           update-comment: true
 
-      - name: Fail PR if overall coverage is less than 80% (temporarily 10%)
-        if: ${{ steps.jacoco.outputs.coverage-overall < 10.0 }}
+      - name: Fail PR if overall coverage is less than 80%
+        if: ${{ steps.jacoco.outputs.coverage-overall < 80.0 }}
         uses: actions/github-script@v6
         with:
           script: |

aics-admin/build.gradle

@@ -11,4 +11,21 @@ dependencies {
     implementation project(':aics-common')
     implementation project(':aics-infra')
     implementation project(':aics-global-utils')
+
+    testFixturesImplementation project(':aics-domain')
+    testFixturesImplementation project(':aics-common')
+    testFixturesImplementation project(':aics-infra')
+    testFixturesImplementation project(':aics-global-utils')
+
+    testFixturesImplementation testFixtures(project(':aics-domain'))
+    testFixturesImplementation testFixtures(project(':aics-global-utils'))
+}
+apply from: "../gradle/jacoco.gradle"
+
+jacocoTestReport {
+    dependsOn test
+    reports {
+        xml.required = true
+        html.required = true
+    }
 }

aics-admin/src/main/java/kgu/developers/admin/lab/application/LabAdminFacade.java

@@ -18,13 +18,13 @@ public class LabAdminFacade {
 	private final LabQueryService labQueryService;
 
 	public LabPersistResponse createLab(LabRequest request) {
-		Long id = labCommandService.createLab(request.name(), request.location(), request.site(), request.professor());
+		Long id = labCommandService.createLab(request.name(), request.loc(), request.site(), request.advisor());
 		return LabPersistResponse.of(id);
 	}
 
 	public void updateLab(Long id, LabRequest request) {
 		Lab lab = labQueryService.getById(id);
-		labCommandService.updateLab(lab, request.name(), request.location(), request.site(), request.professor());
+		labCommandService.updateLab(lab, request.name(), request.loc(), request.site(), request.advisor());
 	}
 
 	public void deleteLab(Long id) {

aics-admin/src/main/java/kgu/developers/admin/lab/presentation/request/LabRequest.java

@@ -18,7 +18,7 @@ public record LabRequest(
 	@Schema(description = "연구실 위치", example = "8502, 8503", requiredMode = REQUIRED)
 	@NotBlank
 	@Size(max = 10)
-	String location,
+	String loc,
 
 	@Schema(description = "연구실 홈페이지", example = "http://ailab.kyonggi.ac.kr", requiredMode = Schema.RequiredMode.REQUIRED)
 	@NotBlank
@@ -28,6 +28,6 @@ public record LabRequest(
 	@Schema(description = "연구실 담당교수", example = "박민준", requiredMode = REQUIRED)
 	@NotBlank
 	@Size(max = 15)
-	String professor
+	String advisor
 ) {
 }

aics-admin/src/testFixtures/java/about/application/AboutAdminFacadeTest.java

@@ -0,0 +1,123 @@
+package about.application;
+
+import static kgu.developers.domain.about.domain.MainCategory.DEPT_INTRO;
+import static kgu.developers.domain.about.domain.MainCategory.EDU_ACTIVITIES;
+import static kgu.developers.domain.about.domain.SubCategory.CURRICULUM;
+import static kgu.developers.domain.about.domain.SubCategory.HISTORY;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import kgu.developers.admin.about.application.AboutAdminFacade;
+import kgu.developers.admin.about.presentation.request.AboutCreateRequest;
+import kgu.developers.admin.about.presentation.request.AboutUpdateRequest;
+import kgu.developers.admin.about.presentation.response.AboutPersistResponse;
+import kgu.developers.domain.about.application.command.AboutCommandService;
+import kgu.developers.domain.about.domain.About;
+import kgu.developers.domain.about.domain.MainCategory;
+import kgu.developers.domain.about.domain.SubCategory;
+import kgu.developers.domain.about.exception.AboutNotFoundException;
+import kgu.developers.domain.about.exception.CategoryNotMatchException;
+import mock.repository.FakeAboutRepository;
+
+public class AboutAdminFacadeTest {
+	private AboutAdminFacade aboutAdminFacade;
+	private FakeAboutRepository fakeAboutRepository;
+
+	@BeforeEach
+	public void init() {
+		fakeAboutRepository = new FakeAboutRepository();
+		aboutAdminFacade = new AboutAdminFacade(
+			new AboutCommandService(fakeAboutRepository)
+		);
+
+		fakeAboutRepository.save(About.builder()
+			.mainCategory(EDU_ACTIVITIES)
+			.subCategory(CURRICULUM)
+			.detailCategory("initDetail")
+			.content("initContent")
+			.build());
+	}
+
+	@Test
+	@DisplayName("createAbout은 about을 생성한다")
+	public void createAbout_Success() {
+		// given
+		MainCategory main = DEPT_INTRO;
+		SubCategory sub = HISTORY;
+		String detail = "detail";
+		String content = "content";
+
+		AboutCreateRequest request = AboutCreateRequest.builder()
+			.main(main)
+			.sub(sub)
+			.detail(detail)
+			.content(content)
+			.build();
+
+		// when
+		AboutPersistResponse result = aboutAdminFacade.createAbout(request);
+
+		// then
+		assertEquals(2L, result.id());
+	}
+
+	@Test
+	@DisplayName("createAbout은 메인 카테고리와 서브 카테고리의 관계가 올바르지 않은 생성 요청 시 CategoryNotMatchException을 발생시킨다")
+	public void createAbout_CategoryNotMatch_ThrowsException() {
+		// given
+		MainCategory main = DEPT_INTRO;
+		SubCategory sub = CURRICULUM;
+		String detail = "detail";
+		String content = "content";
+
+		AboutCreateRequest request = AboutCreateRequest.builder()
+			.main(main)
+			.sub(sub)
+			.detail(detail)
+			.content(content)
+			.build();
+
+		// when
+		// then
+		assertThatThrownBy(() -> aboutAdminFacade.createAbout(request))
+			.isInstanceOf(CategoryNotMatchException.class);
+	}
+
+	@Test
+	@DisplayName("updateAbout은 About의 content를 수정한다")
+	public void updateAbout_Success() {
+		// given
+		Long id = 1L;
+
+		AboutUpdateRequest request = AboutUpdateRequest.builder()
+			.content("updateContent")
+			.build();
+
+		// when
+		aboutAdminFacade.updateAbout(id, request);
+
+		// then
+		About about = fakeAboutRepository.findById(id).orElseThrow();
+		assertEquals(request.content(), about.getContent());
+	}
+
+	@Test
+	@DisplayName("updateAbout은 존재하지 않는 id로 수정 요청 시 AboutNotFoundException을 발생시킨다")
+	public void updateAbout_AboutNotFound_ThrowsException() {
+		// given
+		Long id = 0L;
+
+		AboutUpdateRequest request = AboutUpdateRequest.builder()
+			.content("updateContent")
+			.build();
+
+		// when
+		// then
+		assertThatThrownBy(() -> aboutAdminFacade.updateAbout(id, request))
+			.isInstanceOf(AboutNotFoundException.class);
+	}
+}

aics-admin/src/testFixtures/java/club/application/ClubAdminFacadeTest.java

@@ -0,0 +1,105 @@
+package club.application;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.List;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import kgu.developers.admin.club.application.ClubAdminFacade;
+import kgu.developers.admin.club.presentation.request.ClubRequest;
+import kgu.developers.admin.club.presentation.response.ClubPersistResponse;
+import kgu.developers.domain.club.application.command.ClubCommandService;
+import kgu.developers.domain.club.application.query.ClubQueryService;
+import kgu.developers.domain.club.domain.Club;
+import kgu.developers.domain.club.exception.ClubNotFoundException;
+import mock.repository.FakeClubRepository;
+
+public class ClubAdminFacadeTest {
+	private ClubAdminFacade clubAdminFacade;
+	private FakeClubRepository fakeClubRepository;
+
+	@BeforeEach
+	public void init() {
+		this.fakeClubRepository = new FakeClubRepository();
+		this.clubAdminFacade = new ClubAdminFacade(
+			new ClubCommandService(fakeClubRepository),
+			new ClubQueryService(fakeClubRepository)
+		);
+
+		fakeClubRepository.save(
+			Club.create(
+				"C-Lab", "경기대학교 AI컴퓨터공학부 개발동아리입니다.", "https://www.clab.page"
+			)
+		);
+	}
+
+	@Test
+	@DisplayName("createClub은 Club을 생성한다")
+	void createClub_Success() {
+		// given
+		ClubRequest clubRequest = new ClubRequest(
+			"newClub",
+			"New Club Description",
+			"https://www.new-club.page"
+		);
+
+		// when
+		ClubPersistResponse result = clubAdminFacade.createClub(clubRequest);
+		List<Club> resultData = fakeClubRepository.findAll();
+
+		// then
+		assertEquals(2, resultData.size());
+		assertEquals(2L, result.id());
+	}
+
+	@Test
+	@DisplayName("updateClub은 Club을 수정한다")
+	void updateClub_Success() {
+		// given
+		ClubRequest clubRequest = new ClubRequest(
+			"newClub",
+			"New Club Description",
+			"https://www.new-club.page"
+		);
+
+		// when
+		clubAdminFacade.updateClub(1L, clubRequest);
+		Club saved = fakeClubRepository.findById(1L).get();
+
+		// then
+		assertEquals("newClub", saved.getName());
+		assertEquals("New Club Description", saved.getDescription());
+		assertEquals("https://www.new-club.page", saved.getSite());
+	}
+
+	@Test
+	@DisplayName("updateClub은 존재하지 않은 id을 수정하면 ClubNotFoundException을 발생시킨다")
+	void updateClub_throws_ClubNotFoundException() {
+		// given
+		ClubRequest clubRequest = new ClubRequest(
+			"newClub",
+			"New Club Description",
+			"https://www.new-club.page"
+		);
+
+		// when
+		// then
+		assertThatThrownBy(() -> clubAdminFacade.updateClub(2L, clubRequest))
+			.isInstanceOf(ClubNotFoundException.class);
+	}
+
+	@Test
+	@DisplayName("deleteClub은 Club을 삭제한다")
+	void deleteClub_Success() {
+		// when
+		clubAdminFacade.deleteClub(1L);
+
+		// then
+		List<Club> all = fakeClubRepository.findAll();
+		assertEquals(0, all.size());
+	}
+}