feat(user): expose alumni in convert command

Author: thekaveman

compiler_admin/commands/user/convert.py

@@ -1,9 +1,11 @@
 from argparse import Namespace
 
 from compiler_admin import RESULT_SUCCESS, RESULT_FAILURE
+from compiler_admin.commands.user.alumni import alumni
 from compiler_admin.services.google import (
     GROUP_PARTNERS,
     GROUP_STAFF,
+    OU_ALUMNI,
     OU_CONTRACTORS,
     OU_PARTNERS,
     OU_STAFF,
@@ -17,7 +19,7 @@
 )
 
 
-ACCOUNT_TYPE_OU = {"contractor": OU_CONTRACTORS, "partner": OU_PARTNERS, "staff": OU_STAFF}
+ACCOUNT_TYPE_OU = {"alumni": OU_ALUMNI, "contractor": OU_CONTRACTORS, "partner": OU_PARTNERS, "staff": OU_STAFF}
 
 
 def convert(args: Namespace) -> int:
@@ -48,7 +50,10 @@ def convert(args: Namespace) -> int:
     print(f"User exists, converting to: {account_type} for {account}")
     res = RESULT_SUCCESS
 
-    if account_type == "contractor":
+    if account_type == "alumni":
+        res = alumni(args)
+
+    elif account_type == "contractor":
         if user_is_partner(account):
             res += remove_user_from_group(account, GROUP_PARTNERS)
             res += remove_user_from_group(account, GROUP_STAFF)

compiler_admin/main.py

@@ -144,6 +144,10 @@ def setup_user_command(cmd_parsers: _SubParsersAction):
 
     user_convert = add_sub_cmd_with_username_arg(user_subcmds, "convert", help="Convert a user account to a new type.")
     user_convert.add_argument("account_type", choices=ACCOUNT_TYPE_OU.keys(), help="Target account type for this conversion.")
+    user_convert.add_argument(
+        "--force", action="store_true", default=False, help="Don't ask for confirmation before conversion."
+    )
+    user_convert.add_argument("--notify", help="An email address to send the alumni's new password.")
 
     user_delete = add_sub_cmd_with_username_arg(user_subcmds, "delete", help="Delete a user account.")
     user_delete.add_argument("--force", action="store_true", default=False, help="Don't ask for confirmation before deletion.")

tests/commands/user/test_convert.py

@@ -5,6 +5,11 @@
 from compiler_admin.commands.user.convert import convert, __name__ as MODULE
 
 
+@pytest.fixture
+def mock_commands_alumni(mock_commands_alumni):
+    return mock_commands_alumni(MODULE)
+
+
 @pytest.fixture
 def mock_google_user_exists(mock_google_user_exists):
     return mock_google_user_exists(MODULE)
@@ -98,6 +103,16 @@ def test_convert_user_exists_bad_account_type(mock_google_move_user_ou):
     assert mock_google_move_user_ou.call_count == 0
 
 
+@pytest.mark.usefixtures("mock_google_user_exists_true")
+def test_convert_alumni(mock_commands_alumni, mock_google_move_user_ou):
+    args = Namespace(username="username", account_type="alumni")
+    res = convert(args)
+
+    assert res == RESULT_SUCCESS
+    mock_commands_alumni.assert_called_once_with(args)
+    mock_google_move_user_ou.assert_called_once()
+
+
 @pytest.mark.usefixtures(
     "mock_google_user_exists_true", "mock_google_user_is_partner_false", "mock_google_user_is_staff_false"
 )

tests/conftest.py

@@ -33,6 +33,12 @@ def mock_input(mock_module_name):
     return mock_module_name("input")
 
 
+@pytest.fixture
+def mock_commands_alumni(mock_module_name):
+    """Fixture returns a function that patches the alumni function in a given module."""
+    return mock_module_name("alumni")
+
+
 @pytest.fixture
 def mock_commands_create(mock_module_name):
     """Fixture returns a function that patches the create function in a given module."""

tests/test_main.py

@@ -345,7 +345,13 @@ def test_main_user_convert(mock_commands_user):
     call_args = mock_commands_user.call_args.args
     assert (
         Namespace(
-            func=mock_commands_user, command="user", subcommand="convert", username="username", account_type="contractor"
+            func=mock_commands_user,
+            command="user",
+            subcommand="convert",
+            username="username",
+            account_type="contractor",
+            force=False,
+            notify=None,
         )
         in call_args
     )