Merge remote-tracking branch 'origin/main' into prod

Author: 1117mg

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

@@ -11,10 +11,8 @@
 public interface RecommendationRepository extends JpaRepository<ChallengeRecommendation, Long> {
     @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/service/RecommendationServiceImpl.java

@@ -71,10 +71,12 @@ public List<RouteMissionRecommendationResponse> getRecommendationsByUserActiveSe
         return recommendations.stream().map(recommendation -> {
             RouteMission routeMission = recommendation.getMission();
             ClimbingGym gym = routeMission.getGym();
-            List<UserMissionAttempt> attempts = routeMission.getAttempts().stream().toList();
+            List<UserMissionAttempt> userAttempts = routeMission.getAttempts().stream()
+                .filter(attempt -> attempt.getUser().getId().equals(userId))
+                .toList();
             Sector sector = routeMission.getSector();
 
-            return RouteMissionRecommendationResponse.toDto(recommendation, routeMission, gym, attempts, sector, recommendation.getRecommendedOrder());
+            return RouteMissionRecommendationResponse.toDto(recommendation, routeMission, gym, userAttempts, sector, recommendation.getRecommendedOrder());
         }).toList();
     }
 
@@ -84,6 +86,7 @@ public List<RouteMissionRecommendationResponse> getRecommendationsByUserAttempt(
         UserMissionAttempt attempt = userMissionAttemptRepository.findById(attemptId).orElseThrow(AttemptNotFoundException::new);
 
         UserSession session = attempt.getSession();
+        Long userId = attempt.getUser().getId();
 
         List<ChallengeRecommendation> recommendations = recommendationRepository.findBySession(session);
 
@@ -108,11 +111,13 @@ public List<RouteMissionRecommendationResponse> getRecommendationsByUserAttempt(
 
             RouteMission routeMission = recommendation.getMission();
             ClimbingGym gym = routeMission.getGym();
-            List<UserMissionAttempt> attempts = routeMission.getAttempts().stream().toList();
+            List<UserMissionAttempt> userAttempts = routeMission.getAttempts().stream()
+                .filter(attemptRecord -> attemptRecord.getUser().getId().equals(userId))
+                .toList();
             Sector sector = routeMission.getSector();
 
             recommendationResponseList.add(
-                RouteMissionRecommendationResponse.toDto(recommendation, routeMission, gym, attempts, sector, recommendation.getRecommendedOrder())
+                RouteMissionRecommendationResponse.toDto(recommendation, routeMission, gym, userAttempts, sector, recommendation.getRecommendedOrder())
             );
 
             startingIndex++;