minor word corrections

Author: p-north

src/alembic/versions/243190df5588_create_election_tables.py

@@ -28,7 +28,7 @@ def upgrade() -> None:
         sa.Column("datetime_start_nominations", sa.DateTime(), nullable=False),
         sa.Column("datetime_start_voting", sa.DateTime(), nullable=False),
         sa.Column("datetime_end_voting", sa.DateTime(), nullable=False),
-        sa.Column("avaliable_positions", sa.Text(), nullable=False),
+        sa.Column("available_positions", sa.Text(), nullable=False),
         sa.Column("survey_link", sa.String(length=300), nullable=True),
         sa.PrimaryKeyConstraint("slug")
     )

src/elections/tables.py

@@ -45,7 +45,7 @@ class Election(Base):
     datetime_end_voting = Column(DateTime, nullable=False)
 
     # a csv list of positions which must be elements of OfficerPosition
-    avaliable_positions = Column(Text, nullable=False)
+    available_positions = Column(Text, nullable=False)
     survey_link = Column(String(300))
 
     def private_details(self, at_time: datetime) -> dict:
@@ -60,7 +60,7 @@ def private_details(self, at_time: datetime) -> dict:
             "datetime_end_voting": self.datetime_end_voting.isoformat(),
 
             "status": self.status(at_time),
-            "avaliable_positions": self.avaliable_positions,
+            "available_positions": self.available_positions,
             "survey_link": self.survey_link,
         }
 
@@ -76,7 +76,7 @@ def public_details(self, at_time: datetime) -> dict:
             "datetime_end_voting": self.datetime_end_voting.isoformat(),
 
             "status": self.status(at_time),
-            "avaliable_positions": self.avaliable_positions,
+            "available_positions": self.available_positions,
         }
 
     def public_metadata(self, at_time: datetime) -> dict:
@@ -103,7 +103,7 @@ def to_update_dict(self) -> dict:
             "datetime_start_voting": self.datetime_start_voting,
             "datetime_end_voting": self.datetime_end_voting,
 
-            "avaliable_positions": self.avaliable_positions,
+            "available_positions": self.available_positions,
             "survey_link": self.survey_link,
         }
 

src/elections/urls.py

