chore: build

2026-08-06 12:06:05 +02:00
parent c034088bee
commit 22a8d5026c
174 changed files with 30315 additions and 16120 deletions
@@ -6,8 +6,37 @@ import (
 	"slices"
 	"strings"
 	"time"
+
+	"gorm.io/gorm"
 )

+// commandItemFull mappe toutes les colonnes de command_items pour les insertions batch avec infos client.
+type commandItemFull struct {
+	CommandID       int     `gorm:"column:command_id"`
+	Produit         string  `gorm:"column:produit"`
+	ProductID       int     `gorm:"column:product_id"`
+	Quantite        float64 `gorm:"column:quantite"`
+	Prix            float64 `gorm:"column:prix"`
+	IsReward        bool    `gorm:"column:is_reward"`
+	RewardPoolKey   string  `gorm:"column:reward_pool_key"`
+	ClientUsername  string  `gorm:"column:client_username"`
+	ClientNom       string  `gorm:"column:client_nom"`
+	ClientPrenom    string  `gorm:"column:client_prenom"`
+	ClientTelephone string  `gorm:"column:client_telephone"`
+	DeliveryAddress string  `gorm:"column:delivery_address"`
+	Status          string  `gorm:"column:status"`
+}
+
+func (commandItemFull) TableName() string { return "command_items" }
+
+// InsertCommandItemsBatch insère plusieurs items en une seule requête.
+func (d *Database) InsertCommandItemsBatch(items []commandItemFull) error {
+	if len(items) == 0 {
+		return nil
+	}
+	return d.GDB.Create(&items).Error
+}
+
 // ============================================
 // VALIDATION HELPERS
 // ============================================
@@ -308,6 +337,92 @@ func (d *Database) GetCommandItems(commandID int) ([]map[string]any, error) {
 	return items, nil
 }

