Skip to content

HotFix 후 main 브랜치 develop 브랜치에 병합 #102

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
rnjs9407 merged 6 commits into from
Oct 27, 2025
Merged

HotFix 후 main 브랜치 develop 브랜치에 병합 #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4acfb0e
Merge pull request #88 from SoLit-2025/develop
rnjs9407 Oct 5, 2025
b2d2d23
Merge pull request #91 from SoLit-2025/develop
rnjs9407 Oct 11, 2025
d2f6ca5
Merge pull request #96 from SoLit-2025/develop
rnjs9407 Oct 16, 2025
d1f9a13
Merge pull request #99 from SoLit-2025/develop
rnjs9407 Oct 16, 2025
86397a7
🐞 Fix: POST 보컬분석리포트 생성 API에서 PRE 보컬분석리포트 조회 시 userId 조건 추가 #100
rnjs9407 Oct 27, 2025
4dc8041
Merge pull request #101 from SoLit-2025/hotfix/find-pre-report-by-use…
rnjs9407 Oct 27, 2025
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
4 changes: 2 additions & 2 deletions ...ain/java/com/solit/sync2sing/domain/training/common/service/impl/TrainingServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -806,8 +806,8 @@ private GenerateVocalAnalysisReportResponse postAnalysis(

// 훈련 전 보컬분석리포트
VocalAnalysisReport preReport = vocalAnalysisReportRepository
.findTopBySongAndTrainingModeAndReportTypeOrderByCreatedAtDesc(
trainingSong, trainingMode, RecordingContext.PRE
.findTopBySongAndTrainingModeAndReportTypeAndUserIdOrderByCreatedAtDesc(
trainingSong, trainingMode, RecordingContext.PRE, userId
)
.orElse(null);

Expand Down
7 changes: 3 additions & 4 deletions src/main/java/com/solit/sync2sing/repository/VocalAnalysisReportRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
import com.solit.sync2sing.entity.VocalAnalysisReport;
import com.solit.sync2sing.global.type.TrainingMode;
import com.solit.sync2sing.global.type.RecordingContext;
import com.solit.sync2sing.global.type.TrainingMode;
import org.springframework.data.jpa.repository.JpaRepository;
import com.solit.sync2sing.global.type.RecordingContext;

import java.util.List;

Expand All @@ -22,9 +20,10 @@ List<VocalAnalysisReport> findAllByUser_IdAndTrainingModeAndReportTypeInOrderByC


// 가장 최신 PRE 리포트 하나
Optional<VocalAnalysisReport> findTopBySongAndTrainingModeAndReportTypeOrderByCreatedAtDesc(
Optional<VocalAnalysisReport> findTopBySongAndTrainingModeAndReportTypeAndUserIdOrderByCreatedAtDesc(
Song song,
TrainingMode trainingMode,
RecordingContext reportType
RecordingContext reportType,
Long userId
);
}