IntelSight/Hetzner-Backup
3
0
Fork 0
Code Issues Pull-Requests Actions Pakete Projekte Releases Wiki Aktivität

Test zu Fake geändert, weil Namensproblem

Quellcode durchsuchen
Dieser Commit ist enthalten in:
UserIsMH
2025-06-21 17:22:12 +02:00
Ursprung fec588ba06
Commit 3d899b1c45
22 geänderte Dateien mit 614 neuen und 347 gelöschten Zeilen
Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

52
v2_adminpanel/routes/resource_routes.py
Datei anzeigen

@@ -28,9 +28,9 @@ def resources():
resource_type = request.args.get('type', 'all')
status_filter = request.args.get('status', 'all')
search_query = request.args.get('search', '')
show_test = request.args.get('show_test', 'false') == 'true'
show_fake = request.args.get('show_fake', 'false') == 'true'
logging.info(f"Filters: type={resource_type}, status={status_filter}, search={search_query}, show_test={show_test}")
logging.info(f"Filters: type={resource_type}, status={status_filter}, search={search_query}, show_fake={show_fake}")
# Basis-Query
query = """
@@ -39,7 +39,7 @@ def resources():
rp.resource_type,
rp.resource_value,
rp.status,
rp.is_test,
rp.is_fake,
rp.allocated_to_license,
rp.created_at,
rp.status_changed_at,
@@ -67,8 +67,8 @@ def resources():
query += " AND (rp.resource_value ILIKE %s OR c.name ILIKE %s)"
params.extend([f'%{search_query}%', f'%{search_query}%'])
if not show_test:
query += " AND rp.is_test = false"
if not show_fake:
query += " AND rp.is_fake = false"
query += " ORDER BY rp.resource_type, rp.resource_value"
@@ -84,7 +84,7 @@ def resources():
'resource_type': row[1],
'resource_value': row[2],
'status': row[3],
'is_test': row[4],
'is_fake': row[4],
'allocated_to_license': row[5],
'created_at': row[6],
'status_changed_at': row[7],
@@ -98,16 +98,16 @@ def resources():
SELECT
resource_type,
status,
is_test,
is_fake,
COUNT(*) as count
FROM resource_pools
"""
# Apply test filter to statistics as well
if not show_test:
stats_query += " WHERE is_test = false"
if not show_fake:
stats_query += " WHERE is_fake = false"
stats_query += " GROUP BY resource_type, status, is_test"
stats_query += " GROUP BY resource_type, status, is_fake"
cur.execute(stats_query)
@@ -115,7 +115,7 @@ def resources():
for row in cur.fetchall():
res_type = row[0]
status = row[1]
is_test = row[2]
is_fake = row[2]
count = row[3]
if res_type not in stats:
@@ -131,7 +131,7 @@ def resources():
stats[res_type]['total'] += count
stats[res_type][status] = stats[res_type].get(status, 0) + count
if is_test:
if is_fake:
stats[res_type]['test'] += count
else:
stats[res_type]['prod'] += count
@@ -160,7 +160,7 @@ def resources():
resource_type=resource_type,
status_filter=status_filter,
search=search_query, # Changed from search_query to search
show_test=show_test,
show_fake=show_fake,
total=total,
page=page,
total_pages=total_pages,
@@ -325,7 +325,7 @@ def resource_history(resource_id):
try:
# Hole Ressourcen-Info
cur.execute("""
SELECT resource_type, resource_value, status, is_test
SELECT resource_type, resource_value, status, is_fake
FROM resource_pools WHERE id = %s
""", (resource_id,))
resource = cur.fetchone()
@@ -369,7 +369,7 @@ def resource_history(resource_id):
'type': resource[0],
'value': resource[1],
'status': resource[2],
'is_test': resource[3]
'is_fake': resource[3]
},
history=history)
@@ -395,10 +395,10 @@ def resource_metrics():
SELECT
resource_type,
status,
is_test,
is_fake,
COUNT(*) as count
FROM resource_pools
GROUP BY resource_type, status, is_test
GROUP BY resource_type, status, is_fake
ORDER BY resource_type, status
""")
@@ -539,8 +539,8 @@ def resources_report():
COUNT(CASE WHEN status = 'available' THEN 1 END) as available,
COUNT(CASE WHEN status = 'allocated' THEN 1 END) as allocated,
COUNT(CASE WHEN status = 'quarantined' THEN 1 END) as quarantined,
COUNT(CASE WHEN is_test = true THEN 1 END) as test,
COUNT(CASE WHEN is_test = false THEN 1 END) as production
COUNT(CASE WHEN is_fake = true THEN 1 END) as test,
COUNT(CASE WHEN is_fake = false THEN 1 END) as production
FROM resource_pools
GROUP BY resource_type
ORDER BY resource_type
@@ -566,7 +566,7 @@ def resources_report():
rp.resource_type,
rp.resource_value,
rp.status,
rp.is_test,
rp.is_fake,
c.name as customer_name,
l.license_key,
rp.status_changed_at,
@@ -628,7 +628,7 @@ def add_resources():
try:
resource_type = request.form.get('resource_type')
resources_text = request.form.get('resources_text', '')
is_test = request.form.get('is_test', 'false') == 'true'
is_fake = request.form.get('is_fake', 'false') == 'true'
if not resource_type or not resources_text.strip():
flash('Bitte Ressourcentyp und Ressourcen angeben!', 'error')
@@ -686,9 +686,9 @@ def add_resources():
for resource in new_resources:
cur.execute("""
INSERT INTO resource_pools
(resource_type, resource_value, status, is_test, created_by)
(resource_type, resource_value, status, is_fake, created_by)
VALUES (%s, %s, 'available', %s, %s)
""", (resource_type, resource, is_test, session['username']))
""", (resource_type, resource, is_fake, session['username']))
added_count += 1
conn.commit()
@@ -706,7 +706,7 @@ def add_resources():
if invalid_resources:
flash(f'❌ {len(invalid_resources)} ungültige Ressourcen wurden ignoriert.', 'error')
return redirect(url_for('resources.resources', show_test=request.form.get('show_test', 'false')))
return redirect(url_for('resources.resources', show_fake=request.form.get('show_fake', 'false')))
except Exception as e:
conn.rollback()
@@ -717,5 +717,5 @@ def add_resources():
conn.close()
# GET request - show form
show_test = request.args.get('show_test', 'false') == 'true'
return render_template('add_resources.html', show_test=show_test)
show_fake = request.args.get('show_fake', 'false') == 'true'
return render_template('add_resources.html', show_fake=show_fake)