From 4226e7bd51143c0807b9a9e6ed47c7285303909e Mon Sep 17 00:00:00 2001
From: mailynmailyn <mlpuittinen@gmail.com>
Date: Wed, 13 Aug 2025 11:25:25 -0400
Subject: [PATCH 01/13] feat: create `deleted` boolean flag for instrument name
 - indicates a name has been deleted but preserves in the db refs: #340

---
 web-app/django/VIM/apps/instruments/models/instrument_name.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/web-app/django/VIM/apps/instruments/models/instrument_name.py b/web-app/django/VIM/apps/instruments/models/instrument_name.py
index b31af750..d180639b 100644
--- a/web-app/django/VIM/apps/instruments/models/instrument_name.py
+++ b/web-app/django/VIM/apps/instruments/models/instrument_name.py
@@ -34,6 +34,10 @@ class InstrumentName(models.Model):
         default=False,
         help_text="Is this name already on Wikidata?",
     )
+    deleted = models.BooleanField(
+        default=False,
+        help_text="Soft delete flag. If true, this name is considered deleted but retained in the database.",
+    )
 
     # Custom validation to ensure at most one UMIL label per instrument language
     class Meta:

From 659995a7438c9389f1f81c7d287f7ad5d6ae80f0 Mon Sep 17 00:00:00 2001
From: mailynmailyn <mlpuittinen@gmail.com>
Date: Wed, 13 Aug 2025 12:08:03 -0400
Subject: [PATCH 02/13] feat: set `deleted` status as `true` when the user
 "deletes" a instrument name from UMIL - allow admin to filter instrument
 names by deletion status - change deletion UI message to better reflect that
 the name will persist on the the UMILdb - only display instrument names that
 are `deleted`=`false` - create migration file refs: #340

---
 web-app/django/VIM/apps/instruments/admin.py  |  2 +-
 .../migrations/0010_instrumentname_deleted.py | 20 +++++++++++++++++++
 .../instruments/views/instrument_detail.py    |  9 ++++++---
 .../apps/instruments/views/update_umil_db.py  |  4 +++-
 .../instruments/includes/deleteName.html      |  2 +-
 5 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 web-app/django/VIM/apps/instruments/migrations/0010_instrumentname_deleted.py

diff --git a/web-app/django/VIM/apps/instruments/admin.py b/web-app/django/VIM/apps/instruments/admin.py
index fa511e3c..d07d8244 100644
--- a/web-app/django/VIM/apps/instruments/admin.py
+++ b/web-app/django/VIM/apps/instruments/admin.py
@@ -8,7 +8,7 @@
 
 @admin.register(InstrumentName)
 class InstrumentNameAdmin(admin.ModelAdmin):
-    list_filter = ("verification_status", "on_wikidata")  # Filter by status
+    list_filter = ("verification_status", "on_wikidata", "deleted")  # Filter by status
     search_fields = (
         "name",
         "source_name",
diff --git a/web-app/django/VIM/apps/instruments/migrations/0010_instrumentname_deleted.py b/web-app/django/VIM/apps/instruments/migrations/0010_instrumentname_deleted.py
new file mode 100644
index 00000000..b5b88164
--- /dev/null
+++ b/web-app/django/VIM/apps/instruments/migrations/0010_instrumentname_deleted.py
@@ -0,0 +1,20 @@
+# Generated by Django 4.2.5 on 2025-08-13 15:20
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("instruments", "0009_alter_instrumentname_verification_status"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="instrumentname",
+            name="deleted",
+            field=models.BooleanField(
+                default=False,
+                help_text="Soft delete flag. If true, this name is considered deleted but retained in the database.",
+            ),
+        ),
+    ]
diff --git a/web-app/django/VIM/apps/instruments/views/instrument_detail.py b/web-app/django/VIM/apps/instruments/views/instrument_detail.py
index edc674ba..e79aef22 100644
--- a/web-app/django/VIM/apps/instruments/views/instrument_detail.py
+++ b/web-app/django/VIM/apps/instruments/views/instrument_detail.py
@@ -15,10 +15,13 @@ class InstrumentDetail(DetailView):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
 
