Mark task 19 done and centralize map-color thresholds in settings_service

backend/tests/test_services/test_setup_service.py

@@ -12,7 +12,7 @@ import pytest
 
 from app.db import init_db
 from app.repositories import settings_repo
-from app.services import setup_service
+from app.services import settings_service, setup_service
 
 
 @pytest.fixture
@@ -171,7 +171,7 @@ class TestRunSetup:
             timezone="UTC",
             session_duration_minutes=60,
         )
-        high, medium, low = await setup_service.get_map_color_thresholds(db)
+        high, medium, low = await settings_service.get_map_color_thresholds(db)
         assert high == 100
         assert medium == 50
         assert low == 20
@@ -197,74 +197,6 @@ class TestGetTimezone:
         assert await setup_service.get_timezone(db) == "America/New_York"
 
 
-class TestMapColorThresholds:
-    async def test_get_map_color_thresholds_returns_defaults_on_fresh_db(
-        self, db: aiosqlite.Connection
-    ) -> None:
-        """get_map_color_thresholds() returns default values on a fresh database."""
-        high, medium, low = await setup_service.get_map_color_thresholds(db)
-        assert high == 100
-        assert medium == 50
-        assert low == 20
-
-    async def test_set_map_color_thresholds_persists_values(
-        self, db: aiosqlite.Connection
-    ) -> None:
-        """set_map_color_thresholds() stores and retrieves custom values."""
-        await setup_service.set_map_color_thresholds(
-            db, threshold_high=200, threshold_medium=80, threshold_low=30
-        )
-        high, medium, low = await setup_service.get_map_color_thresholds(db)
-        assert high == 200
-        assert medium == 80
-        assert low == 30
-
-    async def test_set_map_color_thresholds_rejects_non_positive(
-        self, db: aiosqlite.Connection
-    ) -> None:
-        """set_map_color_thresholds() raises ValueError for non-positive thresholds."""
-        with pytest.raises(ValueError, match="positive integers"):
-            await setup_service.set_map_color_thresholds(
-                db, threshold_high=100, threshold_medium=50, threshold_low=0
-            )
-        with pytest.raises(ValueError, match="positive integers"):
-            await setup_service.set_map_color_thresholds(
-                db, threshold_high=-10, threshold_medium=50, threshold_low=20
-            )
-
-    async def test_set_map_color_thresholds_rejects_invalid_order(
-        self, db: aiosqlite.Connection
-    ) -> None:
-        """
-        set_map_color_thresholds() rejects invalid ordering.
-        """
-        with pytest.raises(ValueError, match="high > medium > low"):
-            await setup_service.set_map_color_thresholds(
-                db, threshold_high=50, threshold_medium=50, threshold_low=20
-            )
-        with pytest.raises(ValueError, match="high > medium > low"):
-            await setup_service.set_map_color_thresholds(
-                db, threshold_high=100, threshold_medium=30, threshold_low=50
-            )
-
-    async def test_run_setup_initializes_default_thresholds(
-        self, db: aiosqlite.Connection, tmp_path: Path
-    ) -> None:
-        """run_setup() initializes map color thresholds with defaults."""
-        await setup_service.run_setup(
-            db,
-            master_password="mypassword1",
-            database_path=str(tmp_path / "test.db"),
-            fail2ban_socket="/var/run/fail2ban/fail2ban.sock",
-            timezone="UTC",
-            session_duration_minutes=60,
-        )
-        high, medium, low = await setup_service.get_map_color_thresholds(db)
-        assert high == 100
-        assert medium == 50
-        assert low == 20
-
-
 class TestRunSetupAsync:
     """Verify the async/non-blocking bcrypt behavior of run_setup."""