fix: 대학교 중복 오류 수정 (#510)

* fix : 대학교 중복 오류 수정
- findAllByRegionCodeAnKeywords 메서드에서 term을 고려하여 조회하도록 수정

* fix : keyword에서 NPE이 발생하지 않도록 검증로직 추가

* refactor : 메서드명 수정
- 메서드명에 Term 추가
- 컨벤션 수정

* refactor: 테스트 코드 수정
- 명칭 변경
- 정확하게 현재 학기만 조회되는지 확인하도록 로직 수정

Author: lsy1307

src/main/java/com/example/solidconnection/application/service/ApplicationQueryService.java

@@ -14,6 +14,7 @@
 import com.example.solidconnection.university.domain.UnivApplyInfo;
 import com.example.solidconnection.university.repository.UnivApplyInfoRepository;
 import com.example.solidconnection.university.repository.custom.UnivApplyInfoFilterRepositoryImpl;
+import io.micrometer.common.util.StringUtils;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -45,7 +46,8 @@ public ApplicationsResponse getApplicants(long siteUserId, String regionCode, St
         // 1. 대학 지원 정보 필터링 (regionCode, keyword)
         SiteUser siteUser = siteUserRepository.findById(siteUserId)
                 .orElseThrow(() -> new CustomException(USER_NOT_FOUND));
-        List<UnivApplyInfo> univApplyInfos = universityFilterRepository.findAllByRegionCodeAndKeywords(regionCode, List.of(keyword));
+        List<String> keywords = StringUtils.isNotBlank(keyword) ? List.of(keyword) : List.of();
+        List<UnivApplyInfo> univApplyInfos = universityFilterRepository.findAllByRegionCodeAndKeywordsAndTerm(regionCode, keywords, term);
         if (univApplyInfos.isEmpty()) {
             return new ApplicationsResponse(List.of(), List.of(), List.of());
         }

src/main/java/com/example/solidconnection/university/repository/custom/UnivApplyInfoFilterRepository.java

@@ -6,7 +6,7 @@
 
 public interface UnivApplyInfoFilterRepository {
 
-    List<UnivApplyInfo> findAllByRegionCodeAndKeywords(String regionCode, List<String> keywords);
+    List<UnivApplyInfo> findAllByRegionCodeAndKeywordsAndTerm(String regionCode, List<String> keywords, String term);
 
     List<UnivApplyInfo> findAllByFilter(LanguageTestType testType, String testScore, String term, List<String> countryKoreanNames);
 

src/main/java/com/example/solidconnection/university/repository/custom/UnivApplyInfoFilterRepositoryImpl.java

@@ -31,7 +31,7 @@ public UnivApplyInfoFilterRepositoryImpl(EntityManager em) {
     }
 
     @Override
-    public List<UnivApplyInfo> findAllByRegionCodeAndKeywords(String regionCode, List<String> keywords) {
+    public List<UnivApplyInfo> findAllByRegionCodeAndKeywordsAndTerm(String regionCode, List<String> keywords, String term) {
         QUnivApplyInfo univApplyInfo = QUnivApplyInfo.univApplyInfo;
         QUniversity university = QUniversity.university;
         QCountry country = QCountry.country;
@@ -45,6 +45,7 @@ public List<UnivApplyInfo> findAllByRegionCodeAndKeywords(String regionCode, Lis
                 .where(
                         regionCodeEq(country, regionCode)
                                 .and(countryOrUniversityContainsKeyword(country, university, keywords))
+                                .and(univApplyInfo.term.eq(term))
                 )
                 .distinct()
                 .fetch();

src/test/java/com/example/solidconnection/application/service/ApplicationQueryServiceTest.java

@@ -249,11 +249,11 @@ class 지원자_목록_조회_테스트 {
         }
 
         @Test
-        void 이전_학기_지원자는_조회되지_않는다() {
+        void 현재_학기_지원서만_조회되고_이전_학기_지원서는_제외된다() {
             // given
-            Application application = applicationFixture.지원서(
+            applicationFixture.지원서(
                     user1,
-                    "nickname1",
+                    "nickname1_past",
                     "1988-1",
                     gpaScore1.getGpa(),
                     languageTestScore1.getLanguageTest(),
@@ -262,6 +262,17 @@ class 지원자_목록_조회_테스트 {
                     null
             );
 
+            Application currentApplication = applicationFixture.지원서(
+                    user1,
+                    "nickname1",
+                    term,
+                    gpaScore1.getGpa(),
+                    languageTestScore1.getLanguageTest(),
+                    괌대학_A_지원_정보.getId(),
+                    null,
+                    null
+            );
+
             // when
             ApplicationsResponse response = applicationQueryService.getApplicants(
                     user1.getId(),
@@ -270,10 +281,11 @@ class 지원자_목록_조회_테스트 {
             );
 
             // then
-            assertThat(response.firstChoice()).doesNotContainAnyElementsOf(List.of(
-                    ApplicantsResponse.of(괌대학_A_지원_정보,
-                                          List.of(application), user1)
-            ));
+            assertThat(response.firstChoice()).containsExactlyInAnyOrder(
+                    ApplicantsResponse.of(괌대학_A_지원_정보, List.of(currentApplication), user1),
+                    ApplicantsResponse.of(괌대학_B_지원_정보, List.of(), user1),
+                    ApplicantsResponse.of(서던덴마크대학교_지원_정보, List.of(), user1)
+            );
         }
 
         @Test