diff --git a/go.mod b/go.mod index 89a9e09..f1c8b7a 100644 --- a/go.mod +++ b/go.mod @@ -7,6 +7,7 @@ require ( github.com/getkin/kin-openapi v0.116.0 github.com/go-resty/resty/v2 v2.7.0 github.com/golang-jwt/jwt/v5 v5.0.0 + github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 github.com/joho/godotenv v1.5.1 github.com/labstack/echo/v4 v4.10.2 github.com/sethvargo/go-envconfig v0.9.0 diff --git a/go.sum b/go.sum index 418c682..01c1d0f 100644 --- a/go.sum +++ b/go.sum @@ -1,17 +1,29 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/RaveNoX/go-jsoncommentstrip v1.0.0/go.mod h1:78ihd09MekBnJnxpICcwzCMzGrKSKYe4AqU6PDYYpjk= github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ= github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk= +github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/benbjohnson/clock v1.3.3 h1:g+rSsSaAzhHJYcIQE78hJ3AhyjjtQvleKDjlhdBnIhc= github.com/benbjohnson/clock v1.3.3/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/deepmap/oapi-codegen v1.12.4 h1:pPmn6qI9MuOtCz82WY2Xaw46EQjgvxednXXrP7g5Q2s= github.com/deepmap/oapi-codegen v1.12.4/go.mod h1:3lgHGMu6myQ2vqbbTXH2H1o4eXFTGnFiDaOaKKl5yas= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/getkin/kin-openapi v0.116.0 h1:o986hwgMzR972JzOG5j6+WTwWqllZLs1EJKMKCivs2E= github.com/getkin/kin-openapi v0.116.0/go.mod h1:l5e9PaFUo9fyLJCPGQeXI2ML8c3P8BHOEV2VaAVf/pc= +github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= +github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= @@ -20,18 +32,27 @@ github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/ github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= github.com/go-resty/resty/v2 v2.7.0 h1:me+K9p3uhSmXtrBZ4k9jcEAfJmuC8IivWHwaLZwPrFY= github.com/go-resty/resty/v2 v2.7.0/go.mod h1:9PWDzw47qPphMRFfhsyk0NnSgvluHcljSMVIq3w7q0I= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-test/deep v1.0.8 h1:TDsG77qcSprGbC6vTN8OuXp5g+J+b5Pcguhf7Zt61VM= github.com/go-test/deep v1.0.8/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE= +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 v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= github.com/golang-jwt/jwt/v5 v5.0.0 h1:1n1XNM9hk7O9mnQoNBGolZvzebBQ7p93ULHRc28XJUE= github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= 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/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb h1:PBC98N2aIaM3XXiurYmW7fx4GZkL8feAMVq7nEjURHk= github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= @@ -40,6 +61,8 @@ github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= +github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI= +github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8= github.com/invopop/yaml v0.1.0 h1:YW3WGUoJEXYfzWBjn00zIlrw7brGVD0fUKRYDPAPhrc= github.com/invopop/yaml v0.1.0/go.mod h1:2XuRLgs/ouIrW3XNzuNj7J3Nvu/Dig5MXvbCEdiBN3Q= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= @@ -47,9 +70,12 @@ github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwA github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d/go.mod h1:2PavIy+JPciBPrBUjwbNvtwB6RQlve+hkpll6QSNmOE= +github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/klauspost/compress v1.16.5 h1:IFV2oUNUzZaz+XyusxpLzpzS8Pt5rh0Z16For/djlyI= github.com/klauspost/compress v1.16.5/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= @@ -77,22 +103,29 @@ github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe h1:iruDEfMl2E6fbMZ9s0scYfZQ84/6SPL6zC8ACM2oIL0= github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= +github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/perimeterx/marshmallow v1.1.4 h1:pZLDH9RjlLGGorbXhcaQLhfuV0pFMNfPO55FuFkxqLw= github.com/perimeterx/marshmallow v1.1.4/go.mod h1:dsXbUu8CRzfYP5a87xpp0xq9S3u0Vchtcl8we9tYaXw= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= +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 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/sethvargo/go-envconfig v0.9.0 h1:Q6FQ6hVEeTECULvkJZakq3dZMeBQ3JUpcKMfPQbKMDE= github.com/sethvargo/go-envconfig v0.9.0/go.mod h1:Iz1Gy1Sf3T64TQlJSvee81qDhf7YIlt8GMUX6yyNFs0= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= @@ -119,36 +152,74 @@ github.com/xdg-go/stringprep v1.0.3 h1:kdwGpVNwPFtjs98xCGkHjQtGKh86rDcRZN17QEMCO github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8= github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA= github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.mongodb.org/mongo-driver v1.11.4 h1:4ayjakA013OdpGyL2K3ZqylTac/rMjrJOMZ1EHizXas= go.mongodb.org/mongo-driver v1.11.4/go.mod h1:PTSz5yu21bkT/wXpkS7WR5f0ddqw5quethTUn9WM+2g= +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.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= +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.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= +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= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g= golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +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/net v0.0.0-20180724234803-3673e40ba225/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-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +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-20211029224645-99673261e6eb/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI= golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/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-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= @@ -156,9 +227,30 @@ golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +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/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/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20230223222841-637eb2293923 h1:znp6mq/drrY+6khTAlJUDNFFcDGV2ENLYKpMq8SyCds= google.golang.org/genproto v0.0.0-20230223222841-637eb2293923/go.mod h1:3Dl5ZL0q0isWJt+FVcfpQyirqemEuLAK/iFvg1UP1Hw= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.53.0 h1:LAv2ds7cmFV/XTS3XG1NneeENYrXGmorPxsBbptIjNc= google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= @@ -170,9 +262,12 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/internal/app/app.go b/internal/app/app.go index a6cdd8a..9b45821 100644 --- a/internal/app/app.go +++ b/internal/app/app.go @@ -62,18 +62,29 @@ func Run(ctx context.Context, config *models.Config, logger *zap.Logger) error { api := initialize.NewAPI(controllers) - httpServer := server.New(&server.Deps{ + serverHTTP, httpErr := server.NewHTTP(server.DepsHTTP{ Logger: logger, Swagger: openapi, AuthenticationFunc: utils.NewAuthenticator(utils.NewJWT(&config.Service.JWT)), }) + if httpErr != nil { + return httpErr.Wrap("failed to init http server") + } - httpServer.Register(api) + serverGRPC, grpcErr := server.NewGRPC(server.DepsGRPC{Logger: logger}) + if grpcErr != nil { + return httpErr.Wrap("failed to init grpc server") + } - go httpServer.Run(&config.HTTP) + serverHTTP.Register(api) + serverGRPC.Register(controllers) + + go serverHTTP.Run(&config.HTTP) + go serverGRPC.Run(&config.GRPC) closer.Add(mongoDB.Client().Disconnect) - closer.Add(httpServer.Stop) + closer.Add(serverHTTP.Stop) + closer.Add(serverGRPC.Stop) <-ctx.Done() diff --git a/internal/errors/errors.go b/internal/errors/errors.go index f1fbd74..f3fa14b 100644 --- a/internal/errors/errors.go +++ b/internal/errors/errors.go @@ -19,10 +19,9 @@ var ( type Error interface { Error() string - Extract() error Type() ErrorType - Wrap(err error) - SetType(errorType ErrorType) + Wrap(message string) Error + SetType(errorType ErrorType) Error } type customError struct { @@ -52,14 +51,14 @@ func (receiver *customError) Type() ErrorType { return receiver.errorType } -func (receiver *customError) Wrap(err error) { - receiver.err = fmt.Errorf("%w: %w", receiver.err, err) +func (receiver *customError) Wrap(message string) Error { + receiver.err = fmt.Errorf("%s: %w", message, receiver.err) + + return receiver } -func (receiver *customError) SetType(errorType ErrorType) { +func (receiver *customError) SetType(errorType ErrorType) Error { receiver.errorType = errorType -} -func (receiver *customError) Extract() error { - return receiver.err + return receiver } diff --git a/internal/initialize/clients_test.go b/internal/initialize/clients_test.go index 0564e35..f787643 100644 --- a/internal/initialize/clients_test.go +++ b/internal/initialize/clients_test.go @@ -19,8 +19,8 @@ func TestNewClients(t *testing.T) { AuthURL: &models.AuthMicroserviceURL{}, HubadminURL: &models.HubadminMicroserviceURL{}, CurrencyURL: &models.CurrencyMicroserviceURL{}, - DiscountServiceConfiguration: &models.DiscountMicroserviceConfiguration{}, - PaymentServiceConfiguration: &models.PaymentMicroserviceConfiguration{}, + DiscountServiceConfiguration: &models.DiscountMicroserviceConfiguration{HostGRPC: "host"}, + PaymentServiceConfiguration: &models.PaymentMicroserviceConfiguration{HostGRPC: "host"}, }) assert.NotNil(t, clients) diff --git a/internal/initialize/controllers.go b/internal/initialize/controllers.go index 1debfcb..b635067 100644 --- a/internal/initialize/controllers.go +++ b/internal/initialize/controllers.go @@ -2,6 +2,7 @@ package initialize import ( "go.uber.org/zap" + "penahub.gitlab.yandexcloud.net/pena-services/customer/internal/interface/controller/grpc/payment" "penahub.gitlab.yandexcloud.net/pena-services/customer/internal/interface/controller/rest/account" "penahub.gitlab.yandexcloud.net/pena-services/customer/internal/interface/controller/rest/cart" "penahub.gitlab.yandexcloud.net/pena-services/customer/internal/interface/controller/rest/currency" @@ -20,6 +21,7 @@ type Controllers struct { CartController *cart.Controller HistoryController *history.Controller WalletController *wallet.Controller + PaymentController *payment.Controller } func NewControllers(deps *ControllersDeps) *Controllers { @@ -41,8 +43,13 @@ func NewControllers(deps *ControllersDeps) *Controllers { HistoryService: deps.Services.HistoryService, }), WalletController: wallet.New(wallet.Deps{ - Logger: deps.Logger, - WalletService: deps.Services.WalletService, + Logger: deps.Logger, + WalletService: deps.Services.WalletService, + PaymentService: deps.Services.PaymentService, + }), + PaymentController: payment.New(payment.Deps{ + Logger: deps.Logger, + PaymentCallbackService: deps.Services.PaymentCallbackService, }), } } diff --git a/internal/initialize/controllers_test.go b/internal/initialize/controllers_test.go index a696232..930f0d1 100644 --- a/internal/initialize/controllers_test.go +++ b/internal/initialize/controllers_test.go @@ -4,18 +4,43 @@ import ( "testing" "github.com/stretchr/testify/assert" + "go.mongodb.org/mongo-driver/mongo/integration/mtest" "go.uber.org/zap" "penahub.gitlab.yandexcloud.net/pena-services/customer/internal/initialize" + "penahub.gitlab.yandexcloud.net/pena-services/customer/internal/models" ) func TestNewControllers(t *testing.T) { - t.Run("Контроллеры должны успешно инициализироваться", func(t *testing.T) { + mt := mtest.New(t, mtest.NewOptions().ClientType(mtest.Mock)) + + mt.Run("Контроллеры должны успешно инициализироваться", func(t *mtest.T) { logger := zap.New(zap.L().Core()) assert.NotPanics(t, func() { + clients := initialize.NewClients(&initialize.ClientsDeps{ + Logger: logger, + AuthURL: &models.AuthMicroserviceURL{}, + HubadminURL: &models.HubadminMicroserviceURL{}, + CurrencyURL: &models.CurrencyMicroserviceURL{}, + DiscountServiceConfiguration: &models.DiscountMicroserviceConfiguration{HostGRPC: "host"}, + PaymentServiceConfiguration: &models.PaymentMicroserviceConfiguration{HostGRPC: "host"}, + }) + + repositories := initialize.NewRepositories(&initialize.RepositoriesDeps{ + Logger: logger, + MongoDB: t.Client.Database("test"), + }) + + services := initialize.NewServices(&initialize.ServicesDeps{ + Logger: logger, + Clients: clients, + Repositories: repositories, + ConfigurationGRPC: &models.ConfigurationGRPC{Domen: "http://test:8080"}, + }) + controllers := initialize.NewControllers(&initialize.ControllersDeps{ Logger: logger, - Services: &initialize.Services{}, + Services: services, }) assert.NotNil(t, controllers) diff --git a/internal/initialize/services_test.go b/internal/initialize/services_test.go index 18955b0..00e59c2 100644 --- a/internal/initialize/services_test.go +++ b/internal/initialize/services_test.go @@ -22,8 +22,8 @@ func TestNewServices(t *testing.T) { AuthURL: &models.AuthMicroserviceURL{}, HubadminURL: &models.HubadminMicroserviceURL{}, CurrencyURL: &models.CurrencyMicroserviceURL{}, - DiscountServiceConfiguration: &models.DiscountMicroserviceConfiguration{}, - PaymentServiceConfiguration: &models.PaymentMicroserviceConfiguration{}, + DiscountServiceConfiguration: &models.DiscountMicroserviceConfiguration{HostGRPC: "host"}, + PaymentServiceConfiguration: &models.PaymentMicroserviceConfiguration{HostGRPC: "host"}, }) repositories := initialize.NewRepositories(&initialize.RepositoriesDeps{ diff --git a/internal/interface/controller/rest/cart/cart.go b/internal/interface/controller/rest/cart/cart.go index adf5a3d..f56d482 100644 --- a/internal/interface/controller/rest/cart/cart.go +++ b/internal/interface/controller/rest/cart/cart.go @@ -72,7 +72,7 @@ func (receiver *Controller) Remove(ctx echo.Context, params swagger.RemoveFromCa if err != nil { receiver.logger.Error( "failed to remove item from cart on of ", - zap.Error(err.Extract()), + zap.Error(err), ) return echotools.ResponseError(ctx, err) @@ -103,7 +103,7 @@ func (receiver *Controller) Add(ctx echo.Context, params swagger.Add2cartParams) if err != nil { receiver.logger.Error( "failed to add item to cart on of ", - zap.Error(err.Extract()), + zap.Error(err), ) return echotools.ResponseError(ctx, err) diff --git a/internal/interface/controller/rest/currency/currency.go b/internal/interface/controller/rest/currency/currency.go index b756491..21452c2 100644 --- a/internal/interface/controller/rest/currency/currency.go +++ b/internal/interface/controller/rest/currency/currency.go @@ -51,7 +51,7 @@ func (receiver *Controller) GetCurrencies(ctx echo.Context) error { if err != nil { receiver.logger.Error( "failed to get currencies on of ", - zap.Error(err.Extract()), + zap.Error(err), ) return echotools.ResponseError(ctx, err) } @@ -82,7 +82,7 @@ func (receiver *Controller) PutCurrencies(ctx echo.Context) error { if err != nil { receiver.logger.Error( "failed to put currencies on of ", - zap.Error(err.Extract()), + zap.Error(err), ) return echotools.ResponseError(ctx, err) } diff --git a/internal/interface/controller/rest/wallet/wallet.go b/internal/interface/controller/rest/wallet/wallet.go index ea22af5..7eb7baf 100644 --- a/internal/interface/controller/rest/wallet/wallet.go +++ b/internal/interface/controller/rest/wallet/wallet.go @@ -85,7 +85,7 @@ func (receiver *Controller) ChangeCurrency(ctx echo.Context) error { account, err := receiver.walletService.ChangeCurrency(ctx.Request().Context(), userID, request.Currency) if err != nil { - receiver.logger.Error("failed to put money on of ", zap.Error(err.Extract())) + receiver.logger.Error("failed to put money on of ", zap.Error(err)) return echotools.ResponseError(ctx, err) } diff --git a/internal/server/grpc.go b/internal/server/grpc.go new file mode 100644 index 0000000..689870a --- /dev/null +++ b/internal/server/grpc.go @@ -0,0 +1,79 @@ +package server + +import ( + "context" + "fmt" + "net" + + grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" + grpc_zap "github.com/grpc-ecosystem/go-grpc-middleware/logging/zap" + grpc_recovery "github.com/grpc-ecosystem/go-grpc-middleware/recovery" + "go.uber.org/zap" + "google.golang.org/grpc" + "penahub.gitlab.yandexcloud.net/pena-services/customer/internal/errors" + "penahub.gitlab.yandexcloud.net/pena-services/customer/internal/initialize" + "penahub.gitlab.yandexcloud.net/pena-services/customer/internal/models" + "penahub.gitlab.yandexcloud.net/pena-services/customer/internal/proto/payment_callback" +) + +type DepsGRPC struct { + Logger *zap.Logger +} + +type GRPC struct { + logger *zap.Logger + grpc *grpc.Server +} + +func NewGRPC(deps DepsGRPC) (*GRPC, errors.Error) { + if deps.Logger == nil { + return nil, errors.NewWithMessage("Logger is nil on ", errors.ErrInvalidArgs) + } + + grpcStreamInterceptor := grpc.StreamInterceptor(grpc_middleware.ChainStreamServer( + grpc_zap.StreamServerInterceptor(deps.Logger), + grpc_recovery.StreamServerInterceptor(), + )) + + grpcUnaryInterceptor := grpc.UnaryInterceptor(grpc_middleware.ChainUnaryServer( + grpc_zap.UnaryServerInterceptor(deps.Logger), + grpc_recovery.UnaryServerInterceptor(), + )) + + return &GRPC{ + grpc: grpc.NewServer(grpcStreamInterceptor, grpcUnaryInterceptor), + logger: deps.Logger, + }, nil +} + +func (receiver *GRPC) Run(config *models.ConfigurationGRPC) { + connectionString := fmt.Sprintf("%s:%s", config.Host, config.Port) + + receiver.logger.Info("Starting GRPC Server", zap.String("host", connectionString)) + + if err := receiver.listen(connectionString); err != nil && err != grpc.ErrServerStopped { + receiver.logger.Error("GRPC Listen error", zap.Error(err)) + } +} + +func (receiver *GRPC) Stop(_ context.Context) error { + receiver.grpc.GracefulStop() + receiver.logger.Info("Shutting down GRPC server...") + + return nil +} + +func (receiver *GRPC) Register(controllers *initialize.Controllers) *GRPC { + payment_callback.RegisterPaymentCallbackServiceServer(receiver.grpc, controllers.PaymentController) + + return receiver +} + +func (receiver *GRPC) listen(address string) error { + listener, err := net.Listen("tcp", address) + if err != nil { + return err + } + + return receiver.grpc.Serve(listener) +} diff --git a/internal/server/http.go b/internal/server/http.go index 3b41c96..eab65cf 100644 --- a/internal/server/http.go +++ b/internal/server/http.go @@ -11,11 +11,12 @@ import ( "github.com/labstack/echo/v4" "github.com/labstack/echo/v4/middleware" "go.uber.org/zap" + "penahub.gitlab.yandexcloud.net/pena-services/customer/internal/errors" "penahub.gitlab.yandexcloud.net/pena-services/customer/internal/models" "penahub.gitlab.yandexcloud.net/pena-services/customer/internal/swagger" ) -type Deps struct { +type DepsHTTP struct { Logger *zap.Logger Swagger *openapi3.T AuthenticationFunc openapi3filter.AuthenticationFunc @@ -27,7 +28,19 @@ type HTTP struct { echo *echo.Echo } -func New(deps *Deps) *HTTP { +func NewHTTP(deps DepsHTTP) (*HTTP, errors.Error) { + if deps.Logger == nil { + return nil, errors.NewWithMessage("failed to init http server: logger is nil ", errors.ErrInvalidArgs) + } + + if deps.Swagger == nil { + return nil, errors.NewWithMessage("failed to init http server: swagger is nil ", errors.ErrInvalidArgs) + } + + if deps.AuthenticationFunc == nil { + return nil, errors.NewWithMessage("failed to init http server: AuthenticationFunc is nil ", errors.ErrInvalidArgs) + } + echo := echo.New() echo.Use(middleware.Recover()) @@ -42,7 +55,7 @@ func New(deps *Deps) *HTTP { ReadTimeout: 10 * time.Second, WriteTimeout: 10 * time.Second, }, - } + }, nil } func (receiver *HTTP) Listen(address string) error { diff --git a/internal/service/account/account.go b/internal/service/account/account.go index d1ff3cf..f923a4d 100644 --- a/internal/service/account/account.go +++ b/internal/service/account/account.go @@ -64,7 +64,7 @@ func (receiver *Service) GetAccountByUserID(ctx context.Context, userID string) account, err := receiver.repository.FindByUserID(ctx, userID) if err != nil { receiver.logger.Error("failed to get account by id on of ", - zap.Error(err.Extract()), + zap.Error(err), zap.String("userID", userID), ) @@ -85,7 +85,7 @@ func (receiver *Service) GetAccountsList(ctx context.Context, pagination *models count, err := receiver.repository.CountAll(ctx) if err != nil { receiver.logger.Error("failed to count accounts on of ", - zap.Error(err.Extract()), + zap.Error(err), ) return nil, err @@ -100,7 +100,7 @@ func (receiver *Service) GetAccountsList(ctx context.Context, pagination *models accounts, err := receiver.repository.FindMany(ctx, pagination.Page, pagination.Limit) if err != nil { receiver.logger.Error("failed to get accounts list on of ", - zap.Error(err.Extract()), + zap.Error(err), zap.Int64("page", pagination.Page), zap.Int64("limit", pagination.Limit), ) @@ -118,7 +118,7 @@ func (receiver *Service) CreateAccount(ctx context.Context, account *models.Acco findedAccount, err := receiver.GetAccountByUserID(ctx, account.UserID) if err != nil && err.Type() != errors.ErrNotFound { receiver.logger.Error("failed to find account on of ", - zap.Error(err.Extract()), + zap.Error(err), ) return nil, err @@ -137,7 +137,7 @@ func (receiver *Service) CreateAccount(ctx context.Context, account *models.Acco createdAccount, err := receiver.repository.Insert(ctx, account) if err != nil { receiver.logger.Error("failed to create account on of ", - zap.Error(err.Extract()), + zap.Error(err), zap.Any("account", account), ) @@ -151,7 +151,7 @@ func (receiver *Service) CreateAccountByUserID(ctx context.Context, userID strin account, err := receiver.GetAccountByUserID(ctx, userID) if err != nil && err.Type() != errors.ErrNotFound { receiver.logger.Error("failed to find account on of ", - zap.Error(err.Extract()), + zap.Error(err), ) return nil, err @@ -170,7 +170,7 @@ func (receiver *Service) CreateAccountByUserID(ctx context.Context, userID strin user, err := receiver.authClient.GetUser(ctx, userID) if err != nil { receiver.logger.Error("failed to get user on of ", - zap.Error(err.Extract()), + zap.Error(err), zap.String("userID", userID), ) @@ -197,7 +197,7 @@ func (receiver *Service) CreateAccountByUserID(ctx context.Context, userID strin }) if err != nil { receiver.logger.Error("failed to create account on of ", - zap.Error(err.Extract()), + zap.Error(err), zap.String("userID", userID), ) @@ -211,7 +211,7 @@ func (receiver *Service) RemoveAccount(ctx context.Context, userID string) (*mod account, err := receiver.repository.Remove(ctx, userID) if err != nil { receiver.logger.Error("failed to remove account on of ", - zap.Error(err.Extract()), + zap.Error(err), zap.String("userID", userID), ) @@ -225,7 +225,7 @@ func (receiver *Service) DeleteAccount(ctx context.Context, userID string) (*mod account, err := receiver.repository.Delete(ctx, userID) if err != nil { receiver.logger.Error("failed to delete account on of ", - zap.Error(err.Extract()), + zap.Error(err), zap.String("userID", userID), ) diff --git a/internal/service/cart/cart.go b/internal/service/cart/cart.go index 23535c5..d5332fc 100644 --- a/internal/service/cart/cart.go +++ b/internal/service/cart/cart.go @@ -152,7 +152,6 @@ func (receiver *Service) Pay(ctx context.Context, userID string) (string, errors return "", errors.New(fmt.Errorf("insufficient funds: %d", int64(response.Price)-account.Wallet.Money), errors.ErrInsufficientFunds) } - // TODO: перевести в сервис платёжки if _, err := receiver.walletService.WithdrawAccountWalletMoney(ctx, &models.WithdrawAccountWallet{ Money: int64(response.Price), Account: account, diff --git a/internal/service/currency/currency.go b/internal/service/currency/currency.go index b2aad1b..e3bdb42 100644 --- a/internal/service/currency/currency.go +++ b/internal/service/currency/currency.go @@ -49,7 +49,7 @@ func (receiver *Service) GetCurrencies(ctx context.Context) ([]string, errors.Er if err != nil && err.Type() != errors.ErrNotFound { receiver.logger.Error( "failed to get currencies on of ", - zap.Error(err.Extract()), + zap.Error(err), ) return []string{}, err @@ -70,7 +70,7 @@ func (receiver *Service) PutCurrencies(ctx context.Context, currencies []string) if err != nil && err.Type() != errors.ErrNotFound { receiver.logger.Error( "failed to put currencies on of ", - zap.Error(err.Extract()), + zap.Error(err), ) return []string{}, err @@ -84,7 +84,7 @@ func (receiver *Service) PutCurrencies(ctx context.Context, currencies []string) if err != nil && err.Type() != errors.ErrNotFound { receiver.logger.Error( "failed to insert new currency list on of ", - zap.Error(err.Extract()), + zap.Error(err), ) return []string{}, err diff --git a/internal/service/history/history.go b/internal/service/history/history.go index f0e491b..809cad2 100644 --- a/internal/service/history/history.go +++ b/internal/service/history/history.go @@ -53,7 +53,7 @@ func (receiver *Service) GetHistoryList(ctx context.Context, pagination *models. count, err := receiver.repository.CountAll(ctx) if err != nil { receiver.logger.Error("failed to count histories on of ", - zap.Error(err.Extract()), + zap.Error(err), ) return nil, err @@ -68,7 +68,7 @@ func (receiver *Service) GetHistoryList(ctx context.Context, pagination *models. histories, err := receiver.repository.FindMany(ctx, pagination.Page, pagination.Limit) if err != nil { receiver.logger.Error("failed to get historiy list on of ", - zap.Error(err.Extract()), + zap.Error(err), zap.Int64("page", pagination.Page), zap.Int64("limit", pagination.Limit), ) diff --git a/internal/service/wallet/wallet.go b/internal/service/wallet/wallet.go index 65de388..3fa4e8d 100644 --- a/internal/service/wallet/wallet.go +++ b/internal/service/wallet/wallet.go @@ -11,8 +11,6 @@ import ( "penahub.gitlab.yandexcloud.net/pena-services/customer/pkg/validate" ) -// TODO: добавить интерфейс клиента сервиса оплаты - type accountRepository interface { ChangeWallet(ctx context.Context, userID string, wallet *models.Wallet) (*models.Account, errors.Error) FindByUserID(ctx context.Context, id string) (*models.Account, errors.Error) @@ -72,7 +70,7 @@ func (receiver *Service) ReplenishAccountWallet(ctx context.Context, request *mo }) if translateErr != nil { receiver.logger.Error("failed to translate cash on of ", - zap.Error(translateErr.Extract()), + zap.Error(translateErr), ) return nil, translateErr @@ -91,7 +89,7 @@ func (receiver *Service) ReplenishAccountWallet(ctx context.Context, request *mo }) if changeErr != nil { receiver.logger.Error("failed to replenish wallet on of ", - zap.Error(changeErr.Extract()), + zap.Error(changeErr), zap.String("Currency", request.Account.Wallet.Currency), zap.Int64("Money", request.Account.Wallet.Money+request.Cash), zap.Int64("Cash", request.Account.Wallet.Cash+cash), @@ -111,7 +109,7 @@ func (receiver *Service) ReplenishAccountWallet(ctx context.Context, request *mo }) if err != nil { receiver.logger.Error("failed to translate money on of ", - zap.Error(err.Extract()), + zap.Error(err), ) return nil, err @@ -127,7 +125,7 @@ func (receiver *Service) ReplenishAccountWallet(ctx context.Context, request *mo }) if err != nil { receiver.logger.Error("failed to replenish wallet on of ", - zap.Error(err.Extract()), + zap.Error(err), zap.String("Currency", request.Account.Wallet.Currency), zap.Int64("Money", request.Account.Wallet.Money+request.Cash), zap.Int64("Cash", request.Account.Wallet.Cash+cash), @@ -155,7 +153,7 @@ func (receiver *Service) WithdrawAccountWalletMoney(ctx context.Context, request }) if err != nil { receiver.logger.Error("failed to translate money on of ", - zap.Error(err.Extract()), + zap.Error(err), ) return nil, err @@ -170,7 +168,7 @@ func (receiver *Service) WithdrawAccountWalletMoney(ctx context.Context, request }) if err != nil { receiver.logger.Error("failed to replenish wallet on of ", - zap.Error(err.Extract()), + zap.Error(err), zap.String("Currency", request.Account.Wallet.Currency), zap.Int64("Money", request.Account.Wallet.Money-request.Money), zap.Int64("Cash", request.Account.Wallet.Cash+cash), @@ -186,7 +184,7 @@ func (receiver *Service) ChangeCurrency(ctx context.Context, userID string, curr account, err := receiver.repository.FindByUserID(ctx, userID) if err != nil { receiver.logger.Error("failed to find account on of ", - zap.Error(err.Extract()), + zap.Error(err), zap.String("userID", userID), zap.Any("currency", currency), ) @@ -201,7 +199,7 @@ func (receiver *Service) ChangeCurrency(ctx context.Context, userID string, curr }) if err != nil { receiver.logger.Error("failed to translate currency on of ", - zap.Error(err.Extract()), + zap.Error(err), ) return nil, err @@ -214,7 +212,7 @@ func (receiver *Service) ChangeCurrency(ctx context.Context, userID string, curr }) if err != nil { receiver.logger.Error("failed to update wallet on of ", - zap.Error(err.Extract()), + zap.Error(err), ) return nil, err diff --git a/internal/utils/authenticator.go b/internal/utils/authenticator.go index 9151c93..0680d61 100644 --- a/internal/utils/authenticator.go +++ b/internal/utils/authenticator.go @@ -22,7 +22,7 @@ func NewAuthenticator(jwtUtil *JWT) openapi3filter.AuthenticationFunc { return errors.New( fmt.Errorf("jwt util is nil: %w", errors.ErrInvalidArgs), errors.ErrInvalidArgs, - ).Extract() + ) } return authenticate(ctx, jwtUtil, input) @@ -38,7 +38,7 @@ func authenticate(ctx context.Context, jwtUtil *JWT, input *openapi3filter.Authe // against request contents. jws, err := parseJWSFromRequest(input.RequestValidationInput.Request) if err != nil { - return err.Extract() + return err } // if the JWS is valid, we have a JWT, which will contain a bunch of claims.