diff --git a/cmd/codeword/main.go b/cmd/codeword/main.go index 01aa102..0ed24cd 100644 --- a/cmd/codeword/main.go +++ b/cmd/codeword/main.go @@ -1,16 +1,16 @@ package main import ( - "codeword/internal/app" - "codeword/internal/initialize" "context" "fmt" + "gitea.pena/PenaSide/codeword/internal/app" + "gitea.pena/PenaSide/codeword/internal/initialize" "go.uber.org/zap" "os" "os/signal" + _ "penahub.gitlab.yandexcloud.net/devops/linters/golang.git/pkg/dummy" "syscall" "time" - _ "penahub.gitlab.yandexcloud.net/devops/linters/golang.git/pkg/dummy" ) var ( diff --git a/go.mod b/go.mod index 0d290cf..79933b7 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module codeword +module gitea.pena/PenaSide/codeword go 1.22.2 diff --git a/internal/adapters/client/auth.go b/internal/adapters/client/auth.go index f2af518..4bf9003 100644 --- a/internal/adapters/client/auth.go +++ b/internal/adapters/client/auth.go @@ -1,9 +1,9 @@ package client import ( - "codeword/internal/models" "encoding/json" "fmt" + "gitea.pena/PenaSide/codeword/internal/models" "github.com/gofiber/fiber/v2" "go.uber.org/zap" ) @@ -52,7 +52,7 @@ func (a *AuthClient) RefreshAuthToken(userID, signature string) (*models.Refresh if statusCode != fiber.StatusOK { errorMessage := fmt.Sprintf("received an incorrect response from the authentication service: %d", statusCode) - a.deps.Logger.Error(errorMessage, zap.Int("status", statusCode), zap.String("respBody", string(resBody)), zap.String("UserID", userID),zap.String("sign", signature)) + a.deps.Logger.Error(errorMessage, zap.Int("status", statusCode), zap.String("respBody", string(resBody)), zap.String("UserID", userID), zap.String("sign", signature)) return nil, fmt.Errorf(errorMessage) } diff --git a/internal/app/app.go b/internal/app/app.go index 7170007..3f795b1 100644 --- a/internal/app/app.go +++ b/internal/app/app.go @@ -1,23 +1,23 @@ package app import ( - "codeword/internal/controller/admin/admin_promocode" - "codeword/internal/controller/admin/admin_recovery" - "codeword/internal/controller/client/client_promocode" - "codeword/internal/controller/client/client_recovery" - "codeword/internal/controller/rpc_controllers" - "codeword/internal/initialize" - "codeword/internal/models" - "codeword/internal/repository" - "codeword/internal/server/grpc" - httpserver "codeword/internal/server/http" - "codeword/internal/services" - "codeword/internal/utils/middleware" - "codeword/internal/worker/purge_worker" - "codeword/internal/worker/recovery_worker" - "codeword/pkg/closer" "context" "errors" + "gitea.pena/PenaSide/codeword/internal/controller/admin/admin_promocode" + "gitea.pena/PenaSide/codeword/internal/controller/admin/admin_recovery" + "gitea.pena/PenaSide/codeword/internal/controller/client/client_promocode" + "gitea.pena/PenaSide/codeword/internal/controller/client/client_recovery" + "gitea.pena/PenaSide/codeword/internal/controller/rpc_controllers" + "gitea.pena/PenaSide/codeword/internal/initialize" + "gitea.pena/PenaSide/codeword/internal/models" + "gitea.pena/PenaSide/codeword/internal/repository" + "gitea.pena/PenaSide/codeword/internal/server/grpc" + httpserver "gitea.pena/PenaSide/codeword/internal/server/http" + "gitea.pena/PenaSide/codeword/internal/services" + "gitea.pena/PenaSide/codeword/internal/utils/middleware" + "gitea.pena/PenaSide/codeword/internal/worker/purge_worker" + "gitea.pena/PenaSide/codeword/internal/worker/recovery_worker" + "gitea.pena/PenaSide/codeword/pkg/closer" "github.com/themakers/hlog" "github.com/twmb/franz-go/pkg/kgo" "go.uber.org/zap" diff --git a/internal/controller/admin/admin_promocode/promocode_controller.go b/internal/controller/admin/admin_promocode/promocode_controller.go index 50f2c48..6e66643 100644 --- a/internal/controller/admin/admin_promocode/promocode_controller.go +++ b/internal/controller/admin/admin_promocode/promocode_controller.go @@ -1,12 +1,12 @@ package admin_promocode import ( - "codeword/internal/models" - "codeword/internal/repository" - "codeword/internal/services" - "codeword/internal/utils/middleware" "errors" "fmt" + "gitea.pena/PenaSide/codeword/internal/models" + "gitea.pena/PenaSide/codeword/internal/repository" + "gitea.pena/PenaSide/codeword/internal/services" + "gitea.pena/PenaSide/codeword/internal/utils/middleware" "github.com/gofiber/fiber/v2" "go.uber.org/zap" "penahub.gitlab.yandexcloud.net/backend/penahub_common/log_mw" diff --git a/internal/controller/admin/admin_recovery/recovery_controller.go b/internal/controller/admin/admin_recovery/recovery_controller.go index f5669a5..d2c8169 100644 --- a/internal/controller/admin/admin_recovery/recovery_controller.go +++ b/internal/controller/admin/admin_recovery/recovery_controller.go @@ -1,8 +1,8 @@ package admin_recovery import ( - "codeword/internal/services" "fmt" + "gitea.pena/PenaSide/codeword/internal/services" "github.com/gofiber/fiber/v2" "go.uber.org/zap" "time" diff --git a/internal/controller/client/client_promocode/promocode_controller.go b/internal/controller/client/client_promocode/promocode_controller.go index 2939ec2..79fe3c7 100644 --- a/internal/controller/client/client_promocode/promocode_controller.go +++ b/internal/controller/client/client_promocode/promocode_controller.go @@ -1,12 +1,12 @@ package client_promocode import ( - "codeword/internal/models" - "codeword/internal/repository" - "codeword/internal/services" - "codeword/internal/utils/middleware" "errors" "fmt" + "gitea.pena/PenaSide/codeword/internal/models" + "gitea.pena/PenaSide/codeword/internal/repository" + "gitea.pena/PenaSide/codeword/internal/services" + "gitea.pena/PenaSide/codeword/internal/utils/middleware" "github.com/gofiber/fiber/v2" "go.uber.org/zap" "penahub.gitlab.yandexcloud.net/backend/penahub_common/log_mw" diff --git a/internal/controller/client/client_recovery/recovery_controller.go b/internal/controller/client/client_recovery/recovery_controller.go index 5f53b3d..e502272 100644 --- a/internal/controller/client/client_recovery/recovery_controller.go +++ b/internal/controller/client/client_recovery/recovery_controller.go @@ -1,11 +1,11 @@ package client_recovery import ( - "codeword/internal/models" - "codeword/internal/repository" - "codeword/internal/services" "encoding/base64" "errors" + "gitea.pena/PenaSide/codeword/internal/models" + "gitea.pena/PenaSide/codeword/internal/repository" + "gitea.pena/PenaSide/codeword/internal/services" "github.com/gofiber/fiber/v2" "go.uber.org/zap" "penahub.gitlab.yandexcloud.net/backend/penahub_common/log_mw" diff --git a/internal/controller/rpc_controllers/promoCode.go b/internal/controller/rpc_controllers/promoCode.go index 3aa237f..ae19386 100644 --- a/internal/controller/rpc_controllers/promoCode.go +++ b/internal/controller/rpc_controllers/promoCode.go @@ -1,6 +1,6 @@ package rpc_controllers -import "codeword/internal/services" +import "gitea.pena/PenaSide/codeword/internal/services" type RpcRegister struct { Service *services.PromoCodeService diff --git a/internal/initialize/clients.go b/internal/initialize/clients.go index e32051b..f7d3890 100644 --- a/internal/initialize/clients.go +++ b/internal/initialize/clients.go @@ -1,7 +1,7 @@ package initialize import ( - "codeword/internal/adapters/client" + "gitea.pena/PenaSide/codeword/internal/adapters/client" "github.com/gofiber/fiber/v2" "go.uber.org/zap" ) diff --git a/internal/initialize/encrypt.go b/internal/initialize/encrypt.go index 366147d..1d88168 100644 --- a/internal/initialize/encrypt.go +++ b/internal/initialize/encrypt.go @@ -1,7 +1,7 @@ package initialize import ( - "codeword/internal/utils/encrypt" + "gitea.pena/PenaSide/codeword/internal/utils/encrypt" ) func Encrypt(cfg Config) *encrypt.Encrypt { diff --git a/internal/initialize/grpc.go b/internal/initialize/grpc.go index 692ca21..4aedb21 100644 --- a/internal/initialize/grpc.go +++ b/internal/initialize/grpc.go @@ -1,8 +1,8 @@ package initialize import ( - "codeword/internal/proto/discount" "context" + "gitea.pena/PenaSide/codeword/internal/proto/discount" "google.golang.org/grpc" "time" ) diff --git a/internal/initialize/kafka.go b/internal/initialize/kafka.go index 8b4019d..e61ea9e 100644 --- a/internal/initialize/kafka.go +++ b/internal/initialize/kafka.go @@ -1,7 +1,7 @@ package initialize import ( - "codeword/internal/kafka/tariff" + "gitea.pena/PenaSide/codeword/internal/kafka/tariff" "github.com/twmb/franz-go/pkg/kgo" "go.uber.org/zap" ) diff --git a/internal/initialize/mongo.go b/internal/initialize/mongo.go index c947b4a..bc6ff73 100644 --- a/internal/initialize/mongo.go +++ b/internal/initialize/mongo.go @@ -1,8 +1,8 @@ package initialize import ( - "codeword/internal/repository" "context" + "gitea.pena/PenaSide/codeword/internal/repository" "go.mongodb.org/mongo-driver/mongo" "go.uber.org/zap" mdb "penahub.gitlab.yandexcloud.net/backend/penahub_common/mongo" diff --git a/internal/kafka/tariff/producer.go b/internal/kafka/tariff/producer.go index b7fd098..50d15dd 100644 --- a/internal/kafka/tariff/producer.go +++ b/internal/kafka/tariff/producer.go @@ -1,14 +1,14 @@ package tariff import ( - "codeword/internal/models" - "codeword/internal/utils/transfer" "context" + "fmt" + "gitea.pena/PenaSide/codeword/internal/models" + "gitea.pena/PenaSide/codeword/internal/utils/transfer" "github.com/twmb/franz-go/pkg/kgo" "go.uber.org/zap" "google.golang.org/protobuf/proto" "log" - "fmt" ) type ProducerDeps struct { diff --git a/internal/models/tariff.go b/internal/models/tariff.go index 00da357..96bef67 100644 --- a/internal/models/tariff.go +++ b/internal/models/tariff.go @@ -1,7 +1,7 @@ package models import ( - "codeword/internal/proto/broker" + "gitea.pena/PenaSide/codeword/internal/proto/broker" "time" ) diff --git a/internal/repository/codeword_repository.go b/internal/repository/codeword_repository.go index d2a9fec..46bfd9a 100644 --- a/internal/repository/codeword_repository.go +++ b/internal/repository/codeword_repository.go @@ -1,9 +1,9 @@ package repository import ( - "codeword/internal/models" "context" "encoding/json" + "gitea.pena/PenaSide/codeword/internal/models" "github.com/go-redis/redis/v8" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/bson/primitive" diff --git a/internal/repository/promocode_repository.go b/internal/repository/promocode_repository.go index 5fa9246..e4d3aa3 100644 --- a/internal/repository/promocode_repository.go +++ b/internal/repository/promocode_repository.go @@ -1,8 +1,8 @@ package repository import ( - "codeword/internal/models" "context" + "gitea.pena/PenaSide/codeword/internal/models" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/mongo" diff --git a/internal/repository/promocode_stats.go b/internal/repository/promocode_stats.go index b438d45..ec1480f 100644 --- a/internal/repository/promocode_stats.go +++ b/internal/repository/promocode_stats.go @@ -1,9 +1,9 @@ package repository import ( - "codeword/internal/models" - codeword_rpc "codeword/internal/proto/codeword" "context" + "gitea.pena/PenaSide/codeword/internal/models" + codeword_rpc "gitea.pena/PenaSide/codeword/internal/proto/codeword" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/mongo" diff --git a/internal/repository/user_repository.go b/internal/repository/user_repository.go index 97a62ae..3934783 100644 --- a/internal/repository/user_repository.go +++ b/internal/repository/user_repository.go @@ -1,8 +1,8 @@ package repository import ( - "codeword/internal/models" "context" + "gitea.pena/PenaSide/codeword/internal/models" "github.com/go-redis/redis/v8" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" diff --git a/internal/server/grpc/rpc_server.go b/internal/server/grpc/rpc_server.go index 75a69fb..00e80ec 100644 --- a/internal/server/grpc/rpc_server.go +++ b/internal/server/grpc/rpc_server.go @@ -1,10 +1,10 @@ package grpc import ( - "codeword/internal/controller/rpc_controllers" - codeword_rpc "codeword/internal/proto/codeword" "context" "fmt" + "gitea.pena/PenaSide/codeword/internal/controller/rpc_controllers" + codeword_rpc "gitea.pena/PenaSide/codeword/internal/proto/codeword" grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" grpc_zap "github.com/grpc-ecosystem/go-grpc-middleware/logging/zap" grpc_recovery "github.com/grpc-ecosystem/go-grpc-middleware/recovery" diff --git a/internal/server/http/http_server.go b/internal/server/http/http_server.go index 6df5235..07a09d2 100644 --- a/internal/server/http/http_server.go +++ b/internal/server/http/http_server.go @@ -1,9 +1,9 @@ package http import ( - "codeword/internal/utils/middleware" "context" "fmt" + "gitea.pena/PenaSide/codeword/internal/utils/middleware" "github.com/gofiber/fiber/v2" "github.com/themakers/hlog" "go.uber.org/zap" diff --git a/internal/services/promocode_service.go b/internal/services/promocode_service.go index 8d267df..abecdb3 100644 --- a/internal/services/promocode_service.go +++ b/internal/services/promocode_service.go @@ -1,15 +1,15 @@ package services import ( - "codeword/internal/kafka/tariff" - "codeword/internal/models" - codeword_rpc "codeword/internal/proto/codeword" - "codeword/internal/proto/discount" - "codeword/internal/repository" - "codeword/internal/utils/genID" "context" "errors" "fmt" + "gitea.pena/PenaSide/codeword/internal/kafka/tariff" + "gitea.pena/PenaSide/codeword/internal/models" + codeword_rpc "gitea.pena/PenaSide/codeword/internal/proto/codeword" + "gitea.pena/PenaSide/codeword/internal/proto/discount" + "gitea.pena/PenaSide/codeword/internal/repository" + "gitea.pena/PenaSide/codeword/internal/utils/genID" "go.mongodb.org/mongo-driver/bson/primitive" "go.uber.org/zap" "time" diff --git a/internal/services/recovery_service.go b/internal/services/recovery_service.go index 348b834..b8cc633 100644 --- a/internal/services/recovery_service.go +++ b/internal/services/recovery_service.go @@ -1,11 +1,11 @@ package services import ( - "codeword/internal/adapters/client" - "codeword/internal/models" - "codeword/internal/utils/encrypt" "context" "encoding/base64" + "gitea.pena/PenaSide/codeword/internal/adapters/client" + "gitea.pena/PenaSide/codeword/internal/models" + "gitea.pena/PenaSide/codeword/internal/utils/encrypt" "go.uber.org/zap" ) diff --git a/internal/utils/middleware/authenticator.go b/internal/utils/middleware/authenticator.go index 7ce2108..eb4343a 100644 --- a/internal/utils/middleware/authenticator.go +++ b/internal/utils/middleware/authenticator.go @@ -1,8 +1,8 @@ package middleware import ( - "codeword/internal/models" "fmt" + "gitea.pena/PenaSide/codeword/internal/models" "strings" "github.com/gofiber/fiber/v2" diff --git a/internal/utils/middleware/jwt.go b/internal/utils/middleware/jwt.go index 86b52e7..6169612 100644 --- a/internal/utils/middleware/jwt.go +++ b/internal/utils/middleware/jwt.go @@ -1,9 +1,9 @@ package middleware import ( - "codeword/internal/initialize" "errors" "fmt" + "gitea.pena/PenaSide/codeword/internal/initialize" "github.com/golang-jwt/jwt/v5" "time" ) diff --git a/internal/utils/transfer/privilege.go b/internal/utils/transfer/privilege.go index 6affadc..450ab0a 100644 --- a/internal/utils/transfer/privilege.go +++ b/internal/utils/transfer/privilege.go @@ -1,9 +1,9 @@ package transfer import ( - "codeword/internal/models" - "codeword/internal/proto/broker" "fmt" + "gitea.pena/PenaSide/codeword/internal/models" + "gitea.pena/PenaSide/codeword/internal/proto/broker" ) func PrivilegeModelToProto(privilege *models.Privilege) *broker.PrivilegeMessage { diff --git a/internal/utils/transfer/tariff.go b/internal/utils/transfer/tariff.go index 592c56e..20c7f3c 100644 --- a/internal/utils/transfer/tariff.go +++ b/internal/utils/transfer/tariff.go @@ -1,8 +1,8 @@ package transfer import ( - "codeword/internal/models" - "codeword/internal/proto/broker" + "gitea.pena/PenaSide/codeword/internal/models" + "gitea.pena/PenaSide/codeword/internal/proto/broker" ) func TariffModelToProtoMessage(userID string, tariffModel *models.Tariff) *broker.TariffMessage { diff --git a/internal/worker/recovery_worker/recovery_worker.go b/internal/worker/recovery_worker/recovery_worker.go index df79493..a37c343 100644 --- a/internal/worker/recovery_worker/recovery_worker.go +++ b/internal/worker/recovery_worker/recovery_worker.go @@ -1,10 +1,10 @@ package recovery_worker import ( - "codeword/internal/adapters/client" - "codeword/internal/models" "context" "encoding/json" + "gitea.pena/PenaSide/codeword/internal/adapters/client" + "gitea.pena/PenaSide/codeword/internal/models" "github.com/go-redis/redis/v8" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/bson/primitive" diff --git a/tests/e2e/promo_test.go b/tests/e2e/promo_test.go index 822dfd1..2cf8a7a 100644 --- a/tests/e2e/promo_test.go +++ b/tests/e2e/promo_test.go @@ -1,10 +1,10 @@ package e2e import ( - "codeword/internal/models" - "codeword/tests/helpers" "encoding/json" "fmt" + "gitea.pena/PenaSide/codeword/internal/models" + "gitea.pena/PenaSide/codeword/tests/helpers" "github.com/gofiber/fiber/v2" "github.com/pioz/faker" "github.com/stretchr/testify/assert" diff --git a/tests/e2e/recover_test.go b/tests/e2e/recover_test.go index 0aab88f..0e617c0 100644 --- a/tests/e2e/recover_test.go +++ b/tests/e2e/recover_test.go @@ -1,9 +1,9 @@ package e2e import ( - "codeword/internal/models" "encoding/json" "fmt" + "gitea.pena/PenaSide/codeword/internal/models" "github.com/gofiber/fiber/v2" "github.com/stretchr/testify/assert" "testing" diff --git a/tests/helpers/jwt.go b/tests/helpers/jwt.go index 42becda..7bd9e1d 100644 --- a/tests/helpers/jwt.go +++ b/tests/helpers/jwt.go @@ -1,8 +1,8 @@ package helpers import ( - "codeword/internal/initialize" - "codeword/internal/utils/middleware" + "gitea.pena/PenaSide/codeword/internal/initialize" + "gitea.pena/PenaSide/codeword/internal/utils/middleware" "strings" ) diff --git a/tests/repository_test/repository_test.go b/tests/repository_test/repository_test.go index ef364d7..07d7537 100644 --- a/tests/repository_test/repository_test.go +++ b/tests/repository_test/repository_test.go @@ -1,10 +1,10 @@ package repository_test import ( - "codeword/internal/models" - "codeword/internal/repository" "context" "fmt" + "gitea.pena/PenaSide/codeword/internal/models" + "gitea.pena/PenaSide/codeword/internal/repository" "github.com/stretchr/testify/require" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/bson/primitive"