hotfix: 수업 완료 버그 수정

Author: ymkim97

src/main/java/com/tnt/pt/application/PtService.java

@@ -205,7 +205,7 @@ public void completePtLesson(Long memberId, Long ptLessonId) {
 		ptLesson.complete(ptTrainerTrainee.getFinishedPtCount());
 
 		List<PtLesson> lessonsNotCompleted =
-			ptLessonRepository.findAllByPtTrainerTraineeAndIsCompletedIsFalse(ptTrainerTrainee);
+			ptLessonRepository.findAllByPtTrainerTraineeAndIsCompletedIsFalseWithout(ptTrainerTrainee, ptLessonId);
 
 		lessonsNotCompleted.forEach(lesson -> {
 			if (!lesson.getId().equals(ptLessonId)) {
@@ -226,7 +226,7 @@ public void cancelPtLesson(Long memberId, Long ptLessonId) {
 		PtTrainerTrainee ptTrainerTrainee = ptLesson.getPtTrainerTrainee();
 
 		List<PtLesson> lessonsNotCompleted =
-			ptLessonRepository.findAllByPtTrainerTraineeAndIsCompletedIsFalse(ptTrainerTrainee);
+			ptLessonRepository.findAllByPtTrainerTraineeAndIsCompletedIsFalseWithout(ptTrainerTrainee, ptLessonId);
 
 		lessonsNotCompleted.forEach(lesson -> {
 			if (!lesson.getId().equals(ptLessonId) && lesson.getSession() > ptLesson.getSession()) {

src/main/java/com/tnt/pt/application/repository/PtLessonRepository.java

@@ -19,7 +19,7 @@ public interface PtLessonRepository {
 
 	List<PtLesson> findAllByPtTrainerTrainee(PtTrainerTrainee ptTrainerTrainee);
 
-	List<PtLesson> findAllByPtTrainerTraineeAndIsCompletedIsFalse(PtTrainerTrainee ptTrainerTrainee);
+	List<PtLesson> findAllByPtTrainerTraineeAndIsCompletedIsFalseWithout(PtTrainerTrainee ptTrainerTrainee, Long id);
 
 	List<PtLesson> findAllByTrainerIdAndDate(Long trainerId, LocalDate date);
 

src/main/java/com/tnt/pt/infrastructure/PtLessonJpaRepository.java

@@ -9,6 +9,6 @@ public interface PtLessonJpaRepository extends JpaRepository<PtLessonJpaEntity,
 	List<PtLessonJpaEntity> findAllByPtTrainerTraineeAndDeletedAtIsNull(
 		PtTrainerTraineeJpaEntity ptTrainerTraineeJpaEntity);
 
-	List<PtLessonJpaEntity> findAllByPtTrainerTraineeAndIsCompletedIsFalseAndDeletedAtIsNull(
-		PtTrainerTraineeJpaEntity ptTrainerTraineeJpaEntity);
+	List<PtLessonJpaEntity> findAllByPtTrainerTraineeAndIsCompletedIsFalseAndIdIsNotAndDeletedAtIsNull(
+		PtTrainerTraineeJpaEntity ptTrainerTraineeJpaEntity, Long id);
 }

src/main/java/com/tnt/pt/infrastructure/PtLessonRepositoryImpl.java

@@ -63,9 +63,10 @@ public List<PtLesson> findAllByPtTrainerTrainee(PtTrainerTrainee ptTrainerTraine
 	}
 
 	@Override
-	public List<PtLesson> findAllByPtTrainerTraineeAndIsCompletedIsFalse(PtTrainerTrainee ptTrainerTrainee) {
-		return ptLessonJpaRepository.findAllByPtTrainerTraineeAndIsCompletedIsFalseAndDeletedAtIsNull(
-				PtTrainerTraineeJpaEntity.from(ptTrainerTrainee))
+	public List<PtLesson> findAllByPtTrainerTraineeAndIsCompletedIsFalseWithout(PtTrainerTrainee ptTrainerTrainee,
+		Long id) {
+		return ptLessonJpaRepository.findAllByPtTrainerTraineeAndIsCompletedIsFalseAndIdIsNotAndDeletedAtIsNull(
+				PtTrainerTraineeJpaEntity.from(ptTrainerTrainee), id)
 			.stream()
 			.map(PtLessonJpaEntity::toModel)
 			.toList();

src/test/java/com/tnt/trainer/presentation/TrainerControllerTest.java

@@ -1090,6 +1090,10 @@ void complete_pt_lesson_success() throws Exception {
 		// when & then
 		mockMvc.perform(put("/trainers/lessons/{ptLessonId}/complete", ptLesson1.getId()))
 			.andExpect(status().isOk());
+
+		PtLesson result = ptLessonRepository.findById(ptLesson1.getId());
+
+		assertThat(result.getIsCompleted()).isTrue();
 	}
 
 	@Test