chore: commit local changes

backend/app/utils/config_file_utils.py

@@ -0,0 +1,21 @@
+"""Utilities re-exported from config_file_service for cross-module usage."""
+
+from __future__ import annotations
+
+from pathlib import Path
+
+from app.services.config_file_service import (
+    _build_inactive_jail,
+    _get_active_jail_names,
+    _ordered_config_files,
+    _parse_jails_sync,
+    _validate_jail_config_sync,
+)
+
+__all__ = [
+    "_ordered_config_files",
+    "_parse_jails_sync",
+    "_build_inactive_jail",
+    "_get_active_jail_names",
+    "_validate_jail_config_sync",
+]

backend/app/utils/jail_utils.py

@@ -0,0 +1,20 @@
+"""Jail helpers to decouple service layer dependencies."""
+
+from __future__ import annotations
+
+from collections.abc import Sequence
+
+from app.services.jail_service import reload_all
+
+
+async def reload_jails(
+    socket_path: str,
+    include_jails: Sequence[str] | None = None,
+    exclude_jails: Sequence[str] | None = None,
+) -> None:
+    """Reload fail2ban jails using shared jail service helper."""
+    await reload_all(
+        socket_path,
+        include_jails=list(include_jails) if include_jails is not None else None,
+        exclude_jails=list(exclude_jails) if exclude_jails is not None else None,
+    )

backend/app/utils/log_utils.py

@@ -0,0 +1,14 @@
+"""Log-related helpers to avoid direct service-to-service imports."""
+
+from __future__ import annotations
+
+from app.models.config import LogPreviewRequest, LogPreviewResponse, RegexTestRequest, RegexTestResponse
+from app.services.log_service import preview_log as _preview_log, test_regex as _test_regex
+
+
+async def preview_log(req: LogPreviewRequest) -> LogPreviewResponse:
+    return await _preview_log(req)
+
+
+def test_regex(req: RegexTestRequest) -> RegexTestResponse:
+    return _test_regex(req)

backend/app/utils/setup_utils.py

@@ -0,0 +1,47 @@
+"""Setup-related utilities shared by multiple services."""
+
+from __future__ import annotations
+
+from app.repositories import settings_repo
+
+_KEY_PASSWORD_HASH = "master_password_hash"
+_KEY_SETUP_DONE = "setup_completed"
+_KEY_MAP_COLOR_THRESHOLD_HIGH = "map_color_threshold_high"
+_KEY_MAP_COLOR_THRESHOLD_MEDIUM = "map_color_threshold_medium"
+_KEY_MAP_COLOR_THRESHOLD_LOW = "map_color_threshold_low"
+
+
+async def get_password_hash(db):
+    """Return the stored master password hash or None."""
+    return await settings_repo.get_setting(db, _KEY_PASSWORD_HASH)
+
+
+async def get_map_color_thresholds(db):
+    """Return map color thresholds as tuple (high, medium, low)."""
+    high = await settings_repo.get_setting(db, _KEY_MAP_COLOR_THRESHOLD_HIGH)
+    medium = await settings_repo.get_setting(db, _KEY_MAP_COLOR_THRESHOLD_MEDIUM)
+    low = await settings_repo.get_setting(db, _KEY_MAP_COLOR_THRESHOLD_LOW)
+
+    return (
+        int(high) if high else 100,
+        int(medium) if medium else 50,
+        int(low) if low else 20,
+    )
+
+
+async def set_map_color_thresholds(
+    db,
+    *,
+    threshold_high: int,
+    threshold_medium: int,
+    threshold_low: int,
+) -> None:
+    """Persist map color thresholds after validating values."""
+    if threshold_high <= 0 or threshold_medium <= 0 or threshold_low <= 0:
+        raise ValueError("All thresholds must be positive integers.")
+    if not (threshold_high > threshold_medium > threshold_low):
+        raise ValueError("Thresholds must satisfy: high > medium > low.")
+
+    await settings_repo.set_setting(db, _KEY_MAP_COLOR_THRESHOLD_HIGH, str(threshold_high))
+    await settings_repo.set_setting(db, _KEY_MAP_COLOR_THRESHOLD_MEDIUM, str(threshold_medium))
+    await settings_repo.set_setting(db, _KEY_MAP_COLOR_THRESHOLD_LOW, str(threshold_low))