From 4eee68fb4a9894c562f4b0f7436ea7f83c187be4 Mon Sep 17 00:00:00 2001 From: romanskijdev Date: Fri, 13 Nov 2026 16:49:31 +0300 Subject: [PATCH] Update monthly order db tables rows --- core/db/methods/monthly_orders.go | 13 +++++++++++-- core/typescore/monthly_orders.go | 16 +++++++++------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/core/db/methods/monthly_orders.go b/core/db/methods/monthly_orders.go index 25fc5eb..26a3f68 100644 --- a/core/db/methods/monthly_orders.go +++ b/core/db/methods/monthly_orders.go @@ -141,11 +141,20 @@ func (db *MonthlyOrderDB) SaveSettings(ctx context.Context, tx pgx.Tx, setting * return errors.New("setting is nil") } + marketStage := "" + marketStageComment := "" + + if setting.MarketStageComment != nil { + marketStageComment = *setting.MarketStageComment + } + if setting.MarketStage != nil { + marketStage = *setting.MarketStage + } return dbutils.ExecuteTx(ctx, db.pool, tx, func(tx pgx.Tx) error { query := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar). Insert(string(dbcoretablenames.TableNameMonthlyOrderSettings)). - Columns("month", "year", "deadline_date", "assembly_time_days"). - Values(*setting.Month, *setting.Year, *setting.DeadlineDate, *setting.AssemblyTimeDays). + Columns("month", "year", "deadline_date", "assembly_time_days", "market_stage", "market_stage_comment"). + Values(*setting.Month, *setting.Year, *setting.DeadlineDate, *setting.AssemblyTimeDays, marketStage, marketStageComment). Suffix("ON CONFLICT (month, year) DO UPDATE SET deadline_date = EXCLUDED.deadline_date, assembly_time_days = EXCLUDED.assembly_time_days, updated_at = NOW()") sqlV, args, err := query.ToSql() diff --git a/core/typescore/monthly_orders.go b/core/typescore/monthly_orders.go index 44fd618..999ec2b 100644 --- a/core/typescore/monthly_orders.go +++ b/core/typescore/monthly_orders.go @@ -4,13 +4,15 @@ import "time" // MonthlyOrderSetting — настройки периода заказа (задаются аналитиком) type MonthlyOrderSetting struct { - ID *uint64 `json:"id" db:"id" gorm:"primaryKey;autoIncrement"` - Month *int `json:"month" db:"month"` - Year *int `json:"year" db:"year"` - DeadlineDate *time.Time `json:"deadline_date" db:"deadline_date"` // Дата закрытия доступа - AssemblyTimeDays *int `json:"assembly_time_days" db:"assembly_time_days"` // Срок сборки заказа (задается аналитиком) - CreatedAt *time.Time `json:"created_at" db:"created_at"` - UpdatedAt *time.Time `json:"updated_at" db:"updated_at"` + ID *uint64 `json:"id" db:"id" gorm:"primaryKey;autoIncrement"` + Month *int `json:"month" db:"month"` + Year *int `json:"year" db:"year"` + DeadlineDate *time.Time `json:"deadline_date" db:"deadline_date"` // Дата закрытия доступа + MarketStage *string `json:"market_stage" db:"market_stage"` // Стадия рынка (растущий, падающий, стоячий) + MarketStageComment *string `json:"market_stage_comment" db:"market_stage_comment"` // Комментарий к стадии рынка (растущий, падающий, стоячий) + AssemblyTimeDays *int `json:"assembly_time_days" db:"assembly_time_days"` // Срок сборки заказа (задается аналитиком) + CreatedAt *time.Time `json:"created_at" db:"created_at"` + UpdatedAt *time.Time `json:"updated_at" db:"updated_at"` } // MonthlyOrderClient — заказ конкретного клиента у менеджера