coopgo-platform
/
fleets
8
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

resolve conflict and fix

This commit is contained in:
Arnaud Delcasse 2023-11-27 08:47:44 +01:00
parent 0c8cf6be60
commit 6e6b559356
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
handlers/bookings.go
View File

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

2
storage/bookings.go
View File

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

2
storage/mongodb.go
View File

@ -225,6 +225,8 @@ func (s MongoDBStorage) GetBookingsForDriver(driver string) (bookings []Booking,
func (s MongoDBStorage) DeleteBooking(bookingid string) error { func (s MongoDBStorage) DeleteBooking(bookingid string) error {
collection := s.Client.Database(s.DbName).Collection(s.Collections["bookings"]) collection := s.Client.Database(s.DbName).Collection(s.Collections["bookings"])
fmt.Println(bookingid)
_, err := collection.UpdateOne( _, err := collection.UpdateOne(
context.TODO(), context.TODO(),
bson.M{"_id": bookingid}, bson.M{"_id": bookingid},