bug fixed

Pachj · Jan 6, 2024 · 856a06a · 856a06a
1 parent 939d753
commit 856a06a
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 11 deletions.
diff --git a/shopi-backend/src/main/kotlin/ch/bbw/shopibackend/repository/CartRepository.kt b/shopi-backend/src/main/kotlin/ch/bbw/shopibackend/repository/CartRepository.kt
@@ -29,13 +29,25 @@ class CartRepository(
             .fetchOneInto(Int::class.java)
 
         if (cartId != null) {
-            // increase amount on cart_product by 1
-            context.update(CART_PRODUCT)
-                .set(CART_PRODUCT.COUNT, CART_PRODUCT.COUNT.plus(1))
+            // check if product is already in cart
+            val cartProductId = context.select(CART_PRODUCT.CART_FK, CART_PRODUCT.PRODUCT_FK)
+                .from(CART_PRODUCT)
                 .where(CART_PRODUCT.CART_FK.eq(cartId))
                 .and(CART_PRODUCT.PRODUCT_FK.eq(productId))
-                .execute()
+                .fetchOneInto(Int::class.java)
 
+            if (cartProductId == null) {
+                context.insertInto(CART_PRODUCT, CART_PRODUCT.COUNT, CART_PRODUCT.CART_FK, CART_PRODUCT.PRODUCT_FK)
+                    .values(1, cartId, productId)
+                    .execute()
+            } else {
+                // increase amount on cart_product by 1
+                context.update(CART_PRODUCT)
+                    .set(CART_PRODUCT.COUNT, CART_PRODUCT.COUNT.plus(1))
+                    .where(CART_PRODUCT.CART_FK.eq(cartId))
+                    .and(CART_PRODUCT.PRODUCT_FK.eq(productId))
+                    .execute()
+            }
         } else {
             cartId = context.insertInto(CART, CART.USER_FK)
                 .values(userId)

diff --git a/shopi-frontend/src/components/ShoppingCart/ShoppingCart.tsx b/shopi-frontend/src/components/ShoppingCart/ShoppingCart.tsx
@@ -1,7 +1,20 @@
 import React, { useEffect, useState } from "react";
-import { Box, CircularProgress, Modal, Table, TableBody, TableContainer, TextField, Typography } from "@mui/material";
+import {
+    Box,
+    CircularProgress,
+    IconButton,
+    Modal,
+    Table,
+    TableBody,
+    TableCell,
+    TableContainer,
+    TableRow,
+    TextField,
+    Typography,
+} from "@mui/material";
 import { getCart, updateCart } from "../../helpers/cartHelpers";
 import { Product } from "../ProductOverview/ProductOverview";
+import CloseIcon from "@mui/icons-material/Close";
 
 const boxStyle = {
     position: "absolute",
@@ -55,6 +68,11 @@ const ShoppingCart = ({ open, setOpen }: { open: boolean; setOpen: (b: boolean)
             }}
         >
             <Box sx={boxStyle}>
+                <div className={"flexEnd"} style={{ width: "100%" }}>
+                    <IconButton onClick={() => setOpen(false)}>
+                        <CloseIcon />
+                    </IconButton>
+                </div>
                 <Typography variant={"h4"}>Warenkorb</Typography>
                 {!shoppingCartIsLoaded && <CircularProgress />}
                 {shoppingCartIsLoaded && shoppingCart && shoppingCart.items.length === 0 && (
@@ -65,17 +83,17 @@ const ShoppingCart = ({ open, setOpen }: { open: boolean; setOpen: (b: boolean)
                         <Table>
                             <TableBody>
                                 {shoppingCart.items.map((item) => (
-                                    <tr key={item.product.id}>
-                                        <td>
+                                    <TableRow key={item.product.id}>
+                                        <TableCell>
                                             <TextField
                                                 type={"number"}
                                                 value={item.amount}
                                                 onChange={(e) => updateAmount(item.product, parseInt(e.target.value))}
                                             />
-                                        </td>
-                                        <td>{item.product.name}</td>
-                                        <td>{item.amount * item.product.price}</td>
-                                    </tr>
+                                        </TableCell>
+                                        <TableCell>{item.product.name}</TableCell>
+                                        <TableCell>{item.amount * item.product.price}</TableCell>
+                                    </TableRow>
                                 ))}
                             </TableBody>
                         </Table>