implemented order model #12
Merged
Conversation
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
MentorMateAcademy
suggested changes
Jul 22, 2024
Comment on lines
39
to
71
| ShoppingCart shoppingCart = shoppingCartRepository.findByUserId(userId); | ||
| if (shoppingCart == null || shoppingCart.getCartItems().isEmpty()) { | ||
| throw new EntityNotFoundException("Shopping cart is empty"); | ||
| } | ||
|
|
||
| User user = userRepository.findById(userId) | ||
| .orElseThrow(() -> new EntityNotFoundException("User not found")); | ||
|
|
||
| Order order = makeOrder(shippingAddress, user); | ||
|
|
||
| BigDecimal total = BigDecimal.ZERO; | ||
|
|
||
| for (CartItem cartItem : shoppingCart.getCartItems()) { | ||
| OrderItem orderItem = new OrderItem(); | ||
| orderItem.setOrder(order); | ||
| orderItem.setBook(cartItem.getBook()); | ||
| orderItem.setQuantity(cartItem.getQuantity()); | ||
| orderItem.setPrice(cartItem.getBook().getPrice() | ||
| .multiply(BigDecimal.valueOf(cartItem.getQuantity()))); | ||
| orderItem.setDeleted(false); | ||
| order.getOrderItems().add(orderItem); | ||
|
|
||
| total = total.add(orderItem.getPrice()); | ||
| } | ||
|
|
||
| order.setTotal(total); | ||
| orderRepository.save(order); | ||
| orderItemRepository.saveAll(order.getOrderItems()); | ||
|
|
||
| shoppingCart.getCartItems().clear(); | ||
| shoppingCartRepository.save(shoppingCart); | ||
|
|
||
| return orderMapper.toDto(order); |
There was a problem hiding this comment.
let's divide this method into private helpful
MentorMateAcademy
suggested changes
Jul 24, 2024
| @ManyToOne(fetch = FetchType.LAZY, optional = false) | ||
| @JoinColumn(name = "book_id", nullable = false) | ||
| private Book book; | ||
|
|
Comment on lines
86
to
94
| private static Order makeOrder(String shippingAddress, User user) { | ||
| Order order = new Order(); | ||
| order.setUser(user); | ||
| order.setStatus(Order.Status.PENDING); | ||
| order.setOrderDate(LocalDateTime.now()); | ||
| order.setShippingAddress(shippingAddress); | ||
| order.setDeleted(false); | ||
| return order; | ||
| } |
There was a problem hiding this comment.
i used "extract method" from intellij and this func makes methods static by default, i just do not noticed that.
Comment on lines
109
to
110
| private BigDecimal calculateTotalAndAddOrderItems(ShoppingCart shoppingCart, Order order) { | ||
| BigDecimal total = BigDecimal.ZERO; |
There was a problem hiding this comment.
no Single Responsibility method
Elena-Bruyako
suggested changes
Jul 26, 2024
| @ApiResponse(responseCode = "401", description = "Unauthorized"), | ||
| @ApiResponse(responseCode = "404", description = "Order not found") | ||
| }) | ||
| public void updateOrderStatus( |
There was a problem hiding this comment.
Update endpoint should return dto
| import java.util.Set; | ||
|
|
||
| public record OrderDto( | ||
| @NotNull Long id, |
| import java.math.BigDecimal; | ||
|
|
||
| public record OrderItemDto(@NotNull Long id, | ||
| @NotNull Long orderId, |
| import lombok.Data; | ||
|
|
||
| @Data | ||
| public class PlaceOrderRequestDto { |
| import mate.academy.model.Order; | ||
|
|
||
| @Data | ||
| public class UpdateOrderStatusRequestDto { |
| @Override | ||
| public void updateOrderStatus(Long orderId, Order.Status status) { | ||
| Order order = orderRepository.findById(orderId) | ||
| .orElseThrow(() -> new EntityNotFoundException("Order not found")); |
Comment on lines
91
to
94
| order.setStatus(Order.Status.PENDING); | ||
| order.setOrderDate(LocalDateTime.now()); | ||
| order.setShippingAddress(shippingAddress); | ||
| order.setDeleted(false); |
There was a problem hiding this comment.
Suggested change
| order.setStatus(Order.Status.PENDING); | |
| order.setOrderDate(LocalDateTime.now()); | |
| order.setShippingAddress(shippingAddress); | |
| order.setDeleted(false); | |
| order.setShippingAddress(shippingAddress); |
| } | ||
|
|
||
| private ShoppingCart getShoppingCart(Long userId) { | ||
| ShoppingCart shoppingCart = shoppingCartRepository.findByUserId(userId); |
There was a problem hiding this comment.
Suggested change
| ShoppingCart shoppingCart = shoppingCartRepository.findByUserId(userId); | |
| ShoppingCart shoppingCart = shoppingCartRepository.findByUserId(userId).orElseThrow(... |
|
|
||
| private ShoppingCart getShoppingCart(Long userId) { | ||
| ShoppingCart shoppingCart = shoppingCartRepository.findByUserId(userId); | ||
| if (shoppingCart == null || shoppingCart.getCartItems().isEmpty()) { |
There was a problem hiding this comment.
Suggested change
| if (shoppingCart == null || shoppingCart.getCartItems().isEmpty()) { | |
| if (shoppingCart.getCartItems().isEmpty()) { |
| private ShoppingCart getShoppingCart(Long userId) { | ||
| ShoppingCart shoppingCart = shoppingCartRepository.findByUserId(userId); | ||
| if (shoppingCart == null || shoppingCart.getCartItems().isEmpty()) { | ||
| throw new EntityNotFoundException("Shopping cart is empty"); |
There was a problem hiding this comment.
Suggested change
| throw new EntityNotFoundException("Shopping cart is empty"); | |
| throw new OrderProcessingException(.... |
sarakhmen
approved these changes
Jul 27, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.