diff --git a/core/db/methods/monthly_orders.go b/core/db/methods/monthly_orders.go index 0060f2a..6293fd6 100644 --- a/core/db/methods/monthly_orders.go +++ b/core/db/methods/monthly_orders.go @@ -78,6 +78,14 @@ func (db *MonthlyOrderDB) SaveClientOrder(ctx context.Context, tx pgx.Tx, order return nil, errors.New("order is nil") } + if order.ClientName == nil { + return nil, errors.New("не указано имя клиента (client_name)") + } + if order.Status == nil { + defaultStatus := "draft" + order.Status = &defaultStatus + } + var insertedID uint64 err := dbutils.ExecuteTx(ctx, db.pool, tx, func(tx pgx.Tx) error { // 1. Вставляем или обновляем основу заказа diff --git a/service/rest_admin_service/handlers/monthly_orders/routes.go b/service/rest_admin_service/handlers/monthly_orders/routes.go index fb03b17..8c8a276 100644 --- a/service/rest_admin_service/handlers/monthly_orders/routes.go +++ b/service/rest_admin_service/handlers/monthly_orders/routes.go @@ -174,9 +174,18 @@ func (s *MonthlyOrdersReg) SaveOrdersHandler(w http.ResponseWriter, r *http.Requ order.Month = &month order.Year = &year + if order.Status == nil { + status := "draft" + order.Status = &status + } + + if order.ClientName == nil || *order.ClientName == "" { + continue + } + _, err := s.ipc.Database.MonthlyOrders.SaveClientOrder(ctx, nil, &order) if err != nil { - return nil, err + return nil, err // Здесь теперь вернется внятная ошибка, а не 500 panic } }