Merge branch 'main' of github.com:KBTG-Kampus-ClassNest-SE-Java/works…

…hopb2-group-3
KBTG-Kampus-ClassNest-SE-Java · Mar 31, 2024 · 4cf7f64 · 4cf7f64
2 parents 3d4d50c + 00795cc
commit 4cf7f64
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
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,5 +1,6 @@
 package com.kampus.kbazaar.cart;
 
+import com.kampus.kbazaar.promotion.PromotionRequest;
 import java.util.List;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -27,8 +28,9 @@ public CartResponse addProduct(@RequestBody CartRequest cartRequest, @PathVariab
 
     @PostMapping("/cart/{username}/promotions")
     public ResponseEntity addPromotionToProduct(
-            @PathVariable() String username, CartRequest cartRequest) {
-        cartService.addProduct(cartRequest);
+            @PathVariable("username") String username,
+            @RequestBody() PromotionRequest promotionRequest) {
+        cartService.addProductPromotion(username, promotionRequest);
         return new ResponseEntity<>("System.", HttpStatus.OK);
     }
 }
diff --git a/kbazaar/src/main/java/com/kampus/kbazaar/cart/CartService.java b/kbazaar/src/main/java/com/kampus/kbazaar/cart/CartService.java
@@ -25,7 +25,8 @@ public class CartService {
     public CartService(
             CartRepository cartRepository,
             CartItemRepository cartItemRepository,
-            ProductRepository productRepository) {
+            ProductRepository productRepository,
+            PromotionRepository promotionRepository) {
         this.cartRepository = cartRepository;
         this.cartItemRepository = cartItemRepository;
         this.productRepository = productRepository;
@@ -110,6 +111,7 @@ public ResponseEntity addProductPromotion(String userName, PromotionRequest prom
         Optional<Promotion> promotion =
                 promotionRepository.findByCode(promotionRequest.promotionCode());
         Optional<Product> product = productRepository.findBySku(promotionRequest.productSku());
+        //        System.out.println(product);
 
         return null;
     }