Reduce DB queries needed in search results

api/catalog/api/admin/__init__.py

@@ -1,40 +1,61 @@
 from django.contrib import admin
 
 from catalog.api.admin.site import openverse_admin
-from catalog.api.models import PENDING, AudioReport, ContentProvider, ImageReport
+from catalog.api.models import (
+    PENDING,
+    Audio,
+    AudioReport,
+    ContentProvider,
+    Image,
+    ImageReport,
+)
 from catalog.api.models.media import AbstractDeletedMedia, AbstractMatureMedia
 
 
 admin.site = openverse_admin
 admin.sites.site = openverse_admin
 
 
+@admin.register(Image)
+class ImageAdmin(admin.ModelAdmin):
+    search_fields = ("identifier",)
+
+
+@admin.register(Audio)
+class AudioAdmin(admin.ModelAdmin):
+    search_fields = ("identifier",)
+
+
 class MediaReportAdmin(admin.ModelAdmin):
     list_display = ("reason", "status", "description", "created_at")
     media_specific_list_display = ()
     list_filter = ("status", "reason")
     list_display_links = ("status",)
-    search_fields = ("description", "identifier")
+    search_fields = ("description", "media_obj__identifier")
+    autocomplete_fields = ("media_obj",)
     actions = None
 
     def get_list_display(self, request):
         return self.list_display + self.media_specific_list_display
 
+    def get_exclude(self, request, obj=None):
+        # ``identifier`` cannot be edited on an existing report.
+        if request.path.endswith("/change/"):
+            return ["media_obj"]
+
     def get_readonly_fields(self, request, obj=None):
         if obj is None:
             return []
-        always_readonly = [
+        readonly_fields = [
             "reason",
             "description",
-            "identifier",
+            "media_obj_id",
             "created_at",
         ]
-        if obj.status == PENDING:
-            return always_readonly
-        else:
-            status_readonly = ["status"]
-            status_readonly.extend(always_readonly)
-            return status_readonly
+        # ``status`` cannot be changed on a finalised report.
+        if obj.status != PENDING:
+            readonly_fields.append("status")
+        return readonly_fields
 
 
 @admin.register(ImageReport)
@@ -48,12 +69,9 @@ class AudioReportAdmin(MediaReportAdmin):
 
 
 class MediaSubreportAdmin(admin.ModelAdmin):
-    search_fields = [
-        "identifier",
-    ]
-    readonly_fields = [
-        "identifier",
-    ]
+    exclude = ("media_obj",)
+    search_fields = ("media_obj__identifier",)
+    readonly_fields = ("media_obj_id",)
 
     def has_add_permission(self, *args, **kwargs):
         """Create ``_Report`` instances instead."""

api/catalog/api/admin/site.py

@@ -24,7 +24,17 @@ def get_app_list(self, *args, **kwargs):
                 if media_type in model["object_name"].lower():
                     models.append(model)
                     api_app["models"].remove(model)
-            models.sort(key=lambda x: "0" if "report" in x["name"] else x["name"])
+
+            def key(entry):
+                name = entry["name"]
+                if name in ["Audios", "Images"]:
+                    return "0"
+                elif "report" in name:
+                    return "1"
+                else:
+                    return name
+
+            models.sort(key=key)
 
             media_app = {
                 "name": media_type_name,

api/catalog/api/examples/audio_responses.py

@@ -62,13 +62,7 @@
         "page_size": 20,
         "page": 1,
         "results": [
-            base_audio
-            | {
-                "fields_matched": ["title"],
-                "audio_set": None,
-                "attribution": None,
-                "filesize": None,
-            },
+            base_audio | {"fields_matched": ["title"]},
         ],
     },
 }

api/catalog/api/examples/image_responses.py

@@ -18,8 +18,8 @@
     "provider": "stocksnap",
     "source": "stocksnap",
     "category": "photograph",
