Changeset cfc16a3

Timestamp:

03/03/24 10:52:49 (15 months ago)

Author:

Aleksandar Panovski <apano77@…>

Branches:

main

Children:

c63036a

Parents:

75f5086

Message:

RetaurantServiceImpl problemi
isAvailable od tableEntity...

Files:

• my-react-app/src/App.js (modified) (9 diffs)
• my-react-app/src/components/CuisineContext.js (added)
• my-react-app/src/components/Customers.js (modified) (1 diff)
• my-react-app/src/components/RestaurantCard.js (added)
• my-react-app/src/components/RestaurantContext.js (added)
• my-react-app/src/components/Restaurants.js (modified) (2 diffs)
• my-react-app/src/index.js (modified) (1 diff)
• src/main/java/com/example/rezevirajmasa/demo/model/Reservation.java (modified) (1 diff)
• src/main/java/com/example/rezevirajmasa/demo/repository/RestaurantRepository.java (modified) (2 diffs)
• src/main/java/com/example/rezevirajmasa/demo/repository/TableRepository.java (modified) (1 diff)
• src/main/java/com/example/rezevirajmasa/demo/service/RestaurantService.java (modified) (1 diff)
• src/main/java/com/example/rezevirajmasa/demo/service/impl/RestaurantServiceImpl.java (modified) (1 diff)
• src/main/java/com/example/rezevirajmasa/demo/web/rest/testController.java (modified) (3 diffs)

my-react-app/src/App.js

@@ -2 +2 @@
 import Customers from './components/Customers';
 import Layout from "./components/Layout";
-import React, {useEffect, useState} from 'react';
+import React, {useContext, useEffect, useState} from 'react';
 import CustomerFormContainer from "./components/CustomerFormContainer";
 import CustomerDetails from "./components/CustomerDetails";
@@ -12 +12 @@
 import ReservationEdit from "./components/ReservationEdit";
 import axios from "axios";
