Merge pull request #49 from Nexters/feat/9-routemission-recommendation

eric-jy-park · web-flow · commit 3c998808689d · 2025-08-01T20:02:16.000+09:00
feat: 세션 생성 시 루트미션 추천 만들어지는 부분 구현
diff --git a/src/main/java/com/climbup/climbup/attempt/controller/AttemptController.java b/src/main/java/com/climbup/climbup/attempt/controller/AttemptController.java
@@ -1,5 +1,6 @@
 package com.climbup.climbup.attempt.controller;
 
+
 import com.climbup.climbup.attempt.dto.request.CreateAttemptRequest;
 import com.climbup.climbup.attempt.dto.response.CreateAttemptResponse;
 import com.climbup.climbup.attempt.service.AttemptService;
@@ -37,6 +38,7 @@ public class AttemptController {
 
     private final AttemptService attemptService;
 
+
     @Operation(summary = "도전한 루트미션과 비슷한 난이도의 루트미션 리스트 불러오기", description = "도전한 루트미션과 비슷한 난이도의 루트미션 리스트를 받아보기", security = @SecurityRequirement(name = "bearerAuth"))
     @ApiResponses({
             @ApiResponse(
diff --git a/src/main/java/com/climbup/climbup/recommendation/controller/RecommendationController.java b/src/main/java/com/climbup/climbup/recommendation/controller/RecommendationController.java
@@ -1,7 +1,11 @@
 package com.climbup.climbup.recommendation.controller;
 
+import com.climbup.climbup.auth.util.SecurityUtil;
 import com.climbup.climbup.common.dto.ApiResult;
 import com.climbup.climbup.recommendation.dto.response.RouteMissionRecommendationResponse;
+import com.climbup.climbup.recommendation.service.RecommendationService;
+import com.climbup.climbup.session.repository.UserSessionRepository;
+import com.climbup.climbup.session.service.UserSessionService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.ExampleObject;
@@ -25,6 +29,8 @@
 @RequiredArgsConstructor
 public class RecommendationController {
 
+    private final RecommendationService recommendationService;
+
     @Operation(summary = "루트미션 리스트 불러오기", description = "유저의 난이도에 맞는 추천 루트미션 리스트", security = @SecurityRequirement(name = "bearerAuth"))
     @ApiResponses({
             @ApiResponse(
@@ -90,6 +96,8 @@ public class RecommendationController {
     @GetMapping
     @PreAuthorize("isAuthenticated()")
     public ResponseEntity<ApiResult<List<RouteMissionRecommendationResponse>>> getRouteMissionRecommendations() {
-        return ResponseEntity.ok(ApiResult.success(List.of(RouteMissionRecommendationResponse.builder().build())));
+        Long userId = SecurityUtil.getCurrentUserId();
+        List<RouteMissionRecommendationResponse> routeMissionRecommendationResponses = recommendationService.getRecommendationsByUserActiveSession(userId);
+        return ResponseEntity.ok(ApiResult.success(routeMissionRecommendationResponses));
     }
 }
diff --git a/src/main/java/com/climbup/climbup/recommendation/repository/RecommendationRepository.java b/src/main/java/com/climbup/climbup/recommendation/repository/RecommendationRepository.java
@@ -1,7 +1,19 @@
 package com.climbup.climbup.recommendation.repository;
 
 import com.climbup.climbup.recommendation.entity.ChallengeRecommendation;
+import com.climbup.climbup.session.entity.UserSession;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
 
 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);
 }
diff --git a/src/main/java/com/climbup/climbup/recommendation/service/RecommendationService.java b/src/main/java/com/climbup/climbup/recommendation/service/RecommendationService.java
@@ -1,6 +1,12 @@
 package com.climbup.climbup.recommendation.service;
 
+import com.climbup.climbup.recommendation.dto.response.RouteMissionRecommendationResponse;
+import com.climbup.climbup.session.entity.UserSession;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 public interface RecommendationService {
+    void generateRecommendationsForSession(UserSession session);
+    List<RouteMissionRecommendationResponse> getRecommendationsByUserActiveSession(Long userId);
 }
diff --git a/src/main/java/com/climbup/climbup/recommendation/service/RecommendationServiceImpl.java b/src/main/java/com/climbup/climbup/recommendation/service/RecommendationServiceImpl.java
@@ -1,7 +1,75 @@
 package com.climbup.climbup.recommendation.service;
 
+import com.climbup.climbup.attempt.entity.UserMissionAttempt;
+import com.climbup.climbup.gym.entity.ClimbingGym;
+import com.climbup.climbup.recommendation.dto.response.RouteMissionRecommendationResponse;
+import com.climbup.climbup.recommendation.entity.ChallengeRecommendation;
+import com.climbup.climbup.recommendation.repository.RecommendationRepository;
+import com.climbup.climbup.route.entity.RouteMission;
+import com.climbup.climbup.route.repository.RouteMissionRepository;
+import com.climbup.climbup.sector.entity.Sector;
+import com.climbup.climbup.session.entity.UserSession;
+import com.climbup.climbup.session.exception.UserSessionNotFoundException;
+import com.climbup.climbup.session.repository.UserSessionRepository;
+import com.climbup.climbup.user.entity.User;
+import com.climbup.climbup.user.exception.UserNotFoundException;
+import com.climbup.climbup.user.repository.UserRepository;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
 
 @Service
+@RequiredArgsConstructor
 public class RecommendationServiceImpl implements RecommendationService{
+    private static final byte MAX_NUM_OF_RECS = 30;
+
+    private final UserSessionRepository userSessionRepository;
+    private final UserRepository userRepository;
+    private final RouteMissionRepository routeMissionRepository;
+    private final RecommendationRepository recommendationRepository;
+
+    @Override
+    @Transactional
+    public void generateRecommendationsForSession(UserSession session){
+        User user = session.getUser();
+
+        List<RouteMission> routeMissions = routeMissionRepository.findUnattemptedRouteMissionsByUser(user.getId());
+
+        AtomicInteger index = new AtomicInteger(0);
+
+        List<ChallengeRecommendation> recommendations = routeMissions.stream()
+                .map(routeMission -> {
+                    ChallengeRecommendation recommendation = ChallengeRecommendation.builder()
+                        .session(session)
+                        .mission(routeMission)
+                        .recommendedOrder(index.getAndIncrement())
+                        .build();
+
+                    return recommendation;
+                })
+                .toList();
+
+        recommendations = recommendations.subList(0, (int) Math.min(MAX_NUM_OF_RECS, (long) recommendations.size()));
+        recommendationRepository.saveAll(recommendations);
+    }
+
+    @Override
+    @Transactional(readOnly = true)
+    public List<RouteMissionRecommendationResponse> getRecommendationsByUserActiveSession(Long userId) {
+        UserSession session = userSessionRepository.findByUserIdAndEndedAtIsNull(userId).orElseThrow(UserSessionNotFoundException::new);
+
+        List<ChallengeRecommendation> recommendations = recommendationRepository.findBySession(session);
+
+        return recommendations.stream().map(recommendation -> {
+            RouteMission routeMission = recommendation.getMission();
+            ClimbingGym gym = routeMission.getGym();
+            List<UserMissionAttempt> attempts = routeMission.getAttempts().stream().toList();
+            Sector sector = routeMission.getSector();
+
+            return RouteMissionRecommendationResponse.toDto(recommendation, routeMission, gym, attempts, sector, recommendation.getRecommendedOrder());
+        }).toList();
+    }
 }
diff --git a/src/main/java/com/climbup/climbup/route/repository/RouteMissionRepository.java b/src/main/java/com/climbup/climbup/route/repository/RouteMissionRepository.java
@@ -2,6 +2,14 @@
 
 import com.climbup.climbup.route.entity.RouteMission;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
+@Repository
 public interface RouteMissionRepository extends JpaRepository<RouteMission, Long> {
-}
+    @Query("SELECT rm from RouteMission rm LEFT JOIN rm.attempts uma on uma.user.id = :userId WHERE uma.id IS NULL")
+    List<RouteMission> findUnattemptedRouteMissionsByUser(@Param("userId") Long userId);
+}
diff --git a/src/main/java/com/climbup/climbup/sector/repository/SectorRepository.java b/src/main/java/com/climbup/climbup/sector/repository/SectorRepository.java
@@ -0,0 +1,9 @@
+package com.climbup.climbup.sector.repository;
+
+import com.climbup.climbup.sector.entity.Sector;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface SectorRepository extends JpaRepository<Sector, Long> {
+}
diff --git a/src/main/java/com/climbup/climbup/session/repository/UserSessionRepository.java b/src/main/java/com/climbup/climbup/session/repository/UserSessionRepository.java
@@ -1,6 +1,7 @@
 package com.climbup.climbup.session.repository;
 
 import com.climbup.climbup.session.entity.UserSession;
+import com.climbup.climbup.user.entity.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.Optional;
diff --git a/src/main/java/com/climbup/climbup/session/service/UserSessionServiceImpl.java b/src/main/java/com/climbup/climbup/session/service/UserSessionServiceImpl.java
@@ -1,5 +1,6 @@
 package com.climbup.climbup.session.service;
 
+import com.climbup.climbup.recommendation.service.RecommendationService;
 import com.climbup.climbup.session.entity.UserSession;
 import com.climbup.climbup.session.exception.UserSessionAlreadyFinishedException;
 import com.climbup.climbup.session.exception.UserSessionNotFoundException;
@@ -22,6 +23,7 @@
 public class UserSessionServiceImpl implements UserSessionService {
     private final UserSessionRepository userSessionRepository;
     private final UserRepository userRepository;
+    private final RecommendationService recommendationService;
 
     @Override
     @Transactional
@@ -47,8 +49,11 @@ public UserSession startSession(Long userId) {
                 .completedCount(0)
                 .attemptedCount(0)
                 .build();
+
+        session = userSessionRepository.save(session);
+        recommendationService.generateRecommendationsForSession(session);
         
-        return userSessionRepository.save(session);
+        return session;
     }
 
     @Override
diff --git a/src/main/java/com/climbup/climbup/test/controller/TestController.java b/src/main/java/com/climbup/climbup/test/controller/TestController.java
@@ -9,6 +9,10 @@
 import com.climbup.climbup.gym.repository.GymLevelRepository;
 import com.climbup.climbup.level.entity.Level;
 import com.climbup.climbup.level.repository.LevelRepository;
+import com.climbup.climbup.route.entity.RouteMission;
+import com.climbup.climbup.route.repository.RouteMissionRepository;
+import com.climbup.climbup.sector.entity.Sector;
+import com.climbup.climbup.sector.repository.SectorRepository;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -21,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -35,6 +40,8 @@ public class TestController {
     private final ClimbingGymRepository climbingGymRepository;
     private final BrandRepository brandRepository;
     private final GymLevelRepository gymLevelRepository;
+    private final RouteMissionRepository routeMissionRepository;
+    private final SectorRepository sectorRepository;
 
     @Operation(summary = "랜덤 숫자 생성", description = "0-99 사이의 랜덤한 정수를 반환합니다")
     @ApiResponse(responseCode = "200", description = "성공적으로 랜덤 숫자를 생성함")
@@ -46,7 +53,7 @@ public ResponseEntity<ApiResult<Map<String, Object>>> getRandomNumber() {
         return ResponseEntity.ok(ApiResult.success(response));
     }
 
-    @Operation(summary = "테스트 데이터 초기화", description = "개발/테스트용 브랜드, 레벨, 암장, 브랜드별 레벨 데이터를 생성합니다")
+    @Operation(summary = "테스트 데이터 초기화", description = "개발/테스트용 브랜드, 레벨, 암장, 브랜드별 레벨, 섹터, 루트 미션 데이터를 생성합니다")
     @ApiResponse(responseCode = "200", description = "테스트 데이터 생성 완료")
     @PostMapping("/init-data")
     @Transactional
@@ -55,6 +62,8 @@ public ResponseEntity<ApiResult<Map<String, Object>>> initTestData() {
         int levelsCreated = 0;
         int gymsCreated = 0;
         int gymLevelsCreated = 0;
+        int sectorsCreated = 0;
+        int routeMissionsCreated = 0;
 
         // 1. 브랜드 데이터 생성
         if (brandRepository.count() == 0) {
@@ -237,13 +246,69 @@ public ResponseEntity<ApiResult<Map<String, Object>>> initTestData() {
             gymLevelsCreated = theClimbLevels.size();
         }
 
+        // 5. 섹터 데이터 생성
+        if (sectorRepository.count() == 0) {
+            List<Sector> sectors = sectorRepository.saveAll(List.of(
+                    Sector.builder()
+                            .name("A구역")
+                            .imageUrl("https://example.com/sector-a.jpg")
+                            .build(),
+                    Sector.builder()
+                            .name("B구역")
+                            .imageUrl("https://example.com/sector-b.jpg")
+                            .build(),
+                    Sector.builder()
+                            .name("C구역")
+                            .imageUrl("https://example.com/sector-c.jpg")
+                            .build(),
+                    Sector.builder()
+                            .name("D구역")
+                            .imageUrl("https://example.com/sector-d.jpg")
+                            .build()
+            ));
+            sectorsCreated = sectors.size();
+        }
+
+        // 6. 루트 미션 30개 생성
+        if (routeMissionRepository.count() == 0) {
+            List<ClimbingGym> gyms = climbingGymRepository.findAll();
+            List<Sector> sectors = sectorRepository.findAll();
+            
+            if (!gyms.isEmpty() && !sectors.isEmpty()) {
+                String[] difficulties = {"V0", "V1", "V2", "V3", "V4", "V5", "V6"};
+                
+                List<RouteMission> routeMissions = new ArrayList<>();
+                for (int i = 1; i <= 30; i++) {
+                    ClimbingGym gym = gyms.get((i - 1) % gyms.size());
+                    Sector sector = sectors.get((i - 1) % sectors.size());
+                    String difficulty = difficulties[(i - 1) % difficulties.length];
+                    
+                    routeMissions.add(RouteMission.builder()
+                            .gym(gym)
+                            .sector(sector)
+                            .difficulty(difficulty)
+                            .score(600 + (i - 1) * 50)
+                            .imageUrl("https://example.com/route-mission-" + i + ".jpg")
+                            .thumbnailUrl("https://example.com/route-mission-" + i + "-thumb.jpg")
+                            .videoUrl("https://example.com/route-mission-" + i + ".mp4")
+                            .postedAt(LocalDateTime.now().minusDays(30 - i))
+                            .build());
+                }
+                
+                routeMissionRepository.saveAll(routeMissions);
+                routeMissionsCreated = routeMissions.size();
+            }
+        }
+
         // 결과 응답
         Map<String, Object> response = new HashMap<>();
         response.put("message", "테스트 데이터가 생성되었습니다.");
         response.put("brandsCreated", brandsCreated);
         response.put("levelsCreated", levelsCreated);
         response.put("gymsCreated", gymsCreated);
         response.put("gymLevelsCreated", gymLevelsCreated);
+        response.put("sectorsCreated", sectorsCreated);
+        response.put("routeMissionsCreated", routeMissionsCreated);
         response.put("timestamp", LocalDateTime.now());
 
         return ResponseEntity.ok(ApiResult.success(response));
@@ -258,6 +323,8 @@ public ResponseEntity<ApiResult<Map<String, Object>>> getDataStatus() {
         response.put("levelCount", levelRepository.count());
         response.put("gymCount", climbingGymRepository.count());
         response.put("gymLevelCount", gymLevelRepository.count());
+        response.put("sectorCount", sectorRepository.count());
+        response.put("routeMissionCount", routeMissionRepository.count());
         response.put("timestamp", LocalDateTime.now());
 
         return ResponseEntity.ok(ApiResult.success(response));
@@ -272,10 +339,14 @@ public ResponseEntity<ApiResult<Map<String, Object>>> clearTestData() {
         long levelCount = levelRepository.count();
         long gymCount = climbingGymRepository.count();
         long gymLevelCount = gymLevelRepository.count();
+        long sectorCount = sectorRepository.count();
+        long routeMissionCount = routeMissionRepository.count();
 
         // 외래키 제약조건 때문에 순서가 중요함
+        routeMissionRepository.deleteAll();
         gymLevelRepository.deleteAll();
         climbingGymRepository.deleteAll();
+        sectorRepository.deleteAll();
         levelRepository.deleteAll();
         brandRepository.deleteAll();
 
@@ -285,6 +356,8 @@ public ResponseEntity<ApiResult<Map<String, Object>>> clearTestData() {
         response.put("deletedLevels", levelCount);
         response.put("deletedGyms", gymCount);
         response.put("deletedGymLevels", gymLevelCount);
+        response.put("deletedSectors", sectorCount);
+        response.put("deletedRouteMissions", routeMissionCount);
         response.put("timestamp", LocalDateTime.now());
 
         return ResponseEntity.ok(ApiResult.success(response));
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
@@ -16,7 +16,7 @@ spring:
 
   jpa:
     hibernate:
-      ddl-auto: create
+      ddl-auto: update
     show-sql: true
 
   flyway:
