wip: get current officers done

Author: jbriones1

src/officers/models.py

@@ -11,7 +11,6 @@ class BaseOfficerModel(BaseModel):
     position: OfficerPositionEnum
     start_date: datetime
     end_date: str | None = None
-    csss_email: str
 
 class PublicOfficerResponse(BaseOfficerModel):
     """
@@ -22,6 +21,7 @@ class PublicOfficerResponse(BaseOfficerModel):
     discord_name: str | None = None
     discord_nickname: int | None = None
     biography: str | None = None
+    csss_email: str
 
 class PrivateOfficerResponse(PublicOfficerResponse):
     """
@@ -32,10 +32,17 @@ class PrivateOfficerResponse(PublicOfficerResponse):
     github_username: str | None = None
     google_drive_email: str | None = None
 
-class OfficerTermParams(BaseModel):
+class OfficerTermCreate(BaseOfficerModel):
     """
-    Create a new officer term
+    Create a new Officer term
     """
     computing_id: str
-    position: OfficerPositionEnum
-    start_date: str
+
+class OfficerTermUpdate(BaseModel):
+    """
+    Update an Officer Term
+    """
+    legal_name: str | None = None
+    position: OfficerPositionEnum | None = None
+    start_date: datetime | None = None
+    end_date: datetime | None = None

src/officers/tables.py

@@ -8,6 +8,7 @@
     Integer,
     String,
     Text,
+    UniqueConstraint,
 )
 from sqlalchemy.orm import Mapped, mapped_column
 
@@ -50,6 +51,8 @@ class OfficerTerm(Base):
     biography: Mapped[str] = mapped_column(Text, nullable=True)
     photo_url: Mapped[str] = mapped_column(Text, nullable=True) # some urls get big, best to let it be a string
 
+    __table_args__ = (UniqueConstraint("computing_id", "position", "start_date"),) # This needs a comma to work
+
     def serializable_dict(self) -> dict:
         return {
             "id": self.id,

src/officers/urls.py

@@ -46,7 +46,6 @@ async def _has_officer_private_info_access(
     operation_id="get_current_officers"
 )
 async def current_officers(
-    # the request headers
     request: Request,
     db_session: database.DBSession,
 ):
@@ -62,7 +61,9 @@ async def current_officers(
 
 @router.get(
     "/all",
-    description="Information for all execs from all exec terms"
+    description="Information for all execs from all exec terms",
+    response_model=list[PrivateOfficerResponse] | list[PublicOfficerResponse],
+    operation_id="get_all_officers"
 )
 async def all_officers(
     request: Request,
@@ -78,10 +79,16 @@ async def all_officers(
             raise HTTPException(status_code=401, detail="only website admins can view all executive terms that have not started yet")
 
     all_officers = await officers.crud.all_officers(db_session, has_private_access, include_future_terms)
-    return JSONResponse([
-        officer_data.serializable_dict()
-        for officer_data in all_officers
-    ])
+    if has_private_access:
+        return JSONResponse([
+            PrivateOfficerResponse.model_validate(officer_data)
+            for officer_data in all_officers
+        ])
+    else:
+        return JSONResponse([
+            PublicOfficerResponse.model_validate(officer_data)
+            for officer_data in all_officers
+        ])
 
 @router.get(
     "/terms/{computing_id}",