-
Reservation ID: {reservation.reservationID}
-
Restaurant: {reservation.restaurant.name}
-
Table Number: {reservation.table.id}
- {/* Format reservation date and time */}
-
Reservation
- Date: {new Date(reservation.checkInTime).toLocaleDateString('en-US', {
- weekday: 'long',
- year: 'numeric',
- month: 'long',
- day: 'numeric'
- })}
-
Reservation
- Time: {new Date(reservation.checkInTime).toLocaleTimeString('en-US', {
- hour: 'numeric',
- minute: 'numeric',
- hour12: true
- })}
- {/* End of formatted date and time */}
-
Party Size: {reservation.partySize}
-
Special
- Requests: {reservation.specialRequests}
-
Status: {reservation.status}
-
Grace period of 15 minutes +-
-
-
-
-
handleEditReservation(reservation.reservationID)}>Edit
- Reservation
+ {reservations.length === 0 ? (
+
+
No active reservations
+
Looking for a place to dine? Check out our restaurants .
+
+
+
+
Reservation ID: {reservation.reservationID}
+
Restaurant: {reservation?.restaurant.name || "Not specified"}
+
Table Number: {reservation?.tableNumber || "Not specified"}
+
+ Reservation Date: {reservation.checkInTime ?
+ new Date(reservation.checkInTime).toLocaleDateString('en-US', {
+ weekday: 'long', year: 'numeric', month: 'long', day: 'numeric'
+ }) :
+ "Not specified"}
+
+
+ Reservation Time: {reservation.checkInTime ?
+ new Date(reservation.checkInTime).toLocaleTimeString('en-US', {
+ hour: 'numeric', minute: 'numeric', hour12: true
+ }) :
+ "Not specified"}
+
+
Reservation made on: {reservation.reservationDateTime ?
+ new Date(reservation.reservationDateTime).toLocaleTimeString('en-US', {
+ hour: 'numeric', minute: 'numeric', hour12: true
+ }) :
+ "Not specified"} {reservation.reservationDateTime ?
+ new Date(reservation.reservationDateTime).toLocaleDateString('en-US', {
+ weekday: 'long', year: 'numeric', month: 'long', day: 'numeric'
+ }) :
+ "Not specified"}
+
Party Size: {reservation.partySize || "Not specified"}
+
Special Requests: {reservation.specialRequests || "None"}
+
Status: {reservation.status || "Pending"}
+
Grace period of 15 minutes +-
+
+ handleEditReservation(reservation.reservationID)}>
+ Edit Reservation
-
-
- handleCancelReservation(reservation.reservationID)}>Cancel
- Reservation
+ handleCancelReservation(reservation.reservationID)}>
+ Cancel Reservation
@@ -99,12 +106,11 @@
-
);
- p
-
};
export default Reservations;
+
Index: my-react-app/src/components/RestaurantContext.js
===================================================================
--- my-react-app/src/components/RestaurantContext.js (revision 8ca35dc93473fb5be3777778a84fedee941c8790)
+++ my-react-app/src/components/RestaurantContext.js (revision f5b256e5542dc70faf511ecc16ef87cc3d52cce5)
@@ -17,5 +17,5 @@
};
- fetchRestaurants().then(r => console.log(fetchRestaurants()));
+ fetchRestaurants();
}, []);
Index: my-react-app/src/components/RestaurantDetails.js
===================================================================
--- my-react-app/src/components/RestaurantDetails.js (revision 8ca35dc93473fb5be3777778a84fedee941c8790)
+++ my-react-app/src/components/RestaurantDetails.js (revision f5b256e5542dc70faf511ecc16ef87cc3d52cce5)
@@ -6,14 +6,15 @@
import StarRating from "./StarRating";
+
const RestaurantDetails = () => {
const navigate = useNavigate();
+ const { id } = useParams();
- const { id } = useParams();
const [restaurant, setRestaurant] = useState(null);
const [selectedTableId, setSelectedTableId] = useState('');
- const [selectedTimeSlot, setSelectedTimeSlot] = useState('');
+ const [selectedDate, setSelectedDate] = useState('');
+ const [selectedTime, setSelectedTime] = useState('');
+ const [timeOptions, setTimeOptions] = useState([]);
const [selectedTable, setSelectedTable] = useState(null);
- const [filteredTimeSlots, setFilteredTimeSlots] = useState([]);
- const [selectedCapacity, setSelectedCapacity] = useState(''); // Define selectedCapacity state
useEffect(() => {
@@ -32,5 +33,5 @@
useEffect(() => {
- if (!selectedTableId) return; // If no table is selected, return early
+ if (!selectedTableId) return;
const fetchTableDetails = async () => {
@@ -46,43 +47,69 @@
}, [selectedTableId]);
- useEffect(() => {
- if (!selectedTable || !restaurant) return; // If table or restaurant is not loaded, return early
+ const today = new Date();
+ const year = today.getFullYear();
+ const month = String(today.getMonth() + 1).padStart(2, '0');
+ const day = String(today.getDate()).padStart(2, '0');
+ const formattedDate = `${year}-${month}-${day}`;
+ const parseOperatingHours = (operatingHours) => {
+ const [start, end] = operatingHours.split('-');
+ const [startHour, startMinute] = start.split(':').map(Number);
+ const [endHour, endMinute] = end.split(':').map(Number);
- // Filter time slots based on the selected table
- const currentTime = new Date();
- const filteredSlots = selectedTable.timeSlots.filter(timeSlot => new Date(timeSlot) >= currentTime);
- setFilteredTimeSlots(filteredSlots);
- }, [selectedTable, restaurant]);
+ const startTime = new Date();
+ startTime.setHours(startHour, startMinute, 0, 0);
+ const endTime = new Date();
+ endTime.setHours(endHour < startHour ? endHour + 24 : endHour, endMinute, 0, 0);
- const formatTimeSlot = (timeSlot) => {
- const date = new Date(timeSlot);
- const formattedDate = date.toLocaleDateString();
- const formattedTime = date.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' });
- return `${formattedDate} - ${formattedTime}`;
+ return { startTime, endTime };
};
- const handleTableSelect = (event) => {
- const selectedTableId = event.target.value;
- setSelectedTableId(selectedTableId);
+ const generateTimeOptions = (operatingHours) => {
+ const { startTime, endTime } = parseOperatingHours(operatingHours);
+ const now = new Date();
+
+ const selectedDateObj = new Date(selectedDate);
+ const isToday = selectedDateObj.toDateString() === now.toDateString();
+
+ let currentTime = isToday ? roundToNext15Minutes(new Date()) : new Date(startTime);
+
+ const options = [];
+ while (currentTime <= endTime) {
+ options.push(currentTime.toTimeString().slice(0, 5));
+ currentTime = new Date(currentTime.getTime() + 15 * 60 * 1000);
+ }
+
+ return options;
};
- const handleTimeSlotSelect = (event) => {
- const selectedTimeSlot = event.target.value;
- setSelectedTimeSlot(selectedTimeSlot);
+ useEffect(() => {
+ if (restaurant && selectedDate) {
+ const options = generateTimeOptions(restaurant.operatingHours);
+ setTimeOptions(options);
+ }
+ }, [restaurant, selectedDate]);
+
+ const handleTableSelect = (event) => {
+ setSelectedTableId(event.target.value);
};
- const handleReservationConfirmation = (restaurant) => {
- const tableNumber = selectedTableId;
- const formattedTimeSlot = selectedTimeSlot;
- const restaurantId = restaurant.restaurantId;
+ const handleReservationConfirmation = () => {
+ const encodedTableId = encodeURIComponent(selectedTableId);
+ const encodedDateTime = encodeURIComponent(`${selectedDate}T${selectedTime}`);
+ const encodedRestaurantId = encodeURIComponent(restaurant.restaurantId);
- const encodedTableNumber = encodeURIComponent(tableNumber);
- const encodedTimeSlot = encodeURIComponent(formattedTimeSlot);
- const encodedRestaurantId = encodeURIComponent(restaurantId);
-
- navigate(`/reservationConfirmation/${encodedTableNumber}/${encodedTimeSlot}/${encodedRestaurantId}`);
+ navigate(`/reservationConfirmation/${encodedTableId}/${encodedDateTime}/${encodedRestaurantId}`);
};
+ const roundToNext15Minutes = (date) => {
+ const minutes = date.getMinutes();
+ const remainder = minutes % 15;
+ if (remainder === 0) return date;
+
+ date.setMinutes(minutes + 15 - remainder);
+ date.setSeconds(0, 0);
+ return date;
+ };
return (
@@ -91,5 +118,5 @@
<>
- {restaurant.name}
+ {restaurant.name}
@@ -98,30 +125,60 @@
Address: {restaurant.address}
Phone: {restaurant.phone}
-
Website: {restaurant.website}
+
+ Website: {restaurant.website}
+
Social Media Links: {restaurant.socialMediaLinks}
Select Table:
-
+
Select Table
- {restaurant.tablesList.map((table, index) => (
- {`Capacity: ${table.capacity} - ${table.location}`}
+ {restaurant.tablesList.map((table) => (
+
+ {`Capacity: ${table.capacity} - ${table.location}`}
+
))}
+
{selectedTable && (
<>
- Select Time Slot:
-
- Select Time Slot
- {filteredTimeSlots.map((timeSlot, index) => (
- {formatTimeSlot(timeSlot)}
+ Select Date:
+ Please select a valid date.
}
+
+ Select Time:
+ setSelectedTime(event.target.value)}
+ value={selectedTime}
+ disabled={!selectedDate}
+ >
+ Select Time
+ {timeOptions.map((time, index) => (
+
+ {time}
+
))}
)}
- handleReservationConfirmation(restaurant)}>
+
+
Confirm Reservation
Index: my-react-app/src/components/Restaurants.js
===================================================================
--- my-react-app/src/components/Restaurants.js (revision 8ca35dc93473fb5be3777778a84fedee941c8790)
+++ my-react-app/src/components/Restaurants.js (revision f5b256e5542dc70faf511ecc16ef87cc3d52cce5)
@@ -4,4 +4,21 @@
import { useNavigate } from 'react-router-dom';
import {RestaurantContext} from "./RestaurantContext";
+import {Alert} from "bootstrap";
+
+const parseTime = (timeString) => {
+ const [hours, minutes] = timeString.trim().split(':').map(Number);
+ return new Date().setHours(hours, minutes, 0, 0);
+};
+
+const roundToNextQuarter = (date) => {
+ const minutes = date.getMinutes();
+ const roundedMinutes = Math.floor(minutes / 15) * 15;
+ date.setMinutes(roundedMinutes, 0, 0);
+ return date;
+};
+
+const shouldMoveToNextDay = (currentTime, endTime) => {
+ return (endTime - currentTime) <= 2 * 60 * 60 * 1000;
+};
const Restaurants = () => {
@@ -14,7 +31,31 @@
}, [restaurantContext]);
+
+ const generateTimeSlots = (operatingHours) => {
+ const timeSlots = [];
+ const [startTimeStr, endTimeStr] = operatingHours.split('-').map((time) => time.trim());
+
+ const startTime = parseTime(startTimeStr);
+ let endTime = parseTime(endTimeStr);
+
+ const currentTime = new Date().getTime();
+ if (shouldMoveToNextDay(currentTime, endTime)) {
+ endTime += 24 * 60 * 60 * 1000;
+ }
+
+ let currentTimeSlot = new Date(startTime);
+ currentTimeSlot = roundToNextQuarter(currentTimeSlot);
+
+ while (currentTimeSlot.getTime() < endTime) {
+ timeSlots.push(currentTimeSlot.toISOString());
+ currentTimeSlot.setMinutes(currentTimeSlot.getMinutes() + 15);
+ }
+
+ return timeSlots;
+ };
+
const handleDetailClick = (restaurantId) => {
navigate(`/restaurants/${restaurantId}`);
- }
+ };
const handleTimeSlotClick = (table, timeSlot, restaurant) => {
@@ -23,40 +64,49 @@
const restaurantId = restaurant.restaurantId;
- const encodedTableNumber = encodeURI(tableNumber);
+ const encodedTableNumber = encodeURIComponent(tableNumber);
const encodedTimeSlot = encodeURIComponent(formattedTimeSlot);
const encodedRestaurantId = encodeURIComponent(restaurantId);
navigate(`/reservationConfirmation/${encodedTableNumber}/${encodedTimeSlot}/${encodedRestaurantId}`);
- }
+ };
const renderTimeSlots = (tablesList, restaurant) => {
const currentTime = new Date().getTime();
- let renderedTimeSlots = {}; // Object to store rendered slots for each table capacity
+ let renderedTimeSlots = {};
- return tablesList.flatMap(table => {
- // Render capacity header when encountering a new capacity
+ if (tablesList.length === 0) {
+ return No tables available for reservations at this restaurant.
;
+ }
+
+ return tablesList.flatMap((table) => {
+ const tableTimeSlots = generateTimeSlots(restaurant.operatingHours);
+
if (!renderedTimeSlots[table.capacity]) {
renderedTimeSlots[table.capacity] = 0;
return (
-
Table for: {table.capacity}
- {table.timeSlots.map((timeSlot, index) => {
+
Table for {table.capacity} guests
+ {tableTimeSlots.map((timeSlot, index) => {
const timeSlotTime = new Date(timeSlot).getTime();
- const tableCapacity = table.capacity;
- // Check if the time slot is after the current time and limit to 3 slots
- if (timeSlotTime > currentTime && renderedTimeSlots[tableCapacity] < 3) {
- renderedTimeSlots[tableCapacity]++;
+ if (timeSlotTime > currentTime && renderedTimeSlots[table.capacity] < 3) {
+ renderedTimeSlots[table.capacity]++;
const timeSlotDateTime = new Date(timeSlot);
- const formattedTime = timeSlotDateTime.toLocaleTimeString();
- const formattedDateTime = timeSlotDateTime.toLocaleString(); // Format for both date and time
+ const formattedTime = timeSlotDateTime.toLocaleTimeString([], {
+ hour: '2-digit',
+ minute: '2-digit'
+ });
return (
-
handleTimeSlotClick(table, timeSlot, restaurant)}>
- {formattedDateTime} {/* Display both date and time */}
+ handleTimeSlotClick(table, timeSlot, restaurant)}
+ >
+ {formattedTime} {}
);
} else {
- return null; // Render nothing if the condition is not met
+ return null;
}
})}
@@ -64,11 +114,8 @@
);
} else {
- // If capacity has been rendered, return null to avoid duplicate rendering
return null;
}
});
-
- }
-
+ };
return (
@@ -77,19 +124,24 @@
{restaurants.map((restaurant) => (
-
+
- {restaurant.name}
+ {restaurant.name}
{restaurant.cuisineType}
{restaurant.operatingHours}
Ul. {restaurant.address}
-
- {renderTimeSlots(restaurant.tablesList.flatMap((table) => table), restaurant)}
-
+
+ {restaurant.tablesList && restaurant.tablesList.length > 0 ? (
+
+ {renderTimeSlots(restaurant.tablesList, restaurant)}
+
+ ) : (
+
No tables available for reservations at this restaurant.
+ )}
-
handleDetailClick(restaurant.restaurantId)}
- className="btn btn-primary">View Details
+ handleDetailClick(restaurant.restaurantId)} className="btn btn-primary">
+ View Details
Index: my-react-app/src/components/TimeSlotList.js
===================================================================
--- my-react-app/src/components/TimeSlotList.js (revision f5b256e5542dc70faf511ecc16ef87cc3d52cce5)
+++ my-react-app/src/components/TimeSlotList.js (revision f5b256e5542dc70faf511ecc16ef87cc3d52cce5)
@@ -0,0 +1,20 @@
+import React from 'react';
+
+const TimeSlotList = ({ timeSlots }) => {
+ return (
+
+
Available Time Slots
+ {timeSlots.length > 0 ? (
+
+ {timeSlots.map((slot, index) => (
+ {slot}
+ ))}
+
+ ) : (
+
No available time slots.
+ )}
+
+ );
+};
+
+export default TimeSlotList;
Index: c/main/java/com/example/rezevirajmasa/demo/bootstrap/DataInitialization.java
===================================================================
--- src/main/java/com/example/rezevirajmasa/demo/bootstrap/DataInitialization.java (revision 8ca35dc93473fb5be3777778a84fedee941c8790)
+++ (revision )
@@ -1,108 +1,0 @@
-//package com.example.rezevirajmasa.demo.bootstrap;
-//
-//import com.example.rezevirajmasa.demo.model.Reservation;
-//import com.example.rezevirajmasa.demo.model.Restaurant;
-//import com.example.rezevirajmasa.demo.model.TableEntity;
-//import com.example.rezevirajmasa.demo.service.ReservationService;
-//import com.example.rezevirajmasa.demo.service.RestaurantService;
-//import com.example.rezevirajmasa.demo.service.TableService;
-//import jakarta.annotation.PostConstruct;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.boot.ApplicationArguments;
-//import org.springframework.stereotype.Component;
-//
-//import java.time.LocalDate;
-//import java.time.LocalDateTime;
-//import java.time.LocalTime;
-//import java.time.format.DateTimeFormatter;
-//import java.util.ArrayList;
-//import java.util.List;
-//
-//@Component
-//public class DataInitialization {
-// private final RestaurantService restaurantService;
-// private final TableService tableService;
-// private final ReservationService reservationService;
-//
-// public DataInitialization(RestaurantService restaurantService, TableService tableService, ReservationService reservationService) {
-// this.restaurantService = restaurantService;
-// this.tableService = tableService;
-// this.reservationService = reservationService;
-// }
-//
-//// @PostConstruct
-// public void initData() {
-// for(Restaurant restaurant : restaurantService.listall()) {
-// extendTimeSlotsIndefinitely(restaurant);
-// }
-// }
-//
-// private void extendTimeSlotsIndefinitely(Restaurant restaurant) {
-// while (true) {
-// String[] hours = restaurant.getOperatingHours().split("-");
-// LocalTime startTime = LocalTime.parse(hours[0], DateTimeFormatter.ofPattern("HH:mm"));
-// LocalTime endTime = LocalTime.parse(hours[1], DateTimeFormatter.ofPattern("HH:mm"));
-//
-// // Get the current date and time
-// LocalDateTime currentDateTime = LocalDateTime.now().with(startTime);
-//
-// // Calculate the end date (current date + 3 days)
-// LocalDateTime endDate = LocalDateTime.now().with(endTime).plusDays(3);
-//
-// List
tables = restaurant.getTablesList();
-// for (TableEntity table : tables) {
-// List existingTimeSlots = table.getTimeSlots();
-// List existingReservations = reservationService.findReservationsByTableAndDateRange(table, currentDateTime, endDate);
-// List newTimeSlots = generateTimeSlots(currentDateTime, endDate, existingReservations, existingTimeSlots, startTime, endTime);
-// existingTimeSlots.addAll(newTimeSlots);
-// tableService.saveTable(table);
-// }
-//
-// // Sleep for a period before generating time slots again
-// try {
-// // Sleep for 24 hours
-// Thread.sleep(24 * 60 * 60 * 1000);
-// } catch (InterruptedException e) {
-// // Handle interrupted exception
-// break;
-// }
-// }
-// }
-//
-// private List generateTimeSlots(LocalDateTime startDate, LocalDateTime endDate, List existingReservations, List existingTimeSlots, LocalTime startTime, LocalTime endTime) {
-// List timeSlots = new ArrayList<>();
-// LocalDateTime currentDateTime = startDate;
-// LocalTime currentTime = startTime;
-// LocalDate currentDate = LocalDate.now(); // Get the current date
-//
-// // Generate time slots until the end date
-// while (currentDateTime.isBefore(endDate)) {
-// // Ensure the current date is within the restaurant's opening hours
-// if (currentDateTime.toLocalTime().isBefore(startTime)) {
-// currentDateTime = currentDateTime.plusDays(1).with(startTime); // Move to the next day and set the start time
-// continue; // Skip generating time slots for this day
-// }
-//
-// final LocalDateTime currentTimeSlotStart = currentDateTime; // Declare a final local variable
-//
-// // Check if the current time slot overlaps with existing reservations
-// boolean overlapsReservations = existingReservations.stream()
-// .anyMatch(reservation -> isOverlapping(currentTimeSlotStart, currentTimeSlotStart.plusMinutes(15), reservation.getCheckInTime(), reservation.getCheckOutTime()));
-// boolean overlapsExistingTimeSlots = existingTimeSlots.stream()
-// .anyMatch(existingSlot -> isOverlapping(currentTimeSlotStart, currentTimeSlotStart.plusMinutes(15), existingSlot, existingSlot.plusMinutes(15)));
-//
-// if (!overlapsReservations && !overlapsExistingTimeSlots) {
-// timeSlots.add(currentDateTime);
-// }
-//
-// // Move to the next time slot (add 15 minutes
-// currentDateTime = currentDateTime.plusMinutes(15);
-// }
-//
-// return timeSlots;
-// }
-//
-// private boolean isOverlapping(LocalDateTime start1, LocalDateTime end1, LocalDateTime start2, LocalDateTime end2) {
-// return start1.isBefore(end2) && start2.isBefore(end1);
-// }
-//}
Index: c/main/java/com/example/rezevirajmasa/demo/bootstrap/ReservationInitializer.java
===================================================================
--- src/main/java/com/example/rezevirajmasa/demo/bootstrap/ReservationInitializer.java (revision 8ca35dc93473fb5be3777778a84fedee941c8790)
+++ (revision )
@@ -1,48 +1,0 @@
-//package com.example.rezevirajmasa.demo.bootstrap;
-//
-//import com.example.rezevirajmasa.demo.model.Reservation;
-//import com.example.rezevirajmasa.demo.model.Restaurant;
-//import com.example.rezevirajmasa.demo.service.ReservationHistoryService;
-//import com.example.rezevirajmasa.demo.service.ReservationService;
-//import org.springframework.stereotype.Component;
-//
-//import jakarta.annotation.PostConstruct;
-//import java.time.LocalDateTime;
-//import java.util.List;
-//import java.util.stream.Collectors;
-//
-//@Component
-//public class ReservationInitializer {
-// private final ReservationHistoryService reservationHistoryService;
-// private final ReservationService reservationService;
-//
-// public ReservationInitializer(ReservationHistoryService reservationHistoryService, ReservationService reservationService) {
-// this.reservationHistoryService = reservationHistoryService;
-// this.reservationService = reservationService;
-// }
-//
-// @PostConstruct
-// public void initializePastReservations() {
-// LocalDateTime currentTime = LocalDateTime.now();
-// List reservationsToMove = reservationService.findReservationsToMove(currentTime);
-//
-// List reservationHistories = reservationsToMove.stream()
-// .map(reservation -> new Restaurant.ReservationHistory(
-// reservation.getUser(),
-// reservation.getTable(),
-// reservation.getRestaurant(),
-// reservation.getReservationDateTime(),
-// reservation.getPartySize(),
-// reservation.getSpecialRequests(),
-// "Done",
-// null,
-// reservation.getCheckInTime()
-// ))
-// .collect(Collectors.toList());
-//
-// reservationHistoryService.moveReservationsToPast(reservationHistories);
-//
-// reservationsToMove.forEach(reservation -> reservationService.deleteReservation(reservation.getReservationID()));
-// }
-//
-//}
Index: c/main/java/com/example/rezevirajmasa/demo/bootstrap/TimeSlotManagementService.java
===================================================================
--- src/main/java/com/example/rezevirajmasa/demo/bootstrap/TimeSlotManagementService.java (revision 8ca35dc93473fb5be3777778a84fedee941c8790)
+++ (revision )
@@ -1,103 +1,0 @@
-package com.example.rezevirajmasa.demo.bootstrap;
-
-import com.example.rezevirajmasa.demo.model.Reservation;
-import com.example.rezevirajmasa.demo.model.Restaurant;
-import com.example.rezevirajmasa.demo.model.TableEntity;
-import com.example.rezevirajmasa.demo.repository.ReservationRepository;
-import com.example.rezevirajmasa.demo.repository.TableRepository;
-import jakarta.annotation.PostConstruct;
-import jakarta.annotation.PreDestroy;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cglib.core.Local;
-import org.springframework.stereotype.Component;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-@Component
-public class TimeSlotManagementService {
- @Autowired
- private TableRepository tableRepository;
- @Autowired
- private ReservationRepository reservationRepository;
-
- @PostConstruct
- public void initializeTimeSlots() {
- LocalDate startDate = LocalDate.now();
- initializeTimeSlotsForNextDays(startDate);
- }
-
- private void initializeTimeSlotsForNextDays(LocalDate startDate) {
- LocalDate currentDate = startDate;
- for (int i = 0; i < 3; i++) {
- Iterable tableEntities = tableRepository.findAll();
- for (TableEntity tableEntity : tableEntities) {
- initializeTimeSlotsForTable(tableEntity, currentDate);
- tableRepository.save(tableEntity);
- }
- currentDate = currentDate.plusDays(1);
- }
- }
-
- private void initializeTimeSlotsForTable(TableEntity tableEntity, LocalDate date) {
- // Get existing time slots for the table
- List existingTimeSlots = tableEntity.getTimeSlots().stream()
- .filter(slot -> slot.toLocalDate().isEqual(date)) // Filter time slots for the specified date
- .toList();
-
- // If existing time slots are not null and not empty, return without initializing new ones
- if (!existingTimeSlots.isEmpty()) {
- return;
- }
-
- Restaurant restaurant = tableEntity.getRestaurant();
- String[] hours = restaurant.getOperatingHours().split("-");
- LocalTime startTime = LocalTime.parse(hours[0], DateTimeFormatter.ofPattern("HH:mm"));
- LocalTime endTime = LocalTime.parse(hours[1], DateTimeFormatter.ofPattern("HH:mm"));
-
- List reservationCheckIns = getReservationCheckInsAfterNow(date);
-
- tableEntity.initializeTimeSlots(startTime, endTime, Collections.singletonList(date), reservationCheckIns);
- }
-
- private List getReservationCheckInsAfterNow(LocalDate date) {
- LocalDateTime currentTime = LocalDateTime.now();
- List reservations = reservationRepository.findByCheckInTimeAfterAndCheckInTimeBefore(
- LocalDateTime.of(date, LocalTime.MIN), LocalDateTime.of(date, LocalTime.MAX));
- List checkIns = new ArrayList<>();
- for (Reservation reservation : reservations) {
- if (reservation.getCheckInTime().isAfter(currentTime)) {
- checkIns.add(reservation.getCheckInTime());
- }
- }
- return checkIns;
- }
-
- @PreDestroy
- public void cleanUpTimeSlots() {
- // Define the cutoff date (yesterday)
- LocalDate cutoffDate = LocalDate.now().minusDays(1);
-
- // Iterate through all tables and remove unused time slots older than the cutoff date
- Iterable tableEntities = tableRepository.findAll();
- for (TableEntity tableEntity : tableEntities) {
- // Remove unused time slots older than the cutoff date
- removeUnusedTimeSlots(tableEntity, cutoffDate);
- tableRepository.save(tableEntity);
- }
- }
-
- private void removeUnusedTimeSlots(TableEntity tableEntity, LocalDate cutoffDate) {
- // Get all time slots for the table
- List timeSlots = tableEntity.getTimeSlots();
-
- // Remove unused time slots older than the cutoff date
- timeSlots.removeIf(timeSlot -> timeSlot.toLocalDate().isBefore(cutoffDate));
- }
-}
Index: src/main/java/com/example/rezevirajmasa/demo/component/ReservationScheduler.java
===================================================================
--- src/main/java/com/example/rezevirajmasa/demo/component/ReservationScheduler.java (revision f5b256e5542dc70faf511ecc16ef87cc3d52cce5)
+++ src/main/java/com/example/rezevirajmasa/demo/component/ReservationScheduler.java (revision f5b256e5542dc70faf511ecc16ef87cc3d52cce5)
@@ -0,0 +1,2 @@
+package com.example.rezevirajmasa.demo.component;public class ReservationScheduler {
+}
Index: src/main/java/com/example/rezevirajmasa/demo/config/ModelMapperConfig.java
===================================================================
--- src/main/java/com/example/rezevirajmasa/demo/config/ModelMapperConfig.java (revision f5b256e5542dc70faf511ecc16ef87cc3d52cce5)
+++ src/main/java/com/example/rezevirajmasa/demo/config/ModelMapperConfig.java (revision f5b256e5542dc70faf511ecc16ef87cc3d52cce5)
@@ -0,0 +1,2 @@
+package com.example.rezevirajmasa.demo.config;public class ModelMapperConfig {
+}
Index: src/main/java/com/example/rezevirajmasa/demo/dto/ReservationDTO.java
===================================================================
--- src/main/java/com/example/rezevirajmasa/demo/dto/ReservationDTO.java (revision f5b256e5542dc70faf511ecc16ef87cc3d52cce5)
+++ src/main/java/com/example/rezevirajmasa/demo/dto/ReservationDTO.java (revision f5b256e5542dc70faf511ecc16ef87cc3d52cce5)
@@ -0,0 +1,2 @@
+package com.example.rezevirajmasa.demo.dto;public class ReservationDTO {
+}
Index: src/main/java/com/example/rezevirajmasa/demo/dto/RestaurantDTO.java
===================================================================
--- src/main/java/com/example/rezevirajmasa/demo/dto/RestaurantDTO.java (revision f5b256e5542dc70faf511ecc16ef87cc3d52cce5)
+++ src/main/java/com/example/rezevirajmasa/demo/dto/RestaurantDTO.java (revision f5b256e5542dc70faf511ecc16ef87cc3d52cce5)
@@ -0,0 +1,2 @@
+package com.example.rezevirajmasa.demo.dto;public class RestaurantDTO {
+}
Index: src/main/java/com/example/rezevirajmasa/demo/dto/TableDTO.java
===================================================================
--- src/main/java/com/example/rezevirajmasa/demo/dto/TableDTO.java (revision f5b256e5542dc70faf511ecc16ef87cc3d52cce5)
+++ src/main/java/com/example/rezevirajmasa/demo/dto/TableDTO.java (revision f5b256e5542dc70faf511ecc16ef87cc3d52cce5)
@@ -0,0 +1,2 @@
+package com.example.rezevirajmasa.demo.dto;public class TableDTO {
+}
Index: c/main/java/com/example/rezevirajmasa/demo/model/RestaurantMenu.java
===================================================================
--- src/main/java/com/example/rezevirajmasa/demo/model/RestaurantMenu.java (revision 8ca35dc93473fb5be3777778a84fedee941c8790)
+++ (revision )
@@ -1,40 +1,0 @@
-package com.example.rezevirajmasa.demo.model;
-
-import jakarta.persistence.*;
-
-import java.io.Serializable;
-
-@Entity
-@Table(name = "restaurantMenus")
-public class RestaurantMenu {
- @EmbeddedId
- private RestaurantMenuId id;
-
- @ManyToOne
- @MapsId("restaurantID")
- @JoinColumn(name = "RestaurantID", nullable = false)
- private Restaurant restaurant;
-
- @ManyToOne
- @MapsId("menuID")
- @JoinColumn(name = "MenuID", nullable = false)
- private Menu menu;
-
- public RestaurantMenu(Restaurant restaurant, Menu menu) {
- this.restaurant = restaurant;
- this.menu = menu;
- }
-
- public RestaurantMenu() {
- }
-
- @Embeddable
- public static class RestaurantMenuId implements Serializable {
-
- @Column(name = "RestaurantID")
- private Long restaurantID;
-
- @Column(name = "MenuID")
- private Long menuID;
- }
-}
Index: c/main/java/com/example/rezevirajmasa/demo/web/controller/ReservationController.java
===================================================================
--- src/main/java/com/example/rezevirajmasa/demo/web/controller/ReservationController.java (revision 8ca35dc93473fb5be3777778a84fedee941c8790)
+++ (revision )
@@ -1,107 +1,0 @@
-package com.example.rezevirajmasa.demo.web.controller;
-
-import com.example.rezevirajmasa.demo.dto.SignUpDto;
-import com.example.rezevirajmasa.demo.dto.UserDto;
-import com.example.rezevirajmasa.demo.mappers.UserMapper;
-import com.example.rezevirajmasa.demo.model.*;
-import com.example.rezevirajmasa.demo.model.exceptions.ExpiredReservationException;
-import com.example.rezevirajmasa.demo.service.*;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.security.core.Authentication;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.RestrictedTransactionalEventListenerFactory;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.List;
-import java.util.stream.Collectors;
-
-@Controller
-public class ReservationController {
- private final ReservationService reservationService;
- private final UserService userService;
- private final TableService tableService;
- private final ReservationHistoryService reservationHistoryService;
-
- private final UserMapper userMapper;
-
- public ReservationController(ReservationService reservationService, UserService userService, TableService tableService, ReservationHistoryService reservationHistoryService, UserMapper userMapper) {
- this.reservationService = reservationService;
- this.userService = userService;
- this.tableService = tableService;
- this.reservationHistoryService = reservationHistoryService;
- this.userMapper = userMapper;
- }
-
- @GetMapping("/reservations")
- public String showReservations(Model model, Authentication authentication) {
- UserDto userDto = userService.findByEmail(authentication.getName());
-
- SignUpDto signUpDto = userMapper.toSignUpDto(userDto);
-
- User user = userMapper.signUpToUser(signUpDto);
-
- List reservationList = reservationService.findReservationByUser(user);
-
- model.addAttribute("bodyContent", "reservationList");
- model.addAttribute("reservations", reservationList);
- return "index";
- }
-
-
- @GetMapping("/reservations/edit/{reservationId}")
- public String showEditReservation(@PathVariable Long reservationId, Model model) {
- Reservation reservation = reservationService.findById(reservationId);
- tableService.canceledTimeSlots(reservation.getTable().getId(), reservation.getCheckInTime());
- model.addAttribute("reservation", reservation);
- model.addAttribute("bodyContent", "reservationsEditForm");
- return "index";
- }
-
- @PostMapping("/restaurants/{tableNumber}")
- public String saveReservation(@PathVariable Long tableNumber,
- @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime reservationDateTime,
- @RequestParam int partySize,
- @RequestParam String specialRequests,
- Authentication authentication){
- TableEntity table = tableService.findById(tableNumber);
- Restaurant restaurant = table.getRestaurant();
-
- UserDto userDto = userService.findByEmail(authentication.getName());
-
- SignUpDto signUpDto = userMapper.toSignUpDto(userDto);
-
- User user = userMapper.signUpToUser(signUpDto);
-
- if(!table.isAvailable(reservationDateTime)) {
- System.out.println("The slot is taken sorry, pick another :D");
- }
- tableService.deleteTimeSlotsForReservation(tableNumber, reservationDateTime);
- reservationService.makeReservation(user, table, restaurant, LocalDateTime.now(), reservationDateTime, partySize, specialRequests);
- return "redirect:/reservations";
- }
-
- @RequestMapping("/reservations/edit/{reservationId}")
- public String updateReservation(@PathVariable Long reservationId,
- @RequestParam int partySize,
- @RequestParam String specialRequests,
- @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime reservationDateTime) {
- Reservation reservation = reservationService.findById(reservationId);
- reservation.setPartySize(partySize);
- reservation.setSpecialRequests(specialRequests);
- reservation.setCheckInTime(reservationDateTime);
- tableService.deleteTimeSlotsForReservation(reservation.getTable().getId(), reservationDateTime);
- return "redirect:/reservations";
- }
-
- @PostMapping("/reservations/delete/{reservationId}")
- public String deleteReservation(@PathVariable Long reservationId, @RequestParam String reason) {
- Reservation reservation = reservationService.findById(reservationId);
- tableService.canceledTimeSlots(reservation.getTable().getId(), reservation.getCheckInTime());
- reservationService.cancelReservation(reservationId);
- reservationHistoryService.moveReservationToHistory(reservation, "canceled", reason);
- return "redirect:/reservation-history";
- }
-}
Index: c/main/java/com/example/rezevirajmasa/demo/web/controller/RestaurantController.java
===================================================================
--- src/main/java/com/example/rezevirajmasa/demo/web/controller/RestaurantController.java (revision 8ca35dc93473fb5be3777778a84fedee941c8790)
+++ (revision )
@@ -1,109 +1,0 @@
-package com.example.rezevirajmasa.demo.web.controller;
-
-import com.example.rezevirajmasa.demo.model.Customer;
-import com.example.rezevirajmasa.demo.model.Restaurant;
-import com.example.rezevirajmasa.demo.model.TableEntity;
-import com.example.rezevirajmasa.demo.service.CustomerService;
-import com.example.rezevirajmasa.demo.service.ReservationService;
-import com.example.rezevirajmasa.demo.service.RestaurantService;
-import com.example.rezevirajmasa.demo.service.TableService;
-import net.sourceforge.htmlunit.xpath.operations.Mod;
-import org.springframework.boot.Banner;
-import org.springframework.security.core.Authentication;
-import org.springframework.ui.Model;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.ui.Model;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-@Controller
-public class RestaurantController {
- private final RestaurantService restaurantService;
- private final TableService tableService;
-
- public RestaurantController(RestaurantService restaurantService, TableService tableService) {
- this.restaurantService = restaurantService;
- this.tableService = tableService;
- }
-
- @GetMapping("/restaurants")
- public String showRestaurants(@RequestParam(required = false) String search, Model model) {
- List restaurantList;
- if(search == null) {
- restaurantList = this.restaurantService.listall();
- } else {
- restaurantList = restaurantService.listRestaurantBy(search);
- }
-
- for (Restaurant restaurant : restaurantList) {
- // Initialize a set to store unique capacities for this restaurant
- Set uniqueCapacities = new HashSet<>();
-
- // Populate uniqueCapacities with unique capacity values for tables in this restaurant
- for (TableEntity table : restaurant.getTablesList()) {
- uniqueCapacities.add(table.getCapacity());
- }
-
- // Add uniqueCapacities to the model for this restaurant
- model.addAttribute("uniqueCapacities_" + restaurant.getRestaurantId(), uniqueCapacities);
- }
- model.addAttribute("bodyContent", "restaurants");
- model.addAttribute("restaurants", restaurantList);
- return "index";
- }
-
- @GetMapping("/restaurants/{tableNumber}")
- public String reserveTable(@PathVariable Long tableNumber, Model model) {
- TableEntity tableEntity = tableService.findById(tableNumber);
- Restaurant restaurant = tableEntity.getRestaurant();
-
- model.addAttribute("table", tableEntity);
- model.addAttribute("restaurant", restaurant);
-
- model.addAttribute("bodyContent", "reservationConfirmation.html");
-
- return "index";
- }
-
- @GetMapping("/restaurants/add")
- public String showAddRestaurantForm(Model model) {
- model.addAttribute("bodyContent", "restaurantForm");
- return "index";
- }
-
- @PostMapping("/register-restaurant")
- public String saveRestaurant(@RequestParam String name,
- @RequestParam String cuisineType,
- @RequestParam String address,
- @RequestParam String phone,
- @RequestParam String operatingHours,
- @RequestParam BigDecimal rating,
- @RequestParam int numberOfTables,
- @RequestParam List tableCapacities,
- @RequestParam List tableLocations,
- @RequestParam List tableSmokingAreas,
- @RequestParam List tableDescriptions,
- @RequestParam String socialMediaLinks,
- @RequestParam String website,
- Model model) {
-
- Restaurant restaurant = new Restaurant();
- restaurant.setName(name);
- restaurant.setCuisineType(cuisineType);
- restaurant.setAddress(address);
- restaurant.setPhone(phone);
- restaurant.setOperatingHours(operatingHours);
- restaurant.setRating(rating);
- restaurant.setSocialMediaLinks(socialMediaLinks);
- restaurant.setWebsite(website);
-
- restaurantService.save(restaurant, numberOfTables, tableCapacities, tableLocations, tableSmokingAreas, tableDescriptions);
- model.addAttribute("bodyContent", "restaurants");
- return "redirect:/restaurants";
- }
-
-}