ebird-api-data 0.1.1__tar.gz → 0.2.0__tar.gz

{ebird_api_data-0.1.1 → ebird_api_data-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ebird-api-data
-Version: 0.1.1
+Version: 0.2.0
 Summary: eBird API Data is a reusable Django app for loading data from eBird into a database.
 Author-email: Stuart MacKay <smackay@flagstonesoftware.com>
 License-Expression: MIT

{ebird_api_data-0.1.1 → ebird_api_data-0.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ebird-api-data"
-version = "0.1.1"
+version = "0.2.0"
 description = "eBird API Data is a reusable Django app for loading data from eBird into a database."
 keywords = ["checklists", "observations", "species", "Django", "eBird", "models"]
 license = "MIT"
@@ -64,7 +64,7 @@ dev-dependencies = [
 ]
 
 [tool.bumpversion]
-current_version = "0.1.1"
+current_version = "0.2.0"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 ignore_missing_version = false

ebird_api_data-0.2.0/src/ebird/api/data/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.0"

{ebird_api_data-0.1.1 → ebird_api_data-0.2.0}/src/ebird/api/data/loaders.py

@@ -303,19 +303,33 @@ class APILoader:
 
     def get_observer(self, data: dict) -> Observer:
         name: str = data.get("userDisplayName", "Anonymous eBirder")
-        observer, created = Observer.objects.get_or_create(
-            original=name, defaults={"name": name}
-        )
-        if observer.multiple:
+        is_multiple = Observer.objects.filter(original=name, multiple=True).exists()
+        if is_multiple:
+            identifier = self.get_observer_identifier(data)
             observer, created = Observer.objects.get_or_create(
-                identifier=self.get_observer_identifier(data),
-                defaults={"original": random_word(8), "name": name},
+                identifier=identifier,
+                defaults={
+                    "name":name,
+                    "original": random_word(8)
+                }
             )
-        elif observer.identifier == "":
-            observer.identifier = self.get_observer_identifier(data)
-            observer.save()
+        else:
+            if observer := Observer.objects.filter(original=name).first():
+                created = False
+            else:
+                identifier = self.get_observer_identifier(data)
+                observer = Observer.objects.create(
+                    identifier=identifier,
+                    name=name,
+                    original=name,
+                )
+                created = True
+
         if created:
-            logger.info("Added observer: %s", observer.name)
+            logger.info("Added observer: %s", name)
+            if Observer.objects.filter(original=name).count() > 1:
+                logger.error("Multiple observers exist with same name: %s", name)
+
         return observer
 
     def add_checklist(self, identifier: str) -> Checklist | None:

ebird_api_data-0.2.0/src/ebird/api/data/migrations/0002_convert_foreign_keys_to_integers.py

@@ -0,0 +1,103 @@
+# Generated by Django 5.2.4 on 2025-07-14 09:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('data', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='checklist',
+            name='country',
+            field=models.IntegerField(),
+        ),
+        migrations.AlterField(
+            model_name='checklist',
+            name='county',
+            field=models.IntegerField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='checklist',
+            name='location',
+            field=models.IntegerField(),
+        ),
+        migrations.AlterField(
+            model_name='checklist',
+            name='observer',
+            field=models.IntegerField(),
+        ),
+        migrations.AlterField(
+            model_name='checklist',
+            name='state',
+            field=models.IntegerField(),
+        ),
+        migrations.AlterField(
+            model_name='filter',
+            name='location',
+            field=models.IntegerField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='filter',
+            name='species',
+            field=models.IntegerField(),
+        ),
+        migrations.AlterField(
+            model_name='filter',
+            name='update_species',
+            field=models.IntegerField(),
+        ),
+        migrations.AlterField(
+            model_name='location',
+            name='country',
+            field=models.IntegerField(),
+        ),
+        migrations.AlterField(
+            model_name='location',
+            name='county',
+            field=models.IntegerField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='location',
+            name='state',
+            field=models.IntegerField(),
+        ),
+        migrations.AlterField(
+            model_name='observation',
+            name='checklist',
+            field=models.IntegerField(),
+        ),
+        migrations.AlterField(
+            model_name='observation',
+            name='country',
+            field=models.IntegerField(),
+        ),
+        migrations.AlterField(
+            model_name='observation',
+            name='county',
+            field=models.IntegerField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='observation',
+            name='location',
+            field=models.IntegerField(),
+        ),
+        migrations.AlterField(
+            model_name='observation',
+            name='observer',
+            field=models.IntegerField(),
+        ),
+        migrations.AlterField(
+            model_name='observation',
+            name='species',
+            field=models.IntegerField(),
+        ),
+        migrations.AlterField(
+            model_name='observation',
+            name='state',
+            field=models.IntegerField(),
+        ),
+    ]