-        # Query the instrument names in all languages
-        instrument_names = context["instrument"].instrumentname_set.select_related(
-            "language"
+        # Query the instrument names in all languages, excluding deleted names
+        instrument_names = (
+            context["instrument"]
+            .instrumentname_set.select_related("language")
+            .filter(deleted=False)
         )
+
         if self.request.user.is_authenticated:
             # Show all names for authenticated users
             context["instrument_names"] = instrument_names.all()
diff --git a/web-app/django/VIM/apps/instruments/views/update_umil_db.py b/web-app/django/VIM/apps/instruments/views/update_umil_db.py
index 1a2ed493..e8d148cf 100644
--- a/web-app/django/VIM/apps/instruments/views/update_umil_db.py
+++ b/web-app/django/VIM/apps/instruments/views/update_umil_db.py
@@ -133,7 +133,9 @@ def delete_name(request: HttpRequest) -> JsonResponse:
 
     # If user is a superuser or created the name, allow deletion
     if request.user.is_superuser or instrument_name.contributor == request.user:
-        instrument_name.delete()
+        instrument_name.deleted = True  # Soft delete the name
+        instrument_name.save()  # Don't forget to save the changes
+
         return JsonResponse(
             {
                 "status": "success",
diff --git a/web-app/django/VIM/templates/instruments/includes/deleteName.html b/web-app/django/VIM/templates/instruments/includes/deleteName.html
index 1bdc2b61..6d375d45 100644
--- a/web-app/django/VIM/templates/instruments/includes/deleteName.html
+++ b/web-app/django/VIM/templates/instruments/includes/deleteName.html
@@ -20,7 +20,7 @@ <h5 class="modal-title" id="deleteNameModalLabel">
       <div class="modal-body">
         <div class="mb-3">
           <p>
-            The following will be deleted from the UMIL database. The entry will persist on Wikidata.
+            The following will be deleted from UMIL. The entry will persist on Wikidata.
           </p>
         </div>
         <div class="mb-3 p-2 border rounded bg-light">

From 41970f5bed513ad6e56de38f7e92826183520719 Mon Sep 17 00:00:00 2001
From: mailynmailyn <mlpuittinen@gmail.com>
Date: Mon, 18 Aug 2025 12:54:29 -0400
Subject: [PATCH 03/13] feat: custom save functionalities to correctly set
 `umil_label` - change constraint: `umil_label` = `true` only when verified
 and not deleted - existing_umil_label: other instrument_name in language
 where umil_label=true - replacement_umil_label: first verified, non-deleted
 instrument name added in language - `umil_label` set to `true`: unset
 `existing_umil_label` -`umil_label` set to `false`: reassign if possible to
 `replacement_umil_label` -`umil_label` set to `true` and `deleted` = `true`:
 indicates that name has been deleted from frontend --> reassign if possible,
 otherwise there are no verified instrument names refs: #350

---
 .../instruments/models/instrument_name.py     | 62 +++++++++++++++++--
 1 file changed, 56 insertions(+), 6 deletions(-)

diff --git a/web-app/django/VIM/apps/instruments/models/instrument_name.py b/web-app/django/VIM/apps/instruments/models/instrument_name.py
index d180639b..d96dc228 100644
--- a/web-app/django/VIM/apps/instruments/models/instrument_name.py
+++ b/web-app/django/VIM/apps/instruments/models/instrument_name.py
@@ -1,4 +1,5 @@
 from django.db import models
+from django.db.models import Q
 
 
 class InstrumentName(models.Model):
@@ -39,16 +40,65 @@ class InstrumentName(models.Model):
         help_text="Soft delete flag. If true, this name is considered deleted but retained in the database.",
     )
 
-    # Custom validation to ensure at most one UMIL label per instrument language
     class Meta:
         constraints = [
-            models.UniqueConstraint(
-                fields=["instrument", "language"],
-                condition=models.Q(umil_label=True),
-                name="unique_umil_label_per_instrument_language",
-            )
+            models.CheckConstraint(
+                name="umil_label_only_if_verified_and_not_deleted",
+                check=~Q(umil_label=True)
+                | (Q(verification_status="verified") & Q(deleted=False)),
+            ),
         ]
 
     # TODO: add verified_by field to track who verified the name
     def __str__(self):
         return f"{self.name} ({self.language.en_label}) - {self.instrument.wikidata_id}"
+
+    def save(self, *args, **kwargs):
+        """
+        umil_label
+        """
+        existing_umil_label = InstrumentName.objects.filter(
+            instrument=self.instrument,
+            language=self.language,
+            umil_label=True,
+        ).exclude(id=self.id)
+        print("existing_umil_label", existing_umil_label.exists(), flush=True)
+
+        replacement_umil_label = (
+            InstrumentName.objects.filter(
+                instrument=self.instrument,
+                language=self.language,
+                verification_status="verified",
+                deleted=False,
+            )
+            .exclude(id=self.id)
+            .first()
+        )
+        print("replacement_umil_label", replacement_umil_label, flush=True)
+
+        if self.umil_label:
+            if self.deleted:
+                if replacement_umil_label:
+                    self.umil_label = False
+                    replacement_umil_label.umil_label = True
+                    replacement_umil_label.save()
+                else:
+                    self.umil_label = False
+                    return super().save(*args, **kwargs)
+            else:
+                if existing_umil_label.exists():
+                    existing_umil_label.update(umil_label=False)
+                else:
+                    return super().save(*args, **kwargs)
+
+        if not self.umil_label and self.verification_status == "verified":
+            if replacement_umil_label:
+                replacement_umil_label.umil_label = True
+                replacement_umil_label.save()
+            else:
+                if self.deleted:
+                    self.umil_label = False
+                else:
+                    self.umil_label = True
+
+        super().save(*args, **kwargs)

From 54e771f82738baae353d334847443245ad52a3eb Mon Sep 17 00:00:00 2001
From: mailynmailyn <mlpuittinen@gmail.com>
Date: Mon, 18 Aug 2025 12:55:50 -0400
Subject: [PATCH 04/13] chore: remove functinality to assign `umil_label` as
 newly added instruments will never be verified refs:#350

---
 .../apps/instruments/views/update_umil_db.py   | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/web-app/django/VIM/apps/instruments/views/update_umil_db.py b/web-app/django/VIM/apps/instruments/views/update_umil_db.py
index e8d148cf..005112df 100644
--- a/web-app/django/VIM/apps/instruments/views/update_umil_db.py
+++ b/web-app/django/VIM/apps/instruments/views/update_umil_db.py
@@ -51,10 +51,6 @@ def add_name(request: HttpRequest) -> JsonResponse:
     # create dictionary to map language codes to Language objects
     language = {lang.wikidata_code: lang for lang in Language.objects.all()}
 
-    # considering entries with multiple of the same language, create a dictionary to track if a label has
-    # been assigned to a previous entry
-    entry_labels = {entry["language"]: False for entry in entries}
-
     instrument_names_to_create = []
 
     for entry in entries:
@@ -75,19 +71,6 @@ def add_name(request: HttpRequest) -> JsonResponse:
         # Find language object from language code dictionary
         language_obj: Language = language.get(language_code)
 
-        # Within the entries, check if the language already has a name
-        # if it does, set umil_label to False
-        # otherwise, check against the UMILdb
-        if entry_labels[language_code]:
-            umil_label = False
-        else:
-            umil_label: bool = not (
-                instrument.instrumentname_set.filter(
-                    language__wikidata_code=language_code
-                ).exists()
-            )
-            entry_labels[language_code] = True  # Mark that this language now has a name
-
         # Prepare the InstrumentName object
         instrument_names_to_create.append(
             InstrumentName(
@@ -95,7 +78,6 @@ def add_name(request: HttpRequest) -> JsonResponse:
                 language=language_obj,
                 name=name,
                 source_name=source,
-                umil_label=umil_label,
                 contributor=request.user,
             )
         )

From 009afe79831a5d5e716b3f21fd1978de8d956dde Mon Sep 17 00:00:00 2001
From: mailynmailyn <mlpuittinen@gmail.com>
Date: Mon, 18 Aug 2025 12:56:53 -0400
Subject: [PATCH 05/13] refactor: the active_instrument_label is always set to
 the instrument where `umil_label` = `true` refs:#350

---
 .../VIM/apps/instruments/views/instrument_detail.py      | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/web-app/django/VIM/apps/instruments/views/instrument_detail.py b/web-app/django/VIM/apps/instruments/views/instrument_detail.py
index e79aef22..69170368 100644
--- a/web-app/django/VIM/apps/instruments/views/instrument_detail.py
+++ b/web-app/django/VIM/apps/instruments/views/instrument_detail.py
@@ -40,15 +40,12 @@ def get_context_data(self, **kwargs):
         )
 
         # Get the instrument label in the active language
-        # Set label to the first instrument name added in the language if there is no "umil_label" set
         active_labels = context["instrument_names"].filter(
             language=context["active_language"]
         )
-        umil_label = active_labels.filter(umil_label=True).first()
-        if umil_label:
-            context["active_instrument_label"] = umil_label
-        else:
-            context["active_instrument_label"] = active_labels.first()
+        context["active_instrument_label"] = active_labels.filter(
+            umil_label=True
+        ).first()
 
         # Get all languages for the dropdown
         context["languages"] = Language.objects.all()

From e0b4f5fcf188efd8190950869e290ce51b70e18c Mon Sep 17 00:00:00 2001
From: mailynmailyn <mlpuittinen@gmail.com>
Date: Mon, 18 Aug 2025 12:57:47 -0400
Subject: [PATCH 06/13] feat: notify user on the detail page that there are no
 verified instrument names for the label in a language refs:#350

---
 web-app/django/VIM/templates/instruments/detail.html | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/web-app/django/VIM/templates/instruments/detail.html b/web-app/django/VIM/templates/instruments/detail.html
index b1ba2aaf..32b9c322 100644
--- a/web-app/django/VIM/templates/instruments/detail.html
+++ b/web-app/django/VIM/templates/instruments/detail.html
@@ -23,7 +23,13 @@
   <div class="container d-flex align-items-center justify-content-center min-vh-80 py-4">
     <div class="container-border bg-white p-4 d-flex flex-column align-items-center flex-nowrap">
       <div class="w-100">
-        <h2 class="notranslate">{{ active_instrument_label.name|title }}</h2>
+        {% if active_instrument_label is None %}
+          <h2 class="fst-italic opacity-75">
+            No verified names in {{ active_language.en_label }}
+          </h2>
+        {% else %}
+          <h2 class="notranslate">{{ active_instrument_label.name|title }}</h2>
+        {% endif %}
         <hr class="w-100 mt-0" />
       </div>
       <div class="w-100">

From 322082d9a1dc186d7dc09291fbf5d0871f87dec4 Mon Sep 17 00:00:00 2001
From: mailynmailyn <mlpuittinen@gmail.com>
Date: Tue, 19 Aug 2025 09:56:44 -0400
Subject: [PATCH 07/13] refactor: raise error that notifies the reviewer that
 their verification must set `umil_label`=`true` refs:#350

---
 web-app/django/VIM/apps/instruments/models/instrument_name.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/web-app/django/VIM/apps/instruments/models/instrument_name.py b/web-app/django/VIM/apps/instruments/models/instrument_name.py
index d96dc228..6afdd5aa 100644
--- a/web-app/django/VIM/apps/instruments/models/instrument_name.py
+++ b/web-app/django/VIM/apps/instruments/models/instrument_name.py
@@ -99,6 +99,8 @@ def save(self, *args, **kwargs):
                 if self.deleted:
                     self.umil_label = False
                 else:
-                    self.umil_label = True
+                    raise ValueError(
+                        "This is the only verified, non-deleted name for this instrument and language, it must be set as umil_label."
+                    )
 
         super().save(*args, **kwargs)

From e28e9d707f172917fc7cef313a9daec754ce3e19 Mon Sep 17 00:00:00 2001
From: mailynmailyn <mlpuittinen@gmail.com>
Date: Tue, 19 Aug 2025 11:00:18 -0400
Subject: [PATCH 08/13] refactor: reduce queries of custom save function - make
 use of the update function and querysets - eliminate recusivity - specify
 constraint name refs:#350

---
 .../instruments/models/instrument_name.py     | 57 ++++++++-----------
 1 file changed, 25 insertions(+), 32 deletions(-)

diff --git a/web-app/django/VIM/apps/instruments/models/instrument_name.py b/web-app/django/VIM/apps/instruments/models/instrument_name.py
index 6afdd5aa..31899fa0 100644
--- a/web-app/django/VIM/apps/instruments/models/instrument_name.py
+++ b/web-app/django/VIM/apps/instruments/models/instrument_name.py
@@ -40,10 +40,11 @@ class InstrumentName(models.Model):
         help_text="Soft delete flag. If true, this name is considered deleted but retained in the database.",
     )
 
