Næster version

linedance-api/app/routers/sync.py

@@ -268,28 +268,37 @@ def pull(
             "dance_id":    cd.dance_id,
         })
 
-    # Delte playlister
-    shared_ids = [
-        s.project_id for s in
-        db.query(PlaylistShare).filter_by(shared_with_id=me.id).all()
-    ]
+    # Delte playlister (read-only — kun ejeren kan redigere)
+    shared_ids = set()
+    for s in db.query(PlaylistShare).filter(
+        (PlaylistShare.shared_with_id == me.id) |
+        (PlaylistShare.invited_email == me.email)
+    ).all():
+        shared_ids.add(s.project_id)
+
     shared = []
     for p in db.query(Project).filter(Project.id.in_(shared_ids)).all():
+        if p.owner_id == me.id:
+            continue  # Egne lister håndteres separat
+        owner = db.query(User).filter_by(id=p.owner_id).first()
+        songs_out = []
+        for ps in p.project_songs:
+            song = db.query(Song).filter_by(id=ps.song_id).first()
+            if not song:
+                continue
+            songs_out.append({
+                "title":         song.title,
+                "artist":        song.artist,
+                "position":      ps.position,
+                "status":        ps.status,
+                "is_workshop":   ps.is_workshop,
+                "dance_override": ps.dance_override or "",
+            })
         shared.append({
-            "id":          p.id,
-            "name":        p.name,
-            "owner_id":    p.owner_id,
-            "visibility":  p.visibility,
-            "songs": [
-                {
-                    "song_id":       ps.song_id,
-                    "position":      ps.position,
-                    "status":        ps.status,
-                    "is_workshop":   ps.is_workshop,
-                    "dance_override": ps.dance_override,
-                }
-                for ps in p.project_songs
-            ]
+            "server_id":  p.id,
+            "name":       p.name,
+            "owner":      owner.username if owner else "?",
+            "songs":      sorted(songs_out, key=lambda x: x["position"]),
         })
 
     # Egne playlister