Update app

app/routes/admin.py

@@ -7,7 +7,7 @@ from flask_login import current_user, login_required, login_user
 
 from ..extensions import db
 from ..uploads import abs_upload_path, ensure_company_upload_dir, get_company_upload_bytes, is_valid_upload_relpath
-from ..models import AppSettings, Company, Display, DisplaySession, Playlist, PlaylistItem, User
+from ..models import AppSettings, Company, Display, DisplayPlaylist, DisplaySession, Playlist, PlaylistItem, User
 from ..email_utils import send_email
 
 bp = Blueprint("admin", __name__, url_prefix="/admin")
@@ -375,8 +375,12 @@ def delete_company(company_id: int):
     for d in list(company.displays):
         d.assigned_playlist_id = None
 
-    # 2) Delete display sessions referencing displays of this company
+    # 1b) Clear multi-playlist mappings
     display_ids = [d.id for d in company.displays]
+    if display_ids:
+        DisplayPlaylist.query.filter(DisplayPlaylist.display_id.in_(display_ids)).delete(synchronize_session=False)
+
+    # 2) Delete display sessions referencing displays of this company
     if display_ids:
         DisplaySession.query.filter(DisplaySession.display_id.in_(display_ids)).delete(synchronize_session=False)
 
@@ -518,10 +522,13 @@ def delete_display(display_id: int):
     # 1) Unassign playlist
     display.assigned_playlist_id = None
 
-    # 2) Delete active sessions for this display
+    # 2) Clear multi-playlist mappings
+    DisplayPlaylist.query.filter_by(display_id=display.id).delete(synchronize_session=False)
+
+    # 3) Delete active sessions for this display
     DisplaySession.query.filter_by(display_id=display.id).delete(synchronize_session=False)
 
-    # 3) Delete display
+    # 4) Delete display
     db.session.delete(display)
     db.session.commit()