refactor(command): organize user commands in subdir

thekaveman · thekaveman · commit 9378f3b69df1 · 2024-04-20T13:29:54.000-07:00
diff --git a/compiler_admin/commands/user/__init__.py b/compiler_admin/commands/user/__init__.py
@@ -0,0 +1,18 @@
+from argparse import Namespace
+
+from compiler_admin.commands.user.create import create  # noqa: F401
+from compiler_admin.commands.user.convert import convert  # noqa: F401
+from compiler_admin.commands.user.delete import delete  # noqa: F401
+from compiler_admin.commands.user.offboard import offboard  # noqa: F401
+from compiler_admin.commands.user.reset_password import reset_password  # noqa: F401
+from compiler_admin.commands.user.restore import restore  # noqa: F401
+from compiler_admin.commands.user.signout import signout  # noqa: F401
+
+
+def user(args: Namespace, *extra):
+    # try to call the subcommand function directly from local symbols
+    # if the subcommand function was imported above, it should exist in locals()
+    if args.subcommand in locals():
+        locals()[args.subcommand](args, *extra)
+    else:
+        raise ValueError(f"Unknown user subcommand: {args.subcommand}")
diff --git a/compiler_admin/commands/user/convert.py b/compiler_admin/commands/user/convert.py
diff --git a/compiler_admin/commands/user/create.py b/compiler_admin/commands/user/create.py
diff --git a/compiler_admin/commands/user/delete.py b/compiler_admin/commands/user/delete.py
diff --git a/compiler_admin/commands/user/offboard.py b/compiler_admin/commands/user/offboard.py
@@ -2,8 +2,8 @@
 from tempfile import NamedTemporaryFile
 
 from compiler_admin import RESULT_SUCCESS, RESULT_FAILURE
