Skip to content

[#72]Feat: Flask 요청 시 Level 전달 추가, Flask 응답으로 score점수 받기 및 저장 로직 추가 #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Santoragi merged 1 commit into from
Apr 28, 2025
Merged

[#72]Feat: Flask 요청 시 Level 전달 추가, Flask 응답으로 score점수 받기 및 저장 로직 추가 #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/capstone/SportyUp/SportyUp_Server/domain/enums/PoseScore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package capstone.SportyUp.SportyUp_Server.domain.enums;

public enum PoseScore {
BAD, GOOD, EXCELLENT
BAD, COMMON, GOOD, EXCELLENT
}
2 changes: 2 additions & 0 deletions src/main/java/capstone/SportyUp/SportyUp_Server/repository/UserSportsRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package capstone.SportyUp.SportyUp_Server.repository;

import capstone.SportyUp.SportyUp_Server.domain.Sports;
import capstone.SportyUp.SportyUp_Server.domain.User;
import capstone.SportyUp.SportyUp_Server.domain.UserSports;
import org.springframework.data.jpa.repository.JpaRepository;
Expand All @@ -8,4 +9,5 @@

public interface UserSportsRepository extends JpaRepository<UserSports, Long> {
Optional<UserSports> findTop1ByUser(User user);
UserSports findTop1ByUserAndSports(User user, Sports sports);
}
34 changes: 19 additions & 15 deletions ...a/capstone/SportyUp/SportyUp_Server/service/AnalyzeService/AnalyzeCommandServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,12 @@
import capstone.SportyUp.SportyUp_Server.apiPayload.code.status.ErrorStatus;
import capstone.SportyUp.SportyUp_Server.aws.s3.S3Uploader;
import capstone.SportyUp.SportyUp_Server.converter.AnalyzeConverter;
import capstone.SportyUp.SportyUp_Server.domain.AnalyzeEntity;
import capstone.SportyUp.SportyUp_Server.domain.Game;
import capstone.SportyUp.SportyUp_Server.domain.Sports;
import capstone.SportyUp.SportyUp_Server.domain.User;
import capstone.SportyUp.SportyUp_Server.domain.*;
import capstone.SportyUp.SportyUp_Server.domain.enums.PoseScore;
import capstone.SportyUp.SportyUp_Server.repository.AnalyzeRepository;
import capstone.SportyUp.SportyUp_Server.repository.GameRepository;
import capstone.SportyUp.SportyUp_Server.repository.UserRepository;
import capstone.SportyUp.SportyUp_Server.repository.UserSportsRepository;
import capstone.SportyUp.SportyUp_Server.web.DTO.AnalyzeDTO.AnalyzeRequestDTO;
import capstone.SportyUp.SportyUp_Server.web.DTO.AnalyzeDTO.AnalyzeResponseDTO;
import lombok.RequiredArgsConstructor;
Expand All @@ -37,6 +35,7 @@ public class AnalyzeCommandServiceImpl implements AnalyzeCommandService {
private final GameRepository gameRepository;
private final AnalyzeRepository analyzeRepository;
private final UserRepository userRepository;
private final UserSportsRepository userSportsRepository;

@Value("${flask}")
private String FLASK_SERVER_URL; // Flask 서버 URL (예시: http://localhost:5000)
Expand All @@ -54,6 +53,7 @@ public AnalyzeResponseDTO.AnalyzeResultDTO requestAnalyze(Long userId, Long game
//분석할 영상이 속한 게임 찾기
Game game = gameRepository.findById(gameId).orElseThrow(()->new GameHandler(ErrorStatus.GAME_NOT_FOUND));
Sports sports = game.getSports();
UserSports userSports = userSportsRepository.findTop1ByUserAndSports(user,sports);
//영상찾기
MultipartFile uploadedFile = request.getFile();

Expand All @@ -73,24 +73,27 @@ public AnalyzeResponseDTO.AnalyzeResultDTO requestAnalyze(Long userId, Long game
} catch (IOException e){
throw new RuntimeException("S3 업로드 실패", e);
}
String userLevel = userSports.getLevel().toString();

//Flask 요청
Map<String, Object> flaskResponse = processFileWithFlask(sports,uploadedVideoUrl,analyzedKey);
Map<String, Object> flaskResponse = processFileWithFlask(sports,uploadedVideoUrl,analyzedKey,userLevel);

//Flask 응답
String videoUrl = (String) flaskResponse.get("video_url");
String recommendPose = (String) flaskResponse.get("recommend");
String goodPoint = (String) flaskResponse.get("good");
String badPoint = (String) flaskResponse.get("bad");
Double score = ((Number) flaskResponse.get("score")).doubleValue();
PoseScore poseScore = PoseScore.valueOf(flaskResponse.get("grade").toString());
Integer score = ((Number) flaskResponse.get("score")).intValue();

PoseScore poseScore = evaluateScore(score.intValue());
// PoseScore poseScore = evaluateScore(score.intValue());

//AnalyzeEntity 저장
AnalyzeEntity newAnalyzeEntity = AnalyzeEntity.builder()
.user(user)
.game(game)
.videoUrl(videoUrl)
.score(score)
.poseScore(poseScore)
.goodPoint(goodPoint)
.badPoint(badPoint)
Expand All @@ -103,12 +106,13 @@ public AnalyzeResponseDTO.AnalyzeResultDTO requestAnalyze(Long userId, Long game
}


private Map<String, Object> sendFileToFlask(String videoUrl, String analyzedKey) throws IOException {
private Map<String, Object> sendFileToFlask(String videoUrl, String analyzedKey, String userLevel) throws IOException {
RestTemplate restTemplate = new RestTemplate();

// Flask 서버에 보낼 파일 설정
MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
body.add("video_url", videoUrl);
body.add("user_level", userLevel);
body.add("analyzed_key", analyzedKey);

// HTTP 요청 헤더 설정
Expand Down Expand Up @@ -149,10 +153,10 @@ private Map<String, Object> sendFileToFlask(String videoUrl, String analyzedKey)
// }
// }

private Map<String, Object> processFileWithFlask(Sports sports, String videoUrl, String analyzedKey) {
private Map<String, Object> processFileWithFlask(Sports sports, String videoUrl, String analyzedKey, String userLevel) {
if ("볼링".equals(sports.getName())) {
try {
return sendFileToFlask(videoUrl, analyzedKey);
return sendFileToFlask(videoUrl, analyzedKey, userLevel);
} catch (IOException e) {
throw new RuntimeException("Flask 처리 실패", e);
}
Expand All @@ -168,9 +172,9 @@ private Map<String, Object> processFileWithFlask(Sports sports, String videoUrl,
);
}

private PoseScore evaluateScore(int score) {
if (score <= 33) return PoseScore.BAD;
if (score <= 66) return PoseScore.GOOD;
return PoseScore.EXCELLENT;
}
// private PoseScore evaluateScore(int score) {
// if (score <= 33) return PoseScore.BAD;
// if (score <= 66) return PoseScore.GOOD;
// return PoseScore.EXCELLENT;
// }
}