Fixed issue push

src/crud/__init__.py

@@ -23,6 +23,7 @@ from .users import (
     get_user_by_id,
     delete_user,
     hash_password,  # Import hash_password from users module
+    get_all_users
 )
 from .devices import (
     get_device_by_id_str,
@@ -35,11 +36,14 @@ from .clearance import (
     get_clearance_statuses_by_student_id,
     update_clearance_status,
     delete_clearance_status,
+    get_all_clearance_status,
+    get_student_clearance_status
 )
 from .tag_linking import (
     create_pending_tag_link,
-    get_pending_link_by_device,
-    delete_pending_link,
+    get_pending_link_by_id,
+    delete_pending_link_by_device_id,
+    get_pending_links,
 )
 
 # Export all functions
@@ -52,6 +56,7 @@ __all__ = [
     'get_user_by_id',
     'delete_user',
     'hash_password',
+    'get_all_users',
     # Students
     'create_student',
     'get_all_students',
@@ -71,6 +76,8 @@ __all__ = [
     'delete_clearance_status',
     # Tag Linking
     'create_pending_tag_link',
-    'get_pending_link_by_device',
-    'delete_pending_link',
+    'get_pending_link_by_device_id',
+    'get_pending_link_by_token',
+    'delete_pending_link_by_id',
+    'get_all_pending_links',
 ]

src/crud/clearance.py

@@ -75,3 +75,28 @@ def delete_clearance_status(
         db.commit()
 
     return status_to_delete
+
+
+def get_all_clearance_status(db: Session) -> list[models.ClearanceStatus]:
+    """
+    Retrieves all clearance statuses from the database.
+    
+    This function is useful for administrative purposes, allowing staff to view
+    all clearance records across all students and departments.
+    """
+    return db.query(models.ClearanceStatus).all()
+
+def get_student_clearance_status(
+    db: Session,
+    student_id: str,
+    department: models.ClearanceDepartment
+) -> models.ClearanceStatus | None:
+    """
+    Retrieves the clearance status for a specific student in a specific department.
+    
+    Returns None if no status exists for that student and department.
+    """
+    return db.query(models.ClearanceStatus).filter(
+        models.ClearanceStatus.student_id == student_id,
+        models.ClearanceStatus.department == department
+    ).first()

src/crud/tag_linking.py

@@ -26,16 +26,19 @@ def create_pending_tag_link(db: Session, link_details: models.PrepareTagLinkRequ
     db.refresh(new_link)
     return new_link
 
-def get_pending_link_by_device(db: Session, device_id: int) -> models.PendingTagLink | None:
+def get_pending_links(db: Session, device_id: int) -> models.PendingTagLink | None:
     """
     Fetches the active (non-expired) pending tag link for a specific device.
     """
-    return db.query(models.PendingTagLink).filter(
-        models.PendingTagLink.device_id_fk == device_id,
-        models.PendingTagLink.expires_at > datetime.utcnow()
-    ).first()
+    return db.query(models.PendingTagLink).offset(0).limit(limit=1000).all()
 
-def delete_pending_link(db: Session, link_id: int):
+def get_pending_link_by_id(db: Session, link_id: int) -> models.PendingTagLink | None:
+    """
+    Fetches a pending tag link by its ID.
+    """
+    return db.query(models.PendingTagLink).filter(models.PendingTagLink.id == link_id).first()
+
+def delete_pending_link_by_device_id(db: Session, link_id: int):
     """Deletes a pending link, typically after it has been used."""
     link_to_delete = db.query(models.PendingTagLink).filter(models.PendingTagLink.id == link_id).first()
     if link_to_delete:

src/routers/token.py

@@ -3,6 +3,7 @@ Router for handling user authentication and issuing JWT tokens.
 """
 from fastapi import APIRouter, Depends, HTTPException, status
 from fastapi.security import OAuth2PasswordRequestForm
+from fastapi.concurrency import run_in_threadpool
 from sqlalchemy.orm import Session
 from datetime import timedelta
 
@@ -13,7 +14,7 @@ from src.config import settings
 
 router = APIRouter(
     prefix="/api",
-    tags=["Authentication"]
+    tags=["Authentication Token"]
 )
 
 @router.post("/token", response_model=models.Token)
@@ -27,7 +28,9 @@ async def login_for_access_token(
     This is the primary login endpoint. It takes a username and password
     and returns an access token if the credentials are valid.
     """
-    user = await authenticate_user(db, form_data.username, form_data.password)
+    user = await run_in_threadpool(
+        authenticate_user, db, form_data.username, form_data.password
+        )
     if not user:
         raise HTTPException(
             status_code=status.HTTP_401_UNAUTHORIZED,

src/routers/users.py

@@ -2,6 +2,7 @@
 Router for managing users (staff, admins).
 """
 from fastapi import APIRouter, Depends, HTTPException, status
+from fastapi.concurrency import run_in_threadpool
 from sqlalchemy.orm import Session
 from typing import List
 
@@ -19,10 +20,10 @@ async def create_new_user(user: models.UserCreate, db: Session = Depends(get_db)
     """
     Admin: Create a new user (staff or admin).
     """
-    try:
-        return await crud.create_user(db=db, user=user)
-    except HTTPException as e:
-        raise e
+    db_user = await run_in_threadpool(crud.get_user_by_username, db, user.username)
+    if db_user:
+        raise HTTPException(status_code=400, detail="Username already registered")
+    return await run_in_threadpool(crud.create_user, db, user)
 
 @router.get("/", response_model=List[models.UserResponse], dependencies=[Depends(get_current_active_admin_user_from_token)])
 async def read_users(skip: int = 0, limit: int = 100, db: Session = Depends(get_db)):
@@ -32,9 +33,18 @@ async def read_users(skip: int = 0, limit: int = 100, db: Session = Depends(get_
     users = await crud.get_all_users(db, skip=skip, limit=limit) # Assumes get_all_users exists in crud.users
     return users
 
+@router.get("/all", response_model=list[models.UserResponse], dependencies=[Depends(get_current_active_admin_user_from_token)])
+async def get_all_users(db: Session = Depends(get_db)):
+    """
+    Admin: Get a list of all users.
+    """
+    users = await run_in_threadpool(crud.get_all_users, db)
+    return users
+
 @router.get("/me", response_model=models.UserResponse)
 async def read_users_me(current_user: models.User = Depends(get_current_active_user)):
     """
     Get profile information for the currently authenticated user.
     """
     return current_user
+