change DeltaUrl.delete to to_delete

Author: CarsonDavis

sde_collections/migrations/0065_rename_delete_deltaurl_to_delete_and_more.py

@@ -0,0 +1,42 @@
+# Generated by Django 4.2.9 on 2024-11-16 00:26
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("sde_collections", "0064_alter_curatedurl_options_and_more"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="deltaurl",
+            old_name="delete",
+            new_name="to_delete",
+        ),
+        migrations.AlterField(
+            model_name="curatedurl",
+            name="collection",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="curated_urls",
+                to="sde_collections.collection",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="deltaurl",
+            name="collection",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE, related_name="delta_urls", to="sde_collections.collection"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="dumpurl",
+            name="collection",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE, related_name="dump_urls", to="sde_collections.collection"
+            ),
+        ),
+    ]

sde_collections/models/collection.py

@@ -109,35 +109,35 @@ def migrate_dump_to_delta(self):
             if curated:
                 # Check if any of the comparison fields differ
                 if any(getattr(curated, field) != getattr(dump, field) for field in DELTA_COMPARISON_FIELDS):
-                    self.create_or_update_delta_url(dump, delete=False)
+                    self.create_or_update_delta_url(dump, to_delete=False)
             else:
                 # New URL, not in CuratedUrls; move it entirely to DeltaUrls
-                self.create_or_update_delta_url(dump, delete=False)
+                self.create_or_update_delta_url(dump, to_delete=False)
 
         # Step 4: Identify CuratedUrls missing in DumpUrls and flag them for deletion in DeltaUrls
         for curated in curated_urls.values():
             if curated.url not in dump_urls:
-                self.create_or_update_delta_url(curated, delete=True)
+                self.create_or_update_delta_url(curated, to_delete=True)
 
         # Step 5: Clear DumpUrls after migration is complete
         self.clear_dump_urls()
 
-    def create_or_update_delta_url(self, url_instance, delete=False):
+    def create_or_update_delta_url(self, url_instance, to_delete=False):
         """
         Creates or updates a DeltaUrl entry based on the given DumpUrl or CuratedUrl object.
-        If delete is True, only sets the delete flag and url.
+        If to_delete is True, only sets the to_delete flag and url.
         """
-        if delete:
-            # Only set the URL and delete flag
-            DeltaUrl.objects.update_or_create(collection=self, url=url_instance.url, defaults={"delete": True})
+        if to_delete:
+            # Only set the URL and to_delete flag
+            DeltaUrl.objects.update_or_create(collection=self, url=url_instance.url, defaults={"to_delete": True})
         else:
             # Automatically move over all fields from url_instance
             fields_to_copy = {
                 field.name: getattr(url_instance, field.name)
                 for field in DumpUrl._meta.fields  # Assumes same fields for CuratedUrl via inheritance
                 if field.name not in ["id", "collection", "url"]
             }
-            fields_to_copy["delete"] = False  # Ensure delete flag is False
+            fields_to_copy["to_delete"] = False  # Ensure to_delete flag is False
 
             DeltaUrl.objects.update_or_create(collection=self, url=url_instance.url, defaults=fields_to_copy)
 
@@ -155,7 +155,7 @@ def promote_to_curated(self):
             curated = curated_urls.get(url)
 
             # Delete the CuratedUrl if the DeltaUrl is marked for deletion
-            if delta.delete:
+            if delta.to_delete:
                 if curated:
                     curated.delete()
                 continue
@@ -164,7 +164,7 @@ def promote_to_curated(self):
                 updated_fields = {}
                 for field in delta._meta.fields:
                     field_name = field.name
-                    if field_name == "delete":
+                    if field_name == "to_delete":
                         continue
 
                     delta_value = getattr(delta, field_name)