+import { CuisineContext } from './components/CuisineContext';
 
 const App = () => {
@@ -45 +46 @@
     const [timeSlots, setTimeSlots] = useState([]);
 
+    const cuisineTypes = useContext(CuisineContext);
+
     useEffect(() => {
         if (date) {
@@ -82 +85 @@
     }, [date]);
 
-
     const handleDateChange = (e) => {
         setDate(e.target.value);
@@ -102 +104 @@
         e.preventDefault();
         const [year, month, day] = date.split("-");
-
         let formattedDateTime;
-        const [selectedHours, selectedMinutes] = selectedTime.split(":");
-        // Check if selectedHours and selectedMinutes are valid numbers
-        if (!isNaN(selectedHours) && !isNaN(selectedMinutes)) {
-            const dateTime = new Date(Date.UTC(year, month - 1, day, selectedHours, selectedMinutes));
-            formattedDateTime = dateTime.toISOString().slice(0, 16).replace('T', ' ');
+
+        if (selectedTime) {
+            const [selectedHours, selectedMinutes] = selectedTime.split(":");
+            // Check if selectedHours and selectedMinutes are valid numbers
+            if (!isNaN(selectedHours) && !isNaN(selectedMinutes)) {
+                const dateTime = new Date(Date.UTC(year, month - 1, day, selectedHours, selectedMinutes));
+                formattedDateTime = dateTime.toISOString().slice(0, 16).replace('T', ' ');
+            }
         } else {
-            // Default values if selectedTime is not valid
+            // Find the first available time slot after the current time
             const now = new Date();
-            let defaultTime;
-            if (now.getHours() >= 9 && now.getHours() <= 23) {
-                defaultTime = now;
-            } else {
-                defaultTime = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 9, 0); // Set to 09:00 if current time is before 09:00
-            }
-            const dateTime = new Date(Date.UTC(year, month - 1, day, defaultTime.getHours(), defaultTime.getMinutes()));
-            formattedDateTime = dateTime.toISOString().slice(0, 16).replace('T', ' ');
+            const currentTime = now.getHours() * 60 + now.getMinutes(); // Current time in minutes
+            const nextSlot = timeSlots.find(slot => {
+                const [hours, minutes] = slot.split(":");
+                const slotTime = parseInt(hours) * 60 + parseInt(minutes); // Time of the slot in minutes
+                return slotTime > currentTime;
+            });
+
+            // If no slot is found after the current time, use the first slot of the day
+            formattedDateTime = nextSlot ? `${date} ${nextSlot}` : `${date} ${timeSlots[0]}`;
         }
 
@@ -128 +133 @@
         };
 
-        console.log("pecatam data pod mene")
-        console.log(data)
+        console.log("Data to be submitted:");
+        console.log(data);
 
         try {
@@ -141 +146 @@
     };
 
+    const handleSearchByCuisine = async (cuisine) => {
+        const cuisineName = cuisine.replace('Searching by cuisine: ', '');
+        try {
+            const response = await axios.post(`http://localhost:8080/api/search/shortcut/${cuisineName}`, cuisineName);
+            // Handle the response as needed
+            console.log(response.data); // Log the response data, for example
+        } catch (error) {
+            console.error('Error searching by cuisine:', error);
+            // Handle errors, such as displaying an error message to the user
+        }
+    };
 
 
@@ -154 +170 @@
     return (
         <div className="container">
-            <h2>Home</h2>
-            <p>Welcome to My Awesome App!</p>
+            <h2 className="display-1">Rezerviraj masa</h2>
             <form className="row g-2 align-items-center" onSubmit={handleSubmit}>
                 <div className="col-auto">
@@ -189 +204 @@
                     <button className="btn btn-outline-success" type="submit">Search</button>
                 </div>
+                <form>
+                    <div className="mb-3">
+                        <h2 className="display-2">Search by cuisine type</h2>
+                        <ul className="list-group">
+                            {cuisineTypes.map((cuisine, index) => (
+                                <li key={index} className="list-group-item">
+                                    <button type="button" className="btn btn-outline-primary"
+                                            onClick={() => handleSearchByCuisine(cuisine)}>
+                                        {cuisine}
+                                    </button>
+                                </li>
+                            ))}
+                        </ul>
+                    </div>
+                </form>
+
+
             </form>
         </div>

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

@@ -35 +35 @@
             await axios.delete(`http://localhost:8080/api/customers/delete/${customerId}`);
             setCustomers(customers.filter(customer => customer.customerID !== customerId));
-            alert('Reservation canceled successfully');
+            window.location.reload();
         } catch (error) {
             console.error("Error + " + error);
-            alert("An error occurred while deleting");
         }
     }

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

@@ -1 @@
-import React, { useState, useEffect } from 'react';
-import axios from 'axios';
+import React, {useState, useEffect, useContext} from 'react';
 import 'bootstrap/dist/css/bootstrap.min.css';
 import StarRating from './StarRating';
 import { useNavigate } from 'react-router-dom';
+import {RestaurantContext} from "./RestaurantContext";
 
 const Restaurants = () => {
     const [restaurants, setRestaurants] = useState([]);
     const navigate = useNavigate();
+    const restaurantContext = useContext(RestaurantContext);
 
     useEffect(() => {
-        const fetchRestaurants = async () => {
-            try {
-                const response = await axios.get('http://localhost:8080/api/restaurants');
-                setRestaurants(response.data);
-            } catch (error) {
-                console.error('Error fetching restaurants:', error);
-            }
-        };
-
-        fetchRestaurants();
-    }, []);
+        setRestaurants(restaurantContext.restaurants);
+    }, [restaurantContext]);
 
     const handleDetailClick = (restaurantId) => {
@@ -98 +90 @@
                                 </div>
                             </div>
-                            <button onClick={() => handleDetailClick(restaurant.restaurantId)} className="btn btn-primary">View Details</button>
+                            <button onClick={() => handleDetailClick(restaurant.restaurantId)}
+                                    className="btn btn-primary">View Details
+                            </button>
                         </div>
                     </div>

my-react-app/src/index.js

@@ -3 +3 @@
 import './index.css';
 import App from './App';
+import { CuisineProvider } from './components/CuisineContext';
+import {RestaurantProvider} from "./components/RestaurantContext";
 
 const root = ReactDOM.createRoot(document.getElementById('root'));
 root.render(
-  <React.StrictMode>
-    <App />
-  </React.StrictMode>
+    <React.StrictMode>
+        <CuisineProvider>
+            <RestaurantProvider>
+                <App />
+            </RestaurantProvider>
+        </CuisineProvider>
+    </React.StrictMode>
 );

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

@@ -48 +48 @@
 //    private BigDecimal totalAmount;//rezervacija so depozit ako e
 
-    @Column(name = "Pa`ymentStatus", length = 20, nullable = false, columnDefinition = "VARCHAR default 'Unpaid'")
+    @Column(name = "PaymentStatus", length = 20, nullable = false, columnDefinition = "VARCHAR default 'Unpaid'")
     private String paymentStatus;
 

src/main/java/com/example/rezevirajmasa/demo/repository/RestaurantRepository.java

@@ -4 +4 @@
 import com.example.rezevirajmasa.demo.model.TableEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
@@ -9 +10 @@
 public interface RestaurantRepository extends JpaRepository<Restaurant, Long> {
     List<Restaurant> findAllByNameLike(String search);
-    List<Restaurant> findAllByCuisineTypeLike(String search);
+    List<Restaurant> findAllByCuisineTypeContaining(String search);
+    @Query("SELECT DISTINCT r.cuisineType FROM Restaurant r")
+    List<String> findAllCuisineTypes();
+    List<Restaurant> findAllByCuisineType(String cuisine);
 }

src/main/java/com/example/rezevirajmasa/demo/repository/TableRepository.java

@@ -14 +14 @@
 //    @Query("SELECT t FROM TableEntity t JOIN FETCH t.restaurant WHERE t.id = :id")
 //    TableEntity findTableEntityByIdWithRestaurant(@Param("id") Long id);
-    List<TableEntity> findAllByTimeSlotsContainingAndCapacity(LocalDateTime timeSlot, Integer partySize);
+    List<TableEntity> findAllByTimeSlotsContainingAndCapacityGreaterThanEqual(LocalDateTime timeSlot, Integer partySize);
 }

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

