integration with parcoursmob

servers/grpc/server/management.go

@@ -32,12 +32,42 @@ func (s *CarpoolServiceServerImpl) CreateRegularRoutes(ctx context.Context, req
 	return &proto.CreateRegularRoutesResponse{}, nil
 }
 
-func (s *CarpoolServiceServerImpl) DeleteRegularRoutes(context.Context, *proto.DeleteRegularRoutesRequest) (*proto.DeleteRegularRoutesResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method DeleteTrips not implemented")
+func (s *CarpoolServiceServerImpl) DeleteRegularRoutes(ctx context.Context, req *proto.DeleteRegularRoutesRequest) (*proto.DeleteRegularRoutesResponse, error) {
+	err := s.Handler.DeleteRegularRoutes(req.Ids)
+	if err != nil {
+		return nil, err
+	}
+	return &proto.DeleteRegularRoutesResponse{}, nil
+}
+
+func (s *CarpoolServiceServerImpl) GetRegularRoutes(ctx context.Context, req *proto.GetRegularRoutesRequest) (*proto.GetRegularRoutesResponse, error) {
+	log.Debug().Msg("grpc CarpoolService - GetRegularRoutes")
+
+	routes, err := s.Handler.GetUserRegularRoutes(req.UserId)
+	if err != nil {
+		return nil, status.Errorf(codes.Internal, "could not retrieve user routes : %s", err.Error())
+	}
+
+	results := []*proto.CarpoolFeatureCollection{}
+
+	for _, r := range routes {
+		serialized, err := r.MarshalJSON()
+		if err != nil {
+			log.Error().Err(err).Msg("error marshaling route")
+			continue
+		}
+		results = append(results, &proto.CarpoolFeatureCollection{
+			Serialized: string(serialized),
+		})
+	}
+
+	return &proto.GetRegularRoutesResponse{
+		Routes: results,
+	}, nil
 }
 
 func (s *CarpoolServiceServerImpl) GetUserPlanning(ctx context.Context, req *proto.GetUserPlanningRequest) (*proto.GetUserPlanningResponse, error) {
-	log.Debug().Msg("grpc CarpoolService - GetRegularUserRoutes")
+	log.Debug().Msg("grpc CarpoolService - GetUserPlanning")
 
 	planned_schedules, missing_planning, err := s.Handler.GetUserPlanning(req.UserId, req.MinDepartureDate.AsTime(), req.MaxDepartureDate.AsTime())
 	if err != nil {

servers/grpc/server/search.go

@@ -71,12 +71,22 @@ func (s *CarpoolServiceServerImpl) DriverJourneys(ctx context.Context, req *prot
 			distance = &dist
 		}
 
+		operator := "internal"
+		if usermap["operator"] != nil {
+			operator = usermap["operator"].(string)
+		}
+
+		alias := ""
+		if usermap["alias"] != nil {
+			alias = usermap["alias"].(string)
+		}
+
 		results = append(results, &proto.CarpoolServiceDriverJourney{
 			Id: journeyId,
 			Driver: &proto.CarpoolServiceUser{
 				Id:       usermap["id"].(string),
-				Operator: usermap["operator"].(string),
-				Alias:    usermap["alias"].(string),
+				Operator: operator,
+				Alias:    alias,
 			},
 			Operator:               s.Handler.InternalOperatorID,
 			PassengerPickupLat:     req.DepartureLat,