add routes in main

go.mod

@@ -1,6 +1,8 @@
 module git.coopgo.io/coopgo-apps/parcoursmob
 
-go 1.18
+go 1.22
+
+toolchain go1.23.2
 
 replace git.coopgo.io/coopgo-platform/mobility-accounts => ../../coopgo-platform/mobility-accounts/
 
@@ -30,8 +32,8 @@ require (
 	gitlab.scity.coop/maas/navitia-golang v0.0.0-20220429110621-5c22d6efdd0c
 	go.etcd.io/etcd/client/v3 v3.5.10
 	golang.org/x/image v0.5.0
-	golang.org/x/oauth2 v0.20.0
+	golang.org/x/oauth2 v0.23.0
-	google.golang.org/grpc v1.65.0
+	google.golang.org/grpc v1.68.1
 	google.golang.org/protobuf v1.34.2
 )
 
@@ -45,7 +47,7 @@ require (
 	git.coopgo.io/sbouaram/solidarity-service v0.0.0-00010101000000-000000000000
 	github.com/gorilla/securecookie v1.1.1
 	github.com/minio/minio-go/v7 v7.0.43
-	github.com/rs/zerolog v1.32.0
+	github.com/rs/zerolog v1.33.0
 	github.com/xuri/excelize/v2 v2.7.1
 )
 
