Stock logic fix

backend/src/main/java/com/matchmycoffee/controller/controlleradvice/OrderValidationErrorHandler.java

@@ -10,10 +10,12 @@
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
 
 import java.time.Instant;
 
@@ -57,6 +59,25 @@ public final ErrorResponse handleInsufficientStockException(InsufficientStockExc
         return buildErrorResponse(HttpStatus.CONFLICT, e.getMessage());
     }
 
+    @ExceptionHandler(MethodArgumentTypeMismatchException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    @ResponseBody
+    public final ErrorResponse handleTypeMismatch(MethodArgumentTypeMismatchException e) {
+        log.debug("MethodArgumentTypeMismatchException occurred", e);
+        String message = String.format("Invalid value '%s' for parameter '%s'.", e.getValue(), e.getName());
+        return buildErrorResponse(HttpStatus.BAD_REQUEST, message);
+    }
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    @ResponseBody
+    public final ErrorResponse handleValidationExceptions(MethodArgumentNotValidException e) {
+        log.debug("MethodArgumentNotValidException occurred", e);
+        String message = e.getBindingResult().getAllErrors().get(0).getDefaultMessage();
+        return buildErrorResponse(HttpStatus.BAD_REQUEST, message);
+    }
+
+
     @Data
     @Getter
     @Setter

backend/src/main/java/com/matchmycoffee/dto/response/product/ProductSummaryResponse.java

@@ -20,4 +20,6 @@ public class ProductSummaryResponse {
     private Integer roastLevel;
     private Double averageRating;
     private Long reviewCount;
+    private Integer stock;
+    private Boolean isActive;
 }

backend/src/main/java/com/matchmycoffee/service/impl/OrderServiceImpl.java

@@ -135,11 +135,6 @@ public Order addItemToOrder(Long orderId, OrderItemRequest itemRequest)
             throw new IllegalOrderArgumentException("Order status is not pending!");
         }
 
-        if (!product.getIsActive()) {
-            log.error("Product is not active: {}", product.getName());
-            throw new IllegalOrderArgumentException("Product is not active!");
-        }
-
         // Create OrderItem with price from product
         OrderItem orderItem = new OrderItem();
         orderItem.setOrder(savedOrder);

frontend/README.md

@@ -205,10 +205,6 @@ Both contexts persist data to `localStorage` for a seamless user experience acro
 
 See `package.json` for the complete list of dependencies.
 
-## 🚧 Development Status
-
-Currently, the frontend is using **mock data** from `src/utils/DummyProducts.ts`. The API integration layer in `src/services/main.api.ts` is prepared for backend integration but returns dummy data for now.
-
 ### Next Steps
 
 - Connect to actual Spring Boot backend API

frontend/public/locales/en/translation.json

@@ -41,7 +41,8 @@
     "quantity": "Quantity",
     "writeReviewPlaceholder": "Write your review here...",
     "reviewerName": "Your Name",
-    "reviewerNamePlaceholder": "Enter your name"
+    "reviewerNamePlaceholder": "Enter your name",
+    "outOfStock": "Out of Stock"
   },
   "title": "Match My Coffee",
   "description": "Find your perfect coffee match based on your preferences and taste!",

frontend/src/components/cart/CheckoutModal.tsx

@@ -1,3 +1,4 @@
+import axios from 'axios';
 import { useState } from 'react';
 import { Alert, Modal, Spinner } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
@@ -25,7 +26,9 @@ function CheckoutModal(props: CheckoutModalProps) {
     const [error, setError] = useState<string | null>(null);
 
     const handleConfirm = async () => {
-        if (!order) return;
+        if (!order) {
+            return;
+        }
 
         setIsSubmitting(true);
         setError(null);
@@ -41,9 +44,21 @@ function CheckoutModal(props: CheckoutModalProps) {
             }, 5000);
             onHide();
         } catch (err) {
-            console.error('Failed to submit order:', err);
-            const errorMessage = (err as { response?: { data?: { error?: string } } })?.response?.data?.error;
-            setError(errorMessage ?? t('checkout.orderSubmitError') ?? 'Failed to submit order. Please try again.');
+            if (axios.isAxiosError(err)) {
+                const responseData = err.response?.data as
+                    | { data: { message: string } }
+                    | { message: string }
+                    | undefined;
+
+                const backendMessage =
+                    (responseData && 'data' in responseData && responseData.data?.message) ??
+                    (responseData && 'message' in responseData && responseData.message) ??
+                    err.message;
+
+                setError(backendMessage || 'An unexpected error occurred');
+            } else {
+                setError('An unexpected error occurred');
+            }
         } finally {
             setIsSubmitting(false);
         }

