From 6940ec7bfaf9555d101b55ba0b9e2c9b0b5f7977 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Sun, 21 Dec 2025 21:35:48 +0900 Subject: [PATCH 01/10] =?UTF-8?q?refactor:=20api=20=EA=B2=BD=EB=A1=9C?= =?UTF-8?q?=EB=AA=85=20=EC=9D=BC=EA=B4=80=ED=99=94=20=EC=9E=91=EC=97=85=20?= =?UTF-8?q?=EC=88=98=ED=96=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../applicationuser/bookmark/controller/BookmarkController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/bookmark/controller/BookmarkController.java b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/bookmark/controller/BookmarkController.java index 5c1e9268..25e6bbb4 100644 --- a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/bookmark/controller/BookmarkController.java +++ b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/bookmark/controller/BookmarkController.java @@ -22,7 +22,7 @@ @Tag(name = "Bookmark API", description = "북마크 API") @RestController -@RequestMapping("/bookmarks") +@RequestMapping("v1/users/me/bookmarks") @RequiredArgsConstructor public class BookmarkController { private final BookmarkService bookmarkService; From f357cdbfd6f6d37cd09f84db6aedaec758d1ea5f Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Sun, 21 Dec 2025 22:08:35 +0900 Subject: [PATCH 02/10] =?UTF-8?q?refactor:=20api=20=EA=B2=BD=EB=A1=9C?= =?UTF-8?q?=EB=AA=85=20=EC=9D=BC=EA=B4=80=ED=99=94=20=EC=9E=91=EC=97=85=20?= =?UTF-8?q?=EC=88=98=ED=96=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../menu/controller/MenuController.java | 6 +- .../controller/KakaoAppAuthController.java | 2 +- .../order/controller/OrderController.java | 6 +- .../controller/ReservationController.java | 15 +++-- .../store/controller/StoreController.java | 15 ++--- .../controller/StorePaymentController.java | 58 +++++++++---------- .../token/controller/TokenController.java | 2 +- .../user/controller/UserController.java | 11 ++-- 8 files changed, 55 insertions(+), 60 deletions(-) diff --git a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/menu/controller/MenuController.java b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/menu/controller/MenuController.java index 9c8b997a..bd446191 100644 --- a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/menu/controller/MenuController.java +++ b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/menu/controller/MenuController.java @@ -18,14 +18,14 @@ @Tag(name = "Menu API", description = "메뉴 API") @RestController -@RequestMapping("/v1/menus") +@RequestMapping("/v1/stores/{publicCode}/menus") @RequiredArgsConstructor @Slf4j public class MenuController { private final MenuService menuService; - @GetMapping("/all-menus/stores/{publicCode}") + @GetMapping @Operation(summary = "가게의 모든 메뉴 조회", description = "특정 가게의 모든 메뉴를 조회합니다.") @ApiResponse(responseCode = "200", description = "모든 메뉴를 조회 성공") public ResponseEntity getMenusByStoreId(@PathVariable String publicCode) { @@ -38,7 +38,7 @@ public ResponseEntity getMenusByStoreId(@PathVariable String publicCode) { ); } - @GetMapping("/{publicCode}/{menuId}") + @GetMapping("/{menuId}") @Operation( summary = "메뉴 ID로 메뉴 조회", description = "특정 가게의 특정 메뉴를 ID로 조회합니다.") @ApiResponse(responseCode = "200", description = "메뉴 조회 성공") diff --git a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/oauth/controller/KakaoAppAuthController.java b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/oauth/controller/KakaoAppAuthController.java index 0b744df0..18dac6ae 100644 --- a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/oauth/controller/KakaoAppAuthController.java +++ b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/oauth/controller/KakaoAppAuthController.java @@ -15,7 +15,7 @@ import lombok.RequiredArgsConstructor; @RestController -@RequestMapping("/v2/app/oauth/kakao") +@RequestMapping("/v1/auth/app/kakao") @RequiredArgsConstructor public class KakaoAppAuthController { diff --git a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/order/controller/OrderController.java b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/order/controller/OrderController.java index 76501d55..8a50297d 100644 --- a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/order/controller/OrderController.java +++ b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/order/controller/OrderController.java @@ -27,7 +27,7 @@ @Tag(name = "Order API", description = "주문 API") @RestController -@RequestMapping("/orders") +@RequestMapping("/v1/stores/{publicCode}/tables/{tableId}/orders") @RequiredArgsConstructor public class OrderController { private final OrderService orderService; @@ -50,7 +50,7 @@ public class OrderController { // ); // } - @PostMapping("/create/{publicCode}/{tableId}") + @PostMapping @Operation(summary = "주문 생성", description = "특정 주점 - 특정 테이블에 대한 주문 생성") @ApiResponse(responseCode = "201", description = "주문 생성") public ResponseEntity createOrder( @@ -69,7 +69,7 @@ public ResponseEntity createOrder( ); } - @GetMapping("/items/{publicCode}/{tableId}") + @GetMapping @Operation(summary = "테이블별 주문 아이템 조회", description = "비로그인(세션) 기준으로 테이블의 내 주문 목록만 조회") @ApiResponse(responseCode = "200", description = "주문 조회") public ResponseEntity getOrderItems( diff --git a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/reservation/controller/ReservationController.java b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/reservation/controller/ReservationController.java index 6c1dfe99..fa00e0e3 100644 --- a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/reservation/controller/ReservationController.java +++ b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/reservation/controller/ReservationController.java @@ -28,13 +28,15 @@ @Tag(name = "Reservation API", description = "예약 API") @RestController -@RequestMapping("/reservations") +@RequestMapping("/v1/users/me/waitings") @RequiredArgsConstructor public class ReservationController { private final ReservationService reservationService; - @PostMapping("/create/{storeId}") + // 성능 비교를 위해 남겨둔 레거시 웨이팅 등록 API + @PostMapping("/legacy/{storeId}") + @Operation(summary = "웨이팅 등록", description = "특정 주점에 대한 웨이팅 등록 레거시") public ResponseEntity create( @PathVariable Long storeId, @AuthenticationPrincipal CustomOAuth2User customOAuth2User, @@ -49,7 +51,7 @@ public ResponseEntity create( ); } - @PostMapping("/create/redis/{storeId}") + @PostMapping("/{storeId}") @Operation(summary = "대기열 등록", description = "특정 주점에 대한 대기열 등록") @ApiResponse(responseCode = "201", description = "대기열 등록") public ResponseEntity createQueue( @@ -67,7 +69,7 @@ public ResponseEntity createQueue( ); } - @GetMapping("/get/queue/redis/{storeId}") + @GetMapping("/{storeId}") @Operation(summary = "특정 주점의 본인 대기열 조회", description = "특정 주점에 대한 본인 대기열 조회") @ApiResponse(responseCode = "200", description = "본인 대기열 조회") public ResponseEntity getQueue( @@ -84,7 +86,8 @@ public ResponseEntity getQueue( ); } - @DeleteMapping("/delete/queue/redis/{storeId}") + // TODO : 대기열 취소 시 예약 번호 사용하도록 변경 (현재는 주점 아이디로 처리 중) + @DeleteMapping("{storeId}") @Operation(summary = "내 대기열 취소", description = "특정 주점에 대한 대기열 취소") @ApiResponse(responseCode = "200", description = "대기열 취소") public ResponseEntity deleteQueue( @@ -100,7 +103,7 @@ public ResponseEntity deleteQueue( ); } - @GetMapping("/my/waitings") + @GetMapping @Operation(summary = "내 모든 대기열 리스트 확인", description = "내가 신청한 모든 대기열 리스트 확인") @ApiResponse(responseCode = "200", description = "대기열 리스트 조회") public ResponseEntity getAllMyWaitings(@AuthenticationPrincipal CustomOAuth2User customOAuth2User) { 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 8eefa2d7..d951926a 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 @@ -22,7 +22,7 @@ @Tag(name = "Store API", description = "주점(Store) API") @RestController -@RequestMapping("v1/stores") +@RequestMapping("/v1/stores") @RequiredArgsConstructor @Slf4j public class StoreController { @@ -30,13 +30,10 @@ public class StoreController { private final StoreService storeService; - @GetMapping("/all-stores") - @Operation( - summary = "모든 주점 페이지네이션 조회", - description = "모든 주점을 페이지네이션으로 조회합니다." - ) + @GetMapping + @Operation(summary = "모든 주점 페이지네이션 조회", description = "모든 주점을 페이지네이션으로 조회합니다.") @ApiResponse(responseCode = "200", description = "모든 주점 페이지네이션 조회 성공") - public ResponseEntity getAllStoresByPageAndDeparments(Pageable pageable, @AuthenticationPrincipal CustomOAuth2User customOAuth2User) { + public ResponseEntity getAllStoresByPageAndDepartments(Pageable pageable, @AuthenticationPrincipal CustomOAuth2User customOAuth2User) { return ResponseEntity .ok() .body( @@ -59,7 +56,7 @@ public ResponseEntity getStoreById(@PathVariable String publicCode, @Authenti ); } - @GetMapping("/search") + @GetMapping @Operation(summary = "주점 이름으로 주점 검색", description = "주점 이름을 기준으로 주점을 검색합니다.") @ApiResponse(responseCode = "200", description = "주점 검색 성공") public ResponseEntity searchStores(@RequestParam("keyword") String keyword) { @@ -72,7 +69,7 @@ public ResponseEntity searchStores(@RequestParam("keyword") String keyword) { ); } - @GetMapping("/waiting-list") + @GetMapping("/waiting-count") @Operation(summary = "예약 많은순/적은순 주점 리스트 조회", description = "desc(대기 많은순) , asc(대기 적은순)") @ApiResponse(responseCode = "200", description = "주점 대기순 정렬") public ResponseEntity getStoreWaitingList( diff --git a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/storepayment/controller/StorePaymentController.java b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/storepayment/controller/StorePaymentController.java index c8cd09c4..25cbd3ea 100644 --- a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/storepayment/controller/StorePaymentController.java +++ b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/storepayment/controller/StorePaymentController.java @@ -19,37 +19,31 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -@Tag(name = "Store Payment API", description = "주점 결제 정보 API") -@RestController -@RequestMapping("v1/store-payments") -@RequiredArgsConstructor -@Slf4j -public class StorePaymentController { - - private final StorePaymentService storePaymentService; - - @GetMapping(("/{publicCode}")) - @Operation(summary = "주점 결제 정보 조회", description = "주점 ID로 주점 결제 정보를 조회합니다.") - @ApiResponse(responseCode = "200", description = "주점 결제 정보 조회 성공") - public ResponseEntity getStorePaymentByStoreId(@PathVariable String publicCode) { - Optional response = storePaymentService.getStorePaymentByStoreId(publicCode); - - if (response.isPresent()) { - return ResponseEntity - .status(HttpStatus.OK) - .body( - ApiUtils.success( - response - ) - ); - } else { - return ResponseEntity - .status(HttpStatus.OK) - .body( - ApiUtils.success( - "해당 주점의 등록된 결제 정보가 존재하지 않습니다." - ) - ); + @Tag(name = "Store Payment API", description = "주점 결제 정보 API") + @RestController + @RequestMapping("/v1/store//{publicCode}/payments") + @RequiredArgsConstructor + @Slf4j + public class StorePaymentController { + + private final StorePaymentService storePaymentService; + + @GetMapping + @Operation(summary = "주점 결제 정보 조회", description = "주점 ID로 주점 결제 정보를 조회합니다.") + @ApiResponse(responseCode = "200", description = "주점 결제 정보 조회 성공") + @ApiResponse(responseCode = "204", description = "결제 정보 없음") + public ResponseEntity getStorePaymentByStoreId(@PathVariable String publicCode) { + + return storePaymentService.getStorePaymentByStoreId(publicCode) + .map(response -> ResponseEntity + .status(HttpStatus.OK) + .body( + ApiUtils.success( + response + ) + )) + .orElseGet(() -> ResponseEntity + .status(HttpStatus.NO_CONTENT).build() + ); } } -} diff --git a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/token/controller/TokenController.java b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/token/controller/TokenController.java index 25a79ba9..211c9330 100644 --- a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/token/controller/TokenController.java +++ b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/token/controller/TokenController.java @@ -22,7 +22,7 @@ @RestController @RequiredArgsConstructor -@RequestMapping("/api/refresh-token") +@RequestMapping("/v1/auth/token/refresh") @Slf4j public class TokenController { private final JwtUtil jwtUtil; diff --git a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/user/controller/UserController.java b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/user/controller/UserController.java index 91ab09ca..79f0906b 100644 --- a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/user/controller/UserController.java +++ b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/user/controller/UserController.java @@ -16,18 +16,19 @@ import lombok.RequiredArgsConstructor; @RestController -@RequestMapping("/users") +@RequestMapping("/v1/users/me") @RequiredArgsConstructor public class UserController { private final UserService userService; - @PutMapping("/optional-info") + // TODO : Pathch로 변경 고려 및 토큰 전달 방식 변경 고려 (SecurityContext) + @PutMapping("/optional") public ResponseEntity putOptional( - @Valid @RequestBody UserUpdateRequest req) { + @Valid @RequestBody UserUpdateRequest request) { - AuthenticationResponse authenticationResponse = userService.putOptional(req.phoneNumber(), - Boolean.TRUE.equals(req.consent()), req.accessToken()); + AuthenticationResponse authenticationResponse = userService.putOptional(request.phoneNumber(), + Boolean.TRUE.equals(request.consent()), request.accessToken()); return ResponseEntity .status(HttpStatus.OK) From d5584736f98d75e80c69f1cd40bc0151d53f97fe Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Sun, 21 Dec 2025 22:10:28 +0900 Subject: [PATCH 03/10] =?UTF-8?q?refactor:=20api=20=EA=B2=BD=EB=A1=9C?= =?UTF-8?q?=EB=AA=85=20=EC=9D=BC=EA=B4=80=ED=99=94=20=EC=9E=91=EC=97=85=20?= =?UTF-8?q?=EC=88=98=ED=96=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../storepayment/controller/StorePaymentController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/storepayment/controller/StorePaymentController.java b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/storepayment/controller/StorePaymentController.java index 25cbd3ea..e308f653 100644 --- a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/storepayment/controller/StorePaymentController.java +++ b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/storepayment/controller/StorePaymentController.java @@ -21,7 +21,7 @@ @Tag(name = "Store Payment API", description = "주점 결제 정보 API") @RestController - @RequestMapping("/v1/store//{publicCode}/payments") + @RequestMapping("/v1/store/{publicCode}/payments") @RequiredArgsConstructor @Slf4j public class StorePaymentController { From 9bf5a45d0e1241cb9d05a2fca5a0611c5d47a777 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Sun, 21 Dec 2025 22:26:20 +0900 Subject: [PATCH 04/10] =?UTF-8?q?refactor:=20api=20=EA=B2=BD=EB=A1=9C?= =?UTF-8?q?=EB=AA=85=20=EC=9D=BC=EA=B4=80=ED=99=94=20=EC=9E=91=EC=97=85=20?= =?UTF-8?q?=EC=88=98=ED=96=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../applicationuser/store/controller/StoreController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d951926a..2d085022 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 @@ -56,7 +56,7 @@ public ResponseEntity getStoreById(@PathVariable String publicCode, @Authenti ); } - @GetMapping + @GetMapping("/search") @Operation(summary = "주점 이름으로 주점 검색", description = "주점 이름을 기준으로 주점을 검색합니다.") @ApiResponse(responseCode = "200", description = "주점 검색 성공") public ResponseEntity searchStores(@RequestParam("keyword") String keyword) { From 2fa79cc513341fbddfc52881682c6512e5f3a21f Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Sun, 21 Dec 2025 22:33:18 +0900 Subject: [PATCH 05/10] =?UTF-8?q?refactor:=20=EA=B2=BD=EB=A1=9C=EC=97=90?= =?UTF-8?q?=20=EC=84=A0=ED=96=89=20=EC=8A=AC=EB=9E=98=EC=8B=9C=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../applicationuser/bookmark/controller/BookmarkController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/bookmark/controller/BookmarkController.java b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/bookmark/controller/BookmarkController.java index 25e6bbb4..01fc1774 100644 --- a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/bookmark/controller/BookmarkController.java +++ b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/bookmark/controller/BookmarkController.java @@ -22,7 +22,7 @@ @Tag(name = "Bookmark API", description = "북마크 API") @RestController -@RequestMapping("v1/users/me/bookmarks") +@RequestMapping("/v1/users/me/bookmarks") @RequiredArgsConstructor public class BookmarkController { private final BookmarkService bookmarkService; From 64d135b6deb029e8f856864f4d5458d51cf4bfed Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Sun, 21 Dec 2025 22:34:49 +0900 Subject: [PATCH 06/10] =?UTF-8?q?refactor:=20=EA=B2=BD=EB=A1=9C=EC=97=90?= =?UTF-8?q?=20=EC=84=A0=ED=96=89=20=EC=8A=AC=EB=9E=98=EC=8B=9C=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reservation/controller/ReservationController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/reservation/controller/ReservationController.java b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/reservation/controller/ReservationController.java index fa00e0e3..845784c8 100644 --- a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/reservation/controller/ReservationController.java +++ b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/reservation/controller/ReservationController.java @@ -87,7 +87,7 @@ public ResponseEntity getQueue( } // TODO : 대기열 취소 시 예약 번호 사용하도록 변경 (현재는 주점 아이디로 처리 중) - @DeleteMapping("{storeId}") + @DeleteMapping("/{storeId}") @Operation(summary = "내 대기열 취소", description = "특정 주점에 대한 대기열 취소") @ApiResponse(responseCode = "200", description = "대기열 취소") public ResponseEntity deleteQueue( From cd73750482609704e93c5e6f75c8547040b05cbd Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Sun, 21 Dec 2025 22:35:17 +0900 Subject: [PATCH 07/10] =?UTF-8?q?refactor:=20=EB=93=A4=EC=97=AC=EC=93=B0?= =?UTF-8?q?=EA=B8=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/StorePaymentController.java | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/storepayment/controller/StorePaymentController.java b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/storepayment/controller/StorePaymentController.java index e308f653..30686cfc 100644 --- a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/storepayment/controller/StorePaymentController.java +++ b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/storepayment/controller/StorePaymentController.java @@ -19,31 +19,31 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; - @Tag(name = "Store Payment API", description = "주점 결제 정보 API") - @RestController - @RequestMapping("/v1/store/{publicCode}/payments") - @RequiredArgsConstructor - @Slf4j - public class StorePaymentController { - - private final StorePaymentService storePaymentService; - - @GetMapping - @Operation(summary = "주점 결제 정보 조회", description = "주점 ID로 주점 결제 정보를 조회합니다.") - @ApiResponse(responseCode = "200", description = "주점 결제 정보 조회 성공") - @ApiResponse(responseCode = "204", description = "결제 정보 없음") - public ResponseEntity getStorePaymentByStoreId(@PathVariable String publicCode) { - - return storePaymentService.getStorePaymentByStoreId(publicCode) - .map(response -> ResponseEntity - .status(HttpStatus.OK) - .body( - ApiUtils.success( - response - ) - )) - .orElseGet(() -> ResponseEntity - .status(HttpStatus.NO_CONTENT).build() - ); - } +@Tag(name = "Store Payment API", description = "주점 결제 정보 API") +@RestController +@RequestMapping("/v1/store/{publicCode}/payments") +@RequiredArgsConstructor +@Slf4j +public class StorePaymentController { + + private final StorePaymentService storePaymentService; + + @GetMapping + @Operation(summary = "주점 결제 정보 조회", description = "주점 ID로 주점 결제 정보를 조회합니다.") + @ApiResponse(responseCode = "200", description = "주점 결제 정보 조회 성공") + @ApiResponse(responseCode = "204", description = "결제 정보 없음") + public ResponseEntity getStorePaymentByStoreId(@PathVariable String publicCode) { + + return storePaymentService.getStorePaymentByStoreId(publicCode) + .map(response -> ResponseEntity + .status(HttpStatus.OK) + .body( + ApiUtils.success( + response + ) + )) + .orElseGet(() -> ResponseEntity + .status(HttpStatus.NO_CONTENT).build() + ); } +} From 57e2e5ac1b36a0014ce19ac2682f05b2529c1306 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Sun, 21 Dec 2025 22:36:00 +0900 Subject: [PATCH 08/10] =?UTF-8?q?refactor:=20=EA=B2=BD=EB=A1=9C=EB=AA=85?= =?UTF-8?q?=20=EC=9D=BC=EA=B4=80=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../storepayment/controller/StorePaymentController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/storepayment/controller/StorePaymentController.java b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/storepayment/controller/StorePaymentController.java index 30686cfc..cd1d8da0 100644 --- a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/storepayment/controller/StorePaymentController.java +++ b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/storepayment/controller/StorePaymentController.java @@ -21,7 +21,7 @@ @Tag(name = "Store Payment API", description = "주점 결제 정보 API") @RestController -@RequestMapping("/v1/store/{publicCode}/payments") +@RequestMapping("/v1/stores/{publicCode}/payments") @RequiredArgsConstructor @Slf4j public class StorePaymentController { From 80783644b9d1d4e024996af1d85218e514b636b6 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Sun, 21 Dec 2025 22:39:40 +0900 Subject: [PATCH 09/10] =?UTF-8?q?refactor:=20SecurityConfig=20=EA=B2=BD?= =?UTF-8?q?=EB=A1=9C=EB=AA=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../applicationuser/config/security/SecurityConfig.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/config/security/SecurityConfig.java b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/config/security/SecurityConfig.java index 20e844e9..802f72e7 100644 --- a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/config/security/SecurityConfig.java +++ b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/config/security/SecurityConfig.java @@ -57,10 +57,10 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { .requestMatchers( "/oauth2/authorization/kakao", // 카카오 로그인 요청 "/login/oauth2/code/**", // 카카오 인증 콜백 - "/api/refresh-token", // refresh token (토큰 갱신) - "/v2/app/oauth/kakao/login", // 카카오 앱 로그인 - "/v1/menus/**", // 모든 메뉴 조회 - "/v1/store-payments/**", // 결제 관련 API + "/v1/auth/token/refresh", // refresh token (토큰 갱신) + "/v1/auth/app/kakao/login", // 카카오 앱 로그인 + "/v1/stores/*/menus/**", // 모든 메뉴 조회 + "/v1/stores/*/payments/**", // 결제 관련 API "/orders/**", "/swagger-ui/**", "/v3/api-docs/**", From 54ced6de68bb36c303c4f5e155a3b270035f98c7 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Sun, 21 Dec 2025 22:41:35 +0900 Subject: [PATCH 10/10] =?UTF-8?q?refactor:=20=EC=82=AC=EC=9A=A9=ED=95=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EC=BD=94=EB=93=9C=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/controller/OrderController.java | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/order/controller/OrderController.java b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/order/controller/OrderController.java index 8a50297d..df3d2114 100644 --- a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/order/controller/OrderController.java +++ b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/order/controller/OrderController.java @@ -32,24 +32,6 @@ public class OrderController { private final OrderService orderService; - // @PostMapping("/create/{storeId}/{tableId}") - // @Operation(summary = "주문 생성", description = "특정 주점 - 특정 테이블에 대한 주문 생성") - // @ApiResponse(responseCode = "201", description = "주문 생성") - // public ResponseEntity createOrder( - // @PathVariable Long storeId, - // @PathVariable Long tableId, - // @RequestBody @Valid OrderCreateRequestDto orderCreateRequestDto, - // HttpSession session - // ) { - // String sessionId = session.getId(); - // OrderCreateResponseDto response = orderService.createOrder(storeId, tableId, orderCreateRequestDto, sessionId); - // return ResponseEntity - // .status(HttpStatus.CREATED) - // .body( - // ApiUtils.success(response) - // ); - // } - @PostMapping @Operation(summary = "주문 생성", description = "특정 주점 - 특정 테이블에 대한 주문 생성") @ApiResponse(responseCode = "201", description = "주문 생성")