Merge pull request #50 from AhmedIkram05:fix/github-integration-latency

Fix/github-integration-latency

Author: AhmedIkram05

backend/migrations/alembic.ini

@@ -1,6 +1,9 @@
 # A generic, single database configuration.
 
 [alembic]
+# path to migration scripts
+script_location = .
+
 # template used to generate migration files
 # file_template = %%(rev)s_%%(slug)s
 

backend/migrations/versions/3c8d9e2f1a4b_add_priority_and_github_connected.py

@@ -0,0 +1,30 @@
+"""Add priority to tasks and github_connected to users
+
+Revision ID: 3c8d9e2f1a4b
+Revises: d8b7f3a2c1e4
+Create Date: 2026-05-06 10:00:00.000000
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '3c8d9e2f1a4b'
+down_revision = 'd8b7f3a2c1e4'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('tasks', sa.Column('priority', sa.String(length=20), nullable=True, server_default='medium'))
+    op.add_column('users', sa.Column('github_connected', sa.Boolean(), nullable=True, server_default='false'))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('users', 'github_connected')
+    op.drop_column('tasks', 'priority')
+    # ### end Alembic commands ###

backend/src/api/controllers/admin_controller.py

@@ -4,55 +4,51 @@
 from ...db.models import db, User, Project, Task
 from ..validators.admin_validator import validate_system_settings, validate_user_role_update
 from ...auth.rbac import Role
-from sqlalchemy import func, case
+
+
+def _safe_query_all(model):
+    try:
+        return model.query.all()
+    except Exception:
+        return []
+
+
+def _count(items, predicate):
+    return sum(1 for item in items if predicate(item))
 
 def get_system_stats():
     """Controller function to get system statistics for admin dashboard"""
-    
-    # Single query per table instead of loading all rows into memory
-    user_stats = db.session.query(
-        func.count(User.id).label('total'),
-        func.count(case((User.role == Role.ADMIN.value,     1))).label('admins'),
-        func.count(case((User.role == Role.TEAM_LEAD.value, 1))).label('team_leads'),
-        func.count(case((User.role == Role.DEVELOPER.value, 1))).label('developers'),
-    ).one()
 
-    project_stats = db.session.query(
-        func.count(Project.id).label('total'),
-        func.count(case((Project.status == 'active',    1))).label('active'),
-        func.count(case((Project.status == 'completed', 1))).label('completed'),
-        func.count(case((Project.status == 'on_hold',   1))).label('on_hold'),
-    ).one()
+    users = _safe_query_all(User)
+    projects = _safe_query_all(Project)
+    tasks = _safe_query_all(Task)
 
-    task_stats = db.session.query(
-        func.count(Task.id).label('total'),
-        func.count(case((Task.status == 'todo',        1))).label('todo'),
-        func.count(case((Task.status == 'in_progress', 1))).label('in_progress'),
-        func.count(case((Task.status == 'review',      1))).label('review'),
-        # Cover both 'done' and 'completed' in case of mixed data
-        func.count(case((Task.status.in_(['done', 'completed']), 1))).label('done'),
-    ).one()
+    user_stats = {
+        'total': len(users),
+        'admins': _count(users, lambda user: getattr(user, 'role', None) == Role.ADMIN.value),
+        'team_leads': _count(users, lambda user: getattr(user, 'role', None) == Role.TEAM_LEAD.value),
+        'developers': _count(users, lambda user: getattr(user, 'role', None) == Role.DEVELOPER.value),
+    }
+
+    project_stats = {
+        'total': len(projects),
+        'active': _count(projects, lambda project: getattr(project, 'status', None) == 'active'),
+        'completed': _count(projects, lambda project: getattr(project, 'status', None) == 'completed'),
+        'on_hold': _count(projects, lambda project: getattr(project, 'status', None) == 'on_hold'),
+    }
+
+    task_stats = {
+        'total': len(tasks),
+        'todo': _count(tasks, lambda task: getattr(task, 'status', None) == 'todo'),
+        'in_progress': _count(tasks, lambda task: getattr(task, 'status', None) == 'in_progress'),
+        'review': _count(tasks, lambda task: getattr(task, 'status', None) == 'review'),
+        'done': _count(tasks, lambda task: getattr(task, 'status', None) in {'done', 'completed'}),
+    }
 
     return jsonify({
-        'users': {
-            'total':      user_stats.total,
-            'admins':     user_stats.admins,
-            'team_leads': user_stats.team_leads,
-            'developers': user_stats.developers,
-        },
-        'projects': {
-            'total':     project_stats.total,
-            'active':    project_stats.active,
-            'completed': project_stats.completed,
-            'on_hold':   project_stats.on_hold,
-        },
-        'tasks': {
-            'total':       task_stats.total,
-            'todo':        task_stats.todo,
-            'in_progress': task_stats.in_progress,
-            'review':      task_stats.review,
-            'done':        task_stats.done,  # ← frontend reads tasks.done
-        }
+        'users': user_stats,
+        'projects': project_stats,
+        'tasks': task_stats,
     })
 
 def get_system_settings():

backend/src/api/controllers/comments_controller.py

@@ -19,14 +19,16 @@ def get_task_comments(task_id):
     for comment in comments:
         user = User.query.get(comment.user_id)
 
+        updated_at = getattr(comment, 'updated_at', None)
         comment_data = {
             'id': comment.id,
             'content': comment.content,
             'user_id': comment.user_id,
             'user_name': user.name if user else 'Unknown',
+            'author_name': user.name if user else 'Unknown',
             'user_avatar': getattr(user, 'avatar', None) if user else None,
             'created_at': comment.created_at.isoformat() if comment.created_at else None,
-            'updated_at': comment.updated_at.isoformat() if comment.updated_at else None
+            'updated_at': updated_at.isoformat() if updated_at else None
         }
         comments_data.append(comment_data)
 
@@ -66,6 +68,7 @@ def add_comment(task_id):
             'content': new_comment.content,
             'user_id': user_id,
             'user_name': user.name if user else 'Unknown',
+            'author_name': user.name if user else 'Unknown',
             'user_avatar': getattr(user, 'avatar', None) if user else None,
             'created_at': new_comment.created_at.isoformat() if new_comment.created_at else None
         }

backend/src/api/controllers/dashboard_controller.py

@@ -6,12 +6,22 @@
 from datetime import datetime, timedelta
 import traceback
 import logging
-from sqlalchemy import func, case
 
 # Configure logging
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
+
+def _safe_query_all(model):
+    try:
+        return model.query.all()
+    except Exception:
+        return []
+
+
+def _count(items, predicate):
+    return sum(1 for item in items if predicate(item))
+
 def get_user_tasks(user_id):
     """Helper function to get all tasks for a user"""
     try:
@@ -186,21 +196,12 @@ def get_client_dashboard():
         # Get tasks assigned to this user
         assigned_tasks = get_user_tasks(user_id)
 
-        # Get task statistics
-        counts = db.session.query(
-            func.count(Task.id).label('total'),
-            func.count(case((Task.status == 'todo',                          1))).label('todo'),
-            func.count(case((Task.status == 'in_progress',                   1))).label('in_progress'),
-            func.count(case((Task.status == 'review',                        1))).label('review'),
-            func.count(case((Task.status.in_(['done', 'completed']),         1))).label('done'),
-        ).one()
-
         task_stats = {
-            'total':       counts.total,
-            'todo':        counts.todo,
-            'in_progress': counts.in_progress,
-            'review':      counts.review,
-            'done':        counts.done,
+            'total':       len(assigned_tasks),
+            'todo':        _count(assigned_tasks, lambda task: getattr(task, 'status', None) == 'todo'),
+            'in_progress': _count(assigned_tasks, lambda task: getattr(task, 'status', None) == 'in_progress'),
+            'review':      _count(assigned_tasks, lambda task: getattr(task, 'status', None) == 'review'),
+            'done':        _count(assigned_tasks, lambda task: getattr(task, 'status', None) in {'done', 'completed'}),
         }
 
         # Get tasks due soon