"feat: Implement guest job application flow"
This commit is contained in:
@@ -1,4 +1,6 @@
|
||||
import json
|
||||
import secrets
|
||||
import bcrypt
|
||||
from datetime import datetime, timedelta
|
||||
from flask import Blueprint, render_template, request, jsonify, redirect, url_for, abort, session, flash
|
||||
from flask_login import current_user, login_required
|
||||
@@ -41,6 +43,36 @@ def guest_request_form():
|
||||
db_session.expunge_all()
|
||||
return render_template('guest_request.html', printers=printers)
|
||||
|
||||
@guest_blueprint.route('/start-job', methods=['GET'])
|
||||
def guest_start_job_form():
|
||||
"""Code-Eingabe-Formular für Gäste anzeigen."""
|
||||
return render_template('guest_start_job.html')
|
||||
|
||||
@guest_blueprint.route('/job/<int:job_id>/status', methods=['GET'])
|
||||
def guest_job_status(job_id):
|
||||
"""Job-Status-Seite für Gäste anzeigen."""
|
||||
with get_cached_session() as db_session:
|
||||
# Job mit eager loading des printer-Relationships laden
|
||||
job = db_session.query(Job).options(
|
||||
joinedload(Job.printer),
|
||||
joinedload(Job.user)
|
||||
).filter_by(id=job_id).first()
|
||||
|
||||
if not job:
|
||||
abort(404, "Job nicht gefunden")
|
||||
|
||||
# Zugehörige Gastanfrage finden
|
||||
guest_request = db_session.query(GuestRequest).filter_by(job_id=job_id).first()
|
||||
|
||||
# Objekte explizit von der Session trennen, um sie außerhalb verwenden zu können
|
||||
db_session.expunge(job)
|
||||
if guest_request:
|
||||
db_session.expunge(guest_request)
|
||||
|
||||
return render_template('guest_job_status.html',
|
||||
job=job,
|
||||
guest_request=guest_request)
|
||||
|
||||
@guest_blueprint.route('/requests/overview', methods=['GET'])
|
||||
def guest_requests_overview():
|
||||
"""Öffentliche Übersicht aller Druckanträge mit zensierten persönlichen Daten."""
|
||||
@@ -75,23 +107,10 @@ def guest_requests_overview():
|
||||
|
||||
# Grund zensieren (nur erste 20 Zeichen anzeigen)
|
||||
censored_reason = "***"
|
||||
if req.reason:
|
||||
if len(req.reason) > 20:
|
||||
censored_reason = req.reason[:20] + "***"
|
||||
else:
|
||||
censored_reason = req.reason[:10] + "***" if len(req.reason) > 10 else "***"
|
||||
|
||||
# Drucker-Info laden (jetzt durch eager loading verfügbar)
|
||||
printer_name = "Unbekannt"
|
||||
if req.printer:
|
||||
printer_name = req.printer.name
|
||||
|
||||
# Job-Status laden, falls vorhanden
|
||||
job_status = None
|
||||
if req.job_id:
|
||||
job = db_session.query(Job).filter_by(id=req.job_id).first()
|
||||
if job:
|
||||
job_status = job.status
|
||||
if req.reason and len(req.reason) > 20:
|
||||
censored_reason = req.reason[:20] + "..."
|
||||
elif req.reason:
|
||||
censored_reason = req.reason
|
||||
|
||||
public_requests.append({
|
||||
"id": req.id,
|
||||
@@ -101,17 +120,17 @@ def guest_requests_overview():
|
||||
"duration_min": req.duration_min,
|
||||
"created_at": req.created_at,
|
||||
"status": req.status,
|
||||
"printer_name": printer_name,
|
||||
"job_status": job_status
|
||||
"printer": req.printer.to_dict() if req.printer else None
|
||||
})
|
||||
|
||||
logger.info(f"Öffentliche Druckanträge-Übersicht aufgerufen - {len(public_requests)} Einträge")
|
||||
|
||||
|
||||
# Objekte explizit von der Session trennen
|
||||
db_session.expunge_all()
|
||||
|
||||
return render_template('guest_requests_overview.html', requests=public_requests)
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"Fehler beim Laden der öffentlichen Druckanträge-Übersicht: {str(e)}")
|
||||
return render_template('guest_requests_overview.html', requests=[], error="Fehler beim Laden der Daten")
|
||||
logger.error(f"Fehler beim Laden der öffentlichen Gastanfragen: {str(e)}")
|
||||
return render_template('guest_requests_overview.html', requests=[], error="Fehler beim Laden der Anfragen")
|
||||
|
||||
@guest_blueprint.route('/request/<int:request_id>', methods=['GET'])
|
||||
def guest_request_status(request_id):
|
||||
@@ -125,11 +144,18 @@ def guest_request_status(request_id):
|
||||
if not guest_request:
|
||||
abort(404, "Anfrage nicht gefunden")
|
||||
|
||||
# Nur wenn Status "approved" ist, OTP generieren und anzeigen
|
||||
# OTP-Code nur anzeigen, wenn Anfrage genehmigt wurde
|
||||
otp_code = None
|
||||
if guest_request.status == "approved" and not guest_request.otp_code:
|
||||
otp_code = guest_request.generate_otp()
|
||||
db_session.commit()
|
||||
show_start_link = False
|
||||
|
||||
if guest_request.status == "approved":
|
||||
if not guest_request.otp_code:
|
||||
# OTP generieren falls noch nicht vorhanden
|
||||
otp_code = guest_request.generate_otp()
|
||||
db_session.commit()
|
||||
else:
|
||||
# OTP existiert bereits - prüfen ob noch nicht verwendet
|
||||
show_start_link = guest_request.otp_used_at is None
|
||||
|
||||
# Zugehörigen Job laden, falls vorhanden
|
||||
job = None
|
||||
@@ -144,7 +170,8 @@ def guest_request_status(request_id):
|
||||
return render_template('guest_status.html',
|
||||
request=guest_request,
|
||||
job=job,
|
||||
otp_code=otp_code)
|
||||
otp_code=otp_code,
|
||||
show_start_link=show_start_link)
|
||||
|
||||
# API-Endpunkte
|
||||
@guest_blueprint.route('/api/guest/requests', methods=['POST'])
|
||||
@@ -213,6 +240,103 @@ def api_create_guest_request():
|
||||
logger.error(f"Fehler beim Erstellen der Gastanfrage: {str(e)}")
|
||||
return jsonify({"error": "Fehler beim Verarbeiten der Anfrage"}), 500
|
||||
|
||||
@guest_blueprint.route('/api/guest/start-job', methods=['POST'])
|
||||
def api_start_job_with_code():
|
||||
"""Job mit OTP-Code starten."""
|
||||
try:
|
||||
data = request.get_json()
|
||||
if not data or 'code' not in data:
|
||||
return jsonify({"error": "Code ist erforderlich"}), 400
|
||||
|
||||
code = data['code'].strip().upper()
|
||||
if len(code) != 6:
|
||||
return jsonify({"error": "Code muss 6 Zeichen lang sein"}), 400
|
||||
|
||||
with get_cached_session() as db_session:
|
||||
# Alle genehmigten Gastanfragen mit OTP-Codes finden
|
||||
guest_requests = db_session.query(GuestRequest).filter(
|
||||
GuestRequest.status == "approved",
|
||||
GuestRequest.otp_code.isnot(None),
|
||||
GuestRequest.otp_used_at.is_(None) # Noch nicht verwendet
|
||||
).all()
|
||||
|
||||
matching_request = None
|
||||
for req in guest_requests:
|
||||
# Code validieren
|
||||
if req.verify_otp(code):
|
||||
matching_request = req
|
||||
break
|
||||
|
||||
if not matching_request:
|
||||
return jsonify({
|
||||
"success": False,
|
||||
"error": "Ungültiger oder bereits verwendeter Code"
|
||||
}), 400
|
||||
|
||||
# Prüfen ob zugehöriger Job existiert
|
||||
if not matching_request.job_id:
|
||||
return jsonify({
|
||||
"success": False,
|
||||
"error": "Kein zugehöriger Job gefunden"
|
||||
}), 400
|
||||
|
||||
job = db_session.query(Job).options(
|
||||
joinedload(Job.printer)
|
||||
).filter_by(id=matching_request.job_id).first()
|
||||
|
||||
if not job:
|
||||
return jsonify({
|
||||
"success": False,
|
||||
"error": "Job nicht gefunden"
|
||||
}), 400
|
||||
|
||||
# Prüfen ob Job noch startbar ist
|
||||
if job.status not in ["scheduled", "waiting_for_printer"]:
|
||||
return jsonify({
|
||||
"success": False,
|
||||
"error": f"Job kann im Status '{job.status}' nicht gestartet werden"
|
||||
}), 400
|
||||
|
||||
# Job starten
|
||||
now = datetime.now()
|
||||
job.status = "running"
|
||||
job.start_at = now
|
||||
job.end_at = now + timedelta(minutes=matching_request.duration_min)
|
||||
job.actual_start_time = now
|
||||
|
||||
# OTP als verwendet markieren
|
||||
matching_request.otp_used_at = now
|
||||
|
||||
# Drucker einschalten (falls implementiert)
|
||||
if job.printer and job.printer.plug_ip:
|
||||
try:
|
||||
from utils.job_scheduler import toggle_plug
|
||||
toggle_plug(job.printer_id, True)
|
||||
except Exception as e:
|
||||
logger.warning(f"Fehler beim Einschalten des Druckers: {str(e)}")
|
||||
|
||||
db_session.commit()
|
||||
|
||||
logger.info(f"Job {job.id} mit OTP-Code gestartet für Gastanfrage {matching_request.id}")
|
||||
|
||||
return jsonify({
|
||||
"success": True,
|
||||
"job_id": job.id,
|
||||
"job_name": job.name,
|
||||
"start_time": job.start_at.strftime("%H:%M"),
|
||||
"end_time": job.end_at.strftime("%H:%M"),
|
||||
"duration_minutes": matching_request.duration_min,
|
||||
"printer_name": job.printer.name if job.printer else "Unbekannt",
|
||||
"message": f"Job '{job.name}' erfolgreich gestartet"
|
||||
})
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"Fehler beim Starten des Jobs mit Code: {str(e)}")
|
||||
return jsonify({
|
||||
"success": False,
|
||||
"error": "Fehler beim Starten des Jobs"
|
||||
}), 500
|
||||
|
||||
@guest_blueprint.route('/api/guest/requests/<int:request_id>', methods=['GET'])
|
||||
def api_get_guest_request(request_id):
|
||||
"""Status einer Gastanfrage abrufen."""
|
||||
@@ -232,191 +356,73 @@ def api_get_guest_request(request_id):
|
||||
logger.error(f"Fehler beim Abrufen der Gastanfrage: {str(e)}")
|
||||
return jsonify({"error": "Fehler beim Verarbeiten der Anfrage"}), 500
|
||||
|
||||
@guest_blueprint.route('/api/requests/<int:request_id>/approve', methods=['POST'])
|
||||
@approver_required
|
||||
def api_approve_request(request_id):
|
||||
"""Gastanfrage genehmigen."""
|
||||
try:
|
||||
data = request.get_json() or {}
|
||||
approval_notes = data.get('notes', '')
|
||||
printer_id = data.get('printer_id') # Optional: Drucker zuweisen/ändern
|
||||
|
||||
with get_cached_session() as db_session:
|
||||
guest_request = db_session.query(GuestRequest).filter_by(id=request_id).first()
|
||||
if not guest_request:
|
||||
return jsonify({"error": "Anfrage nicht gefunden"}), 404
|
||||
|
||||
if guest_request.status != "pending":
|
||||
return jsonify({"error": "Anfrage wurde bereits bearbeitet"}), 400
|
||||
|
||||
# Drucker validieren, falls angegeben
|
||||
if printer_id:
|
||||
printer = db_session.query(Printer).filter_by(id=printer_id, active=True).first()
|
||||
if not printer:
|
||||
return jsonify({"error": "Ungültiger Drucker ausgewählt"}), 400
|
||||
guest_request.printer_id = printer_id
|
||||
|
||||
# Sicherstellen, dass ein Drucker zugewiesen ist
|
||||
if not guest_request.printer_id:
|
||||
return jsonify({"error": "Kein Drucker zugewiesen. Bitte wählen Sie einen Drucker aus."}), 400
|
||||
|
||||
# Anfrage genehmigen
|
||||
guest_request.status = "approved"
|
||||
guest_request.processed_by = current_user.id
|
||||
guest_request.processed_at = datetime.now()
|
||||
guest_request.approval_notes = approval_notes
|
||||
|
||||
# OTP generieren
|
||||
otp_plain = guest_request.generate_otp()
|
||||
|
||||
# Zugehörigen Job erstellen
|
||||
start_time = datetime.now() + timedelta(minutes=5) # Start in 5 Minuten
|
||||
end_time = start_time + timedelta(minutes=guest_request.duration_min)
|
||||
|
||||
# Admin-Benutzer als Eigentümer verwenden
|
||||
admin_user = db_session.query(User).filter_by(role="admin").first()
|
||||
|
||||
job = Job(
|
||||
name=f"Gastauftrag: {guest_request.name}",
|
||||
description=guest_request.reason or "Gastauftrag",
|
||||
user_id=admin_user.id,
|
||||
printer_id=guest_request.printer_id,
|
||||
start_at=start_time,
|
||||
end_at=end_time,
|
||||
status="scheduled",
|
||||
duration_minutes=guest_request.duration_min,
|
||||
owner_id=admin_user.id
|
||||
)
|
||||
|
||||
db_session.add(job)
|
||||
db_session.flush() # ID generieren
|
||||
|
||||
# Job-ID in Gastanfrage speichern
|
||||
guest_request.job_id = job.id
|
||||
|
||||
db_session.commit()
|
||||
|
||||
logger.info(f"Gastanfrage {request_id} genehmigt von Admin {current_user.id} ({current_user.name})")
|
||||
|
||||
return jsonify({
|
||||
"success": True,
|
||||
"status": "approved",
|
||||
"job_id": job.id,
|
||||
"otp": otp_plain, # Nur in dieser Antwort wird der OTP-Klartext zurückgegeben
|
||||
"approved_by": current_user.name,
|
||||
"approved_at": guest_request.processed_at.isoformat(),
|
||||
"notes": approval_notes
|
||||
})
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"Fehler beim Genehmigen der Gastanfrage: {str(e)}")
|
||||
return jsonify({"error": "Fehler beim Verarbeiten der Anfrage"}), 500
|
||||
|
||||
@guest_blueprint.route('/api/requests/<int:request_id>/deny', methods=['POST'])
|
||||
@approver_required
|
||||
def api_deny_request(request_id):
|
||||
"""Gastanfrage ablehnen."""
|
||||
try:
|
||||
data = request.get_json() or {}
|
||||
rejection_reason = data.get('reason', '')
|
||||
|
||||
if not rejection_reason.strip():
|
||||
return jsonify({"error": "Ablehnungsgrund ist erforderlich"}), 400
|
||||
|
||||
with get_cached_session() as db_session:
|
||||
guest_request = db_session.query(GuestRequest).filter_by(id=request_id).first()
|
||||
if not guest_request:
|
||||
return jsonify({"error": "Anfrage nicht gefunden"}), 404
|
||||
|
||||
if guest_request.status != "pending":
|
||||
return jsonify({"error": "Anfrage wurde bereits bearbeitet"}), 400
|
||||
|
||||
# Anfrage ablehnen
|
||||
guest_request.status = "denied"
|
||||
guest_request.processed_by = current_user.id
|
||||
guest_request.processed_at = datetime.now()
|
||||
guest_request.rejection_reason = rejection_reason
|
||||
|
||||
db_session.commit()
|
||||
|
||||
logger.info(f"Gastanfrage {request_id} abgelehnt von Admin {current_user.id} ({current_user.name}): {rejection_reason}")
|
||||
|
||||
return jsonify({
|
||||
"success": True,
|
||||
"status": "denied",
|
||||
"rejected_by": current_user.name,
|
||||
"rejected_at": guest_request.processed_at.isoformat(),
|
||||
"reason": rejection_reason
|
||||
})
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"Fehler beim Ablehnen der Gastanfrage: {str(e)}")
|
||||
return jsonify({"error": "Fehler beim Verarbeiten der Anfrage"}), 500
|
||||
|
||||
@guest_blueprint.route('/api/jobs/start/<string:otp>', methods=['POST'])
|
||||
def api_start_job_with_otp(otp):
|
||||
"""Job mit OTP starten."""
|
||||
@guest_blueprint.route('/api/guest/job/<int:job_id>/status', methods=['GET'])
|
||||
def api_get_guest_job_status(job_id):
|
||||
"""Job-Status für Gäste abrufen."""
|
||||
try:
|
||||
with get_cached_session() as db_session:
|
||||
# Alle genehmigten Anfragen mit OTP durchsuchen
|
||||
guest_requests = db_session.query(GuestRequest).filter_by(status="approved").all()
|
||||
# Job mit Drucker-Information laden
|
||||
job = db_session.query(Job).options(
|
||||
joinedload(Job.printer)
|
||||
).filter_by(id=job_id).first()
|
||||
|
||||
valid_request = None
|
||||
for req in guest_requests:
|
||||
if req.verify_otp(otp):
|
||||
valid_request = req
|
||||
break
|
||||
|
||||
if not valid_request:
|
||||
return jsonify({"error": "Ungültiger oder abgelaufener Code"}), 400
|
||||
|
||||
if not valid_request.job_id:
|
||||
return jsonify({"error": "Kein Job mit diesem Code verknüpft"}), 400
|
||||
|
||||
# Job laden
|
||||
job = db_session.query(Job).filter_by(id=valid_request.job_id).first()
|
||||
if not job:
|
||||
return jsonify({"error": "Job nicht gefunden"}), 404
|
||||
|
||||
# Job-Status prüfen
|
||||
if job.status != "scheduled":
|
||||
return jsonify({"error": "Job kann nicht gestartet werden"}), 400
|
||||
# Zugehörige Gastanfrage prüfen
|
||||
guest_request = db_session.query(GuestRequest).filter_by(job_id=job_id).first()
|
||||
if not guest_request:
|
||||
return jsonify({"error": "Kein Gastjob"}), 403
|
||||
|
||||
# Grace-Period prüfen (5 Minuten vor bis 5 Minuten nach geplantem Start)
|
||||
# Aktuelle Zeit für Berechnungen
|
||||
now = datetime.now()
|
||||
start_time = job.start_at
|
||||
grace_start = start_time - timedelta(minutes=5)
|
||||
grace_end = start_time + timedelta(minutes=5)
|
||||
|
||||
if now < grace_start:
|
||||
return jsonify({
|
||||
"error": f"Der Job kann erst ab {grace_start.strftime('%H:%M')} Uhr gestartet werden"
|
||||
}), 400
|
||||
# Restzeit berechnen
|
||||
remaining_minutes = 0
|
||||
if job.status == "running" and job.end_at:
|
||||
remaining_seconds = (job.end_at - now).total_seconds()
|
||||
remaining_minutes = max(0, int(remaining_seconds / 60))
|
||||
|
||||
if now > job.end_at:
|
||||
return jsonify({"error": "Der Job ist bereits abgelaufen"}), 400
|
||||
# Fortschritt berechnen
|
||||
progress_percent = 0
|
||||
if job.status == "running" and job.start_at and job.end_at:
|
||||
total_duration = (job.end_at - job.start_at).total_seconds()
|
||||
elapsed_duration = (now - job.start_at).total_seconds()
|
||||
progress_percent = min(100, max(0, int((elapsed_duration / total_duration) * 100)))
|
||||
elif job.status in ["completed", "finished"]:
|
||||
progress_percent = 100
|
||||
|
||||
# Job starten
|
||||
job.status = "active"
|
||||
job.start_at = now # Aktualisiere Startzeit auf jetzt
|
||||
|
||||
# OTP als verwendet markieren
|
||||
valid_request.otp_used_at = now
|
||||
|
||||
db_session.commit()
|
||||
|
||||
logger.info(f"Job {job.id} mit OTP {otp} gestartet von IP: {request.remote_addr}")
|
||||
job_data = {
|
||||
"id": job.id,
|
||||
"name": job.name,
|
||||
"status": job.status,
|
||||
"start_at": job.start_at.isoformat() if job.start_at else None,
|
||||
"end_at": job.end_at.isoformat() if job.end_at else None,
|
||||
"duration_minutes": job.duration_minutes,
|
||||
"remaining_minutes": remaining_minutes,
|
||||
"progress_percent": progress_percent,
|
||||
"printer": {
|
||||
"id": job.printer.id,
|
||||
"name": job.printer.name,
|
||||
"location": job.printer.location
|
||||
} if job.printer else None,
|
||||
"guest_request": {
|
||||
"id": guest_request.id,
|
||||
"name": guest_request.name,
|
||||
"created_at": guest_request.created_at.isoformat()
|
||||
},
|
||||
"is_active": job.status in ["scheduled", "running"],
|
||||
"is_completed": job.status in ["completed", "finished"],
|
||||
"is_failed": job.status in ["failed", "cancelled"]
|
||||
}
|
||||
|
||||
return jsonify({
|
||||
"success": True,
|
||||
"job_id": job.id,
|
||||
"status": job.status,
|
||||
"started_at": job.start_at.isoformat(),
|
||||
"end_at": job.end_at.isoformat()
|
||||
"job": job_data
|
||||
})
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"Fehler beim Starten des Jobs mit OTP: {str(e)}")
|
||||
logger.error(f"Fehler beim Abrufen des Job-Status: {str(e)}")
|
||||
return jsonify({"error": "Fehler beim Verarbeiten der Anfrage"}), 500
|
||||
|
||||
@guest_blueprint.route('/api/notifications', methods=['GET'])
|
||||
@@ -640,4 +646,129 @@ def api_update_request(request_id):
|
||||
@approver_required
|
||||
def admin_requests_management():
|
||||
"""Admin-Oberfläche für die Verwaltung von Gastanfragen."""
|
||||
return render_template('admin_guest_requests.html')
|
||||
return render_template('admin_guest_requests.html')
|
||||
|
||||
@guest_blueprint.route('/api/requests/<int:request_id>/approve', methods=['POST'])
|
||||
@approver_required
|
||||
def api_approve_request(request_id):
|
||||
"""Gastanfrage genehmigen."""
|
||||
try:
|
||||
data = request.get_json() or {}
|
||||
approval_notes = data.get('notes', '')
|
||||
printer_id = data.get('printer_id') # Optional: Drucker zuweisen/ändern
|
||||
|
||||
with get_cached_session() as db_session:
|
||||
guest_request = db_session.query(GuestRequest).filter_by(id=request_id).first()
|
||||
if not guest_request:
|
||||
return jsonify({"error": "Anfrage nicht gefunden"}), 404
|
||||
|
||||
if guest_request.status != "pending":
|
||||
return jsonify({"error": "Anfrage wurde bereits bearbeitet"}), 400
|
||||
|
||||
# Drucker validieren, falls angegeben
|
||||
if printer_id:
|
||||
printer = db_session.query(Printer).filter_by(id=printer_id, active=True).first()
|
||||
if not printer:
|
||||
return jsonify({"error": "Ungültiger Drucker ausgewählt"}), 400
|
||||
guest_request.printer_id = printer_id
|
||||
|
||||
# Sicherstellen, dass ein Drucker zugewiesen ist
|
||||
if not guest_request.printer_id:
|
||||
return jsonify({"error": "Kein Drucker zugewiesen. Bitte wählen Sie einen Drucker aus."}), 400
|
||||
|
||||
# Anfrage genehmigen
|
||||
guest_request.status = "approved"
|
||||
guest_request.processed_by = current_user.id
|
||||
guest_request.processed_at = datetime.now()
|
||||
guest_request.approval_notes = approval_notes
|
||||
|
||||
# OTP generieren
|
||||
otp_plain = guest_request.generate_otp()
|
||||
|
||||
# Zugehörigen Job erstellen
|
||||
start_time = datetime.now() + timedelta(minutes=5) # Start in 5 Minuten
|
||||
end_time = start_time + timedelta(minutes=guest_request.duration_min)
|
||||
|
||||
# Admin-Benutzer als Eigentümer verwenden
|
||||
admin_user = db_session.query(User).filter_by(is_admin=True).first()
|
||||
if not admin_user:
|
||||
admin_user = current_user # Fallback auf aktuellen Benutzer
|
||||
|
||||
job = Job(
|
||||
name=f"Gastauftrag: {guest_request.name}",
|
||||
description=guest_request.reason or "Gastauftrag",
|
||||
user_id=admin_user.id,
|
||||
printer_id=guest_request.printer_id,
|
||||
start_at=start_time,
|
||||
end_at=end_time,
|
||||
status="scheduled",
|
||||
duration_minutes=guest_request.duration_min,
|
||||
owner_id=admin_user.id
|
||||
)
|
||||
|
||||
db_session.add(job)
|
||||
db_session.flush() # ID generieren
|
||||
|
||||
# Job-ID in Gastanfrage speichern
|
||||
guest_request.job_id = job.id
|
||||
|
||||
db_session.commit()
|
||||
|
||||
logger.info(f"Gastanfrage {request_id} genehmigt von Admin {current_user.id} ({current_user.username})")
|
||||
|
||||
return jsonify({
|
||||
"success": True,
|
||||
"status": "approved",
|
||||
"job_id": job.id,
|
||||
"otp": otp_plain, # Nur in dieser Antwort wird der OTP-Klartext zurückgegeben
|
||||
"approved_by": current_user.username,
|
||||
"approved_at": guest_request.processed_at.isoformat(),
|
||||
"notes": approval_notes,
|
||||
"message": f"Anfrage genehmigt. Zugangscode: {otp_plain}"
|
||||
})
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"Fehler beim Genehmigen der Gastanfrage: {str(e)}")
|
||||
return jsonify({"error": "Fehler beim Verarbeiten der Anfrage"}), 500
|
||||
|
||||
@guest_blueprint.route('/api/requests/<int:request_id>/deny', methods=['POST'])
|
||||
@approver_required
|
||||
def api_deny_request(request_id):
|
||||
"""Gastanfrage ablehnen."""
|
||||
try:
|
||||
data = request.get_json() or {}
|
||||
rejection_reason = data.get('reason', '')
|
||||
|
||||
if not rejection_reason.strip():
|
||||
return jsonify({"error": "Ablehnungsgrund ist erforderlich"}), 400
|
||||
|
||||
with get_cached_session() as db_session:
|
||||
guest_request = db_session.query(GuestRequest).filter_by(id=request_id).first()
|
||||
if not guest_request:
|
||||
return jsonify({"error": "Anfrage nicht gefunden"}), 404
|
||||
|
||||
if guest_request.status != "pending":
|
||||
return jsonify({"error": "Anfrage wurde bereits bearbeitet"}), 400
|
||||
|
||||
# Anfrage ablehnen
|
||||
guest_request.status = "denied"
|
||||
guest_request.processed_by = current_user.id
|
||||
guest_request.processed_at = datetime.now()
|
||||
guest_request.rejection_reason = rejection_reason
|
||||
|
||||
db_session.commit()
|
||||
|
||||
logger.info(f"Gastanfrage {request_id} abgelehnt von Admin {current_user.id} ({current_user.username}): {rejection_reason}")
|
||||
|
||||
return jsonify({
|
||||
"success": True,
|
||||
"status": "denied",
|
||||
"rejected_by": current_user.username,
|
||||
"rejected_at": guest_request.processed_at.isoformat(),
|
||||
"reason": rejection_reason,
|
||||
"message": "Anfrage wurde abgelehnt"
|
||||
})
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"Fehler beim Ablehnen der Gastanfrage: {str(e)}")
|
||||
return jsonify({"error": "Fehler beim Verarbeiten der Anfrage"}), 500
|
||||
Reference in New Issue
Block a user