small bug fixes

Author: EarthenSky

src/permission/types.py

@@ -18,7 +18,7 @@ async def has_permission(db_session: database.DBSession, computing_id: str) -> b
         A semester is defined in semester_start
         """
 
-        term_list = await officers.crud.get_officer_terms(db_session, computing_id)
+        term_list = await officers.crud.get_officer_terms(db_session, computing_id, include_future_terms=False)
         for term in term_list:
             if utils.is_active_term(term):
                 return True

src/utils.py

@@ -34,6 +34,11 @@ def is_active_officer(query: Select) -> Select:
         )
     )
 
+def has_started_term(query: Select) -> bool:
+    return query.where(
+        OfficerTerm.start_date <= date.today()
+    )
+
 def is_active_term(term: OfficerTerm) -> bool:
     return (
         # cannot be an officer who has not started yet
@@ -46,9 +51,6 @@ def is_active_term(term: OfficerTerm) -> bool:
         )
     )
 
-def has_started_term(term: OfficerTerm) -> bool:
-    return term.start_date <= date.today()
-
 def is_past_term(term: OfficerTerm) -> bool:
     """Any term which has concluded"""
     return (