frontend/src/components/common/ProductCard.tsx

@@ -1,13 +1,12 @@
-import { Button, ButtonGroup, Card, Dropdown, DropdownButton } from 'react-bootstrap';
+import { Button, Card } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
 import { IoCloseSharp } from 'react-icons/io5';
 import { Link } from 'react-router-dom';
 
 import { useProductActions } from '../../hooks/useProductActions.ts';
 import type { ProductSummary } from '../../types/ProductsType.ts';
-import AddToCartButton from '../common/AddToCartButton.tsx';
-import AddToFavoritesButton from '../common/AddToFavoritesButton.tsx';
 import StarRating from '../common/StarRating.tsx';
+import CustomButtonGroup from '../product/CustomButtonGroup.tsx';
 import style from './ProductCard.module.css';
 
 interface ProductTypeProps {
@@ -53,27 +52,18 @@ function ProductCard(props: ProductTypeProps) {
                         <StarRating rating={data.averageRating} showCount={data.reviewCount} key={data.id} />
                     </div>
                 </Link>
-                {inCart ? (
-                    <>
-                        <DropdownButton
-                            as={ButtonGroup}
-                            key={'cart-count'}
-                            id={`cart-count`}
-                            variant={'none'}
-                            title={`${t('product.quantity')}: ${currentQuantity}`}
-                            onSelect={handleQuantitySelect}
-                        >
-                            {Array.from({ length: 10 }, (_, i) => i + 1).map((count) => (
-                                <Dropdown.Item key={count} eventKey={count.toString()}>
-                                    {count}
-                                </Dropdown.Item>
-                            ))}
-                        </DropdownButton>
-                    </>
+                {data.isActive || data.stock > 0 ? (
+                    <div className={style.buttonGroup}>
+                        <CustomButtonGroup
+                            inCart={inCart}
+                            data={data}
+                            currentQuantity={currentQuantity}
+                            handleQuantitySelect={handleQuantitySelect}
+                        />
+                    </div>
                 ) : (
-                    <AddToCartButton product={data} variant={'icon-only'} inCart={inCart} />
+                    <div className={style.outOfStockLabel}>{t('product.outOfStock')}</div>
                 )}
-                <AddToFavoritesButton product={data} variant={'icon-only'} />
             </Card.Body>
         </Card>
     );

frontend/src/components/product/CustomButtonGroup.tsx

@@ -0,0 +1,43 @@
+import { ButtonGroup, Dropdown, DropdownButton } from 'react-bootstrap';
+import { useTranslation } from 'react-i18next';
+
+import type { ProductSummary } from '../../types/ProductsType.ts';
+import AddToCartButton from '../common/AddToCartButton.tsx';
+import AddToFavoritesButton from '../common/AddToFavoritesButton.tsx';
+
+interface CustomButtonGroupProps {
+    inCart?: boolean;
+    data: ProductSummary;
+    currentQuantity: number;
+    handleQuantitySelect: (eventKey: string | null) => void;
+}
+
+function CustomButtonGroup({ inCart, data, currentQuantity, handleQuantitySelect }: CustomButtonGroupProps) {
+    const { t } = useTranslation();
+
+    return (
+        <>
+            {inCart ? (
+                <DropdownButton
+                    as={ButtonGroup}
+                    key={'cart-count'}
+                    id={`cart-count`}
+                    variant={'none'}
+                    title={`${t('product.quantity')}: ${currentQuantity}`}
+                    onSelect={handleQuantitySelect}
+                >
+                    {Array.from({ length: Math.min(10, data.stock) }, (_, i) => i + 1).map((count) => (
+                        <Dropdown.Item key={count} eventKey={count.toString()}>
+                            {count}
+                        </Dropdown.Item>
+                    ))}
+                </DropdownButton>
+            ) : (
+                <AddToCartButton product={data} variant={'icon-only'} inCart={inCart} />
+            )}
+            <AddToFavoritesButton product={data} variant={'icon-only'} />
+        </>
+    );
+}
+
+export default CustomButtonGroup;

frontend/src/pages/CartCheckoutPage.tsx

@@ -1,3 +1,4 @@
+import axios from 'axios';
 import React, { useContext, useState } from 'react';
 import { Alert, Dropdown, DropdownButton, Form } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
@@ -105,9 +106,19 @@ function CartCheckoutPage() {
             setCreatedOrder(order);
             setModalShow(true);
         } catch (err) {
-            console.error('Failed to create order:', err);
-            const errorMessage = (err as { response?: { data?: { error?: string } } })?.response?.data?.error;
-            setError(errorMessage ?? t('checkout.orderCreationError') ?? 'Failed to create order. Please try again.');
+            if (axios.isAxiosError(err)) {
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+                const responseData = err.response?.data;
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
+                const backendMessage = responseData?.data?.message ?? responseData?.message ?? err.message;
+
+                setError(
+                    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+                    backendMessage ?? t('checkout.orderCreationError') ?? 'Failed to create order. Please try again.',
+                );
+            } else {
+                setError(t('checkout.orderCreationError') ?? 'Failed to create order. Please try again.');
+            }
         } finally {
             setIsSubmitting(false);
         }

frontend/src/pages/ProductPage.tsx

@@ -51,10 +51,14 @@ function ProductPage() {
                     </div>
                     <div className={style.purchaseSection}>
                         <h3>{product.price} $</h3>
-                        <div className={style.buttonContainer}>
-                            <AddToCartButton product={product} variant={'with-text'} />
-                            <AddToFavoritesButton product={product} variant={'with-text'} />
-                        </div>
+                        {product.isActive && product.stock > 0 ? (
+                            <div className={style.buttonContainer}>
+                                <AddToCartButton product={product} variant={'with-text'} />
+                                <AddToFavoritesButton product={product} variant={'with-text'} />
+                            </div>
+                        ) : (
+                            <h2>{t('product.outOfStock')}</h2>
+                        )}
                     </div>
                 </div>
             </div>
@@ -121,23 +125,25 @@ function ProductPage() {
                         </tbody>
                     </Table>
                 </div>
-                <section id={'reviews'}>
-                    <div className={style.reviewsSection}>
-                        <h2>{t('product.reviews')}</h2>
-                        <AddReview refetchWithInvalidation={refetchWithInvalidation} productId={product.id} />
-                        {Array.isArray(reviews) && reviews.length !== 0
-                            ? reviews.map((review, index) => (
-                                  <div key={`${review.id}-${index}`} className={style.reviewCard}>
-                                      <div className={style.reviewHeader}>
-                                          <p>{review.authorName}</p>
-                                          <StarRating rating={review.rating} size={20} />
+                {product.isActive && product.stock > 0 ? (
+                    <section id={'reviews'}>
+                        <div className={style.reviewsSection}>
+                            <h2>{t('product.reviews')}</h2>
+                            <AddReview refetchWithInvalidation={refetchWithInvalidation} productId={product.id} />
+                            {Array.isArray(reviews) && reviews.length !== 0
+                                ? reviews.map((review, index) => (
+                                      <div key={`${review.id}-${index}`} className={style.reviewCard}>
+                                          <div className={style.reviewHeader}>
+                                              <p>{review.authorName}</p>
+                                              <StarRating rating={review.rating} size={20} />
+                                          </div>
+                                          <p>{review.comment}</p>
                                       </div>
-                                      <p>{review.comment}</p>
-                                  </div>
-                              ))
-                            : null}
-                    </div>
-                </section>
+                                  ))
+                                : null}
+                        </div>
+                    </section>
+                ) : null}
             </div>
         </div>
     );

frontend/src/types/ProductsType.ts

@@ -6,6 +6,8 @@ export interface ProductSummary {
     price: number;
     imageUrl: string;
     isBlend: boolean;
+    stock: number;
+    isActive: boolean;
 
     specifications: {
         roastLevel: number;
@@ -17,8 +19,6 @@ export interface ProductSummary {
 
 export interface ProductDetail extends ProductSummary {
     description: string;
-    stock: number;
-    isActive: boolean;
 
     specifications: {
         roastLevel: number;