refacto

2026-05-13 16:43:20 +02:00
parent 65d1367f42
commit 0039dda8a0
8 changed files with 61 additions and 700 deletions
@@ -3,6 +3,7 @@ package db
 import (
 	"fmt"
 	"log"
+	"slices"
 	"strings"
 	"time"
 )
@@ -79,10 +80,8 @@ func validateItemStatus(status string) error {

 	status = strings.ToLower(strings.TrimSpace(status))

-	for _, valid := range validStatuses {
-		if status == valid {
-			return nil
-		}
+	if !slices.Contains(validStatuses, status) {
+		return fmt.Errorf("...")
 	}

 	return fmt.Errorf("statut invalide: %s", status)
@@ -181,7 +180,7 @@ func (d *Database) InsertCommandItemWithClientInfo(
 // GET COMMAND ITEMS - VERSION SÉCURISÉE + FIX NULL
 // ============================================

-func (d *Database) GetCommandItems(commandID int) ([]map[string]interface{}, error) {
+func (d *Database) GetCommandItems(commandID int) ([]map[string]any, error) {
 	log.Printf("📦 [GetCommandItems] START - commandID=%d", commandID)

 	// ✅ VALIDATION
@@ -191,28 +190,28 @@ func (d *Database) GetCommandItems(commandID int) ([]map[string]interface{}, err
 	}

 	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"`
-		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"`
-		ClientOrderNumber  int        `gorm:"column:client_order_number"`
+		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"`
+		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"`
+		ClientOrderNumber int        `gorm:"column:client_order_number"`
 	}

 	err := d.GDB.Raw(`
@@ -249,19 +248,19 @@ func (d *Database) GetCommandItems(commandID int) ([]map[string]interface{}, err
 		return nil, fmt.Errorf("erreur récupération items: %w", err)
 	}

-	items := make([]map[string]interface{}, 0, len(rows))
+	items := make([]map[string]any, 0, len(rows))
 	for _, row := range rows {
 		productIDValue := 0
 		if row.ProductID != nil {
 			productIDValue = int(*row.ProductID)
 		}

-		var commandCreatedAt interface{}
+		var commandCreatedAt any
 		if row.CommandCreatedAt != nil {
 			commandCreatedAt = *row.CommandCreatedAt
 		}

-		item := map[string]interface{}{
+		item := map[string]any{
 			"id":               row.ID,
 			"command_id":       row.CommandID,
 			"produit":          row.Produit,
@@ -277,11 +276,11 @@ func (d *Database) GetCommandItems(commandID int) ([]map[string]interface{}, err
 			"created_at":       row.CreatedAt,
 			"updated_at":       row.UpdatedAt,
 			// Infos commande
-			"command_status":     ptrStr(row.CommandStatus),
-			"command_address":    ptrStr(row.CommandAddress),
-			"total_prix":         row.TotalPrix,
-			"referral_used":      row.ReferralUsed,
-			"livreur_assign":     ptrStr(row.LivreurAssign),
+			"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,
 			"client_order_number": row.ClientOrderNumber,
@@ -301,104 +300,6 @@ func ptrStr(s *string) string {
 	return *s
 }

-func (d *Database) GetCommandItemsByUsername(username string) ([]map[string]interface{}, error) {
-	if err := validateUsername(username); err != nil {
-		log.Printf("❌ [GetCommandItemsByUsername] %v", err)
-		return nil, err
-	}
-
-	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"`
-		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"`
-		LivreurAssign      *string    `gorm:"column:livreur_assign"`
-		CommandCreatedAt   *time.Time `gorm:"column:command_created_at"`
-	}
-
-	err := d.GDB.Raw(`
-	SELECT
-		ci.id,
-		ci.command_id,
-		ci.produit,
-		ci.product_id,
-		ci.quantite,
-		ci.prix,
-		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.livreur_assign,
-		c.created_at as command_created_at
-	FROM command_items ci
-	LEFT JOIN commandes c ON ci.command_id = c.id
-	WHERE ci.client_username = ?
-	ORDER BY ci.command_id DESC, ci.id ASC`, username).Scan(&rows).Error
-	if err != nil {
-		log.Printf("❌ Erreur query: %v", err)
-		return nil, fmt.Errorf("erreur récupération items: %w", err)
-	}
-
-	items := make([]map[string]interface{}, 0, len(rows))
-	for _, row := range rows {
-		productIDValue := 0
-		if row.ProductID != nil {
-			productIDValue = int(*row.ProductID)
-		}
-
-		var commandCreatedAt interface{}
-		if row.CommandCreatedAt != nil {
-			commandCreatedAt = *row.CommandCreatedAt
-		}
-
-		item := map[string]interface{}{
-			"id":                 row.ID,
-			"command_id":         row.CommandID,
-			"produit":            row.Produit,
-			"product_id":         productIDValue,
-			"quantite":           row.Quantite,
-			"prix":               row.Prix,
-			"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,
-			"livreur_assign":     ptrStr(row.LivreurAssign),
-			"command_created_at": commandCreatedAt,
-		}
-		items = append(items, item)
-	}
-
-	log.Printf("✅ %d items récupérés pour l'utilisateur %s", len(items), username)
-	return items, nil
-}
-
 func (d *Database) DeleteCommandItem(commandID, itemID int) error {
 	log.Printf("🗑️ [DeleteCommandItem] START - commandID=%d, itemID=%d", commandID, itemID)

@@ -411,7 +312,7 @@ func (d *Database) DeleteCommandItem(commandID, itemID int) error {

 	// Récupérer le prix et la quantité avant suppression pour mettre à jour le total
 	var result struct {
-		Prix    float64 `gorm:"column:prix"`
+		Prix     float64 `gorm:"column:prix"`
 		Quantite float64 `gorm:"column:quantite"`
 	}
 	if err := d.GDB.Raw(`SELECT prix, quantite FROM command_items WHERE id = ? AND command_id = ?`, itemID, commandID).Scan(&result).Error; err != nil {