From f8ad642cdc3caf51a1cedbf5ce498ea5e862289e Mon Sep 17 00:00:00 2001 From: M_Kececi Date: Mon, 22 Jun 2026 22:32:23 +0300 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- svc/product_series_auto_scheduler.go | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/svc/product_series_auto_scheduler.go b/svc/product_series_auto_scheduler.go index 6cd5be7..2dd88bd 100644 --- a/svc/product_series_auto_scheduler.go +++ b/svc/product_series_auto_scheduler.go @@ -284,6 +284,10 @@ func productSeriesProcessQueue(ctx context.Context, pg *sql.DB, batchSize int, a if err != nil { return 0, 0, 0, err } + variants, _, err := productSeriesLoadMSSQLStockVariants(ctx) + if err != nil { + return 0, 0, 0, err + } totalProcessed, totalWritten, totalSkipped := 0, 0, 0 for { tx, err := pg.BeginTx(ctx, nil) @@ -303,11 +307,7 @@ func productSeriesProcessQueue(ctx context.Context, pg *sql.DB, batchSize int, a } for _, it := range items { - variant, ok, err := productSeriesLoadSingleVariant(ctx, it.ProductCode, it.ColorCode, it.Dim3Code) - if err != nil { - _ = productSeriesMarkQueueFailed(ctx, pg, it, err.Error()) - return totalProcessed, totalWritten, totalSkipped, err - } + variant, ok := variants[productSeriesAutoKey(it.ProductCode, it.ColorCode, it.Dim3Code)] if !ok { variant = productSeriesAutoVariant{ RowKey: productSeriesAutoKey(it.ProductCode, it.ColorCode, it.Dim3Code), @@ -439,16 +439,6 @@ func productSeriesLoadMSSQLStockVariants(ctx context.Context) (map[string]produc return out, scanned, nil } -func productSeriesLoadSingleVariant(ctx context.Context, productCode, colorCode, dim3Code string) (productSeriesAutoVariant, bool, error) { - variants, _, err := productSeriesLoadMSSQLStockVariants(ctx) - if err != nil { - return productSeriesAutoVariant{}, false, err - } - key := productSeriesAutoKey(productCode, colorCode, dim3Code) - v, ok := variants[key] - return v, ok, nil -} - func productSeriesLoadRules(ctx context.Context, pg *sql.DB) ([]productSeriesAutoRule, error) { rows, err := pg.QueryContext(ctx, ` SELECT d.id, COALESCE(d.code,''), COALESCE(d.title,''),