integration with parcoursmob

servers/grpc/proto/carpool-service.proto

@@ -10,6 +10,7 @@ service CarpoolService {
     // rpc XXXX(Request) returns (Response) {}
     rpc CreateRegularRoutes(CreateRegularRoutesRequest) returns (CreateRegularRoutesResponse) {}
     rpc DeleteRegularRoutes(DeleteRegularRoutesRequest) returns (DeleteRegularRoutesResponse) {}
+    rpc GetRegularRoutes(GetRegularRoutesRequest) returns (GetRegularRoutesResponse) {}
     rpc GetUserPlanning(GetUserPlanningRequest) returns (GetUserPlanningResponse) {}
     rpc GetPlannedTrip(GetPlannedTripRequest) returns (GetPlannedTripResponse) {}
     rpc GetUserBookings(GetUserBookingsRequest) returns (GetUserBookingsResponse) {}
@@ -37,6 +38,14 @@ message DeleteRegularRoutesRequest {
 
 message DeleteRegularRoutesResponse {}
 
+message GetRegularRoutesRequest {
+    string user_id = 1;
+}
+
+message GetRegularRoutesResponse {
+    repeated CarpoolFeatureCollection routes = 1;
+}
+
 message GetUserPlanningRequest {
     string user_id = 1;
     google.protobuf.Timestamp min_departure_date = 2;

servers/grpc/proto/carpool-service_grpc.pb.go

@@ -21,6 +21,7 @@ const _ = grpc.SupportPackageIsVersion7
 const (
 	CarpoolService_CreateRegularRoutes_FullMethodName   = "/CarpoolService/CreateRegularRoutes"
 	CarpoolService_DeleteRegularRoutes_FullMethodName   = "/CarpoolService/DeleteRegularRoutes"
+	CarpoolService_GetRegularRoutes_FullMethodName      = "/CarpoolService/GetRegularRoutes"
 	CarpoolService_GetUserPlanning_FullMethodName       = "/CarpoolService/GetUserPlanning"
 	CarpoolService_GetPlannedTrip_FullMethodName        = "/CarpoolService/GetPlannedTrip"
 	CarpoolService_GetUserBookings_FullMethodName       = "/CarpoolService/GetUserBookings"
@@ -41,6 +42,7 @@ type CarpoolServiceClient interface {
 	// rpc XXXX(Request) returns (Response) {}
 	CreateRegularRoutes(ctx context.Context, in *CreateRegularRoutesRequest, opts ...grpc.CallOption) (*CreateRegularRoutesResponse, error)
 	DeleteRegularRoutes(ctx context.Context, in *DeleteRegularRoutesRequest, opts ...grpc.CallOption) (*DeleteRegularRoutesResponse, error)
+	GetRegularRoutes(ctx context.Context, in *GetRegularRoutesRequest, opts ...grpc.CallOption) (*GetRegularRoutesResponse, error)
 	GetUserPlanning(ctx context.Context, in *GetUserPlanningRequest, opts ...grpc.CallOption) (*GetUserPlanningResponse, error)
 	GetPlannedTrip(ctx context.Context, in *GetPlannedTripRequest, opts ...grpc.CallOption) (*GetPlannedTripResponse, error)
 	GetUserBookings(ctx context.Context, in *GetUserBookingsRequest, opts ...grpc.CallOption) (*GetUserBookingsResponse, error)
@@ -80,6 +82,15 @@ func (c *carpoolServiceClient) DeleteRegularRoutes(ctx context.Context, in *Dele
 	return out, nil
 }
 
+func (c *carpoolServiceClient) GetRegularRoutes(ctx context.Context, in *GetRegularRoutesRequest, opts ...grpc.CallOption) (*GetRegularRoutesResponse, error) {
+	out := new(GetRegularRoutesResponse)
+	err := c.cc.Invoke(ctx, CarpoolService_GetRegularRoutes_FullMethodName, in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *carpoolServiceClient) GetUserPlanning(ctx context.Context, in *GetUserPlanningRequest, opts ...grpc.CallOption) (*GetUserPlanningResponse, error) {
 	out := new(GetUserPlanningResponse)
 	err := c.cc.Invoke(ctx, CarpoolService_GetUserPlanning_FullMethodName, in, out, opts...)
@@ -178,6 +189,7 @@ type CarpoolServiceServer interface {
 	// rpc XXXX(Request) returns (Response) {}
 	CreateRegularRoutes(context.Context, *CreateRegularRoutesRequest) (*CreateRegularRoutesResponse, error)
 	DeleteRegularRoutes(context.Context, *DeleteRegularRoutesRequest) (*DeleteRegularRoutesResponse, error)
+	GetRegularRoutes(context.Context, *GetRegularRoutesRequest) (*GetRegularRoutesResponse, error)
 	GetUserPlanning(context.Context, *GetUserPlanningRequest) (*GetUserPlanningResponse, error)
 	GetPlannedTrip(context.Context, *GetPlannedTripRequest) (*GetPlannedTripResponse, error)
 	GetUserBookings(context.Context, *GetUserBookingsRequest) (*GetUserBookingsResponse, error)
@@ -202,6 +214,9 @@ func (UnimplementedCarpoolServiceServer) CreateRegularRoutes(context.Context, *C
 func (UnimplementedCarpoolServiceServer) DeleteRegularRoutes(context.Context, *DeleteRegularRoutesRequest) (*DeleteRegularRoutesResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteRegularRoutes not implemented")
 }
+func (UnimplementedCarpoolServiceServer) GetRegularRoutes(context.Context, *GetRegularRoutesRequest) (*GetRegularRoutesResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetRegularRoutes not implemented")
+}
 func (UnimplementedCarpoolServiceServer) GetUserPlanning(context.Context, *GetUserPlanningRequest) (*GetUserPlanningResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetUserPlanning not implemented")
 }
@@ -281,6 +296,24 @@ func _CarpoolService_DeleteRegularRoutes_Handler(srv interface{}, ctx context.Co
 	return interceptor(ctx, in, info, handler)
 }
 
+func _CarpoolService_GetRegularRoutes_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetRegularRoutesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(CarpoolServiceServer).GetRegularRoutes(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: CarpoolService_GetRegularRoutes_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(CarpoolServiceServer).GetRegularRoutes(ctx, req.(*GetRegularRoutesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _CarpoolService_GetUserPlanning_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(GetUserPlanningRequest)
 	if err := dec(in); err != nil {
@@ -476,6 +509,10 @@ var CarpoolService_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "DeleteRegularRoutes",
 			Handler:    _CarpoolService_DeleteRegularRoutes_Handler,
 		},
+		{
+			MethodName: "GetRegularRoutes",
+			Handler:    _CarpoolService_GetRegularRoutes_Handler,
+		},
 		{
 			MethodName: "GetUserPlanning",
 			Handler:    _CarpoolService_GetUserPlanning_Handler,

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,