Update "create checkout" follows new design #1224

NhatTranMinh15 · 2024-10-23T09:19:49Z

github-actions · 2024-10-23T09:23:15Z

Order Coverage Report

Overall Project	75.21% `-6.88%`	❌
Files changed	52.71%	❌

File	Coverage
CheckoutController.java	100%	🍏
CheckoutItemVm.java	100%	🍏
CheckoutItemPostVm.java	100%	🍏
CheckoutPostVm.java	100%	🍏
CheckoutVm.java	100%	🍏
CheckoutMapper.java	100%	🍏
ProductGetCheckoutListVm.java	100%	🍏
CheckoutState.java	95.71%	🍏
CheckoutService.java	81.69% `-9.15%`	🍏
AuthenticationUtils.java	55.17% `-10.34%`	🍏
Checkout.java	26.67% `-73.33%`	❌
CheckoutItem.java	0%	❌
ProductService.java	0% `-87.71%`	❌
Constants.java	0%	🍏

order/src/main/java/com/yas/order/model/Checkout.java

…-new-design

github-actions · 2024-10-30T09:23:44Z

Customer Coverage Report

Overall Project	89.24%	🍏

File	Coverage
CustomerService.java	84.09%	🍏

…-new-design

minhtridn2001

Hi @NhatTranMinh15,
Thanks for your effort 👍. Please check my comments, and let’s discuss if you have any inquiries.
Thanks.

minhtridn2001 · 2024-11-06T07:01:37Z

order/src/main/java/com/yas/order/mapper/CheckoutMapper.java

-    @Mapping(target = "totalAmount", source = "totalAmount") // Ánh xạ tường minh cho totalAmount
-    @Mapping(target = "totalDiscountAmount", source = "totalDiscountAmount")
+//    @Mapping(target = "totalAmount", source = "totalAmount") // Ánh xạ tường minh cho totalAmount
+//    @Mapping(target = "totalDiscountAmount", source = "totalDiscountAmount")


Remove these comments

minhtridn2001 · 2024-11-06T07:10:02Z

order/src/main/java/com/yas/order/model/Checkout.java

