coopgo-platform/carpool-service
7
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Improve passenger pickup/drop handling
Some checks failed
Build and Push Docker Image / build_and_push (push) Failing after 3m8s
Details

Browse Source
This commit is contained in:
Arnaud Delcasse
2025-09-25 06:36:14 +02:00
parent a95cd6eb55
commit b7ac71741f
14 changed files with 1042 additions and 2085 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
servers/grpc/server/management.go
View File

@@ -82,10 +82,11 @@ func (s *CarpoolServiceServerImpl) GetUserPlanning(ctx context.Context, req *pro
Collection: []*proto.CarpoolFeatureCollection{},
}
for _, s := range scheds {
s.Route.ExtraMembers["departure_date"] = s.DepartureDate
s.Route.ExtraMembers["id"] = s.ID
fcraw, _ := s.Route.MarshalJSON()
for _, sched := range scheds {
sched.Route.ExtraMembers["departure_date"] = sched.DepartureDate
sched.Route.ExtraMembers["id"] = sched.ID
sched.Route.ExtraMembers["operator"] = s.Handler.InternalOperatorID
fcraw, _ := sched.Route.MarshalJSON()
results[k].Collection = append(results[k].Collection, &proto.CarpoolFeatureCollection{
Serialized: string(fcraw),
})
@@ -106,6 +107,15 @@ func (s *CarpoolServiceServerImpl) GetPlannedTrip(ctx context.Context, req *prot
planned_trip.Route.ExtraMembers["id"] = planned_trip.ID
planned_trip.Route.ExtraMembers["departure_date"] = planned_trip.DepartureDate
planned_trip.Route.ExtraMembers["operator"] = s.Handler.InternalOperatorID
// Add passenger pickup and drop information to extra members for frontend access
if planned_trip.PassengerPickup != nil {
planned_trip.Route.ExtraMembers["passenger_pickup"] = planned_trip.PassengerPickup
}
if planned_trip.PassengerDrop != nil {
planned_trip.Route.ExtraMembers["passenger_drop"] = planned_trip.PassengerDrop
}
serialized, err := planned_trip.Route.MarshalJSON()
if err != nil {