solidarity transport updates

resolve mail
merge with main
2025-09-09 05:47:56 +02:00 · 2025-02-28 18:27:36 +01:00 · 2025-02-28 18:05:34 +01:00 · 2025-02-28 17:49:14 +01:00 · 2025-02-27 05:17:32 +01:00 · 2025-02-12 10:42:26 +01:00
97 changed files with 5729 additions and 847 deletions
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@ -0,0 +1,81 @@
+name: Build and Push Docker Image
+
+on:
+  push:
+    tags:
+      - '*'
+    branches:
+      - main
+      - dev
+
+jobs:
+  build_and_push:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Install Docker
+      run: |
+        apt-get update
+        apt-get install -y docker.io
+
+    - name: Checkout Repository
+      uses: actions/checkout@v4
+
+    - name: Set Kubernetes Context
+      uses: azure/k8s-set-context@v4
+      with:
+        method: kubeconfig
+        kubeconfig: ${{secrets.buildx_kubeconfig}}
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+      with:
+        driver: kubernetes
+        driver-opts: |
+          namespace=gitea
+
+    - name: Login to Docker Registry
+      uses: docker/login-action@v3
+      with:
+        registry: git.coopgo.io
+        username: ${{ secrets.REGISTRY_USER }}
+        password: ${{ secrets.REGISTRY_TOKEN }}
+
+    - name: Extract metadata (tags, labels) for Docker image
+      id: metadata
+      uses: docker/metadata-action@v3
+      with:
+        images: git.coopgo.io/${{gitea.repository}}
+        tags: |
+          type=ref,event=branch
+          type=ref,event=tag
+          type=ref,event=pr
+        flavor: |
+          latest=auto
+
+    - name: Build and push
+      uses: docker/build-push-action@v5
+      with:
+        context: .
+        push: true
+        tags: |
+          ${{ steps.metadata.outputs.tags }}
+        build-args: |		
+          ACCESS_TOKEN_USR=${{gitea.actor}}
+          ACCESS_TOKEN_PWD=${{gitea.token}}
+
+    # BUILD WITH KANIKO
+    # - name: Kaniko build and push
+    #   uses: aevea/action-kaniko@master
+    #   with:
+    #     build_file: Dockerfile
+    #     registry: git.coopgo.io
+    #     username: ${{secrets.registry_user}}
+    #     password: ${{secrets.registry_token}}
+    #     image: ${{gitea.repository}}
+    #     tag: ${{gitea.ref_name}}
+    #     cache: true
+    #     cache_registry: git.coopgo.io/${{gitea.repository}}/cache
+    #     extra-args: |
+    #       ACCESS_TOKEN_USR=${{gitea.actor}}
+    #       ACCESS_TOKEN_PWD=${{gitea.token}}
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/parcoursmob.iml" filepath="$PROJECT_DIR$/.idea/parcoursmob.iml" />
+    </modules>
+  </component>
+</project>
--- a/.idea/parcoursmob.iml
+++ b/.idea/parcoursmob.iml
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="Go" enabled="true" />
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/themes" vcs="Git" />
+  </component>
+</project>
--- a/5
+++ b/5
@ -19,9 +19,12 @@ COPY . .

 RUN go mod download && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o /server

-#RUN rm -r themes/*
+RUN rm -r themes
+RUN mkdir themes
+
 RUN git clone --depth 1 https://git.coopgo.io/coopgo-apps/parcoursmob-default-theme themes/default
 RUN git clone -b spie06 --depth 1 https://git.coopgo.io/coopgo-apps/parcoursmob-default-theme themes/spie06
+RUN git clone -b solidarity-transport-dev --depth 1 https://git.coopgo.io/coopgo-apps/parcoursmob-default-theme themes/solidarity-transport

 FROM scratch
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
--- a/README.md
+++ b/README.md
@ -10,5 +10,3 @@ This new version of PARCOURSMOB brings :
 - A configurable and themeable approach of rendering web pages : the default theme is located in the folder [themes/default/](themes/default/)
 - A modular architecture based on groups and access rights, using [COOPGO Groups Management](https://git.coopgo.io/coopgo-groups-management)
 - A distributed cache system through [etcd](https://etcd.io/) to handle distributed state management like pagination in a cloud native way
-
-
--- a/config.go
+++ b/config.go
@ -22,11 +22,105 @@ func ReadConfig() (*viper.Viper, error) {
 				"session_key": "SESSION_KEY",
 			},
 		},
+		"storage": map[string]any{
+			"files": map[string]any{
+				"file_types": map[string]string{
+					"driving_licence": "Permis de conduire",
+					"work_contract":   "Contrat de travail",
+					"identity_proof":  "Pièce d'identité",
+					"membership_form": "Bulletin d'adhésion",
+					"other":           "Autre",
+				},
+			},
+		},
+		"modules": map[string]any{
+			"dashboard": map[string]any{
+				"enabled": true,
+			},
+			"beneficiaries": map[string]any{
+				"enabled": true,
+				"validated_profile": map[string]any{
+					"enabled": false,
+					"required": map[string]any{
+						"fields":    []string{},
+						"documents": []string{},
+					},
+				},
+			},
+			"journeys": map[string]any{
+				"enabled": true,
+			},
+			"solidarity_transport": map[string]any{
+				"enabled": true,
+				"drivers": map[string]any{
+					"documents_types": []string{"membership_form", "driving_licence", "identity_proof", "other"},
+					"validated_profile": map[string]any{
+						"enabled": false,
+						"required": map[string]any{
+							"fields":    []string{},
+							"documents": []string{},
+						},
+					},
+				},
+			},
+			"organized_carpool": map[string]any{
+				"enabled": true,
+				"drivers": map[string]any{
+					"documents_types": []string{"membership_form", "driving_licence", "identity_proof", "other"},
+					"validated_profile": map[string]any{
+						"enabled": false,
+						"required": map[string]any{
+							"fields":    []string{},
+							"documents": []string{},
+						},
+					},
+				},
+			},
+			"vehicles": map[string]any{
+				"enabled": true,
+			},
+			"vehicles_management": map[string]any{
+				"enabled": true,
+			},
+			"agenda": map[string]any{
+				"enabled": true,
+			},
+			"directory": map[string]any{
+				"enabled": true,
+			},
+			"support": map[string]any{
+				"enabled": true,
+			},
+		},
 		"geo": map[string]any{
 			"pelias": map[string]any{
 				"url": "https://geocode.ridygo.fr",
 			},
 		},
+		"geography": map[string]any{
+			"storage": map[string]any{
+				"index": map[string]any{
+					"type": "memory_rtree",
+					"bleve": map[string]any{
+						"file": "index.bleve",
+					},
+				},
+			},
+			"services": map[string]any{
+				"grpc": map[string]any{
+					"enable": true,
+					"port":   8080,
+				},
+			},
+			"data": map[string]any{
+				"layers": map[string]string{
+					"regions":      "https://etalab-datasets.geo.data.gouv.fr/contours-administratifs/latest/geojson/regions-50m.geojson",
+					"departements": "https://etalab-datasets.geo.data.gouv.fr/contours-administratifs/latest/geojson/departements-50m.geojson",
+					"epci":         "https://etalab-datasets.geo.data.gouv.fr/contours-administratifs/latest/geojson/epci-50m.geojson",
+					"communes":     "https://etalab-datasets.geo.data.gouv.fr/contours-administratifs/latest/geojson/communes-50m.geojson",
+				},
+			},
+		},
 	}
 	v := viper.New()
 	for key, value := range defaults {
--- a/go.mod
+++ b/go.mod
@ -1,8 +1,6 @@
 module git.coopgo.io/coopgo-apps/parcoursmob

-go 1.22.0
-
-toolchain go1.23.3
+go 1.24.2

 // replace git.coopgo.io/coopgo-platform/mobility-accounts => ../../coopgo-platform/mobility-accounts/

@ -14,98 +12,168 @@ toolchain go1.23.3

 // replace git.coopgo.io/coopgo-platform/emailing => ../../coopgo-platform/emailing/

+// replace git.coopgo.io/coopgo-platform/data-hub => ../../coopgo-platform/data-hub/
+
+// replace git.coopgo.io/coopgo-platform/solidarity-transport => ../../coopgo-platform/solidarity-transport/
+
+// replace git.coopgo.io/coopgo-platform/carpool-service => ../../coopgo-platform/carpool-service/
+
+// replace git.coopgo.io/coopgo-platform/multimodal-routing => ../../coopgo-platform/multimodal-routing/
+
+// replace git.coopgo.io/coopgo-platform/payments => ../../coopgo-platform/payments/
+
+// replace git.coopgo.io/coopgo-platform/geography => ../../coopgo-platform/geography/
+
+// replace git.coopgo.io/coopgo-platform/sms => ../../coopgo-platform/sms/
+
 require (
-	github.com/coreos/go-oidc v2.2.1+incompatible
 	github.com/fogleman/gg v1.3.0
-	github.com/go-playground/validator/v10 v10.11.0
+	github.com/go-playground/validator/v10 v10.14.1
 	github.com/google/uuid v1.6.0
 	github.com/gorilla/mux v1.8.0
 	github.com/gorilla/sessions v1.2.1
-	github.com/paulmach/go.geojson v1.4.0
-	github.com/spf13/viper v1.19.0
+	github.com/paulmach/go.geojson v1.4.0 // indirect
+	github.com/spf13/viper v1.20.1
 	gitlab.scity.coop/maas/navitia-golang v0.0.0-20220429110621-5c22d6efdd0c
 	go.etcd.io/etcd/client/v3 v3.5.12
 	golang.org/x/image v0.5.0
 	golang.org/x/oauth2 v0.25.0
-	google.golang.org/grpc v1.67.3
-	google.golang.org/protobuf v1.36.1
+	google.golang.org/grpc v1.71.1
+	google.golang.org/protobuf v1.36.6
 )

 require (
-	git.coopgo.io/coopgo-platform/agenda v0.0.0-20230310121901-ef3add576f86
+	git.coopgo.io/coopgo-platform/agenda v1.0.0
+	git.coopgo.io/coopgo-platform/carpool-service v0.0.0-20250415082502-575b8129b727
 	git.coopgo.io/coopgo-platform/emailing v0.0.0-20250212064257-167ef5864260
 	git.coopgo.io/coopgo-platform/fleets v0.0.0-20230310144446-feb935f8bf4e
 	git.coopgo.io/coopgo-platform/groups-management v0.0.0-20230310123255-5ef94ee0746c
-	git.coopgo.io/coopgo-platform/mobility-accounts v0.0.0-20230430115320-f5bb2e7c2c26
+	git.coopgo.io/coopgo-platform/mobility-accounts v0.0.0-20230329105908-a76c0412a386
+	git.coopgo.io/coopgo-platform/multimodal-routing v0.0.0-20250504230045-8680f560066a
+	git.coopgo.io/coopgo-platform/payments v0.0.0-20250616162131-77f7b00b8fc3
+	git.coopgo.io/coopgo-platform/routing-service v0.0.0-20250304234521-faabcc54f536
+	git.coopgo.io/coopgo-platform/sms v0.0.0-20250523074631-1f1e7fc6b7af
+	git.coopgo.io/coopgo-platform/solidarity-transport v0.0.0-20250616110116-d71da5accdfd
+	github.com/arran4/golang-ical v0.3.1
+	github.com/coreos/go-oidc/v3 v3.11.0
 	github.com/gorilla/securecookie v1.1.1
 	github.com/minio/minio-go/v7 v7.0.43
+	github.com/paulmach/orb v0.11.1
+	github.com/rs/zerolog v1.34.0
+	github.com/stretchr/objx v0.5.2
 	github.com/xuri/excelize/v2 v2.7.1
 )

 require (
+	git.coopgo.io/coopgo-platform/carpool-service/interoperability/ocss v0.0.0-20250429082239-a95cd6eb5523 // indirect
+	git.coopgo.io/coopgo-platform/geography v0.0.0-20250616160304-0285c9494673 // indirect
+	github.com/RoaringBitmap/roaring/v2 v2.4.5 // indirect
+	github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
+	github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
+	github.com/bits-and-blooms/bitset v1.22.0 // indirect
+	github.com/blevesearch/bleve/v2 v2.5.2 // indirect
+	github.com/blevesearch/bleve_index_api v1.2.8 // indirect
+	github.com/blevesearch/geo v0.2.3 // indirect
+	github.com/blevesearch/go-faiss v1.0.25 // indirect
+	github.com/blevesearch/go-porterstemmer v1.0.3 // indirect
+	github.com/blevesearch/gtreap v0.1.1 // indirect
+	github.com/blevesearch/mmap-go v1.0.4 // indirect
+	github.com/blevesearch/scorch_segment_api/v2 v2.3.10 // indirect
+	github.com/blevesearch/segment v0.9.1 // indirect
+	github.com/blevesearch/snowballstem v0.9.0 // indirect
+	github.com/blevesearch/upsidedown_store_api v1.0.2 // indirect
+	github.com/blevesearch/vellum v1.1.0 // indirect
+	github.com/blevesearch/zapx/v11 v11.4.2 // indirect
+	github.com/blevesearch/zapx/v12 v12.4.2 // indirect
+	github.com/blevesearch/zapx/v13 v13.4.2 // indirect
+	github.com/blevesearch/zapx/v14 v14.4.2 // indirect
+	github.com/blevesearch/zapx/v15 v15.4.2 // indirect
+	github.com/blevesearch/zapx/v16 v16.2.4 // indirect
+	github.com/bmatcuk/doublestar v1.3.4 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
+	github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
+	github.com/gorilla/schema v1.4.1 // indirect
+	github.com/manterfield/go-mapreader v0.2.0 // indirect
+	github.com/mschoch/smat v0.2.0 // indirect
+	github.com/oapi-codegen/runtime v1.1.1 // indirect
+	github.com/sagikazarmark/locafero v0.9.0 // indirect
+	github.com/sourcegraph/conc v0.3.0 // indirect
+	github.com/tidwall/geoindex v1.7.0 // indirect
+	github.com/tidwall/rtree v1.10.0 // indirect
+	github.com/twpayne/go-polyline v1.1.1 // indirect
+	github.com/zclconf/go-cty-yaml v1.1.0 // indirect
+	go.etcd.io/bbolt v1.4.0 // indirect
+	go.mongodb.org/mongo-driver/v2 v2.1.0 // indirect
+	golang.org/x/mod v0.24.0 // indirect
+	golang.org/x/tools v0.32.0 // indirect
+)
+
+require (
+	ariga.io/atlas v0.32.0 // indirect
+	git.coopgo.io/coopgo-platform/diags v0.0.0-20250212093351-64da61495c9d
+	github.com/agext/levenshtein v1.2.3 // indirect
 	github.com/coreos/go-semver v0.3.0 // indirect
-	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
+	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
 	github.com/dustin/go-humanize v1.0.0 // indirect
-	github.com/fsnotify/fsnotify v1.8.0 // indirect
-	github.com/go-playground/locales v0.14.0 // indirect
-	github.com/go-playground/universal-translator v0.18.0 // indirect
+	github.com/fsnotify/fsnotify v1.9.0 // indirect
+	github.com/go-jose/go-jose/v4 v4.0.2 // indirect
+	github.com/go-openapi/inflect v0.21.2 // indirect
+	github.com/go-playground/locales v0.14.1 // indirect
+	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/golang/snappy v0.0.1 // indirect
-	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/golang/snappy v1.0.0 // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
+	github.com/hashicorp/hcl/v2 v2.23.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.17.2 // indirect
-	github.com/klauspost/cpuid/v2 v2.1.0 // indirect
-	github.com/leodido/go-urn v1.2.1 // indirect
-	github.com/magiconair/properties v1.8.9 // indirect
+	github.com/klauspost/compress v1.18.0 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
+	github.com/leodido/go-urn v1.2.4 // indirect
+	github.com/lib/pq v1.10.9 // indirect
+	github.com/mattn/go-colorable v0.1.14 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mb0/wkt v0.0.0-20170420051526-a30afd545ee1 // indirect
 	github.com/minio/md5-simd v1.1.2 // indirect
 	github.com/minio/sha256-simd v1.0.0 // indirect
-	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	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/pelletier/go-toml/v2 v2.2.3 // indirect
+	github.com/montanaflynn/stats v0.7.1 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.4 // 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
 	github.com/richardlehane/msoleps v1.0.3 // indirect
-	github.com/rs/xid v1.4.0 // indirect
-	github.com/sagikazarmark/locafero v0.7.0 // indirect
-	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
+	github.com/rs/xid v1.6.0 // indirect
 	github.com/santhosh-tekuri/jsonschema/v5 v5.0.0 // indirect
-	github.com/sirupsen/logrus v1.9.0 // indirect
-	github.com/sourcegraph/conc v0.3.0 // indirect
-	github.com/spf13/afero v1.12.0 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
+	github.com/spf13/afero v1.14.0 // indirect
 	github.com/spf13/cast v1.7.1 // indirect
 	github.com/spf13/pflag v1.0.6 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
-	github.com/tidwall/pretty v1.1.0 // indirect
-	github.com/twpayne/go-geom v1.2.1 // indirect
+	github.com/twpayne/go-geom v1.5.7 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
-	github.com/xdg-go/scram v1.1.1 // indirect
-	github.com/xdg-go/stringprep v1.0.3 // indirect
+	github.com/xdg-go/scram v1.1.2 // indirect
+	github.com/xdg-go/stringprep v1.0.4 // indirect
 	github.com/xuri/efp v0.0.0-20220603152613-6918739fd470 // indirect
 	github.com/xuri/nfp v0.0.0-20220409054826-5e722a1d9e22 // indirect
-	github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
+	github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
+	github.com/zclconf/go-cty v1.16.2 // indirect
 	go.etcd.io/etcd/api/v3 v3.5.12 // indirect
 	go.etcd.io/etcd/client/pkg/v3 v3.5.12 // indirect
-	go.mongodb.org/mongo-driver v1.10.1 // indirect
+	go.mongodb.org/mongo-driver v1.17.3 // 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.33.0 // indirect
-	golang.org/x/exp v0.0.0-20250207012021-f9890c6ad9f3 // indirect
-	golang.org/x/net v0.33.0 // indirect
-	golang.org/x/sync v0.11.0 // indirect
-	golang.org/x/sys v0.30.0 // indirect
-	golang.org/x/text v0.22.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 // indirect
+	golang.org/x/crypto v0.37.0 // indirect
+	golang.org/x/net v0.39.0 // indirect
+	golang.org/x/sync v0.13.0 // indirect
+	golang.org/x/sys v0.32.0 // indirect
+	golang.org/x/text v0.24.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250414145226-207652e42e2e // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect
-	gopkg.in/square/go-jose.v2 v2.5.2-0.20210529014059-a5c7eec3c614 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
--- a/go.sum
+++ b/go.sum
@ -1,34 +1,125 @@
-git.coopgo.io/coopgo-platform/agenda v0.0.0-20230310121901-ef3add576f86 h1:pSNHhPU8NB35G14QsSyw/XwsTWZo0qGB0U0X0gzqR1s=
-git.coopgo.io/coopgo-platform/agenda v0.0.0-20230310121901-ef3add576f86/go.mod h1:7jVyZSz//VW5+jlLeuwc+JJawNUhJZ7Vima+TdVwKfs=
-git.coopgo.io/coopgo-platform/emailing v0.0.0-20250211064035-3c2744fb32ec h1:kMbNAiC/y154+Sq4p/0Mk3OMb9vvMrAOwrf+3FiQY3k=
-git.coopgo.io/coopgo-platform/emailing v0.0.0-20250211064035-3c2744fb32ec/go.mod h1:6cvvjv0RLSwBthIQ4TiuZoXFGvQXZ55hNSJchWXAgB4=
+ariga.io/atlas v0.32.0 h1:y+77nueMrExLiKlz1CcPKh/nU7VSlWfBbwCShsJyvCw=
+ariga.io/atlas v0.32.0/go.mod h1:Oe1xWPuu5q9LzyrWfbZmEZxFYeu4BHTyzfjeW2aZp/w=
+git.coopgo.io/coopgo-platform/agenda v1.0.0 h1:rTHgva1JKKO0wAPlINegifMkHm+xOg3IWW4yQRy334w=
+git.coopgo.io/coopgo-platform/agenda v1.0.0/go.mod h1:/hToSla0p6SeWn1zo1MDrfxdmo7RBdZDkbLqCVituIM=
+git.coopgo.io/coopgo-platform/carpool-service v0.0.0-20250415082502-575b8129b727 h1:HdE8EO1CUhwGOTeNeG6dftWtxvZIHWA7SvxBAA7Ab1s=
+git.coopgo.io/coopgo-platform/carpool-service v0.0.0-20250415082502-575b8129b727/go.mod h1:edaXmIta2b5SfK1OHG/02uRAXkKZqj7dSMQoeBxfUew=
+git.coopgo.io/coopgo-platform/carpool-service/interoperability/ocss v0.0.0-20250429082239-a95cd6eb5523 h1:hXoUOEZ+umiyR0SzYbGacJxiUbW4puw4phmkfTVfqPU=
+git.coopgo.io/coopgo-platform/carpool-service/interoperability/ocss v0.0.0-20250429082239-a95cd6eb5523/go.mod h1:c9aJwNtY4PJuqAFYZ9afnx46UAZtWJ3P8ICZM02/DBA=
+git.coopgo.io/coopgo-platform/diags v0.0.0-20250212093351-64da61495c9d h1:fBxVvik4Cb/6d4+HAXZi9e8x8P9UBCJt8JcWgqnNjsE=
+git.coopgo.io/coopgo-platform/diags v0.0.0-20250212093351-64da61495c9d/go.mod h1:diyq11WNkgJ0kYHdT7SphXPMQUyoq4lRk7T6IgM5yPA=
 git.coopgo.io/coopgo-platform/emailing v0.0.0-20250212064257-167ef5864260 h1:Li3dotY6raKu9+oxEgICU7nwdomYpjgu19i3mZNiqTc=
 git.coopgo.io/coopgo-platform/emailing v0.0.0-20250212064257-167ef5864260/go.mod h1:6cvvjv0RLSwBthIQ4TiuZoXFGvQXZ55hNSJchWXAgB4=
 git.coopgo.io/coopgo-platform/fleets v0.0.0-20230310144446-feb935f8bf4e h1:eHahRTKlC8aBWYCd6LbXNcX8HoQhuZj31OFWrw0EL0U=
 git.coopgo.io/coopgo-platform/fleets v0.0.0-20230310144446-feb935f8bf4e/go.mod h1:s9OIFCNcjBAbBzRNHwoCTYV6kAntPG9CpT3GVweGdTY=
+git.coopgo.io/coopgo-platform/geography v0.0.0-20250613055151-06d78317f9ad h1:hNjV2OrYBtSrQZE22YMKIT/iCGdVE30drEJD1pkDhhU=
+git.coopgo.io/coopgo-platform/geography v0.0.0-20250613055151-06d78317f9ad/go.mod h1:TbR3g1Awa8hpAe6LR1z1EQbv2IBVgN5JQ/FjXfKX4K0=
+git.coopgo.io/coopgo-platform/geography v0.0.0-20250616160304-0285c9494673 h1:cth7a8Mnx1C6C6F5rv7SoKVMHYpI/CioFubyi0xB+Dw=
+git.coopgo.io/coopgo-platform/geography v0.0.0-20250616160304-0285c9494673/go.mod h1:TbR3g1Awa8hpAe6LR1z1EQbv2IBVgN5JQ/FjXfKX4K0=
 git.coopgo.io/coopgo-platform/groups-management v0.0.0-20230310123255-5ef94ee0746c h1:bY7PyrAgYY02f5IpDyf1WVfRqvWzivu31K6aEAYbWCw=
 git.coopgo.io/coopgo-platform/groups-management v0.0.0-20230310123255-5ef94ee0746c/go.mod h1:lozSy6qlIIYhvKKXscZzz28HAtS0qBDUTv5nofLRmYA=
-git.coopgo.io/coopgo-platform/mobility-accounts v0.0.0-20230430115320-f5bb2e7c2c26 h1:qiYVLLNU29xgT0RRj0Jz0WrjEJnz1Eng1X7l1UW9jGU=
-git.coopgo.io/coopgo-platform/mobility-accounts v0.0.0-20230430115320-f5bb2e7c2c26/go.mod h1:1typNYtO+PQT6KG77vs/PUv0fO60/nbeSGZL2tt1LLg=
+git.coopgo.io/coopgo-platform/mobility-accounts v0.0.0-20230329105908-a76c0412a386 h1:v1JUdx8sknw2YYhFGz5cOAa1dEWNIBKvyiOpKr3RR+s=
+git.coopgo.io/coopgo-platform/mobility-accounts v0.0.0-20230329105908-a76c0412a386/go.mod h1:1typNYtO+PQT6KG77vs/PUv0fO60/nbeSGZL2tt1LLg=
+git.coopgo.io/coopgo-platform/multimodal-routing v0.0.0-20250504230045-8680f560066a h1:Fl12RBdYDxYh7H2xluPhgTpaHKUNULWpsclBKNx2t8s=
+git.coopgo.io/coopgo-platform/multimodal-routing v0.0.0-20250504230045-8680f560066a/go.mod h1:zDMfGVIvzuWV4Cw4bSi2kuEyMDbAfNfs7cGOAWNKfOo=
+git.coopgo.io/coopgo-platform/payments v0.0.0-20250523113636-a98e83924818 h1:7qIY7Ebh/sR6zCvK5nEsLCxljYwiwDf8KWIqSwqmGYU=
+git.coopgo.io/coopgo-platform/payments v0.0.0-20250523113636-a98e83924818/go.mod h1:32jMjsXTcdzifpsJOQ3Jv8bkieLqefJXWfwkZIZ/Ua4=
+git.coopgo.io/coopgo-platform/payments v0.0.0-20250610065650-b422c8adc3d7 h1:+FUcrwnQouOi/CfVyRNy7Lyv7Wm9XJ7y+qLaugMRl0g=
+git.coopgo.io/coopgo-platform/payments v0.0.0-20250610065650-b422c8adc3d7/go.mod h1:32jMjsXTcdzifpsJOQ3Jv8bkieLqefJXWfwkZIZ/Ua4=
+git.coopgo.io/coopgo-platform/payments v0.0.0-20250616110159-53d3a7f51f92 h1:mXQhmMkP5xh6oDcDQ6UJex0/LwOZgO3ci8IZTpSjQTg=
+git.coopgo.io/coopgo-platform/payments v0.0.0-20250616110159-53d3a7f51f92/go.mod h1:X2WqQN7ZLAucV9z1gPubkWChkHbmdOIxWdwn18DZ+YU=
+git.coopgo.io/coopgo-platform/payments v0.0.0-20250616162131-77f7b00b8fc3 h1:HGEo2E4IyprzshGKKeK7xMmorLNIGF8vbxa3zkBa+KM=
+git.coopgo.io/coopgo-platform/payments v0.0.0-20250616162131-77f7b00b8fc3/go.mod h1:X2WqQN7ZLAucV9z1gPubkWChkHbmdOIxWdwn18DZ+YU=
+git.coopgo.io/coopgo-platform/routing-service v0.0.0-20250304234521-faabcc54f536 h1:SllXX1VJXulfhNi+Pd0R9chksm8zO6gkWcTQ/uSMsdc=
+git.coopgo.io/coopgo-platform/routing-service v0.0.0-20250304234521-faabcc54f536/go.mod h1:Nh7o15LlV0OuO9zxvJIs9FlelpeAaLYkXtFdgIkFrgg=
+git.coopgo.io/coopgo-platform/sms v0.0.0-20250523074631-1f1e7fc6b7af h1:KxHim1dFcOVbFhRqelec8cJ65QBD2cma6eytW8llgYY=
+git.coopgo.io/coopgo-platform/sms v0.0.0-20250523074631-1f1e7fc6b7af/go.mod h1:mad9D+WICDdpJzB+8H/wEVVbllK2mU6VLVByrppc9x0=
+git.coopgo.io/coopgo-platform/solidarity-transport v0.0.0-20250528053224-d237401c81ba h1:CY4DxNQVpwF2OKTu+4+7KJZdM/TH4b3uOtKsI7PKTDw=
+git.coopgo.io/coopgo-platform/solidarity-transport v0.0.0-20250528053224-d237401c81ba/go.mod h1:PKjHUTpP8VNm5bm5njsyj3m6bUpxOVMjoU+llDdfB9E=
+git.coopgo.io/coopgo-platform/solidarity-transport v0.0.0-20250604135203-418c7152b665 h1:5CzA5T9IHjfhawogGO+ADxlUBN+va5xOEHTGAdI03ik=
+git.coopgo.io/coopgo-platform/solidarity-transport v0.0.0-20250604135203-418c7152b665/go.mod h1:jnSYIECcH/nL8bLBwYD2WmJSPgWUC2rioOXxivWBTBM=
+git.coopgo.io/coopgo-platform/solidarity-transport v0.0.0-20250610065958-2f0a45ced0a2 h1:OIkREZ/b9Vah+eV7cdarcaAkJ+ac39QAEENpJ8oi4Xw=
+git.coopgo.io/coopgo-platform/solidarity-transport v0.0.0-20250610065958-2f0a45ced0a2/go.mod h1:jnSYIECcH/nL8bLBwYD2WmJSPgWUC2rioOXxivWBTBM=
+git.coopgo.io/coopgo-platform/solidarity-transport v0.0.0-20250616110116-d71da5accdfd h1:2mvQWRfKHxihCxF1tOH1JgJinxqGDE96x4drlEloQNM=
+git.coopgo.io/coopgo-platform/solidarity-transport v0.0.0-20250616110116-d71da5accdfd/go.mod h1:jnSYIECcH/nL8bLBwYD2WmJSPgWUC2rioOXxivWBTBM=
 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.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU=
+github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU=
 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=
 github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
 github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk=
+github.com/RaveNoX/go-jsoncommentstrip v1.0.0/go.mod h1:78ihd09MekBnJnxpICcwzCMzGrKSKYe4AqU6PDYYpjk=
+github.com/RoaringBitmap/roaring v0.4.23 h1:gpyfd12QohbqhFO4NVDUdoPOCXsyahYRQhINmlHxKeo=
+github.com/RoaringBitmap/roaring/v2 v2.4.5 h1:uGrrMreGjvAtTBobc0g5IrW1D5ldxDQYe2JW2gggRdg=
+github.com/RoaringBitmap/roaring/v2 v2.4.5/go.mod h1:FiJcsfkGje/nZBZgCu0ZxCPOKD/hVXDS2dXi7/eUFE0=
+github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=
+github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
+github.com/alecthomas/assert/v2 v2.10.0 h1:jjRCHsj6hBJhkmhznrCzoNpbA3zqy0fYiUcYZP/GkPY=
+github.com/alecthomas/assert/v2 v2.10.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=
+github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc=
+github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
+github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ=
+github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk=
+github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY=
+github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4=
+github.com/arran4/golang-ical v0.3.1 h1:v13B3eQZ9VDHTAvT6M11vVzxYgcYmjyPBE2eAZl3VZk=
+github.com/arran4/golang-ical v0.3.1/go.mod h1:LZWxF8ZIu/sjBVUCV0udiVPrQAgq3V0aa0RfbO99Qkk=
 github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
+github.com/bits-and-blooms/bitset v1.12.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
+github.com/bits-and-blooms/bitset v1.22.0 h1:Tquv9S8+SGaS3EhyA+up3FXzmkhxPGjQQCkcs2uw7w4=
+github.com/bits-and-blooms/bitset v1.22.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
+github.com/blevesearch/bleve/v2 v2.5.2 h1:Ab0r0MODV2C5A6BEL87GqLBySqp/s9xFgceCju6BQk8=
+github.com/blevesearch/bleve/v2 v2.5.2/go.mod h1:5Dj6dUQxZM6aqYT3eutTD/GpWKGFSsV8f7LDidFbwXo=
+github.com/blevesearch/bleve_index_api v1.2.8 h1:Y98Pu5/MdlkRyLM0qDHostYo7i+Vv1cDNhqTeR4Sy6Y=
+github.com/blevesearch/bleve_index_api v1.2.8/go.mod h1:rKQDl4u51uwafZxFrPD1R7xFOwKnzZW7s/LSeK4lgo0=
+github.com/blevesearch/geo v0.2.3 h1:K9/vbGI9ehlXdxjxDRJtoAMt7zGAsMIzc6n8zWcwnhg=
+github.com/blevesearch/geo v0.2.3/go.mod h1:K56Q33AzXt2YExVHGObtmRSFYZKYGv0JEN5mdacJJR8=
+github.com/blevesearch/go-faiss v1.0.25 h1:lel1rkOUGbT1CJ0YgzKwC7k+XH0XVBHnCVWahdCXk4U=
+github.com/blevesearch/go-faiss v1.0.25/go.mod h1:OMGQwOaRRYxrmeNdMrXJPvVx8gBnvE5RYrr0BahNnkk=
+github.com/blevesearch/go-porterstemmer v1.0.3 h1:GtmsqID0aZdCSNiY8SkuPJ12pD4jI+DdXTAn4YRcHCo=
+github.com/blevesearch/go-porterstemmer v1.0.3/go.mod h1:angGc5Ht+k2xhJdZi511LtmxuEf0OVpvUUNrwmM1P7M=
+github.com/blevesearch/gtreap v0.1.1 h1:2JWigFrzDMR+42WGIN/V2p0cUvn4UP3C4Q5nmaZGW8Y=
+github.com/blevesearch/gtreap v0.1.1/go.mod h1:QaQyDRAT51sotthUWAH4Sj08awFSSWzgYICSZ3w0tYk=
+github.com/blevesearch/mmap-go v1.0.4 h1:OVhDhT5B/M1HNPpYPBKIEJaD0F3Si+CrEKULGCDPWmc=
+github.com/blevesearch/mmap-go v1.0.4/go.mod h1:EWmEAOmdAS9z/pi/+Toxu99DnsbhG1TIxUoRmJw/pSs=
+github.com/blevesearch/scorch_segment_api/v2 v2.3.10 h1:Yqk0XD1mE0fDZAJXTjawJ8If/85JxnLd8v5vG/jWE/s=
+github.com/blevesearch/scorch_segment_api/v2 v2.3.10/go.mod h1:Z3e6ChN3qyN35yaQpl00MfI5s8AxUJbpTR/DL8QOQ+8=
+github.com/blevesearch/segment v0.9.1 h1:+dThDy+Lvgj5JMxhmOVlgFfkUtZV2kw49xax4+jTfSU=
+github.com/blevesearch/segment v0.9.1/go.mod h1:zN21iLm7+GnBHWTao9I+Au/7MBiL8pPFtJBJTsk6kQw=
+github.com/blevesearch/snowballstem v0.9.0 h1:lMQ189YspGP6sXvZQ4WZ+MLawfV8wOmPoD/iWeNXm8s=
+github.com/blevesearch/snowballstem v0.9.0/go.mod h1:PivSj3JMc8WuaFkTSRDW2SlrulNWPl4ABg1tC/hlgLs=
+github.com/blevesearch/upsidedown_store_api v1.0.2 h1:U53Q6YoWEARVLd1OYNc9kvhBMGZzVrdmaozG2MfoB+A=
+github.com/blevesearch/upsidedown_store_api v1.0.2/go.mod h1:M01mh3Gpfy56Ps/UXHjEO/knbqyQ1Oamg8If49gRwrQ=
+github.com/blevesearch/vellum v1.1.0 h1:CinkGyIsgVlYf8Y2LUQHvdelgXr6PYuvoDIajq6yR9w=
+github.com/blevesearch/vellum v1.1.0/go.mod h1:QgwWryE8ThtNPxtgWJof5ndPfx0/YMBh+W2weHKPw8Y=
+github.com/blevesearch/zapx/v11 v11.4.2 h1:l46SV+b0gFN+Rw3wUI1YdMWdSAVhskYuvxlcgpQFljs=
+github.com/blevesearch/zapx/v11 v11.4.2/go.mod h1:4gdeyy9oGa/lLa6D34R9daXNUvfMPZqUYjPwiLmekwc=
+github.com/blevesearch/zapx/v12 v12.4.2 h1:fzRbhllQmEMUuAQ7zBuMvKRlcPA5ESTgWlDEoB9uQNE=
+github.com/blevesearch/zapx/v12 v12.4.2/go.mod h1:TdFmr7afSz1hFh/SIBCCZvcLfzYvievIH6aEISCte58=
+github.com/blevesearch/zapx/v13 v13.4.2 h1:46PIZCO/ZuKZYgxI8Y7lOJqX3Irkc3N8W82QTK3MVks=
+github.com/blevesearch/zapx/v13 v13.4.2/go.mod h1:knK8z2NdQHlb5ot/uj8wuvOq5PhDGjNYQQy0QDnopZk=
+github.com/blevesearch/zapx/v14 v14.4.2 h1:2SGHakVKd+TrtEqpfeq8X+So5PShQ5nW6GNxT7fWYz0=
+github.com/blevesearch/zapx/v14 v14.4.2/go.mod h1:rz0XNb/OZSMjNorufDGSpFpjoFKhXmppH9Hi7a877D8=
+github.com/blevesearch/zapx/v15 v15.4.2 h1:sWxpDE0QQOTjyxYbAVjt3+0ieu8NCE0fDRaFxEsp31k=
+github.com/blevesearch/zapx/v15 v15.4.2/go.mod h1:1pssev/59FsuWcgSnTa0OeEpOzmhtmr/0/11H0Z8+Nw=
+github.com/blevesearch/zapx/v16 v16.2.4 h1:tGgfvleXTAkwsD5mEzgM3zCS/7pgocTCnO1oyAUjlww=
+github.com/blevesearch/zapx/v16 v16.2.4/go.mod h1:Rti/REtuuMmzwsI8/C/qIzRaEoSK/wiFYw5e5ctUKKs=
+github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w=
+github.com/bmatcuk/doublestar v1.3.4 h1:gPypJ5xD31uhX6Tf54sDPUOBXTqKH4c9aPY66CyQrS0=
+github.com/bmatcuk/doublestar v1.3.4/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE=
 github.com/cenkalti/backoff v2.1.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
 github.com/containerd/continuity v0.0.0-20181203112020-004b46473808/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
-github.com/coreos/go-oidc v2.2.1+incompatible h1:mh48q/BqXqgjVHpy2ZY7WnWAbenxRjsz9N1i1YxjHAk=
-github.com/coreos/go-oidc v2.2.1+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc=
+github.com/coreos/go-oidc/v3 v3.11.0 h1:Ia3MxdwpSw702YW0xgfmP1GVCMA9aEFWu12XUZ3/OtI=
+github.com/coreos/go-oidc/v3 v3.11.0/go.mod h1:gE3LgjOgFoHi9a4ce4/tJczr0Ai2/BoDhf0r5lltWI0=
 github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
-github.com/coreos/go-systemd/v22 v22.3.2 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzAJc1DzSI=
-github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
+github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
+github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/d4l3k/messagediff v1.2.1 h1:ZcAIMYsUg0EAp9X+tt8/enBE/Q8Yd5kzPynLyKptt9U=
 github.com/d4l3k/messagediff v1.2.1/go.mod h1:Oozbb1TVXFac9FtSIxHBMnBCq2qeH/2KkEQxENCrlLo=
 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=
@ -38,78 +129,109 @@ github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5Xh
 github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
+github.com/dvyukov/go-fuzz v0.0.0-20200318091601-be3528f3a813/go.mod h1:11Gm+ccJnvAhCNLlf5+cS9KjtbaD5I5zaZpFMsTHWTw=
 github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
 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.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
-github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
-github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
-github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
-github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU=
-github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs=
-github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho=
-github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA=
-github.com/go-playground/validator/v10 v10.11.0 h1:0W+xRM511GY47Yy3bZUbJVitCNg2BOGlCyvTqsp/xIw=
-github.com/go-playground/validator/v10 v10.11.0/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU=
+github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
+github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
+github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
+github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
+github.com/go-jose/go-jose/v4 v4.0.2 h1:R3l3kkBds16bO7ZFAEEcofK0MkrAJt3jlJznWZG0nvk=
+github.com/go-jose/go-jose/v4 v4.0.2/go.mod h1:WVf9LFMHh/QVrmqrOfqun0C45tMe3RoiKJMPvgWwLfY=
+github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
+github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
+github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
+github.com/go-openapi/inflect v0.21.2 h1:0gClGlGcxifcJR56zwvhaOulnNgnhc4qTAkob5ObnSM=
+github.com/go-openapi/inflect v0.21.2/go.mod h1:INezMuUu7SJQc2AyR3WO0DqqYUJSj8Kb4hBd7WtjlAw=
+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=
+github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
+github.com/go-playground/validator/v10 v10.14.1 h1:9c50NUPC30zyuKprjL3vNZ0m5oG+jU0zvx4AqHGnv4k=
+github.com/go-playground/validator/v10 v10.14.1/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
+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/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIxtHqx8aGss=
+github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
 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=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
-github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/golang/snappy v1.0.0 h1:Oy607GVXHs7RtbggtPBnr2RmDArIsAefDwvrdWvRhGs=
+github.com/golang/snappy v1.0.0/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
+github.com/gorilla/schema v1.4.1 h1:jUg5hUjCSDZpNGLuXQOgIWGdlgrIdYvgQ0wZtdK1M3E=
+github.com/gorilla/schema v1.4.1/go.mod h1:Dg5SSm5PV60mhF2NFaTV1xuYYj8tV8NOPRo4FggUMnM=
 github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
 github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
 github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7FsgI=
 github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
 github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod h1:zZKM6oeNM8k+FRljX1mnzVYeS8wiGgQyvST1/GafPbY=
-github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
-github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
+github.com/hashicorp/hcl/v2 v2.23.0 h1:Fphj1/gCylPxHutVSEOf2fBOh1VE4AuLV7+kbJf3qos=
+github.com/hashicorp/hcl/v2 v2.23.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA=
+github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
+github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
 github.com/huandu/xstrings v1.3.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
 github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
+github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d/go.mod h1:2PavIy+JPciBPrBUjwbNvtwB6RQlve+hkpll6QSNmOE=
 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.2 h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/ixi4=
-github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
+github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
+github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
 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.1.0 h1:eyi1Ad2aNJMW95zcSbmGg7Cg6cq3ADwLpMAP96d8rF0=
-github.com/klauspost/cpuid/v2 v2.1.0/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
+github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg=
+github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/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.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 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/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w=
-github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
+github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
+github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
 github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/magiconair/properties v1.8.9 h1:nWcCbLq1N2v/cpNsy5WvQ37Fb+YElfq20WJ/a8RkpQM=
-github.com/magiconair/properties v1.8.9/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
+github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
+github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/manterfield/go-mapreader v0.2.0 h1:ZDJbja6bZCatRG725SDchdudqYnULyk04wSH58gvyqM=
+github.com/manterfield/go-mapreader v0.2.0/go.mod h1:dYr8DHvSqfhrwTHBO1h8dLa9nUUnushqBYuWBns1Z0s=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
+github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mb0/wkt v0.0.0-20170420051526-a30afd545ee1 h1:VCgV+ng800r1/AChRHzHbWCtQI06cPxoZQUljQHTyXc=
 github.com/mb0/wkt v0.0.0-20170420051526-a30afd545ee1/go.mod h1:IhobDa5AIyiMAsnH/qkytD0NbG0JMOJ2ihQqe1NdXyg=
 github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
@ -119,8 +241,8 @@ github.com/minio/minio-go/v7 v7.0.43/go.mod h1:nCrRzjoSUQh8hgKKtu3Y708OLvRLtuASM
 github.com/minio/sha256-simd v1.0.0 h1:v1ta+49hkWZyvaKwrQB8elexRqm6Y0aMLjCNsrYxo6g=
 github.com/minio/sha256-simd v1.0.0/go.mod h1:OuYzVNI5vcoYIAmbIvHPl3N3jUzVedXbKy5RFepssQM=
 github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
-github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
-github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=
+github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0=
 github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
@ -129,58 +251,68 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw=
 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
-github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe h1:iruDEfMl2E6fbMZ9s0scYfZQ84/6SPL6zC8ACM2oIL0=
 github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
+github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8eaE=
+github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
+github.com/mschoch/smat v0.2.0 h1:8imxQsjDm8yFEAVBe7azKmKSgzSkZXDuKkSq9374khM=
+github.com/mschoch/smat v0.2.0/go.mod h1:kc9mz7DoBKqDyiRL7VZN8KvXQMWeTaVnttLRXOlotKw=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
+github.com/oapi-codegen/runtime v1.1.1 h1:EXLHh0DXIJnWhdRPN2w4MXAzFyE4CskzhNLUmtpMYro=
+github.com/oapi-codegen/runtime v1.1.1/go.mod h1:SK9X900oXmPWilYR5/WKPzt3Kqxn/uS/+lbpREv+eCg=
 github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
 github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
 github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
 github.com/ory/dockertest v3.3.4+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs=
 github.com/paulmach/go.geojson v1.4.0 h1:5x5moCkCtDo5x8af62P9IOAYGQcYHtxz2QJ3x1DoCgY=
 github.com/paulmach/go.geojson v1.4.0/go.mod h1:YaKx1hKpWF+T2oj2lFJPsW/t1Q5e1jQI61eoQSTwpIs=
-github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M=
-github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc=
-github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
+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.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
+github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
 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=
 github.com/richardlehane/mscfb v1.0.4/go.mod h1:YzVpcZg9czvAuhk9T+a3avCpcFPMUWm7gK3DypaEsUk=
 github.com/richardlehane/msoleps v1.0.1/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg=
 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.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
-github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
 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.4.0 h1:qd7wPTDkN6KQx2VmMBLrpHkiyQwgFXRnkOLacUiaSNY=
-github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
-github.com/sagikazarmark/locafero v0.7.0 h1:5MqpDsTGNDhY8sGp0Aowyf0qKsPrhewaLSsFaodPcyo=
-github.com/sagikazarmark/locafero v0.7.0/go.mod h1:2za3Cg5rMaTMoG/2Ulr9AwtFaIppKXTRYnozin4aB5k=
-github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE=
-github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ=
+github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU=
+github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
+github.com/rs/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY=
+github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6wYQ=
+github.com/sagikazarmark/locafero v0.9.0 h1:GbgQGNtTrEmddYDSAH9QLRyfAHY12md+8YFTqyMTC9k=
+github.com/sagikazarmark/locafero v0.9.0/go.mod h1:UBUyz37V+EdMS3hDF3QWIiVr/2dPrx49OMO0Bn0hJqk=
 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/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
-github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
-github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
 github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0=
-github.com/spf13/afero v1.12.0 h1:UcOPyRBYczmFn6yvphxkn9ZEOY65cpwGKb5mL36mrqs=
-github.com/spf13/afero v1.12.0/go.mod h1:ZTlWwG4/ahT8W7T0WQ5uYmjI9duaLQGy3Q2OAl4sk/4=
+github.com/spf13/afero v1.14.0 h1:9tH6MapGnn/j0eb0yIXiLjERO8RB6xIVZRDCX7PtqWA=
+github.com/spf13/afero v1.14.0/go.mod h1:acJQ8t0ohCGuMN3O+Pv0V0hgMxNYDlvdk+VTfyZmbYo=
 github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y=
 github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
 github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
 github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/viper v1.19.0 h1:RWq5SEjt8o25SROyN3z2OrDB9l7RPd3lwTWU8EcEdcI=
-github.com/spf13/viper v1.19.0/go.mod h1:GQUN9bilAbhU/jgc1bKs99f/suXKeUMct8Adx5+Ntkg=
+github.com/spf13/viper v1.20.1 h1:ZMi+z/lvLyPSCoNtFCpqjy0S4kPbirhpTMwl8BkW9X4=
+github.com/spf13/viper v1.20.1/go.mod h1:P9Mdzt1zoHIG8m2eZQinpiBjo6kCmZSKBClNNqjJvu4=
+github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.3.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
+github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
@ -188,45 +320,79 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
+github.com/tidwall/cities v0.1.0/go.mod h1:lV/HDp2gCcRcHJWqgt6Di54GiDrTZwh1aG2ZUPNbqa4=
+github.com/tidwall/geoindex v1.7.0 h1:jtk41sfgwIt8MEDyC3xyKSj75iXXf6rjReJGDNPtR5o=
+github.com/tidwall/geoindex v1.7.0/go.mod h1:rvVVNEFfkJVWGUdEfU8QaoOg/9zFX0h9ofWzA60mz1I=
+github.com/tidwall/lotsa v1.0.2/go.mod h1:X6NiU+4yHA3fE3Puvpnn1XMDrFZrE9JO2/w+UMuqgR8=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
-github.com/tidwall/pretty v1.1.0 h1:K3hMW5epkdAVwibsQEfR/7Zj0Qgt4DxtNumTq/VloO8=
-github.com/tidwall/pretty v1.1.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
-github.com/twpayne/go-geom v1.2.1 h1:GazrButEFQmIiV5SUqZdkWvMbmgVNLhZlJF3mH6Rv5w=
+github.com/tidwall/rtree v1.10.0 h1:+EcI8fboEaW1L3/9oW/6AMoQ8HiEIHyR7bQOGnmz4Mg=
+github.com/tidwall/rtree v1.10.0/go.mod h1:iDJQ9NBRtbfKkzZu02za+mIlaP+bjYPnunbSNidpbCQ=
 github.com/twpayne/go-geom v1.2.1/go.mod h1:90yvs0wf/gyT5eQ9W4v5WOZ9w/Xnrj5RMlA9XNKqxyA=
+github.com/twpayne/go-geom v1.5.7 h1:7fdceDUr03/MP7rAKOaTV6x9njMiQdxB/D0PDzMTCDc=
+github.com/twpayne/go-geom v1.5.7/go.mod h1:y4fTAQtLedXW8eG2Yo4tYrIGN1yIwwKkmA+K3iSHKBA=
 github.com/twpayne/go-kml v1.5.0/go.mod h1:g/OG8Q8JUxqFw8LGXE44W7osn1uXDAYaVFr1Yld43yc=
 github.com/twpayne/go-polyline v1.0.0/go.mod h1:ICh24bcLYBX8CknfvNPKqoTbe+eg+MX1NPyJmSBo7pU=
+github.com/twpayne/go-polyline v1.1.1 h1:/tSF1BR7rN4HWj4XKqvRUNrCiYVMCvywxTFVofvDV0w=
+github.com/twpayne/go-polyline v1.1.1/go.mod h1:ybd9IWWivW/rlXPXuuckeKUyF3yrIim+iqA7kSl4NFY=
 github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
 github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
-github.com/xdg-go/scram v1.1.1 h1:VOMT+81stJgXW3CpHyqHN3AXDYIMsx56mEFrB37Mb/E=
 github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g=
-github.com/xdg-go/stringprep v1.0.3 h1:kdwGpVNwPFtjs98xCGkHjQtGKh86rDcRZN17QEMCOIs=
+github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY=
+github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4=
 github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8=
+github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8=
+github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM=
 github.com/xuri/efp v0.0.0-20220603152613-6918739fd470 h1:6932x8ltq1w4utjmfMPVj09jdMlkY0aiA6+Skbtl3/c=
 github.com/xuri/efp v0.0.0-20220603152613-6918739fd470/go.mod h1:ybY/Jr0T0GTCnYjKqmdwxyxn2BQf2RcQIIvex5QldPI=
 github.com/xuri/excelize/v2 v2.7.1 h1:gm8q0UCAyaTt3MEF5wWMjVdmthm2EHAWesGSKS9tdVI=
 github.com/xuri/excelize/v2 v2.7.1/go.mod h1:qc0+2j4TvAUrBw36ATtcTeC1VCM0fFdAXZOmcF4nTpY=
 github.com/xuri/nfp v0.0.0-20220409054826-5e722a1d9e22 h1:OAmKAfT06//esDdpi/DZ8Qsdt4+M5+ltca05dA5bG2M=
 github.com/xuri/nfp v0.0.0-20220409054826-5e722a1d9e22/go.mod h1:WwHg+CVyzlv/TX9xqBFXEZAuxOPxn2k1GNHwG41IIUQ=
-github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA=
 github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
+github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 h1:ilQV1hzziu+LLM3zUTJ0trRztfwgjqKnBWNtSRkbmwM=
+github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfSfmXjznFBSZNN13rSJjlIOI1fUNAtF7rmI=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+github.com/zclconf/go-cty v1.16.2 h1:LAJSwc3v81IRBZyUVQDUdZ7hs3SYs9jv0eZJDWHD/70=
+github.com/zclconf/go-cty v1.16.2/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=
+github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo=
+github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM=
+github.com/zclconf/go-cty-yaml v1.1.0 h1:nP+jp0qPHv2IhUVqmQSzjvqAWcObN0KBkUl2rWBdig0=
+github.com/zclconf/go-cty-yaml v1.1.0/go.mod h1:9YLUH4g7lOhVWqUbctnVlZ5KLpg7JAprQNgxSZ1Gyxs=
 gitlab.scity.coop/maas/navitia-golang v0.0.0-20220429110621-5c22d6efdd0c h1:pCazzEsTvjDopl3bvo6H2f2xjo1cDjOZ9QpJRNFCc00=
 gitlab.scity.coop/maas/navitia-golang v0.0.0-20220429110621-5c22d6efdd0c/go.mod h1:M1U2osA6dYQF8zuJOTb/0O1F/Xgcb+4AkRdw+Un6Rp4=
+go.etcd.io/bbolt v1.4.0 h1:TU77id3TnN/zKr7CO/uk+fBCwF2jGcMuw2B/FMAzYIk=
+go.etcd.io/bbolt v1.4.0/go.mod h1:AsD+OCi/qPN1giOX1aiLAha3o1U8rAz65bvN4j0sRuk=
 go.etcd.io/etcd/api/v3 v3.5.12 h1:W4sw5ZoU2Juc9gBWuLk5U6fHfNVyY1WC5g9uiXZio/c=
 go.etcd.io/etcd/api/v3 v3.5.12/go.mod h1:Ot+o0SWSyT6uHhA56al1oCED0JImsRiU9Dc26+C2a+4=
 go.etcd.io/etcd/client/pkg/v3 v3.5.12 h1:EYDL6pWwyOsylrQyLp2w+HkQ46ATiOvoEdMarindU2A=
 go.etcd.io/etcd/client/pkg/v3 v3.5.12/go.mod h1:seTzl2d9APP8R5Y2hFL3NVlD6qC/dOT+3kvrqPyTas4=
 go.etcd.io/etcd/client/v3 v3.5.12 h1:v5lCPXn1pf1Uu3M4laUE2hp/geOTc5uPcYYsNe1lDxg=
 go.etcd.io/etcd/client/v3 v3.5.12/go.mod h1:tSbBCakoWmmddL+BKVAJHa9km+O/E+bumDe9mSbPiqw=
-go.mongodb.org/mongo-driver v1.10.1 h1:NujsPveKwHaWuKUer/ceo9DzEe7HIj1SlJ6uvXZG0S4=
-go.mongodb.org/mongo-driver v1.10.1/go.mod h1:z4XpeoU6w+9Vht+jAFyLgVrD+jGSQQe0+CBWFHNiHt8=
+go.mongodb.org/mongo-driver v1.11.4/go.mod h1:PTSz5yu21bkT/wXpkS7WR5f0ddqw5quethTUn9WM+2g=
+go.mongodb.org/mongo-driver v1.17.3 h1:TQyXhnsWfWtgAhMtOgtYHMTkZIfBTpMTsMnd9ZBeHxQ=
+go.mongodb.org/mongo-driver v1.17.3/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ=
+go.mongodb.org/mongo-driver/v2 v2.1.0 h1:/ELnVNjmfUKDsoBisXxuJL0noR9CfeUIrP7Yt3R+egg=
+go.mongodb.org/mongo-driver/v2 v2.1.0/go.mod h1:AWiLRShSrk5RHQS3AEn3RL19rqOzVq49MCpWQ3x/huI=
+go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
+go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
+go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=
+go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI=
+go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ=
+go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE=
+go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A=
+go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU=
+go.opentelemetry.io/otel/sdk/metric v1.34.0 h1:5CeK9ujjbFVL5c1PhLuStg1wxA7vQv7ce1EK0Gyvahk=
+go.opentelemetry.io/otel/sdk/metric v1.34.0/go.mod h1:jQ/r8Ze28zRKoNRdkjCZxfs6YvBTG1+YIqyFVFYec5w=
+go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k=
+go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
 go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
@ -242,13 +408,10 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 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.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
-golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
-golang.org/x/exp v0.0.0-20250207012021-f9890c6ad9f3 h1:qNgPs5exUA+G0C96DrPwNrvLSj7GT/9D+3WMWUcUg34=
-golang.org/x/exp v0.0.0-20250207012021-f9890c6ad9f3/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU=
+golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
+golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
 golang.org/x/image v0.5.0 h1:5JMiNunQeQw++mMOz48/ISeNu3Iweh/JaZU8ZLqHRrI=
 golang.org/x/image v0.5.0/go.mod h1:FVC7BI/5Ym8R25iw5OLsgshdUBbT1h5jZTpA+mvAdZ4=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
@ -257,6 +420,8 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
+golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@ -268,8 +433,8 @@ 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.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
-golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
+golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
+golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
 golang.org/x/oauth2 v0.25.0 h1:CY4y7XT9v0cRI9oupztF8AgiIu99L/ksR/Xp/6jrZ70=
 golang.org/x/oauth2 v0.25.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@ -278,8 +443,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
 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.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
-golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
+golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 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=
@ -292,15 +457,16 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 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.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
-golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
+golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 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=
@ -310,10 +476,11 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 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.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
-golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
+golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
+golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
 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-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@ -322,35 +489,37 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/tools v0.32.0 h1:Q7N1vhpkQv7ybVzLFtTjvQya2ewbwNDZzUgfXGqtMWU=
+golang.org/x/tools v0.32.0/go.mod h1:ZxrU41P/wAbZD8EDa6dDCa6XfpkhJ7HFMjHJXfBDu8s=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 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-20241209162323-e6fa225c2576 h1:CkkIfIt50+lT6NHAVoRYEyAvQGFM7xEwXUUywFvEb3Q=
-google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576/go.mod h1:1R3kvZ1dtP3+4p4d3G8uJ8rFk/fWlScl38vanWACI08=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 h1:TqExAhdPaB60Ux47Cn0oLV07rGnxZzIsaRhQaqS666A=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8/go.mod h1:lcTa1sDdWEIHMWlITnIczmw5w60CF9ffkb8Z+DVmmjA=
-google.golang.org/grpc v1.67.3 h1:OgPcDAFKHnH8X3O4WcO4XUc8GRDeKsKReqbQtiCj7N8=
-google.golang.org/grpc v1.67.3/go.mod h1:YGaHCc6Oap+FzBJTZLBzkGSYt/cvGPFTPxkn7QfSU8s=
-google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
-google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 h1:GVIKPyP/kLIyVOgOnTwFOrvQaQUzOzGMCxgFUOEmm24=
+google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422/go.mod h1:b6h1vNKhxaSoEI+5jc3PJUCustfli/mRab7295pY7rw=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250414145226-207652e42e2e h1:ztQaXfzEXTmCBvbtWYRhJxW+0iJcz2qXfd38/e9l7bA=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250414145226-207652e42e2e/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
+google.golang.org/grpc v1.71.1 h1:ffsFWr7ygTUscGPI0KKK6TLrGz0476KUvvsbqWK0rPI=
+google.golang.org/grpc v1.71.1/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec=
+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.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
+google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
 gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 h1:VpOs+IwYnYBaFnrNAeB8UUWtL3vEUnzSCL1nVjPhqrw=
 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
-gopkg.in/square/go-jose.v2 v2.5.2-0.20210529014059-a5c7eec3c614 h1:lwJmuuJQGclcankpPJwh8rorzB0bNbVALv8phDGh8TQ=
-gopkg.in/square/go-jose.v2 v2.5.2-0.20210529014059-a5c7eec3c614/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
 gopkg.in/yaml.v2 v2.2.2/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.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
--- a/handlers/api/api.go
+++ b/handlers/api/api.go
--- a/handlers/api/cache.go
+++ b/handlers/api/cache.go
@ -2,27 +2,52 @@ package api

 import (
 	"encoding/json"
-	"fmt"
 	"net/http"
 	"strconv"

+	"github.com/rs/zerolog/log"
+
 	"github.com/gorilla/mux"
 )

 func (h APIHandler) GetCache(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 	cacheid := vars["cacheid"]
-
+	// Use a channel to synchronize the goroutines
+	ch := make(chan []byte)
+	// Fetch data from cache asynchronously
+	go func() {
 		d, err := h.cache.Get(cacheid)
 		if err != nil {
-		fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusNotFound)
+			ch <- nil
 			return
 		}
+		var data []any
+		if val, ok := d.([]any); ok {
+			data = val
+		} else {
+			data = []any{d}
+		}
+		j := toJSON(data, w, r)
+		ch <- j // Signal that the data has been fetched successfully
+		close(ch)
+	}()
+	// wait for the JSON marshaling goroutine to finish
+	j := <-ch
+	if j == nil {
+		return // Stop processing if an error occurred
+	}
+	// Send the JSON response to the client
+	w.WriteHeader(http.StatusOK)
+	w.Header().Set("Content-Type", "application/json")
+	w.Write(j)

-	result := d
-
-	if data, ok := d.([]any); ok {
+	<-ch
+}
+func toJSON(data []any, w http.ResponseWriter, r *http.Request) []byte {
+	result := data
 	if limitsmin, ok := r.URL.Query()["limits.min"]; ok {
 		min, _ := strconv.Atoi(limitsmin[0])
 		if limitsmax, ok := r.URL.Query()["limits.max"]; ok {
@ -36,16 +61,10 @@ func (h APIHandler) GetCache(w http.ResponseWriter, r *http.Request) {
 			result = data[min:]
 		}
 	}
-	}
-
 	j, err := json.Marshal(result)
 	if err != nil {
 		w.WriteHeader(http.StatusNotFound)
-		return
+		return nil
 	}
-
-	w.WriteHeader(http.StatusOK)
-	w.Header().Set("Content-Type", "application/json")
-	w.Write(j)
-
+	return j
 }
--- a/handlers/api/calendars.go
+++ b/handlers/api/calendars.go
@ -0,0 +1,120 @@
+package api
+
+import (
+	"net/http"
+	"time"
+
+	"git.coopgo.io/coopgo-apps/parcoursmob/services"
+	ics "github.com/arran4/golang-ical"
+	"github.com/gorilla/mux"
+	"github.com/rs/zerolog/log"
+)
+
+func (h *APIHandler) icsCalendar(events []services.AgendaEvent) (*ics.Calendar, error) {
+	calendar := ics.NewCalendarFor(h.config.GetString("service_name"))
+
+	for _, e := range events {
+		vevent := ics.NewEvent(e.ID)
+		vevent.SetSummary(e.Name)
+		vevent.SetDescription(e.Description)
+		if e.Allday {
+			vevent.SetAllDayStartAt(e.Startdate)
+			if e.Enddate.After(e.Startdate) {
+				vevent.SetAllDayEndAt(e.Enddate.Add(24 * time.Hour))
+			}
+		} else {
+			timeloc, err := time.LoadLocation("Europe/Paris")
+			if err != nil {
+				log.Error().Err(err).Msg("Tried to load timezone location Europe/Paris. Error. Missing zones in container ?")
+				return nil, err
+			}
+
+			starttime, err := time.ParseInLocation("15:04", e.Starttime, timeloc)
+			if err != nil {
+				return nil, err
+			}
+			startdatetime := time.Date(e.Startdate.Year(), e.Startdate.Month(), e.Startdate.Day(), starttime.Hour(), starttime.Minute(), 0, 0, timeloc)
+
+			endtime, err := time.Parse("15:04", e.Endtime)
+			if err != nil {
+				return nil, err
+			}
+			enddatetime := time.Date(e.Enddate.Year(), e.Enddate.Month(), e.Enddate.Day(), endtime.Hour(), endtime.Minute(), 0, 0, timeloc)
+
+			vevent.SetStartAt(startdatetime)
+			vevent.SetEndAt(enddatetime)
+		}
+		calendar.AddVEvent(vevent)
+	}
+	return calendar, nil
+}
+
+func (h *APIHandler) CalendarGlobal(w http.ResponseWriter, r *http.Request) {
+	enabled := h.config.GetBool("modules.agenda.enabled") && h.config.GetBool("modules.agenda.calendars.global.enabled")
+	if !enabled {
+		log.Error().Msg("global calendar not activated in configuration")
+		w.WriteHeader(http.StatusForbidden)
+		return
+	}
+
+	events, err := h.services.GetAgendaEvents()
+	if err != nil {
+		log.Error().Err(err).Msg("error retrieving agenda events")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	calendar, err := h.icsCalendar(events)
+	if err != nil {
+		log.Error().Err(err).Msg("error while creating ics calendar")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	w.WriteHeader(http.StatusOK)
+	w.Header().Set("Content-Type", "text/calendar")
+	w.Write([]byte(calendar.Serialize()))
+}
+
+func (h *APIHandler) CalendarOrganizations(w http.ResponseWriter, r *http.Request) {
+	enabled := h.config.GetBool("modules.agenda.enabled") && h.config.GetBool("modules.agenda.calendars.organizations.enabled")
+	if !enabled {
+		log.Error().Msg("organizations calendar not activated in configuration")
+		w.WriteHeader(http.StatusForbidden)
+		return
+	}
+
+	// TODO set additional calendar rights in group configuration to prevent default behavior ?
+
+	vars := mux.Vars(r)
+	groupid := vars["groupid"]
+
+	events, err := h.services.GetAgendaEvents()
+	if err != nil {
+		log.Error().Err(err).Msg("error retrieving agenda events")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	filteredEvents := []services.AgendaEvent{}
+
+	for _, e := range events {
+		for _, g := range e.Owners {
+			if g == groupid {
+				filteredEvents = append(filteredEvents, e)
+				continue
+			}
+		}
+	}
+
+	calendar, err := h.icsCalendar(filteredEvents)
+	if err != nil {
+		log.Error().Err(err).Msg("error while creating ics calendar")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	w.WriteHeader(http.StatusOK)
+	w.Header().Set("Content-Type", "text/calendar")
+	w.Write([]byte(calendar.Serialize()))
+}
--- a/handlers/api/export.go
+++ b/handlers/api/export.go
@ -8,6 +8,7 @@ import (
 	"strconv"

 	"github.com/gorilla/mux"
+	"github.com/rs/zerolog/log"
 )

 type FlatMaps []map[string]any
@ -48,7 +49,7 @@ func (h APIHandler) CacheExport(w http.ResponseWriter, r *http.Request) {

 	d, err := h.cache.Get(cacheid)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("Error getting cache")
 		w.WriteHeader(http.StatusNotFound)
 		return
 	}
@ -56,7 +57,6 @@ func (h APIHandler) CacheExport(w http.ResponseWriter, r *http.Request) {
 	if data, ok := d.([]any); ok {

 		flatmaps := FlatMaps{}
-		//fmt.Println(data)

 		for _, v := range data {
 			fm := map[string]any{}
@ -90,7 +90,7 @@ func flatten(prefix string, src map[string]any, dest map[string]any) {
 				dest[prefix+k+"."+strconv.Itoa(i)] = child[i]
 			}
 		default:
-			fmt.Println(prefix+k, " : ", v)
+			// log.Trace().Str("key", prefix+k).Any("value", v).Msg("")
 			dest[prefix+k] = v
 		}
 	}
--- a/handlers/api/geo.go
+++ b/handlers/api/geo.go
@ -3,13 +3,12 @@ package api
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"net/http"
 )

 func (h *APIHandler) GeoAutocomplete(w http.ResponseWriter, r *http.Request) {
-
 	pelias := h.config.GetString("geo.pelias.url")

 	t, ok := r.URL.Query()["text"]
@ -29,8 +28,7 @@ func (h *APIHandler) GeoAutocomplete(w http.ResponseWriter, r *http.Request) {

 	defer resp.Body.Close()

-	body, err := ioutil.ReadAll(resp.Body)
-
+	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		log.Fatal(err)
 	}
--- a/handlers/api/oidc.go
+++ b/handlers/api/oidc.go
@ -2,15 +2,15 @@ package api

 import (
 	"context"
-	"fmt"
 	"net/http"
+
+	"github.com/rs/zerolog/log"
 )

 func (h APIHandler) OAuth2Callback(w http.ResponseWriter, r *http.Request) {
 	oauth2Token, err := h.idp.OAuth2Config.Exchange(context.Background(), r.URL.Query().Get("code"))
 	if err != nil {
-		fmt.Println("Exchange error")
-		fmt.Println(err)
+		log.Error().Err(err).Msg("Exchange error")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -18,15 +18,14 @@ func (h APIHandler) OAuth2Callback(w http.ResponseWriter, r *http.Request) {
 	// Extract the ID Token from OAuth2 token.
 	rawIDToken, ok := oauth2Token.Extra("id_token").(string)
 	if !ok {
-		fmt.Println("issue retrieving token")
+		log.Error().Msg("Cannot retrieve ID token")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}

 	_, err = h.idp.TokenVerifier.Verify(context.Background(), rawIDToken)
 	if err != nil {
-		fmt.Println("not able to verify token")
-		fmt.Println(err)
+		log.Error().Err(err).Msg("Not able to verify token")
 		w.WriteHeader(http.StatusUnauthorized)
 		return
 	}
@ -42,7 +41,7 @@ func (h APIHandler) OAuth2Callback(w http.ResponseWriter, r *http.Request) {
 	}

 	if err = session.Save(r, w); err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("Cannot save session")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
--- a/handlers/api/protected/protected.go
+++ b/handlers/api/protected/protected.go
@ -0,0 +1,32 @@
+package protected
+
+import (
+	"net/http"
+
+	"git.coopgo.io/coopgo-apps/parcoursmob/services"
+	"git.coopgo.io/coopgo-apps/parcoursmob/utils/identification"
+	cache "git.coopgo.io/coopgo-apps/parcoursmob/utils/storage"
+	"github.com/spf13/viper"
+)
+
+type ProtectedAPIHandler struct {
+	ApiKey   string
+	idp      *identification.IdentificationProvider
+	config   *viper.Viper
+	services *services.ServicesHandler
+	cache    cache.CacheHandler
+}
+
+func NewProtectedAPIHandler(cfg *viper.Viper, idp *identification.IdentificationProvider, svc *services.ServicesHandler, cache cache.CacheHandler) (*ProtectedAPIHandler, error) {
+	return &ProtectedAPIHandler{
+		ApiKey:   cfg.GetString("services.api.api_key"),
+		idp:      idp,
+		config:   cfg,
+		services: svc,
+		cache:    cache,
+	}, nil
+}
+
+func (h *ProtectedAPIHandler) NotFound(w http.ResponseWriter, r *http.Request) {
+	w.WriteHeader(http.StatusNotFound)
+}
--- a/handlers/api/protected/users.go
+++ b/handlers/api/protected/users.go
@ -0,0 +1,65 @@
+package protected
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	groupsgrpc "git.coopgo.io/coopgo-platform/groups-management/grpcapi"
+	"git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
+	"git.coopgo.io/coopgo-platform/mobility-accounts/storage"
+	"github.com/rs/zerolog/log"
+)
+
+func (h *ProtectedAPIHandler) Users(w http.ResponseWriter, r *http.Request) {
+	if r.Method == "POST" {
+		h.postUsers(w, r)
+		return
+	}
+
+	w.WriteHeader(http.StatusMethodNotAllowed)
+}
+
+func (h *ProtectedAPIHandler) postUsers(w http.ResponseWriter, r *http.Request) {
+	var user storage.Account
+
+	decoder := json.NewDecoder(r.Body)
+	err := decoder.Decode(&user)
+	if err != nil {
+		log.Error().Err(err).Msg("could not read account input")
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+
+	account, err := grpcapi.AccountFromStorageType(&user)
+	if err != nil {
+		log.Error().Err(err).Msg("could not generate protobuf for account")
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+
+	resp, err := h.services.GRPC.MobilityAccounts.Register(context.Background(), &grpcapi.RegisterRequest{
+		Account: account,
+	})
+	if err != nil {
+		log.Error().Err(err).Msg("grpc request issue")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	if g, ok := user.Metadata["import_in_group"]; ok {
+		if group, ok := g.(string); ok {
+			_, err = h.services.GRPC.GroupsManagement.Subscribe(context.Background(), &groupsgrpc.SubscribeRequest{
+				Groupid:  group,
+				Memberid: resp.Account.Id,
+			})
+			if err != nil {
+				log.Error().Err(err).Msg("grpc request issue, groups")
+				w.WriteHeader(http.StatusInternalServerError)
+				return
+			}
+		}
+	}
+
+	w.WriteHeader(http.StatusOK)
+}
--- a/handlers/application/administration.go
+++ b/handlers/application/administration.go
@ -8,6 +8,7 @@ import (
 	"io"
 	"net/http"
 	"sort"
+	"sync"
 	"time"

 	"git.coopgo.io/coopgo-apps/parcoursmob/utils/identification"
@ -23,83 +24,95 @@ import (
 	mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
 	"github.com/google/uuid"
 	"github.com/gorilla/mux"
+	"github.com/rs/zerolog/log"
 	"google.golang.org/protobuf/types/known/structpb"
 )

 func (h *ApplicationHandler) Administration(w http.ResponseWriter, r *http.Request) {
-
-	accounts, err := h.services.GetAccounts()
-	if err != nil {
-		fmt.Println(err)
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	beneficiaries, err := h.services.GetBeneficiaries()
-	if err != nil {
-		fmt.Println(err)
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	bookings, err := h.services.GetBookings()
-	if err != nil {
-		fmt.Println(err)
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
+	var (
+		wg                                                                                               sync.WaitGroup
+		accounts, beneficiaries                                                                          []mobilityaccountsstorage.Account
+		bookings                                                                                         []fleetsstorage.Booking
+		accountsErr, beneficiariesErr, bookingsErr, groupsResponseErr, eventsResponseErr, groupsBatchErr error
+		groups                                                                                           = []groupstorage.Group{}
+		responses                                                                                        = []agendastorage.Event{}
+		groupsResponse                                                                                   *groupsmanagement.GetGroupsResponse
+		eventsResponse                                                                                   *agenda.GetEventsResponse
+		groupids                                                                                         = []string{}
+		groupsBatchResponse                                                                              *groupsmanagement.GetGroupsBatchResponse
+	)
+	// Retrieve accounts in a goroutine
+	wg.Add(1)
+	go func() {
+		defer wg.Done()
+		accounts, accountsErr = h.services.GetAccounts()
+	}()
+	// Retrieve beneficiaries in a goroutine
+	wg.Add(1)
+	go func() {
+		defer wg.Done()
+		beneficiaries, beneficiariesErr = h.services.GetBeneficiaries()
+	}()
+	// Retrieve bookings in a goroutine
+	wg.Add(1)
+	go func() {
+		defer wg.Done()
+		bookings, bookingsErr = h.services.GetBookings()
+	}()
+	// Retrieve groupsRequest in a goroutine
+	wg.Add(1)
+	go func() {
+		defer wg.Done()
 		request := &groupsmanagement.GetGroupsRequest{
 			Namespaces: []string{"parcoursmob_organizations"},
 		}
-
-	resp, err := h.services.GRPC.GroupsManagement.GetGroups(context.TODO(), request)
-	if err != nil {
-		fmt.Println(err)
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	var groups = []groupstorage.Group{}
-
-	for _, group := range resp.Groups {
+		groupsResponse, groupsResponseErr = h.services.GRPC.GroupsManagement.GetGroups(context.TODO(), request)
+		for _, group := range groupsResponse.Groups {
 			g := group.ToStorageType()
 			groups = append(groups, g)
 		}
-
 		sort.Sort(sorting.GroupsByName(groups))
-	////////////////////////////////////add event////////////////////////////////////////////
-	rresp, err := h.services.GRPC.Agenda.GetEvents(context.TODO(), &agenda.GetEventsRequest{
+	}()
+	// Retrieve Events in a goroutine
+	wg.Add(1)
+	go func() {
+		defer wg.Done()
+		eventsResponse, eventsResponseErr = h.services.GRPC.Agenda.GetEvents(context.TODO(), &agenda.GetEventsRequest{
 			Namespaces: []string{"parcoursmob_dispositifs"},
 		})
-
-	if err != nil {
-		fmt.Println(err)
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	responses := []agendastorage.Event{}
-
-	groupids := []string{}
-	for _, e := range rresp.Events {
+		for _, e := range eventsResponse.Events {
 			groupids = append(groupids, e.Owners...)
 			responses = append(responses, e.ToStorageType())
 		}
-
 		sort.Sort(sorting.EventsByStartdate(responses))
-
-	groupsresp, err := h.services.GRPC.GroupsManagement.GetGroupsBatch(context.TODO(), &groupsmanagement.GetGroupsBatchRequest{
+	}()
+	wg.Add(1)
+	// Retrieve groupsBatch in a goroutine
+	go func() {
+		defer wg.Done()
+		groupsBatchResponse, groupsBatchErr = h.services.GRPC.GroupsManagement.GetGroupsBatch(context.TODO(), &groupsmanagement.GetGroupsBatchRequest{
 			Groupids: groupids,
 		})
 		groupps := map[string]any{}
-
-	if err == nil {
-		for _, g := range groupsresp.Groups {
+		if groupsBatchErr == nil {
+			for _, g := range groupsBatchResponse.Groups {
 				groupps[g.Id] = g.ToStorageType()
 			}
 		}
-
+	}()
+	wg.Wait()
+	if accountsErr != nil || beneficiariesErr != nil || bookingsErr != nil || groupsResponseErr != nil || eventsResponseErr != nil {
+		log.Error().
+			Any("accounts error", accountsErr).
+			Any("beneficiaries error", beneficiariesErr).
+			Any("bookings error", bookingsErr).
+			Any("groups response error", groupsResponseErr).
+			Any("events response error", eventsResponseErr).
+			Any("groups batch error", groupsBatchErr).
+			Msg("Error in retrieving administration data")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
 	h.Renderer.Administration(w, r, accounts, beneficiaries, groups, bookings, responses)
 }

@ -109,7 +122,7 @@ func (h *ApplicationHandler) AdministrationCreateGroup(w http.ResponseWriter, r

 		if r.FormValue("name") == "" {

-			fmt.Println("invalid name")
+			log.Error().Str("name", r.FormValue("name")).Msg("Invalid name")
 			w.WriteHeader(http.StatusBadRequest)
 			return
 		}
@ -136,7 +149,7 @@ func (h *ApplicationHandler) AdministrationCreateGroup(w http.ResponseWriter, r

 		data, err := structpb.NewValue(dataMap)
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("Cannot create PB struct from data map")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@ -155,22 +168,23 @@ func (h *ApplicationHandler) AdministrationCreateGroup(w http.ResponseWriter, r
 				Namespace: "parcoursmob_roles",
 			},
 		}
-
+		go func() {
 			_, err = h.services.GRPC.GroupsManagement.AddGroup(context.TODO(), request_organization)
 			if err != nil {
-			fmt.Println(err)
+				log.Error().Err(err).Msg("Issue in Groups management service - AddGroup")
 				w.WriteHeader(http.StatusInternalServerError)
 				return
 			}
-
+		}()
 		// Create the admin role for the organization
+		go func() {
 			_, err = h.services.GRPC.GroupsManagement.AddGroup(context.TODO(), request_role)
 			if err != nil {
-			fmt.Println(err)
+				log.Error().Err(err).Msg("Issue in Groups management service - AddGroup")
 				w.WriteHeader(http.StatusInternalServerError)
 				return
 			}
-
+		}()
 		http.Redirect(w, r, fmt.Sprintf("/app/administration/groups/%s", groupid), http.StatusFound)
 		return
 	}
@ -187,14 +201,14 @@ func (h *ApplicationHandler) AdministrationGroupDisplay(w http.ResponseWriter, r

 	resp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), request)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("Issue in Groups management service - GetGroup")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}

 	groupmembers, admins, err := h.groupmembers(groupid)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("inssue retrieving group members")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -205,41 +219,40 @@ func (h *ApplicationHandler) AdministrationGroupDisplay(w http.ResponseWriter, r
 func (h *ApplicationHandler) AdministrationGroupInviteAdmin(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 	groupid := vars["groupid"]
-
-	groupresp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), &groupsmanagement.GetGroupRequest{
+	var (
+		groupresp   *groupsmanagement.GetGroupResponse
+		accountresp *accounts.GetAccountUsernameResponse
+		err         error
+	)
+	groupresp, err = h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), &groupsmanagement.GetGroupRequest{
 		Id:        groupid,
 		Namespace: "parcoursmob_organizations",
 	})
-
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("Issue in Groups management service - GetGroup")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
-
 	r.ParseForm()

-	accountresp, err := h.services.GRPC.MobilityAccounts.GetAccountUsername(context.TODO(), &accounts.GetAccountUsernameRequest{
+	accountresp, err = h.services.GRPC.MobilityAccounts.GetAccountUsername(context.TODO(), &accounts.GetAccountUsernameRequest{
 		Username:  r.FormValue("username"),
 		Namespace: "parcoursmob",
 	})
-
 	if err == nil {
+		log.Print("account exists")
 		// Account already exists : adding the existing account to admin list
 		account := accountresp.Account.ToStorageType()
-		account.Data["groups"] = append(account.Data["groups"].([]any), groupid, groupid)
+		// account.Data["groups"] = append(account.Data["groups"].([]any), groupid, groupid)
 		account.Data["groups"] = append(account.Data["groups"].([]any), groupid, groupid+":admin")

 		as, _ := accounts.AccountFromStorageType(&account)

-		_, err = h.services.GRPC.MobilityAccounts.UpdateData(
-			context.TODO(),
-			&accounts.UpdateDataRequest{
-				Account: as,
-			},
-		)
-
-		fmt.Println(err)
+		if _, err = h.services.GRPC.MobilityAccounts.UpdateData(context.TODO(), &accounts.UpdateDataRequest{Account: as}); err != nil {
+			log.Error().Err(err).Msg("could not set groups to user account")
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}

 		data := map[string]any{
 			"group":   groupresp.Group.ToStorageType().Data["name"],
@ -247,11 +260,9 @@ func (h *ApplicationHandler) AdministrationGroupInviteAdmin(w http.ResponseWrite
 		}

 		if err := h.emailing.Send("onboarding.existing_administrator", r.FormValue("username"), data); err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("Cannot send email")
 		}

-		http.Redirect(w, r, fmt.Sprintf("/app/administration/groups/%s", groupid), http.StatusFound)
-		return
 	} else {
 		// Onboard now administrator
 		onboarding := map[string]any{
@ -262,7 +273,7 @@ func (h *ApplicationHandler) AdministrationGroupInviteAdmin(w http.ResponseWrite

 		b := make([]byte, 16)
 		if _, err := io.ReadFull(rand.Reader, b); err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("Issue creating random bytes")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@ -281,7 +292,7 @@ func (h *ApplicationHandler) AdministrationGroupInviteAdmin(w http.ResponseWrite
 		}

 		if err := h.emailing.Send("onboarding.new_administrator", r.FormValue("username"), data); err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("Cannot send email")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@ -293,27 +304,17 @@ func (h *ApplicationHandler) AdministrationGroupInviteAdmin(w http.ResponseWrite
 func (h *ApplicationHandler) AdministrationGroupInviteMember(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 	groupid := vars["groupid"]
-
-	groupresp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), &groupsmanagement.GetGroupRequest{
-		Id:        groupid,
-		Namespace: "parcoursmob_organizations",
-	})
-
+	group, err := h.services.GetGroup(groupid)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("Issue in Groups management service - GetGroup")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
-
-	group := groupresp.Group.ToStorageType()
-
 	r.ParseForm()
-
 	accountresp, err := h.services.GRPC.MobilityAccounts.GetAccountUsername(context.TODO(), &accounts.GetAccountUsernameRequest{
 		Username:  r.FormValue("username"),
 		Namespace: "parcoursmob",
 	})
-
 	if err == nil {
 		account := accountresp.Account.ToStorageType()
 		account.Data["groups"] = append(account.Data["groups"].([]any), group.ID)
@ -326,22 +327,17 @@ func (h *ApplicationHandler) AdministrationGroupInviteMember(w http.ResponseWrit
 				Account: as,
 			},
 		)
-
-		fmt.Println(err)
-
 		data := map[string]any{
 			"group":   group.Data["name"],
 			"baseUrl": h.config.GetString("base_url"),
 		}

 		if err := h.emailing.Send("onboarding.existing_member", r.FormValue("username"), data); err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("error sending email onboarding.existing_member")
 		}

-		http.Redirect(w, r, "/app/group/settings", http.StatusFound)
-		return
 	} else {
-		// Onboard now administrator
+		// Onboard new administrator
 		onboarding := map[string]any{
 			"username": r.FormValue("username"),
 			"group":    group.ID,
@ -350,14 +346,12 @@ func (h *ApplicationHandler) AdministrationGroupInviteMember(w http.ResponseWrit

 		b := make([]byte, 16)
 		if _, err := io.ReadFull(rand.Reader, b); err != nil {
-			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
 		key := base64.RawURLEncoding.EncodeToString(b)

 		h.cache.PutWithTTL("onboarding/"+key, onboarding, 168*time.Hour) // 1 week TTL
-
 		data := map[string]any{
 			"group":   group.Data["name"],
 			"key":     key,
@ -365,14 +359,12 @@ func (h *ApplicationHandler) AdministrationGroupInviteMember(w http.ResponseWrit
 		}

 		if err := h.emailing.Send("onboarding.new_member", r.FormValue("username"), data); err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("error sending email onboarding.new_member")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
 	}
-
 	http.Redirect(w, r, "/app/administration/groups/"+group.ID, http.StatusFound)
-	return
 }

 func filteVehicle(r *http.Request, v *fleets.Vehicle) bool {
@ -393,7 +385,6 @@ func filteVehicle(r *http.Request, v *fleets.Vehicle) bool {
 }

 func (h ApplicationHandler) AdminStatVehicles(w http.ResponseWriter, r *http.Request) {
-
 	bookings := []fleetsstorage.Booking{}
 	administrators := []string{}
 	reequest := &fleets.GetVehiclesRequest{
@ -401,7 +392,7 @@ func (h ApplicationHandler) AdminStatVehicles(w http.ResponseWriter, r *http.Req
 	}
 	reesp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), reequest)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("Issue in Fleets service - GetVehicles")
 		w.WriteHeader(http.StatusInternalServerError)
 	}

@ -439,7 +430,7 @@ func (h ApplicationHandler) AdminStatVehicles(w http.ResponseWriter, r *http.Req
 			Groupids: administrators,
 		})
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("Issue in Groups management service - GetGroupsBatch")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@ -455,7 +446,6 @@ func (h ApplicationHandler) AdminStatVehicles(w http.ResponseWriter, r *http.Req
 }

 func (h ApplicationHandler) AdminStatBookings(w http.ResponseWriter, r *http.Request) {
-
 	vehicles := map[string]fleetsstorage.Vehicle{}
 	bookings := []fleetsstorage.Booking{}

@ -464,7 +454,7 @@ func (h ApplicationHandler) AdminStatBookings(w http.ResponseWriter, r *http.Req
 	}
 	reesp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), reequest)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("Issue in Fleets service - GetVehicles")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -490,7 +480,7 @@ func (h ApplicationHandler) AdminStatBookings(w http.ResponseWriter, r *http.Req
 		Namespaces: []string{"parcoursmob_organizations"},
 	})
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("Issue in Groups management service - GetGroups")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -503,7 +493,7 @@ func (h ApplicationHandler) AdminStatBookings(w http.ResponseWriter, r *http.Req
 		Accountids: beneficiaries_ids,
 	})
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("Issue in Mobility accounts service - GetAccountsBatch")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -532,7 +522,7 @@ func (h *ApplicationHandler) groupmembers(groupid string) (groupmembers []mobili
 	members, err := h.members()
 	if err != nil {
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("Cannot get members")
 			return nil, nil, err
 		}
 	}
@ -558,7 +548,7 @@ func (h *ApplicationHandler) groupmembers(groupid string) (groupmembers []mobili
 func (h ApplicationHandler) AdminStatBeneficaires(w http.ResponseWriter, r *http.Request) {
 	beneficiaries, err := h.services.GetBeneficiaries()
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("Cannot get beneficiaries")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -571,9 +561,8 @@ func (h ApplicationHandler) AdminStatEvents(w http.ResponseWriter, r *http.Reque
 	resp, err := h.services.GRPC.Agenda.GetEvents(context.TODO(), &agenda.GetEventsRequest{
 		Namespaces: []string{"parcoursmob_dispositifs"},
 	})
-
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("Issue in Agenda service - GetEvents")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
--- a/handlers/application/agenda.go
+++ b/handlers/application/agenda.go
@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"io"
 	"net/http"
 	"sort"
 	"strconv"
@ -13,12 +14,15 @@ import (
 	formvalidators "git.coopgo.io/coopgo-apps/parcoursmob/utils/form-validators"
 	"git.coopgo.io/coopgo-apps/parcoursmob/utils/identification"
 	"git.coopgo.io/coopgo-apps/parcoursmob/utils/sorting"
+	filestorage "git.coopgo.io/coopgo-apps/parcoursmob/utils/storage"
 	agenda "git.coopgo.io/coopgo-platform/agenda/grpcapi"
 	agendastorage "git.coopgo.io/coopgo-platform/agenda/storage"
 	groupsmanagement "git.coopgo.io/coopgo-platform/groups-management/grpcapi"
 	"git.coopgo.io/coopgo-platform/groups-management/storage"
 	mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
+	"github.com/google/uuid"
 	"github.com/gorilla/mux"
+	"github.com/rs/zerolog/log"
 	"google.golang.org/protobuf/types/known/structpb"
 	"google.golang.org/protobuf/types/known/timestamppb"
 )
@ -43,7 +47,7 @@ func (h *ApplicationHandler) AgendaHome(w http.ResponseWriter, r *http.Request)
 	})

 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -78,7 +82,7 @@ func (h *ApplicationHandler) AgendaHistory(w http.ResponseWriter, r *http.Reques
 	})

 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -119,11 +123,13 @@ func (h *ApplicationHandler) AgendaCreateEvent(w http.ResponseWriter, r *http.Re

 		eventForm, err := parseEventsForm(r)
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusBadRequest)
 			return
 		}
 		
+		log.Debug().Any("eventFrom", eventForm).Msg("Form data submitted to create event")
+
 		data, _ := structpb.NewStruct(map[string]any{
 			"address": eventForm.Address,
 		})
@ -147,17 +153,52 @@ func (h *ApplicationHandler) AgendaCreateEvent(w http.ResponseWriter, r *http.Re
 		}

 		resp, err := h.services.GRPC.Agenda.CreateEvent(context.TODO(), request)
-
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}

+		contentType := r.Header.Get("Content-Type")
+		if strings.HasPrefix(contentType, "multipart/form-data") {
+			err = r.ParseMultipartForm(100 * 1024 * 1024) // 100 MB limit
+			if err != nil {
+				log.Error().Err(err).Msg("Error parsing multipart form")
+				w.WriteHeader(http.StatusBadRequest)
+				return
+			}
+
+			file, header, err := r.FormFile("file-upload")
+			if err == nil {
+				defer file.Close()
+
+				document_type := r.FormValue("file_type")
+				document_name := r.FormValue("file_name")
+
+				fileid := uuid.NewString()
+
+				metadata := map[string]string{
+					"file_type": document_type,
+					"file_name": document_name,
+				}
+
+				if err := h.filestorage.Put(file, filestorage.PREFIX_AGENDA, fmt.Sprintf("%s/%s_%s", resp.Event.Id, fileid, header.Filename), header.Size, metadata); err != nil {
+					log.Error().Err(err).Msg("Error uploading file")
+					w.WriteHeader(http.StatusInternalServerError)
+					return
+				}
+			} else if err != http.ErrMissingFile {
+				log.Error().Err(err).Msg("Error retrieving file")
+				w.WriteHeader(http.StatusInternalServerError)
+				return
+			}
+		}
+
 		http.Redirect(w, r, fmt.Sprintf("/app/agenda/%s", resp.Event.Id), http.StatusFound)
 		return
 	}
-	h.Renderer.AgendaCreateEvent(w, r)
+
+	h.Renderer.AgendaCreateEvent(w, r, h.config.GetStringSlice("modules.agenda.documents_types"), h.config.GetStringMapString("storage.files.file_types"), nil)
 }

 func (h *ApplicationHandler) AgendaDisplayEvent(w http.ResponseWriter, r *http.Request) {
@ -170,7 +211,7 @@ func (h *ApplicationHandler) AgendaDisplayEvent(w http.ResponseWriter, r *http.R

 	resp, err := h.services.GRPC.Agenda.GetEvent(context.TODO(), request)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -181,7 +222,7 @@ func (h *ApplicationHandler) AgendaDisplayEvent(w http.ResponseWriter, r *http.R

 	groupresp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), grouprequest)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -208,7 +249,7 @@ func (h *ApplicationHandler) AgendaDisplayEvent(w http.ResponseWriter, r *http.R

 	g := r.Context().Value(identification.GroupKey)
 	if g == nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -237,19 +278,24 @@ func (h *ApplicationHandler) AgendaDisplayEvent(w http.ResponseWriter, r *http.R
 		}
 	}

-	h.Renderer.AgendaDisplayEvent(w, r, resp.Event.ToStorageType(), groupresp.Group.ToStorageType(), subscribers, accounts)
+	documents := h.filestorage.List(filestorage.PREFIX_AGENDA + "/" + eventid)
+
+	events_file_types := h.config.GetStringSlice("modules.agenda.documents_types")
+	file_types_map := h.config.GetStringMapString("storage.files.file_types")
+
+	h.Renderer.AgendaDisplayEvent(w, r, resp.Event.ToStorageType(), groupresp.Group.ToStorageType(), events_file_types, file_types_map, documents, subscribers, accounts)
 }

 func (h *ApplicationHandler) AgendaSubscribeEvent(w http.ResponseWriter, r *http.Request) {
 	current_group, err := h.currentGroup(r)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 	current_user_token, current_user_claims, err := h.currentUser(r)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -257,7 +303,7 @@ func (h *ApplicationHandler) AgendaSubscribeEvent(w http.ResponseWriter, r *http
 	eventid := vars["eventid"]

 	if err := r.ParseForm(); err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
@ -277,7 +323,7 @@ func (h *ApplicationHandler) AgendaSubscribeEvent(w http.ResponseWriter, r *http
 	}
 	datapb, err := structpb.NewStruct(data)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -290,7 +336,7 @@ func (h *ApplicationHandler) AgendaSubscribeEvent(w http.ResponseWriter, r *http

 	_, err = h.services.GRPC.Agenda.SubscribeEvent(context.TODO(), request)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -366,7 +412,7 @@ func contains(s []*agenda.Subscription, e string) bool {
 	return false
 }

-///////////////////////////////Update Event/////////////////////////////////////////
+// /////////////////////////////Update Event/////////////////////////////////////////
 func (h *ApplicationHandler) AgendaUpdateEvent(w http.ResponseWriter, r *http.Request) {
 	adm := strings.Split(r.URL.Path, "/")
 	eventID := adm[3]
@ -376,7 +422,7 @@ func (h *ApplicationHandler) AgendaUpdateEvent(w http.ResponseWriter, r *http.Re

 	resp, err := h.services.GRPC.Agenda.GetEvent(context.TODO(), request)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -391,7 +437,7 @@ func (h *ApplicationHandler) AgendaUpdateEvent(w http.ResponseWriter, r *http.Re

 		eventForm, err := parseEventsForm(r)
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusBadRequest)
 			return
 		}
@ -422,7 +468,7 @@ func (h *ApplicationHandler) AgendaUpdateEvent(w http.ResponseWriter, r *http.Re
 		resp, err := h.services.GRPC.Agenda.UpdateEvent(context.TODO(), request)

 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@ -443,7 +489,7 @@ func (h *ApplicationHandler) AgendaDeleteEvent(w http.ResponseWriter, r *http.Re

 	resp, err := h.services.GRPC.Agenda.GetEvent(context.TODO(), request)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -473,7 +519,7 @@ func (h *ApplicationHandler) AgendaDeleteEvent(w http.ResponseWriter, r *http.Re
 		_, err := h.services.GRPC.Agenda.UpdateEvent(context.TODO(), request)

 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@ -484,7 +530,7 @@ func (h *ApplicationHandler) AgendaDeleteEvent(w http.ResponseWriter, r *http.Re
 	h.Renderer.AgendaDeleteEvent(w, r, resp.Event.ToStorageType())
 }

-///////////////////////////Delete subscriber///////////////////////////////
+// /////////////////////////Delete subscriber///////////////////////////////
 func (h *ApplicationHandler) AgendaDeleteSubscribeEvent(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 	eventId := vars["eventid"]
@ -500,7 +546,7 @@ func (h *ApplicationHandler) AgendaDeleteSubscribeEvent(w http.ResponseWriter, r

 	resp, err := h.services.GRPC.Agenda.GetEvent(context.TODO(), request)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -522,14 +568,14 @@ func (h *ApplicationHandler) AgendaDeleteSubscribeEvent(w http.ResponseWriter, r

 	current_group, err := h.currentGroup(r)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}

 	current_user_token, current_user_claims, err := h.currentUser(r)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -562,7 +608,7 @@ func (h *ApplicationHandler) AgendaDeleteSubscribeEvent(w http.ResponseWriter, r

 	datapb, err := structpb.NewStruct(data)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -583,18 +629,18 @@ func (h *ApplicationHandler) AgendaDeleteSubscribeEvent(w http.ResponseWriter, r

 		// récupérer l'adresse mail de l'utilisateur qui a créé l'événement
 		mail := s_b_email
-		fmt.Println(mail)
+		log.Debug().Str("mail", mail).Msg("Email content")

 		_, err := h.services.GRPC.Agenda.DeleteSubscription(context.TODO(), request)

 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}

 		if err := h.emailing.Send("delete_subscriber.request", mail, data); err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@ -605,7 +651,7 @@ func (h *ApplicationHandler) AgendaDeleteSubscribeEvent(w http.ResponseWriter, r
 	h.Renderer.AgendaDeleteSubscribeEvent(w, r, eventId)
 }

-////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////
 // /////////////////////History Event////////////////////////
 func (h *ApplicationHandler) AgendaHistoryEvent(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
@ -616,7 +662,7 @@ func (h *ApplicationHandler) AgendaHistoryEvent(w http.ResponseWriter, r *http.R

 	resp, err := h.services.GRPC.Agenda.GetEvent(context.TODO(), request)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -627,7 +673,7 @@ func (h *ApplicationHandler) AgendaHistoryEvent(w http.ResponseWriter, r *http.R

 	groupresp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), grouprequest)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -654,7 +700,6 @@ func (h *ApplicationHandler) AgendaHistoryEvent(w http.ResponseWriter, r *http.R

 	g := r.Context().Value(identification.GroupKey)
 	if g == nil {
-		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -685,3 +730,61 @@ func (h *ApplicationHandler) AgendaHistoryEvent(w http.ResponseWriter, r *http.R

 	h.Renderer.AgendaHistoryEvent(w, r, resp.Event.ToStorageType(), groupresp.Group.ToStorageType(), subscribers, accounts)
 }
+
+// //// ADD DOCUMENTS //////
+func (h *ApplicationHandler) EventDocuments(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	eventID := vars["eventid"]
+
+	//r.ParseForm()
+	r.ParseMultipartForm(100 * 1024 * 1024)
+
+	document_type := r.FormValue("type")
+	document_name := r.FormValue("name")
+
+	file, header, err := r.FormFile("file-upload")
+	if err != nil {
+		log.Error().Err(err).Msg("")
+		return
+	}
+	defer file.Close()
+
+	fileid := uuid.NewString()
+
+	metadata := map[string]string{
+		"type": document_type,
+		"name": document_name,
+	}
+
+	if err := h.filestorage.Put(file, filestorage.PREFIX_AGENDA, fmt.Sprintf("%s/%s_%s", eventID, fileid, header.Filename), header.Size, metadata); err != nil {
+		log.Error().Err(err).Msg("")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	http.Redirect(w, r, fmt.Sprintf("/app/agenda/%s", eventID), http.StatusFound)
+
+}
+
+func (h *ApplicationHandler) EventDocumentDownload(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	eventID := vars["eventid"]
+	document := vars["document"]
+
+	file, info, err := h.filestorage.Get(filestorage.PREFIX_AGENDA, fmt.Sprintf("%s/%s", eventID, document))
+	if err != nil {
+		log.Error().Err(err).Msg("")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	w.Header().Set("Content-Type", info.ContentType)
+	if _, err = io.Copy(w, file); err != nil {
+		log.Error().Err(err).Msg("")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	http.Redirect(w, r, fmt.Sprintf("/app/agenda/%s", eventID), http.StatusFound)
+
+}
--- a/handlers/application/application.go
+++ b/handlers/application/application.go
@ -10,7 +10,7 @@ import (
 	cache "git.coopgo.io/coopgo-apps/parcoursmob/utils/storage"
 	"git.coopgo.io/coopgo-platform/emailing"
 	"git.coopgo.io/coopgo-platform/groups-management/storage"
-	"github.com/coreos/go-oidc"
+	"github.com/coreos/go-oidc/v3/oidc"
 	"github.com/spf13/viper"
 )

@ -25,7 +25,7 @@ type ApplicationHandler struct {

 func NewApplicationHandler(cfg *viper.Viper, svc *services.ServicesHandler, cache cache.CacheHandler, filestorage cache.FileStorage, emailing *emailing.Mailer) (*ApplicationHandler, error) {
 	templates_root := cfg.GetString("templates.root")
-	renderer := renderer.NewRenderer(cfg, templates_root)
+	renderer := renderer.NewRenderer(cfg, templates_root, filestorage)
 	return &ApplicationHandler{
 		config:      cfg,
 		Renderer:    renderer,
--- a/handlers/application/beneficiaries.go
+++ b/handlers/application/beneficiaries.go
@ -8,7 +8,6 @@ import (
 	"fmt"
 	"image/png"
 	"io"
-	"log"
 	"net/http"
 	"sort"
 	"strconv"
@ -20,14 +19,22 @@ import (
 	profilepictures "git.coopgo.io/coopgo-apps/parcoursmob/utils/profile-pictures"
 	"git.coopgo.io/coopgo-apps/parcoursmob/utils/sorting"
 	filestorage "git.coopgo.io/coopgo-apps/parcoursmob/utils/storage"
+	agenda "git.coopgo.io/coopgo-platform/agenda/grpcapi"
+	agendastorage "git.coopgo.io/coopgo-platform/agenda/storage"
+	diagsstorage "git.coopgo.io/coopgo-platform/diags/storage"
 	fleets "git.coopgo.io/coopgo-platform/fleets/grpcapi"
+	fleetsstorage "git.coopgo.io/coopgo-platform/fleets/storage"
 	groupsmanagement "git.coopgo.io/coopgo-platform/groups-management/grpcapi"
 	"git.coopgo.io/coopgo-platform/groups-management/storage"
 	mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
 	mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
+	"git.coopgo.io/coopgo-platform/solidarity-transport/servers/grpc/proto/gen"
+	"git.coopgo.io/coopgo-platform/solidarity-transport/servers/grpc/transformers"
 	"github.com/google/uuid"
 	"github.com/gorilla/mux"
+	"github.com/rs/zerolog/log"
 	"google.golang.org/protobuf/types/known/structpb"
+	"google.golang.org/protobuf/types/known/timestamppb"
 )

 type BeneficiariesForm struct {
@ -39,13 +46,74 @@ type BeneficiariesForm struct {
 	FileNumber      string     `json:"file_number"`
 	Address         any        `json:"address,omitempty"`
 	Gender          string     `json:"gender"`
+	OtherProperties any        `json:"other_properties,omitempty"`
+}
+
+type Event_Beneficiary interface {
+	Name() string
+	Date() time.Time
+	DateEnd() time.Time
+	Type() string
+	Db() string
+	ID() string
+	Icons() string
+	Status() int
+}
+
+type Event struct {
+	IDVal      string
+	NameVal    string
+	DateVal    time.Time
+	DateEndVal time.Time
+	TypeVal    string
+	DbVal      string
+	Deleted    bool
+	IconSet    string
+	StatusVal  int
+}
+
+func (e Event) Name() string {
+	return e.NameVal
+}
+
+func (e Event) Date() time.Time {
+	return e.DateVal
+}
+
+func (e Event) DateEnd() time.Time {
+	return e.DateEndVal
+}
+
+func (e Event) Type() string {
+	return e.TypeVal
+}
+
+func (e Event) ID() string {
+	return e.IDVal
+}
+
+func (e Event) Db() string {
+	return e.DbVal
+}
+
+func (e Event) Icons() string {
+	return e.IconSet
+}
+
+func (e Event) Status() int {
+	return e.StatusVal
+}
+
+func sortByDate(events []Event_Beneficiary) {
+	sort.Slice(events, func(i, j int) bool {
+		return events[i].Date().After(events[j].Date())
+	})
 }

 func (h *ApplicationHandler) BeneficiariesList(w http.ResponseWriter, r *http.Request) {
-
 	accounts, err := h.beneficiaries(r)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
@ -60,7 +128,7 @@ func (h *ApplicationHandler) BeneficiariesList(w http.ResponseWriter, r *http.Re
 func (h *ApplicationHandler) BeneficiaryCreate(w http.ResponseWriter, r *http.Request) {
 	g := r.Context().Value(identification.GroupKey)
 	if g == nil {
-		fmt.Println("Create beneficiary : could not find group")
+		log.Error().Msg("Create beneficiary : could not find group")
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
@ -71,14 +139,14 @@ func (h *ApplicationHandler) BeneficiaryCreate(w http.ResponseWriter, r *http.Re

 		dataMap, err := parseBeneficiariesForm(r)
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusBadRequest)
 			return
 		}

 		data, err := structpb.NewValue(dataMap)
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@ -91,9 +159,8 @@ func (h *ApplicationHandler) BeneficiaryCreate(w http.ResponseWriter, r *http.Re
 		}

 		resp, err := h.services.GRPC.MobilityAccounts.Register(context.TODO(), request)
-
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@ -104,9 +171,8 @@ func (h *ApplicationHandler) BeneficiaryCreate(w http.ResponseWriter, r *http.Re
 		}

 		_, err = h.services.GRPC.GroupsManagement.Subscribe(context.TODO(), subscribe)
-
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@ -130,27 +196,169 @@ func (h *ApplicationHandler) BeneficiaryDisplay(w http.ResponseWriter, r *http.R

 	resp, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), request)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("cannot retrieve account")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}

+	subscriptionrequest := &agenda.GetSubscriptionByUserRequest{
+		Subscriber: beneficiaryID,
+	}
+
+	subcriptionresp, err := h.services.GRPC.Agenda.GetSubscriptionByUser(context.TODO(), subscriptionrequest)
+	if err != nil {
+		log.Error().Err(err).Msg("")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	events := []agendastorage.Event{}
+	currentTime := time.Now().Truncate(24 * time.Hour)
+
+	for _, e := range subcriptionresp.Subscription {
+		eventresquest := &agenda.GetEventRequest{
+			Id: e.Eventid,
+		}
+		eventresp, err := h.services.GRPC.Agenda.GetEvent(context.TODO(), eventresquest)
+		if err != nil {
+			log.Error().Err(err).Msg("")
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+		events = append(events, eventresp.Event.ToStorageType())
+	}
+
+	sort.Sort(sorting.EventsByStartdate(events))
+
 	bookingsrequest := &fleets.GetDriverBookingsRequest{
 		Driver: beneficiaryID,
 	}
 	bookingsresp, err := h.services.GRPC.Fleets.GetDriverBookings(context.TODO(), bookingsrequest)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}

-	bookings := []any{}
+	bookings := []fleetsstorage.Booking{}

 	for _, b := range bookingsresp.Bookings {
 		bookings = append(bookings, b.ToStorageType())
 	}

+	var events_list []Event_Beneficiary
+	var status_event int
+
+	for _, e := range events {
+
+		if e.Startdate.After(currentTime) {
+			status_event = 1
+		} else if e.Startdate.Before(currentTime) && e.Enddate.After(currentTime) || e.Enddate.Equal(currentTime) {
+			status_event = 2
+		} else {
+			status_event = 3
+		}
+
+		event := Event{
+			NameVal:    e.Name,
+			DateVal:    e.Startdate,
+			DateEndVal: e.Enddate,
+			TypeVal:    e.Type,
+			IDVal:      e.ID,
+			DbVal:      "/app/agenda/",
+			IconSet:    "calendar",
+			StatusVal:  status_event,
+		}
+
+		events_list = append(events_list, event)
+	}
+
+	var status_booking int
+	for _, b := range bookings {
+		if b.Enddate.After(currentTime) || b.Enddate.Equal(currentTime) {
+			GetVehiculeRequest := &fleets.GetVehicleRequest{
+				Vehicleid: b.Vehicleid,
+			}
+
+			GetVehiculeResp, err := h.services.GRPC.Fleets.GetVehicle(context.Background(), GetVehiculeRequest)
+			if err != nil {
+				log.Error().Err(err).Msg("")
+				w.WriteHeader(http.StatusInternalServerError)
+				return
+			}
+
+			if b.Startdate.After(currentTime) {
+				status_booking = 1
+			} else if b.Startdate.Before(currentTime) && b.Enddate.After(currentTime) || b.Enddate.Equal(currentTime) {
+				status_booking = 2
+			} else {
+				status_booking = 3
+			}
+
+			event := Event{
+				NameVal:    GetVehiculeResp.Vehicle.ToStorageType().Data["name"].(string),
+				DateVal:    b.Startdate,
+				DateEndVal: b.Enddate,
+				TypeVal:    "Réservation de véhicule",
+				IDVal:      b.ID,
+				DbVal:      "/app/vehicles-management/bookings/",
+				IconSet:    "vehicle",
+				StatusVal:  status_booking,
+			}
+
+			events_list = append(events_list, event)
+		}
+	}
+	solidarity, err := h.services.GRPC.SolidarityTransport.GetSolidarityTransportBookings(context.Background(), &gen.GetSolidarityTransportBookingsRequest{
+		Passengerid: beneficiaryID,
+		StartDate:   timestamppb.New(time.Now().Add(-36 * 730 * time.Hour)),
+		EndDate:     timestamppb.New(time.Now().Add(12 * 730 * time.Hour)),
+	})
+	solidarityTransportStats := map[string]int64{
+		"count": 0,
+		"km":    0,
+	}
+	for _, s := range solidarity.Bookings {
+		b, _ := transformers.BookingProtoToType(s)
+		event := Event{
+			NameVal:    fmt.Sprintf("%s (%d km)", b.Journey.PassengerDrop.Properties.MustString("label", ""), b.Journey.PassengerDistance),
+			DateVal:    b.Journey.PassengerPickupDate,
+			DateEndVal: b.Journey.PassengerPickupDate,
+			TypeVal:    "Transport solidaire",
+			IDVal:      b.Id,
+			DbVal:      "/app/solidarity-transport/bookings/",
+			IconSet:    "vehicle",
+			StatusVal:  1,
+		}
+
+		events_list = append(events_list, event)
+
+		solidarityTransportStats["count"] = solidarityTransportStats["count"] + 1
+		solidarityTransportStats["km"] = solidarityTransportStats["km"] + b.Journey.PassengerDistance
+
+	}
+	sortByDate(events_list)
+
+	diag := []diagsstorage.Diag{}
+
+	/*diagsrequest := &diags.GetDiagsRequest{
+		Namespaces: []string{"parcoursmob_beneficiaries"},
+	}
+
+	diagsresp, err := h.services.GRPC.Diags.GetDiags(context.TODO(), diagsrequest)
+	if err != nil {
+		log.Error().Err(err).Msg("")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	for _, d := range diagsresp.Diags {
+		diagData := d.Data.AsMap()
+		if beneficiary, ok := diagData["beneficiary"].(string); ok && beneficiary == beneficiaryID {
+			diag = append(diag, d.ToStorageType())
+		}
+	}*/
+
 	groupsrequest := &groupsmanagement.GetGroupsRequest{
 		Namespaces: []string{"parcoursmob_organizations"},
 		Member:     beneficiaryID,
@ -158,7 +366,7 @@ func (h *ApplicationHandler) BeneficiaryDisplay(w http.ResponseWriter, r *http.R

 	groupsresp, err := h.services.GRPC.GroupsManagement.GetGroups(context.TODO(), groupsrequest)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 	}

 	organizations := []any{}
@ -169,7 +377,11 @@ func (h *ApplicationHandler) BeneficiaryDisplay(w http.ResponseWriter, r *http.R
 	beneficiaries_file_types := h.config.GetStringSlice("modules.beneficiaries.documents_types")
 	file_types_map := h.config.GetStringMapString("storage.files.file_types")

-	h.Renderer.BeneficiaryDisplay(w, r, resp.Account.ToStorageType(), bookings, organizations, beneficiaries_file_types, file_types_map, documents)
+	diagsAny := make([]any, len(diag))
+	for i, d := range diag {
+		diagsAny[i] = d
+	}
+	h.Renderer.BeneficiaryDisplay(w, r, resp.Account.ToStorageType(), bookings, organizations, beneficiaries_file_types, file_types_map, documents, events_list, diagsAny, solidarityTransportStats)
 }

 func (h *ApplicationHandler) BeneficiaryUpdate(w http.ResponseWriter, r *http.Request) {
@ -180,14 +392,14 @@ func (h *ApplicationHandler) BeneficiaryUpdate(w http.ResponseWriter, r *http.Re

 		dataMap, err := parseBeneficiariesForm(r)
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusBadRequest)
 			return
 		}

 		data, err := structpb.NewValue(dataMap)
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@ -201,9 +413,8 @@ func (h *ApplicationHandler) BeneficiaryUpdate(w http.ResponseWriter, r *http.Re
 		}

 		resp, err := h.services.GRPC.MobilityAccounts.UpdateData(context.TODO(), request)
-
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@ -219,17 +430,69 @@ func (h *ApplicationHandler) BeneficiaryUpdate(w http.ResponseWriter, r *http.Re

 	resp, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), request)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}

-	//TODO filter namespaces
-	//TODO filter groups
+	// TODO filter namespaces
+	// TODO filter groups

 	h.Renderer.BeneficiaryUpdate(w, r, resp.Account.ToStorageType())
 }

+func (h *ApplicationHandler) BeneficiaryArchive(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	beneficiaryID := vars["beneficiaryid"]
+
+	data, err := structpb.NewValue(map[string]any{
+		"archived": true,
+	})
+
+	request := &mobilityaccounts.UpdateDataRequest{
+		Account: &mobilityaccounts.Account{
+			Id:        beneficiaryID,
+			Namespace: "parcoursmob_beneficiaries",
+			Data:      data.GetStructValue(),
+		},
+	}
+
+	resp, err := h.services.GRPC.MobilityAccounts.UpdateData(context.TODO(), request)
+	if err != nil {
+		log.Error().Err(err).Msg("")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	http.Redirect(w, r, fmt.Sprintf("/app/beneficiaries/%s", resp.Account.Id), http.StatusFound)
+}
+
+func (h *ApplicationHandler) BeneficiaryUnarchive(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	beneficiaryID := vars["beneficiaryid"]
+
+	data, err := structpb.NewValue(map[string]any{
+		"archived": false,
+	})
+
+	request := &mobilityaccounts.UpdateDataRequest{
+		Account: &mobilityaccounts.Account{
+			Id:        beneficiaryID,
+			Namespace: "parcoursmob_beneficiaries",
+			Data:      data.GetStructValue(),
+		},
+	}
+
+	resp, err := h.services.GRPC.MobilityAccounts.UpdateData(context.TODO(), request)
+	if err != nil {
+		log.Error().Err(err).Msg("")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	http.Redirect(w, r, fmt.Sprintf("/app/beneficiaries/%s", resp.Account.Id), http.StatusFound)
+}
+
 func (h *ApplicationHandler) BeneficiaryPicture(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 	beneficiaryID := vars["beneficiaryid"]
@ -240,7 +503,7 @@ func (h *ApplicationHandler) BeneficiaryPicture(w http.ResponseWriter, r *http.R

 	resp, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), request)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -253,13 +516,13 @@ func (h *ApplicationHandler) BeneficiaryPicture(w http.ResponseWriter, r *http.R

 	buffer := new(bytes.Buffer)
 	if err := png.Encode(buffer, picture); err != nil {
-		log.Println("unable to encode image.")
+		log.Error().Err(err).Msg("unable to encode image.")
 	}

 	w.Header().Set("Content-Type", "image/png")
 	w.Header().Set("Content-Length", strconv.Itoa(len(buffer.Bytes())))
 	if _, err := w.Write(buffer.Bytes()); err != nil {
-		log.Println("unable to write image.")
+		log.Error().Err(err).Msg("unable to write image.")
 	}
 }

@ -267,7 +530,7 @@ func (h *ApplicationHandler) BeneficiaryDocuments(w http.ResponseWriter, r *http
 	vars := mux.Vars(r)
 	beneficiaryID := vars["beneficiaryid"]

-	//r.ParseForm()
+	// r.ParseForm()
 	r.ParseMultipartForm(100 * 1024 * 1024)

 	document_type := r.FormValue("type")
@ -275,7 +538,7 @@ func (h *ApplicationHandler) BeneficiaryDocuments(w http.ResponseWriter, r *http

 	file, header, err := r.FormFile("file-upload")
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		return
 	}
 	defer file.Close()
@ -287,14 +550,15 @@ func (h *ApplicationHandler) BeneficiaryDocuments(w http.ResponseWriter, r *http
 		"name": document_name,
 	}

+	log.Debug().Any("metadata", metadata).Msg("Metadata")
+
 	if err := h.filestorage.Put(file, filestorage.PREFIX_BENEFICIARIES, fmt.Sprintf("%s/%s_%s", beneficiaryID, fileid, header.Filename), header.Size, metadata); err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}

 	http.Redirect(w, r, fmt.Sprintf("/app/beneficiaries/%s", beneficiaryID), http.StatusFound)
-
 }

 func (h *ApplicationHandler) BeneficiaryDocumentDownload(w http.ResponseWriter, r *http.Request) {
@ -304,20 +568,19 @@ func (h *ApplicationHandler) BeneficiaryDocumentDownload(w http.ResponseWriter,

 	file, info, err := h.filestorage.Get(filestorage.PREFIX_BENEFICIARIES, fmt.Sprintf("%s/%s", beneficiaryID, document))
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}

 	w.Header().Set("Content-Type", info.ContentType)
 	if _, err = io.Copy(w, file); err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}

-	http.Redirect(w, r, fmt.Sprintf("/app/beneficiaries/%s", beneficiaryID), http.StatusFound)
-
+	// http.Redirect(w, r, fmt.Sprintf("/app/beneficiaries/%s", beneficiaryID), http.StatusFound)
 }

 func filterAccount(r *http.Request, a *mobilityaccounts.Account) bool {
@ -330,11 +593,25 @@ func filterAccount(r *http.Request, a *mobilityaccounts.Account) bool {
 		}
 	}

+	archivedFilter, ok := r.URL.Query()["archived"]
+	if ok && archivedFilter[0] == "true" {
+		if archived, ok := a.Data.AsMap()["archived"].(bool); ok && archived {
+			return true
+		}
+		return false
+	} else {
+		if archived, ok := a.Data.AsMap()["archived"].(bool); ok && archived {
+			return false
+		}
+	}
+
 	return true
 }

+// func BeneficiariesEventList()
+
 func (h *ApplicationHandler) beneficiaries(r *http.Request) ([]mobilityaccountsstorage.Account, error) {
-	var accounts = []mobilityaccountsstorage.Account{}
+	accounts := []mobilityaccountsstorage.Account{}
 	g := r.Context().Value(identification.GroupKey)
 	if g == nil {
 		return accounts, errors.New("no group provided")
@ -348,6 +625,7 @@ func (h *ApplicationHandler) beneficiaries(r *http.Request) ([]mobilityaccountss

 	resp, err := h.services.GRPC.MobilityAccounts.GetAccountsBatch(context.TODO(), request)
 	if err != nil {
+		log.Error().Err(err).Msg("issue in mobilityaccounts call")
 		return accounts, err
 	}

@ -385,6 +663,7 @@ func parseBeneficiariesForm(r *http.Request) (map[string]any, error) {
 		FileNumber:  r.PostFormValue("file_number"),
 		Gender:      r.PostFormValue("gender"),
 	}
+	log.Trace().Any("address", r.PostFormValue("address")).Msg("address")

 	if r.PostFormValue("address") != "" {
 		var a any
@ -393,6 +672,15 @@ func parseBeneficiariesForm(r *http.Request) (map[string]any, error) {
 		formData.Address = a
 	}

+	log.Trace().Any("otther properties", r.PostFormValue("other_properties")).Msg("other propperties ?")
+
+	if r.PostFormValue("other_properties") != "" {
+		var a any
+		json.Unmarshal([]byte(r.PostFormValue("other_properties")), &a)
+
+		formData.OtherProperties = a
+	}
+
 	validate := formvalidators.New()
 	if err := validate.Struct(formData); err != nil {
 		return nil, err
--- a/handlers/application/dashboard.go
+++ b/handlers/application/dashboard.go
@ -5,18 +5,21 @@ import (
 	"fmt"
 	"net/http"
 	"sort"
+	"time"

 	"git.coopgo.io/coopgo-apps/parcoursmob/utils/identification"
 	"git.coopgo.io/coopgo-apps/parcoursmob/utils/sorting"
 	agenda "git.coopgo.io/coopgo-platform/agenda/grpcapi"
 	agendastorage "git.coopgo.io/coopgo-platform/agenda/storage"
+	fleets "git.coopgo.io/coopgo-platform/fleets/grpcapi"
+	fleetstorage "git.coopgo.io/coopgo-platform/fleets/storage"
 	"git.coopgo.io/coopgo-platform/groups-management/storage"
 	mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
+	"github.com/rs/zerolog/log"
 	"google.golang.org/protobuf/types/known/timestamppb"
 )

 func (h *ApplicationHandler) Dashboard(w http.ResponseWriter, r *http.Request) {
-
 	g := r.Context().Value(identification.GroupKey)
 	if g == nil {
 		w.WriteHeader(http.StatusBadRequest)
@ -31,12 +34,12 @@ func (h *ApplicationHandler) Dashboard(w http.ResponseWriter, r *http.Request) {

 	resp, err := h.services.GRPC.MobilityAccounts.GetAccountsBatch(context.TODO(), request)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}

-	var accounts = []any{}
+	accounts := []any{}

 	// We only display the 10 last here
 	count := len(resp.Accounts)
@ -55,7 +58,7 @@ func (h *ApplicationHandler) Dashboard(w http.ResponseWriter, r *http.Request) {

 	members, _, err := h.groupmembers(group.ID)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -69,12 +72,27 @@ func (h *ApplicationHandler) Dashboard(w http.ResponseWriter, r *http.Request) {
 		Mindate:    timestamppb.Now(),
 	})

+	if err == nil {
 		for _, e := range eventsresp.Events {
 			events = append(events, e.ToStorageType())
 		}
+	}

 	sort.Sort(sorting.EventsByStartdate(events))

-	h.Renderer.Dashboard(w, r, accounts, count, count_members, events)
+	bookings := []fleetstorage.Booking{}

+	bookingsresp, err := h.services.GRPC.Fleets.GetBookings(context.TODO(), &fleets.GetBookingsRequest{
+		Namespaces: []string{"parcoursmob_dispositifs"},
+	})
+
+	if err == nil {
+		for _, b := range bookingsresp.Bookings {
+			if b.Enddate.AsTime().After(time.Now()) {
+				bookings = append(bookings, b.ToStorageType())
+			}
+		}
+	}
+
+	h.Renderer.Dashboard(w, r, accounts, count, count_members, events, bookings)
 }
--- a/handlers/application/diags.go
+++ b/handlers/application/diags.go
@ -0,0 +1,642 @@
+package application
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+
+	// "io"
+	"net/http"
+	// "strconv"
+	"strings"
+	"time"
+
+	"git.coopgo.io/coopgo-apps/parcoursmob/services"
+	"git.coopgo.io/coopgo-apps/parcoursmob/utils/identification"
+	filestorage "git.coopgo.io/coopgo-apps/parcoursmob/utils/storage"
+
+	// filestorage "git.coopgo.io/coopgo-apps/parcoursmob/utils/storage"
+	diags "git.coopgo.io/coopgo-platform/diags/grpcapi"
+	diagsstorage "git.coopgo.io/coopgo-platform/diags/storage"
+
+	groupsmanagement "git.coopgo.io/coopgo-platform/groups-management/grpcapi"
+	"git.coopgo.io/coopgo-platform/groups-management/storage"
+	// mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
+	// "github.com/google/uuid"
+	"github.com/google/uuid"
+	"github.com/gorilla/mux"
+	"github.com/rs/zerolog/log"
+	"google.golang.org/protobuf/types/known/structpb"
+	"google.golang.org/protobuf/types/known/timestamppb"
+)
+
+type DiagsForm struct {
+	Name            string          `json:"name" validate:"required"`
+	Namespace       string          `json:"namespace" validate:"required"`
+	JsonSchema      string          `json:"json_schema"`
+	UiSchema        string          `json:"ui_schema"`
+	Data            map[string]any  `json:"data"`
+	Deleted         bool            `json:"deleted"`
+	Diagdate		*time.Time      `json:"diagdate"`
+	Owners		  	[]string        `json:"owners"`
+}
+
+func (h *ApplicationHandler) DiagsHome(w http.ResponseWriter, r *http.Request) {
+	groupID := r.Context().Value(identification.GroupKey).(storage.Group).ID
+
+	resp, err := h.services.GRPC.Diags.GetDiags(context.TODO(), &diags.GetDiagsRequest{
+		Namespaces: []string{"parcoursmob_beneficiaries", "parcoursmob_diagnostiques", "parcoursmob_vehicles", "parcoursmob_bookings"},
+	})
+
+	if err != nil {
+		log.Error().Err(err).Msg("")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	responses := []diagsstorage.Diag{}
+
+	groupids := []string{}
+	for _, e := range resp.Diags {
+		groupids = append(groupids, e.Owners...)
+		responses = append(responses, e.ToStorageType())
+	}
+
+	groupsresp, err := h.services.GRPC.GroupsManagement.GetGroupsBatch(context.TODO(), &groupsmanagement.GetGroupsBatchRequest{
+		Groupids: groupids,
+	})
+	groups := map[string]any{}
+
+	if err == nil {
+		for _, g := range groupsresp.Groups {
+			groups[g.Id] = g.ToStorageType()
+		}
+	}
+
+	filteredDiags := []diagsstorage.Diag{}
+    for _, diag := range responses {
+		for _, owner := range diag.Owners {
+			if string(owner) == groupID {
+				filteredDiags = append(filteredDiags, diag)
+				log.Debug().Msgf("Diag %s added to filtered list", diag.ID)
+				break
+			}
+		}
+        }
+
+	h.Renderer.DiagsHome(w, r, filteredDiags, groups)
+}
+
+func (h *ApplicationHandler) DiagsHistory(w http.ResponseWriter, r *http.Request) {
+	resp, err := h.services.GRPC.Diags.GetDiags(context.TODO(), &diags.GetDiagsRequest{
+		Namespaces: []string{"parcoursmob_beneficiaries", "parcoursmob_diagnostiques", "parcoursmob_vehicles", "parcoursmob_bookings"},
+	})
+
+	if err != nil {
+		log.Error().Err(err).Msg("")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	responses := []diagsstorage.Diag{}
+
+	for _, e := range resp.Diags {
+		if e.Deleted {
+			responses = append(responses, e.ToStorageType())
+		}
+	}
+
+	h.Renderer.DiagsHistory(w, r, responses)
+}
+
+func (h *ApplicationHandler) BeneficiariesCreateDiag(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	beneficiaryID := vars["beneficiaryid"]
+
+	if h.services == nil || (h.services.GRPC == services.GRPCServices{}) || h.services.GRPC.Diags == nil {
+		log.Error().Msg("Diags service is not initialized")
+		http.Error(w, "Internal server error", http.StatusInternalServerError)
+		return
+	}
+	
+
+	if r.Method == http.MethodPost {
+		g := r.Context().Value(identification.GroupKey)
+		if g == nil {
+			http.Error(w, "Missing group information", http.StatusBadRequest)
+			return
+		}
+
+		group := g.(storage.Group)
+
+		diagForm, err := parseDiagsForm(r)
+		if err != nil {
+			log.Error().Err(err).Msg("Invalid form data")
+			http.Error(w, err.Error(), http.StatusBadRequest)
+			return
+		}
+
+		data, err := structpb.NewStruct(map[string]any{
+			"beneficiary": beneficiaryID,
+		})
+		if err != nil {
+			log.Error().Err(err).Msg("Failed to create protobuf struct")
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		request := &diags.CreateDiagRequest{
+			Diag: &diags.Diag{
+				Name:       diagForm.Name,
+				Namespace:  diagForm.Namespace,
+				JsonSchema: diagForm.JsonSchema,
+				UiSchema:   diagForm.UiSchema,
+				Data:       data,
+				Deleted:    diagForm.Deleted,
+				Diagdate:   timestamppb.New(time.Now()),
+				Owners:	 	[]string{group.ID},
+			},
+		}
+
+		resp, err := h.services.GRPC.Diags.CreateDiag(context.TODO(), request)
+		if err != nil {
+			log.Error().Err(err).Msg("Failed to create diagnostic")
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		contentType := r.Header.Get("Content-Type")
+		if strings.HasPrefix(contentType, "multipart/form-data") {
+			err = r.ParseMultipartForm(100 * 1024 * 1024) // 100 MB limit
+			if err != nil {
+				log.Error().Err(err).Msg("Error parsing multipart form")
+				w.WriteHeader(http.StatusBadRequest)
+				return
+			}
+
+			file, header, err := r.FormFile("file-upload")
+			if err == nil {
+				defer file.Close()
+
+				document_type := r.FormValue("file_type")
+				document_name := r.FormValue("file_name")
+
+				fileid := uuid.NewString()
+
+				metadata := map[string]string{
+					"file_type": document_type,
+					"file_name": document_name,
+				}
+
+				if err := h.filestorage.Put(file, filestorage.PREFIX_DIAGS, fmt.Sprintf("%s/%s_%s", resp.Diag.Id, fileid, header.Filename), header.Size, metadata); err != nil {
+					log.Error().Err(err).Msg("Error uploading file")
+					w.WriteHeader(http.StatusInternalServerError)
+					return
+				}
+			} else if err != http.ErrMissingFile {
+				log.Error().Err(err).Msg("Error retrieving file")
+				w.WriteHeader(http.StatusInternalServerError)
+				return
+			}
+		}
+		
+		http.Redirect(w, r, fmt.Sprintf("/app/diags/%s", resp.Diag.Id), http.StatusFound)
+		return
+	}
+
+	h.Renderer.BeneficiariesCreateDiag(w, r, beneficiaryID, h.config.GetStringSlice("modules.diags.documents_types"), h.config.GetStringMapString("storage.files.file_types"), nil)
+}
+
+func (h *ApplicationHandler) VehiclesCreateDiag(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	vehicleID := vars["vehicleid"]
+
+	if h.services == nil || (h.services.GRPC == services.GRPCServices{}) || h.services.GRPC.Diags == nil {
+		log.Error().Msg("Diags service is not initialized")
+		http.Error(w, "Internal server error", http.StatusInternalServerError)
+		return
+	}
+	
+
+	if r.Method == http.MethodPost {
+		g := r.Context().Value(identification.GroupKey)
+		if g == nil {
+			http.Error(w, "Missing group information", http.StatusBadRequest)
+			return
+		}
+
+		diagForm, err := parseDiagsForm(r)
+		if err != nil {
+			log.Error().Err(err).Msg("Invalid form data")
+			http.Error(w, err.Error(), http.StatusBadRequest)
+			return
+		}
+
+		log.Debug().Interface("diagForm", diagForm).Msg("Form data parsed")
+
+		data, err := structpb.NewStruct(map[string]any{
+			"vehicle": vehicleID,
+		})
+		if err != nil {
+			log.Error().Err(err).Msg("Failed to create protobuf struct")
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		group := g.(storage.Group)
+
+		request := &diags.CreateDiagRequest{
+			Diag: &diags.Diag{
+				Name:       diagForm.Name,
+				Namespace:  diagForm.Namespace,
+				JsonSchema: diagForm.JsonSchema,
+				UiSchema:   diagForm.UiSchema,
+				Data:       data,
+				Deleted:    diagForm.Deleted,
+				Diagdate:   timestamppb.New(time.Now()),
+				Owners:	 	[]string{group.ID},
+			},
+		}
+
+		resp, err := h.services.GRPC.Diags.CreateDiag(context.TODO(), request)
+		if err != nil {
+			log.Error().Err(err).Msg("Failed to create diagnostic")
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		http.Redirect(w, r, fmt.Sprintf("/app/diags/%s", resp.Diag.Id), http.StatusFound)
+		return
+	}
+
+	h.Renderer.VehiclesCreateDiag(w, r, vehicleID)
+}
+
+func (h *ApplicationHandler) BookingsCreateDiag(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	bookingID := vars["bookingid"]
+
+	if h.services == nil || (h.services.GRPC == services.GRPCServices{}) || h.services.GRPC.Diags == nil {
+		log.Error().Msg("Diags service is not initialized")
+		http.Error(w, "Internal server error", http.StatusInternalServerError)
+		return
+	}
+	
+
+	if r.Method == http.MethodPost {
+		g := r.Context().Value(identification.GroupKey)
+		if g == nil {
+			http.Error(w, "Missing group information", http.StatusBadRequest)
+			return
+		}
+
+		diagForm, err := parseDiagsForm(r)
+		if err != nil {
+			log.Error().Err(err).Msg("Invalid form data")
+			http.Error(w, err.Error(), http.StatusBadRequest)
+			return
+		}
+
+		log.Debug().Interface("diagForm", diagForm).Msg("Form data parsed")
+
+		data, err := structpb.NewStruct(map[string]any{
+			"booking": bookingID,
+		})
+		if err != nil {
+			log.Error().Err(err).Msg("Failed to create protobuf struct")
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		group := g.(storage.Group)
+
+		request := &diags.CreateDiagRequest{
+			Diag: &diags.Diag{
+				Name:       diagForm.Name,
+				Namespace:  diagForm.Namespace,
+				JsonSchema: diagForm.JsonSchema,
+				UiSchema:   diagForm.UiSchema,
+				Data:       data,
+				Deleted:    diagForm.Deleted,
+				Diagdate:   timestamppb.New(time.Now()),
+				Owners:	 	[]string{group.ID},
+			},
+		}
+
+		resp, err := h.services.GRPC.Diags.CreateDiag(context.TODO(), request)
+		if err != nil {
+			log.Error().Err(err).Msg("Failed to create diagnostic")
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		http.Redirect(w, r, fmt.Sprintf("/app/diags/%s", resp.Diag.Id), http.StatusFound)
+		return
+	}
+
+	h.Renderer.BookingsCreateDiag(w, r, bookingID)
+}
+
+func (h *ApplicationHandler) VehicleBookingsCreateDiag(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	bookingID := vars["bookingid"]
+
+	if h.services == nil || (h.services.GRPC == services.GRPCServices{}) || h.services.GRPC.Diags == nil {
+		log.Error().Msg("Diags service is not initialized")
+		http.Error(w, "Internal server error", http.StatusInternalServerError)
+		return
+	}
+	
+
+	if r.Method == http.MethodPost {
+		g := r.Context().Value(identification.GroupKey)
+		if g == nil {
+			http.Error(w, "Missing group information", http.StatusBadRequest)
+			return
+		}
+
+		diagForm, err := parseDiagsForm(r)
+		if err != nil {
+			log.Error().Err(err).Msg("Invalid form data")
+			http.Error(w, err.Error(), http.StatusBadRequest)
+			return
+		}
+
+		log.Debug().Interface("diagForm", diagForm).Msg("Form data parsed")
+
+		data, err := structpb.NewStruct(map[string]any{
+			"booking": bookingID,
+		})
+		if err != nil {
+			log.Error().Err(err).Msg("Failed to create protobuf struct")
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		group := g.(storage.Group)
+
+		request := &diags.CreateDiagRequest{
+			Diag: &diags.Diag{
+				Name:       diagForm.Name,
+				Namespace:  diagForm.Namespace,
+				JsonSchema: diagForm.JsonSchema,
+				UiSchema:   diagForm.UiSchema,
+				Data:       data,
+				Deleted:    diagForm.Deleted,
+				Diagdate:   timestamppb.New(time.Now()),
+				Owners:	 	[]string{group.ID},
+			},
+		}
+
+		resp, err := h.services.GRPC.Diags.CreateDiag(context.TODO(), request)
+		if err != nil {
+			log.Error().Err(err).Msg("Failed to create diagnostic")
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		http.Redirect(w, r, fmt.Sprintf("/app/diags/%s", resp.Diag.Id), http.StatusFound)
+		return
+	}
+
+	h.Renderer.VehicleBookingsCreateDiag(w, r, bookingID)
+}
+
+func (h *ApplicationHandler) DiagsDisplayDiag(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	diagid := vars["diagid"]
+
+	request := &diags.GetDiagRequest{
+		Id: diagid,
+	}
+
+	resp, err := h.services.GRPC.Diags.GetDiag(context.TODO(), request)
+	if err != nil {
+		log.Error().Err(err).Msg("")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	g := r.Context().Value(identification.GroupKey)
+	if g == nil {
+		log.Error().Err(err).Msg("")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+
+	documents := h.filestorage.List(filestorage.PREFIX_DIAGS + "/" + diagid)
+
+	events_file_types := h.config.GetStringSlice("modules.diags.documents_types")
+	file_types_map := h.config.GetStringMapString("storage.files.file_types")
+
+	h.Renderer.DiagsDisplayDiag(w, r, resp.Diag.ToStorageType(), events_file_types, file_types_map, documents)
+}
+
+func parseDiagsForm(r *http.Request) (*DiagsForm, error) {
+	if err := r.ParseForm(); err != nil {
+		return nil, err
+	}
+
+	formData := &DiagsForm{
+		Name:       r.PostFormValue("name"),
+		Namespace:  r.PostFormValue("namespace"), // Récupère le namespace
+		JsonSchema: r.PostFormValue("json_schema"),
+		UiSchema:   r.PostFormValue("ui_schema"),
+		Deleted:    false,
+	}
+
+	if formData.Name == "" || formData.Namespace == "" {
+		return nil, errors.New("missing required fields: 'name' or 'namespace'")
+	}
+
+	// Gestion de la valeur JSON dans `data`
+	if rawData := r.PostFormValue("data"); rawData != "" {
+		data := map[string]any{}
+		if err := json.Unmarshal([]byte(rawData), &data); err != nil {
+			return nil, errors.New("invalid 'data' field: must be a valid JSON object")
+		}
+		formData.Data = data
+	}
+
+	return formData, nil
+}
+
+func (h *ApplicationHandler) DiagUpdate(w http.ResponseWriter, r *http.Request) {
+	adm := strings.Split(r.URL.Path, "/")
+	diagID := adm[3]
+	request := &diags.GetDiagRequest{
+		Id: diagID,
+	}
+
+	resp, err := h.services.GRPC.Diags.GetDiag(context.TODO(), request)
+	if err != nil {
+		log.Error().Err(err).Msg("")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+	if r.Method == "POST" {
+		g := r.Context().Value(identification.GroupKey)
+		if g == nil {
+			w.WriteHeader(http.StatusBadRequest)
+			return
+		}
+
+		group := g.(storage.Group)
+
+		diagForm, err := parseDiagsForm(r)
+		if err != nil {
+			log.Error().Err(err).Msg("")
+			w.WriteHeader(http.StatusBadRequest)
+			return
+		}
+
+		data, _ := structpb.NewStruct(map[string]any{})
+
+		request := &diags.UpdateDiagRequest{
+			Diag: &diags.Diag{
+				Namespace:      diagForm.Namespace,
+				Id:             diagID,
+				Name:           diagForm.Name,
+				JsonSchema:     diagForm.JsonSchema,
+				UiSchema: 	 	diagForm.UiSchema,
+				Data:           data,
+				Diagdate: 	 	timestamppb.New(time.Now()),
+				Owners: 		[]string{group.ID},
+			},
+		}
+
+		resp, err := h.services.GRPC.Diags.UpdateDiag(context.TODO(), request)
+
+		if err != nil {
+			log.Error().Err(err).Msg("")
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		http.Redirect(w, r, fmt.Sprintf("/app/diags/%s", resp.Diag.Id), http.StatusFound)
+		return
+	}
+	h.Renderer.DiagUpdate(w, r, resp.Diag.ToStorageType())
+}
+
+func (h *ApplicationHandler) DiagDelete(w http.ResponseWriter, r *http.Request) {
+
+	vars := mux.Vars(r)
+	diagID := vars["diagid"]
+	request := &diags.GetDiagRequest{
+		Id: diagID,
+	}
+
+	resp, err := h.services.GRPC.Diags.GetDiag(context.TODO(), request)
+	if err != nil {
+		log.Error().Err(err).Msg("")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	if r.Method == "POST" {
+
+		request := &diags.UpdateDiagRequest{
+			Diag: &diags.Diag{
+				Namespace:      resp.Diag.Namespace,
+				Id:             resp.Diag.Id,
+				Name:           resp.Diag.Name,
+				JsonSchema:     resp.Diag.JsonSchema,
+				UiSchema:	 	resp.Diag.UiSchema,
+				Data:           resp.Diag.Data,
+				Deleted:        true,
+				Diagdate: 	 	resp.Diag.Diagdate,
+			},
+		}
+
+		_, err := h.services.GRPC.Diags.UpdateDiag(context.TODO(), request)
+
+		if err != nil {
+			log.Error().Err(err).Msg("")
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		http.Redirect(w, r, "/app/diags/", http.StatusFound)
+		return
+	}
+	h.Renderer.DiagDelete(w, r, resp.Diag.ToStorageType())
+}
+
+func (h *ApplicationHandler) DiagsHistoryDiag(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	diagId := vars["diagid"]
+	request := &diags.GetDiagRequest{
+		Id: diagId,
+	}
+
+	resp, err := h.services.GRPC.Diags.GetDiag(context.TODO(), request)
+	if err != nil {
+		log.Error().Err(err).Msg("")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	h.Renderer.DiagsHistoryDiag(w, r, resp.Diag.ToStorageType())
+}
+
+// //// ADD DOCUMENTS //////
+func (h *ApplicationHandler) DiagsDocuments(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	diagID := vars["diagid"]
+
+	//r.ParseForm()
+	r.ParseMultipartForm(100 * 1024 * 1024)
+
+	document_type := r.FormValue("type")
+	document_name := r.FormValue("name")
+
+	file, header, err := r.FormFile("file-upload")
+	if err != nil {
+		log.Error().Err(err).Msg("")
+		return
+	}
+	defer file.Close()
+
+	fileid := uuid.NewString()
+
+	metadata := map[string]string{
+		"type": document_type,
+		"name": document_name,
+	}
+
+	if err := h.filestorage.Put(file, filestorage.PREFIX_DIAGS, fmt.Sprintf("%s/%s_%s", diagID, fileid, header.Filename), header.Size, metadata); err != nil {
+		log.Error().Err(err).Msg("")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	http.Redirect(w, r, fmt.Sprintf("/app/diags/%s", diagID), http.StatusFound)
+
+}
+
+func (h *ApplicationHandler) DiagsDocumentDownload(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	diagID := vars["diagid"]
+	document := vars["document"]
+
+	file, info, err := h.filestorage.Get(filestorage.PREFIX_DIAGS, fmt.Sprintf("%s/%s", diagID, document))
+	if err != nil {
+		log.Error().Err(err).Msg("")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	w.Header().Set("Content-Type", info.ContentType)
+	if _, err = io.Copy(w, file); err != nil {
+		log.Error().Err(err).Msg("")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	http.Redirect(w, r, fmt.Sprintf("/app/diags/%s", diagID), http.StatusFound)
+
+}
--- a/handlers/application/directory.go
+++ b/handlers/application/directory.go
--- a/handlers/application/group.go
+++ b/handlers/application/group.go
@ -4,7 +4,6 @@ import (
 	"context"
 	"crypto/rand"
 	"encoding/base64"
-	"fmt"
 	"io"
 	"net/http"
 	"time"
@ -12,6 +11,7 @@ import (
 	"git.coopgo.io/coopgo-apps/parcoursmob/utils/identification"
 	"git.coopgo.io/coopgo-platform/groups-management/storage"
 	accounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
+	"github.com/rs/zerolog/log"
 )

 func (h *ApplicationHandler) GroupSettingsDisplay(w http.ResponseWriter, r *http.Request) {
@ -26,7 +26,7 @@ func (h *ApplicationHandler) GroupSettingsDisplay(w http.ResponseWriter, r *http
 	members, err := h.members()
 	if err != nil {
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@ -81,14 +81,16 @@ func (h *ApplicationHandler) GroupSettingsInviteMember(w http.ResponseWriter, r
 			},
 		)

-		fmt.Println(err)
+		if err != nil {
+			log.Error().Err(err).Msg("")
+		}

 		data := map[string]any{
 			"group": group.Data["name"],
 		}

 		if err := h.emailing.Send("onboarding.existing_member", r.FormValue("username"), data); err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 		}

 		http.Redirect(w, r, "/app/group/settings", http.StatusFound)
@ -103,7 +105,7 @@ func (h *ApplicationHandler) GroupSettingsInviteMember(w http.ResponseWriter, r

 		b := make([]byte, 16)
 		if _, err := io.ReadFull(rand.Reader, b); err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@ -117,7 +119,7 @@ func (h *ApplicationHandler) GroupSettingsInviteMember(w http.ResponseWriter, r
 		}

 		if err := h.emailing.Send("onboarding.new_member", r.FormValue("username"), data); err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
--- a/handlers/application/group_module.go
+++ b/handlers/application/group_module.go
@ -14,6 +14,7 @@ import (
 	mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
 	"github.com/google/uuid"
 	"github.com/gorilla/mux"
+	"github.com/rs/zerolog/log"
 	"google.golang.org/protobuf/types/known/structpb"
 )

@ -45,7 +46,7 @@ func (h *ApplicationHandler) Groups(w http.ResponseWriter, r *http.Request) {

 	resp, err := h.services.GRPC.GroupsManagement.GetGroups(context.TODO(), request)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -73,14 +74,12 @@ func (h *ApplicationHandler) CreateGroupModule(w http.ResponseWriter, r *http.Re
 		r.ParseForm()

 		if r.FormValue("name") == "" {
-
-			fmt.Println("invalid name")
+			log.Error().Msg("Invalid name")
 			w.WriteHeader(http.StatusBadRequest)
 			return
 		}
 		if r.FormValue("type") == "" {
-
-			fmt.Println("invalid type")
+			log.Error().Msg("Invalid type")
 			w.WriteHeader(http.StatusBadRequest)
 			return
 		}
@ -96,7 +95,7 @@ func (h *ApplicationHandler) CreateGroupModule(w http.ResponseWriter, r *http.Re

 		data, err := structpb.NewValue(dataMap)
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@ -111,7 +110,7 @@ func (h *ApplicationHandler) CreateGroupModule(w http.ResponseWriter, r *http.Re

 		_, err = h.services.GRPC.GroupsManagement.AddGroup(context.TODO(), request_organization)
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@ -145,7 +144,7 @@ func (h *ApplicationHandler) DisplayGroupModule(w http.ResponseWriter, r *http.R

 	resp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), request)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -186,7 +185,7 @@ func (h *ApplicationHandler) DisplayGroupModule(w http.ResponseWriter, r *http.R

 		respbeneficiary, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), requestbeneficiary)
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@ -201,7 +200,7 @@ func (h *ApplicationHandler) DisplayGroupModule(w http.ResponseWriter, r *http.R
 		_, err = h.services.GRPC.GroupsManagement.Subscribe(context.TODO(), subscribe)

 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@ -212,7 +211,7 @@ func (h *ApplicationHandler) DisplayGroupModule(w http.ResponseWriter, r *http.R

 	accountsBeneficaire, err := h.beneficiaries(r)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
--- a/handlers/application/journeys.go
+++ b/handlers/application/journeys.go
@ -5,34 +5,56 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"slices"
 	"sort"
 	"strconv"
 	"strings"
+	"sync"
 	"time"

+	"git.coopgo.io/coopgo-apps/parcoursmob/utils/sorting"
+	carpoolproto "git.coopgo.io/coopgo-platform/carpool-service/servers/grpc/proto"
 	fleets "git.coopgo.io/coopgo-platform/fleets/grpcapi"
+	fleetsstorage "git.coopgo.io/coopgo-platform/fleets/storage"
 	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"
+	mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
+	"git.coopgo.io/coopgo-platform/multimodal-routing/libs/transit/motis"
+	"git.coopgo.io/coopgo-platform/solidarity-transport/servers/grpc/proto/gen"
+	"git.coopgo.io/coopgo-platform/solidarity-transport/servers/grpc/transformers"
 	"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"
+	"github.com/paulmach/orb/geojson"
+	"github.com/rs/zerolog/log"
+
+	//"gitlab.scity.coop/maas/navitia-golang"
+	//"gitlab.scity.coop/maas/navitia-golang/types"
 	"google.golang.org/protobuf/types/known/structpb"
+	"google.golang.org/protobuf/types/known/timestamppb"
 )

-var Depart any
-var Arrive any
+var (
+	Depart any
+	Arrive any
+)

 func (h *ApplicationHandler) JourneysSearch(w http.ResponseWriter, r *http.Request) {
 	r.ParseForm()
-
+	var (
+		transit_results []*motis.Itinerary
+		carpool_results []*geojson.FeatureCollection
+		vehicle_results []fleetsstorage.Vehicle
+	)
+	// availableDrivers := []mobilityaccountsstorage.Account{}
+	drivers := map[string]mobilityaccountsstorage.Account{}
+	driverJourneys := []*gen.SolidarityTransportDriverJourney{}
+	var organizedCarpools []*carpoolproto.CarpoolServiceDriverJourney
+	// navitiaCh := make(chan *navitia.JourneyResults, 1)
+	// carpoolCh := make(chan []any, 1)
 	locTime, errTime := time.LoadLocation("Europe/Paris")
 	if errTime != nil {
-		fmt.Println("Loading timezone location Europe/Paris error : ")
-		fmt.Println("Missing zones in container ? ")
-		panic(errTime)
+		log.Panic().Err(errTime).Msg("Tried to load timezone location Europe/Paris. Error. Missing zones in container ?")
 	}

 	departuredate := r.FormValue("departuredate")
@ -41,15 +63,15 @@ func (h *ApplicationHandler) JourneysSearch(w http.ResponseWriter, r *http.Reque

 	departure := r.FormValue("departure")
 	destination := r.FormValue("destination")
+	kb_results := []any{}

 	searched := false

 	var (
 		departuregeo   *geojson.Feature
 		destinationgeo *geojson.Feature
-		journeys       *navitia.JourneyResults
-		carpoolresults any
-		vehicles       = []any{}
+		// journeys       *navitia.JourneyResults
+		// carpoolresults []any
 	)

 	if departuredate != "" && departuretime != "" && departure != "" && destination != "" {
@ -59,102 +81,191 @@ func (h *ApplicationHandler) JourneysSearch(w http.ResponseWriter, r *http.Reque

 		departuregeo, err = geojson.UnmarshalFeature([]byte(departure))
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("error unmarshalling departure")
 			w.WriteHeader(http.StatusBadRequest)
 			return
 		}

 		destinationgeo, err = geojson.UnmarshalFeature([]byte(destination))
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("error unmarshalling destination")
 			w.WriteHeader(http.StatusBadRequest)
 			return
 		}

-		//TODO make it a library
-		session, _ := navitia.NewCustom(
-			h.config.GetString("services.navitia.api_key"),
-			"https://api.navitia.io/v1",
-			&http.Client{})
+		// SOLIDARITY TRANSPORT
+		drivers, err = h.services.GetAccountsInNamespacesMap([]string{"solidarity_drivers", "organized_carpool_drivers"})
 		if err != nil {
-			fmt.Println(err)
-			w.WriteHeader(http.StatusBadRequest)
-			return
+			drivers = map[string]mobilityaccountsstorage.Account{}
 		}

-		request := navitia.JourneyRequest{
-			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])),
-			Date:          departuredatetime.Add(-2 * time.Hour),
-			DateIsArrival: false, //TODO
-		}
+		protodep, _ := transformers.GeoJsonToProto(departuregeo)
+		protodest, _ := transformers.GeoJsonToProto(destinationgeo)

-		journeys, err = session.Journeys(context.Background(), request)
+		log.Debug().Time("departure time", departuredatetime).Msg("calling driver journeys with ...")
+
+		res, err := h.services.GRPC.SolidarityTransport.GetDriverJourneys(context.Background(), &gen.GetDriverJourneysRequest{
+			Departure:     protodep,
+			Arrival:       protodest,
+			DepartureDate: timestamppb.New(departuredatetime),
+		})
 		if err != nil {
-			fmt.Println(err)
-			// w.WriteHeader(http.StatusBadRequest)
-			// return
-		}
-
-		//CARPOOL
-		// carpoolrequest := fmt.Sprintf(
-		// 	"https://api.rdex.ridygo.fr/journeys.json?p[driver][state]=1&frequency=punctual&p[passenger][state]=0&p[from][latitude]=%f&p[from][longitude]=%f&p[to][latitude]=%f&p[to][longitude]=%f&p[outward][mindate]=%s&p[outward][maxdate]=%s",
-		// 	departuregeo.Geometry.Point[1], departuregeo.Geometry.Point[0],
-		// 	destinationgeo.Geometry.Point[1], destinationgeo.Geometry.Point[0],
-		// 	departuredatetime.Format("2006-01-02"), departuredatetime.Add(24*time.Hour).Format("2006-01-02"))
-		carpoolrequest := "https://api.rdex.ridygo.fr/journeys.json"
-
-		client := &http.Client{}
-		req, err := http.NewRequest("GET", carpoolrequest, nil)
-		if err != nil {
-			fmt.Println(err)
-		}
-
-		req.URL.RawQuery = fmt.Sprintf(
-			"p[driver][state]=1&frequency=punctual&p[passenger][state]=0&p[from][latitude]=%f&p[from][longitude]=%f&p[to][latitude]=%f&p[to][longitude]=%f&p[outward][mindate]=%s&p[outward][maxdate]=%s",
-			departuregeo.Geometry.Point[1], departuregeo.Geometry.Point[0],
-			destinationgeo.Geometry.Point[1], destinationgeo.Geometry.Point[0],
-			departuredatetime.Format("2006-01-02"), departuredatetime.Format("2006-01-02"))
-
-		req.Header.Set("X-API-KEY", "123456")
-		resp, err := client.Do(req)
-		if err != nil {
-			fmt.Println(err)
-		}
-
-		if err == nil && resp.StatusCode == http.StatusOK {
-			err = json.NewDecoder(resp.Body).Decode(&carpoolresults)
-			if err != nil {
-				fmt.Println(err)
-			}
-
-			if carpoolresults == nil {
-				carpoolresults = []any{}
-			}
+			log.Error().Err(err).Msg("error in grpc call to GetDriverJourneys")
 		} else {
-			carpoolresults = []any{}
+			driverJourneys = slices.Collect(func(yield func(*gen.SolidarityTransportDriverJourney) bool) {
+				for _, dj := range res.DriverJourneys {
+					if a, ok := drivers[dj.DriverId].Data["archived"]; ok {
+						if archived, ok := a.(bool); ok {
+							if archived {
+								continue
+							}
+						}
+					}
+					if !yield(dj) {
+						return
+					}
+				}
+			})
+			// res.DriverJourneys
+			sort.Slice(driverJourneys, func(i, j int) bool {
+				return driverJourneys[i].DriverDistance < driverJourneys[j].DriverDistance
+			})
 		}

-		// Vehicles
+		// ORGANIZED CARPOOL
+		organizedCarpoolsRes, err := h.services.GRPC.CarpoolService.DriverJourneys(context.Background(), &carpoolproto.DriverJourneysRequest{
+			DepartureLat:  departuregeo.Point().Lat(),
+			DepartureLng:  departuregeo.Point().Lon(),
+			ArrivalLat:    destinationgeo.Point().Lat(),
+			ArrivalLng:    destinationgeo.Point().Lon(),
+			DepartureDate: timestamppb.New(departuredatetime),
+		})
+		if err != nil {
+			log.Error().Err(err).Msg("error retrieving organized carpools")
+		} else {
+			organizedCarpools = organizedCarpoolsRes.DriverJourneys
+			sort.Slice(organizedCarpools, func(i, j int) bool {
+				return *organizedCarpools[i].Distance < *organizedCarpools[j].Distance
+			})
+		}

+		var wg sync.WaitGroup
+		// CARPOOL OPERATORS
+		carpools := make(chan *geojson.FeatureCollection)
+		go h.services.InteropCarpool.Search(carpools, *departuregeo, *destinationgeo, departuredatetime)
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			for c := range carpools {
+				carpool_results = append(carpool_results, c)
+			}
+		}()
+
+		// TRANSIT
+		transitch := make(chan *motis.Itinerary)
+		go func(transitch chan *motis.Itinerary, departure *geojson.Feature, destination *geojson.Feature, datetime *time.Time) {
+			defer close(transitch)
+			// timetableView := false
+			searchWindows := 1800
+			response, err := h.services.TransitRouting.PlanWithResponse(context.Background(), &motis.PlanParams{
+				FromPlace: fmt.Sprintf("%f,%f", departure.Point().Lat(), departure.Point().Lon()),
+				ToPlace:   fmt.Sprintf("%f,%f", destination.Point().Lat(), destination.Point().Lon()),
+				Time:      datetime,
+				// TimetableView: &timetableView,
+				SearchWindow: &searchWindows,
+			})
+			if err != nil {
+				log.Error().Err(err).Msg("error retrieving transit data from MOTIS server")
+				return
+			}
+			for _, i := range response.JSON200.Itineraries {
+				transitch <- &i
+			}
+		}(transitch, departuregeo, destinationgeo, &departuredatetime)
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			for itinerary := range transitch {
+				transit_results = append(transit_results, itinerary)
+			}
+		}()
+
+		// VEHICLES
+		vehiclech := make(chan fleetsstorage.Vehicle)
+		go h.vehicleRequest(vehiclech, departuredatetime.Add(-24*time.Hour), departuredatetime.Add(168*time.Hour))
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			for vehicle := range vehiclech {
+				vehicle_results = append(vehicle_results, vehicle)
+			}
+			slices.SortFunc(vehicle_results, sorting.VehiclesByDistanceFrom(*departuregeo))
+		}()
+		// journeys_results = <-navitiaCh
+		wg.Wait()
+		// KNOWLEDGE BASE
+		departureGeo, _ := h.services.Geography.GeoSearch(departuregeo)
+		kbData := h.config.Get("knowledge_base")
+		if kb, ok := kbData.([]any); ok {
+			log.Debug().Msg("1")
+			for _, sol := range kb {
+				log.Debug().Msg("2")
+				if solution, ok := sol.(map[string]any); ok {
+					log.Debug().Msg("3")
+					if g, ok := solution["geography"]; ok {
+						log.Debug().Msg("4")
+						if geography, ok := g.([]any); ok {
+							log.Debug().Msg("5")
+							for _, gg := range geography {
+								log.Debug().Msg("6")
+								if geog, ok := gg.(map[string]any); ok {
+									log.Debug().Msg("7")
+									if layer, ok := geog["layer"].(string); ok {
+										log.Debug().Msg("8")
+										code := geog["code"]
+										log.Debug().Any("code", fmt.Sprintf("%s", code)).Any("departure geo", departureGeo[layer].Properties.MustString("code")).Msg("9")
+										if strings.Compare(fmt.Sprintf("%v", code), departureGeo[layer].Properties.MustString("code")) == 0 {
+											log.Debug().Msg("10")
+											kb_results = append(kb_results, solution)
+											break
+										}
+
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	beneficiaries, err := h.beneficiaries(r)
+	if err != nil {
+		log.Error().Err(err).Msg("issue retrieving beneficiaries")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	h.Renderer.JourneysSearch(w, r, carpool_results, transit_results, vehicle_results, searched, departuregeo, destinationgeo, departuredate, departuretime, driverJourneys, drivers, organizedCarpools, beneficiaries, kb_results)
+}
+
+func (h *ApplicationHandler) vehicleRequest(vehiclech chan fleetsstorage.Vehicle, start time.Time, end time.Time) {
+	defer close(vehiclech)
 	vehiclerequest := &fleets.GetVehiclesRequest{
 		Namespaces: []string{"parcoursmob"},
 	}
 	vehicleresp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), vehiclerequest)
 	if err != nil {
-			fmt.Println(err)
-			w.WriteHeader(http.StatusInternalServerError)
+		log.Error().Err(err).Msg("")
+		return
 	}
-
 	for _, vehicle := range vehicleresp.Vehicles {
 		v := vehicle.ToStorageType()
-			if v.Free(departuredatetime.Add(-24*time.Hour), departuredatetime.Add(168*time.Hour)) {
-				vehicles = append(vehicles, v)
+		if v.Free(start, end) {
+			vehiclech <- v
 		}
 	}
-	}
-
-	h.Renderer.JourneysSearch(w, r, carpoolresults, journeys, vehicles, searched, departuregeo, destinationgeo, departuredate, departuretime)
 }

 type GroupsModule []groupstorage.Group
@ -166,19 +277,18 @@ func (a GroupsModule) Less(i, j int) bool {
 func (a GroupsModule) Swap(i, j int) { a[i], a[j] = a[j], a[i] }

 func (h *ApplicationHandler) GroupsGestion(w http.ResponseWriter, r *http.Request) {
-
 	request := &groupsmanagement.GetGroupsRequest{
 		Namespaces: []string{"parcoursmob_groups_covoiturage"},
 	}

 	resp, err := h.services.GRPC.GroupsManagement.GetGroups(context.TODO(), request)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}

-	var groups = []groupstorage.Group{}
+	groups := []groupstorage.Group{}

 	for _, group := range resp.Groups {
 		g := group.ToStorageType()
@ -192,6 +302,7 @@ func (h *ApplicationHandler) GroupsGestion(w http.ResponseWriter, r *http.Reques

 	h.Renderer.GroupsGestion(w, r, groups, cacheid)
 }
+
 func filterAcc(r *http.Request, a *mobilityaccounts.Account) bool {
 	searchFilter, ok := r.URL.Query()["search"]

@ -206,7 +317,6 @@ func filterAcc(r *http.Request, a *mobilityaccounts.Account) bool {
 }

 func (h *ApplicationHandler) CreateGroup(w http.ResponseWriter, r *http.Request) {
-
 	var beneficiary any
 	var (
 		departurgeo   *geojson.Feature
@ -224,7 +334,7 @@ func (h *ApplicationHandler) CreateGroup(w http.ResponseWriter, r *http.Request)

 		respbeneficiary, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), requestbeneficiary)
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@ -241,14 +351,14 @@ func (h *ApplicationHandler) CreateGroup(w http.ResponseWriter, r *http.Request)

 				departurgeo, err = geojson.UnmarshalFeature([]byte(departure))
 				if err != nil {
-					fmt.Println(err)
+					log.Error().Err(err).Msg("")
 					w.WriteHeader(http.StatusBadRequest)
 					return
 				}

 				dstinationgeo, err = geojson.UnmarshalFeature([]byte(destination))
 				if err != nil {
-					fmt.Println(err)
+					log.Error().Err(err).Msg("")
 					w.WriteHeader(http.StatusBadRequest)
 					return
 				}
@ -269,14 +379,14 @@ func (h *ApplicationHandler) CreateGroup(w http.ResponseWriter, r *http.Request)

 			if r.FormValue("name") == "" {

-				fmt.Println("invalid name")
+				log.Error().Msg("invalid name")
 				w.WriteHeader(http.StatusBadRequest)
 				return
 			}

 			if r.FormValue("number") == "" {

-				fmt.Println("invalid number of personne")
+				log.Error().Msg("invalid number of personne")
 				w.WriteHeader(http.StatusBadRequest)
 				return
 			}
@ -313,7 +423,7 @@ func (h *ApplicationHandler) CreateGroup(w http.ResponseWriter, r *http.Request)

 			data, err := structpb.NewValue(dataMap)
 			if err != nil {
-				fmt.Println(err)
+				log.Error().Err(err).Msg("")
 				w.WriteHeader(http.StatusInternalServerError)
 				return
 			}
@ -328,7 +438,7 @@ func (h *ApplicationHandler) CreateGroup(w http.ResponseWriter, r *http.Request)

 			_, err = h.services.GRPC.GroupsManagement.AddGroup(context.TODO(), request_organization)
 			if err != nil {
-				fmt.Println(err)
+				log.Error().Err(err).Msg("")
 				w.WriteHeader(http.StatusInternalServerError)
 				return
 			}
@ -340,13 +450,12 @@ func (h *ApplicationHandler) CreateGroup(w http.ResponseWriter, r *http.Request)
 	}
 	accountsBeneficaire, err := h.beneficiaries(r)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}

 	h.Renderer.CreateGroup(w, r, Depart, Arrive, searched, beneficiary, accountsBeneficaire, departurgeo, dstinationgeo)
-
 }

 func (h *ApplicationHandler) DisplayGroupCovoiturage(w http.ResponseWriter, r *http.Request) {
@ -359,12 +468,12 @@ func (h *ApplicationHandler) DisplayGroupCovoiturage(w http.ResponseWriter, r *h

 	resp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), request)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}

-	var accounts = []any{}
+	accounts := []any{}

 	requesst := &mobilityaccounts.GetAccountsBatchRequest{
 		Accountids: resp.Group.Members,
@ -396,7 +505,7 @@ func (h *ApplicationHandler) DisplayGroupCovoiturage(w http.ResponseWriter, r *h

 		respbeneficiary, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), requestbeneficiary)
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@ -409,9 +518,8 @@ func (h *ApplicationHandler) DisplayGroupCovoiturage(w http.ResponseWriter, r *h
 		}

 		_, err = h.services.GRPC.GroupsManagement.Subscribe(context.TODO(), subscribe)
-
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@ -430,14 +538,13 @@ func (h *ApplicationHandler) DisplayGroupCovoiturage(w http.ResponseWriter, r *h
 		}
 		r.ParseForm()
 		dataMap := map[string]any{
-
 			"depart": Depart,
 			"arrive": Arrive,
 		}
 		id := uuid.NewString()
 		data, err := structpb.NewValue(dataMap)
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@ -453,7 +560,7 @@ func (h *ApplicationHandler) DisplayGroupCovoiturage(w http.ResponseWriter, r *h

 		_, err = h.services.GRPC.GroupsManagement.AddGroupMember(context.TODO(), request_organizatio)
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@ -468,7 +575,7 @@ func (h *ApplicationHandler) DisplayGroupCovoiturage(w http.ResponseWriter, r *h
 	// }
 	// s, err := h.services.GRPC.GroupsManagement.GetGroupsBatchMember(context.TODO(), grp)
 	// if err != nil {
-	// 	fmt.Println(err)
+	// 	log.Error().Err(err).Msg("")
 	// 	w.WriteHeader(http.StatusInternalServerError)
 	// 	return
 	// }
@ -482,12 +589,10 @@ func (h *ApplicationHandler) DisplayGroupCovoiturage(w http.ResponseWriter, r *h
 	//////////find all groups to store the adresse passenger///////
 	///////////try to optimise the code ////////////////////////////
 	groups, _ := h.services.GetGroupsMemberMap(resp.Group.ToStorageType().ID)
-	//fmt.Println(groups)
 	var number string = strconv.Itoa(len(resp.Group.Members))
-	/////////////////////
 	accountsBeneficaire, err := h.beneficiaries(r)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
@ -510,7 +615,7 @@ func (h *ApplicationHandler) UpdateGroupCovoiturage(w http.ResponseWriter, r *ht

 		resp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), request)
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@ -523,7 +628,7 @@ func (h *ApplicationHandler) UpdateGroupCovoiturage(w http.ResponseWriter, r *ht

 		ressp, err := h.services.GRPC.GroupsManagement.GetGroupMember(context.TODO(), reequest)
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@ -533,7 +638,7 @@ func (h *ApplicationHandler) UpdateGroupCovoiturage(w http.ResponseWriter, r *ht

 		_, errr := h.services.GRPC.GroupsManagement.UnsubscribeMember(context.TODO(), req)
 		if errr != nil {
-			fmt.Println(errr)
+			log.Error().Err(errr).Msg("Issue in groups management service - InsubscribeMember")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@ -550,12 +655,11 @@ func (h *ApplicationHandler) UpdateGroupCovoiturage(w http.ResponseWriter, r *ht

 				_, err := h.services.GRPC.GroupsManagement.Unsubscribe(context.TODO(), reequest)
 				if err != nil {
-					fmt.Println(err)
+					log.Error().Err(err).Msg("")
 					w.WriteHeader(http.StatusInternalServerError)
 					return
 				}
 			}
-
 		}
 		http.Redirect(w, r, fmt.Sprintf("/app/journeys/groups_covoiturage/create/%s", groupid), http.StatusFound)
 		/*
--- a/handlers/application/members.go
+++ b/handlers/application/members.go
@ -12,6 +12,7 @@ import (
 	groupsmanagement "git.coopgo.io/coopgo-platform/groups-management/grpcapi"
 	mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
 	"github.com/google/uuid"
+	"github.com/rs/zerolog/log"
 	"google.golang.org/protobuf/types/known/structpb"
 )

@ -35,7 +36,7 @@ func (h *ApplicationHandler) MemberDisplay(w http.ResponseWriter, r *http.Reques

 	resp, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), request)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -54,7 +55,7 @@ func (h *ApplicationHandler) MemberDisplay(w http.ResponseWriter, r *http.Reques

 	res, err := h.services.GRPC.GroupsManagement.GetGroupsBatch(context.TODO(), reques)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -77,14 +78,14 @@ func (h *ApplicationHandler) MemberUpdate(w http.ResponseWriter, r *http.Request

 		dataMap, err := parseUserForm(r)
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusBadRequest)
 			return
 		}

 		data, err := structpb.NewValue(dataMap)
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@ -100,7 +101,7 @@ func (h *ApplicationHandler) MemberUpdate(w http.ResponseWriter, r *http.Request
 		resp, err := h.services.GRPC.MobilityAccounts.UpdateData(context.TODO(), request)

 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@ -116,7 +117,7 @@ func (h *ApplicationHandler) MemberUpdate(w http.ResponseWriter, r *http.Request

 	resp, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), request)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -160,7 +161,7 @@ func (h *ApplicationHandler) MembersList(w http.ResponseWriter, r *http.Request)

 	accounts, err := h.services.GetAccounts()
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -174,7 +175,7 @@ func (h *ApplicationHandler) MembersList(w http.ResponseWriter, r *http.Request)

 		resp, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), request)
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@ -195,7 +196,7 @@ func (h *ApplicationHandler) MembersList(w http.ResponseWriter, r *http.Request)

 		res, err := h.services.GRPC.GroupsManagement.GetGroupsBatch(context.TODO(), reques)
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
--- a/handlers/application/organized-carpool.go
+++ b/handlers/application/organized-carpool.go
@ -0,0 +1,639 @@
+package application
+
+import (
+	"cmp"
+	"context"
+	"encoding/json"
+	"fmt"
+	"io"
+	"net/http"
+	"slices"
+	"strings"
+	"time"
+
+	formvalidators "git.coopgo.io/coopgo-apps/parcoursmob/utils/form-validators"
+	filestorage "git.coopgo.io/coopgo-apps/parcoursmob/utils/storage"
+	"git.coopgo.io/coopgo-platform/carpool-service/servers/grpc/proto"
+	mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
+	mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
+	"github.com/google/uuid"
+	"github.com/gorilla/mux"
+	"github.com/paulmach/orb"
+	"github.com/paulmach/orb/geojson"
+	"github.com/rs/zerolog/log"
+	"google.golang.org/protobuf/types/known/structpb"
+	"google.golang.org/protobuf/types/known/timestamppb"
+)
+
+type OrganizedCarpoolDriversForm struct {
+	FirstName          string     `json:"first_name" validate:"required"`
+	LastName           string     `json:"last_name" validate:"required"`
+	Email              string     `json:"email" validate:"required,email"`
+	Birthdate          *time.Time `json:"birthdate" validate:"required"`
+	PhoneNumber        string     `json:"phone_number" validate:"required,phoneNumber"`
+	FileNumber         string     `json:"file_number"`
+	Address            any        `json:"address,omitempty"`
+	AddressDestination any        `json:"address_destination,omitempty"`
+	Gender             string     `json:"gender"`
+}
+
+func (h *ApplicationHandler) OrganizedCarpoolOverview(w http.ResponseWriter, r *http.Request) {
+	accounts, err := h.organizedCarpoolDrivers(r)
+	if err != nil {
+		log.Error().Err(err).Msg("issue getting solidarity drivers")
+		accounts = []mobilityaccountsstorage.Account{}
+	}
+
+	accountsMap := map[string]mobilityaccountsstorage.Account{}
+
+	for _, a := range accounts {
+		accountsMap[a.ID] = a
+	}
+
+	beneficiariesMap, err := h.services.GetBeneficiariesMap()
+	if err != nil {
+		beneficiariesMap = map[string]mobilityaccountsstorage.Account{}
+	}
+
+	bookingsproto, err := h.services.GRPC.CarpoolService.GetCarpoolBookings(context.Background(), &proto.GetCarpoolBookingsRequest{
+		MinDate: timestamppb.Now(),
+		MaxDate: timestamppb.New(time.Now().Add(24 * 365 * time.Hour)),
+	})
+	if err != nil {
+		log.Error().Err(err).Msg("issue retreving bookings")
+	}
+
+	bookings := []*proto.CarpoolServiceBooking{}
+
+	if err == nil {
+		for _, b := range bookingsproto.Bookings {
+			// booking, _ := transformers.BookingProtoToType(b)
+			bookings = append(bookings, b)
+		}
+	}
+
+	slices.SortFunc(accounts, func(a, b mobilityaccountsstorage.Account) int {
+		return strings.Compare(
+			strings.ToLower(fmt.Sprintf("%s %s", a.Data["first_name"].(string), a.Data["last_name"].(string))),
+			strings.ToLower(fmt.Sprintf("%s %s", b.Data["first_name"].(string), b.Data["last_name"].(string))),
+		)
+	})
+	slices.SortFunc(bookings, func(a, b *proto.CarpoolServiceBooking) int {
+		return cmp.Compare(a.PassengerPickupDate.AsTime().Unix(), b.PassengerPickupDate.AsTime().Unix())
+	})
+
+	h.Renderer.OrganizedCarpoolOverview(w, r, accounts, accountsMap, beneficiariesMap, bookings)
+}
+
+func (h *ApplicationHandler) organizedCarpoolDrivers(r *http.Request) ([]mobilityaccountsstorage.Account, error) {
+	accounts := []mobilityaccountsstorage.Account{}
+
+	request := &mobilityaccounts.GetAccountsRequest{
+		Namespaces: []string{"organized_carpool_drivers"},
+	}
+
+	resp, err := h.services.GRPC.MobilityAccounts.GetAccounts(context.TODO(), request)
+	if err != nil {
+		return accounts, err
+	}
+
+	for _, account := range resp.Accounts {
+		if filterAccount(r, account) {
+			a := account.ToStorageType()
+			accounts = append(accounts, a)
+		}
+	}
+
+	return accounts, err
+}
+
+func (h *ApplicationHandler) OrganizedCarpoolCreateDriver(w http.ResponseWriter, r *http.Request) {
+	if r.Method == "POST" {
+		dataMap, err := parseOrganizedCarpoolDriversForm(r)
+		if err != nil {
+			log.Error().Err(err).Msg("")
+			w.WriteHeader(http.StatusBadRequest)
+			return
+		}
+
+		data, err := structpb.NewValue(dataMap)
+		if err != nil {
+			log.Error().Err(err).Msg("")
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		request := &mobilityaccounts.RegisterRequest{
+			Account: &mobilityaccounts.Account{
+				Namespace: "organized_carpool_drivers",
+				Data:      data.GetStructValue(),
+			},
+		}
+
+		resp, err := h.services.GRPC.MobilityAccounts.Register(context.TODO(), request)
+		if err != nil {
+			log.Error().Err(err).Msg("")
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		http.Redirect(w, r, fmt.Sprintf("/app/organized-carpool/drivers/%s", resp.Account.Id), http.StatusFound)
+		return
+	}
+
+	h.Renderer.OrganizedCarpoolCreateDriver(w, r)
+}
+
+func (h *ApplicationHandler) OrganizedCarpoolDriverDisplay(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	driverID := vars["driverid"]
+
+	documents := h.filestorage.List(filestorage.PREFIX_ORGANIZED_CARPOOL_DRIVERS + "/" + driverID)
+
+	driver, err := h.services.GetAccount(driverID)
+	if err != nil {
+		log.Error().Err(err).Msg("Issue retrieving driver account")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	log.Info().Any("driver data", driver.Data).Msg("driver retrieved")
+
+	trips := []*geojson.FeatureCollection{}
+
+	resp, err := h.services.GRPC.CarpoolService.GetRegularRoutes(context.Background(), &proto.GetRegularRoutesRequest{
+		UserId: driverID,
+	})
+
+	for _, r := range resp.Routes {
+		t, err := geojson.UnmarshalFeatureCollection([]byte(r.Serialized))
+		if err != nil {
+			log.Error().Err(err).Msg("could not unmarshall feature collection")
+			continue
+		}
+
+		trips = append(trips, t)
+	}
+
+	h.Renderer.OrganizedCarpoolDriverDisplay(w, r, driver, trips, documents)
+}
+
+func (h *ApplicationHandler) OrganizedCarpoolArchiveDriver(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	driverID := vars["driverid"]
+
+	data, _ := structpb.NewValue(map[string]any{
+		"archived": true,
+	})
+
+	request := &mobilityaccounts.UpdateDataRequest{
+		Account: &mobilityaccounts.Account{
+			Id:        driverID,
+			Namespace: "organized_carpool_drivers",
+			Data:      data.GetStructValue(),
+		},
+	}
+
+	resp, err := h.services.GRPC.MobilityAccounts.UpdateData(context.TODO(), request)
+	if err != nil {
+		log.Error().Err(err).Msg("")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	http.Redirect(w, r, fmt.Sprintf("/app/organized-carpool/drivers/%s", resp.Account.Id), http.StatusFound)
+}
+
+func (h *ApplicationHandler) OrganizedCarpoolUnarchiveDriver(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	driverID := vars["driverid"]
+
+	data, _ := structpb.NewValue(map[string]any{
+		"archived": false,
+	})
+
+	request := &mobilityaccounts.UpdateDataRequest{
+		Account: &mobilityaccounts.Account{
+			Id:        driverID,
+			Namespace: "organized_carpool_drivers",
+			Data:      data.GetStructValue(),
+		},
+	}
+
+	resp, err := h.services.GRPC.MobilityAccounts.UpdateData(context.TODO(), request)
+	if err != nil {
+		log.Error().Err(err).Msg("")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	http.Redirect(w, r, fmt.Sprintf("/app/organized-carpool/drivers/%s", resp.Account.Id), http.StatusFound)
+}
+
+func (h *ApplicationHandler) OrganizedCarpoolDriverDocuments(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	driverID := vars["driverid"]
+
+	// r.ParseForm()
+	r.ParseMultipartForm(100 * 1024 * 1024)
+
+	document_type := r.FormValue("type")
+	document_name := r.FormValue("name")
+
+	file, header, err := r.FormFile("file-upload")
+	if err != nil {
+		log.Error().Err(err).Msg("")
+		return
+	}
+	defer file.Close()
+
+	fileid := uuid.NewString()
+
+	metadata := map[string]string{
+		"type": document_type,
+		"name": document_name,
+	}
+
+	log.Debug().Any("metadata", metadata).Msg("Metadata")
+
+	if err := h.filestorage.Put(file, filestorage.PREFIX_ORGANIZED_CARPOOL_DRIVERS, fmt.Sprintf("%s/%s_%s", driverID, fileid, header.Filename), header.Size, metadata); err != nil {
+		log.Error().Err(err).Msg("")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	http.Redirect(w, r, fmt.Sprintf("/app/organized-carpool/drivers/%s", driverID), http.StatusFound)
+}
+
+func (h *ApplicationHandler) OrganizedCarpoolDocumentDownload(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	driverID := vars["driverid"]
+	document := vars["document"]
+
+	file, info, err := h.filestorage.Get(filestorage.PREFIX_ORGANIZED_CARPOOL_DRIVERS, fmt.Sprintf("%s/%s", driverID, document))
+	if err != nil {
+		log.Error().Err(err).Msg("")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	w.Header().Set("Content-Type", info.ContentType)
+	if _, err = io.Copy(w, file); err != nil {
+		log.Error().Err(err).Msg("")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	// http.Redirect(w, r, fmt.Sprintf("/app/solidarity-transport/drivers/%s", driverID), http.StatusFound)
+}
+
+func (h *ApplicationHandler) OrganizedCarpoolAddTrip(w http.ResponseWriter, r *http.Request) {
+	if r.Method != "POST" {
+		log.Error().Msg("Wrong method")
+		w.WriteHeader(http.StatusMethodNotAllowed)
+		return
+	}
+
+	if err := r.ParseForm(); err != nil {
+		log.Error().Err(err).Msg("error parsong availabilities form")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	vars := mux.Vars(r)
+	driverID := vars["driverid"]
+
+	trips := []*proto.CarpoolFeatureCollection{}
+
+	outwardtime := r.PostFormValue("outwardtime")
+	returntime := r.PostFormValue("returntime")
+	dep := r.PostFormValue("address_departure")
+	dest := r.PostFormValue("address_destination")
+
+	departure, err := geojson.UnmarshalFeature([]byte(dep))
+	if err != nil {
+		log.Error().Err(err).Msg("failed parsong departure geojson")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+	destination, err := geojson.UnmarshalFeature([]byte(dest))
+	if err != nil {
+		log.Error().Err(err).Msg("failed parsong departure geojson")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	outwardroute, err := h.services.Routing.Route([]orb.Point{departure.Point(), destination.Point()})
+	if err != nil {
+		log.Error().Err(err).Msg("failed calling route search")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+	returnroute, err := h.services.Routing.Route([]orb.Point{destination.Point(), departure.Point()})
+	if err != nil {
+		log.Error().Err(err).Msg("failed calling route search")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	outwardschedules := []map[string]any{}
+	returnschedules := []map[string]any{}
+
+	if r.PostFormValue("days.monday") == "on" {
+		outwardschedules = append(outwardschedules, map[string]any{
+			"day":         "MON",
+			"time_of_day": outwardtime,
+		})
+		returnschedules = append(returnschedules, map[string]any{
+			"day":         "MON",
+			"time_of_day": returntime,
+		})
+	}
+	if r.PostFormValue("days.tuesday") == "on" {
+		outwardschedules = append(outwardschedules, map[string]any{
+			"day":         "TUE",
+			"time_of_day": outwardtime,
+		})
+		returnschedules = append(returnschedules, map[string]any{
+			"day":         "TUE",
+			"time_of_day": returntime,
+		})
+	}
+	if r.PostFormValue("days.wednesday") == "on" {
+		outwardschedules = append(outwardschedules, map[string]any{
+			"day":         "WED",
+			"time_of_day": outwardtime,
+		})
+		returnschedules = append(returnschedules, map[string]any{
+			"day":         "WED",
+			"time_of_day": returntime,
+		})
+	}
+	if r.PostFormValue("days.thursday") == "on" {
+		outwardschedules = append(outwardschedules, map[string]any{
+			"day":         "THU",
+			"time_of_day": outwardtime,
+		})
+		returnschedules = append(returnschedules, map[string]any{
+			"day":         "THU",
+			"time_of_day": returntime,
+		})
+	}
+	if r.PostFormValue("days.friday") == "on" {
+		outwardschedules = append(outwardschedules, map[string]any{
+			"day":         "FRI",
+			"time_of_day": outwardtime,
+		})
+		returnschedules = append(returnschedules, map[string]any{
+			"day":         "FRI",
+			"time_of_day": returntime,
+		})
+	}
+	if r.PostFormValue("days.saturday") == "on" {
+		outwardschedules = append(outwardschedules, map[string]any{
+			"day":         "SAT",
+			"time_of_day": outwardtime,
+		})
+		returnschedules = append(returnschedules, map[string]any{
+			"day":         "SAT",
+			"time_of_day": returntime,
+		})
+	}
+	if r.PostFormValue("days.sunday") == "on" {
+		outwardschedules = append(outwardschedules, map[string]any{
+			"day":         "SUN",
+			"time_of_day": outwardtime,
+		})
+		returnschedules = append(returnschedules, map[string]any{
+			"day":         "SUN",
+			"time_of_day": returntime,
+		})
+	}
+
+	outward_fc := geojson.NewFeatureCollection()
+	outward_fc.Append(departure)
+	outward_fc.Append(destination)
+	outward_fc.ExtraMembers = geojson.Properties{}
+	outward_fc.ExtraMembers["properties"] = map[string]any{
+		"is_driver":    true,
+		"is_passenger": false,
+		"user": mobilityaccountsstorage.Account{
+			ID: driverID,
+		},
+		"polyline":          outwardroute.Summary.Polyline,
+		"schedules":         outwardschedules,
+		"driver_options":    map[string]any{},
+		"passenger_options": map[string]any{},
+	}
+	outwardtrip, err := outward_fc.MarshalJSON()
+	if err != nil {
+		log.Error().Err(err).Msg("failed parsong return geojson")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	return_fc := geojson.NewFeatureCollection()
+	return_fc.Append(destination)
+	return_fc.Append(departure)
+	return_fc.ExtraMembers = geojson.Properties{}
+	return_fc.ExtraMembers["properties"] = map[string]any{
+		"is_driver":    true,
+		"is_passenger": false,
+		"user": mobilityaccountsstorage.Account{
+			ID: driverID,
+		},
+		"polyline":          returnroute.Summary.Polyline,
+		"schedules":         returnschedules,
+		"driver_options":    map[string]any{},
+		"passenger_options": map[string]any{},
+	}
+	returntrip, err := return_fc.MarshalJSON()
+	if err != nil {
+		log.Error().Err(err).Msg("failed parsong return geojson")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	trips = append(trips, &proto.CarpoolFeatureCollection{
+		Serialized: string(outwardtrip),
+	})
+	trips = append(trips, &proto.CarpoolFeatureCollection{
+		Serialized: string(returntrip),
+	})
+
+	req := &proto.CreateRegularRoutesRequest{
+		Routes: trips,
+	}
+	_, err = h.services.GRPC.CarpoolService.CreateRegularRoutes(context.Background(), req)
+	if err != nil {
+		log.Error().Err(err).Msg("could not create regular routes")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	log.Info().Msg("Finished creating carpool routes")
+	http.Redirect(w, r, fmt.Sprintf("/app/organized-carpool/drivers/%s", driverID), http.StatusFound)
+}
+
+func (h *ApplicationHandler) OrganizedCarpoolDeleteTrip(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	driverID := vars["driverid"]
+	tripID := vars["tripid"]
+
+	req := &proto.DeleteRegularRoutesRequest{
+		Ids: []string{tripID},
+	}
+
+	_, err := h.services.GRPC.CarpoolService.DeleteRegularRoutes(context.Background(), req)
+	if err != nil {
+		log.Error().Err(err).Msg("could not delete regular routes")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	http.Redirect(w, r, fmt.Sprintf("/app/organized-carpool/drivers/%s", driverID), http.StatusFound)
+}
+
+func (h *ApplicationHandler) OrganizedCarpoolJourney(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	driverId := vars["driverid"]
+	journeyId := vars["journeyid"]
+
+	var passenger mobilityaccountsstorage.Account
+	passengerId := r.URL.Query().Get("passengerid")
+	log.Info().Str("journeyid", journeyId).Str("driverid", driverId).Str("passengerid", passengerId).Msg("driver journey")
+
+	journeyResp, err := h.services.GRPC.CarpoolService.GetPlannedTrip(context.Background(), &proto.GetPlannedTripRequest{
+		Id: journeyId,
+	})
+	if err != nil {
+		log.Error().Err(err).Msg("could not get driver journey")
+		w.WriteHeader(http.StatusNotFound)
+		return
+	}
+	journey, err := geojson.UnmarshalFeatureCollection([]byte(journeyResp.PlannedTrip.Serialized))
+	if err != nil {
+		log.Error().Err(err).Msg("could not unmarshal driver journey")
+		w.WriteHeader(http.StatusNotFound)
+		return
+	}
+
+	if r.Method == "POST" {
+		if passengerId == "" {
+			log.Error().Err(err).Msg("could not get driver journey")
+			w.WriteHeader(http.StatusNotFound)
+			return
+		}
+
+		/*if _, err := h.services.GRPC.CarpoolService.CreateBooking(context.Background(), &proto.CreateCarpoolBookingRequest{
+			Booking: &proto.CarpoolServiceBooking{
+				Passenger: &proto.CarpoolServiceUser{
+					Id: passengerId,
+				},
+				Driver: &proto.CarpoolServiceUser{
+					Id: driverId,
+				},
+			}
+			PassengerId:     passengerId,
+			DriverId:        driverId,
+			DriverJourneyId: journeyId,
+		}); err != nil {
+			log.Error().Err(err).Msg("cannot create booking")
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}*/
+		http.Redirect(w, r, fmt.Sprintf("/app/organized_carpool/"), http.StatusFound)
+		return
+	}
+
+	driver, err := h.services.GetAccount(driverId)
+	if err != nil {
+		log.Error().Err(err).Msg("could not get driver")
+		w.WriteHeader(http.StatusNotFound)
+		return
+	}
+	if passengerId != "" {
+		passenger, err = h.services.GetAccount(passengerId)
+		if err != nil {
+			log.Error().Err(err).Msg("could not get account")
+			w.WriteHeader(http.StatusNotFound)
+			return
+		}
+	}
+
+	beneficiaries, err := h.beneficiaries(r)
+	if err != nil {
+		log.Error().Err(err).Msg("")
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+
+	/*driverjourney, err := transformers.DriverJourneyProtoToType(journey.DriverJourney)
+	if err != nil {
+		log.Error().Err(err).Msg("could not transform driver journey type")
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}*/
+
+	h.Renderer.OrganizedCarpoolJourney(w, r, journey, driver, passenger, beneficiaries)
+}
+
+func parseOrganizedCarpoolDriversForm(r *http.Request) (map[string]any, error) {
+	if err := r.ParseForm(); err != nil {
+		return nil, err
+	}
+
+	log.Info().Any("form content", r.Form).Msg("parsing form")
+
+	var date *time.Time
+
+	if r.PostFormValue("birthdate") != "" {
+		d, err := time.Parse("2006-01-02", r.PostFormValue("birthdate"))
+		if err != nil {
+			return nil, err
+		}
+		date = &d
+	}
+
+	formData := OrganizedCarpoolDriversForm{
+		FirstName:   r.PostFormValue("first_name"),
+		LastName:    r.PostFormValue("last_name"),
+		Email:       r.PostFormValue("email"),
+		Birthdate:   date,
+		PhoneNumber: r.PostFormValue("phone_number"),
+		FileNumber:  r.PostFormValue("file_number"),
+		Gender:      r.PostFormValue("gender"),
+	}
+
+	if r.PostFormValue("address") != "" {
+		var a any
+		json.Unmarshal([]byte(r.PostFormValue("address")), &a)
+
+		formData.Address = a
+	}
+
+	if r.PostFormValue("address_destination") != "" {
+		var a any
+		json.Unmarshal([]byte(r.PostFormValue("address_destination")), &a)
+
+		formData.AddressDestination = a
+	}
+
+	validate := formvalidators.New()
+	if err := validate.Struct(formData); err != nil {
+		return nil, err
+	}
+
+	d, err := json.Marshal(formData)
+	if err != nil {
+		return nil, err
+	}
+
+	var dataMap map[string]any
+	err = json.Unmarshal(d, &dataMap)
+	if err != nil {
+		return nil, err
+	}
+
+	return dataMap, nil
+}
--- a/handlers/application/sms.go
+++ b/handlers/application/sms.go
@ -0,0 +1,58 @@
+package application
+
+import (
+	"errors"
+	"net/http"
+
+	"github.com/rs/zerolog/log"
+)
+
+func (h *ApplicationHandler) SendSMS(w http.ResponseWriter, r *http.Request) {
+	if r.Method != "POST" {
+		w.WriteHeader(http.StatusMethodNotAllowed)
+		return
+	}
+	referer := r.Referer()
+
+	if err := r.ParseForm(); err != nil {
+		log.Error().Err(err).Msg("Bad request")
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+
+	message := r.PostFormValue("message")
+	beneficiaryid := r.PostFormValue("beneficiaryid")
+
+	h.GenerateSMS(beneficiaryid, message)
+
+	http.Redirect(w, r, referer, http.StatusFound)
+}
+
+func (h *ApplicationHandler) GenerateSMS(recipientid string, message string) error {
+	recipient, err := h.services.GetAccount(recipientid)
+	if err != nil {
+		log.Error().Err(err).Msg("user not found")
+		return err
+	}
+
+	pn, ok := recipient.Data["phone_number"]
+	if !ok {
+		log.Error().Msg("Beneficiary doesn't have a phone number")
+		return errors.New("missing phone number")
+	}
+	phoneNumber, ok := pn.(string)
+	if !ok {
+		log.Error().Msg("phone number type error")
+		return errors.New("phone number type error")
+	}
+
+	sender := h.config.GetString("service_name")
+
+	err = h.services.SMS.Send(phoneNumber, message, sender)
+	if err != nil {
+		log.Error().Err(err).Msg("cannot send SMS")
+		return err
+	}
+
+	return nil
+}
--- a/handlers/application/solidarity-transport-ext.go
+++ b/handlers/application/solidarity-transport-ext.go
@ -0,0 +1,80 @@
+package application
+
+import (
+	"context"
+	"net/http"
+
+	"git.coopgo.io/coopgo-platform/solidarity-transport/servers/grpc/proto/gen"
+	"git.coopgo.io/coopgo-platform/solidarity-transport/servers/grpc/transformers"
+	"github.com/gorilla/mux"
+	"github.com/rs/zerolog/log"
+)
+
+func (h *ApplicationHandler) SolidarityTransportExternalBookingProposal(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	bookingId := vars["bookingid"]
+
+	resp, err := h.services.GRPC.SolidarityTransport.GetSolidarityTransportBooking(context.Background(), &gen.GetSolidarityTransportBookingRequest{
+		Id: bookingId,
+	})
+
+	booking, err := transformers.BookingProtoToType(resp.Booking)
+	if err != nil {
+		log.Error().Err(err).Msg("could not transform booking type")
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+
+	driver, err := h.services.GetAccount(booking.DriverId)
+	if err != nil {
+		log.Error().Err(err).Msg("driver retrieval issue")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	passenger, err := h.services.GetAccount(booking.PassengerId)
+	if err != nil {
+		log.Error().Err(err).Msg("passenger retrieval issue")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	if r.Method == "POST" {
+		if err = r.ParseForm(); err != nil {
+			log.Error().Err(err).Msg("error parsing form data")
+		}
+		message := r.FormValue("message")
+		action := r.FormValue("action")
+		var status string
+		if action == "confirm" {
+			status = "VALIDATED"
+		} else if action == "cancel" {
+			status = "CANCELLED"
+		} else if action == "waitconfirmation" {
+			status = "WAITING_CONFIRMATION"
+		}
+		if status != "" {
+			if _, err := h.services.GRPC.SolidarityTransport.UpdateSolidarityTransportBookingStatus(context.Background(), &gen.UpdateSolidarityTransportBookingStatusRequest{
+				BookingId: bookingId,
+				NewStatus: status,
+				Reason:    "Refusé par le bénévole",
+			}); err != nil {
+				log.Error().Err(err).Msg("update booking status issue")
+				w.WriteHeader(http.StatusInternalServerError)
+				return
+			}
+			booking.Status = status
+			if status == "VALIDATED" {
+				h.GenerateSMS(passenger.ID, message)
+			} else if status == "CANCELLED" {
+				if err := h.creditWallet(passenger.ID, booking.Journey.Price.Amount); err != nil {
+					log.Error().Err(err).Msg("could not credit wallet")
+					w.WriteHeader(http.StatusInternalServerError)
+					return
+				}
+			}
+		}
+	}
+
+	h.Renderer.SolidarityTransportExternalBookingDisplay(w, r, booking, driver, passenger)
+}
--- a/handlers/application/solidarity-transport.go
+++ b/handlers/application/solidarity-transport.go
@ -0,0 +1,927 @@
+package application
+
+import (
+	"cmp"
+	"context"
+	"encoding/json"
+	"fmt"
+	"io"
+	"net/http"
+	"slices"
+	"sort"
+	"strconv"
+	"strings"
+	"time"
+
+	mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
+	mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
+	"git.coopgo.io/coopgo-platform/payments/pricing"
+	"git.coopgo.io/coopgo-platform/solidarity-transport/servers/grpc/proto/gen"
+	"git.coopgo.io/coopgo-platform/solidarity-transport/servers/grpc/transformers"
+	"git.coopgo.io/coopgo-platform/solidarity-transport/types"
+	"github.com/google/uuid"
+	"github.com/gorilla/mux"
+	"github.com/paulmach/orb/geojson"
+	"github.com/rs/zerolog/log"
+	"google.golang.org/protobuf/types/known/structpb"
+	"google.golang.org/protobuf/types/known/timestamppb"
+
+	formvalidators "git.coopgo.io/coopgo-apps/parcoursmob/utils/form-validators"
+	"git.coopgo.io/coopgo-apps/parcoursmob/utils/sorting"
+	filestorage "git.coopgo.io/coopgo-apps/parcoursmob/utils/storage"
+)
+
+type DriversForm struct {
+	FirstName   string     `json:"first_name" validate:"required"`
+	LastName    string     `json:"last_name" validate:"required"`
+	Email       string     `json:"email" validate:"required,email"`
+	Birthdate   *time.Time `json:"birthdate" validate:"required"`
+	PhoneNumber string     `json:"phone_number" validate:"required,phoneNumber"`
+	Address     any        `json:"address,omitempty"`
+	Gender      string     `json:"gender"`
+}
+
+const (
+	Sunday = iota
+	Monday
+	Tuesday
+	Wednesday
+	Thursday
+	Friday
+	Saturday
+)
+
+func (h *ApplicationHandler) SolidarityTransportOverview(w http.ResponseWriter, r *http.Request) {
+	accounts, err := h.solidarityDrivers(r)
+	if err != nil {
+		log.Error().Err(err).Msg("issue getting solidarity drivers")
+		accounts = []mobilityaccountsstorage.Account{}
+	}
+
+	accountsMap := map[string]mobilityaccountsstorage.Account{}
+
+	for _, a := range accounts {
+		accountsMap[a.ID] = a
+	}
+
+	beneficiariesMap, err := h.services.GetBeneficiariesMap()
+	if err != nil {
+		beneficiariesMap = map[string]mobilityaccountsstorage.Account{}
+	}
+
+	bookingsproto, err := h.services.GRPC.SolidarityTransport.GetSolidarityTransportBookings(context.Background(), &gen.GetSolidarityTransportBookingsRequest{
+		StartDate: timestamppb.Now(),
+		EndDate:   timestamppb.New(time.Now().Add(24 * 365 * time.Hour)),
+	})
+	if err != nil {
+		log.Error().Err(err).Msg("issue retreving bookings")
+	}
+
+	bookings := []*types.Booking{}
+
+	if err == nil {
+		for _, b := range bookingsproto.Bookings {
+			booking, _ := transformers.BookingProtoToType(b)
+			bookings = append(bookings, booking)
+		}
+	}
+	bookingshistoryproto, err := h.services.GRPC.SolidarityTransport.GetSolidarityTransportBookings(context.Background(), &gen.GetSolidarityTransportBookingsRequest{
+		EndDate:   timestamppb.Now(),
+		StartDate: timestamppb.New(time.Now().Add(-1 * 24 * 365 * time.Hour)),
+	})
+	if err != nil {
+		log.Error().Err(err).Msg("issue retreving bookings")
+	}
+
+	bookingshistory := []*types.Booking{}
+
+	if err == nil {
+		for _, b := range bookingshistoryproto.Bookings {
+			booking, _ := transformers.BookingProtoToType(b)
+			bookingshistory = append(bookingshistory, booking)
+		}
+	}
+
+	slices.SortFunc(accounts, func(a, b mobilityaccountsstorage.Account) int {
+		return strings.Compare(
+			strings.ToLower(fmt.Sprintf("%s %s", a.Data["first_name"].(string), a.Data["last_name"].(string))),
+			strings.ToLower(fmt.Sprintf("%s %s", b.Data["first_name"].(string), b.Data["last_name"].(string))),
+		)
+	})
+	slices.SortFunc(bookings, func(a, b *types.Booking) int {
+		return cmp.Compare(a.Journey.PassengerPickupDate.Unix(), b.Journey.PassengerPickupDate.Unix())
+	})
+	slices.SortFunc(bookingshistory, func(a, b *types.Booking) int {
+		return cmp.Compare(a.Journey.PassengerPickupDate.Unix(), b.Journey.PassengerPickupDate.Unix())
+	})
+
+	h.Renderer.SolidarityTransportOverview(w, r, accounts, accountsMap, beneficiariesMap, bookings, bookingshistory)
+}
+
+func (h *ApplicationHandler) SolidarityTransportCreateDriver(w http.ResponseWriter, r *http.Request) {
+	if r.Method == "POST" {
+		dataMap, err := parseBeneficiariesForm(r)
+		if err != nil {
+			log.Error().Err(err).Msg("")
+			w.WriteHeader(http.StatusBadRequest)
+			return
+		}
+
+		data, err := structpb.NewValue(dataMap)
+		if err != nil {
+			log.Error().Err(err).Msg("")
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		request := &mobilityaccounts.RegisterRequest{
+			Account: &mobilityaccounts.Account{
+				Namespace: "solidarity_drivers",
+				Data:      data.GetStructValue(),
+			},
+		}
+
+		resp, err := h.services.GRPC.MobilityAccounts.Register(context.TODO(), request)
+		if err != nil {
+			log.Error().Err(err).Msg("")
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		http.Redirect(w, r, fmt.Sprintf("/app/solidarity-transport/drivers/%s", resp.Account.Id), http.StatusFound)
+		return
+	}
+
+	h.Renderer.SolidarityTransportCreateDriver(w, r)
+}
+
+func (h *ApplicationHandler) SolidarityTransportUpdateDriver(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	driverID := vars["driverid"]
+
+	driver, err := h.services.GetAccount(driverID)
+	if err != nil {
+		log.Error().Err(err).Msg("Issue retrieving driver account")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	if r.Method == "POST" {
+		dataMap, err := parseBeneficiariesForm(r)
+		if err != nil {
+			log.Error().Err(err).Msg("")
+			w.WriteHeader(http.StatusBadRequest)
+			return
+		}
+
+		data, err := structpb.NewValue(dataMap)
+		if err != nil {
+			log.Error().Err(err).Msg("")
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		request := &mobilityaccounts.UpdateDataRequest{
+			Account: &mobilityaccounts.Account{
+				Id:        driverID,
+				Namespace: "solidarity_drivers",
+				Data:      data.GetStructValue(),
+			},
+		}
+
+		resp, err := h.services.GRPC.MobilityAccounts.UpdateData(context.TODO(), request)
+		if err != nil {
+			log.Error().Err(err).Msg("")
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		http.Redirect(w, r, fmt.Sprintf("/app/solidarity-transport/drivers/%s", resp.Account.Id), http.StatusFound)
+		return
+	}
+
+	h.Renderer.SolidarityTransportUpdateDriver(w, r, driver)
+}
+
+func (h *ApplicationHandler) SolidarityTransportDriverDisplay(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	driverID := vars["driverid"]
+
+	documents := h.filestorage.List(filestorage.PREFIX_SOLIDARITY_TRANSPORT_DRIVERS + "/" + driverID)
+
+	driver, err := h.services.GetAccount(driverID)
+	if err != nil {
+		log.Error().Err(err).Msg("Issue retrieving driver account")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	availabilities := []*gen.DriverRegularAvailability{}
+
+	resp, err := h.services.GRPC.SolidarityTransport.GetDriverRegularAvailabilities(context.Background(), &gen.GetDriverRegularAvailabilitiesRequest{DriverId: driverID})
+	if err != nil {
+		log.Error().Err(err).Msg("error calling GetDriverRegularAvailabilities")
+	} else {
+		availabilities = resp.Results
+	}
+	sort.Sort(sorting.SolidarityAvailabilitiesByDay(availabilities))
+
+	bookingsresp, err := h.services.GRPC.SolidarityTransport.GetSolidarityTransportBookings(context.Background(), &gen.GetSolidarityTransportBookingsRequest{Driverid: driverID})
+	if err != nil {
+		log.Error().Err(err).Msg("could not get driver bookings")
+	}
+	log.Debug().Any("bookings", bookingsresp.Bookings).Msg("bookings list")
+	kmnb := int64(0)
+	bookings := slices.Collect(func(yield func(*gen.SolidarityTransportBooking) bool) {
+		for _, b := range bookingsresp.Bookings {
+			log.Debug().Str("bokking status", b.Status).Msg("candidate booking")
+			if b.Status == "VALIDATED" {
+				kmnb = kmnb + b.Journey.DriverDistance
+				if !yield(b) {
+					return
+				}
+			}
+		}
+	})
+	log.Debug().Any("bookings", bookings).Msg("bookings list")
+
+	stats := map[string]any{
+		"bookings": map[string]any{
+			"count": len(bookings),
+			"km":    kmnb,
+		},
+	}
+
+	h.Renderer.SolidarityTransportDriverDisplay(w, r, driver, availabilities, documents, bookings, stats)
+}
+
+func (h *ApplicationHandler) SolidarityTransportAddAvailability(w http.ResponseWriter, r *http.Request) {
+	if r.Method != "POST" {
+		log.Error().Msg("Wrong method")
+		w.WriteHeader(http.StatusMethodNotAllowed)
+		return
+	}
+
+	if err := r.ParseForm(); err != nil {
+		log.Error().Err(err).Msg("error parsong availabilities form")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	vars := mux.Vars(r)
+	driverID := vars["driverid"]
+
+	availabilities := []*gen.DriverRegularAvailability{}
+
+	starttime := r.PostFormValue("starttime")
+	endtime := r.PostFormValue("endtime")
+	address := r.PostFormValue("address")
+
+	if r.PostFormValue("days.monday") == "on" {
+		a := &gen.DriverRegularAvailability{
+			DriverId:  driverID,
+			Day:       Monday,
+			StartTime: starttime,
+			EndTime:   endtime,
+			Address: &gen.GeoJsonFeature{
+				Serialized: address,
+			},
+		}
+		availabilities = append(availabilities, a)
+	}
+	if r.PostFormValue("days.tuesday") == "on" {
+		a := &gen.DriverRegularAvailability{
+			DriverId:  driverID,
+			Day:       Tuesday,
+			StartTime: starttime,
+			EndTime:   endtime,
+			Address: &gen.GeoJsonFeature{
+				Serialized: address,
+			},
+		}
+		availabilities = append(availabilities, a)
+	}
+	if r.PostFormValue("days.wednesday") == "on" {
+		a := &gen.DriverRegularAvailability{
+			DriverId:  driverID,
+			Day:       Wednesday,
+			StartTime: starttime,
+			EndTime:   endtime,
+			Address: &gen.GeoJsonFeature{
+				Serialized: address,
+			},
+		}
+		availabilities = append(availabilities, a)
+	}
+	if r.PostFormValue("days.thursday") == "on" {
+		a := &gen.DriverRegularAvailability{
+			DriverId:  driverID,
+			Day:       Thursday,
+			StartTime: starttime,
+			EndTime:   endtime,
+			Address: &gen.GeoJsonFeature{
+				Serialized: address,
+			},
+		}
+		availabilities = append(availabilities, a)
+	}
+	if r.PostFormValue("days.friday") == "on" {
+		a := &gen.DriverRegularAvailability{
+			DriverId:  driverID,
+			Day:       Friday,
+			StartTime: starttime,
+			EndTime:   endtime,
+			Address: &gen.GeoJsonFeature{
+				Serialized: address,
+			},
+		}
+		availabilities = append(availabilities, a)
+	}
+	if r.PostFormValue("days.saturday") == "on" {
+		a := &gen.DriverRegularAvailability{
+			DriverId:  driverID,
+			Day:       Saturday,
+			StartTime: starttime,
+			EndTime:   endtime,
+			Address: &gen.GeoJsonFeature{
+				Serialized: address,
+			},
+		}
+		availabilities = append(availabilities, a)
+	}
+	if r.PostFormValue("days.sunday") == "on" {
+		a := &gen.DriverRegularAvailability{
+			DriverId:  driverID,
+			Day:       Sunday,
+			StartTime: starttime,
+			EndTime:   endtime,
+			Address: &gen.GeoJsonFeature{
+				Serialized: address,
+			},
+		}
+		availabilities = append(availabilities, a)
+	}
+
+	req := &gen.AddDriverRegularAvailabilitiesRequest{
+		Availabilities: availabilities,
+	}
+	_, err := h.services.GRPC.SolidarityTransport.AddDriverRegularAvailabilities(context.Background(), req)
+	if err != nil {
+		log.Error().Err(err).Msg("could not add availabilities")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	log.Info().Msg("Finished creating availabilities")
+	http.Redirect(w, r, fmt.Sprintf("/app/solidarity-transport/drivers/%s", driverID), http.StatusFound)
+}
+
+func (h *ApplicationHandler) SolidarityTransportUnarchiveDriver(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	driverID := vars["driverid"]
+
+	data, _ := structpb.NewValue(map[string]any{
+		"archived": false,
+	})
+
+	request := &mobilityaccounts.UpdateDataRequest{
+		Account: &mobilityaccounts.Account{
+			Id:        driverID,
+			Namespace: "solidarity_transport_drivers",
+			Data:      data.GetStructValue(),
+		},
+	}
+
+	resp, err := h.services.GRPC.MobilityAccounts.UpdateData(context.TODO(), request)
+	if err != nil {
+		log.Error().Err(err).Msg("")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	http.Redirect(w, r, fmt.Sprintf("/app/solidarity-transport/drivers/%s", resp.Account.Id), http.StatusFound)
+}
+
+func (h *ApplicationHandler) SolidarityTransportDriverDocuments(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	driverID := vars["driverid"]
+
+	// r.ParseForm()
+	r.ParseMultipartForm(100 * 1024 * 1024)
+
+	document_type := r.FormValue("type")
+	document_name := r.FormValue("name")
+
+	file, header, err := r.FormFile("file-upload")
+	if err != nil {
+		log.Error().Err(err).Msg("")
+		return
+	}
+	defer file.Close()
+
+	fileid := uuid.NewString()
+
+	metadata := map[string]string{
+		"type": document_type,
+		"name": document_name,
+	}
+
+	log.Debug().Any("metadata", metadata).Msg("Metadata")
+
+	if err := h.filestorage.Put(file, filestorage.PREFIX_SOLIDARITY_TRANSPORT_DRIVERS, fmt.Sprintf("%s/%s_%s", driverID, fileid, header.Filename), header.Size, metadata); err != nil {
+		log.Error().Err(err).Msg("")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	http.Redirect(w, r, fmt.Sprintf("/app/solidarity-transport/drivers/%s", driverID), http.StatusFound)
+}
+
+func (h *ApplicationHandler) SolidarityTransportDocumentDownload(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	driverID := vars["driverid"]
+	document := vars["document"]
+
+	file, info, err := h.filestorage.Get(filestorage.PREFIX_SOLIDARITY_TRANSPORT_DRIVERS, fmt.Sprintf("%s/%s", driverID, document))
+	if err != nil {
+		log.Error().Err(err).Msg("")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	w.Header().Set("Content-Type", info.ContentType)
+	if _, err = io.Copy(w, file); err != nil {
+		log.Error().Err(err).Msg("")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	// http.Redirect(w, r, fmt.Sprintf("/app/solidarity-transport/drivers/%s", driverID), http.StatusFound)
+}
+
+func (h *ApplicationHandler) SolidarityTransportArchiveDriver(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	driverID := vars["driverid"]
+
+	data, _ := structpb.NewValue(map[string]any{
+		"archived": true,
+	})
+
+	request := &mobilityaccounts.UpdateDataRequest{
+		Account: &mobilityaccounts.Account{
+			Id:        driverID,
+			Namespace: "solidarity_transport_drivers",
+			Data:      data.GetStructValue(),
+		},
+	}
+
+	resp, err := h.services.GRPC.MobilityAccounts.UpdateData(context.TODO(), request)
+	if err != nil {
+		log.Error().Err(err).Msg("")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	http.Redirect(w, r, fmt.Sprintf("/app/solidarity-transport/drivers/%s", resp.Account.Id), http.StatusFound)
+}
+
+func (h *ApplicationHandler) SolidarityTransportDeleteAvailability(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	driverID := vars["driverid"]
+	availabilityID := vars["availabilityid"]
+
+	req := &gen.DeleteDriverRegularAvailabilityRequest{
+		DriverId:       driverID,
+		AvailabilityId: availabilityID,
+	}
+
+	if _, err := h.services.GRPC.SolidarityTransport.DeleteDriverRegularAvailability(context.Background(), req); err != nil {
+		log.Error().Err(err).Msg("could not delete availability")
+		w.WriteHeader(http.StatusNotFound)
+		return
+	}
+
+	http.Redirect(w, r, fmt.Sprintf("/app/solidarity-transport/drivers/%s", driverID), http.StatusFound)
+}
+
+func (h *ApplicationHandler) SolidarityTransportDriverJourney(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	driverId := vars["driverid"]
+	journeyId := vars["journeyid"]
+
+	var passenger mobilityaccountsstorage.Account
+	passengerId := r.URL.Query().Get("passengerid")
+	log.Info().Str("journeyid", journeyId).Str("driverid", driverId).Msg("driver journey")
+
+	journey, err := h.services.GRPC.SolidarityTransport.GetDriverJourney(context.Background(), &gen.GetDriverJourneyRequest{
+		DriverId:  driverId,
+		JourneyId: journeyId,
+	})
+	if err != nil {
+		log.Error().Err(err).Msg("could not get driver journey")
+		w.WriteHeader(http.StatusNotFound)
+		return
+	}
+	if passengerId != "" {
+		passenger, err = h.services.GetAccount(passengerId)
+		if err != nil {
+			log.Error().Err(err).Msg("could not get account")
+			w.WriteHeader(http.StatusNotFound)
+			return
+		}
+	}
+
+	j, err := transformers.DriverJourneyProtoToType(journey.DriverJourney)
+	if err != nil {
+		log.Error().Err(err).Msg("could not get driver journey")
+		w.WriteHeader(http.StatusNotFound)
+		return
+	}
+	solidarity, err := h.services.GRPC.SolidarityTransport.GetSolidarityTransportBookings(context.Background(), &gen.GetSolidarityTransportBookingsRequest{
+		Passengerid: passengerId,
+		StartDate:   timestamppb.New(time.Now().Add(-12 * 730 * time.Hour)),
+		EndDate:     timestamppb.New(time.Now().Add(12 * 730 * time.Hour)),
+	})
+
+	priority := false
+	if a, ok := passenger.Data["other_properties"]; ok {
+		if b, ok := a.(map[string]any); ok {
+			if c, ok := b["status"]; ok {
+				if p, ok := c.(string); ok {
+					priority = (p == "Prioritaire")
+				}
+			}
+		}
+	}
+
+	history := 0
+	if op, ok := passenger.Data["other_properties"]; ok {
+		if op_map, ok := op.(map[string]any); ok {
+			if pst, ok := op_map["previous_solidarity_transport"]; ok {
+				if pst_str, ok := pst.(string); ok {
+					if pst_str != "" {
+						if n, err := strconv.Atoi(pst_str); err == nil {
+							history = history + n
+						} else {
+							log.Error().Err(err).Str("n", pst_str).Msg("string to int conversion error")
+						}
+					}
+				}
+			}
+		}
+	}
+
+	history = history + len(solidarity.Bookings)
+
+	log.Debug().Any("history", history).Msg("history check")
+
+	benefParams := pricing.BeneficiaryParams{}
+	if passengerId == "" {
+		benefParams = pricing.BeneficiaryParams{
+			Address:  h.pricingGeography(j.PassengerPickup),
+			History:  99,
+			Priority: false,
+		}
+	} else {
+		log.Debug().Any("passenger data", passenger.Data).Msg("0")
+		var passengerGeo pricing.GeographyParams
+		if pa, ok := passenger.Data["address"]; ok {
+			jsonpa, err := json.Marshal(pa)
+			if err == nil {
+				passGeojson, err := geojson.UnmarshalFeature(jsonpa)
+				if err == nil {
+					passengerGeo = h.pricingGeography(passGeojson)
+				}
+			}
+		}
+		benefParams = pricing.BeneficiaryParams{
+			Address:  passengerGeo,
+			History:  history,
+			Priority: priority,
+		}
+	}
+	pricing, err := h.services.Pricing.Prices(pricing.PricingParams{
+		MobilityType: "solidarity_transport",
+		Beneficiary:  benefParams,
+		SharedMobility: pricing.SharedMobilityParams{
+			DriverDistance:    journey.DriverJourney.DriverDistance,
+			PassengerDistance: journey.DriverJourney.PassengerDistance,
+			Departure:         h.pricingGeography(j.PassengerPickup),
+			Destination:       h.pricingGeography(j.PassengerDrop),
+			OutwardOnly:       journey.DriverJourney.Noreturn,
+		},
+	})
+	if err != nil {
+		log.Error().Err(err).Msg("error in pricing calculation")
+	}
+
+	journey.DriverJourney.Price.Amount = pricing["passenger"].Amount
+	journey.DriverJourney.Price.Currency = "EUR"
+
+	if r.Method == "POST" {
+		if passengerId == "" {
+			log.Error().Err(err).Msg("could not get driver journey")
+			w.WriteHeader(http.StatusNotFound)
+			return
+		}
+
+		if err := r.ParseForm(); err != nil {
+			log.Error().Err(err).Msg("could not parse form input")
+			w.WriteHeader(http.StatusBadRequest)
+			return
+		}
+
+		rwt := r.PostFormValue("return_waiting_time")
+		return_waiting_time := int64(0)
+		return_waiting_time, err := strconv.ParseInt(rwt, 10, 64)
+		if err == nil {
+			log.Error().Err(err).Msg("return waiting time error")
+		}
+		motivation := r.PostFormValue("motivation")
+
+		data, err := structpb.NewStruct(map[string]any{
+			"motivation": motivation,
+		})
+		if err != nil {
+			log.Error().Err(err).Msg("issue creating data struct")
+		}
+
+		bookingRes, err := h.services.GRPC.SolidarityTransport.BookDriverJourney(context.Background(), &gen.BookDriverJourneyRequest{
+			PassengerId:           passengerId,
+			DriverId:              driverId,
+			DriverJourneyId:       journeyId,
+			ReturnWaitingDuration: return_waiting_time * int64(time.Minute),
+			PriceAmount:           journey.DriverJourney.Price.Amount,
+			PriceCurrency:         journey.DriverJourney.Price.Currency,
+			Data:                  data,
+		})
+		if err != nil {
+			log.Error().Err(err).Msg("cannot create booking")
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		message := r.PostFormValue("message")
+		doNotSend := r.PostFormValue("do_not_send")
+		send_message := strings.ReplaceAll(message, "{booking_id}", bookingRes.Booking.Id)
+		log.Debug().Str("message", send_message).Str("do not send", doNotSend).Msg("Driver journey booked : sending message")
+		if doNotSend != "on" {
+			h.GenerateSMS(driverId, send_message)
+
+			if err := h.creditWallet(passengerId, float64(-1)*journey.DriverJourney.Price.Amount); err != nil {
+				log.Error().Err(err).Msg("could not credit wallet")
+				w.WriteHeader(http.StatusInternalServerError)
+				return
+			}
+		}
+
+		http.Redirect(w, r, fmt.Sprintf("/app/solidarity-transport/"), http.StatusFound)
+		return
+	}
+
+	driver, err := h.services.GetAccount(driverId)
+	if err != nil {
+		log.Error().Err(err).Msg("could not get driver")
+		w.WriteHeader(http.StatusNotFound)
+		return
+	}
+
+	beneficiaries, err := h.beneficiaries(r)
+	if err != nil {
+		log.Error().Err(err).Msg("")
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+
+	driverjourney, err := transformers.DriverJourneyProtoToType(journey.DriverJourney)
+	if err != nil {
+		log.Error().Err(err).Msg("could not transform driver journey type")
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+
+	h.Renderer.SolidarityTransportDriverJourney(w, r, driverjourney, driver, passenger, beneficiaries)
+}
+
+func (h *ApplicationHandler) SolidarityTransportDriverJourneyToggleNoreturn(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	journeyId := vars["journeyid"]
+
+	_, err := h.services.GRPC.SolidarityTransport.ToggleSolidarityTransportNoreturn(context.Background(), &gen.ToggleSolidarityTransportNoreturnRequest{
+		JourneyId: journeyId,
+	})
+	if err != nil {
+		log.Error().Err(err).Msg("could not get driver journey")
+		w.WriteHeader(http.StatusNotFound)
+		return
+	}
+	log.Debug().Msg("here")
+	http.Redirect(w, r, r.Referer(), http.StatusFound)
+}
+
+func (h *ApplicationHandler) SolidarityTransportBookingDisplay(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	bookingId := vars["bookingid"]
+
+	resp, err := h.services.GRPC.SolidarityTransport.GetSolidarityTransportBooking(context.Background(), &gen.GetSolidarityTransportBookingRequest{
+		Id: bookingId,
+	})
+	if r.Method == "POST" {
+		if err := r.ParseForm(); err != nil {
+			log.Error().Err(err).Msg("could not parse form")
+			w.WriteHeader(http.StatusBadRequest)
+			return
+		}
+
+		driverDistanceStr := r.PostFormValue("driver_distance")
+
+		driverDistance, err := strconv.Atoi(driverDistanceStr)
+		if err != nil {
+			log.Error().Err(err).Msg("could not read distance")
+			w.WriteHeader(http.StatusBadRequest)
+			return
+		}
+		resp.Booking.Journey.DriverDistance = int64(driverDistance)
+
+		_, err = h.services.GRPC.SolidarityTransport.UpdateSolidarityTransportBooking(context.Background(), &gen.UpdateSolidarityTransportBookingRequest{
+			Booking: resp.Booking,
+		})
+		if err != nil {
+			log.Error().Err(err).Msg("could not update booking")
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+	}
+
+	booking, err := transformers.BookingProtoToType(resp.Booking)
+	if err != nil {
+		log.Error().Err(err).Msg("could not transform booking type")
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+
+	driver, err := h.services.GetAccount(booking.DriverId)
+	if err != nil {
+		log.Error().Err(err).Msg("driver retrieval issue")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	passenger, err := h.services.GetAccount(booking.PassengerId)
+	if err != nil {
+		log.Error().Err(err).Msg("passenger retrieval issue")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	h.Renderer.SolidarityTransportBookingDisplay(w, r, booking, driver, passenger)
+}
+
+func (h *ApplicationHandler) SolidarityTransportBookingStatus(action string) func(w http.ResponseWriter, r *http.Request) {
+	return func(w http.ResponseWriter, r *http.Request) {
+		vars := mux.Vars(r)
+		bookingId := vars["bookingid"]
+		reason := ""
+
+		status := ""
+		if action == "confirm" {
+			status = "VALIDATED"
+		} else if action == "cancel" {
+			status = "CANCELLED"
+			if r.Method == "POST" {
+				r.ParseForm()
+				reason = r.PostFormValue("reason")
+			}
+		} else if action == "waitconfirmation" {
+			status = "WAITING_CONFIRMATION"
+		}
+
+		if status != "" {
+			if _, err := h.services.GRPC.SolidarityTransport.UpdateSolidarityTransportBookingStatus(context.Background(), &gen.UpdateSolidarityTransportBookingStatusRequest{
+				BookingId: bookingId,
+				NewStatus: status,
+				Reason:    reason,
+			}); err != nil {
+				log.Error().Err(err).Msg("update booking status issue")
+				w.WriteHeader(http.StatusInternalServerError)
+				return
+			}
+			if status == "CANCELLED" {
+				booking, err := h.services.GRPC.SolidarityTransport.GetSolidarityTransportBooking(context.Background(), &gen.GetSolidarityTransportBookingRequest{
+					Id: bookingId,
+				})
+				if err == nil {
+					if err := h.creditWallet(booking.Booking.PassengerId, booking.Booking.Journey.Price.Amount); err != nil {
+						log.Error().Err(err).Msg("could not credit wallet")
+						w.WriteHeader(http.StatusInternalServerError)
+						return
+					}
+				}
+			}
+			if status == "WAITING_CONFIRMATION" {
+				booking, err := h.services.GRPC.SolidarityTransport.GetSolidarityTransportBooking(context.Background(), &gen.GetSolidarityTransportBookingRequest{
+					Id: bookingId,
+				})
+				if err == nil {
+					if err := h.creditWallet(booking.Booking.PassengerId, float64(-1)*booking.Booking.Journey.Price.Amount); err != nil {
+						log.Error().Err(err).Msg("could not credit wallet")
+						w.WriteHeader(http.StatusInternalServerError)
+						return
+					}
+				}
+			}
+		}
+		http.Redirect(w, r, fmt.Sprintf("/app/solidarity-transport/bookings/%s", bookingId), http.StatusFound)
+	}
+}
+
+func parseDriversForm(r *http.Request) (map[string]any, error) {
+	if err := r.ParseForm(); err != nil {
+		return nil, err
+	}
+
+	var date *time.Time
+
+	if r.PostFormValue("birthdate") != "" {
+		d, err := time.Parse("2006-01-02", r.PostFormValue("birthdate"))
+		if err != nil {
+			return nil, err
+		}
+		date = &d
+	}
+
+	formData := DriversForm{
+		FirstName:   r.PostFormValue("first_name"),
+		LastName:    r.PostFormValue("last_name"),
+		Email:       r.PostFormValue("email"),
+		Birthdate:   date,
+		PhoneNumber: r.PostFormValue("phone_number"),
+		Gender:      r.PostFormValue("gender"),
+	}
+
+	if r.PostFormValue("address") != "" {
+		var a any
+		json.Unmarshal([]byte(r.PostFormValue("address")), &a)
+
+		formData.Address = a
+	}
+
+	validate := formvalidators.New()
+	if err := validate.Struct(formData); err != nil {
+		return nil, err
+	}
+
+	d, err := json.Marshal(formData)
+	if err != nil {
+		return nil, err
+	}
+
+	var dataMap map[string]any
+	err = json.Unmarshal(d, &dataMap)
+	if err != nil {
+		return nil, err
+	}
+
+	return dataMap, nil
+}
+
+func (h *ApplicationHandler) solidarityDrivers(r *http.Request) ([]mobilityaccountsstorage.Account, error) {
+	accounts := []mobilityaccountsstorage.Account{}
+
+	request := &mobilityaccounts.GetAccountsRequest{
+		Namespaces: []string{"solidarity_drivers"},
+	}
+
+	resp, err := h.services.GRPC.MobilityAccounts.GetAccounts(context.TODO(), request)
+	if err != nil {
+		return accounts, err
+	}
+
+	for _, account := range resp.Accounts {
+		if filterAccount(r, account) {
+			a := account.ToStorageType()
+			accounts = append(accounts, a)
+		}
+	}
+
+	return accounts, err
+}
+
+func (h *ApplicationHandler) pricingGeography(loc *geojson.Feature) pricing.GeographyParams {
+	if loc == nil {
+		return pricing.GeographyParams{}
+	}
+
+	geo, err := h.services.Geography.GeoSearch(loc)
+	if err != nil {
+		log.Error().Err(err).Msg("issue in geosearch")
+		return pricing.GeographyParams{}
+	}
+	return pricing.GeographyParams{
+		Location:             loc,
+		CityCode:             geo["communes"].Properties.MustString("code"),
+		IntercommunalityCode: geo["epci"].Properties.MustString("code"),
+		RegionCode:           geo["regions"].Properties.MustString("code"),
+		DepartmentCode:       geo["departements"].Properties.MustString("code"),
+	}
+}
--- a/handlers/application/support.go
+++ b/handlers/application/support.go
@ -1,10 +1,10 @@
 package application

 import (
-	"fmt"
 	"net/http"

 	"git.coopgo.io/coopgo-apps/parcoursmob/utils/identification"
+	"github.com/rs/zerolog/log"
 )

 type Message struct {
@ -12,10 +12,9 @@ type Message struct {
 }

 func (h *ApplicationHandler) SupportSend(w http.ResponseWriter, r *http.Request) {
-
 	c := r.Context().Value(identification.ClaimsKey)
 	if c == nil {
-		fmt.Println("no current user claims")
+		log.Error().Msg("no current user claims")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -24,14 +23,19 @@ func (h *ApplicationHandler) SupportSend(w http.ResponseWriter, r *http.Request)
 	comment := r.PostFormValue(("comment"))

 	if r.Method == "POST" {
+		user_email := current_user_claims["email"].(string)
+
 		data := map[string]any{
 			"key":  comment,
-			"user": current_user_claims["email"],
+			"user": user_email,
 		}

+		log.Debug().Str("user_email", user_email).Msg("Sending message")
+
 		if err := h.emailing.Send("support.request", "support@parcoursmob.fr", data); err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("error sending email")
 			w.WriteHeader(http.StatusInternalServerError)
+			return
 		}
 		http.Redirect(w, r, "/app/", http.StatusFound)
 		return
--- a/handlers/application/vehicles-management.go
+++ b/handlers/application/vehicles-management.go
@ -17,21 +17,22 @@ import (
 	"git.coopgo.io/coopgo-platform/groups-management/storage"
 	mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
 	mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
-	"github.com/coreos/go-oidc"
+	"github.com/coreos/go-oidc/v3/oidc"
 	"github.com/google/uuid"
 	"github.com/gorilla/mux"
+	"github.com/rs/zerolog/log"
 	"google.golang.org/protobuf/types/known/structpb"
 	"google.golang.org/protobuf/types/known/timestamppb"
 )

 func (h *ApplicationHandler) VehiclesManagementOverview(w http.ResponseWriter, r *http.Request) {
-	//Get Vehicles
+	// Get Vehicles
 	request := &fleets.GetVehiclesRequest{
 		Namespaces: []string{"parcoursmob"},
 	}
 	resp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), request)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 	}

@ -60,19 +61,21 @@ func (h *ApplicationHandler) VehiclesManagementOverview(w http.ResponseWriter, r
 		}
 	}

+	driversMap, _ := h.services.GetBeneficiariesMap()
+
 	sort.Sort(sorting.VehiclesByLicencePlate(vehicles))
 	sort.Sort(sorting.BookingsByStartdate(bookings))
-	h.Renderer.VehiclesManagementOverview(w, r, vehicles, vehicles_map, bookings)
+	h.Renderer.VehiclesManagementOverview(w, r, vehicles, vehicles_map, driversMap, bookings)
 }

 func (h *ApplicationHandler) VehiclesManagementBookingsList(w http.ResponseWriter, r *http.Request) {
-	//Get Vehicles
+	// Get Vehicles
 	request := &fleets.GetVehiclesRequest{
 		Namespaces: []string{"parcoursmob"},
 	}
 	resp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), request)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 	}

@ -97,7 +100,9 @@ func (h *ApplicationHandler) VehiclesManagementBookingsList(w http.ResponseWrite
 	cacheid := uuid.NewString()
 	h.cache.PutWithTTL(cacheid, bookings, 1*time.Hour)

-	h.Renderer.VehiclesManagementBookingsList(w, r, vehicles_map, bookings, cacheid)
+	driversMap, _ := h.services.GetBeneficiariesMap()
+
+	h.Renderer.VehiclesManagementBookingsList(w, r, vehicles_map, driversMap, bookings, cacheid)
 }

 func (h *ApplicationHandler) VehiclesFleetAdd(w http.ResponseWriter, r *http.Request) {
@ -111,7 +116,7 @@ func (h *ApplicationHandler) VehiclesFleetAdd(w http.ResponseWriter, r *http.Req
 		group := g.(storage.Group)

 		if err := r.ParseForm(); err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusBadRequest)
 			return
 		}
@ -124,7 +129,7 @@ func (h *ApplicationHandler) VehiclesFleetAdd(w http.ResponseWriter, r *http.Req
 			var address map[string]any
 			err := json.Unmarshal([]byte(v), &address)
 			if err != nil {
-				fmt.Println(err)
+				log.Error().Err(err).Msg("")
 				w.WriteHeader(http.StatusInternalServerError)
 				return
 			}
@ -137,13 +142,15 @@ func (h *ApplicationHandler) VehiclesFleetAdd(w http.ResponseWriter, r *http.Req
 			dataMap["licence_plate"] = v
 		}
 		if v := r.FormValue("automatic"); v != "" {
-			fmt.Println(v)
 			dataMap["automatic"] = (v == "on")
 		}
+		if v := r.FormValue("kilometers"); v != "" {
+			dataMap["kilometers"] = v
+		}

 		data, err := structpb.NewValue(dataMap)
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@ -161,9 +168,8 @@ func (h *ApplicationHandler) VehiclesFleetAdd(w http.ResponseWriter, r *http.Req
 		}

 		_, err = h.services.GRPC.Fleets.AddVehicle(context.TODO(), request)
-
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@ -186,12 +192,43 @@ func (h *ApplicationHandler) VehiclesFleetDisplay(w http.ResponseWriter, r *http

 	resp, err := h.services.GRPC.Fleets.GetVehicle(context.TODO(), request)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}

-	h.Renderer.VehiclesFleetDisplay(w, r, resp.Vehicle.ToStorageType())
+	beneficiaries, err := h.services.GetBeneficiariesMap()
+	if err != nil {
+		log.Error().Err(err).Msg("issue retrieving beneficiaries")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+	/*diag := []diagsstorage.Diag{}
+
+	diagsrequest := &diags.GetDiagsRequest{
+		Namespaces: []string{"parcoursmob_vehicles"},
+	}
+
+		diagsresp, err := h.services.GRPC.Diags.GetDiags(context.TODO(), diagsrequest)
+		if err != nil {
+			log.Error().Err(err).Msg("did not retrieve diags")
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		for _, d := range diagsresp.Diags {
+			diagData := d.Data.AsMap()
+			if vehicle, ok := diagData["vehicle"].(string); ok && vehicle == vehicleid {
+				diag = append(diag, d.ToStorageType())
+			}
+		} */
+
+	diagsAny := []any{}
+	/*for i, d := range diag {
+		diagsAny[i] = d
+	}*/
+
+	h.Renderer.VehiclesFleetDisplay(w, r, resp.Vehicle.ToStorageType(), beneficiaries, diagsAny)
 }

 func filterVehicle(r *http.Request, v *fleets.Vehicle) bool {
@ -217,7 +254,7 @@ func (h ApplicationHandler) VehicleManagementBookingDisplay(w http.ResponseWrite

 	booking, err := h.services.GetBooking(bookingid)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -265,7 +302,7 @@ func (h ApplicationHandler) VehicleManagementBookingDisplay(w http.ResponseWrite

 		_, err := h.services.GRPC.Fleets.UpdateBooking(context.TODO(), request)
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@ -282,7 +319,7 @@ func (h ApplicationHandler) VehicleManagementBookingDisplay(w http.ResponseWrite

 		beneficiaryresp, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), beneficiaryrequest)
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@ -296,7 +333,7 @@ func (h ApplicationHandler) VehicleManagementBookingDisplay(w http.ResponseWrite

 	groupresp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), grouprequest)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -311,7 +348,7 @@ func (h ApplicationHandler) VehicleManagementBookingDisplay(w http.ResponseWrite

 	alternativeresp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), alternativerequest)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 	}

 	alternatives := []any{}
@ -323,7 +360,32 @@ func (h ApplicationHandler) VehicleManagementBookingDisplay(w http.ResponseWrite
 	documents := h.filestorage.List(filestorage.PREFIX_BOOKINGS + "/" + bookingid)
 	file_types_map := h.config.GetStringMapString("storage.files.file_types")

-	h.Renderer.VehicleManagementBookingDisplay(w, r, booking, booking.Vehicle, beneficiary, groupresp.Group.ToStorageType(), documents, file_types_map, alternatives)
+	/*	diag := []diagsstorage.Diag{}
+
+		diagsrequest := &diags.GetDiagsRequest{
+			Namespaces: []string{"parcoursmob_bookings"},
+		}
+
+		diagsresp, err := h.services.GRPC.Diags.GetDiags(context.TODO(), diagsrequest)
+		if err != nil {
+			log.Error().Err(err).Msg("")
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		for _, d := range diagsresp.Diags {
+			diagData := d.Data.AsMap()
+			if booking, ok := diagData["booking"].(string); ok && booking == bookingid {
+				diag = append(diag, d.ToStorageType())
+			}
+		}*/
+
+	diagsAny := []any{}
+	/*for i, d := range diag {
+		diagsAny[i] = d
+	}*/
+
+	h.Renderer.VehicleManagementBookingDisplay(w, r, booking, booking.Vehicle, beneficiary, groupresp.Group.ToStorageType(), documents, file_types_map, alternatives, diagsAny)
 }

 func (h ApplicationHandler) VehicleManagementBookingChangeVehicle(w http.ResponseWriter, r *http.Request) {
@ -336,7 +398,7 @@ func (h ApplicationHandler) VehicleManagementBookingChangeVehicle(w http.Respons

 	booking, err := h.services.GetBooking(bookingid)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -351,19 +413,18 @@ func (h ApplicationHandler) VehicleManagementBookingChangeVehicle(w http.Respons

 	_, err = h.services.GRPC.Fleets.UpdateBooking(context.TODO(), request)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}

 	http.Redirect(w, r, fmt.Sprintf("/app/vehicles-management/bookings/%s", bookingid), http.StatusFound)
-
 }

 func (h ApplicationHandler) VehiclesFleetMakeUnavailable(w http.ResponseWriter, r *http.Request) { // Get Group
 	g := r.Context().Value(identification.GroupKey)
 	if g == nil {
-		fmt.Println("no current group")
+		log.Error().Msg("no current group")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -372,7 +433,7 @@ func (h ApplicationHandler) VehiclesFleetMakeUnavailable(w http.ResponseWriter,
 	// Get current user ID
 	u := r.Context().Value(identification.IdtokenKey)
 	if u == nil {
-		fmt.Println("no current user")
+		log.Error().Msg("no current user")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -381,7 +442,7 @@ func (h ApplicationHandler) VehiclesFleetMakeUnavailable(w http.ResponseWriter,
 	// Get current user claims
 	c := r.Context().Value(identification.ClaimsKey)
 	if c == nil {
-		fmt.Println("no current user claims")
+		log.Error().Msg("no current user claims")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -416,7 +477,7 @@ func (h ApplicationHandler) VehiclesFleetMakeUnavailable(w http.ResponseWriter,

 	datapb, err := structpb.NewStruct(data)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -435,7 +496,7 @@ func (h ApplicationHandler) VehiclesFleetMakeUnavailable(w http.ResponseWriter,

 	_, err = h.services.GRPC.Fleets.CreateBooking(context.TODO(), request)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
@ -443,31 +504,6 @@ func (h ApplicationHandler) VehiclesFleetMakeUnavailable(w http.ResponseWriter,
 	http.Redirect(w, r, fmt.Sprintf("/app/vehicles-management/fleet/%s", vehicleid), http.StatusFound)
 }

-//	func (h *ApplicationHandler) UnbookingVehicles(w http.ResponseWriter, r *http.Request) {
-//		request := &fleets.GetVehiclesRequest{
-//			Namespaces: []string{"parcoursmob"},
-//		}
-//		resp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), request)
-//		if err != nil {
-//			fmt.Println(err)
-//			w.WriteHeader(http.StatusInternalServerError)
-//		}
-//		vehicles := []fleetsstorage.Vehicle{}
-//		fmt.Println(resp.Vehicles[0].Bookings)
-//		for i, vehicle := range resp.Vehicles {
-//			if len(resp.Vehicles[i].Bookings) == 0 {
-//				v := vehicle.ToStorageType()
-//				vehicles = append(vehicles, v)
-//			}
-//		}
-//		// if len(resp.Vehicle.ToStorageType().Bookings) == 0 {
-//		// 	h.Renderer.UnbookingVehicles(w, r, resp.Vehicle.ToStorageType())
-//		// }
-//		// fmt.Println(resp.Vehicle.ToStorageType().Bookings)
-//		fmt.Println(vehicles)
-//		h.Renderer.UnbookingVehicles(w, r, vehicles)
-//	}
-
 func (h *ApplicationHandler) DeleteBooking(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 	bookingid := vars["bookingid"]
@ -496,7 +532,7 @@ func (h *ApplicationHandler) UnbookingVehicle(w http.ResponseWriter, r *http.Req

 	resp, err := h.services.GRPC.Fleets.GetBooking(context.TODO(), request)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -509,14 +545,14 @@ func (h *ApplicationHandler) UnbookingVehicle(w http.ResponseWriter, r *http.Req

 	current_group, err := h.currentGroup(r)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}

 	current_user_token, current_user_claims, err := h.currentUser(r)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -556,7 +592,7 @@ func (h *ApplicationHandler) UnbookingVehicle(w http.ResponseWriter, r *http.Req

 	datapb, err := structpb.NewStruct(data)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -577,9 +613,8 @@ func (h *ApplicationHandler) UnbookingVehicle(w http.ResponseWriter, r *http.Req
 		}

 		_, err := h.services.GRPC.Fleets.UpdateBooking(context.TODO(), request)
-
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@ -601,18 +636,18 @@ func (h *ApplicationHandler) VehiclesFleetUpdate(w http.ResponseWriter, r *http.

 	resp, err := h.services.GRPC.Fleets.GetVehicle(context.TODO(), request)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 	namespaceV := resp.Vehicle.Namespace
-	//typeV := resp.Vehicle.Type
+	// typeV := resp.Vehicle.Type
 	administratorsV := resp.Vehicle.Administrators

 	if r.Method == "POST" {
 		fmt.Print(r.FormValue("vehicle_type"))
 		if err := r.ParseForm(); err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusBadRequest)
 			return
 		}
@ -624,7 +659,7 @@ func (h *ApplicationHandler) VehiclesFleetUpdate(w http.ResponseWriter, r *http.
 			var address map[string]any
 			err := json.Unmarshal([]byte(v), &address)
 			if err != nil {
-				fmt.Println(err)
+				log.Error().Err(err).Msg("")
 				w.WriteHeader(http.StatusInternalServerError)
 				return
 			}
@ -636,14 +671,16 @@ func (h *ApplicationHandler) VehiclesFleetUpdate(w http.ResponseWriter, r *http.
 		if v := r.FormValue("licence_plate"); v != "" {
 			dataMap["licence_plate"] = v
 		}
+		if v := r.FormValue("kilometers"); v != "" {
+			dataMap["kilometers"] = v
+		}
 		if v := r.FormValue("automatic"); v != "" {
-			fmt.Println(v)
 			dataMap["automatic"] = (v == "on")
 		}

 		data, err := structpb.NewValue(dataMap)
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@ -659,9 +696,8 @@ func (h *ApplicationHandler) VehiclesFleetUpdate(w http.ResponseWriter, r *http.
 		}

 		resp, err := h.services.GRPC.Fleets.UpdateVehicle(context.TODO(), request)
-
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
--- a/handlers/application/vehicles.go
+++ b/handlers/application/vehicles.go
@ -2,9 +2,11 @@ package application

 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"io"
 	"net/http"
+	"slices"
 	"sort"
 	"strings"
 	"time"
@ -20,18 +22,19 @@ import (
 	mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
 	"github.com/google/uuid"
 	"github.com/gorilla/mux"
+	"github.com/paulmach/orb/geojson"
+	"github.com/rs/zerolog/log"
 	"google.golang.org/protobuf/types/known/structpb"
 	"google.golang.org/protobuf/types/known/timestamppb"
 )

 func (h ApplicationHandler) VehiclesSearch(w http.ResponseWriter, r *http.Request) {
 	r.ParseForm()
-
 	var beneficiary mobilityaccountsstorage.Account

 	beneficiarydocuments := []filestorage.FileInfo{}

-	vehicles := []any{}
+	vehicles := []storage.Vehicle{}
 	searched := false
 	start := r.FormValue("startdate")
 	end := r.FormValue("enddate")
@ -42,7 +45,7 @@ func (h ApplicationHandler) VehiclesSearch(w http.ResponseWriter, r *http.Reques

 	administrators := []string{}

-	if r.FormValue("beneficiaryid") != "" {
+	if r.FormValue("beneficiaryid") != "" && startdate.After(time.Now().Add(-24*time.Hour)) && enddate.After(startdate) {
 		// Handler form
 		searched = true

@ -52,7 +55,7 @@ func (h ApplicationHandler) VehiclesSearch(w http.ResponseWriter, r *http.Reques

 		respbeneficiary, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), requestbeneficiary)
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@ -71,7 +74,7 @@ func (h ApplicationHandler) VehiclesSearch(w http.ResponseWriter, r *http.Reques

 		resp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), request)
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 		}

@ -79,9 +82,7 @@ func (h ApplicationHandler) VehiclesSearch(w http.ResponseWriter, r *http.Reques
 			v := vehicle.ToStorageType()

 			if r.FormValue("type") == "Voiture" && automatic {
-				fmt.Println(v.Data["automatic"])
 				if auto, ok := v.Data["automatic"].(bool); !ok || !auto {
-					fmt.Println(v.Data["automatic"])
 					continue
 				}
 			}
@ -100,12 +101,27 @@ func (h ApplicationHandler) VehiclesSearch(w http.ResponseWriter, r *http.Reques
 			vehicles = append(vehicles, v)
 		}

+		// Sort vehicles if beneficiary address is set
+		if beneficiaryAddress, ok := beneficiary.Data["address"]; ok {
+			beneficiaryAddressJson, err := json.Marshal(beneficiaryAddress)
+			if err == nil {
+				beneficiaryAddressGeojson, err := geojson.UnmarshalFeature(beneficiaryAddressJson)
+				if err == nil {
+					slices.SortFunc(vehicles, sorting.VehiclesByDistanceFrom(*beneficiaryAddressGeojson))
+				} else {
+					log.Error().Err(err).Msg("error transforming beneficiary address to GeoJSON")
+				}
+			} else {
+				log.Error().Err(err).Msg("error transforming beneficiary address to JSON")
+			}
+		}
+
 		beneficiarydocuments = h.filestorage.List(filestorage.PREFIX_BENEFICIARIES + "/" + beneficiary.ID)
 	}

 	accounts, err := h.beneficiaries(r)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
@ -116,7 +132,7 @@ func (h ApplicationHandler) VehiclesSearch(w http.ResponseWriter, r *http.Reques
 			Groupids: administrators,
 		})
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@ -136,17 +152,16 @@ func (h ApplicationHandler) VehiclesSearch(w http.ResponseWriter, r *http.Reques
 }

 func (h ApplicationHandler) Book(w http.ResponseWriter, r *http.Request) {
-	fmt.Println("Book")
 	current_group, err := h.currentGroup(r)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}

 	current_user_token, current_user_claims, err := h.currentUser(r)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -159,7 +174,7 @@ func (h ApplicationHandler) Book(w http.ResponseWriter, r *http.Request) {
 		Vehicleid: vehicleid,
 	})
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		w.Write([]byte("Vehicle not found"))
 		w.Write([]byte(err.Error()))
@ -188,7 +203,7 @@ func (h ApplicationHandler) Book(w http.ResponseWriter, r *http.Request) {
 	}
 	datapb, err := structpb.NewStruct(data)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -213,7 +228,7 @@ func (h ApplicationHandler) Book(w http.ResponseWriter, r *http.Request) {
 		if existing_file == "" {
 			file, header, err := r.FormFile("doc-" + v)
 			if err != nil {
-				fmt.Println(err)
+				log.Error().Err(err).Msg("")
 				w.WriteHeader(http.StatusBadRequest)
 				w.Write([]byte("Document manquant : " + v))
 				return
@ -228,7 +243,7 @@ func (h ApplicationHandler) Book(w http.ResponseWriter, r *http.Request) {
 			}

 			if err := h.filestorage.Put(file, filestorage.PREFIX_BOOKINGS, fmt.Sprintf("%s/%s_%s", booking.Id, fileid, header.Filename), header.Size, metadata); err != nil {
-				fmt.Println(err)
+				log.Error().Err(err).Msg("")
 				w.WriteHeader(http.StatusInternalServerError)
 				return
 			}
@ -236,7 +251,7 @@ func (h ApplicationHandler) Book(w http.ResponseWriter, r *http.Request) {
 			path := strings.Split(existing_file, "/")

 			if err := h.filestorage.Copy(existing_file, fmt.Sprintf("%s/%s/%s", filestorage.PREFIX_BOOKINGS, booking.Id, path[len(path)-1])); err != nil {
-				fmt.Println(err)
+				log.Error().Err(err).Msg("")
 				w.WriteHeader(http.StatusInternalServerError)
 				return
 			}
@ -245,15 +260,15 @@ func (h ApplicationHandler) Book(w http.ResponseWriter, r *http.Request) {

 	_, err = h.services.GRPC.Fleets.CreateBooking(context.TODO(), request)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}

-	//NOTIFY GROUP MEMBERS
+	// NOTIFY GROUP MEMBERS
 	members, _, err := h.groupmembers(vehicle.Vehicle.Administrators[0])
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 	} else {
 		for _, m := range members {
 			if email, ok := m.Data["email"].(string); ok {
@ -265,7 +280,6 @@ func (h ApplicationHandler) Book(w http.ResponseWriter, r *http.Request) {
 	}

 	http.Redirect(w, r, fmt.Sprintf("/app/vehicles/bookings/%s", booking.Id), http.StatusFound)
-
 }

 func (h ApplicationHandler) VehicleBookingDisplay(w http.ResponseWriter, r *http.Request) {
@ -277,7 +291,7 @@ func (h ApplicationHandler) VehicleBookingDisplay(w http.ResponseWriter, r *http
 	}
 	resp, err := h.services.GRPC.Fleets.GetBooking(context.TODO(), request)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -301,7 +315,7 @@ func (h ApplicationHandler) VehicleBookingDisplay(w http.ResponseWriter, r *http

 	groupresp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), grouprequest)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -309,11 +323,35 @@ func (h ApplicationHandler) VehicleBookingDisplay(w http.ResponseWriter, r *http
 	documents := h.filestorage.List(filestorage.PREFIX_BOOKINGS + "/" + bookingid)
 	file_types_map := h.config.GetStringMapString("storage.files.file_types")

-	h.Renderer.VehicleBookingDisplay(w, r, booking, booking.Vehicle, beneficiaryresp.Account.ToStorageType(), groupresp.Group.ToStorageType(), documents, file_types_map)
+	/*diag := []diagsstorage.Diag{}
+
+	diagsrequest := &diags.GetDiagsRequest{
+		Namespaces: []string{"parcoursmob_bookings"},
+	}
+
+	diagsresp, err := h.services.GRPC.Diags.GetDiags(context.TODO(), diagsrequest)
+	if err != nil {
+		log.Error().Err(err).Msg("")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	for _, d := range diagsresp.Diags {
+		diagData := d.Data.AsMap()
+		if booking, ok := diagData["booking"].(string); ok && booking == bookingid {
+			diag = append(diag, d.ToStorageType())
+		}
+	} */
+
+	diagsAny := []any{}
+	/*for i, d := range diag {
+		diagsAny[i] = d
+	}*/
+
+	h.Renderer.VehicleBookingDisplay(w, r, booking, booking.Vehicle, beneficiaryresp.Account.ToStorageType(), groupresp.Group.ToStorageType(), documents, file_types_map, diagsAny)
 }

 func (h ApplicationHandler) VehiclesBookingsList(w http.ResponseWriter, r *http.Request) {
-
 	g := r.Context().Value(identification.GroupKey)
 	if g == nil {
 		w.WriteHeader(http.StatusBadRequest)
@ -325,7 +363,7 @@ func (h ApplicationHandler) VehiclesBookingsList(w http.ResponseWriter, r *http.
 	request := &fleets.GetBookingsRequest{}
 	resp, err := h.services.GRPC.Fleets.GetBookings(context.TODO(), request)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusNotFound)
 		return
 	}
@ -357,22 +395,21 @@ func (h *ApplicationHandler) BookingDocumentDownload(w http.ResponseWriter, r *h
 	bookingid := vars["bookingid"]
 	document := vars["document"]

-	fmt.Println(fmt.Sprintf("%s/%s", bookingid, document))
+	log.Debug().Str("booking id", bookingid).Str("document", document).Msg("Document and booking ID")

 	file, info, err := h.filestorage.Get(filestorage.PREFIX_BOOKINGS, fmt.Sprintf("%s/%s", bookingid, document))
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}

 	w.Header().Set("Content-Type", info.ContentType)
 	if _, err = io.Copy(w, file); err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}

 	http.Redirect(w, r, fmt.Sprintf("/app/vehicles/bookings/%s", bookingid), http.StatusFound)
-
 }
--- a/handlers/application/wallets.go
+++ b/handlers/application/wallets.go
@ -0,0 +1,69 @@
+package application
+
+import (
+	"context"
+	"net/http"
+	"strconv"
+
+	"git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
+	"github.com/gorilla/mux"
+	"github.com/rs/zerolog/log"
+)
+
+func (h ApplicationHandler) CreditWallet(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	userid := vars["userid"]
+
+	if r.Method != "POST" {
+		w.WriteHeader(http.StatusMethodNotAllowed)
+		return
+	}
+
+	r.ParseForm()
+
+	amountStr := r.FormValue("amount")
+
+	amount, err := strconv.ParseFloat(amountStr, 64)
+	if err != nil {
+		log.Error().Err(err).Msg("could not read amount")
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+
+	if err := h.creditWallet(userid, amount); err != nil {
+		log.Error().Err(err).Msg("could not credit wallet")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	http.Redirect(w, r, r.Referer(), http.StatusFound)
+}
+
+func (h *ApplicationHandler) creditWallet(userid string, amount float64) error {
+	account, err := h.services.GetAccount(userid)
+	if err != nil {
+		log.Error().Err(err).Msg("could not retrieve account")
+		return err
+	}
+
+	if account.Data["wallet"] == nil {
+		account.Data["wallet"] = float64(0)
+	}
+
+	account.Data["wallet"] = account.Data["wallet"].(float64) + amount
+	accountproto, err := grpcapi.AccountFromStorageType(&account)
+	if err != nil {
+		log.Error().Err(err).Msg("account type transformation issue")
+		return err
+	}
+
+	_, err = h.services.GRPC.MobilityAccounts.UpdateData(context.Background(), &grpcapi.UpdateDataRequest{
+		Account: accountproto,
+	})
+	if err != nil {
+		log.Error().Err(err).Msg("account type transformation issue")
+		return err
+	}
+
+	return nil
+}
--- a/handlers/auth/auth.go
+++ b/handlers/auth/auth.go
@ -18,9 +18,9 @@ type AuthHandler struct {
 	emailing *emailing.Mailer
 }

-func NewAuthHandler(cfg *viper.Viper, idp *identification.IdentificationProvider, svc *services.ServicesHandler, cache cache.CacheHandler, emailing *emailing.Mailer) (*AuthHandler, error) {
+func NewAuthHandler(cfg *viper.Viper, idp *identification.IdentificationProvider, svc *services.ServicesHandler, cache cache.CacheHandler, emailing *emailing.Mailer, filestorage cache.FileStorage) (*AuthHandler, error) {
 	templates_root := cfg.GetString("templates.root")
-	renderer := renderer.NewRenderer(cfg, templates_root)
+	renderer := renderer.NewRenderer(cfg, templates_root, filestorage)
 	return &AuthHandler{
 		idp:      idp,
 		config:   cfg,
--- a/handlers/auth/disconnect.go
+++ b/handlers/auth/disconnect.go
--- a/handlers/auth/groups.go
+++ b/handlers/auth/groups.go
@ -2,10 +2,10 @@ package auth

 import (
 	"context"
-	"fmt"
 	"net/http"

 	groupsmanagement "git.coopgo.io/coopgo-platform/groups-management/grpcapi"
+	"github.com/rs/zerolog/log"
 )

 func (h *AuthHandler) Groups(w http.ResponseWriter, r *http.Request) {
@ -42,7 +42,7 @@ func (h *AuthHandler) Groups(w http.ResponseWriter, r *http.Request) {

 	err = idtoken.Claims(&claims)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 	}

 	g := claims["groups"]
@ -65,7 +65,7 @@ func (h *AuthHandler) Groups(w http.ResponseWriter, r *http.Request) {

 	resp, err := h.services.GRPC.GroupsManagement.GetGroupsBatch(context.TODO(), request)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
--- a/handlers/auth/lost_password.go
+++ b/handlers/auth/lost_password.go
@ -4,12 +4,12 @@ import (
 	"context"
 	"crypto/rand"
 	"encoding/base64"
-	"fmt"
 	"io"
 	"net/http"
 	"time"

 	"git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
+	"github.com/rs/zerolog/log"
 )

 func (h *AuthHandler) LostPasswordInit(w http.ResponseWriter, r *http.Request) {
@ -22,14 +22,14 @@ func (h *AuthHandler) LostPasswordInit(w http.ResponseWriter, r *http.Request) {
 				Namespace: "parcoursmob",
 			})
 			if err != nil {
-				fmt.Println(err)
+				log.Error().Err(err).Msg("")
 				http.Redirect(w, r, "/app/", http.StatusFound)
 				return
 			}

 			b := make([]byte, 16)
 			if _, err := io.ReadFull(rand.Reader, b); err != nil {
-				fmt.Println(err)
+				log.Error().Err(err).Msg("")
 				w.WriteHeader(http.StatusInternalServerError)
 				return
 			}
@ -44,7 +44,7 @@ func (h *AuthHandler) LostPasswordInit(w http.ResponseWriter, r *http.Request) {
 			h.cache.PutWithTTL("retrieve-password/"+key, passwordretrieval, 72*time.Hour)

 			if err := h.emailing.Send("auth.retrieve_password", email, passwordretrieval); err != nil {
-				fmt.Println(err)
+				log.Error().Err(err).Msg("")
 				w.WriteHeader(http.StatusInternalServerError)
 				return
 			}
@ -62,7 +62,7 @@ func (h *AuthHandler) LostPasswordRecover(w http.ResponseWriter, r *http.Request
 	key := r.FormValue("key")
 	recover, err := h.cache.Get("retrieve-password/" + key)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		h.Renderer.LostPasswordRecoverKO(w, r, key)
 		return
 	}
@ -81,13 +81,13 @@ func (h *AuthHandler) LostPasswordRecover(w http.ResponseWriter, r *http.Request
 		})

 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 		}

 		err = h.cache.Delete("retrieve-password/" + key)
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 		}

 		http.Redirect(w, r, "/app/", http.StatusFound)
--- a/handlers/auth/onboarding.go
+++ b/handlers/auth/onboarding.go
@ -7,6 +7,7 @@ import (

 	mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
 	ma "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
+	"github.com/rs/zerolog/log"
 )

 func (h *AuthHandler) Onboarding(w http.ResponseWriter, r *http.Request) {
@ -15,7 +16,7 @@ func (h *AuthHandler) Onboarding(w http.ResponseWriter, r *http.Request) {
 	key := r.FormValue("key")
 	onboarding, err := h.cache.Get("onboarding/" + key)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		h.Renderer.AuthOnboardingKO(w, r, key)
 		return
 	}
@ -24,7 +25,7 @@ func (h *AuthHandler) Onboarding(w http.ResponseWriter, r *http.Request) {

 	if r.Method == "POST" {
 		if r.FormValue("password") == "" {
-			fmt.Println("password is empty !")
+			log.Error().Msg("Password is empty")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@ -58,7 +59,7 @@ func (h *AuthHandler) Onboarding(w http.ResponseWriter, r *http.Request) {

 		acc, err := mobilityaccounts.AccountFromStorageType(account)
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@ -70,14 +71,14 @@ func (h *AuthHandler) Onboarding(w http.ResponseWriter, r *http.Request) {
 		_, err = h.services.GRPC.MobilityAccounts.Register(context.TODO(), request)

 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}

 		err = h.cache.Delete("onboarding/" + key)
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 		}

 		http.Redirect(w, r, "/app/", http.StatusFound)
--- a/handlers/exports/agenda.go
+++ b/handlers/exports/agenda.go
@ -14,6 +14,7 @@ import (
 	accounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
 	accountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
 	"github.com/gorilla/mux"
+	"github.com/rs/zerolog/log"
 	"github.com/xuri/excelize/v2"
 )

@ -25,7 +26,7 @@ func (h *ExportsHandler) Agenda(filter string) func(w http.ResponseWriter, r *ht
 				Namespaces: []string{"parcoursmob_dispositifs"},
 			})
 			if err != nil {
-				fmt.Println(err)
+				log.Error().Err(err).Msg("")
 				w.WriteHeader(http.StatusInternalServerError)
 				return
 			}
@ -60,7 +61,7 @@ func (h *ExportsHandler) Agenda(filter string) func(w http.ResponseWriter, r *ht
 				Accountids: beneficiaries_ids,
 			})
 			if err != nil {
-				fmt.Println(err)
+				log.Error().Err(err).Msg("")
 				w.WriteHeader(http.StatusInternalServerError)
 				return
 			}
@ -83,7 +84,7 @@ func (h *ExportsHandler) Agenda(filter string) func(w http.ResponseWriter, r *ht
 				Id: eventId,
 			})
 			if err != nil {
-				fmt.Println(err)
+				log.Error().Err(err).Msg("")
 				w.WriteHeader(http.StatusInternalServerError)
 				return
 			}
@ -108,7 +109,7 @@ func (h *ExportsHandler) Agenda(filter string) func(w http.ResponseWriter, r *ht
 				Accountids: beneficiaries_ids,
 			})
 			if err != nil {
-				fmt.Println(err)
+				log.Error().Err(err).Msg("")
 				w.WriteHeader(http.StatusInternalServerError)
 				return
 			}
@ -131,7 +132,7 @@ func (h *ExportsHandler) generateExcel(events []agendastorage.Event, groups map[
 	f := excelize.NewFile()
 	defer func() {
 		if err := f.Close(); err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 		}
 	}()
 	f.SetCellValue("Sheet1", "A1", "Evénement")
--- a/handlers/exports/exports.go
+++ b/handlers/exports/exports.go
--- a/handlers/exports/fleets.go
+++ b/handlers/exports/fleets.go
@ -12,11 +12,11 @@ import (
 	groupsstorage "git.coopgo.io/coopgo-platform/groups-management/storage"
 	accounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
 	accountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
+	"github.com/rs/zerolog/log"
 	"github.com/xuri/excelize/v2"
 )

 func (h *ExportsHandler) Bookings(w http.ResponseWriter, r *http.Request) {
-
 	vehicles := map[string]fleetsstorage.Vehicle{}
 	bookings := []fleetsstorage.Booking{}
 	reequest := &fleets.GetVehiclesRequest{
@ -24,7 +24,7 @@ func (h *ExportsHandler) Bookings(w http.ResponseWriter, r *http.Request) {
 	}
 	reesp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), reequest)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -34,7 +34,6 @@ func (h *ExportsHandler) Bookings(w http.ResponseWriter, r *http.Request) {
 	for _, vehicle := range reesp.Vehicles {

 		v := vehicle.ToStorageType()
-		fmt.Println(v)

 		for _, b := range v.Bookings {
 			bookings = append(bookings, b)
@ -51,7 +50,7 @@ func (h *ExportsHandler) Bookings(w http.ResponseWriter, r *http.Request) {
 		Namespaces: []string{"parcoursmob_organizations"},
 	})
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -64,7 +63,7 @@ func (h *ExportsHandler) Bookings(w http.ResponseWriter, r *http.Request) {
 		Accountids: beneficiaries_ids,
 	})
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@ -79,7 +78,7 @@ func (h *ExportsHandler) Bookings(w http.ResponseWriter, r *http.Request) {
 	f := excelize.NewFile()
 	defer func() {
 		if err := f.Close(); err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 		}
 	}()

@ -112,7 +111,6 @@ func (h *ExportsHandler) Bookings(w http.ResponseWriter, r *http.Request) {
 				if v3, ok := v2["display_name"].(string); ok {
 					bookedby = v3
 				}
-
 			}
 		}

@ -170,5 +168,141 @@ func (h *ExportsHandler) Bookings(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Content-Transfer-Encoding", "binary")
 	w.Header().Set("Expires", "0")
 	f.Write(w)
-
+}
+
+func (h *ExportsHandler) AllBookings(w http.ResponseWriter, r *http.Request) {
+	vehicles := map[string]fleetsstorage.Vehicle{}
+	bookings := []fleetsstorage.Booking{}
+	reequest := &fleets.GetVehiclesRequest{
+		Namespaces: []string{"parcoursmob"},
+	}
+	reesp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), reequest)
+	if err != nil {
+		log.Error().Err(err).Msg("")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	beneficiaries_ids := []string{}
+
+	for _, vehicle := range reesp.Vehicles {
+
+		v := vehicle.ToStorageType()
+
+		for _, b := range v.Bookings {
+			bookings = append(bookings, b)
+			beneficiaries_ids = append(beneficiaries_ids, b.Driver)
+		}
+
+		vehicles[vehicle.Id] = v
+
+	}
+
+	groups := map[string]groupsstorage.Group{}
+
+	admingroups, err := h.services.GRPC.GroupsManagement.GetGroups(context.TODO(), &groupsmanagement.GetGroupsRequest{
+		Namespaces: []string{"parcoursmob_organizations"},
+	})
+	if err != nil {
+		log.Error().Err(err).Msg("")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	for _, g := range admingroups.Groups {
+		groups[g.Id] = g.ToStorageType()
+	}
+
+	beneficiaries, err := h.services.GRPC.MobilityAccounts.GetAccountsBatch(context.TODO(), &accounts.GetAccountsBatchRequest{
+		Accountids: beneficiaries_ids,
+	})
+	if err != nil {
+		log.Error().Err(err).Msg("")
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	beneficiaries_map := map[string]accountsstorage.Account{}
+	for _, ben := range beneficiaries.Accounts {
+		beneficiaries_map[ben.Id] = ben.ToStorageType()
+	}
+
+	/////////////// Generate file
+
+	f := excelize.NewFile()
+	defer func() {
+		if err := f.Close(); err != nil {
+			log.Error().Err(err).Msg("")
+		}
+	}()
+
+	f.SetCellValue("Sheet1", "A1", "Numéro")
+	f.SetCellValue("Sheet1", "B1", "Type")
+	f.SetCellValue("Sheet1", "C1", "Gestionnaire")
+	f.SetCellValue("Sheet1", "D1", "Prescripteur")
+	f.SetCellValue("Sheet1", "E1", "Bénéficiaire")
+	f.SetCellValue("Sheet1", "F1", "Numéro allocataire / Pole emploi")
+	f.SetCellValue("Sheet1", "G1", "Début de Mise à disposition")
+	f.SetCellValue("Sheet1", "H1", "Fin de mise à disposition")
+	f.SetCellValue("Sheet1", "I1", "Début indisponibilité")
+	f.SetCellValue("Sheet1", "J1", "Fin indisponibilité")
+	f.SetCellValue("Sheet1", "K1", "Véhicule retiré")
+	f.SetCellValue("Sheet1", "L1", "Commentaire - Retrait véhicule")
+	f.SetCellValue("Sheet1", "M1", "Réservation supprimée")
+	f.SetCellValue("Sheet1", "N1", "Motif de la suppression")
+
+	i := 2
+	for _, b := range bookings {
+		vehicle := vehicles[b.Vehicleid]
+		if len(vehicle.Administrators) == 0 {
+			continue
+		}
+		admin := groups[vehicle.Administrators[0]]
+
+		bookedby := ""
+		if v, ok := b.Data["booked_by"].(map[string]any); ok {
+			if v2, ok := v["user"].(map[string]any); ok {
+				if v3, ok := v2["display_name"].(string); ok {
+					bookedby = v3
+				}
+			}
+		}
+
+		beneficiary := beneficiaries_map[b.Driver]
+		adminunavailability := false
+
+		if av, ok := b.Data["administrator_unavailability"].(bool); ok && av {
+			adminunavailability = true
+		}
+
+		deleted := ""
+		v, ok := b.Data["Deleted"]
+		fmt.Println(v)
+		fmt.Println(ok)
+		if b.Deleted || (ok && v.(bool)) {
+			deleted = "DELETED"
+		}
+
+		f.SetCellValue("Sheet1", fmt.Sprintf("A%d", i), vehicle.Data["licence_plate"])
+		f.SetCellValue("Sheet1", fmt.Sprintf("B%d", i), vehicle.Type)
+		f.SetCellValue("Sheet1", fmt.Sprintf("C%d", i), admin.Data["name"])
+		f.SetCellValue("Sheet1", fmt.Sprintf("D%d", i), bookedby)
+		f.SetCellValue("Sheet1", fmt.Sprintf("E%d", i), fmt.Sprintf("%v %v", beneficiary.Data["first_name"], beneficiary.Data["last_name"]))
+		f.SetCellValue("Sheet1", fmt.Sprintf("F%d", i), beneficiary.Data["file_number"])
+		f.SetCellValue("Sheet1", fmt.Sprintf("G%d", i), b.Startdate.Format("2006-01-02"))
+		f.SetCellValue("Sheet1", fmt.Sprintf("H%d", i), b.Enddate.Format("2006-01-02"))
+		f.SetCellValue("Sheet1", fmt.Sprintf("I%d", i), b.Unavailablefrom.Format("2006-01-02"))
+		f.SetCellValue("Sheet1", fmt.Sprintf("J%d", i), b.Unavailableto.Format("2006-01-02"))
+		f.SetCellValue("Sheet1", fmt.Sprintf("K%d", i), adminunavailability)
+		f.SetCellValue("Sheet1", fmt.Sprintf("L%d", i), b.Data["comment"])
+		f.SetCellValue("Sheet1", fmt.Sprintf("M%d", i), deleted)
+		f.SetCellValue("Sheet1", fmt.Sprintf("N%d", i), b.Data["motif"])
+		i = i + 1
+	}
+
+	w.Header().Set("Content-Type", "application/octet-stream")
+	w.Header().Set("Content-Disposition", "attachment; filename="+"Workbook.xlsx")
+	w.Header().Set("Content-Transfer-Encoding", "binary")
+	w.Header().Set("Expires", "0")
+	f.Write(w)
 }
--- a/main.go
+++ b/main.go
@ -1,26 +1,32 @@
 package main

 import (
-	"fmt"
-	"log"
 	"net/http"
+	"os"
 	"time"

+	"github.com/rs/zerolog"
+	"github.com/rs/zerolog/log"
+
+	"github.com/gorilla/mux"
+
 	"git.coopgo.io/coopgo-apps/parcoursmob/handlers/api"
+	"git.coopgo.io/coopgo-apps/parcoursmob/handlers/api/protected"
 	"git.coopgo.io/coopgo-apps/parcoursmob/handlers/application"
 	"git.coopgo.io/coopgo-apps/parcoursmob/handlers/auth"
 	"git.coopgo.io/coopgo-apps/parcoursmob/handlers/exports"
 	"git.coopgo.io/coopgo-apps/parcoursmob/renderer"
 	"git.coopgo.io/coopgo-apps/parcoursmob/services"
 	"git.coopgo.io/coopgo-apps/parcoursmob/utils/identification"
+	"git.coopgo.io/coopgo-apps/parcoursmob/utils/protectapi"
 	cache "git.coopgo.io/coopgo-apps/parcoursmob/utils/storage"
-	"github.com/gorilla/mux"
 )

 func main() {
 	cfg, err := ReadConfig()
 	if err != nil {
-		panic(err)
+		log.Fatal().Err(err).Msg("cannot read config!")
+		return
 	}

 	var (
@ -30,37 +36,38 @@ func main() {
 		dev_env              = cfg.GetBool("dev_env")
 	)

+	if dev_env {
+		log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr})
+	} else {
+		zerolog.TimeFieldFormat = zerolog.TimeFormatUnix
+	}
+
 	svc, err := services.NewServicesHandler(cfg)
 	if err != nil {
-		panic(err)
+		log.Panic().Err(err).Msg("Error creating services handler")
 	}

 	kv, err := cache.NewKVHandler(cfg)
 	if err != nil {
-		panic(err)
+		log.Panic().Err(err).Msg("Error creating KV handler")
 	}
-
-	filestorage, err := cache.NewFileStorage(cfg)
+	filestorage, _ := cache.NewFileStorage(cfg)

 	idp, err := identification.NewIdentificationProvider(cfg, svc, kv)
 	if err != nil {
-		panic(err)
+		log.Panic().Err(err).Msg("Error creating identification provider")
 	}

 	emailing, err := renderer.NewEmailingHandler(cfg)
 	if err != nil {
-		panic(err)
+		log.Panic().Err(err).Msg("Error creating emailing handler")
 	}

 	apiHandler, _ := api.NewAPIHandler(cfg, idp, svc, kv)
+	protectedApiHandler, _ := protected.NewProtectedAPIHandler(cfg, idp, svc, kv)
 	applicationHandler, _ := application.NewApplicationHandler(cfg, svc, kv, filestorage, emailing)
 	exportsHandler, _ := exports.NewExportsHandler(cfg, svc, emailing)
-	authHandler, _ := auth.NewAuthHandler(cfg, idp, svc, kv, emailing)
-
-	fmt.Println("Running", service_name, ":")
-	if dev_env {
-		fmt.Printf("\033]0;%s\007", service_name)
-	}
+	authHandler, _ := auth.NewAuthHandler(cfg, idp, svc, kv, emailing, filestorage)

 	r := mux.NewRouter()

@ -74,6 +81,17 @@ func main() {
 	r.HandleFunc("/auth/groups/switch", authHandler.GroupSwitch)
 	r.HandleFunc("/", redirectApp)

+	if dev_env {
+		r.Use(trackPage)
+	}
+
+	calendars_router := r.PathPrefix("/api/calendars").Subrouter()
+	calendars_router.HandleFunc("/global.ics", apiHandler.CalendarGlobal)
+	calendars_router.HandleFunc("/organizations/{groupid}.ics", apiHandler.CalendarOrganizations)
+
+	ext_router := r.PathPrefix("/ext").Subrouter()
+	ext_router.HandleFunc("/st/bp/{bookingid}", applicationHandler.SolidarityTransportExternalBookingProposal)
+
 	api_router := r.PathPrefix("/api").Subrouter()
 	api_router.HandleFunc("/", apiHandler.NotFound)
 	api_router.HandleFunc("/geo/autocomplete", apiHandler.GeoAutocomplete)
@ -81,20 +99,56 @@ func main() {
 	api_router.HandleFunc("/cache/{cacheid}/export", apiHandler.CacheExport)
 	api_router.HandleFunc("/oauth2/callback", apiHandler.OAuth2Callback)

+	protected_api_router := api_router.PathPrefix("/protected").Subrouter()
+	protected_api_router.HandleFunc("/users", protectedApiHandler.Users)
+	protected_api_router.Use(protectapi.ApiKey(cfg.GetString("services.api.api_key")))
+
+	interact_router := r.PathPrefix("/int").Subrouter()
+	interact_router.HandleFunc("/", apiHandler.NotFound)
+
 	application := r.PathPrefix("/app").Subrouter()
 	application.HandleFunc("/", applicationHandler.Dashboard)
 	application.HandleFunc("/beneficiaries/", applicationHandler.BeneficiariesList)
 	application.HandleFunc("/beneficiaries/create", applicationHandler.BeneficiaryCreate)
 	application.HandleFunc("/beneficiaries/{beneficiaryid}", applicationHandler.BeneficiaryDisplay)
 	application.HandleFunc("/beneficiaries/{beneficiaryid}/update", applicationHandler.BeneficiaryUpdate)
+	application.HandleFunc("/beneficiaries/{beneficiaryid}/archive", applicationHandler.BeneficiaryArchive)
+	application.HandleFunc("/beneficiaries/{beneficiaryid}/unarchive", applicationHandler.BeneficiaryUnarchive)
 	application.HandleFunc("/beneficiaries/{beneficiaryid}/documents", applicationHandler.BeneficiaryDocuments)
 	application.HandleFunc("/beneficiaries/{beneficiaryid}/documents/{document}", applicationHandler.BeneficiaryDocumentDownload)
 	application.HandleFunc("/beneficiaries/{beneficiaryid}/picture", applicationHandler.BeneficiaryPicture)
+	application.HandleFunc("/wallets/{userid}/credit", applicationHandler.CreditWallet)
 	application.HandleFunc("/members/{beneficiaryid}/picture", applicationHandler.BeneficiaryPicture)
 	application.HandleFunc("/members/{adminid}", applicationHandler.MemberDisplay)
 	application.HandleFunc("/members/{adminid}/update", applicationHandler.MemberUpdate)
 	application.HandleFunc("/members/", applicationHandler.MembersList)
 	application.HandleFunc("/journeys/", applicationHandler.JourneysSearch)
+	application.HandleFunc("/solidarity-transport/", applicationHandler.SolidarityTransportOverview)
+	application.HandleFunc("/solidarity-transport/drivers/create", applicationHandler.SolidarityTransportCreateDriver)
+	application.HandleFunc("/solidarity-transport/drivers/{driverid}/update", applicationHandler.SolidarityTransportUpdateDriver)
+	application.HandleFunc("/solidarity-transport/drivers/{driverid}/availabilities", applicationHandler.SolidarityTransportAddAvailability)
+	application.HandleFunc("/solidarity-transport/drivers/{driverid}/archive", applicationHandler.SolidarityTransportArchiveDriver)
+	application.HandleFunc("/solidarity-transport/drivers/{driverid}/unarchive", applicationHandler.SolidarityTransportUnarchiveDriver)
+	application.HandleFunc("/solidarity-transport/drivers/{driverid}/documents", applicationHandler.SolidarityTransportDriverDocuments)
+	application.HandleFunc("/solidarity-transport/drivers/{driverid}/documents/{document}", applicationHandler.SolidarityTransportDocumentDownload)
+	application.HandleFunc("/solidarity-transport/drivers/{driverid}/availabilities/{availabilityid}/delete", applicationHandler.SolidarityTransportDeleteAvailability)
+	application.HandleFunc("/solidarity-transport/drivers/{driverid}/journeys/{journeyid}", applicationHandler.SolidarityTransportDriverJourney)
+	application.HandleFunc("/solidarity-transport/drivers/{driverid}/journeys/{journeyid}/noreturn", applicationHandler.SolidarityTransportDriverJourneyToggleNoreturn)
+	application.HandleFunc("/solidarity-transport/drivers/{driverid}", applicationHandler.SolidarityTransportDriverDisplay)
+	application.HandleFunc("/solidarity-transport/bookings/{bookingid}", applicationHandler.SolidarityTransportBookingDisplay)
+	application.HandleFunc("/solidarity-transport/bookings/{bookingid}/confirm", applicationHandler.SolidarityTransportBookingStatus("confirm"))
+	application.HandleFunc("/solidarity-transport/bookings/{bookingid}/cancel", applicationHandler.SolidarityTransportBookingStatus("cancel"))
+	application.HandleFunc("/solidarity-transport/bookings/{bookingid}/waitconfirmation", applicationHandler.SolidarityTransportBookingStatus("waitconfirmation"))
+	application.HandleFunc("/organized-carpool/", applicationHandler.OrganizedCarpoolOverview)
+	application.HandleFunc("/organized-carpool/drivers/create", applicationHandler.OrganizedCarpoolCreateDriver)
+	application.HandleFunc("/organized-carpool/drivers/{driverid}/trips", applicationHandler.OrganizedCarpoolAddTrip)
+	application.HandleFunc("/organized-carpool/drivers/{driverid}/archive", applicationHandler.OrganizedCarpoolArchiveDriver)
+	application.HandleFunc("/organized-carpool/drivers/{driverid}/unarchive", applicationHandler.OrganizedCarpoolUnarchiveDriver)
+	application.HandleFunc("/organized-carpool/drivers/{driverid}/documents", applicationHandler.OrganizedCarpoolDriverDocuments)
+	application.HandleFunc("/organized-carpool/drivers/{driverid}/documents/{document}", applicationHandler.OrganizedCarpoolDocumentDownload)
+	application.HandleFunc("/organized-carpool/drivers/{driverid}/trips/{tripid}/delete", applicationHandler.OrganizedCarpoolDeleteTrip)
+	application.HandleFunc("/organized-carpool/drivers/{driverid}", applicationHandler.OrganizedCarpoolDriverDisplay)
+	application.HandleFunc("/organized-carpool/drivers/{driverid}/journeys/{journeyid}", applicationHandler.OrganizedCarpoolJourney)
 	application.HandleFunc("/vehicles/", applicationHandler.VehiclesSearch)
 	application.HandleFunc("/vehicles/bookings/", applicationHandler.VehiclesBookingsList)
 	application.HandleFunc("/vehicles/bookings/{bookingid}", applicationHandler.VehicleBookingDisplay)
@ -128,17 +182,15 @@ func main() {
 	application.HandleFunc("/group/settings", applicationHandler.GroupSettingsDisplay)
 	application.HandleFunc("/group/settings/invite-member", applicationHandler.GroupSettingsInviteMember)

-	/****************************Groupe Déplacement ************************************/
 	application.HandleFunc("/journeys/groups_covoiturage", applicationHandler.GroupsGestion)
 	application.HandleFunc("/journeys/groups_covoiturage/create", applicationHandler.CreateGroup)
 	application.HandleFunc("/journeys/groups_covoiturage/create/{groupid}", applicationHandler.DisplayGroupCovoiturage)
 	application.HandleFunc("/journeys/groups_covoiturage/create/{id}/{groupid}/{memberid}", applicationHandler.UpdateGroupCovoiturage)
-	/****************************************************************/

-	/********************Code Supprt Emailing************************/
+	application.HandleFunc("/sms/send", applicationHandler.SendSMS)
+
 	application.HandleFunc("/support/", applicationHandler.SupportSend)

-	/*********************** CODE GROUP **************************/
 	appGroup := application.PathPrefix("/group_module").Subrouter()
 	appGroup.HandleFunc("/", applicationHandler.Groups)
 	appGroup.HandleFunc("/groups", applicationHandler.CreateGroupModule)
@ -164,27 +216,65 @@ func main() {
 	application.HandleFunc("/agenda/{eventid}/{subscribeid}/delete", applicationHandler.AgendaDeleteSubscribeEvent)
 	application.HandleFunc("/agenda/{eventid}/history", applicationHandler.AgendaHistoryEvent)
 	/////////////////////////////////////////////////////////////////////////////////////////////////////
+	//////////////////Add documents in event////////////////////////
+	application.HandleFunc("/agenda/{eventid}/documents", applicationHandler.EventDocuments)
+	application.HandleFunc("/agenda/{eventid}/documents/{document}", applicationHandler.EventDocumentDownload)
+	////////////////////////////////////////////////////////////////
+	//////////////////Diag in event////////////////////////
+	// application.HandleFunc("/agenda/{eventid}/create-diag", applicationHandler.DiagsCreateDiag)
+	application.HandleFunc("/agenda/{eventid}/diags", applicationHandler.DiagsHome)
+	application.HandleFunc("/agenda/{eventid}/diags/{diagid}", applicationHandler.DiagsDisplayDiag)
+	application.HandleFunc("/agenda/{eventid}/diags/history", applicationHandler.DiagsHistory)
+	application.HandleFunc("/agenda/{eventid}/diags/{diagid}/history", applicationHandler.DiagsHistoryDiag)
+	////////////////////////////////////////////////////////////////
+	//////////////////Diag in benefeciaries////////////////////////
+	application.HandleFunc("/beneficiaries/{beneficiaryid}/create-diag", applicationHandler.BeneficiariesCreateDiag)
+	application.HandleFunc("/beneficiaries/{beneficiaryid}/diags/{diagid}", applicationHandler.DiagsDisplayDiag)
+	////////////////////////////////////////////////////////////////
+	//////////////////Diag in vehicules////////////////////////
+	application.HandleFunc("/vehicles-management/fleet/{vehicleid}/create-diag", applicationHandler.VehiclesCreateDiag)
+	application.HandleFunc("/vehicles-management/fleet/{vehicleid}/diags", applicationHandler.DiagsHome)
+	application.HandleFunc("/vehicles-management/fleet/{vehicleid}/diags/{diagid}", applicationHandler.DiagsDisplayDiag)
+	////////////////////////////////////////////////////////////////
+	//////////////////Diag in bookings////////////////////////
+	application.HandleFunc("/vehicles-management/bookings/{bookingid}/create-diag", applicationHandler.BookingsCreateDiag)
+	application.HandleFunc("/vehicles/bookings/{vehicleid}/diags", applicationHandler.DiagsHome)
+	application.HandleFunc("/vehicles/bookings/{bookingid}/create-diag", applicationHandler.VehicleBookingsCreateDiag)
+	//////////////////Diags////////////////////////
+	application.HandleFunc("/diags/", applicationHandler.DiagsHome)
+	application.HandleFunc("/diags/{diagid}/documents", applicationHandler.DiagsDocuments)
+	application.HandleFunc("/diags/{diagid}/documents/{document}", applicationHandler.DiagsDocumentDownload)
+	application.HandleFunc("/diags/{diagid}", applicationHandler.DiagsDisplayDiag)
+	application.HandleFunc("/diags/{diagid}/update", applicationHandler.DiagUpdate)
+	application.HandleFunc("/diags/{diagid}/delete", applicationHandler.DiagDelete)

 	export := r.PathPrefix("/exports").Subrouter()
-	export.HandleFunc("/fleets/bookings", exportsHandler.Bookings)
+	export.HandleFunc("/fleets/bookings", exportsHandler.AllBookings)
 	export.HandleFunc("/fleets/bookings/{groupid}", exportsHandler.Bookings)
 	export.HandleFunc("/agenda/subscriptions", exportsHandler.Agenda("allEvents"))
 	export.HandleFunc("/agenda/{eventid}", exportsHandler.Agenda("oneEvent"))
 	export.Use(idp.Middleware)
 	export.Use(idp.GroupsMiddleware)

-	fmt.Println("-> HTTP server listening on", address)
-
 	srv := &http.Server{
 		Handler:      r,
 		Addr:         address,
-		WriteTimeout: 15 * time.Second,
+		WriteTimeout: 30 * time.Second,
 		ReadTimeout:  15 * time.Second,
 	}

-	log.Fatal(srv.ListenAndServe())
+	log.Info().Str("service_name", service_name).Str("address", address).Msg("Running HTTP server")
+
+	log.Fatal().Err(srv.ListenAndServe()).Msg("Failed")
 }

 func redirectApp(w http.ResponseWriter, r *http.Request) {
 	http.Redirect(w, r, "/app/", http.StatusFound)
 }
+
+func trackPage(next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		log.Trace().Str("requested_uri", r.RequestURI).Msg("New request")
+		next.ServeHTTP(w, r.WithContext(r.Context()))
+	})
+}
--- a/renderer/administration.go
+++ b/renderer/administration.go
--- a/renderer/agenda.go
+++ b/renderer/agenda.go
@ -30,20 +30,29 @@ func (renderer *Renderer) AgendaHistory(w http.ResponseWriter, r *http.Request,
 	renderer.Render("agenda history", w, r, files, state)
 }

-func (renderer *Renderer) AgendaCreateEvent(w http.ResponseWriter, r *http.Request) {
+func (renderer *Renderer) AgendaCreateEvent(w http.ResponseWriter, r *http.Request, events_file_types []string, file_types_map map[string]string, documents any) {
 	files := renderer.ThemeConfig.GetStringSlice("views.agenda.create_event.files")
 	state := NewState(r, renderer.ThemeConfig, agendaMenu)

+	state.ViewState = map[string]any{
+		"events_file_types": events_file_types,
+		"file_types_map":    file_types_map,
+		"documents":         documents,
+	}
+
 	renderer.Render("agenda create event", w, r, files, state)
 }

-func (renderer *Renderer) AgendaDisplayEvent(w http.ResponseWriter, r *http.Request, event any, group any, subscribers map[string]any, beneficiaries any) {
+func (renderer *Renderer) AgendaDisplayEvent(w http.ResponseWriter, r *http.Request, event any, group any, events_file_types []string, file_types_map map[string]string, documents any, subscribers map[string]any, beneficiaries any) {
 	files := renderer.ThemeConfig.GetStringSlice("views.agenda.display_event.files")
 	state := NewState(r, renderer.ThemeConfig, agendaMenu)

 	state.ViewState = map[string]any{
 		"event":         	 event,
 		"group":         	 group,
+		"events_file_types": events_file_types,
+		"file_types_map":	 file_types_map,
+		"documents":     	 documents,
 		"subscribers":   	 subscribers,
 		"beneficiaries": 	 beneficiaries,
 	}
@ -100,3 +109,18 @@ func (renderer *Renderer) AgendaDeleteEvent(w http.ResponseWriter, r *http.Reque

 	renderer.Render("event_deleteEvent", w, r, files, state)
 }
+
+////////Event documents////////////////////////
+// func (renderer *Renderer) EventDocuments(w http.ResponseWriter, r *http.Request, event any, documents []any) {
+// 	files := renderer.ThemeConfig.GetStringSlice("views.agenda.event_files.files")
+// 	state := NewState(r, renderer.ThemeConfig, agendaMenu)
+
+// 	state.ViewState = map[string]any{
+// 		"event":      event,
+// 		"documents":  documents,
+// 		"eventid":    event.(map[string]any)["id"],
+// 		"eventtitle": event.(map[string]any)["title"],
+// 	}
+
+// 	renderer.Render("event_files", w, r, files, state)
+// }
--- a/renderer/auth.go
+++ b/renderer/auth.go
--- a/renderer/beneficiaries.go
+++ b/renderer/beneficiaries.go
@ -5,6 +5,7 @@ import (
 	"html/template"
 	"net/http"

+	fleetsstorage "git.coopgo.io/coopgo-platform/fleets/storage"
 	mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
 )

@ -52,7 +53,7 @@ type BeneficiariesDisplayState struct {
 	Beneficiary any
 }

-func (renderer *Renderer) BeneficiaryDisplay(w http.ResponseWriter, r *http.Request, beneficiary any, bookings []any, organizations []any, beneficiaries_file_types []string, file_types_map map[string]string, documents 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{}, diags []any, solidarityTransportStats any) {
 	files := renderer.ThemeConfig.GetStringSlice("views.beneficiaries.display.files")
 	state := NewState(r, renderer.ThemeConfig, beneficiariesMenu)
 	state.ViewState = map[string]any{
@ -62,8 +63,10 @@ func (renderer *Renderer) BeneficiaryDisplay(w http.ResponseWriter, r *http.Requ
 		"file_types_map":             file_types_map,
 		"documents":                  documents,
 		"organizations":              organizations,
+		"event":                      event,
+		"diags":                      diags,
+		"solidarity_transport_stats": solidarityTransportStats,
 	}
-
 	renderer.Render("beneficiaries_display", w, r, files, state)
 }

--- a/renderer/dashboard.go
+++ b/renderer/dashboard.go
@ -4,11 +4,12 @@ import (
 	"net/http"

 	agendastorage "git.coopgo.io/coopgo-platform/agenda/storage"
+	fleetstorage "git.coopgo.io/coopgo-platform/fleets/storage"
 )

 const dashboardMenu = "dashboard"

-func (renderer *Renderer) Dashboard(w http.ResponseWriter, r *http.Request, accounts []any, nbaccounts int, count_members int, events []agendastorage.Event) {
+func (renderer *Renderer) Dashboard(w http.ResponseWriter, r *http.Request, accounts []any, nbaccounts int, count_members int, events []agendastorage.Event, fleets []fleetstorage.Booking) {
 	files := renderer.ThemeConfig.GetStringSlice("views.dashboard.files")
 	state := NewState(r, renderer.ThemeConfig, dashboardMenu)
 	state.ViewState = map[string]any{
@ -18,6 +19,7 @@ func (renderer *Renderer) Dashboard(w http.ResponseWriter, r *http.Request, acco
 		},
 		"count_members": count_members,
 		"events":        events,
+		"fleets":         fleets,
 	}

 	renderer.Render("dashboard", w, r, files, state)
--- a/renderer/diags.go
+++ b/renderer/diags.go
@ -0,0 +1,115 @@
+package renderer
+
+import (
+	"net/http"
+
+	diagsstorage "git.coopgo.io/coopgo-platform/diags/storage"
+)
+
+const diagsMenu = "diags"
+
+func (renderer *Renderer) DiagsHome(w http.ResponseWriter, r *http.Request, diags []diagsstorage.Diag, groups map[string]any) {
+	files := renderer.ThemeConfig.GetStringSlice("views.diags.list.files")
+	state := NewState(r, renderer.ThemeConfig, diagsMenu)
+	state.ViewState = map[string]any{
+		"diags": diags,
+		"groups": groups,
+	}
+
+	renderer.Render("diags home", w, r, files, state)
+}
+
+func (renderer *Renderer) DiagsHistory(w http.ResponseWriter, r *http.Request, diags []diagsstorage.Diag) {
+	files := renderer.ThemeConfig.GetStringSlice("views.diags.history.files")
+	state := NewState(r, renderer.ThemeConfig, diagsMenu)
+	state.ViewState = map[string]any{
+		"diags": diags,
+	}
+
+	renderer.Render("diags history", w, r, files, state)
+}
+
+func (renderer *Renderer) BeneficiariesCreateDiag(w http.ResponseWriter, r *http.Request, beneficiary string, diags_file_types []string, file_types_map map[string]string, documents any) {
+	state := NewState(r, renderer.ThemeConfig, diagsMenu)
+	files := renderer.ThemeConfig.GetStringSlice("views.beneficiaries.create_diag.files")
+	state.ViewState = map[string]any{
+		"beneficiary": beneficiary,
+		"diags_file_types": diags_file_types,
+		"file_types_map": file_types_map,
+		"documents": documents,
+	}
+	renderer.Render("diag create for beneficiary", w, r, files, state)
+}
+
+func (renderer *Renderer) VehiclesCreateDiag(w http.ResponseWriter, r *http.Request, vehicle string) {
+	state := NewState(r, renderer.ThemeConfig, diagsMenu)
+	files := renderer.ThemeConfig.GetStringSlice("views.vehicles_management.create_vehicle_diag.files")
+	state.ViewState = map[string]any{
+		"vehicle": vehicle,
+	}
+	renderer.Render("diag create for vehicle", w, r, files, state)
+}
+
+func (renderer *Renderer) BookingsCreateDiag(w http.ResponseWriter, r *http.Request, booking string) {
+	state := NewState(r, renderer.ThemeConfig, diagsMenu)
+	files := renderer.ThemeConfig.GetStringSlice("views.vehicles_management.create_booking_diag.files")
+	state.ViewState = map[string]any{
+		"booking": booking,
+	}
+	renderer.Render("diag create for booking", w, r, files, state)
+}
+
+func (renderer *Renderer) VehicleBookingsCreateDiag(w http.ResponseWriter, r *http.Request, booking string) {
+	state := NewState(r, renderer.ThemeConfig, diagsMenu)
+	files := renderer.ThemeConfig.GetStringSlice("views.vehicles.create_booking_diag.files")
+	state.ViewState = map[string]any{
+		"booking": booking,
+	}
+	renderer.Render("diag create for booking", w, r, files, state)
+}
+
+func (renderer *Renderer) DiagsDisplayDiag(w http.ResponseWriter, r *http.Request, diag any, diags_file_types []string, file_types_map map[string]string, documents any) {
+	files := renderer.ThemeConfig.GetStringSlice("views.diags.display_diag.files")
+	state := NewState(r, renderer.ThemeConfig, diagsMenu)
+
+	state.ViewState = map[string]any{
+		"diag":         	 diag,
+		"diags_file_types": diags_file_types,
+		"file_types_map":	 file_types_map,
+		"documents":     	 documents,
+	}
+
+	renderer.Render("diags create diag", w, r, files, state)
+}
+
+func (renderer *Renderer) DiagsHistoryDiag(w http.ResponseWriter, r *http.Request, diag any) {
+	files := renderer.ThemeConfig.GetStringSlice("views.diags.history_diag.files")
+	state := NewState(r, renderer.ThemeConfig, diagsMenu)
+	state.ViewState = map[string]any{
+		"diag":         diag,
+	}
+
+	renderer.Render("diags history diag", w, r, files, state)
+}
+
+func (renderer *Renderer) DiagUpdate(w http.ResponseWriter, r *http.Request, diag any) {
+	files := renderer.ThemeConfig.GetStringSlice("views.diags.update.files")
+	state := NewState(r, renderer.ThemeConfig, diagsMenu)
+
+	state.ViewState = map[string]any{
+		"diag": diag,
+	}
+
+	renderer.Render("diag_update", w, r, files, state)
+}
+
+func (renderer *Renderer) DiagDelete(w http.ResponseWriter, r *http.Request, diag any) {
+	files := renderer.ThemeConfig.GetStringSlice("views.diags.delete.files")
+	state := NewState(r, renderer.ThemeConfig, diagsMenu)
+
+	state.ViewState = map[string]any{
+		"diag": diag,
+	}
+
+	renderer.Render("diag_deleteDiag", w, r, files, state)
+}
--- a/renderer/directory.go
+++ b/renderer/directory.go
--- a/renderer/func-maps.go
+++ b/renderer/func-maps.go
@ -8,19 +8,44 @@ import (
 	"strings"
 	"time"

+	groupsstorage "git.coopgo.io/coopgo-platform/groups-management/storage"
+	"github.com/rs/zerolog/log"
+	"github.com/spf13/viper"
 	"gitlab.scity.coop/maas/navitia-golang/types"
 )

-func TimeFrom(d any) *time.Time {
+func ModuleAvailable(group groupsstorage.Group, configmodules *viper.Viper) func(string) bool {
+	return func(module string) bool {
+		if module == "dashboard" {
+			return true
+		}
+		groupmodules := group.Data["modules"].(map[string]any)
+		modAvailable, ok := groupmodules[module].(bool)
+		if ok && modAvailable && configmodules.GetBool(fmt.Sprintf("modules.%s.enabled", module)) {
+			return true
+		}
+		return false
+	}
+}

+func TimeFrom(d any) *time.Time {
+	paris, err := time.LoadLocation("Europe/Paris")
 	if date, ok := d.(time.Time); ok {
+		if err != nil {
 			return &date
+		}
+		nd := date.In(paris)
+		return &nd
 	} else if date, ok := d.(string); ok {
 		datetime, err := time.Parse("2006-01-02T15:04:05Z", date)
 		if err != nil {
-			panic(err)
+			datetime, err = time.Parse("2006-01-02", date)
+			if err != nil {
+				log.Error().Err(err).Msg("cannot parse date")
 			}
-		return &datetime
+		}
+		dt := datetime.In(paris)
+		return &dt
 	}
 	return nil
 }
@ -78,7 +103,6 @@ func RawJSON(v any) string {
 		return ""
 	}
 	return strings.TrimSuffix(buf.String(), "\n")
-
 }

 func UnescapeHTML(s string) template.HTML {
@ -127,3 +151,14 @@ func strval(v interface{}) string {
 func Divide[V int | float64](a, b V) V {
 	return a / b
 }
+
+func ShortDuration(d time.Duration) string {
+	s := d.String()
+	if strings.HasSuffix(s, "m0s") {
+		s = s[:len(s)-2]
+	}
+	if strings.HasSuffix(s, "h0m") {
+		s = s[:len(s)-2]
+	}
+	return s
+}
--- a/renderer/group.go
+++ b/renderer/group.go
--- a/renderer/group_module.go
+++ b/renderer/group_module.go
--- a/renderer/journeys.go
+++ b/renderer/journeys.go
@ -7,6 +7,7 @@ import (

 	groupstorage "git.coopgo.io/coopgo-platform/groups-management/storage"
 	mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
+	geojson "github.com/paulmach/orb/geojson"
 )

 const journeysMenu = "journeys"
@ -35,7 +36,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 []*geojson.FeatureCollection, transitjourneys any, vehicles any, searched bool, departure any, destination any, departuredate string, departuretime string, driverJourneys any, solidarityDrivers any, organizedCarpools any, beneficiaries any, kbData any) {
 	files := renderer.ThemeConfig.GetStringSlice("views.journeys.search.files")
 	state := NewState(r, renderer.ThemeConfig, journeysMenu)
 	state.ViewState = map[string]any{
@ -46,7 +47,13 @@ func (renderer *Renderer) JourneysSearch(w http.ResponseWriter, r *http.Request,
 		"destination":        destination,
 		"journeys":           transitjourneys,
 		"carpools":           carpools,
+		"organized_carpools": organizedCarpools,
 		"vehicles":           vehicles,
+		"driver_journeys":    driverJourneys,
+		"solidarity_drivers": solidarityDrivers,
+		"querystring":        r.URL.RawQuery,
+		"beneficiaries":      beneficiaries,
+		"kb_data":            kbData,
 	}

 	renderer.Render("journeys", w, r, files, state)
@ -69,6 +76,7 @@ func (s BeneficiariesListstate) JSONWithLimits(a int, b int) template.JS {
 	}
 	return s.JSON()
 }
+
 func (renderer *Renderer) GroupsGestion(w http.ResponseWriter, r *http.Request, groups []groupstorage.Group, cacheid string) {
 	files := renderer.ThemeConfig.GetStringSlice("views.journeys.list.files")
 	state := NewState(r, renderer.ThemeConfig, journeysMenu)
@ -98,7 +106,6 @@ func (renderer *Renderer) CreateGroup(w http.ResponseWriter, r *http.Request, de
 		viewstate["search"] = map[string]any{
 			"beneficiary": beneficiary,
 		}
-
 	}

 	state.ViewState = viewstate
@ -130,7 +137,6 @@ func (renderer *Renderer) DisplayGroupCovoiturage(w http.ResponseWriter, r *http
 		viewstate["search"] = map[string]any{
 			"beneficiary": beneficiary,
 		}
-
 	}
 	state.ViewState = viewstate

@ -146,5 +152,4 @@ func (renderer *Renderer) UpdateGroupCovoiturage(w http.ResponseWriter, r *http.
 		"memberid": memberid,
 	}
 	renderer.Render("journeys", w, r, files, state)
-
 }
--- a/renderer/layout.go
+++ b/renderer/layout.go
@ -2,9 +2,14 @@ package renderer

 type LayoutState struct {
 	AdministrationState AdministrationState
+	Menu                any
+	ActiveMenu          string
+
+	// DEPRECATED
 	MenuItems []MenuItem
 }

+// DEPRECATED
 type MenuItem struct {
 	Title  string
 	Link   string
--- a/renderer/mailer.go
+++ b/renderer/mailer.go
--- a/renderer/members.go
+++ b/renderer/members.go
--- a/renderer/organized-carpool.go
+++ b/renderer/organized-carpool.go
@ -0,0 +1,61 @@
+package renderer
+
+import (
+	"net/http"
+
+	mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
+)
+
+const organizedCarpoolMenu = "organized_carpool"
+
+func (renderer *Renderer) OrganizedCarpoolOverview(w http.ResponseWriter, r *http.Request, drivers any, driversMap any, passengersMap any, bookings any) {
+	files := renderer.ThemeConfig.GetStringSlice("views.organized_carpool.overview.files")
+	state := NewState(r, renderer.ThemeConfig, organizedCarpoolMenu)
+	state.ViewState = map[string]any{
+		"drivers":        drivers,
+		"drivers_map":    driversMap,
+		"passengers_map": passengersMap,
+		"bookings":       bookings,
+	}
+
+	renderer.Render("organized carpool overview", w, r, files, state)
+}
+
+func (renderer *Renderer) OrganizedCarpoolCreateDriver(w http.ResponseWriter, r *http.Request) {
+	files := renderer.ThemeConfig.GetStringSlice("views.organized_carpool.driver_create.files")
+	state := NewState(r, renderer.ThemeConfig, organizedCarpoolMenu)
+	state.ViewState = map[string]any{}
+
+	renderer.Render("organized carpool driver creation", w, r, files, state)
+}
+
+func (renderer *Renderer) OrganizedCarpoolDriverDisplay(w http.ResponseWriter, r *http.Request, driver mobilityaccountsstorage.Account, trips any, documents any) {
+	files := renderer.ThemeConfig.GetStringSlice("views.organized_carpool.driver_display.files")
+	state := NewState(r, renderer.ThemeConfig, organizedCarpoolMenu)
+
+	drivers_file_types := renderer.GlobalConfig.GetStringSlice("modules.organized_carpool.drivers.documents_types")
+	file_types_map := renderer.GlobalConfig.GetStringMapString("storage.files.file_types")
+
+	state.ViewState = map[string]any{
+		"driver":             driver,
+		"trips":              trips,
+		"documents":          documents,
+		"drivers_file_types": drivers_file_types,
+		"file_types_map":     file_types_map,
+	}
+
+	renderer.Render("organized carpool driver display", w, r, files, state)
+}
+
+func (renderer *Renderer) OrganizedCarpoolJourney(w http.ResponseWriter, r *http.Request, journey any, driver any, passenger any, beneficiaries any) {
+	files := renderer.ThemeConfig.GetStringSlice("views.organized_carpool.journey.files")
+	state := NewState(r, renderer.ThemeConfig, solidarityTransportMenu)
+	state.ViewState = map[string]any{
+		"driver":        driver,
+		"passenger":     passenger,
+		"beneficiaries": beneficiaries,
+		"journey":       journey,
+	}
+
+	renderer.Render("organized carpool journey", w, r, files, state)
+}
--- a/renderer/renderer.go
+++ b/renderer/renderer.go
@ -4,12 +4,17 @@ import (
 	"fmt"
 	"html/template"
 	"net/http"
+	"reflect"

 	"git.coopgo.io/coopgo-apps/parcoursmob/utils/icons"
 	"git.coopgo.io/coopgo-apps/parcoursmob/utils/identification"
+	cache "git.coopgo.io/coopgo-apps/parcoursmob/utils/storage"
+	filestorage "git.coopgo.io/coopgo-apps/parcoursmob/utils/storage"
+	validatedprofile "git.coopgo.io/coopgo-apps/parcoursmob/utils/validated-profile"
 	"git.coopgo.io/coopgo-platform/emailing"
 	"git.coopgo.io/coopgo-platform/groups-management/storage"
-	"github.com/coreos/go-oidc"
+	"github.com/coreos/go-oidc/v3/oidc"
+	"github.com/rs/zerolog/log"
 	"github.com/spf13/viper"
 )

@ -18,9 +23,10 @@ type Renderer struct {
 	GlobalConfig *viper.Viper
 	ThemeConfig  *viper.Viper
 	Mailer       *emailing.Mailer
+	FileStorage  cache.FileStorage
 }

-func NewRenderer(global *viper.Viper, templates_dir string) *Renderer {
+func NewRenderer(global *viper.Viper, templates_dir string, filestorage cache.FileStorage) *Renderer {
 	theme := viper.New()
 	theme.SetConfigName("config")
 	theme.AddConfigPath(templates_dir)
@ -32,11 +38,11 @@ func NewRenderer(global *viper.Viper, templates_dir string) *Renderer {
 		TemplatesDir: templates_dir,
 		GlobalConfig: global,
 		ThemeConfig:  theme,
+		FileStorage:  filestorage,
 	}
 }

 func (renderer *Renderer) Render(name string, w http.ResponseWriter, r *http.Request, files []string, state RenderState) {
-
 	genericFiles := renderer.ThemeConfig.GetStringSlice("views.generic.files")

 	prefixed_files := []string{}
@ -50,6 +56,7 @@ func (renderer *Renderer) Render(name string, w http.ResponseWriter, r *http.Req
 	w.WriteHeader(http.StatusOK)
 	t := template.New(name).Funcs(
 		template.FuncMap{
+			"moduleAvailable":                  ModuleAvailable(state.Group, renderer.GlobalConfig),
 			"timeFrom":                         TimeFrom,
 			"timeFormat":                       TimeFormat,
 			"genderISO5218":                    GenderISO5218,
@ -60,18 +67,34 @@ func (renderer *Renderer) Render(name string, w http.ResponseWriter, r *http.Req
 			"walkingLength":                    WalkingLength,
 			"divideFloat64":                    Divide[float64],
 			"divideInt":                        Divide[int],
+			"typeOf":                           reflect.TypeOf,
+			"shortDuration":                    ShortDuration,
+			"beneficiaryValidatedProfile":      validatedprofile.ValidateProfile(renderer.GlobalConfig.Sub("modules.beneficiaries.validated_profile")),
+			"solidarityDriverValidatedProfile": validatedprofile.ValidateProfile(renderer.GlobalConfig.Sub("modules.solidarity_transport.drivers.validated_profile")),
+			"carpoolDriverValidatedProfile":    validatedprofile.ValidateProfile(renderer.GlobalConfig.Sub("modules.organized_carpool.drivers.validated_profile")),
+			"beneficiaryDocuments": func(id string) []filestorage.FileInfo {
+				documents := renderer.FileStorage.List(filestorage.PREFIX_BENEFICIARIES + "/" + id)
+				return documents
+			},
+			"solidarityDocuments": func(id string) []filestorage.FileInfo {
+				documents := renderer.FileStorage.List(filestorage.PREFIX_SOLIDARITY_TRANSPORT_DRIVERS + "/" + id)
+				return documents
+			},
+			"carpoolDocuments": func(id string) []filestorage.FileInfo {
+				documents := renderer.FileStorage.List(filestorage.PREFIX_ORGANIZED_CARPOOL_DRIVERS + "/" + id)
+				return documents
+			},
 		},
 	)
 	t = template.Must(t.ParseFiles(prefixed_files...))

 	err := t.ExecuteTemplate(w, "main", state)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("issue executing template")
 	}
 }

 func (renderer *Renderer) RenderNoLayout(name string, w http.ResponseWriter, r *http.Request, files []string, state RenderState) {
-
 	prefixed_files := []string{}
 	for _, f := range files {
 		prefixed_files = append(prefixed_files, renderer.templateFile(f))
@ -89,13 +112,30 @@ func (renderer *Renderer) RenderNoLayout(name string, w http.ResponseWriter, r *
 			"unsescapeHTML":                    UnescapeHTML,
 			"divideFloat64":                    Divide[float64],
 			"divideInt":                        Divide[int],
+			"typeOf":                           reflect.TypeOf,
+			"shortDuration":                    ShortDuration,
+			"beneficiaryValidatedProfile":      validatedprofile.ValidateProfile(renderer.GlobalConfig.Sub("modules.beneficiaries.validated_profile")),
+			"solidarityDriverValidatedProfile": validatedprofile.ValidateProfile(renderer.GlobalConfig.Sub("modules.solidarity_transport.drivers.validated_profile")),
+			"carpoolDriverValidatedProfile":    validatedprofile.ValidateProfile(renderer.GlobalConfig.Sub("modules.organized_carpool.drivers.validated_profile")),
+			"beneficiaryDocuments": func(id string) []filestorage.FileInfo {
+				documents := renderer.FileStorage.List(filestorage.PREFIX_BENEFICIARIES + "/" + id)
+				return documents
+			},
+			"solidarityDocuments": func(id string) []filestorage.FileInfo {
+				documents := renderer.FileStorage.List(filestorage.PREFIX_SOLIDARITY_TRANSPORT_DRIVERS + "/" + id)
+				return documents
+			},
+			"carpoolDocuments": func(id string) []filestorage.FileInfo {
+				documents := renderer.FileStorage.List(filestorage.PREFIX_ORGANIZED_CARPOOL_DRIVERS + "/" + id)
+				return documents
+			},
 		},
 	)

 	t = template.Must(t.ParseFiles(prefixed_files...))
 	err := t.ExecuteTemplate(w, "main", state)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("issue executing template")
 	}
 }

@ -115,6 +155,7 @@ type RenderState struct {

 func NewState(r *http.Request, themeConfig *viper.Viper, menuState string) RenderState {
 	iconset := themeConfig.GetStringMapString("icons.svg")
+	menu := themeConfig.Get("menu_items")

 	// Get State elements from Request
 	var userid string
@ -160,6 +201,9 @@ func NewState(r *http.Request, themeConfig *viper.Viper, menuState string) Rende
 			Active:  menuState == administrationMenu,
 		},

+		Menu: menu,
+
+		// DEPRECATED
 		MenuItems: []MenuItem{
 			{
 				Title:  "Tableau de bord",
@ -170,6 +214,7 @@ func NewState(r *http.Request, themeConfig *viper.Viper, menuState string) Rende
 		},
 	}

+	// DEPRECATED
 	if modules["beneficiaries"] != nil && modules["beneficiaries"].(bool) {
 		ls.MenuItems = append(ls.MenuItems, MenuItem{
 			Title:  "Bénéficiaires",
@ -188,6 +233,15 @@ func NewState(r *http.Request, themeConfig *viper.Viper, menuState string) Rende
 		})
 	}

+	if modules["solidarity_transport"] != nil && modules["solidarity_transport"].(bool) {
+		ls.MenuItems = append(ls.MenuItems, MenuItem{
+			Title:  "Transport solidaire",
+			Link:   "/app/solidarity-transport/",
+			Active: menuState == solidarityTransportMenu,
+			Icon:   "tabler-icons:car",
+		})
+	}
+
 	if modules["vehicles"] != nil && modules["vehicles"].(bool) {
 		ls.MenuItems = append(ls.MenuItems, MenuItem{
 			Title:  "Véhicules partagés",
@ -222,7 +276,6 @@ func NewState(r *http.Request, themeConfig *viper.Viper, menuState string) Rende
 			Active: menuState == groupMenu,
 			Icon:   "hero:outline/group_module",
 		})
-
 	}

 	if modules["support"] != nil && modules["support"].(bool) {
@ -232,7 +285,6 @@ func NewState(r *http.Request, themeConfig *viper.Viper, menuState string) Rende
 			Active: menuState == commentMenu,
 			Icon:   "hero:outline/support",
 		})
-
 	}

 	if modules["directory"] != nil && modules["directory"].(bool) {
@ -243,14 +295,15 @@ func NewState(r *http.Request, themeConfig *viper.Viper, menuState string) Rende
 			Icon:   "hero:outline/document-text",
 		})
 	}
-	if modules["conseillers"] != nil && modules["conseillers"].(bool) {
+	/*if modules["diags"] != nil && modules["diags"].(bool) {
 		ls.MenuItems = append(ls.MenuItems, MenuItem{
-			Title:  "Conseillers",
-			Link:   "/app/conseillers/",
-			Active: menuState == membersMenu,
-			Icon:   "hero:outline/user-group",
+			Title:  "Diagnostics",
+			Link:   "/app/diags/",
+			Active: menuState == diagsMenu,
+			Icon:   "hero:outline/document-text",
 		})
-	}
+	}*/
+
 	return RenderState{
 		IconSet:     icons.NewIconSet(iconset),
 		Group:       group,
--- a/renderer/solidarity-transport-ext.go
+++ b/renderer/solidarity-transport-ext.go
@ -0,0 +1,16 @@
+package renderer
+
+import "net/http"
+
+func (renderer *Renderer) SolidarityTransportExternalBookingDisplay(w http.ResponseWriter, r *http.Request, booking any, driver any, passenger any) {
+	files := renderer.ThemeConfig.GetStringSlice("views.solidarity_transport.ext.booking_proposal.files")
+	state := NewState(r, renderer.ThemeConfig, solidarityTransportMenu)
+	state.ViewState = map[string]any{
+		"driver":    driver,
+		"passenger": passenger,
+		"booking":   booking,
+		"config":    renderer.GlobalConfig,
+	}
+
+	renderer.RenderNoLayout("booking display", w, r, files, state)
+}
--- a/renderer/solidarity-transport.go
+++ b/renderer/solidarity-transport.go
@ -0,0 +1,87 @@
+package renderer
+
+import (
+	"net/http"
+
+	mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
+)
+
+const solidarityTransportMenu = "solidarity_transport"
+
+func (renderer *Renderer) SolidarityTransportOverview(w http.ResponseWriter, r *http.Request, drivers any, driversMap any, passengersMap any, bookings any, bookingsHistory any) {
+	files := renderer.ThemeConfig.GetStringSlice("views.solidarity_transport.overview.files")
+	state := NewState(r, renderer.ThemeConfig, solidarityTransportMenu)
+	state.ViewState = map[string]any{
+		"drivers":          drivers,
+		"drivers_map":      driversMap,
+		"passengers_map":   passengersMap,
+		"bookings":         bookings,
+		"bookings_history": bookingsHistory,
+	}
+
+	renderer.Render("solidarity transport overview", w, r, files, state)
+}
+
+func (renderer *Renderer) SolidarityTransportCreateDriver(w http.ResponseWriter, r *http.Request) {
+	files := renderer.ThemeConfig.GetStringSlice("views.solidarity_transport.driver_create.files")
+	state := NewState(r, renderer.ThemeConfig, solidarityTransportMenu)
+	state.ViewState = map[string]any{}
+
+	renderer.Render("solidarity transport driver creation", w, r, files, state)
+}
+
+func (renderer *Renderer) SolidarityTransportUpdateDriver(w http.ResponseWriter, r *http.Request, driver any) {
+	files := renderer.ThemeConfig.GetStringSlice("views.solidarity_transport.driver_update.files")
+	state := NewState(r, renderer.ThemeConfig, solidarityTransportMenu)
+	state.ViewState = map[string]any{
+		"driver": driver,
+	}
+
+	renderer.Render("solidarity transport driver update", w, r, files, state)
+}
+
+func (renderer *Renderer) SolidarityTransportDriverDisplay(w http.ResponseWriter, r *http.Request, driver mobilityaccountsstorage.Account, availabilities any, documents any, bookings any, stats map[string]any) {
+	files := renderer.ThemeConfig.GetStringSlice("views.solidarity_transport.driver_display.files")
+	state := NewState(r, renderer.ThemeConfig, solidarityTransportMenu)
+
+	drivers_file_types := renderer.GlobalConfig.GetStringSlice("modules.solidarity_transport.drivers.documents_types")
+	file_types_map := renderer.GlobalConfig.GetStringMapString("storage.files.file_types")
+
+	state.ViewState = map[string]any{
+		"driver":             driver,
+		"availabilities":     availabilities,
+		"bookings":           bookings,
+		"documents":          documents,
+		"drivers_file_types": drivers_file_types,
+		"file_types_map":     file_types_map,
+		"stats":              stats,
+	}
+
+	renderer.Render("solidarity transport driver creation", w, r, files, state)
+}
+
+func (renderer *Renderer) SolidarityTransportDriverJourney(w http.ResponseWriter, r *http.Request, driverJourney any, driver any, passenger any, beneficiaries any) {
+	files := renderer.ThemeConfig.GetStringSlice("views.solidarity_transport.driver_journey.files")
+	state := NewState(r, renderer.ThemeConfig, solidarityTransportMenu)
+	state.ViewState = map[string]any{
+		"driver":         driver,
+		"passenger":      passenger,
+		"beneficiaries":  beneficiaries,
+		"driver_journey": driverJourney,
+		"config":         renderer.GlobalConfig,
+	}
+
+	renderer.Render("solidarity transport driver creation", w, r, files, state)
+}
+
+func (renderer *Renderer) SolidarityTransportBookingDisplay(w http.ResponseWriter, r *http.Request, booking any, driver any, passenger any) {
+	files := renderer.ThemeConfig.GetStringSlice("views.solidarity_transport.booking_display.files")
+	state := NewState(r, renderer.ThemeConfig, solidarityTransportMenu)
+	state.ViewState = map[string]any{
+		"driver":    driver,
+		"passenger": passenger,
+		"booking":   booking,
+	}
+
+	renderer.Render("booking display", w, r, files, state)
+}
--- a/renderer/support.go
+++ b/renderer/support.go
--- a/renderer/vehicle-management.go
+++ b/renderer/vehicle-management.go
@ -5,28 +5,31 @@ import (

 	filestorage "git.coopgo.io/coopgo-apps/parcoursmob/utils/storage"
 	fleetsstorage "git.coopgo.io/coopgo-platform/fleets/storage"
+	mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
 )

 const vehiclesmanagementMenu = "vehicles_management"

-func (renderer *Renderer) VehiclesManagementOverview(w http.ResponseWriter, r *http.Request, vehicles []fleetsstorage.Vehicle, vehicles_map map[string]fleetsstorage.Vehicle, bookings []fleetsstorage.Booking) {
+func (renderer *Renderer) VehiclesManagementOverview(w http.ResponseWriter, r *http.Request, vehicles []fleetsstorage.Vehicle, vehicles_map map[string]fleetsstorage.Vehicle, driversMap map[string]mobilityaccountsstorage.Account, bookings []fleetsstorage.Booking) {
 	files := renderer.ThemeConfig.GetStringSlice("views.vehicles_management.overview.files")
 	state := NewState(r, renderer.ThemeConfig, vehiclesmanagementMenu)
 	state.ViewState = map[string]any{
 		"vehicles":     vehicles,
 		"bookings":     bookings,
 		"vehicles_map": vehicles_map,
+		"drivers_map":  driversMap,
 	}

 	renderer.Render("fleet overview", w, r, files, state)
 }

-func (renderer *Renderer) VehiclesManagementBookingsList(w http.ResponseWriter, r *http.Request, vehicles_map map[string]fleetsstorage.Vehicle, bookings []fleetsstorage.Booking, cacheid string) {
+func (renderer *Renderer) VehiclesManagementBookingsList(w http.ResponseWriter, r *http.Request, vehiclesMap map[string]fleetsstorage.Vehicle, driversMap map[string]mobilityaccountsstorage.Account, bookings []fleetsstorage.Booking, cacheid string) {
 	files := renderer.ThemeConfig.GetStringSlice("views.vehicles_management.bookings_list.files")
 	state := NewState(r, renderer.ThemeConfig, vehiclesmanagementMenu)
 	state.ViewState = map[string]any{
 		"bookings":     bookings,
-		"vehicles_map": vehicles_map,
+		"vehicles_map": vehiclesMap,
+		"drivers_map":  driversMap,
 		"cacheid":      cacheid,
 	}

@ -43,11 +46,13 @@ func (renderer *Renderer) VehiclesFleetAdd(w http.ResponseWriter, r *http.Reques
 	renderer.Render("fleet add vehicle", w, r, files, state)
 }

-func (renderer *Renderer) VehiclesFleetDisplay(w http.ResponseWriter, r *http.Request, vehicle any) {
+func (renderer *Renderer) VehiclesFleetDisplay(w http.ResponseWriter, r *http.Request, vehicle any, beneficiaries any, diags []any) {
 	files := renderer.ThemeConfig.GetStringSlice("views.vehicles_management.fleet_display.files")
 	state := NewState(r, renderer.ThemeConfig, vehiclesmanagementMenu)
 	state.ViewState = map[string]any{
 		"vehicle":       vehicle,
+		"beneficiaries": beneficiaries,
+		"diags":         diags,
 	}

 	renderer.Render("fleet display vehicle", w, r, files, state)
@ -64,7 +69,7 @@ func (renderer *Renderer) VehiclesFleetUpdate(w http.ResponseWriter, r *http.Req
 	renderer.Render("fleet display vehicle", w, r, files, state)
 }

-func (renderer *Renderer) VehicleManagementBookingDisplay(w http.ResponseWriter, r *http.Request, booking any, vehicle any, beneficiary any, group any, documents []filestorage.FileInfo, file_types_map map[string]string, alternative_vehicles []any) {
+func (renderer *Renderer) VehicleManagementBookingDisplay(w http.ResponseWriter, r *http.Request, booking any, vehicle any, beneficiary any, group any, documents []filestorage.FileInfo, file_types_map map[string]string, alternative_vehicles []any, diags []any) {
 	files := renderer.ThemeConfig.GetStringSlice("views.vehicles_management.booking_display.files")
 	state := NewState(r, renderer.ThemeConfig, vehiclesmanagementMenu)
 	state.ViewState = map[string]any{
@ -75,6 +80,7 @@ func (renderer *Renderer) VehicleManagementBookingDisplay(w http.ResponseWriter,
 		"documents":            documents,
 		"file_types_map":       file_types_map,
 		"alternative_vehicles": alternative_vehicles,
+		"diags":                diags,
 	}

 	renderer.Render("vehicles search", w, r, files, state)
@ -88,5 +94,4 @@ func (renderer *Renderer) UnbookingVehicle(w http.ResponseWriter, r *http.Reques
 	}

 	renderer.Render("vehicule unbooking", w, r, files, state)
-
 }
--- a/renderer/vehicles.go
+++ b/renderer/vehicles.go
@ -5,6 +5,7 @@ import (

 	filestorage "git.coopgo.io/coopgo-apps/parcoursmob/utils/storage"
 	"git.coopgo.io/coopgo-platform/fleets/storage"
+	fleetsstorage "git.coopgo.io/coopgo-platform/fleets/storage"
 	mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
 )

@ -22,7 +23,7 @@ func selectDocumentsDefaults(beneficiarydocuments []filestorage.FileInfo, mandat
 	return res
 }

-func (renderer *Renderer) VehiclesSearch(w http.ResponseWriter, r *http.Request, beneficiaries []mobilityaccountsstorage.Account, searched bool, vehicles []any, beneficiary any, startdate any, enddate any, mandatory_documents []string, file_types_map map[string]string, beneficiarydocuments []filestorage.FileInfo, selected_type string, automatic bool, vehicles_types []string, admingroups map[string]any) {
+func (renderer *Renderer) VehiclesSearch(w http.ResponseWriter, r *http.Request, beneficiaries []mobilityaccountsstorage.Account, searched bool, vehicles []fleetsstorage.Vehicle, beneficiary any, startdate any, enddate any, mandatory_documents []string, file_types_map map[string]string, beneficiarydocuments []filestorage.FileInfo, selected_type string, automatic bool, vehicles_types []string, admingroups map[string]any) {
 	files := renderer.ThemeConfig.GetStringSlice("views.vehicles.search.files")
 	state := NewState(r, renderer.ThemeConfig, vehiclesMenu)
 	viewstate := map[string]any{
@ -52,7 +53,7 @@ func (renderer *Renderer) VehiclesSearch(w http.ResponseWriter, r *http.Request,
 	renderer.Render("vehicles search", w, r, files, state)
 }

-func (renderer *Renderer) VehicleBookingDisplay(w http.ResponseWriter, r *http.Request, booking any, vehicle any, beneficiary any, group any, documents []filestorage.FileInfo, file_types_map map[string]string) {
+func (renderer *Renderer) VehicleBookingDisplay(w http.ResponseWriter, r *http.Request, booking any, vehicle any, beneficiary any, group any, documents []filestorage.FileInfo, file_types_map map[string]string, diags []any) {
 	files := renderer.ThemeConfig.GetStringSlice("views.vehicles.booking_display.files")
 	state := NewState(r, renderer.ThemeConfig, vehiclesMenu)
 	state.ViewState = map[string]any{
@ -62,6 +63,7 @@ func (renderer *Renderer) VehicleBookingDisplay(w http.ResponseWriter, r *http.R
 		"group":          group,
 		"documents":      documents,
 		"file_types_map": file_types_map,
+		"diags":          diags,
 	}

 	renderer.Render("vehicles search", w, r, files, state)
--- a/services/agenda.go
+++ b/services/agenda.go
@ -1,8 +1,14 @@
 package services

 import (
+	"context"
+	"fmt"
+	"time"
+
 	agenda "git.coopgo.io/coopgo-platform/agenda/grpcapi"
+	"git.coopgo.io/coopgo-platform/agenda/storage"
 	"google.golang.org/grpc"
+	"google.golang.org/protobuf/types/known/timestamppb"
 )

 type AgendaService struct {
@ -21,3 +27,39 @@ func NewAgendaService(dial string) (*AgendaService, error) {
 		AgendaClient: client,
 	}, nil
 }
+
+func (s *ServicesHandler) GetAgendaEvents() ([]AgendaEvent, error) {
+	resp, err := s.GRPC.Agenda.GetEvents(context.TODO(), &agenda.GetEventsRequest{
+		Namespaces: []string{"parcoursmob_dispositifs"},
+		Mindate:    timestamppb.New(time.Now().Add(-24 * time.Hour)),
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	groups, err := s.GetGroupsMap()
+	if err != nil {
+		return nil, fmt.Errorf("error in groups request : %w", err)
+	}
+
+	events := []AgendaEvent{}
+
+	for _, e := range resp.Events {
+		newEvent := AgendaEvent{
+			Event: e.ToStorageType(),
+		}
+		for _, o := range e.Owners {
+			newEvent.OwnersGroups = append(newEvent.OwnersGroups, GroupsManagementGroup{Group: groups[o]})
+		}
+		events = append(events, newEvent)
+	}
+
+	return events, nil
+}
+
+// Enriched types
+
+type AgendaEvent struct {
+	OwnersGroups []GroupsManagementGroup
+	storage.Event
+}
--- a/services/carpool.go
+++ b/services/carpool.go
@ -0,0 +1,23 @@
+package services
+
+import (
+	"git.coopgo.io/coopgo-platform/carpool-service/servers/grpc/proto"
+	"google.golang.org/grpc"
+)
+
+type CarpoolService struct {
+	proto.CarpoolServiceClient
+}
+
+func NewCarpoolService(dial string) (*CarpoolService, error) {
+	conn, err := grpc.Dial(dial, grpc.WithInsecure())
+
+	client := proto.NewCarpoolServiceClient(conn)
+	if err != nil {
+		return nil, err
+	}
+
+	return &CarpoolService{
+		CarpoolServiceClient: client,
+	}, nil
+}
--- a/services/diags.go
+++ b/services/diags.go
@ -0,0 +1,55 @@
+package services
+
+import (
+	"context"
+	// "time"
+
+	diags "git.coopgo.io/coopgo-platform/diags/grpcapi"
+	"git.coopgo.io/coopgo-platform/diags/storage"
+	"google.golang.org/grpc"
+	// "google.golang.org/protobuf/types/known/timestamppb"
+)
+
+type DiagsService struct {
+	diags.DiagsClient
+}
+
+func NewDiagsService(dial string) (*DiagsService, error) {
+	conn, err := grpc.Dial(dial, grpc.WithInsecure())
+
+	client := diags.NewDiagsClient(conn)
+	if err != nil {
+		return nil, err
+	}
+
+	return &DiagsService{
+		DiagsClient: client,
+	}, nil
+}
+
+func (s *ServicesHandler) GetDiagsDiags() ([]DiagsDiag, error) {
+	resp, err := s.GRPC.Diags.GetDiags(context.TODO(), &diags.GetDiagsRequest{
+		Namespaces: []string{"parcoursmob_beneficiaires", "parcoursmob_diagnostiques"},
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	diags := []DiagsDiag{}
+
+	for _, e := range resp.Diags {
+		newDiag := DiagsDiag{
+			Diag: e.ToStorageType(),
+		}
+		diags = append(diags, newDiag)
+	}
+
+	return diags, nil
+}
+
+// Enriched types
+
+type DiagsDiag struct {
+	OwnersGroups []GroupsManagementGroup
+	storage.Diag
+}
--- a/services/fleets.go
+++ b/services/fleets.go
@ -7,6 +7,7 @@ import (
 	"git.coopgo.io/coopgo-apps/parcoursmob/utils/sorting"
 	fleets "git.coopgo.io/coopgo-platform/fleets/grpcapi"
 	"git.coopgo.io/coopgo-platform/fleets/storage"
+	"github.com/rs/zerolog/log"
 	"google.golang.org/grpc"
 )

@ -56,13 +57,17 @@ func (s *ServicesHandler) GetBookings() (bookings []storage.Booking, err error)
 func (s *ServicesHandler) GetVehiclesMap() (vehicles map[string]storage.Vehicle, err error) {
 	vehicles = map[string]storage.Vehicle{}

-	request := &fleets.GetVehiclesRequest{}
+	request := &fleets.GetVehiclesRequest{
+		Namespaces: []string{"parcoursmob"},
+	}
 	resp, err := s.GRPC.Fleets.GetVehicles(context.TODO(), request)
-	if err == nil {
+	if err != nil {
+		log.Error().Err(err).Msg("")
+	} else {
 		for _, vehicle := range resp.Vehicles {
 			vehicles[vehicle.Id] = vehicle.ToStorageType()
 		}
 	}

-	return
+	return vehicles, err
 }
--- a/services/groupsmanagement.go
+++ b/services/groupsmanagement.go
@ -41,7 +41,7 @@ func (s *ServicesHandler) GetGroupsMap() (groups map[string]storage.Group, err e
 	return
 }

-////////////////////////////////optimize the code//////////////////////////////////////
+// //////////////////////////////optimize the code//////////////////////////////////////
 func (s *ServicesHandler) GetGroupsMemberMap(id string) (groups map[string]any, err error) {
 	groups = map[string]any{}

@ -56,3 +56,23 @@ func (s *ServicesHandler) GetGroupsMemberMap(id string) (groups map[string]any,
 	}
 	return
 }
+
+func (s *ServicesHandler) GetGroup(groupid string) (*storage.Group, error) {
+	groupresp, err := s.GRPC.GroupsManagement.GetGroup(context.TODO(), &groupsmanagement.GetGroupRequest{
+		Id:        groupid,
+		Namespace: "parcoursmob_organizations",
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	group := groupresp.Group.ToStorageType()
+
+	return &group, nil
+}
+
+// Enriched types
+
+type GroupsManagementGroup struct {
+	storage.Group
+}
--- a/services/mobilityaccounts.go
+++ b/services/mobilityaccounts.go
@ -42,6 +42,22 @@ func (s *ServicesHandler) GetBeneficiaries() (accounts []storage.Account, err er
 	return
 }

+func (s *ServicesHandler) GetBeneficiariesMap() (accounts map[string]storage.Account, err error) {
+	accounts = map[string]storage.Account{}
+	request := &mobilityaccounts.GetAccountsRequest{
+		Namespaces: []string{"parcoursmob_beneficiaries"},
+	}
+	resp, err := s.GRPC.MobilityAccounts.GetAccounts(context.TODO(), request)
+
+	if err == nil {
+		for _, v := range resp.Accounts {
+			accounts[v.Id] = v.ToStorageType()
+		}
+	}
+
+	return
+}
+
 func (s *ServicesHandler) GetAccounts() (accounts []storage.Account, err error) {
 	accounts = []storage.Account{}
 	request := &mobilityaccounts.GetAccountsRequest{
@ -58,3 +74,63 @@ func (s *ServicesHandler) GetAccounts() (accounts []storage.Account, err error)

 	return
 }
+
+func (s *ServicesHandler) GetAccountsInNamespace(namespace string) (accounts []storage.Account, err error) {
+	accounts = []storage.Account{}
+	request := &mobilityaccounts.GetAccountsRequest{
+		Namespaces: []string{namespace},
+	}
+	resp, err := s.GRPC.MobilityAccounts.GetAccounts(context.TODO(), request)
+
+	if err == nil {
+		for _, v := range resp.Accounts {
+			a := v.ToStorageType()
+			accounts = append(accounts, a)
+		}
+	}
+
+	return
+}
+func (s *ServicesHandler) GetAccountsInNamespaceMap(namespace string) (accounts map[string]storage.Account, err error) {
+	accounts = map[string]storage.Account{}
+	request := &mobilityaccounts.GetAccountsRequest{
+		Namespaces: []string{namespace},
+	}
+	resp, err := s.GRPC.MobilityAccounts.GetAccounts(context.TODO(), request)
+
+	if err == nil {
+		for _, v := range resp.Accounts {
+			accounts[v.Id] = v.ToStorageType()
+		}
+	}
+
+	return
+}
+
+func (s *ServicesHandler) GetAccountsInNamespacesMap(namespaces []string) (accounts map[string]storage.Account, err error) {
+	accounts = map[string]storage.Account{}
+	request := &mobilityaccounts.GetAccountsRequest{
+		Namespaces: namespaces,
+	}
+	resp, err := s.GRPC.MobilityAccounts.GetAccounts(context.TODO(), request)
+
+	if err == nil {
+		for _, v := range resp.Accounts {
+			accounts[v.Id] = v.ToStorageType()
+		}
+	}
+
+	return
+}
+
+func (s *ServicesHandler) GetAccount(id string) (account storage.Account, err error) {
+	request := &mobilityaccounts.GetAccountRequest{
+		Id: id,
+	}
+	resp, err := s.GRPC.MobilityAccounts.GetAccount(context.TODO(), request)
+	if err != nil {
+		return storage.Account{}, err
+	}
+
+	return resp.Account.ToStorageType(), nil
+}
--- a/services/services.go
+++ b/services/services.go
@ -2,14 +2,30 @@ package services

 import (
 	agenda "git.coopgo.io/coopgo-platform/agenda/grpcapi"
+	carpoolservice "git.coopgo.io/coopgo-platform/carpool-service/servers/grpc/proto"
+	diags "git.coopgo.io/coopgo-platform/diags/grpcapi"
 	fleets "git.coopgo.io/coopgo-platform/fleets/grpcapi"
+	"git.coopgo.io/coopgo-platform/geography/handlers/admin"
 	groupsmanagement "git.coopgo.io/coopgo-platform/groups-management/grpcapi"
 	mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
+	multimodal "git.coopgo.io/coopgo-platform/multimodal-routing/handlers"
+	"git.coopgo.io/coopgo-platform/multimodal-routing/libs/transit/motis"
+	"git.coopgo.io/coopgo-platform/payments/pricing"
+	"git.coopgo.io/coopgo-platform/routing-service"
+	"git.coopgo.io/coopgo-platform/sms"
+	solidaritytransport "git.coopgo.io/coopgo-platform/solidarity-transport/servers/grpc/proto/gen"
+	"github.com/rs/zerolog/log"
 	"github.com/spf13/viper"
 )

 type ServicesHandler struct {
 	GRPC           GRPCServices
+	InteropCarpool *multimodal.CarpoolRoutingHandler
+	Routing        routing.RoutingService
+	TransitRouting *motis.ClientWithResponses
+	SMS            *sms.SMSHandler
+	Pricing        pricing.PricingService
+	Geography      admin.AdminIndex
 }

 type GRPCServices struct {
@ -17,6 +33,9 @@ type GRPCServices struct {
 	GroupsManagement    groupsmanagement.GroupsManagementClient
 	Fleets              fleets.FleetsClient
 	Agenda              agenda.AgendaClient
+	SolidarityTransport solidaritytransport.SolidarityTransportClient
+	CarpoolService      carpoolservice.CarpoolServiceClient
+	Diags               diags.DiagsClient
 }

 func NewServicesHandler(cfg *viper.Viper) (*ServicesHandler, error) {
@ -25,24 +44,90 @@ 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")
+		solidarityTransportDial = cfg.GetString("services.grpc.solidaritytransport.dial")
+		carpoolServiceDial      = cfg.GetString("services.grpc.carpoolservice.dial")
+		routing_service_type    = cfg.GetString("routing.type")
+		valhalla_base_url       = cfg.GetString("routing.valhalla.base_url")
+
+		// diagsDial            = cfg.GetString("services.grpc.diags.dial")
 	)
 	mobilityAccounts, err := NewMobilityAccountService(mobilityAccountsDial)
 	if err != nil {
+		log.Error().Err(err).Msg("Mobility Accounts service issue")
 		return nil, err
 	}

 	groupsManagement, err := NewGroupsManagementService(groupsManagementDial)
 	if err != nil {
+		log.Error().Err(err).Msg("Groups mgmt service issue")
 		return nil, err
 	}

 	fleetsSvc, err := NewFleetsService(fleetsDial)
 	if err != nil {
+		log.Error().Err(err).Msg("Fleets service issue")
 		return nil, err
 	}

 	agendaSvc, err := NewAgendaService(agendaDial)
 	if err != nil {
+		log.Error().Err(err).Msg("Agenda service issue")
+		return nil, err
+	}
+
+	solidarityTransportSvc, err := NewSolidarityTransportService(solidarityTransportDial)
+	if err != nil {
+		log.Error().Err(err).Msg("Solidarity Transport service issue")
+		return nil, err
+	}
+	carpoolSvc, err := NewCarpoolService(carpoolServiceDial)
+	if err != nil {
+		log.Error().Err(err).Msg("Carpool service service issue")
+		return nil, err
+	}
+
+	//diagsSvc, err := NewDiagsService(diagsDial)
+	//	log.Error().Err(err).Msg("Mobility Accounts service issue")
+	//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
+	}
+
+	carpoolRouting, err := multimodal.NewCarpoolRoutingHandler(cfg.Sub("multimodal.modes.carpool"))
+	if err != nil {
+		log.Fatal().Err(err).Msg("Could not initiate the carpool routing service")
+		return nil, err
+	}
+
+	motisRouting, err := motis.NewClientWithResponses(cfg.GetString("multimodal.modes.transit.motis.server"))
+	if err != nil {
+		log.Fatal().Err(err).Msg("Could not initiate the transit routing service")
+		return nil, err
+	}
+
+	pricing_type := cfg.GetString("payments.pricing.type")
+	if pricing_type == "" {
+		pricing_type = "mms43"
+	}
+	pricingService, err := pricing.NewPricingService(pricing_type)
+	if err != nil {
+		log.Fatal().Err(err).Msg("Could not initiate the pricing service")
+		return nil, err
+	}
+
+	smsHandler, err := sms.NewSMSHandler(cfg.Sub("sms"))
+	if err != nil {
+		log.Fatal().Err(err).Msg("Could not initiate the SMS handler")
+		return nil, err
+	}
+
+	geography, err := admin.NewAdminIndex(cfg.Sub("geography"))
+	if err != nil {
+		log.Fatal().Err(err).Msg("could not initiate admin index")
 		return nil, err
 	}

@ -52,6 +137,15 @@ func NewServicesHandler(cfg *viper.Viper) (*ServicesHandler, error) {
 			GroupsManagement:    groupsManagement,
 			Fleets:              fleetsSvc,
 			Agenda:              agendaSvc,
+			SolidarityTransport: solidarityTransportSvc,
+			CarpoolService:      carpoolSvc,
+			//		Diags:            diagsSvc,
 		},
+		Routing:        routing,
+		InteropCarpool: carpoolRouting,
+		TransitRouting: motisRouting,
+		SMS:            smsHandler,
+		Pricing:        pricingService,
+		Geography:      geography,
 	}, nil
 }
--- a/services/solidaritytransport.go
+++ b/services/solidaritytransport.go
@ -0,0 +1,23 @@
+package services
+
+import (
+	"git.coopgo.io/coopgo-platform/solidarity-transport/servers/grpc/proto/gen"
+	"google.golang.org/grpc"
+)
+
+type SolidarityTransportService struct {
+	gen.SolidarityTransportClient
+}
+
+func NewSolidarityTransportService(dial string) (*SolidarityTransportService, error) {
+	conn, err := grpc.Dial(dial, grpc.WithInsecure())
+
+	client := gen.NewSolidarityTransportClient(conn)
+	if err != nil {
+		return nil, err
+	}
+
+	return &SolidarityTransportService{
+		SolidarityTransportClient: client,
+	}, nil
+}
--- a/1
+++ b/1
@ -0,0 +1 @@
+Subproject commit db4c22699eff6756851b0d3eff430b7bbe4c1c1b
--- a/utils/form-validators/form-validators.go
+++ b/utils/form-validators/form-validators.go
--- a/utils/form-validators/phone-numbers.go
+++ b/utils/form-validators/phone-numbers.go
--- a/utils/icons/svg-icons.go
+++ b/utils/icons/svg-icons.go
--- a/utils/identification/groups.go
+++ b/utils/identification/groups.go
@ -6,6 +6,7 @@ import (
 	"net/http"

 	groupsmanagement "git.coopgo.io/coopgo-platform/groups-management/grpcapi"
+	"github.com/rs/zerolog/log"
 )

 const GroupKey ContextKey = "group"
@ -19,7 +20,6 @@ func (p *IdentificationProvider) GroupsMiddleware(next http.Handler) http.Handle

 		o, ok := session.Values["organization"]
 		if !ok || o == nil {
-			fmt.Println("no organization")
 			http.Redirect(w, r, "/auth/groups/", http.StatusFound)
 			return
 		}
@ -29,7 +29,7 @@ func (p *IdentificationProvider) GroupsMiddleware(next http.Handler) http.Handle
 		claimgroups, ok := claims["groups"].([]any)

 		if !ok {
-			fmt.Println("cast issue")
+			log.Error().Msg("cast issue")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
--- a/utils/identification/oidc.go
+++ b/utils/identification/oidc.go
@ -4,14 +4,14 @@ import (
 	"context"
 	"crypto/rand"
 	"encoding/base64"
-	"fmt"
 	"io"
 	"net/http"

 	"git.coopgo.io/coopgo-apps/parcoursmob/services"
 	"git.coopgo.io/coopgo-apps/parcoursmob/utils/storage"
-	"github.com/coreos/go-oidc"
+	"github.com/coreos/go-oidc/v3/oidc"
 	"github.com/gorilla/sessions"
+	"github.com/rs/zerolog/log"
 	"github.com/spf13/viper"
 	"golang.org/x/oauth2"
 )
@ -40,8 +40,28 @@ func NewIdentificationProvider(cfg *viper.Viper, services *services.ServicesHand

 	provider, err := oidc.NewProvider(context.Background(), providerURL)
 	if err != nil {
+		var (
+			issuerUrl   = cfg.GetString("identification.oidc.provider_config.issuer_url")
+			authUrl     = cfg.GetString("identification.oidc.provider_config.auth_url")
+			tokenUrl    = cfg.GetString("identification.oidc.provider_config.token_url")
+			userInfoUrl = cfg.GetString("identification.oidc.provider_config.user_info_url")
+			jwksUrl     = cfg.GetString("identification.oidc.provider_config.jwks_url")
+			algorithms  = []string{"RS256"}
+		)
+		if issuerUrl == "" || authUrl == "" || tokenUrl == "" || jwksUrl == "" {
 			return nil, err
 		}
+		providerConfig := oidc.ProviderConfig{
+			IssuerURL:   issuerUrl,
+			AuthURL:     authUrl,
+			TokenURL:    tokenUrl,
+			UserInfoURL: userInfoUrl,
+			JWKSURL:     jwksUrl,
+			Algorithms:  algorithms,
+		}
+
+		provider = providerConfig.NewProvider(context.Background())
+	}

 	oauth2Config := oauth2.Config{
 		ClientID:     clientID,
@ -71,18 +91,18 @@ func (p *IdentificationProvider) Middleware(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		session, err := p.SessionsStore.Get(r, "parcoursmob_session")
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 		}

 		if session.Values["idtoken"] == nil || session.Values["idtoken"] == "" {
-
 			state, err := newState()
 			if err != nil {
 				panic(err)
 			}
 			session.Values["state"] = state
 			session.Save(r, w)
-			http.Redirect(w, r, p.OAuth2Config.AuthCodeURL(state), http.StatusFound)
+			url := p.OAuth2Config.AuthCodeURL(state)
+			http.Redirect(w, r, url, http.StatusFound)
 			return
 		}

@ -102,7 +122,7 @@ func (p *IdentificationProvider) Middleware(next http.Handler) http.Handler {

 		err = idtoken.Claims(&claims)
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 		}

 		ctx := context.WithValue(r.Context(), IdtokenKey, idtoken)
--- a/utils/profile-pictures/profile-pictures.go
+++ b/utils/profile-pictures/profile-pictures.go
@ -1,12 +1,12 @@
 package profilepictures

 import (
-	"fmt"
 	"image"
 	"image/color"
 	"image/draw"

 	"github.com/fogleman/gg"
+	"github.com/rs/zerolog/log"
 	"golang.org/x/image/font"
 	"golang.org/x/image/math/fixed"
 )
@ -21,7 +21,7 @@ func DefaultProfilePicture(initials string) *image.RGBA {

 	ff, err := gg.LoadFontFace("themes/default/web/fonts/bitter.ttf", 150.0)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		return img
 	}

--- a/utils/protectapi/api_key.go
+++ b/utils/protectapi/api_key.go
@ -0,0 +1,19 @@
+package protectapi
+
+import (
+	"net/http"
+
+	"github.com/rs/zerolog/log"
+)
+
+func ApiKey(apiKey string) func(http.Handler) http.Handler {
+	return func(next http.Handler) http.Handler {
+		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			if apiKey == "" || r.Header.Get("X_API_KEY") != apiKey {
+				log.Info().Msg("call to api not allowed")
+				w.WriteHeader(http.StatusForbidden)
+			}
+			next.ServeHTTP(w, r)
+		})
+	}
+}
--- a/utils/sorting/beneficiaries.go
+++ b/utils/sorting/beneficiaries.go
--- a/utils/sorting/events.go
+++ b/utils/sorting/events.go
--- a/utils/sorting/fleets.go
+++ b/utils/sorting/fleets.go
@ -1,9 +1,15 @@
 package sorting

 import (
+	"cmp"
+	"encoding/json"
 	"strings"

+	"git.coopgo.io/coopgo-platform/fleets/storage"
 	fleetsstorage "git.coopgo.io/coopgo-platform/fleets/storage"
+	"github.com/paulmach/orb/geo"
+	"github.com/paulmach/orb/geojson"
+	"github.com/rs/zerolog/log"
 )

 type VehiclesByLicencePlate []fleetsstorage.Vehicle
@ -21,3 +27,47 @@ func (a BookingsByStartdate) Less(i, j int) bool {
 	return a[i].Startdate.Before(a[j].Startdate)
 }
 func (a BookingsByStartdate) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
+
+// Functions
+
+func VehiclesByDistanceFrom(from geojson.Feature) func(vehicle1, vehicle2 storage.Vehicle) int {
+	return func(vehicle1, vehicle2 storage.Vehicle) int {
+		vehicle1Address, ok := vehicle1.Data["address"]
+		if !ok {
+			return 1
+		}
+		vehicle1Json, err := json.Marshal(vehicle1Address)
+		if err != nil {
+			log.Error().Err(err).Msg("failed marshalling vehicle 1 json")
+			return 1
+		}
+
+		vehicle1Geojson, err := geojson.UnmarshalFeature(vehicle1Json)
+		if err != nil {
+			log.Error().Err(err).Msg("failed unmarshalling vehicle 1 geojson")
+			return 1
+		}
+
+		vehicle2Address, ok := vehicle2.Data["address"]
+		if !ok {
+			log.Debug().Msg("Vehicle 2 does not have an address")
+			return -1
+		}
+		vehicle2Json, err := json.Marshal(vehicle2Address)
+		if err != nil {
+			log.Error().Err(err).Msg("failed marshalling vehicle 2 json")
+			return -1
+		}
+
+		vehicle2Geojson, err := geojson.UnmarshalFeature(vehicle2Json)
+		if err != nil {
+			log.Error().Err(err).Msg("failed unmarshalling vehicle 2 geojson")
+			return -1
+		}
+
+		distance1 := geo.Distance(from.Point(), vehicle1Geojson.Point())
+		distance2 := geo.Distance(from.Point(), vehicle2Geojson.Point())
+
+		return cmp.Compare(distance1, distance2)
+	}
+}
--- a/utils/sorting/groups.go
+++ b/utils/sorting/groups.go
--- a/utils/sorting/solidarity-transport.go
+++ b/utils/sorting/solidarity-transport.go
@ -0,0 +1,32 @@
+package sorting
+
+import (
+	"strings"
+
+	mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
+	"git.coopgo.io/coopgo-platform/solidarity-transport/servers/grpc/proto/gen"
+)
+
+type SolidarityDriversByName []mobilityaccountsstorage.Account
+
+func (e SolidarityDriversByName) Len() int { return len(e) }
+func (e SolidarityDriversByName) Less(i, j int) bool {
+	return e[i].Data["first_name"].(string) < e[j].Data["first_name"].(string)
+}
+func (e SolidarityDriversByName) Swap(i, j int) { e[i], e[j] = e[j], e[i] }
+
+type SolidarityAvailabilitiesByDay []*gen.DriverRegularAvailability
+
+func (e SolidarityAvailabilitiesByDay) Len() int { return len(e) }
+func (e SolidarityAvailabilitiesByDay) Less(i, j int) bool {
+	if e[i].Day == e[j].Day {
+		return strings.Compare(e[i].StartTime, e[j].StartTime) < 0
+	}
+
+	if e[i].Day == 0 {
+		return false
+	}
+
+	return e[i].Day < e[j].Day
+}
+func (e SolidarityAvailabilitiesByDay) Swap(i, j int) { e[i], e[j] = e[j], e[i] }
--- a/utils/sorting/sorting.go
+++ b/utils/sorting/sorting.go
--- a/utils/storage/badger.go
+++ b/utils/storage/badger.go
@ -0,0 +1 @@
+package storage
--- a/utils/storage/cache.go
+++ b/utils/storage/cache.go
--- a/utils/storage/etcd.go
+++ b/utils/storage/etcd.go
@ -8,6 +8,7 @@ import (
 	"fmt"
 	"time"

+	"github.com/rs/zerolog/log"
 	"github.com/spf13/viper"
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/client/v3/namespace"
@ -75,7 +76,7 @@ func NewEtcdHandler(cfg *viper.Viper) (*EtcdHandler, error) {
 		DialTimeout: 5 * time.Second,
 	})
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		return nil, err
 	}

@ -92,7 +93,7 @@ func NewEtcdHandler(cfg *viper.Viper) (*EtcdHandler, error) {
 func (s *EtcdHandler) Put(k string, v any) error {
 	data, err := s.serializer.Serialize(v)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		return err
 	}
 	// _, err = s.Client.KV.Put(context.TODO(), k, data.String())
@ -100,7 +101,7 @@ func (s *EtcdHandler) Put(k string, v any) error {
 	_, err = s.Client.KV.Put(ctx, k, string(data))
 	cancel()
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		return err
 	}
 	return nil
@ -109,13 +110,13 @@ func (s *EtcdHandler) Put(k string, v any) error {
 func (s *EtcdHandler) PutWithTTL(k string, v any, duration time.Duration) error {
 	lease, err := s.Client.Lease.Grant(context.TODO(), int64(duration.Seconds()))
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		return err
 	}

 	data, err := s.serializer.Serialize(v)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		return err
 	}
 	// _, err = s.Client.KV.Put(context.TODO(), k, data.String(), clientv3.WithLease(lease.ID))
@ -124,7 +125,7 @@ func (s *EtcdHandler) PutWithTTL(k string, v any, duration time.Duration) error
 	cancel()

 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		return err
 	}
 	return nil
@ -135,14 +136,14 @@ func (s *EtcdHandler) Get(k string) (any, error) {
 	resp, err := s.Client.KV.Get(ctx, k)
 	cancel()
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		return nil, err
 	}
 	for _, v := range resp.Kvs {
 		var data any
 		err := s.serializer.Deserialize([]byte(v.Value), &data)
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			return nil, err
 		}
 		// We return directly as we want to last revision of value
@ -156,7 +157,7 @@ func (s *EtcdHandler) Delete(k string) error {
 	_, err := s.Client.KV.Delete(ctx, k)
 	cancel()
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		return err
 	}
 	return nil
--- a/utils/storage/files.go
+++ b/utils/storage/files.go
@ -9,7 +9,11 @@ import (

 const (
 	PREFIX_BENEFICIARIES                = "beneficiaries"
+	PREFIX_SOLIDARITY_TRANSPORT_DRIVERS = "solidarity_transport/drivers"
+	PREFIX_ORGANIZED_CARPOOL_DRIVERS    = "organized_carpool/drivers"
 	PREFIX_BOOKINGS                     = "fleets_bookings"
+	PREFIX_AGENDA                       = "event_files"
+	PREFIX_DIAGS                        = "diags"
 )

 type FileInfo struct {
--- a/utils/storage/kv.go
+++ b/utils/storage/kv.go
@ -15,4 +15,6 @@ type KVHandler interface {

 func NewKVHandler(cfg *viper.Viper) (KVHandler, error) {
 	return NewEtcdHandler(cfg)
+	return nil, nil
+
 }
--- a/utils/storage/minio.go
+++ b/utils/storage/minio.go
@ -2,12 +2,12 @@ package storage

 import (
 	"context"
-	"fmt"
 	"io"
 	"strings"

 	"github.com/minio/minio-go/v7"
 	"github.com/minio/minio-go/v7/pkg/credentials"
+	"github.com/rs/zerolog/log"
 	"github.com/spf13/viper"
 )

@ -23,7 +23,7 @@ func NewMinioStorageHandler(cfg *viper.Viper) (*MinioStorageHandler, error) {
 		Secure: cfg.GetBool("storage.files.minio.use_ssl"),
 	})
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		return nil, err
 	}

@ -53,13 +53,13 @@ func (s *MinioStorageHandler) List(prefix string) []FileInfo {

 	for object := range objectCh {
 		if object.Err != nil {
-			fmt.Println("Error : ", object.Err)
+			log.Error().Str("prefix", prefix).Err(object.Err).Msg("Error listing files for prefix")
 			continue
 		}

 		objinfo, err := s.Client.StatObject(context.Background(), s.BucketName, object.Key, minio.StatObjectOptions{})
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			continue
 		}

@ -82,12 +82,12 @@ func (s *MinioStorageHandler) List(prefix string) []FileInfo {
 func (s *MinioStorageHandler) Get(prefix string, file string) (io.Reader, *FileInfo, error) {
 	object, err := s.Client.GetObject(context.Background(), s.BucketName, prefix+"/"+file, minio.GetObjectOptions{})
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		return nil, nil, err
 	}
 	objinfo, err := s.Client.StatObject(context.Background(), s.BucketName, prefix+"/"+file, minio.StatObjectOptions{})
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		return nil, nil, err
 	}

@ -117,7 +117,7 @@ func (s *MinioStorageHandler) Copy(src string, dst string) error {

 	_, err := s.Client.CopyObject(context.Background(), dstOpts, srcOpts)
 	if err != nil {
-		fmt.Println(err)
+		log.Error().Err(err).Msg("")
 		return err
 	}
 	return nil
--- a/utils/storage/sessions.go
+++ b/utils/storage/sessions.go
@ -11,6 +11,7 @@ import (

 	"github.com/gorilla/securecookie"
 	"github.com/gorilla/sessions"
+	"github.com/rs/zerolog/log"
 )

 // Amount of time for cookies/kv keys to expire.
@ -76,7 +77,7 @@ func (s *SessionStore) Save(r *http.Request, w http.ResponseWriter, session *ses
 	// Marked for deletion.
 	if session.Options.MaxAge <= 0 {
 		if err := s.delete(r.Context(), session); err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			return err
 		}
 		http.SetCookie(w, sessions.NewCookie(session.Name(), "", session.Options))
@ -87,13 +88,13 @@ func (s *SessionStore) Save(r *http.Request, w http.ResponseWriter, session *ses
 		}

 		if err := s.save(r.Context(), session); err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			return err
 		}

 		encoded, err := securecookie.EncodeMulti(session.Name(), session.ID, s.Codecs...)
 		if err != nil {
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			return err
 		}
 		http.SetCookie(w, sessions.NewCookie(session.Name(), encoded, session.Options))
@ -104,13 +105,11 @@ func (s *SessionStore) Save(r *http.Request, w http.ResponseWriter, session *ses
 // save stores the session in kv.
 func (s *SessionStore) save(ctx context.Context, session *sessions.Session) error {
 	m := make(map[string]interface{}, len(session.Values))
-	fmt.Println(m)
 	for k, v := range session.Values {
-		fmt.Println(v)
 		ks, ok := k.(string)
 		if !ok {
 			err := fmt.Errorf("non-string key value, cannot serialize session: %v", k)
-			fmt.Println(err)
+			log.Error().Err(err).Msg("")
 			return err
 		}
 		m[ks] = v
--- a/utils/validated-profile/validated-profile.go
+++ b/utils/validated-profile/validated-profile.go
@ -0,0 +1,102 @@
+package validatedprofile
+
+import (
+	"cmp"
+	"slices"
+	"time"
+
+	"git.coopgo.io/coopgo-apps/parcoursmob/utils/storage"
+	mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
+	"github.com/go-viper/mapstructure/v2"
+	"github.com/rs/zerolog/log"
+	"github.com/spf13/viper"
+	"github.com/stretchr/objx"
+)
+
+type Comparison struct {
+	Field string
+	Type  string
+	Value any
+}
+
+func ValidateProfile(cfg *viper.Viper) func(mobilityaccountsstorage.Account, []storage.FileInfo) bool {
+	enabled := cfg.GetBool("enabled")
+	requiredDocuments := cfg.GetStringSlice("required.documents")
+	requiredFields := cfg.GetStringSlice("required.fields")
+	comp := cfg.Get("assert.compare")
+	var comparisons []Comparison
+	err := mapstructure.Decode(comp, &comparisons)
+	if err != nil {
+		log.Error().Err(err).Msg("reading comparisons issue")
+	}
+	return func(account mobilityaccountsstorage.Account, docs []storage.FileInfo) bool {
+		if !enabled {
+			return true
+		}
+
+		for _, d := range requiredDocuments {
+			if !slices.ContainsFunc(docs, func(f storage.FileInfo) bool {
+				log.Debug().Str("required", d).Str("checked", f.Metadata["Type"]).Msg("file check")
+				return f.Metadata["Type"] == d
+			}) {
+				log.Debug().Msg("file missing")
+				return false
+			}
+		}
+
+		obj := objx.Map(account.Data)
+
+		for _, f := range requiredFields {
+			if obj.Get(f) == nil {
+				log.Debug().Msg("field missing")
+				return false
+			}
+		}
+
+		for _, c := range comparisons {
+			val := obj.Get(c.Field)
+			if val == nil {
+				return false
+			}
+			value := ""
+			if v, ok := c.Value.(string); ok {
+				value = v
+			} else if v, ok := c.Value.(time.Time); ok {
+				value = v.Format("2006-01-02")
+			} else {
+				log.Error().Msg("could not get type")
+				return false
+			}
+			result := cmp.Compare(val.String(), value)
+
+			if c.Type == "gte" {
+				if result < 0 {
+					log.Debug().Int("comparison result", result).Str("operand", c.Type).Msg("comparison issue")
+					return false
+				}
+			} else if c.Type == "gt" {
+				if result <= 0 {
+					log.Debug().Int("comparison result", result).Str("operand", c.Type).Msg("comparison issue")
+					return false
+				}
+			} else if c.Type == "lt" {
+				if result >= 0 {
+					log.Debug().Int("comparison result", result).Str("operand", c.Type).Msg("comparison issue")
+					return false
+				}
+			} else if c.Type == "lte" {
+				if result < 0 {
+					log.Debug().Int("comparison result", result).Str("operand", c.Type).Msg("comparison issue")
+					return false
+				}
+			} else if c.Type == "eq" {
+				if result != 0 {
+					log.Debug().Int("comparison result", result).Str("operand", c.Type).Msg("comparison issue")
+					return false
+				}
+			}
+		}
+
+		return true
+	}
+}
Author	SHA1	Message	Date
Arnaud Delcasse	9ab7b66b68	solidarity transport updates	2025-09-09 05:47:56 +02:00
Arnaud Delcasse	95b60ea737	resolve mail	2025-02-28 18:27:36 +01:00
Arnaud Delcasse	ea5be2e157	merge with main	2025-02-28 18:05:34 +01:00
Arnaud Delcasse	7914cd919f	Solidarity transport	2025-02-28 17:49:14 +01:00
Arnaud Delcasse	0dc694324e	Merge branch 'dev' of https://git.coopgo.io/coopgo-apps/parcoursmob into dev	2025-02-27 05:17:32 +01:00
Nicolas CARON	0a690cadf1	Add check in Diags home if its the same groupID Build and Push Docker Image / build_and_push (push) Failing after 1m49s Details	2025-02-12 10:42:26 +01:00
Nicolas CARON	d0fc96f8bb	Add documents on diags Build and Push Docker Image / build_and_push (push) Failing after 1m51s Details	2025-02-10 16:17:20 +01:00
Nicolas CARON	023f5c735d	add Diagdate	2025-02-10 12:47:41 +01:00
Arnaud Delcasse	2660b82bdb	resolve conflicts	2025-01-24 12:48:08 +01:00
Arnaud Delcasse	1685d1e1ac	small fixes	2024-12-27 15:39:05 +01:00
Nicolas CARON	a1adc028df	edit DiagsHistory in diags handlers Build and Push Docker Image / build_and_push (push) Failing after 1m37s Details	2024-12-18 16:00:38 +01:00
Nicolas CARON	c7ac48d373	add namespace parcoursmob_bookings on diags handlers	2024-12-17 10:33:17 +01:00
Nicolas CARON	f862440fd4	add namespace parcoursmob_bookings on diags handlers	2024-12-17 10:32:35 +01:00
Nicolas CARON	08cfe11814	Add VehicleBookingsCreateDiag - second route to create a diag in reservation Build and Push Docker Image / build_and_push (push) Failing after 1m40s Details	2024-12-16 14:42:00 +01:00
Nicolas CARON	1f265ba4bd	Add BookingsCreateDiag	2024-12-16 12:37:40 +01:00
Nicolas CARON	1162f2faf2	Add VehiclesCreateDiag	2024-12-10 16:14:43 +01:00
Nicolas CARON	7665fc75a0	Edit diags handlers	2024-12-04 18:21:29 +01:00
Nicolas CARON	42f33a17dd	Add module diags in menu	2024-12-04 17:27:38 +01:00
Nicolas CARON	064cb2df16	Edit beneficiaries handler to show diags related to a beneficiary	2024-12-04 16:16:30 +01:00
Nicolas CARON	1c4371b121	Edit beneficiaries handlers to show diags	2024-12-04 14:11:49 +01:00
Nicolas CARON	a2a3ac5ffe	add diags services	2024-12-04 09:23:45 +01:00
Nicolas CARON	e81399eef4	Add diags	2024-12-02 08:58:40 +01:00
Nicolas CARON	cfb9a645dd	add diags services	2024-11-27 15:54:33 +01:00
Arnaud Delcasse	d46f62d92a	fix issues in groups members management Build and Push Docker Image / build_and_push (push) Failing after 1m26s Details	2024-11-21 23:11:59 +01:00
Arnaud Delcasse	dd30d7959b	Add ICS calendars (global and organizations) Build and Push Docker Image / build_and_push (push) Failing after 1m24s Details	2024-11-21 00:54:52 +01:00
Arnaud Delcasse	5f12bed2d4	Add beneficiaries informations to bookings list Build and Push Docker Image / build_and_push (push) Failing after 1m25s Details	2024-11-19 15:53:40 +01:00
Arnaud Delcasse	2f760733af	Add ReplyTo header when sending email tu support Build and Push Docker Image / build_and_push (push) Failing after 1m41s Details	2024-11-19 15:21:31 +01:00
Arnaud Delcasse	1df56a4f83	Remove all fmr.Println and add zerolog logging Build and Push Docker Image / build_and_push (push) Failing after 1m42s Details	2024-11-11 20:07:00 +01:00
Arnaud Delcasse	a8acc9950a	Remove all fmr.Println and add zerolog logging Build and Push Docker Image / build_and_push (push) Failing after 1m52s Details	2024-11-11 19:50:17 +01:00
Arnaud Delcasse	a51f077358	resolve conflict Build and Push Docker Image / build_and_push (push) Failing after 1m46s Details	2024-11-04 17:29:19 +01:00
Arnaud Delcasse	4fc08a35de	Allow insecure HTTP for OIDC only in local in development mode	2024-11-04 17:24:02 +01:00
Nicolas CARON	eaf866154e	Update package git.coopgo.io Build and Push Docker Image / build_and_push (push) Failing after 1m41s Details	2024-11-04 10:58:30 +01:00
Nicolas CARON	06f42947b9	run 'go mod tidy' Build and Push Docker Image / build_and_push (push) Failing after 1m1s Details	2024-11-04 10:45:59 +01:00
Nicolas CARON	acb5232b94	run 'go mod tidy' Build and Push Docker Image / build_and_push (push) Failing after 55s Details	2024-11-04 10:43:24 +01:00
Nicolas CARON	8de170a009	add bookings on dashboard & kilometers on vehicles management Build and Push Docker Image / build_and_push (push) Failing after 59s Details	2024-10-29 12:08:24 +01:00
Nicolas CARON	a0557b0971	edit go.mod - comments all replace Build and Push Docker Image / build_and_push (push) Failing after 58s Details	2024-10-28 10:05:31 +01:00
Nicolas CARON	b4c59c7408	edit agenda handlers - delete logs Build and Push Docker Image / build_and_push (push) Failing after 2m8s Details	2024-10-23 10:39:11 +02:00
Nicolas CARON	334351a0cf	renderer agenda.go & handler agendo.go	2024-10-22 12:09:46 +02:00
Nicolas CARON	7184f4735c	edit agenda handlers	2024-10-15 10:51:15 +02:00
Nicolas CARON	434be30074	add logical to add docs in event	2024-10-09 18:21:45 +02:00
Arnaud Delcasse	498b12de18	fix dependencies in go.mod Build and Push Docker Image / build_and_push (push) Failing after 54s Details	2024-05-20 17:25:31 +02:00
Nicolas CARON	b77403c674	test actions Build and Push Docker Image / build_and_push (push) Failing after 53s Details	2024-04-10 09:18:24 +02:00
Nicolas CARON	f7cb9f1116	test actions Build and Push Docker Image / build_and_push (push) Failing after 26s Details	2024-04-05 12:22:22 +02:00
Nicolas CARON	2aec61e520	Merge branch 'dev' of https://git.coopgo.io/coopgo-apps/parcoursmob into dev	2024-04-04 12:24:59 +02:00
Nicolas CARON	73586aa61a	add .gitea/worflows/build.yml	2024-04-04 12:24:21 +02:00
mfrigo	a636b54a94	[+] Correction for véhicule partages	2023-12-08 13:29:25 +01:00
mfrigo	7c73c1d233	Merge branch 'dev' of https://git.coopgo.io/coopgo-apps/parcoursmob into dev	2023-11-24 17:06:12 +01:00
mfrigo	7a31b0ceb2	[+] merge main.go	2023-11-24 17:04:10 +01:00
mfrigo	2274f8d6d0	[+] bug fix regarding booking-list	2023-11-24 16:27:34 +01:00
mfrigo	4229c13b6b	Implemented functional "Actions réalisées" - Added events and vehicles inside it - Included dates, characteristics, and names of events/vehicles - Introduced color-coded badges to indicate the status of events/vehicles (ongoing or not)	2023-10-23 09:45:57 +02:00
mfrigo	100ffbe05a	delete themes.zip	2023-09-06 13:32:49 +02:00
mfrigo	0f50b5e678	[+] adding in beneficiary-events the agenda-widget	2023-09-06 13:28:02 +02:00
sbouaram	0e00a839a3	agenda dispositifs exports	2023-05-30 09:06:48 +02:00
sbouaram	c354bece5f	refactoring groupcache	2023-05-19 10:58:37 +02:00
sbouaram	6299a6c7be	cache refactoring	2023-05-19 10:06:30 +02:00
sbouaram	718c39de00	refactoring	2023-05-16 08:40:05 +02:00
sbouaram	9f66851529	adding groupcache	2023-05-15 14:49:00 +02:00
sbouaram	aa13d60ca6	AdministrationGroupInviteMember	2023-04-25 04:37:20 -04:00
sbouaram	d169566cd1	administration create group	2023-04-24 05:36:57 -04:00
root	b54961b619	handlers/administration goroutines	2023-04-20 19:14:00 +03:00
root	c34d08ff70	go routines /handlers/application/journeys	2023-04-20 15:28:27 +03:00
root	46a72e1aef	api/cache	2023-04-20 13:14:25 +03:00
				`@ -0,0 +1 @@`
				`Subproject commit db4c22699eff6756851b0d3eff430b7bbe4c1c1b`