ebird_api_data-0.2.0/src/ebird/api/data/migrations/0003_make_codes_and_identifiers_primary_keys.py

@@ -0,0 +1,93 @@
+# Generated by Django 5.2.4 on 2025-07-14 09:49
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('data', '0002_convert_foreign_keys_to_integers'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='checklist',
+            name='id',
+            field=models.IntegerField(),
+        ),
+        migrations.AlterField(
+            model_name='country',
+            name='id',
+            field=models.IntegerField(),
+        ),
+        migrations.AlterField(
+            model_name='county',
+            name='id',
+            field=models.IntegerField(),
+        ),
+        migrations.AlterField(
+            model_name='location',
+            name='id',
+            field=models.IntegerField(),
+        ),
+        migrations.AlterField(
+            model_name='observation',
+            name='id',
+            field=models.IntegerField(),
+        ),
+        migrations.AlterField(
+            model_name='observer',
+            name='id',
+            field=models.IntegerField(),
+        ),
+        migrations.AlterField(
+            model_name='species',
+            name='id',
+            field=models.IntegerField(),
+        ),
+        migrations.AlterField(
+            model_name='state',
+            name='id',
+            field=models.IntegerField(),
+        ),
+        migrations.AlterField(
+            model_name='checklist',
+            name='identifier',
+            field=models.CharField(help_text='The unique identifier for the checklist.', max_length=15, primary_key=True, serialize=False, verbose_name='identifier'),
+        ),
+        migrations.AlterField(
+            model_name='country',
+            name='code',
+            field=models.CharField(help_text='The code used to identify the country.', max_length=2, primary_key=True, serialize=False, verbose_name='code'),
+        ),
+        migrations.AlterField(
+            model_name='county',
+            name='code',
+            field=models.CharField(help_text='The code used to identify the county.', max_length=10, primary_key=True, serialize=False, verbose_name='code'),
+        ),
+        migrations.AlterField(
+            model_name='location',
+            name='identifier',
+            field=models.CharField(help_text='The unique identifier for the location.', max_length=15, primary_key=True, serialize=False, verbose_name='identifier'),
+        ),
+        migrations.AlterField(
+            model_name='observation',
+            name='identifier',
+            field=models.CharField(help_text='A global unique identifier for the observation.', max_length=15, primary_key=True, serialize=False, verbose_name='identifier'),
+        ),
+        migrations.AlterField(
+            model_name='observer',
+            name='identifier',
+            field=models.CharField(help_text='The code for the person submitted the checklist.', max_length=15, primary_key=True, serialize=False, verbose_name='identifier'),
+        ),
+        migrations.AlterField(
+            model_name='species',
+            name='species_code',
+            field=models.CharField(help_text='The species code, e.g. ostric2, used in the eBird API.', max_length=10, primary_key=True, serialize=False, verbose_name='species code'),
+        ),
+        migrations.AlterField(
+            model_name='state',
+            name='code',
+            field=models.CharField(help_text='The code used to identify the state.', max_length=6, primary_key=True, serialize=False, verbose_name='code'),
+        ),
+    ]

ebird_api_data-0.2.0/src/ebird/api/data/migrations/0004_rename_foreign_keys.py