@@ -65,7 +73,8 @@ public class Checkout extends AbstractAuditEntity {
    private String attributes;

    @SuppressWarnings("unused")
-    private BigDecimal totalAmount;
+    @Builder.Default
+    private long totalAmount = 0;


Why is BigDecimal not used for totalAmount?
@Builder.Default is unnecessary here because primitive types like long already have default values

minhtridn2001 · 2024-11-06T07:25:08Z

order/src/main/java/com/yas/order/service/CheckoutService.java


-        CheckoutVm checkoutVm = checkoutMapper.toVm(savedCheckout);
        if (CollectionUtils.isEmpty(checkoutPostVm.checkoutItemPostVms())) {


Isn't checkoutItems required? It should result in a bad request if checkoutItems is empty

minhtridn2001 · 2024-11-06T07:28:59Z

order/src/main/java/com/yas/order/service/CheckoutService.java

+
+        ProductGetCheckoutListVm response = productService.getProductInfomation(productIds, 0, productIds.size());
+
+        if (response != null) {


Please log an error message and throw an exception in case response is null.

minhtridn2001 · 2024-11-06T07:30:31Z

order/src/main/java/com/yas/order/service/CheckoutService.java

+
+        if (response != null) {
+            Map<Long, ProductCheckoutListVm> products
+                    = response.productCheckoutListVms()


Please separate this part into a method.

minhtridn2001 · 2024-11-06T07:33:10Z

order/src/main/java/com/yas/order/service/CheckoutService.java

+                .stream()
+                .map(checkoutItemPostVm -> {
+                    CheckoutItem item = checkoutMapper.toModel(checkoutItemPostVm);
+                    checkout.addAmount(item.getQuantity());


Wrong mapping?
amount = price * quantity

minhtridn2001 · 2024-11-06T07:38:14Z

order/src/main/java/com/yas/order/service/CheckoutService.java

@@ -76,20 +100,20 @@ public CheckoutVm getCheckoutPendingStateWithItemsById(String id) {
            -> new NotFoundException(CHECKOUT_NOT_FOUND, id));

        if (!checkout.getCreatedBy().equals(AuthenticationUtils.getCurrentUserId())) {
-            throw new Forbidden(Constants.ErrorCode.FORBIDDEN);


The ADMIN role should be permitted also. Let's create a helper method for this since it’s reusable
Please log a message for additional error insights.

minhtridn2001 · 2024-11-06T07:45:27Z

order/src/main/java/com/yas/order/service/ProductService.java

+    @Retry(name = "restApi")
+    @CircuitBreaker(name = "restCircuitBreaker", fallbackMethod = "handleProductInfomationFallback")
+    public ProductGetCheckoutListVm getProductInfomation(Set<Long> ids, int pageNo, int pageSize) {
+        final String jwt = ((Jwt) SecurityContextHolder.getContext().getAuthentication().getPrincipal())


Please use the helper method to get the jwt token. If the method doesn’t exist, create one in the common library

minhtridn2001 · 2024-11-06T07:49:27Z

order/src/main/java/com/yas/order/model/CheckoutItem.java

-    @Column(name = "tax")
-    private BigDecimal taxAmount;
+    @SuppressWarnings("unused")
+    private Long tax;


Tax amount should be of type BigDecimal.
Please keep using BigDecimal taxAmount;

minhtridn2001 · 2024-11-06T07:50:21Z

order/src/main/java/com/yas/order/service/CheckoutService.java

+                if (product != null) {
+                    t.setProductName(product.getName());
+                    t.setProductPrice(BigDecimal.valueOf(product.getPrice()));
+                    t.setTax(product.getTaxClassId());


Wrong mapping for taxAmount

Update changelog

sonarcloud · 2024-11-07T06:38:22Z

Quality Gate passed for 'order'

Issues
1 New issue
0 Accepted issues

Measures
0 Security Hotspots
46.4% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

sonarcloud · 2024-11-07T06:38:43Z

Quality Gate passed for 'customer'

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

minhtridn2001 · 2024-11-14T02:25:40Z

order/src/main/java/com/yas/order/model/Checkout.java

+    }
+
+    public void addAmount(double a) {


Why there are 2 addAmount methods? Please remove the unused one

minhtridn2001 · 2024-11-14T02:28:55Z

order/src/main/java/com/yas/order/model/Checkout.java

+    }
+
+    public void subtractAmount(BigDecimal a) {


This method is not used anywhere

minhtridn2001 · 2024-11-14T02:43:17Z

order/src/main/java/com/yas/order/service/CheckoutService.java

+            } else {
+                t.setProductName(product.getName());
+                t.setProductPrice(BigDecimal.valueOf(product.getPrice()));
+                checkout.addAmount(product.getPrice() * t.getQuantity());


Replace product.getPrice() * t.getQuantity() with BigDecimal operations to prevent precision errors

minhtridn2001 · 2024-11-14T02:48:08Z

order/src/main/java/com/yas/order/service/CheckoutService.java

    }

    public CheckoutVm getCheckoutPendingStateWithItemsById(String id) {

        Checkout checkout = checkoutRepository.findByIdAndCheckoutState(id, CheckoutState.PENDING).orElseThrow(()
-            -> new NotFoundException(CHECKOUT_NOT_FOUND, id));
+                -> new NotFoundException(CHECKOUT_NOT_FOUND, id));

        if (!checkout.getCreatedBy().equals(AuthenticationUtils.getCurrentUserId())) {


As an ADMIN user, if I am not the user who created the checkout, would I be able to call this method?
Please extract this validation to a separate method

minhtridn2001 · 2024-11-14T02:50:47Z

order/src/main/java/com/yas/order/service/CheckoutService.java

+        checkoutItems.forEach(t -> {
+            ProductCheckoutListVm product = products.get(t.getProductId());
+            if (product == null) {
+                throw new NotFoundException("PRODUCT_NOT_FOUND", t.getProductId());


Please define a constant for "PRODUCT_NOT_FOUND"

minhtridn2001 · 2024-11-14T02:56:31Z

order/src/main/java/com/yas/order/service/CheckoutService.java


        return checkoutVm.toBuilder().checkoutItemVms(checkoutItemVms).build();
    }

    public Long updateCheckoutStatus(CheckoutStatusPutVm checkoutStatusPutVm) {
        Checkout checkout = checkoutRepository.findById(checkoutStatusPutVm.checkoutId())
-            .orElseThrow(() -> new NotFoundException(CHECKOUT_NOT_FOUND, checkoutStatusPutVm.checkoutId()));
+                .orElseThrow(() -> new NotFoundException(CHECKOUT_NOT_FOUND, checkoutStatusPutVm.checkoutId()));
        checkout.setCheckoutState(CheckoutState.valueOf(checkoutStatusPutVm.checkoutStatus()));
        checkoutRepository.save(checkout);
        Order order = orderService.findOrderByCheckoutId(checkoutStatusPutVm.checkoutId());


Please use logging to track key operations like checkout creation or status update, etc.

minhtridn2001 · 2024-11-14T02:57:51Z

order/src/main/java/com/yas/order/service/ProductService.java

 import com.yas.order.config.ServiceUrlConfig;
+import com.yas.order.utils.AuthenticationUtils;


Please use com.yas.commonlibrary.utils.AuthenticationUtils

duylv27 · 2024-11-14T06:42:16Z

order/src/main/java/com/yas/order/service/ProductService.java

-            .toUri();
+                .fromHttpUrl(serviceUrlConfig.product())
+                .path("/backoffice/product-variations/" + productId)
+                .buildAndExpand()


Please use this to append path variables instead of .path("/backoffice/product-variations/" + productId)

final URI url = UriComponentsBuilder .fromHttpUrl(serviceUrlConfig.product()) .path("/backoffice/product-variations/${productId}") .buildAndExpand(productId) .toUri();

duylv27 · 2024-11-14T07:00:38Z

order/src/main/java/com/yas/order/service/CheckoutService.java

    private final OrderService orderService;
+    private final ProductService productService;
    private final CheckoutMapper checkoutMapper;

    public CheckoutVm createCheckout(CheckoutPostVm checkoutPostVm) {


Hi a @minhtridn2001, @NhatTranMinh15,

Do you think this method should be named initCheckout(...)? It seems to handle the case when the user initiates the checkout.

If this method is meant to create a checkout, it should handle more cases than just the PENDING status.

Moreover, should we check if the checkout already exists (by verifying the checkout status and checkout items) instead of creating a new one each time the user clicks Proceed to checkout, especially when they might click it multiple times with the same items?

NhatTranMinh15 added 7 commits October 23, 2024 16:13

Update Models and Vms

034fcea

Update Vm

841553f

Call to product service

15f0911

update create checkout

dcc9ff1

update database

f39f78a

Update test to new model

e1bfbca

Reformat code

3afd26d

NhatTranMinh15 added 2 commits October 23, 2024 16:47

check style

c1dcb88

fix checkstyle

bede55c

NhatTranMinh15 marked this pull request as ready for review October 23, 2024 10:05

Fix checkstyle

b193d6e

khanhduzz reviewed Oct 24, 2024

View reviewed changes

order/src/main/java/com/yas/order/model/Checkout.java Show resolved Hide resolved

NhatTranMinh15 added 5 commits October 25, 2024 09:11

Merge remote-tracking branch 'origin/main' into #1105-Create-checkout…

309e1c7

…-new-design

Add CheckoutItem to Checkout model

c098734

fix checkstyle

13642ee

Merge remote-tracking branch 'origin/main' into #1105-Create-checkout…

3ad226a

…-new-design

update import

f7611cf

khanhduzz approved these changes Nov 4, 2024

View reviewed changes

NhatTranMinh15 added 2 commits November 4, 2024 09:36

Merge remote-tracking branch 'origin/main' into #1105-Create-checkout…

eb9908a

…-new-design

Update CheckoutPostVm

a23717e

minhtridn2001 requested changes Nov 6, 2024

View reviewed changes

NhatTranMinh15 added 6 commits November 7, 2024 13:12

Update model and vm

e5c2da7

Separate CheckoutItem to different function

7b564b7

Update get jwt token function

0059e78

Update changelog

Update tests

9f412fa

Fix sonar checkstyle

989da0a

reduce line length

715a68b

minhtridn2001 reviewed Nov 14, 2024

View reviewed changes

duylv27 reviewed Nov 14, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update "create checkout" follows new design #1224

Update "create checkout" follows new design #1224

NhatTranMinh15 commented Oct 23, 2024

github-actions bot commented Oct 23, 2024 •

edited

Loading

github-actions bot commented Oct 30, 2024 •

edited

Loading

minhtridn2001 left a comment

minhtridn2001 Nov 6, 2024

minhtridn2001 Nov 6, 2024

minhtridn2001 Nov 6, 2024

minhtridn2001 Nov 6, 2024

minhtridn2001 Nov 6, 2024

minhtridn2001 Nov 6, 2024

minhtridn2001 Nov 6, 2024

minhtridn2001 Nov 6, 2024

minhtridn2001 Nov 6, 2024

minhtridn2001 Nov 6, 2024

sonarcloud bot commented Nov 7, 2024

sonarcloud bot commented Nov 7, 2024

minhtridn2001 Nov 14, 2024

minhtridn2001 Nov 14, 2024

minhtridn2001 Nov 14, 2024

minhtridn2001 Nov 14, 2024

minhtridn2001 Nov 14, 2024

minhtridn2001 Nov 14, 2024

minhtridn2001 Nov 14, 2024

duylv27 Nov 14, 2024

duylv27 Nov 14, 2024 •

edited

Loading

duylv27 Nov 14, 2024


		CheckoutVm checkoutVm = checkoutMapper.toVm(savedCheckout);
		if (CollectionUtils.isEmpty(checkoutPostVm.checkoutItemPostVms())) {


		ProductGetCheckoutListVm response = productService.getProductInfomation(productIds, 0, productIds.size());

		if (response != null) {

		import com.yas.order.config.ServiceUrlConfig;
		import com.yas.order.utils.AuthenticationUtils;

Update "create checkout" follows new design #1224

Are you sure you want to change the base?

Update "create checkout" follows new design #1224

Conversation

NhatTranMinh15 commented Oct 23, 2024

github-actions bot commented Oct 23, 2024 • edited Loading

Order Coverage Report

github-actions bot commented Oct 30, 2024 • edited Loading

Customer Coverage Report

minhtridn2001 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sonarcloud bot commented Nov 7, 2024

Quality Gate passed for 'order'

sonarcloud bot commented Nov 7, 2024

Quality Gate passed for 'customer'

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

duylv27 Nov 14, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Oct 23, 2024 •

edited

Loading

github-actions bot commented Oct 30, 2024 •

edited

Loading

duylv27 Nov 14, 2024 •

edited

Loading