fix: cart props

kitcc-org · Nov 13, 2024 · 17bcfc3 · 17bcfc3
1 parent ffcf996
commit 17bcfc3
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 9 deletions.
diff --git a/frontend/app/components/books/BookCardCartButton.tsx b/frontend/app/components/books/BookCardCartButton.tsx
@@ -2,6 +2,7 @@ import { Button } from '@mantine/core';
 import { useAtom } from 'jotai';
 import { BiSolidCartAdd } from 'react-icons/bi';
 import { cartAtom } from '~/stores/cartAtom';
+import { addBookToCart } from '~/utils/cart';
 
 interface BookCardCartButtonProps {
 	id: number;
@@ -11,7 +12,7 @@ interface BookCardCartButtonProps {
 const BookCardCartButton = ({ id, stock }: BookCardCartButtonProps) => {
 	const [cart, setCart] = useAtom(cartAtom);
 	const addCart = () => {
-		setCart([...cart, { id, stock }]);
+		setCart(addBookToCart(cart, id, stock));
 	};
 	return (
 		<Button

diff --git a/frontend/app/components/books/BookCardHeader.tsx b/frontend/app/components/books/BookCardHeader.tsx
@@ -29,7 +29,7 @@ const BookCardHeader = ({
 			setSelectedBook(selectedBook.filter((element) => element.id !== id));
 		} else {
 			// 選択されていなかった場合は選択する
-			setSelectedBook([...selectedBook, { id, stock, title, thumbnail }]);
+			setSelectedBook([...selectedBook, { id, stock, thumbnail }]);
 		}
 	};
 

diff --git a/frontend/app/components/cart/CartCard.tsx b/frontend/app/components/cart/CartCard.tsx
@@ -14,7 +14,6 @@ const CartCard = ({ book }: CartCardProps) => {
 				<CartCardHeader
 					id={book.id}
 					stock={book.stock}
-					title={book.title}
 					volume={book.volume}
 					thumbnail={book.thumbnail}
 				/>

diff --git a/frontend/app/components/cart/CartCardHeader.tsx b/frontend/app/components/cart/CartCardHeader.tsx
@@ -7,15 +7,13 @@ import CartCardNumberInput from './CartCardNumberInput';
 interface CartCardHeaderProps {
 	id: number;
 	stock: number;
-	title: string;
 	volume: number;
 	thumbnail?: string;
 }
 
 const CartCardHeader = ({
 	id,
 	stock,
-	title,
 	volume,
 	thumbnail,
 }: CartCardHeaderProps) => {
@@ -32,7 +30,6 @@ const CartCardHeader = ({
 					return {
 						id: element.id,
 						stock: element.stock,
-						title: element.title,
 						thumbnail: element.thumbnail,
 						volume: value,
 					};
@@ -56,7 +53,7 @@ const CartCardHeader = ({
 			// 選択されていなかった場合は選択する
 			setSelectedCartBook([
 				...selectedCartBook,
-				{ id, stock, title, thumbnail, volume: 1 },
+				{ id, stock, thumbnail, volume: 1 },
 			]);
 		}
 	};

diff --git a/frontend/app/stores/bookAtom.ts b/frontend/app/stores/bookAtom.ts
@@ -3,7 +3,6 @@ import { atom } from 'jotai';
 export interface SelectedBookProps {
 	id: number;
 	stock: number;
-	title: string;
 	thumbnail?: string;
 }
 

diff --git a/frontend/app/utils/cart.ts b/frontend/app/utils/cart.ts
@@ -13,7 +13,6 @@ export const addBooksToCart = (
 			cart.push({
 				id: book.id,
 				stock: book.stock,
-				title: book.title,
 				thumbnail: book.thumbnail,
 				volume: 1,
 			});
@@ -22,6 +21,25 @@ export const addBooksToCart = (
 	return cart;
 };
 
+export const addBookToCart = (
+	cart: CartProps[],
+	bookId: number,
+	stock: number,
+) => {
+	const index = cart.findIndex((cartBook) => cartBook.id === bookId);
+	if (index !== -1) {
+		cart[index].volume += 1;
+	} else {
+		cart.push({
+			id: bookId,
+			stock,
+			thumbnail: '',
+			volume: 1,
+		});
+	}
+	return cart;
+};
+
 export const removeBooksFromCart = (cart: CartProps[], books: CartProps[]) => {
 	const idList = books.map((book) => book.id);
 	return cart.filter((cartBook) => !idList.includes(cartBook.id));