Refactor blocklist schedule management into service

backend/app/services/blocklist_service.py

@@ -30,6 +30,7 @@ from app.models.blocklist import (
     ImportSourceResult,
     PreviewResponse,
     ScheduleConfig,
+    ScheduleFrequency,
     ScheduleInfo,
 )
 from app.repositories import blocklist_repo, import_log_repo, settings_repo
@@ -40,7 +41,9 @@ if TYPE_CHECKING:
 
     import aiohttp
     import aiosqlite
+    from apscheduler.schedulers.asyncio import AsyncIOScheduler
 
+    from app.config import Settings
     from app.models.geo import GeoBatchLookup
 
 log: structlog.stdlib.BoundLogger = structlog.get_logger()
@@ -505,6 +508,66 @@ async def import_all(
 
 _DEFAULT_SCHEDULE = ScheduleConfig()
 
+#: Stable APScheduler job id for the blocklist import job.
+JOB_ID: str = "blocklist_import"
+
+
+def _get_job_next_run_at(scheduler: AsyncIOScheduler) -> str | None:
+    """Return the next scheduled run time as an ISO 8601 string."""
+    job = scheduler.get_job(JOB_ID)
+    if job is None or job.next_run_time is None:
+        return None
+    return job.next_run_time.isoformat()
+
+
+def schedule_blocklist_job(
+    scheduler: AsyncIOScheduler,
+    settings: Settings,
+    http_session: aiohttp.ClientSession,
+    config: ScheduleConfig,
+) -> None:
+    """Register or replace the scheduled blocklist import job."""
+    from app.tasks import blocklist_import as blocklist_import_task
+
+    if scheduler.get_job(JOB_ID):
+        scheduler.remove_job(JOB_ID)
+
+    kwargs: dict[str, object] = {
+        "settings": settings,
+        "http_session": http_session,
+    }
+
+    if config.frequency == ScheduleFrequency.hourly:
+        trigger_type = "interval"
+        trigger_kwargs = {"hours": config.interval_hours}
+    elif config.frequency == ScheduleFrequency.weekly:
+        trigger_type = "cron"
+        trigger_kwargs = {
+            "day_of_week": config.day_of_week,
+            "hour": config.hour,
+            "minute": config.minute,
+        }
+    else:
+        trigger_type = "cron"
+        trigger_kwargs = {
+            "hour": config.hour,
+            "minute": config.minute,
+        }
+
+    scheduler.add_job(
+        blocklist_import_task._run_import_with_resources,
+        trigger=trigger_type,
+        id=JOB_ID,
+        kwargs=kwargs,
+        **trigger_kwargs,
+    )
+    log.info(
+        "blocklist_import_scheduled",
+        frequency=config.frequency,
+        trigger=trigger_type,
+        trigger_kwargs=trigger_kwargs,
+    )
+
 
 async def get_schedule(db: aiosqlite.Connection) -> ScheduleConfig:
     """Read the import schedule config from the settings table.
@@ -576,6 +639,28 @@ async def get_schedule_info(
     )
 
 
+async def get_schedule_info_with_runtime(
+    db: aiosqlite.Connection,
+    scheduler: AsyncIOScheduler,
+) -> ScheduleInfo:
+    """Return schedule info enriched with runtime scheduler metadata."""
+    next_run_at = _get_job_next_run_at(scheduler)
+    return await get_schedule_info(db, next_run_at)
+
+
+async def update_schedule(
+    db: aiosqlite.Connection,
+    scheduler: AsyncIOScheduler,
+    http_session: aiohttp.ClientSession,
+    settings: Settings,
+    config: ScheduleConfig,
+) -> ScheduleInfo:
+    """Persist a new schedule config and re-register the scheduled job."""
+    await set_schedule(db, config)
+    schedule_blocklist_job(scheduler, settings, http_session, config)
+    return await get_schedule_info(db, _get_job_next_run_at(scheduler))
+
+
 async def list_import_logs(
     db: aiosqlite.Connection,
     *,