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

50
v2_adminpanel/routes/api_routes.py
Datei anzeigen

@@ -25,7 +25,7 @@ def api_customers():
try:
# Get all customers (with optional search)
customers = get_customers(show_test=True, search=search)
customers = get_customers(show_fake=True, search=search)
# Pagination
start = (page - 1) * per_page
@@ -396,7 +396,7 @@ def bulk_delete_licenses():
for license_id in license_ids:
# Hole vollständige Lizenz-Info
cur.execute("""
SELECT l.id, l.license_key, l.is_active, l.is_test,
SELECT l.id, l.license_key, l.is_active, l.is_fake,
c.name as customer_name
FROM licenses l
LEFT JOIN customers c ON l.customer_id = c.id
@@ -407,7 +407,7 @@ def bulk_delete_licenses():
if not result:
continue
license_id, license_key, is_active, is_test, customer_name = result
license_id, license_key, is_active, is_fake, customer_name = result
# Safety check: Don't delete active licenses unless forced
if is_active and not force_delete:
@@ -601,7 +601,7 @@ def get_license_resources(license_id):
rp.id,
rp.resource_type,
rp.resource_value,
rp.is_test,
rp.is_fake,
rp.status_changed_at,
lr.assigned_at,
lr.assigned_by
@@ -617,7 +617,7 @@ def get_license_resources(license_id):
'id': row[0],
'type': row[1],
'value': row[2],
'is_test': row[3],
'is_fake': row[3],
'status_changed_at': row[4].isoformat() if row[4] else None,
'assigned_at': row[5].isoformat() if row[5] else None,
'assigned_by': row[6]
@@ -675,7 +675,7 @@ def allocate_resources():
try:
# Prüfe ob Ressource verfügbar ist
cur.execute("""
SELECT resource_value, status, is_test
SELECT resource_value, status, is_fake
FROM resource_pools
WHERE id = %s
""", (resource_id,))
@@ -690,8 +690,8 @@ def allocate_resources():
continue
# Prüfe Test/Produktion Kompatibilität
if resource[2] != license_data['is_test']:
errors.append(f"Ressource {resource[0]} ist {'Test' if resource[2] else 'Produktion'}, Lizenz ist {'Test' if license_data['is_test'] else 'Produktion'}")
if resource[2] != license_data['is_fake']:
errors.append(f"Ressource {resource[0]} ist {'Test' if resource[2] else 'Produktion'}, Lizenz ist {'Test' if license_data['is_fake'] else 'Produktion'}")
continue
# Weise Ressource zu
@@ -751,32 +751,32 @@ def check_resource_availability():
resource_type = request.args.get('type')
if resource_type:
count = int(request.args.get('count', 1))
is_test = request.args.get('is_test', 'false') == 'true'
show_test = request.args.get('show_test', 'false') == 'true'
is_fake = request.args.get('is_fake', 'false') == 'true'
show_fake = request.args.get('show_fake', 'false') == 'true'
conn = get_connection()
cur = conn.cursor()
try:
# Hole verfügbare Ressourcen mit Details
if show_test:
if show_fake:
# Zeige alle verfügbaren Ressourcen (Test und Produktion)
cur.execute("""
SELECT id, resource_value, is_test
SELECT id, resource_value, is_fake
FROM resource_pools
WHERE resource_type = %s
AND status = 'available'
ORDER BY is_test, resource_value
ORDER BY is_fake, resource_value
LIMIT %s
""", (resource_type, count))
else:
# Zeige nur Produktions-Ressourcen
cur.execute("""
SELECT id, resource_value, is_test
SELECT id, resource_value, is_fake
FROM resource_pools
WHERE resource_type = %s
AND status = 'available'
AND is_test = false
AND is_fake = false
ORDER BY resource_value
LIMIT %s
""", (resource_type, count))
@@ -786,7 +786,7 @@ def check_resource_availability():
available_resources.append({
'id': row[0],
'value': row[1],
'is_test': row[2]
'is_fake': row[2]
})
return jsonify({
@@ -794,7 +794,7 @@ def check_resource_availability():
'requested': count,
'available': available_resources,
'sufficient': len(available_resources) >= count,
'show_test': show_test
'show_fake': show_fake
})
except Exception as e:
@@ -808,7 +808,7 @@ def check_resource_availability():
domain_count = int(request.args.get('domain', 0))
ipv4_count = int(request.args.get('ipv4', 0))
phone_count = int(request.args.get('phone', 0))
is_test = request.args.get('is_test', 'false') == 'true'
is_fake = request.args.get('is_fake', 'false') == 'true'
conn = get_connection()
cur = conn.cursor()
@@ -823,8 +823,8 @@ def check_resource_availability():
FROM resource_pools
WHERE resource_type = 'domain'
AND status = 'available'
AND is_test = %s
""", (is_test,))
AND is_fake = %s
""", (is_fake,))
domain_available = cur.fetchone()[0]
# IPv4
@@ -833,8 +833,8 @@ def check_resource_availability():
FROM resource_pools
WHERE resource_type = 'ipv4'
AND status = 'available'
AND is_test = %s
""", (is_test,))
AND is_fake = %s
""", (is_fake,))
ipv4_available = cur.fetchone()[0]
# Phones
@@ -843,8 +843,8 @@ def check_resource_availability():
FROM resource_pools
WHERE resource_type = 'phone'
AND status = 'available'
AND is_test = %s
""", (is_test,))
AND is_fake = %s
""", (is_fake,))
phone_available = cur.fetchone()[0]
return jsonify({
@@ -862,7 +862,7 @@ def check_resource_availability():
ipv4_available >= ipv4_count and
phone_available >= phone_count
),
'is_test': is_test
'is_fake': is_fake
})
except Exception as e: