Round 3 fixes: cancelled polling, aggregator invalid_count, filter state, scheduler atomicity, HTTP exception handler, tests

app/api/routes/scheduler.py

@@ -4,37 +4,45 @@ from fastapi import APIRouter, Depends
 from app.services.scheduler_service import SchedulerService
 from app.repositories.settings_repo import SettingsRepository
 from app.core.db import get_db
-from app.api.deps import get_scheduler_service
+from app.api.deps import get_scheduler_service, get_settings_repo
 from app.api.common import success_response
 
 router = APIRouter(prefix="/api/scheduler", tags=["scheduler"])
-settings_repo = SettingsRepository()
 
 
-async def _save_auto_validate_setting(enabled: bool):
+async def _save_auto_validate_setting(enabled: bool, settings_repo: SettingsRepository):
     """保存自动验证设置"""
     async with get_db() as db:
-        settings = await settings_repo.get_all(db)
-        settings["auto_validate"] = enabled
-        from app.models.schemas import SettingsSchema
-        await settings_repo.save(db, SettingsSchema(**settings).model_dump())
+        await settings_repo.save(db, {"auto_validate": enabled})
 
 
 @router.post("/start")
-async def start_scheduler(scheduler: SchedulerService = Depends(get_scheduler_service)):
+async def start_scheduler(
+    scheduler: SchedulerService = Depends(get_scheduler_service),
+    settings_repo: SettingsRepository = Depends(get_settings_repo),
+):
     if scheduler.running:
         return success_response("验证调度器已在运行", {"running": True})
+    try:
+        await _save_auto_validate_setting(True, settings_repo)
+    except Exception:
+        return success_response("启动调度器失败（设置保存异常）", {"running": False})
     await scheduler.start()
-    await _save_auto_validate_setting(True)
     return success_response("验证调度器已启动", {"running": True})
 
 
 @router.post("/stop")
-async def stop_scheduler(scheduler: SchedulerService = Depends(get_scheduler_service)):
+async def stop_scheduler(
+    scheduler: SchedulerService = Depends(get_scheduler_service),
+    settings_repo: SettingsRepository = Depends(get_settings_repo),
+):
     if not scheduler.running:
         return success_response("验证调度器未运行", {"running": False})
+    try:
+        await _save_auto_validate_setting(False, settings_repo)
+    except Exception:
+        return success_response("停止调度器失败（设置保存异常）", {"running": True})
     await scheduler.stop()
-    await _save_auto_validate_setting(False)
     return success_response("验证调度器已停止", {"running": False})