+    # Constrain umil_label to be true only if the name is verified and not deleted
     class Meta:
         constraints = [
             models.CheckConstraint(
-                name="umil_label_only_if_verified_and_not_deleted",
+                name="umil_label=true only if name is Verified and not Deleted",
                 check=~Q(umil_label=True)
                 | (Q(verification_status="verified") & Q(deleted=False)),
             ),
@@ -54,48 +55,40 @@ def __str__(self):
         return f"{self.name} ({self.language.en_label}) - {self.instrument.wikidata_id}"
 
     def save(self, *args, **kwargs):
-        """
-        umil_label
-        """
-        existing_umil_label = InstrumentName.objects.filter(
+        # Querysets for efficiency
+        existing_umil_label_qs = InstrumentName.objects.filter(
             instrument=self.instrument,
             language=self.language,
             umil_label=True,
         ).exclude(id=self.id)
-        print("existing_umil_label", existing_umil_label.exists(), flush=True)
 
-        replacement_umil_label = (
-            InstrumentName.objects.filter(
-                instrument=self.instrument,
-                language=self.language,
-                verification_status="verified",
-                deleted=False,
-            )
-            .exclude(id=self.id)
-            .first()
-        )
-        print("replacement_umil_label", replacement_umil_label, flush=True)
+        replacement_umil_label_qs = InstrumentName.objects.filter(
+            instrument=self.instrument,
+            language=self.language,
+            verification_status="verified",
+            deleted=False,
+        ).exclude(id=self.id)
 
+        # If setting umil_label=True
         if self.umil_label:
             if self.deleted:
-                if replacement_umil_label:
-                    self.umil_label = False
-                    replacement_umil_label.umil_label = True
-                    replacement_umil_label.save()
-                else:
-                    self.umil_label = False
-                    return super().save(*args, **kwargs)
+                # Assign replacement if possible, else just unset
+                self.umil_label = False
+                super().save(*args, **kwargs)
+
+                replacement_umil_label_qs.update(umil_label=True)
+                return
             else:
-                if existing_umil_label.exists():
-                    existing_umil_label.update(umil_label=False)
-                else:
-                    return super().save(*args, **kwargs)
+                # Unset other umil_labels in one query
+                existing_umil_label_qs.update(umil_label=False)
 
+        # If a verified name is removing itself as umil_label
         if not self.umil_label and self.verification_status == "verified":
-            if replacement_umil_label:
-                replacement_umil_label.umil_label = True
-                replacement_umil_label.save()
-            else:
+            # Try to assign replacement label in one query
+            replaced = replacement_umil_label_qs.update(umil_label=True)
+            if not replaced:
+                # If there is no replacement umil_label, only set umil_label=False if the current name is also deleted
+                # Otherwise, a viewer will see a verified name on the detail page without a label
                 if self.deleted:
                     self.umil_label = False
                 else:

From 93756493e25e543ed40d26285277a22bfaefb468 Mon Sep 17 00:00:00 2001
From: mailynmailyn <mlpuittinen@gmail.com>
Date: Tue, 19 Aug 2025 13:39:10 -0400
Subject: [PATCH 09/13] fix: access replacement_umi_label as an object rather
 than query - otherwise update would set all other verified, non-deleted names
 as umil_label - order by id to get the correct first added name - consider
 scenario where the replacement_umil_label IS the current umil_label: avoid
 redundant resetting - remove unique umil_label constraint, the process of
 swapping labels will violate the constraint (seemingly the constraints are
 checked ebfore the custom save logic) refs:#350

---
 ..._label_per_instrument_language_and_more.py | 27 +++++++++++++
 .../instruments/models/instrument_name.py     | 40 ++++++++++++-------
 2 files changed, 53 insertions(+), 14 deletions(-)
 create mode 100644 web-app/django/VIM/apps/instruments/migrations/0011_remove_instrumentname_unique_umil_label_per_instrument_language_and_more.py

diff --git a/web-app/django/VIM/apps/instruments/migrations/0011_remove_instrumentname_unique_umil_label_per_instrument_language_and_more.py b/web-app/django/VIM/apps/instruments/migrations/0011_remove_instrumentname_unique_umil_label_per_instrument_language_and_more.py
new file mode 100644
index 00000000..62ca3cd9
--- /dev/null
+++ b/web-app/django/VIM/apps/instruments/migrations/0011_remove_instrumentname_unique_umil_label_per_instrument_language_and_more.py
@@ -0,0 +1,27 @@
+# Generated by Django 4.2.5 on 2025-08-19 15:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("instruments", "0010_instrumentname_deleted"),
+    ]
+
+    operations = [
+        migrations.RemoveConstraint(
+            model_name="instrumentname",
+            name="unique_umil_label_per_instrument_language",
+        ),
+        migrations.AddConstraint(
+            model_name="instrumentname",
+            constraint=models.CheckConstraint(
+                check=models.Q(
+                    models.Q(("umil_label", True), _negated=True),
+                    models.Q(("verification_status", "verified"), ("deleted", False)),
+                    _connector="OR",
+                ),
+                name="umil_label=true only if name is Verified and not Deleted",
+            ),
+        ),
+    ]
diff --git a/web-app/django/VIM/apps/instruments/models/instrument_name.py b/web-app/django/VIM/apps/instruments/models/instrument_name.py
index 31899fa0..5fe36cd9 100644
--- a/web-app/django/VIM/apps/instruments/models/instrument_name.py
+++ b/web-app/django/VIM/apps/instruments/models/instrument_name.py
@@ -62,22 +62,30 @@ def save(self, *args, **kwargs):
             umil_label=True,
         ).exclude(id=self.id)
 
-        replacement_umil_label_qs = InstrumentName.objects.filter(
-            instrument=self.instrument,
-            language=self.language,
-            verification_status="verified",
-            deleted=False,
-        ).exclude(id=self.id)
+        # do not re-replace existing umil_label if it is already set
+        replacement_umil_label = (
+            InstrumentName.objects.filter(
+                instrument=self.instrument,
+                language=self.language,
+                verification_status="verified",
+                umil_label=False,
+                deleted=False,
+            )
+            .exclude(id=self.id)
+            .order_by("id")
+            .first()
+        )
 
         # If setting umil_label=True
         if self.umil_label:
             if self.deleted:
                 # Assign replacement if possible, else just unset
                 self.umil_label = False
-                super().save(*args, **kwargs)
+                if replacement_umil_label:
+                    replacement_umil_label.umil_label = True
+                    replacement_umil_label.save()
 
-                replacement_umil_label_qs.update(umil_label=True)
-                return
+                return super().save(*args, **kwargs)
             else:
                 # Unset other umil_labels in one query
                 existing_umil_label_qs.update(umil_label=False)
@@ -85,15 +93,19 @@ def save(self, *args, **kwargs):
         # If a verified name is removing itself as umil_label
         if not self.umil_label and self.verification_status == "verified":
             # Try to assign replacement label in one query
