Changeset e48199a

Timestamp:

05/07/25 18:34:01 (10 days ago)

Author:

Aleksandar Panovski <apano77@…>

Branches:

main

Parents:

b67dfd3

Message:

Final version for DB

Files:

• my-react-app/src/App.js (modified) (3 diffs)
• my-react-app/src/components/ErrorPage.js (modified) (2 diffs)
• my-react-app/src/components/Layout.js (modified) (1 diff)
• my-react-app/src/components/ReadOnlyMenuList.js (modified) (1 diff)
• my-react-app/src/components/ReservationConfirmation.js (modified) (4 diffs)
• my-react-app/src/components/ReservationEdit.js (modified) (5 diffs)
• my-react-app/src/components/RestaurantDetails.js (modified) (1 diff)
• my-react-app/src/components/StarRating.js (modified) (3 diffs)
• my-react-app/src/components/TimeSlotList.js (deleted)
• src/main/java/com/example/rezevirajmasa/demo/dto/PreorderedItemDto.java (added)
• src/main/java/com/example/rezevirajmasa/demo/dto/ReservationDTO.java (modified) (10 diffs)
• src/main/java/com/example/rezevirajmasa/demo/model/Menu.java (modified) (1 diff)
• src/main/java/com/example/rezevirajmasa/demo/model/PreorderedItem.java (modified) (2 diffs)
• src/main/java/com/example/rezevirajmasa/demo/model/PriceHistory.java (added)
• src/main/java/com/example/rezevirajmasa/demo/model/Reservation.java (modified) (1 diff)
• src/main/java/com/example/rezevirajmasa/demo/repository/PriceHistoryRepository.java (added)
• src/main/java/com/example/rezevirajmasa/demo/service/MenuService.java (modified) (1 diff)
• src/main/java/com/example/rezevirajmasa/demo/service/impl/MenuServiceImpl.java (modified) (3 diffs)
• src/main/java/com/example/rezevirajmasa/demo/service/impl/ReservationImpl.java (modified) (5 diffs)
• src/main/java/com/example/rezevirajmasa/demo/web/rest/testController.java (modified) (1 diff)

my-react-app/src/App.js

@@ -96 +96 @@
                 const option = currentTime.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit', hour12: false });
                 slots.push(option);
-                currentTime.setMinutes(currentTime.getMinutes() + 15); // Increment by 15 minutes
+                currentTime.setMinutes(currentTime.getMinutes() + 15);
             }
 
@@ -322 +322 @@
                             <div className="card-body">
                                 <div className="row">
-                                    {/* Narrow left column: info and actions */}
+
                                     <div className="col-md-4">
                                         <RestaurantInfo key={restaurant.id} restaurant={restaurant}/>
@@ -340 +340 @@
                                     </div>
 
-                                    {/* Wide right column: menu */}
+
                                     <div className="col-md-8">
                                         <ReadOnlyMenuList restaurantId={restaurant.restaurantId}/>

my-react-app/src/components/ErrorPage.js

@@ -1 @@
-// ErrorPage.js
 import React from 'react';
 
@@ -7 +6 @@
             <h1>Oops! Something went wrong.</h1>
             <p>Please try again later or contact support.</p>
-            {/* Add any additional content or error-specific messages */}
         </div>
     );

my-react-app/src/components/Layout.js

@@ -1 @@
-// Layout.js
 import React from 'react';
 import Header from './Header';

my-react-app/src/components/ReadOnlyMenuList.js

@@ -14 +14 @@
                 const response = await axios.get(`http://localhost:8081/api/restaurant-menu/${restaurantId}`);
                 setMenuItems(response.data);
-                setCurrentPage(1); // Reset to first page on restaurant change
+                setCurrentPage(1);
             } catch (err) {
                 console.error('Failed to fetch menu:', err);

my-react-app/src/components/ReservationConfirmation.js

@@ -27 +27 @@
                 const tableResponse = await axios.get(`http://localhost:8081/api/tables/${tableNumber}`);
                 setTable(tableResponse.data);
-                console.log(tableResponse.data)
                 const restaurantResponse = await axios.get(`http://localhost:8081/api/restaurants/${restaurantId}`);
                 setRestaurant(restaurantResponse.data);
@@ -65 +64 @@
                 preorderedItemName: item.itemName,
                 quantity: item.quantity,
-                price: item.price
+                price: item.price,
+                menuID: item.menuID
             }))
         };
