From 99ef4417ff1cac3dd5ef2468e36e4c52e3bd65fb Mon Sep 17 00:00:00 2001 From: ImKunYoung Date: Fri, 1 Dec 2023 14:46:15 +0900 Subject: [PATCH] =?UTF-8?q?Revert=20"api=20=EC=88=98=EC=A0=95=20(#497)"=20?= =?UTF-8?q?(#499)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit ec2eb39db24a413e6bd02be3885c1f9ef809497d. --- .../applicationservice/CartItemModifyService.java | 4 ---- .../impl/CartItemModifyServiceImpl.java | 13 ------------- .../impl/CartItemRetrieveServiceImpl.java | 4 ++-- .../service/controller/CartItemController.java | 11 ----------- .../controller/dto/CartItemRequestWithLicense.java | 6 +++--- .../service/controller/dto/CartItemResponse.java | 6 ++---- .../controller/guest/CartItemGuestController.java | 14 -------------- .../mock/CartLicenseItemCreateServiceMockTest.java | 6 +++--- 8 files changed, 10 insertions(+), 54 deletions(-) diff --git a/liberty52-main-service/src/main/java/com/liberty52/main/service/applicationservice/CartItemModifyService.java b/liberty52-main-service/src/main/java/com/liberty52/main/service/applicationservice/CartItemModifyService.java index eec31bff..6aad5e37 100644 --- a/liberty52-main-service/src/main/java/com/liberty52/main/service/applicationservice/CartItemModifyService.java +++ b/liberty52-main-service/src/main/java/com/liberty52/main/service/applicationservice/CartItemModifyService.java @@ -12,8 +12,4 @@ public interface CartItemModifyService { void modifyUserCartItemWihLicense(String authId, CartModifyWithLicenseRequestDto dto, String customProductId); void modifyGuestCartItemWithLicense(String guestId, CartModifyWithLicenseRequestDto dto, String customProductId); - - void modifyUserCartItemImage(String authId, MultipartFile imageFile, String customProductId); - - void modifyGuestCartItemImage(String guestId, MultipartFile imageFile, String customProductId); } diff --git a/liberty52-main-service/src/main/java/com/liberty52/main/service/applicationservice/impl/CartItemModifyServiceImpl.java b/liberty52-main-service/src/main/java/com/liberty52/main/service/applicationservice/impl/CartItemModifyServiceImpl.java index e68d3124..3fac808b 100644 --- a/liberty52-main-service/src/main/java/com/liberty52/main/service/applicationservice/impl/CartItemModifyServiceImpl.java +++ b/liberty52-main-service/src/main/java/com/liberty52/main/service/applicationservice/impl/CartItemModifyServiceImpl.java @@ -60,19 +60,6 @@ public void modifyGuestCartItemWithLicense(String guestId, CartModifyWithLicense } - @Override - public void modifyUserCartItemImage(String authId, MultipartFile imageFile, String customProductId) { - CustomProduct customProduct = customProductRepository.findById(customProductId).orElseThrow(() -> new CustomProductNotFoundByIdException(customProductId)); - modifyImage(customProduct, imageFile); - - } - - @Override - public void modifyGuestCartItemImage(String guestId, MultipartFile imageFile, String customProductId) { - CustomProduct customProduct = customProductRepository.findById(customProductId).orElseThrow(() -> new CustomProductNotFoundByIdException(customProductId)); - modifyImage(customProduct, imageFile); - } - private void modifyCartItemWithLicence(String ownerId, CartModifyWithLicenseRequestDto dto, String customProductId) { CustomProduct customProduct = customProductRepository.findById(customProductId).orElseThrow(() -> new CustomProductNotFoundByIdException(customProductId)); validCartItem(ownerId, customProduct); diff --git a/liberty52-main-service/src/main/java/com/liberty52/main/service/applicationservice/impl/CartItemRetrieveServiceImpl.java b/liberty52-main-service/src/main/java/com/liberty52/main/service/applicationservice/impl/CartItemRetrieveServiceImpl.java index defff578..de317499 100644 --- a/liberty52-main-service/src/main/java/com/liberty52/main/service/applicationservice/impl/CartItemRetrieveServiceImpl.java +++ b/liberty52-main-service/src/main/java/com/liberty52/main/service/applicationservice/impl/CartItemRetrieveServiceImpl.java @@ -57,12 +57,12 @@ private List retrieveCartItem(List cartItemR deliveryFee = product.getDeliveryOption().getFee(); } if(product.isCustom()){ - cartItemResponse = CartItemResponse.of(cartItem.getId(), product.getId(), product.getName(), cartItem.getUserCustomPictureUrl(), product.getPrice(), cartItem.getQuantity(), getCartOptionList(cartItem.getOptions()), courierName, deliveryFee, product.isCustom(), null); + cartItemResponse = CartItemResponse.of(cartItem.getId(), product.getName(), cartItem.getUserCustomPictureUrl(), product.getPrice(), cartItem.getQuantity(), getCartOptionList(cartItem.getOptions()), courierName, deliveryFee, product.isCustom(), null); } else { LicenseOptionDetail licenseOptionDetail = cartItem.getCustomLicenseOption().getLicenseOptionDetail(); LicenseOptionResponse license = LicenseOptionResponse.of(licenseOptionDetail.getLicenseOption().getId(), licenseOptionDetail.getLicenseOption().getName(), licenseOptionDetail.getId(), licenseOptionDetail.getArtName(), licenseOptionDetail.getPrice()); - cartItemResponse = CartItemResponse.of(cartItem.getId(), product.getId(), product.getName(), licenseOptionDetail.getArtUrl(), product.getPrice(), cartItem.getQuantity(), getCartOptionList(cartItem.getOptions()), courierName, deliveryFee, product.isCustom(), license); + cartItemResponse = CartItemResponse.of(cartItem.getId(), product.getName(), licenseOptionDetail.getArtUrl(), product.getPrice(), cartItem.getQuantity(), getCartOptionList(cartItem.getOptions()), courierName, deliveryFee, product.isCustom(), license); } cartItemResponseList.add(cartItemResponse); } diff --git a/liberty52-main-service/src/main/java/com/liberty52/main/service/controller/CartItemController.java b/liberty52-main-service/src/main/java/com/liberty52/main/service/controller/CartItemController.java index 09854dc1..c651cd78 100644 --- a/liberty52-main-service/src/main/java/com/liberty52/main/service/controller/CartItemController.java +++ b/liberty52-main-service/src/main/java/com/liberty52/main/service/controller/CartItemController.java @@ -77,17 +77,6 @@ public void modifyUserCartItemWithLicense(@RequestHeader(HttpHeaders.AUTHORIZATI cartItemModifyService.modifyUserCartItemWihLicense(authId, dto, customProductId); } - /** - * UPDATE - **/ - @Operation(summary = "장바구니 상품 이미지 수정", description = "주어진 인증 ID, 이미지 파일 및 장바구니 상품 수정 요청을 사용하여 사용자 장바구니 상품 이미지을 수정합니다.") - @PatchMapping("/carts/custom-products/image/{customProductId}") - @ResponseStatus(HttpStatus.NO_CONTENT) - public void modifyUserCartItem(@RequestHeader(HttpHeaders.AUTHORIZATION) String authId, - @RequestPart(value = "file", required = false) MultipartFile imageFile, @PathVariable String customProductId) { - cartItemModifyService.modifyUserCartItemImage(authId, imageFile, customProductId); - } - /** * DELETE **/ diff --git a/liberty52-main-service/src/main/java/com/liberty52/main/service/controller/dto/CartItemRequestWithLicense.java b/liberty52-main-service/src/main/java/com/liberty52/main/service/controller/dto/CartItemRequestWithLicense.java index 31e1f0dc..6afb37a5 100644 --- a/liberty52-main-service/src/main/java/com/liberty52/main/service/controller/dto/CartItemRequestWithLicense.java +++ b/liberty52-main-service/src/main/java/com/liberty52/main/service/controller/dto/CartItemRequestWithLicense.java @@ -17,14 +17,14 @@ public class CartItemRequestWithLicense { String[] optionDetailIds; @NotNull - String licenseOptionDetailId; + String licenseOptionId; @Builder - public CartItemRequestWithLicense(String productId, Integer quantity, String[] optionDetailIds, String licenseOptionDetailId) { + public CartItemRequestWithLicense(String productId, Integer quantity, String[] optionDetailIds, String licenseOptionId) { this.productId = productId; this.quantity = quantity; this.optionDetailIds = optionDetailIds; - this.licenseOptionDetailId = licenseOptionDetailId; + this.licenseOptionId = licenseOptionId; } public CartItemRequestWithLicense() { diff --git a/liberty52-main-service/src/main/java/com/liberty52/main/service/controller/dto/CartItemResponse.java b/liberty52-main-service/src/main/java/com/liberty52/main/service/controller/dto/CartItemResponse.java index 0a49aea6..46ccabdf 100644 --- a/liberty52-main-service/src/main/java/com/liberty52/main/service/controller/dto/CartItemResponse.java +++ b/liberty52-main-service/src/main/java/com/liberty52/main/service/controller/dto/CartItemResponse.java @@ -14,8 +14,6 @@ public class CartItemResponse { String id; - String productId; - String name; String imageUrl; @@ -34,8 +32,8 @@ public class CartItemResponse { LicenseOptionResponse license; - public static CartItemResponse of(String id, String productId,String name, String imageUrl, long price, int quantity, List options, String courierName, int deliveryFee, boolean isCustom, LicenseOptionResponse license){ - return new CartItemResponse(id, productId, name, imageUrl, price, quantity, options, courierName, deliveryFee, isCustom, license); + public static CartItemResponse of(String id, String name, String imageUrl, long price, int quantity, List options, String courierName, int deliveryFee, boolean isCustom, LicenseOptionResponse license){ + return new CartItemResponse(id, name, imageUrl, price, quantity, options, courierName, deliveryFee, isCustom, license); } diff --git a/liberty52-main-service/src/main/java/com/liberty52/main/service/controller/guest/CartItemGuestController.java b/liberty52-main-service/src/main/java/com/liberty52/main/service/controller/guest/CartItemGuestController.java index 56900972..b9250e46 100644 --- a/liberty52-main-service/src/main/java/com/liberty52/main/service/controller/guest/CartItemGuestController.java +++ b/liberty52-main-service/src/main/java/com/liberty52/main/service/controller/guest/CartItemGuestController.java @@ -95,20 +95,6 @@ public void modifyGuestCartItemWithLicense( cartItemModifyService.modifyGuestCartItemWithLicense(guestId, dto, customProductId); } - /** - * UPDATE - **/ - @Operation(summary = "비회원 장바구니 상품 수정", description = "비회원 장바구니에 있는 상품을 수정합니다.") - @PatchMapping("/guest/carts/custom-products/image/{customProductId}") - @ResponseStatus(HttpStatus.NO_CONTENT) - public void modifyGuestCartItemImage( - @RequestHeader(HttpHeaders.AUTHORIZATION) String guestId, - @RequestPart(value = "file", required = false) MultipartFile imageFile, - @PathVariable String customProductId - ) { - cartItemModifyService.modifyGuestCartItemImage(guestId, imageFile, customProductId); - } - /** * DELETE **/ diff --git a/liberty52-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/CartLicenseItemCreateServiceMockTest.java b/liberty52-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/CartLicenseItemCreateServiceMockTest.java index 93b4b09d..15d657b2 100644 --- a/liberty52-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/CartLicenseItemCreateServiceMockTest.java +++ b/liberty52-main-service/src/test/java/com/liberty52/main/service/applicationservice/mock/CartLicenseItemCreateServiceMockTest.java @@ -64,10 +64,10 @@ void init() { //given String[] option = {"OPT-001", "OPT-003", "OPT-005"}; - CartItemRequestWithLicense dto1 = new CartItemRequestWithLicense().builder().productId("LIB-002").quantity(1).optionDetailIds(option).licenseOptionDetailId("licenseOption").build(); - CartItemRequestWithLicense dto2 = new CartItemRequestWithLicense().builder().productId("L").quantity(2).optionDetailIds(option).licenseOptionDetailId("licenseOption").build(); + CartItemRequestWithLicense dto1 = new CartItemRequestWithLicense().builder().productId("LIB-002").quantity(1).optionDetailIds(option).licenseOptionId("licenseOption").build(); + CartItemRequestWithLicense dto2 = new CartItemRequestWithLicense().builder().productId("L").quantity(2).optionDetailIds(option).licenseOptionId("licenseOption").build(); String[] optionErr = {"OPT-002", "OPT-003", "OPT-005"}; - CartItemRequestWithLicense dto3 = new CartItemRequestWithLicense().builder().productId("LIB-002").quantity(4).optionDetailIds(optionErr).licenseOptionDetailId("err").build(); + CartItemRequestWithLicense dto3 = new CartItemRequestWithLicense().builder().productId("LIB-002").quantity(4).optionDetailIds(optionErr).licenseOptionId("err").build(); MockMultipartFile imageFile = new MockMultipartFile("image", "test.png", "image/jpeg", new FileInputStream("src/test/resources/static/test.jpg"));