add nginx.dev.conf for development environment

add functionality of scheduler to send right event
data to the clients
added route for file download

scheduler/db_utils.py

@@ -2,11 +2,9 @@
 from dotenv import load_dotenv
 import os
 from datetime import datetime
-from sqlalchemy.orm import sessionmaker
+from sqlalchemy.orm import sessionmaker, joinedload
 from sqlalchemy import create_engine
-from models.models import Event
-# import sys
-# sys.path.append('/workspace/server')
+from models.models import Event, EventMedia
 
 load_dotenv('/workspace/.env')
 
@@ -15,14 +13,66 @@ DB_CONN = os.environ.get("DB_CONN", "mysql+pymysql://user:password@db/dbname")
 engine = create_engine(DB_CONN)
 Session = sessionmaker(bind=engine)
 
+# Base URL from .env for file URLs
+API_BASE_URL = os.environ.get("API_BASE_URL", "http://server:8000")
+
 
 def get_active_events(start: datetime, end: datetime, group_id: int = None):
     session = Session()
-    query = session.query(Event).filter(Event.is_active == True)
-    if start and end:
-        query = query.filter(Event.start < end, Event.end > start)
-    if group_id:
-        query = query.filter(Event.group_id == group_id)
-    events = query.all()
-    session.close()
-    return events
+    try:
+        # Now this will work with the relationship defined
+        query = session.query(Event).options(
+            joinedload(Event.event_media)
+        ).filter(Event.is_active == True)
+
+        if start and end:
+            query = query.filter(Event.start < end, Event.end > start)
+        if group_id:
+            query = query.filter(Event.group_id == group_id)
+
+        events = query.all()
+
+        formatted_events = []
+        for event in events:
+            formatted_event = format_event_with_media(event)
+            formatted_events.append(formatted_event)
+
+        return formatted_events
+    finally:
+        session.close()
+
+
+def format_event_with_media(event):
+    """Transform Event + EventMedia into client-expected format"""
+    event_dict = {
+        "id": event.id,
+        "title": event.title,
+        "start": str(event.start),
+        "end": str(event.end),
+        "group_id": event.group_id,
+    }
+
+    # Now you can directly access event.event_media
+    if event.event_media:
+        media = event.event_media
+
+        if event.event_type.value == "presentation":
+            event_dict["presentation"] = {
+                "type": "slideshow",
+                "files": [],
+                "slide_interval": event.slideshow_interval or 5000,
+                "auto_advance": True
+            }
+
+            if media.file_path:
+                filename = os.path.basename(media.file_path)
+                event_dict["presentation"]["files"].append({
+                    "name": filename,
+                    "url": f"{API_BASE_URL}/api/files/{media.id}/{filename}",
+                    "checksum": None,
+                    "size": None
+                })
+
+        # Add other event types...
+
+    return event_dict

scheduler/scheduler.py

@@ -55,22 +55,17 @@ def main():
 
     while True:
         now = datetime.datetime.now(datetime.timezone.utc)
-        # Hole alle aktiven Events (Vergleich mit UTC)
+        # Hole alle aktiven Events (bereits formatierte Dictionaries)
         events = get_active_events(now, now)
 
         # Gruppiere Events nach group_id
         groups = {}
         for event in events:
-            gid = getattr(event, "group_id", None)
+            gid = event.get("group_id")
             if gid not in groups:
                 groups[gid] = []
-            groups[gid].append({
-                "id": event.id,
-                "title": getattr(event, "title", ""),
-                "start": str(getattr(event, "start", "")),
-                "end": str(getattr(event, "end", "")),
-                "group_id": gid,
-            })
+            # Event ist bereits ein Dictionary im gewünschten Format
+            groups[gid].append(event)
 
         # Sende pro Gruppe die Eventliste als retained Message, nur bei Änderung
         for gid, event_list in groups.items():