core/Projektarbeit-MYP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

📚 Improved logging structure & efficiency across backend logs 🚀

Browse Source
This commit is contained in:
Till Tomczak
2025-06-01 18:01:23 +02:00
parent 5ad80ff995
commit 361901eefe
22 changed files with 806 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
backend/app.py
View File

@@ -1513,7 +1513,7 @@ def user_update_profile_api():
data = request.get_json()
db_session = get_db_session()
user = db_session.query(User).filter(User.id == int(current_user.id)).first()
user = db_session.get(User, int(current_user.id))
if not user:
db_session.close()
@@ -2669,7 +2669,7 @@ def toggle_printer_power(printer_id):
# Standard-Zustand ermitteln (Toggle-Verhalten)
db_session = get_db_session()
printer = db_session.get(Printer, printer_id) # Modernized from query().get()
printer = db_session.get(Printer, printer_id)
if not printer:
db_session.close()
@@ -2730,7 +2730,7 @@ def test_printer_tapo_connection(printer_id):
"""
try:
db_session = get_db_session()
printer = db_session.query(Printer).get(printer_id)
printer = db_session.get(Printer, printer_id)
if not printer:
db_session.close()
@@ -3103,7 +3103,7 @@ def admin_update_user_form(user_id):
db_session = get_db_session()
user = db_session.query(User).get(user_id)
user = db_session.get(User, user_id)
if not user:
db_session.close()
flash("Benutzer nicht gefunden.", "error")
@@ -3174,7 +3174,7 @@ def admin_update_printer_form(printer_id):
db_session = get_db_session()
printer = db_session.query(Printer).get(printer_id)
printer = db_session.get(Printer, printer_id)
if not printer:
db_session.close()
flash("Drucker nicht gefunden.", "error")
@@ -3373,7 +3373,7 @@ def upload_avatar():
# Alte Avatar-Datei löschen falls vorhanden
db_session = get_db_session()
user = db_session.query(User).get(current_user.id)
user = db_session.get(User, current_user.id)
if user and user.avatar_path:
delete_file_safe(user.avatar_path)
@@ -3833,7 +3833,7 @@ def delete_job(job_id):
"""Löscht einen Job."""
try:
db_session = get_db_session()
job = db_session.query(Job).get(job_id)
job = db_session.get(Job, job_id)
if not job:
db_session.close()
@@ -3963,7 +3963,7 @@ def create_job():
db_session = get_db_session()
# Prüfen, ob der Drucker existiert
printer = db_session.query(Printer).get(printer_id)
printer = db_session.get(Printer, printer_id)
if not printer:
db_session.close()
return jsonify({"error": "Drucker nicht gefunden"}), 404
@@ -4016,7 +4016,7 @@ def update_job(job_id):
data = request.json
db_session = get_db_session()
job = db_session.query(Job).get(job_id)
job = db_session.get(Job, job_id)
if not job:
db_session.close()
@@ -4626,7 +4626,7 @@ def approve_guest_request(request_id):
try:
db_session = get_db_session()
guest_request = db_session.query(GuestRequest).filter(GuestRequest.id == request_id).first()
guest_request = db_session.get(GuestRequest, request_id)
if not guest_request:
db_session.close()
@@ -4656,7 +4656,7 @@ def approve_guest_request(request_id):
# Falls Drucker zugewiesen werden soll
if printer_id:
printer = db_session.query(Printer).filter(Printer.id == printer_id).first()
printer = db_session.get(Printer, printer_id)
if printer:
guest_request.assigned_printer_id = printer_id
@@ -4706,7 +4706,7 @@ def reject_guest_request(request_id):
try:
db_session = get_db_session()
guest_request = db_session.query(GuestRequest).filter(GuestRequest.id == request_id).first()
guest_request = db_session.get(GuestRequest, request_id)
if not guest_request:
db_session.close()
@@ -4773,7 +4773,7 @@ def delete_guest_request(request_id):
try:
db_session = get_db_session()
guest_request = db_session.query(GuestRequest).filter(GuestRequest.id == request_id).first()
guest_request = db_session.get(GuestRequest, request_id)
if not guest_request:
db_session.close()
@@ -4817,7 +4817,7 @@ def get_guest_request_detail(request_id):
try:
db_session = get_db_session()
guest_request = db_session.query(GuestRequest).filter(GuestRequest.id == request_id).first()
guest_request = db_session.get(GuestRequest, request_id)
if not guest_request:
db_session.close()
@@ -4860,18 +4860,18 @@ def get_guest_request_detail(request_id):
# Bearbeiter-Informationen hinzufügen
if guest_request.approved_by:
approved_by_user = db_session.query(User).filter(User.id == guest_request.approved_by).first()
approved_by_user = db_session.get(User, guest_request.approved_by)
if approved_by_user:
request_data['approved_by_name'] = approved_by_user.name or approved_by_user.username
if guest_request.rejected_by:
rejected_by_user = db_session.query(User).filter(User.id == guest_request.rejected_by).first()
rejected_by_user = db_session.get(User, guest_request.rejected_by)
if rejected_by_user:
request_data['rejected_by_name'] = rejected_by_user.name or rejected_by_user.username
# Zugewiesener Drucker
if hasattr(guest_request, 'assigned_printer_id') and guest_request.assigned_printer_id:
assigned_printer = db_session.query(Printer).filter(Printer.id == guest_request.assigned_printer_id).first()
assigned_printer = db_session.get(Printer, guest_request.assigned_printer_id)
if assigned_printer:
request_data['assigned_printer'] = {
'id': assigned_printer.id,