Reduce DB queries needed in search results

api/catalog/api/admin/__init__.py

@@ -1,32 +1,54 @@
 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_id")
+    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):
+        if request.path.endswith("/change/"):
+            return ["media_obj"]
+
     def get_readonly_fields(self, request, obj=None):
         if obj is None:
             return []
         always_readonly = [
             "reason",
             "description",
-            "identifier",
+            "media_obj_id",
             "created_at",
         ]
         if obj.status == PENDING:
@@ -48,12 +70,9 @@ class AudioReportAdmin(MediaReportAdmin):
 
 
 class MediaSubreportAdmin(admin.ModelAdmin):
-    search_fields = [
-        "identifier",
-    ]
-    readonly_fields = [
-        "identifier",
-    ]
+    exclude = ("media_obj",)
+    search_fields = ("media_obj_id",)
+    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,157 @@
+# Generated by Django 4.1.2 on 2022-12-12 05:54
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+REPORTING_TABLES = [
+    "api_deletedaudio",
+    "api_deletedimage",
+    "api_matureaudio",
+    "api_matureimage",
+    "nsfw_reports",
+    "nsfw_reports_audio",
+]
+forward_query = "".join([
+    f"UPDATE {table} SET media_obj_id = identifier;"
+    for table in REPORTING_TABLES
+])
+reverse_query = "".join([
+    f"UPDATE {table} SET identifier = media_obj_id;"
+    for table in REPORTING_TABLES
+])
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0051_delete_sourcelogo'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='deletedimage',
+            name='identifier',
+            field=models.UUIDField(unique=True),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='matureimage',
+            name='identifier',
+            field=models.UUIDField(unique=True),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='deletedaudio',
+            name='identifier',
+            field=models.UUIDField(unique=True),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='matureaudio',
+            name='identifier',
+            field=models.UUIDField(unique=True),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='imagereport',
+            name='media_obj',
+            field=models.ForeignKey(db_constraint=False, null=True, related_name="image_report", help_text="The reference to the image being reported.", on_delete=django.db.models.deletion.DO_NOTHING, to='api.image', to_field='identifier'),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='deletedimage',
+            name='media_obj',
+            field=models.OneToOneField(db_constraint=False, null=True, related_name="deleted_image", help_text="The reference to the deleted image.", on_delete=django.db.models.deletion.DO_NOTHING, serialize=False, to='api.image', to_field='identifier'),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='matureimage',
+            name='media_obj',
+            field=models.OneToOneField(db_constraint=False, null=True, related_name="mature_image", help_text="The reference to the mature image.", on_delete=django.db.models.deletion.DO_NOTHING, serialize=False, to='api.image', to_field='identifier'),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='audioreport',
+            name='media_obj',
+            field=models.ForeignKey(db_constraint=False, null=True, related_name="audio_report", help_text="The reference to the audio being reported.", on_delete=django.db.models.deletion.DO_NOTHING, to='api.audio', to_field='identifier'),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='deletedaudio',
+            name='media_obj',
+            field=models.OneToOneField(db_constraint=False, null=True, related_name="deleted_audio", help_text="The reference to the deleted audio.", on_delete=django.db.models.deletion.DO_NOTHING, serialize=False, to='api.audio', to_field='identifier'),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='matureaudio',
+            name='media_obj',
+            field=models.OneToOneField(db_constraint=False, null=True, related_name="mature_audio", help_text="The reference to the mature audio.", on_delete=django.db.models.deletion.DO_NOTHING, serialize=False, to='api.audio', to_field='identifier'),
+            preserve_default=False,
+        ),
+        migrations.RunSQL(
+            forward_query,
+            reverse_query,
+        ),
+        migrations.AlterField(
+            model_name='imagereport',
+            name='media_obj',
+            field=models.ForeignKey(db_constraint=False, related_name="image_report", help_text="The reference to the image being reported.", on_delete=django.db.models.deletion.DO_NOTHING, to='api.image', to_field='identifier'),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='deletedimage',
+            name='media_obj',
+            field=models.OneToOneField(db_constraint=False, related_name="deleted_image", help_text="The reference to the deleted image.", on_delete=django.db.models.deletion.DO_NOTHING, primary_key=True, serialize=False, to='api.image', to_field='identifier'),
+        ),
+        migrations.AlterField(
+            model_name='matureimage',
+            name='media_obj',
+            field=models.OneToOneField(db_constraint=False, related_name="mature_image", help_text="The reference to the mature image.", on_delete=django.db.models.deletion.DO_NOTHING, primary_key=True, serialize=False, to='api.image', to_field='identifier'),
+        ),
+        migrations.AlterField(
+            model_name='audioreport',
+            name='media_obj',
+            field=models.ForeignKey(db_constraint=False, related_name="audio_report", help_text="The reference to the audio being reported.", on_delete=django.db.models.deletion.DO_NOTHING, to='api.audio', to_field='identifier'),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='deletedaudio',
+            name='media_obj',
+            field=models.OneToOneField(db_constraint=False, related_name="deleted_audio", help_text="The reference to the deleted audio.", on_delete=django.db.models.deletion.DO_NOTHING, primary_key=True, serialize=False, to='api.audio', to_field='identifier'),
+        ),
+        migrations.AlterField(
+            model_name='matureaudio',
+            name='media_obj',
+            field=models.OneToOneField(db_constraint=False, related_name="mature_audio", help_text="The reference to the mature audio.", on_delete=django.db.models.deletion.DO_NOTHING, primary_key=True, serialize=False, to='api.audio', to_field='identifier'),
+        ),
+        migrations.RemoveField(
+            model_name='imagereport',
+            name='identifier',
+        ),
+        migrations.RemoveField(
+            model_name='deletedimage',
+            name='identifier',
+        ),
+        migrations.RemoveField(
+            model_name='matureimage',
+            name='identifier',
+        ),
+        migrations.RemoveField(
+            model_name='audioreport',
+            name='identifier',
+        ),
+        migrations.RemoveField(
+            model_name='deletedaudio',
+            name='identifier',
+        ),
+        migrations.RemoveField(
+            model_name='matureaudio',
+            name='identifier',
+        ),
+        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')),
+        ),
+    ]