working version

backend/api/routers/events.py

@@ -1,5 +1,5 @@
 from fastapi import APIRouter, Depends, HTTPException, status
-from sqlalchemy.orm import Session
+from sqlalchemy.orm import Session, joinedload
 from typing import List
 from datetime import datetime
 from config.database import get_db
@@ -64,7 +64,7 @@ async def get_events(
     upcoming: bool = None
 ):
     """Get all events, optionally filtered by upcoming status."""
-    query = db.query(Event)
+    query = db.query(Event).options(joinedload(Event.creator))
     
     if upcoming is True:
         # Only upcoming events
@@ -83,7 +83,7 @@ async def get_upcoming_events(
     current_user: User = Depends(get_current_active_user)
 ):
     """Get only upcoming events."""
-    events = db.query(Event).filter(
+    events = db.query(Event).options(joinedload(Event.creator)).filter(
         Event.date >= datetime.utcnow()
     ).order_by(Event.date).all()
     return [format_event_response(event, db) for event in events]
@@ -94,7 +94,7 @@ async def get_past_events(
     current_user: User = Depends(get_current_active_user)
 ):
     """Get only past events."""
-    events = db.query(Event).filter(
+    events = db.query(Event).options(joinedload(Event.creator)).filter(
         Event.date < datetime.utcnow()
     ).order_by(Event.date.desc()).all()
     return [format_event_response(event, db) for event in events]
@@ -204,6 +204,9 @@ def format_event_response(event: Event, db: Session) -> dict:
     participations = []
     present_count = absent_count = maybe_count = pending_count = 0
     
+    # Get creator user directly
+    creator = db.query(User).filter(User.id == event.creator_id).first()
+    
     for p in event.participations:
         user = db.query(User).filter(User.id == p.user_id).first()
         participations.append({
@@ -235,7 +238,8 @@ def format_event_response(event: Event, db: Session) -> dict:
         "cover_image": event.cover_image,
         "created_at": event.created_at,
         "updated_at": event.updated_at,
-        "creator_name": event.creator.full_name,
+        "creator_name": creator.full_name if creator else "Unknown",
+        "creator_avatar": creator.avatar_url if creator else None,
         "participations": participations,
         "present_count": present_count,
         "absent_count": absent_count,