Skip to content
Snippets Groups Projects
Commit 776d38a9 authored by David Trattnig's avatar David Trattnig
Browse files

refact: remove fallback playlists from model #100

parent 7b094297
No related branches found
No related tags found
No related merge requests found
...@@ -176,13 +176,6 @@ class Timeslot(DB.Model, AuraDatabaseModel): ...@@ -176,13 +176,6 @@ class Timeslot(DB.Model, AuraDatabaseModel):
is assigned is assigned
show_default (Playlist): Some playlist played by default, when no default schedule show_default (Playlist): Some playlist played by default, when no default schedule
playlist is assigned playlist is assigned
schedule_fallback (Playlist): Some playlist played as fallback, when no specific playlist
is assigned or if it is erroneous (includes silence detection)
show_fallback (Playlist): Some playlist played as fallback, when no schedule fallback
playlist is assigned or if some specific playlist is erroneous
(includes silence detection)
station_fallback (Playlist): Defined in the original AURA API but not implemented, as
station fallbacks are handled locally
""" """
...@@ -222,43 +215,10 @@ class Timeslot(DB.Model, AuraDatabaseModel): ...@@ -222,43 +215,10 @@ class Timeslot(DB.Model, AuraDatabaseModel):
uselist=False, uselist=False,
back_populates="timeslot", back_populates="timeslot",
) )
schedule_fallback = relationship(
"Playlist",
primaryjoin=(
"and_(Timeslot.timeslot_start==Playlist.timeslot_start,"
" Timeslot.schedule_fallback_id==Playlist.playlist_id,"
" Timeslot.show_name==Playlist.show_name)"
),
uselist=False,
back_populates="timeslot",
)
show_fallback = relationship(
"Playlist",
primaryjoin=(
"and_(Timeslot.timeslot_start==Playlist.timeslot_start,"
" Timeslot.show_fallback_id==Playlist.playlist_id,"
" Timeslot.show_name==Playlist.show_name)"
),
uselist=False,
back_populates="timeslot",
)
station_fallback = relationship(
"Playlist",
primaryjoin=(
"and_(Timeslot.timeslot_start==Playlist.timeslot_start,"
" Timeslot.station_fallback_id==Playlist.playlist_id,"
" Timeslot.show_name==Playlist.show_name)"
),
uselist=False,
back_populates="timeslot",
)
playlist_id = Column(Integer) playlist_id = Column(Integer)
default_schedule_playlist_id = Column(Integer) default_schedule_playlist_id = Column(Integer)
default_show_playlist_id = Column(Integer) default_show_playlist_id = Column(Integer)
schedule_fallback_id = Column(Integer)
show_fallback_id = Column(Integer)
station_fallback_id = Column(Integer)
# Data # Data
timeslot_start = Column(DateTime, unique=True, index=True) timeslot_start = Column(DateTime, unique=True, index=True)
...@@ -337,9 +297,6 @@ class Timeslot(DB.Model, AuraDatabaseModel): ...@@ -337,9 +297,6 @@ class Timeslot(DB.Model, AuraDatabaseModel):
"playlist_id": self.playlist_id, "playlist_id": self.playlist_id,
"schedule_default_id": self.schedule_default_id, "schedule_default_id": self.schedule_default_id,
"show_default_id": self.show_default_id, "show_default_id": self.show_default_id,
"schedule_fallback_id": self.schedule_fallback_id,
"show_fallback_id": self.show_fallback_id,
"station_fallback_id": self.station_fallback_id,
"show": {"name": self.show_name, "host": self.show_hosts}, "show": {"name": self.show_name, "host": self.show_hosts},
"playlist": playlist, "playlist": playlist,
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment