fix: removed unused imports and changed some return types

Author: jbriones1

src/elections/crud.py

@@ -1,13 +1,10 @@
-import logging
-
 import sqlalchemy
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from elections.tables import Election, NomineeApplication, NomineeInfo
 
-_logger = logging.getLogger(__name__)
 
-async def get_all_elections(db_session: AsyncSession) -> list[Election] | None:
+async def get_all_elections(db_session: AsyncSession) -> list[Election]:
     # TODO: can this return None?
     election_list = (await db_session.scalars(
         sqlalchemy

src/elections/urls.py

@@ -1,4 +1,3 @@
-import logging
 import re
 from datetime import datetime
 
@@ -7,15 +6,13 @@
 
 import database
 import elections
+import elections.crud
 import elections.tables
 from elections.tables import Election, NomineeApplication, NomineeInfo, election_types
 from officers.constants import OfficerPosition
-from officers.crud import get_active_officer_terms
 from permission.types import ElectionOfficer, WebsiteAdmin
 from utils.urls import is_logged_in
 
-_logger = logging.getLogger(__name__)
-
 router = APIRouter(
     prefix="/elections",
     tags=["elections"],
@@ -28,9 +25,9 @@ def _slugify(text: str) -> str:
 async def _validate_user(
     request: Request,
     db_session: database.DBSession,
-) -> tuple[bool, str, str]:
+) -> tuple[bool, str | None, str | None]:
     logged_in, session_id, computing_id = await is_logged_in(request, db_session)
-    if not logged_in:
+    if not logged_in or not computing_id:
         return False, None, None
 
     # where valid means elections officer or website admin
@@ -53,7 +50,7 @@ async def list_elections(
     election_list = await elections.crud.get_all_elections(db_session)
     if election_list is None or len(election_list) == 0:
         raise HTTPException(
-            status_code=status.HTTP_404_INTERNAL_SERVER_ERROR,
+            status_code=status.HTTP_404_NOT_FOUND,
             detail="no elections found"
         )
 
@@ -92,6 +89,11 @@ async def get_election(
 
         election_json = election.private_details(current_time)
         all_nominations = await elections.crud.get_all_registrations_in_election(db_session, slugified_name)
+        if not all_nominations:
+            raise HTTPException(
+                status_code=status.HTTP_404_NOT_FOUND,
+                detail="no registrations found"
+            )
         election_json["candidates"] = []
 
         available_positions_list = election.available_positions.split(",")

src/utils/urls.py

@@ -1,6 +1,7 @@
 from fastapi import HTTPException, Request
 
 import auth
+import auth.crud
 import database
 
 # TODO: move other utils into this module
@@ -23,7 +24,7 @@ async def logged_in_or_raise(
 async def is_logged_in(
     request: Request,
     db_session: database.DBSession
-) -> tuple[str | None, str | None]:
+) -> tuple[bool, str | None, str | None]:
     """gets the user's computing_id, or raises an exception if the current request is not logged in"""
     session_id = request.cookies.get("session_id", None)
     if session_id is None: