From 7ee8e0e6b1e3fb2eac8a14c6b61f5fc9ebc8046a Mon Sep 17 00:00:00 2001 From: Gabe WSL Debian <24978329+EarthenSky@users.noreply.github.com> Date: Tue, 31 Dec 2024 00:29:46 -0800 Subject: [PATCH 1/2] add website admins for bootstrapping & update phone number default handling --- src/permission/types.py | 3 +++ src/scripts/migrate_from_about_officers.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/permission/types.py b/src/permission/types.py index 659ed32..b1d6131 100644 --- a/src/permission/types.py +++ b/src/permission/types.py @@ -43,6 +43,9 @@ async def has_permission(db_session: database.DBSession, computing_id: str) -> b """ A website admin has to be an active officer who has one of the above positions """ + if computing_id in ["gsa92", "mdb15"]: + return True + for position in await officers.crud.current_officer_positions(db_session, computing_id): if position in WebsiteAdmin.WEBSITE_ADMIN_POSITIONS: return True diff --git a/src/scripts/migrate_from_about_officers.py b/src/scripts/migrate_from_about_officers.py index 2e393c5..e29cab9 100644 --- a/src/scripts/migrate_from_about_officers.py +++ b/src/scripts/migrate_from_about_officers.py @@ -155,7 +155,7 @@ def get_key(officer): new_officer_info = OfficerInfo( computing_id = officer["sfu_computing_id"], legal_name = officer["full_name"], - phone_number = str(officer["phone_number"]), + phone_number = None if str(officer["phone_number"]) == 0 else str(officer["phone_number"]), discord_id = officer["discord_id"], discord_name = officer["discord_username"], From e194c0fd14993ec13e8d06350ff1d9868bcf9477 Mon Sep 17 00:00:00 2001 From: Gabe WSL Debian <24978329+EarthenSky@users.noreply.github.com> Date: Tue, 31 Dec 2024 13:50:00 -0800 Subject: [PATCH 2/2] small comment --- src/scripts/migrate_from_about_officers.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/scripts/migrate_from_about_officers.py b/src/scripts/migrate_from_about_officers.py index e29cab9..9af3e71 100644 --- a/src/scripts/migrate_from_about_officers.py +++ b/src/scripts/migrate_from_about_officers.py @@ -152,6 +152,8 @@ def get_key(officer): # use the most up to date officer info # -------------------------------- + # TODO: insert None instead of NA for many of the terms? + new_officer_info = OfficerInfo( computing_id = officer["sfu_computing_id"], legal_name = officer["full_name"],