From 7b6733bcf7f5c29062da94dbcd854af8c44ea6d3 Mon Sep 17 00:00:00 2001 From: p1001q Date: Tue, 11 Aug 2026 17:24:00 +0900 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=EC=BD=94=EB=93=9C=20=EC=98=88?= =?UTF-8?q?=EC=8B=9C=20noteNumbers=20=EB=B6=88=EB=B3=80=20=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=EB=A1=9C=20=EB=B0=98=ED=99=98=20(#201)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/LearningStepDetailResponseDTO.java | 2 +- ...hordExampleNoteNumbersIntegrationTest.java | 70 +++++++++++++++++++ .../learning/service/LearningServiceTest.java | 3 + 3 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 src/test/java/com/mr/domain/learning/service/ChordExampleNoteNumbersIntegrationTest.java diff --git a/src/main/java/com/mr/domain/learning/dto/res/LearningStepDetailResponseDTO.java b/src/main/java/com/mr/domain/learning/dto/res/LearningStepDetailResponseDTO.java index 41ffe408..f193560b 100644 --- a/src/main/java/com/mr/domain/learning/dto/res/LearningStepDetailResponseDTO.java +++ b/src/main/java/com/mr/domain/learning/dto/res/LearningStepDetailResponseDTO.java @@ -100,7 +100,7 @@ public static ChordExampleItem from(ChordExample chordExample) { return new ChordExampleItem( chordExample.getChordName(), chordExample.getDescription(), - chordExample.getNoteNumbers() + List.copyOf(chordExample.getNoteNumbers()) ); } } diff --git a/src/test/java/com/mr/domain/learning/service/ChordExampleNoteNumbersIntegrationTest.java b/src/test/java/com/mr/domain/learning/service/ChordExampleNoteNumbersIntegrationTest.java new file mode 100644 index 00000000..f2e5b31f --- /dev/null +++ b/src/test/java/com/mr/domain/learning/service/ChordExampleNoteNumbersIntegrationTest.java @@ -0,0 +1,70 @@ +package com.mr.domain.learning.service; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +import com.mr.domain.learning.dto.res.LearningStepDetailResponseDTO; +import com.mr.domain.learning.entity.ChordExample; +import com.mr.domain.learning.entity.Learning; +import com.mr.domain.learning.entity.LearningStep; +import com.mr.domain.learning.entity.enums.LearningCategory; +import com.mr.domain.learning.entity.enums.LearningDifficulty; +import com.mr.domain.learning.repository.ChordExampleRepository; +import com.mr.domain.learning.repository.LearningRepository; +import com.mr.domain.learning.repository.LearningStepRepository; +import jakarta.persistence.EntityManager; +import java.util.List; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.transaction.annotation.Transactional; + +/** + * 서승기님이 지적한 서버 크래시 재현/검증용 통합 테스트. + * noteNumbers는 @ElementCollection이라 실제로는 Hibernate가 관리하는 컬렉션(PersistentBag)으로 로드되는데, + * Mockito mock(ChordExample.class)로는 이 타입을 재현할 수 없어 flush+clear로 영속성 컨텍스트를 비우고 + * 실제로 DB에서 다시 읽어온 컬렉션으로 검증한다. + */ +@SpringBootTest +@Transactional +class ChordExampleNoteNumbersIntegrationTest { + + @Autowired + private LearningService learningService; + @Autowired + private LearningRepository learningRepository; + @Autowired + private LearningStepRepository learningStepRepository; + @Autowired + private ChordExampleRepository chordExampleRepository; + @Autowired + private EntityManager entityManager; + + @Test + @DisplayName("getStepDetail - 실제 Hibernate 컬렉션으로 로드된 noteNumbers도 불변 리스트로 반환된다") + void getStepDetail_realHibernateCollection_returnsImmutableNoteNumbers() { + Learning learning = learningRepository.save(Learning.create( + "Tension Notes", LearningCategory.THEORY, LearningDifficulty.ADVANCED, + "요약", "본문", "팁", 10, "PIANO", true)); + + LearningStep step = learningStepRepository.save( + LearningStep.create(learning, 1, "11th 텐션 노트 활용하기", "설명", "이론 설명", "연습 팁", 10)); + + chordExampleRepository.save( + ChordExample.create(step, "Cmaj7", List.of(4, 11), "F(11th) 주의 - E(3rd)와 충돌")); + + // 방금 만든 자바 객체가 아니라 DB에서 진짜로 다시 읽어온 Hibernate 컬렉션을 태우기 위해 영속성 컨텍스트를 비운다 + entityManager.flush(); + entityManager.clear(); + + LearningStepDetailResponseDTO.StepDetailResultDTO result = + learningService.getStepDetail(learning.getId(), step.getId()); + + assertThat(result.chordExamples()).hasSize(1); + List noteNumbers = result.chordExamples().get(0).noteNumbers(); + assertThat(noteNumbers).containsExactly(4, 11); + assertThatThrownBy(() -> noteNumbers.add(1)) + .isInstanceOf(UnsupportedOperationException.class); + } +} diff --git a/src/test/java/com/mr/domain/learning/service/LearningServiceTest.java b/src/test/java/com/mr/domain/learning/service/LearningServiceTest.java index 9035d046..b8f990cc 100644 --- a/src/test/java/com/mr/domain/learning/service/LearningServiceTest.java +++ b/src/test/java/com/mr/domain/learning/service/LearningServiceTest.java @@ -270,6 +270,9 @@ void getStepDetail_success_includesModelPerformanceAndChordExamples() { assertThat(result.modelPerformance().durationSeconds()).isEqualTo(154); assertThat(result.chordExamples()).hasSize(1); assertThat(result.chordExamples().get(0).chordName()).isEqualTo("Cmaj7"); + assertThat(result.chordExamples().get(0).noteNumbers()).containsExactly(60, 64, 67, 70, 77); + assertThatThrownBy(() -> result.chordExamples().get(0).noteNumbers().add(1)) + .isInstanceOf(UnsupportedOperationException.class); } @Test From d659b414ab599eff09c5519429fc893a9679c31f Mon Sep 17 00:00:00 2001 From: p1001q Date: Wed, 12 Aug 2026 03:08:38 +0900 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20noteNumbers=20=ED=95=84=EB=93=9C=20?= =?UTF-8?q?=EC=A6=89=EC=8B=9C=20=EC=B4=88=EA=B8=B0=ED=99=94=EB=A1=9C=20nul?= =?UTF-8?q?l=20=EC=95=88=EC=A0=84=EC=84=B1=20=EB=B3=B4=EC=99=84=20(#201)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/mr/domain/learning/entity/ChordExample.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/mr/domain/learning/entity/ChordExample.java b/src/main/java/com/mr/domain/learning/entity/ChordExample.java index 015c41db..d459913b 100644 --- a/src/main/java/com/mr/domain/learning/entity/ChordExample.java +++ b/src/main/java/com/mr/domain/learning/entity/ChordExample.java @@ -49,7 +49,7 @@ public class ChordExample extends BaseCreatedEntity { joinColumns = @JoinColumn(name = "chord_example_id") ) @Column(name = "note_number", nullable = false) - private List noteNumbers; + private List noteNumbers = new ArrayList<>(); // 설명 @Column(name = "description", columnDefinition = "TEXT") From 23dc668758dee01393db7cf44633c6a82a4d2eea Mon Sep 17 00:00:00 2001 From: p1001q Date: Wed, 12 Aug 2026 04:01:59 +0900 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20noteNumbers=20=ED=95=84=EB=93=9C=20?= =?UTF-8?q?=EC=B4=88=EA=B8=B0=ED=99=94=20=EB=90=98=EB=8F=8C=EB=A6=BC=20+?= =?UTF-8?q?=20Home=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=8B=9C=EA=B0=84?= =?UTF-8?q?=EB=8C=80=20=EC=88=98=EC=A0=95=20(#201)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mr/domain/learning/entity/ChordExample.java | 2 +- .../java/com/mr/domain/home/service/HomeServiceTest.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/mr/domain/learning/entity/ChordExample.java b/src/main/java/com/mr/domain/learning/entity/ChordExample.java index d459913b..015c41db 100644 --- a/src/main/java/com/mr/domain/learning/entity/ChordExample.java +++ b/src/main/java/com/mr/domain/learning/entity/ChordExample.java @@ -49,7 +49,7 @@ public class ChordExample extends BaseCreatedEntity { joinColumns = @JoinColumn(name = "chord_example_id") ) @Column(name = "note_number", nullable = false) - private List noteNumbers = new ArrayList<>(); + private List noteNumbers; // 설명 @Column(name = "description", columnDefinition = "TEXT") diff --git a/src/test/java/com/mr/domain/home/service/HomeServiceTest.java b/src/test/java/com/mr/domain/home/service/HomeServiceTest.java index f6cc2a37..ad7f8818 100644 --- a/src/test/java/com/mr/domain/home/service/HomeServiceTest.java +++ b/src/test/java/com/mr/domain/home/service/HomeServiceTest.java @@ -177,7 +177,7 @@ void getHome_longStreak_notCappedByLookbackWindow() { void getHome_noPracticeToday_countsFromYesterday() { stubBaseline(1L); - LocalDate yesterday = LocalDate.now().minusDays(1); + LocalDate yesterday = LocalDate.now(ZoneId.of("Asia/Seoul")).minusDays(1); given(playingRepository.findDistinctEndedDatesByUserAndStatus(1L, PlayingStatus.COMPLETED)) .willReturn(List.of(toInstant(yesterday))); @@ -191,7 +191,7 @@ void getHome_noPracticeToday_countsFromYesterday() { void getHome_duplicateDateFromRepository_countsOnce() { stubBaseline(1L); - LocalDate today = LocalDate.now(); + LocalDate today = LocalDate.now(ZoneId.of("Asia/Seoul")); given(playingRepository.findDistinctEndedDatesByUserAndStatus(1L, PlayingStatus.COMPLETED)) .willReturn(List.of(toInstant(today), toInstant(today), toInstant(today))); @@ -212,7 +212,7 @@ void getHome_weeklyAttendance_hasSevenDaysAndFutureDaysAreEmpty() { assertThat(weeklyAttendance.get(0).dayOfWeek()).isEqualTo(DayOfWeekCode.MON); assertThat(weeklyAttendance.get(6).dayOfWeek()).isEqualTo(DayOfWeekCode.SUN); - LocalDate today = LocalDate.now(); + LocalDate today = LocalDate.now(ZoneId.of("Asia/Seoul")); LocalDate weekStart = today.with(DayOfWeek.MONDAY); for (int i = 0; i < weeklyAttendance.size(); i++) { LocalDate day = weekStart.plusDays(i); From 26175a420a003416bea1bf5bb63055e5dd9af2e2 Mon Sep 17 00:00:00 2001 From: p1001q Date: Wed, 12 Aug 2026 04:09:00 +0900 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20noteNumbers=20=ED=95=84=EB=93=9C=20?= =?UTF-8?q?=EC=A6=89=EC=8B=9C=20=EC=B4=88=EA=B8=B0=ED=99=94=20=EC=9E=AC?= =?UTF-8?q?=EB=B0=98=EC=98=81=20(#201)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/mr/domain/learning/entity/ChordExample.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/mr/domain/learning/entity/ChordExample.java b/src/main/java/com/mr/domain/learning/entity/ChordExample.java index 015c41db..d459913b 100644 --- a/src/main/java/com/mr/domain/learning/entity/ChordExample.java +++ b/src/main/java/com/mr/domain/learning/entity/ChordExample.java @@ -49,7 +49,7 @@ public class ChordExample extends BaseCreatedEntity { joinColumns = @JoinColumn(name = "chord_example_id") ) @Column(name = "note_number", nullable = false) - private List noteNumbers; + private List noteNumbers = new ArrayList<>(); // 설명 @Column(name = "description", columnDefinition = "TEXT") From 1e733e75ceb748774b9c651dde12106aaeb17899 Mon Sep 17 00:00:00 2001 From: p1001q Date: Wed, 12 Aug 2026 13:00:14 +0900 Subject: [PATCH 5/5] =?UTF-8?q?test:=20=EB=85=B8=ED=8A=B8=20=EB=B2=88?= =?UTF-8?q?=ED=98=B8=20=ED=9A=8C=EA=B7=80=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=EA=B0=80=20=EC=84=B8=EC=85=98=20=EC=A2=85=EB=A3=8C=20=ED=9B=84?= =?UTF-8?q?=20=EC=A0=91=EA=B7=BC=EC=9D=84=20=EC=9E=AC=ED=98=84=ED=95=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=ED=8A=B8=EB=9E=9C=EC=9E=AD=EC=85=98=20?= =?UTF-8?q?=EB=B2=94=EC=9C=84=20=EB=B6=84=EB=A6=AC=20(#201)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...hordExampleNoteNumbersIntegrationTest.java | 45 +++++++++++++------ 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/src/test/java/com/mr/domain/learning/service/ChordExampleNoteNumbersIntegrationTest.java b/src/test/java/com/mr/domain/learning/service/ChordExampleNoteNumbersIntegrationTest.java index f2e5b31f..ef6e840f 100644 --- a/src/test/java/com/mr/domain/learning/service/ChordExampleNoteNumbersIntegrationTest.java +++ b/src/test/java/com/mr/domain/learning/service/ChordExampleNoteNumbersIntegrationTest.java @@ -12,22 +12,24 @@ import com.mr.domain.learning.repository.ChordExampleRepository; import com.mr.domain.learning.repository.LearningRepository; import com.mr.domain.learning.repository.LearningStepRepository; -import jakarta.persistence.EntityManager; import java.util.List; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.transaction.annotation.Transactional; +import org.springframework.test.context.ActiveProfiles; /** * 서승기님이 지적한 서버 크래시 재현/검증용 통합 테스트. * noteNumbers는 @ElementCollection이라 실제로는 Hibernate가 관리하는 컬렉션(PersistentBag)으로 로드되는데, - * Mockito mock(ChordExample.class)로는 이 타입을 재현할 수 없어 flush+clear로 영속성 컨텍스트를 비우고 - * 실제로 DB에서 다시 읽어온 컬렉션으로 검증한다. + * Mockito mock(ChordExample.class)로는 이 타입을 재현할 수 없어 실제로 DB에서 다시 읽어온 컬렉션으로 검증한다. + * 클래스 레벨 @Transactional을 걸지 않아서(걸면 getStepDetail() 호출 이후에도 테스트 자신의 트랜잭션이 + * 계속 열려있게 되어 세션 종료 후 접근하는 실제 장애 시나리오를 재현하지 못한다) 저장/서비스 호출이 각자 + * 별도 트랜잭션으로 커밋·종료되게 하고, 검증은 서비스 트랜잭션이 이미 닫힌 뒤에 이뤄지도록 한다. */ @SpringBootTest -@Transactional +@ActiveProfiles("test") class ChordExampleNoteNumbersIntegrationTest { @Autowired @@ -38,8 +40,23 @@ class ChordExampleNoteNumbersIntegrationTest { private LearningStepRepository learningStepRepository; @Autowired private ChordExampleRepository chordExampleRepository; - @Autowired - private EntityManager entityManager; + + private Long learningId; + private Long stepId; + private Long chordExampleId; + + @AfterEach + void tearDown() { + if (chordExampleId != null) { + chordExampleRepository.deleteById(chordExampleId); + } + if (stepId != null) { + learningStepRepository.deleteById(stepId); + } + if (learningId != null) { + learningRepository.deleteById(learningId); + } + } @Test @DisplayName("getStepDetail - 실제 Hibernate 컬렉션으로 로드된 noteNumbers도 불변 리스트로 반환된다") @@ -47,20 +64,22 @@ void getStepDetail_realHibernateCollection_returnsImmutableNoteNumbers() { Learning learning = learningRepository.save(Learning.create( "Tension Notes", LearningCategory.THEORY, LearningDifficulty.ADVANCED, "요약", "본문", "팁", 10, "PIANO", true)); + learningId = learning.getId(); LearningStep step = learningStepRepository.save( LearningStep.create(learning, 1, "11th 텐션 노트 활용하기", "설명", "이론 설명", "연습 팁", 10)); + stepId = step.getId(); - chordExampleRepository.save( + ChordExample chordExample = chordExampleRepository.save( ChordExample.create(step, "Cmaj7", List.of(4, 11), "F(11th) 주의 - E(3rd)와 충돌")); + chordExampleId = chordExample.getId(); - // 방금 만든 자바 객체가 아니라 DB에서 진짜로 다시 읽어온 Hibernate 컬렉션을 태우기 위해 영속성 컨텍스트를 비운다 - entityManager.flush(); - entityManager.clear(); - + // 여기까지의 save() 호출들은 각자 별도 트랜잭션으로 이미 커밋·종료됐고, + // getStepDetail()도 자신의 트랜잭션을 새로 열어 반환 시점에 커밋·세션 종료한다. LearningStepDetailResponseDTO.StepDetailResultDTO result = - learningService.getStepDetail(learning.getId(), step.getId()); + learningService.getStepDetail(learningId, stepId); + // 이 시점엔 서비스 트랜잭션도 이미 닫혀 있다 - 실제 장애 시나리오(세션 종료 후 접근)와 동일한 조건에서 검증 assertThat(result.chordExamples()).hasSize(1); List noteNumbers = result.chordExamples().get(0).noteNumbers(); assertThat(noteNumbers).containsExactly(4, 11);