Migration of events to use group_id instead of

group_name
This commit is contained in:
2025-06-30 19:45:04 +00:00
parent 10b32b9a20
commit 95b823ae3d
4 changed files with 104 additions and 10 deletions

View File

@@ -1,9 +1,9 @@
from database import Session
from sqlalchemy import and_
from models import Event
from flask import Blueprint, request, jsonify
import sys
sys.path.append('/workspace')
from flask import Blueprint, request, jsonify
from models import Event
from sqlalchemy import and_
from database import Session
events_bp = Blueprint("events", __name__, url_prefix="/api/events")
@@ -13,17 +13,20 @@ def get_events():
session = Session()
start = request.args.get("start")
end = request.args.get("end")
client_uuid = request.args.get("client_uuid")
# geändert: jetzt group_id statt client_uuid
group_id = request.args.get("group_id")
query = session.query(Event).filter(Event.is_active == True)
if start and end:
query = query.filter(and_(Event.start < end, Event.end > start))
if client_uuid:
query = query.filter(Event.client_uuid == client_uuid)
if group_id:
# geändert: filter auf group_id
query = query.filter(Event.group_id == int(group_id))
events = query.all()
result = []
for e in events:
result.append({
"Id": str(e.id),
"GroupId": e.group_id, # geändert: gibt group_id zurück
"Subject": e.title,
"StartTime": e.start.isoformat() if e.start else None,
"EndTime": e.end.isoformat() if e.end else None,