deleted bookings management

handlers/bookings.go

@@ -1,6 +1,8 @@
 package handlers
 
 import (
+	"time"
+
 	"git.coopgo.io/coopgo-platform/fleets/storage"
 	"github.com/google/uuid"
 )
@@ -24,23 +26,15 @@ func (h FleetsHandler) GetBooking(id string) (booking *storage.Booking, err erro
 		return nil, err
 	}
 
-	// if booking.Deleted {
-	// 	return nil, errors.New("booking was deleted")
-	// }
-
 	vehicle, err := h.storage.GetVehicle(booking.Vehicleid)
 	if err != nil {
 		return nil, err
 	}
-	if err != nil {
-		return nil, err
-	}
 	booking.Vehicle = *vehicle
 	return
 }
 
 func (h FleetsHandler) UpdateBooking(booking storage.Booking) (*storage.Booking, error) {
-
 	// Store the account
 	if err := h.storage.UpdateBooking(booking); err != nil {
 		return nil, err
@@ -49,8 +43,33 @@ func (h FleetsHandler) UpdateBooking(booking storage.Booking) (*storage.Booking,
 	return &booking, nil
 }
 
-func (h FleetsHandler) DeleteBooking(id string) error {
-	return h.storage.DeleteBooking(id)
+func (h FleetsHandler) DeleteBooking(id string, deletionMetadata map[string]any) error {
+	// Get the existing booking
+	booking, err := h.storage.GetBooking(id)
+	if err != nil {
+		return err
+	}
+
+	// Mark as deleted instead of hard delete
+	booking.Deleted = true
+
+	// Add deletion metadata to data
+	if booking.Data == nil {
+		booking.Data = make(map[string]any)
+	}
+
+	// Add deletion timestamp
+	booking.Data["deleted_at"] = time.Now().Format(time.RFC3339)
+
+	// Merge provided deletion metadata
+	if deletionMetadata != nil {
+		for key, value := range deletionMetadata {
+			booking.Data[key] = value
+		}
+	}
+
+	// Update the booking instead of deleting
+	return h.storage.UpdateBooking(*booking)
 }
 
 func (h FleetsHandler) GetBookings() ([]storage.Booking, error) {

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