Refactor geo re-resolve to use geo_cache repo and move data-access out of router

backend/app/services/history_service.py

@@ -13,16 +13,16 @@ from __future__ import annotations
 from datetime import UTC, datetime
 from typing import Any
 
-import aiosqlite
 import structlog
 
-from app.models.ban import BLOCKLIST_JAIL, BanOrigin, TIME_RANGE_SECONDS, TimeRange
+from app.models.ban import TIME_RANGE_SECONDS, TimeRange
 from app.models.history import (
     HistoryBanItem,
     HistoryListResponse,
     IpDetailResponse,
     IpTimelineEvent,
 )
+from app.repositories import fail2ban_db_repo
 from app.services.ban_service import _get_fail2ban_db_path, _parse_data_json, _ts_to_iso
 
 log: structlog.stdlib.BoundLogger = structlog.get_logger()
@@ -58,7 +58,6 @@ async def list_history(
     *,
     range_: TimeRange | None = None,
     jail: str | None = None,
-    origin: BanOrigin | None = None,
     ip_filter: str | None = None,
     page: int = 1,
     page_size: int = _DEFAULT_PAGE_SIZE,
@@ -74,8 +73,6 @@ async def list_history(
         socket_path: Path to the fail2ban Unix domain socket.
         range_: Time-range preset.  ``None`` means all-time (no time filter).
         jail: If given, restrict results to bans from this jail.
-        origin: Optional origin filter — ``"blocklist"`` restricts results to
-            the ``blocklist-import`` jail, ``"selfblock"`` excludes it.
         ip_filter: If given, restrict results to bans for this exact IP
             (or a prefix — the query uses ``LIKE ip_filter%``).
         page: 1-based page number (default: ``1``).
@@ -87,34 +84,11 @@ async def list_history(
         and the total matching count.
     """
     effective_page_size: int = min(page_size, _MAX_PAGE_SIZE)
-    offset: int = (page - 1) * effective_page_size
 
     # Build WHERE clauses dynamically.
-    wheres: list[str] = []
-    params: list[Any] = []
-
+    since: int | None = None
     if range_ is not None:
-        since: int = _since_unix(range_)
-        wheres.append("timeofban >= ?")
-        params.append(since)
-
-    if jail is not None:
-        wheres.append("jail = ?")
-        params.append(jail)
-
-    if origin is not None:
-        if origin == "blocklist":
-            wheres.append("jail = ?")
-            params.append(BLOCKLIST_JAIL)
-        elif origin == "selfblock":
-            wheres.append("jail != ?")
-            params.append(BLOCKLIST_JAIL)
-
-    if ip_filter is not None:
-        wheres.append("ip LIKE ?")
-        params.append(f"{ip_filter}%")
-
-    where_sql: str = ("WHERE " + " AND ".join(wheres)) if wheres else ""
+        since = _since_unix(range_)
 
     db_path: str = await _get_fail2ban_db_path(socket_path)
     log.info(
@@ -126,32 +100,22 @@ async def list_history(
         page=page,
     )
 
-    async with aiosqlite.connect(f"file:{db_path}?mode=ro", uri=True) as f2b_db:
-        f2b_db.row_factory = aiosqlite.Row
-
-        async with f2b_db.execute(
-            f"SELECT COUNT(*) FROM bans {where_sql}",  # noqa: S608
-            params,
-        ) as cur:
-            count_row = await cur.fetchone()
-            total: int = int(count_row[0]) if count_row else 0
-
-        async with f2b_db.execute(
-            f"SELECT jail, ip, timeofban, bancount, data "  # noqa: S608
-            f"FROM bans {where_sql} "
-            "ORDER BY timeofban DESC "
-            "LIMIT ? OFFSET ?",
-            [*params, effective_page_size, offset],
-        ) as cur:
-            rows = await cur.fetchall()
+    rows, total = await fail2ban_db_repo.get_history_page(
+        db_path=db_path,
+        since=since,
+        jail=jail,
+        ip_filter=ip_filter,
+        page=page,
+        page_size=effective_page_size,
+    )
 
     items: list[HistoryBanItem] = []
     for row in rows:
-        jail_name: str = str(row["jail"])
-        ip: str = str(row["ip"])
-        banned_at: str = _ts_to_iso(int(row["timeofban"]))
-        ban_count: int = int(row["bancount"])
-        matches, failures = _parse_data_json(row["data"])
+        jail_name: str = row.jail
+        ip: str = row.ip
+        banned_at: str = _ts_to_iso(row.timeofban)
+        ban_count: int = row.bancount
+        matches, failures = _parse_data_json(row.data)
 
         country_code: str | None = None
         country_name: str | None = None
@@ -216,16 +180,7 @@ async def get_ip_detail(
     db_path: str = await _get_fail2ban_db_path(socket_path)
     log.info("history_service_ip_detail", db_path=db_path, ip=ip)
 
-    async with aiosqlite.connect(f"file:{db_path}?mode=ro", uri=True) as f2b_db:
-        f2b_db.row_factory = aiosqlite.Row
-        async with f2b_db.execute(
-            "SELECT jail, ip, timeofban, bancount, data "
-            "FROM bans "
-            "WHERE ip = ? "
-            "ORDER BY timeofban DESC",
-            (ip,),
-        ) as cur:
-            rows = await cur.fetchall()
+    rows = await fail2ban_db_repo.get_history_for_ip(db_path=db_path, ip=ip)
 
     if not rows:
         return None
@@ -234,10 +189,10 @@ async def get_ip_detail(
     total_failures: int = 0
 
     for row in rows:
-        jail_name: str = str(row["jail"])
-        banned_at: str = _ts_to_iso(int(row["timeofban"]))
-        ban_count: int = int(row["bancount"])
-        matches, failures = _parse_data_json(row["data"])
+        jail_name: str = row.jail
+        banned_at: str = _ts_to_iso(row.timeofban)
+        ban_count: int = row.bancount
+        matches, failures = _parse_data_json(row.data)
         total_failures += failures
         timeline.append(
             IpTimelineEvent(