@@ -179,7 +179,7 @@ def promote_to_curated(self):
                 new_data = {
                     field.name: getattr(delta, field.name)
                     for field in delta._meta.fields
-                    if field.name not in ["delete", "collection"] and getattr(delta, field.name) not in [None, ""]
+                    if field.name not in ["to_delete", "collection"] and getattr(delta, field.name) not in [None, ""]
                 }
                 CuratedUrl.objects.create(collection=self, **new_data)
 

sde_collections/models/delta_url.py

@@ -126,7 +126,7 @@ class DeltaUrl(BaseUrl):
     collection = models.ForeignKey("Collection", on_delete=models.CASCADE, related_name="delta_urls")
 
     objects = DeltaUrlManager()
-    delete = models.BooleanField(default=False)
+    to_delete = models.BooleanField(default=False)
 
     class Meta:
         verbose_name = "Delta Urls"

sde_collections/tests/factories.py

@@ -87,4 +87,4 @@ class Meta:
     collection = factory.SubFactory(CollectionFactory)
     url = factory.Faker("url")
     scraped_title = factory.Faker("sentence")
-    delete = False
+    to_delete = False

sde_collections/tests/test_migrate_dump.py

@@ -31,18 +31,18 @@ def test_clear_dump_urls(self):
     def test_create_or_update_delta_url_add(self):
         collection = CollectionFactory()
         dump_url = DumpUrlFactory(collection=collection)
-        collection.create_or_update_delta_url(dump_url, delete=False)
+        collection.create_or_update_delta_url(dump_url, to_delete=False)
         delta = DeltaUrl.objects.get(url=dump_url.url)
-        assert delta.delete is False
+        assert delta.to_delete is False
         for field in DELTA_COMPARISON_FIELDS:
             assert getattr(delta, field) == getattr(dump_url, field)
 
     def test_create_or_update_delta_url_delete(self):
         collection = CollectionFactory()
         curated_url = CuratedUrlFactory(collection=collection)
-        collection.create_or_update_delta_url(curated_url, delete=True)
+        collection.create_or_update_delta_url(curated_url, to_delete=True)
         delta = DeltaUrl.objects.get(url=curated_url.url)
-        assert delta.delete is True
+        assert delta.to_delete is True
         assert delta.scraped_title == ""
 
 
@@ -53,7 +53,7 @@ def test_new_url_in_dump_only(self):
         dump_url = DumpUrlFactory(collection=collection)
         collection.migrate_dump_to_delta()
         delta = DeltaUrl.objects.get(url=dump_url.url)
-        assert delta.delete is False
+        assert delta.to_delete is False
         for field in DELTA_COMPARISON_FIELDS:
             assert getattr(delta, field) == getattr(dump_url, field)
 
@@ -63,15 +63,15 @@ def test_url_in_both_with_different_field(self):
         curated_url = CuratedUrlFactory(collection=collection, url=dump_url.url, scraped_title="Old Title")  # noqa
         collection.migrate_dump_to_delta()
         delta = DeltaUrl.objects.get(url=dump_url.url)
-        assert delta.delete is False
+        assert delta.to_delete is False
         assert delta.scraped_title == "New Title"
 
     def test_url_in_curated_only(self):
         collection = CollectionFactory()
         curated_url = CuratedUrlFactory(collection=collection)
         collection.migrate_dump_to_delta()
         delta = DeltaUrl.objects.get(url=curated_url.url)
-        assert delta.delete is True
+        assert delta.to_delete is True
         assert delta.scraped_title == ""
 
     def test_identical_url_in_both(self):
@@ -91,16 +91,16 @@ def test_full_migration_flow(self):
         collection.migrate_dump_to_delta()
 
         # New URL moved to DeltaUrls
-        assert DeltaUrl.objects.filter(url=dump_url_new.url, delete=False).exists()
+        assert DeltaUrl.objects.filter(url=dump_url_new.url, to_delete=False).exists()
 
         # Updated URL moved to DeltaUrls
         delta_update = DeltaUrl.objects.get(url=dump_url_update.url)
         assert delta_update.scraped_title == "Updated Title"
-        assert delta_update.delete is False
+        assert delta_update.to_delete is False
 
         # Deleted URL in CuratedUrls marked as delete in DeltaUrls
         delta_delete = DeltaUrl.objects.get(url=curated_url_delete.url)
-        assert delta_delete.delete is True
+        assert delta_delete.to_delete is True
 
     def test_empty_collections(self):
         collection = CollectionFactory()
@@ -113,7 +113,7 @@ def test_partial_data_in_dump_urls(self):
         collection.migrate_dump_to_delta()
         delta = DeltaUrl.objects.get(url=dump_url.url)
         assert delta.scraped_title == ""
-        assert delta.delete is False
+        assert delta.to_delete is False
 
 
 @pytest.mark.django_db
@@ -136,11 +136,11 @@ def test_create_or_update_delta_url_idempotency(self):
         dump_url = DumpUrlFactory(collection=collection)
 
         # First call
-        collection.create_or_update_delta_url(dump_url, delete=False)
+        collection.create_or_update_delta_url(dump_url, to_delete=False)
         assert DeltaUrl.objects.filter(url=dump_url.url).count() == 1
 
         # Second call with the same data
-        collection.create_or_update_delta_url(dump_url, delete=False)
+        collection.create_or_update_delta_url(dump_url, to_delete=False)
         assert DeltaUrl.objects.filter(url=dump_url.url).count() == 1  # Should still be one
 
 
@@ -157,7 +157,7 @@ def test_create_or_update_delta_url_field_copy():
         division=2,
     )
 
-    collection.create_or_update_delta_url(dump_url, delete=False)
+    collection.create_or_update_delta_url(dump_url, to_delete=False)
     delta = DeltaUrl.objects.get(url=dump_url.url)
 
     # Verify each field is copied correctly
@@ -174,7 +174,7 @@ def test_full_migration_new_url(self):
         collection.migrate_dump_to_delta()
 
         # New URL should be added to DeltaUrls
-        assert DeltaUrl.objects.filter(url=dump_url.url, delete=False).exists()
+        assert DeltaUrl.objects.filter(url=dump_url.url, to_delete=False).exists()
 
     def test_full_migration_updated_url(self):
         collection = CollectionFactory()
@@ -184,7 +184,7 @@ def test_full_migration_updated_url(self):
         # URL with differing fields should be updated in DeltaUrls
         delta_update = DeltaUrl.objects.get(url=dump_url.url)
         assert delta_update.scraped_title == "Updated Title"
-        assert delta_update.delete is False
+        assert delta_update.to_delete is False
 
     def test_full_migration_deleted_url(self):
         collection = CollectionFactory()
@@ -193,7 +193,7 @@ def test_full_migration_deleted_url(self):
 
         # Missing URL in DumpUrls should be marked as delete in DeltaUrls
         delta_delete = DeltaUrl.objects.get(url=curated_url.url)
-        assert delta_delete.delete is True
+        assert delta_delete.to_delete is True
 
 
 @pytest.mark.django_db
@@ -225,4 +225,4 @@ def test_partial_data_in_curated_urls():
     # Since `scraped_title` differs (None vs "Title Exists"), it should create a DeltaUrl
     delta = DeltaUrl.objects.get(url=dump_url.url)
     assert delta.scraped_title == "Title Exists"
-    assert delta.delete is False
+    assert delta.to_delete is False

sde_collections/tests/test_promote_collection.py

@@ -68,7 +68,7 @@ def test_promotion_deletes_curated_urls(collection):
     collection.promote_to_curated()
 
     # create a new DeltaUrl marked for deletion
-    DeltaUrl.objects.create(collection=collection, url="https://example1.com", scraped_title="Title 1", delete=True)
+    DeltaUrl.objects.create(collection=collection, url="https://example1.com", scraped_title="Title 1", to_delete=True)
 
     # Promote the deletion
     collection.promote_to_curated()