ServerKit is a lightweight, modern server control panel for managing web applications, databases, and services on your VPS or dedicated server. Built with Python/Flask backend and React frontend.
Python astracloudflarecontrol-panelcyberpaneldnsfablehosting-control-panelhosting-panelkimi-k3server-managementserverkitubuntu-web-panelwebserver
refactor(unify): §8 Phase B3 — global backup policy/run listing API
Juan Denisb90f6669d2a8
diff --git a/backend/app/api/backups.py b/backend/app/api/backups.pyindex 2494442e..f081c4a3 100644--- a/backend/app/api/backups.py+++ b/backend/app/api/backups.py@@ -29,6 +29,69 @@ def get_stats():return jsonify(stats), 200+@backups_bp.route('/policies', methods=['GET'])+@jwt_required()+@admin_required+def list_policies():+ """Global list of policy-driven backup schedules across every target type+ (§8 unification). Optional filters: ?target_type=, ?enabled=true|false.++ Replaces the legacy filesystem schedule list (/backups/schedules) for the+ unified Backups page — one queryable view of every BackupPolicy.+ """+ from app.models.backup_policy import BackupPolicy, VALID_TARGET_TYPES+ query = BackupPolicy.query+ target_type = request.args.get('target_type')+ if target_type:+ if target_type not in VALID_TARGET_TYPES:+ return jsonify({'error': f'invalid target_type {target_type!r}'}), 400+ query = query.filter_by(target_type=target_type)+ enabled = request.args.get('enabled')+ if enabled is not None:+ query = query.filter_by(enabled=str(enabled).lower() in ('1', 'true', 'yes'))+ policies = query.order_by(BackupPolicy.target_type, BackupPolicy.target_id).all()+ return jsonify({'policies': [p.to_dict() for p in policies]}), 200+++@backups_bp.route('/runs', methods=['GET'])+@jwt_required()+@admin_required+def list_runs():+ """Global, queryable list of backup runs across every policy (§8).++ Optional filters: ?target_type=, ?status=, ?policy_id=, ?limit= (<=500).+ Each run is augmented with its policy's target_type/target_id so the unified+ Backups page can render and filter without a second lookup.+ """+ from app.models.backup_policy import BackupPolicy+ from app.models.backup_run import BackupRun+ query = db.session.query(BackupRun, BackupPolicy).join(+ BackupPolicy, BackupRun.policy_id == BackupPolicy.id+ )+ target_type = request.args.get('target_type')+ if target_type:+ query = query.filter(BackupPolicy.target_type == target_type)+ status = request.args.get('status')+ if status:+ query = query.filter(BackupRun.status == status)+ policy_id = request.args.get('policy_id', type=int)+ if policy_id:+ query = query.filter(BackupRun.policy_id == policy_id)+ try:+ limit = min(int(request.args.get('limit', 200)), 500)+ except (TypeError, ValueError):+ limit = 200+ rows = query.order_by(BackupRun.started_at.desc()).limit(limit).all()+ runs = []+ for run, policy in rows:+ item = run.to_dict()+ item['target_type'] = policy.target_type+ item['target_id'] = policy.target_id+ item['target_subtype'] = policy.target_subtype+ runs.append(item)+ return jsonify({'runs': runs}), 200++@backups_bp.route('/config', methods=['GET'])@jwt_required()@admin_requireddiff --git a/backend/tests/test_backup_global_api.py b/backend/tests/test_backup_global_api.pynew file mode 100644index 00000000..b3babe4b--- /dev/null+++ b/backend/tests/test_backup_global_api.py@@ -0,0 +1,72 @@+"""§8 Phase B3 — global, queryable backup policy/run listing endpoints.++GET /api/v1/backups/policies and /api/v1/backups/runs give the unified Backups+page one cross-target view, replacing the legacy per-type filesystem scans.+"""+from datetime import datetime+++def _seed(app):+ from app import db+ from app.models.backup_policy import BackupPolicy+ from app.models.backup_run import BackupRun+ with app.app_context():+ app_policy = BackupPolicy(target_type='application', target_id=1, enabled=True)+ db_policy = BackupPolicy(target_type='database', target_id=2, target_subtype='mysql',+ enabled=False)+ db.session.add_all([app_policy, db_policy])+ db.session.commit()+ db.session.add(BackupRun(policy_id=app_policy.id, kind='full', status='success',+ started_at=datetime.utcnow(), size_local=100))+ db.session.add(BackupRun(policy_id=db_policy.id, kind='full', status='failed',+ started_at=datetime.utcnow(), size_local=0))+ db.session.commit()+ return app_policy.id, db_policy.id+++def test_list_policies_returns_all(app, client, auth_headers):+ _seed(app)+ res = client.get('/api/v1/backups/policies', headers=auth_headers)+ assert res.status_code == 200+ policies = res.get_json()['policies']+ types = {p['target_type'] for p in policies}+ assert {'application', 'database'} <= types+++def test_list_policies_filters_by_target_type(app, client, auth_headers):+ _seed(app)+ res = client.get('/api/v1/backups/policies?target_type=database', headers=auth_headers)+ assert res.status_code == 200+ policies = res.get_json()['policies']+ assert policies and all(p['target_type'] == 'database' for p in policies)+++def test_list_policies_filters_by_enabled(app, client, auth_headers):+ _seed(app)+ res = client.get('/api/v1/backups/policies?enabled=true', headers=auth_headers)+ assert res.status_code == 200+ policies = res.get_json()['policies']+ assert policies and all(p['enabled'] for p in policies)+++def test_list_policies_rejects_bad_target_type(app, client, auth_headers):+ _seed(app)+ res = client.get('/api/v1/backups/policies?target_type=bogus', headers=auth_headers)+ assert res.status_code == 400+++def test_list_runs_augments_target_info(app, client, auth_headers):+ _seed(app)+ res = client.get('/api/v1/backups/runs', headers=auth_headers)+ assert res.status_code == 200+ runs = res.get_json()['runs']+ assert len(runs) == 2+ assert all('target_type' in r and 'target_id' in r for r in runs)+++def test_list_runs_filters_by_status_and_type(app, client, auth_headers):+ _seed(app)+ res = client.get('/api/v1/backups/runs?target_type=database&status=failed', headers=auth_headers)+ assert res.status_code == 200+ runs = res.get_json()['runs']+ assert runs and all(r['target_type'] == 'database' and r['status'] == 'failed' for r in runs)