Show saved queries in tickets

app/routes/admin.py

@@ -5,6 +5,7 @@ from app.dependencies import get_current_admin_user, get_db
 from app.models.user import User
 from app.schemas.admin import AdminDepartmentUpdate, AdminUserUpdate
 from app.schemas.department import DepartmentCreate, DepartmentResponse
+from app.schemas.query import QueryRead
 from app.schemas.user import UserRead
 from app.services.admin_service import (
     create_department,
@@ -17,6 +18,7 @@ from app.services.admin_service import (
     update_department,
     update_user,
 )
+from app.services.query_service import list_all_queries
 
 
 router = APIRouter(prefix="/admin", tags=["admin"])
@@ -91,6 +93,15 @@ def admin_list_users(
     return list_users(db)
 
 
+@router.get("/queries", response_model=list[QueryRead])
+def admin_list_queries(
+    db: Session = Depends(get_db),
+    current_admin: User = Depends(get_current_admin_user),
+):
+    _ = current_admin
+    return list_all_queries(db)
+
+
 @router.get("/users/{user_id}", response_model=UserRead)
 def admin_get_user(
     user_id: int,

app/services/query_service.py

@@ -41,3 +41,12 @@ def list_queries_for_user(db: Session, *, current_user: User) -> list[Query]:
         .order_by(Query.created_at.desc(), Query.id.desc())
         .all()
     )
+
+
+def list_all_queries(db: Session) -> list[Query]:
+    return (
+        db.query(Query)
+        .options(selectinload(Query.department))
+        .order_by(Query.created_at.desc(), Query.id.desc())
+        .all()
+    )

tests/test_queries.py

@@ -7,6 +7,7 @@ from app.models.department import Department
 from app.schemas.auth import SignupRequest
 from app.schemas.query import QueryCreate
 from app.services.auth_service import create_user
+from app.services import query_service
 from app.services.query_service import create_query, list_queries_for_user
 
 
@@ -158,3 +159,47 @@ def test_list_queries_for_user_only_returns_that_users_queries():
     finally:
         db.close()
         Base.metadata.drop_all(bind=engine)
+
+
+def test_list_all_queries_returns_every_saved_query_for_admin():
+    engine, db = _make_session()
+    try:
+        finance = Department(
+            name="Finance Department",
+            code="FIN",
+            description="Handles fees, refunds, and payment plans",
+            keywords="fee, payment, tuition, refund",
+        )
+        admin = Department(
+            name="Admin",
+            code="ADMIN",
+            description="Fallback team",
+            keywords="general, other",
+        )
+        db.add_all([finance, admin])
+        db.commit()
+        db.refresh(finance)
+        db.refresh(admin)
+
+        student_one = _create_student(db, email="student1@example.com")
+        student_two = _create_student(db, email="student2@example.com")
+
+        first_query = create_query(
+            db,
+            current_user=student_one,
+            payload=QueryCreate(message="Question about tuition payment"),
+        )
+        second_query = create_query(
+            db,
+            current_user=student_two,
+            payload=QueryCreate(message="Different student's message"),
+        )
+
+        queries = query_service.list_all_queries(db)
+
+        assert [query.id for query in queries] == [second_query.id, first_query.id]
+        assert queries[0].department_id in {finance.id, admin.id}
+        assert queries[1].department_id in {finance.id, admin.id}
+    finally:
+        db.close()
+        Base.metadata.drop_all(bind=engine)