Skip to content

refactor(Reservation): reservationNumber 생성 메서드 분리 #195

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 1 commit into from
Jul 30, 2025
Merged

refactor(Reservation): reservationNumber 생성 메서드 분리 #195

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 22 additions & 13 deletions ...in/java/com/nowait/applicationuser/reservation/repository/WaitingUserRedisRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ public String addToWaitingQueue(Long storeId, String userId, Integer partySize,
String queueKey = RedisKeyUtils.buildWaitingKeyPrefix() + storeId;
String partyKey = RedisKeyUtils.buildWaitingPartySizeKeyPrefix() + storeId;
String statusKey = RedisKeyUtils.buildWaitingStatusKeyPrefix() + storeId;

String seqKey = RedisKeyUtils.buildReservationSeqKey(storeId);
String numberMapKey = RedisKeyUtils.buildReservationNumberKey(storeId);

Expand All @@ -44,18 +43,7 @@ public String addToWaitingQueue(Long storeId, String userId, Integer partySize,

if (Boolean.TRUE.equals(added)) {

// 2) 일일 시퀀스: 날짜별로 초기화하려면
String today = LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE); // YYYYMMDD
String dailySeqKey = seqKey + ":" + today; // ex. reservation:seq:5:20250728

// atomic increment
Long seq = redisTemplate.opsForValue().increment(dailySeqKey, 1);

// 3) 4자리 0패딩
String seqStr = String.format("%04d", seq);

// 4) 최종 ID 조합
reservationId = storeId + "-" + today + "-" + seqStr;
reservationId = GenerateReservationNumber(seqKey, storeId);

// 5) Hash에 저장
redisTemplate.opsForHash().put(numberMapKey, userId, reservationId);
Expand All @@ -69,6 +57,8 @@ public String addToWaitingQueue(Long storeId, String userId, Integer partySize,
redisTemplate.expire(queueKey, ttl);
redisTemplate.expire(partyKey, ttl);
redisTemplate.expire(statusKey, ttl);
redisTemplate.expire(seqKey, ttl);
redisTemplate.expire(numberMapKey, ttl);
} else {
Object stored = redisTemplate.opsForHash().get(numberMapKey, userId);
reservationId = stored != null ? stored.toString() : null;
Expand Down Expand Up @@ -193,6 +183,7 @@ public String getReservationId(Long storeId, String userId) {
return val != null ? val.toString() : null;
}

// 6) TTL 계산: 다음날 03:00 까지 남은 시간
public Duration calculateTTLUntilNext03AM() {
// 6-1) Asia/Seoul 기준으로 오늘 자정(내일 00:00) 구하기
ZoneId zone = ZoneId.of("Asia/Seoul");
Expand All @@ -204,6 +195,24 @@ public Duration calculateTTLUntilNext03AM() {

return Duration.ofSeconds(secondsUntilMidnight);
}

// 예약 번호 생성
public String GenerateReservationNumber(String seqKey, Long storeId) {
// 2) 일일 시퀀스: 날짜별로 초기화하려면
String today = LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE); // YYYYMMDD
String dailySeqKey = seqKey + ":" + today; // ex. reservation:seq:5:20250728

// atomic increment
Long seq = redisTemplate.opsForValue().increment(dailySeqKey, 1);

// 3) 4자리 0패딩
String seqStr = String.format("%04d", seq);

// 4) 최종 ID 조합
String reservationId = storeId + "-" + today + "-" + seqStr;

return reservationId;
}
}