@@ -0,0 +1,103 @@
+# Generated by Django 5.2.4 on 2025-07-14 09:59
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('data', '0003_make_codes_and_identifiers_primary_keys'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='checklist',
+            old_name='country',
+            new_name='country_old',
+        ),
+        migrations.RenameField(
+            model_name='checklist',
+            old_name='county',
+            new_name='county_old',
+        ),
+        migrations.RenameField(
+            model_name='checklist',
+            old_name='location',
+            new_name='location_old',
+        ),
+        migrations.RenameField(
+            model_name='checklist',
+            old_name='observer',
+            new_name='observer_old',
+        ),
+        migrations.RenameField(
+            model_name='checklist',
+            old_name='state',
+            new_name='state_old',
+        ),
+        migrations.RenameField(
+            model_name='filter',
+            old_name='location',
+            new_name='location_old',
+        ),
+        migrations.RenameField(
+            model_name='filter',
+            old_name='species',
+            new_name='species_old',
+        ),
+        migrations.RenameField(
+            model_name='filter',
+            old_name='update_species',
+            new_name='update_species_old',
+        ),
+        migrations.RenameField(
+            model_name='location',
+            old_name='country',
+            new_name='country_old',
+        ),
+        migrations.RenameField(
+            model_name='location',
+            old_name='county',
+            new_name='county_old',
+        ),
+        migrations.RenameField(
+            model_name='location',
+            old_name='state',
+            new_name='state_old',
+        ),
+        migrations.RenameField(
+            model_name='observation',
+            old_name='checklist',
+            new_name='checklist_old',
+        ),
+        migrations.RenameField(
+            model_name='observation',
+            old_name='country',
+            new_name='country_old',
+        ),
+        migrations.RenameField(
+            model_name='observation',
+            old_name='county',
+            new_name='county_old',
+        ),
+        migrations.RenameField(
+            model_name='observation',
+            old_name='location',
+            new_name='location_old',
+        ),
+        migrations.RenameField(
+            model_name='observation',
+            old_name='observer',
+            new_name='observer_old',
+        ),
+        migrations.RenameField(
+            model_name='observation',
+            old_name='species',
+            new_name='species_old',
+        ),
+        migrations.RenameField(
+            model_name='observation',
+            old_name='state',
+            new_name='state_old',
+        ),
+    ]

ebird_api_data-0.2.0/src/ebird/api/data/migrations/0005_add_new_foreign_keys.py

