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

…va/workshopb2-group-4

# Conflicts:
#	kbazaar/src/main/java/com/kampus/kbazaar/cart/Cart.java

infra/gitops/dev/deployment.yml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
         - name: kbazaar-api
-          image: ghcr.io/kbtg-kampus-classnest-se-java/workshopb2-group-4:02b564fd4756157c7ca83761b863e2cfc16e0726
+          image: ghcr.io/kbtg-kampus-classnest-se-java/workshopb2-group-4:9c5aa03f180dd688190dc1cd8363acf36f0ebaf1
           imagePullPolicy: Always
           ports:
             - containerPort: 8080

kbazaar/build.gradle

@@ -15,17 +15,6 @@ jacocoTestReport {
     }
 }
 
-spotless {
-    java {
-        importOrder()
-        removeUnusedImports()
-        googleJavaFormat().aosp()
-        trimTrailingWhitespace()
-        formatAnnotations()
-        endWithNewline()
-    }
-}
-
 group = 'com.kampus'
 version = '0.0.1-SNAPSHOT'
 

kbazaar/makefile

@@ -40,3 +40,6 @@ docker-build:
 
 docker-run:
 	docker run -p 8080:8080 kbazaar
+
+# test commit spotlessApply
+# test commit spotlessApply

kbazaar/src/main/java/com/kampus/kbazaar/KBazaarApplication.java

@@ -1,12 +1,12 @@
-package com.kampus.kbazaar;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class KBazaarApplication {
-
-    public static void main(String[] args) {
-        SpringApplication.run(KBazaarApplication.class, args);
-    }
-}
+package com.kampus.kbazaar;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class KBazaarApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(KBazaarApplication.class, args);
+    }
+}

kbazaar/src/main/java/com/kampus/kbazaar/cart/Cart.java

@@ -30,7 +30,7 @@ public class Cart {
     private String promotionCodes;
 
     @Description("precisely reflect its pre-discount status")
-    @Column(name = "subtotal")
+    @Column(name = "sub_total")
     private BigDecimal subtotal;
 
     @Description("the final, all-inclusive amount to be paid.")

kbazaar/src/main/java/com/kampus/kbazaar/cart/CartController.java

@@ -1,14 +1,25 @@
 package com.kampus.kbazaar.cart;
 
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/api/v1")
 public class CartController {
 
+    private CartService cartService;
+
+    public CartController(CartService cartService) {
+        this.cartService = cartService;
+    }
+
     @GetMapping("/carts")
-    public ResponseEntity getCart() { // NOSONAR
-        return ResponseEntity.ok().build();
+    public ResponseEntity<List<CartResponse>> getCart() { // NOSONAR
+//        return ResponseEntity.ok().build();
+
+        return new ResponseEntity<>(cartService.getAll(), HttpStatus.OK);
     }
 }

kbazaar/src/main/java/com/kampus/kbazaar/cart/CartResponse.java

@@ -1,48 +1,53 @@
-package com.kampus.kbazaar.cart;
-
-import com.kampus.kbazaar.cartItem.CartItem;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-public class CartResponse {
-    private String username;
-    private List<CartItem> items;
-    private BigDecimal discount;
-    private BigDecimal totalDiscount;
-    private BigDecimal subtotal;
-    private BigDecimal grandTotal;
-
-    public CartResponse(String username, List<CartItem> items, BigDecimal discount, BigDecimal totalDiscount, BigDecimal subtotal, BigDecimal grandTotal) {
-        this.username = username;
-        this.items = items;
-        this.discount = discount;
-        this.totalDiscount = totalDiscount;
-        this.subtotal = subtotal;
-        this.grandTotal = grandTotal;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public List<CartItem> getItems() {
-        return items;
-    }
-
-    public BigDecimal getDiscount() {
-        return discount;
-    }
-
-    public BigDecimal getTotalDiscount() {
-        return totalDiscount;
-    }
-
-    public BigDecimal getSubtotal() {
-        return subtotal;
-    }
-
-    public BigDecimal getGrandTotal() {
-        return grandTotal;
-    }
-}
+package com.kampus.kbazaar.cart;
+
+import com.kampus.kbazaar.cartItem.CartItem;
+import java.math.BigDecimal;
+import java.util.List;
+
+public class CartResponse {
+    private String username;
+    private List<CartItem> items;
+    private BigDecimal discount;
+    private BigDecimal totalDiscount;
+    private BigDecimal subtotal;
+    private BigDecimal grandTotal;
+
+    public CartResponse(
+            String username,
+            List<CartItem> items,
+            BigDecimal discount,
+            BigDecimal totalDiscount,
+            BigDecimal subtotal,
+            BigDecimal grandTotal) {
+        this.username = username;
+        this.items = items;
+        this.discount = discount;
+        this.totalDiscount = totalDiscount;
+        this.subtotal = subtotal;
+        this.grandTotal = grandTotal;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public List<CartItem> getItems() {
+        return items;
+    }
+
+    public BigDecimal getDiscount() {
+        return discount;
+    }
+
+    public BigDecimal getTotalDiscount() {
+        return totalDiscount;
+    }
+
+    public BigDecimal getSubtotal() {
+        return subtotal;
+    }
+
+    public BigDecimal getGrandTotal() {
+        return grandTotal;
+    }
+}