fix: all test_endpoint tests work

Author: jbriones1

src/elections/models.py

@@ -41,7 +41,7 @@ class ElectionResponse(BaseModel):
 class ElectionParams(BaseModel):
     slug: str
     name: str
-    type: ElectionTypeEnum
+    type: ElectionTypeEnum | None = None
     datetime_start_nominations: str
     datetime_start_voting: str
     datetime_end_voting: str
@@ -56,15 +56,16 @@ class ElectionUpdateParams(BaseModel):
     available_positions: list[str] | None = None
     survey_link: str | None = None
 
-class RegistrationParams(BaseModel):
+class NomineeApplicationParams(BaseModel):
     election_name: str
     computing_id: str
     position: OfficerPositionEnum
 
-class RegistrationUpdateParams(RegistrationParams):
+class NomineeApplicationUpdateParams(BaseModel):
+    position: OfficerPositionEnum | None = None
     speech: str | None = None
 
-class RegistrantModel(BaseModel):
+class NomineeApplicationModel(BaseModel):
     computing_id: str
     nominee_election: str
     position: str

src/elections/tables.py

@@ -17,7 +17,13 @@
     DISCORD_NICKNAME_LEN,
 )
 from database import Base
-from elections.models import ElectionStatusEnum, ElectionUpdateParams
+from elections.models import (
+    ElectionStatusEnum,
+    ElectionUpdateParams,
+    NomineeApplicationUpdateParams,
+    NomineeUpdateParams,
+)
+from officers.types import OfficerPositionEnum
 
 MAX_ELECTION_NAME = 64
 MAX_ELECTION_SLUG = 64
@@ -163,7 +169,7 @@ class NomineeApplication(Base):
 
     computing_id: Mapped[str] = mapped_column(ForeignKey("election_nominee_info.computing_id"), primary_key=True)
     nominee_election: Mapped[str] = mapped_column(ForeignKey("election.slug"), primary_key=True)
-    position: Mapped[str] = mapped_column(String(64), primary_key=True)
+    position: Mapped[OfficerPositionEnum] = mapped_column(String(64), primary_key=True)
 
     speech: Mapped[str | None] = mapped_column(Text)
 
@@ -189,3 +195,9 @@ def to_update_dict(self) -> dict:
             "speech": self.speech,
         }
 
+    def update_from_params(self, params: NomineeApplicationUpdateParams):
+        update_data = params.model_dump(exclude_unset=True)
+        for k, v in update_data.items():
+            setattr(self, k, v)
+
+

src/elections/urls.py

@@ -14,11 +14,11 @@
     ElectionStatusEnum,
     ElectionTypeEnum,
     ElectionUpdateParams,
+    NomineeApplicationModel,
+    NomineeApplicationParams,
+    NomineeApplicationUpdateParams,
     NomineeInfoModel,
     NomineeUpdateParams,
-    RegistrantModel,
-    RegistrationParams,
-    RegistrationUpdateParams,
 )
 from elections.tables import Election, NomineeApplication, NomineeInfo
 from officers.constants import COUNCIL_REP_ELECTION_POSITIONS, GENERAL_ELECTION_POSITIONS
@@ -349,7 +349,7 @@ async def update_election(
     election = await elections.crud.get_election(db_session, slugified_name)
     if election is None:
         raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail="couldn't find updated election")
