backup

backend/app/routers/blocklist.py

@@ -30,7 +30,14 @@ if TYPE_CHECKING:
     import aiohttp
 from fastapi import APIRouter, Depends, HTTPException, Query, Request, status
 
-from app.dependencies import AuthDep, get_db
+from app.dependencies import (
+    AuthDep,
+    DbDep,
+    Fail2BanSocketDep,
+    HttpSessionDep,
+    SchedulerDep,
+    get_db,
+)
 from app.models.blocklist import (
     BlocklistListResponse,
     BlocklistSource,
@@ -117,6 +124,8 @@ async def run_import_now(
     request: Request,
     db: DbDep,
     _auth: AuthDep,
+    http_session: HttpSessionDep,
+    socket_path: Fail2BanSocketDep,
 ) -> ImportRunResult:
     """Download and apply all enabled blocklist sources immediately.
 
@@ -129,8 +138,6 @@ async def run_import_now(
         :class:`~app.models.blocklist.ImportRunResult` with per-source
         results and aggregated counters.
     """
-    http_session: aiohttp.ClientSession = request.app.state.http_session
-    socket_path: str = request.app.state.settings.fail2ban_socket
     from app.services import jail_service
 
     return await blocklist_service.import_all(
@@ -151,6 +158,7 @@ async def get_schedule(
     request: Request,
     db: DbDep,
     _auth: AuthDep,
+    scheduler: SchedulerDep,
 ) -> ScheduleInfo:
     """Return the current schedule configuration and runtime metadata.
 
@@ -165,7 +173,6 @@ async def get_schedule(
         :class:`~app.models.blocklist.ScheduleInfo` with config and run
         times.
     """
-    scheduler = request.app.state.scheduler
     job = scheduler.get_job(blocklist_import_task.JOB_ID)
     next_run_at: str | None = None
     if job is not None and job.next_run_time is not None:
@@ -184,6 +191,7 @@ async def update_schedule(
     request: Request,
     db: DbDep,
     _auth: AuthDep,
+    scheduler: SchedulerDep,
 ) -> ScheduleInfo:
     """Persist a new schedule configuration and reschedule the import job.
 
@@ -200,7 +208,7 @@ async def update_schedule(
     # Reschedule the background job immediately.
     blocklist_import_task.reschedule(request.app)
 
-    job = request.app.state.scheduler.get_job(blocklist_import_task.JOB_ID)
+    job = scheduler.get_job(blocklist_import_task.JOB_ID)
     next_run_at: str | None = None
     if job is not None and job.next_run_time is not None:
         next_run_at = job.next_run_time.isoformat()