resolve conflict and fix

grpcapi/grpcapi.go

@@ -55,7 +55,8 @@ func (s FleetsServerImpl) GetVehicle(ctx context.Context, req *GetVehicleRequest
 
 func (s FleetsServerImpl) GetVehicles(ctx context.Context, req *GetVehiclesRequest) (*GetVehiclesResponse, error) {
 	filter := storage.VehicleFilters{
-		Types: req.Types,
+		Types:          req.Types,
+		Administrators: req.Administrators,
 	}
 	if req.AvailabilityFrom.IsValid() {
 		filter.AvailableFrom = req.AvailabilityFrom.AsTime()

handlers/bookings.go

@@ -1,8 +1,6 @@
 package handlers
 
 import (
-	"errors"
-
 	"git.coopgo.io/coopgo-platform/fleets/storage"
 	"github.com/google/uuid"
 )
@@ -26,9 +24,9 @@ func (h FleetsHandler) GetBooking(id string) (booking *storage.Booking, err erro
 		return nil, err
 	}
 
-	if booking.Deleted {
+	// if booking.Deleted {
-		return nil, errors.New("booking was deleted")
+	// 	return nil, errors.New("booking was deleted")
-	}
+	// }
 
 	vehicle, err := h.storage.GetVehicle(booking.Vehicleid)
 	if err != nil {

main.go

@@ -18,6 +18,7 @@ func main() {
 	var (
 		service_name = cfg.GetString("name")
 		grpc_enable  = cfg.GetBool("services.grpc.enable")
+		dev_env      = cfg.GetBool("dev_env")
 	)
 
 	storage, err := storage.NewStorage(cfg)
@@ -28,6 +29,9 @@ func main() {
 	handler := handlers.NewHandler(cfg, storage)
 
 	fmt.Println("Running", service_name, ":")
+	if dev_env {
+		fmt.Printf("\033]0;%s\007", service_name)
+	}
 
 	failed := make(chan error)
 

storage/bookings.go

@@ -18,8 +18,8 @@ type Booking struct {
 	Unavailableto   time.Time      `json:"unavailableto"`
 	Data            map[string]any `json:"data"`
 
-	Deleted bool
+	Deleted bool    `json:"deleted"`
-	Vehicle Vehicle
+	Vehicle Vehicle `json:"vehicle" bson:"-"`
 }
 
 func (b Booking) Status() int {

storage/mongodb.go

@@ -225,6 +225,8 @@ func (s MongoDBStorage) GetBookingsForDriver(driver string) (bookings []Booking,
 func (s MongoDBStorage) DeleteBooking(bookingid string) error {
 	collection := s.Client.Database(s.DbName).Collection(s.Collections["bookings"])
 
+	fmt.Println(bookingid)
+
 	_, err := collection.UpdateOne(
 		context.TODO(),
 		bson.M{"_id": bookingid},
@@ -237,7 +239,7 @@ func (s MongoDBStorage) DeleteBooking(bookingid string) error {
 
 }
 
-/////////////////////update///////////////
+// ///////////////////update///////////////
 func (s MongoDBStorage) UpdateVehicle(vehicle Vehicle) error {
 	collection := s.Client.Database(s.DbName).Collection(s.Collections["vehicles"])
 	if _, err := collection.ReplaceOne(context.TODO(), bson.M{"_id": vehicle.ID}, vehicle); err != nil {

storage/vehicles.go

@@ -17,18 +17,17 @@ type Vehicle struct {
 }
 
 type VehicleFilters struct {
-	Types         []string
+	Types          []string
-	AvailableFrom time.Time
+	Administrators []string
-	AvailableTo   time.Time
+	AvailableFrom  time.Time
+	AvailableTo    time.Time
 }
 
 func (v Vehicle) Free(start time.Time, end time.Time) bool {
 	for _, b := range v.Bookings {
-		fmt.Println("Bookings for", v)
+		if ((start.Before(b.Unavailablefrom) || start.Equal(b.Unavailablefrom)) && (end.After(b.Unavailablefrom.Add(24*time.Hour)) || end.Equal(b.Unavailablefrom.Add(24*time.Hour)))) ||
-		fmt.Println(b)
+			((start.Before(b.Unavailableto) || start.Equal(b.Unavailableto)) && (end.After(b.Unavailableto.Add(24*time.Hour)) || end.Equal(b.Unavailableto.Add(24*time.Hour)))) ||
-		if (start.Before(b.Unavailablefrom) && end.After(b.Unavailablefrom.Add(24*time.Hour))) ||
+			((start.After(b.Unavailablefrom) || start.Equal(b.Unavailablefrom)) && (end.Before(b.Unavailableto.Add(24*time.Hour)) || end.Equal(b.Unavailableto.Add(24*time.Hour)))) {
-			(start.Before(b.Unavailableto) && end.After(b.Unavailableto.Add(24*time.Hour))) ||
-			(start.After(b.Unavailablefrom) && end.Before(b.Unavailableto.Add(24*time.Hour))) {
 			return false
 		}
 	}
@@ -36,6 +35,8 @@ func (v Vehicle) Free(start time.Time, end time.Time) bool {
 }
 
 func (v Vehicle) MatchesFilters(filters VehicleFilters) bool {
+	fmt.Println("Filters : ", filters)
+
 	if len(filters.Types) > 0 {
 		found := false
 		for _, t := range filters.Types {
@@ -49,11 +50,24 @@ func (v Vehicle) MatchesFilters(filters VehicleFilters) bool {
 		}
 	}
 
+	if len(filters.Administrators) > 0 {
+		found := false
+		for _, a := range filters.Administrators {
+			for _, va := range v.Administrators {
+				if a == va {
+					found = true
+					break
+				}
+			}
+		}
+		if !found {
+			return false
+		}
+	}
+
 	if !v.Free(filters.AvailableFrom, filters.AvailableTo) {
 		return false
 	}
 
-	fmt.Println(filters)
-
 	return true
 }