-from compiler_admin.commands.delete import delete
-from compiler_admin.commands.signout import signout
+from compiler_admin.commands.user.delete import delete
+from compiler_admin.commands.user.signout import signout
 from compiler_admin.services.google import (
     USER_ARCHIVE,
     CallGAMCommand,
diff --git a/compiler_admin/commands/user/reset_password.py b/compiler_admin/commands/user/reset_password.py
@@ -1,7 +1,7 @@
 from argparse import Namespace
 
 from compiler_admin import RESULT_SUCCESS, RESULT_FAILURE
-from compiler_admin.commands.signout import signout
+from compiler_admin.commands.user.signout import signout
 from compiler_admin.services.google import USER_HELLO, CallGAMCommand, user_account_name, user_exists
 
 
diff --git a/compiler_admin/commands/user/restore.py b/compiler_admin/commands/user/restore.py
diff --git a/compiler_admin/commands/user/signout.py b/compiler_admin/commands/user/signout.py
diff --git a/tests/commands/user/test_convert.py b/tests/commands/user/test_convert.py
@@ -2,7 +2,7 @@
 import pytest
 
 from compiler_admin import RESULT_FAILURE, RESULT_SUCCESS
-from compiler_admin.commands.convert import convert, __name__ as MODULE
+from compiler_admin.commands.user.convert import convert, __name__ as MODULE
 
 
 @pytest.fixture
diff --git a/tests/commands/user/test_create.py b/tests/commands/user/test_create.py
@@ -2,7 +2,7 @@
 import pytest
 
 from compiler_admin import RESULT_FAILURE, RESULT_SUCCESS
-from compiler_admin.commands.create import create, __name__ as MODULE
+from compiler_admin.commands.user.create import create, __name__ as MODULE
 from compiler_admin.services.google import USER_HELLO
 
 
diff --git a/tests/commands/user/test_delete.py b/tests/commands/user/test_delete.py
@@ -2,7 +2,7 @@
 import pytest
 
 from compiler_admin import RESULT_FAILURE, RESULT_SUCCESS
-from compiler_admin.commands.delete import delete, __name__ as MODULE
+from compiler_admin.commands.user.delete import delete, __name__ as MODULE
 
 
 @pytest.fixture
diff --git a/tests/commands/user/test_offboard.py b/tests/commands/user/test_offboard.py
@@ -2,7 +2,7 @@
 import pytest
 
 from compiler_admin import RESULT_FAILURE, RESULT_SUCCESS
-from compiler_admin.commands.offboard import offboard, __name__ as MODULE
+from compiler_admin.commands.user.offboard import offboard, __name__ as MODULE
 
 
 @pytest.fixture
diff --git a/tests/commands/user/test_reset_password.py b/tests/commands/user/test_reset_password.py
@@ -2,7 +2,7 @@
 import pytest
 
 from compiler_admin import RESULT_FAILURE, RESULT_SUCCESS
-from compiler_admin.commands.reset_password import reset_password, __name__ as MODULE
+from compiler_admin.commands.user.reset_password import reset_password, __name__ as MODULE
 from compiler_admin.services.google import USER_HELLO
 
 
diff --git a/tests/commands/user/test_restore.py b/tests/commands/user/test_restore.py
@@ -2,7 +2,7 @@
 import pytest
 
 from compiler_admin import RESULT_FAILURE, RESULT_SUCCESS
-from compiler_admin.commands.restore import restore, __name__ as MODULE
+from compiler_admin.commands.user.restore import restore, __name__ as MODULE
 
 
 @pytest.fixture
diff --git a/tests/commands/user/test_signout.py b/tests/commands/user/test_signout.py
@@ -2,7 +2,7 @@
 import pytest
 
 from compiler_admin import RESULT_FAILURE, RESULT_SUCCESS
-from compiler_admin.commands.signout import signout, __name__ as MODULE
+from compiler_admin.commands.user.signout import signout, __name__ as MODULE
 
 
 @pytest.fixture
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -30,55 +30,55 @@ def mock_input(mock_module_name):
 
 @pytest.fixture
 def mock_commands_create(mock_module_name):
-    """Fixture returns a function that patches commands.create in a given module."""
+    """Fixture returns a function that patches the create function in a given module."""
     return mock_module_name("create")
 
 
 @pytest.fixture
 def mock_commands_convert(mock_module_name):
-    """Fixture returns a function that patches commands.convert in a given module."""
+    """Fixture returns a function that patches the convert command function in a given module."""
     return mock_module_name("convert")
 
 
 @pytest.fixture
 def mock_commands_delete(mock_module_name):
-    """Fixture returns a function that patches commands.delete in a given module."""
+    """Fixture returns a function that patches the delete command function in a given module."""
     return mock_module_name("delete")
 
 
 @pytest.fixture
 def mock_commands_info(mock_module_name):
-    """Fixture returns a function that patches commands.info in a given module."""
+    """Fixture returns a function that patches the info command function in a given module."""
     return mock_module_name("info")
 
 
 @pytest.fixture
 def mock_commands_init(mock_module_name):
-    """Fixture returns a function that patches commands.init in a given module."""
+    """Fixture returns a function that patches the init command function in a given module."""
     return mock_module_name("init")
 
 
 @pytest.fixture
 def mock_commands_offboard(mock_module_name):
-    """Fixture returns a function that patches commands.offboard in a given module."""
+    """Fixture returns a function that patches the offboard command function in a given module."""
     return mock_module_name("offboard")
 
 
 @pytest.fixture
 def mock_commands_reset_password(mock_module_name):
-    """Fixture returns a function that patches commands.reset_password in a given module."""
+    """Fixture returns a function that patches the reset_password command function in a given module."""
     return mock_module_name("reset_password")
 
 
 @pytest.fixture
 def mock_commands_restore(mock_module_name):
-    """Fixture returns a function that patches commands.restore in a given module."""
+    """Fixture returns a function that patches the restore command function in a given module."""
     return mock_module_name("restore")
 
 
 @pytest.fixture
 def mock_commands_signout(mock_module_name):
-    """Fixture returns a function that patches commands.signout in a given module."""
+    """Fixture returns a function that patches the signout command function in a given module."""
     return mock_module_name("signout")
 
 
