fix: application, university 테스트 코드 오류 수정

- 연관관계 변경에 따른 transaction 문제 해결
- 쿼리 일부 수정, 테스트 코드 일부 수정
- GeneralUniversityRecommendService 로직 수정

Author: lsy1307

src/main/java/com/example/solidconnection/university/repository/UniversityInfoForApplyRepository.java

@@ -4,6 +4,7 @@
 import com.example.solidconnection.siteuser.domain.SiteUser;
 import com.example.solidconnection.university.domain.UnivApplyInfo;
 import com.example.solidconnection.university.domain.University;
+import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
@@ -30,32 +31,33 @@ public interface UniversityInfoForApplyRepository extends JpaRepository<UnivAppl
     List<UnivApplyInfo> findByUniversitiesAndTerm(@Param("universities") List<University> universities, @Param("term") String term);
 
     @Query("""
-        SELECT uifa
+        SELECT DISTINCT uifa
         FROM UnivApplyInfo uifa
-        JOIN University u ON uifa.university = u
-        WHERE (u.country IN (
+        LEFT JOIN FETCH uifa.languageRequirements lr
+        JOIN FETCH uifa.university u
+        LEFT JOIN FETCH u.country c
+        LEFT JOIN FETCH u.region r
+        WHERE (c.code IN (
                   SELECT ic.countryCode
                   FROM InterestedCountry ic
                   WHERE ic.siteUserId = :siteUserId
               )
-              OR u.region IN (
+              OR r.code IN (
                   SELECT ir.regionCode
                   FROM InterestedRegion ir
                   WHERE ir.siteUserId = :siteUserId
               ))
               AND uifa.term = :term
-        """)
+    """)
     List<UnivApplyInfo> findUniversityInfoForAppliesBySiteUsersInterestedCountryOrRegionAndTerm(@Param("siteUserId") Long siteUserId, @Param("term") String term);
-
     @Query(value = """
-                SELECT *
-                FROM university_info_for_apply
-                WHERE term = :term
-                ORDER BY RAND() 
-                LIMIT :limitNum
-            """, nativeQuery = true)
+        SELECT u.*
+        FROM university_info_for_apply u
+        WHERE u.term = :term
+        ORDER BY RAND() 
+        LIMIT :limitNum
+    """, nativeQuery = true)
     List<UnivApplyInfo> findRandomByTerm(@Param("term") String term, @Param("limitNum") int limitNum);
-
     default UnivApplyInfo getUniversityInfoForApplyById(Long id) {
         return findById(id)
                 .orElseThrow(() -> new CustomException(UNIVERSITY_INFO_FOR_APPLY_NOT_FOUND));

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

@@ -49,7 +49,10 @@ public List<UnivApplyInfo> findByRegionCodeAndKeywords(String regionCode, List<S
 
 
     private BooleanExpression regionCodeEq(QCountry country, String regionCode) {
-        return regionCode != null ? country.regionCode.eq(regionCode) : null;
+        if (regionCode == null || regionCode.isEmpty()) {
+            return Expressions.asBoolean(true).isTrue();
+        }
+        return country.regionCode.eq(regionCode);
     }
 
     private BooleanExpression countryOrUniversityContainsKeyword(QCountry country, QUniversity university, List<String> keywords) {

src/main/java/com/example/solidconnection/university/service/GeneralUniversityRecommendService.java

@@ -2,12 +2,11 @@
 
 import com.example.solidconnection.university.domain.UnivApplyInfo;
 import com.example.solidconnection.university.repository.UniversityInfoForApplyRepository;
-import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import org.hibernate.Hibernate;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.context.event.ApplicationReadyEvent;
-import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -17,19 +16,24 @@
 @RequiredArgsConstructor
 public class GeneralUniversityRecommendService {
 
-    /*
-     * 해당 시기에 열리는 대학교들 중 랜덤으로 선택해서 목록을 구성한다.
-     * */
     private final UniversityInfoForApplyRepository universityInfoForApplyRepository;
 
-    @Getter
-    private List<UnivApplyInfo> recommendUniversities;
-
     @Value("${university.term}")
     public String term;
 
-    @EventListener(ApplicationReadyEvent.class)
-    public void init() {
-        recommendUniversities = universityInfoForApplyRepository.findRandomByTerm(term, RECOMMEND_UNIVERSITY_NUM);
+    @Transactional(readOnly = true)  // 트랜잭션 추가
+    public List<UnivApplyInfo> getRecommendUniversities() {
+        List<UnivApplyInfo> universities = universityInfoForApplyRepository.findRandomByTerm(term, RECOMMEND_UNIVERSITY_NUM);
+
+        universities.forEach(univ -> {
+            Hibernate.initialize(univ.getLanguageRequirements());
+            Hibernate.initialize(univ.getUniversity());
+            if (univ.getUniversity() != null) {
+                Hibernate.initialize(univ.getUniversity().getCountry());
+                Hibernate.initialize(univ.getUniversity().getRegion());
+            }
+        });
+
+        return universities;
     }
 }

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

@@ -40,7 +40,6 @@ void setUp() {
         univApplyInfoFixture.그라츠공과대학_지원_정보();
         univApplyInfoFixture.린츠_카톨릭대학_지원_정보();
         univApplyInfoFixture.메이지대학_지원_정보();
-        generalUniversityRecommendService.init();
     }
 
     @Test

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

@@ -72,7 +72,6 @@ void setUp() {
         univApplyInfoFixture.그라츠공과대학_지원_정보();
         univApplyInfoFixture.린츠_카톨릭대학_지원_정보();
         univApplyInfoFixture.메이지대학_지원_정보();
-        generalUniversityRecommendService.init();
     }
 
     @Test
@@ -136,18 +135,16 @@ void setUp() {
     @Test
     void 관심사_미설정_사용자는_일반_추천_대학을_조회한다() {
         // when
-        UniversityRecommendsResponse response = universityRecommendService.getPersonalRecommends(user);
+        UniversityRecommendsResponse personalResponse = universityRecommendService.getPersonalRecommends(user);
+        UniversityRecommendsResponse generalResponse = universityRecommendService.getGeneralRecommends();
 
         // then
-        assertThat(response.recommendedUniversities())
+        assertThat(personalResponse.recommendedUniversities())
                 .hasSize(RECOMMEND_UNIVERSITY_NUM)
-                .containsExactlyInAnyOrderElementsOf(
-                        generalUniversityRecommendService.getRecommendUniversities().stream()
-                                .map(UniversityInfoForApplyPreviewResponse::from)
-                                .toList()
-                );
+                .containsExactlyInAnyOrderElementsOf(generalResponse.recommendedUniversities());
     }
 
+
     @Test
     void 일반_추천_대학을_조회한다() {
         // when
@@ -156,10 +153,7 @@ void setUp() {
         // then
         assertThat(response.recommendedUniversities())
                 .hasSize(RECOMMEND_UNIVERSITY_NUM)
-                .containsExactlyInAnyOrderElementsOf(
-                        generalUniversityRecommendService.getRecommendUniversities().stream()
-                                .map(UniversityInfoForApplyPreviewResponse::from)
-                                .toList()
-                );
+                .allMatch(univ -> univ.id() > 0)
+                .allMatch(univ -> univ.koreanName() != null);
     }
 }