@@ -93,7 +93,7 @@ async def get_election(
         all_nominations = await elections.crud.get_all_registrations_in_election(db_session, slugified_name)
         election_json["candidates"] = []
 
-        avaliable_positions_list = election.avaliable_positions.split(",")
+        avaliable_positions_list = election.available_positions.split(",")
         for nomination in all_nominations:
             if nomination.position not in avaliable_positions_list:
                 # ignore any positions that are **no longer** active
@@ -134,7 +134,7 @@ def _raise_if_bad_election_data(
     datetime_start_nominations: datetime,
     datetime_start_voting: datetime,
     datetime_end_voting: datetime,
-    avaliable_positions: str | None,
+    available_positions: str | None,
 ):
     if election_type not in election_types:
         raise HTTPException(
@@ -149,8 +149,8 @@ def _raise_if_bad_election_data(
             status_code=status.HTTP_400_BAD_REQUEST,
             detail="dates must be in order from earliest to latest",
         )
-    elif avaliable_positions is not None:
-        for position in avaliable_positions.split(","):
+    elif available_positions is not None:
+        for position in available_positions.split(","):
             if position not in OfficerPosition.position_list():
                 raise HTTPException(
                     status_code=status.HTTP_400_BAD_REQUEST,
@@ -175,7 +175,7 @@ async def create_election(
     datetime_start_voting: datetime,
     datetime_end_voting: datetime,
     # allows None, which assigns it to the default
-    avaliable_positions: str | None = None,
+    available_positions: str | None = None,
     survey_link: str | None = None,
 ):
     # ensure that election name is not "list" as it will collide with endpoint
@@ -185,13 +185,13 @@ async def create_election(
             detail="cannot use that election name",
         )
 
-    if avaliable_positions is None:
+    if available_positions is None:
         if election_type == "general_election":
-            avaliable_positions = elections.tables.DEFAULT_POSITIONS_GENERAL_ELECTION
+            available_positions = elections.tables.DEFAULT_POSITIONS_GENERAL_ELECTION
         elif election_type == "by_election":
-            avaliable_positions = elections.tables.DEFAULT_POSITIONS_BY_ELECTION
+            available_positions = elections.tables.DEFAULT_POSITIONS_BY_ELECTION
         elif election_type == "council_rep_election":
-            avaliable_positions = elections.tables.DEFAULT_POSITIONS_COUNCIL_REP_ELECTION
+            available_positions = elections.tables.DEFAULT_POSITIONS_COUNCIL_REP_ELECTION
         else:
             raise HTTPException(
                 status_code=status.HTTP_400_BAD_REQUEST,
@@ -205,7 +205,7 @@ async def create_election(
         datetime_start_nominations,
         datetime_start_voting,
         datetime_end_voting,
-        avaliable_positions,
+        available_positions,
     )
 
     is_valid_user, _, _ = await _validate_user(request, db_session)
@@ -232,7 +232,7 @@ async def create_election(
             datetime_start_nominations = datetime_start_nominations,
             datetime_start_voting = datetime_start_voting,
             datetime_end_voting = datetime_end_voting,
-            avaliable_positions = avaliable_positions,
+            available_positions = available_positions,
             survey_link = survey_link
         )
     )
@@ -260,7 +260,7 @@ async def update_election(
     datetime_start_nominations: datetime,
     datetime_start_voting: datetime,
     datetime_end_voting: datetime,
-    avaliable_positions: str,
+    available_positions: str,
     survey_link: str | None = None,
 ):
     slugified_name = _slugify(election_name)
@@ -271,7 +271,7 @@ async def update_election(
         datetime_start_nominations,
         datetime_start_voting,
         datetime_end_voting,
-        avaliable_positions,
+        available_positions,
     )
 
     is_valid_user, _, _ = await _validate_user(request, db_session)
@@ -298,7 +298,7 @@ async def update_election(
             datetime_start_nominations = datetime_start_nominations,
             datetime_start_voting = datetime_start_voting,
             datetime_end_voting = datetime_end_voting,
-            avaliable_positions = avaliable_positions,
+            available_positions = available_positions,
             survey_link = survey_link
         )
     )
@@ -401,7 +401,7 @@ async def register_in_election(
             status_code=status.HTTP_404_NOT_FOUND,
             detail=f"election with slug {slugified_name} does not exist"
         )
-    elif position not in election.avaliable_positions.split(","):
+    elif position not in election.available_positions.split(","):
         # NOTE: We only restrict creating a registration for a position that doesn't exist,
         # not updating or deleting one
         raise HTTPException(

src/load_test_db.py

@@ -303,7 +303,7 @@ async def load_test_elections_data(db_session: AsyncSession):
         datetime_start_nominations=datetime.now() - timedelta(days=400),
         datetime_start_voting=datetime.now() - timedelta(days=395, hours=4),
         datetime_end_voting=datetime.now() - timedelta(days=390, hours=8),
-        avaliable_positions="president,vice-president",
+        available_positions="president,vice-president",
         survey_link="https://youtu.be/dQw4w9WgXcQ?si=kZROi2tu-43MXPM5"
     ))
     await update_election(db_session, Election(
@@ -313,7 +313,7 @@ async def load_test_elections_data(db_session: AsyncSession):
         datetime_start_nominations=datetime.now() - timedelta(days=400),
         datetime_start_voting=datetime.now() - timedelta(days=395, hours=4),
         datetime_end_voting=datetime.now() - timedelta(days=390, hours=8),
-        avaliable_positions="president,vice-president,treasurer",
+        available_positions="president,vice-president,treasurer",
         survey_link="https://youtu.be/dQw4w9WgXcQ?si=kZROi2tu-43MXPM5"
     ))
     await create_election(db_session, Election(
@@ -323,7 +323,7 @@ async def load_test_elections_data(db_session: AsyncSession):
         datetime_start_nominations=datetime.now() - timedelta(days=1),
         datetime_start_voting=datetime.now() + timedelta(days=7),
         datetime_end_voting=datetime.now() + timedelta(days=14),
-        avaliable_positions="president,vice-president,treasurer",
+        available_positions="president,vice-president,treasurer",
         survey_link="https://youtu.be/dQw4w9WgXcQ?si=kZROi2tu-43MXPM5 (oh yeah)"
     ))
     await create_nominee_info(db_session, NomineeInfo(
@@ -349,7 +349,7 @@ async def load_test_elections_data(db_session: AsyncSession):
         datetime_start_nominations=datetime.now() - timedelta(days=5),
         datetime_start_voting=datetime.now() - timedelta(days=1, hours=4),
         datetime_end_voting=datetime.now() + timedelta(days=5, hours=8),
-        avaliable_positions="president,vice-president,treasurer",
+        available_positions="president,vice-president,treasurer",
         survey_link="https://youtu.be/dQw4w9WgXcQ?si=kZROi2tu-43MXPM5"
     ))
     await create_election(db_session, Election(
@@ -359,7 +359,7 @@ async def load_test_elections_data(db_session: AsyncSession):
         datetime_start_nominations=datetime.now() + timedelta(days=5),
         datetime_start_voting=datetime.now() + timedelta(days=10, hours=4),
         datetime_end_voting=datetime.now() + timedelta(days=15, hours=8),
-        avaliable_positions="president,vice-president,treasurer",
+        available_positions="president,vice-president,treasurer",
         survey_link=None
     ))
     await db_session.commit()

tests/integration/test_elections.py

@@ -125,7 +125,7 @@ async def test_endpoints(client, database_setup):
         "datetime_start_nominations": "2025-08-18T09:00:00Z",
         "datetime_start_voting": "2025-09-03T09:00:00Z",
         "datetime_end_voting": "2025-09-18T23:59:59Z",
-        "avaliable_positions": "president",
+        "available_positions": "president",
         "survey_link": "https://youtu.be/dQw4w9WgXcQ?si=kZROi2tu-43MXPM5"
 
     })
