Merge pull request #25 from Likelion-YeungNam-Univ/feat/#23-video-query

fix : 건강정보 조합 키워드 생성
Likelion-YeungNam-Univ · Jul 27, 2024 · a01496a · a01496a
2 parents f69839d + c304b21
commit a01496a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 deletions.
diff --git a/src/main/java/com/example/beginnerfitbe/playlist/service/PlaylistService.java b/src/main/java/com/example/beginnerfitbe/playlist/service/PlaylistService.java
@@ -3,6 +3,7 @@
 import com.example.beginnerfitbe.playlist.domain.Playlist;
 import com.example.beginnerfitbe.playlist.dto.PlaylistDto;
 import com.example.beginnerfitbe.playlist.repository.PlaylistRepository;
+import com.example.beginnerfitbe.user.dto.UserDto;
 import com.example.beginnerfitbe.youtube.dto.SelectedVideoDto;
 import com.example.beginnerfitbe.user.domain.User;
 import com.example.beginnerfitbe.user.repository.UserRepository;
@@ -19,7 +20,9 @@
 
 import java.io.IOException;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Random;
 import java.util.stream.Collectors;
 
 @Service
@@ -67,19 +70,22 @@ public void createPlaylistDaily() {
         });
     }
 
-    private String searchKeyword(User user) {
-
-        String query= "운동";
-//        if(user.getExerciseIntensity()<=3){
-//            query = user.getExercisePart() + " " + user.getExercisePurpose() +" 쉬운 운동";
-//        }
-//        else if(user.getExerciseIntensity()>=7){
-//            query = user.getExercisePart() + " " + user.getExercisePurpose() +" 매운맛 운동";
-//        }
-//        else{
-//            query = user.getExercisePart() + " " + user.getExercisePurpose()+" 운동";
-//        }
-        return query;
+    public String searchKeyword(User user) {
+        List<String> keywords = new ArrayList<>();
+
+        String areas = String.join(" ", user.getConcernedAreas()); // 고정된 부위
+        List<String> goals = user.getExerciseGoals();
+        List<String> intensities = user.getExerciseIntensity();
+
+        // 목표와 강도를 조합하여 키워드 생성
+        for (String goal : goals) {
+            for (String intensity : intensities) {
+                keywords.add(areas + " " + goal + " " + intensity + " 운동");
+            }
+        }
+        Random random = new Random();
+        int randomIndex = random.nextInt(keywords.size());
+        return keywords.get(randomIndex);
     }
 
     @Transactional

diff --git a/src/main/java/com/example/beginnerfitbe/user/service/UserService.java b/src/main/java/com/example/beginnerfitbe/user/service/UserService.java
@@ -69,7 +69,7 @@ public StateResponse updateHealthInfo(HealthInfoReqDto dto) throws IOException {
         userRepository.save(user);
 
         //플레이리스트 생성
-//        playlistService.create(user);
+        playlistService.create(user);
 
         //몸무게 기록
         weightRecordService.create(user.getId(), user.getWeight());