Changeset cfc16a3 for src/main/java/com/example/rezevirajmasa/demo

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

Location:

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

Files:

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

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