-    return JSONResponse(election.private_details(current_time))
+    return JSONResponse(election.private_details(datetime.now()))
 
 @router.delete(
     "/{election_name:str}",
@@ -384,7 +384,7 @@ async def delete_election(
 @router.get(
     "/registration/{election_name:str}",
     description="get all the registrations of a single election",
-    response_model=list[RegistrantModel],
+    response_model=list[NomineeApplicationModel],
     responses={
         401: { "description": "Not logged in", "model": DetailModel },
         404: { "description": "Election with slug does not exist", "model": DetailModel }
@@ -415,7 +415,7 @@ async def get_election_registrations(
 @router.post(
     "/register",
     description="Register for a specific position in this election, but doesn't set a speech. Returns the created entry.",
-    response_model=RegistrantModel,
+    response_model=NomineeApplicationModel,
     responses={
         400: { "description": "Bad request", "model": DetailModel },
         401: { "description": "Not logged in", "model": DetailModel },
@@ -427,7 +427,7 @@ async def get_election_registrations(
 async def register_in_election(
     request: Request,
     db_session: database.DBSession,
-    body: RegistrationParams,
+    body: NomineeApplicationParams,
 ):
     await admin_or_raise(request, db_session)
 
@@ -493,9 +493,9 @@ async def register_in_election(
     return registrant
 
 @router.patch(
-    "/registration/{election_name:str}/{computing_id:str}",
+    "/registration/{election_name:str}/{position:str}/{computing_id:str}",
     description="update the application of a specific registrant and return the changed entry",
-    response_model=RegistrantModel,
+    response_model=NomineeApplicationModel,
     responses={
         400: { "description": "Bad request", "model": DetailModel },
         401: { "description": "Not logged in", "model": DetailModel },
@@ -507,9 +507,10 @@ async def register_in_election(
 async def update_registration(
     request: Request,
     db_session: database.DBSession,
-    body: RegistrationUpdateParams,
+    body: NomineeApplicationUpdateParams,
     election_name: str,
     computing_id: str,
+    position: OfficerPositionEnum
 ):
     await admin_or_raise(request, db_session)
 
@@ -528,18 +529,22 @@ async def update_registration(
         )
 
     # self updates can only be done during nomination period. Officer updates can be done whenever
-    elif election.status(datetime.now()) != ElectionStatusEnum.NOMINATIONS:
+    if election.status(datetime.now()) != ElectionStatusEnum.NOMINATIONS:
         raise HTTPException(
             status_code=status.HTTP_400_BAD_REQUEST,
             detail="speeches can only be updated during the nomination period"
         )
 
-    elif not await elections.crud.get_all_registrations_of_user(db_session, computing_id, slugified_name):
+    registration = await elections.crud.get_one_registration_in_election(db_session, computing_id, slugified_name, position)
+
+    if not registration:
         raise HTTPException(
             status_code=status.HTTP_404_NOT_FOUND,
-            detail="applicant not yet registered in this election"
+            detail="no registration record found"
         )
 
+    registration.update_from_params(body)
+
     await elections.crud.update_registration(db_session, NomineeApplication(
         computing_id=computing_id,
         nominee_election=slugified_name,
@@ -549,7 +554,7 @@ async def update_registration(
     await db_session.commit()
 
     registrant = await elections.crud.get_one_registration_in_election(
-        db_session, body.computing_id, slugified_name, body.position
+        db_session, registration.computing_id, slugified_name, body.position
     )
     if not registrant:
         raise HTTPException(

src/load_test_db.py

@@ -12,8 +12,8 @@
 # tables, or the current python context will not be able to find them & they won't be loaded
 from auth.crud import create_user_session, update_site_user
 from database import SQLALCHEMY_TEST_DATABASE_URL, Base, DatabaseSessionManager
-from elections.crud import create_election, create_nominee_info, update_election
-from elections.tables import Election, NomineeInfo
+from elections.crud import add_registration, create_election, create_nominee_info, update_election
+from elections.tables import Election, NomineeApplication, NomineeInfo
 from officers.constants import OfficerPosition
 from officers.crud import (
     create_new_officer_info,
@@ -364,6 +364,15 @@ async def load_test_elections_data(db_session: AsyncSession):
     ))
     await db_session.commit()
 
+async def load_test_election_nominee_application_data(db_session: AsyncSession):
+    await add_registration(db_session, NomineeApplication(
+        computing_id=SYSADMIN_COMPUTING_ID,
+        nominee_election="test-election-2",
+        position="vice-president",
+        speech=None
+    ))
+    await db_session.commit()
+
 # ----------------------------------------------------------------- #
 
 async def async_main(sessionmanager):
@@ -373,6 +382,7 @@ async def async_main(sessionmanager):
         await load_test_officers_data(db_session)
         await load_sysadmin(db_session)
         await load_test_elections_data(db_session)
+        await load_test_election_nominee_application_data(db_session)
 
 if __name__ == "__main__":
     response = input(f"This will reset the {SQLALCHEMY_TEST_DATABASE_URL} database, are you okay with this? (y/N): ")

tests/integration/test_elections.py

@@ -127,24 +127,24 @@ async def test_endpoints(client, database_setup):
     })
     assert response.status_code == 401 # unauthorized access to register candidates
 
-    response = await client.patch(f"/elections/{election_name}",  params={
+    response = await client.patch(f"/elections/{election_name}", json={
         "type": "general_election",
         "datetime_start_nominations": "2025-08-18T09:00:00Z",
         "datetime_start_voting": "2025-09-03T09:00:00Z",
         "datetime_end_voting": "2025-09-18T23:59:59Z",
-        "available_positions": "president,treasurer",
+        "available_positions": ["president", "treasurer"],
         "survey_link": "https://youtu.be/dQw4w9WgXcQ?si=kZROi2tu-43MXPM5"
 
     })
     assert response.status_code == 401
 
-    response = await client.patch(f"/elections/registration/{election_name}/pkn4", params={
+    response = await client.patch(f"/elections/registration/{election_name}/vice-president/{load_test_db.SYSADMIN_COMPUTING_ID}", json={
         "position": "president",
         "speech": "I would like to run for president because I'm the best in Valorant at SFU."
     })
     assert response.status_code == 401
 
-    response = await client.put("/elections/nominee/info", params={
+    response = await client.patch("/elections/nominee/jdo12", json={
         "full_name": "John Doe VI",
         "linked_in": "linkedin.com/john-doe-vi",
         "instagram": "john_vi",
@@ -156,7 +156,7 @@ async def test_endpoints(client, database_setup):
     response = await client.delete(f"/elections/{election_name}")
     assert response.status_code == 401
 
-    response = await client.delete(f"/elections/registration/{election_name}/president")
+    response = await client.delete(f"/elections/registration/{election_name}/vice-president/{load_test_db.SYSADMIN_COMPUTING_ID}")
     assert response.status_code == 401
 
 
@@ -190,7 +190,7 @@ async def test_endpoints_admin(client, database_setup):
     assert response.status_code == 200
 
     # ensure that authorized users can create an election
-    response = await client.post("/elections/testElection4", params={
+    response = await client.post("/elections/testElection4", json={
         "election_type": "general_election",
         "datetime_start_nominations": (datetime.now() - timedelta(days=1)).isoformat(),
         "datetime_start_voting": (datetime.now() + timedelta(days=7)).isoformat(),
@@ -200,7 +200,7 @@ async def test_endpoints_admin(client, database_setup):
     })
     assert response.status_code == 200
     # ensure that user can create elections without knowing each position type
-    response = await client.post("/elections/byElection4", params={
+    response = await client.post("/elections/byElection4", json={
         "election_type": "by_election",
         "datetime_start_nominations": (datetime.now() - timedelta(days=1)).isoformat(),
         "datetime_start_voting": (datetime.now() + timedelta(days=7)).isoformat(),
@@ -210,7 +210,7 @@ async def test_endpoints_admin(client, database_setup):
     assert response.status_code == 200
 
     # try creating an invalid election name
-    response = await client.post("/elections/list", params={
+    response = await client.post("/elections/list", json={
         "election_type": "by_election",
         "datetime_start_nominations": (datetime.now() - timedelta(days=1)).isoformat(),
         "datetime_start_voting": (datetime.now() + timedelta(days=7)).isoformat(),
@@ -223,21 +223,21 @@ async def test_endpoints_admin(client, database_setup):
 
 
     # try to register for a past election -> should say nomination period expired
-    response = await client.post("/elections/registration/test election    1", params={
+    response = await client.post("/elections/registration/test election    1", json={
         "position": "president",
     })
     assert response.status_code == 400
     assert "nomination period" in response.json()["detail"]
 
     # try to register for an invalid position
-    response = await client.post(f"/elections/registration/{election_name}", params={
+    response = await client.post(f"/elections/registration/{election_name}", json={
         "position": "CEO",
     })
     assert response.status_code == 400
     assert "invalid position" in response.json()["detail"]
 
     # try to register in an unknown election
-    response = await client.post("/elections/registration/unknownElection12345", params={
+    response = await client.post("/elections/registration/unknownElection12345", json={
         "position": "president",
     })
     assert response.status_code == 404
@@ -246,7 +246,7 @@ async def test_endpoints_admin(client, database_setup):
 
 
     # register for an election correctly
-    response = await client.post(f"/elections/registration/{election_name}", params={
+    response = await client.post(f"/elections/registration/{election_name}", json={
         "position": "president",
     })
     assert response.status_code == 200
@@ -255,14 +255,14 @@ async def test_endpoints_admin(client, database_setup):
     assert response.status_code == 200
 
     # duplicate registration
-    response = await client.post(f"/elections/registration/{election_name}", params={
+    response = await client.post(f"/elections/registration/{election_name}", json={
         "position": "president",
     })
     assert response.status_code == 400
     assert "registered" in response.json()["detail"]
 
     # update the above election
-    response = await client.patch("/elections/testElection4", params={
+    response = await client.patch("/elections/testElection4", json={
         "election_type": "general_election",
         "datetime_start_nominations": (datetime.now() - timedelta(days=1)).isoformat(),
         "datetime_start_voting": (datetime.now() + timedelta(days=7)).isoformat(),
@@ -273,14 +273,14 @@ async def test_endpoints_admin(client, database_setup):
     assert response.status_code == 200
 
     # update the registration
-    response = await client.patch(f"/elections/registration/{election_name}/pkn4", params={
+    response = await client.patch(f"/elections/registration/{election_name}/pkn4", json={
         "position": "president",
         "speech": "Vote for me as treasurer"
     })
     assert response.status_code == 200
 
     # try updating a non-registered election
-    response = await client.patch("/elections/registration/testElection4/pkn4", params={
+    response = await client.patch("/elections/registration/testElection4/pkn4", json={
         "position": "president",
         "speech": "Vote for me as president, I am good at valorant."
     })
@@ -299,7 +299,7 @@ async def test_endpoints_admin(client, database_setup):
     assert response.status_code == 200
 
     # update nominee info
-    response = await client.put("/elections/nominee/info", params={
+    response = await client.put("/elections/nominee/info", json={
         "full_name": "Puneet N",
         "linked_in": "linkedin.com/not-my-linkedin",
     })