-    "filesize": None,
-    "filetype": None,
+    "filesize": 896128,
+    "filetype": "jpg",
     "tags": [
         {"name": "tree"},
         {"name": "bark"},
@@ -43,11 +43,15 @@
         {"name": "closeup"},
         {"name": "root"},
     ],
-    "attribution": None,
+    "attribution": (
+        '"Tree Bark Photo" by Tim Sullivan is marked with '
+        "CC0 1.0. To view the terms, visit "
+        "https://creativecommons.org/publicdomain/zero/1.0/."
+    ),
     "fields_matched": [],
     "mature": False,
-    "height": None,
-    "width": None,
+    "height": 4016,
+    "width": 6016,
     "thumbnail": f"{origin}/v1/images/{identifier}/thumb/",
     "detail_url": f"{origin}/v1/images/{identifier}/",
     "related_url": f"{origin}/v1/images/{identifier}/related/",
@@ -67,17 +71,7 @@
         "page_count": 0,
         "page_size": 20,
         "page": 1,
-        "results": [
-            base_image
-            | {
-                "fields_matched": ["title"],
-                "height": None,
-                "width": None,
-                "attribution": None,
-                "filesize": None,
-                "filetype": None,
-            }
-        ],
+        "results": [base_image | {"fields_matched": ["title"]}],
     },
 }
 

api/catalog/api/migrations/0052_relational_fields.py

@@ -0,0 +1,79 @@
+# Generated by Django 4.1.3 on 2022-12-20 06:17
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0051_delete_sourcelogo'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='audio',
+            name='audioset',
+            field=models.ForeignObject(from_fields=('audio_set_foreign_identifier', 'provider'), null=True, on_delete=django.db.models.deletion.DO_NOTHING, to='api.audioset', to_fields=('foreign_identifier', 'provider')),
+        ),
+        migrations.AlterField(
+            model_name='audioreport',
+            name='identifier',
+            field=models.ForeignKey(db_column="identifier", db_constraint=False, help_text='The reference to the audio being reported.', on_delete=django.db.models.deletion.DO_NOTHING, related_name='audio_report', to='api.audio', to_field='identifier'),
+        ),
+        migrations.AlterField(
+            model_name='deletedaudio',
+            name='identifier',
+            field=models.OneToOneField(db_column="identifier", db_constraint=False, help_text='The reference to the deleted audio.', on_delete=django.db.models.deletion.DO_NOTHING, primary_key=True, related_name='deleted_audio', serialize=False, to='api.audio', to_field='identifier'),
+        ),
+        migrations.AlterField(
+            model_name='deletedimage',
+            name='identifier',
+            field=models.OneToOneField(db_column="identifier", db_constraint=False, help_text='The reference to the deleted image.', on_delete=django.db.models.deletion.DO_NOTHING, primary_key=True, related_name='deleted_image', serialize=False, to='api.image', to_field='identifier'),
+        ),
+        migrations.AlterField(
+            model_name='imagereport',
+            name='identifier',
+            field=models.ForeignKey(db_column="identifier", db_constraint=False, help_text='The reference to the image being reported.', on_delete=django.db.models.deletion.DO_NOTHING, related_name='image_report', to='api.image', to_field='identifier'),
+        ),
+        migrations.AlterField(
+            model_name='matureaudio',
+            name='identifier',
+            field=models.OneToOneField(db_column="identifier", db_constraint=False, help_text='The reference to the mature audio.', on_delete=django.db.models.deletion.DO_NOTHING, primary_key=True, related_name='mature_audio', serialize=False, to='api.audio', to_field='identifier'),
+        ),
+        migrations.AlterField(
+            model_name='matureimage',
+            name='identifier',
+            field=models.OneToOneField(db_column="identifier", db_constraint=False, help_text='The reference to the mature image.', on_delete=django.db.models.deletion.DO_NOTHING, primary_key=True, related_name='mature_image', serialize=False, to='api.image', to_field='identifier'),
+        ),
+        migrations.RenameField(
+            model_name="audioreport",
+            old_name="identifier",
+            new_name="media_obj",
+        ),
+        migrations.RenameField(
+            model_name="deletedaudio",
+            old_name="identifier",
+            new_name="media_obj",
+        ),
+        migrations.RenameField(
+            model_name="deletedimage",
+            old_name="identifier",
+            new_name="media_obj",
+        ),
+        migrations.RenameField(
+            model_name="imagereport",
+            old_name="identifier",
+            new_name="media_obj",
+        ),
+        migrations.RenameField(
+            model_name="matureaudio",
+            old_name="identifier",
+            new_name="media_obj",
+        ),
+        migrations.RenameField(
+            model_name="matureimage",
+            old_name="identifier",
+            new_name="media_obj",
+        ),
+    ]

