From 4009e7eeb6723bb89ade4dd71612087dddd25d54 Mon Sep 17 00:00:00 2001 From: jo Date: Mon, 27 Jun 2022 17:25:59 +0200 Subject: [PATCH] chore(api): use fully qualified model names --- api/libretime_api/core/models/auth.py | 5 ++++- api/libretime_api/core/models/preference.py | 2 +- api/libretime_api/core/models/worker.py | 2 +- api/libretime_api/history/models/listener.py | 4 ++-- api/libretime_api/history/models/played.py | 7 +++++-- api/libretime_api/podcasts/models/podcast.py | 6 +++--- api/libretime_api/schedule/models/playlist.py | 4 ++-- api/libretime_api/schedule/models/schedule.py | 4 ++-- api/libretime_api/schedule/models/show.py | 10 +++++----- api/libretime_api/schedule/models/smart_block.py | 4 ++-- api/libretime_api/schedule/models/webstream.py | 2 +- api/libretime_api/storage/models/cloud_file.py | 2 +- 12 files changed, 29 insertions(+), 23 deletions(-) diff --git a/api/libretime_api/core/models/auth.py b/api/libretime_api/core/models/auth.py index 0936a2698..de5a74e8f 100644 --- a/api/libretime_api/core/models/auth.py +++ b/api/libretime_api/core/models/auth.py @@ -2,7 +2,10 @@ from django.db import models class UserToken(models.Model): - user = models.ForeignKey("User", on_delete=models.DO_NOTHING) + user = models.ForeignKey( + "core.User", + on_delete=models.DO_NOTHING, + ) action = models.CharField(max_length=255) token = models.CharField(unique=True, max_length=40) created = models.DateTimeField() diff --git a/api/libretime_api/core/models/preference.py b/api/libretime_api/core/models/preference.py index cb57cfa85..a49bf0aa1 100644 --- a/api/libretime_api/core/models/preference.py +++ b/api/libretime_api/core/models/preference.py @@ -3,7 +3,7 @@ from django.db import models class Preference(models.Model): user = models.ForeignKey( - "User", + "core.User", on_delete=models.CASCADE, db_column="subjid", blank=True, diff --git a/api/libretime_api/core/models/worker.py b/api/libretime_api/core/models/worker.py index a5a314bc8..8961cac83 100644 --- a/api/libretime_api/core/models/worker.py +++ b/api/libretime_api/core/models/worker.py @@ -21,7 +21,7 @@ class ThirdPartyTrackReference(models.Model): class CeleryTask(models.Model): task_id = models.CharField(max_length=256) track_reference = models.ForeignKey( - "ThirdPartyTrackReference", + "core.ThirdPartyTrackReference", on_delete=models.DO_NOTHING, ) name = models.CharField(max_length=256, blank=True, null=True) diff --git a/api/libretime_api/history/models/listener.py b/api/libretime_api/history/models/listener.py index f22128565..a49dacf14 100644 --- a/api/libretime_api/history/models/listener.py +++ b/api/libretime_api/history/models/listener.py @@ -18,8 +18,8 @@ class Timestamp(models.Model): class ListenerCount(models.Model): - timestamp = models.ForeignKey("Timestamp", on_delete=models.DO_NOTHING) - mount_name = models.ForeignKey("MountName", on_delete=models.DO_NOTHING) + timestamp = models.ForeignKey("history.Timestamp", on_delete=models.DO_NOTHING) + mount_name = models.ForeignKey("history.MountName", on_delete=models.DO_NOTHING) listener_count = models.IntegerField() class Meta: diff --git a/api/libretime_api/history/models/played.py b/api/libretime_api/history/models/played.py index ba7635491..bb8a6a43b 100644 --- a/api/libretime_api/history/models/played.py +++ b/api/libretime_api/history/models/played.py @@ -24,7 +24,7 @@ class PlayoutHistory(models.Model): class PlayoutHistoryMetadata(models.Model): history = models.ForeignKey( - "PlayoutHistory", + "history.PlayoutHistory", on_delete=models.DO_NOTHING, ) key = models.CharField(max_length=128) @@ -45,7 +45,10 @@ class PlayoutHistoryTemplate(models.Model): class PlayoutHistoryTemplateField(models.Model): - template = models.ForeignKey("PlayoutHistoryTemplate", on_delete=models.DO_NOTHING) + template = models.ForeignKey( + "history.PlayoutHistoryTemplate", + on_delete=models.DO_NOTHING, + ) name = models.CharField(max_length=128) label = models.CharField(max_length=128) type = models.CharField(max_length=128) diff --git a/api/libretime_api/podcasts/models/podcast.py b/api/libretime_api/podcasts/models/podcast.py index 6407a7238..661405445 100644 --- a/api/libretime_api/podcasts/models/podcast.py +++ b/api/libretime_api/podcasts/models/podcast.py @@ -37,7 +37,7 @@ class Podcast(models.Model): class PodcastEpisode(models.Model): - podcast = models.ForeignKey("Podcast", on_delete=models.DO_NOTHING) + podcast = models.ForeignKey("podcasts.Podcast", on_delete=models.DO_NOTHING) file = models.ForeignKey( "storage.File", @@ -71,7 +71,7 @@ class PodcastEpisode(models.Model): class StationPodcast(models.Model): - podcast = models.ForeignKey("Podcast", on_delete=models.DO_NOTHING) + podcast = models.ForeignKey("podcasts.Podcast", on_delete=models.DO_NOTHING) def get_owner(self): return self.podcast.owner @@ -82,7 +82,7 @@ class StationPodcast(models.Model): class ImportedPodcast(models.Model): - podcast = models.ForeignKey("Podcast", on_delete=models.DO_NOTHING) + podcast = models.ForeignKey("podcasts.Podcast", on_delete=models.DO_NOTHING) override_album = models.BooleanField(db_column="album_override") auto_ingest = models.BooleanField() diff --git a/api/libretime_api/schedule/models/playlist.py b/api/libretime_api/schedule/models/playlist.py index 614e06e43..40eb75a66 100644 --- a/api/libretime_api/schedule/models/playlist.py +++ b/api/libretime_api/schedule/models/playlist.py @@ -24,7 +24,7 @@ class Playlist(models.Model): class PlaylistContent(models.Model): playlist = models.ForeignKey( - "Playlist", + "schedule.Playlist", on_delete=models.DO_NOTHING, blank=True, null=True, @@ -36,7 +36,7 @@ class PlaylistContent(models.Model): null=True, ) block = models.ForeignKey( - "SmartBlock", + "schedule.SmartBlock", on_delete=models.DO_NOTHING, blank=True, null=True, diff --git a/api/libretime_api/schedule/models/schedule.py b/api/libretime_api/schedule/models/schedule.py index d226d70bc..f7b6880dc 100644 --- a/api/libretime_api/schedule/models/schedule.py +++ b/api/libretime_api/schedule/models/schedule.py @@ -11,7 +11,7 @@ class Schedule(models.Model): null=True, ) stream = models.ForeignKey( - "Webstream", + "schedule.Webstream", on_delete=models.DO_NOTHING, blank=True, null=True, @@ -22,7 +22,7 @@ class Schedule(models.Model): cue_in = models.DurationField() cue_out = models.DurationField() media_item_played = models.BooleanField(blank=True, null=True) - instance = models.ForeignKey("ShowInstance", on_delete=models.DO_NOTHING) + instance = models.ForeignKey("schedule.ShowInstance", on_delete=models.DO_NOTHING) playout_status = models.SmallIntegerField() broadcasted = models.SmallIntegerField() position = models.IntegerField() diff --git a/api/libretime_api/schedule/models/show.py b/api/libretime_api/schedule/models/show.py index 39af85cd0..239f437c5 100644 --- a/api/libretime_api/schedule/models/show.py +++ b/api/libretime_api/schedule/models/show.py @@ -17,7 +17,7 @@ class Show(models.Model): image_path = models.CharField(max_length=255, blank=True, null=True) has_autoplaylist = models.BooleanField() autoplaylist = models.ForeignKey( - "Playlist", + "schedule.Playlist", on_delete=models.DO_NOTHING, blank=True, null=True, @@ -41,7 +41,7 @@ class ShowDays(models.Model): day = models.SmallIntegerField(blank=True, null=True) repeat_type = models.SmallIntegerField() next_pop_date = models.DateField(blank=True, null=True) - show = models.ForeignKey("Show", on_delete=models.DO_NOTHING) + show = models.ForeignKey("schedule.Show", on_delete=models.DO_NOTHING) record = models.SmallIntegerField(blank=True, null=True) def get_owner(self): @@ -53,7 +53,7 @@ class ShowDays(models.Model): class ShowHost(models.Model): - show = models.ForeignKey("Show", on_delete=models.DO_NOTHING) + show = models.ForeignKey("schedule.Show", on_delete=models.DO_NOTHING) subjs = models.ForeignKey("core.User", on_delete=models.DO_NOTHING) class Meta: @@ -65,7 +65,7 @@ class ShowInstance(models.Model): description = models.CharField(max_length=8192, blank=True, null=True) starts = models.DateTimeField() ends = models.DateTimeField() - show = models.ForeignKey("Show", on_delete=models.DO_NOTHING) + show = models.ForeignKey("schedule.Show", on_delete=models.DO_NOTHING) record = models.SmallIntegerField(blank=True, null=True) rebroadcast = models.SmallIntegerField(blank=True, null=True) instance = models.ForeignKey( @@ -97,7 +97,7 @@ class ShowInstance(models.Model): class ShowRebroadcast(models.Model): day_offset = models.CharField(max_length=1024) start_time = models.TimeField() - show = models.ForeignKey("Show", on_delete=models.DO_NOTHING) + show = models.ForeignKey("schedule.Show", on_delete=models.DO_NOTHING) def get_owner(self): return self.show.get_owner() diff --git a/api/libretime_api/schedule/models/smart_block.py b/api/libretime_api/schedule/models/smart_block.py index 73c3244e0..4b353e3cd 100644 --- a/api/libretime_api/schedule/models/smart_block.py +++ b/api/libretime_api/schedule/models/smart_block.py @@ -35,7 +35,7 @@ class SmartBlock(models.Model): class SmartBlockContent(models.Model): block = models.ForeignKey( - "SmartBlock", + "schedule.SmartBlock", on_delete=models.DO_NOTHING, blank=True, null=True, @@ -78,7 +78,7 @@ class SmartBlockCriteria(models.Model): value = models.CharField(max_length=512) extra = models.CharField(max_length=512, blank=True, null=True) criteriagroup = models.IntegerField(blank=True, null=True) - block = models.ForeignKey("SmartBlock", on_delete=models.DO_NOTHING) + block = models.ForeignKey("schedule.SmartBlock", on_delete=models.DO_NOTHING) def get_owner(self): return self.block.get_owner() diff --git a/api/libretime_api/schedule/models/webstream.py b/api/libretime_api/schedule/models/webstream.py index 5f9a6c89b..82c5eca4e 100644 --- a/api/libretime_api/schedule/models/webstream.py +++ b/api/libretime_api/schedule/models/webstream.py @@ -26,7 +26,7 @@ class Webstream(models.Model): class WebstreamMetadata(models.Model): - instance = models.ForeignKey("Schedule", on_delete=models.DO_NOTHING) + instance = models.ForeignKey("schedule.Schedule", on_delete=models.DO_NOTHING) start_time = models.DateTimeField() liquidsoap_data = models.CharField(max_length=1024) diff --git a/api/libretime_api/storage/models/cloud_file.py b/api/libretime_api/storage/models/cloud_file.py index 915fe100b..9570e172b 100644 --- a/api/libretime_api/storage/models/cloud_file.py +++ b/api/libretime_api/storage/models/cloud_file.py @@ -5,7 +5,7 @@ class CloudFile(models.Model): storage_backend = models.CharField(max_length=512) resource_id = models.TextField() filename = models.ForeignKey( - "File", + "storage.File", on_delete=models.DO_NOTHING, blank=True, null=True,