diff --git a/.gitignore b/.gitignore index f702e7b..f77345f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ config.yaml .vscode +.idea __debug_bin \ No newline at end of file diff --git a/go.mod b/go.mod index d10bb34..09f32df 100644 --- a/go.mod +++ b/go.mod @@ -3,21 +3,29 @@ module git.coopgo.io/coopgo-platform/agenda go 1.18 require ( - github.com/golang/protobuf v1.5.2 + ariga.io/atlas v0.12.0 + github.com/golang/protobuf v1.5.3 + github.com/google/go-cmp v0.5.8 github.com/google/uuid v1.3.0 + github.com/lib/pq v1.10.9 github.com/spf13/viper v1.12.0 go.mongodb.org/mongo-driver v1.10.1 google.golang.org/grpc v1.48.0 - google.golang.org/protobuf v1.28.1 + google.golang.org/protobuf v1.31.0 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 ) require ( + github.com/agext/levenshtein v1.2.1 // indirect + github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect github.com/fsnotify/fsnotify v1.5.4 // indirect + github.com/go-openapi/inflect v0.19.0 // indirect github.com/golang/snappy v0.0.1 // indirect github.com/hashicorp/hcl v1.0.0 // indirect + github.com/hashicorp/hcl/v2 v2.10.0 // indirect github.com/klauspost/compress v1.13.6 // indirect github.com/magiconair/properties v1.8.6 // indirect + github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect github.com/pelletier/go-toml v1.9.5 // indirect @@ -32,11 +40,12 @@ require ( github.com/xdg-go/scram v1.1.1 // indirect github.com/xdg-go/stringprep v1.0.3 // indirect github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect + github.com/zclconf/go-cty v1.8.0 // indirect golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 // indirect golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect - golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect - golang.org/x/text v0.3.7 // indirect + golang.org/x/sys v0.5.0 // indirect + golang.org/x/text v0.8.0 // indirect google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd // indirect gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect gopkg.in/ini.v1 v1.66.4 // indirect diff --git a/go.sum b/go.sum index af72b8b..e39c8b3 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,5 @@ +ariga.io/atlas v0.12.0 h1:jDfjxT3ppKhzqLS26lZv9ni7p9TVNrhy7SQquaF7bPs= +ariga.io/atlas v0.12.0/go.mod h1:+TR129FJZ5Lvzms6dvCeGWh1yR6hMvmXBhug4hrNIGk= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= @@ -38,7 +40,14 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= +github.com/agext/levenshtein v1.2.1 h1:QmvMAjj2aEICytGiWzmxoE0x2KZvE0fvmqMOfy2tjT8= +github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM= +github.com/apparentlymart/go-textseg v1.0.0/go.mod h1:z96Txxhf3xSFMPmb5X/1W05FF/Nj9VFpLOpjS5yuumk= +github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw= +github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= @@ -69,6 +78,10 @@ github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeME github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-openapi/inflect v0.19.0 h1:9jCH9scKIbHeV9m12SmPilScz6krDxKRasNNSNPXu/4= +github.com/go-openapi/inflect v0.19.0/go.mod h1:lHpZVlpIQqLyKwJ4N+YSc9hchQy/i12fJykb83CRBH4= +github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68= +github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -80,6 +93,7 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= +github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -95,8 +109,9 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -113,6 +128,7 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= +github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -138,6 +154,8 @@ github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hashicorp/hcl/v2 v2.10.0 h1:1S1UnuhDGlv3gRFV4+0EdwB+znNP5HmcGbIqwnSCByg= +github.com/hashicorp/hcl/v2 v2.10.0/go.mod h1:FwWsfWEjyV/CMj8s/gqAuiviY72rJ1/oayI9WftqcKg= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= @@ -151,8 +169,14 @@ github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 h1:MtvEpTB6LX3vkb4ax0b5D2DHbNAUsen0Gx5wZoq3lV4= +github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= +github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= +github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 h1:DpOJ2HYzCv8LZP15IdmG+YdwD2luVPHITV96TkirNBM= +github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe h1:iruDEfMl2E6fbMZ9s0scYfZQ84/6SPL6zC8ACM2oIL0= @@ -170,12 +194,15 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1: github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= +github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= +github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo= github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= +github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.12.0 h1:CZ7eSOd3kZoaYDLbXnmzgQI5RlciuXBMA+18HwHRfZQ= @@ -192,6 +219,9 @@ github.com/subosito/gotenv v1.3.0 h1:mjC+YW8QpAdXibNi+vNWgzmgBH4+5l5dCXv8cNysBLI github.com/subosito/gotenv v1.3.0/go.mod h1:YzJjq/33h7nrwdY+iHMhEOEEbW0ovIz0tB6t6PwAXzs= github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= +github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= +github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+NXzzngzBKDPIqw4= +github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= github.com/xdg-go/scram v1.1.1 h1:VOMT+81stJgXW3CpHyqHN3AXDYIMsx56mEFrB37Mb/E= @@ -204,6 +234,10 @@ github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/zclconf/go-cty v1.2.0/go.mod h1:hOPWgoHbaTUnI5k4D2ld+GRpFJSCe6bCM7m1q/N4PQ8= +github.com/zclconf/go-cty v1.8.0 h1:s4AvqaeQzJIu3ndv4gVIhplVD0krU+bgrcLSVUnaWuA= +github.com/zclconf/go-cty v1.8.0/go.mod h1:vVKLxnk3puL4qRAv72AO+W99LUD4da90g3uUAzyuvAk= +github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b/go.mod h1:ZRKQfBXbGkpdV6QMzT3rU1kSTAnfu1dO8dPKjYprgj8= go.mongodb.org/mongo-driver v1.10.1 h1:NujsPveKwHaWuKUer/ceo9DzEe7HIj1SlJ6uvXZG0S4= go.mongodb.org/mongo-driver v1.10.1/go.mod h1:z4XpeoU6w+9Vht+jAFyLgVrD+jGSQQe0+CBWFHNiHt8= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= @@ -214,6 +248,7 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -256,6 +291,7 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -316,6 +352,7 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -349,8 +386,8 @@ golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7w 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-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -360,8 +397,9 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68= +golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -516,8 +554,8 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= -google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= 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-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= diff --git a/grpcapi/agenda.pb.go b/grpcapi/agenda.pb.go index 4d27540..2594f4e 100644 --- a/grpcapi/agenda.pb.go +++ b/grpcapi/agenda.pb.go @@ -2,7 +2,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 +// protoc-gen-go v1.31.0 // protoc v3.12.4 // source: agenda.proto @@ -832,6 +832,100 @@ func (x *UpdateEventResponse) GetEvent() *Event { return nil } +type GetSubscriptionByUserRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Subscriber string `protobuf:"bytes,54,opt,name=subscriber,proto3" json:"subscriber,omitempty"` +} + +func (x *GetSubscriptionByUserRequest) Reset() { + *x = GetSubscriptionByUserRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_agenda_proto_msgTypes[16] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *GetSubscriptionByUserRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*GetSubscriptionByUserRequest) ProtoMessage() {} + +func (x *GetSubscriptionByUserRequest) ProtoReflect() protoreflect.Message { + mi := &file_agenda_proto_msgTypes[16] + 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 GetSubscriptionByUserRequest.ProtoReflect.Descriptor instead. +func (*GetSubscriptionByUserRequest) Descriptor() ([]byte, []int) { + return file_agenda_proto_rawDescGZIP(), []int{16} +} + +func (x *GetSubscriptionByUserRequest) GetSubscriber() string { + if x != nil { + return x.Subscriber + } + return "" +} + +type GetSubscriptionByUserResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Subscription []*Subscription `protobuf:"bytes,55,rep,name=subscription,proto3" json:"subscription,omitempty"` +} + +func (x *GetSubscriptionByUserResponse) Reset() { + *x = GetSubscriptionByUserResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_agenda_proto_msgTypes[17] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *GetSubscriptionByUserResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*GetSubscriptionByUserResponse) ProtoMessage() {} + +func (x *GetSubscriptionByUserResponse) ProtoReflect() protoreflect.Message { + mi := &file_agenda_proto_msgTypes[17] + 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 GetSubscriptionByUserResponse.ProtoReflect.Descriptor instead. +func (*GetSubscriptionByUserResponse) Descriptor() ([]byte, []int) { + return file_agenda_proto_rawDescGZIP(), []int{17} +} + +func (x *GetSubscriptionByUserResponse) GetSubscription() []*Subscription { + if x != nil { + return x.Subscription + } + return nil +} + var File_agenda_proto protoreflect.FileDescriptor var file_agenda_proto_rawDesc = []byte{ @@ -907,43 +1001,58 @@ var file_agenda_proto_rawDesc = []byte{ 0x0a, 0x13, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1c, 0x0a, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x35, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x05, 0x65, 0x76, - 0x65, 0x6e, 0x74, 0x32, 0x86, 0x04, 0x0a, 0x06, 0x41, 0x67, 0x65, 0x6e, 0x64, 0x61, 0x12, 0x3a, - 0x0a, 0x0b, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x13, 0x2e, - 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x14, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x31, 0x0a, 0x08, 0x47, 0x65, - 0x74, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x10, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x76, 0x65, 0x6e, - 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x11, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x76, - 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x34, 0x0a, - 0x09, 0x47, 0x65, 0x74, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x11, 0x2e, 0x47, 0x65, 0x74, - 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x12, 0x2e, - 0x47, 0x65, 0x74, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x22, 0x00, 0x12, 0x3a, 0x0a, 0x0b, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x45, 0x76, 0x65, - 0x6e, 0x74, 0x12, 0x13, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x14, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, + 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x0a, 0x1c, 0x47, 0x65, 0x74, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, + 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x79, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, + 0x72, 0x18, 0x36, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, + 0x62, 0x65, 0x72, 0x22, 0x52, 0x0a, 0x1d, 0x47, 0x65, 0x74, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, + 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x79, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x31, 0x0a, 0x0c, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x70, + 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x37, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x53, 0x75, 0x62, + 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x73, 0x75, 0x62, 0x73, 0x63, + 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x32, 0xe0, 0x04, 0x0a, 0x06, 0x41, 0x67, 0x65, 0x6e, + 0x64, 0x61, 0x12, 0x3a, 0x0a, 0x0b, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x76, 0x65, 0x6e, + 0x74, 0x12, 0x13, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x14, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, + 0x76, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x31, + 0x0a, 0x08, 0x47, 0x65, 0x74, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x10, 0x2e, 0x47, 0x65, 0x74, + 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x11, 0x2e, 0x47, + 0x65, 0x74, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, + 0x00, 0x12, 0x34, 0x0a, 0x09, 0x47, 0x65, 0x74, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x11, + 0x2e, 0x47, 0x65, 0x74, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x1a, 0x12, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x3a, 0x0a, 0x0b, 0x44, 0x65, 0x6c, 0x65, 0x74, + 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x13, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x45, + 0x76, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x14, 0x2e, 0x44, 0x65, + 0x6c, 0x65, 0x74, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x22, 0x00, 0x12, 0x3a, 0x0a, 0x0b, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x45, 0x76, 0x65, + 0x6e, 0x74, 0x12, 0x13, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x14, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, - 0x3a, 0x0a, 0x0b, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x13, - 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x14, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x45, 0x76, 0x65, 0x6e, - 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x43, 0x0a, 0x0e, 0x53, - 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x16, 0x2e, - 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, - 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, - 0x12, 0x49, 0x0a, 0x10, 0x55, 0x6e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x45, - 0x76, 0x65, 0x6e, 0x74, 0x12, 0x18, 0x2e, 0x55, 0x6e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, - 0x62, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, - 0x2e, 0x55, 0x6e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x45, 0x76, 0x65, 0x6e, - 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4f, 0x0a, 0x12, 0x44, - 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, - 0x6e, 0x12, 0x1a, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, - 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, - 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, - 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x2e, 0x5a, 0x2c, - 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, 0x61, 0x67, - 0x65, 0x6e, 0x64, 0x61, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x61, 0x70, 0x69, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x43, 0x0a, 0x0e, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x45, 0x76, 0x65, 0x6e, + 0x74, 0x12, 0x16, 0x2e, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x45, 0x76, 0x65, + 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x53, 0x75, 0x62, 0x73, + 0x63, 0x72, 0x69, 0x62, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x22, 0x00, 0x12, 0x49, 0x0a, 0x10, 0x55, 0x6e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, + 0x69, 0x62, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x18, 0x2e, 0x55, 0x6e, 0x73, 0x75, 0x62, + 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x55, 0x6e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, + 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, + 0x4f, 0x0a, 0x12, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, + 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x75, + 0x62, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x1a, 0x1b, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, + 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, + 0x12, 0x58, 0x0a, 0x15, 0x47, 0x65, 0x74, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, + 0x69, 0x6f, 0x6e, 0x42, 0x79, 0x55, 0x73, 0x65, 0x72, 0x12, 0x1d, 0x2e, 0x47, 0x65, 0x74, 0x53, + 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x79, 0x55, 0x73, 0x65, + 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x75, + 0x62, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x79, 0x55, 0x73, 0x65, 0x72, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x2e, 0x5a, 0x2c, 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, 0x61, 0x67, 0x65, 0x6e, + 0x64, 0x61, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x61, 0x70, 0x69, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( @@ -958,60 +1067,66 @@ func file_agenda_proto_rawDescGZIP() []byte { return file_agenda_proto_rawDescData } -var file_agenda_proto_msgTypes = make([]protoimpl.MessageInfo, 16) +var file_agenda_proto_msgTypes = make([]protoimpl.MessageInfo, 18) var file_agenda_proto_goTypes = []interface{}{ - (*CreateEventRequest)(nil), // 0: CreateEventRequest - (*CreateEventResponse)(nil), // 1: CreateEventResponse - (*GetEventRequest)(nil), // 2: GetEventRequest - (*GetEventResponse)(nil), // 3: GetEventResponse - (*DeleteEventRequest)(nil), // 4: DeleteEventRequest - (*DeleteEventResponse)(nil), // 5: DeleteEventResponse - (*GetEventsRequest)(nil), // 6: GetEventsRequest - (*GetEventsResponse)(nil), // 7: GetEventsResponse - (*SubscribeEventRequest)(nil), // 8: SubscribeEventRequest - (*SubscribeEventResponse)(nil), // 9: SubscribeEventResponse - (*UnsubscribeEventRequest)(nil), // 10: UnsubscribeEventRequest - (*UnsubscribeEventResponse)(nil), // 11: UnsubscribeEventResponse - (*DeleteSubscriptionRequest)(nil), // 12: DeleteSubscriptionRequest - (*DeleteSubscriptionResponse)(nil), // 13: DeleteSubscriptionResponse - (*UpdateEventRequest)(nil), // 14: UpdateEventRequest - (*UpdateEventResponse)(nil), // 15: UpdateEventResponse - (*Event)(nil), // 16: Event - (*timestamp.Timestamp)(nil), // 17: google.protobuf.Timestamp - (*_struct.Struct)(nil), // 18: google.protobuf.Struct + (*CreateEventRequest)(nil), // 0: CreateEventRequest + (*CreateEventResponse)(nil), // 1: CreateEventResponse + (*GetEventRequest)(nil), // 2: GetEventRequest + (*GetEventResponse)(nil), // 3: GetEventResponse + (*DeleteEventRequest)(nil), // 4: DeleteEventRequest + (*DeleteEventResponse)(nil), // 5: DeleteEventResponse + (*GetEventsRequest)(nil), // 6: GetEventsRequest + (*GetEventsResponse)(nil), // 7: GetEventsResponse + (*SubscribeEventRequest)(nil), // 8: SubscribeEventRequest + (*SubscribeEventResponse)(nil), // 9: SubscribeEventResponse + (*UnsubscribeEventRequest)(nil), // 10: UnsubscribeEventRequest + (*UnsubscribeEventResponse)(nil), // 11: UnsubscribeEventResponse + (*DeleteSubscriptionRequest)(nil), // 12: DeleteSubscriptionRequest + (*DeleteSubscriptionResponse)(nil), // 13: DeleteSubscriptionResponse + (*UpdateEventRequest)(nil), // 14: UpdateEventRequest + (*UpdateEventResponse)(nil), // 15: UpdateEventResponse + (*GetSubscriptionByUserRequest)(nil), // 16: GetSubscriptionByUserRequest + (*GetSubscriptionByUserResponse)(nil), // 17: GetSubscriptionByUserResponse + (*Event)(nil), // 18: Event + (*timestamp.Timestamp)(nil), // 19: google.protobuf.Timestamp + (*_struct.Struct)(nil), // 20: google.protobuf.Struct + (*Subscription)(nil), // 21: Subscription } var file_agenda_proto_depIdxs = []int32{ - 16, // 0: CreateEventRequest.event:type_name -> Event - 16, // 1: CreateEventResponse.event:type_name -> Event - 16, // 2: GetEventResponse.event:type_name -> Event - 17, // 3: GetEventsRequest.mindate:type_name -> google.protobuf.Timestamp - 17, // 4: GetEventsRequest.maxdate:type_name -> google.protobuf.Timestamp - 16, // 5: GetEventsResponse.events:type_name -> Event - 18, // 6: SubscribeEventRequest.data:type_name -> google.protobuf.Struct - 18, // 7: DeleteSubscriptionRequest.data:type_name -> google.protobuf.Struct - 16, // 8: UpdateEventRequest.event:type_name -> Event - 16, // 9: UpdateEventResponse.event:type_name -> Event - 0, // 10: Agenda.CreateEvent:input_type -> CreateEventRequest - 2, // 11: Agenda.GetEvent:input_type -> GetEventRequest - 6, // 12: Agenda.GetEvents:input_type -> GetEventsRequest - 4, // 13: Agenda.DeleteEvent:input_type -> DeleteEventRequest - 14, // 14: Agenda.UpdateEvent:input_type -> UpdateEventRequest - 8, // 15: Agenda.SubscribeEvent:input_type -> SubscribeEventRequest - 10, // 16: Agenda.UnsubscribeEvent:input_type -> UnsubscribeEventRequest - 12, // 17: Agenda.DeleteSubscription:input_type -> DeleteSubscriptionRequest - 1, // 18: Agenda.CreateEvent:output_type -> CreateEventResponse - 3, // 19: Agenda.GetEvent:output_type -> GetEventResponse - 7, // 20: Agenda.GetEvents:output_type -> GetEventsResponse - 5, // 21: Agenda.DeleteEvent:output_type -> DeleteEventResponse - 15, // 22: Agenda.UpdateEvent:output_type -> UpdateEventResponse - 9, // 23: Agenda.SubscribeEvent:output_type -> SubscribeEventResponse - 11, // 24: Agenda.UnsubscribeEvent:output_type -> UnsubscribeEventResponse - 13, // 25: Agenda.DeleteSubscription:output_type -> DeleteSubscriptionResponse - 18, // [18:26] is the sub-list for method output_type - 10, // [10:18] is the sub-list for method input_type - 10, // [10:10] is the sub-list for extension type_name - 10, // [10:10] is the sub-list for extension extendee - 0, // [0:10] is the sub-list for field type_name + 18, // 0: CreateEventRequest.event:type_name -> Event + 18, // 1: CreateEventResponse.event:type_name -> Event + 18, // 2: GetEventResponse.event:type_name -> Event + 19, // 3: GetEventsRequest.mindate:type_name -> google.protobuf.Timestamp + 19, // 4: GetEventsRequest.maxdate:type_name -> google.protobuf.Timestamp + 18, // 5: GetEventsResponse.events:type_name -> Event + 20, // 6: SubscribeEventRequest.data:type_name -> google.protobuf.Struct + 20, // 7: DeleteSubscriptionRequest.data:type_name -> google.protobuf.Struct + 18, // 8: UpdateEventRequest.event:type_name -> Event + 18, // 9: UpdateEventResponse.event:type_name -> Event + 21, // 10: GetSubscriptionByUserResponse.subscription:type_name -> Subscription + 0, // 11: Agenda.CreateEvent:input_type -> CreateEventRequest + 2, // 12: Agenda.GetEvent:input_type -> GetEventRequest + 6, // 13: Agenda.GetEvents:input_type -> GetEventsRequest + 4, // 14: Agenda.DeleteEvent:input_type -> DeleteEventRequest + 14, // 15: Agenda.UpdateEvent:input_type -> UpdateEventRequest + 8, // 16: Agenda.SubscribeEvent:input_type -> SubscribeEventRequest + 10, // 17: Agenda.UnsubscribeEvent:input_type -> UnsubscribeEventRequest + 12, // 18: Agenda.DeleteSubscription:input_type -> DeleteSubscriptionRequest + 16, // 19: Agenda.GetSubscriptionByUser:input_type -> GetSubscriptionByUserRequest + 1, // 20: Agenda.CreateEvent:output_type -> CreateEventResponse + 3, // 21: Agenda.GetEvent:output_type -> GetEventResponse + 7, // 22: Agenda.GetEvents:output_type -> GetEventsResponse + 5, // 23: Agenda.DeleteEvent:output_type -> DeleteEventResponse + 15, // 24: Agenda.UpdateEvent:output_type -> UpdateEventResponse + 9, // 25: Agenda.SubscribeEvent:output_type -> SubscribeEventResponse + 11, // 26: Agenda.UnsubscribeEvent:output_type -> UnsubscribeEventResponse + 13, // 27: Agenda.DeleteSubscription:output_type -> DeleteSubscriptionResponse + 17, // 28: Agenda.GetSubscriptionByUser:output_type -> GetSubscriptionByUserResponse + 20, // [20:29] is the sub-list for method output_type + 11, // [11:20] is the sub-list for method input_type + 11, // [11:11] is the sub-list for extension type_name + 11, // [11:11] is the sub-list for extension extendee + 0, // [0:11] is the sub-list for field type_name } func init() { file_agenda_proto_init() } @@ -1213,6 +1328,30 @@ func file_agenda_proto_init() { return nil } } + file_agenda_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*GetSubscriptionByUserRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_agenda_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*GetSubscriptionByUserResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -1220,7 +1359,7 @@ func file_agenda_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_agenda_proto_rawDesc, NumEnums: 0, - NumMessages: 16, + NumMessages: 18, NumExtensions: 0, NumServices: 1, }, diff --git a/grpcapi/agenda.proto b/grpcapi/agenda.proto index 029fcfc..abde27e 100644 --- a/grpcapi/agenda.proto +++ b/grpcapi/agenda.proto @@ -17,6 +17,7 @@ service Agenda { rpc SubscribeEvent(SubscribeEventRequest) returns (SubscribeEventResponse) {} rpc UnsubscribeEvent(UnsubscribeEventRequest) returns (UnsubscribeEventResponse) {} rpc DeleteSubscription(DeleteSubscriptionRequest) returns (DeleteSubscriptionResponse) {} + rpc GetSubscriptionByUser(GetSubscriptionByUserRequest) returns (GetSubscriptionByUserResponse) {} } message CreateEventRequest { @@ -88,4 +89,12 @@ message UpdateEventRequest { message UpdateEventResponse { Event event = 53; -} \ No newline at end of file +} + +message GetSubscriptionByUserRequest { + string subscriber = 54; +} + +message GetSubscriptionByUserResponse { + repeated Subscription subscription = 55; +} diff --git a/grpcapi/agenda_grpc.pb.go b/grpcapi/agenda_grpc.pb.go index 37a1a03..ea44e38 100644 --- a/grpcapi/agenda_grpc.pb.go +++ b/grpcapi/agenda_grpc.pb.go @@ -1,6 +1,8 @@ +//COOPGO Agenda gRPC service definition + // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 +// - protoc-gen-go-grpc v1.3.0 // - protoc v3.12.4 // source: agenda.proto @@ -18,6 +20,18 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + Agenda_CreateEvent_FullMethodName = "/Agenda/CreateEvent" + Agenda_GetEvent_FullMethodName = "/Agenda/GetEvent" + Agenda_GetEvents_FullMethodName = "/Agenda/GetEvents" + Agenda_DeleteEvent_FullMethodName = "/Agenda/DeleteEvent" + Agenda_UpdateEvent_FullMethodName = "/Agenda/UpdateEvent" + Agenda_SubscribeEvent_FullMethodName = "/Agenda/SubscribeEvent" + Agenda_UnsubscribeEvent_FullMethodName = "/Agenda/UnsubscribeEvent" + Agenda_DeleteSubscription_FullMethodName = "/Agenda/DeleteSubscription" + Agenda_GetSubscriptionByUser_FullMethodName = "/Agenda/GetSubscriptionByUser" +) + // AgendaClient is the client API for Agenda service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -30,6 +44,7 @@ type AgendaClient interface { SubscribeEvent(ctx context.Context, in *SubscribeEventRequest, opts ...grpc.CallOption) (*SubscribeEventResponse, error) UnsubscribeEvent(ctx context.Context, in *UnsubscribeEventRequest, opts ...grpc.CallOption) (*UnsubscribeEventResponse, error) DeleteSubscription(ctx context.Context, in *DeleteSubscriptionRequest, opts ...grpc.CallOption) (*DeleteSubscriptionResponse, error) + GetSubscriptionByUser(ctx context.Context, in *GetSubscriptionByUserRequest, opts ...grpc.CallOption) (*GetSubscriptionByUserResponse, error) } type agendaClient struct { @@ -42,7 +57,7 @@ func NewAgendaClient(cc grpc.ClientConnInterface) AgendaClient { func (c *agendaClient) CreateEvent(ctx context.Context, in *CreateEventRequest, opts ...grpc.CallOption) (*CreateEventResponse, error) { out := new(CreateEventResponse) - err := c.cc.Invoke(ctx, "/Agenda/CreateEvent", in, out, opts...) + err := c.cc.Invoke(ctx, Agenda_CreateEvent_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -51,7 +66,7 @@ func (c *agendaClient) CreateEvent(ctx context.Context, in *CreateEventRequest, func (c *agendaClient) GetEvent(ctx context.Context, in *GetEventRequest, opts ...grpc.CallOption) (*GetEventResponse, error) { out := new(GetEventResponse) - err := c.cc.Invoke(ctx, "/Agenda/GetEvent", in, out, opts...) + err := c.cc.Invoke(ctx, Agenda_GetEvent_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -60,7 +75,7 @@ func (c *agendaClient) GetEvent(ctx context.Context, in *GetEventRequest, opts . func (c *agendaClient) GetEvents(ctx context.Context, in *GetEventsRequest, opts ...grpc.CallOption) (*GetEventsResponse, error) { out := new(GetEventsResponse) - err := c.cc.Invoke(ctx, "/Agenda/GetEvents", in, out, opts...) + err := c.cc.Invoke(ctx, Agenda_GetEvents_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -69,7 +84,7 @@ func (c *agendaClient) GetEvents(ctx context.Context, in *GetEventsRequest, opts func (c *agendaClient) DeleteEvent(ctx context.Context, in *DeleteEventRequest, opts ...grpc.CallOption) (*DeleteEventResponse, error) { out := new(DeleteEventResponse) - err := c.cc.Invoke(ctx, "/Agenda/DeleteEvent", in, out, opts...) + err := c.cc.Invoke(ctx, Agenda_DeleteEvent_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -78,7 +93,7 @@ func (c *agendaClient) DeleteEvent(ctx context.Context, in *DeleteEventRequest, func (c *agendaClient) UpdateEvent(ctx context.Context, in *UpdateEventRequest, opts ...grpc.CallOption) (*UpdateEventResponse, error) { out := new(UpdateEventResponse) - err := c.cc.Invoke(ctx, "/Agenda/UpdateEvent", in, out, opts...) + err := c.cc.Invoke(ctx, Agenda_UpdateEvent_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -87,7 +102,7 @@ func (c *agendaClient) UpdateEvent(ctx context.Context, in *UpdateEventRequest, func (c *agendaClient) SubscribeEvent(ctx context.Context, in *SubscribeEventRequest, opts ...grpc.CallOption) (*SubscribeEventResponse, error) { out := new(SubscribeEventResponse) - err := c.cc.Invoke(ctx, "/Agenda/SubscribeEvent", in, out, opts...) + err := c.cc.Invoke(ctx, Agenda_SubscribeEvent_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -96,7 +111,7 @@ func (c *agendaClient) SubscribeEvent(ctx context.Context, in *SubscribeEventReq func (c *agendaClient) UnsubscribeEvent(ctx context.Context, in *UnsubscribeEventRequest, opts ...grpc.CallOption) (*UnsubscribeEventResponse, error) { out := new(UnsubscribeEventResponse) - err := c.cc.Invoke(ctx, "/Agenda/UnsubscribeEvent", in, out, opts...) + err := c.cc.Invoke(ctx, Agenda_UnsubscribeEvent_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -105,7 +120,16 @@ func (c *agendaClient) UnsubscribeEvent(ctx context.Context, in *UnsubscribeEven func (c *agendaClient) DeleteSubscription(ctx context.Context, in *DeleteSubscriptionRequest, opts ...grpc.CallOption) (*DeleteSubscriptionResponse, error) { out := new(DeleteSubscriptionResponse) - err := c.cc.Invoke(ctx, "/Agenda/DeleteSubscription", in, out, opts...) + err := c.cc.Invoke(ctx, Agenda_DeleteSubscription_FullMethodName, in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *agendaClient) GetSubscriptionByUser(ctx context.Context, in *GetSubscriptionByUserRequest, opts ...grpc.CallOption) (*GetSubscriptionByUserResponse, error) { + out := new(GetSubscriptionByUserResponse) + err := c.cc.Invoke(ctx, Agenda_GetSubscriptionByUser_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -124,6 +148,7 @@ type AgendaServer interface { SubscribeEvent(context.Context, *SubscribeEventRequest) (*SubscribeEventResponse, error) UnsubscribeEvent(context.Context, *UnsubscribeEventRequest) (*UnsubscribeEventResponse, error) DeleteSubscription(context.Context, *DeleteSubscriptionRequest) (*DeleteSubscriptionResponse, error) + GetSubscriptionByUser(context.Context, *GetSubscriptionByUserRequest) (*GetSubscriptionByUserResponse, error) mustEmbedUnimplementedAgendaServer() } @@ -155,6 +180,9 @@ func (UnimplementedAgendaServer) UnsubscribeEvent(context.Context, *UnsubscribeE func (UnimplementedAgendaServer) DeleteSubscription(context.Context, *DeleteSubscriptionRequest) (*DeleteSubscriptionResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method DeleteSubscription not implemented") } +func (UnimplementedAgendaServer) GetSubscriptionByUser(context.Context, *GetSubscriptionByUserRequest) (*GetSubscriptionByUserResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetSubscriptionByUser not implemented") +} func (UnimplementedAgendaServer) mustEmbedUnimplementedAgendaServer() {} // UnsafeAgendaServer may be embedded to opt out of forward compatibility for this service. @@ -178,7 +206,7 @@ func _Agenda_CreateEvent_Handler(srv interface{}, ctx context.Context, dec func( } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/Agenda/CreateEvent", + FullMethod: Agenda_CreateEvent_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AgendaServer).CreateEvent(ctx, req.(*CreateEventRequest)) @@ -196,7 +224,7 @@ func _Agenda_GetEvent_Handler(srv interface{}, ctx context.Context, dec func(int } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/Agenda/GetEvent", + FullMethod: Agenda_GetEvent_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AgendaServer).GetEvent(ctx, req.(*GetEventRequest)) @@ -214,7 +242,7 @@ func _Agenda_GetEvents_Handler(srv interface{}, ctx context.Context, dec func(in } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/Agenda/GetEvents", + FullMethod: Agenda_GetEvents_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AgendaServer).GetEvents(ctx, req.(*GetEventsRequest)) @@ -232,7 +260,7 @@ func _Agenda_DeleteEvent_Handler(srv interface{}, ctx context.Context, dec func( } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/Agenda/DeleteEvent", + FullMethod: Agenda_DeleteEvent_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AgendaServer).DeleteEvent(ctx, req.(*DeleteEventRequest)) @@ -250,7 +278,7 @@ func _Agenda_UpdateEvent_Handler(srv interface{}, ctx context.Context, dec func( } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/Agenda/UpdateEvent", + FullMethod: Agenda_UpdateEvent_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AgendaServer).UpdateEvent(ctx, req.(*UpdateEventRequest)) @@ -268,7 +296,7 @@ func _Agenda_SubscribeEvent_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/Agenda/SubscribeEvent", + FullMethod: Agenda_SubscribeEvent_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AgendaServer).SubscribeEvent(ctx, req.(*SubscribeEventRequest)) @@ -286,7 +314,7 @@ func _Agenda_UnsubscribeEvent_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/Agenda/UnsubscribeEvent", + FullMethod: Agenda_UnsubscribeEvent_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AgendaServer).UnsubscribeEvent(ctx, req.(*UnsubscribeEventRequest)) @@ -304,7 +332,7 @@ func _Agenda_DeleteSubscription_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/Agenda/DeleteSubscription", + FullMethod: Agenda_DeleteSubscription_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AgendaServer).DeleteSubscription(ctx, req.(*DeleteSubscriptionRequest)) @@ -312,6 +340,24 @@ func _Agenda_DeleteSubscription_Handler(srv interface{}, ctx context.Context, de return interceptor(ctx, in, info, handler) } +func _Agenda_GetSubscriptionByUser_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GetSubscriptionByUserRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(AgendaServer).GetSubscriptionByUser(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Agenda_GetSubscriptionByUser_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(AgendaServer).GetSubscriptionByUser(ctx, req.(*GetSubscriptionByUserRequest)) + } + return interceptor(ctx, in, info, handler) +} + // Agenda_ServiceDesc is the grpc.ServiceDesc for Agenda service. // It's only intended for direct use with grpc.RegisterService, // and not to be introspected or modified (even as a copy) @@ -351,6 +397,10 @@ var Agenda_ServiceDesc = grpc.ServiceDesc{ MethodName: "DeleteSubscription", Handler: _Agenda_DeleteSubscription_Handler, }, + { + MethodName: "GetSubscriptionByUser", + Handler: _Agenda_GetSubscriptionByUser_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "agenda.proto", diff --git a/grpcapi/events.pb.go b/grpcapi/events.pb.go index 31f2d94..b87e791 100644 --- a/grpcapi/events.pb.go +++ b/grpcapi/events.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 +// protoc-gen-go v1.31.0 // protoc v3.12.4 // source: events.proto @@ -203,10 +203,11 @@ type Subscription struct { unknownFields protoimpl.UnknownFields Id string `protobuf:"bytes,20,opt,name=id,proto3" json:"id,omitempty"` - Subscriber string `protobuf:"bytes,21,opt,name=subscriber,proto3" json:"subscriber,omitempty"` - Tags []string `protobuf:"bytes,22,rep,name=tags,proto3" json:"tags,omitempty"` - Data *_struct.Struct `protobuf:"bytes,23,opt,name=data,proto3" json:"data,omitempty"` - CreatedAt *timestamp.Timestamp `protobuf:"bytes,24,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"` + Eventid string `protobuf:"bytes,21,opt,name=eventid,proto3" json:"eventid,omitempty"` + Subscriber string `protobuf:"bytes,22,opt,name=subscriber,proto3" json:"subscriber,omitempty"` + Tags []string `protobuf:"bytes,23,rep,name=tags,proto3" json:"tags,omitempty"` + Data *_struct.Struct `protobuf:"bytes,24,opt,name=data,proto3" json:"data,omitempty"` + CreatedAt *timestamp.Timestamp `protobuf:"bytes,25,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"` } func (x *Subscription) Reset() { @@ -248,6 +249,13 @@ func (x *Subscription) GetId() string { return "" } +func (x *Subscription) GetEventid() string { + if x != nil { + return x.Eventid + } + return "" +} + func (x *Subscription) GetSubscriber() string { if x != nil { return x.Subscriber @@ -322,22 +330,24 @@ var file_events_proto_rawDesc = []byte{ 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x18, 0x11, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x64, 0x65, 0x6c, 0x65, - 0x74, 0x65, 0x64, 0x22, 0xba, 0x01, 0x0a, 0x0c, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x70, + 0x74, 0x65, 0x64, 0x22, 0xd4, 0x01, 0x0a, 0x0c, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x14, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x02, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, - 0x65, 0x72, 0x18, 0x15, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, - 0x69, 0x62, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x61, 0x67, 0x73, 0x18, 0x16, 0x20, 0x03, - 0x28, 0x09, 0x52, 0x04, 0x74, 0x61, 0x67, 0x73, 0x12, 0x2b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, - 0x18, 0x17, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, - 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x39, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, - 0x5f, 0x61, 0x74, 0x18, 0x18, 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, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, - 0x42, 0x2e, 0x5a, 0x2c, 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, 0x61, 0x67, 0x65, 0x6e, 0x64, 0x61, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x61, 0x70, 0x69, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x18, + 0x15, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x12, 0x1e, + 0x0a, 0x0a, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x72, 0x18, 0x16, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x0a, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x72, 0x12, 0x12, + 0x0a, 0x04, 0x74, 0x61, 0x67, 0x73, 0x18, 0x17, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x74, 0x61, + 0x67, 0x73, 0x12, 0x2b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x18, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, + 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, + 0x39, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x19, 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, + 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x42, 0x2e, 0x5a, 0x2c, 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, 0x61, 0x67, 0x65, 0x6e, + 0x64, 0x61, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x61, 0x70, 0x69, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( diff --git a/grpcapi/events.proto b/grpcapi/events.proto index 7e4391c..a3bd117 100644 --- a/grpcapi/events.proto +++ b/grpcapi/events.proto @@ -27,8 +27,9 @@ message Event { message Subscription { string id = 20; - string subscriber = 21; - repeated string tags = 22; - google.protobuf.Struct data = 23; - google.protobuf.Timestamp created_at = 24; + string eventid = 21; + string subscriber = 22; + repeated string tags = 23; + google.protobuf.Struct data = 24; + google.protobuf.Timestamp created_at = 25; } \ No newline at end of file diff --git a/grpcapi/grpcapi.go b/grpcapi/grpcapi.go index bed5594..942477f 100644 --- a/grpcapi/grpcapi.go +++ b/grpcapi/grpcapi.go @@ -8,11 +8,14 @@ import ( "time" "git.coopgo.io/coopgo-platform/agenda/handlers" + "git.coopgo.io/coopgo-platform/agenda/storage" + timestamp "github.com/golang/protobuf/ptypes/timestamp" "github.com/spf13/viper" "google.golang.org/grpc" codes "google.golang.org/grpc/codes" "google.golang.org/grpc/reflection" status "google.golang.org/grpc/status" + "google.golang.org/protobuf/types/known/structpb" ) type AgendaServerImpl struct { @@ -95,6 +98,76 @@ func (s AgendaServerImpl) UnsubscribeEvent(context.Context, *UnsubscribeEventReq return nil, status.Errorf(codes.Unimplemented, "method Unsubscribe not implemented") } +///////////////////////////////////////////////////////////////////////////////////////// + +func ConvertStorageToProtoSubscription(storageSubs []*storage.Subscription) ([]*Subscription, error) { + var protoSubs []*Subscription + for _, storageSub := range storageSubs { + dataStruct, err := ConvertMapToStruct(storageSub.Data) + if err != nil { + return nil, err + } + + protoSub := &Subscription{ + Id: storageSub.ID, + Eventid: storageSub.EventID, + Subscriber: storageSub.Subscriber, + Tags: storageSub.Tags, + CreatedAt: ×tamp.Timestamp{Seconds: storageSub.CreatedAt.Unix()}, + Data: dataStruct, + } + protoSubs = append(protoSubs, protoSub) + } + + return protoSubs, nil +} + +// ConvertMapToStruct converts a map[string]interface{} to a google.protobuf.Struct +func ConvertMapToStruct(dataMap map[string]interface{}) (*structpb.Struct, error) { + fields := make(map[string]*structpb.Value) + for key, value := range dataMap { + fieldValue, err := structpb.NewValue(value) + if err != nil { + return nil, err + } + fields[key] = fieldValue + } + + return &structpb.Struct{ + Fields: fields, + }, nil +} + +func (s AgendaServerImpl) GetSubscriptionByUser(ctx context.Context, req *GetSubscriptionByUserRequest) (*GetSubscriptionByUserResponse, error) { + results, err := s.handler.GetSubscriptionByUser(req.Subscriber) + if err != nil { + fmt.Println(err) + return nil, status.Errorf(codes.NotFound, "could not get subscriptions : %v", err) + } + var subscriptions []*storage.Subscription + for _, result := range results { + if err != nil { + fmt.Println(err) + return nil, status.Errorf(codes.Internal, "could not get subscriptions : %v", err) + } + subscription := &storage.Subscription{ + ID: result.ID, + EventID: result.EventID, + Subscriber: result.Subscriber, + Tags: result.Tags, + Data: result.Data, + CreatedAt: result.CreatedAt, + } + subscriptions = append(subscriptions, subscription) + } + sub, err := ConvertStorageToProtoSubscription(subscriptions) + if err != nil { + fmt.Println(err) + return nil, status.Errorf(codes.Internal, "could not get subscriptions : %v", err) + } + return &GetSubscriptionByUserResponse{Subscription: sub}, nil +} + //////////////////////////////////////////////////////////// func (s AgendaServerImpl) DeleteSubscription(ctx context.Context, req *DeleteSubscriptionRequest) (*DeleteSubscriptionResponse, error) { err := s.handler.DeleteSubscription(req.Eventid, req.Subscriber, req.Data.AsMap()) diff --git a/handlers/events.go b/handlers/events.go index dafd3a8..6a6e907 100644 --- a/handlers/events.go +++ b/handlers/events.go @@ -100,3 +100,14 @@ func (h AgendaHandler) UpdateEvent(event storage.Event) (*storage.Event, error) return &event, nil } + +func (h AgendaHandler) GetSubscriptionByUser(subscriber string) (results []storage.Subscription, err error) { + if subscriber == "" { + return nil, errors.New("missing subscriber") + } + results, err = h.storage.GetSubscriptionByUser(subscriber) + if err != nil { + return nil, err + } + return results, nil +} diff --git a/storage/events.go b/storage/events.go index e16c0b3..cb2e88d 100644 --- a/storage/events.go +++ b/storage/events.go @@ -24,6 +24,7 @@ type Event struct { type Subscription struct { ID string `json:"id" bson:"_id"` + EventID string `json:"event_id"` Subscriber string `json:"subscriber"` Tags []string `json:"tags"` CreatedAt time.Time `json:"created_at,omitempty"` diff --git a/storage/mongodb.go b/storage/mongodb.go index 89b3c02..e3cbe6d 100644 --- a/storage/mongodb.go +++ b/storage/mongodb.go @@ -153,3 +153,11 @@ func (s MongoDBStorage) UpdateEvent(event Event) error { return nil } + +func (psql MongoDBStorage) GetSubscriber(subscriber string) ([]Subscription, error) { + return nil, nil +} + +func (psql MongoDBStorage) GetSubscriptionByUser(subscriber string) ([]Subscription, error) { + return nil, nil +} diff --git a/storage/postgresql.go b/storage/postgresql.go new file mode 100644 index 0000000..dc5bc03 --- /dev/null +++ b/storage/postgresql.go @@ -0,0 +1,560 @@ +package storage + +import ( + "context" + "database/sql" + "encoding/json" + "fmt" + "os" + "strconv" + + "ariga.io/atlas/sql/postgres" + "ariga.io/atlas/sql/schema" + "github.com/lib/pq" + "github.com/spf13/viper" +) + +type PostgresqlStorage struct { + DbConnection *sql.DB + Schema string + Tables map[string]string +} + +func NewPostgresqlStorage(cfg *viper.Viper) (PostgresqlStorage, error) { + var ( + host = cfg.GetString("storage.db.psql.host") + port = cfg.GetString("storage.db.psql.port") + user = cfg.GetString("storage.db.psql.user") + password = cfg.GetString("storage.db.psql.password") + dbname = cfg.GetString("storage.db.psql.dbname") + sslmode = cfg.GetString("storage.db.psql.sslmode") + pg_schema = cfg.GetString("storage.db.psql.schema") + pgtables_event = cfg.GetString("storage.db.psql.tables.event") + pgtables_subscription = cfg.GetString("storage.db.psql.tables.subscription") + timezone = "Europe/Paris" + ) + portInt, _ := strconv.Atoi(port) + psqlconn := fmt.Sprintf("host=%s port=%d user=%s password=%s dbname=%s sslmode=%s TimeZone=%s", host, portInt, + user, password, dbname, sslmode, timezone) + db, err := sql.Open("postgres", psqlconn) + if err != nil { + fmt.Println("error", err) + return PostgresqlStorage{}, fmt.Errorf("connection to postgresql failed") + } + err = db.Ping() + if err != nil { + fmt.Println(err) + return PostgresqlStorage{}, fmt.Errorf("connection to postgresql database failed") + } + return PostgresqlStorage{ + DbConnection: db, + Schema: pg_schema, + Tables: map[string]string{ + "event": fmt.Sprintf("%s.%s", pg_schema, pgtables_event), + "subscription": fmt.Sprintf("%s.%s", pg_schema, pgtables_subscription), + }, + }, nil +} + +func (psql PostgresqlStorage) CreateEvent(e Event) error { + tx, err := psql.DbConnection.Begin() + if err != nil { + return err + } + defer func() { + if err != nil { + tx.Rollback() + return + } + tx.Commit() + }() + dataEvent, err := json.Marshal(e.Data) + if err != nil { + return err + } + + deletedSubscriptionsJSON, err := json.Marshal(e.DeletedSubscription) + if err != nil { + return err + } + + eventQuery := fmt.Sprintf(` + INSERT INTO %s (id, namespace, owners, restricted_to, type, name, description, startdate, + enddate, starttime, endtime, allday, maxsubscribers, data, deleted, deletedsubscriptions) + VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16) + `, psql.Tables["event"]) + + ownersArray, err := pq.Array(e.Owners).Value() + if err != nil { + return err + } + + restrictedToArray, err := pq.Array(e.RestrictedTo).Value() + if err != nil { + return err + } + _, err = tx.Exec( + eventQuery, + e.ID, + e.Namespace, + ownersArray, + restrictedToArray, + e.Type, + e.Name, + e.Description, + e.Startdate, + e.Enddate, + e.Starttime, + e.Endtime, + e.Allday, + e.MaxSubscribers, + dataEvent, + e.Deleted, + deletedSubscriptionsJSON, + ) + + if err != nil { + return err + } + for _, subscription := range e.Subscriptions { + subscriptionQuery := fmt.Sprintf(` + INSERT INTO %s (id, event_id, subscriber, tags, created_at, data) + VALUES ($1, $2, $3, $4, $5, $6) + `, psql.Tables["subscription"]) + dataSubscription, err := json.Marshal(subscription.Data) + if err != nil { + return err + } + tagsArray, err := pq.Array(subscription.Tags).Value() + if err != nil { + return err + } + _, err = tx.Exec( + subscriptionQuery, + subscription.ID, + e.ID, + subscription.Subscriber, + tagsArray, + subscription.CreatedAt, + dataSubscription, + ) + + if err != nil { + return err + } + } + return nil +} + +func (psql PostgresqlStorage) GetEvent(eventID string) (*Event, error) { + var event Event + eventQuery := fmt.Sprintf(` + SELECT id, namespace, owners, restricted_to, type, name, description, startdate, + enddate, starttime, endtime, allday, maxsubscribers, data, deleted, deletedsubscriptions + FROM %s + WHERE id = $1 + `, psql.Tables["event"]) + row := psql.DbConnection.QueryRow(eventQuery, eventID) + owners := pq.StringArray{} + restrictedTo := pq.StringArray{} + dataEvent := []byte{} + deletedSubscriptions := []byte{} + err := row.Scan( + &event.ID, + &event.Namespace, + &owners, + &restrictedTo, + &event.Type, + &event.Name, + &event.Description, + &event.Startdate, + &event.Enddate, + &event.Starttime, + &event.Endtime, + &event.Allday, + &event.MaxSubscribers, + &dataEvent, + &event.Deleted, + &deletedSubscriptions, + ) + if err != nil { + return nil, err + } + event.Owners = []string(owners) + event.RestrictedTo = []string(restrictedTo) + data := make(map[string]any) + err = json.Unmarshal(dataEvent, &data) + if err != nil { + return nil, err + } + event.Data = data + subscriptions, err := psql.GetSubscription(eventID) + if err != nil { + return nil, err + } + event.Subscriptions = subscriptions + deletedSubs := []Subscription{} + err = json.Unmarshal(deletedSubscriptions, &deletedSubs) + if err != nil { + return nil, err + } + event.DeletedSubscription = deletedSubs + return &event, nil +} + +func (psql PostgresqlStorage) GetEvents(namespaces []string) ([]Event, error) { + var events []Event + eventQuery := fmt.Sprintf(` + SELECT id, namespace, owners, restricted_to, type, name, description, startdate, + enddate, starttime, endtime, allday, maxsubscribers, data, deletedsubscriptions, deleted + FROM %s + WHERE namespace = ANY($1::text[]) + `, psql.Tables["event"]) + rows, err := psql.DbConnection.Query(eventQuery, pq.Array(namespaces)) + if err != nil { + return nil, err + } + defer rows.Close() + for rows.Next() { + var event Event + var owners pq.StringArray + var restrictedTo pq.StringArray + var dataEvent []byte + var deletedSubscriptions []byte + err := rows.Scan( + &event.ID, + &event.Namespace, + &owners, + &restrictedTo, + &event.Type, + &event.Name, + &event.Description, + &event.Startdate, + &event.Enddate, + &event.Starttime, + &event.Endtime, + &event.Allday, + &event.MaxSubscribers, + &dataEvent, + &deletedSubscriptions, + &event.Deleted, + ) + if err != nil { + return nil, err + } + event.Owners = []string(owners) + event.RestrictedTo = []string(restrictedTo) + err = json.Unmarshal(dataEvent, &event.Data) + if err != nil { + return nil, err + } + event.Subscriptions, err = psql.GetSubscription(event.ID) + if err != nil { + return nil, err + } + err = json.Unmarshal(deletedSubscriptions, &event.DeletedSubscription) + if err != nil { + return nil, err + } + events = append(events, event) + } + return events, nil +} + +func (psql PostgresqlStorage) UpdateEvent(e Event) error { + tx, err := psql.DbConnection.Begin() + if err != nil { + return err + } + defer func() { + if err != nil { + tx.Rollback() + return + } + tx.Commit() + }() + dataEvent, err := json.Marshal(e.Data) + if err != nil { + return err + } + deletedSubscriptions, err := json.Marshal(e.DeletedSubscription) + if err != nil { + return err + } + eventQuery := fmt.Sprintf(` + UPDATE %s + SET namespace = $2, + owners = $3, + restricted_to = $4, + type = $5, + name = $6, + description = $7, + startdate = $8, + enddate = $9, + starttime = $10, + endtime = $11, + allday = $12, + maxsubscribers = $13, + data = $14, + deleted = $15, + deletedsubscriptions = $16 + WHERE id = $1 + `, psql.Tables["event"]) + + ownersArray, err := pq.Array(e.Owners).Value() + if err != nil { + return err + } + + restrictedToArray, err := pq.Array(e.RestrictedTo).Value() + if err != nil { + return err + } + _, err = tx.Exec( + eventQuery, + e.ID, + e.Namespace, + ownersArray, + restrictedToArray, + e.Type, + e.Name, + e.Description, + e.Startdate, + e.Enddate, + e.Starttime, + e.Endtime, + e.Allday, + e.MaxSubscribers, + dataEvent, + e.Deleted, + deletedSubscriptions, + ) + + if err != nil { + return err + } + + for _, subscription := range e.Subscriptions { + subscriptionQuery := fmt.Sprintf(` + UPDATE %s + SET subscriber = $2, + tags = $3, + data = $4, + created_at= $5 + WHERE event_id = $1 + `, psql.Tables["subscription"]) + + dataSubscription, err := json.Marshal(subscription.Data) + if err != nil { + return err + } + tagsArray, err := pq.Array(subscription.Tags).Value() + if err != nil { + return err + } + _, err = tx.Exec( + subscriptionQuery, + e.ID, + subscription.Subscriber, + tagsArray, + dataSubscription, + subscription.CreatedAt, + ) + + if err != nil { + return err + } + } + + return nil + +} + +func (psql PostgresqlStorage) AddSubscription(eventid string, subscription Subscription) error { + tags := pq.Array(subscription.Tags) + data, err := json.Marshal(subscription.Data) + if err != nil { + return err + } + _, err = psql.DbConnection.Exec(fmt.Sprintf(` + INSERT INTO %s (id, event_id, subscriber, tags, created_at, data) + VALUES ($1, $2, $3, $4, $5, $6) + `, psql.Tables["subscription"]), + subscription.ID, + eventid, + subscription.Subscriber, + tags, + subscription.CreatedAt, + data, + ) + return err +} + +func (psql PostgresqlStorage) UpdateSubscription(eventid string, subscriber string, deletesubscription Subscription) error { + tx, err := psql.DbConnection.Begin() + if err != nil { + return err + } + defer func() { + if err != nil { + tx.Rollback() + return + } + tx.Commit() + }() + + subscriptionQuery := fmt.Sprintf(` + DELETE FROM %s + WHERE event_id = $1 AND subscriber = $2 + `, psql.Tables["subscription"]) + _, err = tx.Exec( + subscriptionQuery, + eventid, + subscriber, + ) + if err != nil { + fmt.Println(err) + return err + } + eventQuery := fmt.Sprintf(` + UPDATE %s + SET deletedsubscriptions = deletedsubscriptions || $1 + WHERE id = $2 +`, psql.Tables["event"]) + deletedSubscriptions, err := json.Marshal(deletesubscription) + if err != nil { + fmt.Println(err) + return err + } + _, err = tx.Exec( + eventQuery, + deletedSubscriptions, + eventid, + ) + if err != nil { + fmt.Println(err) + return err + } + + return nil +} + +func (psql PostgresqlStorage) GetSubscription(eventID string) ([]Subscription, error) { + var subscriptions []Subscription + subscriptionQuery := fmt.Sprintf(` + SELECT id, subscriber, tags, created_at, data + FROM %s + WHERE event_id = $1 + `, psql.Tables["subscription"]) + rows, err := psql.DbConnection.Query(subscriptionQuery, eventID) + if err != nil { + return nil, err + } + defer rows.Close() + for rows.Next() { + var subscription Subscription + var tags pq.StringArray + var dataSubscription []byte + err := rows.Scan( + &subscription.ID, + &subscription.Subscriber, + &tags, + &subscription.CreatedAt, + &dataSubscription, + ) + if err != nil { + return nil, err + } + subscription.Tags = []string(tags) + data := make(map[string]any) + err = json.Unmarshal(dataSubscription, &data) + if err != nil { + return nil, err + } + subscription.Data = data + subscriptions = append(subscriptions, subscription) + } + return subscriptions, nil +} + +func (psql PostgresqlStorage) GetSubscriber(subscriber string) ([]Subscription, error) { + var subscriptions []Subscription + subscriptionQuery := fmt.Sprintf("SELECT id, event_id, subscriber, tags, created_at, data FROM %s WHERE subscriber = $1", psql.Tables["subscription"]) + rows, err := psql.DbConnection.Query(subscriptionQuery, subscriber) + if err != nil { + fmt.Println(err) + return nil, err + } + defer rows.Close() + for rows.Next() { + var subscription Subscription + var tags pq.StringArray + var dataSubscription []byte + err := rows.Scan( + &subscription.ID, + &subscription.EventID, + &subscription.Subscriber, + &tags, + &subscription.CreatedAt, + &dataSubscription, + ) + if err != nil { + fmt.Println(err) + return nil, err + } + subscription.Tags = []string(tags) + data := make(map[string]any) + err = json.Unmarshal(dataSubscription, &data) + if err != nil { + fmt.Println(err) + return nil, err + } + subscription.Data = data + subscriptions = append(subscriptions, subscription) + } + return subscriptions, nil +} + +func (psql PostgresqlStorage) GetSubscriptionByUser(subscriber string) ([]Subscription, error) { + events, err := psql.GetSubscriber(subscriber) + if err != nil { + panic(err) + } + return events, nil +} + +func (psql PostgresqlStorage) Migrate() error { + ctx := context.Background() + driver, err := postgres.Open(psql.DbConnection) + if err != nil { + return err + } + existing, err := driver.InspectRealm(ctx, &schema.InspectRealmOption{Schemas: []string{psql.Schema}}) + if err != nil { + return err + } + + var desired schema.Realm + + hcl, err := os.ReadFile("postgresql/schema.hcl") + if err != nil { + return err + } + + err = postgres.EvalHCLBytes(hcl, &desired, nil) + if err != nil { + return err + } + + diff, err := driver.RealmDiff(existing, &desired) + if err != nil { + return err + } + + err = driver.ApplyChanges(ctx, diff) + if err != nil { + return err + } + + return nil +} diff --git a/storage/postgresql/schema.hcl b/storage/postgresql/schema.hcl new file mode 100644 index 0000000..86d5eb9 --- /dev/null +++ b/storage/postgresql/schema.hcl @@ -0,0 +1,110 @@ +table "event" { + schema = schema.agenda + column "id" { + null = false + type = uuid + } + column "namespace" { + null = true + type = text + } + column "owners" { + null = true + type = sql("text[]") + } + column "restricted_to" { + null = true + type = sql("text[]") + } + column "type" { + null = true + type = text + } + column "name" { + null = true + type = text + } + column "description" { + null = true + type = text + } + column "startdate" { + null = true + type = timestamptz + } + column "enddate" { + null = true + type = timestamptz + } + column "starttime" { + null = true + type = text + } + column "endtime" { + null = true + type = text + } + column "allday" { + null = true + type = boolean + } + column "maxsubscribers" { + null = true + type = bigint + } + column "data" { + null = true + type = jsonb + } + column "deleted" { + null = true + type = boolean + } + + column "deletedsubscriptions" { + null = true + type = jsonb + } + primary_key { + columns = [column.id] + } +} +table "subscription" { + schema = schema.agenda + column "id" { + null = false + type = uuid + } + column "event_id" { + null = true + type = uuid + } + column "subscriber" { + null = true + type = text + } + column "tags" { + null = true + type = sql("text[]") + } + column "created_at" { + null = true + type = timestamptz + } + column "data" { + null = true + type = jsonb + } + primary_key { + columns = [column.id] + } + foreign_key "subscription_event_id_fkey" { + columns = [column.event_id] + ref_columns = [table.event.column.id] + on_update = NO_ACTION + on_delete = NO_ACTION + } +} + +schema "agenda" { +} \ No newline at end of file diff --git a/storage/postgresql_test.go b/storage/postgresql_test.go new file mode 100644 index 0000000..8b8e36c --- /dev/null +++ b/storage/postgresql_test.go @@ -0,0 +1,278 @@ +package storage + +import ( + "context" + "fmt" + "testing" + "time" + + "github.com/google/go-cmp/cmp" + "github.com/google/uuid" + "github.com/spf13/viper" +) + +var cfg *viper.Viper + +var date, _ = time.Parse(time.RFC3339Nano, "2023-05-04T16:00:50.165419+02:00") +var event = Event{ + ID: uuid.New().String(), + Namespace: "test_namespace", + Owners: []string{"owners", "owners"}, + RestrictedTo: []string{"restricted_to", "restricted_to"}, + Type: "type", + Name: "test", + Description: "description", + Startdate: date, + Enddate: date, + Starttime: "starttime", + Endtime: "endtime", + Allday: false, + MaxSubscribers: 23, + Subscriptions: []Subscription{ + { + ID: uuid.NewString(), + Subscriber: "subscriber1", + Tags: []string{"tag1", "tag2"}, + CreatedAt: date, + Data: map[string]any{ + "test": "test", + }, + }, + }, + DeletedSubscription: []Subscription{ + { + ID: uuid.NewString(), + Subscriber: "subscriber_deleted", + Tags: []string{"tag1", "tag2"}, + CreatedAt: date, + Data: map[string]any{ + "deleted": "deleted", + }, + }, + }, + Data: map[string]any{ + "data": "data", + }, + Deleted: false, +} +var event1 = Event{ + ID: uuid.New().String(), + Namespace: "test_namespace", + Owners: []string{"owners", "owners"}, + RestrictedTo: []string{"restricted_to", "restricted_to"}, + Type: "type", + Name: "test", + Description: "description", + Startdate: date, + Enddate: date, + Starttime: "starttime", + Endtime: "endtime", + Allday: false, + MaxSubscribers: 23, + Subscriptions: []Subscription{ + { + ID: uuid.NewString(), + Subscriber: "subscriber1", + Tags: []string{"tag1", "tag2"}, + CreatedAt: date, + Data: map[string]any{ + "test": "test", + }, + }, + }, + DeletedSubscription: []Subscription{ + { + ID: uuid.NewString(), + Subscriber: "subscriber_deleted", + Tags: []string{"tag1", "tag2"}, + CreatedAt: date, + Data: map[string]any{ + "deleted": "deleted", + }, + }, + }, + Data: map[string]any{ + "data": "data", + }, + Deleted: false, +} + +func init() { + cfg = viper.New() + cfg.SetDefault("storage.db.psql.host", "localhost") + cfg.SetDefault("storage.db.psql.port", "5432") + cfg.SetDefault("storage.db.psql.user", "postgres") + cfg.SetDefault("storage.db.psql.password", "postgres") + cfg.SetDefault("storage.db.psql.dbname", "coopgo_platform") + cfg.SetDefault("storage.db.psql.sslmode", "disable") + cfg.SetDefault("storage.db.psql.schema", "agenda") + cfg.SetDefault("storage.db.psql.tables.event", "event") + cfg.SetDefault("storage.db.psql.tables.subscription", "subscription") + cfg.SetConfigName("config") // Override default values in a config.yaml file within this directory + cfg.AddConfigPath(".") + cfg.ReadInConfig() +} + +func TestPostgresqlStorage_Initialize(t *testing.T) { + storage, err := NewPostgresqlStorage(cfg) + if err != nil { + t.Errorf("error creating new PostgreSQL storage: %v", err) + } + defer storage.DbConnection.Close() + + err = storage.Migrate() + if err != nil { + t.Errorf("database migration issue: %v", err) + return + } + + tx, err := storage.DbConnection.BeginTx(context.Background(), nil) + if err != nil { + t.Errorf("transaction issue: %v", err) + return + } + defer tx.Rollback() + _, err = tx.Exec(fmt.Sprintf("DELETE FROM %s;", storage.Tables["subscription"])) + if err != nil { + t.Errorf("delete accounts subscription issue: %v", err) + return + } + _, err = tx.Exec(fmt.Sprintf("DELETE FROM %s;", storage.Tables["event"])) + if err != nil { + t.Errorf("delete accounts event issue: %v", err) + return + } + if err = tx.Commit(); err != nil { + t.Errorf("commit transaction issue: %v", err) + return + } +} + +func TestPostgresqlStorage_CreateAndGetEvent(t *testing.T) { + storage, err := NewPostgresqlStorage(cfg) + if err != nil { + t.Errorf("error creating new PostgreSQL storage: %v", err) + } + err = storage.CreateEvent(event) + if err != nil { + t.Error(err) + } + retrieved_event, err := storage.GetEvent(event.ID) + if err != nil { + t.Error(err) + } + diff := cmp.Diff(&event, retrieved_event) + if diff != "" { + fmt.Printf("The retrieved event differs from the original event:\n%s", diff) + t.Fail() + } +} + +func TestPostgresqlStorage_GetEvents(t *testing.T) { + storage, err := NewPostgresqlStorage(cfg) + if err != nil { + t.Errorf("error creating new PostgreSQL storage: %v", err) + } + event.Namespace = "test" + err = storage.CreateEvent(event) + if err != nil { + t.Error(err) + } + event1.Namespace = "test1" + err = storage.CreateEvent(event1) + if err != nil { + t.Error(err) + } + events, err := storage.GetEvents([]string{"test", "test1"}) + if err != nil { + t.Error(err) + } + diff := cmp.Diff(events, []Event{event, event1}) + if diff != "" { + fmt.Printf("The retrieved event differs from the original event:\n%s", diff) + t.Fail() + } + +} + +func TestPostgresqlStorage_AddSubscription(t *testing.T) { + storage, err := NewPostgresqlStorage(cfg) + if err != nil { + t.Errorf("error creating new PostgreSQL storage: %v", err) + } + err = storage.CreateEvent(event) + if err != nil { + t.Error(err) + } + subscription := Subscription{ + ID: uuid.NewString(), + Subscriber: "salim", + Tags: []string{"tag"}, + CreatedAt: date, + Data: map[string]any{"data": "data"}, + } + err = storage.AddSubscription(event.ID, subscription) + stored_event, err := storage.GetEvent(event.ID) + if err != nil { + t.Error(err) + } + expected_event := Event{ + ID: event.ID, + Namespace: event.Namespace, + Owners: event.Owners, + RestrictedTo: event.RestrictedTo, + Type: event.Type, + Name: event.Name, + Description: event.Description, + Startdate: event.Startdate, + Enddate: event.Enddate, + Starttime: event.Starttime, + Endtime: event.Endtime, + Allday: event.Allday, + MaxSubscribers: event.MaxSubscribers, + Subscriptions: []Subscription{event.Subscriptions[0], subscription}, + DeletedSubscription: event.DeletedSubscription, + Data: event.Data, + Deleted: event.Deleted, + } + diff := cmp.Diff(stored_event, &expected_event) + if diff != "" { + fmt.Printf("The retrieved event differs from the original event:\n%s", diff) + t.Fail() + } + +} + +func TestPostgresqlStorage_UpdateEvent(t *testing.T) { + storage, err := NewPostgresqlStorage(cfg) + if err != nil { + t.Errorf("error creating new PostgreSQL storage: %v", err) + } + err = storage.CreateEvent(event) + if err != nil { + t.Error(err) + } + subscription := Subscription{ + ID: event.Subscriptions[0].ID, + Subscriber: "updated", + Tags: []string{"tag"}, + CreatedAt: date, + Data: map[string]any{"data": "data"}, + } + event.Subscriptions[0] = subscription + + err = storage.UpdateEvent(event) + if err != nil { + t.Error(err) + } + retrieved_event, err := storage.GetEvent(event.ID) + if err != nil { + t.Error(err) + } + diff := cmp.Diff(retrieved_event, &event) + if diff != "" { + fmt.Printf("The retrieved event differs from the original event:\n%s", diff) + t.Fail() + } + +} diff --git a/storage/storage.go b/storage/storage.go index d63710d..cba82e7 100644 --- a/storage/storage.go +++ b/storage/storage.go @@ -13,6 +13,7 @@ type Storage interface { AddSubscription(eventid string, subscription Subscription) error UpdateSubscription(eventid string, subscriber string, deletesubscription Subscription) error UpdateEvent(Event) error + GetSubscriptionByUser(subscriber string) ([]Subscription, error) } type StorageImpl struct { } @@ -26,6 +27,9 @@ func NewStorage(cfg *viper.Viper) (Storage, error) { case "mongodb": s, err := NewMongoDBStorage(cfg) return s, err + case "psql": + s, err := NewPostgresqlStorage(cfg) + return s, err default: return nil, fmt.Errorf("storage type %v is not supported", storage_type) }