-            replaced = replacement_umil_label_qs.update(umil_label=True)
-            if not replaced:
+            if replacement_umil_label:
+                replacement_umil_label.umil_label = True
+                replacement_umil_label.save()
+            else:
                 # If there is no replacement umil_label, only set umil_label=False if the current name is also deleted
                 # Otherwise, a viewer will see a verified name on the detail page without a label
                 if self.deleted:
                     self.umil_label = False
                 else:
-                    raise ValueError(
-                        "This is the only verified, non-deleted name for this instrument and language, it must be set as umil_label."
-                    )
+                    # If no replacement and not deleted, check that there is not an existing umil_label
+                    if not existing_umil_label_qs.exists():
+                        raise ValueError(
+                            "This is the only verified, non-deleted name for this instrument and language, it must be set as umil_label."
+                        )
 
         super().save(*args, **kwargs)

From 1e608059b153d1abb9f9ee4ed17d5b44b5eeabfa Mon Sep 17 00:00:00 2001
From: mailynmailyn <mlpuittinen@gmail.com>
Date: Wed, 20 Aug 2025 11:52:07 -0400
Subject: [PATCH 10/13] fix: alter migration file post rebase - consider
 constraint migration refs:#350

---
 .../migrations/0010_instrumentname_deleted.py | 20 -------------------
 ..._label_per_instrument_language_and_more.py | 12 +++++++++--
 2 files changed, 10 insertions(+), 22 deletions(-)
 delete mode 100644 web-app/django/VIM/apps/instruments/migrations/0010_instrumentname_deleted.py