@@ -0,0 +1,104 @@
+# Generated by Django 5.2.4 on 2025-07-14 10:06
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('data', '0004_rename_foreign_keys'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='checklist',
+            name='country',
+            field=models.ForeignKey(help_text='The country where the checklist was made.', null=True, on_delete=django.db.models.deletion.PROTECT, related_name='checklists', to='data.country', verbose_name='country'),
+        ),
+        migrations.AddField(
+            model_name='checklist',
+            name='county',
+            field=models.ForeignKey(blank=True, help_text='The county where the checklist was made.', null=True, on_delete=django.db.models.deletion.PROTECT, related_name='checklists', to='data.county', verbose_name='county'),
+        ),
+        migrations.AddField(
+            model_name='checklist',
+            name='location',
+            field=models.ForeignKey(help_text='The location where checklist was made.', null=True, on_delete=django.db.models.deletion.PROTECT, related_name='checklists', to='data.location', verbose_name='location'),
+        ),
+        migrations.AddField(
+            model_name='checklist',
+            name='observer',
+            field=models.ForeignKey(help_text='The person who submitted the checklist.', null=True, on_delete=django.db.models.deletion.PROTECT, related_name='checklists', to='data.observer', verbose_name='observer'),
+        ),
+        migrations.AddField(
+            model_name='checklist',
+            name='state',
+            field=models.ForeignKey(help_text='The state where the checklist was made.', null=True, on_delete=django.db.models.deletion.PROTECT, related_name='checklists', to='data.state', verbose_name='state'),
+        ),
+        migrations.AddField(
+            model_name='filter',
+            name='location',
+            field=models.ForeignKey(blank=True, help_text='The location used to find matching Observations.', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='filtered_on', to='data.location', verbose_name='location'),
+        ),
+        migrations.AddField(
+            model_name='filter',
+            name='species',
+            field=models.ForeignKey(help_text='The species used to find matching Observations.', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='filtered_on', to='data.species', verbose_name='species'),
+        ),
+        migrations.AddField(
+            model_name='filter',
+            name='update_species',
+            field=models.ForeignKey(help_text='Matching Observations are updated to this species.', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='filtered_by', to='data.species', verbose_name='update species'),
+        ),
+        migrations.AddField(
+            model_name='location',
+            name='country',
+            field=models.ForeignKey(help_text='The country for the location.', null=True, on_delete=django.db.models.deletion.PROTECT, related_name='locations', to='data.country', verbose_name='country'),
+        ),
+        migrations.AddField(
+            model_name='location',
+            name='county',
+            field=models.ForeignKey(blank=True, help_text='The county for the location.', null=True, on_delete=django.db.models.deletion.PROTECT, related_name='locations', to='data.county', verbose_name='county'),
+        ),
+        migrations.AddField(
+            model_name='location',
+            name='state',
+            field=models.ForeignKey(help_text='The state for the location.', null=True, on_delete=django.db.models.deletion.PROTECT, related_name='locations', to='data.state', verbose_name='state'),
+        ),
+        migrations.AddField(
+            model_name='observation',
+            name='checklist',
+            field=models.ForeignKey(help_text='The checklist this observation belongs to.', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='observations', to='data.checklist', verbose_name='checklist'),
+        ),
+        migrations.AddField(
+            model_name='observation',
+            name='country',
+            field=models.ForeignKey(help_text='The country where the observation was made.', null=True, on_delete=django.db.models.deletion.PROTECT, related_name='observations', to='data.country', verbose_name='country'),
+        ),
+        migrations.AddField(
+            model_name='observation',
+            name='county',
+            field=models.ForeignKey(blank=True, help_text='The county where the observation was made.', null=True, on_delete=django.db.models.deletion.PROTECT, related_name='observations', to='data.county', verbose_name='county'),
+        ),
+        migrations.AddField(
+            model_name='observation',
+            name='location',
+            field=models.ForeignKey(help_text='The location where the observation was made.', null=True, on_delete=django.db.models.deletion.PROTECT, related_name='observations', to='data.location', verbose_name='location'),
+        ),
+        migrations.AddField(
+            model_name='observation',
+            name='observer',
+            field=models.ForeignKey(help_text='The person who made the observation.', null=True, on_delete=django.db.models.deletion.PROTECT, related_name='observations', to='data.observer', verbose_name='observer'),
+        ),
+        migrations.AddField(
+            model_name='observation',
+            name='species',
+            field=models.ForeignKey(help_text='The identified species.', null=True, on_delete=django.db.models.deletion.PROTECT, related_name='observations', to='data.species', verbose_name='species'),
+        ),
+        migrations.AddField(
+            model_name='observation',
+            name='state',
+            field=models.ForeignKey(help_text='The state where the observation was made.', null=True, on_delete=django.db.models.deletion.PROTECT, related_name='observations', to='data.state', verbose_name='state'),
+        ),
+    ]

ebird_api_data-0.2.0/src/ebird/api/data/migrations/0006_set_new_foreign_keys.py

