-
Notifications
You must be signed in to change notification settings - Fork 1
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.
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
[Refactor] 장바구니 상품 추가 Dto 클래스 타입 record로 변경 및 ErrorCode 추가 #32
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
84bb615
refactor: 기존 장바구니 상품 추가 Dto 클래스를 record로 수정 (#23)
pdohyung d0af8dd
feat: 장바구니, 상품을 못 찾았을때 처리하는 에러 추가 (#23)
pdohyung f8336ec
refactor: 에러 코드 추가와 Dto record 타입으로 인한 수정 (#23)
pdohyung 912c012
test: test의 utils 폴더 구조 수정 (#23)
pdohyung 3f93a11
refactor: CartRepository 메서드명 PhysicalNaming으로 수정 (#23)
pdohyung File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,6 +17,8 @@ | |
import com.teamA.hicardi.domain.item.repository.ItemRepository; | ||
import com.teamA.hicardi.domain.member.entity.Member; | ||
import com.teamA.hicardi.domain.member.repository.MemberRepository; | ||
import com.teamA.hicardi.error.ErrorCode; | ||
import com.teamA.hicardi.error.exception.custom.BusinessException; | ||
|
||
import lombok.RequiredArgsConstructor; | ||
|
||
|
@@ -37,11 +39,11 @@ public class CartService { | |
public void addCartItem(CartItemAddRequestDto cartItemAddRequestDto, String userId) { | ||
|
||
Member findMember = memberRepository.findByUserId(userId) | ||
.orElseThrow(() -> new IllegalArgumentException("존재하지 않는 회원입니다.")); | ||
.orElseThrow(() -> new BusinessException(ErrorCode.MEMBER_NOT_FOUND)); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 좋아요. |
||
|
||
Long memberId = findMember.getId(); | ||
|
||
boolean existsCart = cartRepository.existsCartByMember_Id(memberId); | ||
boolean existsCart = cartRepository.existsCartByMemberId(memberId); | ||
|
||
// 장바구니가 존재하지 않을때 장바구니 생성 | ||
if(!existsCart){ | ||
|
@@ -52,17 +54,12 @@ public void addCartItem(CartItemAddRequestDto cartItemAddRequestDto, String user | |
} | ||
|
||
// 해당 회원의 장바구니를 가져와서 상품을 추가 | ||
Cart findCart = cartRepository.findCartByMember_Id(memberId) | ||
.orElseThrow(() -> new IllegalArgumentException("존재하지 않는 장바구니입니다.")); | ||
Cart findCart = cartRepository.findByMemberId(memberId) | ||
.orElseThrow(() -> new BusinessException(ErrorCode.CART_NOT_FOUND)); | ||
Item findItem = itemRepository.findById(cartItemAddRequestDto.itemId()) | ||
.orElseThrow(() -> new BusinessException(ErrorCode.ITEM_NOT_FOUND)); | ||
|
||
Item findItem = itemRepository.findById(cartItemAddRequestDto.getItemId()) | ||
.orElseThrow(() -> new IllegalArgumentException("존재하지 않는 상품입니다.")); | ||
|
||
CartItem cartItem = CartItem.builder() | ||
.cart(findCart) | ||
.item(findItem) | ||
.count(cartItemAddRequestDto.getCount()) | ||
.build(); | ||
CartItem cartItem = cartItemAddRequestDto.toEntity(findCart, findItem); | ||
|
||
cartItemRepository.save(cartItem); | ||
} | ||
|
23 changes: 10 additions & 13 deletions
23
src/main/java/com/teamA/hicardi/domain/cartItem/dto/CartItemAddRequestDto.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,15 @@ | ||
package com.teamA.hicardi.domain.cartItem.dto; | ||
|
||
import lombok.Builder; | ||
import lombok.Getter; | ||
import lombok.NoArgsConstructor; | ||
import com.teamA.hicardi.domain.cart.entity.Cart; | ||
import com.teamA.hicardi.domain.cartItem.entity.CartItem; | ||
import com.teamA.hicardi.domain.item.entity.Item; | ||
|
||
@Getter | ||
@NoArgsConstructor | ||
public class CartItemAddRequestDto { | ||
private Long itemId; | ||
private int count; | ||
|
||
@Builder | ||
public CartItemAddRequestDto(Long itemId, int count) { | ||
this.itemId = itemId; | ||
this.count = count; | ||
public record CartItemAddRequestDto (Long itemId, int count) { | ||
public CartItem toEntity(Cart cart, Item item) { | ||
return CartItem.builder() | ||
.cart(cart) | ||
.item(item) | ||
.count(count) | ||
.build(); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 👍 |
||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...omain/utils/TestUserArgumentResolver.java → ...cardi/utils/TestUserArgumentResolver.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
좋습니다.