refactor: 코드리뷰 수정사항 반영

- Long타입 long으로 수정
- collect -> toList단독으로 변경
- 컨벤션 수정
- Recomment 변경사항 원복
- getGeneralRecommendsExcludingSelected함수 OutOfRange 방지 추가

Author: lsy1307

src/main/java/com/example/solidconnection/application/repository/ApplicationRepository.java

@@ -37,7 +37,7 @@ public interface ApplicationRepository extends JpaRepository<Application, Long>
             """)
     Optional<Application> findBySiteUserIdAndTerm(@Param("siteUserId") Long siteUserId, @Param("term") String term);
 
-    default Application getApplicationBySiteUserIdAndTerm(Long siteUserId, String term) {
+    default Application getApplicationBySiteUserIdAndTerm(long siteUserId, String term) {
         return findBySiteUserIdAndTerm(siteUserId, term)
                 .orElseThrow(() -> new CustomException(APPLICATION_NOT_FOUND));
     }

src/main/java/com/example/solidconnection/score/service/ScoreService.java

@@ -57,7 +57,7 @@ public GpaScoreStatusesResponse getGpaScoreStatus(SiteUser siteUser) {
                 gpaScoreRepository.findBySiteUserId(siteUser.getId())
                         .stream()
                         .map(GpaScoreStatusResponse::from)
-                        .collect(Collectors.toList());
+                        .toList();
 
         return GpaScoreStatusesResponse.from(gpaScoreStatusResponseList);
     }

src/main/java/com/example/solidconnection/university/domain/UnivApplyInfo.java

@@ -77,10 +77,10 @@ public class UnivApplyInfo {
     @Column(length = 1000)
     private String details;
 
-    @OneToMany(mappedBy = "univApplyInfo", cascade = CascadeType.ALL, orphanRemoval = true)
+    @OneToMany(mappedBy = "univApplyInfo", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
     private Set<LanguageRequirement> languageRequirements = new HashSet<>();
 
-    @ManyToOne(fetch = FetchType.LAZY)
+    @ManyToOne(fetch = FetchType.EAGER)
     private University university;
 
     public void addLanguageRequirements(LanguageRequirement languageRequirements) {

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

@@ -25,5 +25,5 @@ public interface LikedUnivApplyInfoRepository extends JpaRepository<LikedUnivApp
             """)
     List<UnivApplyInfo> findUnivApplyInfosBySiteUserId(@Param("siteUserId") long siteUserId);
 
-    boolean existsBySiteUserIdAndUnivApplyInfoId(long siteUserId, Long univApplyInfoId);
+    boolean existsBySiteUserIdAndUnivApplyInfoId(long siteUserId, long univApplyInfoId);
 }

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

@@ -37,22 +37,14 @@ OR r.code IN (
     """)
     List<UnivApplyInfo> findAllBySiteUsersInterestedCountryOrRegionAndTerm(@Param("siteUserId") Long siteUserId, @Param("term") String term);
 
-    @Query("""
-    SELECT DISTINCT uai
-    FROM UnivApplyInfo uai
-    LEFT JOIN FETCH uai.languageRequirements lr
-    LEFT JOIN FETCH uai.university u
-    LEFT JOIN FETCH u.country c
-    LEFT JOIN FETCH u.region r
-    WHERE uai.term = :term
-    ORDER BY FUNCTION('RAND')
-    """)
-    List<UnivApplyInfo> findAllRandomByTerm(@Param("term") String term);
-    default List<UnivApplyInfo> findRandomByTerm(String term, int limitNum) {
-        return findAllRandomByTerm(term).stream()
-                .limit(limitNum)
-                .collect(Collectors.toList());
-    }
+    @Query(value = """
+                SELECT *
+                FROM university_info_for_apply
+                WHERE term = :term
+                ORDER BY RAND()
+                LIMIT :limitNum
+            """, nativeQuery = true)
+    List<UnivApplyInfo> findRandomByTerm(@Param("term") String term, @Param("limitNum") int limitNum);
 
     default UnivApplyInfo getUnivApplyInfoById(Long id) {
         return findById(id)

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

@@ -2,10 +2,12 @@
 
 import com.example.solidconnection.university.domain.UnivApplyInfo;
 import com.example.solidconnection.university.repository.UnivApplyInfoRepository;
+import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 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;
 
@@ -20,11 +22,14 @@ public class GeneralUnivApplyInfoRecommendService {
      * */
     private final UnivApplyInfoRepository univApplyInfoRepository;
 
+    @Getter
+    private List<UnivApplyInfo> generalRecommends;
+
     @Value("${university.term}")
     public String term;
 
-    @Transactional(readOnly = true)
-    public List<UnivApplyInfo> getGeneralRecommends() {
-        return univApplyInfoRepository.findRandomByTerm(term, RECOMMEND_UNIV_APPLY_INFO_NUM);
+    @EventListener(ApplicationReadyEvent.class)
+    public void init() {
+        generalRecommends = univApplyInfoRepository.findRandomByTerm(term, RECOMMEND_UNIV_APPLY_INFO_NUM);
     }
 }

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

@@ -56,9 +56,9 @@ private List<UnivApplyInfo> getGeneralRecommendsExcludingSelected(List<UnivApply
         List<UnivApplyInfo> generalRecommend = new ArrayList<>(generalUnivApplyInfoRecommendService.getGeneralRecommends());
         generalRecommend.removeAll(alreadyPicked);
         Collections.shuffle(generalRecommend);
-        return generalRecommend.subList(0, RECOMMEND_UNIV_APPLY_INFO_NUM - alreadyPicked.size());
+        int needed = RECOMMEND_UNIV_APPLY_INFO_NUM - alreadyPicked.size();
+        return generalRecommend.subList(0, Math.min(needed, generalRecommend.size()));
     }
-
     /*
      * 공통 추천 대학교를 불러온다.
      * */

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

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

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

@@ -72,6 +72,7 @@ void setUp() {
         univApplyInfoFixture.그라츠공과대학_지원_정보();
         univApplyInfoFixture.린츠_카톨릭대학_지원_정보();
         univApplyInfoFixture.메이지대학_지원_정보();
+        generalUnivApplyInfoRecommendService.init();
     }
 
     @Test
@@ -140,9 +141,10 @@ void setUp() {
         // then
         assertThat(response.recommendedUniversities())
                 .hasSize(RECOMMEND_UNIV_APPLY_INFO_NUM)
-                .allMatch(univ -> univ.koreanName() != null)
-                .allMatch(univ -> univ.id() > 0)
-                .allMatch(univ -> univ.term().equals("2024-1"));
+                .containsExactlyInAnyOrderElementsOf(
+                        generalUnivApplyInfoRecommendService.getGeneralRecommends().stream()
+                                .map(UnivApplyInfoPreviewResponse::from).toList()
+                );
     }
     @Test
     void 일반_추천_대학_지원_정보를_조회한다() {
@@ -152,7 +154,10 @@ void setUp() {
         // then
         assertThat(response.recommendedUniversities())
                 .hasSize(RECOMMEND_UNIV_APPLY_INFO_NUM)
-                .allMatch(univ -> univ.id() > 0)
-                .allMatch(univ -> univ.koreanName() != null);
+                .containsExactlyInAnyOrderElementsOf(
+                        generalUnivApplyInfoRecommendService.getGeneralRecommends().stream()
+                                .map(UnivApplyInfoPreviewResponse::from)
+                                .toList()
+                );
     }
 }