diff --git a/config.yaml b/config.yaml index f0a17dc..169ceb6 100644 --- a/config.yaml +++ b/config.yaml @@ -20,12 +20,12 @@ storage: services: grpc: - ip: 10.73.189.75 #10.73.190.5 + ip: 10.73.189.26 #10.73.190.5 enable: true port: 8089 solidarity-api: enable: true - address: 10.73.189.75:9999 #10.73.190.5:9999 + address: 10.73.189.26:9999 #10.73.190.5:9999 routing: type: valhalla diff --git a/go.mod b/go.mod index 95d457b..dcc72e8 100644 --- a/go.mod +++ b/go.mod @@ -19,6 +19,8 @@ require ( ) require ( + github.com/ericlagergren/decimal v0.0.0-20221120152707-495c53812d05 // indirect + github.com/formancehq/formance-sdk-go/v3 v3.2.0 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/hashicorp/hcl v1.0.0 // indirect @@ -46,7 +48,7 @@ require ( golang.org/x/crypto v0.24.0 // indirect golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect golang.org/x/net v0.26.0 // indirect - golang.org/x/sync v0.7.0 // indirect + golang.org/x/sync v0.8.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 // indirect diff --git a/go.sum b/go.sum index baa602d..d085b51 100644 --- a/go.sum +++ b/go.sum @@ -6,6 +6,10 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dvyukov/go-fuzz v0.0.0-20200318091601-be3528f3a813/go.mod h1:11Gm+ccJnvAhCNLlf5+cS9KjtbaD5I5zaZpFMsTHWTw= +github.com/ericlagergren/decimal v0.0.0-20221120152707-495c53812d05 h1:S92OBrGuLLZsyM5ybUzgc/mPjIYk2AZqufieooe98uw= +github.com/ericlagergren/decimal v0.0.0-20221120152707-495c53812d05/go.mod h1:M9R1FoZ3y//hwwnJtO51ypFGwm8ZfpxPT/ZLtO1mcgQ= +github.com/formancehq/formance-sdk-go/v3 v3.2.0 h1:3zxYSu71jjCj5XMBvT6bTm2HlbZWvm3txYcuONJUbWw= +github.com/formancehq/formance-sdk-go/v3 v3.2.0/go.mod h1:XivkqQzjOtR3W7hqIFYcUN11UIf+X8/V1yoPPnGBQVU= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= @@ -148,6 +152,8 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/handler/services.go b/handler/services.go index d503a94..3fc72bb 100644 --- a/handler/services.go +++ b/handler/services.go @@ -95,6 +95,14 @@ func (s *SolidarityServiceHandler) GetBookingsByStatus(ctx context.Context, stat return bookings, nil } +func (s *SolidarityServiceHandler) GetAllBookingsSolidarity(ctx context.Context ) (bookings []internal.Booking, err error) { + bookings, err = s.Storage.GetAllBookingsSolidarity() + if err != nil { + return nil, err + } + return bookings, nil +} + func (s *SolidarityServiceHandler) GetDriverJourneys(ctx context.Context, departure_route *geojson.Feature, departure_date int64) (drivers []internal.Driver, err error) { drivers, err = s.Storage.DriverJourneys(departure_route, departure_date) if err != nil { diff --git a/interoperability/solidarity-api/server/openapi/model_driver_punctual_availabilities_request.go b/interoperability/solidarity-api/server/openapi/model_driver_punctual_availabilities_request.go index 330c758..f9b7cb5 100644 --- a/interoperability/solidarity-api/server/openapi/model_driver_punctual_availabilities_request.go +++ b/interoperability/solidarity-api/server/openapi/model_driver_punctual_availabilities_request.go @@ -25,7 +25,7 @@ type DriverPunctualAvailabilitiesRequest struct { Availabilities []PunctualAvailabilitySlot `json:"availabilities"` - User User `json:"user"` + User User `json:"user"` Preferences Preferences `json:"preferences,omitempty"` diff --git a/main.go b/main.go index 348245f..c6d8a12 100644 --- a/main.go +++ b/main.go @@ -1,13 +1,19 @@ package main import ( - routing "git.coopgo.io/coopgo-platform/routing-service" - "github.com/rs/zerolog" - "github.com/rs/zerolog/log" + "context" SolidarityServiceHandler "solidarity-service/handler" api "solidarity-service/interoperability/solidarity-api/server" grpcserver "solidarity-service/servers/grpc/server" "solidarity-service/storage" + "strconv" + + routing "git.coopgo.io/coopgo-platform/routing-service" + formancesdkgo "github.com/formancehq/formance-sdk-go/v3" + "github.com/formancehq/formance-sdk-go/v3/pkg/models/operations" + "github.com/formancehq/formance-sdk-go/v3/pkg/models/shared" + "github.com/rs/zerolog" + "github.com/rs/zerolog/log" ) func main() { @@ -56,4 +62,21 @@ func main() { err = <-failed log.Fatal().Err(err).Msg("Terminating") + + s := formancesdkgo.New( + formancesdkgo.WithServerURL("https://10.73.189.26"), + formancesdkgo.WithSecurity(shared.Security{ + ClientID: formancesdkgo.String(""), + ClientSecret: formancesdkgo.String(""), + }), + ) + + ctx := context.Background() + res, err := s.Ledger.V2.ListLedgers(ctx, operations.V2ListLedgersRequest{ + PageSize: formancesdkgo.Int64(100), + }) + if err != nil { + log.Fatal().Err(err).Msg("Formance Ledger initialitation error") + } + log.Info().Msg("response:"+ strconv.Itoa(res.StatusCode)) } diff --git a/servers/grpc/proto/solidarity-api-types.pb.go b/servers/grpc/proto/solidarity-api-types.pb.go index 99c3488..7ae4237 100644 --- a/servers/grpc/proto/solidarity-api-types.pb.go +++ b/servers/grpc/proto/solidarity-api-types.pb.go @@ -988,6 +988,44 @@ func (x *BookingSolidarity) GetPickupDate() *timestamp.Timestamp { return nil } +type GetAllBookingsSolidarity struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *GetAllBookingsSolidarity) Reset() { + *x = GetAllBookingsSolidarity{} + if protoimpl.UnsafeEnabled { + mi := &file_solidarity_api_types_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *GetAllBookingsSolidarity) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*GetAllBookingsSolidarity) ProtoMessage() {} + +func (x *GetAllBookingsSolidarity) ProtoReflect() protoreflect.Message { + mi := &file_solidarity_api_types_proto_msgTypes[10] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use GetAllBookingsSolidarity.ProtoReflect.Descriptor instead. +func (*GetAllBookingsSolidarity) Descriptor() ([]byte, []int) { + return file_solidarity_api_types_proto_rawDescGZIP(), []int{10} +} + type GetAllPassengers struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -997,7 +1035,7 @@ type GetAllPassengers struct { func (x *GetAllPassengers) Reset() { *x = GetAllPassengers{} if protoimpl.UnsafeEnabled { - mi := &file_solidarity_api_types_proto_msgTypes[10] + mi := &file_solidarity_api_types_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1010,7 +1048,7 @@ func (x *GetAllPassengers) String() string { func (*GetAllPassengers) ProtoMessage() {} func (x *GetAllPassengers) ProtoReflect() protoreflect.Message { - mi := &file_solidarity_api_types_proto_msgTypes[10] + mi := &file_solidarity_api_types_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1023,7 +1061,7 @@ func (x *GetAllPassengers) ProtoReflect() protoreflect.Message { // Deprecated: Use GetAllPassengers.ProtoReflect.Descriptor instead. func (*GetAllPassengers) Descriptor() ([]byte, []int) { - return file_solidarity_api_types_proto_rawDescGZIP(), []int{10} + return file_solidarity_api_types_proto_rawDescGZIP(), []int{11} } type GetPassenger struct { @@ -1035,7 +1073,7 @@ type GetPassenger struct { func (x *GetPassenger) Reset() { *x = GetPassenger{} if protoimpl.UnsafeEnabled { - mi := &file_solidarity_api_types_proto_msgTypes[11] + mi := &file_solidarity_api_types_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1048,7 +1086,7 @@ func (x *GetPassenger) String() string { func (*GetPassenger) ProtoMessage() {} func (x *GetPassenger) ProtoReflect() protoreflect.Message { - mi := &file_solidarity_api_types_proto_msgTypes[11] + mi := &file_solidarity_api_types_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1061,7 +1099,7 @@ func (x *GetPassenger) ProtoReflect() protoreflect.Message { // Deprecated: Use GetPassenger.ProtoReflect.Descriptor instead. func (*GetPassenger) Descriptor() ([]byte, []int) { - return file_solidarity_api_types_proto_rawDescGZIP(), []int{11} + return file_solidarity_api_types_proto_rawDescGZIP(), []int{12} } type Car struct { @@ -1076,7 +1114,7 @@ type Car struct { func (x *Car) Reset() { *x = Car{} if protoimpl.UnsafeEnabled { - mi := &file_solidarity_api_types_proto_msgTypes[12] + mi := &file_solidarity_api_types_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1089,7 +1127,7 @@ func (x *Car) String() string { func (*Car) ProtoMessage() {} func (x *Car) ProtoReflect() protoreflect.Message { - mi := &file_solidarity_api_types_proto_msgTypes[12] + mi := &file_solidarity_api_types_proto_msgTypes[13] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1102,7 +1140,7 @@ func (x *Car) ProtoReflect() protoreflect.Message { // Deprecated: Use Car.ProtoReflect.Descriptor instead. func (*Car) Descriptor() ([]byte, []int) { - return file_solidarity_api_types_proto_rawDescGZIP(), []int{12} + return file_solidarity_api_types_proto_rawDescGZIP(), []int{13} } func (x *Car) GetModel() string { @@ -1134,7 +1172,7 @@ type Preferences struct { func (x *Preferences) Reset() { *x = Preferences{} if protoimpl.UnsafeEnabled { - mi := &file_solidarity_api_types_proto_msgTypes[13] + mi := &file_solidarity_api_types_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1147,7 +1185,7 @@ func (x *Preferences) String() string { func (*Preferences) ProtoMessage() {} func (x *Preferences) ProtoReflect() protoreflect.Message { - mi := &file_solidarity_api_types_proto_msgTypes[13] + mi := &file_solidarity_api_types_proto_msgTypes[14] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1160,7 +1198,7 @@ func (x *Preferences) ProtoReflect() protoreflect.Message { // Deprecated: Use Preferences.ProtoReflect.Descriptor instead. func (*Preferences) Descriptor() ([]byte, []int) { - return file_solidarity_api_types_proto_rawDescGZIP(), []int{13} + return file_solidarity_api_types_proto_rawDescGZIP(), []int{14} } func (x *Preferences) GetSmoking() bool { @@ -1211,7 +1249,7 @@ type Price struct { func (x *Price) Reset() { *x = Price{} if protoimpl.UnsafeEnabled { - mi := &file_solidarity_api_types_proto_msgTypes[14] + mi := &file_solidarity_api_types_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1224,7 +1262,7 @@ func (x *Price) String() string { func (*Price) ProtoMessage() {} func (x *Price) ProtoReflect() protoreflect.Message { - mi := &file_solidarity_api_types_proto_msgTypes[14] + mi := &file_solidarity_api_types_proto_msgTypes[15] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1237,7 +1275,7 @@ func (x *Price) ProtoReflect() protoreflect.Message { // Deprecated: Use Price.ProtoReflect.Descriptor instead. func (*Price) Descriptor() ([]byte, []int) { - return file_solidarity_api_types_proto_rawDescGZIP(), []int{14} + return file_solidarity_api_types_proto_rawDescGZIP(), []int{15} } func (x *Price) GetType() PriceType { @@ -1279,7 +1317,7 @@ type User struct { func (x *User) Reset() { *x = User{} if protoimpl.UnsafeEnabled { - mi := &file_solidarity_api_types_proto_msgTypes[15] + mi := &file_solidarity_api_types_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1292,7 +1330,7 @@ func (x *User) String() string { func (*User) ProtoMessage() {} func (x *User) ProtoReflect() protoreflect.Message { - mi := &file_solidarity_api_types_proto_msgTypes[15] + mi := &file_solidarity_api_types_proto_msgTypes[16] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1305,7 +1343,7 @@ func (x *User) ProtoReflect() protoreflect.Message { // Deprecated: Use User.ProtoReflect.Descriptor instead. func (*User) Descriptor() ([]byte, []int) { - return file_solidarity_api_types_proto_rawDescGZIP(), []int{15} + return file_solidarity_api_types_proto_rawDescGZIP(), []int{16} } func (x *User) GetId() string { @@ -1505,68 +1543,70 @@ var file_solidarity_api_types_proto_rawDesc = []byte{ 0x61, 0x74, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0a, 0x70, 0x69, 0x63, 0x6b, 0x75, 0x70, 0x44, 0x61, 0x74, - 0x65, 0x22, 0x12, 0x0a, 0x10, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x50, 0x61, 0x73, 0x73, 0x65, - 0x6e, 0x67, 0x65, 0x72, 0x73, 0x22, 0x0e, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x50, 0x61, 0x73, 0x73, - 0x65, 0x6e, 0x67, 0x65, 0x72, 0x22, 0x31, 0x0a, 0x03, 0x43, 0x61, 0x72, 0x12, 0x14, 0x0a, 0x05, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x72, 0x61, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x05, 0x62, 0x72, 0x61, 0x6e, 0x64, 0x22, 0x97, 0x01, 0x0a, 0x0b, 0x50, 0x72, 0x65, - 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6d, 0x6f, 0x6b, - 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x73, 0x6d, 0x6f, 0x6b, 0x69, - 0x6e, 0x67, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x6e, 0x69, 0x6d, 0x61, 0x6c, 0x73, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x08, 0x52, 0x07, 0x61, 0x6e, 0x69, 0x6d, 0x61, 0x6c, 0x73, 0x12, 0x14, 0x0a, 0x05, - 0x6d, 0x75, 0x73, 0x69, 0x63, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x6d, 0x75, 0x73, - 0x69, 0x63, 0x12, 0x1b, 0x0a, 0x09, 0x69, 0x73, 0x5f, 0x74, 0x61, 0x6c, 0x6b, 0x65, 0x72, 0x18, - 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x54, 0x61, 0x6c, 0x6b, 0x65, 0x72, 0x12, - 0x21, 0x0a, 0x0c, 0x6c, 0x75, 0x67, 0x67, 0x61, 0x67, 0x65, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, - 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x6c, 0x75, 0x67, 0x67, 0x61, 0x67, 0x65, 0x53, 0x69, - 0x7a, 0x65, 0x22, 0x5b, 0x0a, 0x05, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x1e, 0x0a, 0x04, 0x74, - 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x50, 0x72, 0x69, 0x63, - 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x61, - 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x52, 0x06, 0x61, 0x6d, 0x6f, - 0x75, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x63, 0x79, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x63, 0x79, 0x22, - 0xdd, 0x01, 0x0a, 0x04, 0x55, 0x73, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x6c, 0x69, 0x61, - 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x12, 0x1d, - 0x0a, 0x0a, 0x66, 0x69, 0x72, 0x73, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x09, 0x66, 0x69, 0x72, 0x73, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1b, 0x0a, - 0x09, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, - 0x61, 0x64, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x67, 0x72, 0x61, 0x64, 0x65, - 0x12, 0x18, 0x0a, 0x07, 0x70, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x07, 0x70, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x65, - 0x6e, 0x64, 0x65, 0x72, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x67, 0x65, 0x6e, 0x64, - 0x65, 0x72, 0x12, 0x2b, 0x0a, 0x11, 0x76, 0x65, 0x72, 0x69, 0x66, 0x69, 0x65, 0x64, 0x5f, 0x69, - 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10, 0x76, - 0x65, 0x72, 0x69, 0x66, 0x69, 0x65, 0x64, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2a, - 0x4a, 0x0a, 0x09, 0x44, 0x61, 0x79, 0x4f, 0x66, 0x57, 0x65, 0x65, 0x6b, 0x12, 0x07, 0x0a, 0x03, - 0x4d, 0x4f, 0x4e, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x54, 0x55, 0x45, 0x10, 0x01, 0x12, 0x07, - 0x0a, 0x03, 0x57, 0x45, 0x44, 0x10, 0x03, 0x12, 0x07, 0x0a, 0x03, 0x54, 0x48, 0x55, 0x10, 0x04, - 0x12, 0x07, 0x0a, 0x03, 0x46, 0x52, 0x49, 0x10, 0x05, 0x12, 0x07, 0x0a, 0x03, 0x53, 0x41, 0x54, - 0x10, 0x06, 0x12, 0x07, 0x0a, 0x03, 0x53, 0x55, 0x4e, 0x10, 0x07, 0x2a, 0x2e, 0x0a, 0x09, 0x50, - 0x72, 0x69, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x46, 0x52, 0x45, 0x45, - 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x50, 0x41, 0x59, 0x49, 0x4e, 0x47, 0x10, 0x01, 0x12, 0x0b, - 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x02, 0x2a, 0xbc, 0x01, 0x0a, 0x17, - 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, - 0x79, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x0d, 0x0a, 0x09, 0x49, 0x4e, 0x49, 0x54, 0x49, - 0x41, 0x54, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1f, 0x0a, 0x1b, 0x57, 0x41, 0x49, 0x54, 0x49, 0x4e, - 0x47, 0x5f, 0x44, 0x52, 0x49, 0x56, 0x45, 0x52, 0x5f, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x52, 0x4d, - 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x01, 0x12, 0x22, 0x0a, 0x1e, 0x57, 0x41, 0x49, 0x54, 0x49, - 0x4e, 0x47, 0x5f, 0x50, 0x41, 0x53, 0x53, 0x45, 0x4e, 0x47, 0x45, 0x52, 0x5f, 0x43, 0x4f, 0x4e, - 0x46, 0x49, 0x52, 0x4d, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x02, 0x12, 0x0d, 0x0a, 0x09, 0x43, - 0x4f, 0x4e, 0x46, 0x49, 0x52, 0x4d, 0x45, 0x44, 0x10, 0x03, 0x12, 0x0d, 0x0a, 0x09, 0x43, 0x41, - 0x4e, 0x43, 0x45, 0x4c, 0x4c, 0x45, 0x44, 0x10, 0x04, 0x12, 0x20, 0x0a, 0x1c, 0x43, 0x4f, 0x4d, - 0x50, 0x4c, 0x45, 0x54, 0x45, 0x44, 0x5f, 0x50, 0x45, 0x4e, 0x44, 0x49, 0x4e, 0x47, 0x5f, 0x56, - 0x41, 0x4c, 0x49, 0x44, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x05, 0x12, 0x0d, 0x0a, 0x09, 0x56, - 0x41, 0x4c, 0x49, 0x44, 0x41, 0x54, 0x45, 0x44, 0x10, 0x06, 0x2a, 0x25, 0x0a, 0x08, 0x55, 0x73, - 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0a, 0x0a, 0x06, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, - 0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09, 0x70, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x10, - 0x01, 0x42, 0x45, 0x5a, 0x43, 0x67, 0x69, 0x74, 0x2e, 0x63, 0x6f, 0x6f, 0x70, 0x67, 0x6f, 0x2e, - 0x69, 0x6f, 0x2f, 0x63, 0x6f, 0x6f, 0x70, 0x67, 0x6f, 0x2d, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, - 0x72, 0x6d, 0x2f, 0x73, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x2d, 0x73, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x73, 0x2f, 0x67, 0x72, - 0x70, 0x63, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x22, 0x1a, 0x0a, 0x18, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x42, 0x6f, 0x6f, 0x6b, 0x69, + 0x6e, 0x67, 0x73, 0x53, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x22, 0x12, 0x0a, + 0x10, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, + 0x73, 0x22, 0x0e, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, + 0x72, 0x22, 0x31, 0x0a, 0x03, 0x43, 0x61, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x12, 0x14, + 0x0a, 0x05, 0x62, 0x72, 0x61, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x62, + 0x72, 0x61, 0x6e, 0x64, 0x22, 0x97, 0x01, 0x0a, 0x0b, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, + 0x6e, 0x63, 0x65, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6d, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x73, 0x6d, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x12, 0x18, + 0x0a, 0x07, 0x61, 0x6e, 0x69, 0x6d, 0x61, 0x6c, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, + 0x07, 0x61, 0x6e, 0x69, 0x6d, 0x61, 0x6c, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x75, 0x73, 0x69, + 0x63, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x6d, 0x75, 0x73, 0x69, 0x63, 0x12, 0x1b, + 0x0a, 0x09, 0x69, 0x73, 0x5f, 0x74, 0x61, 0x6c, 0x6b, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x08, 0x52, 0x08, 0x69, 0x73, 0x54, 0x61, 0x6c, 0x6b, 0x65, 0x72, 0x12, 0x21, 0x0a, 0x0c, 0x6c, + 0x75, 0x67, 0x67, 0x61, 0x67, 0x65, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x0b, 0x6c, 0x75, 0x67, 0x67, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x22, 0x5b, + 0x0a, 0x05, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x1e, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x50, 0x72, 0x69, 0x63, 0x65, 0x54, 0x79, 0x70, + 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, + 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, + 0x1a, 0x0a, 0x08, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x63, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x08, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x63, 0x79, 0x22, 0xdd, 0x01, 0x0a, 0x04, + 0x55, 0x73, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x05, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x66, 0x69, + 0x72, 0x73, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, + 0x66, 0x69, 0x72, 0x73, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x6c, 0x61, 0x73, + 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6c, 0x61, + 0x73, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x61, 0x64, 0x65, 0x18, + 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x67, 0x72, 0x61, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, + 0x70, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x70, + 0x69, 0x63, 0x74, 0x75, 0x72, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, + 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x2b, + 0x0a, 0x11, 0x76, 0x65, 0x72, 0x69, 0x66, 0x69, 0x65, 0x64, 0x5f, 0x69, 0x64, 0x65, 0x6e, 0x74, + 0x69, 0x74, 0x79, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10, 0x76, 0x65, 0x72, 0x69, 0x66, + 0x69, 0x65, 0x64, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2a, 0x4a, 0x0a, 0x09, 0x44, + 0x61, 0x79, 0x4f, 0x66, 0x57, 0x65, 0x65, 0x6b, 0x12, 0x07, 0x0a, 0x03, 0x4d, 0x4f, 0x4e, 0x10, + 0x00, 0x12, 0x07, 0x0a, 0x03, 0x54, 0x55, 0x45, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x57, 0x45, + 0x44, 0x10, 0x03, 0x12, 0x07, 0x0a, 0x03, 0x54, 0x48, 0x55, 0x10, 0x04, 0x12, 0x07, 0x0a, 0x03, + 0x46, 0x52, 0x49, 0x10, 0x05, 0x12, 0x07, 0x0a, 0x03, 0x53, 0x41, 0x54, 0x10, 0x06, 0x12, 0x07, + 0x0a, 0x03, 0x53, 0x55, 0x4e, 0x10, 0x07, 0x2a, 0x2e, 0x0a, 0x09, 0x50, 0x72, 0x69, 0x63, 0x65, + 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x46, 0x52, 0x45, 0x45, 0x10, 0x00, 0x12, 0x0a, + 0x0a, 0x06, 0x50, 0x41, 0x59, 0x49, 0x4e, 0x47, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, + 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x02, 0x2a, 0xbc, 0x01, 0x0a, 0x17, 0x42, 0x6f, 0x6f, 0x6b, + 0x69, 0x6e, 0x67, 0x53, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x53, 0x74, 0x61, + 0x74, 0x75, 0x73, 0x12, 0x0d, 0x0a, 0x09, 0x49, 0x4e, 0x49, 0x54, 0x49, 0x41, 0x54, 0x45, 0x44, + 0x10, 0x00, 0x12, 0x1f, 0x0a, 0x1b, 0x57, 0x41, 0x49, 0x54, 0x49, 0x4e, 0x47, 0x5f, 0x44, 0x52, + 0x49, 0x56, 0x45, 0x52, 0x5f, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x52, 0x4d, 0x41, 0x54, 0x49, 0x4f, + 0x4e, 0x10, 0x01, 0x12, 0x22, 0x0a, 0x1e, 0x57, 0x41, 0x49, 0x54, 0x49, 0x4e, 0x47, 0x5f, 0x50, + 0x41, 0x53, 0x53, 0x45, 0x4e, 0x47, 0x45, 0x52, 0x5f, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x52, 0x4d, + 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x02, 0x12, 0x0d, 0x0a, 0x09, 0x43, 0x4f, 0x4e, 0x46, 0x49, + 0x52, 0x4d, 0x45, 0x44, 0x10, 0x03, 0x12, 0x0d, 0x0a, 0x09, 0x43, 0x41, 0x4e, 0x43, 0x45, 0x4c, + 0x4c, 0x45, 0x44, 0x10, 0x04, 0x12, 0x20, 0x0a, 0x1c, 0x43, 0x4f, 0x4d, 0x50, 0x4c, 0x45, 0x54, + 0x45, 0x44, 0x5f, 0x50, 0x45, 0x4e, 0x44, 0x49, 0x4e, 0x47, 0x5f, 0x56, 0x41, 0x4c, 0x49, 0x44, + 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x05, 0x12, 0x0d, 0x0a, 0x09, 0x56, 0x41, 0x4c, 0x49, 0x44, + 0x41, 0x54, 0x45, 0x44, 0x10, 0x06, 0x2a, 0x25, 0x0a, 0x08, 0x55, 0x73, 0x65, 0x72, 0x54, 0x79, + 0x70, 0x65, 0x12, 0x0a, 0x0a, 0x06, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x10, 0x00, 0x12, 0x0d, + 0x0a, 0x09, 0x70, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x10, 0x01, 0x42, 0x45, 0x5a, + 0x43, 0x67, 0x69, 0x74, 0x2e, 0x63, 0x6f, 0x6f, 0x70, 0x67, 0x6f, 0x2e, 0x69, 0x6f, 0x2f, 0x63, + 0x6f, 0x6f, 0x70, 0x67, 0x6f, 0x2d, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x2f, 0x73, + 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x2d, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x73, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x2f, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1582,7 +1622,7 @@ func file_solidarity_api_types_proto_rawDescGZIP() []byte { } var file_solidarity_api_types_proto_enumTypes = make([]protoimpl.EnumInfo, 4) -var file_solidarity_api_types_proto_msgTypes = make([]protoimpl.MessageInfo, 16) +var file_solidarity_api_types_proto_msgTypes = make([]protoimpl.MessageInfo, 17) var file_solidarity_api_types_proto_goTypes = []interface{}{ (DayOfWeek)(0), // 0: DayOfWeek (PriceType)(0), // 1: PriceType @@ -1598,42 +1638,43 @@ var file_solidarity_api_types_proto_goTypes = []interface{}{ (*RegularAvailabilitySlot)(nil), // 11: RegularAvailabilitySlot (*BookingSolidarityRequest)(nil), // 12: BookingSolidarityRequest (*BookingSolidarity)(nil), // 13: BookingSolidarity - (*GetAllPassengers)(nil), // 14: GetAllPassengers - (*GetPassenger)(nil), // 15: GetPassenger - (*Car)(nil), // 16: Car - (*Preferences)(nil), // 17: Preferences - (*Price)(nil), // 18: Price - (*User)(nil), // 19: User - (*timestamp.Timestamp)(nil), // 20: google.protobuf.Timestamp + (*GetAllBookingsSolidarity)(nil), // 14: GetAllBookingsSolidarity + (*GetAllPassengers)(nil), // 15: GetAllPassengers + (*GetPassenger)(nil), // 16: GetPassenger + (*Car)(nil), // 17: Car + (*Preferences)(nil), // 18: Preferences + (*Price)(nil), // 19: Price + (*User)(nil), // 20: User + (*timestamp.Timestamp)(nil), // 21: google.protobuf.Timestamp } var file_solidarity_api_types_proto_depIdxs = []int32{ - 19, // 0: DriverJourney.user:type_name -> User - 16, // 1: DriverJourney.car:type_name -> Car - 20, // 2: DriverJourney.driver_departure_Date:type_name -> google.protobuf.Timestamp - 18, // 3: DriverJourney.price:type_name -> Price + 20, // 0: DriverJourney.user:type_name -> User + 17, // 1: DriverJourney.car:type_name -> Car + 21, // 2: DriverJourney.driver_departure_Date:type_name -> google.protobuf.Timestamp + 19, // 3: DriverJourney.price:type_name -> Price 7, // 4: DriverJourney.repeated_punctual_availabilities:type_name -> RepeatedPunctualAvailabilitySlot 8, // 5: DriverJourney.repeated_regular_availabilities:type_name -> RepeatedRegularAvailabilitySlot 10, // 6: RepeatedPunctualAvailabilitySlot.punctual_availabilities:type_name -> PunctualAvailabilitySlot 11, // 7: RepeatedRegularAvailabilitySlot.regular_availabilities:type_name -> RegularAvailabilitySlot 4, // 8: DriverRequest.driver_address:type_name -> Feature - 19, // 9: DriverRequest.driver:type_name -> User - 17, // 10: DriverRequest.preferences:type_name -> Preferences - 16, // 11: DriverRequest.car:type_name -> Car - 20, // 12: PunctualAvailabilitySlot.date:type_name -> google.protobuf.Timestamp + 20, // 9: DriverRequest.driver:type_name -> User + 18, // 10: DriverRequest.preferences:type_name -> Preferences + 17, // 11: DriverRequest.car:type_name -> Car + 21, // 12: PunctualAvailabilitySlot.date:type_name -> google.protobuf.Timestamp 0, // 13: RegularAvailabilitySlot.dayOfWeek:type_name -> DayOfWeek 2, // 14: BookingSolidarityRequest.status:type_name -> BookingSolidarityStatus 4, // 15: BookingSolidarityRequest.departure_address:type_name -> Feature 4, // 16: BookingSolidarityRequest.destination_address:type_name -> Feature - 20, // 17: BookingSolidarityRequest.pickup_date:type_name -> google.protobuf.Timestamp - 19, // 18: BookingSolidarity.driver:type_name -> User - 19, // 19: BookingSolidarity.passenger:type_name -> User - 20, // 20: BookingSolidarity.passengerPickupDate:type_name -> google.protobuf.Timestamp + 21, // 17: BookingSolidarityRequest.pickup_date:type_name -> google.protobuf.Timestamp + 20, // 18: BookingSolidarity.driver:type_name -> User + 20, // 19: BookingSolidarity.passenger:type_name -> User + 21, // 20: BookingSolidarity.passengerPickupDate:type_name -> google.protobuf.Timestamp 4, // 21: BookingSolidarity.passenger_departure_route:type_name -> Feature 4, // 22: BookingSolidarity.passenger_destination_route:type_name -> Feature 2, // 23: BookingSolidarity.status:type_name -> BookingSolidarityStatus - 18, // 24: BookingSolidarity.price:type_name -> Price - 16, // 25: BookingSolidarity.car:type_name -> Car - 20, // 26: BookingSolidarity.pickup_date:type_name -> google.protobuf.Timestamp + 19, // 24: BookingSolidarity.price:type_name -> Price + 17, // 25: BookingSolidarity.car:type_name -> Car + 21, // 26: BookingSolidarity.pickup_date:type_name -> google.protobuf.Timestamp 1, // 27: Price.type:type_name -> PriceType 28, // [28:28] is the sub-list for method output_type 28, // [28:28] is the sub-list for method input_type @@ -1769,7 +1810,7 @@ func file_solidarity_api_types_proto_init() { } } file_solidarity_api_types_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GetAllPassengers); i { + switch v := v.(*GetAllBookingsSolidarity); i { case 0: return &v.state case 1: @@ -1781,7 +1822,7 @@ func file_solidarity_api_types_proto_init() { } } file_solidarity_api_types_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GetPassenger); i { + switch v := v.(*GetAllPassengers); i { case 0: return &v.state case 1: @@ -1793,7 +1834,7 @@ func file_solidarity_api_types_proto_init() { } } file_solidarity_api_types_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Car); i { + switch v := v.(*GetPassenger); i { case 0: return &v.state case 1: @@ -1805,7 +1846,7 @@ func file_solidarity_api_types_proto_init() { } } file_solidarity_api_types_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Preferences); i { + switch v := v.(*Car); i { case 0: return &v.state case 1: @@ -1817,7 +1858,7 @@ func file_solidarity_api_types_proto_init() { } } file_solidarity_api_types_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Price); i { + switch v := v.(*Preferences); i { case 0: return &v.state case 1: @@ -1829,6 +1870,18 @@ func file_solidarity_api_types_proto_init() { } } file_solidarity_api_types_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*Price); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_solidarity_api_types_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*User); i { case 0: return &v.state @@ -1851,7 +1904,7 @@ func file_solidarity_api_types_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_solidarity_api_types_proto_rawDesc, NumEnums: 4, - NumMessages: 16, + NumMessages: 17, NumExtensions: 0, NumServices: 0, }, diff --git a/servers/grpc/proto/solidarity-api-types.proto b/servers/grpc/proto/solidarity-api-types.proto index 0fe5e78..cd6c654 100644 --- a/servers/grpc/proto/solidarity-api-types.proto +++ b/servers/grpc/proto/solidarity-api-types.proto @@ -87,6 +87,10 @@ message BookingSolidarity { google.protobuf.Timestamp pickup_date = 12; } +message GetAllBookingsSolidarity { + +} + message GetAllPassengers { } diff --git a/servers/grpc/proto/solidarity-api.pb.go b/servers/grpc/proto/solidarity-api.pb.go index 8ac5cbd..5a1a682 100644 --- a/servers/grpc/proto/solidarity-api.pb.go +++ b/servers/grpc/proto/solidarity-api.pb.go @@ -1003,6 +1003,53 @@ func (x *GetBookingsByStatusResponse) GetBooking() []*BookingSolidarity { return nil } +type GetAllBookingsSolidarityResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Booking []*BookingSolidarity `protobuf:"bytes,1,rep,name=booking,proto3" json:"booking,omitempty"` +} + +func (x *GetAllBookingsSolidarityResponse) Reset() { + *x = GetAllBookingsSolidarityResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_solidarity_api_proto_msgTypes[19] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *GetAllBookingsSolidarityResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*GetAllBookingsSolidarityResponse) ProtoMessage() {} + +func (x *GetAllBookingsSolidarityResponse) ProtoReflect() protoreflect.Message { + mi := &file_solidarity_api_proto_msgTypes[19] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use GetAllBookingsSolidarityResponse.ProtoReflect.Descriptor instead. +func (*GetAllBookingsSolidarityResponse) Descriptor() ([]byte, []int) { + return file_solidarity_api_proto_rawDescGZIP(), []int{19} +} + +func (x *GetAllBookingsSolidarityResponse) GetBooking() []*BookingSolidarity { + if x != nil { + return x.Booking + } + return nil +} + var File_solidarity_api_proto protoreflect.FileDescriptor var file_solidarity_api_proto_rawDesc = []byte{ @@ -1127,69 +1174,80 @@ var file_solidarity_api_proto_rawDesc = []byte{ 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2c, 0x0a, 0x07, 0x62, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x52, 0x07, 0x62, - 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x32, 0x97, 0x07, 0x0a, 0x11, 0x53, 0x6f, 0x6c, 0x69, 0x64, - 0x61, 0x72, 0x69, 0x74, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x5f, 0x0a, 0x1e, - 0x53, 0x65, 0x74, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x52, 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72, - 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x12, 0x1c, - 0x2e, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x52, 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x41, 0x76, - 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x1a, 0x1d, 0x2e, 0x44, - 0x72, 0x69, 0x76, 0x65, 0x72, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, - 0x69, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x61, 0x0a, - 0x1f, 0x53, 0x65, 0x74, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x50, 0x75, 0x6e, 0x63, 0x74, 0x75, - 0x61, 0x6c, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, - 0x12, 0x1d, 0x2e, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x50, 0x75, 0x6e, 0x63, 0x74, 0x75, 0x61, - 0x6c, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x1a, - 0x1d, 0x2e, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, - 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, - 0x12, 0x5e, 0x0a, 0x17, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, - 0x67, 0x53, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x12, 0x1f, 0x2e, 0x43, 0x72, - 0x65, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x6f, 0x6c, 0x69, 0x64, - 0x61, 0x72, 0x69, 0x74, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x43, - 0x72, 0x65, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x6f, 0x6c, 0x69, - 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, - 0x12, 0x5e, 0x0a, 0x17, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, - 0x67, 0x53, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x12, 0x1f, 0x2e, 0x55, 0x70, - 0x64, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x6f, 0x6c, 0x69, 0x64, - 0x61, 0x72, 0x69, 0x74, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x55, - 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x6f, 0x6c, 0x69, - 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, - 0x12, 0x55, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x6f, - 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x12, 0x1c, 0x2e, 0x47, 0x65, 0x74, 0x42, 0x6f, + 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x22, 0x50, 0x0a, 0x20, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, + 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x73, 0x53, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, + 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2c, 0x0a, 0x07, 0x62, 0x6f, + 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x6f, 0x6b, - 0x69, 0x6e, 0x67, 0x53, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x52, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x42, 0x6f, - 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x73, 0x42, 0x79, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1b, - 0x2e, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x73, 0x42, 0x79, 0x53, 0x74, - 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x47, 0x65, - 0x74, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x73, 0x42, 0x79, 0x53, 0x74, 0x61, 0x74, 0x75, - 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x43, 0x0a, 0x0e, 0x44, - 0x72, 0x69, 0x76, 0x65, 0x72, 0x4a, 0x6f, 0x75, 0x72, 0x6e, 0x65, 0x79, 0x73, 0x12, 0x16, 0x2e, - 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x4a, 0x6f, 0x75, 0x72, 0x6e, 0x65, 0x79, 0x73, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x4a, 0x6f, - 0x75, 0x72, 0x6e, 0x65, 0x79, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, - 0x12, 0x41, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, - 0x73, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x16, 0x2e, 0x47, 0x65, 0x74, 0x41, - 0x6c, 0x6c, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x22, 0x00, 0x12, 0x47, 0x0a, 0x10, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x50, 0x61, 0x73, - 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x73, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, - 0x19, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, - 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x3d, 0x0a, 0x0c, - 0x47, 0x65, 0x74, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x12, 0x14, 0x2e, 0x47, - 0x65, 0x74, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x15, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, - 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x43, 0x0a, 0x10, 0x53, - 0x65, 0x74, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x54, 0x72, 0x69, 0x70, 0x12, - 0x15, 0x2e, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x54, 0x72, 0x69, 0x70, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, - 0x65, 0x72, 0x54, 0x72, 0x69, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, - 0x42, 0x45, 0x5a, 0x43, 0x67, 0x69, 0x74, 0x2e, 0x63, 0x6f, 0x6f, 0x70, 0x67, 0x6f, 0x2e, 0x69, - 0x6f, 0x2f, 0x63, 0x6f, 0x6f, 0x70, 0x67, 0x6f, 0x2d, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, - 0x6d, 0x2f, 0x73, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x2d, 0x73, 0x65, 0x72, - 0x76, 0x69, 0x63, 0x65, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x73, 0x2f, 0x67, 0x72, 0x70, - 0x63, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x07, 0x62, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x32, 0xf0, 0x07, 0x0a, 0x11, 0x53, 0x6f, 0x6c, + 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x5f, + 0x0a, 0x1e, 0x53, 0x65, 0x74, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x52, 0x65, 0x67, 0x75, 0x6c, + 0x61, 0x72, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, + 0x12, 0x1c, 0x2e, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x52, 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72, + 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x1a, 0x1d, + 0x2e, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, + 0x69, 0x74, 0x69, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, + 0x61, 0x0a, 0x1f, 0x53, 0x65, 0x74, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x50, 0x75, 0x6e, 0x63, + 0x74, 0x75, 0x61, 0x6c, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, + 0x65, 0x73, 0x12, 0x1d, 0x2e, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x50, 0x75, 0x6e, 0x63, 0x74, + 0x75, 0x61, 0x6c, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, + 0x73, 0x1a, 0x1d, 0x2e, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, + 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x22, 0x00, 0x12, 0x5e, 0x0a, 0x17, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, + 0x69, 0x6e, 0x67, 0x53, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x12, 0x1f, 0x2e, + 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x6f, 0x6c, + 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, + 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x6f, + 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x22, 0x00, 0x12, 0x5e, 0x0a, 0x17, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, + 0x69, 0x6e, 0x67, 0x53, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x12, 0x1f, 0x2e, + 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x6f, 0x6c, + 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, + 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x6f, + 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x22, 0x00, 0x12, 0x55, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, + 0x53, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x12, 0x1c, 0x2e, 0x47, 0x65, 0x74, + 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, + 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x47, 0x65, 0x74, 0x42, 0x6f, + 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x57, 0x0a, 0x18, 0x47, 0x65, 0x74, + 0x41, 0x6c, 0x6c, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x73, 0x53, 0x6f, 0x6c, 0x69, 0x64, + 0x61, 0x72, 0x69, 0x74, 0x79, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x21, 0x2e, + 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x73, 0x53, 0x6f, + 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x22, 0x00, 0x12, 0x52, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, + 0x73, 0x42, 0x79, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1b, 0x2e, 0x47, 0x65, 0x74, 0x42, + 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x73, 0x42, 0x79, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x6f, 0x6b, + 0x69, 0x6e, 0x67, 0x73, 0x42, 0x79, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x43, 0x0a, 0x0e, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, + 0x4a, 0x6f, 0x75, 0x72, 0x6e, 0x65, 0x79, 0x73, 0x12, 0x16, 0x2e, 0x44, 0x72, 0x69, 0x76, 0x65, + 0x72, 0x4a, 0x6f, 0x75, 0x72, 0x6e, 0x65, 0x79, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x1a, 0x17, 0x2e, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x4a, 0x6f, 0x75, 0x72, 0x6e, 0x65, 0x79, + 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x41, 0x0a, 0x0d, 0x47, + 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x73, 0x12, 0x16, 0x2e, 0x67, + 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, + 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x16, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x44, 0x72, 0x69, + 0x76, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x47, + 0x0a, 0x10, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, + 0x72, 0x73, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x19, 0x2e, 0x47, 0x65, 0x74, + 0x41, 0x6c, 0x6c, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x3d, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x50, 0x61, + 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x12, 0x14, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x61, 0x73, + 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x15, 0x2e, + 0x47, 0x65, 0x74, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x43, 0x0a, 0x10, 0x53, 0x65, 0x74, 0x50, 0x61, 0x73, + 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x54, 0x72, 0x69, 0x70, 0x12, 0x15, 0x2e, 0x50, 0x61, 0x73, + 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x54, 0x72, 0x69, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x1a, 0x16, 0x2e, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x54, 0x72, 0x69, + 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x45, 0x5a, 0x43, 0x67, + 0x69, 0x74, 0x2e, 0x63, 0x6f, 0x6f, 0x70, 0x67, 0x6f, 0x2e, 0x69, 0x6f, 0x2f, 0x63, 0x6f, 0x6f, + 0x70, 0x67, 0x6f, 0x2d, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x2f, 0x73, 0x6f, 0x6c, + 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x2d, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, + 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x73, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x2f, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1204,89 +1262,93 @@ func file_solidarity_api_proto_rawDescGZIP() []byte { return file_solidarity_api_proto_rawDescData } -var file_solidarity_api_proto_msgTypes = make([]protoimpl.MessageInfo, 19) +var file_solidarity_api_proto_msgTypes = make([]protoimpl.MessageInfo, 20) var file_solidarity_api_proto_goTypes = []interface{}{ - (*PassengerTripRequest)(nil), // 0: PassengerTripRequest - (*DriverRegularAvailabilities)(nil), // 1: DriverRegularAvailabilities - (*DriverPunctualAvailabilities)(nil), // 2: DriverPunctualAvailabilities - (*PassengerTripResponse)(nil), // 3: PassengerTripResponse - (*DriverAvailabilitiesResponse)(nil), // 4: DriverAvailabilitiesResponse - (*CreateBookingSolidarityRequest)(nil), // 5: CreateBookingSolidarityRequest - (*CreateBookingSolidarityResponse)(nil), // 6: CreateBookingSolidarityResponse - (*UpdateBookingSolidarityRequest)(nil), // 7: UpdateBookingSolidarityRequest - (*UpdateBookingSolidarityResponse)(nil), // 8: UpdateBookingSolidarityResponse - (*GetBookingSolidarityRequest)(nil), // 9: GetBookingSolidarityRequest - (*GetBookingSolidarityResponse)(nil), // 10: GetBookingSolidarityResponse - (*GetBookingsByStatusRequest)(nil), // 11: GetBookingsByStatusRequest - (*DriverJourneysRequest)(nil), // 12: DriverJourneysRequest - (*DriverJourneysResponse)(nil), // 13: DriverJourneysResponse - (*GetAllDriversResponse)(nil), // 14: GetAllDriversResponse - (*GetAllPassengersResponse)(nil), // 15: GetAllPassengersResponse - (*GetPassengerRequest)(nil), // 16: GetPassengerRequest - (*GetPassengerResponse)(nil), // 17: GetPassengerResponse - (*GetBookingsByStatusResponse)(nil), // 18: GetBookingsByStatusResponse - (*User)(nil), // 19: User - (*Preferences)(nil), // 20: Preferences - (*DriverRequest)(nil), // 21: DriverRequest - (*RegularAvailabilitySlot)(nil), // 22: RegularAvailabilitySlot - (*PunctualAvailabilitySlot)(nil), // 23: PunctualAvailabilitySlot - (*BookingSolidarityRequest)(nil), // 24: BookingSolidarityRequest - (*BookingSolidarity)(nil), // 25: BookingSolidarity - (BookingSolidarityStatus)(0), // 26: BookingSolidarityStatus - (UserType)(0), // 27: UserType - (*Feature)(nil), // 28: Feature - (*timestamp.Timestamp)(nil), // 29: google.protobuf.Timestamp - (*DriverJourney)(nil), // 30: DriverJourney - (*empty.Empty)(nil), // 31: google.protobuf.Empty + (*PassengerTripRequest)(nil), // 0: PassengerTripRequest + (*DriverRegularAvailabilities)(nil), // 1: DriverRegularAvailabilities + (*DriverPunctualAvailabilities)(nil), // 2: DriverPunctualAvailabilities + (*PassengerTripResponse)(nil), // 3: PassengerTripResponse + (*DriverAvailabilitiesResponse)(nil), // 4: DriverAvailabilitiesResponse + (*CreateBookingSolidarityRequest)(nil), // 5: CreateBookingSolidarityRequest + (*CreateBookingSolidarityResponse)(nil), // 6: CreateBookingSolidarityResponse + (*UpdateBookingSolidarityRequest)(nil), // 7: UpdateBookingSolidarityRequest + (*UpdateBookingSolidarityResponse)(nil), // 8: UpdateBookingSolidarityResponse + (*GetBookingSolidarityRequest)(nil), // 9: GetBookingSolidarityRequest + (*GetBookingSolidarityResponse)(nil), // 10: GetBookingSolidarityResponse + (*GetBookingsByStatusRequest)(nil), // 11: GetBookingsByStatusRequest + (*DriverJourneysRequest)(nil), // 12: DriverJourneysRequest + (*DriverJourneysResponse)(nil), // 13: DriverJourneysResponse + (*GetAllDriversResponse)(nil), // 14: GetAllDriversResponse + (*GetAllPassengersResponse)(nil), // 15: GetAllPassengersResponse + (*GetPassengerRequest)(nil), // 16: GetPassengerRequest + (*GetPassengerResponse)(nil), // 17: GetPassengerResponse + (*GetBookingsByStatusResponse)(nil), // 18: GetBookingsByStatusResponse + (*GetAllBookingsSolidarityResponse)(nil), // 19: GetAllBookingsSolidarityResponse + (*User)(nil), // 20: User + (*Preferences)(nil), // 21: Preferences + (*DriverRequest)(nil), // 22: DriverRequest + (*RegularAvailabilitySlot)(nil), // 23: RegularAvailabilitySlot + (*PunctualAvailabilitySlot)(nil), // 24: PunctualAvailabilitySlot + (*BookingSolidarityRequest)(nil), // 25: BookingSolidarityRequest + (*BookingSolidarity)(nil), // 26: BookingSolidarity + (BookingSolidarityStatus)(0), // 27: BookingSolidarityStatus + (UserType)(0), // 28: UserType + (*Feature)(nil), // 29: Feature + (*timestamp.Timestamp)(nil), // 30: google.protobuf.Timestamp + (*DriverJourney)(nil), // 31: DriverJourney + (*empty.Empty)(nil), // 32: google.protobuf.Empty } var file_solidarity_api_proto_depIdxs = []int32{ - 19, // 0: PassengerTripRequest.passenger:type_name -> User - 20, // 1: PassengerTripRequest.preferences:type_name -> Preferences - 21, // 2: DriverRegularAvailabilities.driver_request:type_name -> DriverRequest - 22, // 3: DriverRegularAvailabilities.driver_availabilities:type_name -> RegularAvailabilitySlot - 21, // 4: DriverPunctualAvailabilities.driver_request:type_name -> DriverRequest - 23, // 5: DriverPunctualAvailabilities.driver_availabilities:type_name -> PunctualAvailabilitySlot - 24, // 6: CreateBookingSolidarityRequest.booking:type_name -> BookingSolidarityRequest - 25, // 7: CreateBookingSolidarityResponse.booking:type_name -> BookingSolidarity - 26, // 8: UpdateBookingSolidarityRequest.status:type_name -> BookingSolidarityStatus - 25, // 9: GetBookingSolidarityResponse.booking:type_name -> BookingSolidarity - 26, // 10: GetBookingsByStatusRequest.status:type_name -> BookingSolidarityStatus - 27, // 11: GetBookingsByStatusRequest.type:type_name -> UserType - 28, // 12: DriverJourneysRequest.departure:type_name -> Feature - 29, // 13: DriverJourneysRequest.departure_date:type_name -> google.protobuf.Timestamp - 30, // 14: DriverJourneysResponse.driver_journeys:type_name -> DriverJourney - 19, // 15: GetAllDriversResponse.driver_journeys:type_name -> User - 19, // 16: GetAllPassengersResponse.passenger:type_name -> User - 19, // 17: GetPassengerRequest.passenger:type_name -> User - 19, // 18: GetPassengerResponse.passenger:type_name -> User - 25, // 19: GetBookingsByStatusResponse.booking:type_name -> BookingSolidarity - 1, // 20: SolidarityService.SetDriverRegularAvailabilities:input_type -> DriverRegularAvailabilities - 2, // 21: SolidarityService.SetDriverPunctualAvailabilities:input_type -> DriverPunctualAvailabilities - 5, // 22: SolidarityService.CreateBookingSolidarity:input_type -> CreateBookingSolidarityRequest - 7, // 23: SolidarityService.UpdateBookingSolidarity:input_type -> UpdateBookingSolidarityRequest - 9, // 24: SolidarityService.GetBookingSolidarity:input_type -> GetBookingSolidarityRequest - 11, // 25: SolidarityService.GetBookingsByStatus:input_type -> GetBookingsByStatusRequest - 12, // 26: SolidarityService.DriverJourneys:input_type -> DriverJourneysRequest - 31, // 27: SolidarityService.GetAllDrivers:input_type -> google.protobuf.Empty - 31, // 28: SolidarityService.GetAllPassengers:input_type -> google.protobuf.Empty - 16, // 29: SolidarityService.GetPassenger:input_type -> GetPassengerRequest - 0, // 30: SolidarityService.SetPassengerTrip:input_type -> PassengerTripRequest - 4, // 31: SolidarityService.SetDriverRegularAvailabilities:output_type -> DriverAvailabilitiesResponse - 4, // 32: SolidarityService.SetDriverPunctualAvailabilities:output_type -> DriverAvailabilitiesResponse - 6, // 33: SolidarityService.CreateBookingSolidarity:output_type -> CreateBookingSolidarityResponse - 8, // 34: SolidarityService.UpdateBookingSolidarity:output_type -> UpdateBookingSolidarityResponse - 10, // 35: SolidarityService.GetBookingSolidarity:output_type -> GetBookingSolidarityResponse - 18, // 36: SolidarityService.GetBookingsByStatus:output_type -> GetBookingsByStatusResponse - 13, // 37: SolidarityService.DriverJourneys:output_type -> DriverJourneysResponse - 14, // 38: SolidarityService.GetAllDrivers:output_type -> GetAllDriversResponse - 15, // 39: SolidarityService.GetAllPassengers:output_type -> GetAllPassengersResponse - 17, // 40: SolidarityService.GetPassenger:output_type -> GetPassengerResponse - 3, // 41: SolidarityService.SetPassengerTrip:output_type -> PassengerTripResponse - 31, // [31:42] is the sub-list for method output_type - 20, // [20:31] is the sub-list for method input_type - 20, // [20:20] is the sub-list for extension type_name - 20, // [20:20] is the sub-list for extension extendee - 0, // [0:20] is the sub-list for field type_name + 20, // 0: PassengerTripRequest.passenger:type_name -> User + 21, // 1: PassengerTripRequest.preferences:type_name -> Preferences + 22, // 2: DriverRegularAvailabilities.driver_request:type_name -> DriverRequest + 23, // 3: DriverRegularAvailabilities.driver_availabilities:type_name -> RegularAvailabilitySlot + 22, // 4: DriverPunctualAvailabilities.driver_request:type_name -> DriverRequest + 24, // 5: DriverPunctualAvailabilities.driver_availabilities:type_name -> PunctualAvailabilitySlot + 25, // 6: CreateBookingSolidarityRequest.booking:type_name -> BookingSolidarityRequest + 26, // 7: CreateBookingSolidarityResponse.booking:type_name -> BookingSolidarity + 27, // 8: UpdateBookingSolidarityRequest.status:type_name -> BookingSolidarityStatus + 26, // 9: GetBookingSolidarityResponse.booking:type_name -> BookingSolidarity + 27, // 10: GetBookingsByStatusRequest.status:type_name -> BookingSolidarityStatus + 28, // 11: GetBookingsByStatusRequest.type:type_name -> UserType + 29, // 12: DriverJourneysRequest.departure:type_name -> Feature + 30, // 13: DriverJourneysRequest.departure_date:type_name -> google.protobuf.Timestamp + 31, // 14: DriverJourneysResponse.driver_journeys:type_name -> DriverJourney + 20, // 15: GetAllDriversResponse.driver_journeys:type_name -> User + 20, // 16: GetAllPassengersResponse.passenger:type_name -> User + 20, // 17: GetPassengerRequest.passenger:type_name -> User + 20, // 18: GetPassengerResponse.passenger:type_name -> User + 26, // 19: GetBookingsByStatusResponse.booking:type_name -> BookingSolidarity + 26, // 20: GetAllBookingsSolidarityResponse.booking:type_name -> BookingSolidarity + 1, // 21: SolidarityService.SetDriverRegularAvailabilities:input_type -> DriverRegularAvailabilities + 2, // 22: SolidarityService.SetDriverPunctualAvailabilities:input_type -> DriverPunctualAvailabilities + 5, // 23: SolidarityService.CreateBookingSolidarity:input_type -> CreateBookingSolidarityRequest + 7, // 24: SolidarityService.UpdateBookingSolidarity:input_type -> UpdateBookingSolidarityRequest + 9, // 25: SolidarityService.GetBookingSolidarity:input_type -> GetBookingSolidarityRequest + 32, // 26: SolidarityService.GetAllBookingsSolidarity:input_type -> google.protobuf.Empty + 11, // 27: SolidarityService.GetBookingsByStatus:input_type -> GetBookingsByStatusRequest + 12, // 28: SolidarityService.DriverJourneys:input_type -> DriverJourneysRequest + 32, // 29: SolidarityService.GetAllDrivers:input_type -> google.protobuf.Empty + 32, // 30: SolidarityService.GetAllPassengers:input_type -> google.protobuf.Empty + 16, // 31: SolidarityService.GetPassenger:input_type -> GetPassengerRequest + 0, // 32: SolidarityService.SetPassengerTrip:input_type -> PassengerTripRequest + 4, // 33: SolidarityService.SetDriverRegularAvailabilities:output_type -> DriverAvailabilitiesResponse + 4, // 34: SolidarityService.SetDriverPunctualAvailabilities:output_type -> DriverAvailabilitiesResponse + 6, // 35: SolidarityService.CreateBookingSolidarity:output_type -> CreateBookingSolidarityResponse + 8, // 36: SolidarityService.UpdateBookingSolidarity:output_type -> UpdateBookingSolidarityResponse + 10, // 37: SolidarityService.GetBookingSolidarity:output_type -> GetBookingSolidarityResponse + 19, // 38: SolidarityService.GetAllBookingsSolidarity:output_type -> GetAllBookingsSolidarityResponse + 18, // 39: SolidarityService.GetBookingsByStatus:output_type -> GetBookingsByStatusResponse + 13, // 40: SolidarityService.DriverJourneys:output_type -> DriverJourneysResponse + 14, // 41: SolidarityService.GetAllDrivers:output_type -> GetAllDriversResponse + 15, // 42: SolidarityService.GetAllPassengers:output_type -> GetAllPassengersResponse + 17, // 43: SolidarityService.GetPassenger:output_type -> GetPassengerResponse + 3, // 44: SolidarityService.SetPassengerTrip:output_type -> PassengerTripResponse + 33, // [33:45] is the sub-list for method output_type + 21, // [21:33] is the sub-list for method input_type + 21, // [21:21] is the sub-list for extension type_name + 21, // [21:21] is the sub-list for extension extendee + 0, // [0:21] is the sub-list for field type_name } func init() { file_solidarity_api_proto_init() } @@ -1524,6 +1586,18 @@ func file_solidarity_api_proto_init() { return nil } } + file_solidarity_api_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*GetAllBookingsSolidarityResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -1531,7 +1605,7 @@ func file_solidarity_api_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_solidarity_api_proto_rawDesc, NumEnums: 0, - NumMessages: 19, + NumMessages: 20, NumExtensions: 0, NumServices: 1, }, diff --git a/servers/grpc/proto/solidarity-api.proto b/servers/grpc/proto/solidarity-api.proto index 2725a6d..163d147 100644 --- a/servers/grpc/proto/solidarity-api.proto +++ b/servers/grpc/proto/solidarity-api.proto @@ -10,6 +10,7 @@ service SolidarityService { rpc CreateBookingSolidarity(CreateBookingSolidarityRequest) returns (CreateBookingSolidarityResponse) {} rpc UpdateBookingSolidarity(UpdateBookingSolidarityRequest) returns (UpdateBookingSolidarityResponse) {} rpc GetBookingSolidarity(GetBookingSolidarityRequest) returns (GetBookingSolidarityResponse) {} + rpc GetAllBookingsSolidarity(google.protobuf.Empty) returns (GetAllBookingsSolidarityResponse) {} rpc GetBookingsByStatus(GetBookingsByStatusRequest) returns (GetBookingsByStatusResponse) {} rpc DriverJourneys(DriverJourneysRequest) returns (DriverJourneysResponse) {} rpc GetAllDrivers(google.protobuf.Empty) returns (GetAllDriversResponse) {} @@ -104,4 +105,8 @@ message GetPassengerResponse { message GetBookingsByStatusResponse{ repeated BookingSolidarity booking = 1; +} + +message GetAllBookingsSolidarityResponse{ + repeated BookingSolidarity booking = 1; } \ No newline at end of file diff --git a/servers/grpc/proto/solidarity-api_grpc.pb.go b/servers/grpc/proto/solidarity-api_grpc.pb.go index 2f37d44..0af5630 100644 --- a/servers/grpc/proto/solidarity-api_grpc.pb.go +++ b/servers/grpc/proto/solidarity-api_grpc.pb.go @@ -25,6 +25,7 @@ const ( SolidarityService_CreateBookingSolidarity_FullMethodName = "/SolidarityService/CreateBookingSolidarity" SolidarityService_UpdateBookingSolidarity_FullMethodName = "/SolidarityService/UpdateBookingSolidarity" SolidarityService_GetBookingSolidarity_FullMethodName = "/SolidarityService/GetBookingSolidarity" + SolidarityService_GetAllBookingsSolidarity_FullMethodName = "/SolidarityService/GetAllBookingsSolidarity" SolidarityService_GetBookingsByStatus_FullMethodName = "/SolidarityService/GetBookingsByStatus" SolidarityService_DriverJourneys_FullMethodName = "/SolidarityService/DriverJourneys" SolidarityService_GetAllDrivers_FullMethodName = "/SolidarityService/GetAllDrivers" @@ -42,6 +43,7 @@ type SolidarityServiceClient interface { CreateBookingSolidarity(ctx context.Context, in *CreateBookingSolidarityRequest, opts ...grpc.CallOption) (*CreateBookingSolidarityResponse, error) UpdateBookingSolidarity(ctx context.Context, in *UpdateBookingSolidarityRequest, opts ...grpc.CallOption) (*UpdateBookingSolidarityResponse, error) GetBookingSolidarity(ctx context.Context, in *GetBookingSolidarityRequest, opts ...grpc.CallOption) (*GetBookingSolidarityResponse, error) + GetAllBookingsSolidarity(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*GetAllBookingsSolidarityResponse, error) GetBookingsByStatus(ctx context.Context, in *GetBookingsByStatusRequest, opts ...grpc.CallOption) (*GetBookingsByStatusResponse, error) DriverJourneys(ctx context.Context, in *DriverJourneysRequest, opts ...grpc.CallOption) (*DriverJourneysResponse, error) GetAllDrivers(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*GetAllDriversResponse, error) @@ -108,6 +110,16 @@ func (c *solidarityServiceClient) GetBookingSolidarity(ctx context.Context, in * return out, nil } +func (c *solidarityServiceClient) GetAllBookingsSolidarity(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*GetAllBookingsSolidarityResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(GetAllBookingsSolidarityResponse) + err := c.cc.Invoke(ctx, SolidarityService_GetAllBookingsSolidarity_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *solidarityServiceClient) GetBookingsByStatus(ctx context.Context, in *GetBookingsByStatusRequest, opts ...grpc.CallOption) (*GetBookingsByStatusResponse, error) { cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(GetBookingsByStatusResponse) @@ -177,6 +189,7 @@ type SolidarityServiceServer interface { CreateBookingSolidarity(context.Context, *CreateBookingSolidarityRequest) (*CreateBookingSolidarityResponse, error) UpdateBookingSolidarity(context.Context, *UpdateBookingSolidarityRequest) (*UpdateBookingSolidarityResponse, error) GetBookingSolidarity(context.Context, *GetBookingSolidarityRequest) (*GetBookingSolidarityResponse, error) + GetAllBookingsSolidarity(context.Context, *empty.Empty) (*GetAllBookingsSolidarityResponse, error) GetBookingsByStatus(context.Context, *GetBookingsByStatusRequest) (*GetBookingsByStatusResponse, error) DriverJourneys(context.Context, *DriverJourneysRequest) (*DriverJourneysResponse, error) GetAllDrivers(context.Context, *empty.Empty) (*GetAllDriversResponse, error) @@ -208,6 +221,9 @@ func (UnimplementedSolidarityServiceServer) UpdateBookingSolidarity(context.Cont func (UnimplementedSolidarityServiceServer) GetBookingSolidarity(context.Context, *GetBookingSolidarityRequest) (*GetBookingSolidarityResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetBookingSolidarity not implemented") } +func (UnimplementedSolidarityServiceServer) GetAllBookingsSolidarity(context.Context, *empty.Empty) (*GetAllBookingsSolidarityResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetAllBookingsSolidarity not implemented") +} func (UnimplementedSolidarityServiceServer) GetBookingsByStatus(context.Context, *GetBookingsByStatusRequest) (*GetBookingsByStatusResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetBookingsByStatus not implemented") } @@ -337,6 +353,24 @@ func _SolidarityService_GetBookingSolidarity_Handler(srv interface{}, ctx contex return interceptor(ctx, in, info, handler) } +func _SolidarityService_GetAllBookingsSolidarity_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(empty.Empty) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(SolidarityServiceServer).GetAllBookingsSolidarity(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: SolidarityService_GetAllBookingsSolidarity_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(SolidarityServiceServer).GetAllBookingsSolidarity(ctx, req.(*empty.Empty)) + } + return interceptor(ctx, in, info, handler) +} + func _SolidarityService_GetBookingsByStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(GetBookingsByStatusRequest) if err := dec(in); err != nil { @@ -472,6 +506,10 @@ var SolidarityService_ServiceDesc = grpc.ServiceDesc{ MethodName: "GetBookingSolidarity", Handler: _SolidarityService_GetBookingSolidarity_Handler, }, + { + MethodName: "GetAllBookingsSolidarity", + Handler: _SolidarityService_GetAllBookingsSolidarity_Handler, + }, { MethodName: "GetBookingsByStatus", Handler: _SolidarityService_GetBookingsByStatus_Handler, diff --git a/servers/grpc/server/services.go b/servers/grpc/server/services.go index 74035d1..0cabd24 100644 --- a/servers/grpc/server/services.go +++ b/servers/grpc/server/services.go @@ -21,7 +21,7 @@ func (s *SolidarityServiceServerImpl) SetDriverRegularAvailabilities(ctx context if req.DriverRequest.Driver.Id == "" || req.DriverRequest.Driver.Alias == "" || req.DriverAvailabilities == nil || req.DriverRequest.DriverAddress == nil || req.DriverRequest.DriverRadius == 0 { return &proto.DriverAvailabilitiesResponse{ Success: false, - }, errors.New("missing required fields") + }, errors.New("missing required fields") } driver := internal.Driver{ @@ -424,6 +424,7 @@ func (s *SolidarityServiceServerImpl) GetBookingSolidarity(ctx context.Context, return resp, nil } + func (s *SolidarityServiceServerImpl) GetBookingsByStatus(ctx context.Context, req *proto.GetBookingsByStatusRequest) (resp *proto.GetBookingsByStatusResponse, err error) { if req.Type.String() == "" || req.Status.String() == "" || req.UserId == "" { return nil, errors.New("missing required fields") @@ -458,6 +459,38 @@ func (s *SolidarityServiceServerImpl) GetBookingsByStatus(ctx context.Context, r } } + +func (s *SolidarityServiceServerImpl) GetAllBookingsSolidarity(ctx context.Context, _ *emptypb.Empty) (resp *proto.GetAllBookingsSolidarityResponse, err error) { + + bookings, err := s.Handler.GetAllBookingsSolidarity(ctx) + if err != nil { + if strings.Contains(err.Error(), utils.SQL_NO_ROWS) { + return nil, errors.New("invalid ID") + } + return nil, err + } + + // Use a goroutine to concurrently convert bookings to proto + respChan := make(chan []*proto.BookingSolidarity, 1) + go func() { + respChan <- convertInternalBookingsToProto(s, bookings, 50) + }() + + select { + case convertedBookings := <-respChan: + close(respChan) + + resp = &proto.GetAllBookingsSolidarityResponse{ + Booking: convertedBookings, + } + return resp, nil + + case <-ctx.Done(): + // If the context is canceled, return an error + return nil, ctx.Err() + } +} + func convertInternalBookingsToProto(s *SolidarityServiceServerImpl, bookings []internal.Booking, maxGoroutines int) []*proto.BookingSolidarity { var responses []*proto.BookingSolidarity var wg sync.WaitGroup diff --git a/storage/postgresql.go b/storage/postgresql.go index 03f0139..b81bf99 100644 --- a/storage/postgresql.go +++ b/storage/postgresql.go @@ -592,6 +592,76 @@ func (s PostgresqlStorage) GetBooking(id string) (booking internal.Booking, err return booking, nil } + +func (s PostgresqlStorage) GetAllBookingsSolidarity() (bookings []internal.Booking, err error) { + var departureAddress []byte + var destinationAddress []byte + var booking internal.Booking + + rows, err := s.DbConnection.Query(fmt.Sprintf("SELECT booking_id , passenger_id , driver_id , booking_status , departure_address,destination_address,pickup_date,duration,distance FROM %s ", s.Tables["bookings"])) + if err != nil { + return nil, err + } + defer rows.Close() + + for rows.Next() { + if err := rows.Scan( + &booking.ID, + &booking.Passenger.ID, + &booking.Driver.ID, + &booking.Status, + &departureAddress, + &destinationAddress, + &booking.Pickup_date, + &booking.Duration, + &booking.Distance, + ) + err != nil { + return nil, err + } + + if err := json.Unmarshal(departureAddress, &booking.PassengerPickupAddress); err != nil { + return nil, err + } + + if err != nil { + errMsg := "Postgresql Storage GetBooking Error getting booking" + log.Error().Err(err).Msg(errMsg) + return nil, errors.New(errMsg + err.Error()) + } + booking.PassengerPickupAddress, err = geojson.UnmarshalFeature(departureAddress) + if err != nil { + errMsg := "Postgresql Storage GetBooking Error decoding Driver departure route into GeoJSON" + log.Error().Err(err).Msg(errMsg) + return nil, errors.New(errMsg + err.Error()) + } + booking.PassengerDropAddress, err = geojson.UnmarshalFeature(destinationAddress) + if err != nil { + errMsg := "Postgresql Storage GetBooking Error decoding Driver destination route into GeoJSON" + log.Error().Err(err).Msg(errMsg) + return nil, errors.New(errMsg + err.Error()) + } + passenger, err := s.GetPassenger(booking.Passenger.ID) + if err != nil { + errMsg := "Postgresql Storage GetBooking Error getting passenger" + log.Error().Err(err).Msg(errMsg) + return bookings, errors.New(errMsg + err.Error()) + } + booking.Passenger = passenger.Passenger + driver, err := s.GetDriver(booking.Driver.ID) + if err != nil { + errMsg := "Postgresql Storage GetBooking Error getting driver" + log.Error().Err(err).Msg(errMsg) + return bookings, errors.New(errMsg + err.Error()) + } + booking.Driver = driver.Driver + + bookings = append(bookings, booking) + } + + return bookings, nil +} + func (s PostgresqlStorage) UpdateBookingStatus(id string, status internal.BookingStatus) (err error) { _, err = uuid.Parse(id) if err != nil { diff --git a/storage/storage.go b/storage/storage.go index 89a38be..cbd1cea 100644 --- a/storage/storage.go +++ b/storage/storage.go @@ -17,6 +17,7 @@ type Storage interface { CreateBooking(booking internal.BookingRequest) (err error) UpdateBookingStatus(id string, status internal.BookingStatus) (err error) FilterUserBookingsByStatus(user_type string, status internal.BookingStatus, user_id string) (bookings []internal.Booking, err error) + GetAllBookingsSolidarity() (passengers []internal.Booking, err error) DriverJourneys(departure_route *geojson.Feature, departure_date int64) (drivers []internal.Driver, err error) GetAllDriversByDate(date int64) (drivers []internal.Driver, err error) GetAllDrivers() (drivers []internal.Driver, err error)