diff --git a/config.yaml b/config.yaml index 81ecdb5..f0a17dc 100644 --- a/config.yaml +++ b/config.yaml @@ -20,12 +20,12 @@ storage: services: grpc: - ip: 192.168.238.1 #10.73.190.5 + ip: 10.73.189.75 #10.73.190.5 enable: true port: 8089 solidarity-api: enable: true - address: 192.168.238.1:9999 #10.73.190.5:9999 + address: 10.73.189.75:9999 #10.73.190.5:9999 routing: type: valhalla diff --git a/go.mod b/go.mod index 94f0d11..95d457b 100644 --- a/go.mod +++ b/go.mod @@ -5,32 +5,21 @@ go 1.21 toolchain go1.23.2 require ( - git.coopgo.io/coopgo-platform/geocode v0.0.0-20240919052438-16ad0c51895a - git.coopgo.io/coopgo-platform/mobility-accounts v0.0.0-20230430115320-f5bb2e7c2c26 git.coopgo.io/coopgo-platform/routing-service v0.0.0-20230403183358-4d30329f06be - github.com/appleboy/gorush v1.18.8 - github.com/golang-jwt/jwt/v4 v4.5.0 github.com/golang/protobuf v1.5.4 github.com/google/uuid v1.6.0 github.com/gorilla/mux v1.8.1 github.com/lib/pq v1.10.9 github.com/paulmach/orb v0.11.1 - github.com/pkg/errors v0.9.1 github.com/rs/zerolog v1.32.0 github.com/spf13/viper v1.18.2 go.mongodb.org/mongo-driver v1.15.0 - google.golang.org/genproto v0.0.0-20240604185151-ef581f913117 google.golang.org/grpc v1.66.2 google.golang.org/protobuf v1.34.2 - gopkg.in/mail.v2 v2.3.1 ) require ( - cloud.google.com/go/maps v1.11.0 // indirect - github.com/coreos/go-semver v0.3.0 // indirect - github.com/coreos/go-systemd/v22 v22.5.0 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect - github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -43,7 +32,6 @@ require ( github.com/pelletier/go-toml/v2 v2.2.2 // indirect github.com/sagikazarmark/locafero v0.4.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect - github.com/santhosh-tekuri/jsonschema/v5 v5.0.0 // indirect github.com/sourcegraph/conc v0.3.0 // indirect github.com/spf13/afero v1.11.0 // indirect github.com/spf13/cast v1.6.0 // indirect @@ -54,21 +42,14 @@ require ( github.com/xdg-go/scram v1.1.2 // indirect github.com/xdg-go/stringprep v1.0.4 // indirect github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect - go.etcd.io/etcd/api/v3 v3.5.10 // indirect - go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect - go.etcd.io/etcd/client/v3 v3.5.10 // indirect - go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect - go.uber.org/zap v1.21.0 // indirect golang.org/x/crypto v0.24.0 // indirect golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect golang.org/x/net v0.26.0 // indirect golang.org/x/sync v0.7.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 // indirect - gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index d666099..baa602d 100644 --- a/go.sum +++ b/go.sum @@ -1,18 +1,5 @@ -cloud.google.com/go/maps v1.11.0 h1:+//LeUr5ARVau1wVsxLkLnFtYviq9YFS+fB/mhfAOGQ= -cloud.google.com/go/maps v1.11.0/go.mod h1:XcSsd8lg4ZhLPCtJ2YHcu/xLVePBzZOlI7GmR2cRCws= -git.coopgo.io/coopgo-platform/geocode v0.0.0-20240919052438-16ad0c51895a h1:fdh8EewE46YyU+/BophnWgP33GYfSg2cBt3kYrumFV4= -git.coopgo.io/coopgo-platform/geocode v0.0.0-20240919052438-16ad0c51895a/go.mod h1:v1ZKauCJ989bUkLHmsGdaxEa0S/L2OajERePcRqwMM8= -git.coopgo.io/coopgo-platform/mobility-accounts v0.0.0-20230430115320-f5bb2e7c2c26 h1:qiYVLLNU29xgT0RRj0Jz0WrjEJnz1Eng1X7l1UW9jGU= -git.coopgo.io/coopgo-platform/mobility-accounts v0.0.0-20230430115320-f5bb2e7c2c26/go.mod h1:1typNYtO+PQT6KG77vs/PUv0fO60/nbeSGZL2tt1LLg= git.coopgo.io/coopgo-platform/routing-service v0.0.0-20230403183358-4d30329f06be h1:VIzWX8NftKzQX1clunLaMf79Ut1dygcCc/ZLV/iWOaY= git.coopgo.io/coopgo-platform/routing-service v0.0.0-20230403183358-4d30329f06be/go.mod h1:Nh7o15LlV0OuO9zxvJIs9FlelpeAaLYkXtFdgIkFrgg= -github.com/appleboy/gorush v1.18.8 h1:pwPjLPEeSc6OrlYrqFOAr6ombH7tKKhJdaaQa2Ul4sA= -github.com/appleboy/gorush v1.18.8/go.mod h1:qoLmAkmDIuMd2c1qPYMo1/eEqQ5CfVaCscRYd0Y+flU= -github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= -github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= -github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM= -github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -24,10 +11,7 @@ github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7z github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg= -github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= @@ -77,8 +61,6 @@ github.com/paulmach/orb v0.11.1/go.mod h1:5mULz1xQfs3bmQm63QEJA6lNGujuRafwA5S/En github.com/paulmach/protoscan v0.2.1/go.mod h1:SpcSwydNLrxUGSDvXvO0P7g7AuhJ7lcKfDlhJCDw2gY= github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= @@ -92,8 +74,6 @@ github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6ke github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4= github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= -github.com/santhosh-tekuri/jsonschema/v5 v5.0.0 h1:TToq11gyfNlrMFZiYujSekIsPd9AmsA2Bj/iv+s4JHE= -github.com/santhosh-tekuri/jsonschema/v5 v5.0.0/go.mod h1:FKdcjfQW6rpZSnxxUvEA5H/cDPdvJ/SZJQLWWXWGrZ0= github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= @@ -134,27 +114,12 @@ github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.etcd.io/etcd/api/v3 v3.5.10 h1:szRajuUUbLyppkhs9K6BRtjY37l66XQQmw7oZRANE4k= -go.etcd.io/etcd/api/v3 v3.5.10/go.mod h1:TidfmT4Uycad3NM/o25fG3J07odo4GBB9hoxaodFCtI= -go.etcd.io/etcd/client/pkg/v3 v3.5.10 h1:kfYIdQftBnbAq8pUWFXfpuuxFSKzlmM5cSn76JByiT0= -go.etcd.io/etcd/client/pkg/v3 v3.5.10/go.mod h1:DYivfIviIuQ8+/lCq4vcxuseg2P2XbHygkKwFo9fc8U= -go.etcd.io/etcd/client/v3 v3.5.10 h1:W9TXNZ+oB3MCd/8UjxHTWK5J9Nquw9fQBLJd5ne5/Ao= -go.etcd.io/etcd/client/v3 v3.5.10/go.mod h1:RVeBnDz2PUEZqTpgqwAtUd8nAPf5kjyFyND7P1VkOKc= go.mongodb.org/mongo-driver v1.11.4/go.mod h1:PTSz5yu21bkT/wXpkS7WR5f0ddqw5quethTUn9WM+2g= go.mongodb.org/mongo-driver v1.15.0 h1:rJCKC8eEliewXjZGf0ddURtl7tTVy1TK3bfl0gkUSLc= go.mongodb.org/mongo-driver v1.15.0/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c= -go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= -go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= -go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= -go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= -go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= -go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8= -go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= @@ -164,18 +129,14 @@ golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f h1:99ci1mjWVBWwJiEKYY6jWa4d2nTQVIEhZIptnrVb1XY= golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= 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.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= @@ -191,9 +152,7 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -212,20 +171,14 @@ golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto v0.0.0-20240604185151-ef581f913117 h1:HCZ6DlkKtCDAtD8ForECsY3tKuaR+p4R3grlK80uCCc= -google.golang.org/genproto v0.0.0-20240604185151-ef581f913117/go.mod h1:lesfX/+9iA+3OdqeCpoDddJaNxVB1AB6tD7EfqMmprc= -google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 h1:+rdxYoE3E5htTEWIe15GlN6IfvbURM//Jt0mmkmm6ZU= -google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117/go.mod h1:OimBR/bc1wPO9iV4NC2bpyjy3VnAwZh5EBPQdtaE5oo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 h1:1GBuWVLM/KMVUv1t1En5Gs+gFZCNd360GGb4sSxtrhU= google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= google.golang.org/grpc v1.66.2 h1:3QdXkuq3Bkh7w+ywLdLvM56cmGvQHUMZpiCzt6Rqaoo= @@ -234,19 +187,12 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= 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= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/mail.v2 v2.3.1 h1:WYFn/oANrAGP2C0dcV6/pbkPzv8yGzqTjPmTeO7qoXk= -gopkg.in/mail.v2 v2.3.1/go.mod h1:htwXN1Qh09vZJ1NVKxQqHPBaCBbzKhp5GzuJEA4VJWw= -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= diff --git a/handler/services.go b/handler/services.go index 68b70b9..d503a94 100644 --- a/handler/services.go +++ b/handler/services.go @@ -31,6 +31,14 @@ func (s *SolidarityServiceHandler) GetDriver(ctx context.Context, id string) (dr return driver, nil } +func (s *SolidarityServiceHandler) GetAllDrivers(ctx context.Context) (drivers []internal.Driver, err error) { + drivers, err = s.Storage.GetAllDrivers() + if err != nil { + return []internal.Driver{}, err + } + return drivers, nil +} + func (s *SolidarityServiceHandler) SetDriverAvailabilities(ctx context.Context, driver internal.Driver) (err error) { driver.Driver.Operator = "internal-grpc" err = s.Storage.CreateDriver(driver) @@ -46,21 +54,21 @@ func (s *SolidarityServiceHandler) SetPassengerTrip(ctx context.Context, passeng return nil } -func (s *SolidarityServiceHandler) CreateBooking(ctx context.Context, bookingRequest internal.BookingRequest) ( driver internal.Driver, err error) { //passenger internal.Passenger, +func (s *SolidarityServiceHandler) CreateBooking(ctx context.Context, bookingRequest internal.BookingRequest) ( passenger internal.Passenger, driver internal.Driver, err error) { bookingRequest.Operator = "internal-grpc" err = s.Storage.CreateBooking(bookingRequest) if err != nil { - return internal.Driver{}, err //internal.Passenger{}, + return internal.Passenger{}, internal.Driver{}, err + } + passenger, err = s.Storage.GetPassenger(bookingRequest.Passenger_id) + if err != nil { + return internal.Passenger{}, internal.Driver{}, err } - // passenger, err = s.Storage.GetPassenger(bookingRequest.Passenger_id) - // if err != nil { - // return internal.Passenger{}, internal.Driver{}, err - // } driver, err = s.Storage.GetDriver(bookingRequest.Driver_id) if err != nil { - return internal.Driver{}, err //internal.Passenger{}, + return internal.Passenger{}, internal.Driver{}, err } - return driver, nil //passenger, + return passenger, driver, nil } func (s *SolidarityServiceHandler) UpdateBooking(ctx context.Context, bookingId string, status internal.BookingStatus) (err error) { diff --git a/internal/models.go b/internal/models.go index d829aa1..2a29c71 100644 --- a/internal/models.go +++ b/internal/models.go @@ -98,3 +98,5 @@ type PunctualAvailabilities struct { StartTime string `json:"startTime"` EndTime string `json:"endTime"` } + + diff --git a/servers/grpc/proto/solidarity-api-types.pb.go b/servers/grpc/proto/solidarity-api-types.pb.go index 821f453..99c3488 100644 --- a/servers/grpc/proto/solidarity-api-types.pb.go +++ b/servers/grpc/proto/solidarity-api-types.pb.go @@ -421,6 +421,44 @@ func (*DriverJourney_RepeatedPunctualAvailabilities) isDriverJourney_Availabilit func (*DriverJourney_RepeatedRegularAvailabilities) isDriverJourney_Availabilities() {} +type GetAllDrivers struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *GetAllDrivers) Reset() { + *x = GetAllDrivers{} + if protoimpl.UnsafeEnabled { + mi := &file_solidarity_api_types_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *GetAllDrivers) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*GetAllDrivers) ProtoMessage() {} + +func (x *GetAllDrivers) ProtoReflect() protoreflect.Message { + mi := &file_solidarity_api_types_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use GetAllDrivers.ProtoReflect.Descriptor instead. +func (*GetAllDrivers) Descriptor() ([]byte, []int) { + return file_solidarity_api_types_proto_rawDescGZIP(), []int{2} +} + type RepeatedPunctualAvailabilitySlot struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -432,7 +470,7 @@ type RepeatedPunctualAvailabilitySlot struct { func (x *RepeatedPunctualAvailabilitySlot) Reset() { *x = RepeatedPunctualAvailabilitySlot{} if protoimpl.UnsafeEnabled { - mi := &file_solidarity_api_types_proto_msgTypes[2] + mi := &file_solidarity_api_types_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -445,7 +483,7 @@ func (x *RepeatedPunctualAvailabilitySlot) String() string { func (*RepeatedPunctualAvailabilitySlot) ProtoMessage() {} func (x *RepeatedPunctualAvailabilitySlot) ProtoReflect() protoreflect.Message { - mi := &file_solidarity_api_types_proto_msgTypes[2] + mi := &file_solidarity_api_types_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -458,7 +496,7 @@ func (x *RepeatedPunctualAvailabilitySlot) ProtoReflect() protoreflect.Message { // Deprecated: Use RepeatedPunctualAvailabilitySlot.ProtoReflect.Descriptor instead. func (*RepeatedPunctualAvailabilitySlot) Descriptor() ([]byte, []int) { - return file_solidarity_api_types_proto_rawDescGZIP(), []int{2} + return file_solidarity_api_types_proto_rawDescGZIP(), []int{3} } func (x *RepeatedPunctualAvailabilitySlot) GetPunctualAvailabilities() []*PunctualAvailabilitySlot { @@ -479,7 +517,7 @@ type RepeatedRegularAvailabilitySlot struct { func (x *RepeatedRegularAvailabilitySlot) Reset() { *x = RepeatedRegularAvailabilitySlot{} if protoimpl.UnsafeEnabled { - mi := &file_solidarity_api_types_proto_msgTypes[3] + mi := &file_solidarity_api_types_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -492,7 +530,7 @@ func (x *RepeatedRegularAvailabilitySlot) String() string { func (*RepeatedRegularAvailabilitySlot) ProtoMessage() {} func (x *RepeatedRegularAvailabilitySlot) ProtoReflect() protoreflect.Message { - mi := &file_solidarity_api_types_proto_msgTypes[3] + mi := &file_solidarity_api_types_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -505,7 +543,7 @@ func (x *RepeatedRegularAvailabilitySlot) ProtoReflect() protoreflect.Message { // Deprecated: Use RepeatedRegularAvailabilitySlot.ProtoReflect.Descriptor instead. func (*RepeatedRegularAvailabilitySlot) Descriptor() ([]byte, []int) { - return file_solidarity_api_types_proto_rawDescGZIP(), []int{3} + return file_solidarity_api_types_proto_rawDescGZIP(), []int{4} } func (x *RepeatedRegularAvailabilitySlot) GetRegularAvailabilities() []*RegularAvailabilitySlot { @@ -530,7 +568,7 @@ type DriverRequest struct { func (x *DriverRequest) Reset() { *x = DriverRequest{} if protoimpl.UnsafeEnabled { - mi := &file_solidarity_api_types_proto_msgTypes[4] + mi := &file_solidarity_api_types_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -543,7 +581,7 @@ func (x *DriverRequest) String() string { func (*DriverRequest) ProtoMessage() {} func (x *DriverRequest) ProtoReflect() protoreflect.Message { - mi := &file_solidarity_api_types_proto_msgTypes[4] + mi := &file_solidarity_api_types_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -556,7 +594,7 @@ func (x *DriverRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use DriverRequest.ProtoReflect.Descriptor instead. func (*DriverRequest) Descriptor() ([]byte, []int) { - return file_solidarity_api_types_proto_rawDescGZIP(), []int{4} + return file_solidarity_api_types_proto_rawDescGZIP(), []int{5} } func (x *DriverRequest) GetDriverAddress() *Feature { @@ -607,7 +645,7 @@ type PunctualAvailabilitySlot struct { func (x *PunctualAvailabilitySlot) Reset() { *x = PunctualAvailabilitySlot{} if protoimpl.UnsafeEnabled { - mi := &file_solidarity_api_types_proto_msgTypes[5] + mi := &file_solidarity_api_types_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -620,7 +658,7 @@ func (x *PunctualAvailabilitySlot) String() string { func (*PunctualAvailabilitySlot) ProtoMessage() {} func (x *PunctualAvailabilitySlot) ProtoReflect() protoreflect.Message { - mi := &file_solidarity_api_types_proto_msgTypes[5] + mi := &file_solidarity_api_types_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -633,7 +671,7 @@ func (x *PunctualAvailabilitySlot) ProtoReflect() protoreflect.Message { // Deprecated: Use PunctualAvailabilitySlot.ProtoReflect.Descriptor instead. func (*PunctualAvailabilitySlot) Descriptor() ([]byte, []int) { - return file_solidarity_api_types_proto_rawDescGZIP(), []int{5} + return file_solidarity_api_types_proto_rawDescGZIP(), []int{6} } func (x *PunctualAvailabilitySlot) GetDate() *timestamp.Timestamp { @@ -670,7 +708,7 @@ type RegularAvailabilitySlot struct { func (x *RegularAvailabilitySlot) Reset() { *x = RegularAvailabilitySlot{} if protoimpl.UnsafeEnabled { - mi := &file_solidarity_api_types_proto_msgTypes[6] + mi := &file_solidarity_api_types_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -683,7 +721,7 @@ func (x *RegularAvailabilitySlot) String() string { func (*RegularAvailabilitySlot) ProtoMessage() {} func (x *RegularAvailabilitySlot) ProtoReflect() protoreflect.Message { - mi := &file_solidarity_api_types_proto_msgTypes[6] + mi := &file_solidarity_api_types_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -696,7 +734,7 @@ func (x *RegularAvailabilitySlot) ProtoReflect() protoreflect.Message { // Deprecated: Use RegularAvailabilitySlot.ProtoReflect.Descriptor instead. func (*RegularAvailabilitySlot) Descriptor() ([]byte, []int) { - return file_solidarity_api_types_proto_rawDescGZIP(), []int{6} + return file_solidarity_api_types_proto_rawDescGZIP(), []int{7} } func (x *RegularAvailabilitySlot) GetDayOfWeek() DayOfWeek { @@ -737,7 +775,7 @@ type BookingSolidarityRequest struct { func (x *BookingSolidarityRequest) Reset() { *x = BookingSolidarityRequest{} if protoimpl.UnsafeEnabled { - mi := &file_solidarity_api_types_proto_msgTypes[7] + mi := &file_solidarity_api_types_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -750,7 +788,7 @@ func (x *BookingSolidarityRequest) String() string { func (*BookingSolidarityRequest) ProtoMessage() {} func (x *BookingSolidarityRequest) ProtoReflect() protoreflect.Message { - mi := &file_solidarity_api_types_proto_msgTypes[7] + mi := &file_solidarity_api_types_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -763,7 +801,7 @@ func (x *BookingSolidarityRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use BookingSolidarityRequest.ProtoReflect.Descriptor instead. func (*BookingSolidarityRequest) Descriptor() ([]byte, []int) { - return file_solidarity_api_types_proto_rawDescGZIP(), []int{7} + return file_solidarity_api_types_proto_rawDescGZIP(), []int{8} } func (x *BookingSolidarityRequest) GetId() string { @@ -837,7 +875,7 @@ type BookingSolidarity struct { func (x *BookingSolidarity) Reset() { *x = BookingSolidarity{} if protoimpl.UnsafeEnabled { - mi := &file_solidarity_api_types_proto_msgTypes[8] + mi := &file_solidarity_api_types_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -850,7 +888,7 @@ func (x *BookingSolidarity) String() string { func (*BookingSolidarity) ProtoMessage() {} func (x *BookingSolidarity) ProtoReflect() protoreflect.Message { - mi := &file_solidarity_api_types_proto_msgTypes[8] + mi := &file_solidarity_api_types_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -863,7 +901,7 @@ func (x *BookingSolidarity) ProtoReflect() protoreflect.Message { // Deprecated: Use BookingSolidarity.ProtoReflect.Descriptor instead. func (*BookingSolidarity) Descriptor() ([]byte, []int) { - return file_solidarity_api_types_proto_rawDescGZIP(), []int{8} + return file_solidarity_api_types_proto_rawDescGZIP(), []int{9} } func (x *BookingSolidarity) GetId() string { @@ -959,7 +997,7 @@ type GetAllPassengers struct { func (x *GetAllPassengers) Reset() { *x = GetAllPassengers{} if protoimpl.UnsafeEnabled { - mi := &file_solidarity_api_types_proto_msgTypes[9] + mi := &file_solidarity_api_types_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -972,7 +1010,7 @@ func (x *GetAllPassengers) String() string { func (*GetAllPassengers) ProtoMessage() {} func (x *GetAllPassengers) ProtoReflect() protoreflect.Message { - mi := &file_solidarity_api_types_proto_msgTypes[9] + mi := &file_solidarity_api_types_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -985,7 +1023,7 @@ func (x *GetAllPassengers) ProtoReflect() protoreflect.Message { // Deprecated: Use GetAllPassengers.ProtoReflect.Descriptor instead. func (*GetAllPassengers) Descriptor() ([]byte, []int) { - return file_solidarity_api_types_proto_rawDescGZIP(), []int{9} + return file_solidarity_api_types_proto_rawDescGZIP(), []int{10} } type GetPassenger struct { @@ -997,7 +1035,7 @@ type GetPassenger struct { func (x *GetPassenger) Reset() { *x = GetPassenger{} if protoimpl.UnsafeEnabled { - mi := &file_solidarity_api_types_proto_msgTypes[10] + mi := &file_solidarity_api_types_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1010,7 +1048,7 @@ func (x *GetPassenger) String() string { func (*GetPassenger) ProtoMessage() {} func (x *GetPassenger) ProtoReflect() protoreflect.Message { - mi := &file_solidarity_api_types_proto_msgTypes[10] + mi := &file_solidarity_api_types_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1023,7 +1061,7 @@ func (x *GetPassenger) ProtoReflect() protoreflect.Message { // Deprecated: Use GetPassenger.ProtoReflect.Descriptor instead. func (*GetPassenger) Descriptor() ([]byte, []int) { - return file_solidarity_api_types_proto_rawDescGZIP(), []int{10} + return file_solidarity_api_types_proto_rawDescGZIP(), []int{11} } type Car struct { @@ -1038,7 +1076,7 @@ type Car struct { func (x *Car) Reset() { *x = Car{} if protoimpl.UnsafeEnabled { - mi := &file_solidarity_api_types_proto_msgTypes[11] + mi := &file_solidarity_api_types_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1051,7 +1089,7 @@ func (x *Car) String() string { func (*Car) ProtoMessage() {} func (x *Car) ProtoReflect() protoreflect.Message { - mi := &file_solidarity_api_types_proto_msgTypes[11] + mi := &file_solidarity_api_types_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1064,7 +1102,7 @@ func (x *Car) ProtoReflect() protoreflect.Message { // Deprecated: Use Car.ProtoReflect.Descriptor instead. func (*Car) Descriptor() ([]byte, []int) { - return file_solidarity_api_types_proto_rawDescGZIP(), []int{11} + return file_solidarity_api_types_proto_rawDescGZIP(), []int{12} } func (x *Car) GetModel() string { @@ -1096,7 +1134,7 @@ type Preferences struct { func (x *Preferences) Reset() { *x = Preferences{} if protoimpl.UnsafeEnabled { - mi := &file_solidarity_api_types_proto_msgTypes[12] + mi := &file_solidarity_api_types_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1109,7 +1147,7 @@ func (x *Preferences) String() string { func (*Preferences) ProtoMessage() {} func (x *Preferences) ProtoReflect() protoreflect.Message { - mi := &file_solidarity_api_types_proto_msgTypes[12] + mi := &file_solidarity_api_types_proto_msgTypes[13] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1122,7 +1160,7 @@ func (x *Preferences) ProtoReflect() protoreflect.Message { // Deprecated: Use Preferences.ProtoReflect.Descriptor instead. func (*Preferences) Descriptor() ([]byte, []int) { - return file_solidarity_api_types_proto_rawDescGZIP(), []int{12} + return file_solidarity_api_types_proto_rawDescGZIP(), []int{13} } func (x *Preferences) GetSmoking() bool { @@ -1173,7 +1211,7 @@ type Price struct { func (x *Price) Reset() { *x = Price{} if protoimpl.UnsafeEnabled { - mi := &file_solidarity_api_types_proto_msgTypes[13] + mi := &file_solidarity_api_types_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1186,7 +1224,7 @@ func (x *Price) String() string { func (*Price) ProtoMessage() {} func (x *Price) ProtoReflect() protoreflect.Message { - mi := &file_solidarity_api_types_proto_msgTypes[13] + mi := &file_solidarity_api_types_proto_msgTypes[14] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1199,7 +1237,7 @@ func (x *Price) ProtoReflect() protoreflect.Message { // Deprecated: Use Price.ProtoReflect.Descriptor instead. func (*Price) Descriptor() ([]byte, []int) { - return file_solidarity_api_types_proto_rawDescGZIP(), []int{13} + return file_solidarity_api_types_proto_rawDescGZIP(), []int{14} } func (x *Price) GetType() PriceType { @@ -1241,7 +1279,7 @@ type User struct { func (x *User) Reset() { *x = User{} if protoimpl.UnsafeEnabled { - mi := &file_solidarity_api_types_proto_msgTypes[14] + mi := &file_solidarity_api_types_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1254,7 +1292,7 @@ func (x *User) String() string { func (*User) ProtoMessage() {} func (x *User) ProtoReflect() protoreflect.Message { - mi := &file_solidarity_api_types_proto_msgTypes[14] + mi := &file_solidarity_api_types_proto_msgTypes[15] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1267,7 +1305,7 @@ func (x *User) ProtoReflect() protoreflect.Message { // Deprecated: Use User.ProtoReflect.Descriptor instead. func (*User) Descriptor() ([]byte, []int) { - return file_solidarity_api_types_proto_rawDescGZIP(), []int{14} + return file_solidarity_api_types_proto_rawDescGZIP(), []int{15} } func (x *User) GetId() string { @@ -1367,167 +1405,168 @@ var file_solidarity_api_types_proto_rawDesc = []byte{ 0x00, 0x52, 0x1d, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x52, 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x42, 0x10, 0x0a, 0x0e, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, - 0x65, 0x73, 0x22, 0x76, 0x0a, 0x20, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x50, 0x75, - 0x6e, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, - 0x74, 0x79, 0x53, 0x6c, 0x6f, 0x74, 0x12, 0x52, 0x0a, 0x17, 0x70, 0x75, 0x6e, 0x63, 0x74, 0x75, - 0x61, 0x6c, 0x5f, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, - 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x50, 0x75, 0x6e, 0x63, 0x74, 0x75, - 0x61, 0x6c, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x53, 0x6c, - 0x6f, 0x74, 0x52, 0x16, 0x70, 0x75, 0x6e, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x41, 0x76, 0x61, 0x69, - 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x22, 0x72, 0x0a, 0x1f, 0x52, 0x65, - 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x52, 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x41, 0x76, 0x61, - 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x53, 0x6c, 0x6f, 0x74, 0x12, 0x4f, 0x0a, - 0x16, 0x72, 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x5f, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, - 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, - 0x52, 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, - 0x69, 0x74, 0x79, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x15, 0x72, 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72, - 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x22, 0xcc, - 0x01, 0x0a, 0x0d, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x12, 0x2f, 0x0a, 0x0e, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, - 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x46, 0x65, 0x61, 0x74, 0x75, - 0x72, 0x65, 0x52, 0x0d, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, - 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x5f, 0x72, 0x61, 0x64, 0x69, - 0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, - 0x52, 0x61, 0x64, 0x69, 0x75, 0x73, 0x12, 0x1d, 0x0a, 0x06, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x05, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x52, 0x06, 0x64, - 0x72, 0x69, 0x76, 0x65, 0x72, 0x12, 0x2e, 0x0a, 0x0b, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, - 0x6e, 0x63, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x50, 0x72, 0x65, - 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x52, 0x0b, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, - 0x65, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x16, 0x0a, 0x03, 0x63, 0x61, 0x72, 0x18, 0x05, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x04, 0x2e, 0x43, 0x61, 0x72, 0x52, 0x03, 0x63, 0x61, 0x72, 0x22, 0x82, 0x01, - 0x0a, 0x18, 0x50, 0x75, 0x6e, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, - 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x53, 0x6c, 0x6f, 0x74, 0x12, 0x2e, 0x0a, 0x04, 0x64, 0x61, - 0x74, 0x65, 0x18, 0x01, 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, 0x04, 0x64, 0x61, 0x74, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x74, - 0x61, 0x72, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, - 0x74, 0x61, 0x72, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x6e, 0x64, 0x54, - 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x65, 0x6e, 0x64, 0x54, 0x69, - 0x6d, 0x65, 0x22, 0x7b, 0x0a, 0x17, 0x52, 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x41, 0x76, 0x61, - 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x53, 0x6c, 0x6f, 0x74, 0x12, 0x28, 0x0a, - 0x09, 0x64, 0x61, 0x79, 0x4f, 0x66, 0x57, 0x65, 0x65, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, - 0x32, 0x0a, 0x2e, 0x44, 0x61, 0x79, 0x4f, 0x66, 0x57, 0x65, 0x65, 0x6b, 0x52, 0x09, 0x64, 0x61, - 0x79, 0x4f, 0x66, 0x57, 0x65, 0x65, 0x6b, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x74, 0x61, 0x72, 0x74, - 0x54, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x74, 0x61, 0x72, - 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x6e, 0x64, 0x54, 0x69, 0x6d, 0x65, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x65, 0x6e, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x22, - 0xc9, 0x02, 0x0a, 0x18, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x6f, 0x6c, 0x69, 0x64, - 0x61, 0x72, 0x69, 0x74, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, - 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b, - 0x70, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0b, 0x70, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, - 0x0a, 0x08, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x08, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x49, 0x64, 0x12, 0x30, 0x0a, 0x06, 0x73, 0x74, - 0x61, 0x74, 0x75, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x18, 0x2e, 0x42, 0x6f, 0x6f, - 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x53, 0x74, - 0x61, 0x74, 0x75, 0x73, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x35, 0x0a, 0x11, - 0x64, 0x65, 0x70, 0x61, 0x72, 0x74, 0x75, 0x72, 0x65, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, - 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, - 0x65, 0x52, 0x10, 0x64, 0x65, 0x70, 0x61, 0x72, 0x74, 0x75, 0x72, 0x65, 0x41, 0x64, 0x64, 0x72, - 0x65, 0x73, 0x73, 0x12, 0x39, 0x0a, 0x13, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x08, 0x2e, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x52, 0x12, 0x64, 0x65, 0x73, 0x74, - 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x3b, - 0x0a, 0x0b, 0x70, 0x69, 0x63, 0x6b, 0x75, 0x70, 0x5f, 0x64, 0x61, 0x74, 0x65, 0x18, 0x07, 0x20, + 0x65, 0x73, 0x22, 0x0f, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x44, 0x72, 0x69, 0x76, + 0x65, 0x72, 0x73, 0x22, 0x76, 0x0a, 0x20, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x50, + 0x75, 0x6e, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, + 0x69, 0x74, 0x79, 0x53, 0x6c, 0x6f, 0x74, 0x12, 0x52, 0x0a, 0x17, 0x70, 0x75, 0x6e, 0x63, 0x74, + 0x75, 0x61, 0x6c, 0x5f, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, + 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x50, 0x75, 0x6e, 0x63, 0x74, + 0x75, 0x61, 0x6c, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x53, + 0x6c, 0x6f, 0x74, 0x52, 0x16, 0x70, 0x75, 0x6e, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x41, 0x76, 0x61, + 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x22, 0x72, 0x0a, 0x1f, 0x52, + 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x52, 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x41, 0x76, + 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x53, 0x6c, 0x6f, 0x74, 0x12, 0x4f, + 0x0a, 0x16, 0x72, 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x5f, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, + 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, + 0x2e, 0x52, 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, + 0x6c, 0x69, 0x74, 0x79, 0x53, 0x6c, 0x6f, 0x74, 0x52, 0x15, 0x72, 0x65, 0x67, 0x75, 0x6c, 0x61, + 0x72, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x22, + 0xcc, 0x01, 0x0a, 0x0d, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x12, 0x2f, 0x0a, 0x0e, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x5f, 0x61, 0x64, 0x64, 0x72, + 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x46, 0x65, 0x61, 0x74, + 0x75, 0x72, 0x65, 0x52, 0x0d, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, + 0x73, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x5f, 0x72, 0x61, 0x64, + 0x69, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x64, 0x72, 0x69, 0x76, 0x65, + 0x72, 0x52, 0x61, 0x64, 0x69, 0x75, 0x73, 0x12, 0x1d, 0x0a, 0x06, 0x64, 0x72, 0x69, 0x76, 0x65, + 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x05, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x52, 0x06, + 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x12, 0x2e, 0x0a, 0x0b, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, + 0x65, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x50, 0x72, + 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x52, 0x0b, 0x70, 0x72, 0x65, 0x66, 0x65, + 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x16, 0x0a, 0x03, 0x63, 0x61, 0x72, 0x18, 0x05, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x04, 0x2e, 0x43, 0x61, 0x72, 0x52, 0x03, 0x63, 0x61, 0x72, 0x22, 0x82, + 0x01, 0x0a, 0x18, 0x50, 0x75, 0x6e, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x41, 0x76, 0x61, 0x69, 0x6c, + 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x53, 0x6c, 0x6f, 0x74, 0x12, 0x2e, 0x0a, 0x04, 0x64, + 0x61, 0x74, 0x65, 0x18, 0x01, 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, 0x04, 0x64, 0x61, 0x74, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x73, + 0x74, 0x61, 0x72, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, + 0x73, 0x74, 0x61, 0x72, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x6e, 0x64, + 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x65, 0x6e, 0x64, 0x54, + 0x69, 0x6d, 0x65, 0x22, 0x7b, 0x0a, 0x17, 0x52, 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x41, 0x76, + 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x53, 0x6c, 0x6f, 0x74, 0x12, 0x28, + 0x0a, 0x09, 0x64, 0x61, 0x79, 0x4f, 0x66, 0x57, 0x65, 0x65, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x0e, 0x32, 0x0a, 0x2e, 0x44, 0x61, 0x79, 0x4f, 0x66, 0x57, 0x65, 0x65, 0x6b, 0x52, 0x09, 0x64, + 0x61, 0x79, 0x4f, 0x66, 0x57, 0x65, 0x65, 0x6b, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x74, 0x61, 0x72, + 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x74, 0x61, + 0x72, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x6e, 0x64, 0x54, 0x69, 0x6d, + 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x65, 0x6e, 0x64, 0x54, 0x69, 0x6d, 0x65, + 0x22, 0xc9, 0x02, 0x0a, 0x18, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x6f, 0x6c, 0x69, + 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, + 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x20, 0x0a, + 0x0b, 0x70, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x0b, 0x70, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x49, 0x64, 0x12, + 0x1a, 0x0a, 0x08, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x08, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x49, 0x64, 0x12, 0x30, 0x0a, 0x06, 0x73, + 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x18, 0x2e, 0x42, 0x6f, + 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x53, + 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x35, 0x0a, + 0x11, 0x64, 0x65, 0x70, 0x61, 0x72, 0x74, 0x75, 0x72, 0x65, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, + 0x73, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x46, 0x65, 0x61, 0x74, 0x75, + 0x72, 0x65, 0x52, 0x10, 0x64, 0x65, 0x70, 0x61, 0x72, 0x74, 0x75, 0x72, 0x65, 0x41, 0x64, 0x64, + 0x72, 0x65, 0x73, 0x73, 0x12, 0x39, 0x0a, 0x13, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x08, 0x2e, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x52, 0x12, 0x64, 0x65, 0x73, + 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, + 0x3b, 0x0a, 0x0b, 0x70, 0x69, 0x63, 0x6b, 0x75, 0x70, 0x5f, 0x64, 0x61, 0x74, 0x65, 0x18, 0x07, + 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, 0x0a, 0x70, 0x69, 0x63, 0x6b, 0x75, 0x70, 0x44, 0x61, 0x74, 0x65, 0x22, 0xa2, 0x04, 0x0a, + 0x11, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, + 0x74, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, + 0x69, 0x64, 0x12, 0x1d, 0x0a, 0x06, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x05, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x52, 0x06, 0x64, 0x72, 0x69, 0x76, 0x65, + 0x72, 0x12, 0x23, 0x0a, 0x09, 0x70, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x05, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x52, 0x09, 0x70, 0x61, 0x73, + 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x12, 0x4c, 0x0a, 0x13, 0x70, 0x61, 0x73, 0x73, 0x65, 0x6e, + 0x67, 0x65, 0x72, 0x50, 0x69, 0x63, 0x6b, 0x75, 0x70, 0x44, 0x61, 0x74, 0x65, 0x18, 0x04, 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, - 0x0a, 0x70, 0x69, 0x63, 0x6b, 0x75, 0x70, 0x44, 0x61, 0x74, 0x65, 0x22, 0xa2, 0x04, 0x0a, 0x11, + 0x13, 0x70, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x50, 0x69, 0x63, 0x6b, 0x75, 0x70, + 0x44, 0x61, 0x74, 0x65, 0x12, 0x44, 0x0a, 0x19, 0x70, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, + 0x72, 0x5f, 0x64, 0x65, 0x70, 0x61, 0x72, 0x74, 0x75, 0x72, 0x65, 0x5f, 0x72, 0x6f, 0x75, 0x74, + 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, + 0x65, 0x52, 0x17, 0x70, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x44, 0x65, 0x70, 0x61, + 0x72, 0x74, 0x75, 0x72, 0x65, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x12, 0x48, 0x0a, 0x1b, 0x70, 0x61, + 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x5f, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x08, 0x2e, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x52, 0x19, 0x70, 0x61, 0x73, 0x73, 0x65, + 0x6e, 0x67, 0x65, 0x72, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, + 0x6f, 0x75, 0x74, 0x65, 0x12, 0x30, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x07, + 0x20, 0x01, 0x28, 0x0e, 0x32, 0x18, 0x2e, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x6f, + 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x06, + 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x09, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x64, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x1c, + 0x0a, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, + 0x50, 0x72, 0x69, 0x63, 0x65, 0x52, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x12, 0x16, 0x0a, 0x03, + 0x63, 0x61, 0x72, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x04, 0x2e, 0x43, 0x61, 0x72, 0x52, + 0x03, 0x63, 0x61, 0x72, 0x12, 0x3b, 0x0a, 0x0b, 0x70, 0x69, 0x63, 0x6b, 0x75, 0x70, 0x5f, 0x64, + 0x61, 0x74, 0x65, 0x18, 0x0c, 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, 0x0a, 0x70, 0x69, 0x63, 0x6b, 0x75, 0x70, 0x44, 0x61, 0x74, + 0x65, 0x22, 0x12, 0x0a, 0x10, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x50, 0x61, 0x73, 0x73, 0x65, + 0x6e, 0x67, 0x65, 0x72, 0x73, 0x22, 0x0e, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x50, 0x61, 0x73, 0x73, + 0x65, 0x6e, 0x67, 0x65, 0x72, 0x22, 0x31, 0x0a, 0x03, 0x43, 0x61, 0x72, 0x12, 0x14, 0x0a, 0x05, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x72, 0x61, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x05, 0x62, 0x72, 0x61, 0x6e, 0x64, 0x22, 0x97, 0x01, 0x0a, 0x0b, 0x50, 0x72, 0x65, + 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6d, 0x6f, 0x6b, + 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x73, 0x6d, 0x6f, 0x6b, 0x69, + 0x6e, 0x67, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x6e, 0x69, 0x6d, 0x61, 0x6c, 0x73, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x08, 0x52, 0x07, 0x61, 0x6e, 0x69, 0x6d, 0x61, 0x6c, 0x73, 0x12, 0x14, 0x0a, 0x05, + 0x6d, 0x75, 0x73, 0x69, 0x63, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x6d, 0x75, 0x73, + 0x69, 0x63, 0x12, 0x1b, 0x0a, 0x09, 0x69, 0x73, 0x5f, 0x74, 0x61, 0x6c, 0x6b, 0x65, 0x72, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x54, 0x61, 0x6c, 0x6b, 0x65, 0x72, 0x12, + 0x21, 0x0a, 0x0c, 0x6c, 0x75, 0x67, 0x67, 0x61, 0x67, 0x65, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, + 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x6c, 0x75, 0x67, 0x67, 0x61, 0x67, 0x65, 0x53, 0x69, + 0x7a, 0x65, 0x22, 0x5b, 0x0a, 0x05, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x1e, 0x0a, 0x04, 0x74, + 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x50, 0x72, 0x69, 0x63, + 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x61, + 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x52, 0x06, 0x61, 0x6d, 0x6f, + 0x75, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x63, 0x79, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x63, 0x79, 0x22, + 0xdd, 0x01, 0x0a, 0x04, 0x55, 0x73, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x6c, 0x69, 0x61, + 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x12, 0x1d, + 0x0a, 0x0a, 0x66, 0x69, 0x72, 0x73, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x09, 0x66, 0x69, 0x72, 0x73, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1b, 0x0a, + 0x09, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, + 0x61, 0x64, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x67, 0x72, 0x61, 0x64, 0x65, + 0x12, 0x18, 0x0a, 0x07, 0x70, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x07, 0x70, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x65, + 0x6e, 0x64, 0x65, 0x72, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x67, 0x65, 0x6e, 0x64, + 0x65, 0x72, 0x12, 0x2b, 0x0a, 0x11, 0x76, 0x65, 0x72, 0x69, 0x66, 0x69, 0x65, 0x64, 0x5f, 0x69, + 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10, 0x76, + 0x65, 0x72, 0x69, 0x66, 0x69, 0x65, 0x64, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2a, + 0x4a, 0x0a, 0x09, 0x44, 0x61, 0x79, 0x4f, 0x66, 0x57, 0x65, 0x65, 0x6b, 0x12, 0x07, 0x0a, 0x03, + 0x4d, 0x4f, 0x4e, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x54, 0x55, 0x45, 0x10, 0x01, 0x12, 0x07, + 0x0a, 0x03, 0x57, 0x45, 0x44, 0x10, 0x03, 0x12, 0x07, 0x0a, 0x03, 0x54, 0x48, 0x55, 0x10, 0x04, + 0x12, 0x07, 0x0a, 0x03, 0x46, 0x52, 0x49, 0x10, 0x05, 0x12, 0x07, 0x0a, 0x03, 0x53, 0x41, 0x54, + 0x10, 0x06, 0x12, 0x07, 0x0a, 0x03, 0x53, 0x55, 0x4e, 0x10, 0x07, 0x2a, 0x2e, 0x0a, 0x09, 0x50, + 0x72, 0x69, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x46, 0x52, 0x45, 0x45, + 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x50, 0x41, 0x59, 0x49, 0x4e, 0x47, 0x10, 0x01, 0x12, 0x0b, + 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x02, 0x2a, 0xbc, 0x01, 0x0a, 0x17, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, - 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, - 0x64, 0x12, 0x1d, 0x0a, 0x06, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x05, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x52, 0x06, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, - 0x12, 0x23, 0x0a, 0x09, 0x70, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x05, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x52, 0x09, 0x70, 0x61, 0x73, 0x73, - 0x65, 0x6e, 0x67, 0x65, 0x72, 0x12, 0x4c, 0x0a, 0x13, 0x70, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, - 0x65, 0x72, 0x50, 0x69, 0x63, 0x6b, 0x75, 0x70, 0x44, 0x61, 0x74, 0x65, 0x18, 0x04, 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, 0x13, - 0x70, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x50, 0x69, 0x63, 0x6b, 0x75, 0x70, 0x44, - 0x61, 0x74, 0x65, 0x12, 0x44, 0x0a, 0x19, 0x70, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, - 0x5f, 0x64, 0x65, 0x70, 0x61, 0x72, 0x74, 0x75, 0x72, 0x65, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, - 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, - 0x52, 0x17, 0x70, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x44, 0x65, 0x70, 0x61, 0x72, - 0x74, 0x75, 0x72, 0x65, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x12, 0x48, 0x0a, 0x1b, 0x70, 0x61, 0x73, - 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x5f, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, - 0x2e, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x52, 0x19, 0x70, 0x61, 0x73, 0x73, 0x65, 0x6e, - 0x67, 0x65, 0x72, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x6f, - 0x75, 0x74, 0x65, 0x12, 0x30, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x07, 0x20, - 0x01, 0x28, 0x0e, 0x32, 0x18, 0x2e, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x6f, 0x6c, - 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x06, 0x73, - 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x09, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x08, 0x64, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x1c, 0x0a, - 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x50, - 0x72, 0x69, 0x63, 0x65, 0x52, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x12, 0x16, 0x0a, 0x03, 0x63, - 0x61, 0x72, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x04, 0x2e, 0x43, 0x61, 0x72, 0x52, 0x03, - 0x63, 0x61, 0x72, 0x12, 0x3b, 0x0a, 0x0b, 0x70, 0x69, 0x63, 0x6b, 0x75, 0x70, 0x5f, 0x64, 0x61, - 0x74, 0x65, 0x18, 0x0c, 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, 0x0a, 0x70, 0x69, 0x63, 0x6b, 0x75, 0x70, 0x44, 0x61, 0x74, 0x65, - 0x22, 0x12, 0x0a, 0x10, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, - 0x67, 0x65, 0x72, 0x73, 0x22, 0x0e, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x50, 0x61, 0x73, 0x73, 0x65, - 0x6e, 0x67, 0x65, 0x72, 0x22, 0x31, 0x0a, 0x03, 0x43, 0x61, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x72, 0x61, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x05, 0x62, 0x72, 0x61, 0x6e, 0x64, 0x22, 0x97, 0x01, 0x0a, 0x0b, 0x50, 0x72, 0x65, 0x66, - 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6d, 0x6f, 0x6b, 0x69, - 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x73, 0x6d, 0x6f, 0x6b, 0x69, 0x6e, - 0x67, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x6e, 0x69, 0x6d, 0x61, 0x6c, 0x73, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x08, 0x52, 0x07, 0x61, 0x6e, 0x69, 0x6d, 0x61, 0x6c, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x6d, - 0x75, 0x73, 0x69, 0x63, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x6d, 0x75, 0x73, 0x69, - 0x63, 0x12, 0x1b, 0x0a, 0x09, 0x69, 0x73, 0x5f, 0x74, 0x61, 0x6c, 0x6b, 0x65, 0x72, 0x18, 0x04, - 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x54, 0x61, 0x6c, 0x6b, 0x65, 0x72, 0x12, 0x21, - 0x0a, 0x0c, 0x6c, 0x75, 0x67, 0x67, 0x61, 0x67, 0x65, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x05, - 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x6c, 0x75, 0x67, 0x67, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, - 0x65, 0x22, 0x5b, 0x0a, 0x05, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x1e, 0x0a, 0x04, 0x74, 0x79, - 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x50, 0x72, 0x69, 0x63, 0x65, - 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, - 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, - 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x63, 0x79, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x63, 0x79, 0x22, 0xdd, - 0x01, 0x0a, 0x04, 0x55, 0x73, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x6c, 0x69, 0x61, 0x73, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x12, 0x1d, 0x0a, - 0x0a, 0x66, 0x69, 0x72, 0x73, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x09, 0x66, 0x69, 0x72, 0x73, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1b, 0x0a, 0x09, - 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x08, 0x6c, 0x61, 0x73, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x61, - 0x64, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x67, 0x72, 0x61, 0x64, 0x65, 0x12, - 0x18, 0x0a, 0x07, 0x70, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x07, 0x70, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x65, 0x6e, - 0x64, 0x65, 0x72, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, - 0x72, 0x12, 0x2b, 0x0a, 0x11, 0x76, 0x65, 0x72, 0x69, 0x66, 0x69, 0x65, 0x64, 0x5f, 0x69, 0x64, - 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10, 0x76, 0x65, - 0x72, 0x69, 0x66, 0x69, 0x65, 0x64, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2a, 0x4a, - 0x0a, 0x09, 0x44, 0x61, 0x79, 0x4f, 0x66, 0x57, 0x65, 0x65, 0x6b, 0x12, 0x07, 0x0a, 0x03, 0x4d, - 0x4f, 0x4e, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x54, 0x55, 0x45, 0x10, 0x01, 0x12, 0x07, 0x0a, - 0x03, 0x57, 0x45, 0x44, 0x10, 0x03, 0x12, 0x07, 0x0a, 0x03, 0x54, 0x48, 0x55, 0x10, 0x04, 0x12, - 0x07, 0x0a, 0x03, 0x46, 0x52, 0x49, 0x10, 0x05, 0x12, 0x07, 0x0a, 0x03, 0x53, 0x41, 0x54, 0x10, - 0x06, 0x12, 0x07, 0x0a, 0x03, 0x53, 0x55, 0x4e, 0x10, 0x07, 0x2a, 0x2e, 0x0a, 0x09, 0x50, 0x72, - 0x69, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x46, 0x52, 0x45, 0x45, 0x10, - 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x50, 0x41, 0x59, 0x49, 0x4e, 0x47, 0x10, 0x01, 0x12, 0x0b, 0x0a, - 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x02, 0x2a, 0xbc, 0x01, 0x0a, 0x17, 0x42, - 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, - 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x0d, 0x0a, 0x09, 0x49, 0x4e, 0x49, 0x54, 0x49, 0x41, - 0x54, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1f, 0x0a, 0x1b, 0x57, 0x41, 0x49, 0x54, 0x49, 0x4e, 0x47, - 0x5f, 0x44, 0x52, 0x49, 0x56, 0x45, 0x52, 0x5f, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x52, 0x4d, 0x41, - 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x01, 0x12, 0x22, 0x0a, 0x1e, 0x57, 0x41, 0x49, 0x54, 0x49, 0x4e, - 0x47, 0x5f, 0x50, 0x41, 0x53, 0x53, 0x45, 0x4e, 0x47, 0x45, 0x52, 0x5f, 0x43, 0x4f, 0x4e, 0x46, - 0x49, 0x52, 0x4d, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x02, 0x12, 0x0d, 0x0a, 0x09, 0x43, 0x4f, - 0x4e, 0x46, 0x49, 0x52, 0x4d, 0x45, 0x44, 0x10, 0x03, 0x12, 0x0d, 0x0a, 0x09, 0x43, 0x41, 0x4e, - 0x43, 0x45, 0x4c, 0x4c, 0x45, 0x44, 0x10, 0x04, 0x12, 0x20, 0x0a, 0x1c, 0x43, 0x4f, 0x4d, 0x50, - 0x4c, 0x45, 0x54, 0x45, 0x44, 0x5f, 0x50, 0x45, 0x4e, 0x44, 0x49, 0x4e, 0x47, 0x5f, 0x56, 0x41, - 0x4c, 0x49, 0x44, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x05, 0x12, 0x0d, 0x0a, 0x09, 0x56, 0x41, - 0x4c, 0x49, 0x44, 0x41, 0x54, 0x45, 0x44, 0x10, 0x06, 0x2a, 0x25, 0x0a, 0x08, 0x55, 0x73, 0x65, - 0x72, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0a, 0x0a, 0x06, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x10, - 0x00, 0x12, 0x0d, 0x0a, 0x09, 0x70, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x10, 0x01, - 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, + 0x79, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x0d, 0x0a, 0x09, 0x49, 0x4e, 0x49, 0x54, 0x49, + 0x41, 0x54, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1f, 0x0a, 0x1b, 0x57, 0x41, 0x49, 0x54, 0x49, 0x4e, + 0x47, 0x5f, 0x44, 0x52, 0x49, 0x56, 0x45, 0x52, 0x5f, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x52, 0x4d, + 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x01, 0x12, 0x22, 0x0a, 0x1e, 0x57, 0x41, 0x49, 0x54, 0x49, + 0x4e, 0x47, 0x5f, 0x50, 0x41, 0x53, 0x53, 0x45, 0x4e, 0x47, 0x45, 0x52, 0x5f, 0x43, 0x4f, 0x4e, + 0x46, 0x49, 0x52, 0x4d, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x02, 0x12, 0x0d, 0x0a, 0x09, 0x43, + 0x4f, 0x4e, 0x46, 0x49, 0x52, 0x4d, 0x45, 0x44, 0x10, 0x03, 0x12, 0x0d, 0x0a, 0x09, 0x43, 0x41, + 0x4e, 0x43, 0x45, 0x4c, 0x4c, 0x45, 0x44, 0x10, 0x04, 0x12, 0x20, 0x0a, 0x1c, 0x43, 0x4f, 0x4d, + 0x50, 0x4c, 0x45, 0x54, 0x45, 0x44, 0x5f, 0x50, 0x45, 0x4e, 0x44, 0x49, 0x4e, 0x47, 0x5f, 0x56, + 0x41, 0x4c, 0x49, 0x44, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x05, 0x12, 0x0d, 0x0a, 0x09, 0x56, + 0x41, 0x4c, 0x49, 0x44, 0x41, 0x54, 0x45, 0x44, 0x10, 0x06, 0x2a, 0x25, 0x0a, 0x08, 0x55, 0x73, + 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0a, 0x0a, 0x06, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, + 0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09, 0x70, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x10, + 0x01, 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 ( @@ -1543,7 +1582,7 @@ func file_solidarity_api_types_proto_rawDescGZIP() []byte { } var file_solidarity_api_types_proto_enumTypes = make([]protoimpl.EnumInfo, 4) -var file_solidarity_api_types_proto_msgTypes = make([]protoimpl.MessageInfo, 15) +var file_solidarity_api_types_proto_msgTypes = make([]protoimpl.MessageInfo, 16) var file_solidarity_api_types_proto_goTypes = []interface{}{ (DayOfWeek)(0), // 0: DayOfWeek (PriceType)(0), // 1: PriceType @@ -1551,49 +1590,50 @@ var file_solidarity_api_types_proto_goTypes = []interface{}{ (UserType)(0), // 3: UserType (*Feature)(nil), // 4: Feature (*DriverJourney)(nil), // 5: DriverJourney - (*RepeatedPunctualAvailabilitySlot)(nil), // 6: RepeatedPunctualAvailabilitySlot - (*RepeatedRegularAvailabilitySlot)(nil), // 7: RepeatedRegularAvailabilitySlot - (*DriverRequest)(nil), // 8: DriverRequest - (*PunctualAvailabilitySlot)(nil), // 9: PunctualAvailabilitySlot - (*RegularAvailabilitySlot)(nil), // 10: RegularAvailabilitySlot - (*BookingSolidarityRequest)(nil), // 11: BookingSolidarityRequest - (*BookingSolidarity)(nil), // 12: BookingSolidarity - (*GetAllPassengers)(nil), // 13: GetAllPassengers - (*GetPassenger)(nil), // 14: GetPassenger - (*Car)(nil), // 15: Car - (*Preferences)(nil), // 16: Preferences - (*Price)(nil), // 17: Price - (*User)(nil), // 18: User - (*timestamp.Timestamp)(nil), // 19: google.protobuf.Timestamp + (*GetAllDrivers)(nil), // 6: GetAllDrivers + (*RepeatedPunctualAvailabilitySlot)(nil), // 7: RepeatedPunctualAvailabilitySlot + (*RepeatedRegularAvailabilitySlot)(nil), // 8: RepeatedRegularAvailabilitySlot + (*DriverRequest)(nil), // 9: DriverRequest + (*PunctualAvailabilitySlot)(nil), // 10: PunctualAvailabilitySlot + (*RegularAvailabilitySlot)(nil), // 11: RegularAvailabilitySlot + (*BookingSolidarityRequest)(nil), // 12: BookingSolidarityRequest + (*BookingSolidarity)(nil), // 13: BookingSolidarity + (*GetAllPassengers)(nil), // 14: GetAllPassengers + (*GetPassenger)(nil), // 15: GetPassenger + (*Car)(nil), // 16: Car + (*Preferences)(nil), // 17: Preferences + (*Price)(nil), // 18: Price + (*User)(nil), // 19: User + (*timestamp.Timestamp)(nil), // 20: google.protobuf.Timestamp } var file_solidarity_api_types_proto_depIdxs = []int32{ - 18, // 0: DriverJourney.user:type_name -> User - 15, // 1: DriverJourney.car:type_name -> Car - 19, // 2: DriverJourney.driver_departure_Date:type_name -> google.protobuf.Timestamp - 17, // 3: DriverJourney.price:type_name -> Price - 6, // 4: DriverJourney.repeated_punctual_availabilities:type_name -> RepeatedPunctualAvailabilitySlot - 7, // 5: DriverJourney.repeated_regular_availabilities:type_name -> RepeatedRegularAvailabilitySlot - 9, // 6: RepeatedPunctualAvailabilitySlot.punctual_availabilities:type_name -> PunctualAvailabilitySlot - 10, // 7: RepeatedRegularAvailabilitySlot.regular_availabilities:type_name -> RegularAvailabilitySlot + 19, // 0: DriverJourney.user:type_name -> User + 16, // 1: DriverJourney.car:type_name -> Car + 20, // 2: DriverJourney.driver_departure_Date:type_name -> google.protobuf.Timestamp + 18, // 3: DriverJourney.price:type_name -> Price + 7, // 4: DriverJourney.repeated_punctual_availabilities:type_name -> RepeatedPunctualAvailabilitySlot + 8, // 5: DriverJourney.repeated_regular_availabilities:type_name -> RepeatedRegularAvailabilitySlot + 10, // 6: RepeatedPunctualAvailabilitySlot.punctual_availabilities:type_name -> PunctualAvailabilitySlot + 11, // 7: RepeatedRegularAvailabilitySlot.regular_availabilities:type_name -> RegularAvailabilitySlot 4, // 8: DriverRequest.driver_address:type_name -> Feature - 18, // 9: DriverRequest.driver:type_name -> User - 16, // 10: DriverRequest.preferences:type_name -> Preferences - 15, // 11: DriverRequest.car:type_name -> Car - 19, // 12: PunctualAvailabilitySlot.date:type_name -> google.protobuf.Timestamp + 19, // 9: DriverRequest.driver:type_name -> User + 17, // 10: DriverRequest.preferences:type_name -> Preferences + 16, // 11: DriverRequest.car:type_name -> Car + 20, // 12: PunctualAvailabilitySlot.date:type_name -> google.protobuf.Timestamp 0, // 13: RegularAvailabilitySlot.dayOfWeek:type_name -> DayOfWeek 2, // 14: BookingSolidarityRequest.status:type_name -> BookingSolidarityStatus 4, // 15: BookingSolidarityRequest.departure_address:type_name -> Feature 4, // 16: BookingSolidarityRequest.destination_address:type_name -> Feature - 19, // 17: BookingSolidarityRequest.pickup_date:type_name -> google.protobuf.Timestamp - 18, // 18: BookingSolidarity.driver:type_name -> User - 18, // 19: BookingSolidarity.passenger:type_name -> User - 19, // 20: BookingSolidarity.passengerPickupDate:type_name -> google.protobuf.Timestamp + 20, // 17: BookingSolidarityRequest.pickup_date:type_name -> google.protobuf.Timestamp + 19, // 18: BookingSolidarity.driver:type_name -> User + 19, // 19: BookingSolidarity.passenger:type_name -> User + 20, // 20: BookingSolidarity.passengerPickupDate:type_name -> google.protobuf.Timestamp 4, // 21: BookingSolidarity.passenger_departure_route:type_name -> Feature 4, // 22: BookingSolidarity.passenger_destination_route:type_name -> Feature 2, // 23: BookingSolidarity.status:type_name -> BookingSolidarityStatus - 17, // 24: BookingSolidarity.price:type_name -> Price - 15, // 25: BookingSolidarity.car:type_name -> Car - 19, // 26: BookingSolidarity.pickup_date:type_name -> google.protobuf.Timestamp + 18, // 24: BookingSolidarity.price:type_name -> Price + 16, // 25: BookingSolidarity.car:type_name -> Car + 20, // 26: BookingSolidarity.pickup_date:type_name -> google.protobuf.Timestamp 1, // 27: Price.type:type_name -> PriceType 28, // [28:28] is the sub-list for method output_type 28, // [28:28] is the sub-list for method input_type @@ -1633,7 +1673,7 @@ func file_solidarity_api_types_proto_init() { } } file_solidarity_api_types_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RepeatedPunctualAvailabilitySlot); i { + switch v := v.(*GetAllDrivers); i { case 0: return &v.state case 1: @@ -1645,7 +1685,7 @@ func file_solidarity_api_types_proto_init() { } } file_solidarity_api_types_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RepeatedRegularAvailabilitySlot); i { + switch v := v.(*RepeatedPunctualAvailabilitySlot); i { case 0: return &v.state case 1: @@ -1657,7 +1697,7 @@ func file_solidarity_api_types_proto_init() { } } file_solidarity_api_types_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DriverRequest); i { + switch v := v.(*RepeatedRegularAvailabilitySlot); i { case 0: return &v.state case 1: @@ -1669,7 +1709,7 @@ func file_solidarity_api_types_proto_init() { } } file_solidarity_api_types_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PunctualAvailabilitySlot); i { + switch v := v.(*DriverRequest); i { case 0: return &v.state case 1: @@ -1681,7 +1721,7 @@ func file_solidarity_api_types_proto_init() { } } file_solidarity_api_types_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RegularAvailabilitySlot); i { + switch v := v.(*PunctualAvailabilitySlot); i { case 0: return &v.state case 1: @@ -1693,7 +1733,7 @@ func file_solidarity_api_types_proto_init() { } } file_solidarity_api_types_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*BookingSolidarityRequest); i { + switch v := v.(*RegularAvailabilitySlot); i { case 0: return &v.state case 1: @@ -1705,7 +1745,7 @@ func file_solidarity_api_types_proto_init() { } } file_solidarity_api_types_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*BookingSolidarity); i { + switch v := v.(*BookingSolidarityRequest); i { case 0: return &v.state case 1: @@ -1717,7 +1757,7 @@ func file_solidarity_api_types_proto_init() { } } file_solidarity_api_types_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GetAllPassengers); i { + switch v := v.(*BookingSolidarity); i { case 0: return &v.state case 1: @@ -1729,7 +1769,7 @@ func file_solidarity_api_types_proto_init() { } } file_solidarity_api_types_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GetPassenger); i { + switch v := v.(*GetAllPassengers); i { case 0: return &v.state case 1: @@ -1741,7 +1781,7 @@ func file_solidarity_api_types_proto_init() { } } file_solidarity_api_types_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Car); i { + switch v := v.(*GetPassenger); i { case 0: return &v.state case 1: @@ -1753,7 +1793,7 @@ func file_solidarity_api_types_proto_init() { } } file_solidarity_api_types_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Preferences); i { + switch v := v.(*Car); i { case 0: return &v.state case 1: @@ -1765,7 +1805,7 @@ func file_solidarity_api_types_proto_init() { } } file_solidarity_api_types_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Price); i { + switch v := v.(*Preferences); i { case 0: return &v.state case 1: @@ -1777,6 +1817,18 @@ func file_solidarity_api_types_proto_init() { } } file_solidarity_api_types_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*Price); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_solidarity_api_types_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*User); i { case 0: return &v.state @@ -1799,7 +1851,7 @@ func file_solidarity_api_types_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_solidarity_api_types_proto_rawDesc, NumEnums: 4, - NumMessages: 15, + NumMessages: 16, NumExtensions: 0, NumServices: 0, }, diff --git a/servers/grpc/proto/solidarity-api-types.proto b/servers/grpc/proto/solidarity-api-types.proto index e1a1bb0..0fe5e78 100644 --- a/servers/grpc/proto/solidarity-api-types.proto +++ b/servers/grpc/proto/solidarity-api-types.proto @@ -19,6 +19,11 @@ message DriverJourney { RepeatedRegularAvailabilitySlot repeated_regular_availabilities = 7; } } + +message GetAllDrivers { + +} + message RepeatedPunctualAvailabilitySlot { repeated PunctualAvailabilitySlot punctual_availabilities = 1; } diff --git a/servers/grpc/proto/solidarity-api.pb.go b/servers/grpc/proto/solidarity-api.pb.go index df61759..8ac5cbd 100644 --- a/servers/grpc/proto/solidarity-api.pb.go +++ b/servers/grpc/proto/solidarity-api.pb.go @@ -768,6 +768,53 @@ func (x *DriverJourneysResponse) GetDriverJourneys() []*DriverJourney { return nil } +type GetAllDriversResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + DriverJourneys []*User `protobuf:"bytes,1,rep,name=driver_journeys,json=driverJourneys,proto3" json:"driver_journeys,omitempty"` +} + +func (x *GetAllDriversResponse) Reset() { + *x = GetAllDriversResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_solidarity_api_proto_msgTypes[14] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *GetAllDriversResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*GetAllDriversResponse) ProtoMessage() {} + +func (x *GetAllDriversResponse) ProtoReflect() protoreflect.Message { + mi := &file_solidarity_api_proto_msgTypes[14] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use GetAllDriversResponse.ProtoReflect.Descriptor instead. +func (*GetAllDriversResponse) Descriptor() ([]byte, []int) { + return file_solidarity_api_proto_rawDescGZIP(), []int{14} +} + +func (x *GetAllDriversResponse) GetDriverJourneys() []*User { + if x != nil { + return x.DriverJourneys + } + return nil +} + type GetAllPassengersResponse struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -779,7 +826,7 @@ type GetAllPassengersResponse struct { func (x *GetAllPassengersResponse) Reset() { *x = GetAllPassengersResponse{} if protoimpl.UnsafeEnabled { - mi := &file_solidarity_api_proto_msgTypes[14] + mi := &file_solidarity_api_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -792,7 +839,7 @@ func (x *GetAllPassengersResponse) String() string { func (*GetAllPassengersResponse) ProtoMessage() {} func (x *GetAllPassengersResponse) ProtoReflect() protoreflect.Message { - mi := &file_solidarity_api_proto_msgTypes[14] + mi := &file_solidarity_api_proto_msgTypes[15] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -805,7 +852,7 @@ func (x *GetAllPassengersResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use GetAllPassengersResponse.ProtoReflect.Descriptor instead. func (*GetAllPassengersResponse) Descriptor() ([]byte, []int) { - return file_solidarity_api_proto_rawDescGZIP(), []int{14} + return file_solidarity_api_proto_rawDescGZIP(), []int{15} } func (x *GetAllPassengersResponse) GetPassenger() []*User { @@ -826,7 +873,7 @@ type GetPassengerRequest struct { func (x *GetPassengerRequest) Reset() { *x = GetPassengerRequest{} if protoimpl.UnsafeEnabled { - mi := &file_solidarity_api_proto_msgTypes[15] + mi := &file_solidarity_api_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -839,7 +886,7 @@ func (x *GetPassengerRequest) String() string { func (*GetPassengerRequest) ProtoMessage() {} func (x *GetPassengerRequest) ProtoReflect() protoreflect.Message { - mi := &file_solidarity_api_proto_msgTypes[15] + mi := &file_solidarity_api_proto_msgTypes[16] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -852,7 +899,7 @@ func (x *GetPassengerRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use GetPassengerRequest.ProtoReflect.Descriptor instead. func (*GetPassengerRequest) Descriptor() ([]byte, []int) { - return file_solidarity_api_proto_rawDescGZIP(), []int{15} + return file_solidarity_api_proto_rawDescGZIP(), []int{16} } func (x *GetPassengerRequest) GetPassenger() *User { @@ -873,7 +920,7 @@ type GetPassengerResponse struct { func (x *GetPassengerResponse) Reset() { *x = GetPassengerResponse{} if protoimpl.UnsafeEnabled { - mi := &file_solidarity_api_proto_msgTypes[16] + mi := &file_solidarity_api_proto_msgTypes[17] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -886,7 +933,7 @@ func (x *GetPassengerResponse) String() string { func (*GetPassengerResponse) ProtoMessage() {} func (x *GetPassengerResponse) ProtoReflect() protoreflect.Message { - mi := &file_solidarity_api_proto_msgTypes[16] + mi := &file_solidarity_api_proto_msgTypes[17] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -899,7 +946,7 @@ func (x *GetPassengerResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use GetPassengerResponse.ProtoReflect.Descriptor instead. func (*GetPassengerResponse) Descriptor() ([]byte, []int) { - return file_solidarity_api_proto_rawDescGZIP(), []int{16} + return file_solidarity_api_proto_rawDescGZIP(), []int{17} } func (x *GetPassengerResponse) GetPassenger() *User { @@ -920,7 +967,7 @@ type GetBookingsByStatusResponse struct { func (x *GetBookingsByStatusResponse) Reset() { *x = GetBookingsByStatusResponse{} if protoimpl.UnsafeEnabled { - mi := &file_solidarity_api_proto_msgTypes[17] + mi := &file_solidarity_api_proto_msgTypes[18] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -933,7 +980,7 @@ func (x *GetBookingsByStatusResponse) String() string { func (*GetBookingsByStatusResponse) ProtoMessage() {} func (x *GetBookingsByStatusResponse) ProtoReflect() protoreflect.Message { - mi := &file_solidarity_api_proto_msgTypes[17] + mi := &file_solidarity_api_proto_msgTypes[18] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -946,7 +993,7 @@ func (x *GetBookingsByStatusResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use GetBookingsByStatusResponse.ProtoReflect.Descriptor instead. func (*GetBookingsByStatusResponse) Descriptor() ([]byte, []int) { - return file_solidarity_api_proto_rawDescGZIP(), []int{17} + return file_solidarity_api_proto_rawDescGZIP(), []int{18} } func (x *GetBookingsByStatusResponse) GetBooking() []*BookingSolidarity { @@ -1059,82 +1106,90 @@ var file_solidarity_api_proto_rawDesc = []byte{ 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, 0x3f, 0x0a, 0x18, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, - 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x12, 0x23, 0x0a, 0x09, 0x70, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x18, - 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x05, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x52, 0x09, 0x70, 0x61, - 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x22, 0x3a, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x50, 0x61, - 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x23, - 0x0a, 0x09, 0x70, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x05, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x52, 0x09, 0x70, 0x61, 0x73, 0x73, 0x65, 0x6e, - 0x67, 0x65, 0x72, 0x22, 0x3b, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, - 0x67, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x23, 0x0a, 0x09, 0x70, - 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x05, + 0x75, 0x72, 0x6e, 0x65, 0x79, 0x73, 0x22, 0x47, 0x0a, 0x15, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, + 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, + 0x2e, 0x0a, 0x0f, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x5f, 0x6a, 0x6f, 0x75, 0x72, 0x6e, 0x65, + 0x79, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x05, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x52, + 0x0e, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x4a, 0x6f, 0x75, 0x72, 0x6e, 0x65, 0x79, 0x73, 0x22, + 0x3f, 0x0a, 0x18, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, + 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x23, 0x0a, 0x09, 0x70, + 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x05, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x52, 0x09, 0x70, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, - 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, 0x6f, 0x6c, 0x69, 0x64, 0x61, - 0x72, 0x69, 0x74, 0x79, 0x52, 0x07, 0x62, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x32, 0xd4, 0x06, - 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, 0x6c, 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, 0x5e, 0x0a, 0x17, 0x43, 0x72, 0x65, 0x61, 0x74, - 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, - 0x74, 0x79, 0x12, 0x1f, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, - 0x6e, 0x67, 0x53, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, + 0x22, 0x3a, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x09, 0x70, 0x61, 0x73, 0x73, 0x65, + 0x6e, 0x67, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x05, 0x2e, 0x55, 0x73, 0x65, + 0x72, 0x52, 0x09, 0x70, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x22, 0x3b, 0x0a, 0x14, + 0x47, 0x65, 0x74, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x23, 0x0a, 0x09, 0x70, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, + 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x05, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x52, 0x09, + 0x70, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 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, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x52, 0x07, 0x62, + 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x32, 0x97, 0x07, 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, + 0x6c, 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, 0x5e, 0x0a, 0x17, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, + 0x67, 0x53, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x12, 0x1f, 0x2e, 0x43, 0x72, + 0x65, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x6f, 0x6c, 0x69, 0x64, + 0x61, 0x72, 0x69, 0x74, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x43, + 0x72, 0x65, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x6f, 0x6c, 0x69, + 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, + 0x12, 0x5e, 0x0a, 0x17, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, + 0x67, 0x53, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x12, 0x1f, 0x2e, 0x55, 0x70, + 0x64, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x6f, 0x6c, 0x69, 0x64, + 0x61, 0x72, 0x69, 0x74, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x55, + 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x6f, 0x6c, 0x69, + 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, + 0x12, 0x55, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x6f, + 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x12, 0x1c, 0x2e, 0x47, 0x65, 0x74, 0x42, 0x6f, + 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x5e, 0x0a, 0x17, 0x55, 0x70, 0x64, 0x61, 0x74, - 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, - 0x74, 0x79, 0x12, 0x1f, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, - 0x6e, 0x67, 0x53, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, - 0x69, 0x6e, 0x67, 0x53, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x55, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x42, 0x6f, - 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x12, - 0x1c, 0x2e, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x6f, 0x6c, 0x69, - 0x64, 0x61, 0x72, 0x69, 0x74, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, - 0x47, 0x65, 0x74, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x6f, 0x6c, 0x69, 0x64, 0x61, - 0x72, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x52, - 0x0a, 0x13, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x73, 0x42, 0x79, 0x53, - 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1b, 0x2e, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x6f, 0x6b, 0x69, - 0x6e, 0x67, 0x73, 0x42, 0x79, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x1c, 0x2e, 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, - 0x22, 0x00, 0x12, 0x43, 0x0a, 0x0e, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x4a, 0x6f, 0x75, 0x72, - 0x6e, 0x65, 0x79, 0x73, 0x12, 0x16, 0x2e, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x4a, 0x6f, 0x75, - 0x72, 0x6e, 0x65, 0x79, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x44, - 0x72, 0x69, 0x76, 0x65, 0x72, 0x4a, 0x6f, 0x75, 0x72, 0x6e, 0x65, 0x79, 0x73, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x47, 0x0a, 0x10, 0x47, 0x65, 0x74, 0x41, 0x6c, - 0x6c, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x73, 0x12, 0x16, 0x2e, 0x67, 0x6f, - 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, - 0x70, 0x74, 0x79, 0x1a, 0x19, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x50, 0x61, 0x73, 0x73, - 0x65, 0x6e, 0x67, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, - 0x12, 0x3d, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, - 0x12, 0x14, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x15, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x61, 0x73, 0x73, - 0x65, 0x6e, 0x67, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, - 0x43, 0x0a, 0x10, 0x53, 0x65, 0x74, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x54, - 0x72, 0x69, 0x70, 0x12, 0x15, 0x2e, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 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, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x52, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x42, 0x6f, + 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x73, 0x42, 0x79, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1b, + 0x2e, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x73, 0x42, 0x79, 0x53, 0x74, + 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 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, 0x22, 0x00, 0x12, 0x43, 0x0a, 0x0e, 0x44, + 0x72, 0x69, 0x76, 0x65, 0x72, 0x4a, 0x6f, 0x75, 0x72, 0x6e, 0x65, 0x79, 0x73, 0x12, 0x16, 0x2e, + 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x4a, 0x6f, 0x75, 0x72, 0x6e, 0x65, 0x79, 0x73, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x4a, 0x6f, + 0x75, 0x72, 0x6e, 0x65, 0x79, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, + 0x12, 0x41, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, + 0x73, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x16, 0x2e, 0x47, 0x65, 0x74, 0x41, + 0x6c, 0x6c, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x22, 0x00, 0x12, 0x47, 0x0a, 0x10, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x50, 0x61, 0x73, + 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x73, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, + 0x19, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, + 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x3d, 0x0a, 0x0c, + 0x47, 0x65, 0x74, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x12, 0x14, 0x2e, 0x47, + 0x65, 0x74, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x1a, 0x15, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, + 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x43, 0x0a, 0x10, 0x53, + 0x65, 0x74, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x54, 0x72, 0x69, 0x70, 0x12, + 0x15, 0x2e, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 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 ( @@ -1149,7 +1204,7 @@ func file_solidarity_api_proto_rawDescGZIP() []byte { return file_solidarity_api_proto_rawDescData } -var file_solidarity_api_proto_msgTypes = make([]protoimpl.MessageInfo, 18) +var file_solidarity_api_proto_msgTypes = make([]protoimpl.MessageInfo, 19) var file_solidarity_api_proto_goTypes = []interface{}{ (*PassengerTripRequest)(nil), // 0: PassengerTripRequest (*DriverRegularAvailabilities)(nil), // 1: DriverRegularAvailabilities @@ -1165,69 +1220,73 @@ var file_solidarity_api_proto_goTypes = []interface{}{ (*GetBookingsByStatusRequest)(nil), // 11: GetBookingsByStatusRequest (*DriverJourneysRequest)(nil), // 12: DriverJourneysRequest (*DriverJourneysResponse)(nil), // 13: DriverJourneysResponse - (*GetAllPassengersResponse)(nil), // 14: GetAllPassengersResponse - (*GetPassengerRequest)(nil), // 15: GetPassengerRequest - (*GetPassengerResponse)(nil), // 16: GetPassengerResponse - (*GetBookingsByStatusResponse)(nil), // 17: GetBookingsByStatusResponse - (*User)(nil), // 18: User - (*Preferences)(nil), // 19: Preferences - (*DriverRequest)(nil), // 20: DriverRequest - (*RegularAvailabilitySlot)(nil), // 21: RegularAvailabilitySlot - (*PunctualAvailabilitySlot)(nil), // 22: PunctualAvailabilitySlot - (*BookingSolidarityRequest)(nil), // 23: BookingSolidarityRequest - (*BookingSolidarity)(nil), // 24: BookingSolidarity - (BookingSolidarityStatus)(0), // 25: BookingSolidarityStatus - (UserType)(0), // 26: UserType - (*Feature)(nil), // 27: Feature - (*timestamp.Timestamp)(nil), // 28: google.protobuf.Timestamp - (*DriverJourney)(nil), // 29: DriverJourney - (*empty.Empty)(nil), // 30: google.protobuf.Empty + (*GetAllDriversResponse)(nil), // 14: GetAllDriversResponse + (*GetAllPassengersResponse)(nil), // 15: GetAllPassengersResponse + (*GetPassengerRequest)(nil), // 16: GetPassengerRequest + (*GetPassengerResponse)(nil), // 17: GetPassengerResponse + (*GetBookingsByStatusResponse)(nil), // 18: GetBookingsByStatusResponse + (*User)(nil), // 19: User + (*Preferences)(nil), // 20: Preferences + (*DriverRequest)(nil), // 21: DriverRequest + (*RegularAvailabilitySlot)(nil), // 22: RegularAvailabilitySlot + (*PunctualAvailabilitySlot)(nil), // 23: PunctualAvailabilitySlot + (*BookingSolidarityRequest)(nil), // 24: BookingSolidarityRequest + (*BookingSolidarity)(nil), // 25: BookingSolidarity + (BookingSolidarityStatus)(0), // 26: BookingSolidarityStatus + (UserType)(0), // 27: UserType + (*Feature)(nil), // 28: Feature + (*timestamp.Timestamp)(nil), // 29: google.protobuf.Timestamp + (*DriverJourney)(nil), // 30: DriverJourney + (*empty.Empty)(nil), // 31: google.protobuf.Empty } var file_solidarity_api_proto_depIdxs = []int32{ - 18, // 0: PassengerTripRequest.passenger:type_name -> User - 19, // 1: PassengerTripRequest.preferences:type_name -> Preferences - 20, // 2: DriverRegularAvailabilities.driver_request:type_name -> DriverRequest - 21, // 3: DriverRegularAvailabilities.driver_availabilities:type_name -> RegularAvailabilitySlot - 20, // 4: DriverPunctualAvailabilities.driver_request:type_name -> DriverRequest - 22, // 5: DriverPunctualAvailabilities.driver_availabilities:type_name -> PunctualAvailabilitySlot - 23, // 6: CreateBookingSolidarityRequest.booking:type_name -> BookingSolidarityRequest - 24, // 7: CreateBookingSolidarityResponse.booking:type_name -> BookingSolidarity - 25, // 8: UpdateBookingSolidarityRequest.status:type_name -> BookingSolidarityStatus - 24, // 9: GetBookingSolidarityResponse.booking:type_name -> BookingSolidarity - 25, // 10: GetBookingsByStatusRequest.status:type_name -> BookingSolidarityStatus - 26, // 11: GetBookingsByStatusRequest.type:type_name -> UserType - 27, // 12: DriverJourneysRequest.departure:type_name -> Feature - 28, // 13: DriverJourneysRequest.departure_date:type_name -> google.protobuf.Timestamp - 29, // 14: DriverJourneysResponse.driver_journeys:type_name -> DriverJourney - 18, // 15: GetAllPassengersResponse.passenger:type_name -> User - 18, // 16: GetPassengerRequest.passenger:type_name -> User - 18, // 17: GetPassengerResponse.passenger:type_name -> User - 24, // 18: GetBookingsByStatusResponse.booking:type_name -> BookingSolidarity - 1, // 19: SolidarityService.SetDriverRegularAvailabilities:input_type -> DriverRegularAvailabilities - 2, // 20: SolidarityService.SetDriverPunctualAvailabilities:input_type -> DriverPunctualAvailabilities - 5, // 21: SolidarityService.CreateBookingSolidarity:input_type -> CreateBookingSolidarityRequest - 7, // 22: SolidarityService.UpdateBookingSolidarity:input_type -> UpdateBookingSolidarityRequest - 9, // 23: SolidarityService.GetBookingSolidarity:input_type -> GetBookingSolidarityRequest - 11, // 24: SolidarityService.GetBookingsByStatus:input_type -> GetBookingsByStatusRequest - 12, // 25: SolidarityService.DriverJourneys:input_type -> DriverJourneysRequest - 30, // 26: SolidarityService.GetAllPassengers:input_type -> google.protobuf.Empty - 15, // 27: SolidarityService.GetPassenger:input_type -> GetPassengerRequest - 0, // 28: SolidarityService.SetPassengerTrip:input_type -> PassengerTripRequest - 4, // 29: SolidarityService.SetDriverRegularAvailabilities:output_type -> DriverAvailabilitiesResponse - 4, // 30: SolidarityService.SetDriverPunctualAvailabilities:output_type -> DriverAvailabilitiesResponse - 6, // 31: SolidarityService.CreateBookingSolidarity:output_type -> CreateBookingSolidarityResponse - 8, // 32: SolidarityService.UpdateBookingSolidarity:output_type -> UpdateBookingSolidarityResponse - 10, // 33: SolidarityService.GetBookingSolidarity:output_type -> GetBookingSolidarityResponse - 17, // 34: SolidarityService.GetBookingsByStatus:output_type -> GetBookingsByStatusResponse - 13, // 35: SolidarityService.DriverJourneys:output_type -> DriverJourneysResponse - 14, // 36: SolidarityService.GetAllPassengers:output_type -> GetAllPassengersResponse - 16, // 37: SolidarityService.GetPassenger:output_type -> GetPassengerResponse - 3, // 38: SolidarityService.SetPassengerTrip:output_type -> PassengerTripResponse - 29, // [29:39] is the sub-list for method output_type - 19, // [19:29] is the sub-list for method input_type - 19, // [19:19] is the sub-list for extension type_name - 19, // [19:19] is the sub-list for extension extendee - 0, // [0:19] is the sub-list for field type_name + 19, // 0: PassengerTripRequest.passenger:type_name -> User + 20, // 1: PassengerTripRequest.preferences:type_name -> Preferences + 21, // 2: DriverRegularAvailabilities.driver_request:type_name -> DriverRequest + 22, // 3: DriverRegularAvailabilities.driver_availabilities:type_name -> RegularAvailabilitySlot + 21, // 4: DriverPunctualAvailabilities.driver_request:type_name -> DriverRequest + 23, // 5: DriverPunctualAvailabilities.driver_availabilities:type_name -> PunctualAvailabilitySlot + 24, // 6: CreateBookingSolidarityRequest.booking:type_name -> BookingSolidarityRequest + 25, // 7: CreateBookingSolidarityResponse.booking:type_name -> BookingSolidarity + 26, // 8: UpdateBookingSolidarityRequest.status:type_name -> BookingSolidarityStatus + 25, // 9: GetBookingSolidarityResponse.booking:type_name -> BookingSolidarity + 26, // 10: GetBookingsByStatusRequest.status:type_name -> BookingSolidarityStatus + 27, // 11: GetBookingsByStatusRequest.type:type_name -> UserType + 28, // 12: DriverJourneysRequest.departure:type_name -> Feature + 29, // 13: DriverJourneysRequest.departure_date:type_name -> google.protobuf.Timestamp + 30, // 14: DriverJourneysResponse.driver_journeys:type_name -> DriverJourney + 19, // 15: GetAllDriversResponse.driver_journeys:type_name -> User + 19, // 16: GetAllPassengersResponse.passenger:type_name -> User + 19, // 17: GetPassengerRequest.passenger:type_name -> User + 19, // 18: GetPassengerResponse.passenger:type_name -> User + 25, // 19: GetBookingsByStatusResponse.booking:type_name -> BookingSolidarity + 1, // 20: SolidarityService.SetDriverRegularAvailabilities:input_type -> DriverRegularAvailabilities + 2, // 21: SolidarityService.SetDriverPunctualAvailabilities:input_type -> DriverPunctualAvailabilities + 5, // 22: SolidarityService.CreateBookingSolidarity:input_type -> CreateBookingSolidarityRequest + 7, // 23: SolidarityService.UpdateBookingSolidarity:input_type -> UpdateBookingSolidarityRequest + 9, // 24: SolidarityService.GetBookingSolidarity:input_type -> GetBookingSolidarityRequest + 11, // 25: SolidarityService.GetBookingsByStatus:input_type -> GetBookingsByStatusRequest + 12, // 26: SolidarityService.DriverJourneys:input_type -> DriverJourneysRequest + 31, // 27: SolidarityService.GetAllDrivers:input_type -> google.protobuf.Empty + 31, // 28: SolidarityService.GetAllPassengers:input_type -> google.protobuf.Empty + 16, // 29: SolidarityService.GetPassenger:input_type -> GetPassengerRequest + 0, // 30: SolidarityService.SetPassengerTrip:input_type -> PassengerTripRequest + 4, // 31: SolidarityService.SetDriverRegularAvailabilities:output_type -> DriverAvailabilitiesResponse + 4, // 32: SolidarityService.SetDriverPunctualAvailabilities:output_type -> DriverAvailabilitiesResponse + 6, // 33: SolidarityService.CreateBookingSolidarity:output_type -> CreateBookingSolidarityResponse + 8, // 34: SolidarityService.UpdateBookingSolidarity:output_type -> UpdateBookingSolidarityResponse + 10, // 35: SolidarityService.GetBookingSolidarity:output_type -> GetBookingSolidarityResponse + 18, // 36: SolidarityService.GetBookingsByStatus:output_type -> GetBookingsByStatusResponse + 13, // 37: SolidarityService.DriverJourneys:output_type -> DriverJourneysResponse + 14, // 38: SolidarityService.GetAllDrivers:output_type -> GetAllDriversResponse + 15, // 39: SolidarityService.GetAllPassengers:output_type -> GetAllPassengersResponse + 17, // 40: SolidarityService.GetPassenger:output_type -> GetPassengerResponse + 3, // 41: SolidarityService.SetPassengerTrip:output_type -> PassengerTripResponse + 31, // [31:42] is the sub-list for method output_type + 20, // [20:31] is the sub-list for method input_type + 20, // [20:20] is the sub-list for extension type_name + 20, // [20:20] is the sub-list for extension extendee + 0, // [0:20] is the sub-list for field type_name } func init() { file_solidarity_api_proto_init() } @@ -1406,7 +1465,7 @@ func file_solidarity_api_proto_init() { } } file_solidarity_api_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GetAllPassengersResponse); i { + switch v := v.(*GetAllDriversResponse); i { case 0: return &v.state case 1: @@ -1418,7 +1477,7 @@ func file_solidarity_api_proto_init() { } } file_solidarity_api_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GetPassengerRequest); i { + switch v := v.(*GetAllPassengersResponse); i { case 0: return &v.state case 1: @@ -1430,7 +1489,7 @@ func file_solidarity_api_proto_init() { } } file_solidarity_api_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GetPassengerResponse); i { + switch v := v.(*GetPassengerRequest); i { case 0: return &v.state case 1: @@ -1442,6 +1501,18 @@ func file_solidarity_api_proto_init() { } } file_solidarity_api_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*GetPassengerResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_solidarity_api_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*GetBookingsByStatusResponse); i { case 0: return &v.state @@ -1460,7 +1531,7 @@ func file_solidarity_api_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_solidarity_api_proto_rawDesc, NumEnums: 0, - NumMessages: 18, + NumMessages: 19, NumExtensions: 0, NumServices: 1, }, diff --git a/servers/grpc/proto/solidarity-api.proto b/servers/grpc/proto/solidarity-api.proto index 75921fb..2725a6d 100644 --- a/servers/grpc/proto/solidarity-api.proto +++ b/servers/grpc/proto/solidarity-api.proto @@ -12,6 +12,7 @@ service SolidarityService { rpc GetBookingSolidarity(GetBookingSolidarityRequest) returns (GetBookingSolidarityResponse) {} rpc GetBookingsByStatus(GetBookingsByStatusRequest) returns (GetBookingsByStatusResponse) {} rpc DriverJourneys(DriverJourneysRequest) returns (DriverJourneysResponse) {} + rpc GetAllDrivers(google.protobuf.Empty) returns (GetAllDriversResponse) {} rpc GetAllPassengers(google.protobuf.Empty) returns (GetAllPassengersResponse) {} rpc GetPassenger(GetPassengerRequest) returns (GetPassengerResponse) {} rpc SetPassengerTrip(PassengerTripRequest) returns (PassengerTripResponse) {} @@ -85,6 +86,10 @@ message DriverJourneysResponse { repeated DriverJourney driver_journeys = 1; } +message GetAllDriversResponse { + repeated User driver_journeys = 1; +} + message GetAllPassengersResponse { repeated User passenger = 1; } diff --git a/servers/grpc/proto/solidarity-api_grpc.pb.go b/servers/grpc/proto/solidarity-api_grpc.pb.go index b0f00fe..2f37d44 100644 --- a/servers/grpc/proto/solidarity-api_grpc.pb.go +++ b/servers/grpc/proto/solidarity-api_grpc.pb.go @@ -27,6 +27,7 @@ const ( SolidarityService_GetBookingSolidarity_FullMethodName = "/SolidarityService/GetBookingSolidarity" SolidarityService_GetBookingsByStatus_FullMethodName = "/SolidarityService/GetBookingsByStatus" SolidarityService_DriverJourneys_FullMethodName = "/SolidarityService/DriverJourneys" + SolidarityService_GetAllDrivers_FullMethodName = "/SolidarityService/GetAllDrivers" SolidarityService_GetAllPassengers_FullMethodName = "/SolidarityService/GetAllPassengers" SolidarityService_GetPassenger_FullMethodName = "/SolidarityService/GetPassenger" SolidarityService_SetPassengerTrip_FullMethodName = "/SolidarityService/SetPassengerTrip" @@ -43,6 +44,7 @@ type SolidarityServiceClient interface { GetBookingSolidarity(ctx context.Context, in *GetBookingSolidarityRequest, opts ...grpc.CallOption) (*GetBookingSolidarityResponse, error) GetBookingsByStatus(ctx context.Context, in *GetBookingsByStatusRequest, opts ...grpc.CallOption) (*GetBookingsByStatusResponse, error) DriverJourneys(ctx context.Context, in *DriverJourneysRequest, opts ...grpc.CallOption) (*DriverJourneysResponse, error) + GetAllDrivers(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*GetAllDriversResponse, error) GetAllPassengers(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*GetAllPassengersResponse, error) GetPassenger(ctx context.Context, in *GetPassengerRequest, opts ...grpc.CallOption) (*GetPassengerResponse, error) SetPassengerTrip(ctx context.Context, in *PassengerTripRequest, opts ...grpc.CallOption) (*PassengerTripResponse, error) @@ -126,6 +128,16 @@ func (c *solidarityServiceClient) DriverJourneys(ctx context.Context, in *Driver return out, nil } +func (c *solidarityServiceClient) GetAllDrivers(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*GetAllDriversResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(GetAllDriversResponse) + err := c.cc.Invoke(ctx, SolidarityService_GetAllDrivers_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *solidarityServiceClient) GetAllPassengers(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*GetAllPassengersResponse, error) { cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(GetAllPassengersResponse) @@ -167,6 +179,7 @@ type SolidarityServiceServer interface { GetBookingSolidarity(context.Context, *GetBookingSolidarityRequest) (*GetBookingSolidarityResponse, error) GetBookingsByStatus(context.Context, *GetBookingsByStatusRequest) (*GetBookingsByStatusResponse, error) DriverJourneys(context.Context, *DriverJourneysRequest) (*DriverJourneysResponse, error) + GetAllDrivers(context.Context, *empty.Empty) (*GetAllDriversResponse, error) GetAllPassengers(context.Context, *empty.Empty) (*GetAllPassengersResponse, error) GetPassenger(context.Context, *GetPassengerRequest) (*GetPassengerResponse, error) SetPassengerTrip(context.Context, *PassengerTripRequest) (*PassengerTripResponse, error) @@ -201,6 +214,9 @@ func (UnimplementedSolidarityServiceServer) GetBookingsByStatus(context.Context, func (UnimplementedSolidarityServiceServer) DriverJourneys(context.Context, *DriverJourneysRequest) (*DriverJourneysResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method DriverJourneys not implemented") } +func (UnimplementedSolidarityServiceServer) GetAllDrivers(context.Context, *empty.Empty) (*GetAllDriversResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetAllDrivers not implemented") +} func (UnimplementedSolidarityServiceServer) GetAllPassengers(context.Context, *empty.Empty) (*GetAllPassengersResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetAllPassengers not implemented") } @@ -357,6 +373,24 @@ func _SolidarityService_DriverJourneys_Handler(srv interface{}, ctx context.Cont return interceptor(ctx, in, info, handler) } +func _SolidarityService_GetAllDrivers_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(empty.Empty) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(SolidarityServiceServer).GetAllDrivers(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: SolidarityService_GetAllDrivers_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(SolidarityServiceServer).GetAllDrivers(ctx, req.(*empty.Empty)) + } + return interceptor(ctx, in, info, handler) +} + func _SolidarityService_GetAllPassengers_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(empty.Empty) if err := dec(in); err != nil { @@ -446,6 +480,10 @@ var SolidarityService_ServiceDesc = grpc.ServiceDesc{ MethodName: "DriverJourneys", Handler: _SolidarityService_DriverJourneys_Handler, }, + { + MethodName: "GetAllDrivers", + Handler: _SolidarityService_GetAllDrivers_Handler, + }, { MethodName: "GetAllPassengers", Handler: _SolidarityService_GetAllPassengers_Handler, diff --git a/servers/grpc/server/services.go b/servers/grpc/server/services.go index 4ac3a9f..74035d1 100644 --- a/servers/grpc/server/services.go +++ b/servers/grpc/server/services.go @@ -168,6 +168,29 @@ func (s *SolidarityServiceServerImpl) SetDriverPunctualAvailabilities(ctx contex }, nil } +func (s *SolidarityServiceServerImpl) GetAllDrivers( ctx context.Context, _ *emptypb.Empty) (resp *proto.GetAllDriversResponse, err error) { + drivers, err := s.Handler.GetAllDrivers(context.Background()) + resp = &proto.GetAllDriversResponse{ + DriverJourneys: []*proto.User{}, + } + response := []*proto.User{} + for _, v := range drivers { + temp := &proto.User{ + Id: v.Driver.ID, + Alias: v.Driver.Alias, + FirstName: v.Driver.FirstName, + LastName: v.Driver.LastName, + Grade: v.Driver.Grade, + Picture: v.Driver.Picture, + Gender: v.Driver.Gender, + VerifiedIdentity: v.Driver.VerifiedIdentity, + } + response = append(response, temp) + } + resp.DriverJourneys = response + return resp, nil +} + func (s *SolidarityServiceServerImpl) GetAllPassengers( ctx context.Context, _ *emptypb.Empty) (resp *proto.GetAllPassengersResponse, err error) { passengers, err := s.Handler.GetAllPassengers(context.Background()) resp = &proto.GetAllPassengersResponse{ @@ -245,7 +268,7 @@ func (s *SolidarityServiceServerImpl) CreateBookingSolidarity(ctx context.Contex }, Pickup_date: req.Booking.PickupDate.Seconds, } - driver, err := s.Handler.CreateBooking(context.Background(), bookingRequest) //passenger, + passenger, driver, err := s.Handler.CreateBooking(context.Background(), bookingRequest) if err != nil { if strings.Contains(err.Error(), utils.SQL_DUPLICATE) { err = errors.New("ID is already used") @@ -275,7 +298,14 @@ func (s *SolidarityServiceServerImpl) CreateBookingSolidarity(ctx context.Contex }, Passenger: &proto.User{ Id: req.Booking.PassengerId, - }, + Alias: passenger.Passenger.Alias, + FirstName: passenger.Passenger.FirstName, + LastName: passenger.Passenger.LastName, + Grade: passenger.Passenger.Grade, + Picture: passenger.Passenger.Picture, + Gender: passenger.Passenger.Gender, + VerifiedIdentity: passenger.Passenger.VerifiedIdentity, + }, PassengerPickupDate: ×tamp.Timestamp{ Seconds: bookingRequest.Pickup_date, }, @@ -359,6 +389,13 @@ func (s *SolidarityServiceServerImpl) GetBookingSolidarity(ctx context.Context, }, Passenger: &proto.User{ Id: booking.Passenger.ID, + Alias: booking.Passenger.Alias, + FirstName: booking.Passenger.FirstName, + LastName: booking.Passenger.LastName, + Grade: booking.Passenger.Grade, + Picture: booking.Passenger.Picture, + Gender: booking.Passenger.Gender, + VerifiedIdentity: booking.Passenger.VerifiedIdentity, }, PassengerPickupDate: ×tamp.Timestamp{ Seconds: booking.Pickup_date, diff --git a/storage/postgresql.go b/storage/postgresql.go index 6efeaeb..03f0139 100644 --- a/storage/postgresql.go +++ b/storage/postgresql.go @@ -575,13 +575,13 @@ func (s PostgresqlStorage) GetBooking(id string) (booking internal.Booking, err log.Error().Err(err).Msg(errMsg) return internal.Booking{}, errors.New(errMsg + err.Error()) } - // passenger, err := s.GetPassenger(booking.Passenger.ID) - // if err != nil { - // errMsg := "Postgresql Storage GetBooking Error getting passenger" - // log.Error().Err(err).Msg(errMsg) - // return booking, errors.New(errMsg + err.Error()) - // } - // booking.Passenger = passenger.Passenger + passenger, err := s.GetPassenger(booking.Passenger.ID) + if err != nil { + errMsg := "Postgresql Storage GetBooking Error getting passenger" + log.Error().Err(err).Msg(errMsg) + return booking, errors.New(errMsg + err.Error()) + } + booking.Passenger = passenger.Passenger driver, err := s.GetDriver(booking.Driver.ID) if err != nil { errMsg := "Postgresql Storage GetBooking Error getting driver" @@ -677,20 +677,20 @@ func (s PostgresqlStorage) populateBookingDetails(booking internal.Booking, depa errCh := make(chan error, 4) // Buffered channel to handle potential errors // Concurrently fetch passenger information - // wg.Add(1) - // go func() { - // defer wg.Done() + wg.Add(1) + go func() { + defer wg.Done() - // passenger, err := s.GetPassenger(booking.Passenger.ID) - // if err != nil { - // errCh <- fmt.Errorf("Postgresql Storage GetBooking Error getting passenger: %w", err) - // return - // } + passenger, err := s.GetPassenger(booking.Passenger.ID) + if err != nil { + errCh <- fmt.Errorf("Postgresql Storage GetBooking Error getting passenger: %w", err) + return + } - // mu.Lock() - // booking.Passenger = passenger.Passenger - // mu.Unlock() - // }() + mu.Lock() + booking.Passenger = passenger.Passenger + mu.Unlock() + }() // Concurrently fetch driver information wg.Add(1) @@ -754,7 +754,64 @@ func (s PostgresqlStorage) populateBookingDetails(booking internal.Booking, depa return booking, nil } -func (s PostgresqlStorage) GetAllDrivers(date int64) (drivers []internal.Driver, err error) { +func (s PostgresqlStorage) GetAllDrivers( ) (drivers []internal.Driver, err error) { + rows, err := s.DbConnection.Query(fmt.Sprintf("SELECT driver_id, driver_departure_route, driver_radius, last_name, first_name, grade, alias, picture, verified_identity, preferences, availabilities_type, availabilities, operator, car FROM %s", s.Tables["drivers"])) + + fmt.Println("test; ; ; ; ", rows) + if err != nil { + return nil, err + } + defer rows.Close() + + for rows.Next() { + var driver internal.Driver + var departureRoute []byte + var preferencesJSON []byte + var availabilitiesJSON []byte + var carJSON []byte + + if err := rows.Scan( + &driver.Driver.ID, + &departureRoute, + &driver.Radius, + &driver.Driver.LastName, + &driver.Driver.FirstName, + &driver.Driver.Grade, + &driver.Driver.Alias, + &driver.Driver.Picture, + &driver.Driver.VerifiedIdentity, + &preferencesJSON, + &driver.AvailabilitiesType, + &availabilitiesJSON, + &driver.Driver.Operator, + &carJSON, + ); err != nil { + return nil, err + } + + if err := json.Unmarshal(departureRoute, &driver.Driver_departure_address); err != nil { + return nil, err + } + if err := json.Unmarshal(preferencesJSON, &driver.Preferences); err != nil { + return nil, err + } + if err := json.Unmarshal(carJSON, &driver.Car); err != nil { + return nil, err + } + + drivers = append(drivers, driver) + + } + + if err := rows.Err(); err != nil { + return nil, err + } + + return drivers, nil +} + + +func (s PostgresqlStorage) GetAllDriversByDate(date int64) (drivers []internal.Driver, err error) { rows, err := s.DbConnection.Query(fmt.Sprintf("SELECT driver_id, driver_departure_route, driver_radius, last_name, first_name, grade, alias, picture, verified_identity, preferences, availabilities_type, availabilities, operator, car FROM %s", s.Tables["drivers"])) if err != nil { return nil, err @@ -880,7 +937,7 @@ func (s PostgresqlStorage) GetAllDrivers(date int64) (drivers []internal.Driver, } func (s PostgresqlStorage) DriverJourneys(departure_route *geojson.Feature, departure_date int64) (drivers []internal.Driver, err error) { - allDrivers, err := s.GetAllDrivers(departure_date) + allDrivers, err := s.GetAllDriversByDate(departure_date) if err != nil { return nil, err } diff --git a/storage/storage.go b/storage/storage.go index e7b6689..89a38be 100644 --- a/storage/storage.go +++ b/storage/storage.go @@ -18,8 +18,9 @@ type Storage interface { UpdateBookingStatus(id string, status internal.BookingStatus) (err error) FilterUserBookingsByStatus(user_type string, status internal.BookingStatus, user_id string) (bookings []internal.Booking, err error) DriverJourneys(departure_route *geojson.Feature, departure_date int64) (drivers []internal.Driver, err error) - GetAllDrivers(date int64) (drivers []internal.Driver, err error) - } + GetAllDriversByDate(date int64) (drivers []internal.Driver, err error) + GetAllDrivers() (drivers []internal.Driver, err error) + } func NewStorage(cfg *viper.Viper) (Storage, error) { var (