Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import org.springframework.http.ResponseEntity;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
Expand All @@ -11,6 +12,7 @@

import com.nowait.applicationuser.waiting.dto.CancelWaitingRequest;
import com.nowait.applicationuser.waiting.dto.CancelWaitingResponse;
import com.nowait.applicationuser.waiting.dto.GetWaitingSizeResponse;
import com.nowait.applicationuser.waiting.dto.RegisterWaitingRequest;
import com.nowait.applicationuser.waiting.dto.RegisterWaitingResponse;
import com.nowait.applicationuser.waiting.service.WaitingService;
Expand Down Expand Up @@ -77,4 +79,24 @@ public ResponseEntity<?> cancelWaiting(
)
);
}

@GetMapping("/{publicCode}/waiting-count")
@Operation(summary = "대기열 리팩토링용 API", description = "대기 인원수 조회")
public ResponseEntity<?> getWaitingCount(
@AuthenticationPrincipal CustomOAuth2User customOAuth2User,
@PathVariable String publicCode
) {
GetWaitingSizeResponse response = waitingService.getWaitingCount(
customOAuth2User,
publicCode
);

return ResponseEntity
.ok()
.body(
ApiUtils.success(
response
)
);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.nowait.applicationuser.waiting.dto;

import lombok.Builder;
import lombok.Getter;

@Getter
@Builder
public class GetWaitingSizeResponse {
private Long storeId;
private Long waitingCount;
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

import com.nowait.applicationuser.waiting.dto.CancelWaitingRequest;
import com.nowait.applicationuser.waiting.dto.CancelWaitingResponse;
import com.nowait.applicationuser.waiting.dto.GetWaitingSizeResponse;
import com.nowait.applicationuser.waiting.dto.RegisterWaitingRequest;
import com.nowait.applicationuser.waiting.dto.RegisterWaitingResponse;
import com.nowait.applicationuser.waiting.dto.WaitingIdempotencyValue;
Expand Down Expand Up @@ -147,6 +148,24 @@ public CancelWaitingResponse cancelWaiting(CustomOAuth2User oAuth2User, String p
.build();
}

public GetWaitingSizeResponse getWaitingCount(CustomOAuth2User oAuth2User, String publicCode) {

Store store = storeRepository.findByPublicCodeAndDeletedFalse(publicCode)
.orElseThrow(StoreNotFoundException::new);

User user = userRepository.findById(oAuth2User.getUserId())
.orElseThrow(UserNotFoundException::new);

Long storeId = store.getStoreId();

Long waitingCount = waitingRedisRepository.getWaitingCount(storeId);

return GetWaitingSizeResponse.builder()
.storeId(storeId)
.waitingCount(waitingCount)
.build();
}

private String generateWaitingNumber(Long storeId, LocalDateTime timestamp) {
// 1) 키 접두사 - 날짜
String today = timestamp.format(DateTimeFormatter.BASIC_ISO_DATE); // YYYYMMDD
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,13 @@ public Long getWaitingRank(Long storeId, Long userId) {
return redisTemplate.opsForZSet().rank(queueKey, String.valueOf(userId));
}

public Long getWaitingCount(Long storeId) {
String queueKey = RedisKeyUtils.buildWaitingKeyPrefix() + storeId;
Long size = redisTemplate.opsForZSet().zCard(queueKey);

return size != null ? size : 0L;
}

// 웨이팅 여부 조회
// TODO: 구현 필요
public Boolean isWaiting(Long storeId, Long userId) {
Expand Down