fix: 총 회차보다 더 많은 수업 추가 못하도록 수정

Author: ymkim97

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

@@ -15,7 +15,6 @@
 import java.time.LocalDateTime;
 import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -26,6 +25,7 @@
 import com.tnt.application.trainee.PtGoalService;
 import com.tnt.application.trainee.TraineeService;
 import com.tnt.application.trainer.TrainerService;
+import com.tnt.common.error.exception.BadRequestException;
 import com.tnt.common.error.exception.ConflictException;
 import com.tnt.common.error.exception.NotFoundException;
 import com.tnt.domain.member.Member;
@@ -368,9 +368,6 @@ private int validateAndGetNextSession(PtTrainerTrainee ptTrainerTrainee, LocalDa
 		int temp = 0;
 
 		if (!lessonsForTrainee.isEmpty()) {
-			if (Objects.equals(lessonsForTrainee.getLast().getSession(), ptTrainerTrainee.getTotalPtCount())) {
-				throw new ConflictException(PT_LESSON_OVERFLOW);
-			}
 
 			for (PtLesson toCompare : lessonsForTrainee) {
 				if (toCompare.getLessonStart().isBefore(start)) {
@@ -387,6 +384,12 @@ private int validateAndGetNextSession(PtTrainerTrainee ptTrainerTrainee, LocalDa
 			}
 		}
 
-		return ptTrainerTrainee.getFinishedPtCount() + 1 + temp;
+		int nextSession = ptTrainerTrainee.getFinishedPtCount() + 1 + temp;
+
+		if (nextSession > ptTrainerTrainee.getTotalPtCount()) {
+			throw new BadRequestException(PT_LESSON_OVERFLOW);
+		}
+
+		return nextSession;
 	}
 }

src/test/java/com/tnt/fixture/PtTrainerTraineeFixture.java

@@ -49,4 +49,18 @@ public static PtTrainerTrainee getPtTrainerTrainee3(Trainer trainer, Trainee tra
 			.totalPtCount(totalPtCount)
 			.build();
 	}
+
+	public static PtTrainerTrainee getPtTrainerTrainee4(Trainer trainer, Trainee trainee) {
+		LocalDate startDate = LocalDate.of(2025, 1, 1);
+		Integer totalPtCount = 1;
+		Integer finishedPtCount = 1;
+
+		return PtTrainerTrainee.builder()
+			.trainer(trainer)
+			.trainee(trainee)
+			.startedAt(startDate)
+			.finishedPtCount(finishedPtCount)
+			.totalPtCount(totalPtCount)
+			.build();
+	}
 }

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

@@ -972,45 +972,24 @@ void add_pt_lesson_fail2() throws Exception {
 		trainer = trainerRepository.save(trainer);
 		trainee = traineeRepository.save(trainee);
 
-		PtTrainerTrainee ptTrainerTrainee = PtTrainerTraineeFixture.getPtTrainerTrainee3(trainer, trainee);
+		PtTrainerTrainee ptTrainerTrainee = PtTrainerTraineeFixture.getPtTrainerTrainee4(trainer, trainee);
 
 		ptTrainerTraineeRepository.save(ptTrainerTrainee);
 
-		PtGoal ptGoal1 = PtGoal.builder()
-			.traineeId(trainee.getId())
-			.content("다이어트")
-			.build();
-
-		PtGoal ptGoal2 = PtGoal.builder()
-			.traineeId(trainee.getId())
-			.content("체중 감량")
-			.build();
-
-		ptGoalRepository.saveAll(List.of(ptGoal1, ptGoal2));
-
 		LocalDateTime startDate1 = LocalDateTime.parse("2025-02-01T11:30");
 		LocalDateTime endDate1 = LocalDateTime.parse("2025-02-01T13:00");
 
-		LocalDateTime startDate2 = LocalDateTime.parse("2025-02-07T11:30");
-		LocalDateTime endDate2 = LocalDateTime.parse("2025-02-07T13:00");
-
-		List<PtLesson> ptLessons = List.of(PtLesson.builder()
-				.ptTrainerTrainee(ptTrainerTrainee)
-				.session(9)
-				.lessonStart(startDate1)
-				.lessonEnd(endDate1)
-				.build(),
-			PtLesson.builder()
-				.ptTrainerTrainee(ptTrainerTrainee)
-				.session(10)
-				.lessonStart(startDate2)
-				.lessonEnd(endDate2)
-				.build());
+		PtLesson ptLessons = PtLesson.builder()
+			.ptTrainerTrainee(ptTrainerTrainee)
+			.session(1)
+			.lessonStart(startDate1)
+			.lessonEnd(endDate1)
+			.build();
 
-		ptLessonRepository.saveAll(ptLessons);
+		ptLessonRepository.save(ptLessons);
 
-		LocalDateTime start = LocalDateTime.of(2025, 1, 1, 10, 30);
-		LocalDateTime end = LocalDateTime.of(2025, 1, 1, 11, 30);
+		LocalDateTime start = LocalDateTime.of(2025, 2, 2, 10, 30);
+		LocalDateTime end = LocalDateTime.of(2025, 2, 2, 11, 30);
 		String memo = "THIS IS MEMO";
 
 		CreatePtLessonRequest request = new CreatePtLessonRequest(start, end, memo, trainee.getId());