resolve conflict and fix

go.sum

@@ -127,7 +127,6 @@ github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=

grpcapi/grpcapi.go

@@ -56,6 +56,7 @@ 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,
+		Administrators: req.Administrators,
 	}
 	if req.AvailabilityFrom.IsValid() {
 		filter.AvailableFrom = req.AvailabilityFrom.AsTime()
@@ -79,9 +80,6 @@ func (s FleetsServerImpl) GetVehicles(ctx context.Context, req *GetVehiclesReque
 	return &GetVehiclesResponse{Vehicles: vehicles}, nil
 }
 
-func (s FleetsServerImpl) UpdateVehicle(context.Context, *UpdateVehicleRequest) (*UpdateVehicleResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method UpdateVehicle not implemented")
-}
 func (s FleetsServerImpl) CreateBooking(ctx context.Context, req *CreateBookingRequest) (*CreateBookingResponse, error) {
 	b := req.Booking.ToStorageType()
 	booking, err := s.handler.AddBooking(b)
@@ -195,3 +193,19 @@ func Run(done chan error, cfg *viper.Viper, handler handlers.FleetsHandler) {
 		done <- err
 	}
 }
+
+/////////////////////update////////////////////////
+func (s FleetsServerImpl) UpdateVehicle(ctx context.Context, req *UpdateVehicleRequest) (*UpdateVehicleResponse, error) {
+	b := req.Vehicle.ToStorageType()
+	vehicle, err := s.handler.UpdateVehicle(b)
+	if err != nil {
+		fmt.Println(err)
+		return nil, status.Errorf(codes.AlreadyExists, "vehicle update failed : %v", err)
+	}
+	response, err := VehicleFromStorageType(vehicle)
+	if err != nil {
+		fmt.Println(err)
+		return nil, status.Errorf(codes.Internal, "issue while retrieving vehicle : %v", err)
+	}
+	return &UpdateVehicleResponse{Vehicle: response}, nil
+}

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 {

handlers/vehicles.go

@@ -3,6 +3,8 @@ package handlers
 import (
 	"time"
 
+	// "Documents/go_projet/go/pkg/mod/git.coopgo.io/coopgo-platform/fleets@v0.0.0-20230310144446-feb935f8bf4e/storage"
+
 	"git.coopgo.io/coopgo-platform/fleets/storage"
 	"github.com/google/uuid"
 )
@@ -56,3 +58,14 @@ func (h FleetsHandler) GetVehicles(namespaces []string, filters storage.VehicleF
 	}
 	return newvehicles, err
 }
+
+/////////////////update///////////////
+func (h FleetsHandler) UpdateVehicle(vehicle storage.Vehicle) (*storage.Vehicle, error) {
+
+	// Store the account
+	if err := h.storage.UpdateVehicle(vehicle); err != nil {
+		return nil, err
+	}
+
+	return &vehicle, 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,7 +18,7 @@ type Booking struct {
 	Unavailableto   time.Time      `json:"unavailableto"`
 	Data            map[string]any `json:"data"`
 
-	Deleted bool
+	Deleted bool    `json:"deleted"`
 	Vehicle Vehicle `json:"vehicle" bson:"-"`
 }
 

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},
@@ -236,3 +238,14 @@ func (s MongoDBStorage) DeleteBooking(bookingid string) error {
 	return err
 
 }
+
+// ///////////////////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 {
+		fmt.Println(err)
+		return err
+	}
+
+	return nil
+}

storage/storage.go

@@ -11,6 +11,7 @@ type Storage interface {
 	CreateVehicle(Vehicle) error
 	GetVehicle(id string) (*Vehicle, error)
 	GetVehicles(namespaces []string) ([]Vehicle, error)
+	UpdateVehicle(Vehicle) error
 
 	//Bookings management
 	CreateBooking(Booking) error

storage/vehicles.go

@@ -18,14 +18,13 @@ type Vehicle struct {
 
 type VehicleFilters struct {
 	Types          []string
+	Administrators []string
 	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)
-		fmt.Println(b)
 		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)))) ||
 			((start.Before(b.Unavailableto) || start.Equal(b.Unavailableto)) && (end.After(b.Unavailableto.Add(24*time.Hour)) || end.Equal(b.Unavailableto.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)))) {
@@ -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
 }