@@ -0,0 +1,266 @@
+# Generated by Django 5.2.4 on 2025-07-14 10:06
+
+import django.db.models.deletion
+from django.db import connection, migrations, models
+
+
+def update_location_country(apps, schema_editor):
+    with connection.cursor() as cursor:
+        cursor.execute(
+            "UPDATE data_location "
+            "SET country_id = data_country.code "
+            "FROM data_country "
+            "WHERE data_location.country_old = data_country.id"
+        )
+
+
+def update_location_state(apps, schema_editor):
+    with connection.cursor() as cursor:
+        cursor.execute(
+            "UPDATE data_location "
+            "SET state_id = data_state.code "
+            "FROM data_state "
+            "WHERE data_location.state_old = data_state.id"
+        )
+
+
+def update_location_county(apps, schema_editor):
+    with connection.cursor() as cursor:
+        cursor.execute(
+            "UPDATE data_location "
+            "SET county_id = data_county.code "
+            "FROM data_county "
+            "WHERE data_location.county_old = data_county.id"
+        )
+
+
+def update_checklist_country(apps, schema_editor):
+    with connection.cursor() as cursor:
+        cursor.execute(
+            "UPDATE data_checklist "
+            "SET country_id = data_country.code "
+            "FROM data_country "
+            "WHERE data_checklist.country_old = data_country.id"
+        )
+
+
+def update_checklist_state(apps, schema_editor):
+    with connection.cursor() as cursor:
+        cursor.execute(
+            "UPDATE data_checklist "
+            "SET state_id = data_state.code "
+            "FROM data_state "
+            "WHERE data_checklist.state_old = data_state.id"
+        )
+
+
+def update_checklist_county(apps, schema_editor):
+    with connection.cursor() as cursor:
+        cursor.execute(
+            "UPDATE data_checklist "
+            "SET county_id = data_county.code "
+            "FROM data_county "
+            "WHERE data_checklist.county_old = data_county.id"
+        )
+
+
+def update_checklist_location(apps, schema_editor):
+    with connection.cursor() as cursor:
+        cursor.execute(
+            "UPDATE data_checklist "
+            "SET location_id = data_location.identifier "
+            "FROM data_location "
+            "WHERE data_checklist.location_old = data_location.id"
+        )
+
+
+def update_checklist_observer(apps, schema_editor):
+    with connection.cursor() as cursor:
+        cursor.execute(
+            "UPDATE data_checklist "
+            "SET observer_id = data_observer.identifier "
+            "FROM data_observer "
+            "WHERE data_checklist.observer_old = data_observer.id"
+        )
+
+
+def update_observation_country(apps, schema_editor):
+    with connection.cursor() as cursor:
+        cursor.execute(
+            "UPDATE data_observation "
+            "SET country_id = data_country.code "
+            "FROM data_country "
+            "WHERE data_observation.country_old = data_country.id"
+        )
+
+
+def update_observation_state(apps, schema_editor):
+    with connection.cursor() as cursor:
+        cursor.execute(
+            "UPDATE data_observation "
+            "SET state_id = data_state.code "
+            "FROM data_state "
+            "WHERE data_observation.state_old = data_state.id"
+        )
+
+
+def update_observation_county(apps, schema_editor):
+    with connection.cursor() as cursor:
+        cursor.execute(
+            "UPDATE data_observation "
+            "SET county_id = data_county.code "
+            "FROM data_county "
+            "WHERE data_observation.county_old = data_county.id"
+        )
+
+
+def update_observation_location(apps, schema_editor):
+    with connection.cursor() as cursor:
+        cursor.execute(
+            "UPDATE data_observation "
+            "SET location_id = data_location.identifier "
+            "FROM data_location "
+            "WHERE data_observation.location_old = data_location.id"
+        )
+
+
+def update_observation_observer(apps, schema_editor):
+    with connection.cursor() as cursor:
+        cursor.execute(
+            "UPDATE data_observation "
+            "SET observer_id = data_observer.identifier "
+            "FROM data_observer "
+            "WHERE data_observation.observer_old = data_observer.id"
+        )
+
+
+def update_observation_checklist(apps, schema_editor):
+    with connection.cursor() as cursor:
+        cursor.execute(
+            "UPDATE data_observation "
+            "SET checklist_id = data_checklist.identifier "
+            "FROM data_checklist "
+            "WHERE data_observation.checklist_old = data_checklist.id"
+        )
+
+
+def update_observation_species(apps, schema_editor):
+    with connection.cursor() as cursor:
+        cursor.execute(
+            "UPDATE data_observation "
+            "SET species_id = data_species.species_code "
+            "FROM data_species "
+            "WHERE data_observation.species_old = data_species.id"
+        )
+
+
+def update_filter_species(apps, schema_editor):
+    with connection.cursor() as cursor:
+        cursor.execute(
+            "UPDATE data_filter "
+            "SET species_id = data_species.species_code "
+            "FROM data_species "
+            "WHERE data_filter.species_old = data_species.id"
+        )
+
+
+def update_filter_location(apps, schema_editor):
+    with connection.cursor() as cursor:
+        cursor.execute(
+            "UPDATE data_filter "
+            "SET location_id = data_location.identifier "
+            "FROM data_location "
+            "WHERE data_filter.location_old = data_location.id"
+        )
+
+
+def update_filter_update_species(apps, schema_editor):
+    with connection.cursor() as cursor:
+        cursor.execute(
+            "UPDATE data_filter "
+            "SET update_species_id = data_species.species_code "
+            "FROM data_species "
+            "WHERE data_filter.update_species_old = data_species.id"
+        )
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('data', '0005_add_new_foreign_keys'),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            update_location_country,
+            reverse_code=migrations.RunPython.noop
+        ),
+        migrations.RunPython(
+            update_location_state,
+            reverse_code=migrations.RunPython.noop
+        ),
+        migrations.RunPython(
+            update_location_county,
+            reverse_code=migrations.RunPython.noop
+        ),
+        migrations.RunPython(
+            update_checklist_country,
+            reverse_code=migrations.RunPython.noop
+        ),
+        migrations.RunPython(
+            update_checklist_state,
+            reverse_code=migrations.RunPython.noop
+        ),
+        migrations.RunPython(
+            update_checklist_county,
+            reverse_code=migrations.RunPython.noop
+        ),
+        migrations.RunPython(
+            update_checklist_location,
+            reverse_code=migrations.RunPython.noop
+        ),
+        migrations.RunPython(
+            update_checklist_observer,
+            reverse_code=migrations.RunPython.noop
+        ),
+        migrations.RunPython(
+            update_observation_country,
+            reverse_code=migrations.RunPython.noop
+        ),
+        migrations.RunPython(
+            update_observation_state,
+            reverse_code=migrations.RunPython.noop
+        ),
+        migrations.RunPython(
+            update_observation_county,
+            reverse_code=migrations.RunPython.noop
+        ),
+        migrations.RunPython(
+            update_observation_location,
+            reverse_code=migrations.RunPython.noop
+        ),
+        migrations.RunPython(
+            update_observation_observer,
+            reverse_code=migrations.RunPython.noop
+        ),
+        migrations.RunPython(
+            update_observation_checklist,
+            reverse_code=migrations.RunPython.noop
+        ),
+        migrations.RunPython(
+            update_observation_species,
+            reverse_code=migrations.RunPython.noop
+        ),
+        migrations.RunPython(
+            update_filter_species,
+            reverse_code=migrations.RunPython.noop
+        ),
+        migrations.RunPython(
+            update_filter_location,
+            reverse_code=migrations.RunPython.noop
+        ),
+        migrations.RunPython(
+            update_filter_update_species,
+            reverse_code=migrations.RunPython.noop
+        ),
+    ]

