From 2325841150067d0d81a7ddabeaab7d6ff2713aac Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Fri, 29 Aug 2025 18:36:39 +0900 Subject: [PATCH 1/6] =?UTF-8?q?refactor:=20path=20publicCode=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../applicationuser/store/controller/StoreController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/controller/StoreController.java b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/controller/StoreController.java index e134bf28..ed034c78 100644 --- a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/controller/StoreController.java +++ b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/controller/StoreController.java @@ -46,15 +46,15 @@ public ResponseEntity getAllStoresByPageAndDeparments(Pageable pageable, @Aut ); } - @GetMapping("/{storeId}") + @GetMapping("/{publicCode}") @Operation(summary = "주점 ID로 주점 상세 조회", description = "특정 주점을 ID로 조회합니다.") @ApiResponse(responseCode = "200", description = "주점 상세 조회 성공") - public ResponseEntity getStoreById(@PathVariable Long storeId, @AuthenticationPrincipal CustomOAuth2User customOAuth2User) { + public ResponseEntity getStoreById(@PathVariable String publicCode, @AuthenticationPrincipal CustomOAuth2User customOAuth2User) { return ResponseEntity .status(HttpStatus.OK) .body( ApiUtils.success( - storeService.getStoreByStoreId(storeId, customOAuth2User) + storeService.getStoreByStoreId(publicCode, customOAuth2User) ) ); } From 0cf1418e1d0a939a98fd3e75d654a803eb678427 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Fri, 29 Aug 2025 18:36:54 +0900 Subject: [PATCH 2/6] =?UTF-8?q?refactor:=20publicCode=20=ED=95=84=EB=93=9C?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../applicationuser/store/dto/StorePageReadResponse.java | 2 ++ .../applicationuser/store/service/StoreService.java | 2 +- .../applicationuser/store/service/StoreServiceImpl.java | 8 +++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/dto/StorePageReadResponse.java b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/dto/StorePageReadResponse.java index cabee501..4bc28d85 100644 --- a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/dto/StorePageReadResponse.java +++ b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/dto/StorePageReadResponse.java @@ -15,6 +15,7 @@ @Builder public class StorePageReadResponse { private Long storeId; + private String publicCode; private Long bookmarkId; private Boolean isBookmark; private Long waitingCount; @@ -45,6 +46,7 @@ public static StorePageReadResponse fromEntity(Store store, Long bookmarkId, Lis return StorePageReadResponse.builder() .storeId(store.getStoreId()) + .publicCode(store.getPublicCode()) .bookmarkId(bookmarkId) .isBookmark(isBookmark) .waitingCount(waitingCount) diff --git a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/service/StoreService.java b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/service/StoreService.java index 6c0bb7e4..eab832b6 100644 --- a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/service/StoreService.java +++ b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/service/StoreService.java @@ -18,7 +18,7 @@ public interface StoreService { StoreDepartmentReadResponse getAllStoresByPageAndDeparments(Pageable pageable, CustomOAuth2User customOAuth2User); - StoreDetailReadResponse getStoreByStoreId(Long storeId, CustomOAuth2User customOAuth2User); + StoreDetailReadResponse getStoreByStoreId(String publicCode, CustomOAuth2User customOAuth2User); List searchByKeywordNative(String name); diff --git a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/service/StoreServiceImpl.java b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/service/StoreServiceImpl.java index c49b4718..4107506d 100644 --- a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/service/StoreServiceImpl.java +++ b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/service/StoreServiceImpl.java @@ -141,15 +141,17 @@ public StoreDepartmentReadResponse getAllStoresByPageAndDeparments(Pageable page @Override @Transactional(readOnly = true) - public StoreDetailReadResponse getStoreByStoreId(Long storeId, CustomOAuth2User customOAuth2User) { + public StoreDetailReadResponse getStoreByStoreId(String publicCode, CustomOAuth2User customOAuth2User) { - if (storeId == null) + if (publicCode == null) throw new StoreParamEmptyException(); User user = customOAuth2User.getUser(); - Store store = storeRepository.findByStoreIdAndDeletedFalse(storeId) + Store store = storeRepository.findByPublicCodeAndDeletedFalse(publicCode) .orElseThrow(StoreNotFoundException::new); + Long storeId = store.getStoreId();; + String departmentName = departmentRepository.findById(store.getDepartmentId()) .map(Department::getName) .orElse("Unknown Department"); From 488215a1d4da92da109cf724032b39845992838e Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Fri, 29 Aug 2025 18:44:20 +0900 Subject: [PATCH 3/6] =?UTF-8?q?refactor:=20=EB=A9=94=EC=84=9C=EB=93=9C?= =?UTF-8?q?=EB=AA=85=EA=B3=BC=20=EC=97=AD=ED=95=A0=20=EC=9D=BC=EC=B9=98?= =?UTF-8?q?=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../applicationuser/store/controller/StoreController.java | 2 +- .../com/nowait/applicationuser/store/service/StoreService.java | 2 +- .../nowait/applicationuser/store/service/StoreServiceImpl.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/controller/StoreController.java b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/controller/StoreController.java index ed034c78..8eefa2d7 100644 --- a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/controller/StoreController.java +++ b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/controller/StoreController.java @@ -54,7 +54,7 @@ public ResponseEntity getStoreById(@PathVariable String publicCode, @Authenti .status(HttpStatus.OK) .body( ApiUtils.success( - storeService.getStoreByStoreId(publicCode, customOAuth2User) + storeService.getStoreByPublicCode(publicCode, customOAuth2User) ) ); } diff --git a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/service/StoreService.java b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/service/StoreService.java index eab832b6..7f7d8bd6 100644 --- a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/service/StoreService.java +++ b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/service/StoreService.java @@ -18,7 +18,7 @@ public interface StoreService { StoreDepartmentReadResponse getAllStoresByPageAndDeparments(Pageable pageable, CustomOAuth2User customOAuth2User); - StoreDetailReadResponse getStoreByStoreId(String publicCode, CustomOAuth2User customOAuth2User); + StoreDetailReadResponse getStoreByPublicCode(String publicCode, CustomOAuth2User customOAuth2User); List searchByKeywordNative(String name); diff --git a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/service/StoreServiceImpl.java b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/service/StoreServiceImpl.java index 4107506d..2caf842a 100644 --- a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/service/StoreServiceImpl.java +++ b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/service/StoreServiceImpl.java @@ -141,7 +141,7 @@ public StoreDepartmentReadResponse getAllStoresByPageAndDeparments(Pageable page @Override @Transactional(readOnly = true) - public StoreDetailReadResponse getStoreByStoreId(String publicCode, CustomOAuth2User customOAuth2User) { + public StoreDetailReadResponse getStoreByPublicCode(String publicCode, CustomOAuth2User customOAuth2User) { if (publicCode == null) throw new StoreParamEmptyException(); From 58ffc50b7e0fd873e8e87a9c85b43fad05e54fc8 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Fri, 29 Aug 2025 18:45:22 +0900 Subject: [PATCH 4/6] =?UTF-8?q?refactor:=20=EC=9E=85=EB=A0=A5=EA=B0=92=20?= =?UTF-8?q?=EA=B2=80=EC=A6=9D=20=EA=B0=95=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nowait/applicationuser/store/service/StoreServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/service/StoreServiceImpl.java b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/service/StoreServiceImpl.java index 2caf842a..35173642 100644 --- a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/service/StoreServiceImpl.java +++ b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/service/StoreServiceImpl.java @@ -23,6 +23,7 @@ import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.StringUtils; import com.nowait.applicationuser.reservation.repository.WaitingUserRedisRepository; import com.nowait.applicationuser.store.dto.StoreDepartmentReadResponse; @@ -143,7 +144,7 @@ public StoreDepartmentReadResponse getAllStoresByPageAndDeparments(Pageable page @Transactional(readOnly = true) public StoreDetailReadResponse getStoreByPublicCode(String publicCode, CustomOAuth2User customOAuth2User) { - if (publicCode == null) + if (!StringUtils.hasText(publicCode)) throw new StoreParamEmptyException(); User user = customOAuth2User.getUser(); From 38ab5ce87f10d389e65b26c637b1608ae204f370 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Fri, 29 Aug 2025 18:52:08 +0900 Subject: [PATCH 5/6] =?UTF-8?q?refactor:=20publicCode=20=ED=95=84=EB=93=9C?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nowait/applicationuser/store/dto/StoreSearchResponse.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/dto/StoreSearchResponse.java b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/dto/StoreSearchResponse.java index 8883ebf3..1a11a085 100644 --- a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/dto/StoreSearchResponse.java +++ b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/dto/StoreSearchResponse.java @@ -15,6 +15,7 @@ @Builder public class StoreSearchResponse { private Long storeId; + private String publicCode; private Long waitingCount; private Long departmentId; private String departmentName; @@ -34,6 +35,7 @@ public static StoreSearchResponse fromEntity(Store store, List Date: Fri, 29 Aug 2025 18:52:22 +0900 Subject: [PATCH 6/6] =?UTF-8?q?refactor:=20=EC=98=88=EC=99=B8=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=20=EB=B3=B4=EA=B0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reservation/service/ReservationService.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/reservation/service/ReservationService.java b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/reservation/service/ReservationService.java index 82e66e3c..d4ec8ab0 100644 --- a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/reservation/service/ReservationService.java +++ b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/reservation/service/ReservationService.java @@ -30,6 +30,7 @@ import com.nowait.domaincorerdb.reservation.entity.Reservation; import com.nowait.domaincorerdb.reservation.exception.DuplicateReservationException; import com.nowait.domaincorerdb.reservation.exception.ReservationAddUnauthorizedException; +import com.nowait.domaincorerdb.reservation.exception.ReservationNotFoundException; import com.nowait.domaincorerdb.reservation.exception.ReservationNumberIssueFailException; import com.nowait.domaincorerdb.reservation.exception.UserWaitingLimitExceededException; import com.nowait.domaincorerdb.reservation.repository.ReservationRepository; @@ -177,9 +178,15 @@ public WaitingResponseDto myWaitingInfo(Long storeId, CustomOAuth2User customOAu if (storeId == null || userId.trim().isEmpty()) { throw new IllegalArgumentException("Invalid storeId or userId"); } + Long rank = waitingUserRedisRepository.getRank(storeId, userId); Integer partySize = waitingUserRedisRepository.getPartySize(storeId, userId); String reservationId = waitingUserRedisRepository.getReservationId(storeId, userId); + + if (reservationId == null) { + throw new ReservationNotFoundException(); + } + return WaitingResponseDto.builder() .reservationNumber(reservationId) .rank(rank == null ? -1 : rank.intValue() + 1)