diff --git a/servers/grpc/proto/helpers.go b/servers/grpc/proto/helpers.go index 2ffab50..50b064f 100644 --- a/servers/grpc/proto/helpers.go +++ b/servers/grpc/proto/helpers.go @@ -253,20 +253,22 @@ func (b *CarpoolServiceBooking) ToOCSS() ocss.Booking { Gender: GenderToOCSS(b.Passenger.Gender), VerifiedIdentity: b.Passenger.VerifiedIdentity, }, - PassengerPickupDate: ocss.OCSSTime(b.PassengerPickupDate.AsTime()), - PassengerPickupLat: b.PassengerPickupLat, - PassengerPickupLng: b.PassengerPickupLng, - PassengerDropLat: b.PassengerDropLat, - PassengerDropLng: b.PassengerDropLng, - PassengerPickupAddress: b.PassengerPickupAddress, - PassengerDropAddress: b.PassengerDropAddress, - Distance: b.Distance, - Duration: duration, - WebUrl: b.WebUrl, - Price: price, - Status: status, - DriverJourneyID: b.DriverJourneyId, - PassengerJourneyID: b.PassengerJourneyId, + PassengerPickupDate: ocss.OCSSTime(b.PassengerPickupDate.AsTime()), + PassengerPickupLat: b.PassengerPickupLat, + PassengerPickupLng: b.PassengerPickupLng, + PassengerDropLat: b.PassengerDropLat, + PassengerDropLng: b.PassengerDropLng, + PassengerPickupAddress: b.PassengerPickupAddress, + PassengerDropAddress: b.PassengerDropAddress, + Distance: b.Distance, + Duration: duration, + WebUrl: b.WebUrl, + Price: price, + Status: status, + DriverJourneyID: b.DriverJourneyId, + PassengerJourneyID: b.PassengerJourneyId, + DriverCompensationAmount: b.DriverCompensationAmount, + DriverCompensationCurrency: b.DriverCompensationCurrency, } } @@ -336,20 +338,22 @@ func BookingFromOCSS(b ocss.Booking) *CarpoolServiceBooking { Gender: b.Passenger.Gender.ToString(), VerifiedIdentity: b.Passenger.VerifiedIdentity, }, - PassengerPickupDate: timestamppb.New(*passengerPickupDate), - PassengerPickupLat: b.PassengerPickupLat, - PassengerPickupLng: b.PassengerPickupLng, - PassengerDropLat: b.PassengerDropLat, - PassengerDropLng: b.PassengerDropLng, - PassengerPickupAddress: b.PassengerPickupAddress, - PassengerDropAddress: b.PassengerDropAddress, - Status: status, - Distance: b.Distance, - Duration: duration, - WebUrl: b.WebUrl, - Price: &price, - DriverJourneyId: b.DriverJourneyID, - PassengerJourneyId: b.PassengerJourneyID, + PassengerPickupDate: timestamppb.New(*passengerPickupDate), + PassengerPickupLat: b.PassengerPickupLat, + PassengerPickupLng: b.PassengerPickupLng, + PassengerDropLat: b.PassengerDropLat, + PassengerDropLng: b.PassengerDropLng, + PassengerPickupAddress: b.PassengerPickupAddress, + PassengerDropAddress: b.PassengerDropAddress, + Status: status, + Distance: b.Distance, + Duration: duration, + WebUrl: b.WebUrl, + Price: &price, + DriverJourneyId: b.DriverJourneyID, + PassengerJourneyId: b.PassengerJourneyID, + DriverCompensationAmount: b.DriverCompensationAmount, + DriverCompensationCurrency: b.DriverCompensationCurrency, } }