fix: typing for officer positions

Author: jbriones1

src/elections/urls.py

@@ -51,7 +51,7 @@ async def _get_user_permissions(
 
     return has_permission, session_id, computing_id
 
-def _default_election_positions(election_type: ElectionTypeEnum) -> list[str]:
+def _default_election_positions(election_type: ElectionTypeEnum) -> list[OfficerPositionEnum]:
     if election_type == ElectionTypeEnum.GENERAL:
         available_positions = GENERAL_ELECTION_POSITIONS
     elif election_type == ElectionTypeEnum.BY_ELECTION:
@@ -67,7 +67,7 @@ def _raise_if_bad_election_data(
     datetime_start_nominations: datetime,
     datetime_start_voting: datetime,
     datetime_end_voting: datetime,
-    available_positions: list[str]
+    available_positions: list[OfficerPositionEnum]
 ):
     if election_type not in ElectionTypeEnum:
         raise HTTPException(

src/officers/constants.py

@@ -1,3 +1,6 @@
+from officers.types import OfficerPositionEnum
+
+
 class OfficerPosition:
     PRESIDENT = "president"
     VICE_PRESIDENT = "vice-president"
@@ -23,7 +26,7 @@ class OfficerPosition:
     SOCIAL_MEDIA_MANAGER = "social media manager"
 
     @staticmethod
-    def position_list() -> list[str]:
+    def position_list() -> list[OfficerPositionEnum]:
         return _OFFICER_POSITION_LIST
 
     @staticmethod
@@ -152,45 +155,45 @@ def expected_positions() -> list[str]:
 }
 
 _OFFICER_POSITION_LIST = [
-    OfficerPosition.PRESIDENT,
-    OfficerPosition.VICE_PRESIDENT,
-    OfficerPosition.TREASURER,
-
-    OfficerPosition.DIRECTOR_OF_RESOURCES,
-    OfficerPosition.DIRECTOR_OF_EVENTS,
-    OfficerPosition.DIRECTOR_OF_EDUCATIONAL_EVENTS,
-    OfficerPosition.ASSISTANT_DIRECTOR_OF_EVENTS,
-    OfficerPosition.DIRECTOR_OF_COMMUNICATIONS,
-    #OfficerPosition.DIRECTOR_OF_OUTREACH,
-    OfficerPosition.DIRECTOR_OF_MULTIMEDIA,
-    OfficerPosition.DIRECTOR_OF_ARCHIVES,
-    OfficerPosition.EXECUTIVE_AT_LARGE,
-    OfficerPosition.FIRST_YEAR_REPRESENTATIVE,
-
-    OfficerPosition.ELECTIONS_OFFICER,
-    OfficerPosition.SFSS_COUNCIL_REPRESENTATIVE,
-    OfficerPosition.FROSH_WEEK_CHAIR,
-
-    OfficerPosition.SYSTEM_ADMINISTRATOR,
-    OfficerPosition.WEBMASTER,
-    OfficerPosition.SOCIAL_MEDIA_MANAGER,
+    OfficerPositionEnum.PRESIDENT,
+    OfficerPositionEnum.VICE_PRESIDENT,
+    OfficerPositionEnum.TREASURER,
+
+    OfficerPositionEnum.DIRECTOR_OF_RESOURCES,
+    OfficerPositionEnum.DIRECTOR_OF_EVENTS,
+    OfficerPositionEnum.DIRECTOR_OF_EDUCATIONAL_EVENTS,
+    OfficerPositionEnum.ASSISTANT_DIRECTOR_OF_EVENTS,
+    OfficerPositionEnum.DIRECTOR_OF_COMMUNICATIONS,
+    #OfficerPositionEnum.DIRECTOR_OF_OUTREACH,
+    OfficerPositionEnum.DIRECTOR_OF_MULTIMEDIA,
+    OfficerPositionEnum.DIRECTOR_OF_ARCHIVES,
+    OfficerPositionEnum.EXECUTIVE_AT_LARGE,
+    OfficerPositionEnum.FIRST_YEAR_REPRESENTATIVE,
+
+    OfficerPositionEnum.ELECTIONS_OFFICER,
+    OfficerPositionEnum.SFSS_COUNCIL_REPRESENTATIVE,
+    OfficerPositionEnum.FROSH_WEEK_CHAIR,
+
+    OfficerPositionEnum.SYSTEM_ADMINISTRATOR,
+    OfficerPositionEnum.WEBMASTER,
+    OfficerPositionEnum.SOCIAL_MEDIA_MANAGER,
 ]
 
 GENERAL_ELECTION_POSITIONS = [
-    OfficerPosition.PRESIDENT,
-    OfficerPosition.VICE_PRESIDENT,
-    OfficerPosition.TREASURER,
-
-    OfficerPosition.DIRECTOR_OF_RESOURCES,
-    OfficerPosition.DIRECTOR_OF_EVENTS,
-    OfficerPosition.DIRECTOR_OF_EDUCATIONAL_EVENTS,
-    OfficerPosition.ASSISTANT_DIRECTOR_OF_EVENTS,
-    OfficerPosition.DIRECTOR_OF_COMMUNICATIONS,
-    #OfficerPosition.DIRECTOR_OF_OUTREACH,
-    OfficerPosition.DIRECTOR_OF_MULTIMEDIA,
-    OfficerPosition.DIRECTOR_OF_ARCHIVES,
+    OfficerPositionEnum.PRESIDENT,
+    OfficerPositionEnum.VICE_PRESIDENT,
+    OfficerPositionEnum.TREASURER,
+
+    OfficerPositionEnum.DIRECTOR_OF_RESOURCES,
+    OfficerPositionEnum.DIRECTOR_OF_EVENTS,
+    OfficerPositionEnum.DIRECTOR_OF_EDUCATIONAL_EVENTS,
+    OfficerPositionEnum.ASSISTANT_DIRECTOR_OF_EVENTS,
+    OfficerPositionEnum.DIRECTOR_OF_COMMUNICATIONS,
+    #OfficerPositionEnum.DIRECTOR_OF_OUTREACH,
+    OfficerPositionEnum.DIRECTOR_OF_MULTIMEDIA,
+    OfficerPositionEnum.DIRECTOR_OF_ARCHIVES,
 ]
 
 COUNCIL_REP_ELECTION_POSITIONS = [
-    OfficerPosition.SFSS_COUNCIL_REPRESENTATIVE,
+    OfficerPositionEnum.SFSS_COUNCIL_REPRESENTATIVE,
 ]

tests/integration/test_elections.py

@@ -16,7 +16,6 @@
     # info crud
     get_nominee_info,
 )
-from src.elections.urls import _slugify
 from src.main import app