From 1d6e7be1e5f8e58a8feec0fc691b5bb11ae790d0 Mon Sep 17 00:00:00 2001 From: KyuCheol Hwang Date: Sat, 20 Jan 2024 11:25:34 +0900 Subject: [PATCH 1/3] =?UTF-8?q?refactor:=20AuthenticationPrincipal=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit AuthenticationPrincipal 적용 --- .../order/controller/OrderController.java | 10 +++++-- .../payment/controller/PaymentController.java | 29 +++++++++++++------ .../payment/controller/TradeController.java | 29 +++++++++++++------ 3 files changed, 47 insertions(+), 21 deletions(-) diff --git a/src/main/java/kr/co/fastcampus/yanabada/domain/order/controller/OrderController.java b/src/main/java/kr/co/fastcampus/yanabada/domain/order/controller/OrderController.java index b4ef094a..e50a556a 100644 --- a/src/main/java/kr/co/fastcampus/yanabada/domain/order/controller/OrderController.java +++ b/src/main/java/kr/co/fastcampus/yanabada/domain/order/controller/OrderController.java @@ -2,12 +2,14 @@ import java.util.List; import kr.co.fastcampus.yanabada.common.response.ResponseBody; +import kr.co.fastcampus.yanabada.common.security.PrincipalDetails; import kr.co.fastcampus.yanabada.domain.order.dto.request.OrderSaveRequest; import kr.co.fastcampus.yanabada.domain.order.dto.response.OrderInfoResponse; import kr.co.fastcampus.yanabada.domain.order.dto.response.OrderSummaryResponse; import kr.co.fastcampus.yanabada.domain.order.service.OrderService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -19,7 +21,7 @@ @Slf4j @RestController @RequiredArgsConstructor -@RequestMapping("orders") +@RequestMapping("/orders") public class OrderController { private final OrderService orderService; @@ -31,9 +33,11 @@ public ResponseBody addOrder(@RequestBody OrderSaveRequest request) { } @GetMapping("/can-sell") - public ResponseBody> getSellableOrders() { + public ResponseBody> getSellableOrders( + @AuthenticationPrincipal PrincipalDetails principalDetails + ) { return ResponseBody.ok( - orderService.getSellableOrders(1L) + orderService.getSellableOrders(principalDetails.id()) ); } diff --git a/src/main/java/kr/co/fastcampus/yanabada/domain/payment/controller/PaymentController.java b/src/main/java/kr/co/fastcampus/yanabada/domain/payment/controller/PaymentController.java index dff2ea1b..0b99f4c5 100644 --- a/src/main/java/kr/co/fastcampus/yanabada/domain/payment/controller/PaymentController.java +++ b/src/main/java/kr/co/fastcampus/yanabada/domain/payment/controller/PaymentController.java @@ -2,6 +2,7 @@ import jakarta.validation.Valid; import kr.co.fastcampus.yanabada.common.response.ResponseBody; +import kr.co.fastcampus.yanabada.common.security.PrincipalDetails; import kr.co.fastcampus.yanabada.domain.payment.dto.request.YanoljaPayAmountRequest; import kr.co.fastcampus.yanabada.domain.payment.dto.request.YanoljaPayHistorySearchRequest; import kr.co.fastcampus.yanabada.domain.payment.dto.request.YanoljaPaySaveRequest; @@ -13,6 +14,7 @@ import kr.co.fastcampus.yanabada.domain.payment.dto.response.YanoljaPaySummaryResponse; import kr.co.fastcampus.yanabada.domain.payment.service.PaymentService; import lombok.RequiredArgsConstructor; +import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -28,48 +30,56 @@ public class PaymentController { private final PaymentService paymentService; @GetMapping("/summary") - public ResponseBody getYanoljaPaySummary() { - return ResponseBody.ok(paymentService.getYanoljaPaySummary(2L)); + public ResponseBody getYanoljaPaySummary( + @AuthenticationPrincipal PrincipalDetails principalDetails + ) { + return ResponseBody.ok(paymentService.getYanoljaPaySummary(principalDetails.id())); } @GetMapping - public ResponseBody getYanoljaPay() { - return ResponseBody.ok(paymentService.getYanoljaPay(2L)); + public ResponseBody getYanoljaPay( + @AuthenticationPrincipal PrincipalDetails principalDetails + ) { + return ResponseBody.ok(paymentService.getYanoljaPay(principalDetails.id())); } @PostMapping public ResponseBody saveYanoljaPay( + @AuthenticationPrincipal PrincipalDetails principalDetails, @RequestBody @Valid YanoljaPaySaveRequest request ) { - paymentService.saveYanoljaPay(2L, request); + paymentService.saveYanoljaPay(principalDetails.id(), request); return ResponseBody.ok(); } @PostMapping("/charge") public ResponseBody chargeYanoljaPay( + @AuthenticationPrincipal PrincipalDetails principalDetails, @RequestBody @Valid YanoljaPayAmountRequest request ) { return ResponseBody.ok( - paymentService.chargeYanoljaPay(2L, request) + paymentService.chargeYanoljaPay(principalDetails.id(), request) ); } @PostMapping("/disburse") public ResponseBody disburseYanoljaPay( + @AuthenticationPrincipal PrincipalDetails principalDetails, @RequestBody @Valid YanoljaPayAmountRequest request ) { return ResponseBody.ok( - paymentService.disburseYanoljaPay(2L, request) + paymentService.disburseYanoljaPay(principalDetails.id(), request) ); } @GetMapping("/histories") public ResponseBody getYanoljaPayHistories( + @AuthenticationPrincipal PrincipalDetails principalDetails, YanoljaPayHistorySearchRequest request ) { return ResponseBody.ok( paymentService.getYanoljaPayHistoriesBySearchRequest( - 2L, + principalDetails.id(), request ) ); @@ -77,11 +87,12 @@ public ResponseBody getYanoljaPayHistories @GetMapping("/histories/{historyId}") public ResponseBody getYanoljaPayHistory( + @AuthenticationPrincipal PrincipalDetails principalDetails, @PathVariable("historyId") Long historyId ) { return ResponseBody.ok( paymentService.getYanoljaPayHistory( - 2L, + principalDetails.id(), historyId ) ); diff --git a/src/main/java/kr/co/fastcampus/yanabada/domain/payment/controller/TradeController.java b/src/main/java/kr/co/fastcampus/yanabada/domain/payment/controller/TradeController.java index 5528725f..47766850 100644 --- a/src/main/java/kr/co/fastcampus/yanabada/domain/payment/controller/TradeController.java +++ b/src/main/java/kr/co/fastcampus/yanabada/domain/payment/controller/TradeController.java @@ -1,6 +1,7 @@ package kr.co.fastcampus.yanabada.domain.payment.controller; import kr.co.fastcampus.yanabada.common.response.ResponseBody; +import kr.co.fastcampus.yanabada.common.security.PrincipalDetails; import kr.co.fastcampus.yanabada.domain.payment.dto.request.TradeSaveRequest; import kr.co.fastcampus.yanabada.domain.payment.dto.response.ApprovalTradeInfoResponse; import kr.co.fastcampus.yanabada.domain.payment.dto.response.ApprovalTradePageResponse; @@ -14,6 +15,7 @@ import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.web.PageableDefault; +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; @@ -33,82 +35,91 @@ public class TradeController { @PostMapping public ResponseBody addTrade( + @AuthenticationPrincipal PrincipalDetails principalDetails, @RequestBody TradeSaveRequest request ) { return ResponseBody.ok( - tradeService.saveTrade(2L, request) + tradeService.saveTrade(principalDetails.id(), request) ); } @PostMapping("/{tradeId}/approve") public ResponseBody approveTrade( + @AuthenticationPrincipal PrincipalDetails principalDetails, @PathVariable("tradeId") Long tradeId ) { - tradeService.approveTrade(1L, tradeId); + tradeService.approveTrade(principalDetails.id(), tradeId); return ResponseBody.ok(); } @PostMapping("/{tradeId}/reject") public ResponseBody rejectTrade( + @AuthenticationPrincipal PrincipalDetails principalDetails, @PathVariable("tradeId") Long tradeId ) { - tradeService.rejectTrade(1L, tradeId); + tradeService.rejectTrade(principalDetails.id(), tradeId); return ResponseBody.ok(); } @PostMapping("/{tradeId}/cancel") public ResponseBody cancelTrade( + @AuthenticationPrincipal PrincipalDetails principalDetails, @PathVariable("tradeId") Long tradeId ) { - tradeService.cancelTrade(2L, tradeId); + tradeService.cancelTrade(principalDetails.id(), tradeId); return ResponseBody.ok(); } @GetMapping("/approvals/{tradeId}") public ResponseBody getApprovalTrade( + @AuthenticationPrincipal PrincipalDetails principalDetails, @PathVariable("tradeId") Long tradeId ) { return ResponseBody.ok( - tradeService.getApprovalTrade(1L, tradeId) + tradeService.getApprovalTrade(principalDetails.id(), tradeId) ); } @GetMapping("/approvals") public ResponseBody getApprovalTrades( + @AuthenticationPrincipal PrincipalDetails principalDetails, @RequestParam(name = "status", required = false) TradeStatus status, @PageableDefault(sort = "registeredDate", direction = Sort.Direction.DESC) Pageable pageable ) { return ResponseBody.ok( - tradeService.getApprovalTrades(1L, status, pageable) + tradeService.getApprovalTrades(principalDetails.id(), status, pageable) ); } @GetMapping("/purchases") public ResponseBody getPurchaseTrades( + @AuthenticationPrincipal PrincipalDetails principalDetails, @RequestParam(name = "status", required = false) TradeStatus status, @PageableDefault(sort = "registeredDate", direction = Sort.Direction.DESC) Pageable pageable ) { return ResponseBody.ok( - tradeService.getPurchaseTrades(2L, status, pageable) + tradeService.getPurchaseTrades(principalDetails.id(), status, pageable) ); } @GetMapping("/purchases/{tradeId}") public ResponseBody getPurchaseTrade( + @AuthenticationPrincipal PrincipalDetails principalDetails, @PathVariable("tradeId") Long tradeId ) { return ResponseBody.ok( - tradeService.getPurchaseTrade(2L, tradeId) + tradeService.getPurchaseTrade(principalDetails.id(), tradeId) ); } @DeleteMapping("/{tradeId}") public ResponseBody deleteTrade( + @AuthenticationPrincipal PrincipalDetails principalDetails, @PathVariable("tradeId") Long tradeId ) { - tradeService.deleteTrade(1L, tradeId); + tradeService.deleteTrade(principalDetails.id(), tradeId); return ResponseBody.ok(); } } From 8be0b070e25ee661f490ab2585a4f83d6bd20fc0 Mon Sep 17 00:00:00 2001 From: KyuCheol Hwang Date: Sat, 20 Jan 2024 11:26:47 +0900 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=EC=95=8C=EB=A6=BC=20=EC=84=9C?= =?UTF-8?q?=EB=B9=84=EC=8A=A4=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 알림 서비스 적용 --- .../dto/TradeNotificationDto.java | 11 +++++ .../service/NotificationService.java | 40 +++++++++---------- .../domain/payment/service/TradeService.java | 31 ++++++++++++-- .../product/service/ProductService.java | 17 ++++++-- 4 files changed, 71 insertions(+), 28 deletions(-) diff --git a/src/main/java/kr/co/fastcampus/yanabada/domain/notification/dto/TradeNotificationDto.java b/src/main/java/kr/co/fastcampus/yanabada/domain/notification/dto/TradeNotificationDto.java index 2586eac8..4c24ed07 100644 --- a/src/main/java/kr/co/fastcampus/yanabada/domain/notification/dto/TradeNotificationDto.java +++ b/src/main/java/kr/co/fastcampus/yanabada/domain/notification/dto/TradeNotificationDto.java @@ -6,11 +6,22 @@ import java.util.Map; import kr.co.fastcampus.yanabada.common.exception.JsonProcessFailedException; import kr.co.fastcampus.yanabada.domain.member.entity.Member; +import lombok.Builder; +@Builder public record TradeNotificationDto( Member receiver, String accommodationName ) { + public static TradeNotificationDto from( + Member receiver, + String accommodationName + ) { + return TradeNotificationDto.builder() + .receiver(receiver) + .accommodationName(accommodationName) + .build(); + } public String convertMapToJsonStr(ObjectMapper objectMapper) { Map contentMap = new HashMap<>(); diff --git a/src/main/java/kr/co/fastcampus/yanabada/domain/notification/service/NotificationService.java b/src/main/java/kr/co/fastcampus/yanabada/domain/notification/service/NotificationService.java index 6651a839..68a7cdb6 100644 --- a/src/main/java/kr/co/fastcampus/yanabada/domain/notification/service/NotificationService.java +++ b/src/main/java/kr/co/fastcampus/yanabada/domain/notification/service/NotificationService.java @@ -89,24 +89,24 @@ public void sendChatCreated(ChatNotificationDto chatDto) { } @Transactional - public void sendTradeRequest(TradeNotificationDto tradeApprovalDto) { + public void sendTradeRequest(TradeNotificationDto tradeNotificationDto) { Notification notification = Notification.builder() .title(TRADE_REQUEST_TITLE) .body( - getShortPhrase(tradeApprovalDto.accommodationName()) + getShortPhrase(tradeNotificationDto.accommodationName()) + TRADE_REQUEST_CONTENT_POSTFIX ) .build(); Data data = Data.builder().notificationType(TRADE_REQUEST.name()).build(); - fcmService.sendToMessage(tradeApprovalDto.receiver().getFcmToken(), notification, data); + fcmService.sendToMessage(tradeNotificationDto.receiver().getFcmToken(), notification, data); NotificationHistory notificationHistory = NotificationHistory.builder() - .receiver(tradeApprovalDto.receiver()) + .receiver(tradeNotificationDto.receiver()) .notificationType(TRADE_REQUEST) - .content(tradeApprovalDto.convertMapToJsonStr(objectMapper)) + .content(tradeNotificationDto.convertMapToJsonStr(objectMapper)) .image(TRADE_REQUEST.name().toLowerCase() + ".png") .build(); notificationHistoryRepository.save(notificationHistory); @@ -114,25 +114,25 @@ public void sendTradeRequest(TradeNotificationDto tradeApprovalDto) { } @Transactional - public void sendTradeCanceled(TradeNotificationDto tradeApprovalDto) { + public void sendTradeCanceled(TradeNotificationDto tradeNotificationDto) { Notification notification = Notification.builder() .title(TRADE_CANCELED_TITLE) .body( TRADE_CANCELED_CONTENT_PREFIX - + getShortPhrase(tradeApprovalDto.accommodationName()) + + getShortPhrase(tradeNotificationDto.accommodationName()) + TRADE_CANCELED_CONTENT_POSTFIX ) .build(); Data data = Data.builder().notificationType(TRADE_CANCELED.name()).build(); - fcmService.sendToMessage(tradeApprovalDto.receiver().getFcmToken(), notification, data); + fcmService.sendToMessage(tradeNotificationDto.receiver().getFcmToken(), notification, data); NotificationHistory notificationHistory = NotificationHistory.builder() - .receiver(tradeApprovalDto.receiver()) + .receiver(tradeNotificationDto.receiver()) .notificationType(TRADE_CANCELED) - .content(tradeApprovalDto.convertMapToJsonStr(objectMapper)) + .content(tradeNotificationDto.convertMapToJsonStr(objectMapper)) .image(TRADE_CANCELED.name().toLowerCase() + ".png") //todo: png 상수처리? .build(); notificationHistoryRepository.save(notificationHistory); @@ -140,24 +140,24 @@ public void sendTradeCanceled(TradeNotificationDto tradeApprovalDto) { } @Transactional - public void sendTradeApproval(TradeNotificationDto tradeApprovalDto) { + public void sendTradeApproval(TradeNotificationDto tradeNotificationDto) { Notification notification = Notification.builder() .title(TRADE_APPROVAL_TITLE) .body( - getShortPhrase(tradeApprovalDto.accommodationName()) + getShortPhrase(tradeNotificationDto.accommodationName()) + TRADE_APPROVAL_CONTENT_POSTFIX ) .build(); Data data = Data.builder().notificationType(TRADE_APPROVAL.name()).build(); - fcmService.sendToMessage(tradeApprovalDto.receiver().getFcmToken(), notification, data); + fcmService.sendToMessage(tradeNotificationDto.receiver().getFcmToken(), notification, data); NotificationHistory notificationHistory = NotificationHistory.builder() - .receiver(tradeApprovalDto.receiver()) + .receiver(tradeNotificationDto.receiver()) .notificationType(TRADE_APPROVAL) - .content(tradeApprovalDto.convertMapToJsonStr(objectMapper)) + .content(tradeNotificationDto.convertMapToJsonStr(objectMapper)) .image(TRADE_APPROVAL.name().toLowerCase() + ".png") .build(); notificationHistoryRepository.save(notificationHistory); @@ -165,24 +165,24 @@ public void sendTradeApproval(TradeNotificationDto tradeApprovalDto) { } @Transactional - public void sendTradeRejected(TradeNotificationDto tradeApprovalDto) { + public void sendTradeRejected(TradeNotificationDto tradeNotificationDto) { Notification notification = Notification.builder() .title(TRADE_REJECTED_TITLE) .body( - getShortPhrase(tradeApprovalDto.accommodationName()) + getShortPhrase(tradeNotificationDto.accommodationName()) + TRADE_REJECTED_CONTENT_POSTFIX ) .build(); Data data = Data.builder().notificationType(TRADE_REJECTED.name()).build(); - fcmService.sendToMessage(tradeApprovalDto.receiver().getFcmToken(), notification, data); + fcmService.sendToMessage(tradeNotificationDto.receiver().getFcmToken(), notification, data); NotificationHistory notificationHistory = NotificationHistory.builder() - .receiver(tradeApprovalDto.receiver()) + .receiver(tradeNotificationDto.receiver()) .notificationType(TRADE_REJECTED) - .content(tradeApprovalDto.convertMapToJsonStr(objectMapper)) + .content(tradeNotificationDto.convertMapToJsonStr(objectMapper)) .image(TRADE_REJECTED.name().toLowerCase() + ".png") .build(); notificationHistoryRepository.save(notificationHistory); diff --git a/src/main/java/kr/co/fastcampus/yanabada/domain/payment/service/TradeService.java b/src/main/java/kr/co/fastcampus/yanabada/domain/payment/service/TradeService.java index 0a0be201..6800c2cc 100644 --- a/src/main/java/kr/co/fastcampus/yanabada/domain/payment/service/TradeService.java +++ b/src/main/java/kr/co/fastcampus/yanabada/domain/payment/service/TradeService.java @@ -27,6 +27,8 @@ import kr.co.fastcampus.yanabada.domain.accommodation.entity.Accommodation; import kr.co.fastcampus.yanabada.domain.member.entity.Member; import kr.co.fastcampus.yanabada.domain.member.repository.MemberRepository; +import kr.co.fastcampus.yanabada.domain.notification.dto.TradeNotificationDto; +import kr.co.fastcampus.yanabada.domain.notification.service.NotificationService; import kr.co.fastcampus.yanabada.domain.order.entity.Order; import kr.co.fastcampus.yanabada.domain.order.entity.enums.OrderStatus; import kr.co.fastcampus.yanabada.domain.order.entity.enums.PaymentType; @@ -69,6 +71,7 @@ public class TradeService { private final YanoljaPayRepository yanoljaPayRepository; private final YanoljaPayHistoryRepository yanoljaPayHistoryRepository; private final AdminPaymentRepository adminPaymentRepository; + private final NotificationService notificationService; @Transactional public TradeIdResponse saveTrade( @@ -91,7 +94,12 @@ public TradeIdResponse saveTrade( product.book(); - //TODO: Seller에게 알림 + notificationService.sendTradeRequest( + TradeNotificationDto.from( + seller, + product.getOrder().getRoom().getAccommodation().getName() + ) + ); return TradeIdResponse.from( tradeRepository.save(request.toEntity(product, seller, buyer)) @@ -117,7 +125,12 @@ public void approveTrade(Long sellerId, Long tradeId) { trade.getProduct().getOrder().trade(); orderRepository.save(createOrderFromTrade(trade)); - //TODO: Buyer에게 알림 + notificationService.sendTradeApproval( + TradeNotificationDto.from( + trade.getBuyer(), + trade.getProduct().getOrder().getRoom().getAccommodation().getName() + ) + ); } @Transactional @@ -135,7 +148,12 @@ public void rejectTrade(Long sellerId, Long tradeId) { trade.reject(); trade.getProduct().onSale(); - //TODO: Buyer에게 알림(Optional) + notificationService.sendTradeRejected( + TradeNotificationDto.from( + trade.getBuyer(), + trade.getProduct().getOrder().getRoom().getAccommodation().getName() + ) + ); } @Transactional @@ -153,7 +171,12 @@ public void cancelTrade(Long buyerId, Long tradeId) { trade.cancel(); trade.getProduct().onSale(); - //TODO: Seller에게 알림(Optional) + notificationService.sendTradeCanceled( + TradeNotificationDto.from( + trade.getSeller(), + trade.getProduct().getOrder().getRoom().getAccommodation().getName() + ) + ); } @Transactional(readOnly = true) diff --git a/src/main/java/kr/co/fastcampus/yanabada/domain/product/service/ProductService.java b/src/main/java/kr/co/fastcampus/yanabada/domain/product/service/ProductService.java index 1e557feb..1467bec6 100644 --- a/src/main/java/kr/co/fastcampus/yanabada/domain/product/service/ProductService.java +++ b/src/main/java/kr/co/fastcampus/yanabada/domain/product/service/ProductService.java @@ -26,6 +26,8 @@ import kr.co.fastcampus.yanabada.common.exception.UnavailableStatusQueryException; import kr.co.fastcampus.yanabada.domain.member.entity.Member; import kr.co.fastcampus.yanabada.domain.member.repository.MemberRepository; +import kr.co.fastcampus.yanabada.domain.notification.dto.TradeNotificationDto; +import kr.co.fastcampus.yanabada.domain.notification.service.NotificationService; import kr.co.fastcampus.yanabada.domain.order.entity.Order; import kr.co.fastcampus.yanabada.domain.order.entity.enums.OrderStatus; import kr.co.fastcampus.yanabada.domain.order.entity.enums.PaymentType; @@ -70,6 +72,7 @@ public class ProductService { private final YanoljaPayRepository yanoljaPayRepository; private final YanoljaPayHistoryRepository yanoljaPayHistoryRepository; private final AdminPaymentRepository adminPaymentRepository; + private final NotificationService notificationService; @Transactional public ProductIdResponse saveProduct( @@ -154,7 +157,7 @@ public void cancelProduct( validateProductCancelRequest(member, product); - cancelTradeRelatedToProduct(product); + rejectTradeRelatedToProduct(product); product.cancel(); } @@ -167,13 +170,13 @@ public void expireProducts() { if (product.getIsAutoCancel()) { product.getOrder().cancel(); } - cancelTradeRelatedToProduct(product); + rejectTradeRelatedToProduct(product); product.expire(); } ); } - private void cancelTradeRelatedToProduct(Product product) { + private void rejectTradeRelatedToProduct(Product product) { AdminPayment adminPayment = adminPaymentRepository.getAdminPayment(); tradeRepository.findByProduct(product) @@ -185,7 +188,13 @@ private void cancelTradeRelatedToProduct(Product product) { adminPayment.withdraw(bill); trade.reject(); - //TODO: Buyer에게 알림 (Optional) + + notificationService.sendTradeRejected( + TradeNotificationDto.from( + trade.getBuyer(), + trade.getProduct().getOrder().getRoom().getAccommodation().getName() + ) + ); } }); } From 9d1e8eb5cdff50b9d45b570e89f5fd1bd030bdd7 Mon Sep 17 00:00:00 2001 From: KyuCheol Hwang Date: Sat, 20 Jan 2024 11:39:32 +0900 Subject: [PATCH 3/3] =?UTF-8?q?refactor:=20=EC=98=88=EC=95=BD=20=EB=82=B4?= =?UTF-8?q?=EC=97=AD=20=EC=83=81=EC=84=B8=EC=97=90=20Security=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 예약 내역 상세에 Security 적용 --- .../yanabada/domain/order/controller/OrderController.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/kr/co/fastcampus/yanabada/domain/order/controller/OrderController.java b/src/main/java/kr/co/fastcampus/yanabada/domain/order/controller/OrderController.java index e50a556a..0168ed42 100644 --- a/src/main/java/kr/co/fastcampus/yanabada/domain/order/controller/OrderController.java +++ b/src/main/java/kr/co/fastcampus/yanabada/domain/order/controller/OrderController.java @@ -15,7 +15,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @Slf4j @@ -44,8 +43,8 @@ public ResponseBody> getSellableOrders( @GetMapping("/{orderId}") public ResponseBody getOrderInfo( @PathVariable Long orderId, - @RequestParam Long currentUserId + @AuthenticationPrincipal PrincipalDetails principalDetails ) { - return ResponseBody.ok(orderService.getOrderInfo(orderId, currentUserId)); + return ResponseBody.ok(orderService.getOrderInfo(orderId, principalDetails.id())); } }