chore: refacto

backend/gestion/db/db_cancel_command.go

@@ -65,10 +65,14 @@ func (d *Database) CancelCommandAtomic(commandID int, username, reason string, f
 			return fmt.Errorf("confirmation requise")
 		}
 
+		cancelMsg := reason
+		if cancelMsg == "Annulation par le client" {
+			cancelMsg = ""
+		}
 		result := tx.Exec(`
 			UPDATE commandes
-			SET status = 'cancelled', updated_at = CURRENT_TIMESTAMP
-			WHERE id = ? AND status = ? AND username = ?`, commandID, cmdResult.Status, username)
+			SET status = 'cancelled', cancel_reason = ?, updated_at = CURRENT_TIMESTAMP
+			WHERE id = ? AND status = ? AND username = ?`, cancelMsg, commandID, cmdResult.Status, username)
 		if result.Error != nil {
 			return result.Error
 		}
@@ -87,13 +91,20 @@ func (d *Database) CancelCommandAtomic(commandID int, username, reason string, f
 			log.Printf("✅ [CancelAtomic] Stock remboursé")
 		}
 
+		if err := tx.Exec(`
+			UPDATE clients
+			SET cancellations_count = COALESCE(cancellations_count, 0) + 1,
+			    updated_at = CURRENT_TIMESTAMP
+			WHERE username = ?`, username).Error; err != nil {
+			log.Printf("⚠️ [CancelAtomic] Erreur incrémentation count: %v", err)
+		}
+
 		if isLateCancel {
 			log.Printf("⚠️ [CancelAtomic] Annulation tardive confirmée - Application pénalité")
 			penalty, _ = d.CalculateCancellationPenalty(username)
 			if err := tx.Exec(`
 				UPDATE clients
 				SET amende = amende + ?,
-				    cancellations_count = COALESCE(cancellations_count, 0) + 1,
 				    updated_at = CURRENT_TIMESTAMP
 				WHERE username = ?`, penalty, username).Error; err != nil {
 				log.Printf("❌ [CancelAtomic] Erreur pénalité: %v", err)
@@ -250,7 +261,7 @@ func (d *Database) GetCommandPositionInQueue(livreurUsername string, commandID i
 
 func (d *Database) GetCancelledCommands(username string, limit int) ([]map[string]any, error) {
 	query := `
-		SELECT id, client_order_id AS client_order_number, username, status, adresse, total_prix::float8 as total_prix, created_at, updated_at
+		SELECT id, client_order_id AS client_order_number, username, status, adresse, total_prix::float8 as total_prix, created_at, updated_at, COALESCE(cancel_reason, '') AS cancel_reason
 		FROM commandes
 		WHERE status = 'cancelled'`