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

21
servers/grpc/server/search.go
View File

@@ -6,6 +6,7 @@ import (
"git.coopgo.io/coopgo-platform/carpool-service/servers/grpc/proto"
"github.com/paulmach/orb"
"github.com/paulmach/orb/geojson"
"github.com/rs/zerolog/log"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
@@ -16,6 +17,24 @@ func (s *CarpoolServiceServerImpl) DriverJourneys(ctx context.Context, req *prot
departure := orb.Point{req.DepartureLng, req.DepartureLat}
arrival := orb.Point{req.ArrivalLng, req.ArrivalLat}
// Create features with addresses
departureFeature := geojson.NewFeature(departure)
arrivalFeature := geojson.NewFeature(arrival)
if req.DepartureAddress != nil && *req.DepartureAddress != "" {
if departureFeature.Properties == nil {
departureFeature.Properties = make(map[string]interface{})
}
departureFeature.Properties["label"] = *req.DepartureAddress
}
if req.ArrivalAddress != nil && *req.ArrivalAddress != "" {
if arrivalFeature.Properties == nil {
arrivalFeature.Properties = make(map[string]interface{})
}
arrivalFeature.Properties["label"] = *req.ArrivalAddress
}
log.Debug().
Str("departure date", req.DepartureDate.String()).
Any("departure", departure).
@@ -39,7 +58,7 @@ func (s *CarpoolServiceServerImpl) DriverJourneys(ctx context.Context, req *prot
Int64("td", int64(td)).
Msg("DriverJourneys show dates")
journeys, err := s.Handler.GetDriverJourneys(departure, arrival, req.DepartureRadius, req.ArrivalRadius, minDate, maxDate, req.Count)
journeys, err := s.Handler.GetDriverJourneys(departureFeature, arrivalFeature, req.DepartureRadius, req.ArrivalRadius, minDate, maxDate, req.Count)
if err != nil {
log.Error().Err(err).Msg("error finding driver journeys")
return nil, err