[#51] fix : 점수 분석모델 사용 API 수정

- 점수가 없는 히스토리는 노출하지 않도록 했습니다. - 음정 분석점수와 유사도 분석 점수를 구분했습니다.
nerd-team-1 · Aug 1, 2024 · 72f85a9 · 72f85a9
1 parent 15a7149
commit 72f85a9
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 11 deletions.
diff --git a/core/core-api/src/main/java/com/nerd/favorite18/core/api/model/converter/ModelConverter.java b/core/core-api/src/main/java/com/nerd/favorite18/core/api/model/converter/ModelConverter.java
@@ -21,8 +21,9 @@ public ModelScore toEntity(User userEntity, Song songEntity, String recordedFile
 
     public ModelScoreResponse toResponse(String recordedFilename, ScoreResult scoreResult) {
         final Integer score = ConvertUtils.stringToInteger(scoreResult.getNormalizedScore());
-        final Double similarity = ConvertUtils.stringToDouble(scoreResult.getCombinedSimilarity());
+        final Double tune = ConvertUtils.stringToDouble(scoreResult.getMeanChromaSimilarity());
+        final Double similarity = ConvertUtils.stringToDouble(scoreResult.getMeanMfccSimilarity());
 
-        return ModelScoreResponse.of(recordedFilename, score, similarity);
+        return ModelScoreResponse.of(recordedFilename, score, tune, similarity);
     }
 }
diff --git a/...src/main/java/com/nerd/favorite18/core/api/model/dto/response/ModelScoreListResponse.java b/...src/main/java/com/nerd/favorite18/core/api/model/dto/response/ModelScoreListResponse.java
@@ -14,6 +14,7 @@ public class ModelScoreListResponse {
     private Long id;
     private SongDto song;
     private Integer score;
+    private Double tune;
     private Double similarity;
     private LocalDateTime createdAt;
     private LocalDateTime updatedAt;
@@ -22,6 +23,7 @@ public static ModelScoreListResponse of(
             Long id,
             SongDto song,
             Integer score,
+            Double tune,
             Double similarity,
             LocalDateTime createdAt,
             LocalDateTime updatedAt
@@ -30,6 +32,7 @@ public static ModelScoreListResponse of(
                 id,
                 song,
                 score,
+                tune,
                 similarity,
                 createdAt,
                 updatedAt

diff --git a/...api/src/main/java/com/nerd/favorite18/core/api/model/dto/response/ModelScoreResponse.java b/...api/src/main/java/com/nerd/favorite18/core/api/model/dto/response/ModelScoreResponse.java
@@ -8,13 +8,15 @@
 public class ModelScoreResponse {
     String recordedFilename;
     Integer score;
+    Double tune;
     Double similarity;
 
-    public static ModelScoreResponse of(String recordedFilename, Integer score, Double similarity) {
+    public static ModelScoreResponse of(String recordedFilename, Integer score, Double tune, Double similarity) {
 
         return new ModelScoreResponse(
                 recordedFilename,
                 score,
+                tune,
                 similarity
         );
     }

diff --git a/.../core-api/src/main/java/com/nerd/favorite18/core/api/model/service/ModelScoreService.java b/.../core-api/src/main/java/com/nerd/favorite18/core/api/model/service/ModelScoreService.java
@@ -37,7 +37,7 @@ public List<ModelScoreListResponse> getScoreList(UserDto userDto) {
         User userEntity =  userRepository.findFirstByIdAndStatusOrderByIdDesc(userDto.getId(), UserStatus.ACTIVE)
                 .orElseThrow(() -> new CoreApiException(ErrorType.USER_NOT_FOUND));
 
-        final List<ModelScoreProjection> projections = modelScoreRepository.findAllByUserOrderByCreatedAtDesc(userEntity);
+        final List<ModelScoreProjection> projections = modelScoreRepository.findAllByUserAndScoreIsNotNullOrderByCreatedAtDesc(userEntity);
 
         return projections.stream().map(projection -> {
             SongProjection song = projection.getSong();
@@ -46,6 +46,7 @@ public List<ModelScoreListResponse> getScoreList(UserDto userDto) {
                     projection.getId(),
                     SongDto.of(song.getId(), song.getTitle(), song.getArtist(), song.getAlbumPictureUrl()),
                     projection.getScore(),
+                    projection.getTune(),
                     projection.getSimilarity(),
                     projection.getCreatedAt(),
                     projection.getUpdatedAt()
@@ -70,12 +71,13 @@ public Long saveRecord(UserDto userDto, Long songId, String recordedFilename) {
     @Transactional
     public void saveScore(Long modelScoreId, ScoreResult scoreResult, long analysisTime) {
         final Integer score = ConvertUtils.stringToInteger(scoreResult.getNormalizedScore());
-        final Double similarity = ConvertUtils.stringToDouble(scoreResult.getCombinedSimilarity());
+        final Double tune = ConvertUtils.stringToDouble(scoreResult.getMeanChromaSimilarity());
+        final Double similarity = ConvertUtils.stringToDouble(scoreResult.getMeanMfccSimilarity());
 
         final ModelScore entity = modelScoreRepository.findById(modelScoreId)
                 .orElseThrow(() -> new CoreApiException(ErrorType.NOT_FOUND));
 
-        entity.applyUpdates(score, similarity, analysisTime);
+        entity.applyUpdates(score, tune, similarity, analysisTime);
 
         modelScoreRepository.save(entity);
     }

diff --git a/...ge/db-core/src/main/java/com/nerd/favorite18/storage/db/core/model/entity/ModelScore.java b/...ge/db-core/src/main/java/com/nerd/favorite18/storage/db/core/model/entity/ModelScore.java
@@ -37,28 +37,35 @@ public class ModelScore extends BaseEntity {
     @Comment("분석 대상 이름")
     private String recordedFilename;
 
-    @Comment("분석 점수")
+    @Comment("총 점수")
     private Integer score;
 
-    @Comment("분석 유사도")
+    @Comment("음정 분석치")
+    private Double tune;
+
+    @Comment("유사도 분석치")
     private Double similarity;
 
     @Comment("분석 소요 시간")
     private long analysisTime;
 
     @Builder
-    public ModelScore(User user, Song song, String recordedFilename, Integer score, Double similarity, long analysisTime) {
+    public ModelScore(User user, Song song, String recordedFilename, Integer score, Double tune, Double similarity, long analysisTime) {
         this.user = user;
         this.song = song;
         this.recordedFilename = recordedFilename;
         this.score = score;
+        this.tune = tune;
         this.similarity = similarity;
         this.analysisTime = analysisTime;
     }
 
     public void updateScore(Integer score) {
         this.score = score;
     }
+    public void updateTune(Double tune) {
+        this.tune = tune;
+    }
 
     public void updateSimilarity(Double similarity) {
         this.similarity = similarity;
@@ -68,11 +75,15 @@ public void updateAnalysisTime(long analysisTime) {
         this.analysisTime = analysisTime;
     }
 
-    public void applyUpdates(Integer score, Double similarity, long analysisTime) {
+    public void applyUpdates(Integer score, Double tune, Double similarity, long analysisTime) {
         if (!ObjectUtils.isEmpty(score)) {
             updateScore(score);
         }
 
+        if (!ObjectUtils.isEmpty(tune)) {
+            updateTune(tune);
+        }
+
         if (!ObjectUtils.isEmpty(similarity)) {
             updateSimilarity(similarity);
         }

diff --git a/.../main/java/com/nerd/favorite18/storage/db/core/model/projection/ModelScoreProjection.java b/.../main/java/com/nerd/favorite18/storage/db/core/model/projection/ModelScoreProjection.java
@@ -6,5 +6,6 @@
 public interface ModelScoreProjection extends BaseProjection {
     SongProjection getSong();
     Integer getScore();
+    Double getTune();
     Double getSimilarity();
 }
diff --git a/.../main/java/com/nerd/favorite18/storage/db/core/model/repository/ModelScoreRepository.java b/.../main/java/com/nerd/favorite18/storage/db/core/model/repository/ModelScoreRepository.java
@@ -8,5 +8,5 @@
 import java.util.List;
 
 public interface ModelScoreRepository extends JpaRepository<ModelScore, Long> {
-    List<ModelScoreProjection> findAllByUserOrderByCreatedAtDesc(User userEntity);
+    List<ModelScoreProjection> findAllByUserAndScoreIsNotNullOrderByCreatedAtDesc(User userEntity);
 }