fix(officers): term_id added to Officer response, id is now an int

Author: jbriones1

src/officers/crud.py

@@ -34,6 +34,7 @@ async def current_officers(db_session: database.DBSession, include_private: bool
         for term, officer in result:
             officer_list.append(
                 Officer(
+                    term_id=term.id,
                     legal_name=officer.legal_name,
                     position=term.position,
                     start_date=term.start_date,
@@ -102,6 +103,7 @@ async def get_all_officers(
         for term, officer in result:
             officer_list.append(
                 Officer(
+                    term_id=term.id,
                     legal_name=officer.legal_name,
                     position=term.position,
                     start_date=term.start_date,

src/officers/models.py

@@ -95,6 +95,7 @@ class Officer(OfficerBase):
     @classmethod
     def public_fields(cls, term: OfficerTermDB, info: OfficerInfoDB) -> Self:
         return cls(
+            term_id=term.id,
             legal_name=info.legal_name,
             position=term.position,
             start_date=term.start_date,
@@ -108,6 +109,8 @@ def public_fields(cls, term: OfficerTermDB, info: OfficerInfoDB) -> Self:
     def is_active(self) -> bool:
         return is_active_term(start_date=self.start_date, end_date=self.end_date)
 
+    term_id: int
+
     # Private Info
     discord_id: str | None = None
     discord_name: str | None = None

src/officers/tables.py

@@ -28,7 +28,7 @@
 class OfficerTermDB(Base):
     __tablename__ = "officer_term"
 
-    id: Mapped[str] = mapped_column(Integer, primary_key=True, autoincrement=True)
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
 
     computing_id: Mapped[str] = mapped_column(
         String(COMPUTING_ID_LEN),