Refactor blocklist schedule management into service

backend/app/routers/blocklist.py

@@ -28,12 +28,12 @@ import aiosqlite
 from fastapi import APIRouter, Depends, HTTPException, Query, status
 
 from app.dependencies import (
-    AppDep,
     AuthDep,
     Fail2BanSocketDep,
     GeoBatchLookupDep,
     HttpSessionDep,
     SchedulerDep,
+    SettingsDep,
     get_db,
 )
 from app.models.blocklist import (
@@ -48,7 +48,6 @@ from app.models.blocklist import (
     ScheduleInfo,
 )
 from app.services import blocklist_service, geo_service, jail_service
-from app.tasks import blocklist_import as blocklist_import_task
 
 router: APIRouter = APIRouter(prefix="/api/blocklists", tags=["Blocklists"])
 
@@ -162,7 +161,6 @@ async def get_schedule(
     The ``next_run_at`` field is read from APScheduler if the job is active.
 
     Args:
-        request: Incoming request (used to query the scheduler).
         db: Application database connection (injected).
         _auth: Validated session — enforces authentication.
 
@@ -170,12 +168,7 @@ async def get_schedule(
         :class:`~app.models.blocklist.ScheduleInfo` with config and run
         times.
     """
-    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()
-
-    return await blocklist_service.get_schedule_info(db, next_run_at)
+    return await blocklist_service.get_schedule_info_with_runtime(db, scheduler)
 
 
 @router.put(
@@ -188,29 +181,29 @@ async def update_schedule(
     db: DbDep,
     _auth: AuthDep,
     scheduler: SchedulerDep,
-    app: AppDep,
+    http_session: HttpSessionDep,
+    settings: SettingsDep,
 ) -> ScheduleInfo:
     """Persist a new schedule configuration and reschedule the import job.
 
     Args:
         payload: New :class:`~app.models.blocklist.ScheduleConfig`.
-        app: FastAPI application instance used to reschedule the import job.
         db: Application database connection (injected).
         _auth: Validated session — enforces authentication.
+        scheduler: Shared APScheduler instance (injected).
+        http_session: Shared HTTP session used by the scheduler job.
+        settings: Current application settings used by the scheduler job.
 
     Returns:
         Updated :class:`~app.models.blocklist.ScheduleInfo`.
     """
-    await blocklist_service.set_schedule(db, payload)
-    # Reschedule the background job immediately.
-    blocklist_import_task.reschedule(app)
-
-    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()
-
-    return await blocklist_service.get_schedule_info(db, next_run_at)
+    return await blocklist_service.update_schedule(
+        db,
+        scheduler,
+        http_session,
+        settings,
+        payload,
+    )
 
 
 @router.get(