From 1baf365d54738f717e6fd28d0674eac6e5a4189c Mon Sep 17 00:00:00 2001 From: jeonghyemin Date: Wed, 12 Nov 2025 16:18:45 +0900 Subject: [PATCH] =?UTF-8?q?refactor(admin):=20=EC=A3=BC=EC=84=9D=20?= =?UTF-8?q?=EB=B0=8F=20=EB=A1=9C=EA=B7=B8=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit getUser 주석 및 로그 삭제 --- nowait-app-admin-api/build.gradle | 2 +- .../applicationadmin/menu/service/MenuService.java | 4 ---- .../applicationadmin/order/service/OrderService.java | 12 ------------ .../reservation/service/ReservationService.java | 7 ------- .../store/service/StoreServiceImpl.java | 7 ------- .../service/StorePaymentServiceImpl.java | 4 ---- 6 files changed, 1 insertion(+), 35 deletions(-) diff --git a/nowait-app-admin-api/build.gradle b/nowait-app-admin-api/build.gradle index 970728d..2dee33e 100644 --- a/nowait-app-admin-api/build.gradle +++ b/nowait-app-admin-api/build.gradle @@ -34,7 +34,7 @@ dependencies { implementation project(':nowait-domain:domain-admin-rdb') implementation project(':nowait-domain:domain-core-rdb') implementation project(':nowait-domain:domain-redis') - implementation project(":nowait-event") + implementation project(':nowait-event') // Spring Boot Starter implementation 'org.springframework.boot:spring-boot-starter-web' diff --git a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/menu/service/MenuService.java b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/menu/service/MenuService.java index a877a5f..c362912 100644 --- a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/menu/service/MenuService.java +++ b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/menu/service/MenuService.java @@ -210,10 +210,6 @@ private void validateDeleteAuthorization(User user, Long storeId) { } } - // private User getUser(MemberDetails memberDetails) { - // return userRepository.findById(memberDetails.getId()).orElseThrow(UserNotFoundException::new); - // } - private Menu getMenu(Long menuId) { return menuRepository.findByIdAndDeletedFalse(menuId) .orElseThrow(MenuNotFoundException::new); diff --git a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/order/service/OrderService.java b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/order/service/OrderService.java index 5ba8872..d4b500f 100644 --- a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/order/service/OrderService.java +++ b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/order/service/OrderService.java @@ -48,11 +48,8 @@ public class OrderService { @Transactional(readOnly = true) public List findAllOrders(Long storeId, MemberDetails memberDetails) { - log.info("getUser 호출 전"); User user = memberDetails.getUser(); - log.info("getUser 호출 완료"); storeRepository.findByStoreIdAndDeletedFalse(storeId).orElseThrow(StoreNotFoundException::new); - log.info("Store 조회 완료"); validateViewAuthorization(user, storeId); @@ -63,7 +60,6 @@ public List findAllOrders(Long storeId, MemberDetails memberDe .stream() .map(OrderResponseDto::fromEntity) .collect(Collectors.toList()); - log.info("Order 조회 완료"); return order; } @@ -152,12 +148,4 @@ private void validateUpdateAuthorization(User user, Long storeId) { throw new OrderUpdateUnauthorizedException(); } } - - // private User getUser(MemberDetails memberDetails) { - // if (memberDetails == null) { - // throw new OrderViewUnauthorizedException(); - // } - // // findById로 Select 쿼리 나가는 것을 getReferenceById로 변경하여 방지 - // return userRepository.getReferenceById(memberDetails.getId()); - // } } diff --git a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/reservation/service/ReservationService.java b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/reservation/service/ReservationService.java index 42a54d5..a9a3e59 100644 --- a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/reservation/service/ReservationService.java +++ b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/reservation/service/ReservationService.java @@ -541,12 +541,5 @@ private void validateUpdateAuthorization(User user, Long storeId) { throw new ReservationUpdateUnauthorizedException(); } } - - // private User getUser(MemberDetails memberDetails) { - // if (memberDetails == null) { - // throw new ReservationViewUnauthorizedException(); - // } - // return userRepository.findById(memberDetails.getId()).orElseThrow(UserNotFoundException::new); - // } } diff --git a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/store/service/StoreServiceImpl.java b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/store/service/StoreServiceImpl.java index 55354ed..acdf94d 100644 --- a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/store/service/StoreServiceImpl.java +++ b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/store/service/StoreServiceImpl.java @@ -149,11 +149,4 @@ private void validateUpdateAuthorization(User user, Long storeId) { throw new StoreUpdateUnauthorizedException(); } } - - // private User getUser(MemberDetails memberDetails) { - // if (memberDetails == null) { - // throw new StoreViewUnauthorizedException(); - // } - // return userRepository.findById(memberDetails.getId()).orElseThrow(UserNotFoundException::new); - // } } diff --git a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/service/StorePaymentServiceImpl.java b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/service/StorePaymentServiceImpl.java index 91e8037..8e723f1 100644 --- a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/service/StorePaymentServiceImpl.java +++ b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/service/StorePaymentServiceImpl.java @@ -86,10 +86,6 @@ public StorePaymentReadDto updateStorePayment(StorePaymentUpdateRequest request, return StorePaymentReadDto.fromEntity(storePayment); } - // private User getUser(MemberDetails memberDetails) { - // return userRepository.findById(memberDetails.getId()).orElseThrow(UserNotFoundException::new); - // } - private void validateViewAuthorization(User user, Long storeId) { if (!(Role.SUPER_ADMIN.equals(user.getRole()) || user.getStoreId().equals(storeId))) { throw new StorePaymentViewUnauthorizedException();