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

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...

File:

• src/main/java/com/example/rezevirajmasa/demo/service/impl/RestaurantServiceImpl.java (modified) (1 diff)

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);
+    }
 }