Merge remote-tracking branch 'origin/main'

KBTG-Kampus-ClassNest-SE-Java · Mar 24, 2024 · ae41d85 · ae41d85
2 parents 10b2081 + 1e3edf6
commit ae41d85
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/infra/gitops/dev/deployment.yml b/infra/gitops/dev/deployment.yml
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
         - name: kbazaar-api
-          image: ghcr.io/kbtg-kampus-classnest-se-java/workshop-group-2:3e197718264daad6ad77d8a2c4585c7a69ee96f5
+          image: ghcr.io/kbtg-kampus-classnest-se-java/workshop-group-2:bdf1b3108b1f2b27a2d8b2c59ce868e391a8cdc7
           imagePullPolicy: Always
           ports:
             - containerPort: 8080

diff --git a/kbazaar/src/main/java/com/kampus/kbazaar/cart/ApplyCodeRequest.java b/kbazaar/src/main/java/com/kampus/kbazaar/cart/ApplyCodeRequest.java
@@ -1,4 +1,4 @@
-package com.kampus.kbazaar.promotion;
+package com.kampus.kbazaar.cart;
 
 import java.util.List;
 import lombok.Data;

diff --git a/kbazaar/src/main/java/com/kampus/kbazaar/cart/CartController.java b/kbazaar/src/main/java/com/kampus/kbazaar/cart/CartController.java
@@ -1,6 +1,5 @@
 package com.kampus.kbazaar.cart;
 
-import com.kampus.kbazaar.promotion.ApplyCodeRequest;
 import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

diff --git a/kbazaar/src/main/java/com/kampus/kbazaar/cart/CartService.java b/kbazaar/src/main/java/com/kampus/kbazaar/cart/CartService.java
@@ -4,7 +4,6 @@
 import com.kampus.kbazaar.exceptions.NotFoundException;
 import com.kampus.kbazaar.product.Product;
 import com.kampus.kbazaar.product.ProductRepository;
-import com.kampus.kbazaar.promotion.ApplyCodeRequest;
 import com.kampus.kbazaar.promotion.Promotion;
 import com.kampus.kbazaar.promotion.PromotionRepository;
 import com.kampus.kbazaar.shopper.Shopper;
@@ -14,11 +13,15 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 @Service
 public class CartService {
 
+    @Value("${enabled.shipping.fee}")
+    private boolean enableShippingFee;
+
     private final PromotionRepository promotionRepository;
     private final ShopperRepository shopperRepository;
 
@@ -120,7 +123,12 @@ public CreateCartResponse createCart(String userName, CartRequest cartRequest) {
                     response.setItems(new ArrayList<>());
                     response.getItems().add(cartItem);
                 }
-                response.setFee(BigDecimal.valueOf(0));
+                if (enableShippingFee) {
+                    response.setFee(BigDecimal.valueOf(25));
+                } else {
+                    response.setFee(BigDecimal.valueOf(0));
+                }
+
                 response.setTotalPrice(totalPriceForReturn);
                 response.setTotalDiscount(totalDiscountForReturn);
             }