Task 13: move ban_ip, unban_ip, and get_active_bans from jail_service to ban_service and update routers/tests

backend/app/routers/bans.py

@@ -22,7 +22,7 @@ from app.dependencies import (
 from app.exceptions import JailNotFoundError, JailOperationError
 from app.models.ban import ActiveBanListResponse, BanRequest, UnbanAllResponse, UnbanRequest
 from app.models.jail import JailCommandResponse
-from app.services import jail_service
+from app.services import ban_service, jail_service
 from app.exceptions import Fail2BanConnectionError
 
 router: APIRouter = APIRouter(prefix="/api/bans", tags=["Bans"])
@@ -72,7 +72,7 @@ async def get_active_bans(
         HTTPException: 502 when fail2ban is unreachable.
     """
     try:
-        return await jail_service.get_active_bans(
+        return await ban_service.get_active_bans(
             socket_path,
             geo_batch_lookup=geo_batch_lookup,
             http_session=http_session,
@@ -114,7 +114,7 @@ async def ban_ip(
         HTTPException: 502 when fail2ban is unreachable.
     """
     try:
-        await jail_service.ban_ip(socket_path, body.jail, body.ip)
+        await ban_service.ban_ip(socket_path, body.jail, body.ip)
         return JailCommandResponse(
             message=f"IP {body.ip!r} banned in jail {body.jail!r}.",
             jail=body.jail,
@@ -174,7 +174,7 @@ async def unban_ip(
     target_jail: str | None = None if (body.unban_all or body.jail is None) else body.jail
 
     try:
-        await jail_service.unban_ip(socket_path, body.ip, jail=target_jail)
+        await ban_service.unban_ip(socket_path, body.ip, jail=target_jail)
         scope = f"jail {target_jail!r}" if target_jail else "all jails"
         return JailCommandResponse(
             message=f"IP {body.ip!r} unbanned from {scope}.",

backend/app/routers/blocklist.py

@@ -44,7 +44,7 @@ from app.models.blocklist import (
     ScheduleConfig,
     ScheduleInfo,
 )
-from app.services import blocklist_service, geo_service, jail_service
+from app.services import ban_service, blocklist_service, geo_service
 from app.tasks.blocklist_import import run_import_with_resources
 
 router: APIRouter = APIRouter(prefix="/api/blocklists", tags=["Blocklists"])
@@ -138,7 +138,7 @@ async def run_import_now(
         socket_path,
         geo_is_cached=geo_service.is_cached,
         geo_batch_lookup=geo_batch_lookup,
-        ban_ip=jail_service.ban_ip,
+        ban_ip=ban_service.ban_ip,
     )