Remove redundancy

Author: emyller

src/task_processor/routers.py

@@ -9,17 +9,10 @@ class TaskProcessorRouter:
 
     route_app_labels = ["task_processor"]
 
-    @property
-    def is_enabled(self) -> bool:
-        return "task_processor" in settings.TASK_PROCESSOR_DATABASES
-
     def db_for_read(self, model: type[Model], **hints: None) -> str | None:
         """
         If enabled, route read operations to the task processor database
         """
-        if not self.is_enabled:
-            return None
-
         if model._meta.app_label in self.route_app_labels:
             return "task_processor"
 
@@ -29,9 +22,6 @@ def db_for_write(self, model: type[Model], **hints: None) -> str | None:
         """
         If enabled, route write operations to the task processor database
         """
-        if not self.is_enabled:
-            return None
-
         if model._meta.app_label in self.route_app_labels:
             return "task_processor"
 
@@ -41,9 +31,6 @@ def allow_relation(self, obj1: Model, obj2: Model, **hints: None) -> bool | None
         """
         If enabled, allow relations between task processor models
         """
-        if not self.is_enabled:
-            return None
-
         both_objects_from_task_processor = (
             obj1._meta.app_label in self.route_app_labels
             and obj2._meta.app_label in self.route_app_labels
@@ -72,9 +59,6 @@ def allow_migrate(
         - We want to make it easier to migrate to the new database, _or back_
           to a single database setup if needed. Running DDL consistently helps.
         """
-        if not self.is_enabled:
-            return None
-
         if app_label in self.route_app_labels:
             return db in ["default", "task_processor"]
 

tests/unit/task_processor/test_unit_task_processor_routers.py

@@ -10,72 +10,20 @@
 from task_processor import routers
 
 
-@pytest.mark.parametrize(
-    "given_settings, expected",
-    [
-        ({"TASK_PROCESSOR_DATABASES": ["task_processor"]}, True),
-        ({"TASK_PROCESSOR_DATABASES": ["default", "task_processor"]}, True),
-        ({"TASK_PROCESSOR_DATABASES": ["default"]}, False),
-    ],
-)
-def test_TaskProcessorRouter__checks_whether_is_enabled(
-    settings: SettingsWrapper,
-    given_settings: dict[str, None | str],
-    expected: bool,
-) -> None:
-    # Given
-    for key, value in given_settings.items():
-        setattr(settings, key, value)
-
-    # When
-    router = routers.TaskProcessorRouter()
-
-    # Then
-    assert router.is_enabled is expected
-
-
 @pytest.mark.parametrize("model", apps.get_app_config("task_processor").get_models())
 def test_TaskProcessorRouter__enabled__routes_queries_to_task_processor_database(
     mocker: MockerFixture,
     model: type[Model],
 ) -> None:
     # Given
-    mocker.patch.object(routers.TaskProcessorRouter, "is_enabled", new=True)
-
-    # When
     router = routers.TaskProcessorRouter()
-    read_database = router.db_for_read(model)
-    write_database = router.db_for_write(model)
-
-    # Then
-    assert read_database == write_database == "task_processor"
-
-
-@pytest.mark.parametrize("model", apps.get_app_config("task_processor").get_models())
-def test_TaskProcessorRouter__disabled__does_not_route_database_queries(
-    mocker: MockerFixture,
-    model: type[Model],
-) -> None:
-    # Given
-    mocker.patch.object(routers.TaskProcessorRouter, "is_enabled", new=False)
 
     # When
-    router = routers.TaskProcessorRouter()
     read_database = router.db_for_read(model)
     write_database = router.db_for_write(model)
-    allows_relation = router.allow_relation(model(), model())
-    allows_migrate = {
-        router.allow_migrate("default", app_label="task_processor"),
-        router.allow_migrate("task_processor", app_label="task_processor"),
-        router.allow_migrate("other", app_label="task_processor"),
-        router.allow_migrate("task_processor", app_label="other"),
-    }
 
     # Then
-    assert read_database is None
-    assert write_database is None
-    assert allows_relation is None
-    assert allows_migrate == {None}
+    assert read_database == write_database == "task_processor"
 
 
 @pytest.mark.parametrize(
@@ -98,10 +46,9 @@ def test_TaskProcessorRouter__allow_relation__returns_according_to_given_models(
     expected: bool,
 ) -> None:
     # Given
-    mocker.patch.object(routers.TaskProcessorRouter, "is_enabled", new=True)
+    router = routers.TaskProcessorRouter()
 
     # When
-    router = routers.TaskProcessorRouter()
     allow_relation = router.allow_relation(model1(), model2())
 
     # Then
@@ -126,10 +73,9 @@ def test_TaskProcessorRouter__allow_migrate__applies_to_both_databases(
     mocker: MockerFixture,
 ) -> None:
     # Given
-    mocker.patch.object(routers.TaskProcessorRouter, "is_enabled", new=True)
+    router = routers.TaskProcessorRouter()
 
     # When
-    router = routers.TaskProcessorRouter()
     allow_migrate = router.allow_migrate(database, app_label)
 
     # Then