Commit 4c5016f0 authored by Шаронов Егор Алексеевич's avatar Шаронов Егор Алексеевич
Browse files

fix connection string

parent 39f938ca
No related merge requests found
Showing with 11 additions and 3 deletions
+11 -3
......@@ -27,7 +27,15 @@ type ServerConfig struct {
}
type DBConfig struct {
Connection string `env:"CONNECTION, default=host=localhost user=postgres password=secret dbname=products_db port=5435 sslmode=disable" validate:"required"`
hostname string `env:"HOSTNAME, default=localhost"`
port int `env:"PORT, default=5435"`
user string `env:"USER, default=postgres"`
password string `env:"PASSWORD, default=secret"`
dbname string `env:"DBNAME, default=products_db"`
}
func (c *DBConfig) ConnectionString() string {
return fmt.Sprintf("host=%s user=%s password=%s dbname=%s port=%d sslmode=disable", c.hostname, c.user, c.password, c.dbname, c.port)
}
// LLMConfig содержит настройки для работы с LLM (модель, API-ключ, endpoint).
......
......@@ -37,7 +37,7 @@ type storeRepository struct {
}
func NewStoreRepository(cfg *config.Config) (StoreRepository, error) {
db, err := gorm.Open(postgres.Open(cfg.DB.Connection), &gorm.Config{})
db, err := gorm.Open(postgres.Open(cfg.DB.ConnectionString()), &gorm.Config{})
if err != nil {
return nil, fmt.Errorf("failed to connect to DB: %w", err)
}
......@@ -70,7 +70,7 @@ func (r *storeRepository) GetParsedProductsByAbstractID(ctx context.Context, abs
m.name as market_name,
COALESCE(array_agg(ph.photo_url) FILTER (WHERE ph.photo_url IS NOT NULL), '{}') as photo_urls
FROM parsed_products pp
LEFT JOIN market_categories mc ON mc.category_id = pp.market_categories_id
LEFT JOIN market_categories mc ON mc.category_id = pp.market_category_id
LEFT JOIN markets m ON mc.market_id = m.market_id
LEFT JOIN product_photos ph ON ph.parsed_product_id = pp.parsed_product_id
WHERE pp.abstract_product_id = ?
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment