Add article generation and pricelist categories

internal/services/configuration.go

@@ -52,10 +52,20 @@ type CreateConfigRequest struct {
 	Notes       string             `json:"notes"`
 	IsTemplate  bool               `json:"is_template"`
 	ServerCount int                `json:"server_count"`
+	ServerModel string             `json:"server_model,omitempty"`
+	SupportCode string             `json:"support_code,omitempty"`
+	Article     string             `json:"article,omitempty"`
 	PricelistID *uint              `json:"pricelist_id,omitempty"`
 	OnlyInStock bool               `json:"only_in_stock"`
 }
 
+type ArticlePreviewRequest struct {
+	Items       models.ConfigItems `json:"items"`
+	ServerModel string             `json:"server_model"`
+	SupportCode string             `json:"support_code,omitempty"`
+	PricelistID *uint              `json:"pricelist_id,omitempty"`
+}
+
 func (s *ConfigurationService) Create(ownerUsername string, req *CreateConfigRequest) (*models.Configuration, error) {
 	projectUUID, err := s.resolveProjectUUID(ownerUsername, req.ProjectUUID)
 	if err != nil {
@@ -84,6 +94,9 @@ func (s *ConfigurationService) Create(ownerUsername string, req *CreateConfigReq
 		Notes:         req.Notes,
 		IsTemplate:    req.IsTemplate,
 		ServerCount:   req.ServerCount,
+		ServerModel:   req.ServerModel,
+		SupportCode:   req.SupportCode,
+		Article:       req.Article,
 		PricelistID:   pricelistID,
 		OnlyInStock:   req.OnlyInStock,
 	}
@@ -146,6 +159,9 @@ func (s *ConfigurationService) Update(uuid string, ownerUsername string, req *Cr
 	config.Notes = req.Notes
 	config.IsTemplate = req.IsTemplate
 	config.ServerCount = req.ServerCount
+	config.ServerModel = req.ServerModel
+	config.SupportCode = req.SupportCode
+	config.Article = req.Article
 	config.PricelistID = pricelistID
 	config.OnlyInStock = req.OnlyInStock
 

internal/services/export.go

@@ -27,6 +27,7 @@ func NewExportService(cfg config.ExportConfig, categoryRepo *repository.Category
 
 type ExportData struct {
 	Name      string
+	Article   string
 	Items     []ExportItem
 	Total     float64
 	Notes     string
@@ -109,7 +110,7 @@ func (s *ExportService) ToCSV(w io.Writer, data *ExportData) error {
 
 	// Total row
 	totalStr := strings.ReplaceAll(fmt.Sprintf("%.2f", data.Total), ".", ",")
-	if err := csvWriter.Write([]string{"", "", "", "", "ИТОГО:", totalStr}); err != nil {
+	if err := csvWriter.Write([]string{data.Article, "", "", "", "ИТОГО:", totalStr}); err != nil {
 		return fmt.Errorf("failed to write total row: %w", err)
 	}
 
@@ -162,6 +163,7 @@ func (s *ExportService) ConfigToExportData(config *models.Configuration, compone
 
 	return &ExportData{
 		Name:      config.Name,
+		Article:   "",
 		Items:     items,
 		Total:     total,
 		Notes:     config.Notes,

internal/services/local_configuration.go

@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"git.mchus.pro/mchus/quoteforge/internal/appmeta"
+	"git.mchus.pro/mchus/quoteforge/internal/article"
 	"git.mchus.pro/mchus/quoteforge/internal/localdb"
 	"git.mchus.pro/mchus/quoteforge/internal/models"
 	"git.mchus.pro/mchus/quoteforge/internal/services/sync"
@@ -64,6 +65,18 @@ func (s *LocalConfigurationService) Create(ownerUsername string, req *CreateConf
 		return nil, err
 	}
 
+	if strings.TrimSpace(req.ServerModel) != "" {
+		articleResult, articleErr := article.Build(s.localDB, req.Items, article.BuildOptions{
+			ServerModel:     req.ServerModel,
+			SupportCode:     req.SupportCode,
+			ServerPricelist: pricelistID,
+		})
+		if articleErr != nil {
+			return nil, articleErr
+		}
+		req.Article = articleResult.Article
+	}
+
 	total := req.Items.Total()
 	if req.ServerCount > 1 {
 		total *= float64(req.ServerCount)
@@ -80,6 +93,9 @@ func (s *LocalConfigurationService) Create(ownerUsername string, req *CreateConf
 		Notes:         req.Notes,
 		IsTemplate:    req.IsTemplate,
 		ServerCount:   req.ServerCount,
+		ServerModel:   req.ServerModel,
+		SupportCode:   req.SupportCode,
+		Article:       req.Article,
 		PricelistID:   pricelistID,
 		OnlyInStock:   req.OnlyInStock,
 		CreatedAt:     time.Now(),
@@ -142,6 +158,18 @@ func (s *LocalConfigurationService) Update(uuid string, ownerUsername string, re
 		return nil, err
 	}
 
+	if strings.TrimSpace(req.ServerModel) != "" {
+		articleResult, articleErr := article.Build(s.localDB, req.Items, article.BuildOptions{
+			ServerModel:     req.ServerModel,
+			SupportCode:     req.SupportCode,
+			ServerPricelist: pricelistID,
+		})
+		if articleErr != nil {
+			return nil, articleErr
+		}
+		req.Article = articleResult.Article
+	}
+
 	total := req.Items.Total()
 	if req.ServerCount > 1 {
 		total *= float64(req.ServerCount)
@@ -163,6 +191,9 @@ func (s *LocalConfigurationService) Update(uuid string, ownerUsername string, re
 	localCfg.Notes = req.Notes
 	localCfg.IsTemplate = req.IsTemplate
 	localCfg.ServerCount = req.ServerCount
+	localCfg.ServerModel = req.ServerModel
+	localCfg.SupportCode = req.SupportCode
+	localCfg.Article = req.Article
 	localCfg.PricelistID = pricelistID
 	localCfg.OnlyInStock = req.OnlyInStock
 	localCfg.UpdatedAt = time.Now()
@@ -176,6 +207,19 @@ func (s *LocalConfigurationService) Update(uuid string, ownerUsername string, re
 	return cfg, nil
 }
 
+// BuildArticlePreview generates server article based on current items and server_model/support_code.
+func (s *LocalConfigurationService) BuildArticlePreview(req *ArticlePreviewRequest) (article.BuildResult, error) {
+	pricelistID, err := s.resolvePricelistID(req.PricelistID)
+	if err != nil {
+		return article.BuildResult{}, err
+	}
+	return article.Build(s.localDB, req.Items, article.BuildOptions{
+		ServerModel:     req.ServerModel,
+		SupportCode:     req.SupportCode,
+		ServerPricelist: pricelistID,
+	})
+}
+
 // Delete deletes a configuration from local SQLite and queues it for sync
 func (s *LocalConfigurationService) Delete(uuid string, ownerUsername string) error {
 	localCfg, err := s.localDB.GetConfigurationByUUID(uuid)
@@ -269,6 +313,9 @@ func (s *LocalConfigurationService) CloneToProject(configUUID string, ownerUsern
 		Notes:         original.Notes,
 		IsTemplate:    false,
 		ServerCount:   original.ServerCount,
+		ServerModel:   original.ServerModel,
+		SupportCode:   original.SupportCode,
+		Article:       original.Article,
 		PricelistID:   original.PricelistID,
 		OnlyInStock:   original.OnlyInStock,
 		CreatedAt:     time.Now(),
@@ -424,6 +471,18 @@ func (s *LocalConfigurationService) UpdateNoAuth(uuid string, req *CreateConfigR
 		return nil, err
 	}
 
+	if strings.TrimSpace(req.ServerModel) != "" {
+		articleResult, articleErr := article.Build(s.localDB, req.Items, article.BuildOptions{
+			ServerModel:     req.ServerModel,
+			SupportCode:     req.SupportCode,
+			ServerPricelist: pricelistID,
+		})
+		if articleErr != nil {
+			return nil, articleErr
+		}
+		req.Article = articleResult.Article
+	}
+
 	total := req.Items.Total()
 	if req.ServerCount > 1 {
 		total *= float64(req.ServerCount)
@@ -444,6 +503,9 @@ func (s *LocalConfigurationService) UpdateNoAuth(uuid string, req *CreateConfigR
 	localCfg.Notes = req.Notes
 	localCfg.IsTemplate = req.IsTemplate
 	localCfg.ServerCount = req.ServerCount
+	localCfg.ServerModel = req.ServerModel
+	localCfg.SupportCode = req.SupportCode
+	localCfg.Article = req.Article
 	localCfg.PricelistID = pricelistID
 	localCfg.OnlyInStock = req.OnlyInStock
 	localCfg.UpdatedAt = time.Now()

internal/services/sync/service.go

@@ -388,6 +388,9 @@ func (s *Service) SyncPricelists() (int, error) {
 		slog.Info("deleted stale local pricelists", "deleted", removed)
 	}
 
+	// Backfill lot_category for used pricelists (older local caches may miss the column values).
+	s.backfillUsedPricelistItemCategories(pricelistRepo, serverPricelistIDs)
+
 	// Update last sync time
 	s.localDB.SetLastSyncTime(time.Now())
 	s.RecordSyncHeartbeat()
@@ -396,6 +399,83 @@ func (s *Service) SyncPricelists() (int, error) {
 	return synced, nil
 }
 
+func (s *Service) backfillUsedPricelistItemCategories(pricelistRepo *repository.PricelistRepository, activeServerPricelistIDs []uint) {
+	if s.localDB == nil || pricelistRepo == nil {
+		return
+	}
+
+	activeSet := make(map[uint]struct{}, len(activeServerPricelistIDs))
+	for _, id := range activeServerPricelistIDs {
+		activeSet[id] = struct{}{}
+	}
+
+	type row struct {
+		ID uint `gorm:"column:id"`
+	}
+	var usedRows []row
+	if err := s.localDB.DB().Raw(`
+		SELECT DISTINCT pricelist_id AS id
+		FROM local_configurations
+		WHERE is_active = 1 AND pricelist_id IS NOT NULL
+		UNION
+		SELECT DISTINCT warehouse_pricelist_id AS id
+		FROM local_configurations
+		WHERE is_active = 1 AND warehouse_pricelist_id IS NOT NULL
+		UNION
+		SELECT DISTINCT competitor_pricelist_id AS id
+		FROM local_configurations
+		WHERE is_active = 1 AND competitor_pricelist_id IS NOT NULL
+	`).Scan(&usedRows).Error; err != nil {
+		slog.Warn("pricelist category backfill: failed to list used pricelists", "error", err)
+		return
+	}
+
+	for _, r := range usedRows {
+		serverID := r.ID
+		if serverID == 0 {
+			continue
+		}
+		if _, ok := activeSet[serverID]; !ok {
+			// Not present on server (or not active) - cannot backfill from remote.
+			continue
+		}
+
+		localPL, err := s.localDB.GetLocalPricelistByServerID(serverID)
+		if err != nil || localPL == nil {
+			continue
+		}
+
+		if s.localDB.CountLocalPricelistItems(localPL.ID) == 0 {
+			continue
+		}
+
+		missing, err := s.localDB.CountLocalPricelistItemsWithEmptyCategory(localPL.ID)
+		if err != nil {
+			slog.Warn("pricelist category backfill: failed to check local items", "server_id", serverID, "error", err)
+			continue
+		}
+		if missing == 0 {
+			continue
+		}
+
+		serverItems, _, err := pricelistRepo.GetItems(serverID, 0, 10000, "")
+		if err != nil {
+			slog.Warn("pricelist category backfill: failed to load server items", "server_id", serverID, "error", err)
+			continue
+		}
+		localItems := make([]localdb.LocalPricelistItem, len(serverItems))
+		for i := range serverItems {
+			localItems[i] = *localdb.PricelistItemToLocal(&serverItems[i], localPL.ID)
+		}
+
+		if err := s.localDB.ReplaceLocalPricelistItems(localPL.ID, localItems); err != nil {
+			slog.Warn("pricelist category backfill: failed to replace local items", "server_id", serverID, "error", err)
+			continue
+		}
+		slog.Info("pricelist category backfill: refreshed local items", "server_id", serverID, "items", len(localItems))
+	}
+}
+
 // RecordSyncHeartbeat updates shared sync heartbeat for current DB user.
 // Only users with write rights are expected to be able to update this table.
 func (s *Service) RecordSyncHeartbeat() {
@@ -595,15 +675,7 @@ func (s *Service) SyncPricelistItems(localPricelistID uint) (int, error) {
 	// Convert and save locally
 	localItems := make([]localdb.LocalPricelistItem, len(serverItems))
 	for i, item := range serverItems {
-		partnumbers := make(localdb.LocalStringList, 0, len(item.Partnumbers))
-		partnumbers = append(partnumbers, item.Partnumbers...)
-		localItems[i] = localdb.LocalPricelistItem{
-			PricelistID:  localPricelistID,
-			LotName:      item.LotName,
-			Price:        item.Price,
-			AvailableQty: item.AvailableQty,
-			Partnumbers:  partnumbers,
-		}
+		localItems[i] = *localdb.PricelistItemToLocal(&item, localPricelistID)
 	}
 
 	if err := s.localDB.SaveLocalPricelistItems(localItems); err != nil {

internal/services/sync/service_pricelist_category_backfill_test.go

@@ -0,0 +1,107 @@
+package sync_test
+
+import (
+	"testing"
+	"time"
+
+	"git.mchus.pro/mchus/quoteforge/internal/localdb"
+	"git.mchus.pro/mchus/quoteforge/internal/models"
+	syncsvc "git.mchus.pro/mchus/quoteforge/internal/services/sync"
+)
+
+func TestSyncPricelists_BackfillsLotCategoryForUsedPricelistItems(t *testing.T) {
+	local := newLocalDBForSyncTest(t)
+	serverDB := newServerDBForSyncTest(t)
+
+	if err := serverDB.AutoMigrate(
+		&models.Pricelist{},
+		&models.PricelistItem{},
+		&models.Lot{},
+		&models.LotPartnumber{},
+		&models.StockLog{},
+	); err != nil {
+		t.Fatalf("migrate server tables: %v", err)
+	}
+
+	serverPL := models.Pricelist{
+		Source:       "estimate",
+		Version:      "2026-02-11-001",
+		Notification: "server",
+		CreatedBy:    "tester",
+		IsActive:     true,
+		CreatedAt:    time.Now().Add(-1 * time.Hour),
+	}
+	if err := serverDB.Create(&serverPL).Error; err != nil {
+		t.Fatalf("create server pricelist: %v", err)
+	}
+	if err := serverDB.Create(&models.PricelistItem{
+		PricelistID:  serverPL.ID,
+		LotName:      "CPU_A",
+		LotCategory:  "CPU",
+		Price:        10,
+		PriceMethod:  "",
+		MetaPrices:   "",
+		ManualPrice:  nil,
+		AvailableQty: nil,
+	}).Error; err != nil {
+		t.Fatalf("create server pricelist item: %v", err)
+	}
+
+	if err := local.SaveLocalPricelist(&localdb.LocalPricelist{
+		ServerID:  serverPL.ID,
+		Source:    serverPL.Source,
+		Version:   serverPL.Version,
+		Name:      serverPL.Notification,
+		CreatedAt: serverPL.CreatedAt,
+		SyncedAt:  time.Now(),
+		IsUsed:    false,
+	}); err != nil {
+		t.Fatalf("seed local pricelist: %v", err)
+	}
+	localPL, err := local.GetLocalPricelistByServerID(serverPL.ID)
+	if err != nil {
+		t.Fatalf("get local pricelist: %v", err)
+	}
+
+	if err := local.SaveLocalPricelistItems([]localdb.LocalPricelistItem{
+		{
+			PricelistID: localPL.ID,
+			LotName:     "CPU_A",
+			LotCategory: "",
+			Price:       10,
+		},
+	}); err != nil {
+		t.Fatalf("seed local pricelist items: %v", err)
+	}
+
+	if err := local.SaveConfiguration(&localdb.LocalConfiguration{
+		UUID:             "cfg-1",
+		OriginalUsername: "tester",
+		Name:             "cfg",
+		Items:            localdb.LocalConfigItems{{LotName: "CPU_A", Quantity: 1, UnitPrice: 10}},
+		IsActive:         true,
+		PricelistID:      &serverPL.ID,
+		SyncStatus:       "synced",
+		CreatedAt:        time.Now().Add(-30 * time.Minute),
+		UpdatedAt:        time.Now().Add(-30 * time.Minute),
+	}); err != nil {
+		t.Fatalf("seed local configuration with pricelist ref: %v", err)
+	}
+
+	svc := syncsvc.NewServiceWithDB(serverDB, local)
+	if _, err := svc.SyncPricelists(); err != nil {
+		t.Fatalf("sync pricelists: %v", err)
+	}
+
+	items, err := local.GetLocalPricelistItems(localPL.ID)
+	if err != nil {
+		t.Fatalf("load local items: %v", err)
+	}
+	if len(items) != 1 {
+		t.Fatalf("expected 1 local item, got %d", len(items))
+	}
+	if items[0].LotCategory != "CPU" {
+		t.Fatalf("expected lot_category backfilled to CPU, got %q", items[0].LotCategory)
+	}
+}
+

internal/services/sync/service_projects_push_test.go

@@ -348,6 +348,9 @@ CREATE TABLE qt_configurations (
 	notes TEXT NULL,
 	is_template INTEGER NOT NULL DEFAULT 0,
 	server_count INTEGER NOT NULL DEFAULT 1,
+	server_model TEXT NULL,
+	support_code TEXT NULL,
+	article TEXT NULL,
 	pricelist_id INTEGER NULL,
 	warehouse_pricelist_id INTEGER NULL,
 	competitor_pricelist_id INTEGER NULL,