Changeset 75f5086

Timestamp:

02/28/24 19:23:09 (15 months ago)

Author:

Aleksandar Panovski <apano77@…>

Branches:

main

Children:

cfc16a3

Parents:

65b6638

Message:

RetaurantServiceImpl problemi
isAvailable od tableEntity...

Location:

src/main/java/com/example/rezevirajmasa/demo

Files:

• repository/RestaurantRepository.java (modified) (1 diff)
• repository/TableRepository.java (modified) (2 diffs)
• service/RestaurantService.java (modified) (1 diff)
• service/impl/RestaurantServiceImpl.java (modified) (1 diff)
• web/rest/testController.java (modified) (1 diff)

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

@@ -8 +8 @@
 
 public interface RestaurantRepository extends JpaRepository<Restaurant, Long> {
-
-
+    List<Restaurant> findAllByNameLike(String search);
+    List<Restaurant> findAllByCuisineTypeLike(String search);
 }

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

@@ -7 +7 @@
 import org.springframework.data.repository.query.Param;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
@@ -13 +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);
 }

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

@@ -21 +21 @@
     List<Restaurant> getRestaurantsWithAvailableTimeSlotsForToday();
     public List<Restaurant> findRestaurantsByDateTimeAndPartySize(LocalDateTime dateTime, int partySize, String search);
+    public List<Restaurant> findRestaurantsBySearchParams(LocalDateTime dateTime, int partySize, String search);
 }

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

@@ -165 +165 @@
         return name == null || name.isEmpty() || restaurant.getName().contains(name);
     }
+
+    @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);
+            }
+            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());
+        }
+    }
 }

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

@@ -64 +64 @@
         }
 
-        List<Restaurant> filteredRestaurants = restaurantService.findRestaurantsByDateTimeAndPartySize(parsedDateTime, partySize, search);
+        List<Restaurant> filteredRestaurants = restaurantService.findRestaurantsBySearchParams(parsedDateTime, partySize, search);
 
         return new ResponseEntity<List<Restaurant>>(filteredRestaurants, HttpStatus.OK);