deleted bookings management

handlers/vehicles.go

@@ -1,6 +1,7 @@
 package handlers
 
 import (
+	"slices"
 	"time"
 
 	// "Documents/go_projet/go/pkg/mod/git.coopgo.io/coopgo-platform/fleets@v0.0.0-20230310144446-feb935f8bf4e/storage"
@@ -41,22 +42,40 @@ func (h FleetsHandler) GetVehicle(id string) (vehicle *storage.Vehicle, err erro
 
 func (h FleetsHandler) GetVehicles(namespaces []string, filters storage.VehicleFilters) ([]storage.Vehicle, error) {
 	vehicles, err := h.storage.GetVehicles(namespaces)
-	newvehicles := []storage.Vehicle{}
-	for _, v := range vehicles {
-
-		bookings, err := h.storage.GetBookingsForVehicle(v.ID)
-		if err != nil {
-			return nil, err
-		}
-		v.Bookings = bookings
-
-		if !v.MatchesFilters(filters) {
-			continue
-		}
-
-		newvehicles = append(newvehicles, v)
+	if err != nil {
+		return nil, err
 	}
-	return newvehicles, err
+
+	// Filter vehicles and bookings using slices.Collect
+	return slices.Collect(func(yield func(storage.Vehicle) bool) {
+		for _, v := range vehicles {
+			bookings, err := h.storage.GetBookingsForVehicle(v.ID)
+			if err != nil {
+				continue // Skip vehicles with booking errors
+			}
+
+			// Filter deleted bookings unless specifically requested
+			if !filters.IncludeDeleted {
+				v.Bookings = slices.Collect(func(yieldBooking func(storage.Booking) bool) {
+					for _, booking := range bookings {
+						if !booking.Deleted {
+							if !yieldBooking(booking) {
+								return
+							}
+						}
+					}
+				})
+			} else {
+				v.Bookings = bookings
+			}
+
+			if v.MatchesFilters(filters) {
+				if !yield(v) {
+					return
+				}
+			}
+		}
+	}), nil
 }
 
 /////////////////update///////////////