fix

change namespace of beneficiaries created
fix
2024-12-16 10:37:14 +01:00 · 2024-12-04 17:47:34 +01:00 · 2024-10-04 18:58:00 +02:00 · 2024-09-26 13:13:48 +02:00
19 changed files with 785 additions and 799 deletions
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@ -1,8 +0,0 @@
 # 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
@ -1,8 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="ProjectModuleManager">
    <modules>
      <module fileurl="file://$PROJECT_DIR$/.idea/silvermobi.iml" filepath="$PROJECT_DIR$/.idea/silvermobi.iml" />
    </modules>
  </component>
 </project>
--- a/.idea/silvermobi.iml
+++ b/.idea/silvermobi.iml
@ -1,9 +0,0 @@
 <?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
@ -1,6 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="VcsDirectoryMappings">
    <mapping directory="$PROJECT_DIR$" vcs="Git" />
  </component>
 </project>
--- a/config.yaml
+++ b/config.yaml
@ -6,8 +6,8 @@ storage:
    psql:
      host: localhost
      dbname: coopgo_platform
-      user: postgres
+      user: maxime
-      password: postgres
+      password: posgres
      sslmode: disable
      port: 5432
      schema: silvermobi_backend
@ -17,14 +17,14 @@ services:
  internal:
    mobility_accounts:
      type: grpc
-      dial: 0.0.0.0:8090
+      dial: localhost:8090
    push:
      type: gorush-grpc
-      dial: 0.0.0.0:8095
+      dial: localhost:8095
  external:
    grpc:
      enable: true
-      ip: 192.168.0.111
+      ip: localhost
      port: 8099
    web:
      enable: true
@ -49,7 +49,7 @@ services:
          bearer: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJjZDExYzY4MS00MTY4LTRiZGYtOGYyZC05ZTNhZGU1ZmFjOGQiLCJuYW1lIjoiY2VydGluZXJneSIsImlhdCI6MTUxNjIzOTAyMn0.tPwn3uD_6T4FjOTehYDRNg39x2A4E9FFv6qTgduODaA
          # bearer: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJjZDExYzY4MS00MTY4LTRiZGYtOGYyZC05ZTNhZGU1ZmFjOGQiLCJuYW1lIjoiY2VydGluZXJneSIsImlhdCI6MTUxNjIzOTAyMn0.LAr2l5X9XFRbPRPQvZLt8AWyfzbFGS5BO9MlB4U5HJo # PROD
 solidarity_service:
-  address: 0.0.0.0:8089
+  address: 10.73.189.26:8089 #10.73.190.5
 identification:
  local:
    jwt_secret: JWT_KEY
@ -61,7 +61,6 @@ carpooling_proofs:
    token: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhIjoiN2Y4MTQwNzYtOTJmOS00NjExLTlhMmItZjA0MzU4MmMwOWI3IiwibyI6OSwicyI6Im9wZXJhdG9yIiwicCI6WyJjb21tb24uY2VydGlmaWNhdGUuZmluZCIsImNvbW1vbi5jb21wYW55LmZldGNoIiwiY29tbW9uLmNvbXBhbnkuZmluZCIsImNvbW1vbi5ob25vci5zYXZlIiwiY29tbW9uLmhvbm9yLnN0YXRzIiwiY29tbW9uLm9wZXJhdG9yLmxpc3QiLCJjb21tb24ub3BlcmF0b3IuZmluZCIsImNvbW1vbi5wb2xpY3kubGlzdCIsImNvbW1vbi5wb2xpY3kubGlzdC50ZW1wbGF0ZXMiLCJjb21tb24udGVycml0b3J5LmZpbmQiLCJjb21tb24udGVycml0b3J5Lmxpc3QiLCJjb21tb24udGVycml0b3J5LnJlYWQiLCJjb21tb24udHJpcC5zdGF0cyIsImNvbW1vbi51c2VyLnVwZGF0ZSIsImNvbW1vbi51c2VyLmZpbmQiLCJjb21tb24udXNlci5wb2xpY3lTaW11bGF0ZSIsIm9wZXJhdG9yLmFjcXVpc2l0aW9uLmNyZWF0ZSIsIm9wZXJhdG9yLmFjcXVpc2l0aW9uLmNhbmNlbCIsIm9wZXJhdG9yLmFjcXVpc2l0aW9uLnN0YXR1cyIsIm9wZXJhdG9yLmNlcnRpZmljYXRlLmNyZWF0ZSIsIm9wZXJhdG9yLmNlcnRpZmljYXRlLmRvd25sb2FkIiwib3BlcmF0b3IucG9saWN5LnNpbXVsYXRlLmZ1dHVyZSJdLCJ2IjoyLCJpYXQiOjE2NzgwOTg0NTR9.b4ezR41U4kGwa6FVF0-JyvqEE1kKtxGEa5gzqh4ctTU
 geocoder:
  type: pelias
  pelias:
--- a/go.mod
+++ b/go.mod
@ -1,6 +1,8 @@
 module git.coopgo.io/coopgo-apps/silvermobi
