package db import ( "database/sql" "fmt" "gestion/models" "log" "slices" "strings" "time" ) func sanitizeString(s string) string { sanitized := strings.Map(func(r rune) rune { if r < 32 || r == 127 { return -1 } return r }, s) if len(sanitized) > 1000 { sanitized = sanitized[:1000] } return strings.TrimSpace(sanitized) } func validateAddress(address string) error { address = strings.TrimSpace(address) if address == "" { return fmt.Errorf("adresse vide non autorisée") } if len(address) > 500 { return fmt.Errorf("adresse trop longue (max 500 caractères)") } if strings.ContainsAny(address, "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x0B\x0C\x0E\x0F") { return fmt.Errorf("adresse contient des caractères de contrôle interdits") } return nil } type basketItem struct { ProductID int Quantity float64 Price float64 } func (d *Database) fetchBasketItems(username string) ([]basketItem, float64, error) { rows, err := d.Query(`SELECT product_id, quantity, price FROM baskets WHERE username = $1`, username) if err != nil { return nil, 0, fmt.Errorf("erreur récupération panier: %w", err) } defer rows.Close() var items []basketItem total := 0.0 for rows.Next() { var item basketItem if err := rows.Scan(&item.ProductID, &item.Quantity, &item.Price); err != nil { return nil, 0, fmt.Errorf("erreur scan panier: %w", err) } items = append(items, item) total += item.Price } if err := rows.Err(); err != nil { return nil, 0, err } return items, total, nil } // validateCommandStatus vérifie si le statut est valide func validateCommandStatus(status string) error { validStatuses := map[string]bool{ "pending": true, "assigned": true, "en_route": true, "arrived": true, "livre": true, "approved": true, "cancelled": true, "disabled": true, } if !validStatuses[status] { return fmt.Errorf("statut invalide: %s", status) } return nil } func (d *Database) CreateCommand(username string) (*models.Command, error) { var adresse string clientQuery := `SELECT username FROM clients WHERE username = $1` err := d.QueryRow(clientQuery, username).Scan(&adresse) if err != nil { adresse = "Adresse non spécifiée" } basketItems, totalPrix, err := d.fetchBasketItems(username) if err != nil { return nil, err } if len(basketItems) == 0 { return nil, fmt.Errorf("le panier est vide") } commandQuery := `INSERT INTO commandes (username, status, adresse, total_prix, created_at, updated_at) VALUES ($1, $2, $3, $4, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP) RETURNING id, created_at, updated_at` var commandID int var createdAt, updatedAt time.Time err = d.QueryRow(commandQuery, username, "pending", adresse, totalPrix).Scan( &commandID, &createdAt, &updatedAt, ) if err != nil { return nil, fmt.Errorf("erreur lors de la création de la commande: %w", err) } for _, item := range basketItems { productName, err := d.GetProductNameByID(item.ProductID) if err != nil { productName = "Produit inconnu" } itemQuery := `INSERT INTO command_items (command_id, produit, product_id, quantite, prix) VALUES ($1, $2, $3, $4, $5)` _, err = d.Exec(itemQuery, commandID, productName, item.ProductID, item.Quantity, item.Price) if err != nil { return nil, fmt.Errorf("erreur lors de l'insertion des items: %w", err) } } clearBasketQuery := `DELETE FROM baskets WHERE username = $1` _, err = d.Exec(clearBasketQuery, username) if err != nil { return nil, fmt.Errorf("erreur lors du vidage du panier: %w", err) } command := &models.Command{ ID: commandID, Status: "pending", Total: totalPrix, } return command, nil } func (d *Database) CreateCommandWithAddress(username, deliveryAddress string) (*models.Command, error) { if err := validateUsername(username); err != nil { return nil, err } if err := validateAddress(deliveryAddress); err != nil { return nil, err } client, err := d.GetClientByUsername(username) if err != nil { log.Printf("⚠️ Client non trouvé: %v", err) } clientNom := "" clientPrenom := "" clientTelephone := "" if client != nil { clientNom = sanitizeString(client.Nom) clientPrenom = sanitizeString(client.Prenom) clientTelephone = sanitizeString(client.Telephone) } basketItems, totalPrix, err := d.fetchBasketItems(username) if err != nil { log.Printf("❌ Erreur query basket: %v", err) return nil, err } if len(basketItems) == 0 { return nil, fmt.Errorf("le panier est vide") } for _, item := range basketItems { if item.ProductID <= 0 || item.Quantity <= 0 || item.Price < 0 { return nil, fmt.Errorf("données panier invalides") } } if totalPrix <= 0 || totalPrix > 100000 { return nil, fmt.Errorf("montant de commande invalide: %.2f€", totalPrix) } commandQuery := `INSERT INTO commandes (username, status, adresse, total_prix, created_at, updated_at) VALUES ($1, $2, $3, $4, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP) RETURNING id, created_at, updated_at` var commandID int var createdAt, updatedAt time.Time err = d.QueryRow(commandQuery, username, "pending", deliveryAddress, totalPrix).Scan( &commandID, &createdAt, &updatedAt, ) if err != nil { return nil, fmt.Errorf("erreur création commande: %w", err) } for _, item := range basketItems { productName, err := d.GetProductNameByID(item.ProductID) if err != nil || productName == "" { productName = fmt.Sprintf("Produit #%d", item.ProductID) } err = d.InsertCommandItemWithClientInfo( commandID, productName, item.ProductID, item.Quantity, item.Price, username, clientNom, clientPrenom, clientTelephone, deliveryAddress, ) if err != nil { log.Printf("❌ Erreur INSERT command_items: %v", err) return nil, fmt.Errorf("erreur insertion items: %w", err) } stockQuery := `UPDATE products SET stock = stock - $1 WHERE id = $2 AND stock >= $1` result, err := d.Exec(stockQuery, item.Quantity, item.ProductID) if err != nil { log.Printf("⚠️ Erreur décrémentation stock produit %d: %v", item.ProductID, err) return nil, fmt.Errorf("erreur mise à jour stock: %w", err) } rowsAffected, _ := result.RowsAffected() if rowsAffected == 0 { log.Printf("⚠️ [CHECKOUT] Stock déjà réservé pour produit %d (double réservation panier/checkout)", item.ProductID) } } clearBasketQuery := `DELETE FROM baskets WHERE username = $1` _, err = d.Exec(clearBasketQuery, username) if err != nil { log.Printf("⚠️ Erreur vidage panier: %v", err) } sanitizedAddress := sanitizeLogMessage(deliveryAddress) d.AddCommandLog(commandID, "created", fmt.Sprintf("Commande créée - Adresse: %s - Total: %.2f€ - Client: %s %s", sanitizedAddress, totalPrix, sanitizeLogMessage(clientNom), sanitizeLogMessage(clientPrenom)), username) command := &models.Command{ ID: commandID, Username: username, Status: "pending", Total: totalPrix, DeliveryAddress: deliveryAddress, CreatedAt: createdAt, UpdatedAt: updatedAt, } return command, nil } func (d *Database) GetAllCommands(status, username string) ([]map[string]any, error) { if username != "" { if err := validateUsername(username); err != nil { return nil, err } } if status != "" { if err := validateCommandStatus(status); err != nil { return nil, err } } query := `SELECT c.id, c.username, c.status, c.adresse, c.total_prix, c.livreur_assign, c.created_at, c.updated_at, c.proposed_address, c.address_proposal_status, ROW_NUMBER() OVER (PARTITION BY c.username ORDER BY c.id) AS client_order_number FROM commandes c WHERE 1=1` args := []interface{}{} argPosition := 1 if status == "" { query += ` AND c.status IN ('pending', 'assigned', 'en_route', 'arrived', 'livre')` } else { query += fmt.Sprintf(" AND c.status = $%d", argPosition) args = append(args, status) argPosition++ } if username != "" { query += fmt.Sprintf(" AND c.username = $%d", argPosition) args = append(args, username) argPosition++ } query += " ORDER BY c.created_at DESC LIMIT 1000" rows, err := d.Query(query, args...) if err != nil { return nil, fmt.Errorf("erreur lors de la récupération des commandes: %w", err) } defer rows.Close() var commands []map[string]any for rows.Next() { var id int var username, status, adresse string var livreurAssign sql.NullString var proposedAddress sql.NullString var addressProposalStatus string var totalPrix float64 var createdAt, updatedAt time.Time var clientOrderNumber int err := rows.Scan(&id, &username, &status, &adresse, &totalPrix, &livreurAssign, &createdAt, &updatedAt, &proposedAddress, &addressProposalStatus, &clientOrderNumber) if err != nil { return nil, fmt.Errorf("erreur lors du scan de la commande: %w", err) } adresse = sanitizeString(adresse) command := map[string]any{ "id": id, "username": username, "status": status, "adresse": adresse, "total_prix": totalPrix, "created_at": createdAt, "updated_at": updatedAt, "address_proposal_status": addressProposalStatus, "client_order_number": clientOrderNumber, } if livreurAssign.Valid { command["livreur_assign"] = livreurAssign.String } else { command["livreur_assign"] = nil } if proposedAddress.Valid { command["proposed_address"] = proposedAddress.String } else { command["proposed_address"] = nil } commands = append(commands, command) } if err = rows.Err(); err != nil { return nil, fmt.Errorf("erreur lors de l'itération des résultats: %w", err) } return commands, nil } func (d *Database) GetCommandCount() (int, error) { var count int err := d.QueryRow("SELECT COUNT(*) FROM commandes").Scan(&count) if err != nil { return 0, fmt.Errorf("erreur récupération count commandes: %w", err) } return count, nil } func (d *Database) SetCommandReferralUsed(commandID int, amount float64) error { _, err := d.Exec(`UPDATE commandes SET referral_used = $1 WHERE id = $2`, amount, commandID) return err } func (d *Database) GetCommandByID(id int) (map[string]any, error) { query := `SELECT c.id, c.username, c.status, c.adresse, c.total_prix, c.livreur_assign, c.created_at, c.updated_at, c.proposed_address, c.address_proposal_status, c.referral_used, (SELECT COUNT(*) FROM commandes c2 WHERE c2.username = c.username AND c2.id <= c.id) AS client_order_number FROM commandes c WHERE c.id = $1` var commandID int var username, status, adresse string var livreurAssign sql.NullString var proposedAddress sql.NullString var addressProposalStatus string var totalPrix, referralUsed float64 var createdAt, updatedAt time.Time var clientOrderNumber int err := d.QueryRow(query, id).Scan( &commandID, &username, &status, &adresse, &totalPrix, &livreurAssign, &createdAt, &updatedAt, &proposedAddress, &addressProposalStatus, &referralUsed, &clientOrderNumber, ) if err == sql.ErrNoRows { return nil, fmt.Errorf("commande non trouvée") } if err != nil { return nil, fmt.Errorf("erreur lors de la récupération de la commande: %w", err) } command := map[string]any{ "id": commandID, "username": username, "status": status, "adresse": adresse, "total_prix": totalPrix, "created_at": createdAt, "updated_at": updatedAt, "address_proposal_status": addressProposalStatus, "referral_used": referralUsed, "client_order_number": clientOrderNumber, } if livreurAssign.Valid { command["livreur_assign"] = livreurAssign.String } else { command["livreur_assign"] = nil } if proposedAddress.Valid { command["proposed_address"] = proposedAddress.String } else { command["proposed_address"] = nil } return command, nil } func (d *Database) GetCommandAddress(commandID int) (string, error) { var address string query := `SELECT adresse FROM commandes WHERE id = $1` err := d.QueryRow(query, commandID).Scan(&address) if err == sql.ErrNoRows { return "", fmt.Errorf("commande non trouvée") } if err != nil { return "", fmt.Errorf("erreur lors de la récupération de l'adresse: %w", err) } return address, nil } func (d *Database) UpdateCommandAddress(commandID int, deliveryAddress string) error { if len(deliveryAddress) > 500 { return fmt.Errorf("adresse trop longue (max 500 caractères)") } if strings.TrimSpace(deliveryAddress) == "" { return fmt.Errorf("adresse vide non autorisée") } query := `UPDATE commandes SET adresse = $1, updated_at = CURRENT_TIMESTAMP WHERE id = $2` result, err := d.Exec(query, deliveryAddress, commandID) if err != nil { return fmt.Errorf("erreur lors de la mise à jour de l'adresse: %w", err) } rowsAffected, err := result.RowsAffected() if err != nil { return fmt.Errorf("erreur lors de la vérification: %w", err) } if rowsAffected == 0 { return fmt.Errorf("commande non trouvée") } log.Printf("✅ Adresse commande %d mise à jour", commandID) return nil } // ProposeAddressChange propose une nouvelle adresse (admin/cabine) en attente de validation client func (d *Database) ProposeAddressChange(commandID int, proposedAddress, proposedBy string) error { if err := validateAddress(proposedAddress); err != nil { return err } query := `UPDATE commandes SET proposed_address = $1, address_proposal_status = 'pending', updated_at = CURRENT_TIMESTAMP WHERE id = $2` result, err := d.Exec(query, proposedAddress, commandID) if err != nil { return fmt.Errorf("erreur proposition adresse: %w", err) } rowsAffected, _ := result.RowsAffected() if rowsAffected == 0 { return fmt.Errorf("commande non trouvée") } d.AddCommandLog(commandID, "address_proposed", fmt.Sprintf("Nouvelle adresse proposée par %s: %s", proposedBy, proposedAddress), proposedBy) log.Printf("✅ Adresse proposée pour commande %d par %s", commandID, proposedBy) return nil } // RespondToAddressProposal accepte ou refuse la proposition d'adresse func (d *Database) RespondToAddressProposal(commandID int, clientUsername string, accepted bool) error { var query string if accepted { query = `UPDATE commandes SET adresse = proposed_address, proposed_address = NULL, address_proposal_status = 'accepted', updated_at = CURRENT_TIMESTAMP WHERE id = $1 AND username = $2 AND address_proposal_status = 'pending'` } else { query = `UPDATE commandes SET proposed_address = NULL, address_proposal_status = 'rejected', updated_at = CURRENT_TIMESTAMP WHERE id = $1 AND username = $2 AND address_proposal_status = 'pending'` } result, err := d.Exec(query, commandID, clientUsername) if err != nil { return fmt.Errorf("erreur réponse proposition adresse: %w", err) } rowsAffected, _ := result.RowsAffected() if rowsAffected == 0 { return fmt.Errorf("aucune proposition en attente pour cette commande") } action := "refusée" if accepted { action = "acceptée" } d.AddCommandLog(commandID, "address_proposal_"+action, fmt.Sprintf("Proposition d'adresse %s par le client %s", action, clientUsername), clientUsername) log.Printf("✅ Proposition adresse %s pour commande %d", action, commandID) return nil } // UpdateCommandStatus met à jour le statut d'une commande func (d *Database) UpdateCommandStatus(commandID int, status string) error { if err := validateCommandStatus(status); err != nil { return err } query := `UPDATE commandes SET status = $1, updated_at = CURRENT_TIMESTAMP WHERE id = $2` result, err := d.Exec(query, status, commandID) if err != nil { return fmt.Errorf("erreur lors de la mise à jour du statut: %w", err) } rowsAffected, err := result.RowsAffected() if err != nil { return fmt.Errorf("erreur lors de la vérification des lignes affectées: %w", err) } if rowsAffected == 0 { return fmt.Errorf("commande non trouvée") } return nil } func (d *Database) AddCommandLog(commandID int, status, message, author string) error { sanitizedMessage := sanitizeLogMessage(message) sanitizedAuthor := sanitizeLogMessage(author) query := `INSERT INTO command_logs (command_id, status, message, author, created_at) VALUES ($1, $2, $3, $4, CURRENT_TIMESTAMP)` _, err := d.Exec(query, commandID, status, sanitizedMessage, sanitizedAuthor) if err != nil { log.Printf("⚠️ Avertissement: impossible d'ajouter le log (table command_logs peut-être manquante): %v", err) return nil } return nil } // GetCommandLogs récupère tous les logs d'une commande func (d *Database) GetCommandLogs(commandID int) ([]map[string]any, error) { query := `SELECT id, command_id, status, message, author, created_at FROM command_logs WHERE command_id = $1 ORDER BY created_at ASC` rows, err := d.Query(query, commandID) if err != nil { // Si la table n'existe pas, retourner un tableau vide au lieu d'une erreur log.Printf("⚠️ Avertissement: impossible de récupérer les logs: %v", err) return []map[string]any{}, nil } defer rows.Close() var logs []map[string]any for rows.Next() { var id, commandID int var status, message, author string var createdAt time.Time err := rows.Scan(&id, &commandID, &status, &message, &author, &createdAt) if err != nil { return nil, fmt.Errorf("erreur lors du scan du log: %w", err) } logEntry := map[string]any{ "id": id, "command_id": commandID, "status": status, "message": message, "author": author, "created_at": createdAt, } logs = append(logs, logEntry) } if err = rows.Err(); err != nil { return nil, fmt.Errorf("erreur lors de l'itération des résultats: %w", err) } return logs, nil } func sanitizeLogMessage(message string) string { sanitized := strings.Map(func(r rune) rune { if r < 32 || r == 127 { return -1 } return r }, message) if len(sanitized) > 1000 { sanitized = sanitized[:1000] } return sanitized } func (d *Database) ValidateDeliveryAtomic(commandID int, adminUsername string) (int, error) { tx, err := d.Begin() if err != nil { log.Printf("❌ [ValidateAtomic] Erreur début transaction: %v", err) return 0, fmt.Errorf("erreur transaction: %w", err) } defer tx.Rollback() var currentStatus, cmdUsername, livreurAssign string var totalPrix float64 err = tx.QueryRow(` SELECT status, username, COALESCE(livreur_assign, ''), total_prix FROM commandes WHERE id = $1 FOR UPDATE `, commandID).Scan(¤tStatus, &cmdUsername, &livreurAssign, &totalPrix) if err == sql.ErrNoRows { log.Printf("❌ [ValidateAtomic] Commande %d non trouvée", commandID) return 0, fmt.Errorf("commande non trouvée") } if err != nil { log.Printf("❌ [ValidateAtomic] Erreur SELECT: %v", err) return 0, fmt.Errorf("erreur lecture commande: %w", err) } log.Printf("📋 [ValidateAtomic] Commande trouvée - status=%s, client=%s, livreur=%s", currentStatus, cmdUsername, livreurAssign) validStatuses := []string{"assigned", "en_route", "pending", "livre"} isValid := slices.Contains(validStatuses, currentStatus) if !isValid { log.Printf("❌ [ValidateAtomic] Statut invalide pour validation: %s", currentStatus) return 0, fmt.Errorf("statut invalide pour validation: %s", currentStatus) } if currentStatus == "approved" { log.Printf("⚠️ [ValidateAtomic] Commande %d déjà approuvée", commandID) return 0, fmt.Errorf("commande déjà approuvée") } result, err := tx.Exec(` UPDATE commandes SET status = 'approved', updated_at = CURRENT_TIMESTAMP WHERE id = $1 AND status = $2 `, commandID, currentStatus) if err != nil { log.Printf("❌ [ValidateAtomic] Erreur UPDATE: %v", err) return 0, fmt.Errorf("erreur mise à jour statut: %w", err) } rows, _ := result.RowsAffected() if rows == 0 { log.Printf("❌ [ValidateAtomic] Commande %d déjà modifiée (race condition évitée)", commandID) return 0, fmt.Errorf("commande déjà modifiée par une autre requête") } totalPoints := 0 if cmdUsername != "" { log.Printf("🔍 [ValidateAtomic] Calcul points pour client: %s", cmdUsername) points, _, err := d.CalculateAndAddPointsForCommandTx(tx, commandID, cmdUsername) if err != nil { log.Printf("❌ [ValidateAtomic] Erreur calcul/ajout points: %v", err) return 0, fmt.Errorf("erreur attribution points: %w", err) } totalPoints = points log.Printf("✅ [ValidateAtomic] %d points attribués à %s", totalPoints, cmdUsername) _, err = tx.Exec(` UPDATE clients SET command = command + 1, updated_at = CURRENT_TIMESTAMP WHERE username = $1 `, cmdUsername) if err != nil { log.Printf("⚠️ [ValidateAtomic] Erreur incrémentation compteur: %v", err) } else { log.Printf("✅ [ValidateAtomic] Compteur commandes incrémenté pour %s", cmdUsername) } } _, err = tx.Exec(` INSERT INTO command_logs (command_id, status, message, author, created_at) VALUES ($1, $2, $3, $4, CURRENT_TIMESTAMP) `, commandID, "approved", fmt.Sprintf("Livraison validée par admin %s - %d points attribués", adminUsername, totalPoints), adminUsername) if err != nil { log.Printf("⚠️ [ValidateAtomic] Erreur ajout log: %v", err) } if err := tx.Commit(); err != nil { log.Printf("❌ [ValidateAtomic] Erreur COMMIT: %v", err) return 0, fmt.Errorf("erreur commit transaction: %w", err) } log.Printf("🎉 [ValidateAtomic] SUCCÈS - Commande %d validée, %d points attribués", commandID, totalPoints) if livreurAssign != "" { log.Printf("📦 [ValidateAtomic] Optimisation queue pour livreur: %s", livreurAssign) go func() { err := d.CompleteDeliveryAndProcessNext(livreurAssign, commandID) if err != nil { log.Printf("⚠️ [ValidateAtomic] Erreur optimisation queue: %v", err) } }() } go func() { commandCacheKey := fmt.Sprintf("command:%d", commandID) Redis.Del(RedisCtx, commandCacheKey) if cmdUsername != "" { clientCacheKey := fmt.Sprintf("client:%s", cmdUsername) Redis.Del(RedisCtx, clientCacheKey) clientCommandsCacheKey := fmt.Sprintf("client:%s:commands", cmdUsername) Redis.Del(RedisCtx, clientCommandsCacheKey) } log.Printf("✅ [ValidateAtomic] Caches invalidés pour cmd %d", commandID) }() return totalPoints, nil } // ApproveDeliveryAtomic - Version atomique pour approbation client func (d *Database) ApproveDeliveryAtomic(commandID int, username string) (int, string, error) { log.Printf("🔒 [ApproveAtomic] START - cmd=%d, client=%s", commandID, username) // ✅ ÉTAPE 1: Démarrer une transaction tx, err := d.Begin() if err != nil { log.Printf("❌ [ApproveAtomic] Erreur début transaction: %v", err) return 0, "", fmt.Errorf("erreur transaction: %w", err) } defer tx.Rollback() // ✅ ÉTAPE 2: SELECT FOR UPDATE pour verrouiller la commande var currentStatus, cmdUsername, livreurAssign string err = tx.QueryRow(` SELECT status, username, COALESCE(livreur_assign, '') FROM commandes WHERE id = $1 FOR UPDATE `, commandID).Scan(¤tStatus, &cmdUsername, &livreurAssign) if err == sql.ErrNoRows { log.Printf("❌ [ApproveAtomic] Commande %d non trouvée", commandID) return 0, "", fmt.Errorf("commande non trouvée") } if err != nil { log.Printf("❌ [ApproveAtomic] Erreur SELECT: %v", err) return 0, "", fmt.Errorf("erreur lecture commande: %w", err) } log.Printf("📋 [ApproveAtomic] Commande trouvée - status=%s, owner=%s", currentStatus, cmdUsername) // ✅ ÉTAPE 3: Vérifier propriété if cmdUsername != username { log.Printf("❌ [ApproveAtomic] Commande n'appartient pas à %s (propriétaire: %s)", username, cmdUsername) return 0, "", fmt.Errorf("cette commande ne vous appartient pas") } // ✅ ÉTAPE 4: Vérifier le statut if currentStatus != "livre" { log.Printf("❌ [ApproveAtomic] Statut invalide: %s (attendu: livre)", currentStatus) return 0, "", fmt.Errorf("commande doit être en statut 'livre' (statut actuel: %s)", currentStatus) } // ✅ ÉTAPE 5: UPDATE avec vérification du statut result, err := tx.Exec(` UPDATE commandes SET status = 'approved', updated_at = CURRENT_TIMESTAMP WHERE id = $1 AND status = 'livre' AND username = $2 `, commandID, username) if err != nil { log.Printf("❌ [ApproveAtomic] Erreur UPDATE: %v", err) return 0, "", fmt.Errorf("erreur mise à jour statut: %w", err) } rows, _ := result.RowsAffected() if rows == 0 { log.Printf("❌ [ApproveAtomic] Commande %d déjà modifiée (race condition évitée)", commandID) return 0, "", fmt.Errorf("commande déjà approuvée ou modifiée") } log.Printf("✅ [ApproveAtomic] Statut mis à jour: livre → approved") // ✅ ÉTAPE 6: Calculer et ajouter les points totalPoints, pointCategory, err := d.CalculateAndAddPointsForCommandTx(tx, commandID, username) if err != nil { log.Printf("❌ [ApproveAtomic] Erreur calcul points: %v", err) return 0, "", fmt.Errorf("erreur attribution points: %w", err) } log.Printf("✅ [ApproveAtomic] %d points [%s] attribués à %s", totalPoints, pointCategory, username) // ✅ ÉTAPE 7: Incrémenter le compteur de commandes _, err = tx.Exec(` UPDATE clients SET command = command + 1, updated_at = CURRENT_TIMESTAMP WHERE username = $1 `, username) if err != nil { log.Printf("⚠️ [ApproveAtomic] Erreur incrémentation compteur: %v", err) // On ne bloque pas pour ça } // ✅ ÉTAPE 8: Ajouter un log _, err = tx.Exec(` INSERT INTO command_logs (command_id, status, message, author, created_at) VALUES ($1, $2, $3, $4, CURRENT_TIMESTAMP) `, commandID, "approved", fmt.Sprintf("Livraison confirmée par le client %s - %d points [%s] attribués", username, totalPoints, pointCategory), username) if err != nil { log.Printf("⚠️ [ApproveAtomic] Erreur ajout log: %v", err) } // ✅ ÉTAPE 9: Commit if err := tx.Commit(); err != nil { log.Printf("❌ [ApproveAtomic] Erreur COMMIT: %v", err) return 0, "", fmt.Errorf("erreur commit transaction: %w", err) } log.Printf("🎉 [ApproveAtomic] SUCCÈS - Commande %d approuvée, %d points [%s] attribués", commandID, totalPoints, pointCategory) // ✅ ÉTAPE 10: Optimiser queue livreur (async, après commit) if livreurAssign != "" { log.Printf("📦 [ApproveAtomic] Optimisation queue pour livreur: %s", livreurAssign) go func() { err := d.CompleteDeliveryAndProcessNext(livreurAssign, commandID) if err != nil { log.Printf("⚠️ [ApproveAtomic] Erreur optimisation queue: %v", err) } }() } // ✅ ÉTAPE 11: Invalider caches (async) go func() { commandCacheKey := fmt.Sprintf("command:%d", commandID) Redis.Del(RedisCtx, commandCacheKey) clientCacheKey := fmt.Sprintf("client:%s", username) Redis.Del(RedisCtx, clientCacheKey) clientCommandsCacheKey := fmt.Sprintf("client:%s:commands", username) Redis.Del(RedisCtx, clientCommandsCacheKey) log.Printf("✅ [ApproveAtomic] Caches invalidés") }() return totalPoints, pointCategory, nil } // ApproveDeliveryAtomicByStaff - Confirmation de réception par admin ou cabine à la place du client func (d *Database) ApproveDeliveryAtomicByStaff(commandID int, staffUsername string) (int, string, string, error) { log.Printf("🔒 [ApproveAtomicStaff] START - cmd=%d, staff=%s", commandID, staffUsername) tx, err := d.Begin() if err != nil { return 0, "", "", fmt.Errorf("erreur transaction: %w", err) } defer tx.Rollback() var currentStatus, clientUsername, livreurAssign string err = tx.QueryRow(` SELECT status, username, COALESCE(livreur_assign, '') FROM commandes WHERE id = $1 FOR UPDATE `, commandID).Scan(¤tStatus, &clientUsername, &livreurAssign) if err == sql.ErrNoRows { return 0, "", "", fmt.Errorf("commande non trouvée") } if err != nil { return 0, "", "", fmt.Errorf("erreur lecture commande: %w", err) } if currentStatus != "livre" { return 0, "", "", fmt.Errorf("commande doit être en statut 'livre' (statut actuel: %s)", currentStatus) } result, err := tx.Exec(` UPDATE commandes SET status = 'approved', updated_at = CURRENT_TIMESTAMP WHERE id = $1 AND status = 'livre' `, commandID) if err != nil { return 0, "", "", fmt.Errorf("erreur mise à jour statut: %w", err) } rows, _ := result.RowsAffected() if rows == 0 { return 0, "", "", fmt.Errorf("commande déjà approuvée ou modifiée") } totalPoints, pointCategory, err := d.CalculateAndAddPointsForCommandTx(tx, commandID, clientUsername) if err != nil { return 0, "", "", fmt.Errorf("erreur attribution points: %w", err) } _, err = tx.Exec(` UPDATE clients SET command = command + 1, updated_at = CURRENT_TIMESTAMP WHERE username = $1 `, clientUsername) if err != nil { log.Printf("⚠️ [ApproveAtomicStaff] Erreur incrémentation compteur: %v", err) } _, err = tx.Exec(` INSERT INTO command_logs (command_id, status, message, author, created_at) VALUES ($1, $2, $3, $4, CURRENT_TIMESTAMP) `, commandID, "approved", fmt.Sprintf("Réception confirmée par %s au nom du client %s - %d points attribués", staffUsername, clientUsername, totalPoints), staffUsername) if err != nil { log.Printf("⚠️ [ApproveAtomicStaff] Erreur log: %v", err) } if err := tx.Commit(); err != nil { return 0, "", "", fmt.Errorf("erreur commit: %w", err) } log.Printf("🎉 [ApproveAtomicStaff] SUCCÈS - cmd=%d approuvée par %s, %d points → client %s", commandID, staffUsername, totalPoints, clientUsername) if livreurAssign != "" { go func() { if err := d.CompleteDeliveryAndProcessNext(livreurAssign, commandID); err != nil { log.Printf("⚠️ [ApproveAtomicStaff] Erreur queue: %v", err) } }() } go func() { Redis.Del(RedisCtx, fmt.Sprintf("command:%d", commandID)) Redis.Del(RedisCtx, fmt.Sprintf("client:%s", clientUsername)) Redis.Del(RedisCtx, fmt.Sprintf("client:%s:commands", clientUsername)) }() return totalPoints, pointCategory, clientUsername, nil }