From 84b2e000b0087cf45b50ddbe9307a50dd05c533a Mon Sep 17 00:00:00 2001 From: Sergey Chubaryan Date: Fri, 17 Jan 2025 12:45:24 +0300 Subject: [PATCH] reorganize project structure --- {src => cmd/backend}/app.go | 26 ++-- {src => cmd/backend}/args_parser/args.go | 0 {misc => cmd/backend}/config.yaml | 2 +- {src => cmd/backend}/config/config.go | 0 {src => cmd/backend}/config/config_test.go | 0 {src => cmd/backend}/config/new.go | 0 {src => cmd/backend}/config/parser.go | 0 {misc => cmd/backend}/jwt_signing_key | 0 main.go => cmd/backend/main.go | 5 +- .../backend}/server/handlers/dummy_handler.go | 0 .../server/handlers/shortlink_handlers.go | 4 +- .../server/handlers/user_create_handler.go | 4 +- .../server/handlers/user_login_handler.go | 4 +- .../backend}/server/middleware/auth.go | 2 +- .../backend}/server/middleware/recovery.go | 4 +- .../backend}/server/middleware/request_log.go | 4 +- .../backend}/server/middleware/tracing.go | 0 {src => cmd/backend}/server/server.go | 16 +-- {src => cmd/backend}/server/utils/user.go | 2 +- helper/config.yaml | 9 -- helper/go.mod | 13 -- helper/go.sum | 64 ---------- helper/main.go | 113 ------------------ {src => internal}/core/models/action_token.go | 0 {src => internal}/core/models/user.go | 0 {src => internal}/core/repos/action_token.go | 4 +- {src => internal}/core/repos/event_repo.go | 2 +- .../core/repos/shortlink_repo.go | 2 +- {src => internal}/core/repos/user_repo.go | 4 +- .../core/services/shortlink_service.go | 6 +- .../core/services/user_service.go | 8 +- {src => internal}/core/utils/jwt.go | 0 {src => internal}/core/utils/password.go | 3 +- {src => internal}/integrations/kafka.go | 0 {src => internal}/integrations/postgresql.go | 0 {src => internal}/integrations/prometheus.go | 0 {src => pkg}/cache/cache_inmem.go | 0 .../cache/cache_inmem_sharded.go | 0 .../interface.go => pkg/cache/expiration.go | 10 -- pkg/cache/interface.go | 11 ++ {src => pkg}/cache/sharding_info.go | 0 {src => pkg}/charsets/charsets.go | 0 {src => pkg}/charsets/enum.go | 0 pkg/containers/queue.go | 43 +++++++ pkg/containers/stack.go | 37 ++++++ {src => pkg}/logger/bufio_wrapper.go | 0 {src => pkg}/logger/event.go | 0 {src => pkg}/logger/logger.go | 0 {src => pkg}/logger/new.go | 0 src/client_notifier/event.go | 12 -- src/client_notifier/notifier.go | 57 --------- src/leader_elector/elector.go | 25 ---- src/server/handlers/long_pooling_handler.go | 28 ----- 53 files changed, 138 insertions(+), 386 deletions(-) rename {src => cmd/backend}/app.go (92%) rename {src => cmd/backend}/args_parser/args.go (100%) rename {misc => cmd/backend}/config.yaml (76%) rename {src => cmd/backend}/config/config.go (100%) rename {src => cmd/backend}/config/config_test.go (100%) rename {src => cmd/backend}/config/new.go (100%) rename {src => cmd/backend}/config/parser.go (100%) rename {misc => cmd/backend}/jwt_signing_key (100%) rename main.go => cmd/backend/main.go (85%) rename {src => cmd/backend}/server/handlers/dummy_handler.go (100%) rename {src => cmd/backend}/server/handlers/shortlink_handlers.go (97%) rename {src => cmd/backend}/server/handlers/user_create_handler.go (96%) rename {src => cmd/backend}/server/handlers/user_login_handler.go (96%) rename {src => cmd/backend}/server/middleware/auth.go (93%) rename {src => cmd/backend}/server/middleware/recovery.go (98%) rename {src => cmd/backend}/server/middleware/request_log.go (95%) rename {src => cmd/backend}/server/middleware/tracing.go (100%) rename {src => cmd/backend}/server/server.go (87%) rename {src => cmd/backend}/server/utils/user.go (86%) delete mode 100644 helper/config.yaml delete mode 100644 helper/go.mod delete mode 100644 helper/go.sum delete mode 100644 helper/main.go rename {src => internal}/core/models/action_token.go (100%) rename {src => internal}/core/models/user.go (100%) rename {src => internal}/core/repos/action_token.go (96%) rename {src => internal}/core/repos/event_repo.go (94%) rename {src => internal}/core/repos/shortlink_repo.go (98%) rename {src => internal}/core/repos/user_repo.go (97%) rename {src => internal}/core/services/shortlink_service.go (95%) rename {src => internal}/core/services/user_service.go (97%) rename {src => internal}/core/utils/jwt.go (100%) rename {src => internal}/core/utils/password.go (98%) rename {src => internal}/integrations/kafka.go (100%) rename {src => internal}/integrations/postgresql.go (100%) rename {src => internal}/integrations/prometheus.go (100%) rename {src => pkg}/cache/cache_inmem.go (100%) rename src/cache/cache_inmem_shard.go => pkg/cache/cache_inmem_sharded.go (100%) rename src/cache/interface.go => pkg/cache/expiration.go (53%) create mode 100644 pkg/cache/interface.go rename {src => pkg}/cache/sharding_info.go (100%) rename {src => pkg}/charsets/charsets.go (100%) rename {src => pkg}/charsets/enum.go (100%) create mode 100644 pkg/containers/queue.go create mode 100644 pkg/containers/stack.go rename {src => pkg}/logger/bufio_wrapper.go (100%) rename {src => pkg}/logger/event.go (100%) rename {src => pkg}/logger/logger.go (100%) rename {src => pkg}/logger/new.go (100%) delete mode 100644 src/client_notifier/event.go delete mode 100644 src/client_notifier/notifier.go delete mode 100644 src/leader_elector/elector.go delete mode 100644 src/server/handlers/long_pooling_handler.go diff --git a/src/app.go b/cmd/backend/app.go similarity index 92% rename from src/app.go rename to cmd/backend/app.go index 38933d6..11b0fb0 100644 --- a/src/app.go +++ b/cmd/backend/app.go @@ -1,17 +1,16 @@ -package src +package main import ( - "backend/src/args_parser" - "backend/src/cache" - "backend/src/client_notifier" - "backend/src/config" - "backend/src/core/models" - "backend/src/core/repos" - "backend/src/core/services" - "backend/src/core/utils" - "backend/src/integrations" - "backend/src/logger" - "backend/src/server" + "backend/cmd/backend/args_parser" + "backend/cmd/backend/config" + "backend/cmd/backend/server" + "backend/internal/core/models" + "backend/internal/core/repos" + "backend/internal/core/services" + "backend/internal/core/utils" + "backend/internal/integrations" + "backend/pkg/cache" + "backend/pkg/logger" "context" "crypto/rsa" "crypto/x509" @@ -187,8 +186,6 @@ func (a *App) Run(p RunParams) { // go shortlinkService.ShortlinkRoutine(ctx) } - clientNotifier := client_notifier.NewBasicNotifier() - // Start profiling if args.GetProfilePath() != "" { pprofFile, err := os.Create(args.GetProfilePath()) @@ -211,7 +208,6 @@ func (a *App) Run(p RunParams) { server.NewServerOpts{ DebugMode: debugMode, Logger: logger, - Notifier: clientNotifier, ShortlinkService: shortlinkService, UserService: userService, Tracer: tracer, diff --git a/src/args_parser/args.go b/cmd/backend/args_parser/args.go similarity index 100% rename from src/args_parser/args.go rename to cmd/backend/args_parser/args.go diff --git a/misc/config.yaml b/cmd/backend/config.yaml similarity index 76% rename from misc/config.yaml rename to cmd/backend/config.yaml index 2fbd62d..d5df5f4 100644 --- a/misc/config.yaml +++ b/cmd/backend/config.yaml @@ -1,5 +1,5 @@ port: 8080 postgres_url: "postgres://postgres:postgres@localhost:5432/postgres" -jwt_signing_key: "./misc/jwt_signing_key" +jwt_signing_key: "./jwt_signing_key" kafka_url: "localhost:9092" kafka_topic: "backend_events" \ No newline at end of file diff --git a/src/config/config.go b/cmd/backend/config/config.go similarity index 100% rename from src/config/config.go rename to cmd/backend/config/config.go diff --git a/src/config/config_test.go b/cmd/backend/config/config_test.go similarity index 100% rename from src/config/config_test.go rename to cmd/backend/config/config_test.go diff --git a/src/config/new.go b/cmd/backend/config/new.go similarity index 100% rename from src/config/new.go rename to cmd/backend/config/new.go diff --git a/src/config/parser.go b/cmd/backend/config/parser.go similarity index 100% rename from src/config/parser.go rename to cmd/backend/config/parser.go diff --git a/misc/jwt_signing_key b/cmd/backend/jwt_signing_key similarity index 100% rename from misc/jwt_signing_key rename to cmd/backend/jwt_signing_key diff --git a/main.go b/cmd/backend/main.go similarity index 85% rename from main.go rename to cmd/backend/main.go index 6ec412d..d53abd7 100644 --- a/main.go +++ b/cmd/backend/main.go @@ -1,7 +1,6 @@ package main import ( - "backend/src" "context" "os" "strings" @@ -14,9 +13,9 @@ func main() { env[kv[0]] = kv[1] } - app := &src.App{} + app := &App{} app.Run( - src.RunParams{ + RunParams{ Ctx: context.Background(), OsArgs: os.Args, EnvVars: env, diff --git a/src/server/handlers/dummy_handler.go b/cmd/backend/server/handlers/dummy_handler.go similarity index 100% rename from src/server/handlers/dummy_handler.go rename to cmd/backend/server/handlers/dummy_handler.go diff --git a/src/server/handlers/shortlink_handlers.go b/cmd/backend/server/handlers/shortlink_handlers.go similarity index 97% rename from src/server/handlers/shortlink_handlers.go rename to cmd/backend/server/handlers/shortlink_handlers.go index d587952..811bb21 100644 --- a/src/server/handlers/shortlink_handlers.go +++ b/cmd/backend/server/handlers/shortlink_handlers.go @@ -1,8 +1,8 @@ package handlers import ( - "backend/src/core/services" - "backend/src/logger" + "backend/internal/core/services" + "backend/pkg/logger" "encoding/json" "fmt" "net/url" diff --git a/src/server/handlers/user_create_handler.go b/cmd/backend/server/handlers/user_create_handler.go similarity index 96% rename from src/server/handlers/user_create_handler.go rename to cmd/backend/server/handlers/user_create_handler.go index 94ebf67..09610e0 100644 --- a/src/server/handlers/user_create_handler.go +++ b/cmd/backend/server/handlers/user_create_handler.go @@ -1,8 +1,8 @@ package handlers import ( - "backend/src/core/services" - "backend/src/logger" + "backend/internal/core/services" + "backend/pkg/logger" "encoding/json" "github.com/gin-gonic/gin" diff --git a/src/server/handlers/user_login_handler.go b/cmd/backend/server/handlers/user_login_handler.go similarity index 96% rename from src/server/handlers/user_login_handler.go rename to cmd/backend/server/handlers/user_login_handler.go index e48552c..d1878d4 100644 --- a/src/server/handlers/user_login_handler.go +++ b/cmd/backend/server/handlers/user_login_handler.go @@ -1,8 +1,8 @@ package handlers import ( - "backend/src/core/services" - "backend/src/logger" + "backend/internal/core/services" + "backend/pkg/logger" "encoding/json" "github.com/gin-gonic/gin" diff --git a/src/server/middleware/auth.go b/cmd/backend/server/middleware/auth.go similarity index 93% rename from src/server/middleware/auth.go rename to cmd/backend/server/middleware/auth.go index 78419a0..6d315ac 100644 --- a/src/server/middleware/auth.go +++ b/cmd/backend/server/middleware/auth.go @@ -1,7 +1,7 @@ package middleware import ( - "backend/src/core/services" + "backend/internal/core/services" "fmt" "github.com/gin-gonic/gin" diff --git a/src/server/middleware/recovery.go b/cmd/backend/server/middleware/recovery.go similarity index 98% rename from src/server/middleware/recovery.go rename to cmd/backend/server/middleware/recovery.go index 798c74c..472e126 100644 --- a/src/server/middleware/recovery.go +++ b/cmd/backend/server/middleware/recovery.go @@ -3,8 +3,8 @@ package middleware // Modified recovery from gin, use own logger import ( - "backend/src/integrations" - "backend/src/logger" + "backend/internal/integrations" + "backend/pkg/logger" "bytes" "errors" "fmt" diff --git a/src/server/middleware/request_log.go b/cmd/backend/server/middleware/request_log.go similarity index 95% rename from src/server/middleware/request_log.go rename to cmd/backend/server/middleware/request_log.go index 047d765..587abc6 100644 --- a/src/server/middleware/request_log.go +++ b/cmd/backend/server/middleware/request_log.go @@ -1,8 +1,8 @@ package middleware import ( - "backend/src/integrations" - log "backend/src/logger" + "backend/internal/integrations" + log "backend/pkg/logger" "time" "github.com/gin-gonic/gin" diff --git a/src/server/middleware/tracing.go b/cmd/backend/server/middleware/tracing.go similarity index 100% rename from src/server/middleware/tracing.go rename to cmd/backend/server/middleware/tracing.go diff --git a/src/server/server.go b/cmd/backend/server/server.go similarity index 87% rename from src/server/server.go rename to cmd/backend/server/server.go index 5a67111..8ea6050 100644 --- a/src/server/server.go +++ b/cmd/backend/server/server.go @@ -1,13 +1,12 @@ package server import ( - "backend/src/client_notifier" - "backend/src/core/services" - "backend/src/integrations" - "backend/src/logger" - "backend/src/server/handlers" - "backend/src/server/middleware" - "backend/src/server/utils" + "backend/cmd/backend/server/handlers" + "backend/cmd/backend/server/middleware" + "backend/cmd/backend/server/utils" + "backend/internal/core/services" + "backend/internal/integrations" + "backend/pkg/logger" "context" "fmt" "net" @@ -24,7 +23,6 @@ type Server struct { type NewServerOpts struct { DebugMode bool Logger logger.Logger - Notifier client_notifier.ClientNotifier UserService services.UserService ShortlinkService services.ShortlinkService Tracer trace.Tracer @@ -48,8 +46,6 @@ func New(opts NewServerOpts) *Server { r.Use(middleware.NewRequestLogMiddleware(opts.Logger, opts.Tracer, prometheus)) r.Use(middleware.NewTracingMiddleware(opts.Tracer)) - r.GET("/pooling", handlers.NewLongPoolingHandler(opts.Logger, opts.Notifier)) - linkGroup := r.Group("/s") linkGroup.POST("/new", handlers.NewShortlinkCreateHandler(opts.Logger, opts.ShortlinkService)) linkGroup.GET("/:linkId", handlers.NewShortlinkResolveHandler(opts.Logger, opts.ShortlinkService)) diff --git a/src/server/utils/user.go b/cmd/backend/server/utils/user.go similarity index 86% rename from src/server/utils/user.go rename to cmd/backend/server/utils/user.go index 0f6bb32..ebc8db3 100644 --- a/src/server/utils/user.go +++ b/cmd/backend/server/utils/user.go @@ -1,7 +1,7 @@ package utils import ( - "backend/src/core/models" + "backend/internal/core/models" "github.com/gin-gonic/gin" ) diff --git a/helper/config.yaml b/helper/config.yaml deleted file mode 100644 index 871cb41..0000000 --- a/helper/config.yaml +++ /dev/null @@ -1,9 +0,0 @@ -kafka: - brokers: - - localhost:9092 - topic: backend_events -smtp: - server: smtp.yandex.ru - port: 587 - email: "" - password: "" \ No newline at end of file diff --git a/helper/go.mod b/helper/go.mod deleted file mode 100644 index f777c18..0000000 --- a/helper/go.mod +++ /dev/null @@ -1,13 +0,0 @@ -module helper - -go 1.22.5 - -require gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df - -require ( - github.com/klauspost/compress v1.15.9 // indirect - github.com/pierrec/lz4/v4 v4.1.15 // indirect - github.com/segmentio/kafka-go v0.4.47 // indirect - gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect - gopkg.in/yaml.v3 v3.0.1 -) diff --git a/helper/go.sum b/helper/go.sum deleted file mode 100644 index e122635..0000000 --- a/helper/go.sum +++ /dev/null @@ -1,64 +0,0 @@ -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/klauspost/compress v1.15.9 h1:wKRjX6JRtDdrE9qwa4b/Cip7ACOshUI4smpCQanqjSY= -github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= -github.com/pierrec/lz4/v4 v4.1.15 h1:MO0/ucJhngq7299dKLwIMtgTfbkoSPF6AoMYDd8Q4q0= -github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/segmentio/kafka-go v0.4.47 h1:IqziR4pA3vrZq7YdRxaT3w1/5fvIH5qpCwstUanQQB0= -github.com/segmentio/kafka-go v0.4.47/go.mod h1:HjF6XbOKh0Pjlkr5GVZxt6CsjjwnmhVOfURM5KMd8qg= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -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/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= -github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4= -github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/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.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= -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/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -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-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.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -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/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= -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.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk= -gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df h1:n7WqCuqOuCbNr617RXOY0AWRXxgwEyPp2z+p0+hgMuE= -gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw= -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= diff --git a/helper/main.go b/helper/main.go deleted file mode 100644 index ab980c5..0000000 --- a/helper/main.go +++ /dev/null @@ -1,113 +0,0 @@ -package main - -import ( - "context" - "encoding/json" - "io" - "log" - "os" - "strings" - - "github.com/segmentio/kafka-go" - "gopkg.in/gomail.v2" - "gopkg.in/yaml.v3" -) - -const MSG_TEXT = ` - - - - -

This message was sent because you forgot a password

-

To change a password, use this link

- - -` - -func SendEmailForgotPassword(dialer *gomail.Dialer, from, to, token string) error { - link := "localhost:8080/restore-password?token=" + token - - msgText := strings.ReplaceAll(MSG_TEXT, "{{Link}}", link) - - m := gomail.NewMessage() - m.SetHeader("From", m.FormatAddress(from, "Pet Backend")) - m.SetHeader("To", to) - m.SetHeader("Subject", "Hello!") - m.SetBody("text/html", msgText) - - return dialer.DialAndSend(m) -} - -type Config struct { - Kafka struct { - Brokers []string `yaml:"brokers"` - Topic string `yaml:"topic"` - } - - SMTP struct { - Server string `yaml:"server"` - Port int `yaml:"port"` - Email string `yaml:"email"` - Password string `yaml:"password"` - } `yaml:"smtp"` -} - -func main() { - ctx := context.Background() - - configFile, err := os.ReadFile("config.yaml") - if err != nil { - log.Fatal(err.Error()) - } - - config := &Config{} - if err := yaml.Unmarshal(configFile, config); err != nil { - log.Fatal(err.Error()) - } - - dialer := gomail.NewDialer(config.SMTP.Server, config.SMTP.Port, config.SMTP.Email, config.SMTP.Password) - - log.Println("starting reader...") - - r := kafka.NewReader(kafka.ReaderConfig{ - Brokers: config.Kafka.Brokers, - Topic: config.Kafka.Topic, - GroupID: "consumer-group-id", - }) - - log.Println("reader started") - - for { - msg, err := r.FetchMessage(ctx) - if err == io.EOF { - log.Fatal("EOF") - return - } - if err != nil { - log.Fatal(err.Error()) - return - } - - log.Printf("offset: %d, partition: %d, key: %s, value: %s\n", msg.Offset, msg.Partition, string(msg.Key), string(msg.Value)) - - if err := r.CommitMessages(ctx, msg); err != nil { - log.Fatalf("failed to commit: %s\n", err.Error()) - continue - } - - value := struct { - Email string `json:"email"` - Token string `json:"token"` - }{} - - if err := json.Unmarshal(msg.Value, &value); err != nil { - log.Fatalf("failed to unmarshal: %s\n", err.Error()) - continue - } - - if err := SendEmailForgotPassword(dialer, config.SMTP.Email, value.Email, value.Token); err != nil { - log.Fatalf("failed to send email: %s\n", err.Error()) - continue - } - } -} diff --git a/src/core/models/action_token.go b/internal/core/models/action_token.go similarity index 100% rename from src/core/models/action_token.go rename to internal/core/models/action_token.go diff --git a/src/core/models/user.go b/internal/core/models/user.go similarity index 100% rename from src/core/models/user.go rename to internal/core/models/user.go diff --git a/src/core/repos/action_token.go b/internal/core/repos/action_token.go similarity index 96% rename from src/core/repos/action_token.go rename to internal/core/repos/action_token.go index 64a4873..4c3dcde 100644 --- a/src/core/repos/action_token.go +++ b/internal/core/repos/action_token.go @@ -1,8 +1,8 @@ package repos import ( - "backend/src/core/models" - "backend/src/integrations" + "backend/internal/core/models" + "backend/internal/integrations" "context" "database/sql" ) diff --git a/src/core/repos/event_repo.go b/internal/core/repos/event_repo.go similarity index 94% rename from src/core/repos/event_repo.go rename to internal/core/repos/event_repo.go index 1ae8216..57460b0 100644 --- a/src/core/repos/event_repo.go +++ b/internal/core/repos/event_repo.go @@ -1,7 +1,7 @@ package repos import ( - "backend/src/integrations" + "backend/internal/integrations" "context" "encoding/json" ) diff --git a/src/core/repos/shortlink_repo.go b/internal/core/repos/shortlink_repo.go similarity index 98% rename from src/core/repos/shortlink_repo.go rename to internal/core/repos/shortlink_repo.go index e8becbd..e48c501 100644 --- a/src/core/repos/shortlink_repo.go +++ b/internal/core/repos/shortlink_repo.go @@ -1,7 +1,7 @@ package repos import ( - "backend/src/integrations" + "backend/internal/integrations" "context" "database/sql" "errors" diff --git a/src/core/repos/user_repo.go b/internal/core/repos/user_repo.go similarity index 97% rename from src/core/repos/user_repo.go rename to internal/core/repos/user_repo.go index 9406f71..2cc7461 100644 --- a/src/core/repos/user_repo.go +++ b/internal/core/repos/user_repo.go @@ -1,8 +1,8 @@ package repos import ( - "backend/src/core/models" - "backend/src/integrations" + "backend/internal/core/models" + "backend/internal/integrations" "context" "database/sql" "errors" diff --git a/src/core/services/shortlink_service.go b/internal/core/services/shortlink_service.go similarity index 95% rename from src/core/services/shortlink_service.go rename to internal/core/services/shortlink_service.go index 6d83829..5228349 100644 --- a/src/core/services/shortlink_service.go +++ b/internal/core/services/shortlink_service.go @@ -1,9 +1,9 @@ package services import ( - "backend/src/cache" - "backend/src/charsets" - "backend/src/core/repos" + "backend/internal/core/repos" + "backend/pkg/cache" + "backend/pkg/charsets" "context" "fmt" "math/rand" diff --git a/src/core/services/user_service.go b/internal/core/services/user_service.go similarity index 97% rename from src/core/services/user_service.go rename to internal/core/services/user_service.go index 998f65e..baca777 100644 --- a/src/core/services/user_service.go +++ b/internal/core/services/user_service.go @@ -1,10 +1,10 @@ package services import ( - "backend/src/cache" - "backend/src/core/models" - "backend/src/core/repos" - "backend/src/core/utils" + "backend/internal/core/models" + "backend/internal/core/repos" + "backend/internal/core/utils" + "backend/pkg/cache" "context" "fmt" "time" diff --git a/src/core/utils/jwt.go b/internal/core/utils/jwt.go similarity index 100% rename from src/core/utils/jwt.go rename to internal/core/utils/jwt.go diff --git a/src/core/utils/password.go b/internal/core/utils/password.go similarity index 98% rename from src/core/utils/password.go rename to internal/core/utils/password.go index aa26fd4..304b850 100644 --- a/src/core/utils/password.go +++ b/internal/core/utils/password.go @@ -1,9 +1,10 @@ package utils import ( - "backend/src/charsets" "fmt" + "backend/pkg/charsets" + "golang.org/x/crypto/bcrypt" ) diff --git a/src/integrations/kafka.go b/internal/integrations/kafka.go similarity index 100% rename from src/integrations/kafka.go rename to internal/integrations/kafka.go diff --git a/src/integrations/postgresql.go b/internal/integrations/postgresql.go similarity index 100% rename from src/integrations/postgresql.go rename to internal/integrations/postgresql.go diff --git a/src/integrations/prometheus.go b/internal/integrations/prometheus.go similarity index 100% rename from src/integrations/prometheus.go rename to internal/integrations/prometheus.go diff --git a/src/cache/cache_inmem.go b/pkg/cache/cache_inmem.go similarity index 100% rename from src/cache/cache_inmem.go rename to pkg/cache/cache_inmem.go diff --git a/src/cache/cache_inmem_shard.go b/pkg/cache/cache_inmem_sharded.go similarity index 100% rename from src/cache/cache_inmem_shard.go rename to pkg/cache/cache_inmem_sharded.go diff --git a/src/cache/interface.go b/pkg/cache/expiration.go similarity index 53% rename from src/cache/interface.go rename to pkg/cache/expiration.go index 75841a3..dfcdf6f 100644 --- a/src/cache/interface.go +++ b/pkg/cache/expiration.go @@ -13,13 +13,3 @@ func (e Expiration) Get() time.Time { } return e.ExpiresAt } - -type Cache[K comparable, V any] interface { - Get(key K) (V, bool) - GetEx(key K, exp Expiration) (V, bool) - - Set(key K, value V, exp Expiration) - - Del(key K) - CheckExpired(batchSize int) -} diff --git a/pkg/cache/interface.go b/pkg/cache/interface.go new file mode 100644 index 0000000..9665b73 --- /dev/null +++ b/pkg/cache/interface.go @@ -0,0 +1,11 @@ +package cache + +type Cache[K comparable, V any] interface { + Get(key K) (V, bool) + GetEx(key K, exp Expiration) (V, bool) + + Set(key K, value V, exp Expiration) + + Del(key K) + CheckExpired(batchSize int) +} diff --git a/src/cache/sharding_info.go b/pkg/cache/sharding_info.go similarity index 100% rename from src/cache/sharding_info.go rename to pkg/cache/sharding_info.go diff --git a/src/charsets/charsets.go b/pkg/charsets/charsets.go similarity index 100% rename from src/charsets/charsets.go rename to pkg/charsets/charsets.go diff --git a/src/charsets/enum.go b/pkg/charsets/enum.go similarity index 100% rename from src/charsets/enum.go rename to pkg/charsets/enum.go diff --git a/pkg/containers/queue.go b/pkg/containers/queue.go new file mode 100644 index 0000000..fa9dc51 --- /dev/null +++ b/pkg/containers/queue.go @@ -0,0 +1,43 @@ +package containers + +func NewQueue[T interface{}]() Queue[T] { + return Queue[T]{ + front: NewStack[T](), + back: NewStack[T](), + } +} + +type Queue[T interface{}] struct { + front, back *Stack[T] +} + +func (m *Queue[T]) Push(val T) { + m.front.Push(val) +} + +func (m *Queue[T]) swapStacks() { + if m.back.Empty() { + for !m.front.Empty() { + val, _ := m.front.Pop() + m.back.Push(val) + } + } +} + +func (m *Queue[T]) Pop() T { + m.swapStacks() + + val, _ := m.back.Pop() + return val +} + +func (m *Queue[T]) Peek() T { + m.swapStacks() + + val, _ := m.back.Peek() + return val +} + +func (m *Queue[T]) Empty() bool { + return m.front.Empty() && m.back.Empty() +} diff --git a/pkg/containers/stack.go b/pkg/containers/stack.go new file mode 100644 index 0000000..7de4846 --- /dev/null +++ b/pkg/containers/stack.go @@ -0,0 +1,37 @@ +package containers + +func NewStack[T interface{}]() *Stack[T] { + return &Stack[T]{[]T{}} +} + +type Stack[T interface{}] struct { + arr []T +} + +func (s *Stack[T]) Empty() bool { + return len(s.arr) <= 0 +} + +func (s *Stack[T]) Push(val T) { + s.arr = append(s.arr, val) +} + +func (s *Stack[T]) Peek() (T, bool) { + if len(s.arr) <= 0 { + var t T + return t, false + } + return s.arr[len(s.arr)-1], true +} + +func (s *Stack[T]) Pop() (T, bool) { + if len(s.arr) <= 0 { + var t T + return t, false + } + + maxIndex := len(s.arr) - 1 + element := s.arr[maxIndex] + s.arr = s.arr[:maxIndex] + return element, true +} diff --git a/src/logger/bufio_wrapper.go b/pkg/logger/bufio_wrapper.go similarity index 100% rename from src/logger/bufio_wrapper.go rename to pkg/logger/bufio_wrapper.go diff --git a/src/logger/event.go b/pkg/logger/event.go similarity index 100% rename from src/logger/event.go rename to pkg/logger/event.go diff --git a/src/logger/logger.go b/pkg/logger/logger.go similarity index 100% rename from src/logger/logger.go rename to pkg/logger/logger.go diff --git a/src/logger/new.go b/pkg/logger/new.go similarity index 100% rename from src/logger/new.go rename to pkg/logger/new.go diff --git a/src/client_notifier/event.go b/src/client_notifier/event.go deleted file mode 100644 index f577329..0000000 --- a/src/client_notifier/event.go +++ /dev/null @@ -1,12 +0,0 @@ -package client_notifier - -type Event struct { - Type EventType - Data []byte -} - -type EventType string - -const ( - EventTypeEmailConfirmed EventType = "event_email_confirmed" -) diff --git a/src/client_notifier/notifier.go b/src/client_notifier/notifier.go deleted file mode 100644 index cd03efc..0000000 --- a/src/client_notifier/notifier.go +++ /dev/null @@ -1,57 +0,0 @@ -package client_notifier - -import "sync" - -type ClientNotifier interface { - RegisterClient(id string) <-chan Event - UnregisterClient(id string) - NotifyClient(id string, e Event) -} - -type client struct { - id string - eventChan chan Event -} - -func NewBasicNotifier() ClientNotifier { - return &basicNotifier{ - m: &sync.RWMutex{}, - clients: map[string]client{}, - } -} - -type basicNotifier struct { - m *sync.RWMutex - clients map[string]client -} - -func (p *basicNotifier) RegisterClient(id string) <-chan Event { - p.m.Lock() - defer p.m.Unlock() - - eventChan := make(chan Event) - p.clients[id] = client{ - id: id, - eventChan: eventChan, - } - - return eventChan -} - -func (p *basicNotifier) UnregisterClient(id string) { - p.m.Lock() - defer p.m.Unlock() - - delete(p.clients, id) -} - -func (p *basicNotifier) NotifyClient(id string, e Event) { - p.m.RLock() - defer p.m.RUnlock() - - client, ok := p.clients[id] - if !ok { - return - } - client.eventChan <- e -} diff --git a/src/leader_elector/elector.go b/src/leader_elector/elector.go deleted file mode 100644 index 4c9ac94..0000000 --- a/src/leader_elector/elector.go +++ /dev/null @@ -1,25 +0,0 @@ -package leader_elector - -import ( - "context" - "database/sql" -) - -func Lock(ctx context.Context, db *sql.DB, lockName, id string) error { - query := ` - update locks (id) - set id = $1 - where name == lockName and timestamp < $1 returning id - on conflict - insert into locks(id, name) values($1, $2);` - - row := db.QueryRowContext(ctx, query, id) - - result := "" - err := row.Scan(&result) - if err != nil { - return err - } - - return nil -} diff --git a/src/server/handlers/long_pooling_handler.go b/src/server/handlers/long_pooling_handler.go deleted file mode 100644 index 840a254..0000000 --- a/src/server/handlers/long_pooling_handler.go +++ /dev/null @@ -1,28 +0,0 @@ -package handlers - -import ( - "backend/src/client_notifier" - "backend/src/logger" - "backend/src/server/utils" - - "github.com/gin-gonic/gin" -) - -func NewLongPoolingHandler(logger logger.Logger, notifier client_notifier.ClientNotifier) gin.HandlerFunc { - return func(c *gin.Context) { - user := utils.GetUserFromRequest(c) - if user == nil { - c.Data(403, "plain/text", []byte("Unauthorized")) - return - } - - eventChan := notifier.RegisterClient(user.Id) - - select { - case <-c.Done(): - notifier.UnregisterClient(user.Id) - case event := <-eventChan: - c.Data(200, "application/json", event.Data) - } - } -}