Skip to content

Commit d757be8

Browse files
committed
refactor: 언어 요구사항 데이터 세팅 방식 변경
1 parent 02d3efa commit d757be8

2 files changed

Lines changed: 23 additions & 75 deletions

File tree

Lines changed: 12 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.example.solidconnection.university.fixture;
22

33
import com.example.solidconnection.type.LanguageTestType;
4+
import com.example.solidconnection.university.domain.LanguageRequirement;
45
import com.example.solidconnection.university.domain.UniversityInfoForApply;
56
import lombok.RequiredArgsConstructor;
67
import org.springframework.boot.test.context.TestComponent;
@@ -11,103 +12,43 @@ public class LanguageRequirementFixture {
1112

1213
private final LanguageRequirementFixtureBuilder languageRequirementFixtureBuilder;
1314

14-
public UniversityInfoForApply 괌대학_A_언어요구사항(UniversityInfoForApply universityInfo) {
15-
languageRequirementFixtureBuilder
15+
public LanguageRequirement 토플_80(UniversityInfoForApply universityInfo) {
16+
return languageRequirementFixtureBuilder
1617
.languageTestType(LanguageTestType.TOEFL_IBT)
1718
.minScore("80")
1819
.universityInfoForApply(universityInfo)
1920
.create();
20-
languageRequirementFixtureBuilder
21-
.languageTestType(LanguageTestType.TOEIC)
22-
.minScore("800")
23-
.universityInfoForApply(universityInfo)
24-
.create();
25-
return universityInfo;
26-
}
27-
28-
public UniversityInfoForApply 괌대학_B_언어요구사항(UniversityInfoForApply universityInfo) {
29-
languageRequirementFixtureBuilder
30-
.languageTestType(LanguageTestType.TOEFL_IBT)
31-
.minScore("70")
32-
.universityInfoForApply(universityInfo)
33-
.create();
34-
languageRequirementFixtureBuilder
35-
.languageTestType(LanguageTestType.TOEIC)
36-
.minScore("900")
37-
.universityInfoForApply(universityInfo)
38-
.create();
39-
return universityInfo;
40-
}
41-
42-
public UniversityInfoForApply 네바다주립_대학_라스베이거스_언어요구사항(UniversityInfoForApply universityInfo) {
43-
languageRequirementFixtureBuilder
44-
.languageTestType(LanguageTestType.TOEIC)
45-
.minScore("800")
46-
.universityInfoForApply(universityInfo)
47-
.create();
48-
return universityInfo;
4921
}
5022

51-
public UniversityInfoForApply 메모리얼_대학_세인트존스_언어요구사항(UniversityInfoForApply universityInfo) {
52-
languageRequirementFixtureBuilder
53-
.languageTestType(LanguageTestType.TOEIC)
54-
.minScore("800")
55-
.universityInfoForApply(universityInfo)
56-
.create();
57-
return universityInfo;
58-
}
59-
60-
public UniversityInfoForApply 서던덴마크_대학_언어요구사항(UniversityInfoForApply universityInfo) {
61-
languageRequirementFixtureBuilder
23+
public LanguageRequirement 토플_70(UniversityInfoForApply universityInfo) {
24+
return languageRequirementFixtureBuilder
6225
.languageTestType(LanguageTestType.TOEFL_IBT)
6326
.minScore("70")
6427
.universityInfoForApply(universityInfo)
6528
.create();
66-
return universityInfo;
67-
}
68-
69-
public UniversityInfoForApply 코펜하겐IT대학_언어요구사항(UniversityInfoForApply universityInfo) {
70-
languageRequirementFixtureBuilder
71-
.languageTestType(LanguageTestType.TOEFL_IBT)
72-
.minScore("80")
73-
.universityInfoForApply(universityInfo)
74-
.create();
75-
return universityInfo;
76-
}
77-
78-
public UniversityInfoForApply 그라츠대학_언어요구사항(UniversityInfoForApply universityInfo) {
79-
languageRequirementFixtureBuilder
80-
.languageTestType(LanguageTestType.TOEFL_IBT)
81-
.minScore("80")
82-
.universityInfoForApply(universityInfo)
83-
.create();
84-
return universityInfo;
8529
}
8630

87-
public UniversityInfoForApply 그라츠공과대학_언어요구사항(UniversityInfoForApply universityInfo) {
88-
languageRequirementFixtureBuilder
31+
public LanguageRequirement 토익_800(UniversityInfoForApply universityInfo) {
32+
return languageRequirementFixtureBuilder
8933
.languageTestType(LanguageTestType.TOEIC)
9034
.minScore("800")
9135
.universityInfoForApply(universityInfo)
9236
.create();
93-
return universityInfo;
9437
}
9538

96-
public UniversityInfoForApply 린츠_카톨릭대학_언어요구사항(UniversityInfoForApply universityInfo) {
97-
languageRequirementFixtureBuilder
39+
public LanguageRequirement 토익_900(UniversityInfoForApply universityInfo) {
40+
return languageRequirementFixtureBuilder
9841
.languageTestType(LanguageTestType.TOEIC)
99-
.minScore("800")
42+
.minScore("900")
10043
.universityInfoForApply(universityInfo)
10144
.create();
102-
return universityInfo;
10345
}
10446

105-
public UniversityInfoForApply 메이지대학_언어요구사항(UniversityInfoForApply universityInfo) {
106-
languageRequirementFixtureBuilder
47+
public LanguageRequirement JLPT_N2(UniversityInfoForApply universityInfo) {
48+
return languageRequirementFixtureBuilder
10749
.languageTestType(LanguageTestType.JLPT)
10850
.minScore("N2")
10951
.universityInfoForApply(universityInfo)
11052
.create();
111-
return universityInfo;
11253
}
11354
}

src/test/java/com/example/solidconnection/university/service/UniversityQueryServiceTest.java

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,12 @@ class UniversityQueryServiceTest {
170170
@Test
171171
void 어학시험_조건으로_대학을_필터링한다() {
172172
// given
173-
UniversityInfoForApply 괌대학_B_지원_정보 = languageRequirementFixture.괌대학_B_언어요구사항(universityInfoForApplyFixture.괌대학_B_지원_정보());
174-
languageRequirementFixture.괌대학_A_언어요구사항(universityInfoForApplyFixture.괌대학_A_지원_정보());
173+
UniversityInfoForApply 괌대학_A_지원_정보 = universityInfoForApplyFixture.괌대학_A_지원_정보();
174+
languageRequirementFixture.토플_80(괌대학_A_지원_정보);
175+
languageRequirementFixture.토익_800(괌대학_A_지원_정보);
176+
UniversityInfoForApply 괌대학_B_지원_정보 = universityInfoForApplyFixture.괌대학_B_지원_정보();
177+
languageRequirementFixture.토플_70(괌대학_B_지원_정보);
178+
languageRequirementFixture.토익_900(괌대학_B_지원_정보);
175179

176180
// when
177181
UniversityInfoForApplyPreviewResponses response = universityQueryService.searchUniversity(
@@ -185,8 +189,11 @@ class UniversityQueryServiceTest {
185189
@Test
186190
void 모든_조건으로_대학을_필터링한다() {
187191
// given
188-
UniversityInfoForApply 서던덴마크대학교_지원_정보 = languageRequirementFixture.서던덴마크_대학_언어요구사항(universityInfoForApplyFixture.서던덴마크대학교_지원_정보());
189-
languageRequirementFixture.괌대학_A_언어요구사항(universityInfoForApplyFixture.괌대학_A_지원_정보());
192+
UniversityInfoForApply 괌대학_A_지원_정보 = universityInfoForApplyFixture.괌대학_A_지원_정보();
193+
languageRequirementFixture.토플_80(괌대학_A_지원_정보);
194+
languageRequirementFixture.토익_800(괌대학_A_지원_정보);
195+
UniversityInfoForApply 서던덴마크대학교_지원_정보 = universityInfoForApplyFixture.서던덴마크대학교_지원_정보();
196+
languageRequirementFixture.토플_70(서던덴마크대학교_지원_정보);
190197

191198
// when
192199
UniversityInfoForApplyPreviewResponses response = universityQueryService.searchUniversity(

0 commit comments

Comments
 (0)