changement d'ortographe
This commit is contained in:
parent
f4ce62543f
commit
fa6faa51c3
4
go.mod
4
go.mod
|
@ -12,6 +12,8 @@ replace git.coopgo.io/coopgo-platform/agenda => ../../coopgo-platform/agenda/
|
||||||
|
|
||||||
replace git.coopgo.io/sbouaram/solidarity-service => ../../coopgo-platform/solidarity-service/
|
replace git.coopgo.io/sbouaram/solidarity-service => ../../coopgo-platform/solidarity-service/
|
||||||
|
|
||||||
|
replace git.coopgo.io/coopgo-apps/silvermobi => ../../coopgo-apps/silvermobi/
|
||||||
|
|
||||||
// replace git.coopgo.io/coopgo-platform/emailing => ../../coopgo-platform/emailing/
|
// replace git.coopgo.io/coopgo-platform/emailing => ../../coopgo-platform/emailing/
|
||||||
|
|
||||||
require (
|
require (
|
||||||
|
@ -32,7 +34,7 @@ require (
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
git.coopgo.io/coopgo-apps/silvermobi v0.0.0-20231208063504-f1d60881e5ab
|
git.coopgo.io/coopgo-apps/silvermobi v0.0.0-20240802133503-2623c85d054d
|
||||||
git.coopgo.io/coopgo-platform/agenda v0.0.0-20230310121901-ef3add576f86
|
git.coopgo.io/coopgo-platform/agenda v0.0.0-20230310121901-ef3add576f86
|
||||||
git.coopgo.io/coopgo-platform/emailing v0.0.0-20221017030337-c71888d90c15
|
git.coopgo.io/coopgo-platform/emailing v0.0.0-20221017030337-c71888d90c15
|
||||||
git.coopgo.io/coopgo-platform/fleets v0.0.0-20230310144446-feb935f8bf4e
|
git.coopgo.io/coopgo-platform/fleets v0.0.0-20230310144446-feb935f8bf4e
|
||||||
|
|
2
go.sum
2
go.sum
|
@ -1,7 +1,5 @@
|
||||||
ariga.io/atlas v0.13.1 h1:oSkEYgI3qUnQZ6b6+teAEiIuizjBvkZ4YDbz0XWfCdQ=
|
ariga.io/atlas v0.13.1 h1:oSkEYgI3qUnQZ6b6+teAEiIuizjBvkZ4YDbz0XWfCdQ=
|
||||||
ariga.io/atlas v0.13.1/go.mod h1:+TR129FJZ5Lvzms6dvCeGWh1yR6hMvmXBhug4hrNIGk=
|
ariga.io/atlas v0.13.1/go.mod h1:+TR129FJZ5Lvzms6dvCeGWh1yR6hMvmXBhug4hrNIGk=
|
||||||
git.coopgo.io/coopgo-apps/silvermobi v0.0.0-20231208063504-f1d60881e5ab h1:Voh7ZtRRnh/9/+b9bqXgwo/98r6HLGRRBGEri0pkP3E=
|
|
||||||
git.coopgo.io/coopgo-apps/silvermobi v0.0.0-20231208063504-f1d60881e5ab/go.mod h1:p4ueQ2fh8K6foJHxqRFArdO52FvWKR9TTLMDjVNQAgw=
|
|
||||||
git.coopgo.io/coopgo-platform/emailing v0.0.0-20221017030337-c71888d90c15 h1:+ZI4nGE6mqZ6pc7N/BizheEPRXn6Z84Sj7ikwfP2ZcU=
|
git.coopgo.io/coopgo-platform/emailing v0.0.0-20221017030337-c71888d90c15 h1:+ZI4nGE6mqZ6pc7N/BizheEPRXn6Z84Sj7ikwfP2ZcU=
|
||||||
git.coopgo.io/coopgo-platform/emailing v0.0.0-20221017030337-c71888d90c15/go.mod h1:rmbqiHVkONcECOoPlsXlxZnD315Tiz2oRnn1M7646Kg=
|
git.coopgo.io/coopgo-platform/emailing v0.0.0-20221017030337-c71888d90c15/go.mod h1:rmbqiHVkONcECOoPlsXlxZnD315Tiz2oRnn1M7646Kg=
|
||||||
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
|
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
|
||||||
|
|
|
@ -6,7 +6,7 @@ import (
|
||||||
"net/http"
|
"net/http"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
solidarity_service "git.coopgo.io/coopgo-apps/silvermobi/servers/grpcapi/proto"
|
silvermobi "git.coopgo.io/coopgo-apps/silvermobi/servers/grpcapi/proto"
|
||||||
"google.golang.org/protobuf/types/known/timestamppb"
|
"google.golang.org/protobuf/types/known/timestamppb"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -20,15 +20,15 @@ func (h *ApplicationHandler) DriversJourney(w http.ResponseWriter, r *http.Reque
|
||||||
|
|
||||||
timestamp := timestamppb.New(departureTime)
|
timestamp := timestamppb.New(departureTime)
|
||||||
|
|
||||||
request := &solidarity_service.DriverJourneysRequest{
|
request := &silvermobi.DriverJourneysRequest{
|
||||||
DepartureDate: timestamp,
|
DepartureDate: timestamp,
|
||||||
Departure: &solidarity_service.Feature{
|
Departure: &silvermobi.Feature{
|
||||||
Lat: 0,
|
Lat: 0,
|
||||||
Long: 0,
|
Long: 0,
|
||||||
Address: "7 rue D",
|
Address: "7 rue D",
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
_, err := h.services.GRPC.SolidarityService.DriverJourneys(context.TODO(), request)
|
_, err := h.services.GRPC.Silvermobi.DriverJourneys(context.TODO(), request)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Println(err)
|
fmt.Println(err)
|
||||||
|
|
|
@ -5,7 +5,7 @@ import (
|
||||||
fleets "git.coopgo.io/coopgo-platform/fleets/grpcapi"
|
fleets "git.coopgo.io/coopgo-platform/fleets/grpcapi"
|
||||||
groupsmanagement "git.coopgo.io/coopgo-platform/groups-management/grpcapi"
|
groupsmanagement "git.coopgo.io/coopgo-platform/groups-management/grpcapi"
|
||||||
mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
|
mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
|
||||||
solidarityservice "git.coopgo.io/coopgo-apps/silvermobi/servers/grpcapi/proto"
|
silvermobi "git.coopgo.io/coopgo-apps/silvermobi/servers/grpcapi/proto"
|
||||||
"github.com/spf13/viper"
|
"github.com/spf13/viper"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ type GRPCServices struct {
|
||||||
GroupsManagement groupsmanagement.GroupsManagementClient
|
GroupsManagement groupsmanagement.GroupsManagementClient
|
||||||
Fleets fleets.FleetsClient
|
Fleets fleets.FleetsClient
|
||||||
Agenda agenda.AgendaClient
|
Agenda agenda.AgendaClient
|
||||||
SolidarityService solidarityservice.SolidarityServiceClient
|
Silvermobi silvermobi.SolidarityServiceClient
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewServicesHandler(cfg *viper.Viper) (*ServicesHandler, error) {
|
func NewServicesHandler(cfg *viper.Viper) (*ServicesHandler, error) {
|
||||||
|
@ -27,7 +27,7 @@ func NewServicesHandler(cfg *viper.Viper) (*ServicesHandler, error) {
|
||||||
groupsManagementDial = cfg.GetString("services.grpc.groupsmanagement.dial")
|
groupsManagementDial = cfg.GetString("services.grpc.groupsmanagement.dial")
|
||||||
fleetsDial = cfg.GetString("services.grpc.fleets.dial")
|
fleetsDial = cfg.GetString("services.grpc.fleets.dial")
|
||||||
agendaDial = cfg.GetString("services.grpc.agenda.dial")
|
agendaDial = cfg.GetString("services.grpc.agenda.dial")
|
||||||
solidarityDial = cfg.GetString("services.grpc.solidarityservice.dial")
|
silvermobiDial = cfg.GetString("services.grpc.silvermobi.dial")
|
||||||
)
|
)
|
||||||
mobilityAccounts, err := NewMobilityAccountService(mobilityAccountsDial)
|
mobilityAccounts, err := NewMobilityAccountService(mobilityAccountsDial)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -49,7 +49,7 @@ func NewServicesHandler(cfg *viper.Viper) (*ServicesHandler, error) {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
solidarityService, err := NewSolidarityService(solidarityDial)
|
silvermobi, err := NewSolidarityService(silvermobiDial)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil , err
|
return nil , err
|
||||||
}
|
}
|
||||||
|
@ -61,7 +61,7 @@ func NewServicesHandler(cfg *viper.Viper) (*ServicesHandler, error) {
|
||||||
GroupsManagement: groupsManagement,
|
GroupsManagement: groupsManagement,
|
||||||
Fleets: fleetsSvc,
|
Fleets: fleetsSvc,
|
||||||
Agenda: agendaSvc,
|
Agenda: agendaSvc,
|
||||||
SolidarityService: solidarityService,
|
Silvermobi: silvermobi,
|
||||||
},
|
},
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,18 +1,18 @@
|
||||||
package services
|
package services
|
||||||
|
|
||||||
import (
|
import (
|
||||||
solidarity_service "git.coopgo.io/coopgo-apps/silvermobi/servers/grpcapi/proto"
|
silvermobi "git.coopgo.io/coopgo-apps/silvermobi/servers/grpcapi/proto"
|
||||||
"google.golang.org/grpc"
|
"google.golang.org/grpc"
|
||||||
)
|
)
|
||||||
|
|
||||||
type SolidarityService struct {
|
type SolidarityService struct {
|
||||||
solidarity_service.SolidarityServiceClient
|
silvermobi.SolidarityServiceClient
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewSolidarityService(silvermobiDial string) (*SolidarityService, error) {
|
func NewSolidarityService(silvermobiDial string) (*SolidarityService, error) {
|
||||||
conn, err := grpc.Dial(silvermobiDial, grpc.WithInsecure())
|
conn, err := grpc.Dial(silvermobiDial, grpc.WithInsecure())
|
||||||
|
|
||||||
client := solidarity_service.NewSolidarityServiceClient(conn)
|
client := silvermobi.NewSolidarityServiceClient(conn)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue