From 93ef98fe248404e4a53f6b2c7cc915496a23feed Mon Sep 17 00:00:00 2001 From: Pasha Date: Fri, 29 Nov 2024 10:38:24 +0300 Subject: [PATCH] update mongo init --- .env | 8 ++------ go.mod | 2 +- go.sum | 4 ++-- internal/app/app.go | 2 +- internal/initialize/config.go | 30 +++++++++++++----------------- internal/initialize/mongo.go | 11 +---------- test/repo_test.go | 11 +++++------ 7 files changed, 25 insertions(+), 43 deletions(-) diff --git a/.env b/.env index 3ce0765..79df6ad 100644 --- a/.env +++ b/.env @@ -1,10 +1,6 @@ # MongoDB settings -MONGO_HOST="127.0.0.1" -MONGO_PORT="27020" -MONGO_USER="test" -MONGO_PASSWORD="test" -MONGO_DB="admin" -MONGO_AUTH="admin" +MONGO_URL = "mongodb://test:test@localhost:27020/" +MONGO_DB_NAME = "admin" # Kafka settings KAFKA_BROKERS="localhost:9092" diff --git a/go.mod b/go.mod index 4a6f48f..5410710 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module gitea.pena/PenaSide/notifier go 1.21.6 require ( - gitea.pena/PenaSide/common v0.0.0-20241120141501-1695a0981562 + gitea.pena/PenaSide/common v0.0.0-20241128160655-fe730a08b5f1 github.com/caarlos0/env/v8 v8.0.0 github.com/gofiber/fiber/v2 v2.51.0 github.com/joho/godotenv v1.5.1 diff --git a/go.sum b/go.sum index d1a4b29..f98032b 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -gitea.pena/PenaSide/common v0.0.0-20241120141501-1695a0981562 h1:LobhWlICMcbCCI+SouOzeRk2K5MsXSVHtv3QOcHRZnY= -gitea.pena/PenaSide/common v0.0.0-20241120141501-1695a0981562/go.mod h1:l71j3W1yROhOSfjWZ6wcMuzjBR37gu2ZTcXsorEJoiw= +gitea.pena/PenaSide/common v0.0.0-20241128160655-fe730a08b5f1 h1:w1AAxrlZGmxUI9NAa/0TYsc6sqWWF9yAzQaLL/KxwrM= +gitea.pena/PenaSide/common v0.0.0-20241128160655-fe730a08b5f1/go.mod h1:l71j3W1yROhOSfjWZ6wcMuzjBR37gu2ZTcXsorEJoiw= github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs= github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/caarlos0/env/v8 v8.0.0 h1:POhxHhSpuxrLMIdvTGARuZqR4Jjm8AYmoi/JKlcScs0= diff --git a/internal/app/app.go b/internal/app/app.go index 6764e8f..b5e50d1 100644 --- a/internal/app/app.go +++ b/internal/app/app.go @@ -2,11 +2,11 @@ package app import ( "context" - "go.uber.org/zap" "gitea.pena/PenaSide/notifier/internal/clients" "gitea.pena/PenaSide/notifier/internal/initialize" "gitea.pena/PenaSide/notifier/internal/repository" "gitea.pena/PenaSide/notifier/internal/workers" + "go.uber.org/zap" ) func Run(ctx context.Context, config initialize.Config, logger *zap.Logger) error { diff --git a/internal/initialize/config.go b/internal/initialize/config.go index 6295e64..be1d0b3 100644 --- a/internal/initialize/config.go +++ b/internal/initialize/config.go @@ -1,29 +1,25 @@ package initialize import ( + "gitea.pena/PenaSide/common/mongo" "github.com/caarlos0/env/v8" "github.com/joho/godotenv" "log" ) type Config struct { - MongoHost string `env:"MONGO_HOST" envDefault:"127.0.0.1"` - MongoPort string `env:"MONGO_PORT" envDefault:"27020"` - MongoUser string `env:"MONGO_USER" envDefault:"test"` - MongoPassword string `env:"MONGO_PASSWORD" envDefault:"test"` - MongoDatabase string `env:"MONGO_DB" envDefault:"admin"` - MongoAuth string `env:"MONGO_AUTH" envDefault:"admin"` - KafkaBrokers string `env:"KAFKA_BROKERS"` - KafkaTopic string `env:"KAFKA_TOPIC_TARIFF"` - SmtpApiUrl string `env:"SMTP_API_URL"` - SmtpHost string `env:"SMTP_HOST"` - SmtpPort string `env:"SMTP_PORT"` - SmtpUsername string `env:"SMTP_UNAME"` - SmtpPassword string `env:"SMTP_PASS"` - SmtpApiKey string `env:"SMTP_API_KEY"` - SmtpSender string `env:"SMTP_SENDER"` - CustomerURL string `env:"CUSTOMER_URL"` - QuizRPCURL string `enc:"QUIZ_RPC_URL"` + KafkaBrokers string `env:"KAFKA_BROKERS"` + KafkaTopic string `env:"KAFKA_TOPIC_TARIFF"` + SmtpApiUrl string `env:"SMTP_API_URL"` + SmtpHost string `env:"SMTP_HOST"` + SmtpPort string `env:"SMTP_PORT"` + SmtpUsername string `env:"SMTP_UNAME"` + SmtpPassword string `env:"SMTP_PASS"` + SmtpApiKey string `env:"SMTP_API_KEY"` + SmtpSender string `env:"SMTP_SENDER"` + CustomerURL string `env:"CUSTOMER_URL"` + QuizRPCURL string `enc:"QUIZ_RPC_URL"` + DataBase mongo.Configuration } func LoadConfig() (*Config, error) { diff --git a/internal/initialize/mongo.go b/internal/initialize/mongo.go index ec0456c..920c575 100644 --- a/internal/initialize/mongo.go +++ b/internal/initialize/mongo.go @@ -11,17 +11,8 @@ func MongoInit(ctx context.Context, config Config) (*mongo.Database, error) { newCtx, cancel := context.WithTimeout(ctx, 10*time.Second) defer cancel() - cfg := mg.Configuration{ - Host: config.MongoHost, - Port: config.MongoPort, - User: config.MongoUser, - Password: config.MongoPassword, - Auth: config.MongoAuth, - DatabaseName: config.MongoDatabase, - } - deps := mg.ConnectDeps{ - Configuration: &cfg, + Configuration: &config.DataBase, Timeout: 10 * time.Second, } diff --git a/test/repo_test.go b/test/repo_test.go index c82f584..21d6b39 100644 --- a/test/repo_test.go +++ b/test/repo_test.go @@ -3,6 +3,7 @@ package test import ( "context" "fmt" + "gitea.pena/PenaSide/common/mongo" "gitea.pena/PenaSide/notifier/internal/initialize" "gitea.pena/PenaSide/notifier/internal/models" "gitea.pena/PenaSide/notifier/internal/repository" @@ -13,12 +14,10 @@ import ( func TestInsertAndGetMany(t *testing.T) { crx := context.Background() mdb, err := initialize.MongoInit(crx, initialize.Config{ - MongoHost: "127.0.0.1", - MongoPort: "27020", - MongoUser: "test", - MongoPassword: "test", - MongoDatabase: "admin", - MongoAuth: "admin", + DataBase: mongo.Configuration{ + URL: "mongodb://test:test@localhost:27020/", + DatabaseName: "admin", + }, }) if err != nil { panic(err)