+// GetCommandItemsBatch charge les items de plusieurs commandes en une seule requête.
+// Retourne map[commandID][]items, même structure que GetCommandItems.
+func (d *Database) GetCommandItemsBatch(commandIDs []int) (map[int][]map[string]any, error) {
+	result := make(map[int][]map[string]any, len(commandIDs))
+	if len(commandIDs) == 0 {
+		return result, nil
+	}
+
+	var rows []struct {
+		ID                int        `gorm:"column:id"`
+		CommandID         int        `gorm:"column:command_id"`
+		Produit           string     `gorm:"column:produit"`
+		ProductID         *int64     `gorm:"column:product_id"`
+		Quantite          float64    `gorm:"column:quantite"`
+		Prix              float64    `gorm:"column:prix"`
+		IsReward          bool       `gorm:"column:is_reward"`
+		RewardPoolKey     string     `gorm:"column:reward_pool_key"`
+		ClientUsername    string     `gorm:"column:client_username"`
+		ClientNom         string     `gorm:"column:client_nom"`
+		ClientPrenom      string     `gorm:"column:client_prenom"`
+		ClientTelephone   string     `gorm:"column:client_telephone"`
+		DeliveryAddress   *string    `gorm:"column:delivery_address"`
+		Status            *string    `gorm:"column:status"`
+		CreatedAt         time.Time  `gorm:"column:created_at"`
+		UpdatedAt         time.Time  `gorm:"column:updated_at"`
+		CommandStatus     *string    `gorm:"column:command_status"`
+		CommandAddress    *string    `gorm:"column:command_address"`
+		TotalPrix         float64    `gorm:"column:total_prix"`
+		ReferralUsed      float64    `gorm:"column:referral_used"`
+		LivreurAssign     *string    `gorm:"column:livreur_assign"`
+		CommandCreatedAt  *time.Time `gorm:"column:command_created_at"`
+		Category          string     `gorm:"column:category"`
+		Unit              string     `gorm:"column:unit"`
+		ClientOrderNumber int        `gorm:"column:client_order_number"`
+	}
+
+	err := d.GDB.Raw(`
+	SELECT
+		ci.id, ci.command_id, ci.produit, ci.product_id,
+		ci.quantite, ci.prix, ci.is_reward, ci.reward_pool_key,
+		ci.client_username, ci.client_nom, ci.client_prenom, ci.client_telephone,
+		ci.delivery_address, ci.status, ci.created_at, ci.updated_at,
+		c.status as command_status, c.adresse as command_address,
+		c.total_prix, c.referral_used, c.livreur_assign,
+		c.created_at as command_created_at,
+		COALESCE(p.category, '') as category,
+		COALESCE(p.unit, '') as unit,
+		c.client_order_id as client_order_number
+	FROM command_items ci
+	LEFT JOIN commandes c ON ci.command_id = c.id
+	LEFT JOIN products p ON ci.product_id = p.id
+	WHERE ci.command_id IN ?
+	ORDER BY ci.command_id ASC, ci.id ASC`, commandIDs).Scan(&rows).Error
+	if err != nil {
+		return nil, fmt.Errorf("erreur récupération items batch: %w", err)
+	}
+
+	for _, row := range rows {
+		productIDValue := 0
+		if row.ProductID != nil {
+			productIDValue = int(*row.ProductID)
+		}
+		var commandCreatedAt any
+		if row.CommandCreatedAt != nil {
+			commandCreatedAt = *row.CommandCreatedAt
+		}
+		item := map[string]any{
+			"id": row.ID, "command_id": row.CommandID,
+			"produit": row.Produit, "product_id": productIDValue,
+			"quantite": row.Quantite, "prix": row.Prix,
+			"is_reward": row.IsReward, "reward_pool_key": row.RewardPoolKey,
+			"client_username": row.ClientUsername, "client_nom": row.ClientNom,
+			"client_prenom": row.ClientPrenom, "client_telephone": row.ClientTelephone,
+			"delivery_address": ptrStr(row.DeliveryAddress), "status": ptrStr(row.Status),
+			"created_at": row.CreatedAt, "updated_at": row.UpdatedAt,
+			"command_status": ptrStr(row.CommandStatus), "command_address": ptrStr(row.CommandAddress),
+			"total_prix": row.TotalPrix, "referral_used": row.ReferralUsed,
+			"livreur_assign": ptrStr(row.LivreurAssign), "command_created_at": commandCreatedAt,
+			"category": row.Category, "unit": row.Unit,
+			"client_order_number": row.ClientOrderNumber,
+		}
+		result[row.CommandID] = append(result[row.CommandID], item)
+	}
+	return result, nil
+}
+
 // ptrStr retourne la valeur d'un *string ou "" si nil
 func ptrStr(s *string) string {
 	if s == nil {
@@ -316,6 +431,12 @@ func ptrStr(s *string) string {
 	return *s
 }

+// DeleteCommandItem supprime un item d'une commande et restaure son stock si
+// la commande n'est pas déjà dans un état terminal. Le statut de la commande
+// est verrouillé (FOR UPDATE) avant toute décision, dans la même transaction
+// que la suppression et le remboursement, pour éviter une course avec une
+// annulation concurrente de la commande entière (qui rembourserait déjà cet
+// item) — même classe de bug que celle corrigée sur UpdateCommandStatusAdmin.
 func (d *Database) DeleteCommandItem(commandID, itemID int) error {
 	log.Printf("🗑️ [DeleteCommandItem] START - commandID=%d, itemID=%d", commandID, itemID)

@@ -326,61 +447,55 @@ func (d *Database) DeleteCommandItem(commandID, itemID int) error {
 		return err
 	}

-	var result struct {
-		Prix      float64 `gorm:"column:prix"`
-		Quantite  float64 `gorm:"column:quantite"`
-		ProductID int     `gorm:"column:product_id"`
-	}
-	if err := d.GDB.Raw(`SELECT prix, quantite, product_id FROM command_items WHERE id = ? AND command_id = ?`, itemID, commandID).Scan(&result).Error; err != nil {
-		return fmt.Errorf("erreur vérification item: %w", err)
-	}
-	if result.Prix == 0 && result.Quantite == 0 {
-		return fmt.Errorf("item %d non trouvé dans la commande %d", itemID, commandID)
-	}
-
-	var cmdStatus string
-	d.GDB.Raw(`SELECT status FROM commandes WHERE id = ?`, commandID).Scan(&cmdStatus)
-
-	noRestoreStatuses := []string{"cancelled", "approved", "livre"}
-	restoreStock := result.ProductID != 0 && !slices.Contains(noRestoreStatuses, cmdStatus)
-
-	tx := d.GDB.Begin()
-	if tx.Error != nil {
-		return fmt.Errorf("erreur démarrage transaction: %w", tx.Error)
-	}
-
-	if err := tx.Exec(`DELETE FROM command_items WHERE id = ?`, itemID).Error; err != nil {
-		tx.Rollback()
-		log.Printf("❌ Erreur DELETE command_items: %v", err)
-		return fmt.Errorf("erreur suppression item: %w", err)
-	}
-
-	if err := tx.Exec(
-		`UPDATE commandes SET total_prix = GREATEST(0, total_prix - ?) WHERE id = ?`,
-		result.Prix*result.Quantite, commandID,
-	).Error; err != nil {
-		tx.Rollback()
-		log.Printf("❌ [DeleteCommandItem] Erreur maj total commande: %v", err)
-		return fmt.Errorf("erreur mise à jour total commande: %w", err)
-	}
-
-	if restoreStock {
-		if err := tx.Exec(
-			`UPDATE products SET stock = stock + ?, updated_at = CURRENT_TIMESTAMP WHERE id = ?`,
-			result.Quantite, result.ProductID,
-		).Error; err != nil {
-			tx.Rollback()
-			log.Printf("❌ [DeleteCommandItem] Erreur restauration stock: %v", err)
-			return fmt.Errorf("erreur restauration stock: %w", err)
+	return d.GDB.Transaction(func(tx *gorm.DB) error {
+		var cmdStatus string
+		if err := tx.Raw(`SELECT status FROM commandes WHERE id = ? FOR UPDATE`, commandID).Scan(&cmdStatus).Error; err != nil {
+			return fmt.Errorf("erreur vérification commande: %w", err)
+		}
+		if cmdStatus == "" {
+			return fmt.Errorf("commande %d non trouvée", commandID)
 		}
-		log.Printf("✅ [DeleteCommandItem] Stock restauré: +%.3f pour produit %d", result.Quantite, result.ProductID)
-	}

-	if err := tx.Commit().Error; err != nil {
-		return fmt.Errorf("erreur commit transaction: %w", err)
-	}
+		var result struct {
+			Prix      float64 `gorm:"column:prix"`
+			Quantite  float64 `gorm:"column:quantite"`
+			ProductID int     `gorm:"column:product_id"`
+		}
+		if err := tx.Raw(`SELECT prix, quantite, product_id FROM command_items WHERE id = ? AND command_id = ?`, itemID, commandID).Scan(&result).Error; err != nil {
+			return fmt.Errorf("erreur vérification item: %w", err)
+		}
+		if result.Prix == 0 && result.Quantite == 0 {
+			return fmt.Errorf("item %d non trouvé dans la commande %d", itemID, commandID)
+		}

-	return nil
+		if err := tx.Exec(`DELETE FROM command_items WHERE id = ?`, itemID).Error; err != nil {
+			log.Printf("❌ Erreur DELETE command_items: %v", err)
+			return fmt.Errorf("erreur suppression item: %w", err)
+		}
+
+		if err := tx.Exec(
+			`UPDATE commandes SET total_prix = GREATEST(0, total_prix - ?) WHERE id = ?`,
+			result.Prix*result.Quantite, commandID,
+		).Error; err != nil {
+			log.Printf("❌ [DeleteCommandItem] Erreur maj total commande: %v", err)
+			return fmt.Errorf("erreur mise à jour total commande: %w", err)
+		}
+
+		noRestoreStatuses := []string{"cancelled", "approved", "livre"}
+		restoreStock := result.ProductID != 0 && !slices.Contains(noRestoreStatuses, cmdStatus)
+		if restoreStock {
+			if err := tx.Exec(
+				`UPDATE products SET stock = stock + ?, updated_at = CURRENT_TIMESTAMP WHERE id = ?`,
+				result.Quantite, result.ProductID,
+			).Error; err != nil {
+				log.Printf("❌ [DeleteCommandItem] Erreur restauration stock: %v", err)
+				return fmt.Errorf("erreur restauration stock: %w", err)
+			}
+			log.Printf("✅ [DeleteCommandItem] Stock restauré: +%.3f pour produit %d", result.Quantite, result.ProductID)
+		}
+
+		return nil
+	})
 }

 func (d *Database) UpdateCommandItemStatus(itemID int, status string) error {