Fixed honorary spelling, added constant value, and other changes per PR feedback

Author: AmrajKoonar

src/alembic/env.py

@@ -7,13 +7,13 @@
 
 import auth.tables
 import blog.tables
+import candidates.tables
 import database
 import elections.tables
+import event.tables
+import honorary.tables
 import nominees.tables
 import officers.tables
-import candidates.tables
-import event.tables
-import honourary.tables
 from alembic import context
 
 # this is the Alembic Config object, which provides

src/alembic/versions/3c00f28c26e2_create_honorary_member_table.py

@@ -5,32 +5,36 @@
 Create Date: 2026-06-29 15:43:07.361827
 
 """
-from typing import Sequence, Union
 
-from alembic import op
+from collections.abc import Sequence
+from typing import Union
+
 import sqlalchemy as sa
 
+from alembic import op
+from honorary.constants import HONORARY_MEMBER_MAX_LENGTH
 
 # revision identifiers, used by Alembic.
-revision: str = '3c00f28c26e2'
-down_revision: Union[str, None] = '42f855bec532'
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
+revision: str = "3c00f28c26e2"
+down_revision: str | None = "42f855bec532"
+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.create_table('honorary_member',
-    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
-    sa.Column('name', sa.String(length=128), nullable=False),
-    sa.Column('start_date', sa.Date(), nullable=False),
-    sa.Column('end_date', sa.Date(), nullable=True),
-    sa.PrimaryKeyConstraint('id', name=op.f('pk_honorary_member'))
+    op.create_table(
+        "honorary_member",
+        sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
+        sa.Column("name", sa.String(length=HONORARY_MEMBER_MAX_LENGTH), nullable=False),
+        sa.Column("start_date", sa.Date(), nullable=False),
+        sa.Column("end_date", sa.Date(), nullable=True),
+        sa.PrimaryKeyConstraint("id", name=op.f("pk_honorary_member")),
     )
     # ### end Alembic commands ###
 
 
 def downgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_table('honorary_member')
+    op.drop_table("honorary_member")
     # ### end Alembic commands ###

src/honorary/constants.py

@@ -0,0 +1 @@
+HONORARY_MEMBER_MAX_LENGTH = 128

src/honourary/crud.py src/honorary/crud.pysrc/honourary/crud.py renamed to src/honorary/crud.py

@@ -1,10 +1,9 @@
 from datetime import date
 
-from fastapi import HTTPException, status
 from sqlalchemy import delete, select
 
 import database
-from honourary.tables import HonoraryMemberDB
+from honorary.tables import HonoraryMemberDB
 
 
 async def get_all_honorary_members(db_session: database.DBSession) -> list[HonoraryMemberDB]:
@@ -25,34 +24,22 @@ async def get_current_honorary_members(db_session: database.DBSession) -> list[H
     return list((await db_session.scalars(query)).all())
 
 
-async def get_honorary_member_by_id_or_raise(
+async def get_honorary_member_by_id(
     db_session: database.DBSession,
     term_id: int,
-) -> HonoraryMemberDB:
-    honorary_member = await db_session.scalar(select(HonoraryMemberDB).where(HonoraryMemberDB.id == term_id))
-    if honorary_member is None:
-        raise HTTPException(
-            status_code=status.HTTP_404_NOT_FOUND,
-            detail=f"honorary member term with id={term_id} does not exist",
-        )
-    return honorary_member
+) -> HonoraryMemberDB | None:
+    return await db_session.scalar(select(HonoraryMemberDB).where(HonoraryMemberDB.id == term_id))
 
 
-def ensure_term_has_not_ended(honorary_member: HonoraryMemberDB) -> None:
-    if honorary_member.end_date is not None and honorary_member.end_date < date.today():
-        raise HTTPException(
-            status_code=status.HTTP_403_FORBIDDEN,
-            detail="cannot update or delete a term that has already ended",
-        )
+def has_term_ended(honorary_member: HonoraryMemberDB) -> bool:
+    return honorary_member.end_date is not None and honorary_member.end_date < date.today()
 
 
 async def create_honorary_members(
     db_session: database.DBSession,
     honorary_members: list[HonoraryMemberDB],
 ) -> list[HonoraryMemberDB]:
     db_session.add_all(honorary_members)
-    await db_session.flush()
-
     return honorary_members
 
 

src/honourary/models.py src/honorary/models.pysrc/honourary/models.py renamed to src/honorary/models.py

@@ -2,11 +2,12 @@
 
 from pydantic import BaseModel, ConfigDict, Field, computed_field
 
+from honorary.constants import HONORARY_MEMBER_MAX_LENGTH
 from utils import is_active_term
 
 
 class HonoraryMemberCreate(BaseModel):
-    name: str = Field(..., max_length=128)
+    name: str = Field(..., max_length=HONORARY_MEMBER_MAX_LENGTH)
     start_date: date
     end_date: date | None = None
 
@@ -23,6 +24,6 @@ def is_active(self) -> bool:
 
 
 class HonoraryMemberUpdate(BaseModel):
-    name: str | None = Field(None, max_length=128)
+    name: str | None = Field(None, max_length=HONORARY_MEMBER_MAX_LENGTH)
     start_date: date | None = None
     end_date: date | None = None

src/honourary/tables.py src/honorary/tables.pysrc/honourary/tables.py renamed to src/honorary/tables.py

@@ -4,12 +4,13 @@
 from sqlalchemy.orm import Mapped, mapped_column
 
 from database import Base
+from honorary.constants import HONORARY_MEMBER_MAX_LENGTH
 
 
 class HonoraryMemberDB(Base):
     __tablename__ = "honorary_member"
 
     id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
-    name: Mapped[str] = mapped_column(String(128), nullable=False)
+    name: Mapped[str] = mapped_column(String(HONORARY_MEMBER_MAX_LENGTH), nullable=False)
     start_date: Mapped[date] = mapped_column(Date, nullable=False)
     end_date: Mapped[date] = mapped_column(Date, nullable=True)

src/honorary/urls.py

@@ -0,0 +1,154 @@
+from fastapi import APIRouter, Depends, HTTPException, status
+from fastapi.responses import JSONResponse
+
+import database
+import honorary.crud
+from dependencies import perm_admin
+from honorary.models import HonoraryMember, HonoraryMemberCreate, HonoraryMemberUpdate
+from honorary.tables import HonoraryMemberDB
+from utils.shared_models import DetailModel, SuccessResponse
+
+router = APIRouter(
+    prefix="/honorary",
+    tags=["honorary"],
+)
+
+
+@router.get(
+    "",
+    description="Get all honorary member terms",
+    response_model=list[HonoraryMember],
+    responses={403: {"description": "must be a website admin", "model": DetailModel}},
+    operation_id="get_all_honorary_members",
+    dependencies=[Depends(perm_admin)],
+)
+async def get_all_honorary_members(db_session: database.DBSession):
+    honorary_members = await honorary.crud.get_all_honorary_members(db_session)
+    return JSONResponse(
+        [
+            HonoraryMember.model_validate(member).model_dump(mode="json", exclude_unset=True)
+            for member in honorary_members
+        ]
+    )
+
+
+@router.get(
+    "/current",
+    description="Get all active honorary member terms",
+    response_model=list[HonoraryMember],
+    responses={403: {"description": "must be a website admin", "model": DetailModel}},
+    operation_id="get_current_honorary_members",
+    dependencies=[Depends(perm_admin)],
+)
+async def get_current_honorary_members(db_session: database.DBSession):
+    honorary_members = await honorary.crud.get_current_honorary_members(db_session)
+    return JSONResponse(
+        [
+            HonoraryMember.model_validate(member).model_dump(mode="json", exclude_unset=True)
+            for member in honorary_members
+        ]
+    )
+
+
+@router.post(
+    "",
+    description="Create honorary member terms",
+    response_model=list[HonoraryMember],
+    responses={
+        403: {"description": "must be a website admin", "model": DetailModel},
+        500: {"description": "failed to create honorary member terms", "model": DetailModel},
+    },
+    operation_id="create_honorary_members",
+    dependencies=[Depends(perm_admin)],
+)
+async def create_honorary_members(
+    db_session: database.DBSession,
+    body: list[HonoraryMemberCreate],
+):
+    new_members = [HonoraryMemberDB(**member.model_dump()) for member in body]
+    created_members = await honorary.crud.create_honorary_members(db_session, new_members)
+
+    await db_session.flush()
+
+    content = [
+        HonoraryMember.model_validate(member).model_dump(mode="json", exclude_unset=True) for member in created_members
+    ]
+
+    await db_session.commit()
+
+    return JSONResponse(content)
+
+
+@router.patch(
+    "/{term_id}",
+    description="Update an honorary member term. Ended terms cannot be updated.",
+    response_model=HonoraryMember,
+    responses={
+        403: {"description": "must be a website admin", "model": DetailModel},
+        404: {"description": "honorary member term does not exist", "model": DetailModel},
+        409: {"description": "honorary member term has already ended", "model": DetailModel},
+    },
+    operation_id="update_honorary_member",
+    dependencies=[Depends(perm_admin)],
+)
+async def update_honorary_member(
+    db_session: database.DBSession,
+    term_id: int,
+    body: HonoraryMemberUpdate,
+):
+    honorary_member = await honorary.crud.get_honorary_member_by_id(db_session, term_id)
+    if honorary_member is None:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail=f"honorary member term with id={term_id} does not exist",
+        )
+
+    if honorary.crud.has_term_ended(honorary_member):
+        raise HTTPException(
+            status_code=status.HTTP_409_CONFLICT,
+            detail="cannot update a term that has already ended",
+        )
+
+    update_data = body.model_dump(exclude_unset=True)
+    for key, value in update_data.items():
+        setattr(honorary_member, key, value)
+
+    await db_session.commit()
+    await db_session.refresh(honorary_member)
+
+    return JSONResponse(HonoraryMember.model_validate(honorary_member).model_dump(mode="json", exclude_unset=True))
+
+
+@router.delete(
+    "/{term_id}",
+    description="Delete an honorary member term. Ended terms cannot be deleted.",
+    response_model=SuccessResponse,
+    responses={
+        403: {"description": "must be a website admin", "model": DetailModel},
+        404: {"description": "honorary member term does not exist", "model": DetailModel},
+        409: {"description": "honorary member term has already ended", "model": DetailModel},
+    },
+    operation_id="delete_honorary_member",
+    dependencies=[Depends(perm_admin)],
+)
+async def delete_honorary_member(
+    db_session: database.DBSession,
+    term_id: int,
+):
+    honorary_member = await honorary.crud.get_honorary_member_by_id(db_session, term_id)
+    if honorary_member is None:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail=f"honorary member term with id={term_id} does not exist",
+        )
+
+    if honorary.crud.has_term_ended(honorary_member):
+        raise HTTPException(
+            status_code=status.HTTP_409_CONFLICT,
+            detail="cannot delete a term that has already ended",
+        )
+
+    await honorary.crud.delete_honorary_member(db_session, honorary_member)
+    await db_session.commit()
+
+    return SuccessResponse(success=True)