Update: Officers API

.github/workflows/pytest_unit.yml

@@ -29,6 +29,4 @@ jobs:
           pip install -r requirements.txt
 
       - name: Run unit tests
-        run: |
-          source ./venv/bin/activate
-          pytest ./tests/unit -v
+        run: PYTHONPATH=src ./venv/bin/python -m pytest ./tests/unit -v

pyproject.toml

@@ -7,12 +7,15 @@ requires-python = ">= 3.11" # older versions untested, but we use new features o
 Homepage = "https://api.sfucsss.org/"
 
 [tool.pytest.ini_options]
-pythonpath = "./src/"
+pythonpath = ["src"]
 log_cli = true
 log_cli_level = "INFO"
 testpaths = [
     "tests",
-]
+  ]
+norecursedirs = "tests/wip"
+asyncio_mode = "auto"
+asyncio_default_fixture_loop_scope = "function"
 
 [tool.ruff]
 line-length = 120

src/alembic/env.py

@@ -9,7 +9,9 @@
 import blog.tables
 import database
 import elections.tables
+import nominees.tables
 import officers.tables
+import registrations.tables
 from alembic import context
 
 # this is the Alembic Config object, which provides

src/alembic/versions/0a2c458d1ddd_site_user_timestamps_nullable.py

@@ -0,0 +1,40 @@
+"""site_user_timestamps_nullable
+
+Revision ID: 0a2c458d1ddd
+Revises: a5c42bcdda5c
+Create Date: 2025-09-28 20:52:02.486734
+
+"""
+from collections.abc import Sequence
+
+from sqlalchemy.dialects import postgresql
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "0a2c458d1ddd"
+down_revision: str | None = "a5c42bcdda5c"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column("site_user", "first_logged_in",
+               existing_type=postgresql.TIMESTAMP(),
+               nullable=True)
+    op.alter_column("site_user", "last_logged_in",
+               existing_type=postgresql.TIMESTAMP(),
+               nullable=True)
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column("site_user", "last_logged_in",
+               existing_type=postgresql.TIMESTAMP(),
+               nullable=False)
+    op.alter_column("site_user", "first_logged_in",
+               existing_type=postgresql.TIMESTAMP(),
+               nullable=False)
+    # ### end Alembic commands ###

src/alembic/versions/0c717bd88d06_elections_timestamp_datetime.py

@@ -0,0 +1,53 @@
+"""elections_timestamp_datetime
+
+Revision ID: 0c717bd88d06
+Revises: 0a2c458d1ddd
+Create Date: 2025-09-28 22:25:28.864945
+
+"""
+from collections.abc import Sequence
+from typing import Union
+
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "0c717bd88d06"
+down_revision: str | None = "0a2c458d1ddd"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column("election", "datetime_start_nominations",
+               existing_type=sa.DATE(),
+               type_=sa.DateTime(),
+               existing_nullable=False)
+    op.alter_column("election", "datetime_start_voting",
+               existing_type=sa.DATE(),
+               type_=sa.DateTime(),
+               existing_nullable=False)
+    op.alter_column("election", "datetime_end_voting",
+               existing_type=sa.DATE(),
+               type_=sa.DateTime(),
+               existing_nullable=False)
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column("election", "datetime_end_voting",
+               existing_type=sa.DateTime(),
+               type_=sa.DATE(),
+               existing_nullable=False)
+    op.alter_column("election", "datetime_start_voting",
+               existing_type=sa.DateTime(),
+               type_=sa.DATE(),
+               existing_nullable=False)
+    op.alter_column("election", "datetime_start_nominations",
+               existing_type=sa.DateTime(),
+               type_=sa.DATE(),
+               existing_nullable=False)
+    # ### end Alembic commands ###

src/alembic/versions/876041e5b41c_elections_officers_datetime_to_date.py

@@ -0,0 +1,54 @@
+"""elections-officers-datetime-to-date
+
+Revision ID: 876041e5b41c
+Revises: 243190df5588
+Create Date: 2025-09-28 18:01:03.913302
+
+"""
+from collections.abc import Sequence
+from typing import Union
+
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "876041e5b41c"
+down_revision: str | None = "243190df5588"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column("election", "datetime_start_nominations",
+               existing_type=postgresql.TIMESTAMP(),
+               type_=sa.Date(),
+               existing_nullable=False)
+    op.alter_column("election", "datetime_start_voting",
+               existing_type=postgresql.TIMESTAMP(),
+               type_=sa.Date(),
+               existing_nullable=False)
+    op.alter_column("election", "datetime_end_voting",
+               existing_type=postgresql.TIMESTAMP(),
+               type_=sa.Date(),
+               existing_nullable=False)
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column("election", "datetime_end_voting",
+               existing_type=sa.Date(),
+               type_=postgresql.TIMESTAMP(),
+               existing_nullable=False)
+    op.alter_column("election", "datetime_start_voting",
+               existing_type=sa.Date(),
+               type_=postgresql.TIMESTAMP(),
+               existing_nullable=False)
+    op.alter_column("election", "datetime_start_nominations",
+               existing_type=sa.Date(),
+               type_=postgresql.TIMESTAMP(),
+               existing_nullable=False)
+    # ### end Alembic commands ###

