Skip to content

feat: 선착순 레슨 신청시 openTime 비교 예외처리 #164

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
merged 4 commits into from
Jul 30, 2025
Merged

feat: 선착순 레슨 신청시 openTime 비교 예외처리 #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c3f078c
feat: 레슨 신청 결제 대기 상태 도입
Ji-minhyeok Jul 29, 2025
c429a3c
Merge branch 'develop' of https://github.com/prgrms-web-devcourse-fin…
Ji-minhyeok Jul 30, 2025
379558e
feat: 선착순 레슨 신청시 openTime 비교 예외처리
Ji-minhyeok Jul 30, 2025
dacbdce
fix: 불필요한 쿼리 검색 조건 삭제
Ji-minhyeok Jul 30, 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
6 changes: 6 additions & 0 deletions src/main/java/com/threestar/trainus/domain/lesson/student/service/StudentLessonService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,14 @@ public LessonApplicationResponseDto applyToLesson(Long lessonId, Long userId) {
throw new BusinessException(ErrorCode.LESSON_NOT_AVAILABLE);
}



// 선착순 여부에 따라 저장 처리 분기
if (lesson.getOpenRun()) {
// 신청 시간 체크
if (java.time.LocalDateTime.now().isBefore(lesson.getOpenTime())) {
throw new BusinessException(ErrorCode.LESSON_NOT_YET_OPEN);
}
// 바로 참가자 등록, 인원수 증가
LessonParticipant participant = LessonParticipant.builder()
.lesson(lesson)
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/threestar/trainus/domain/lesson/teacher/repository/LessonRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ int countCreatedLessons(
AND (:district IS NULL OR l.district = :district)
AND (:dong IS NULL OR l.dong = :dong)
AND (:ri IS NULL OR l.ri = :ri)
AND MATCH(l.lesson_name, l.description) AGAINST(:search IN BOOLEAN MODE)
AND MATCH(l.lesson_name) AGAINST(:search IN BOOLEAN MODE)
ORDER BY
CASE WHEN :sort = 'LATEST' THEN l.created_at END DESC,
CASE WHEN :sort = 'OLDEST' THEN l.created_at END ASC,
Expand Down Expand Up @@ -248,7 +248,7 @@ SELECT COUNT(*) FROM (
AND (:district IS NULL OR l.district = :district)
AND (:dong IS NULL OR l.dong = :dong)
AND (:ri IS NULL OR l.ri = :ri)
AND MATCH(l.lesson_name, l.description) AGAINST(:search IN BOOLEAN MODE)
AND MATCH(l.lesson_name) AGAINST(:search IN BOOLEAN MODE)
LIMIT :limit
) t
""", nativeQuery = true)
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/threestar/trainus/global/exception/domain/ErrorCode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ public enum ErrorCode {
DUPLICATE_LESSON(HttpStatus.CONFLICT, "동일한 이름과 시간으로 이미 생성된 레슨이 있습니다."),
LESSON_TIME_OVERLAP(HttpStatus.CONFLICT, "해당 시간대에 이미 다른 레슨이 예정되어 있습니다."),
LESSON_NOT_AVAILABLE(HttpStatus.BAD_REQUEST, "신청 불가능한 상태의 레슨입니다."),
LESSON_NOT_YET_OPEN(HttpStatus.BAD_REQUEST, "아직 신청 가능한 시간이 아닙니다."),

// 409
ALREADY_APPLIED(HttpStatus.CONFLICT, "이미 신청한 레슨입니다."),
Expand Down