fix: fix recommendation logic

Author: eric-jy-park

.DS_Store

@@ -9,21 +9,12 @@
 import java.util.List;
 
 public interface RecommendationRepository extends JpaRepository<ChallengeRecommendation, Long> {
-    @Query("""
-        SELECT DISTINCT cr
-        FROM ChallengeRecommendation cr
-        JOIN FETCH cr.mission rm
-        JOIN FETCH rm.sector s
-        WHERE cr.session = :session
-          AND NOT EXISTS (
-              SELECT 1
-              FROM UserMissionAttempt a
-              WHERE a.mission = rm
-                AND a.user = cr.session.user
-                AND a.success = TRUE
-          )
-        ORDER BY cr.recommendedOrder
-    """)
-    List<ChallengeRecommendation> findNotSolvedRecommendationsBySession(@Param("session") UserSession session);
+    @Query("SELECT DISTINCT cr FROM ChallengeRecommendation cr " +
+            "JOIN FETCH cr.mission rm " +
+            "LEFT JOIN FETCH rm.attempts " +
+            "JOIN FETCH rm.sector " +
+            "WHERE cr.session = :session " +
+            "ORDER BY cr.recommendedOrder")
+    List<ChallengeRecommendation> findBySession(@Param("session") UserSession session);
 
 }

src/main/java/com/climbup/climbup/recommendation/repository/RecommendationRepository.java

@@ -41,7 +41,7 @@ public class RecommendationServiceImpl implements RecommendationService{
     public void generateRecommendationsForSession(UserSession session){
         User user = session.getUser();
 
-        List<RouteMission> routeMissions = routeMissionRepository.findUnattemptedRouteMissionsByUser(user.getId());
+        List<RouteMission> routeMissions = routeMissionRepository.findNotSucceededMissionsByUser(user.getId());
 
         AtomicInteger index = new AtomicInteger(0);
 
@@ -66,7 +66,7 @@ public void generateRecommendationsForSession(UserSession session){
     public List<RouteMissionRecommendationResponse> getRecommendationsByUserActiveSession(Long userId) {
         UserSession session = userSessionRepository.findByUserIdAndEndedAtIsNull(userId).orElseThrow(UserSessionNotFoundException::new);
 
-        List<ChallengeRecommendation> recommendations = recommendationRepository.findNotSolvedRecommendationsBySession(session);
+        List<ChallengeRecommendation> recommendations = recommendationRepository.findBySession(session);
 
         return recommendations.stream().map(recommendation -> {
             RouteMission routeMission = recommendation.getMission();
@@ -85,7 +85,7 @@ public List<RouteMissionRecommendationResponse> getRecommendationsByUserAttempt(
 
         UserSession session = attempt.getSession();
 
-        List<ChallengeRecommendation> recommendations = recommendationRepository.findNotSolvedRecommendationsBySession(session);
+        List<ChallengeRecommendation> recommendations = recommendationRepository.findBySession(session);
 
         ChallengeRecommendation targetRecommendation = recommendations.stream()
             .filter(recommendation -> recommendation.getMission().getId().equals(attempt.getMission().getId()))

src/main/java/com/climbup/climbup/recommendation/service/RecommendationServiceImpl.java

@@ -18,12 +18,12 @@ public interface RouteMissionRepository extends JpaRepository<RouteMission, Long
         WHERE NOT EXISTS (
             SELECT 1
             FROM UserMissionAttempt a
-            WHERE a.mission = rm
+            WHERE a.mission.id = rm.id
               AND a.user.id = :userId
-              AND a.success = TRUE
+              AND a.success IS TRUE
         )
-    """)
-    List<RouteMission> findUnattemptedRouteMissionsByUser(@Param("userId") Long userId);
+    """)    
+    List<RouteMission> findNotSucceededMissionsByUser(@Param("userId") Long userId);
 
     Optional<RouteMission> findByIdAndRemovedAtIsNull(Long id);