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

Unnötige Reddis und Rabbit MQ entfernt

Quellcode durchsuchen
Dieser Commit ist enthalten in:
UserIsMH
2025-06-21 18:34:48 +02:00
Ursprung e6799c698e
Commit 1e6012a1e6
11 geänderte Dateien mit 186 neuen und 88 gelöschten Zeilen
Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

8
v2_adminpanel/routes/api_routes.py
Datei anzeigen

@@ -37,7 +37,8 @@ def api_customers():
for customer in paginated_customers:
results.append({
'id': customer['id'],
'text': f"{customer['name']} ({customer['email'] or 'keine E-Mail'})"
'text': f"{customer['name']} ({customer['email'] or 'keine E-Mail'})",
'is_fake': customer.get('is_fake', False) # Include the is_fake field
})
return jsonify({
@@ -913,7 +914,7 @@ def global_search():
# Suche in Kunden
cur.execute("""
SELECT id, name, email
SELECT id, name, email, is_fake
FROM customers
WHERE name ILIKE %s OR email ILIKE %s
LIMIT 10
@@ -923,7 +924,8 @@ def global_search():
results['customers'].append({
'id': row[0],
'name': row[1],
'email': row[2]
'email': row[2],
'is_fake': row[3]
})
# Suche in Ressourcen

25
v2_adminpanel/routes/batch_routes.py
Datei anzeigen

@@ -42,20 +42,21 @@ def batch_create():
valid_from = request.form['valid_from']
valid_until = request.form['valid_until']
device_limit = int(request.form['device_limit'])
is_fake = 'is_fake' in request.form
# Validierung
if count < 1 or count > 100:
flash('Anzahl muss zwischen 1 und 100 liegen!', 'error')
return redirect(url_for('batch.batch_create'))
# Hole Kundendaten
cur.execute("SELECT name, email FROM customers WHERE id = %s", (customer_id,))
# Hole Kundendaten inkl. is_fake Status
cur.execute("SELECT name, email, is_fake FROM customers WHERE id = %s", (customer_id,))
customer = cur.fetchone()
if not customer:
flash('Kunde nicht gefunden!', 'error')
return redirect(url_for('batch.batch_create'))
# Lizenz erbt immer den is_fake Status vom Kunden
is_fake = customer[2]
created_licenses = []
# Erstelle Lizenzen
@@ -315,21 +316,27 @@ def batch_import():
if not customer:
# Erstelle neuen Kunden
name = row.get('customer_name', email.split('@')[0])
# Neue Kunden werden immer als Fake erstellt in der Testphase
# TODO: Nach Testphase muss hier die Business-Logik angepasst werden
is_fake = True
cur.execute("""
INSERT INTO customers (name, email, created_at)
VALUES (%s, %s, %s)
INSERT INTO customers (name, email, is_fake, created_at)
VALUES (%s, %s, %s, %s)
RETURNING id
""", (name, email, datetime.now()))
""", (name, email, is_fake, datetime.now()))
customer_id = cur.fetchone()[0]
customer_name = name
else:
customer_id = customer[0]
customer_name = customer[1]
# Hole is_fake Status vom existierenden Kunden
cur.execute("SELECT is_fake FROM customers WHERE id = %s", (customer_id,))
is_fake = cur.fetchone()[0]
# Generiere Lizenzschlüssel
license_key = row.get('license_key', generate_license_key())
# Erstelle Lizenz
# Erstelle Lizenz - is_fake wird vom Kunden geerbt
cur.execute("""
INSERT INTO licenses (
license_key, customer_id,
@@ -340,7 +347,7 @@ def batch_import():
""", (
license_key, customer_id,
row['license_type'], row['valid_from'], row['valid_until'],
int(row['device_limit']), row.get('is_fake', False),
int(row['device_limit']), is_fake,
datetime.now()
))

3
v2_adminpanel/routes/customer_routes.py
Datei anzeigen

@@ -415,7 +415,8 @@ def api_customer_licenses(customer_id):
'customer': {
'id': customer['id'],
'name': customer['name'],
'email': customer['email']
'email': customer['email'],
'is_fake': customer.get('is_fake', False) # Include the is_fake field
},
'licenses': licenses
})

16
v2_adminpanel/routes/license_routes.py
Datei anzeigen

@@ -117,14 +117,13 @@ def edit_license(license_id):
'valid_from': request.form['valid_from'],
'valid_until': request.form['valid_until'],
'is_active': 'is_active' in request.form,
'is_fake': 'is_fake' in request.form,
'device_limit': int(request.form.get('device_limit', 3))
}
cur.execute("""
UPDATE licenses
SET license_key = %s, license_type = %s, valid_from = %s,
valid_until = %s, is_active = %s, is_fake = %s, device_limit = %s
valid_until = %s, is_active = %s, device_limit = %s
WHERE id = %s
""", (
new_values['license_key'],
@@ -132,7 +131,6 @@ def edit_license(license_id):
new_values['valid_from'],
new_values['valid_until'],
new_values['is_active'],
new_values['is_fake'],
new_values['device_limit'],
license_id
))
@@ -147,7 +145,6 @@ def edit_license(license_id):
'valid_from': str(current_license.get('valid_from', '')),
'valid_until': str(current_license.get('valid_until', '')),
'is_active': current_license.get('is_active'),
'is_fake': current_license.get('is_fake'),
'device_limit': current_license.get('device_limit', 3)
},
new_values=new_values)
@@ -286,7 +283,7 @@ def create_license():
license_key = request.form["license_key"].upper() # Immer Großbuchstaben
license_type = request.form["license_type"]
valid_from = request.form["valid_from"]
is_fake = request.form.get("is_fake") == "on" # Checkbox value
# is_fake wird später vom Kunden geerbt
# Berechne valid_until basierend auf Laufzeit
duration = int(request.form.get("duration", 1))
@@ -338,7 +335,9 @@ def create_license():
flash(f'E-Mail bereits vergeben für Kunde: {existing[1]}', 'error')
return redirect(url_for('licenses.create_license'))
# Kunde einfügen (erbt Test-Status von Lizenz)
# Neuer Kunde wird immer als Fake erstellt, da wir in der Testphase sind
# TODO: Nach Testphase muss hier die Business-Logik angepasst werden
is_fake = True
cur.execute("""
INSERT INTO customers (name, email, is_fake, created_at)
VALUES (%s, %s, %s, NOW())
@@ -359,9 +358,8 @@ def create_license():
return redirect(url_for('licenses.create_license'))
customer_info = {'name': customer_data[0], 'email': customer_data[1]}
# Wenn Kunde Test-Kunde ist, Lizenz auch als Test markieren
if customer_data[2]: # is_fake des Kunden
is_fake = True
# Lizenz erbt immer den is_fake Status vom Kunden
is_fake = customer_data[2]
# Lizenz hinzufügen
cur.execute("""

4
v2_adminpanel/routes/monitoring_routes.py
Datei anzeigen

@@ -191,11 +191,7 @@ def system_status():
# Check each service
service_checks = [
{'name': 'License Server', 'url': 'http://license-server:8443/health', 'port': 8443},
{'name': 'Auth Service', 'url': 'http://auth-service:5001/health', 'port': 5001},
{'name': 'Analytics Service', 'url': 'http://analytics-service:5003/health', 'port': 5003},
{'name': 'Admin API Service', 'url': 'http://admin-api-service:5004/health', 'port': 5004},
{'name': 'PostgreSQL', 'check': 'database'},
{'name': 'Redis', 'url': 'http://redis:6379', 'check': 'redis'},
]
for service in service_checks: