add tests for POST term & insert site_user

Author: EarthenSky

src/auth/crud.py

@@ -101,6 +101,15 @@ async def get_site_user(db_session: AsyncSession, session_id: str) -> None | Sit
     )
 
 
+async def site_user_exists(db_session: AsyncSession, computing_id: str) -> bool:
+    user = await db_session.scalar(
+        sqlalchemy
+        .select(SiteUser)
+        .where(SiteUser.computing_id == computing_id)
+    )
+    return user is not None
+
+
 # update the optional user info for a given site user (e.g., display name, profile picture, ...)
 async def update_site_user(
     db_session: AsyncSession,

src/officers/crud.py

@@ -1,8 +1,11 @@
 import logging
+from datetime import datetime
 
 import sqlalchemy
 from fastapi import HTTPException
 
+import auth.crud
+import auth.tables
 import database
 import utils
 from data import semesters
@@ -157,6 +160,14 @@ async def create_new_officer_info(
     new_officer_info: OfficerInfo
 ) -> bool:
     """Return False if the officer already exists & don't do anything."""
+    if not await auth.crud.site_user_exists(db_session, new_officer_info.computing_id):
+        # if computing_id has not been created as a site_user yet, add them
+        db_session.add(auth.tables.SiteUser(
+            computing_id=new_officer_info.computing_id,
+            first_logged_in=datetime.now(),
+            last_logged_in=datetime.now()
+        ))
+
     existing_officer_info = await db_session.scalar(
         sqlalchemy
         .select(OfficerInfo)

src/officers/urls.py

@@ -2,6 +2,7 @@
 
 from fastapi import APIRouter, Body, HTTPException, Request
 from fastapi.responses import JSONResponse, PlainTextResponse
+from sqlalchemy.exc import IntegrityError
 
 import auth.crud
 import database
@@ -166,6 +167,8 @@ async def new_officer_term(
     await WebsiteAdmin.has_permission_or_raise(db_session, session_computing_id)
 
     for officer_info in officer_info_list:
+        # if user with officer_info.computing_id has never logged into the website before,
+        # a site_user tuple will be created for them.
         await officers.crud.create_new_officer_info(db_session, OfficerInfo(
             computing_id = officer_info.computing_id,
             # TODO (#71): use sfu api to get legal name from officer_info.computing_id

tests/integration/test_officers.py

@@ -1,4 +1,5 @@
 import asyncio  # NOTE: don't comment this out; it's required
+import json
 
 import pytest
 from httpx import ASGITransport, AsyncClient
@@ -120,11 +121,21 @@ async def test__endpoints(client, database_setup):
     response = await client.get(f"/officers/info/{load_test_db.SYSADMIN_COMPUTING_ID}")
     assert response.status_code == 401
 
-    # TODO: this
-    response = await client.post("officers/term/abc11")
+    response = await client.post("officers/term", content=json.dumps([{
+        "computing_id": "ehbc12",
+        "position": OfficerPosition.DIRECTOR_OF_MULTIMEDIA,
+        "start_date": "2025-12-29"
+    }]))
+    assert response.status_code == 401
+
+    response = await client.post("officers/term", content=json.dumps([{
+        "computing_id": "ehbc12",
+        "position": "balargho",
+        "start_date": "2025-12-29"
+    }]))
+    assert response.status_code == 400
 
     # TODO: add tests for the POST & PATCH commands
-    # TODO: ensure that the database is being reset every time!
 
 @pytest.mark.anyio
 async def test__endpoints_admin(client, database_setup):
@@ -169,4 +180,20 @@ async def test__endpoints_admin(client, database_setup):
     response = await client.get("/officers/info/balargho")
     assert response.status_code == 404
 
+    response = await client.get("/officers/terms/ehbc12?include_future_terms=true")
+    assert response.status_code == 200
+    assert response.json() == []
+
+    response = await client.post("officers/term", content=json.dumps([{
+        "computing_id": "ehbc12",
+        "position": OfficerPosition.DIRECTOR_OF_MULTIMEDIA,
+        "start_date": "2025-12-29"
+    }]))
+    assert response.status_code == 200
+
+    response = await client.get("/officers/terms/ehbc12?include_future_terms=true")
+    assert response.status_code == 200
+    assert response.json() != []
+    assert len(response.json()) == 1
+
     # TODO: ensure that all endpoints are tested at least once