@@ -22 +22 @@
     public List<Restaurant> findRestaurantsByDateTimeAndPartySize(LocalDateTime dateTime, int partySize, String search);
     public List<Restaurant> findRestaurantsBySearchParams(LocalDateTime dateTime, int partySize, String search);
+    public List<String> findALlCuisineTypes();
+    List<Restaurant> findRestaurantsByCuisineType(String param);
 }

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

@@ -168 +168 @@
     @Override
     public List<Restaurant> findRestaurantsBySearchParams(LocalDateTime dateTime, int partySize, String search) {
-        if (!search.isEmpty()) {
-            List<Restaurant> restaurantList = null;
-            if (!restaurantRepository.findAllByNameLike(search).isEmpty()) {
-                restaurantList = restaurantRepository.findAllByNameLike(search);
-            } else {
-                restaurantList = restaurantRepository.findAllByCuisineTypeLike(search);
+        if (search == null || search.isEmpty()) {
+            List<TableEntity> tableEntities = tableRepository.findAllByTimeSlotsContainingAndCapacityGreaterThanEqual(dateTime, partySize);
+            return tableEntities.stream()
+                    .map(TableEntity::getRestaurant)
+                    .distinct()
+                    .collect(Collectors.toList());
+        } else {
+            List<Restaurant> restaurantList = restaurantRepository.findAllByNameLike(search);
+            if (restaurantList.isEmpty()) {
+                restaurantList = restaurantRepository.findAllByCuisineTypeContaining(search);
             }
             return restaurantList;
-        } else {
-            List<TableEntity> tableEntities = tableRepository.findAllByTimeSlotsContainingAndCapacity(dateTime, partySize);
-            return tableEntities.stream()
-                    .map(TableEntity::getRestaurant)
-                    .distinct()  // To avoid duplicates in case one restaurant has multiple tables
-                    .collect(Collectors.toList());
         }
     }
+
+    @Override
+    public List<String> findALlCuisineTypes() {
+        return restaurantRepository.findAllCuisineTypes();
+    }
+
+    @Override
+    public List<Restaurant> findRestaurantsByCuisineType(String param) {
+        return restaurantRepository.findAllByCuisineType(param);
+    }
 }

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

@@ -17 +17 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 @CrossOrigin(origins = "http://localhost:3000/")
@@ -52 +53 @@
     @PostMapping("/api/search")
     public ResponseEntity<List<Restaurant>> searchRestaurants(@RequestBody Map<String, Object> requestData) {
-        String dateTime = (String) requestData.get("dateTime");
-        Integer partySize = (Integer) requestData.get("partySize");
-        String search = (String) requestData.get("search");
+        Optional<String> dateTimeOptional = Optional.ofNullable((String) requestData.get("dateTime"));
+        int partySize = Integer.parseInt(requestData.get("partySize").toString());
+        Optional<String> searchOptional = Optional.ofNullable((String) requestData.get("search"));
 
-        // Now proceed with parsing dateTime and performing the search based on the received parameters
+        String dateTime = dateTimeOptional.orElse(null);
+        String search = searchOptional.orElse(null);
 
         LocalDateTime parsedDateTime = null;
@@ -67 +69 @@
 
         return new ResponseEntity<List<Restaurant>>(filteredRestaurants, HttpStatus.OK);
+    }
+
+    @PostMapping("/api/search/shortcut/{param}")
+    public ResponseEntity<List<Restaurant>> searchByCuisineTypeShortcut(@PathVariable String param) {
+        List<Restaurant> filteredRestaurants;
+        if(param != null && !param.isEmpty()) {
+            filteredRestaurants = restaurantService.findRestaurantsByCuisineType(param);
+        } else {
+            filteredRestaurants = restaurantService.listall();
+        }
+        return new ResponseEntity<List<Restaurant>>(filteredRestaurants, HttpStatus.OK);
+    }
+
+    @GetMapping("/api/cuisineTypes")
+    public ResponseEntity<List<String>> getAllCuisineTypes() {
+        List<String> cuisineTypes = restaurantService.findALlCuisineTypes();
+        return new ResponseEntity<>(cuisineTypes, HttpStatus.OK);
     }