diff --git a/web-app/django/VIM/apps/instruments/migrations/0010_instrumentname_deleted.py b/web-app/django/VIM/apps/instruments/migrations/0010_instrumentname_deleted.py
deleted file mode 100644
index b5b88164..00000000
--- a/web-app/django/VIM/apps/instruments/migrations/0010_instrumentname_deleted.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Generated by Django 4.2.5 on 2025-08-13 15:20
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("instruments", "0009_alter_instrumentname_verification_status"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="instrumentname",
-            name="deleted",
-            field=models.BooleanField(
-                default=False,
-                help_text="Soft delete flag. If true, this name is considered deleted but retained in the database.",
-            ),
-        ),
-    ]
diff --git a/web-app/django/VIM/apps/instruments/migrations/0011_remove_instrumentname_unique_umil_label_per_instrument_language_and_more.py b/web-app/django/VIM/apps/instruments/migrations/0011_remove_instrumentname_unique_umil_label_per_instrument_language_and_more.py
index 62ca3cd9..f309d78f 100644
--- a/web-app/django/VIM/apps/instruments/migrations/0011_remove_instrumentname_unique_umil_label_per_instrument_language_and_more.py
+++ b/web-app/django/VIM/apps/instruments/migrations/0011_remove_instrumentname_unique_umil_label_per_instrument_language_and_more.py
@@ -1,11 +1,11 @@
-# Generated by Django 4.2.5 on 2025-08-19 15:23
+# Generated by Django 4.2.5 on 2025-08-20 15:50
 
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("instruments", "0010_instrumentname_deleted"),
+        ("instruments", "0010_alter_instrumentname_contributor"),
     ]
 
     operations = [
@@ -13,6 +13,14 @@ class Migration(migrations.Migration):
             model_name="instrumentname",
             name="unique_umil_label_per_instrument_language",
         ),
