diff --git a/servers/grpc/proto/carpool-service-types.pb.go b/servers/grpc/proto/carpool-service-types.pb.go index 0ce2237..858ecf8 100644 --- a/servers/grpc/proto/carpool-service-types.pb.go +++ b/servers/grpc/proto/carpool-service-types.pb.go @@ -1254,30 +1254,32 @@ func (x *CarpoolServicePassengerRegularTrip) GetSchedules() []*CarpoolServiceSch } type CarpoolServiceBooking struct { - state protoimpl.MessageState `protogen:"open.v1"` - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - Driver *CarpoolServiceUser `protobuf:"bytes,2,opt,name=driver,proto3" json:"driver,omitempty"` - Passenger *CarpoolServiceUser `protobuf:"bytes,3,opt,name=passenger,proto3" json:"passenger,omitempty"` - PassengerPickupDate *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=passenger_pickup_date,json=passengerPickupDate,proto3" json:"passenger_pickup_date,omitempty"` - PassengerPickupLat float64 `protobuf:"fixed64,5,opt,name=passenger_pickup_lat,json=passengerPickupLat,proto3" json:"passenger_pickup_lat,omitempty"` - PassengerPickupLng float64 `protobuf:"fixed64,6,opt,name=passenger_pickup_lng,json=passengerPickupLng,proto3" json:"passenger_pickup_lng,omitempty"` - PassengerDropLat float64 `protobuf:"fixed64,7,opt,name=passenger_drop_lat,json=passengerDropLat,proto3" json:"passenger_drop_lat,omitempty"` - PassengerDropLng float64 `protobuf:"fixed64,8,opt,name=passenger_drop_lng,json=passengerDropLng,proto3" json:"passenger_drop_lng,omitempty"` - PassengerPickupAddress *string `protobuf:"bytes,9,opt,name=passenger_pickup_address,json=passengerPickupAddress,proto3,oneof" json:"passenger_pickup_address,omitempty"` - PassengerDropAddress *string `protobuf:"bytes,10,opt,name=passenger_drop_address,json=passengerDropAddress,proto3,oneof" json:"passenger_drop_address,omitempty"` - Status CarpoolServiceBookingStatus `protobuf:"varint,11,opt,name=status,proto3,enum=CarpoolServiceBookingStatus" json:"status,omitempty"` - Distance *int64 `protobuf:"varint,12,opt,name=distance,proto3,oneof" json:"distance,omitempty"` - Duration *int64 `protobuf:"varint,13,opt,name=duration,proto3,oneof" json:"duration,omitempty"` - WebUrl *string `protobuf:"bytes,14,opt,name=web_url,json=webUrl,proto3,oneof" json:"web_url,omitempty"` - Price *CarpoolServicePrice `protobuf:"bytes,15,opt,name=price,proto3" json:"price,omitempty"` - Car *CarpoolServiceCar `protobuf:"bytes,16,opt,name=car,proto3,oneof" json:"car,omitempty"` - DriverJourneyId string `protobuf:"bytes,17,opt,name=driver_journey_id,json=driverJourneyId,proto3" json:"driver_journey_id,omitempty"` - PassengerJourneyId string `protobuf:"bytes,18,opt,name=passenger_journey_id,json=passengerJourneyId,proto3" json:"passenger_journey_id,omitempty"` - DriverRoute *CarpoolFeatureCollection `protobuf:"bytes,30,opt,name=driver_route,json=driverRoute,proto3,oneof" json:"driver_route,omitempty"` - PassengerRoute *CarpoolFeatureCollection `protobuf:"bytes,31,opt,name=passenger_route,json=passengerRoute,proto3,oneof" json:"passenger_route,omitempty"` - DriverDepartureDate *timestamppb.Timestamp `protobuf:"bytes,32,opt,name=driverDepartureDate,proto3,oneof" json:"driverDepartureDate,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Driver *CarpoolServiceUser `protobuf:"bytes,2,opt,name=driver,proto3" json:"driver,omitempty"` + Passenger *CarpoolServiceUser `protobuf:"bytes,3,opt,name=passenger,proto3" json:"passenger,omitempty"` + PassengerPickupDate *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=passenger_pickup_date,json=passengerPickupDate,proto3" json:"passenger_pickup_date,omitempty"` + PassengerPickupLat float64 `protobuf:"fixed64,5,opt,name=passenger_pickup_lat,json=passengerPickupLat,proto3" json:"passenger_pickup_lat,omitempty"` + PassengerPickupLng float64 `protobuf:"fixed64,6,opt,name=passenger_pickup_lng,json=passengerPickupLng,proto3" json:"passenger_pickup_lng,omitempty"` + PassengerDropLat float64 `protobuf:"fixed64,7,opt,name=passenger_drop_lat,json=passengerDropLat,proto3" json:"passenger_drop_lat,omitempty"` + PassengerDropLng float64 `protobuf:"fixed64,8,opt,name=passenger_drop_lng,json=passengerDropLng,proto3" json:"passenger_drop_lng,omitempty"` + PassengerPickupAddress *string `protobuf:"bytes,9,opt,name=passenger_pickup_address,json=passengerPickupAddress,proto3,oneof" json:"passenger_pickup_address,omitempty"` + PassengerDropAddress *string `protobuf:"bytes,10,opt,name=passenger_drop_address,json=passengerDropAddress,proto3,oneof" json:"passenger_drop_address,omitempty"` + Status CarpoolServiceBookingStatus `protobuf:"varint,11,opt,name=status,proto3,enum=CarpoolServiceBookingStatus" json:"status,omitempty"` + Distance *int64 `protobuf:"varint,12,opt,name=distance,proto3,oneof" json:"distance,omitempty"` + Duration *int64 `protobuf:"varint,13,opt,name=duration,proto3,oneof" json:"duration,omitempty"` + WebUrl *string `protobuf:"bytes,14,opt,name=web_url,json=webUrl,proto3,oneof" json:"web_url,omitempty"` + Price *CarpoolServicePrice `protobuf:"bytes,15,opt,name=price,proto3" json:"price,omitempty"` + Car *CarpoolServiceCar `protobuf:"bytes,16,opt,name=car,proto3,oneof" json:"car,omitempty"` + DriverJourneyId string `protobuf:"bytes,17,opt,name=driver_journey_id,json=driverJourneyId,proto3" json:"driver_journey_id,omitempty"` + PassengerJourneyId string `protobuf:"bytes,18,opt,name=passenger_journey_id,json=passengerJourneyId,proto3" json:"passenger_journey_id,omitempty"` + DriverRoute *CarpoolFeatureCollection `protobuf:"bytes,30,opt,name=driver_route,json=driverRoute,proto3,oneof" json:"driver_route,omitempty"` + PassengerRoute *CarpoolFeatureCollection `protobuf:"bytes,31,opt,name=passenger_route,json=passengerRoute,proto3,oneof" json:"passenger_route,omitempty"` + DriverDepartureDate *timestamppb.Timestamp `protobuf:"bytes,32,opt,name=driverDepartureDate,proto3,oneof" json:"driverDepartureDate,omitempty"` + DriverCompensationAmount *float64 `protobuf:"fixed64,33,opt,name=driver_compensation_amount,json=driverCompensationAmount,proto3,oneof" json:"driver_compensation_amount,omitempty"` + DriverCompensationCurrency *string `protobuf:"bytes,34,opt,name=driver_compensation_currency,json=driverCompensationCurrency,proto3,oneof" json:"driver_compensation_currency,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *CarpoolServiceBooking) Reset() { @@ -1457,6 +1459,20 @@ func (x *CarpoolServiceBooking) GetDriverDepartureDate() *timestamppb.Timestamp return nil } +func (x *CarpoolServiceBooking) GetDriverCompensationAmount() float64 { + if x != nil && x.DriverCompensationAmount != nil { + return *x.DriverCompensationAmount + } + return 0 +} + +func (x *CarpoolServiceBooking) GetDriverCompensationCurrency() string { + if x != nil && x.DriverCompensationCurrency != nil { + return *x.DriverCompensationCurrency + } + return "" +} + type CarpoolServicePreferences struct { state protoimpl.MessageState `protogen:"open.v1"` Smoking *bool `protobuf:"varint,1,opt,name=smoking,proto3,oneof" json:"smoking,omitempty"` @@ -2091,7 +2107,7 @@ const file_carpool_service_types_proto_rawDesc = "" + "\x11_journey_polylineB\n" + "\n" + "\b_web_urlB\x0e\n" + - "\f_preferences\"\xde\t\n" + + "\f_preferences\"\xa8\v\n" + "\x15CarpoolServiceBooking\x12\x0e\n" + "\x02id\x18\x01 \x01(\tR\x02id\x12+\n" + "\x06driver\x18\x02 \x01(\v2\x13.CarpoolServiceUserR\x06driver\x121\n" + @@ -2114,7 +2130,10 @@ const file_carpool_service_types_proto_rawDesc = "" + "\x14passenger_journey_id\x18\x12 \x01(\tR\x12passengerJourneyId\x12A\n" + "\fdriver_route\x18\x1e \x01(\v2\x19.CarpoolFeatureCollectionH\x06R\vdriverRoute\x88\x01\x01\x12G\n" + "\x0fpassenger_route\x18\x1f \x01(\v2\x19.CarpoolFeatureCollectionH\aR\x0epassengerRoute\x88\x01\x01\x12Q\n" + - "\x13driverDepartureDate\x18 \x01(\v2\x1a.google.protobuf.TimestampH\bR\x13driverDepartureDate\x88\x01\x01B\x1b\n" + + "\x13driverDepartureDate\x18 \x01(\v2\x1a.google.protobuf.TimestampH\bR\x13driverDepartureDate\x88\x01\x01\x12A\n" + + "\x1adriver_compensation_amount\x18! \x01(\x01H\tR\x18driverCompensationAmount\x88\x01\x01\x12E\n" + + "\x1cdriver_compensation_currency\x18\" \x01(\tH\n" + + "R\x1adriverCompensationCurrency\x88\x01\x01B\x1b\n" + "\x19_passenger_pickup_addressB\x19\n" + "\x17_passenger_drop_addressB\v\n" + "\t_distanceB\v\n" + @@ -2124,7 +2143,9 @@ const file_carpool_service_types_proto_rawDesc = "" + "\x04_carB\x0f\n" + "\r_driver_routeB\x12\n" + "\x10_passenger_routeB\x16\n" + - "\x14_driverDepartureDate\"\xff\x01\n" + + "\x14_driverDepartureDateB\x1d\n" + + "\x1b_driver_compensation_amountB\x1f\n" + + "\x1d_driver_compensation_currency\"\xff\x01\n" + "\x19CarpoolServicePreferences\x12\x1d\n" + "\asmoking\x18\x01 \x01(\bH\x00R\asmoking\x88\x01\x01\x12\x1d\n" + "\aanimals\x18\x02 \x01(\bH\x01R\aanimals\x88\x01\x01\x12\x19\n" + diff --git a/servers/grpc/proto/carpool-service-types.proto b/servers/grpc/proto/carpool-service-types.proto index 763bf34..cbbbcec 100644 --- a/servers/grpc/proto/carpool-service-types.proto +++ b/servers/grpc/proto/carpool-service-types.proto @@ -154,6 +154,8 @@ message CarpoolServiceBooking { optional CarpoolFeatureCollection driver_route = 30; optional CarpoolFeatureCollection passenger_route = 31; optional google.protobuf.Timestamp driverDepartureDate = 32; + optional double driver_compensation_amount = 33; + optional string driver_compensation_currency = 34; } message CarpoolServicePreferences {