ebird_api_data-0.2.0/src/ebird/api/data/migrations/0007_remove_old_fields_and_ids.py

@@ -0,0 +1,188 @@
+# Generated by Django 5.2.4 on 2025-07-14 10:34
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('data', '0006_set_new_foreign_keys'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='checklist',
+            name='country_old',
+        ),
+        migrations.RemoveField(
+            model_name='checklist',
+            name='county_old',
+        ),
+        migrations.RemoveField(
+            model_name='checklist',
+            name='id',
+        ),
+        migrations.RemoveField(
+            model_name='checklist',
+            name='location_old',
+        ),
+        migrations.RemoveField(
+            model_name='checklist',
+            name='observer_old',
+        ),
+        migrations.RemoveField(
+            model_name='checklist',
+            name='state_old',
+        ),
+        migrations.RemoveField(
+            model_name='country',
+            name='id',
+        ),
+        migrations.RemoveField(
+            model_name='county',
+            name='id',
+        ),
+        migrations.RemoveField(
+            model_name='filter',
+            name='location_old',
+        ),
+        migrations.RemoveField(
+            model_name='filter',
+            name='species_old',
+        ),
+        migrations.RemoveField(
+            model_name='filter',
+            name='update_species_old',
+        ),
+        migrations.RemoveField(
+            model_name='location',
+            name='country_old',
+        ),
+        migrations.RemoveField(
+            model_name='location',
+            name='county_old',
+        ),
+        migrations.RemoveField(
+            model_name='location',
+            name='id',
+        ),
+        migrations.RemoveField(
+            model_name='location',
+            name='state_old',
+        ),
+        migrations.RemoveField(
+            model_name='observation',
+            name='checklist_old',
+        ),
+        migrations.RemoveField(
+            model_name='observation',
+            name='country_old',
+        ),
+        migrations.RemoveField(
+            model_name='observation',
+            name='county_old',
+        ),
+        migrations.RemoveField(
+            model_name='observation',
+            name='id',
+        ),
+        migrations.RemoveField(
+            model_name='observation',
+            name='location_old',
+        ),
+        migrations.RemoveField(
+            model_name='observation',
+            name='observer_old',
+        ),
+        migrations.RemoveField(
+            model_name='observation',
+            name='species_old',
+        ),
+        migrations.RemoveField(
+            model_name='observation',
+            name='state_old',
+        ),
+        migrations.RemoveField(
+            model_name='observer',
+            name='id',
+        ),
+        migrations.RemoveField(
+            model_name='species',
+            name='id',
+        ),
+        migrations.RemoveField(
+            model_name='state',
+            name='id',
+        ),
+        migrations.AlterField(
+            model_name='checklist',
+            name='country',
+            field=models.ForeignKey(help_text='The country where the checklist was made.', on_delete=django.db.models.deletion.PROTECT, related_name='checklists', to='data.country', verbose_name='country'),
+        ),
+        migrations.AlterField(
+            model_name='checklist',
+            name='location',
+            field=models.ForeignKey(help_text='The location where checklist was made.', on_delete=django.db.models.deletion.PROTECT, related_name='checklists', to='data.location', verbose_name='location'),
+        ),
+        migrations.AlterField(
+            model_name='checklist',
+            name='observer',
+            field=models.ForeignKey(help_text='The person who submitted the checklist.', on_delete=django.db.models.deletion.PROTECT, related_name='checklists', to='data.observer', verbose_name='observer'),
+        ),
+        migrations.AlterField(
+            model_name='checklist',
+            name='state',
+            field=models.ForeignKey(help_text='The state where the checklist was made.', on_delete=django.db.models.deletion.PROTECT, related_name='checklists', to='data.state', verbose_name='state'),
+        ),
+        migrations.AlterField(
+            model_name='filter',
+            name='species',
+            field=models.ForeignKey(help_text='The species used to find matching Observations.', on_delete=django.db.models.deletion.CASCADE, related_name='filtered_on', to='data.species', verbose_name='species'),
+        ),
+        migrations.AlterField(
+            model_name='filter',
+            name='update_species',
+            field=models.ForeignKey(help_text='Matching Observations are updated to this species.', on_delete=django.db.models.deletion.CASCADE, related_name='filtered_by', to='data.species', verbose_name='update species'),
+        ),
+        migrations.AlterField(
+            model_name='location',
+            name='country',
+            field=models.ForeignKey(help_text='The country for the location.', on_delete=django.db.models.deletion.PROTECT, related_name='locations', to='data.country', verbose_name='country'),
+        ),
+        migrations.AlterField(
+            model_name='location',
+            name='state',
+            field=models.ForeignKey(help_text='The state for the location.', on_delete=django.db.models.deletion.PROTECT, related_name='locations', to='data.state', verbose_name='state'),
+        ),
+        migrations.AlterField(
+            model_name='observation',
+            name='checklist',
+            field=models.ForeignKey(help_text='The checklist this observation belongs to.', on_delete=django.db.models.deletion.CASCADE, related_name='observations', to='data.checklist', verbose_name='checklist'),
+        ),
+        migrations.AlterField(
+            model_name='observation',
+            name='country',
+            field=models.ForeignKey(help_text='The country where the observation was made.', on_delete=django.db.models.deletion.PROTECT, related_name='observations', to='data.country', verbose_name='country'),
+        ),
+        migrations.AlterField(
+            model_name='observation',
+            name='location',
+            field=models.ForeignKey(help_text='The location where the observation was made.', on_delete=django.db.models.deletion.PROTECT, related_name='observations', to='data.location', verbose_name='location'),
+        ),
+        migrations.AlterField(
+            model_name='observation',
+            name='observer',
+            field=models.ForeignKey(help_text='The person who made the observation.', on_delete=django.db.models.deletion.PROTECT, related_name='observations', to='data.observer', verbose_name='observer'),
+        ),
+        migrations.AlterField(
+            model_name='observation',
+            name='species',
+            field=models.ForeignKey(help_text='The identified species.', on_delete=django.db.models.deletion.PROTECT, related_name='observations', to='data.species', verbose_name='species'),
+        ),
+        migrations.AlterField(
+            model_name='observation',
+            name='state',
+            field=models.ForeignKey(help_text='The state where the observation was made.', on_delete=django.db.models.deletion.PROTECT, related_name='observations', to='data.state', verbose_name='state'),
+        ),
+    ]

