From 90a2aa9906d2b6343bb95e38ba8168931191ee6b Mon Sep 17 00:00:00 2001 From: Yan Karpov Date: Mon, 8 May 2023 18:58:28 +0300 Subject: [PATCH 1/5] Added di container, project structure --- .gitignore | 3 + Makefile | 34 ++++ cmd/server/main.go | 33 +++ docker-compose.yml | 16 ++ go.mod | 31 +++ go.sum | 270 +++++++++++++++++++++++++ internal/app/app.go | 54 +++++ internal/app/service_provider.go | 76 +++++++ internal/client/pg/client.go | 43 ++++ internal/client/pg/pg.go | 81 ++++++++ internal/clients/grpc/auth/client.go | 35 ++++ internal/closer/closer.go | 87 ++++++++ internal/config/config.go | 16 ++ internal/config/pg.go | 34 ++++ internal/converter/client/auth/auth.go | 23 +++ internal/errs/errs.go | 12 ++ internal/model/model.go | 20 ++ internal/repository/chat/repository.go | 20 ++ internal/service/chat/service.go | 20 ++ 19 files changed, 908 insertions(+) create mode 100644 Makefile create mode 100644 cmd/server/main.go create mode 100644 docker-compose.yml create mode 100644 go.mod create mode 100644 go.sum create mode 100644 internal/app/app.go create mode 100644 internal/app/service_provider.go create mode 100644 internal/client/pg/client.go create mode 100644 internal/client/pg/pg.go create mode 100644 internal/clients/grpc/auth/client.go create mode 100644 internal/closer/closer.go create mode 100644 internal/config/config.go create mode 100644 internal/config/pg.go create mode 100644 internal/converter/client/auth/auth.go create mode 100644 internal/errs/errs.go create mode 100644 internal/model/model.go create mode 100644 internal/repository/chat/repository.go create mode 100644 internal/service/chat/service.go diff --git a/.gitignore b/.gitignore index 3b735ec..2d6c2aa 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,6 @@ # Go workspace file go.work + +/.idea +.env diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..ef6d943 --- /dev/null +++ b/Makefile @@ -0,0 +1,34 @@ +LOCAL_BIN:=$(CURDIR)/bin + +LOCAL_MIGRATION_DIR=./migrations +LOCAL_MIGRATION_DSN="host=localhost port=54321 dbname=chat user=chat-user password=chat-password sslmode=disable" + +install-go-deps: + GOBIN=$(LOCAL_BIN) go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28.1 + GOBIN=$(LOCAL_BIN) go install -mod=mod google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2 + +.PHONY: local-migration-status +local-migration-status: + goose -dir ${LOCAL_MIGRATION_DIR} postgres ${LOCAL_MIGRATION_DSN} status -v + +local-migration-up: + goose -dir ${LOCAL_MIGRATION_DIR} postgres ${LOCAL_MIGRATION_DSN} up -v + +.PHONY: local-migration-down +local-migration-down: + goose -dir ${LOCAL_MIGRATION_DIR} postgres ${LOCAL_MIGRATION_DSN} down -v + +.PHONY: lint +lint: + golangci-lint run + +.PHONY: cover +cover: + go test -short -count=1 -race -coverprofile=coverage.out ./... + go tool cover -html=coverage.out + rm coverage.out + +.PHONY: gen +gen: + mockgen -source=internal/repository/chat_server/repository.go \ + -destination=internal/repository/mocks/mock_repository.go \ No newline at end of file diff --git a/cmd/server/main.go b/cmd/server/main.go new file mode 100644 index 0000000..009927a --- /dev/null +++ b/cmd/server/main.go @@ -0,0 +1,33 @@ +package main + +import ( + "context" + "os" + "os/signal" + "syscall" + + "github.com/satanaroom/auth/pkg/logger" + "github.com/satanaroom/chat_server/internal/app" +) + +func main() { + ctx := context.Background() + + chatApp, err := app.NewApp(ctx) + if err != nil { + logger.Fatalf("failed to initialize app: %s", err.Error()) + } + + quit := make(chan os.Signal, 1) + signal.Notify(quit, syscall.SIGTERM, syscall.SIGINT) + + logger.Info("service starting up") + + if err = chatApp.Run(); err != nil { + logger.Fatalf("failed to run app: %s", err.Error()) + } + + <-quit + + logger.Info("service shutting down") +} diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..418dbf6 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,16 @@ +version: '3' + +volumes: + postgres_volume: + +services: + pg: + image: postgres:14-alpine3.17 + environment: + - "POSTGRES_DB=${PG_DATABASE}" + - "POSTGRES_USER=${PG_USER}" + - "POSTGRES_PASSWORD=${PG_PASSWORD}" + ports: + - "${PG_PORT}:5432" + volumes: + - postgres_volume:/var/lib/postgresql/data \ No newline at end of file diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..526e5da --- /dev/null +++ b/go.mod @@ -0,0 +1,31 @@ +module github.com/satanaroom/chat_server + +go 1.20 + +require ( + github.com/georgysavva/scany v1.2.1 + github.com/jackc/pgconn v1.14.0 + github.com/jackc/pgx/v4 v4.18.1 + github.com/joho/godotenv v1.5.1 + github.com/satanaroom/auth v0.0.0-20230504071525-1f1c0514db48 +) + +require ( + github.com/golang/protobuf v1.5.2 // indirect + github.com/jackc/chunkreader/v2 v2.0.1 // indirect + github.com/jackc/pgio v1.0.0 // indirect + github.com/jackc/pgpassfile v1.0.0 // indirect + github.com/jackc/pgproto3/v2 v2.3.2 // indirect + github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect + github.com/jackc/pgtype v1.14.0 // indirect + github.com/jackc/puddle v1.3.0 // indirect + github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect + github.com/sirupsen/logrus v1.4.2 // indirect + golang.org/x/crypto v0.8.0 // indirect + golang.org/x/net v0.9.0 // indirect + golang.org/x/sys v0.7.0 // indirect + golang.org/x/text v0.9.0 // indirect + google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect + google.golang.org/grpc v1.54.0 // indirect + google.golang.org/protobuf v1.30.0 // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..d45ca30 --- /dev/null +++ b/go.sum @@ -0,0 +1,270 @@ +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= +github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I= +github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= +github.com/cockroachdb/cockroach-go/v2 v2.2.0 h1:/5znzg5n373N/3ESjHF5SMLxiW4RKB05Ql//KWfeTFs= +github.com/cockroachdb/cockroach-go/v2 v2.2.0/go.mod h1:u3MiKYGupPPjkn3ozknpMUpxPaNLTFWAya419/zv6eI= +github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= +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/georgysavva/scany v1.2.1 h1:91PAMBpwBtDjvn46TaLQmuVhxpAG6p6sjQaU4zPHPSM= +github.com/georgysavva/scany v1.2.1/go.mod h1:vGBpL5XRLOocMFFa55pj0P04DrL3I7qKVRL49K6Eu5o= +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-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw= +github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= +github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= +github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw= +github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= +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/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= +github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= +github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8= +github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= +github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA= +github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE= +github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s= +github.com/jackc/pgconn v1.4.0/go.mod h1:Y2O3ZDF0q4mMacyWV3AstPJpeHXWGEetiFttmq5lahk= +github.com/jackc/pgconn v1.5.0/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI= +github.com/jackc/pgconn v1.5.1-0.20200601181101-fa742c524853/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI= +github.com/jackc/pgconn v1.8.0/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfGIB/o= +github.com/jackc/pgconn v1.9.0/go.mod h1:YctiPyvzfU11JFxoXokUOOKQXQmDMoJL9vJzHH8/2JY= +github.com/jackc/pgconn v1.9.1-0.20210724152538-d89c8390a530/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI= +github.com/jackc/pgconn v1.14.0 h1:vrbA9Ud87g6JdFWkHTJXppVce58qPIdP7N8y0Ml/A7Q= +github.com/jackc/pgconn v1.14.0/go.mod h1:9mBNlny0UvkgJdCDvdVHYSjI+8tD2rnKK69Wz8ti++E= +github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE= +github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8= +github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE= +github.com/jackc/pgmock v0.0.0-20201204152224-4fe30f7445fd/go.mod h1:hrBW0Enj2AZTNpt/7Y5rr2xe/9Mn757Wtb2xeBzPv2c= +github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65 h1:DadwsjnMwFjfWc9y5Wi/+Zz7xoE5ALHsRQlOctkOiHc= +github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65/go.mod h1:5R2h2EEX+qri8jOWMbJCtaPWkrrNc7OHwsp2TCqp7ak= +github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= +github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= +github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78= +github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA= +github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg= +github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= +github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= +github.com/jackc/pgproto3/v2 v2.0.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= +github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= +github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= +github.com/jackc/pgproto3/v2 v2.3.2 h1:7eY55bdBeCz1F2fTzSz69QC+pG46jYq9/jtSPiJ5nn0= +github.com/jackc/pgproto3/v2 v2.3.2/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= +github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= +github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= +github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk= +github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= +github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg= +github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc= +github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw= +github.com/jackc/pgtype v1.2.0/go.mod h1:5m2OfMh1wTK7x+Fk952IDmI4nw3nPrvtQdM0ZT4WpC0= +github.com/jackc/pgtype v1.3.1-0.20200510190516-8cd94a14c75a/go.mod h1:vaogEUkALtxZMCH411K+tKzNpwzCKU+AnPzBKZ+I+Po= +github.com/jackc/pgtype v1.3.1-0.20200606141011-f6355165a91c/go.mod h1:cvk9Bgu/VzJ9/lxTO5R5sf80p0DiucVtN7ZxvaC4GmQ= +github.com/jackc/pgtype v1.6.2/go.mod h1:JCULISAZBFGrHaOXIIFiyfzW5VY0GRitRr8NeJsrdig= +github.com/jackc/pgtype v1.8.1-0.20210724151600-32e20a603178/go.mod h1:C516IlIV9NKqfsMCXTdChteoXmwgUceqaLfjg2e3NlM= +github.com/jackc/pgtype v1.14.0 h1:y+xUdabmyMkJLyApYuPj38mW+aAIqCe5uuBB51rH3Vw= +github.com/jackc/pgtype v1.14.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4= +github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y= +github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM= +github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc= +github.com/jackc/pgx/v4 v4.5.0/go.mod h1:EpAKPLdnTorwmPUUsqrPxy5fphV18j9q3wrfRXgo+kA= +github.com/jackc/pgx/v4 v4.6.1-0.20200510190926-94ba730bb1e9/go.mod h1:t3/cdRQl6fOLDxqtlyhe9UWgfIi9R8+8v8GKV5TRA/o= +github.com/jackc/pgx/v4 v4.6.1-0.20200606145419-4e5062306904/go.mod h1:ZDaNWkt9sW1JMiNn0kdYBaLelIhw7Pg4qd+Vk6tw7Hg= +github.com/jackc/pgx/v4 v4.10.1/go.mod h1:QlrWebbs3kqEZPHCTGyxecvzG6tvIsYu+A5b1raylkA= +github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs= +github.com/jackc/pgx/v4 v4.18.1 h1:YP7G1KABtKpB5IHrO9vYwSrCOhs7p3uqhvhhQBptya0= +github.com/jackc/pgx/v4 v4.18.1/go.mod h1:FydWkUyadDmdNH/mHnGob881GawxeEm7TcMCzkb+qQE= +github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle v1.3.0 h1:eHK/5clGOatcjX3oWGBO/MpxpbHzSwud5EWTSCI+MX0= +github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= +github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/jmoiron/sqlx v1.3.1/go.mod h1:2BljVx/86SuTyjE+aPYlHCTNvZrnJXghYGpNiXLBMCQ= +github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= +github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s= +github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.10.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/lib/pq v1.10.2 h1:AqzbZs4ZoCBp+GtejcpCpcxM3zlSMx29dXbUSeVtJb8= +github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= +github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= +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/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= +github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= +github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc= +github.com/satanaroom/auth v0.0.0-20230504071525-1f1c0514db48 h1:Q2tanARXwfSNEyh3tGbz8bUYMsGv/Q3o9pgPtU8cKRg= +github.com/satanaroom/auth v0.0.0-20230504071525-1f1c0514db48/go.mod h1:HLmgjkOgy6JD46gJ2gzTICkqjTWyJMazSBawZcDhgIM= +github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= +github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= +github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= +github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ= +github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= +github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= +github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +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.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= +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.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= +go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= +go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= +go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= +go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= +golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= +golang.org/x/crypto v0.8.0 h1:pd9TJtTueMTVQXzk8E2XESSMQDj/U7OUu0PqJqPXQjQ= +golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM= +golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +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-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/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-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= +golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.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/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/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-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f h1:BWUVssLB0HVOSY78gIdvk1dTVYtT1y8SBWtPYuTJ/6w= +google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= +google.golang.org/grpc v1.54.0 h1:EhTqbhiYeixwWQtAEZAxmV9MGqcjEU2mFx52xCzNyag= +google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= +google.golang.org/protobuf v1.30.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/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= +gopkg.in/yaml.v2 v2.2.2/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.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gorm.io/driver/postgres v1.0.8/go.mod h1:4eOzrI1MUfm6ObJU/UcmbXyiHSs8jSwH95G5P5dxcAg= +gorm.io/gorm v1.20.12/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw= +gorm.io/gorm v1.21.4/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= diff --git a/internal/app/app.go b/internal/app/app.go new file mode 100644 index 0000000..8445e26 --- /dev/null +++ b/internal/app/app.go @@ -0,0 +1,54 @@ +package app + +import ( + "context" + "fmt" + + "github.com/satanaroom/chat_server/internal/closer" + "github.com/satanaroom/chat_server/internal/config" +) + +type App struct { + serviceProvider *serviceProvider +} + +func NewApp(ctx context.Context) (*App, error) { + a := &App{} + + if err := a.initDeps(ctx); err != nil { + return nil, fmt.Errorf("init deps: %w", err) + } + + return a, nil +} + +func (a *App) Run() error { + defer func() { + closer.CloseAll() + closer.Wait() + }() + + // TODO: run some server + + return nil +} + +func (a *App) initDeps(ctx context.Context) error { + inits := []func(context.Context) error{ + config.Init, + a.initServiceProvider, + } + + for _, f := range inits { + if err := f(ctx); err != nil { + return fmt.Errorf("init: %w", err) + } + } + + return nil +} + +func (a *App) initServiceProvider(_ context.Context) error { + a.serviceProvider = newServiceProvider() + return nil +} diff --git a/internal/app/service_provider.go b/internal/app/service_provider.go new file mode 100644 index 0000000..31574cb --- /dev/null +++ b/internal/app/service_provider.go @@ -0,0 +1,76 @@ +package app + +import ( + "context" + + "github.com/jackc/pgx/v4/pgxpool" + "github.com/satanaroom/auth/pkg/logger" + "github.com/satanaroom/chat_server/internal/client/pg" + "github.com/satanaroom/chat_server/internal/closer" + "github.com/satanaroom/chat_server/internal/config" + chatRepository "github.com/satanaroom/chat_server/internal/repository/chat" + chatService "github.com/satanaroom/chat_server/internal/service/chat" +) + +type serviceProvider struct { + pgConfig config.PGConfig + + pgClient pg.Client + chatRepository chatRepository.Repository + chatService chatService.Service +} + +func newServiceProvider() *serviceProvider { + return &serviceProvider{} +} + +func (s *serviceProvider) PGConfig() config.PGConfig { + if s.pgConfig == nil { + cfg, err := config.NewPGConfig() + if err != nil { + logger.Fatalf("failed to get pg config: %s", err.Error()) + } + + s.pgConfig = cfg + } + + return s.pgConfig +} + +func (s *serviceProvider) PGClient(ctx context.Context) pg.Client { + if s.pgClient == nil { + pgCfg, err := pgxpool.ParseConfig(s.PGConfig().DSN()) + if err != nil { + logger.Fatalf("failed to get db config: %s", err.Error()) + } + + client, err := pg.NewClient(ctx, pgCfg) + if err != nil { + logger.Fatalf("failed to initialize pg clients: %s", err.Error()) + } + + if err = client.PG().Ping(ctx); err != nil { + logger.Fatalf("failed to ping pg: %s", err.Error()) + } + + closer.Add(client.Close) + s.pgClient = client + } + return s.pgClient +} + +func (s *serviceProvider) ChatRepository(ctx context.Context) chatRepository.Repository { + if s.chatRepository == nil { + s.chatRepository = chatRepository.NewRepository(s.PGClient(ctx)) + } + + return s.chatRepository +} + +func (s *serviceProvider) ServiceProvider(ctx context.Context) chatService.Service { + if s.chatService == nil { + s.chatService = chatService.NewService(s.ChatRepository(ctx)) + } + + return s.chatService +} diff --git a/internal/client/pg/client.go b/internal/client/pg/client.go new file mode 100644 index 0000000..10feea6 --- /dev/null +++ b/internal/client/pg/client.go @@ -0,0 +1,43 @@ +package pg + +import ( + "context" + + "github.com/jackc/pgx/v4/pgxpool" + "github.com/satanaroom/auth/pkg/logger" +) + +var _ Client = (*client)(nil) + +type Client interface { + Close() error + PG() PG +} + +type client struct { + pg PG +} + +func NewClient(ctx context.Context, pgCfg *pgxpool.Config) (*client, error) { + dbc, err := pgxpool.ConnectConfig(ctx, pgCfg) + if err != nil { + logger.Fatalf("failed to get db connection: %s", err.Error()) + } + + return &client{ + pg: &pg{ + pool: dbc, + }, + }, nil +} + +func (c *client) PG() PG { + return c.pg +} + +func (c *client) Close() error { + if c.pg != nil { + return c.pg.Close() + } + return nil +} diff --git a/internal/client/pg/pg.go b/internal/client/pg/pg.go new file mode 100644 index 0000000..2ee4f8c --- /dev/null +++ b/internal/client/pg/pg.go @@ -0,0 +1,81 @@ +package pg + +import ( + "context" + "fmt" + + "github.com/georgysavva/scany/pgxscan" + "github.com/jackc/pgconn" + "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v4/pgxpool" +) + +type Query struct { + Name string + QueryRaw string +} + +type Pinger interface { + Ping(ctx context.Context) error +} + +type QueryExecer interface { + ExecContext(ctx context.Context, q Query, args ...interface{}) (pgconn.CommandTag, error) + QueryContext(ctx context.Context, q Query, args ...interface{}) (pgx.Rows, error) + QueryRowContext(ctx context.Context, q Query, args ...interface{}) pgx.Row +} + +type NamedExecer interface { + ScanOne(ctx context.Context, dest interface{}, q Query, args ...interface{}) error + ScanAll(ctx context.Context, dest interface{}, q Query, args ...interface{}) error +} + +type PG interface { + QueryExecer + NamedExecer + Pinger + Close() error +} + +type pg struct { + pool *pgxpool.Pool +} + +func (p *pg) ScanOne(ctx context.Context, dest interface{}, q Query, args ...interface{}) error { + row, err := p.QueryContext(ctx, q, args...) + if err != nil { + return fmt.Errorf("%s: query context: %w", q.Name, err) + } + + return pgxscan.ScanOne(dest, row) +} + +func (p *pg) ScanAll(ctx context.Context, dest interface{}, q Query, args ...interface{}) error { + rows, err := p.QueryContext(ctx, q, args...) + if err != nil { + return fmt.Errorf("%s: query context: %w", q.Name, err) + } + + return pgxscan.ScanAll(dest, rows) +} + +func (p *pg) ExecContext(ctx context.Context, q Query, args ...interface{}) (pgconn.CommandTag, error) { + return p.pool.Exec(ctx, q.QueryRaw, args...) +} + +func (p *pg) QueryContext(ctx context.Context, q Query, args ...interface{}) (pgx.Rows, error) { + return p.pool.Query(ctx, q.QueryRaw, args...) +} + +func (p *pg) QueryRowContext(ctx context.Context, q Query, args ...interface{}) pgx.Row { + return p.pool.QueryRow(ctx, q.QueryRaw, args...) +} + +func (p *pg) Close() error { + p.pool.Close() + return nil +} + +func (p *pg) Ping(ctx context.Context) error { + return p.pool.Ping(ctx) +} diff --git a/internal/clients/grpc/auth/client.go b/internal/clients/grpc/auth/client.go new file mode 100644 index 0000000..ea8f0cc --- /dev/null +++ b/internal/clients/grpc/auth/client.go @@ -0,0 +1,35 @@ +package auth + +import ( + "context" + "fmt" + + authV1 "github.com/satanaroom/auth/pkg/auth_v1" + "github.com/satanaroom/chat_server/internal/converter/client/auth" + "github.com/satanaroom/chat_server/internal/model" +) + +var _ Client = (*client)(nil) + +type Client interface { + Create(ctx context.Context, info *model.UserInfo) (int64, error) +} + +type client struct { + authClient authV1.AuthV1Client +} + +func NewClient(cl authV1.AuthV1Client) *client { + return &client{ + authClient: cl, + } +} + +func (c *client) Create(ctx context.Context, info *model.UserInfo) (int64, error) { + resp, err := c.authClient.Create(ctx, auth.ToCreateRequest(info)) + if err != nil { + return 0, fmt.Errorf("authClient.Create: %w", err) + } + + return auth.FromCreateResponse(resp), nil +} diff --git a/internal/closer/closer.go b/internal/closer/closer.go new file mode 100644 index 0000000..0cc309e --- /dev/null +++ b/internal/closer/closer.go @@ -0,0 +1,87 @@ +package closer + +import ( + "context" + "log" + "os" + "os/signal" + "sync" +) + +var globalCloser = New() + +// Add adds `func() error` callback to the globalCloser +func Add(f ...func() error) { + globalCloser.Add(f...) +} + +// Wait ... +func Wait() { + globalCloser.Wait() +} + +// CloseAll ... +func CloseAll() { + globalCloser.CloseAll() +} + +// Closer ... +type Closer struct { + mu sync.Mutex + once sync.Once + done chan struct{} + funcs []func() error +} + +// New returns new Closer, if []os.Signal is specified Closer will automatically call CloseAll when one of signals is received from OS +func New(sig ...os.Signal) *Closer { + c := &Closer{done: make(chan struct{})} + if len(sig) > 0 { + go func() { + ch := make(chan os.Signal, 1) + signal.Notify(ch, sig...) + <-ch + signal.Stop(ch) + c.CloseAll() + }() + } + return c +} + +// Add func to closer +func (c *Closer) Add(f ...func() error) { + c.mu.Lock() + c.funcs = append(c.funcs, f...) + c.mu.Unlock() +} + +// Wait blocks until all closer functions are done +func (c *Closer) Wait() { + <-c.done +} + +// CloseAll calls all closer functions +func (c *Closer) CloseAll() { + c.once.Do(func() { + defer close(c.done) + + c.mu.Lock() + funcs := c.funcs + c.funcs = nil + c.mu.Unlock() + + // call all Closer funcs async + errs := make(chan error, len(funcs)) + for _, f := range funcs { + go func(f func() error) { + errs <- f() + }(f) + } + + for i := 0; i < cap(errs); i++ { + if err := <-errs; err != nil { + log.Println(context.Background(), "error returned from Closer: %v", err) + } + } + }) +} diff --git a/internal/config/config.go b/internal/config/config.go new file mode 100644 index 0000000..ee258e3 --- /dev/null +++ b/internal/config/config.go @@ -0,0 +1,16 @@ +package config + +import ( + "context" + "fmt" + + "github.com/joho/godotenv" +) + +func Init(_ context.Context) error { + if err := godotenv.Load(".env"); err != nil { + return fmt.Errorf("load env: %w", err) + } + + return nil +} diff --git a/internal/config/pg.go b/internal/config/pg.go new file mode 100644 index 0000000..f7761af --- /dev/null +++ b/internal/config/pg.go @@ -0,0 +1,34 @@ +package config + +import ( + "os" + + "github.com/satanaroom/chat_server/internal/errs" +) + +var _ PGConfig = (*pgConfig)(nil) + +const pgDSNEnvName = "PG_DSN" + +type PGConfig interface { + DSN() string +} + +type pgConfig struct { + dsn string +} + +func NewPGConfig() (*pgConfig, error) { + dsn := os.Getenv(pgDSNEnvName) + if len(dsn) == 0 { + return nil, errs.ErrDSNNotFound + } + + return &pgConfig{ + dsn: dsn, + }, nil +} + +func (cfg *pgConfig) DSN() string { + return cfg.dsn +} diff --git a/internal/converter/client/auth/auth.go b/internal/converter/client/auth/auth.go new file mode 100644 index 0000000..9ecefcd --- /dev/null +++ b/internal/converter/client/auth/auth.go @@ -0,0 +1,23 @@ +package auth + +import ( + authV1 "github.com/satanaroom/auth/pkg/auth_v1" + + "github.com/satanaroom/chat_server/internal/model" +) + +func ToCreateRequest(info *model.UserInfo) *authV1.CreateRequest { + return &authV1.CreateRequest{ + Info: &authV1.UserInfo{ + Username: info.User.Username, + Email: info.User.Email, + Password: info.User.Password, + Role: authV1.Role(info.User.Role), + }, + PasswordConfirm: info.PasswordConfirm, + } +} + +func FromCreateResponse(resp *authV1.CreateResponse) int64 { + return resp.GetId() +} diff --git a/internal/errs/errs.go b/internal/errs/errs.go new file mode 100644 index 0000000..b963f0c --- /dev/null +++ b/internal/errs/errs.go @@ -0,0 +1,12 @@ +package errs + +import "errors" + +var ErrUsernameEmpty = errors.New("username is empty") +var ErrPasswordEmpty = errors.New("password is empty") +var ErrPasswordMismatch = errors.New("password and password confirm do not match") +var ErrRoleInvalid = errors.New("role is invalid") +var ErrEmailInvalid = errors.New("email is invalid") +var ErrUserNotFound = errors.New("user not found") +var ErrDSNNotFound = errors.New("pg dsn not found") +var ErrGRPCPortNotFound = errors.New("grpc port not found") diff --git a/internal/model/model.go b/internal/model/model.go new file mode 100644 index 0000000..e005486 --- /dev/null +++ b/internal/model/model.go @@ -0,0 +1,20 @@ +package model + +type Role int64 + +const ( + RoleAdmin Role = 1 + RoleUser Role = 2 +) + +type User struct { + Username string + Email string + Password string + Role Role +} + +type UserInfo struct { + User User + PasswordConfirm string +} diff --git a/internal/repository/chat/repository.go b/internal/repository/chat/repository.go new file mode 100644 index 0000000..6fe715a --- /dev/null +++ b/internal/repository/chat/repository.go @@ -0,0 +1,20 @@ +package chat + +import ( + "github.com/satanaroom/chat_server/internal/client/pg" +) + +var _ Repository = (*repository)(nil) + +type Repository interface { +} + +type repository struct { + pgClient pg.Client +} + +func NewRepository(pgClient pg.Client) *repository { + return &repository{ + pgClient: pgClient, + } +} diff --git a/internal/service/chat/service.go b/internal/service/chat/service.go new file mode 100644 index 0000000..a6c80ad --- /dev/null +++ b/internal/service/chat/service.go @@ -0,0 +1,20 @@ +package chat + +import ( + "github.com/satanaroom/chat_server/internal/repository/chat" +) + +var _ Service = (*service)(nil) + +type Service interface { +} + +type service struct { + chatRepository chat.Repository +} + +func NewService(chatRepository chat.Repository) *service { + return &service{ + chatRepository: chatRepository, + } +} From 3931db04a903b74e246fe103d90dd73c994c1cb2 Mon Sep 17 00:00:00 2001 From: Yan Karpov Date: Mon, 8 May 2023 19:02:04 +0300 Subject: [PATCH 2/5] Added github workflows --- .github/workflows/go.yml | 43 ++++++++++++++++++++++++++++++++++++++++ .gitignore | 1 + 2 files changed, 44 insertions(+) create mode 100644 .github/workflows/go.yml diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml new file mode 100644 index 0000000..f595cca --- /dev/null +++ b/.github/workflows/go.yml @@ -0,0 +1,43 @@ +name: Go + +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] + +jobs: + + build-and-test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Set up Go + uses: actions/setup-go@v2 + with: + go-version: 1.19 + + - name: Build + run: go build -v ./... + + - name: Test + run: go test -v ./... + + linter: + strategy: + matrix: + go-version: [1.19.x] + os: [ubuntu-latest] + runs-on: ${{ matrix.os }} + steps: + - name: Install Go + uses: actions/setup-go@v2 + with: + go-version: ${{ matrix.go-version }} + - name: Checkout code + uses: actions/checkout@v2 + - name: Run linters + uses: golangci/golangci-lint-action@v2 + with: + version: latest diff --git a/.gitignore b/.gitignore index 2d6c2aa..104b71d 100644 --- a/.gitignore +++ b/.gitignore @@ -20,5 +20,6 @@ # Go workspace file go.work +/bin /.idea .env From 32245e1ff7044613a1c63b31813809b51bfd1776 Mon Sep 17 00:00:00 2001 From: Yan Karpov Date: Tue, 9 May 2023 21:22:35 +0300 Subject: [PATCH 3/5] Removed os signal wait --- cmd/server/main.go | 8 -------- 1 file changed, 8 deletions(-) diff --git a/cmd/server/main.go b/cmd/server/main.go index 009927a..7575138 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -2,9 +2,6 @@ package main import ( "context" - "os" - "os/signal" - "syscall" "github.com/satanaroom/auth/pkg/logger" "github.com/satanaroom/chat_server/internal/app" @@ -18,16 +15,11 @@ func main() { logger.Fatalf("failed to initialize app: %s", err.Error()) } - quit := make(chan os.Signal, 1) - signal.Notify(quit, syscall.SIGTERM, syscall.SIGINT) - logger.Info("service starting up") if err = chatApp.Run(); err != nil { logger.Fatalf("failed to run app: %s", err.Error()) } - <-quit - logger.Info("service shutting down") } From d4c11907a5fdcbec611a964ddb33ae2a24c26ff9 Mon Sep 17 00:00:00 2001 From: Yan Karpov Date: Wed, 10 May 2023 22:09:07 +0300 Subject: [PATCH 4/5] Fixed di container --- Makefile | 13 ----- docker-compose.yml | 16 ----- internal/app/app.go | 1 + internal/app/service_provider.go | 66 ++++++--------------- internal/client/pg/client.go | 43 -------------- internal/client/pg/pg.go | 81 -------------------------- internal/config/auth.go | 34 +++++++++++ internal/config/pg.go | 34 ----------- internal/errs/errs.go | 11 +--- internal/repository/chat/repository.go | 20 ------- internal/service/chat/service.go | 11 +--- 11 files changed, 59 insertions(+), 271 deletions(-) delete mode 100644 docker-compose.yml delete mode 100644 internal/client/pg/client.go delete mode 100644 internal/client/pg/pg.go create mode 100644 internal/config/auth.go delete mode 100644 internal/config/pg.go delete mode 100644 internal/repository/chat/repository.go diff --git a/Makefile b/Makefile index ef6d943..0d49c1b 100644 --- a/Makefile +++ b/Makefile @@ -1,22 +1,9 @@ LOCAL_BIN:=$(CURDIR)/bin -LOCAL_MIGRATION_DIR=./migrations -LOCAL_MIGRATION_DSN="host=localhost port=54321 dbname=chat user=chat-user password=chat-password sslmode=disable" - install-go-deps: GOBIN=$(LOCAL_BIN) go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28.1 GOBIN=$(LOCAL_BIN) go install -mod=mod google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2 -.PHONY: local-migration-status -local-migration-status: - goose -dir ${LOCAL_MIGRATION_DIR} postgres ${LOCAL_MIGRATION_DSN} status -v - -local-migration-up: - goose -dir ${LOCAL_MIGRATION_DIR} postgres ${LOCAL_MIGRATION_DSN} up -v - -.PHONY: local-migration-down -local-migration-down: - goose -dir ${LOCAL_MIGRATION_DIR} postgres ${LOCAL_MIGRATION_DSN} down -v .PHONY: lint lint: diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 418dbf6..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,16 +0,0 @@ -version: '3' - -volumes: - postgres_volume: - -services: - pg: - image: postgres:14-alpine3.17 - environment: - - "POSTGRES_DB=${PG_DATABASE}" - - "POSTGRES_USER=${PG_USER}" - - "POSTGRES_PASSWORD=${PG_PASSWORD}" - ports: - - "${PG_PORT}:5432" - volumes: - - postgres_volume:/var/lib/postgresql/data \ No newline at end of file diff --git a/internal/app/app.go b/internal/app/app.go index 8445e26..d572a7b 100644 --- a/internal/app/app.go +++ b/internal/app/app.go @@ -36,6 +36,7 @@ func (a *App) Run() error { func (a *App) initDeps(ctx context.Context) error { inits := []func(context.Context) error{ config.Init, + a.initServiceProvider, } diff --git a/internal/app/service_provider.go b/internal/app/service_provider.go index 31574cb..8d98af7 100644 --- a/internal/app/service_provider.go +++ b/internal/app/service_provider.go @@ -3,74 +3,46 @@ package app import ( "context" - "github.com/jackc/pgx/v4/pgxpool" + authV1 "github.com/satanaroom/auth/pkg/auth_v1" "github.com/satanaroom/auth/pkg/logger" - "github.com/satanaroom/chat_server/internal/client/pg" + + authClient "github.com/satanaroom/chat_server/internal/clients/grpc/auth" "github.com/satanaroom/chat_server/internal/closer" "github.com/satanaroom/chat_server/internal/config" - chatRepository "github.com/satanaroom/chat_server/internal/repository/chat" chatService "github.com/satanaroom/chat_server/internal/service/chat" + "google.golang.org/grpc" ) type serviceProvider struct { - pgConfig config.PGConfig + authConfig config.AuthClientConfig - pgClient pg.Client - chatRepository chatRepository.Repository - chatService chatService.Service + authClient authClient.Client + chatService chatService.Service } func newServiceProvider() *serviceProvider { return &serviceProvider{} } -func (s *serviceProvider) PGConfig() config.PGConfig { - if s.pgConfig == nil { - cfg, err := config.NewPGConfig() - if err != nil { - logger.Fatalf("failed to get pg config: %s", err.Error()) - } - - s.pgConfig = cfg +func (s *serviceProvider) ChatService(_ context.Context) chatService.Service { + if s.chatService == nil { + s.chatService = chatService.NewService() } - return s.pgConfig + return s.chatService } -func (s *serviceProvider) PGClient(ctx context.Context) pg.Client { - if s.pgClient == nil { - pgCfg, err := pgxpool.ParseConfig(s.PGConfig().DSN()) +func (s *serviceProvider) AuthClient(_ context.Context) authClient.Client { + if s.authClient == nil { + conn, err := grpc.Dial(s.authConfig.Port(), grpc.WithDefaultCallOptions()) if err != nil { - logger.Fatalf("failed to get db config: %s", err.Error()) - } - - client, err := pg.NewClient(ctx, pgCfg) - if err != nil { - logger.Fatalf("failed to initialize pg clients: %s", err.Error()) - } - - if err = client.PG().Ping(ctx); err != nil { - logger.Fatalf("failed to ping pg: %s", err.Error()) + logger.Fatalf("failed to connect %s: %s", s.authConfig.Port(), err.Error()) } + closer.Add(conn.Close) - closer.Add(client.Close) - s.pgClient = client - } - return s.pgClient -} - -func (s *serviceProvider) ChatRepository(ctx context.Context) chatRepository.Repository { - if s.chatRepository == nil { - s.chatRepository = chatRepository.NewRepository(s.PGClient(ctx)) - } - - return s.chatRepository -} - -func (s *serviceProvider) ServiceProvider(ctx context.Context) chatService.Service { - if s.chatService == nil { - s.chatService = chatService.NewService(s.ChatRepository(ctx)) + client := authV1.NewAuthV1Client(conn) + s.authClient = authClient.NewClient(client) } - return s.chatService + return s.authClient } diff --git a/internal/client/pg/client.go b/internal/client/pg/client.go deleted file mode 100644 index 10feea6..0000000 --- a/internal/client/pg/client.go +++ /dev/null @@ -1,43 +0,0 @@ -package pg - -import ( - "context" - - "github.com/jackc/pgx/v4/pgxpool" - "github.com/satanaroom/auth/pkg/logger" -) - -var _ Client = (*client)(nil) - -type Client interface { - Close() error - PG() PG -} - -type client struct { - pg PG -} - -func NewClient(ctx context.Context, pgCfg *pgxpool.Config) (*client, error) { - dbc, err := pgxpool.ConnectConfig(ctx, pgCfg) - if err != nil { - logger.Fatalf("failed to get db connection: %s", err.Error()) - } - - return &client{ - pg: &pg{ - pool: dbc, - }, - }, nil -} - -func (c *client) PG() PG { - return c.pg -} - -func (c *client) Close() error { - if c.pg != nil { - return c.pg.Close() - } - return nil -} diff --git a/internal/client/pg/pg.go b/internal/client/pg/pg.go deleted file mode 100644 index 2ee4f8c..0000000 --- a/internal/client/pg/pg.go +++ /dev/null @@ -1,81 +0,0 @@ -package pg - -import ( - "context" - "fmt" - - "github.com/georgysavva/scany/pgxscan" - "github.com/jackc/pgconn" - "github.com/jackc/pgx/v4" - "github.com/jackc/pgx/v4/pgxpool" -) - -type Query struct { - Name string - QueryRaw string -} - -type Pinger interface { - Ping(ctx context.Context) error -} - -type QueryExecer interface { - ExecContext(ctx context.Context, q Query, args ...interface{}) (pgconn.CommandTag, error) - QueryContext(ctx context.Context, q Query, args ...interface{}) (pgx.Rows, error) - QueryRowContext(ctx context.Context, q Query, args ...interface{}) pgx.Row -} - -type NamedExecer interface { - ScanOne(ctx context.Context, dest interface{}, q Query, args ...interface{}) error - ScanAll(ctx context.Context, dest interface{}, q Query, args ...interface{}) error -} - -type PG interface { - QueryExecer - NamedExecer - Pinger - Close() error -} - -type pg struct { - pool *pgxpool.Pool -} - -func (p *pg) ScanOne(ctx context.Context, dest interface{}, q Query, args ...interface{}) error { - row, err := p.QueryContext(ctx, q, args...) - if err != nil { - return fmt.Errorf("%s: query context: %w", q.Name, err) - } - - return pgxscan.ScanOne(dest, row) -} - -func (p *pg) ScanAll(ctx context.Context, dest interface{}, q Query, args ...interface{}) error { - rows, err := p.QueryContext(ctx, q, args...) - if err != nil { - return fmt.Errorf("%s: query context: %w", q.Name, err) - } - - return pgxscan.ScanAll(dest, rows) -} - -func (p *pg) ExecContext(ctx context.Context, q Query, args ...interface{}) (pgconn.CommandTag, error) { - return p.pool.Exec(ctx, q.QueryRaw, args...) -} - -func (p *pg) QueryContext(ctx context.Context, q Query, args ...interface{}) (pgx.Rows, error) { - return p.pool.Query(ctx, q.QueryRaw, args...) -} - -func (p *pg) QueryRowContext(ctx context.Context, q Query, args ...interface{}) pgx.Row { - return p.pool.QueryRow(ctx, q.QueryRaw, args...) -} - -func (p *pg) Close() error { - p.pool.Close() - return nil -} - -func (p *pg) Ping(ctx context.Context) error { - return p.pool.Ping(ctx) -} diff --git a/internal/config/auth.go b/internal/config/auth.go new file mode 100644 index 0000000..69528d5 --- /dev/null +++ b/internal/config/auth.go @@ -0,0 +1,34 @@ +package config + +import ( + "os" + + "github.com/satanaroom/chat_server/internal/errs" +) + +var _ AuthClientConfig = (*authClientConfig)(nil) + +const authPortEnvName = "AUTH_PORT" + +type AuthClientConfig interface { + Port() string +} + +type authClientConfig struct { + port string +} + +func NewAuthClientConfig() (*authClientConfig, error) { + port := os.Getenv(authPortEnvName) + if port == "" { + return nil, errs.ErrAuthClientPortNotFound + } + + return &authClientConfig{ + port: port, + }, nil +} + +func (c *authClientConfig) Port() string { + return c.port +} diff --git a/internal/config/pg.go b/internal/config/pg.go deleted file mode 100644 index f7761af..0000000 --- a/internal/config/pg.go +++ /dev/null @@ -1,34 +0,0 @@ -package config - -import ( - "os" - - "github.com/satanaroom/chat_server/internal/errs" -) - -var _ PGConfig = (*pgConfig)(nil) - -const pgDSNEnvName = "PG_DSN" - -type PGConfig interface { - DSN() string -} - -type pgConfig struct { - dsn string -} - -func NewPGConfig() (*pgConfig, error) { - dsn := os.Getenv(pgDSNEnvName) - if len(dsn) == 0 { - return nil, errs.ErrDSNNotFound - } - - return &pgConfig{ - dsn: dsn, - }, nil -} - -func (cfg *pgConfig) DSN() string { - return cfg.dsn -} diff --git a/internal/errs/errs.go b/internal/errs/errs.go index b963f0c..926ab69 100644 --- a/internal/errs/errs.go +++ b/internal/errs/errs.go @@ -2,11 +2,6 @@ package errs import "errors" -var ErrUsernameEmpty = errors.New("username is empty") -var ErrPasswordEmpty = errors.New("password is empty") -var ErrPasswordMismatch = errors.New("password and password confirm do not match") -var ErrRoleInvalid = errors.New("role is invalid") -var ErrEmailInvalid = errors.New("email is invalid") -var ErrUserNotFound = errors.New("user not found") -var ErrDSNNotFound = errors.New("pg dsn not found") -var ErrGRPCPortNotFound = errors.New("grpc port not found") +var ( + ErrAuthClientPortNotFound = errors.New("auth client port not found") +) diff --git a/internal/repository/chat/repository.go b/internal/repository/chat/repository.go deleted file mode 100644 index 6fe715a..0000000 --- a/internal/repository/chat/repository.go +++ /dev/null @@ -1,20 +0,0 @@ -package chat - -import ( - "github.com/satanaroom/chat_server/internal/client/pg" -) - -var _ Repository = (*repository)(nil) - -type Repository interface { -} - -type repository struct { - pgClient pg.Client -} - -func NewRepository(pgClient pg.Client) *repository { - return &repository{ - pgClient: pgClient, - } -} diff --git a/internal/service/chat/service.go b/internal/service/chat/service.go index a6c80ad..3213fdc 100644 --- a/internal/service/chat/service.go +++ b/internal/service/chat/service.go @@ -1,20 +1,13 @@ package chat -import ( - "github.com/satanaroom/chat_server/internal/repository/chat" -) - var _ Service = (*service)(nil) type Service interface { } type service struct { - chatRepository chat.Repository } -func NewService(chatRepository chat.Repository) *service { - return &service{ - chatRepository: chatRepository, - } +func NewService() *service { + return &service{} } From ad86cbc1c70c1ba3c40a4fd9810cb6b7e47434b4 Mon Sep 17 00:00:00 2001 From: Yan Karpov Date: Thu, 11 May 2023 14:19:25 +0300 Subject: [PATCH 5/5] Added authClient --- internal/app/service_provider.go | 4 ++-- internal/service/chat/service.go | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/internal/app/service_provider.go b/internal/app/service_provider.go index 8d98af7..09459c4 100644 --- a/internal/app/service_provider.go +++ b/internal/app/service_provider.go @@ -24,9 +24,9 @@ func newServiceProvider() *serviceProvider { return &serviceProvider{} } -func (s *serviceProvider) ChatService(_ context.Context) chatService.Service { +func (s *serviceProvider) ChatService(ctx context.Context) chatService.Service { if s.chatService == nil { - s.chatService = chatService.NewService() + s.chatService = chatService.NewService(s.AuthClient(ctx)) } return s.chatService diff --git a/internal/service/chat/service.go b/internal/service/chat/service.go index 3213fdc..dd1c5c7 100644 --- a/internal/service/chat/service.go +++ b/internal/service/chat/service.go @@ -1,13 +1,18 @@ package chat +import authClient "github.com/satanaroom/chat_server/internal/clients/grpc/auth" + var _ Service = (*service)(nil) type Service interface { } type service struct { + authClient authClient.Client } -func NewService() *service { - return &service{} +func NewService(authClient authClient.Client) *service { + return &service{ + authClient: authClient, + } }