-go 1.19
+go 1.22
 toolchain go1.23.2
 require (
 	git.coopgo.io/coopgo-platform/geocode v0.0.0-20230329105149-1f31b361814e
@ -17,8 +19,8 @@ require (
 	github.com/rs/zerolog v1.29.1
 	github.com/spf13/viper v1.16.0
 	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1
-	google.golang.org/grpc v1.65.0
+	google.golang.org/grpc v1.68.1
-	google.golang.org/protobuf v1.34.1
+	google.golang.org/protobuf v1.34.2
 	gopkg.in/mail.v2 v2.3.1
 )
@ -56,11 +58,11 @@ require (
 	go.uber.org/atomic v1.10.0 // indirect
 	go.uber.org/multierr v1.8.0 // indirect
 	go.uber.org/zap v1.21.0 // indirect
-	golang.org/x/crypto v0.23.0 // indirect
+	golang.org/x/crypto v0.27.0 // indirect
-	golang.org/x/net v0.25.0 // indirect
+	golang.org/x/net v0.29.0 // indirect
-	golang.org/x/sync v0.7.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
-	golang.org/x/sys v0.20.0 // indirect
+	golang.org/x/sys v0.25.0 // indirect
-	golang.org/x/text v0.15.0 // indirect
+	golang.org/x/text v0.18.0 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
--- a/go.sum
+++ b/go.sum
@ -25,7 +25,8 @@ cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUM
 cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
 cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
 cloud.google.com/go/compute v1.19.0 h1:+9zda3WGgW1ZSTlVppLCYFIr48Pa35q1uG2N1itbCEQ=
-cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc=
+cloud.google.com/go/compute/metadata v0.5.0 h1:Zr0eK8JbFv6+Wi4ilXAR8FJ3wyNdpxHKJNPos6LTZOY=
 cloud.google.com/go/compute/metadata v0.5.0/go.mod h1:aHnloV2TPI38yx4s9+wAZhHykWvVCfu7hQbF+9CWoiY=
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
 cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
 cloud.google.com/go/maps v0.7.0 h1:mv9YaczD4oZBZkM5XJl6fXQ984IkJNHPwkc8MUsdkBo=
@ -76,6 +77,7 @@ github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5y
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY=
 github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
 github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
@ -133,6 +135,7 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
 github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
@ -172,9 +175,11 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxv
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
@ -207,6 +212,7 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 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/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/rs/zerolog v1.29.1 h1:cO+d60CHkknCbvzEWxP0S9K6KqyTjrCNUy1LdQLCGPc=
 github.com/rs/zerolog v1.29.1/go.mod h1:Le6ESbR7hc+DP6Lt1THiV8CQSdkkNrd3R0XbEgp3ZBU=
@ -242,6 +248,7 @@ github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8
 github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
 github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
 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=
@ -291,8 +298,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
+golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
-golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
+golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@ -360,8 +367,8 @@ golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
+golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
-golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
+golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@ -371,7 +378,8 @@ golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ
 golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.20.0 h1:4mQdhULixXKP1rwYBW0vAijoXnkTG0BLCDRzfe1idMo=
+golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs=
 golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@ -383,8 +391,8 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
+golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
-golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/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-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@ -429,8 +437,8 @@ golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
+golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
-golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@ -440,8 +448,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4/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.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
+golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
-golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@ -581,8 +589,8 @@ google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
 google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
 google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc=
+google.golang.org/grpc v1.68.1 h1:oI5oTa11+ng8r8XMMN7jAOmWfPZWbYpCFaMUTACxkM0=
-google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ=
+google.golang.org/grpc v1.68.1/go.mod h1:+q1XYFJjShcqn0QZHvCyeR4CXPA+llXIeUIfIe00waw=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@ -595,8 +603,8 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
+google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
-google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@ -611,6 +619,7 @@ gopkg.in/mail.v2 v2.3.1/go.mod h1:htwXN1Qh09vZJ1NVKxQqHPBaCBbzKhp5GzuJEA4VJWw=
 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.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
--- a/handler/authentication.go
+++ b/handler/authentication.go
@ -6,7 +6,7 @@ import (
 )
 func (h *SilvermobiHandler) Login(ctx context.Context, username string, password string) (jwt string, err error) {
-	account, err := h.Services.MobilityAccounts.Login(ctx, username, password, "silvermobi")
+	account, err := h.Services.MobilityAccounts.Login(ctx, username, password, "parcoursmob_beneficiaries")
 	if err != nil {
 		return
 	}
@ -32,7 +32,7 @@ func (h *SilvermobiHandler) Register(ctx context.Context, username string, passw
 			"email":        email,
 			"phone_number": phone_number,
 		},
-		"silvermobi",
+		"parcoursmob_beneficiaries",
 	)
 	if err != nil {
--- a/handler/onboarding_validation.go
+++ b/handler/onboarding_validation.go
@ -77,7 +77,7 @@ func (h *SilvermobiHandler) VerifyPhoneNumber(ctx context.Context, id string, ph
 }
 func (h *SilvermobiHandler) UpdateBirthDate(ctx context.Context, id string, birthdate string) error {
-	err := h.Services.MobilityAccounts.UpdateAccountBirthDate(ctx, id, "silvermobi", birthdate)
+	err := h.Services.MobilityAccounts.UpdateAccountBirthDate(ctx, id, "parcoursmob_beneficiaries", birthdate)
 	if err != nil {
 		return err
 	}
--- a/handler/update_password.go
+++ b/handler/update_password.go
@ -3,7 +3,7 @@ package handler
 import "context"
 func (h *SilvermobiHandler) UpdatePassword(ctx context.Context, username string, password string) (response bool) {
-	account, err := h.Services.MobilityAccounts.GetAccountUsername(ctx, username, "silvermobi")
+	account, err := h.Services.MobilityAccounts.GetAccountUsername(ctx, username, "parcoursmob_beneficiaries")
 	if err != nil {
 		return false
 	}
--- a/servers/grpcapi/proto/silvermobi-service.pb.go
+++ b/servers/grpcapi/proto/silvermobi-service.pb.go
@ -2281,11 +2281,11 @@ var file_silvermobi_service_proto_rawDesc = []byte{
 	0x6e, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x13, 0x2e, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74,
 	0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x14, 0x2e, 0x41, 0x63,
 	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x22, 0x00, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x2e, 0x63, 0x6f, 0x6f, 0x70, 0x67,
+	0x65, 0x22, 0x00, 0x42, 0x3c, 0x5a, 0x3a, 0x67, 0x69, 0x74, 0x2e, 0x63, 0x6f, 0x6f, 0x70, 0x67,
 	0x6f, 0x2e, 0x69, 0x6f, 0x2f, 0x63, 0x6f, 0x6f, 0x70, 0x67, 0x6f, 0x2d, 0x61, 0x70, 0x70, 0x73,
-	0x2f, 0x73, 0x69, 0x6c, 0x76, 0x65, 0x72, 0x6d, 0x6f, 0x62, 0x69, 0x2f, 0x67, 0x72, 0x70, 0x63,
+	0x2f, 0x73, 0x69, 0x6c, 0x76, 0x65, 0x72, 0x6d, 0x6f, 0x62, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76,
-	0x61, 0x70, 0x69, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x65, 0x72, 0x73, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x61, 0x70, 0x69, 0x2f, 0x70, 0x72, 0x6f, 0x74,
-	0x33,
+	0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 var (
--- a/servers/grpcapi/proto/silvermobi-service.proto
+++ b/servers/grpcapi/proto/silvermobi-service.proto
@ -134,8 +134,8 @@ message AccountTypeRequest {
    PASSENGER = 0;
    DRIVER = 1;
  }
-   bool request = 2;
+  optional bool request = 2;
-   AccountType type = 1;
+  optional AccountType type = 1;
 }
 message AccountTypeResponse {
@ -144,7 +144,7 @@ message AccountTypeResponse {
    PASSENGER = 0;
    DRIVER = 1;
  }
-   AccountType type = 2;
+  optional AccountType type = 2;
 }
 message GeoAutocompleteRequest {
--- a/servers/grpcapi/proto/solidarity-api-types.pb.go
+++ b/servers/grpcapi/proto/solidarity-api-types.pb.go
--- a/servers/grpcapi/proto/solidarity-api-types.proto
+++ b/servers/grpcapi/proto/solidarity-api-types.proto
@ -12,9 +12,9 @@ message Feature {
 message DriverJourney {
  User user = 1;
-   Car car = 2;
+  optional Car car = 2;
  google.protobuf.Timestamp driver_departure_Date = 3;
-   Price price = 4;
+  optional Price price = 4;
  string driver_departure_Address = 5;
  oneof availabilities {
    RepeatedPunctualAvailabilitySlot repeated_punctual_availabilities = 6;
@ -33,8 +33,8 @@ message DriverRequest{
  Feature driver_address = 1;
  int32 driver_radius = 2;
  User driver = 3;
-   Preferences preferences = 4;
+  optional Preferences preferences = 4;
-   Car   car = 5;
+  optional Car   car = 5;
 }
 message PunctualAvailabilitySlot {
@ -58,43 +58,43 @@ enum DayOfWeek {
  SUN = 7;
 }
-message  BookingSilvermobiRequest {
+message  BookingRequest {
  string id = 1;
  string passengerId = 2;
  string driverId = 3;
-  BookingSilvermobiStatus status = 4;
+  BookingStatus status = 4;
  Feature departure_address =5;
  Feature destination_address = 6;
  google.protobuf.Timestamp pickup_date = 7;
 }
-message BookingSilvermobi {
+message Booking {
  string id = 1;
  User driver = 2;
  User passenger = 3;
  google.protobuf.Timestamp passengerPickupDate =4;
  Feature passenger_departure_route = 5;
  Feature passenger_destination_route = 6;
-  BookingSilvermobiStatus status = 7;
+  BookingStatus status = 7;
-   int64 duration = 8;
+  optional int64 duration = 8;
-   int64 distance = 9;
+  optional int64 distance = 9;
  Price price = 10;
-   Car car = 11;
+  optional Car car = 11;
  google.protobuf.Timestamp pickup_date = 12;
 }
 message Car {
-   string model = 1;
+  optional string model = 1;
-   string brand = 2;
+  optional string brand = 2;
 }
 message Preferences {
-   bool smoking = 1;
+  optional bool smoking = 1;
-   bool animals = 2;
+  optional bool animals = 2;
-   bool music = 3;
+  optional bool music = 3;
-   bool is_talker = 4;
+  optional bool is_talker = 4;
-   int64 luggage_size = 5;
+  optional int64 luggage_size = 5;
 }
@ -105,23 +105,23 @@ enum PriceType {
 }
 message Price {
-   PriceType type = 1;
+  optional PriceType type = 1;
-   double amount = 2;
+  optional double amount = 2;
-   string currency = 3;
+  optional string currency = 3;
 }
 message User {
  string id = 1;
  string alias = 2;
-   string first_name = 3;
+  optional string first_name = 3;
-   string last_name = 4;
+  optional string last_name = 4;
-   int64 grade = 5;
+  optional int64 grade = 5;
-   string picture = 6;
+  optional string picture = 6;
-   string gender = 7;
+  optional string gender = 7;
-   bool verified_identity = 8;
+  optional bool verified_identity = 8;
 }
-enum BookingSilvermobiStatus {
+enum BookingStatus {
  INITIATED = 0;
  WAITING_DRIVER_CONFIRMATION = 1;
  WAITING_PASSENGER_CONFIRMATION = 2;
--- a/servers/grpcapi/proto/solidarity-api.pb.go
+++ b/servers/grpcapi/proto/solidarity-api.pb.go
@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.27.1
+// 	protoc-gen-go v1.30.0
 // 	protoc        v3.12.4
 // source: solidarity-api.proto
@ -27,7 +27,7 @@ type PassengerTripRequest struct {
 	unknownFields protoimpl.UnknownFields
 	Passenger   *User        `protobuf:"bytes,1,opt,name=passenger,proto3" json:"passenger,omitempty"`
-	Preferences *Preferences `protobuf:"bytes,2,opt,name=preferences,proto3" json:"preferences,omitempty"`
+	Preferences *Preferences `protobuf:"bytes,2,opt,name=preferences,proto3,oneof" json:"preferences,omitempty"`
 }
 func (x *PassengerTripRequest) Reset() {
@ -191,8 +191,8 @@ type PassengerTripResponse struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Success bool   `protobuf:"varint,1,opt,name=success,proto3" json:"success,omitempty"`
+	Success bool    `protobuf:"varint,1,opt,name=success,proto3" json:"success,omitempty"`
-	Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"`
+	Message *string `protobuf:"bytes,2,opt,name=message,proto3,oneof" json:"message,omitempty"`
 }
 func (x *PassengerTripResponse) Reset() {
@ -235,8 +235,8 @@ func (x *PassengerTripResponse) GetSuccess() bool {
 }
 func (x *PassengerTripResponse) GetMessage() string {
-	if x != nil {
+	if x != nil && x.Message != nil {
-		return x.Message
+		return *x.Message
 	}
 	return ""
 }
@ -246,8 +246,8 @@ type DriverAvailabilitiesResponse struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Success bool   `protobuf:"varint,1,opt,name=success,proto3" json:"success,omitempty"`
+	Success bool    `protobuf:"varint,1,opt,name=success,proto3" json:"success,omitempty"`
-	Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"`
+	Message *string `protobuf:"bytes,2,opt,name=message,proto3,oneof" json:"message,omitempty"`
 }
 func (x *DriverAvailabilitiesResponse) Reset() {
@ -290,22 +290,22 @@ func (x *DriverAvailabilitiesResponse) GetSuccess() bool {
 }
 func (x *DriverAvailabilitiesResponse) GetMessage() string {
-	if x != nil {
+	if x != nil && x.Message != nil {
-		return x.Message
+		return *x.Message
 	}
 	return ""
 }
-type CreateBookingSilvermobiRequest struct {
+type CreateBookingRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Booking *BookingSilvermobiRequest `protobuf:"bytes,1,opt,name=booking,proto3" json:"booking,omitempty"`
+	Booking *BookingRequest `protobuf:"bytes,1,opt,name=booking,proto3" json:"booking,omitempty"`
 }
-func (x *CreateBookingSilvermobiRequest) Reset() {
+func (x *CreateBookingRequest) Reset() {
-	*x = CreateBookingSilvermobiRequest{}
+	*x = CreateBookingRequest{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_solidarity_api_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -313,13 +313,13 @@ func (x *CreateBookingSilvermobiRequest) Reset() {
 	}
 }
-func (x *CreateBookingSilvermobiRequest) String() string {
+func (x *CreateBookingRequest) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
-func (*CreateBookingSilvermobiRequest) ProtoMessage() {}
+func (*CreateBookingRequest) ProtoMessage() {}
-func (x *CreateBookingSilvermobiRequest) ProtoReflect() protoreflect.Message {
+func (x *CreateBookingRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_solidarity_api_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -331,28 +331,28 @@ func (x *CreateBookingSilvermobiRequest) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
-// Deprecated: Use CreateBookingSilvermobiRequest.ProtoReflect.Descriptor instead.
+// Deprecated: Use CreateBookingRequest.ProtoReflect.Descriptor instead.
-func (*CreateBookingSilvermobiRequest) Descriptor() ([]byte, []int) {
+func (*CreateBookingRequest) Descriptor() ([]byte, []int) {
 	return file_solidarity_api_proto_rawDescGZIP(), []int{5}
 }
-func (x *CreateBookingSilvermobiRequest) GetBooking() *BookingSilvermobiRequest {
+func (x *CreateBookingRequest) GetBooking() *BookingRequest {
 	if x != nil {
 		return x.Booking
 	}
 	return nil
 }
-type CreateBookingSilvermobiResponse struct {
+type CreateBookingResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Booking *BookingSilvermobi `protobuf:"bytes,1,opt,name=booking,proto3" json:"booking,omitempty"`
+	Booking *Booking `protobuf:"bytes,1,opt,name=booking,proto3" json:"booking,omitempty"`
 }
-func (x *CreateBookingSilvermobiResponse) Reset() {
+func (x *CreateBookingResponse) Reset() {
-	*x = CreateBookingSilvermobiResponse{}
+	*x = CreateBookingResponse{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_solidarity_api_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -360,13 +360,13 @@ func (x *CreateBookingSilvermobiResponse) Reset() {
 	}
 }
-func (x *CreateBookingSilvermobiResponse) String() string {
+func (x *CreateBookingResponse) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
-func (*CreateBookingSilvermobiResponse) ProtoMessage() {}
+func (*CreateBookingResponse) ProtoMessage() {}
-func (x *CreateBookingSilvermobiResponse) ProtoReflect() protoreflect.Message {
+func (x *CreateBookingResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_solidarity_api_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -378,30 +378,30 @@ func (x *CreateBookingSilvermobiResponse) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
-// Deprecated: Use CreateBookingSilvermobiResponse.ProtoReflect.Descriptor instead.
+// Deprecated: Use CreateBookingResponse.ProtoReflect.Descriptor instead.
-func (*CreateBookingSilvermobiResponse) Descriptor() ([]byte, []int) {
+func (*CreateBookingResponse) Descriptor() ([]byte, []int) {
 	return file_solidarity_api_proto_rawDescGZIP(), []int{6}
 }
-func (x *CreateBookingSilvermobiResponse) GetBooking() *BookingSilvermobi {
+func (x *CreateBookingResponse) GetBooking() *Booking {
 	if x != nil {
 		return x.Booking
 	}
 	return nil
 }
-type UpdateBookingSilvermobiRequest struct {
+type UpdateBookingRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	BookingId string                  `protobuf:"bytes,1,opt,name=booking_id,json=bookingId,proto3" json:"booking_id,omitempty"`
+	BookingId string        `protobuf:"bytes,1,opt,name=booking_id,json=bookingId,proto3" json:"booking_id,omitempty"`
-	Status    BookingSilvermobiStatus `protobuf:"varint,2,opt,name=status,proto3,enum=BookingSilvermobiStatus" json:"status,omitempty"`
+	Status    BookingStatus `protobuf:"varint,2,opt,name=status,proto3,enum=BookingStatus" json:"status,omitempty"`
-	Message   string                  `protobuf:"bytes,3,opt,name=message,proto3" json:"message,omitempty"`
+	Message   *string       `protobuf:"bytes,3,opt,name=message,proto3,oneof" json:"message,omitempty"`
 }
-func (x *UpdateBookingSilvermobiRequest) Reset() {
+func (x *UpdateBookingRequest) Reset() {
-	*x = UpdateBookingSilvermobiRequest{}
+	*x = UpdateBookingRequest{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_solidarity_api_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -409,13 +409,13 @@ func (x *UpdateBookingSilvermobiRequest) Reset() {
 	}
 }
-func (x *UpdateBookingSilvermobiRequest) String() string {
+func (x *UpdateBookingRequest) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
-func (*UpdateBookingSilvermobiRequest) ProtoMessage() {}
+func (*UpdateBookingRequest) ProtoMessage() {}
-func (x *UpdateBookingSilvermobiRequest) ProtoReflect() protoreflect.Message {
+func (x *UpdateBookingRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_solidarity_api_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -427,43 +427,43 @@ func (x *UpdateBookingSilvermobiRequest) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
-// Deprecated: Use UpdateBookingSilvermobiRequest.ProtoReflect.Descriptor instead.
+// Deprecated: Use UpdateBookingRequest.ProtoReflect.Descriptor instead.
-func (*UpdateBookingSilvermobiRequest) Descriptor() ([]byte, []int) {
+func (*UpdateBookingRequest) Descriptor() ([]byte, []int) {
 	return file_solidarity_api_proto_rawDescGZIP(), []int{7}
 }
-func (x *UpdateBookingSilvermobiRequest) GetBookingId() string {
+func (x *UpdateBookingRequest) GetBookingId() string {
 	if x != nil {
 		return x.BookingId
 	}
 	return ""
 }
-func (x *UpdateBookingSilvermobiRequest) GetStatus() BookingSilvermobiStatus {
+func (x *UpdateBookingRequest) GetStatus() BookingStatus {
 	if x != nil {
 		return x.Status
 	}
-	return BookingSilvermobiStatus_INITIATED
+	return BookingStatus_INITIATED
 }
-func (x *UpdateBookingSilvermobiRequest) GetMessage() string {
+func (x *UpdateBookingRequest) GetMessage() string {
-	if x != nil {
+	if x != nil && x.Message != nil {
-		return x.Message
+		return *x.Message
 	}
 	return ""
 }
-type UpdateBookingSilvermobiResponse struct {
+type UpdateBookingResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Success bool   `protobuf:"varint,1,opt,name=success,proto3" json:"success,omitempty"`
+	Success bool    `protobuf:"varint,1,opt,name=success,proto3" json:"success,omitempty"`
-	Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"`
+	Message *string `protobuf:"bytes,2,opt,name=message,proto3,oneof" json:"message,omitempty"`
 }
-func (x *UpdateBookingSilvermobiResponse) Reset() {
+func (x *UpdateBookingResponse) Reset() {
-	*x = UpdateBookingSilvermobiResponse{}
+	*x = UpdateBookingResponse{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_solidarity_api_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -471,13 +471,13 @@ func (x *UpdateBookingSilvermobiResponse) Reset() {
 	}
 }
-func (x *UpdateBookingSilvermobiResponse) String() string {
+func (x *UpdateBookingResponse) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
-func (*UpdateBookingSilvermobiResponse) ProtoMessage() {}
+func (*UpdateBookingResponse) ProtoMessage() {}
-func (x *UpdateBookingSilvermobiResponse) ProtoReflect() protoreflect.Message {
+func (x *UpdateBookingResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_solidarity_api_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -489,26 +489,26 @@ func (x *UpdateBookingSilvermobiResponse) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
-// Deprecated: Use UpdateBookingSilvermobiResponse.ProtoReflect.Descriptor instead.
+// Deprecated: Use UpdateBookingResponse.ProtoReflect.Descriptor instead.
-func (*UpdateBookingSilvermobiResponse) Descriptor() ([]byte, []int) {
+func (*UpdateBookingResponse) Descriptor() ([]byte, []int) {
 	return file_solidarity_api_proto_rawDescGZIP(), []int{8}
 }
-func (x *UpdateBookingSilvermobiResponse) GetSuccess() bool {
+func (x *UpdateBookingResponse) GetSuccess() bool {
 	if x != nil {
 		return x.Success
 	}
 	return false
 }
-func (x *UpdateBookingSilvermobiResponse) GetMessage() string {
+func (x *UpdateBookingResponse) GetMessage() string {
-	if x != nil {
+	if x != nil && x.Message != nil {
-		return x.Message
+		return *x.Message
 	}
 	return ""
 }
-type GetBookingSilvermobiRequest struct {
+type GetBookingRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@ -516,8 +516,8 @@ type GetBookingSilvermobiRequest struct {
 	BookingId string `protobuf:"bytes,1,opt,name=booking_id,json=bookingId,proto3" json:"booking_id,omitempty"`
 }
-func (x *GetBookingSilvermobiRequest) Reset() {
+func (x *GetBookingRequest) Reset() {
-	*x = GetBookingSilvermobiRequest{}
+	*x = GetBookingRequest{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_solidarity_api_proto_msgTypes[9]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -525,13 +525,13 @@ func (x *GetBookingSilvermobiRequest) Reset() {
 	}
 }
-func (x *GetBookingSilvermobiRequest) String() string {
+func (x *GetBookingRequest) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
-func (*GetBookingSilvermobiRequest) ProtoMessage() {}
+func (*GetBookingRequest) ProtoMessage() {}
-func (x *GetBookingSilvermobiRequest) ProtoReflect() protoreflect.Message {
+func (x *GetBookingRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_solidarity_api_proto_msgTypes[9]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -543,28 +543,28 @@ func (x *GetBookingSilvermobiRequest) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
-// Deprecated: Use GetBookingSilvermobiRequest.ProtoReflect.Descriptor instead.
+// Deprecated: Use GetBookingRequest.ProtoReflect.Descriptor instead.
-func (*GetBookingSilvermobiRequest) Descriptor() ([]byte, []int) {
+func (*GetBookingRequest) Descriptor() ([]byte, []int) {
 	return file_solidarity_api_proto_rawDescGZIP(), []int{9}
 }
-func (x *GetBookingSilvermobiRequest) GetBookingId() string {
+func (x *GetBookingRequest) GetBookingId() string {
 	if x != nil {
 		return x.BookingId
 	}
 	return ""
 }
-type GetBookingSilvermobiResponse struct {
+type GetBookingResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Booking *BookingSilvermobi `protobuf:"bytes,1,opt,name=booking,proto3" json:"booking,omitempty"`
+	Booking *Booking `protobuf:"bytes,1,opt,name=booking,proto3" json:"booking,omitempty"`
 }
-func (x *GetBookingSilvermobiResponse) Reset() {
+func (x *GetBookingResponse) Reset() {
-	*x = GetBookingSilvermobiResponse{}
+	*x = GetBookingResponse{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_solidarity_api_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -572,13 +572,13 @@ func (x *GetBookingSilvermobiResponse) Reset() {
 	}
 }
-func (x *GetBookingSilvermobiResponse) String() string {
+func (x *GetBookingResponse) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
-func (*GetBookingSilvermobiResponse) ProtoMessage() {}
+func (*GetBookingResponse) ProtoMessage() {}
-func (x *GetBookingSilvermobiResponse) ProtoReflect() protoreflect.Message {
+func (x *GetBookingResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_solidarity_api_proto_msgTypes[10]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -590,12 +590,12 @@ func (x *GetBookingSilvermobiResponse) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
-// Deprecated: Use GetBookingSilvermobiResponse.ProtoReflect.Descriptor instead.
+// Deprecated: Use GetBookingResponse.ProtoReflect.Descriptor instead.
-func (*GetBookingSilvermobiResponse) Descriptor() ([]byte, []int) {
+func (*GetBookingResponse) Descriptor() ([]byte, []int) {
 	return file_solidarity_api_proto_rawDescGZIP(), []int{10}
 }
-func (x *GetBookingSilvermobiResponse) GetBooking() *BookingSilvermobi {
+func (x *GetBookingResponse) GetBooking() *Booking {
 	if x != nil {
 		return x.Booking
 	}
@ -607,9 +607,9 @@ type GetBookingsByStatusRequest struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Status BookingSilvermobiStatus `protobuf:"varint,1,opt,name=status,proto3,enum=BookingSilvermobiStatus" json:"status,omitempty"`
+	Status BookingStatus `protobuf:"varint,1,opt,name=status,proto3,enum=BookingStatus" json:"status,omitempty"`
-	Type   UserType                `protobuf:"varint,2,opt,name=type,proto3,enum=UserType" json:"type,omitempty"`
+	Type   UserType      `protobuf:"varint,2,opt,name=type,proto3,enum=UserType" json:"type,omitempty"`
-	UserId string                  `protobuf:"bytes,3,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"`
+	UserId string        `protobuf:"bytes,3,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"`
 }
 func (x *GetBookingsByStatusRequest) Reset() {
@ -644,11 +644,11 @@ func (*GetBookingsByStatusRequest) Descriptor() ([]byte, []int) {
 	return file_solidarity_api_proto_rawDescGZIP(), []int{11}
 }
-func (x *GetBookingsByStatusRequest) GetStatus() BookingSilvermobiStatus {
+func (x *GetBookingsByStatusRequest) GetStatus() BookingStatus {
 	if x != nil {
 		return x.Status
 	}
-	return BookingSilvermobiStatus_INITIATED
+	return BookingStatus_INITIATED
 }
 func (x *GetBookingsByStatusRequest) GetType() UserType {
@ -772,7 +772,7 @@ type GetBookingsByStatusResponse struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Booking []*BookingSilvermobi `protobuf:"bytes,1,rep,name=booking,proto3" json:"booking,omitempty"`
+	Booking []*Booking `protobuf:"bytes,1,rep,name=booking,proto3" json:"booking,omitempty"`
 }
 func (x *GetBookingsByStatusResponse) Reset() {
@ -807,7 +807,7 @@ func (*GetBookingsByStatusResponse) Descriptor() ([]byte, []int) {
 	return file_solidarity_api_proto_rawDescGZIP(), []int{14}
 }
-func (x *GetBookingsByStatusResponse) GetBooking() []*BookingSilvermobi {
+func (x *GetBookingsByStatusResponse) GetBooking() []*Booking {
 	if x != nil {
 		return x.Booking
 	}
@ -822,155 +822,147 @@ var file_solidarity_api_proto_rawDesc = []byte{
 	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d,
 	0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1a, 0x73, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x72,
 	0x69, 0x74, 0x79, 0x2d, 0x61, 0x70, 0x69, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x22, 0x6b, 0x0a, 0x14, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72,
+	0x6f, 0x74, 0x6f, 0x22, 0x80, 0x01, 0x0a, 0x14, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65,
-	0x54, 0x72, 0x69, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x09, 0x70,
+	0x72, 0x54, 0x72, 0x69, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x09,
-	0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x05,
+	0x70, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x2e, 0x55, 0x73, 0x65, 0x72, 0x52, 0x09, 0x70, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72,
+	0x05, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x52, 0x09, 0x70, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65,
-	0x12, 0x2e, 0x0a, 0x0b, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x18,
+	0x72, 0x12, 0x33, 0x0a, 0x0b, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65,
-	0x63, 0x65, 0x73, 0x52, 0x0b, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73,
+	0x6e, 0x63, 0x65, 0x73, 0x48, 0x00, 0x52, 0x0b, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e,
-	0x22, 0xa3, 0x01, 0x0a, 0x1b, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x52, 0x65, 0x67, 0x75, 0x6c,
+	0x63, 0x65, 0x73, 0x88, 0x01, 0x01, 0x42, 0x0e, 0x0a, 0x0c, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x65,
-	0x61, 0x72, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73,
+	0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x22, 0xa3, 0x01, 0x0a, 0x1b, 0x44, 0x72, 0x69, 0x76, 0x65,
-	0x12, 0x35, 0x0a, 0x0e, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65,
+	0x72, 0x52, 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69,
-	0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x72, 0x69, 0x76, 0x65,
+	0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x12, 0x35, 0x0a, 0x0e, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72,
-	0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x0d, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72,
+	0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x4d, 0x0a, 0x15, 0x64, 0x72, 0x69, 0x76, 0x65,
+	0x2e, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x0d,
-	0x72, 0x5f, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73,
+	0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x4d, 0x0a,
-	0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x52, 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72,
+	0x15, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x5f, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69,
-	0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x53, 0x6c, 0x6f, 0x74,
+	0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x52,
-	0x52, 0x14, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69,
+	0x65, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69,
-	0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x22, 0xa5, 0x01, 0x0a, 0x1c, 0x44, 0x72, 0x69, 0x76, 0x65,
+	0x74, 0x79, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x14, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x41, 0x76,
-	0x72, 0x50, 0x75, 0x6e, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62,
+	0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x22, 0xa5, 0x01, 0x0a,
-	0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x12, 0x35, 0x0a, 0x0e, 0x64, 0x72, 0x69, 0x76, 0x65,
+	0x1c, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x50, 0x75, 0x6e, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x41,
-	0x72, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x12, 0x35, 0x0a,
-	0x0e, 0x2e, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52,
+	0x0e, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x18,
-	0x0d, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x4e,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x52, 0x65,
-	0x0a, 0x15, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x5f, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x0d, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71,
-	0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e,
+	0x75, 0x65, 0x73, 0x74, 0x12, 0x4e, 0x0a, 0x15, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x5f, 0x61,
-	0x50, 0x75, 0x6e, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69,
+	0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x18, 0x02, 0x20,
-	0x6c, 0x69, 0x74, 0x79, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x14, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72,
+	0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x50, 0x75, 0x6e, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x41, 0x76,
-	0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x22, 0x4b,
+	0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x14,
-	0x0a, 0x15, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x54, 0x72, 0x69, 0x70, 0x52,
+	0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65,
+	0x74, 0x69, 0x65, 0x73, 0x22, 0x5c, 0x0a, 0x15, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65,
-	0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73,
+	0x72, 0x54, 0x72, 0x69, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a,
-	0x73, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07,
-	0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x52, 0x0a, 0x1c, 0x44,
+	0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x1d, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61,
-	0x72, 0x69, 0x76, 0x65, 0x72, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74,
+	0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73,
-	0x69, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73,
+	0x61, 0x67, 0x65, 0x88, 0x01, 0x01, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61,
 	0x67, 0x65, 0x22, 0x63, 0x0a, 0x1c, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x41, 0x76, 0x61, 0x69,
 	0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
 	0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20,
 	0x01, 0x28, 0x08, 0x52, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x1d, 0x0a, 0x07,
 	0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52,
 	0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x88, 0x01, 0x01, 0x42, 0x0a, 0x0a, 0x08, 0x5f,
 	0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x41, 0x0a, 0x14, 0x43, 0x72, 0x65, 0x61, 0x74,
 	0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
 	0x29, 0x0a, 0x07, 0x62, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
 	0x32, 0x0f, 0x2e, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
 	0x74, 0x52, 0x07, 0x62, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x22, 0x3b, 0x0a, 0x15, 0x43, 0x72,
 	0x65, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f,
 	0x6e, 0x73, 0x65, 0x12, 0x22, 0x0a, 0x07, 0x62, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x18, 0x01,
 	0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x07,
 	0x62, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x22, 0x88, 0x01, 0x0a, 0x14, 0x55, 0x70, 0x64, 0x61,
 	0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
 	0x12, 0x1d, 0x0a, 0x0a, 0x62, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x5f, 0x69, 0x64, 0x18, 0x01,
 	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x62, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x49, 0x64, 0x12,
 	0x26, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32,
 	0x0e, 0x2e, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52,
 	0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1d, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61,
 	0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73,
 	0x61, 0x67, 0x65, 0x88, 0x01, 0x01, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61,
 	0x67, 0x65, 0x22, 0x5c, 0x0a, 0x15, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b,
 	0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73,
 	0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x73, 0x75,
-	0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
+	0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x1d, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67,
-	0x55, 0x0a, 0x1e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67,
+	0x65, 0x88, 0x01, 0x01, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	0x53, 0x69, 0x6c, 0x76, 0x65, 0x72, 0x6d, 0x6f, 0x62, 0x69, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x22, 0x32, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65,
-	0x74, 0x12, 0x33, 0x0a, 0x07, 0x62, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x62, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67,
-	0x28, 0x0b, 0x32, 0x19, 0x2e, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x69, 0x6c, 0x76,
+	0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x62, 0x6f, 0x6f, 0x6b, 0x69,
-	0x65, 0x72, 0x6d, 0x6f, 0x62, 0x69, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x07, 0x62,
+	0x6e, 0x67, 0x49, 0x64, 0x22, 0x38, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x6f, 0x6b, 0x69,
-	0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x22, 0x4f, 0x0a, 0x1f, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
+	0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x22, 0x0a, 0x07, 0x62, 0x6f,
-	0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x69, 0x6c, 0x76, 0x65, 0x72, 0x6d, 0x6f, 0x62,
+	0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x42, 0x6f,
-	0x69, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2c, 0x0a, 0x07, 0x62, 0x6f, 0x6f,
+	0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x07, 0x62, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x22, 0x7c,
-	0x6b, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x42, 0x6f, 0x6f,
+	0x0a, 0x1a, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x73, 0x42, 0x79, 0x53,
-	0x6b, 0x69, 0x6e, 0x67, 0x53, 0x69, 0x6c, 0x76, 0x65, 0x72, 0x6d, 0x6f, 0x62, 0x69, 0x52, 0x07,
+	0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x26, 0x0a, 0x06,
-	0x62, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x22, 0x8b, 0x01, 0x0a, 0x1e, 0x55, 0x70, 0x64, 0x61,
+	0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0e, 0x2e, 0x42,
-	0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x69, 0x6c, 0x76, 0x65, 0x72, 0x6d,
+	0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x06, 0x73, 0x74,
-	0x6f, 0x62, 0x69, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x62, 0x6f,
+	0x61, 0x74, 0x75, 0x73, 0x12, 0x1d, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
+	0x28, 0x0e, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74,
-	0x62, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x49, 0x64, 0x12, 0x30, 0x0a, 0x06, 0x73, 0x74, 0x61,
+	0x79, 0x70, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x03,
-	0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x18, 0x2e, 0x42, 0x6f, 0x6f, 0x6b,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x82, 0x01, 0x0a,
-	0x69, 0x6e, 0x67, 0x53, 0x69, 0x6c, 0x76, 0x65, 0x72, 0x6d, 0x6f, 0x62, 0x69, 0x53, 0x74, 0x61,
+	0x15, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x4a, 0x6f, 0x75, 0x72, 0x6e, 0x65, 0x79, 0x73, 0x52,
-	0x74, 0x75, 0x73, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x6d,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x26, 0x0a, 0x09, 0x64, 0x65, 0x70, 0x61, 0x72, 0x74,
-	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65,
+	0x75, 0x72, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x46, 0x65, 0x61, 0x74,
-	0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x55, 0x0a, 0x1f, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42,
+	0x75, 0x72, 0x65, 0x52, 0x09, 0x64, 0x65, 0x70, 0x61, 0x72, 0x74, 0x75, 0x72, 0x65, 0x12, 0x41,
-	0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x69, 0x6c, 0x76, 0x65, 0x72, 0x6d, 0x6f, 0x62, 0x69,
+	0x0a, 0x0e, 0x64, 0x65, 0x70, 0x61, 0x72, 0x74, 0x75, 0x72, 0x65, 0x5f, 0x64, 0x61, 0x74, 0x65,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x63, 0x63,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
-	0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61,
-	0x73, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20,
+	0x6d, 0x70, 0x52, 0x0d, 0x64, 0x65, 0x70, 0x61, 0x72, 0x74, 0x75, 0x72, 0x65, 0x44, 0x61, 0x74,
-	0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x3c, 0x0a, 0x1b,
+	0x65, 0x22, 0x51, 0x0a, 0x16, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x4a, 0x6f, 0x75, 0x72, 0x6e,
-	0x47, 0x65, 0x74, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x69, 0x6c, 0x76, 0x65, 0x72,
+	0x65, 0x79, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x37, 0x0a, 0x0f, 0x64,
-	0x6d, 0x6f, 0x62, 0x69, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x62,
+	0x72, 0x69, 0x76, 0x65, 0x72, 0x5f, 0x6a, 0x6f, 0x75, 0x72, 0x6e, 0x65, 0x79, 0x73, 0x18, 0x01,
-	0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x4a, 0x6f, 0x75,
-	0x09, 0x62, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x49, 0x64, 0x22, 0x4c, 0x0a, 0x1c, 0x47, 0x65,
+	0x72, 0x6e, 0x65, 0x79, 0x52, 0x0e, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x4a, 0x6f, 0x75, 0x72,
-	0x74, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x69, 0x6c, 0x76, 0x65, 0x72, 0x6d, 0x6f,
+	0x6e, 0x65, 0x79, 0x73, 0x22, 0x41, 0x0a, 0x1b, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x6f, 0x6b, 0x69,
-	0x62, 0x69, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2c, 0x0a, 0x07, 0x62, 0x6f,
+	0x6e, 0x67, 0x73, 0x42, 0x79, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x42, 0x6f,
+	0x6e, 0x73, 0x65, 0x12, 0x22, 0x0a, 0x07, 0x62, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x18, 0x01,
-	0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x69, 0x6c, 0x76, 0x65, 0x72, 0x6d, 0x6f, 0x62, 0x69, 0x52,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x07,
-	0x07, 0x62, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x22, 0x86, 0x01, 0x0a, 0x1a, 0x47, 0x65, 0x74,
+	0x62, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x32, 0xf2, 0x04, 0x0a, 0x11, 0x53, 0x6f, 0x6c, 0x69,
-	0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x73, 0x42, 0x79, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
+	0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x5f, 0x0a,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x30, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75,
+	0x1e, 0x53, 0x65, 0x74, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x52, 0x65, 0x67, 0x75, 0x6c, 0x61,
-	0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x18, 0x2e, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e,
+	0x72, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x12,
-	0x67, 0x53, 0x69, 0x6c, 0x76, 0x65, 0x72, 0x6d, 0x6f, 0x62, 0x69, 0x53, 0x74, 0x61, 0x74, 0x75,
+	0x1c, 0x2e, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x52, 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x41,
-	0x73, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1d, 0x0a, 0x04, 0x74, 0x79, 0x70,
+	0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x1a, 0x1d, 0x2e,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x54, 0x79,
+	0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69,
-	0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x72,
+	0x74, 0x69, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x61,
-	0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49,
+	0x0a, 0x1f, 0x53, 0x65, 0x74, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x50, 0x75, 0x6e, 0x63, 0x74,
-	0x64, 0x22, 0x82, 0x01, 0x0a, 0x15, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x4a, 0x6f, 0x75, 0x72,
+	0x75, 0x61, 0x6c, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65,
-	0x6e, 0x65, 0x79, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x26, 0x0a, 0x09, 0x64,
+	0x73, 0x12, 0x1d, 0x2e, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x50, 0x75, 0x6e, 0x63, 0x74, 0x75,
 	0x65, 0x70, 0x61, 0x72, 0x74, 0x75, 0x72, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08,
 	0x2e, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x52, 0x09, 0x64, 0x65, 0x70, 0x61, 0x72, 0x74,
 	0x75, 0x72, 0x65, 0x12, 0x41, 0x0a, 0x0e, 0x64, 0x65, 0x70, 0x61, 0x72, 0x74, 0x75, 0x72, 0x65,
 	0x5f, 0x64, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f,
 	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69,
 	0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0d, 0x64, 0x65, 0x70, 0x61, 0x72, 0x74, 0x75,
 	0x72, 0x65, 0x44, 0x61, 0x74, 0x65, 0x22, 0x51, 0x0a, 0x16, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72,
 	0x4a, 0x6f, 0x75, 0x72, 0x6e, 0x65, 0x79, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
 	0x12, 0x37, 0x0a, 0x0f, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x5f, 0x6a, 0x6f, 0x75, 0x72, 0x6e,
 	0x65, 0x79, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x72, 0x69, 0x76,
 	0x65, 0x72, 0x4a, 0x6f, 0x75, 0x72, 0x6e, 0x65, 0x79, 0x52, 0x0e, 0x64, 0x72, 0x69, 0x76, 0x65,
 	0x72, 0x4a, 0x6f, 0x75, 0x72, 0x6e, 0x65, 0x79, 0x73, 0x22, 0x4b, 0x0a, 0x1b, 0x47, 0x65, 0x74,
 	0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x73, 0x42, 0x79, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
 	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2c, 0x0a, 0x07, 0x62, 0x6f, 0x6f, 0x6b,
 	0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x42, 0x6f, 0x6f, 0x6b,
 	0x69, 0x6e, 0x67, 0x53, 0x69, 0x6c, 0x76, 0x65, 0x72, 0x6d, 0x6f, 0x62, 0x69, 0x52, 0x07, 0x62,
 	0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x32, 0xcc, 0x05, 0x0a, 0x11, 0x53, 0x6f, 0x6c, 0x69, 0x64,
 	0x61, 0x72, 0x69, 0x74, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x5f, 0x0a, 0x1e,
 	0x53, 0x65, 0x74, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x52, 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72,
 	0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x12, 0x1c,
 	0x2e, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x52, 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x41, 0x76,
 	0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x1a, 0x1d, 0x2e, 0x44,
 	0x72, 0x69, 0x76, 0x65, 0x72, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74,
 	0x69, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x61, 0x0a,
 	0x1f, 0x53, 0x65, 0x74, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x50, 0x75, 0x6e, 0x63, 0x74, 0x75,
 	0x61, 0x6c, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73,
-	0x12, 0x1d, 0x2e, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x50, 0x75, 0x6e, 0x63, 0x74, 0x75, 0x61,
+	0x1a, 0x1d, 0x2e, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62,
-	0x6c, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x1a,
+	0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
-	0x1d, 0x2e, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69,
+	0x00, 0x12, 0x40, 0x0a, 0x0d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69,
-	0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00,
+	0x6e, 0x67, 0x12, 0x15, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69,
-	0x12, 0x5e, 0x0a, 0x17, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e,
+	0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x43, 0x72, 0x65, 0x61,
-	0x67, 0x53, 0x69, 0x6c, 0x76, 0x65, 0x72, 0x6d, 0x6f, 0x62, 0x69, 0x12, 0x1f, 0x2e, 0x43, 0x72,
+	0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x69, 0x6c, 0x76, 0x65,
+	0x65, 0x22, 0x00, 0x12, 0x40, 0x0a, 0x0d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f,
-	0x72, 0x6d, 0x6f, 0x62, 0x69, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x43,
+	0x6b, 0x69, 0x6e, 0x67, 0x12, 0x15, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f,
-	0x72, 0x65, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x69, 0x6c, 0x76,
+	0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x55, 0x70,
-	0x65, 0x72, 0x6d, 0x6f, 0x62, 0x69, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00,
+	0x64, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x12, 0x5e, 0x0a, 0x17, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e,
+	0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x37, 0x0a, 0x0a, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x6f, 0x6b,
-	0x67, 0x53, 0x69, 0x6c, 0x76, 0x65, 0x72, 0x6d, 0x6f, 0x62, 0x69, 0x12, 0x1f, 0x2e, 0x55, 0x70,
+	0x69, 0x6e, 0x67, 0x12, 0x12, 0x2e, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67,
-	0x64, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x69, 0x6c, 0x76, 0x65,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x13, 0x2e, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x6f,
-	0x72, 0x6d, 0x6f, 0x62, 0x69, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x55,
+	0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x52,
-	0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x69, 0x6c, 0x76,
+	0x0a, 0x13, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x73, 0x42, 0x79, 0x53,
-	0x65, 0x72, 0x6d, 0x6f, 0x62, 0x69, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00,
+	0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1b, 0x2e, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x6f, 0x6b, 0x69,
-	0x12, 0x55, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x69,
+	0x6e, 0x67, 0x73, 0x42, 0x79, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x6c, 0x76, 0x65, 0x72, 0x6d, 0x6f, 0x62, 0x69, 0x12, 0x1c, 0x2e, 0x47, 0x65, 0x74, 0x42, 0x6f,
+	0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x73,
-	0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x69, 0x6c, 0x76, 0x65, 0x72, 0x6d, 0x6f, 0x62, 0x69, 0x52,
+	0x42, 0x79, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x6f, 0x6b,
+	0x22, 0x00, 0x12, 0x43, 0x0a, 0x0e, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x4a, 0x6f, 0x75, 0x72,
-	0x69, 0x6e, 0x67, 0x53, 0x69, 0x6c, 0x76, 0x65, 0x72, 0x6d, 0x6f, 0x62, 0x69, 0x52, 0x65, 0x73,
+	0x6e, 0x65, 0x79, 0x73, 0x12, 0x16, 0x2e, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x4a, 0x6f, 0x75,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x52, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x42, 0x6f,
+	0x72, 0x6e, 0x65, 0x79, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x44,
-	0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x73, 0x42, 0x79, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1b,
+	0x72, 0x69, 0x76, 0x65, 0x72, 0x4a, 0x6f, 0x75, 0x72, 0x6e, 0x65, 0x79, 0x73, 0x52, 0x65, 0x73,
-	0x2e, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x73, 0x42, 0x79, 0x53, 0x74,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x43, 0x0a, 0x10, 0x53, 0x65, 0x74, 0x50, 0x61,
-	0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x47, 0x65,
+	0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x54, 0x72, 0x69, 0x70, 0x12, 0x15, 0x2e, 0x50, 0x61,
-	0x74, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x73, 0x42, 0x79, 0x53, 0x74, 0x61, 0x74, 0x75,
+	0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x54, 0x72, 0x69, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x43, 0x0a, 0x0e, 0x44,
+	0x73, 0x74, 0x1a, 0x16, 0x2e, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x54, 0x72,
-	0x72, 0x69, 0x76, 0x65, 0x72, 0x4a, 0x6f, 0x75, 0x72, 0x6e, 0x65, 0x79, 0x73, 0x12, 0x16, 0x2e,
+	0x69, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x45, 0x5a, 0x43,
-	0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x4a, 0x6f, 0x75, 0x72, 0x6e, 0x65, 0x79, 0x73, 0x52, 0x65,
+	0x67, 0x69, 0x74, 0x2e, 0x63, 0x6f, 0x6f, 0x70, 0x67, 0x6f, 0x2e, 0x69, 0x6f, 0x2f, 0x63, 0x6f,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x4a, 0x6f,
+	0x6f, 0x70, 0x67, 0x6f, 0x2d, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x2f, 0x73, 0x6f,
-	0x75, 0x72, 0x6e, 0x65, 0x79, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00,
+	0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x2d, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x12, 0x43, 0x0a, 0x10, 0x53, 0x65, 0x74, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72,
+	0x2f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x73, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x2f, 0x70, 0x72,
-	0x54, 0x72, 0x69, 0x70, 0x12, 0x15, 0x2e, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72,
+	0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 	0x54, 0x72, 0x69, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x50, 0x61,
 	0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x54, 0x72, 0x69, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f,
 	0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x45, 0x5a, 0x43, 0x67, 0x69, 0x74, 0x2e, 0x63, 0x6f, 0x6f,
 	0x70, 0x67, 0x6f, 0x2e, 0x69, 0x6f, 0x2f, 0x63, 0x6f, 0x6f, 0x70, 0x67, 0x6f, 0x2d, 0x70, 0x6c,
 	0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x2f, 0x73, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, 0x74,
 	0x79, 0x2d, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72,
 	0x73, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x33,
 }
 var (
@ -987,33 +979,33 @@ func file_solidarity_api_proto_rawDescGZIP() []byte {
 var file_solidarity_api_proto_msgTypes = make([]protoimpl.MessageInfo, 15)
 var file_solidarity_api_proto_goTypes = []interface{}{
-	(*PassengerTripRequest)(nil),            // 0: PassengerTripRequest
+	(*PassengerTripRequest)(nil),         // 0: PassengerTripRequest
-	(*DriverRegularAvailabilities)(nil),     // 1: DriverRegularAvailabilities
+	(*DriverRegularAvailabilities)(nil),  // 1: DriverRegularAvailabilities
-	(*DriverPunctualAvailabilities)(nil),    // 2: DriverPunctualAvailabilities
+	(*DriverPunctualAvailabilities)(nil), // 2: DriverPunctualAvailabilities
-	(*PassengerTripResponse)(nil),           // 3: PassengerTripResponse
+	(*PassengerTripResponse)(nil),        // 3: PassengerTripResponse
-	(*DriverAvailabilitiesResponse)(nil),    // 4: DriverAvailabilitiesResponse
+	(*DriverAvailabilitiesResponse)(nil), // 4: DriverAvailabilitiesResponse
-	(*CreateBookingSilvermobiRequest)(nil),  // 5: CreateBookingSilvermobiRequest
+	(*CreateBookingRequest)(nil),         // 5: CreateBookingRequest
-	(*CreateBookingSilvermobiResponse)(nil), // 6: CreateBookingSilvermobiResponse
+	(*CreateBookingResponse)(nil),        // 6: CreateBookingResponse
-	(*UpdateBookingSilvermobiRequest)(nil),  // 7: UpdateBookingSilvermobiRequest
+	(*UpdateBookingRequest)(nil),         // 7: UpdateBookingRequest
-	(*UpdateBookingSilvermobiResponse)(nil), // 8: UpdateBookingSilvermobiResponse
+	(*UpdateBookingResponse)(nil),        // 8: UpdateBookingResponse
-	(*GetBookingSilvermobiRequest)(nil),     // 9: GetBookingSilvermobiRequest
+	(*GetBookingRequest)(nil),            // 9: GetBookingRequest
-	(*GetBookingSilvermobiResponse)(nil),    // 10: GetBookingSilvermobiResponse
+	(*GetBookingResponse)(nil),           // 10: GetBookingResponse
-	(*GetBookingsByStatusRequest)(nil),      // 11: GetBookingsByStatusRequest
+	(*GetBookingsByStatusRequest)(nil),   // 11: GetBookingsByStatusRequest
-	(*DriverJourneysRequest)(nil),           // 12: DriverJourneysRequest
+	(*DriverJourneysRequest)(nil),        // 12: DriverJourneysRequest
-	(*DriverJourneysResponse)(nil),          // 13: DriverJourneysResponse
+	(*DriverJourneysResponse)(nil),       // 13: DriverJourneysResponse
-	(*GetBookingsByStatusResponse)(nil),     // 14: GetBookingsByStatusResponse
+	(*GetBookingsByStatusResponse)(nil),  // 14: GetBookingsByStatusResponse
-	(*User)(nil),                            // 15: User
+	(*User)(nil),                         // 15: User
-	(*Preferences)(nil),                     // 16: Preferences
+	(*Preferences)(nil),                  // 16: Preferences
-	(*DriverRequest)(nil),                   // 17: DriverRequest
+	(*DriverRequest)(nil),                // 17: DriverRequest
-	(*RegularAvailabilitySlot)(nil),         // 18: RegularAvailabilitySlot
+	(*RegularAvailabilitySlot)(nil),      // 18: RegularAvailabilitySlot
-	(*PunctualAvailabilitySlot)(nil),        // 19: PunctualAvailabilitySlot
+	(*PunctualAvailabilitySlot)(nil),     // 19: PunctualAvailabilitySlot
-	(*BookingSilvermobiRequest)(nil),        // 20: BookingSilvermobiRequest
+	(*BookingRequest)(nil),               // 20: BookingRequest
-	(*BookingSilvermobi)(nil),               // 21: BookingSilvermobi
+	(*Booking)(nil),                      // 21: Booking
-	(BookingSilvermobiStatus)(0),            // 22: BookingSilvermobiStatus
+	(BookingStatus)(0),                   // 22: BookingStatus
-	(UserType)(0),                           // 23: UserType
+	(UserType)(0),                        // 23: UserType
-	(*Feature)(nil),                         // 24: Feature
+	(*Feature)(nil),                      // 24: Feature
-	(*timestamp.Timestamp)(nil),             // 25: google.protobuf.Timestamp
+	(*timestamp.Timestamp)(nil),          // 25: google.protobuf.Timestamp
-	(*DriverJourney)(nil),                   // 26: DriverJourney
+	(*DriverJourney)(nil),                // 26: DriverJourney
 }
 var file_solidarity_api_proto_depIdxs = []int32{
 	15, // 0: PassengerTripRequest.passenger:type_name -> User
@ -1022,29 +1014,29 @@ var file_solidarity_api_proto_depIdxs = []int32{
 	18, // 3: DriverRegularAvailabilities.driver_availabilities:type_name -> RegularAvailabilitySlot
 	17, // 4: DriverPunctualAvailabilities.driver_request:type_name -> DriverRequest
 	19, // 5: DriverPunctualAvailabilities.driver_availabilities:type_name -> PunctualAvailabilitySlot
-	20, // 6: CreateBookingSilvermobiRequest.booking:type_name -> BookingSilvermobiRequest
+	20, // 6: CreateBookingRequest.booking:type_name -> BookingRequest
-	21, // 7: CreateBookingSilvermobiResponse.booking:type_name -> BookingSilvermobi
+	21, // 7: CreateBookingResponse.booking:type_name -> Booking
-	22, // 8: UpdateBookingSilvermobiRequest.status:type_name -> BookingSilvermobiStatus
+	22, // 8: UpdateBookingRequest.status:type_name -> BookingStatus
-	21, // 9: GetBookingSilvermobiResponse.booking:type_name -> BookingSilvermobi
+	21, // 9: GetBookingResponse.booking:type_name -> Booking
-	22, // 10: GetBookingsByStatusRequest.status:type_name -> BookingSilvermobiStatus
+	22, // 10: GetBookingsByStatusRequest.status:type_name -> BookingStatus
 	23, // 11: GetBookingsByStatusRequest.type:type_name -> UserType
 	24, // 12: DriverJourneysRequest.departure:type_name -> Feature
 	25, // 13: DriverJourneysRequest.departure_date:type_name -> google.protobuf.Timestamp
 	26, // 14: DriverJourneysResponse.driver_journeys:type_name -> DriverJourney
-	21, // 15: GetBookingsByStatusResponse.booking:type_name -> BookingSilvermobi
+	21, // 15: GetBookingsByStatusResponse.booking:type_name -> Booking
 	1,  // 16: SolidarityService.SetDriverRegularAvailabilities:input_type -> DriverRegularAvailabilities
 	2,  // 17: SolidarityService.SetDriverPunctualAvailabilities:input_type -> DriverPunctualAvailabilities
-	5,  // 18: SolidarityService.CreateBookingSilvermobi:input_type -> CreateBookingSilvermobiRequest
+	5,  // 18: SolidarityService.CreateBooking:input_type -> CreateBookingRequest
-	7,  // 19: SolidarityService.UpdateBookingSilvermobi:input_type -> UpdateBookingSilvermobiRequest
+	7,  // 19: SolidarityService.UpdateBooking:input_type -> UpdateBookingRequest
-	9,  // 20: SolidarityService.GetBookingSilvermobi:input_type -> GetBookingSilvermobiRequest
+	9,  // 20: SolidarityService.GetBooking:input_type -> GetBookingRequest
 	11, // 21: SolidarityService.GetBookingsByStatus:input_type -> GetBookingsByStatusRequest
 	12, // 22: SolidarityService.DriverJourneys:input_type -> DriverJourneysRequest
 	0,  // 23: SolidarityService.SetPassengerTrip:input_type -> PassengerTripRequest
 	4,  // 24: SolidarityService.SetDriverRegularAvailabilities:output_type -> DriverAvailabilitiesResponse
 	4,  // 25: SolidarityService.SetDriverPunctualAvailabilities:output_type -> DriverAvailabilitiesResponse
-	6,  // 26: SolidarityService.CreateBookingSilvermobi:output_type -> CreateBookingSilvermobiResponse
+	6,  // 26: SolidarityService.CreateBooking:output_type -> CreateBookingResponse
-	8,  // 27: SolidarityService.UpdateBookingSilvermobi:output_type -> UpdateBookingSilvermobiResponse
+	8,  // 27: SolidarityService.UpdateBooking:output_type -> UpdateBookingResponse
-	10, // 28: SolidarityService.GetBookingSilvermobi:output_type -> GetBookingSilvermobiResponse
+	10, // 28: SolidarityService.GetBooking:output_type -> GetBookingResponse
 	14, // 29: SolidarityService.GetBookingsByStatus:output_type -> GetBookingsByStatusResponse
 	13, // 30: SolidarityService.DriverJourneys:output_type -> DriverJourneysResponse
 	3,  // 31: SolidarityService.SetPassengerTrip:output_type -> PassengerTripResponse
@ -1123,7 +1115,7 @@ func file_solidarity_api_proto_init() {
 			}
 		}
 		file_solidarity_api_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CreateBookingSilvermobiRequest); i {
+			switch v := v.(*CreateBookingRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@ -1135,7 +1127,7 @@ func file_solidarity_api_proto_init() {
 			}
 		}
 		file_solidarity_api_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CreateBookingSilvermobiResponse); i {
+			switch v := v.(*CreateBookingResponse); i {
 			case 0:
 				return &v.state
 			case 1:
@ -1147,7 +1139,7 @@ func file_solidarity_api_proto_init() {
 			}
 		}
 		file_solidarity_api_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UpdateBookingSilvermobiRequest); i {
+			switch v := v.(*UpdateBookingRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@ -1159,7 +1151,7 @@ func file_solidarity_api_proto_init() {
 			}
 		}
 		file_solidarity_api_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UpdateBookingSilvermobiResponse); i {
+			switch v := v.(*UpdateBookingResponse); i {
 			case 0:
 				return &v.state
 			case 1:
@ -1171,7 +1163,7 @@ func file_solidarity_api_proto_init() {
 			}
 		}
 		file_solidarity_api_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetBookingSilvermobiRequest); i {
+			switch v := v.(*GetBookingRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@ -1183,7 +1175,7 @@ func file_solidarity_api_proto_init() {
 			}
 		}
 		file_solidarity_api_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GetBookingSilvermobiResponse); i {
+			switch v := v.(*GetBookingResponse); i {
 			case 0:
 				return &v.state
 			case 1:
@ -1243,6 +1235,11 @@ func file_solidarity_api_proto_init() {
 			}
 		}
 	}
 	file_solidarity_api_proto_msgTypes[0].OneofWrappers = []interface{}{}
 	file_solidarity_api_proto_msgTypes[3].OneofWrappers = []interface{}{}
 	file_solidarity_api_proto_msgTypes[4].OneofWrappers = []interface{}{}
 	file_solidarity_api_proto_msgTypes[7].OneofWrappers = []interface{}{}
 	file_solidarity_api_proto_msgTypes[8].OneofWrappers = []interface{}{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
--- a/servers/grpcapi/proto/solidarity-api.proto
+++ b/servers/grpcapi/proto/solidarity-api.proto
@ -6,9 +6,9 @@ import "solidarity-api-types.proto";
 service SolidarityService {
  rpc SetDriverRegularAvailabilities(DriverRegularAvailabilities) returns (DriverAvailabilitiesResponse) {}
  rpc SetDriverPunctualAvailabilities(DriverPunctualAvailabilities) returns (DriverAvailabilitiesResponse) {}
-  rpc CreateBookingSilvermobi(CreateBookingSilvermobiRequest) returns (CreateBookingSilvermobiResponse) {}
+  rpc CreateBooking(CreateBookingRequest) returns (CreateBookingResponse) {}
-  rpc UpdateBookingSilvermobi(UpdateBookingSilvermobiRequest) returns (UpdateBookingSilvermobiResponse) {}
+  rpc UpdateBooking(UpdateBookingRequest) returns (UpdateBookingResponse) {}
-  rpc GetBookingSilvermobi(GetBookingSilvermobiRequest) returns (GetBookingSilvermobiResponse) {}
+  rpc GetBooking(GetBookingRequest) returns (GetBookingResponse) {}
  rpc GetBookingsByStatus(GetBookingsByStatusRequest) returns (GetBookingsByStatusResponse) {}
  rpc DriverJourneys(DriverJourneysRequest) returns (DriverJourneysResponse) {}
  rpc SetPassengerTrip(PassengerTripRequest) returns (PassengerTripResponse) {}
@ -17,7 +17,7 @@ service SolidarityService {
 message PassengerTripRequest{
  User passenger = 1;
-   Preferences preferences = 2;
+  optional Preferences preferences = 2;
 }
 message DriverRegularAvailabilities{
@ -33,43 +33,43 @@ message DriverPunctualAvailabilities{
 message PassengerTripResponse {
  bool success = 1;
-   string message = 2;
+  optional string message = 2;
 }
 message DriverAvailabilitiesResponse {
  bool success = 1;
-   string message = 2;
+  optional string message = 2;
 }
-message CreateBookingSilvermobiRequest {
+message CreateBookingRequest {
-  BookingSilvermobiRequest booking = 1;
+  BookingRequest booking = 1;
 }
-message CreateBookingSilvermobiResponse {
+message CreateBookingResponse {
-  BookingSilvermobi booking = 1;
+  Booking booking = 1;
 }
-message UpdateBookingSilvermobiRequest {
+message UpdateBookingRequest {
  string booking_id = 1;
-  BookingSilvermobiStatus status = 2;
+  BookingStatus status = 2;
-   string message = 3;
+  optional string message = 3;
 }
-message UpdateBookingSilvermobiResponse {
+message UpdateBookingResponse {
  bool success = 1;
-   string message = 2;
+  optional string message = 2;
 }
-message GetBookingSilvermobiRequest {
+message GetBookingRequest {
  string booking_id = 1;
 }
-message GetBookingSilvermobiResponse {
+message GetBookingResponse {
-  BookingSilvermobi booking = 1;
+  Booking booking = 1;
 }
 message GetBookingsByStatusRequest{
-  BookingSilvermobiStatus status = 1;
+  BookingStatus status = 1;
  UserType type = 2;
  string user_id = 3;
 }
@ -84,5 +84,5 @@ message DriverJourneysResponse {
 }
 message GetBookingsByStatusResponse{
-  repeated BookingSilvermobi booking = 1;
+  repeated Booking booking = 1;
 }
--- a/servers/grpcapi/proto/solidarity-api_grpc.pb.go
+++ b/servers/grpcapi/proto/solidarity-api_grpc.pb.go
@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-grpc v1.5.1
+// - protoc-gen-go-grpc v1.3.0
 // - protoc             v3.12.4
 // source: solidarity-api.proto
@ -15,15 +15,15 @@ import (
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the grpc package it is being compiled against.
-// Requires gRPC-Go v1.64.0 or later.
+// Requires gRPC-Go v1.32.0 or later.
-const _ = grpc.SupportPackageIsVersion9
+const _ = grpc.SupportPackageIsVersion7
 const (
 	SolidarityService_SetDriverRegularAvailabilities_FullMethodName  = "/SolidarityService/SetDriverRegularAvailabilities"
 	SolidarityService_SetDriverPunctualAvailabilities_FullMethodName = "/SolidarityService/SetDriverPunctualAvailabilities"
-	SolidarityService_CreateBookingSilvermobi_FullMethodName         = "/SolidarityService/CreateBookingSilvermobi"
+	SolidarityService_CreateBooking_FullMethodName                   = "/SolidarityService/CreateBooking"
-	SolidarityService_UpdateBookingSilvermobi_FullMethodName         = "/SolidarityService/UpdateBookingSilvermobi"
+	SolidarityService_UpdateBooking_FullMethodName                   = "/SolidarityService/UpdateBooking"
-	SolidarityService_GetBookingSilvermobi_FullMethodName            = "/SolidarityService/GetBookingSilvermobi"
+	SolidarityService_GetBooking_FullMethodName                      = "/SolidarityService/GetBooking"
 	SolidarityService_GetBookingsByStatus_FullMethodName             = "/SolidarityService/GetBookingsByStatus"
 	SolidarityService_DriverJourneys_FullMethodName                  = "/SolidarityService/DriverJourneys"
 	SolidarityService_SetPassengerTrip_FullMethodName                = "/SolidarityService/SetPassengerTrip"
@ -35,9 +35,9 @@ const (
 type SolidarityServiceClient interface {
 	SetDriverRegularAvailabilities(ctx context.Context, in *DriverRegularAvailabilities, opts ...grpc.CallOption) (*DriverAvailabilitiesResponse, error)
 	SetDriverPunctualAvailabilities(ctx context.Context, in *DriverPunctualAvailabilities, opts ...grpc.CallOption) (*DriverAvailabilitiesResponse, error)
-	CreateBookingSilvermobi(ctx context.Context, in *CreateBookingSilvermobiRequest, opts ...grpc.CallOption) (*CreateBookingSilvermobiResponse, error)
+	CreateBooking(ctx context.Context, in *CreateBookingRequest, opts ...grpc.CallOption) (*CreateBookingResponse, error)
-	UpdateBookingSilvermobi(ctx context.Context, in *UpdateBookingSilvermobiRequest, opts ...grpc.CallOption) (*UpdateBookingSilvermobiResponse, error)
+	UpdateBooking(ctx context.Context, in *UpdateBookingRequest, opts ...grpc.CallOption) (*UpdateBookingResponse, error)
-	GetBookingSilvermobi(ctx context.Context, in *GetBookingSilvermobiRequest, opts ...grpc.CallOption) (*GetBookingSilvermobiResponse, error)
+	GetBooking(ctx context.Context, in *GetBookingRequest, opts ...grpc.CallOption) (*GetBookingResponse, error)
 	GetBookingsByStatus(ctx context.Context, in *GetBookingsByStatusRequest, opts ...grpc.CallOption) (*GetBookingsByStatusResponse, error)
 	DriverJourneys(ctx context.Context, in *DriverJourneysRequest, opts ...grpc.CallOption) (*DriverJourneysResponse, error)
 	SetPassengerTrip(ctx context.Context, in *PassengerTripRequest, opts ...grpc.CallOption) (*PassengerTripResponse, error)
@ -52,9 +52,8 @@ func NewSolidarityServiceClient(cc grpc.ClientConnInterface) SolidarityServiceCl
 }
 func (c *solidarityServiceClient) SetDriverRegularAvailabilities(ctx context.Context, in *DriverRegularAvailabilities, opts ...grpc.CallOption) (*DriverAvailabilitiesResponse, error) {
 	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(DriverAvailabilitiesResponse)
-	err := c.cc.Invoke(ctx, SolidarityService_SetDriverRegularAvailabilities_FullMethodName, in, out, cOpts...)
+	err := c.cc.Invoke(ctx, SolidarityService_SetDriverRegularAvailabilities_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@ -62,39 +61,35 @@ func (c *solidarityServiceClient) SetDriverRegularAvailabilities(ctx context.Con
 }
 func (c *solidarityServiceClient) SetDriverPunctualAvailabilities(ctx context.Context, in *DriverPunctualAvailabilities, opts ...grpc.CallOption) (*DriverAvailabilitiesResponse, error) {
 	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(DriverAvailabilitiesResponse)
-	err := c.cc.Invoke(ctx, SolidarityService_SetDriverPunctualAvailabilities_FullMethodName, in, out, cOpts...)
+	err := c.cc.Invoke(ctx, SolidarityService_SetDriverPunctualAvailabilities_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
-func (c *solidarityServiceClient) CreateBookingSilvermobi(ctx context.Context, in *CreateBookingSilvermobiRequest, opts ...grpc.CallOption) (*CreateBookingSilvermobiResponse, error) {
+func (c *solidarityServiceClient) CreateBooking(ctx context.Context, in *CreateBookingRequest, opts ...grpc.CallOption) (*CreateBookingResponse, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	out := new(CreateBookingResponse)
-	out := new(CreateBookingSilvermobiResponse)
+	err := c.cc.Invoke(ctx, SolidarityService_CreateBooking_FullMethodName, in, out, opts...)
 	err := c.cc.Invoke(ctx, SolidarityService_CreateBookingSilvermobi_FullMethodName, in, out, cOpts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
-func (c *solidarityServiceClient) UpdateBookingSilvermobi(ctx context.Context, in *UpdateBookingSilvermobiRequest, opts ...grpc.CallOption) (*UpdateBookingSilvermobiResponse, error) {
+func (c *solidarityServiceClient) UpdateBooking(ctx context.Context, in *UpdateBookingRequest, opts ...grpc.CallOption) (*UpdateBookingResponse, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	out := new(UpdateBookingResponse)
-	out := new(UpdateBookingSilvermobiResponse)
+	err := c.cc.Invoke(ctx, SolidarityService_UpdateBooking_FullMethodName, in, out, opts...)
 	err := c.cc.Invoke(ctx, SolidarityService_UpdateBookingSilvermobi_FullMethodName, in, out, cOpts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
-func (c *solidarityServiceClient) GetBookingSilvermobi(ctx context.Context, in *GetBookingSilvermobiRequest, opts ...grpc.CallOption) (*GetBookingSilvermobiResponse, error) {
+func (c *solidarityServiceClient) GetBooking(ctx context.Context, in *GetBookingRequest, opts ...grpc.CallOption) (*GetBookingResponse, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	out := new(GetBookingResponse)
-	out := new(GetBookingSilvermobiResponse)
+	err := c.cc.Invoke(ctx, SolidarityService_GetBooking_FullMethodName, in, out, opts...)
 	err := c.cc.Invoke(ctx, SolidarityService_GetBookingSilvermobi_FullMethodName, in, out, cOpts...)
 	if err != nil {
 		return nil, err
 	}
@ -102,9 +97,8 @@ func (c *solidarityServiceClient) GetBookingSilvermobi(ctx context.Context, in *
 }
 func (c *solidarityServiceClient) GetBookingsByStatus(ctx context.Context, in *GetBookingsByStatusRequest, opts ...grpc.CallOption) (*GetBookingsByStatusResponse, error) {
 	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(GetBookingsByStatusResponse)
-	err := c.cc.Invoke(ctx, SolidarityService_GetBookingsByStatus_FullMethodName, in, out, cOpts...)
+	err := c.cc.Invoke(ctx, SolidarityService_GetBookingsByStatus_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@ -112,9 +106,8 @@ func (c *solidarityServiceClient) GetBookingsByStatus(ctx context.Context, in *G
 }
 func (c *solidarityServiceClient) DriverJourneys(ctx context.Context, in *DriverJourneysRequest, opts ...grpc.CallOption) (*DriverJourneysResponse, error) {
 	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(DriverJourneysResponse)
-	err := c.cc.Invoke(ctx, SolidarityService_DriverJourneys_FullMethodName, in, out, cOpts...)
+	err := c.cc.Invoke(ctx, SolidarityService_DriverJourneys_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@ -122,9 +115,8 @@ func (c *solidarityServiceClient) DriverJourneys(ctx context.Context, in *Driver
 }
 func (c *solidarityServiceClient) SetPassengerTrip(ctx context.Context, in *PassengerTripRequest, opts ...grpc.CallOption) (*PassengerTripResponse, error) {
 	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(PassengerTripResponse)
-	err := c.cc.Invoke(ctx, SolidarityService_SetPassengerTrip_FullMethodName, in, out, cOpts...)
+	err := c.cc.Invoke(ctx, SolidarityService_SetPassengerTrip_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@ -133,25 +125,22 @@ func (c *solidarityServiceClient) SetPassengerTrip(ctx context.Context, in *Pass
 // SolidarityServiceServer is the server API for SolidarityService service.
 // All implementations must embed UnimplementedSolidarityServiceServer
-// for forward compatibility.
+// for forward compatibility
 type SolidarityServiceServer interface {
 	SetDriverRegularAvailabilities(context.Context, *DriverRegularAvailabilities) (*DriverAvailabilitiesResponse, error)
 	SetDriverPunctualAvailabilities(context.Context, *DriverPunctualAvailabilities) (*DriverAvailabilitiesResponse, error)
-	CreateBookingSilvermobi(context.Context, *CreateBookingSilvermobiRequest) (*CreateBookingSilvermobiResponse, error)
+	CreateBooking(context.Context, *CreateBookingRequest) (*CreateBookingResponse, error)
-	UpdateBookingSilvermobi(context.Context, *UpdateBookingSilvermobiRequest) (*UpdateBookingSilvermobiResponse, error)
+	UpdateBooking(context.Context, *UpdateBookingRequest) (*UpdateBookingResponse, error)
-	GetBookingSilvermobi(context.Context, *GetBookingSilvermobiRequest) (*GetBookingSilvermobiResponse, error)
+	GetBooking(context.Context, *GetBookingRequest) (*GetBookingResponse, error)
 	GetBookingsByStatus(context.Context, *GetBookingsByStatusRequest) (*GetBookingsByStatusResponse, error)
 	DriverJourneys(context.Context, *DriverJourneysRequest) (*DriverJourneysResponse, error)
 	SetPassengerTrip(context.Context, *PassengerTripRequest) (*PassengerTripResponse, error)
 	mustEmbedUnimplementedSolidarityServiceServer()
 }
-// UnimplementedSolidarityServiceServer must be embedded to have
+// UnimplementedSolidarityServiceServer must be embedded to have forward compatible implementations.
-// forward compatible implementations.
+type UnimplementedSolidarityServiceServer struct {
-//
+}
 // NOTE: this should be embedded by value instead of pointer to avoid a nil
 // pointer dereference when methods are called.
 type UnimplementedSolidarityServiceServer struct{}
 func (UnimplementedSolidarityServiceServer) SetDriverRegularAvailabilities(context.Context, *DriverRegularAvailabilities) (*DriverAvailabilitiesResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SetDriverRegularAvailabilities not implemented")
@ -159,14 +148,14 @@ func (UnimplementedSolidarityServiceServer) SetDriverRegularAvailabilities(conte
 func (UnimplementedSolidarityServiceServer) SetDriverPunctualAvailabilities(context.Context, *DriverPunctualAvailabilities) (*DriverAvailabilitiesResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SetDriverPunctualAvailabilities not implemented")
 }
-func (UnimplementedSolidarityServiceServer) CreateBookingSilvermobi(context.Context, *CreateBookingSilvermobiRequest) (*CreateBookingSilvermobiResponse, error) {
+func (UnimplementedSolidarityServiceServer) CreateBooking(context.Context, *CreateBookingRequest) (*CreateBookingResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method CreateBookingSilvermobi not implemented")
+	return nil, status.Errorf(codes.Unimplemented, "method CreateBooking not implemented")
 }
-func (UnimplementedSolidarityServiceServer) UpdateBookingSilvermobi(context.Context, *UpdateBookingSilvermobiRequest) (*UpdateBookingSilvermobiResponse, error) {
+func (UnimplementedSolidarityServiceServer) UpdateBooking(context.Context, *UpdateBookingRequest) (*UpdateBookingResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method UpdateBookingSilvermobi not implemented")
+	return nil, status.Errorf(codes.Unimplemented, "method UpdateBooking not implemented")
 }
-func (UnimplementedSolidarityServiceServer) GetBookingSilvermobi(context.Context, *GetBookingSilvermobiRequest) (*GetBookingSilvermobiResponse, error) {
+func (UnimplementedSolidarityServiceServer) GetBooking(context.Context, *GetBookingRequest) (*GetBookingResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetBookingSilvermobi not implemented")
+	return nil, status.Errorf(codes.Unimplemented, "method GetBooking not implemented")
 }
 func (UnimplementedSolidarityServiceServer) GetBookingsByStatus(context.Context, *GetBookingsByStatusRequest) (*GetBookingsByStatusResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetBookingsByStatus not implemented")
@ -178,7 +167,6 @@ func (UnimplementedSolidarityServiceServer) SetPassengerTrip(context.Context, *P
 	return nil, status.Errorf(codes.Unimplemented, "method SetPassengerTrip not implemented")
 }
 func (UnimplementedSolidarityServiceServer) mustEmbedUnimplementedSolidarityServiceServer() {}
 func (UnimplementedSolidarityServiceServer) testEmbeddedByValue()                           {}
 // UnsafeSolidarityServiceServer may be embedded to opt out of forward compatibility for this service.
 // Use of this interface is not recommended, as added methods to SolidarityServiceServer will
@ -188,13 +176,6 @@ type UnsafeSolidarityServiceServer interface {
 }
 func RegisterSolidarityServiceServer(s grpc.ServiceRegistrar, srv SolidarityServiceServer) {
 	// If the following call pancis, it indicates UnimplementedSolidarityServiceServer was
 	// embedded by pointer and is nil.  This will cause panics if an
 	// unimplemented method is ever invoked, so we test this at initialization
 	// time to prevent it from happening at runtime later due to I/O.
 	if t, ok := srv.(interface{ testEmbeddedByValue() }); ok {
 		t.testEmbeddedByValue()
 	}
 	s.RegisterService(&SolidarityService_ServiceDesc, srv)
 }
@ -234,56 +215,56 @@ func _SolidarityService_SetDriverPunctualAvailabilities_Handler(srv interface{},
 	return interceptor(ctx, in, info, handler)
 }
-func _SolidarityService_CreateBookingSilvermobi_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+func _SolidarityService_CreateBooking_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(CreateBookingSilvermobiRequest)
+	in := new(CreateBookingRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(SolidarityServiceServer).CreateBookingSilvermobi(ctx, in)
+		return srv.(SolidarityServiceServer).CreateBooking(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: SolidarityService_CreateBookingSilvermobi_FullMethodName,
+		FullMethod: SolidarityService_CreateBooking_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(SolidarityServiceServer).CreateBookingSilvermobi(ctx, req.(*CreateBookingSilvermobiRequest))
+		return srv.(SolidarityServiceServer).CreateBooking(ctx, req.(*CreateBookingRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
-func _SolidarityService_UpdateBookingSilvermobi_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+func _SolidarityService_UpdateBooking_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(UpdateBookingSilvermobiRequest)
+	in := new(UpdateBookingRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(SolidarityServiceServer).UpdateBookingSilvermobi(ctx, in)
+		return srv.(SolidarityServiceServer).UpdateBooking(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: SolidarityService_UpdateBookingSilvermobi_FullMethodName,
+		FullMethod: SolidarityService_UpdateBooking_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(SolidarityServiceServer).UpdateBookingSilvermobi(ctx, req.(*UpdateBookingSilvermobiRequest))
+		return srv.(SolidarityServiceServer).UpdateBooking(ctx, req.(*UpdateBookingRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
-func _SolidarityService_GetBookingSilvermobi_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+func _SolidarityService_GetBooking_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetBookingSilvermobiRequest)
+	in := new(GetBookingRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(SolidarityServiceServer).GetBookingSilvermobi(ctx, in)
+		return srv.(SolidarityServiceServer).GetBooking(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: SolidarityService_GetBookingSilvermobi_FullMethodName,
+		FullMethod: SolidarityService_GetBooking_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(SolidarityServiceServer).GetBookingSilvermobi(ctx, req.(*GetBookingSilvermobiRequest))
+		return srv.(SolidarityServiceServer).GetBooking(ctx, req.(*GetBookingRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@ -358,16 +339,16 @@ var SolidarityService_ServiceDesc = grpc.ServiceDesc{
 			Handler:    _SolidarityService_SetDriverPunctualAvailabilities_Handler,
 		},
 		{
-			MethodName: "CreateBookingSilvermobi",
+			MethodName: "CreateBooking",
-			Handler:    _SolidarityService_CreateBookingSilvermobi_Handler,
+			Handler:    _SolidarityService_CreateBooking_Handler,
 		},
 		{
-			MethodName: "UpdateBookingSilvermobi",
+			MethodName: "UpdateBooking",
-			Handler:    _SolidarityService_UpdateBookingSilvermobi_Handler,
+			Handler:    _SolidarityService_UpdateBooking_Handler,
 		},
 		{
-			MethodName: "GetBookingSilvermobi",
+			MethodName: "GetBooking",
-			Handler:    _SolidarityService_GetBookingSilvermobi_Handler,
+			Handler:    _SolidarityService_GetBooking_Handler,
 		},
 		{
 			MethodName: "GetBookingsByStatus",
--- a/servers/grpcapi/server/onboarding_validation.go
+++ b/servers/grpcapi/server/onboarding_validation.go
@ -132,7 +132,7 @@ func (s SilvermobiGRPCService) GetAccountType(ctx context.Context, req *grpcprot
 	log.Info().
 		Str("User ID", id).
 		Msg("GetAccountType")
-	if req.Request == false || !req.Request {
+	if req.Request != true || !req.Request {
 		return nil, status.Errorf(codes.InvalidArgument, "request arg should be true")
 	}
 	account_type, err := s.Handler.GetAccountType(ctx, id)
--- a/servers/grpcapi/server/solidarity-service.go
+++ b/servers/grpcapi/server/solidarity-service.go
@ -23,11 +23,11 @@ func (s *SolidarityService) SetDriverPunctualAvailabilities(ctx context.Context,
 	return resp, err
 }
-func (s *SolidarityService) CreateBooking(ctx context.Context, req *proto.CreateBookingSilvermobiRequest) (resp *proto.CreateBookingSilvermobiResponse, err error) {
+func (s *SolidarityService) CreateBooking(ctx context.Context, req *proto.CreateBookingRequest) (resp *proto.CreateBookingResponse, err error) {
 	log.Info().
 		Str("Booking ID", req.Booking.Id).
 		Msg("CreateBooking")
-	resp, err = s.SolidarityClient.CreateBookingSilvermobi(ctx, req)
+	resp, err = s.SolidarityClient.CreateBooking(ctx, req)
 	if err == nil {
 		_ = s.Handler.SendNotification(req.Booking.DriverId, "Silvermobi", "Vous avez reçu une demande de trajet. \n Pour plus de détails, veuillez consulter l'interface \"Mes Trajets\" dans l'application SilverMobi.")
 		err = s.Handler.SendEmail(req.Booking.DriverId, "Silvermobi", "Vous avez reçu une demande de trajet. \n Pour plus de détails, veuillez consulter l'interface \"Mes Trajets\" dans l'application SilverMobi.")
@ -36,19 +36,19 @@ func (s *SolidarityService) CreateBooking(ctx context.Context, req *proto.Create
 	return resp, err
 }
-func (s *SolidarityService) UpdateBooking(ctx context.Context, req *proto.UpdateBookingSilvermobiRequest) (resp *proto.UpdateBookingSilvermobiResponse, err error) {
+func (s *SolidarityService) UpdateBooking(ctx context.Context, req *proto.UpdateBookingRequest) (resp *proto.UpdateBookingResponse, err error) {
 	log.Info().
 		Str("Booking ID", req.BookingId).
 		Msg("UpdateBooking")
-	resp, err = s.SolidarityClient.UpdateBookingSilvermobi(ctx, req)
+	resp, err = s.SolidarityClient.UpdateBooking(ctx, req)
 	return resp, err
 }
-func (s *SolidarityService) GetBooking(ctx context.Context, req *proto.GetBookingSilvermobiRequest) (resp *proto.GetBookingSilvermobiResponse, err error) {
+func (s *SolidarityService) GetBooking(ctx context.Context, req *proto.GetBookingRequest) (resp *proto.GetBookingResponse, err error) {
 	log.Info().
 		Str("Booking ID", req.BookingId).
 		Msg("GetBooking")
-	resp, err = s.SolidarityClient.GetBookingSilvermobi(ctx, req)
+	resp, err = s.SolidarityClient.GetBooking(ctx, req)
 	return resp, err
 }
Author	SHA1	Message	Date
Maxime	e65885676e	fix	2024-12-16 10:37:14 +01:00
Maxime	b8e78dd687	change namespace of beneficiaries created	2024-12-04 17:47:34 +01:00
Maxime	4c3aa9c3d3	fix	2024-10-04 18:58:00 +02:00
Maxime	88739650bc	fix err	2024-09-26 13:13:48 +02:00