PenaSide/customer
3
0
Fork 0
generated from PenaSide/GolangTemplate
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

move midllware to penahub common

Browse Source
This commit is contained in:
Pavel 2024-06-07 17:28:54 +03:00
parent b6c16c180a
commit 2d10d4ff6b
10 changed files with 16 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -20,7 +20,7 @@ require (
google.golang.org/genproto/googleapis/api v0.0.0-20240221002015-b0ce06bbee7c
google.golang.org/grpc v1.62.0
google.golang.org/protobuf v1.33.0
penahub.gitlab.yandexcloud.net/backend/penahub_common v0.0.0-20240202120244-c4ef330cfe5d
penahub.gitlab.yandexcloud.net/backend/penahub_common v0.0.0-20240607142502-8257e6c4aa5a
penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240520145524-451212248881
penahub.gitlab.yandexcloud.net/external/trashlog.git v0.1.2-0.20240607135420-4279d2c37763
)

2
go.sum
View File

@ -321,6 +321,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
penahub.gitlab.yandexcloud.net/backend/penahub_common v0.0.0-20240202120244-c4ef330cfe5d h1:gbaDt35HMDqOK84WYmDIlXMI7rstUcRqNttaT6Kx1do=
penahub.gitlab.yandexcloud.net/backend/penahub_common v0.0.0-20240202120244-c4ef330cfe5d/go.mod h1:lTmpjry+8evVkXWbEC+WMOELcFkRD1lFMc7J09mOndM=
penahub.gitlab.yandexcloud.net/backend/penahub_common v0.0.0-20240607142502-8257e6c4aa5a h1:dGW8ErUVdwGJBq6uc5AHYn6Yt10CDNkMIpV+yrDDTLs=
penahub.gitlab.yandexcloud.net/backend/penahub_common v0.0.0-20240607142502-8257e6c4aa5a/go.mod h1:+bPxq2wfW5S1gd+83vZYmHm33AE7nEBfznWS8AM1TKE=
penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240520145524-451212248881 h1:U1/WGQdwZsmrV/ta7Uqm13Dg07IPN/5omS8gzBJYZv4=
penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240520145524-451212248881/go.mod h1:oRyhT55ctjqp/7ZxIzkR7OsQ7T/NLibsfrbb7Ytns64=
penahub.gitlab.yandexcloud.net/external/trashlog.git v0.1.2-0.20240523172059-9bbe8a9faa31 h1:WlRVJnzU0sti+qBq/JTCgFPU0RoxIqGHu7hzDirxE2k=

5
internal/interface/controller/http/account/controllers.go
View File

