refactor(#11): Integra listagem de usuários no dashboard

routes/admin.py

@@ -6,14 +6,28 @@ from sqlalchemy.orm import joinedload
 import pyotp
 from werkzeug.security import generate_password_hash
 import secrets
+from functools import wraps
+from sqlalchemy.exc import SQLAlchemyError
+import logging
+
+logger = logging.getLogger(__name__)
 
 admin_bp = Blueprint('admin', __name__, url_prefix='/admin')
 
+def admin_required(f):
+    @wraps(f)
+    def decorated_function(*args, **kwargs):
+        if not current_user.is_admin:
+            flash('Acesso não autorizado.', 'danger')
+            return redirect(url_for('main.index'))
+        return f(*args, **kwargs)
+    return decorated_function
+
 @admin_bp.route('/')
 @login_required
-@require_role('ADMIN')
+@admin_required
 def dashboard():
-    """Dashboard principal da área administrativa"""
+    """Dashboard principal da área administrativa com lista de usuários"""
     db = get_db_connection()
     try:
         # Carregar estatísticas relevantes
@@ -21,27 +35,27 @@ def dashboard():
         active_users = db.query(Usuario).filter(Usuario.is_active == True).count()
         inactive_users = total_users - active_users
         
-        return render_template(
-            'admin/dashboard.html',
-            total_users=total_users,
-            active_users=active_users,
-            inactive_users=inactive_users
-        )
-    finally:
-        db.close()
-
-@admin_bp.route('/users')
-@login_required
-@require_role('ADMIN')
-def list_users():
-    """Lista todos os usuários do sistema"""
-    db = get_db_connection()
-    try:
+        # Carregar lista de usuários
         users = db.query(Usuario).options(
             joinedload(Usuario.roles),
             joinedload(Usuario.militante)
         ).all()
-        return render_template('admin/users.html', users=users)
+        
+        return render_template(
+            'admin/dashboard.html',
+            total_users=total_users,
+            active_users=active_users,
+            inactive_users=inactive_users,
+            users=users
+        )
+    except SQLAlchemyError as e:
+        logger.error(f"Erro ao buscar dados do dashboard: {str(e)}")
+        flash('Erro ao carregar dados. Por favor, tente novamente.', 'danger')
+        return render_template('admin/dashboard.html',
+                            total_users=0,
+                            active_users=0,
+                            inactive_users=0,
+                            users=[])
     finally:
         db.close()
 
@@ -55,14 +69,14 @@ def reset_user_otp(user_id):
         user = db.query(Usuario).get(user_id)
         if not user:
             flash('Usuário não encontrado.', 'danger')
-            return redirect(url_for('admin.list_users'))
+            return redirect(url_for('admin.dashboard'))
         
         # Gerar novo segredo OTP
         user.otp_secret = pyotp.random_base32()
         db.commit()
         
         flash(f'OTP resetado com sucesso para {user.email}.', 'success')
-        return redirect(url_for('admin.list_users'))
+        return redirect(url_for('admin.dashboard'))
     finally:
         db.close()
 
@@ -76,7 +90,7 @@ def reset_user_password(user_id):
         user = db.query(Usuario).get(user_id)
         if not user:
             flash('Usuário não encontrado.', 'danger')
-            return redirect(url_for('admin.list_users'))
+            return redirect(url_for('admin.dashboard'))
         
         # Gerar nova senha aleatória
         new_password = secrets.token_urlsafe(8)
@@ -84,7 +98,7 @@ def reset_user_password(user_id):
         db.commit()
         
         flash(f'Senha resetada com sucesso. Nova senha: {new_password}', 'success')
-        return redirect(url_for('admin.list_users'))
+        return redirect(url_for('admin.dashboard'))
     finally:
         db.close()