Changeset 65b6638 for src

Timestamp:

02/28/24 18:44:19 (15 months ago)

Author:

Aleksandar Panovski <apano77@…>

Branches:

main

Children:

75f5086

Parents:

d24f17c

Message:

RetaurantServiceImpl problemi
isAvailable od tableEntity...

Location:

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

Files:

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

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

@@ -8 +8 @@
 
 public interface RestaurantRepository extends JpaRepository<Restaurant, Long> {
+
+
 }

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

@@ -2 +2 @@
 
 import com.example.rezevirajmasa.demo.model.Restaurant;
+import com.example.rezevirajmasa.demo.model.TableEntity;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 
@@ -18 +20 @@
     List<Restaurant> listRestaurantBy(String search);
     List<Restaurant> getRestaurantsWithAvailableTimeSlotsForToday();
+    public List<Restaurant> findRestaurantsByDateTimeAndPartySize(LocalDateTime dateTime, int partySize, String search);
 }

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

@@ -143 +143 @@
         return restaurantsWithAvailableTimeSlots;
     }
+
+    @Override
+    public List<Restaurant> findRestaurantsByDateTimeAndPartySize(LocalDateTime dateTime, int partySize, String search) {
+        List<Restaurant> allRestaurants = restaurantRepository.findAll();
+        return allRestaurants.stream()
+                .filter(restaurant -> hasAvailableTable(restaurant, dateTime, partySize))
+                .filter(restaurant -> isMatch(restaurant, search))
+                .collect(Collectors.toList());
+    }
+
+    private boolean hasAvailableTable(Restaurant restaurant, LocalDateTime dateTime, int partySize) {
+        for (TableEntity table : restaurant.getTablesList()) {
+            if (table.isAvailable(dateTime) && table.getCapacity() >= partySize) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private boolean isMatch(Restaurant restaurant, String name) {
+        return name == null || name.isEmpty() || restaurant.getName().contains(name);
+    }
 }

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

@@ -6 +6 @@
 import com.example.rezevirajmasa.demo.service.RestaurantService;
 import com.example.rezevirajmasa.demo.service.TableService;
+import jdk.jfr.consumer.RecordingStream;
 import org.apache.coyote.Response;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -12 +14 @@
 
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
+import java.util.Map;
 
 @CrossOrigin(origins = "http://localhost:3000/")
@@ -34 +38 @@
     }
 
+    //restaurants
+
     @RequestMapping("/api/restaurants")
     public ResponseEntity<List<Restaurant>> getAllRestaurants() {
@@ -42 +48 @@
     public ResponseEntity<Restaurant> getRestaurantById(@PathVariable Long restaurantId) {
         return new ResponseEntity<Restaurant>(restaurantService.findById(restaurantId), HttpStatus.OK);
+    }
+
+    @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");
+
+        // Now proceed with parsing dateTime and performing the search based on the received parameters
+
+        LocalDateTime parsedDateTime = null;
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+        if (dateTime != null) {
+            parsedDateTime = LocalDateTime.parse(dateTime, formatter);
+        }
+
+        List<Restaurant> filteredRestaurants = restaurantService.findRestaurantsByDateTimeAndPartySize(parsedDateTime, partySize, search);
+
+        return new ResponseEntity<List<Restaurant>>(filteredRestaurants, HttpStatus.OK);
     }