feat: add operational sync controls
This commit is contained in:
78
app/web/operations.py
Normal file
78
app/web/operations.py
Normal file
@@ -0,0 +1,78 @@
|
||||
from fastapi import APIRouter, Form, Request
|
||||
from fastapi.responses import HTMLResponse
|
||||
from sqlalchemy import func, select
|
||||
|
||||
from app.auth.admin import require_admin
|
||||
from app.auth.csrf import ensure_csrf_token, validate_csrf
|
||||
from app.db.models import Activity
|
||||
from app.db.repositories import UserRepository
|
||||
from app.sync.manager import SyncAlreadyRunning
|
||||
from app.web.routes import templates
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
APP_VERSION = "1.0.0"
|
||||
|
||||
|
||||
def _normalize_outcome(item):
|
||||
if isinstance(item, Exception):
|
||||
return {
|
||||
"status": "error",
|
||||
"user_id": None,
|
||||
"discovered": 0,
|
||||
"imported": 0,
|
||||
"skipped": 0,
|
||||
"failed": 0,
|
||||
"message": str(item),
|
||||
}
|
||||
return {
|
||||
"status": item.status,
|
||||
"user_id": item.user_id,
|
||||
"discovered": item.discovered,
|
||||
"imported": item.imported,
|
||||
"skipped": item.skipped,
|
||||
"failed": item.failed,
|
||||
"message": item.message,
|
||||
}
|
||||
|
||||
|
||||
@router.post("/users/{user_id}/sync", response_class=HTMLResponse)
|
||||
async def manual_sync(request: Request, user_id: int, csrf_token: str = Form(...)):
|
||||
require_admin(request)
|
||||
validate_csrf(request, csrf_token)
|
||||
try:
|
||||
outcome = await request.app.state.sync_manager.sync_user(user_id)
|
||||
except SyncAlreadyRunning:
|
||||
return HTMLResponse("Sync already running for this user", status_code=409)
|
||||
return templates.TemplateResponse(
|
||||
request, "fragments/sync_result.html", {"outcomes": [_normalize_outcome(outcome)]}
|
||||
)
|
||||
|
||||
|
||||
@router.post("/sync-all", response_class=HTMLResponse)
|
||||
async def manual_sync_all(request: Request, csrf_token: str = Form(...)):
|
||||
require_admin(request)
|
||||
validate_csrf(request, csrf_token)
|
||||
outcomes = await request.app.state.sync_manager.sync_all_enabled()
|
||||
return templates.TemplateResponse(
|
||||
request, "fragments/sync_result.html", {"outcomes": [_normalize_outcome(o) for o in outcomes]}
|
||||
)
|
||||
|
||||
|
||||
@router.get("/system", response_class=HTMLResponse)
|
||||
def system_page(request: Request):
|
||||
require_admin(request)
|
||||
settings = request.app.state.settings
|
||||
scheduler = request.app.state.scheduler
|
||||
with request.app.state.session_factory() as session:
|
||||
user_count = len(UserRepository(session).list_all())
|
||||
activity_count = session.scalar(select(func.count()).select_from(Activity)) or 0
|
||||
return templates.TemplateResponse(request, "system.html", {
|
||||
"csrf_token": ensure_csrf_token(request),
|
||||
"app_version": APP_VERSION,
|
||||
"sync_interval_minutes": settings.sync_interval_minutes,
|
||||
"last_tick": scheduler.last_tick,
|
||||
"next_tick": scheduler.next_tick,
|
||||
"user_count": user_count,
|
||||
"activity_count": activity_count,
|
||||
})
|
||||
@@ -62,11 +62,11 @@ def login(
|
||||
def dashboard(request: Request):
|
||||
require_admin(request)
|
||||
with request.app.state.session_factory() as session:
|
||||
users = UserRepository(session).list_all()
|
||||
rows = UserRepository(session).dashboard_rows()
|
||||
return templates.TemplateResponse(
|
||||
request,
|
||||
"dashboard.html",
|
||||
{"users": users, "csrf_token": ensure_csrf_token(request)},
|
||||
{"rows": rows, "csrf_token": ensure_csrf_token(request)},
|
||||
)
|
||||
|
||||
|
||||
|
||||
@@ -4,13 +4,28 @@
|
||||
|
||||
{% block content %}
|
||||
<h1>Dashboard</h1>
|
||||
<p><a href="/users/new">Add user</a></p>
|
||||
<p><a href="/users/new">Add user</a> | <a href="/system">System</a></p>
|
||||
|
||||
<form method="post" action="/sync-all">
|
||||
<input type="hidden" name="csrf_token" value="{{ csrf_token }}">
|
||||
<button type="submit">Sync all now</button>
|
||||
</form>
|
||||
|
||||
<ul>
|
||||
{% for user in users %}
|
||||
{% for row in rows %}
|
||||
<li>
|
||||
<a href="/users/{{ user.id }}">{{ user.name }}</a>
|
||||
— {{ "enabled" if user.enabled else "disabled" }}
|
||||
— {{ user.health_state.value }}
|
||||
<a href="/users/{{ row.id }}">{{ row.name }}</a>
|
||||
— {{ "enabled" if row.enabled else "disabled" }}
|
||||
— {{ row.health_state }}
|
||||
— last sync: {{ row.last_sync_at or "-" }}
|
||||
— last activity: {{ row.last_activity_name or "-" }} ({{ row.last_activity_status or "-" }})
|
||||
{% if row.action_reason == "garmin_mfa_required" %}
|
||||
<span class="action-required">Garmin MFA required — <a href="/users/{{ row.id }}">resolve</a></span>
|
||||
{% endif %}
|
||||
<form method="post" action="/users/{{ row.id }}/sync" style="display:inline">
|
||||
<input type="hidden" name="csrf_token" value="{{ csrf_token }}">
|
||||
<button type="submit">Sync now</button>
|
||||
</form>
|
||||
</li>
|
||||
{% else %}
|
||||
<li>No users yet.</li>
|
||||
|
||||
17
app/web/templates/fragments/sync_result.html
Normal file
17
app/web/templates/fragments/sync_result.html
Normal file
@@ -0,0 +1,17 @@
|
||||
<ul>
|
||||
{% for outcome in outcomes %}
|
||||
<li>
|
||||
User {{ outcome.user_id if outcome.user_id is not none else "unknown" }}:
|
||||
status={{ outcome.status }}
|
||||
discovered={{ outcome.discovered }}
|
||||
imported={{ outcome.imported }}
|
||||
skipped={{ outcome.skipped }}
|
||||
failed={{ outcome.failed }}
|
||||
{% if outcome.message %}
|
||||
— {{ outcome.message }}
|
||||
{% endif %}
|
||||
</li>
|
||||
{% else %}
|
||||
<li>No outcomes.</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
33
app/web/templates/system.html
Normal file
33
app/web/templates/system.html
Normal file
@@ -0,0 +1,33 @@
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block title %}System - MyWhoosh Garmin Sync{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h1>System</h1>
|
||||
<p><a href="/">Back to dashboard</a></p>
|
||||
|
||||
<dl>
|
||||
<dt>Application version</dt>
|
||||
<dd>{{ app_version }}</dd>
|
||||
|
||||
<dt>Sync interval (minutes)</dt>
|
||||
<dd>{{ sync_interval_minutes }}</dd>
|
||||
|
||||
<dt>Last scheduler tick</dt>
|
||||
<dd>{{ last_tick or "-" }}</dd>
|
||||
|
||||
<dt>Next scheduler tick</dt>
|
||||
<dd>{{ next_tick or "-" }}</dd>
|
||||
|
||||
<dt>User count</dt>
|
||||
<dd>{{ user_count }}</dd>
|
||||
|
||||
<dt>Activity count</dt>
|
||||
<dd>{{ activity_count }}</dd>
|
||||
</dl>
|
||||
|
||||
<form method="post" action="/sync-all">
|
||||
<input type="hidden" name="csrf_token" value="{{ csrf_token }}">
|
||||
<button type="submit">Sync all now</button>
|
||||
</form>
|
||||
{% endblock %}
|
||||
Reference in New Issue
Block a user