+        migrations.AddField(
+            model_name="instrumentname",
+            name="deleted",
+            field=models.BooleanField(
+                default=False,
+                help_text="Soft delete flag. If true, this name is considered deleted but retained in the database.",
+            ),
+        ),
         migrations.AddConstraint(
             model_name="instrumentname",
             constraint=models.CheckConstraint(

From 8ecc56c71c5531315b49c5912f46f8293e7cc909 Mon Sep 17 00:00:00 2001
From: mailynmailyn <mlpuittinen@gmail.com>
Date: Thu, 21 Aug 2025 11:06:25 -0400
Subject: [PATCH 11/13] fix: logic bugs - replacement_umil_label can be the
 existing_umil_label (umil_label=true) - prevents reassignment of a current
 umil_label - check for existing label when umil_label is "unset" to false
 refs: #350

---
 .../instruments/models/instrument_name.py     | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/web-app/django/VIM/apps/instruments/models/instrument_name.py b/web-app/django/VIM/apps/instruments/models/instrument_name.py
index 5fe36cd9..bbd8c929 100644
--- a/web-app/django/VIM/apps/instruments/models/instrument_name.py
+++ b/web-app/django/VIM/apps/instruments/models/instrument_name.py
@@ -55,26 +55,28 @@ def __str__(self):
         return f"{self.name} ({self.language.en_label}) - {self.instrument.wikidata_id}"
 
     def save(self, *args, **kwargs):
-        # Querysets for efficiency
+
         existing_umil_label_qs = InstrumentName.objects.filter(
             instrument=self.instrument,
             language=self.language,
             umil_label=True,
         ).exclude(id=self.id)
 
-        # do not re-replace existing umil_label if it is already set
+        existing_umil_label = existing_umil_label_qs.first()
+        print("Existing UMIL label:", existing_umil_label)
+
         replacement_umil_label = (
             InstrumentName.objects.filter(
                 instrument=self.instrument,
                 language=self.language,
                 verification_status="verified",
-                umil_label=False,
                 deleted=False,
             )
             .exclude(id=self.id)
             .order_by("id")
             .first()
         )
+        print("Replacement UMIL label:", replacement_umil_label)
 
         # If setting umil_label=True
         if self.umil_label:
@@ -91,21 +93,21 @@ def save(self, *args, **kwargs):
                 existing_umil_label_qs.update(umil_label=False)
 
         # If a verified name is removing itself as umil_label
-        if not self.umil_label and self.verification_status == "verified":
-            # Try to assign replacement label in one query
-            if replacement_umil_label:
+        if not self.umil_label:
+            # check if there is an existing label
+            if existing_umil_label:
+                pass
+            # If the existing label is not found, check for a replacement
+            elif replacement_umil_label:
+                print("Replacement label found.", flush=True)
                 replacement_umil_label.umil_label = True
                 replacement_umil_label.save()
+            # If there is no replacement umil_label, only set umil_label=False if the current name is also deleted
             else:
-                # If there is no replacement umil_label, only set umil_label=False if the current name is also deleted
                 # Otherwise, a viewer will see a verified name on the detail page without a label
-                if self.deleted:
-                    self.umil_label = False
-                else:
-                    # If no replacement and not deleted, check that there is not an existing umil_label
-                    if not existing_umil_label_qs.exists():
-                        raise ValueError(
-                            "This is the only verified, non-deleted name for this instrument and language, it must be set as umil_label."
-                        )
+                if self.verification_status == "verified" and not self.deleted:
+                    raise ValueError(
+                        "This is the only verified, non-deleted name for this instrument and language, it must be set as umil_label."
+                    )
 
         super().save(*args, **kwargs)

From d1f900f0c861ff2cf0f2c30204cae072c913d8fb Mon Sep 17 00:00:00 2001
From: mailynmailyn <mlpuittinen@gmail.com>
Date: Fri, 22 Aug 2025 12:59:25 -0400
Subject: [PATCH 12/13] fix: save Wikidata alias as label if there is no
 Wikdiata label refs:#350

---
 .../django/VIM/apps/instruments/models/instrument_name.py  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/web-app/django/VIM/apps/instruments/models/instrument_name.py b/web-app/django/VIM/apps/instruments/models/instrument_name.py
index bbd8c929..a2a0c7d4 100644
--- a/web-app/django/VIM/apps/instruments/models/instrument_name.py
+++ b/web-app/django/VIM/apps/instruments/models/instrument_name.py
@@ -106,8 +106,9 @@ def save(self, *args, **kwargs):
             else:
                 # Otherwise, a viewer will see a verified name on the detail page without a label
                 if self.verification_status == "verified" and not self.deleted:
-                    raise ValueError(
-                        "This is the only verified, non-deleted name for this instrument and language, it must be set as umil_label."
-                    )
+                    # raise ValueError(
+                    #     "This is the only verified, non-deleted name for this instrument and language, it must be set as umil_label."
+                    # )
+                    self.umil_label = True  # Comment this out and uncomment the above after initial instrument upload.
 
         super().save(*args, **kwargs)

From ec8d31a003b0ec4f33b660c0be3a01b6d970d4e4 Mon Sep 17 00:00:00 2001
From: mailynmailyn <mlpuittinen@gmail.com>
Date: Fri, 22 Aug 2025 13:00:08 -0400
Subject: [PATCH 13/13] fix: allow reviewer to modify umil_label attribute,
 remove access to deleted attribute refs:#350

---
 web-app/django/VIM/apps/instruments/admin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web-app/django/VIM/apps/instruments/admin.py b/web-app/django/VIM/apps/instruments/admin.py
index d07d8244..64deea12 100644
--- a/web-app/django/VIM/apps/instruments/admin.py
+++ b/web-app/django/VIM/apps/instruments/admin.py
@@ -25,8 +25,8 @@ def get_readonly_fields(self, request, obj=None):
                 "language",
                 "name",
                 "source_name",
-                "umil_label",
                 "contributor",
                 "on_wikidata",
+                "deleted",
             )
         return super().get_readonly_fields(request, obj)