Skip to content

예약 시 대기번호에 따른 알림 전송, 방문 내역 조회 오류 수정 #354

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
robinjoon merged 2 commits into from
Oct 17, 2025
Merged

예약 시 대기번호에 따른 알림 전송, 방문 내역 조회 오류 수정 #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cccfec7
fix: 입장 시 대기 번호에 따른 알림 발송
robinjoon Oct 17, 2025
6b1dc2f
fix: 방문 내역 조회 시 노쇼인 것 제외
robinjoon Oct 17, 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
14 changes: 9 additions & 5 deletions backend/src/main/java/com/example/demo/application/service/WaitingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import org.springframework.transaction.annotation.Transactional;

import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;

@Slf4j
Expand All @@ -36,9 +35,6 @@ public class WaitingService {
private final BanPort banPort;
private final WaitingStatisticsPort waitingStatisticsPort;

private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("MM.dd");
private static final DateTimeFormatter DAY_FORMATTER = DateTimeFormatter.ofPattern("E");

/**
* 현장 대기 신청
*/
Expand Down Expand Up @@ -115,7 +111,15 @@ public WaitingCreateResponse createWaiting(WaitingCreateRequest request, LocalDa
// 7. 확인 알림 발송
waitingNotificationService.sendWaitingConfirmedNotification(savedWaiting);

// 8. 응답 생성
// 8. 대기 번호에 따른 알림 발송
if (nextWaitingNumber == 0) {
waitingNotificationService.sendEnterNowNotification(savedWaiting);
}
if (nextWaitingNumber == 3) {
waitingNotificationService.sendEnter3TeamsBeforeNotification(savedWaiting);
}

// 9. 응답 생성
return waitingDtoMapper.toCreateResponse(savedWaiting);
}

Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/com/example/demo/infrastructure/persistence/repository/WaitingJpaRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public interface WaitingJpaRepository extends JpaRepository<WaitingEntity, Long>
* @param pageable 페이징 정보
* @return 대기 엔티티 목록
*/
@Query("SELECT w FROM WaitingEntity w WHERE w.memberId = :memberId ORDER BY " +
@Query("SELECT w FROM WaitingEntity w WHERE w.memberId = :memberId and w.status != com.example.demo.domain.model.waiting.WaitingStatus.NO_SHOW ORDER BY " +
"CASE WHEN w.status = :reservedStatus THEN 0 ELSE 1 END, " +
"w.createdAt DESC")
List<WaitingEntity> findByMemberIdOrderByStatusReservedFirstThenCreatedAtDesc(
Expand Down
Loading