@@ -143,7 +143,7 @@ async def test_endpoints(client, database_setup):
         "datetime_start_nominations": "2025-08-18T09:00:00Z",
         "datetime_start_voting": "2025-09-03T09:00:00Z",
         "datetime_end_voting": "2025-09-18T23:59:59Z",
-        "avaliable_positions": "president,treasurer",
+        "available_positions": "president,treasurer",
         "survey_link": "https://youtu.be/dQw4w9WgXcQ?si=kZROi2tu-43MXPM5"
 
     })
@@ -206,7 +206,7 @@ async def test_endpoints_admin(client, database_setup):
         "datetime_start_nominations": (datetime.now() - timedelta(days=1)).isoformat(),
         "datetime_start_voting": (datetime.now() + timedelta(days=7)).isoformat(),
         "datetime_end_voting": (datetime.now() + timedelta(days=14)).isoformat(),
-        "avaliable_positions": "president,treasurer",
+        "available_positions": "president,treasurer",
         "survey_link": "https://youtu.be/dQw4w9WgXcQ?si=kZROi2tu-43MXPM5"
     })
     assert response.status_code == 200
@@ -280,7 +280,7 @@ async def test_endpoints_admin(client, database_setup):
         "datetime_start_nominations": (datetime.now() - timedelta(days=1)).isoformat(),
         "datetime_start_voting": (datetime.now() + timedelta(days=7)).isoformat(),
         "datetime_end_voting": (datetime.now() + timedelta(days=14)).isoformat(),
-        "avaliable_positions": "president,vice-president,treasurer",  # update this
+        "available_positions": "president,vice-president,treasurer",  # update this
         "survey_link": "https://youtu.be/dQw4w9WgXcQ?si=kZROi2tu-43MXPM5"
     })
     assert response.status_code == 200