@@ -68,7 +70,7 @@ require (
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/hashicorp/hcl/v2 v2.16.2 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.17.0 // indirect
+	github.com/klauspost/compress v1.17.7 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
 	github.com/leodido/go-urn v1.2.2 // indirect
 	github.com/lib/pq v1.10.9 // indirect
@@ -84,9 +86,8 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
 	github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect
-	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
 	github.com/paulmach/orb v0.11.1 // indirect
-	github.com/pelletier/go-toml/v2 v2.2.1 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pquerna/cachecontrol v0.1.0 // indirect
 	github.com/richardlehane/mscfb v1.0.4 // indirect
@@ -113,19 +114,18 @@ require (
 	go.etcd.io/etcd/api/v3 v3.5.10 // indirect
 	go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
 	go.mongodb.org/mongo-driver v1.15.0 // indirect
-	go.uber.org/atomic v1.10.0 // indirect
+	go.uber.org/atomic v1.11.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.21.0 // indirect
-	golang.org/x/crypto v0.23.0 // indirect
+	golang.org/x/crypto v0.27.0 // indirect
 	golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect
-	golang.org/x/net v0.25.0 // indirect
+	golang.org/x/net v0.29.0 // indirect
-	golang.org/x/sync v0.7.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
-	golang.org/x/sys v0.20.0 // indirect
+	golang.org/x/sys v0.28.0 // indirect
-	golang.org/x/text v0.15.0 // indirect
+	golang.org/x/text v0.18.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
-	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/mail.v2 v2.3.1 // indirect
 	gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect

go.sum

@@ -5,6 +5,7 @@ git.coopgo.io/coopgo-platform/emailing v0.0.0-20221017030337-c71888d90c15/go.mod
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
 github.com/DATA-DOG/go-sqlmock v1.3.2/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
 github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60=
+github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
 github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
 github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o=
@@ -30,6 +31,7 @@ github.com/d4l3k/messagediff v1.2.1/go.mod h1:Oozbb1TVXFac9FtSIxHBMnBCq2qeH/2KkE
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
 github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
@@ -40,11 +42,13 @@ github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL
 github.com/fogleman/gg v1.3.0 h1:/7zJX8F6AaYQc57WQCyN9cAIz+4bCJGO9B+dyW29am8=
 github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
+github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
 github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/go-openapi/inflect v0.19.0 h1:9jCH9scKIbHeV9m12SmPilScz6krDxKRasNNSNPXu/4=
 github.com/go-openapi/inflect v0.19.0/go.mod h1:lHpZVlpIQqLyKwJ4N+YSc9hchQy/i12fJykb83CRBH4=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
+github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
@@ -52,6 +56,7 @@ github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91
 github.com/go-playground/validator/v10 v10.12.0 h1:E4gtWgxWxp8YSxExrQFv5BpCahla0PVF2oTTEYaWQGI=
 github.com/go-playground/validator/v10 v10.12.0/go.mod h1:hCAPuzYvKdP33pxWa+2+6AIKXEKqjIUyqsNCtbsSJrA=
 github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68=
+github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
@@ -91,8 +96,8 @@ github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHm
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
-github.com/klauspost/compress v1.17.0 h1:Rnbp4K9EjcDuVuHtd0dgA4qNuv9yKDYKK1ulpJwgrqM=
+github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg=
-github.com/klauspost/compress v1.17.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
+github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
 github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk=
@@ -101,10 +106,13 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxv
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 h1:MtvEpTB6LX3vkb4ax0b5D2DHbNAUsen0Gx5wZoq3lV4=
+github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
 github.com/leodido/go-urn v1.2.2 h1:7z68G0FCGvDk646jz1AelTYNYWrTNm0bEcFAo147wt4=
 github.com/leodido/go-urn v1.2.2/go.mod h1:kUaIbLZWttglzwNuG0pgsh5vuV6u2YcGBYz1hIPjtOQ=
 github.com/lib/pq v0.0.0-20180327071824-d34b9ff171c2/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
@@ -159,13 +167,14 @@ github.com/paulmach/go.geojson v1.4.0/go.mod h1:YaKx1hKpWF+T2oj2lFJPsW/t1Q5e1jQI
 github.com/paulmach/orb v0.11.1 h1:3koVegMC4X/WeiXYz9iswopaTwMem53NzTJuTF20JzU=
 github.com/paulmach/orb v0.11.1/go.mod h1:5mULz1xQfs3bmQm63QEJA6lNGujuRafwA5S/EnuLaLU=
 github.com/paulmach/protoscan v0.2.1/go.mod h1:SpcSwydNLrxUGSDvXvO0P7g7AuhJ7lcKfDlhJCDw2gY=
-github.com/pelletier/go-toml/v2 v2.2.1 h1:9TA9+T8+8CUCO2+WYnDLCgrYi9+omqKXyjDtosvtEhg=
+github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
-github.com/pelletier/go-toml/v2 v2.2.1/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
+github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pquerna/cachecontrol v0.1.0 h1:yJMy84ti9h/+OEWa752kBTKv4XC30OtVVHYv/8cTqKc=
 github.com/pquerna/cachecontrol v0.1.0/go.mod h1:NrUG3Z7Rdu85UNR3vm7SOsl1nFIeSiQnrHV5K9mBcUI=
 github.com/richardlehane/mscfb v1.0.4 h1:WULscsljNPConisD5hR0+OyZjwK46Pfyr6mPu5ZawpM=
@@ -174,10 +183,11 @@ github.com/richardlehane/msoleps v1.0.1/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTK
 github.com/richardlehane/msoleps v1.0.3 h1:aznSZzrwYRl3rLKRT3gUk9am7T/mLNSnJINvN0AQoVM=
 github.com/richardlehane/msoleps v1.0.3/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg=
 github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
+github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc=
 github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
-github.com/rs/zerolog v1.32.0 h1:keLypqrlIjaFsbmJOBdB/qvyF8KEtCWHwobLp5l/mQ0=
+github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
-github.com/rs/zerolog v1.32.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
+github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
 github.com/rwtodd/Go.Sed v0.0.0-20210816025313-55464686f9ef/go.mod h1:8AEUvGVi2uQ5b24BIhcr0GCcpd/RNAFWaN2CJFrWIIQ=
 github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ=
 github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4=
@@ -186,6 +196,7 @@ github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWR
 github.com/santhosh-tekuri/jsonschema/v5 v5.0.0 h1:TToq11gyfNlrMFZiYujSekIsPd9AmsA2Bj/iv+s4JHE=
 github.com/santhosh-tekuri/jsonschema/v5 v5.0.0/go.mod h1:FKdcjfQW6rpZSnxxUvEA5H/cDPdvJ/SZJQLWWXWGrZ0=
 github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
+github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
@@ -265,8 +276,8 @@ go.mongodb.org/mongo-driver v1.11.4/go.mod h1:PTSz5yu21bkT/wXpkS7WR5f0ddqw5queth
 go.mongodb.org/mongo-driver v1.15.0 h1:rJCKC8eEliewXjZGf0ddURtl7tTVy1TK3bfl0gkUSLc=
 go.mongodb.org/mongo-driver v1.15.0/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
+go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
-go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
+go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
 go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
@@ -281,8 +292,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE=
-golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
+golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
-golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
+golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
 golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f h1:99ci1mjWVBWwJiEKYY6jWa4d2nTQVIEhZIptnrVb1XY=
 golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI=
 golang.org/x/image v0.5.0 h1:5JMiNunQeQw++mMOz48/ISeNu3Iweh/JaZU8ZLqHRrI=
@@ -305,18 +316,18 @@ golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qx
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
-golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
+golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
-golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
+golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
-golang.org/x/oauth2 v0.20.0 h1:4mQdhULixXKP1rwYBW0vAijoXnkTG0BLCDRzfe1idMo=
+golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs=
-golang.org/x/oauth2 v0.20.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
+golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
+golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
-golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -340,8 +351,8 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
+golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
@@ -354,8 +365,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
+golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
-golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
@@ -369,12 +380,12 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 h1:7whR9kGa5LUwFtpLm2ArCEejtnxlGeLbAyjFY8sGNFw=
+google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 h1:hjSy6tcFQZ171igDaN5QHOw2n6vx40juYbC/x67CEhc=
-google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157/go.mod h1:99sLkeliLXfdj2J75X3Ho+rrVCaJze0uwN7zDDkjPVU=
+google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:qpvKtACPCQhAdu3PyQgV4l3LMXZEtft7y8QcarRsp9I=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
-google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc=
+google.golang.org/grpc v1.68.1 h1:oI5oTa11+ng8r8XMMN7jAOmWfPZWbYpCFaMUTACxkM0=
-google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ=
+google.golang.org/grpc v1.68.1/go.mod h1:+q1XYFJjShcqn0QZHvCyeR4CXPA+llXIeUIfIe00waw=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
@@ -397,6 +408,7 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

handlers/application/beneficiaries.go

@@ -30,6 +30,7 @@ import (
 	mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
 	solidarity_service "git.coopgo.io/sbouaram/solidarity-service/servers/grpc/proto"
 
+
 	"github.com/google/uuid"
 	"github.com/gorilla/mux"
 	"google.golang.org/protobuf/types/known/structpb"
@@ -327,6 +328,62 @@ func (h *ApplicationHandler) BeneficiaryDisplay(w http.ResponseWriter, r *http.R
 		organizations = append(organizations, o.ToStorageType())
 	}
 	
+	beneficiaries_file_types := h.config.GetStringSlice("modules.beneficiaries.documents_types")
+	file_types_map := h.config.GetStringMapString("storage.files.file_types")
+
+	if r.Method == "POST" {
+
+		request := &mobilityaccounts.GetAccountRequest{
+			Id: beneficiaryID,
+		}
+	
+		resp, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), request)
+		if err != nil {
+			fmt.Println(err)
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		fields := resp.Account.Data.Fields
+
+		firstName, ok := fields["first_name"]
+		if !ok {
+			fmt.Println("first_name not found in the data")
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		lastName, ok := fields["last_name"]
+		if !ok {
+			fmt.Println("last_name not found in the data")
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		passenger := solidarity_service.PassengerTripRequest {
+			Passenger : &solidarity_service.User {
+				Id: resp.Account.Id,
+				FirstName: firstName.Kind.(*structpb.Value_StringValue).StringValue,
+				LastName: lastName.Kind.(*structpb.Value_StringValue).StringValue,
+				Alias: " ",
+				Grade: 0,
+				Picture: " ",
+				Gender: " ",
+				VerifiedIdentity: true,
+
+			},
+		}
+
+		silvermobiPassenger, err := h.services.GRPC.SolidarityService.SetPassengerTrip(context.TODO(), &passenger)
+		if err != nil {
+			fmt.Println(err)
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		t := silvermobiPassenger
+		t = t		
+	}
 
 	solidarity_booking := &solidarity_service.GetBookingsByStatusRequest{
 		Status : 0,   /// 0 : pending
@@ -334,17 +391,23 @@ func (h *ApplicationHandler) BeneficiaryDisplay(w http.ResponseWriter, r *http.R
 		Type: 1,      /// 1 : passenger
 	}
 
-	solidarity_bookings_list, err := h.services.GRPC.SolidarityService.GetBookingsByStatus(context.TODO(), solidarity_booking)
+	solidarity_bookings_object, err := h.services.GRPC.SolidarityService.GetBookingsByStatus(context.TODO(), solidarity_booking)
+
 
 	if err != nil {
-		fmt.Println(err)
+		fmt.Println(err)	
-		w.WriteHeader(http.StatusInternalServerError)
+		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
 
-	beneficiaries_file_types := h.config.GetStringSlice("modules.beneficiaries.documents_types")
+	var solidarity_bookings_list []any
-	file_types_map := h.config.GetStringMapString("storage.files.file_types")
 
+	for _, o := range solidarity_bookings_object.Booking {
+		if(o.PassengerPickupDate != nil){
+			solidarity_bookings_list = append(solidarity_bookings_list, o)
+		}
+	}
+	
 	h.Renderer.BeneficiaryDisplay(w, r, resp.Account.ToStorageType(), bookings, organizations, beneficiaries_file_types, file_types_map, documents, events_list, solidarity_bookings_list)
 }
 
@@ -560,7 +623,7 @@ func parseBeneficiariesForm(r *http.Request) (map[string]any, error) {
 		Email:       r.PostFormValue("email"),
 		Birthdate:   date,
 		PhoneNumber: r.PostFormValue("phone_number"),
-		FileNumber:  r.PostFormValue("file_number"),
+		FileNumber:  r.PostFormValue("file_number"), 
 		Gender:      r.PostFormValue("gender"),
 	}
 

handlers/application/journeys.go

@@ -14,27 +14,40 @@ import (
 	groupsmanagement "git.coopgo.io/coopgo-platform/groups-management/grpcapi"
 	groupstorage "git.coopgo.io/coopgo-platform/groups-management/storage"
 	mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
+	solidarity_service "git.coopgo.io/sbouaram/solidarity-service/servers/grpc/proto"
+	models "git.coopgo.io/coopgo-apps/parcoursmob/utils/models"
+
 	"github.com/google/uuid"
 	"github.com/gorilla/mux"
 	geojson "github.com/paulmach/go.geojson"
-	"gitlab.scity.coop/maas/navitia-golang"
+
-	"gitlab.scity.coop/maas/navitia-golang/types"
+	//"gitlab.scity.coop/maas/navitia-golang"
+	//"gitlab.scity.coop/maas/navitia-golang/types"
+	"google.golang.org/protobuf/types/known/emptypb"
 	"google.golang.org/protobuf/types/known/structpb"
+	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
 var Depart any
 var Arrive any
 
+
+var SolidarityData models.SolidarityTransport
+
+
 func (h *ApplicationHandler) JourneysSearch(w http.ResponseWriter, r *http.Request) {
 	r.ParseForm()
 	var (
-		journeys_results *navitia.JourneyResults
+		//journeys_results *navitia.JourneyResults
 		carpool_results  any
 		vehicle_results  []any
+		solidarity_results  models.SolidarityTransport
 	)
 	vehiclech := make(chan []any, 1)
-	navitiaCh := make(chan *navitia.JourneyResults, 1)
+	//navitiaCh := make(chan *navitia.JourneyResults, 1)
 	carpoolCh := make(chan any, 1)
+	solidarityCh := make(chan models.SolidarityTransport, 1)
+
 	locTime, errTime := time.LoadLocation("Europe/Paris")
 	if errTime != nil {
 		fmt.Println("Loading timezone location Europe/Paris error : ")
@@ -54,9 +67,11 @@ func (h *ApplicationHandler) JourneysSearch(w http.ResponseWriter, r *http.Reque
 	var (
 		departuregeo   *geojson.Feature
 		destinationgeo *geojson.Feature
-		journeys       *navitia.JourneyResults
+		//journeys       *navitia.JourneyResults
 		carpoolresults any
 		vehicles       = []any{}
+		drivers        []any
+		accounts 	   []any
 	)
 
 	if departuredate != "" && departuretime != "" && departure != "" && destination != "" {
@@ -78,35 +93,35 @@ func (h *ApplicationHandler) JourneysSearch(w http.ResponseWriter, r *http.Reque
 			return
 		}
 		////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-		journeysRequest := func() {
+		// journeysRequest := func() {
-			//TODO make it a library
+		// 	//TODO make it a library
-			session, _ := navitia.NewCustom(
+		// 	session, _ := navitia.NewCustom(
-				h.config.GetString("services.navitia.api_key"),
+		// 		h.config.GetString("services.navitia.api_key"),
-				"https://api.navitia.io/v1",
+		// 		"https://api.navitia.io/v1",
-				&http.Client{})
+		// 		&http.Client{})
-			if err != nil {
+		// 	if err != nil {
-				fmt.Println(err)
+		// 		fmt.Println(err)
-				w.WriteHeader(http.StatusBadRequest)
+		// 		w.WriteHeader(http.StatusBadRequest)
-				navitiaCh <- nil
+		// 		navitiaCh <- nil
-				return
+		// 		return
-			}
+		// 	}
 
-			request := navitia.JourneyRequest{
+		// 	request := navitia.JourneyRequest{
-				From:          types.ID(fmt.Sprintf("%f", departuregeo.Geometry.Point[0]) + ";" + fmt.Sprintf("%f", departuregeo.Geometry.Point[1])),
+		// 		From:          types.ID(fmt.Sprintf("%f", departuregeo.Geometry.Point[0]) + ";" + fmt.Sprintf("%f", departuregeo.Geometry.Point[1])),
-				To:            types.ID(fmt.Sprintf("%f", destinationgeo.Geometry.Point[0]) + ";" + fmt.Sprintf("%f", destinationgeo.Geometry.Point[1])),
+		// 		To:            types.ID(fmt.Sprintf("%f", destinationgeo.Geometry.Point[0]) + ";" + fmt.Sprintf("%f", destinationgeo.Geometry.Point[1])),
-				Date:          departuredatetime.Add(-2 * time.Hour),
+		// 		Date:          departuredatetime.Add(-2 * time.Hour),
-				DateIsArrival: false, //TODO
+		// 		DateIsArrival: false, //TODO
-			}
+		// 	}
 
-			journeys, err = session.Journeys(context.Background(), request)
+		// 	journeys, err = session.Journeys(context.Background(), request)
-			if err != nil {
+		// 	if err != nil {
-				fmt.Println(err)
+		// 		fmt.Println(err)
-				// w.WriteHeader(http.StatusBadRequest)
+		// 		// w.WriteHeader(http.StatusBadRequest)
-				// return
+		// 		// return
-			}
+		// 	}
-			navitiaCh <- journeys
+		// 	navitiaCh <- journeys
 
-		}
+		// }
 		////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 		//CARPOOL
 		carpoolRequest := func() {
@@ -163,15 +178,117 @@ func (h *ApplicationHandler) JourneysSearch(w http.ResponseWriter, r *http.Reque
 			}
 			vehiclech <- vehicles
 		}
-		go journeysRequest()
+
+		///////////////////////////////////////////////////////////////////////////////////////////////////:::
+		//solidarity-service
+		solidarityRequest := func() {
+		timestamp := timestamppb.New(departuredatetime)
+		PassengerId := r.FormValue("passenger_id")
+		driverId := r.FormValue("driver_id")
+		id := uuid.New().String()
+
+		type Booking struct {
+			bookingData  solidarity_service.CreateBookingSolidarityRequest 
+		} 
+		var BookingData Booking
+		
+		accountsRequest, err := h.services.GRPC.SolidarityService.GetAllPassengers(context.TODO(), &emptypb.Empty{})
+		if err != nil {
+			fmt.Println(err)
+			w.WriteHeader(http.StatusBadRequest)
+		}
+
+		for _, o := range accountsRequest.Passenger {
+				accounts = append(accounts, o)
+		}
+
+		cacheid := uuid.NewString()
+		h.cache.PutWithTTL(cacheid, accounts, 1*time.Hour)
+
+
+		request := solidarity_service.DriverJourneysRequest{
+			DepartureDate: timestamp,
+			Departure: &solidarity_service.Feature{
+				Lat:     departuregeo.Geometry.Point[0],
+				Long:    departuregeo.Geometry.Point[1],
+				Address: departure,
+			},
+		}
+
+		driversRequest, err := h.services.GRPC.SolidarityService.DriverJourneys(context.TODO(), &request)
+
+		if err != nil {
+			fmt.Println(err)
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		for _, o := range driversRequest.DriverJourneys {
+				drivers = append(drivers, o)
+		}
+
+		if r.Method == "POST" {
+
+			BookingData.bookingData = solidarity_service.CreateBookingSolidarityRequest {
+				Booking : &solidarity_service.BookingSolidarityRequest {
+					Id: id,
+					DriverId: driverId,
+					PassengerId: PassengerId,
+					DepartureAddress: &solidarity_service.Feature{
+						Lat:     departuregeo.Geometry.Point[0],
+						Long:    departuregeo.Geometry.Point[1],
+						Address: departure,
+					},
+					DestinationAddress: &solidarity_service.Feature{
+						Lat:     destinationgeo.Geometry.Point[0],
+						Long:    destinationgeo.Geometry.Point[1],
+						Address: departure,
+					},
+					PickupDate : timestamp,
+					
+				},
+			}
+			
+			BookingData.bookingData.Booking.DriverId = driverId
+			BookingData.bookingData.Booking.Id = id
+
+			booking, err := h.services.GRPC.SolidarityService.CreateBookingSolidarity(context.TODO(), &BookingData.bookingData)
+
+			if err != nil {
+				fmt.Println(err)
+				w.WriteHeader(http.StatusInternalServerError)
+				return
+			}
+
+			booking = booking
+
+			SolidarityData = models.SolidarityTransport{
+				Drivers: drivers,
+				Beneficiaries: accounts,
+			}
+
+		}
+		SolidarityData = models.SolidarityTransport{
+			Drivers: drivers,
+			Beneficiaries: accounts,
+		}
+
+		solidarityCh <- SolidarityData
+
+		}
+		//go journeysRequest()
 		go carpoolRequest()
 		go vehicleRequest()
+		go solidarityRequest()
 		carpool_results = <-carpoolCh
-		journeys_results = <-navitiaCh
+		//journeys_results = <-navitiaCh
 		vehicle_results = <-vehiclech
-	}
+		solidarity_results = <-solidarityCh
 
-	h.Renderer.JourneysSearch(w, r, carpool_results, journeys_results, vehicle_results, searched, departuregeo, destinationgeo, departuredate, departuretime)
+	}
+	
+
+	h.Renderer.JourneysSearch(w, r, carpool_results, vehicle_results, searched, departuregeo, destinationgeo, departuredate, departuretime, solidarity_results) //journeys_results,
 }
 
 type GroupsModule []groupstorage.Group

handlers/application/solidarity_service.go

@@ -2,14 +2,20 @@ package application
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"net/http"
+	"strconv"
 	"time"
 
+	mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
 	solidarity_service "git.coopgo.io/sbouaram/solidarity-service/servers/grpc/proto"
+
 	"github.com/google/uuid"
+	"github.com/gorilla/mux"
 	geojson "github.com/paulmach/go.geojson"
 	"google.golang.org/protobuf/types/known/emptypb"
+	"google.golang.org/protobuf/types/known/structpb"
 	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
@@ -19,33 +25,14 @@ type Booking struct {
 	bookingData  solidarity_service.CreateBookingSolidarityRequest 
 } 
 
+//List les conducteurs disponibles + Créer une réservation
 func (h *ApplicationHandler) DriversJourney(w http.ResponseWriter, r *http.Request) {
 
-	parcourmobAccounts, err := h.beneficiaries(r)
-	if err != nil {
-		fmt.Println(err)
-		w.WriteHeader(http.StatusBadRequest)
-		return
-	}
-
-	accounts, err := h.services.GRPC.SolidarityService.GetAllPassengers(context.TODO(), &emptypb.Empty{})
-		if err != nil {
-			fmt.Println(err)
-			w.WriteHeader(http.StatusBadRequest)
-			return
-		}
-
-	cacheid := uuid.NewString()
-	h.cache.PutWithTTL(cacheid, accounts, 1*time.Hour)
-	h.cache.PutWithTTL(cacheid, parcourmobAccounts, 1*time.Hour)
-
-
 	if r.Method == "GET" && r.FormValue("date") != ""{
 				
 		DepartureAddress := r.FormValue("departure");
 		DestinationAddress := r.FormValue("destination");
 		PickupDate := r.FormValue("date");
-		PassengerId := r.FormValue("passenger_id")
 		
 		layout := "2006-01-02T15:04"
 
@@ -104,7 +91,6 @@ func (h *ApplicationHandler) DriversJourney(w http.ResponseWriter, r *http.Reque
 		BookingData.bookingData = solidarity_service.CreateBookingSolidarityRequest {
 			Booking : &solidarity_service.BookingSolidarityRequest {
 			
-			PassengerId: PassengerId,
 			DepartureAddress: &solidarity_service.Feature{
 				Lat:     departuregeo.Geometry.Point[0],
 				Long:    departuregeo.Geometry.Point[1],
@@ -119,21 +105,20 @@ func (h *ApplicationHandler) DriversJourney(w http.ResponseWriter, r *http.Reque
 		},
 		}
 
-		fmt.Println(BookingData.bookingData, "booking")
+		h.Renderer.SolidarityServiceListAvailableDrivers(w, r, drivers, &BookingData.bookingData)
-
-		h.Renderer.SolidarityServiceListAvailableDrivers(w, r, drivers, &BookingData.bookingData, accounts, parcourmobAccounts, cacheid)
 
 	} else if r.Method == "POST" {
 
+		vars := mux.Vars(r)
+		beneficiaryID := vars["id"]
+
 		driverId := r.FormValue("driver_id")
 		id := uuid.New().String()
 
-
 		BookingData.bookingData.Booking.DriverId = driverId
+		BookingData.bookingData.Booking.PassengerId= beneficiaryID
 		BookingData.bookingData.Booking.Id = id
 
-		fmt.Println(BookingData.bookingData, "booking")
-
 		booking, err := h.services.GRPC.SolidarityService.CreateBookingSolidarity(context.TODO(), &BookingData.bookingData)
 
 		if err != nil {
@@ -142,11 +127,134 @@ func (h *ApplicationHandler) DriversJourney(w http.ResponseWriter, r *http.Reque
 			return
 		}
 
-		h.Renderer.SolidarityServiceBooking(w, r, booking, parcourmobAccounts)
+		h.Renderer.SolidarityServiceBooking(w, r, booking)
 
-	}else {	
+	}else {
 
-		h.Renderer.SolidarityService(w, r, accounts, parcourmobAccounts, cacheid)
+
+		h.Renderer.CreateBookingHome(w, r)
 	}
 
+}
+
+func (h *ApplicationHandler) SolidarityService(w http.ResponseWriter, r *http.Request) {
+
+	accounts, err := h.services.GRPC.SolidarityService.GetAllPassengers(context.TODO(), &emptypb.Empty{})
+	drivers, err := h.services.GRPC.SolidarityService.GetAllDrivers(context.TODO(), &emptypb.Empty{})
+	bookings, err := h.services.GRPC.SolidarityService.GetAllBookingsSolidarity(context.TODO(), &emptypb.Empty{})
+
+	parcourmobAccounts, err := h.beneficiaries(r)
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusBadRequest)
+	}
+	cacheid := uuid.NewString()
+	h.cache.PutWithTTL(cacheid, accounts, 1*time.Hour)
+	
+	h.Renderer.SolidarityService(w, r, accounts, drivers, parcourmobAccounts, bookings ,cacheid)
+}
+
+func (h *ApplicationHandler) CreateDriver(w http.ResponseWriter, r *http.Request) {
+
+	if r.Method== "POST" {
+
+		dataMap, err := parseBeneficiariesForm(r)
+		if err != nil {
+			fmt.Println(err)
+			w.WriteHeader(http.StatusBadRequest)
+			return
+		}
+
+		data, err := structpb.NewValue(dataMap)
+		if err != nil {
+			fmt.Println(err)
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		userRequest := &mobilityaccounts.RegisterRequest{
+			Account: &mobilityaccounts.Account{
+				Namespace: "silvermobi",
+				Data:      data.GetStructValue(),
+			},
+		}
+
+		resp, err := h.services.GRPC.MobilityAccounts.Register(context.TODO(), userRequest)
+
+		address := resp.Account.Data.GetFields()["address"].GetStructValue();
+		geometry := address.GetFields()["geometry"].GetStructValue();
+		coordinates:= geometry.GetFields()["coordinates"].GetListValue();
+		if len(coordinates.GetValues()) < 2{
+			fmt.Printf("Erreur lors de la récupération des coordonées : %v", err)
+			return
+		}
+		radiusStr := r.PostFormValue("radius")
+		radius, err := strconv.Atoi(radiusStr)
+		if err != nil {
+			fmt.Printf("Erreur lors de la conversion de radius : %v", err)
+			radius = 0
+		}
+
+		availabilitiesJSON := r.PostFormValue("availabilities")
+
+		var availabilities []solidarity_service.RegularAvailabilitySlot
+
+		jsonerr:= json.Unmarshal([]byte(availabilitiesJSON), &availabilities)
+		if jsonerr != nil {
+			fmt.Printf("Erreur lors de la conversion de availabilitiesJSON  : %v", err)
+		}
+
+		driverRequest := solidarity_service.DriverRegularAvailabilities {
+			DriverRequest : &solidarity_service.DriverRequest {
+				DriverAddress: &solidarity_service.Feature{
+					Lat: coordinates.GetValues()[0].GetNumberValue(),
+					Long: coordinates.GetValues()[1].GetNumberValue(),
+					Address: "********",
+				},
+				DriverRadius: int32(radius),
+				Driver: &solidarity_service.User{
+					Id: resp.Account.Id,
+					Alias: r.PostFormValue("alias"),
+					FirstName: r.PostFormValue("first_name"),
+					LastName: r.PostFormValue("last_name"),
+					Grade: 1,
+					Picture: "h.png",
+					Gender: r.PostFormValue("gender"),
+					VerifiedIdentity: true,      ///////// a Modifier !!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+				},
+				Preferences: &solidarity_service.Preferences{
+					Smoking: false,
+					Animals: false,
+					Music: false,
+					IsTalker: false,
+					LuggageSize: 100,
+				},
+				Car: &solidarity_service.Car{
+					Model: r.PostFormValue("model"),
+					Brand: r.PostFormValue("brand"),
+				},
+			},
+			DriverAvailabilities: []*solidarity_service.RegularAvailabilitySlot{},
+		}
+
+		for _, slot := range availabilities{
+			driverRequest.DriverAvailabilities = append( driverRequest.DriverAvailabilities, &solidarity_service.RegularAvailabilitySlot{
+				DayOfWeek: slot.DayOfWeek,
+				StartTime: slot.StartTime,
+				EndTime: slot.EndTime,
+			})
+		}
+
+		driverResponse, err := h.services.GRPC.SolidarityService.SetDriverRegularAvailabilities(context.TODO(), &driverRequest)
+		if err != nil {
+			fmt.Printf("erreur lors de la création du conducteur: ", err)
+			radius = 0 
+		}
+		fmt.Println("driver: ", driverResponse)
+
+
+	}
+	
+	h.Renderer.CreateDriver(w, r)
+	
 }

main.go

@@ -138,7 +138,10 @@ func main() {
 	/*********************** CODE GROUP **************************/
 
 	//=================================silvermobi====================================
-	application.HandleFunc("/solidarity_service/", applicationHandler.DriversJourney)
+	application.HandleFunc("/solidarity_service/", applicationHandler.SolidarityService) 
+	application.HandleFunc("/solidarity_service/create/{id}", applicationHandler.DriversJourney) 
+	application.HandleFunc("/solidarity_service/driver/create", applicationHandler.CreateDriver) 
+
 
 	appGroup := application.PathPrefix("/group_module").Subrouter()
 	appGroup.HandleFunc("/", applicationHandler.Groups)

renderer/beneficiaries.go

@@ -7,7 +7,7 @@ import (
 
 	fleetsstorage "git.coopgo.io/coopgo-platform/fleets/storage"
 	mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
-
+	solidarity_service "git.coopgo.io/sbouaram/solidarity-service/servers/grpc/proto"
 )
 
 const beneficiariesMenu = "beneficiaries"
@@ -16,6 +16,16 @@ type BeneficiariesListState struct {
 	Count         int                               `json:"count"`
 	CacheId       string                            `json:"cache_id"`
 	Beneficiaries []mobilityaccountsstorage.Account `json:"beneficiaries"`
+	BeneficiariesSolidarity *solidarity_service.GetAllPassengersResponse `json:"beneficiariessolidarity"`
+}
+
+type BeneficiarySolidarityState struct {
+	Count         int                               `json:"count"`
+	CacheId       string                            `json:"cache_id"`
+	Beneficiaries []mobilityaccountsstorage.Account `json:"beneficiaries"`
+	BeneficiarySolidarity *solidarity_service.GetPassengerResponse `json:"beneficiarysolidarity"`
+	BookingSolidarity *solidarity_service.GetBookingsByStatusResponse `json:"bookingsolidarity"`
+
 }
 
 func (s BeneficiariesListState) JSON() template.JS {
@@ -30,7 +40,19 @@ func (s BeneficiariesListState) JSONWithLimits(a int, b int) template.JS {
 	return s.JSON()
 }
 
-func (renderer *Renderer) BeneficiariesList(w http.ResponseWriter, r *http.Request, accounts []mobilityaccountsstorage.Account, cacheid string) {
+func (s BeneficiarySolidarityState) JSON() template.JS {
+	result, _ := json.Marshal(s)
+	return template.JS(result)
+}
+
+func (s BeneficiarySolidarityState) JSONWithLimits(a int, b int) template.JS {
+	if b < 5 { 
+		s.Beneficiaries = s.Beneficiaries[a:b]
+	}
+	return s.JSON()
+}
+
+func (renderer *Renderer) BeneficiariesList(w http.ResponseWriter, r *http.Request, accounts []mobilityaccountsstorage.Account,cacheid string) {
 	files := renderer.ThemeConfig.GetStringSlice("views.beneficiaries.list.files")
 
 	state := NewState(r, renderer.ThemeConfig, beneficiariesMenu)
@@ -54,7 +76,7 @@ type BeneficiariesDisplayState struct {
 	Beneficiary any
 }
 
-func (renderer *Renderer) BeneficiaryDisplay(w http.ResponseWriter, r *http.Request, beneficiary any, bookings []fleetsstorage.Booking, organizations []any, beneficiaries_file_types []string, file_types_map map[string]string, documents any, event interface{}, solidarity_bookings_list interface{}) {
+func (renderer *Renderer) BeneficiaryDisplay(w http.ResponseWriter, r *http.Request, beneficiary any, bookings []fleetsstorage.Booking, organizations []any, beneficiaries_file_types []string, file_types_map map[string]string, documents any, event interface{}, solidarity_bookings_list []any) {
 	files := renderer.ThemeConfig.GetStringSlice("views.beneficiaries.display.files")
 	state := NewState(r, renderer.ThemeConfig, beneficiariesMenu)
 	state.ViewState = map[string]any{
@@ -65,7 +87,7 @@ func (renderer *Renderer) BeneficiaryDisplay(w http.ResponseWriter, r *http.Requ
 		"documents":                documents,
 		"organizations":            organizations,
 		"event":                    event, 
-		"solidarity_bookings":      solidarity_bookings_list,
+		"bookingSolidarity" : solidarity_bookings_list,
 	}
 	renderer.Render("beneficiaries_display", w, r, files, state)
 }

renderer/func-maps.go

@@ -25,6 +25,20 @@ func TimeFrom(d any) *time.Time {
 	return nil
 }
 
+func TimestampFrom(d any) *time.Time {
+
+	if date, ok := d.(time.Time); ok {
+		return &date
+	} else if date, ok := d.(string); ok {
+		datetime, err := time.Parse("2006-01-02T15:04:05Z", date)
+		if err != nil {
+			panic(err)
+		}
+		return &datetime
+	}
+	return nil
+}
+
 func TimeFormat(d any, f string) string {
 	date := TimeFrom(d)
 	if date == nil {

renderer/journeys.go

@@ -4,9 +4,10 @@ import (
 	"encoding/json"
 	"html/template"
 	"net/http"
-
 	groupstorage "git.coopgo.io/coopgo-platform/groups-management/storage"
 	mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
+	models "git.coopgo.io/coopgo-apps/parcoursmob/utils/models"
+
 )
 
 const journeysMenu = "journeys"
@@ -23,6 +24,7 @@ type BeneficiariesCovoiturageA struct {
 	Beneficiaries []any  `json:"beneficiaries"`
 }
 
+
 func (s BeneficiariesCovoiturage) JSON() template.JS {
 	result, _ := json.Marshal(s)
 	return template.JS(result)
@@ -35,7 +37,7 @@ func (s BeneficiariesCovoiturage) JSONWithLimits(a int, b int) template.JS {
 	return s.JSON()
 }
 
-func (renderer *Renderer) JourneysSearch(w http.ResponseWriter, r *http.Request, carpools any, transitjourneys any, vehicles []any, searched bool, departure any, destination any, departuredate string, departuretime string) {
+func (renderer *Renderer) JourneysSearch(w http.ResponseWriter, r *http.Request, carpools any, vehicles []any, searched bool, departure any, destination any, departuredate string, departuretime string, solidarity_results models.SolidarityTransport ) { //transitjourneys any,
 	files := renderer.ThemeConfig.GetStringSlice("views.journeys.search.files")
 	state := NewState(r, renderer.ThemeConfig, journeysMenu)
 	state.ViewState = map[string]any{
@@ -44,11 +46,11 @@ func (renderer *Renderer) JourneysSearch(w http.ResponseWriter, r *http.Request,
 		"departuretime": departuretime,
 		"departure":     departure,
 		"destination":   destination,
-		"journeys":      transitjourneys,
+		//"journeys":      transitjourneys,
 		"carpools":      carpools,
 		"vehicles":      vehicles,
+		"solidarity_results": solidarity_results,
 	}
-
 	renderer.Render("journeys", w, r, files, state)
 }
 

renderer/renderer.go

@@ -253,7 +253,7 @@ func NewState(r *http.Request, themeConfig *viper.Viper, menuState string) Rende
 	}
 	if modules["solidarity_service"] != nil && modules["solidarity_service"].(bool) {
 		ls.MenuItems = append(ls.MenuItems, MenuItem{
-			Title:  "Mobilité solidaire",
+			Title:  "Transport solidaire",
 			Link:   "/app/solidarity_service/",
 			Active: menuState == solidarityserviceMenu,
 			Icon:   "hero:outline/map",

renderer/solidarity_service.go

@@ -5,33 +5,38 @@ import (
 	"html/template"
 	"net/http"
 
-	solidarity_service "git.coopgo.io/sbouaram/solidarity-service/servers/grpc/proto"
 	mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
+	solidarity_service "git.coopgo.io/sbouaram/solidarity-service/servers/grpc/proto"
 )
 
 const solidarityserviceMenu = "solidarity_service"
 
 
 type SolidarityListState struct {
-	Count         int                               `json:"count"`
+	Count                     int                               `json:"count"`
-  	CacheId                string                            `json:"cache_id"`
+  	CacheId                   string                            `json:"cache_id"`
-	BeneficiariesSolidarity         *solidarity_service.GetAllPassengersResponse `json:"beneficiariessolidarity"`
+	BeneficiariesSolidarity   *solidarity_service.GetAllPassengersResponse `json:"beneficiariessolidarity"`
-	Drivers *solidarity_service.DriverJourneysResponse `json:"drivers"`
+	Drivers                   *solidarity_service.DriverJourneysResponse `json:"drivers"`
-	Beneficiaries []mobilityaccountsstorage.Account   `json:"beneficiaries"`
+	Bookings                  *solidarity_service.GetAllBookingsSolidarityResponse `json:"bookings"`
+	Beneficiaries              []mobilityaccountsstorage.Account   `json:"beneficiaries"`
 
 }
 
 type BeneficiariesSolidarityListState struct {
-	Count         int                               `json:"count"`
+	Count                      int                               `json:"count"`
-  	CacheId                string                            `json:"cache_id"`
+  	CacheId                    string                            `json:"cache_id"`
-	BeneficiariesSolidarity          *solidarity_service.GetAllPassengersResponse `json:"beneficiariessolidarity"`
+	BeneficiariesSolidarity    *solidarity_service.GetAllPassengersResponse `json:"beneficiariessolidarity"`
-	Beneficiaries []mobilityaccountsstorage.Account   `json:"beneficiaries"`
+	Drivers                    *solidarity_service.GetAllDriversResponse `json:"drivers"`
+	Bookings                    *solidarity_service.GetAllBookingsSolidarityResponse `json:"bookings"`
+	Beneficiaries              []mobilityaccountsstorage.Account   `json:"beneficiaries"`
+
 
 }
 
 type SolidarityBookingsState struct {
 	Bookings *solidarity_service.CreateBookingSolidarityResponse `json:"bookings"`
 	Beneficiaries []mobilityaccountsstorage.Account   `json:"beneficiaries"`
+	BeneficiariesSolidarity          *solidarity_service.GetAllPassengersResponse `json:"beneficiariessolidarity"`
 
 }
 
@@ -59,42 +64,64 @@ func (s SolidarityListState) JSONWithLimits(a int, b int) template.JS {
 	return s.JSON()
 }
 
-func (renderer *Renderer) SolidarityService(w http.ResponseWriter, r *http.Request, accounts *solidarity_service.GetAllPassengersResponse, parcourmobAccounts []mobilityaccountsstorage.Account, cacheid string) {
+func (s SolidarityBookingsState) JSON() template.JS {
+	result, _ := json.Marshal(s)
+	return template.JS(result)
+}
+
+func (s SolidarityBookingsState) JSONWithLimits(a int, b int) template.JS {
+	if b < 5 { 
+		s.Beneficiaries = s.Beneficiaries[a:b]
+	}
+	return s.JSON()
+}
+
+func (renderer *Renderer) SolidarityService(w http.ResponseWriter, r *http.Request, accounts *solidarity_service.GetAllPassengersResponse, drivers *solidarity_service.GetAllDriversResponse, parcourmobAccounts []mobilityaccountsstorage.Account, bookings *solidarity_service.GetAllBookingsSolidarityResponse, cacheid string) {
 	files := renderer.ThemeConfig.GetStringSlice("views.solidarity_service.list.files")
 	state := NewState(r, renderer.ThemeConfig, solidarityserviceMenu)
 	state.ViewState = BeneficiariesSolidarityListState{
 		Count:         len(parcourmobAccounts), 
 		CacheId:       cacheid,
-		BeneficiariesSolidarity: accounts,
 		Beneficiaries: parcourmobAccounts,
+		BeneficiariesSolidarity: accounts,
+		Drivers: drivers,
+		Bookings: bookings,
+
 	}
 
 	renderer.Render("solidarity_service", w, r, files, state)
 }
 
-func (renderer *Renderer) SolidarityServiceBooking(w http.ResponseWriter, r *http.Request, bookings *solidarity_service.CreateBookingSolidarityResponse, parcourmobAccounts []mobilityaccountsstorage.Account) {
+func (renderer *Renderer) CreateBookingHome(w http.ResponseWriter, r *http.Request ) {
-	files := renderer.ThemeConfig.GetStringSlice("views.solidarity_service.list.files")
+	files := renderer.ThemeConfig.GetStringSlice("views.solidarity_service.create.files")
+	state := NewState(r, renderer.ThemeConfig, solidarityserviceMenu)
+
+	renderer.Render("solidarity_service", w, r, files, state)
+}
+
+func (renderer *Renderer) SolidarityServiceBooking(w http.ResponseWriter, r *http.Request, bookings *solidarity_service.CreateBookingSolidarityResponse) {
+	files := renderer.ThemeConfig.GetStringSlice("views.solidarity_service.create.files")
 	state := NewState(r, renderer.ThemeConfig, solidarityserviceMenu)
 	state.ViewState = SolidarityBookingsState{
 		Bookings: bookings,
-		Beneficiaries: parcourmobAccounts,
-
 	}
 
 	renderer.Render("solidarity_service", w, r, files, state)
 }
 
-func (renderer *Renderer) SolidarityServiceListAvailableDrivers(w http.ResponseWriter, r *http.Request, drivers *solidarity_service.DriverJourneysResponse, booking *solidarity_service.CreateBookingSolidarityRequest, accounts *solidarity_service.GetAllPassengersResponse, parcourmobAccounts []mobilityaccountsstorage.Account, cacheid string) {
+func (renderer *Renderer) SolidarityServiceListAvailableDrivers(w http.ResponseWriter, r *http.Request, drivers *solidarity_service.DriverJourneysResponse, booking *solidarity_service.CreateBookingSolidarityRequest) {
-	files := renderer.ThemeConfig.GetStringSlice("views.solidarity_service.list.files")
+	files := renderer.ThemeConfig.GetStringSlice("views.solidarity_service.create.files")
 	state := NewState(r, renderer.ThemeConfig, solidarityserviceMenu)
-	state.ViewState = SolidarityListState {
+	state.ViewState = SolidarityListState{
-		Count: len(parcourmobAccounts),
-		BeneficiariesSolidarity: accounts,
-		CacheId:       cacheid,
 		Drivers: drivers,
-		Beneficiaries: parcourmobAccounts,
-
 	}
 
 	renderer.Render("solidarity_service", w, r, files, state)
 }
+
+func (renderer *Renderer) CreateDriver(w http.ResponseWriter, r *http.Request) {
+	files := renderer.ThemeConfig.GetStringSlice("views.solidarity_service.create_driver.files")
+	state := NewState(r, renderer.ThemeConfig, solidarityserviceMenu)
+
+	renderer.Render("solidarity_service", w, r, files, state)
+}

services/services.go

@@ -7,6 +7,7 @@ import (
 	mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
 	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"
 )
@@ -21,6 +22,7 @@ type GRPCServices struct {
 	Fleets            fleets.FleetsClient
 	Agenda            agenda.AgendaClient
 	SolidarityService solidarityservice.SolidarityServiceClient
+
 	Routing          routing.RoutingService
 }
 
@@ -59,6 +61,8 @@ func NewServicesHandler(cfg *viper.Viper) (*ServicesHandler, error) {
 		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")

utils/models/models.go

@@ -0,0 +1,7 @@
+package internal
+
+
+type SolidarityTransport struct {
+	Drivers []any
+	Beneficiaries []any
+}