fix connection

services/services.go

@@ -5,8 +5,10 @@ import (
 	fleets "git.coopgo.io/coopgo-platform/fleets/grpcapi"
 	groupsmanagement "git.coopgo.io/coopgo-platform/groups-management/grpcapi"
 	mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
-	silvermobi "git.coopgo.io/coopgo-apps/silvermobi/servers/grpcapi/proto"
+	routing "git.coopgo.io/coopgo-platform/routing-service"
+	solidarityservice "git.coopgo.io/sbouaram/solidarity-service/servers/grpc/proto"
 	"github.com/spf13/viper"
+	"github.com/rs/zerolog/log"
 )
 
 type ServicesHandler struct {
@@ -18,7 +20,8 @@ type GRPCServices struct {
 	GroupsManagement  groupsmanagement.GroupsManagementClient
 	Fleets            fleets.FleetsClient
 	Agenda            agenda.AgendaClient
-	Silvermobi silvermobi.SolidarityServiceClient
+	SolidarityService solidarityservice.SolidarityServiceClient
+	Routing          routing.RoutingService
 }
 
 func NewServicesHandler(cfg *viper.Viper) (*ServicesHandler, error) {
@@ -27,7 +30,9 @@ func NewServicesHandler(cfg *viper.Viper) (*ServicesHandler, error) {
 		groupsManagementDial = cfg.GetString("services.grpc.groupsmanagement.dial")
 		fleetsDial           = cfg.GetString("services.grpc.fleets.dial")
 		agendaDial           = cfg.GetString("services.grpc.agenda.dial")
-		silvermobiDial   = cfg.GetString("services.grpc.silvermobi.dial")
+		solidarityDial   = cfg.GetString("services.grpc.solidarityservice.dial")
+		routing_service_type = cfg.GetString("routing.type")
+		valhalla_base_url    = cfg.GetString("routing.valhalla.base_url")
 	)
 	mobilityAccounts, err := NewMobilityAccountService(mobilityAccountsDial)
 	if err != nil {
@@ -49,11 +54,16 @@ func NewServicesHandler(cfg *viper.Viper) (*ServicesHandler, error) {
 		return nil, err
 	}
 
-	silvermobi, err := NewSolidarityService(silvermobiDial)
+	solidarityService, err := NewSolidarityService(solidarityDial)
 	if err != nil {
 		return nil , err
 	}
 
+	routing, err := routing.NewRoutingService(routing_service_type, valhalla_base_url)
+	if err != nil {
+		log.Fatal().Err(err).Msg("Could not initiate the routing service")
+		return nil, err
+	}
 
 	return &ServicesHandler{
 		GRPC: GRPCServices{
@@ -61,7 +71,8 @@ func NewServicesHandler(cfg *viper.Viper) (*ServicesHandler, error) {
 			GroupsManagement: groupsManagement,
 			Fleets:           fleetsSvc,
 			Agenda:           agendaSvc,
-			Silvermobi: silvermobi,
+			SolidarityService: solidarityService,
+			Routing: routing,
 		},
 	}, nil
 }

services/solidarity_service.go

@@ -1,18 +1,18 @@
 package services
 
 import (
-	silvermobi "git.coopgo.io/coopgo-apps/silvermobi/servers/grpcapi/proto"
+	solidarityservice "git.coopgo.io/sbouaram/solidarity-service/servers/grpc/proto"
 	"google.golang.org/grpc"
 )
 
 type SolidarityService struct {
-	silvermobi.SolidarityServiceClient
+	solidarityservice.SolidarityServiceClient
 }
 
 func NewSolidarityService(silvermobiDial string) (*SolidarityService, error) {
 	conn, err := grpc.Dial(silvermobiDial, grpc.WithInsecure())
 	
-	client := silvermobi.NewSolidarityServiceClient(conn)
+	client := solidarityservice.NewSolidarityServiceClient(conn)
 	if err != nil {
 		return nil, err
 	}