Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "api 수정" - CD 실패 #499

Merged
merged 1 commit into from
Dec 1, 2023
Merged

Revert "api 수정" - CD 실패 #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions ...ce/src/main/java/com/liberty52/main/service/applicationservice/CartItemModifyService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
13 changes: 0 additions & 13 deletions ...in/java/com/liberty52/main/service/applicationservice/impl/CartItemModifyServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions .../java/com/liberty52/main/service/applicationservice/impl/CartItemRetrieveServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@ private List<CartItemResponse> retrieveCartItem(List<CartItemResponse> 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);
}
Expand Down
11 changes: 0 additions & 11 deletions ...-main-service/src/main/java/com/liberty52/main/service/controller/CartItemController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
**/
Expand Down
6 changes: 3 additions & 3 deletions ...e/src/main/java/com/liberty52/main/service/controller/dto/CartItemRequestWithLicense.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
6 changes: 2 additions & 4 deletions ...ain-service/src/main/java/com/liberty52/main/service/controller/dto/CartItemResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ public class CartItemResponse {

String id;

String productId;

String name;

String imageUrl;
Expand All @@ -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<CartOptionResponse> 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<CartOptionResponse> options, String courierName, int deliveryFee, boolean isCustom, LicenseOptionResponse license){
return new CartItemResponse(id, name, imageUrl, price, quantity, options, courierName, deliveryFee, isCustom, license);

}

Expand Down
14 changes: 0 additions & 14 deletions ...ce/src/main/java/com/liberty52/main/service/controller/guest/CartItemGuestController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
**/
Expand Down
6 changes: 3 additions & 3 deletions .../liberty52/main/service/applicationservice/mock/CartLicenseItemCreateServiceMockTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"));

Expand Down
Loading