src/alembic/versions/a5c42bcdda5c_update_officer_term_constraint_71.py

@@ -0,0 +1,38 @@
+"""update_officer_term_constraint_71
+
+Revision ID: a5c42bcdda5c
+Revises: 876041e5b41c
+Create Date: 2025-09-28 18:03:54.856781
+
+"""
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "a5c42bcdda5c"
+down_revision: str | None = "876041e5b41c"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column("election", "type",
+               existing_type=sa.VARCHAR(length=64),
+               type_=sa.String(length=32),
+               nullable=False)
+    op.create_unique_constraint(op.f("uq_officer_term_computing_id"), "officer_term", ["computing_id", "position", "start_date"])
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_constraint(op.f("uq_officer_term_computing_id"), "officer_term", type_="unique")
+    op.alter_column("election", "type",
+               existing_type=sa.String(length=32),
+               type_=sa.VARCHAR(length=64),
+               nullable=True)
+    # ### end Alembic commands ###

src/auth/tables.py

@@ -37,16 +37,21 @@ class SiteUser(Base):
     )
 
     # first and last time logged into the CSSS API
-    first_logged_in: Mapped[datetime] = mapped_column(DateTime, nullable=False, server_default=func.now())
-    last_logged_in: Mapped[datetime] = mapped_column(DateTime, nullable=False, server_default=func.now())
+    first_logged_in: Mapped[datetime | None] = mapped_column(DateTime, nullable=True)
+    last_logged_in: Mapped[datetime | None] = mapped_column(DateTime, nullable=True)
 
     # optional user information for display purposes
     profile_picture_url: Mapped[str | None] = mapped_column(Text, nullable=True)
 
     def serialize(self) -> dict[str, str | int | bool | None]:
-        return {
+
+        res = {
             "computing_id": self.computing_id,
-            "first_logged_in": self.first_logged_in.isoformat(),
-            "last_logged_in": self.last_logged_in.isoformat(),
             "profile_picture_url": self.profile_picture_url
         }
+        if self.first_logged_in is not None:
+            res["first_logged_in"] = self.first_logged_in.isoformat()
+        if self.last_logged_in is not None:
+            res["last_logged_in"] = self.last_logged_in.isoformat()
+
+        return res

src/cron/daily.py

@@ -6,7 +6,7 @@
 import github
 import google_api
 import utils
-from database import _db_session
+from database import get_db_session
 from officers.crud import all_officers, get_user_by_username
 
 _logger = logging.getLogger(__name__)
@@ -55,7 +55,7 @@ async def update_github_permissions(db_session):
     _logger.info("updated github permissions")
 
 async def update_permissions():
-    db_session = _db_session()
+    db_session = get_db_session()
 
     update_google_permissions(db_session)
     db_session.commit()

src/database.py

@@ -102,7 +102,7 @@ def setup_database():
     # TODO: where is sys.stdout piped to? I want all these to go to a specific logs folder
     sessionmanager = DatabaseSessionManager(
         SQLALCHEMY_TEST_DATABASE_URL if os.environ.get("LOCAL") else SQLALCHEMY_DATABASE_URL,
-        { "echo": True },
+        { "echo": False },
     )
 
 @contextlib.asynccontextmanager
@@ -116,10 +116,9 @@ async def lifespan(app: FastAPI):
         await sessionmanager.close()
 
 
-async def _db_session():
+async def get_db_session():
     async with sessionmanager.session() as session:
         yield session
 
 
-# TODO: what does this do again?
-DBSession = Annotated[AsyncSession, Depends(_db_session)]
+DBSession = Annotated[AsyncSession, Depends(get_db_session)]

src/elections/tables.py

@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import date, datetime
 
 from sqlalchemy import (
     DateTime,
@@ -24,10 +24,10 @@ class Election(Base):
     # Slugs are unique identifiers
     slug: Mapped[str] = mapped_column(String(MAX_ELECTION_SLUG), primary_key=True)
     name: Mapped[str] = mapped_column(String(MAX_ELECTION_NAME), nullable=False)
-    type: Mapped[ElectionTypeEnum] = mapped_column(String(64), default=ElectionTypeEnum.GENERAL)
-    datetime_start_nominations: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False)
-    datetime_start_voting: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False)
-    datetime_end_voting: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False)
+    type: Mapped[ElectionTypeEnum] = mapped_column(String(32), default=ElectionTypeEnum.GENERAL)
+    datetime_start_nominations: Mapped[datetime] = mapped_column(DateTime, nullable=False)
+    datetime_start_voting: Mapped[datetime] = mapped_column(DateTime, nullable=False)
+    datetime_end_voting: Mapped[datetime] = mapped_column(DateTime, nullable=False)
 
     # a comma-separated string of positions which must be elements of OfficerPosition
     # By giving it the type `StringList`, the database entry will automatically be marshalled to the correct form