chore: add new features

2026-03-05 19:09:16 +01:00
parent 532584edb2
commit 5ca480ea0b
23 changed files with 695 additions and 284 deletions
@@ -1000,3 +1000,94 @@ func (d *Database) ApproveDeliveryAtomic(commandID int, username string) (int, e

 	return totalPoints, nil
 }
+
+// ApproveDeliveryAtomicByStaff - Confirmation de réception par admin ou cabine à la place du client
+func (d *Database) ApproveDeliveryAtomicByStaff(commandID int, staffUsername string) (int, 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(&currentStatus, &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, 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, clientUsername, nil
+}