diff --git a/core/application/solidarity-transport.go b/core/application/solidarity-transport.go index d464283..2610546 100644 --- a/core/application/solidarity-transport.go +++ b/core/application/solidarity-transport.go @@ -689,7 +689,7 @@ func (h *ApplicationHandler) UpdateSolidarityTransportDriver(ctx context.Context type SolidarityTransportDriverDataResult struct { Driver mobilityaccountsstorage.Account - Availabilities []*gen.DriverRegularAvailability + Availabilities []*solidaritytypes.DriverRegularAvailability Documents []filestorage.FileInfo Bookings []*solidaritytypes.Booking BeneficiariesMap map[string]mobilityaccountsstorage.Account @@ -733,6 +733,12 @@ func (h *ApplicationHandler) GetSolidarityTransportDriverData(ctx context.Contex return nil, err } + // Convert proto availabilities to types with deserialized geojson address + availabilities := []*solidaritytypes.DriverRegularAvailability{} + for _, protoAvail := range availResp.Results { + availabilities = append(availabilities, solidaritytransformers.DriverRegularAvailabilityProtoToType(protoAvail)) + } + // Get documents documents := h.filestorage.List(filestorage.PREFIX_SOLIDARITY_TRANSPORT_DRIVERS + "/" + driverID) @@ -812,7 +818,7 @@ func (h *ApplicationHandler) GetSolidarityTransportDriverData(ctx context.Contex return &SolidarityTransportDriverDataResult{ Driver: driver, - Availabilities: availResp.Results, + Availabilities: availabilities, Documents: documents, Bookings: bookings, BeneficiariesMap: beneficiariesMap,