diff --git a/go.mod b/go.mod index 936b29a..4ac3a49 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( gitea.pena/PenaSide/hlog v0.0.0-20241125221102-a54c29c002a9 gitea.pena/PenaSide/linters-golang v0.0.0-20241207122018-933207374735 gitea.pena/PenaSide/trashlog v0.0.0-20250222101337-a43552caae6f - gitea.pena/SQuiz/common v0.0.0-20250422170643-069ed8e576cc + gitea.pena/SQuiz/common v0.0.0-20250423110755-e980b87b531f github.com/caarlos0/env/v8 v8.0.0 github.com/go-redis/redis/v8 v8.11.5 github.com/gofiber/fiber/v2 v2.52.6 diff --git a/go.sum b/go.sum index 9a9792f..146cf5a 100644 --- a/go.sum +++ b/go.sum @@ -15,6 +15,10 @@ gitea.pena/SQuiz/common v0.0.0-20250422165756-2cc87ee518df h1:+PVdYOD2SZQp8MfZtH gitea.pena/SQuiz/common v0.0.0-20250422165756-2cc87ee518df/go.mod h1:/YR+uo4RouZshuHPkguk7nAJVKuFt3Z0mTFxUPdlzxQ= gitea.pena/SQuiz/common v0.0.0-20250422170643-069ed8e576cc h1:HnmZlJxmQJQdF+2L4DEpKpJWNVOThe4qaouVEOALmY0= gitea.pena/SQuiz/common v0.0.0-20250422170643-069ed8e576cc/go.mod h1:/YR+uo4RouZshuHPkguk7nAJVKuFt3Z0mTFxUPdlzxQ= +gitea.pena/SQuiz/common v0.0.0-20250423105358-3f22f4c92df2 h1:a4w4+B+4UlRkBA5X6XTXEJyEKSC7kaRXA5aJ1V7ynIA= +gitea.pena/SQuiz/common v0.0.0-20250423105358-3f22f4c92df2/go.mod h1:zCrUwDh0APpztKk6NUqTZv+zhjVbWpGBJiJ5z9dAH0U= +gitea.pena/SQuiz/common v0.0.0-20250423110755-e980b87b531f h1:68BRQNKrbOu/6v226qV/WYSQfGJ5DOe0dxWdA5W1Ywo= +gitea.pena/SQuiz/common v0.0.0-20250423110755-e980b87b531f/go.mod h1:rQRjqLlLyM71FZcvbM95Nv3ciq44F9DFtUHPZmDK3T8= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/ClickHouse/clickhouse-go v1.5.4 h1:cKjXeYLNWVJIx2J1K6H2CqyRmfwVJVY1OV1coaaFcI0= github.com/ClickHouse/clickhouse-go v1.5.4/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI= diff --git a/internal/app/app.go b/internal/app/app.go index ed4f786..8d4b906 100644 --- a/internal/app/app.go +++ b/internal/app/app.go @@ -149,6 +149,7 @@ func Run(ctx context.Context, cfg initialize.Config, build Build) error { Controllers: []http.Controller{controllers.HttpControllers.Account, controllers.HttpControllers.Telegram, controllers.HttpControllers.Result, controllers.HttpControllers.Question, controllers.HttpControllers.Quiz, controllers.HttpControllers.Statistic}, Hlogger: loggerHlog, + Dal: dalS.PgDAL, }) go func() { diff --git a/internal/server/http/http_server.go b/internal/server/http/http_server.go index 121c9b1..b6c90a6 100644 --- a/internal/server/http/http_server.go +++ b/internal/server/http/http_server.go @@ -5,7 +5,9 @@ import ( "fmt" "gitea.pena/PenaSide/common/log_mw" "gitea.pena/PenaSide/hlog" + "gitea.pena/SQuiz/common/dal" "gitea.pena/SQuiz/common/middleware" + "gitea.pena/SQuiz/core/internal/middleware/check_ownership" "github.com/gofiber/fiber/v2" "go.uber.org/zap" ) @@ -14,6 +16,7 @@ type ServerConfig struct { Logger *zap.Logger Controllers []Controller Hlogger hlog.Logger + Dal *dal.DAL } type Server struct { @@ -25,6 +28,7 @@ type Server struct { func NewServer(config ServerConfig) *Server { app := fiber.New() app.Use(middleware.JWTAuth()) + app.Use(check_ownership.OwnerShipMiddleware(check_ownership.NewOwnerShip(config.Dal))) app.Use(log_mw.ContextLogger(config.Hlogger)) //app.Get("/liveness", healthchecks.Liveness) //app.Get("/readiness", healthchecks.Readiness(&workerErr)) //todo parametrized readiness. should discuss ready reason