api/catalog/api/models/audio.py

@@ -141,6 +141,14 @@ class Audio(AudioFileMixin, AbstractMedia):
     category: eg. music, sound_effect, podcast, news & audiobook
     """
 
+    audioset = models.ForeignObject(
+        to="AudioSet",
+        on_delete=models.DO_NOTHING,
+        from_fields=["audio_set_foreign_identifier", "provider"],
+        to_fields=["foreign_identifier", "provider"],
+        null=True,
+    )
+
     # Replaces the foreign key to AudioSet
     audio_set_foreign_identifier = models.CharField(
         max_length=1000,
@@ -178,7 +186,7 @@ class Audio(AudioFileMixin, AbstractMedia):
 
     @property
     def mature(self) -> bool:
-        return MatureAudio.objects.filter(identifier=self.identifier).exists()
+        return hasattr(self, "mature_audio")
 
     @property
     def alternative_files(self):
@@ -192,13 +200,7 @@ def duration_in_s(self):
 
     @property
     def audio_set(self):
-        try:
-            return AudioSet.objects.get(
-                provider=self.provider,
-                foreign_identifier=self.audio_set_foreign_identifier,
-            )
-        except AudioSet.DoesNotExist:
-            return None
+        return getattr(self, "audioset")
 
     def get_waveform(self) -> list[float]:
         """
@@ -236,6 +238,17 @@ class DeletedAudio(AbstractDeletedMedia):
     media_class = Audio
     es_index = settings.MEDIA_INDEX_MAPPING[AUDIO_TYPE]
 
+    media_obj = models.OneToOneField(
+        to="Audio",
+        to_field="identifier",
+        on_delete=models.DO_NOTHING,
+        primary_key=True,
+        db_constraint=False,
+        db_column="identifier",
+        related_name="deleted_audio",
+        help_text="The reference to the deleted audio.",
+    )
+
     class Meta:
         verbose_name_plural = "Deleted audio"
 
@@ -249,6 +262,17 @@ class MatureAudio(AbstractMatureMedia):
     media_class = Audio
     es_index = settings.MEDIA_INDEX_MAPPING[AUDIO_TYPE]
 
+    media_obj = models.OneToOneField(
+        to="Audio",
+        to_field="identifier",
+        on_delete=models.DO_NOTHING,
+        primary_key=True,
+        db_constraint=False,
+        db_column="identifier",
+        related_name="mature_audio",
+        help_text="The reference to the mature audio.",
+    )
+
     class Meta:
         verbose_name_plural = "Mature audio"
 
@@ -258,6 +282,16 @@ class AudioReport(AbstractMediaReport):
     mature_class = MatureAudio
     deleted_class = DeletedAudio
 
+    media_obj = models.ForeignKey(
+        to="Audio",
+        to_field="identifier",
+        on_delete=models.DO_NOTHING,
+        db_constraint=False,
+        db_column="identifier",
+        related_name="audio_report",
+        help_text="The reference to the audio being reported.",
+    )
+
     class Meta:
         db_table = "nsfw_reports_audio"