{ebird_api_data-0.1.1 → ebird_api_data-0.2.0}/src/ebird/api/data/models/checklist.py

@@ -26,8 +26,9 @@ class Checklist(models.Model):
         verbose_name=_("published"),
     )
 
-    identifier = models.TextField(
-        unique=True,
+    identifier = models.CharField(
+        max_length=15,
+        primary_key=True,
         verbose_name=_("identifier"),
         help_text=_("The unique identifier for the checklist."),
     )

{ebird_api_data-0.1.1 → ebird_api_data-0.2.0}/src/ebird/api/data/models/country.py

@@ -9,7 +9,7 @@ class Country(models.Model):
 
     code = models.CharField(
         max_length=2,
-        db_index=True,
+        primary_key=True,
         verbose_name=_("code"),
         help_text=_("The code used to identify the country."),
     )

{ebird_api_data-0.1.1 → ebird_api_data-0.2.0}/src/ebird/api/data/models/county.py

@@ -9,7 +9,7 @@ class County(models.Model):
 
     code = models.CharField(
         max_length=10,
-        db_index=True,
+        primary_key=True,
         verbose_name=_("code"),
         help_text=_("The code used to identify the county."),
     )

{ebird_api_data-0.1.1 → ebird_api_data-0.2.0}/src/ebird/api/data/models/location.py

@@ -64,8 +64,9 @@ class Location(models.Model):
         verbose_name = _("location")
         verbose_name_plural = _("locations")
 
-    identifier = models.TextField(
-        unique=True,
+    identifier = models.CharField(
+        max_length=15,
+        primary_key=True,
         verbose_name=_("identifier"),
         help_text=_("The unique identifier for the location."),
     )

{ebird_api_data-0.1.1 → ebird_api_data-0.2.0}/src/ebird/api/data/models/observation.py

@@ -28,8 +28,9 @@ class Observation(models.Model):
         verbose_name=_("published"),
     )
 
-    identifier = models.TextField(
-        unique=True,
+    identifier = models.CharField(
+        max_length=15,
+        primary_key=True,
         verbose_name=_("identifier"),
         help_text=_("A global unique identifier for the observation."),
     )

{ebird_api_data-0.1.1 → ebird_api_data-0.2.0}/src/ebird/api/data/models/observer.py

@@ -7,7 +7,9 @@ class Observer(models.Model):
         verbose_name = _("observer")
         verbose_name_plural = _("observers")
 
-    identifier = models.TextField(
+    identifier = models.CharField(
+        max_length=15,
+        primary_key=True,
         verbose_name=_("identifier"),
         help_text=_("The code for the person submitted the checklist."),
     )

{ebird_api_data-0.1.1 → ebird_api_data-0.2.0}/src/ebird/api/data/models/species.py

@@ -44,8 +44,9 @@ class Species(models.Model):
         help_text=_("The category from the eBird/Clements taxonomy."),
     )
 
-    species_code = models.TextField(
-        blank=True,
+    species_code = models.CharField(
+        max_length=10,
+        primary_key=True,
         verbose_name=_("species code"),
         help_text=_("The species code, e.g. ostric2, used in the eBird API."),
     )

{ebird_api_data-0.1.1 → ebird_api_data-0.2.0}/src/ebird/api/data/models/state.py

@@ -8,8 +8,8 @@ class State(models.Model):
         verbose_name_plural = _("states")
 
     code = models.CharField(
-        max_length=10,
-        db_index=True,
+        max_length=6,
+        primary_key=True,
         verbose_name=_("code"),
         help_text=_("The code used to identify the state."),
     )

ebird_api_data-0.1.1/src/ebird/api/data/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.1.1"