From 6d849e4f44ee3c63e0836455d2dd3814e7146f96 Mon Sep 17 00:00:00 2001
From: Dhruv Bhanushali <dhruv_b@live.com>
Date: Wed, 7 Jul 2021 10:33:30 +0530
Subject: [PATCH 1/2] Update field names for set to avoid shadowing the
 built-in name

---
 openverse-api/catalog/api/models/audio.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openverse-api/catalog/api/models/audio.py b/openverse-api/catalog/api/models/audio.py
index dd5a25af1..f5cc72921 100644
--- a/openverse-api/catalog/api/models/audio.py
+++ b/openverse-api/catalog/api/models/audio.py
@@ -55,14 +55,14 @@ class AudioSet(IdentifierMixin, MediaMixin, FileMixin, OpenLedgerModel):
 
 
 class Audio(AbstractMedia):
-    set = models.ForeignKey(
+    audio_set = models.ForeignKey(
         help_text='Reference to set of which this track is a part.',
         to=AudioSet,
         on_delete=models.SET_NULL,
         null=True,
         blank=True,
     )
-    set_position = models.IntegerField(
+    audio_set_position = models.IntegerField(
         blank=True,
         null=True,
         help_text='Ordering of the audio in the set.'

From a3080dafbded05cad144a36cc0ab1fb67ae80588 Mon Sep 17 00:00:00 2001
From: Dhruv Bhanushali <dhruv_b@live.com>
Date: Wed, 7 Jul 2021 10:34:35 +0530
Subject: [PATCH 2/2] Update migrations to reflect the name change

This is not recommended practice but works as long the migrations have not run on production yet.
---
 openverse-api/catalog/api/migrations/0032_audio_models.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openverse-api/catalog/api/migrations/0032_audio_models.py b/openverse-api/catalog/api/migrations/0032_audio_models.py
index 8e72d4ce2..c3bd11a07 100644
--- a/openverse-api/catalog/api/migrations/0032_audio_models.py
+++ b/openverse-api/catalog/api/migrations/0032_audio_models.py
@@ -38,7 +38,7 @@ class Migration(migrations.Migration):
                 ('tags', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True)),
                 ('tags_list', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, null=True, size=None)),
                 ('meta_data', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True)),
-                ('set_position', models.IntegerField(blank=True, help_text='Ordering of the audio in the set.', null=True)),
+                ('audio_set_position', models.IntegerField(blank=True, help_text='Ordering of the audio in the set.', null=True)),
                 ('genres', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(blank=True, max_length=80), db_index=True, help_text='The artistic style of this audio file, eg. hip-hop (music) / tech (podcasts).', null=True, size=None)),
                 ('category', models.CharField(blank=True, db_index=True, help_text='The category of this audio file, eg. music, podcast, news & audiobook.', max_length=80, null=True)),
                 ('duration', models.IntegerField(blank=True, help_text='The time length of the audio file in milliseconds.', null=True)),
@@ -121,7 +121,7 @@ class Migration(migrations.Migration):
         ),
         migrations.AddField(
             model_name='audio',
-            name='set',
+            name='audio_set',
             field=models.ForeignKey(blank=True, help_text='Reference to set of which this track is a part.', null=True, on_delete=django.db.models.deletion.SET_NULL, to='api.AudioSet'),
         ),
     ]