Skip to content

Refactor: 웨이팅 상태 변경 시 calledAt 필드 추가 #202

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
Jjiggu merged 2 commits into from
Jul 31, 2025
Merged

Refactor: 웨이팅 상태 변경 시 calledAt 필드 추가 #202

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
f3e79a3
refactor(Reservation): calling으로 상태 변경시 updatedAt 시간 한국 기준으로 수정
Jjiggu Jul 31, 2025
c5de5fa
refactor(Reservation): calledAt 필드 추가
Jjiggu Jul 31, 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
8 changes: 6 additions & 2 deletions ...in-api/src/main/java/com/nowait/applicationadmin/reservation/dto/WaitingUserResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import lombok.Builder;
import lombok.Getter;


@Getter
@AllArgsConstructor
@Builder
Expand All @@ -31,6 +30,9 @@ public class WaitingUserResponse {
@Schema(description = "대기 등록 시각", example = "2025-07-22T16:00:00")
private LocalDateTime createdAt;

@Schema(description = "호출 시각", example = "2025-07-22T16:10:00")
private LocalDateTime calledAt;

@Schema(description = "대기 상태", example = "CALLING")
private String status;

Expand All @@ -48,13 +50,15 @@ public static WaitingUserResponse fromEntity(Reservation reservation) {
.build();
}

public static WaitingUserResponse fromRedis(String reservationId, String userId, Integer partySize, String userName, LocalDateTime createdAt, String status, Double score) {
public static WaitingUserResponse fromRedis(String reservationId, String userId, Integer partySize, String userName,
LocalDateTime createdAt, LocalDateTime calledAt, String status, Double score) {
return WaitingUserResponse.builder()
.reservationNumber(reservationId)
.userId(userId)
.partySize(partySize)
.userName(userName)
.createdAt(createdAt)
.calledAt(calledAt)
.status(status)
.score(score)
.build();
Expand Down
22 changes: 16 additions & 6 deletions ...api/src/main/java/com/nowait/applicationadmin/reservation/service/ReservationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ public List<WaitingUserResponse> getAllWaitingUserDetails(Long storeId) {
String pk = RedisKeyUtils.buildWaitingPartySizeKeyPrefix() + storeId;
String sk = RedisKeyUtils.buildWaitingStatusKeyPrefix() + storeId;
String nk = RedisKeyUtils.buildReservationNumberKey(storeId);
String cak = RedisKeyUtils.buildWaitingCalledAtKeyPrefix() + storeId;
String qk = RedisKeyUtils.buildWaitingKeyPrefix() + storeId;

List<Object> pipeline = redisTemplate.executePipelined((RedisCallback<Object>)conn -> {
Expand All @@ -143,6 +144,7 @@ public List<WaitingUserResponse> getAllWaitingUserDetails(Long storeId) {
conn.hGet(pk.getBytes(), uid); // partySize
conn.hGet(sk.getBytes(), uid); // status
conn.hGet(nk.getBytes(), uid); // reservationId
conn.hGet(cak.getBytes(), uid); // calledAt
conn.zScore(qk.getBytes(), uid); // score (등록 시각)
}
return null;
Expand All @@ -158,17 +160,23 @@ public List<WaitingUserResponse> getAllWaitingUserDetails(Long storeId) {
Integer partySize = Optional.ofNullable((String)it.next()).map(Integer::valueOf).orElse(0);
String status = (String)it.next();
String reservationId = (String)it.next();
String calledAtStr = (String)it.next();
Double score = (Double)it.next();

// score → createdAt
LocalDateTime createdAt = score != null
? Instant.ofEpochMilli(score.longValue()).atZone(zone).toLocalDateTime()
: null;

LocalDateTime calledAt = calledAtStr != null
? Instant.ofEpochMilli(Long.parseLong(calledAtStr)).atZone(zone).toLocalDateTime()
: null;

String userName = nicknameMap.getOrDefault(userId, "Unknown");

result.add(
WaitingUserResponse.fromRedis(reservationId, userId, partySize, userName, createdAt, status, score));
WaitingUserResponse.fromRedis(reservationId, userId, partySize, userName, createdAt, calledAt, status,
score));
}

return result;
Expand Down Expand Up @@ -220,7 +228,8 @@ private Reservation findTodayReservation(Long storeId, String userId) {
* - CANCELLED : Redis에서 삭제 → DB 저장 → 취소 메시지 반환
*/
@Transactional
public EntryStatusResponseDto processEntryStatus(Long storeId, String userId, MemberDetails member, ReservationStatus newStatus) {
public EntryStatusResponseDto processEntryStatus(Long storeId, String userId, MemberDetails member,
ReservationStatus newStatus) {

authorize(storeId, member);

Expand All @@ -235,16 +244,16 @@ public EntryStatusResponseDto processEntryStatus(Long storeId, String userId, Me
LocalDateTime requestedAt = score != null
? Instant.ofEpochMilli(score.longValue()).atZone(ZoneId.of("Asia/Seoul")).toLocalDateTime()
: LocalDateTime.now();
LocalDateTime now = LocalDateTime.now();
LocalDateTime now = LocalDateTime.now(ZoneId.of("Asia/Seoul"));

switch (newStatus) {
case CALLING:
if (!ReservationStatus.WAITING.name().equals(currStatus)) {
throw new IllegalStateException("WAITING 상태에서만 CALLING 가능합니다.");
}
waitingRedisRepository.setWaitingStatus(storeId, userId, ReservationStatus.CALLING.name());
waitingRedisRepository.setWaitingCalledAt(storeId, userId, now.atZone(ZoneId.of("Asia/Seoul")).toInstant().toEpochMilli());

waitingRedisRepository.setWaitingCalledAt(storeId, userId,
now.atZone(ZoneId.of("Asia/Seoul")).toInstant().toEpochMilli());

return EntryStatusResponseDto.builder()
.reservationNumber(reservationNumber)
Expand All @@ -259,7 +268,8 @@ public EntryStatusResponseDto processEntryStatus(Long storeId, String userId, Me

case CONFIRMED:
// 1) 기존 대기 중이거나 호출 중일 때: Redis → DB 최초 저장
if (ReservationStatus.WAITING.name().equals(currStatus) || ReservationStatus.CALLING.name().equals(currStatus)) {
if (ReservationStatus.WAITING.name().equals(currStatus) || ReservationStatus.CALLING.name()
.equals(currStatus)) {

// Redis 전부 삭제
waitingRedisRepository.deleteWaiting(storeId, userId);
Expand Down