@@ -76 +76 @@
                 }
             });
-            console.log('Reservation created successfully:', response.data);
             navigate("/reservations")
         } catch (error) {
@@ -112 +111 @@
             localStorage.removeItem('remainingTime');
             alert("Time has expired. Please try reserving again.");
-            navigate('/restaurants'); // Redirect or take necessary action
+            navigate('/restaurants');
         }
     }, [remainingTime, navigate]);

my-react-app/src/components/ReservationEdit.js

@@ -30 +30 @@
                 setIsLoading(true);
                 const response = await axios.get(`http://localhost:8081/api/reservations/${reservationId}`);
-                console.log(response)
                 setCheckInTime(response.data.reservationDateTime);
                 setFormData(response.data);
-                setRestaurant(response.data.restaurantName);
+
                 setRestaurantId(response.data.restaurantId);
+                const restaurantResponse = await axios.get(`http://localhost:8081/api/restaurants/${response.data.restaurantId}`);
+                setRestaurant(restaurantResponse.data);
 
                 setTableNumber(response.data.tableNumber);
@@ -45 +46 @@
             }
         };
-
         fetchReservation();
     }, [reservationId]);
@@ -64 +64 @@
         }
     }, [table]);
-
-    const generateTimeOptions = (operatingHours) => {
-        const now = new Date();
-        const selectedDateObj = new Date(selectedDate);
-
-        const { startTime, endTime } = parseOperatingHours(operatingHours, selectedDateObj);
-
-        const isToday = selectedDateObj.toDateString() === now.toDateString();
-
-        let currentTime;
-
-        if (isToday) {
-            const roundedNow = roundToNext15Minutes(now);
-
-            if (roundedNow < startTime) {
-                currentTime = startTime;
-            } else if (roundedNow > endTime) {
-                return [];
-            } else {
-                currentTime = roundedNow;
-            }
-        } else {
-            currentTime = startTime;
-        }
-
-        const options = [];
-        while (currentTime <= endTime) {
-            options.push(currentTime.toTimeString().slice(0, 5));
-            currentTime = new Date(currentTime.getTime() + 15 * 60 * 1000);
-        }
-
-        return options;
-    };
-
-    const roundToNext15Minutes = (date) => {
-        const ms = 1000 * 60 * 15;
-        return new Date(Math.ceil(date.getTime() / ms) * ms);
-    };
 
     useEffect(() => {
@@ -178 +140 @@
     const formattedDate = `${year}-${month}-${day}`;
 
-    const parseOperatingHours = (operatingHours, forDate) => {
-        const [start, end] = operatingHours.split('-');
-
-        const [startHour, startMinute] = start.split(':').map(Number);
-        const [endHour, endMinute] = end.split(':').map(Number);
-
-        const startTime = new Date(forDate);
-        startTime.setHours(startHour, startMinute, 0, 0);
-
-        const endTime = new Date(forDate);
-        endTime.setHours(endHour, endMinute, 0, 0);
-
-        return { startTime, endTime };
-    };
-
-    useEffect(() => {
-        if (formData?.restaurant?.operatingHours && selectedDate) {
-            const options = generateTimeOptions(formData.restaurant.operatingHours);
+    const generateTimeOptions = (operatingHours) => {
+        const now = new Date();
+        const selectedDateObj = new Date(selectedDate);
+        const isToday = selectedDateObj.toDateString() === now.toDateString();
+
+        let options = [];
+        for (const hours of operatingHours.split(',')) {
+            const [start, end] = hours.trim().split('-');
+            const startTime = new Date(selectedDateObj);
+            const endTime = new Date(selectedDateObj);
+            const [startHour, startMinute] = start.split(':').map(Number);
+            const [endHour, endMinute] = end.split(':').map(Number);
+            startTime.setHours(startHour, startMinute, 0);
+            endTime.setHours(endHour, endMinute, 0);
+
+            if (isToday && startTime < now) {
+                startTime.setTime(roundToNext15Minutes(now).getTime());
+            }
+
+            if (endTime <= now) {
+                setNoAvailableMessage('No available time due to closing.');
+                continue;
+            }
+
+            while (startTime <= endTime) {
+                options.push(startTime.toTimeString().slice(0, 5));
+                startTime.setMinutes(startTime.getMinutes() + 15);
+            }
+        }
+
+        return options.length ? options : ['No available time'];
+    };
+
+    const roundToNext15Minutes = (date) => {
+        const ms = 1000 * 60 * 15;
+        const roundedTime = new Date(Math.ceil(date.getTime() / ms) * ms);
+
+        if (roundedTime.getTime() === date.getTime()) {
+            roundedTime.setMinutes(roundedTime.getMinutes() + 15);
+        }
+
+        return roundedTime;
+    };
+
+    useEffect(() => {
+        if (restaurant?.operatingHours && selectedDate) {
+            const options = generateTimeOptions(restaurant.operatingHours);
             setTimeOptions(options);
         }
     }, [restaurant, selectedDate]);
 
-        // useEffect(() => {
-        //     if (checkInTime) {
-        //         const checkInDateObj = new Date(checkInTime);
-        //         setSelectedDate(checkInDateObj.toISOString().split("T")[0]);
-        //         setSelectedTime(checkInDateObj.toTimeString().slice(0, 5));
-        //     }
-        // }, [checkInTime]);
 
     return (
@@ -217 +201 @@
                     <div className="card-body">
                         <h2 className="card-title">
-                            {formData.restaurant.name} <StarRating key={formData.restaurant.id} rating={formData.restaurant.rating} />
+                            {restaurant?.name}
+                            <StarRating key={restaurant?.id} rating={restaurant?.rating || 0}/>
                         </h2>
-                        <p className="card-text">{formData.restaurant.name}</p>
-                        <p className="card-text">{formData.restaurant.operatingHours}</p>
-                        <p className="card-text">Ul. {formData.restaurant.address}</p>
-                        <br />
+                        <p className="card-text">Operating Hours: {restaurant?.operatingHours}</p>
+                        <p className="card-text">Address: Ul. {restaurant?.address}</p>
+                        <br/>
                     </div>
                     <form onSubmit={handleSubmit}>

my-react-app/src/components/RestaurantDetails.js

@@ -111 +111 @@
         });
     };
-
-    console.log(preOrderedItems)
 
     const roundToNext15Minutes = (date) => {

my-react-app/src/components/StarRating.js

@@ -2 +2 @@
 
 const StarRating = ({ rating }) => {
-    // Convert the rating to a number between 0 and 5
     const normalizedRating = Math.min(Math.max(0, rating), 5);
-    // Calculate the number of filled stars
     const filledStars = Math.floor(normalizedRating);
-    // Calculate the number of half stars
     const hasHalfStar = normalizedRating - filledStars >= 0.5;
 
@@ -12 +9 @@
         <div>
             {[...Array(filledStars)].map((_, index) => (
-                <span key={index} className="star">&#9733;</span>
+                <span key={`filled-${index}`} className="star">&#9733;</span>
             ))}
-            {hasHalfStar && <span className="star">&#9734;</span>}
+
+            {hasHalfStar && <span className="star half">&#9733;</span>}
+
             {[...Array(5 - filledStars - (hasHalfStar ? 1 : 0))].map((_, index) => (
-                <span key={filledStars + index + 1} className="star">&#9734;</span>
+                <span key={`empty-${index}`} className="star">&#9734;</span>
             ))}
         </div>
@@ -23 +22 @@
 
 export default StarRating;
+

src/main/java/com/example/rezevirajmasa/demo/dto/ReservationDTO.java

@@ -4 +4 @@
 import com.example.rezevirajmasa.demo.model.Reservation;
 import com.example.rezevirajmasa.demo.model.Restaurant;
+import lombok.Setter;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.stream.Collectors;
 
+@Setter
 public class ReservationDTO {
     private Long reservationID;
@@ -21 +24 @@
     private String specialRequests;
     private String paymentStatus;
-    private List<PreorderedItem> preOrderedItems;
+    private List<PreorderedItemDto> preOrderedItems;
 
     public ReservationDTO() {
@@ -29 +32 @@
                           LocalDateTime reservationDateTime, LocalDateTime checkInTime, Long restaurantId,
                           int partySize, String reservationStatus, String specialRequests,
-                          String paymentStatus, List<PreorderedItem> preOrderedItems) {
+                          String paymentStatus, List<PreorderedItemDto> preOrderedItems) {
         this.reservationID = reservationID;
         this.userEmail = userEmail;
@@ -56 +59 @@
         this.specialRequests = reservation.getSpecialRequests();
         this.paymentStatus = reservation.getPaymentStatus();
-        this.preOrderedItems = reservation.getPreOrderedItems();
+
+        this.preOrderedItems = reservation.getPreOrderedItems().stream()
+                .map(preorderedItem -> new PreorderedItemDto(
+                        preorderedItem.getPreorderedItemName(),
+                        preorderedItem.getQuantity(),
+                        preorderedItem.getPrice(),
+                        preorderedItem.getMenu().getMenuID()))
+                .collect(Collectors.toList());
     }
 
@@ -63 +73 @@
     }
 
-    public void setReservationID(Long reservationID) {
-        this.reservationID = reservationID;
-    }
-
     public String getUserEmail() {
         return userEmail;
-    }
-
-    public void setUserEmail(String userEmail) {
-        this.userEmail = userEmail;
     }
 
@@ -79 +81 @@
     }
 
-    public void setRating(BigDecimal rating) {
-        this.rating = rating;
-    }
-
     public Long getTableNumber() {
         return tableNumber;
-    }
-
-    public void setTableNumber(Long tableNumber) {
-        this.tableNumber = tableNumber;
     }
 
@@ -95 +89 @@
     }
 
-    public void setReservationDateTime(LocalDateTime reservationDateTime) {
-        this.reservationDateTime = reservationDateTime;
-    }
-
     public LocalDateTime getCheckInTime() {
         return checkInTime;
-    }
-
-    public void setCheckInTime(LocalDateTime checkInTime) {
-        this.checkInTime = checkInTime;
     }
 
@@ -111 +97 @@
     }
 
-    public void setRestaurantId(Long restaurantId) {
-        this.restaurantId = restaurantId;
-    }
-
     public int getPartySize() {
         return partySize;
-    }
-
-    public void setPartySize(int partySize) {
-        this.partySize = partySize;
     }
 
@@ -127 +105 @@
     }
 
-    public void setReservationStatus(String reservationStatus) {
-        this.reservationStatus = reservationStatus;
-    }
-
     public String getSpecialRequests() {
         return specialRequests;
-    }
-
-    public void setSpecialRequests(String specialRequests) {
-        this.specialRequests = specialRequests;
     }
 
@@ -143 +113 @@
     }
 
-    public void setPaymentStatus(String paymentStatus) {
-        this.paymentStatus = paymentStatus;
-    }
-
-    public List<PreorderedItem> getPreOrderedItems() {
+    public List<PreorderedItemDto> getPreOrderedItems() {
         return preOrderedItems;
     }
 
-    public void setPreOrderedItems(List<PreorderedItem> preOrderedItems) {
-        this.preOrderedItems = preOrderedItems;
-    }
 }

src/main/java/com/example/rezevirajmasa/demo/model/Menu.java

@@ -38 +38 @@
     private List<MenuTag> tags = new ArrayList<>();
 
+    @OneToMany(mappedBy = "menu", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY)
+    private List<PriceHistory> priceHistoryList = new ArrayList<>();
+
     public Menu() {
     }

src/main/java/com/example/rezevirajmasa/demo/model/PreorderedItem.java

@@ -26 +26 @@
     private Integer quantity;
 
+    @Column(name = "price_at_order", precision = 8, scale = 2, nullable = false)
     private BigDecimal price;
 
@@ -32 +33 @@
     @JoinColumn(name = "reservation_id", nullable = false)
     private Reservation reservation;
+
+    @ManyToOne
+    @JoinColumn(name = "menu_id", nullable = false)
+    private Menu menu;
 }

src/main/java/com/example/rezevirajmasa/demo/model/Reservation.java

@@ -1 +1 @@
 package com.example.rezevirajmasa.demo.model;
 
+import com.example.rezevirajmasa.demo.dto.PreorderedItemDto;
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.fasterxml.jackson.annotation.JsonManagedReference;

src/main/java/com/example/rezevirajmasa/demo/service/MenuService.java

@@ -3 +3 @@
 import com.example.rezevirajmasa.demo.model.Menu;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 public interface MenuService {
     public List<Menu> getMenuByRestaurantId(Long restaurantId);
+    public void updateMenuPrice(Long menuId, BigDecimal newPrice);
+    public Menu getMenuById(Long id);
 }

src/main/java/com/example/rezevirajmasa/demo/service/impl/MenuServiceImpl.java

@@ -2 +2 @@
 
 import com.example.rezevirajmasa.demo.model.Menu;
+import com.example.rezevirajmasa.demo.model.PriceHistory;
 import com.example.rezevirajmasa.demo.model.Restaurant;
 import com.example.rezevirajmasa.demo.repository.MenuRepository;
+import com.example.rezevirajmasa.demo.repository.PriceHistoryRepository;
 import com.example.rezevirajmasa.demo.service.MenuService;
 import com.example.rezevirajmasa.demo.service.RestaurantService;
+import org.openqa.selenium.InvalidArgumentException;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.List;
 
@@ -15 +20 @@
     private final RestaurantService restaurantService;
 
-    public MenuServiceImpl(MenuRepository menuRepository, RestaurantService restaurantService) {
+    private final PriceHistoryRepository priceHistoryRepository;
+
+    public MenuServiceImpl(MenuRepository menuRepository, RestaurantService restaurantService, PriceHistoryRepository priceHistoryRepository) {
         this.menuRepository = menuRepository;
         this.restaurantService = restaurantService;
+        this.priceHistoryRepository = priceHistoryRepository;
     }
 
@@ -25 +33 @@
         return menuRepository.findAllByRestaurant(restaurant);
     }
+
+    @Override
+    public void updateMenuPrice(Long menuId, BigDecimal newPrice) {
+        Menu menu = menuRepository.findById(menuId)
+                .orElseThrow(() -> new IllegalArgumentException("Menu not found"));
+
+        if (menu.getPrice() != null && !menu.getPrice().equals(newPrice)) {
+            PriceHistory priceHistory = new PriceHistory(menu, menu.getPrice(), LocalDateTime.now());
+            priceHistoryRepository.save(priceHistory);
+        }
+
+        menu.setPrice(newPrice);
+        menuRepository.save(menu);
+    }
+
+    @Override
+    public Menu getMenuById(Long id) {
+        return menuRepository.findById(id)
+                .orElseThrow(()->new InvalidArgumentException("Invalid id sent: " + id));
+    }
 }

