refactor Command Handle handle method

cleaner name for method

Author: Harriethw

manage_breast_screening/notifications/management/commands/create_appointments.py

@@ -37,7 +37,7 @@ def add_arguments(self, parser):
         )
 
     def handle(self, *args, **options):
-        with CommandHandler.command_handler(INSIGHTS_JOB_NAME):
+        with CommandHandler.handle(INSIGHTS_JOB_NAME):
             logger.info("Create Appointments command started")
             container_client = BlobStorage().find_or_create_container(
                 os.getenv("BLOB_CONTAINER_NAME", "")

manage_breast_screening/notifications/management/commands/create_reports.py

@@ -58,7 +58,7 @@ def add_arguments(self, parser):
         parser.add_argument("--smoke-test", action="store_true")
 
     def handle(self, *args, **options):
-        with CommandHandler.command_handler(INSIGHTS_JOB_NAME):
+        with CommandHandler.handle(INSIGHTS_JOB_NAME):
             logger.info("Create Report Command started")
 
             bso_codes, report_configs = self.configuration(options)

manage_breast_screening/notifications/management/commands/helpers/command_handler.py

@@ -10,7 +10,7 @@
 class CommandHandler:
     @contextmanager
     @staticmethod
-    def command_handler(command_name):
+    def handle(command_name):
         try:
             yield
             ApplicationInsightsLogging().custom_event_info(

manage_breast_screening/notifications/management/commands/retry_failed_message_batch.py

@@ -28,7 +28,7 @@ class Command(BaseCommand):
     """
 
     def handle(self, *args, **options):
-        with CommandHandler.command_handler(INSIGHTS_JOB_NAME):
+        with CommandHandler.handle(INSIGHTS_JOB_NAME):
             logger.info("Retry Failed Message Batch Command started")
             queue = Queue.RetryMessageBatches()
             logger.debug("Retry queue items: %s", queue.peek())

manage_breast_screening/notifications/management/commands/save_message_status.py

@@ -26,7 +26,7 @@ class Command(BaseCommand):
     """
 
     def handle(self, *args, **options):
-        with CommandHandler.command_handler(INSIGHTS_JOB_NAME):
+        with CommandHandler.handle(INSIGHTS_JOB_NAME):
             logger.info("Save Message Status Command started")
             queue = Queue.MessageStatusUpdates()
             for item in queue.items():

manage_breast_screening/notifications/management/commands/send_message_batch.py

@@ -33,7 +33,7 @@ class Command(BaseCommand):
     """
 
     def handle(self, *args, **options):
-        with CommandHandler.command_handler(INSIGHTS_JOB_NAME):
+        with CommandHandler.handle(INSIGHTS_JOB_NAME):
             return self.send_message_batch()
 
     def send_message_batch(self):

manage_breast_screening/notifications/management/commands/store_mesh_messages.py

@@ -20,7 +20,7 @@ class Command(BaseCommand):
     """
 
     def handle(self, *args, **options):
-        with CommandHandler.command_handler(INSIGHTS_JOB_NAME):
+        with CommandHandler.handle(INSIGHTS_JOB_NAME):
             logger.info("Store MESH Messages command started")
             today_dirname = datetime.today().strftime("%Y-%m-%d")
             with MeshInbox() as inbox:

manage_breast_screening/notifications/tests/conftest.py

@@ -38,5 +38,5 @@ def mock_insights_logger(request, monkeypatch):
 @pytest.fixture
 def mock_command_handler(request, monkeypatch):
     mock_command_handler = MagicMock()
-    monkeypatch.setattr(CommandHandler, "command_handler", mock_command_handler)
+    monkeypatch.setattr(CommandHandler, "handle", mock_command_handler)
     return mock_command_handler

manage_breast_screening/notifications/tests/management/commands/helpers/test_command_handler.py

@@ -10,7 +10,7 @@
 
 def test_command_handler_yields():
     mock = MagicMock()
-    with CommandHandler.command_handler("SomeJob"):
+    with CommandHandler.handle("SomeJob"):
         mock.do_stuff("this")
         mock.do_more_stuff("that")
 
@@ -24,7 +24,7 @@ def test_command_handler_logs_and_raises(mock_insights_logger):
     mock.do_more_stuff.side_effect = an_exception
 
     with pytest.raises(CommandError) as exc_info:
-        with CommandHandler.command_handler("SomeJob"):
+        with CommandHandler.handle("SomeJob"):
             mock.do_stuff("this")
             mock.do_more_stuff("that")
     mock_insights_logger.assert_called_once_with(f"SomeJobError: {an_exception}")
@@ -38,7 +38,7 @@ def test_command_handler_logs_and_raises(mock_insights_logger):
 
 def test_command_handler_logs_success(mock_insights_logger):
     mock = MagicMock()
-    with CommandHandler.command_handler("SomeJob"):
+    with CommandHandler.handle("SomeJob"):
         mock.do_stuff("this")
         mock.do_more_stuff("that")