@ -8,6 +8,7 @@ import (
"github.com/gofiber/fiber/v2"
"go.uber.org/zap"
"math"
"penahub.gitlab.yandexcloud.net/backend/penahub_common/log_mw"
qutils "penahub.gitlab.yandexcloud.net/backend/quiz/common.git/utils"
"penahub.gitlab.yandexcloud.net/pena-services/customer/internal/errors"
"penahub.gitlab.yandexcloud.net/pena-services/customer/internal/interface/client"
@ -102,7 +103,7 @@ func (receiver *AccountController) Get(ctx *fiber.Ctx) error {
return receiver.middleWare.NoAuth(ctx)
}
hlogger := receiver.middleWare.ExtractLogger(ctx)
hlogger := log_mw.ExtractLogger(ctx)
account, err := receiver.accountRepo.FindByUserID(ctx.Context(), userID)
if err != nil {
@ -123,7 +124,7 @@ func (receiver *AccountController) Create(ctx *fiber.Ctx) error {
return receiver.middleWare.NoAuth(ctx)
}
hlogger := receiver.middleWare.ExtractLogger(ctx)
hlogger := log_mw.ExtractLogger(ctx)
var er error

5
internal/interface/controller/http/cart/controllers.go
View File

@ -4,6 +4,7 @@ import (
"github.com/gofiber/fiber/v2"
"go.uber.org/zap"
"google.golang.org/protobuf/types/known/timestamppb"
"penahub.gitlab.yandexcloud.net/backend/penahub_common/log_mw"
"penahub.gitlab.yandexcloud.net/pena-services/customer/internal/errors"
"penahub.gitlab.yandexcloud.net/pena-services/customer/internal/interface/broker/tariff"
"penahub.gitlab.yandexcloud.net/pena-services/customer/internal/interface/client"
@ -84,7 +85,7 @@ func (receiver *CartController) Add2cart(ctx *fiber.Ctx) error {
return receiver.middleWare.NoAuth(ctx)
}
hlogger := receiver.middleWare.ExtractLogger(ctx)
hlogger := log_mw.ExtractLogger(ctx)
tariffID := ctx.Query("id")
if tariffID == "" {
@ -125,7 +126,7 @@ func (receiver *CartController) Pay(ctx *fiber.Ctx) error {
return receiver.middleWare.NoAuth(ctx)
}
hlogger := receiver.middleWare.ExtractLogger(ctx)
hlogger := log_mw.ExtractLogger(ctx)
account, err := receiver.accountRepo.FindByUserID(ctx.Context(), userID)
if err != nil {

3
internal/interface/controller/http/history/controllers.go
View File

@ -6,6 +6,7 @@ import (
"go.uber.org/zap"
"math"
"os"
"penahub.gitlab.yandexcloud.net/backend/penahub_common/log_mw"
"penahub.gitlab.yandexcloud.net/pena-services/customer/internal/interface/client"
"penahub.gitlab.yandexcloud.net/pena-services/customer/internal/interface/controller/http"
"penahub.gitlab.yandexcloud.net/pena-services/customer/internal/interface/repository"
@ -166,7 +167,7 @@ func (receiver *HistoryController) GetRecentTariffs(ctx *fiber.Ctx) error {
}
func (receiver *HistoryController) SendReport(ctx *fiber.Ctx) error {
hlogger := receiver.middleWare.ExtractLogger(ctx)
hlogger := log_mw.ExtractLogger(ctx)
var req struct {
Id string `json:"id"`

6
internal/interface/controller/http/middleware.go
View File

@ -3,7 +3,6 @@ package http
import (
"fmt"
"github.com/gofiber/fiber/v2"
"github.com/themakers/hlog"
"go.uber.org/zap"
"penahub.gitlab.yandexcloud.net/pena-services/customer/internal/models"
)
@ -54,8 +53,3 @@ func (mw *MiddleWare) ExtractToken(ctx *fiber.Ctx) (string, bool) {
func (mw *MiddleWare) GetHealth(ctx *fiber.Ctx) error {
return ctx.Status(fiber.StatusOK).SendString("OK")
}
func (mw *MiddleWare) ExtractLogger(ctx *fiber.Ctx) hlog.Logger {
logger := ctx.Context().UserValue(models.LoggerKey).(hlog.Logger)
return logger
}

5
internal/interface/controller/http/wallet/controllers.go
View File

@ -5,6 +5,7 @@ import (
"fmt"
"github.com/gofiber/fiber/v2"
"go.uber.org/zap"
"penahub.gitlab.yandexcloud.net/backend/penahub_common/log_mw"
"penahub.gitlab.yandexcloud.net/pena-services/customer/internal/errors"
"penahub.gitlab.yandexcloud.net/pena-services/customer/internal/interface/client"
"penahub.gitlab.yandexcloud.net/pena-services/customer/internal/interface/controller/http"
@ -59,7 +60,7 @@ func (receiver *WalletController) RequestMoney(ctx *fiber.Ctx) error {
return receiver.middleWare.NoAuth(ctx)
}
hlogger := receiver.middleWare.ExtractLogger(ctx)
hlogger := log_mw.ExtractLogger(ctx)
var request models.GetPaymentLinkBody
if err := ctx.BodyParser(&request); err != nil {
@ -286,7 +287,7 @@ func (receiver *WalletController) PostWalletRspay(ctx *fiber.Ctx) error {
return receiver.middleWare.NoAuth(ctx)
}
hlogger := receiver.middleWare.ExtractLogger(ctx)
hlogger := log_mw.ExtractLogger(ctx)
var req struct {
Money *float32 `json:"money,omitempty"`

1
internal/models/auth.go
View File

@ -15,4 +15,3 @@ type User struct {
const AuthJWTDecodedUserIDKey = "userID"
const AuthJWTDecodedAccessTokenKey = "access-token"
const LoggerKey = "logger"

3
internal/server/http.go
View File

@ -6,6 +6,7 @@ import (
"github.com/gofiber/fiber/v2"
"github.com/themakers/hlog"
"go.uber.org/zap"
"penahub.gitlab.yandexcloud.net/backend/penahub_common/log_mw"
"penahub.gitlab.yandexcloud.net/pena-services/customer/internal/models"
"penahub.gitlab.yandexcloud.net/pena-services/customer/internal/utils"
)
@ -29,7 +30,7 @@ func NewServer(config ServerConfig) *Server {
jwtUtil := utils.NewJWT(config.JWTConfig)
app.Use(utils.NewAuthenticator(jwtUtil))
app.Use(utils.ContextLogger(config.Hlog))
app.Use(log_mw.ContextLogger(config.Hlog))
s := &Server{
Logger: config.Logger,

20
internal/utils/logger_middleware.go
View File

@ -1,20 +0,0 @@
package utils
import (
"github.com/gofiber/fiber/v2"
"github.com/themakers/hlog"
"penahub.gitlab.yandexcloud.net/pena-services/customer/internal/models"
"strings"
)
func ContextLogger(logger hlog.Logger) fiber.Handler {
return func(c *fiber.Ctx) error {
c.Locals(models.LoggerKey, logger.With(map[string]string{
"ctxuserip": c.IP(),
"ctxuserport": c.Port(),
"keydomain": strings.Join(c.Subdomains(), "/"),
"keypath": c.Path(),
}))
return c.Next()
}
}