src/main/java/com/example/rezevirajmasa/demo/service/impl/ReservationImpl.java

@@ -1 +1 @@
 package com.example.rezevirajmasa.demo.service.impl;
 
+import com.example.rezevirajmasa.demo.dto.PreorderedItemDto;
 import com.example.rezevirajmasa.demo.dto.ReservationDTO;
 import com.example.rezevirajmasa.demo.mappers.UserMapper;
@@ -8 +9 @@
 import com.example.rezevirajmasa.demo.repository.ReservationRepository;
 import com.example.rezevirajmasa.demo.repository.TableRepository;
+import com.example.rezevirajmasa.demo.service.MenuService;
 import com.example.rezevirajmasa.demo.service.ReservationHistoryService;
 import com.example.rezevirajmasa.demo.service.ReservationService;
 import com.example.rezevirajmasa.demo.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
@@ -31 +34 @@
     @Autowired
     private ReservationRepository reservationRepository;
+    @Autowired
+    @Lazy
+    private MenuService menuService;
 
     public ReservationImpl(UserMapper userMapper) {
@@ -82 +88 @@
             List<PreorderedItem> preOrderedItems = new ArrayList<>();
 
-            for (PreorderedItem dtoItem : reservationDTO.getPreOrderedItems()) {
+            for (PreorderedItemDto dtoItem : reservationDTO.getPreOrderedItems()) {
                 PreorderedItem item = new PreorderedItem();
                 item.setPreorderedItemName(dtoItem.getPreorderedItemName());
@@ -88 +94 @@
                 item.setPrice(dtoItem.getPrice());
                 item.setReservation(reservation);
+
+                Menu menu = menuService.getMenuById(dtoItem.getMenuID());
+                item.setMenu(menu);
 
                 preOrderedItems.add(item);

src/main/java/com/example/rezevirajmasa/demo/web/rest/testController.java

@@ -64 +64 @@
     @GetMapping("/api/restaurants/{restaurantId}")
     public ResponseEntity<RestaurantDTO> getRestaurantById(@PathVariable Long restaurantId) {
-        return new ResponseEntity<RestaurantDTO>(restaurantService.findById(restaurantId), HttpStatus.OK);
+        RestaurantDTO restaurantDTO = restaurantService.findById(restaurantId);
+        return new ResponseEntity<>(restaurantDTO, HttpStatus.OK);
     }