Merge branch 'master' into rc-paas-migration

api/barriers/serializers/data_workspace.py

@@ -231,6 +231,7 @@ class Meta(BarrierSerializerBase.Meta):
             "latest_progress_update",
             "location",
             "reported_by",
+            "reported_on",
             "barrier_owner",
             "modified_by",
             "modified_on",

api/metadata/migrations/0046_auto_20240607_0812.py

@@ -0,0 +1,32 @@
+# Generated by Django 4.2.11 on 2024-06-07 08:12
+
+from django.db import migrations
+
+
+def remove_brexit_and_nip_tags(apps, schema_editor):
+    """Removing Brexit and NIP tags to avoid confusion to users because they are no longer relevant."""
+    BarrierTag = apps.get_model("metadata", "BarrierTag")
+
+    BarrierTag.objects.filter(title="Brexit").delete()
+    BarrierTag.objects.filter(title="NI Protocol").delete()
+
+
+def create_brexit_and_nip_tags(apps, schema_editor):
+    """Creating Brexit and NIP tags."""
+    BarrierTag = apps.get_model("metadata", "BarrierTag")
+
+    BarrierTag.objects.create(title="Brexit")
+    BarrierTag.objects.create(title="NI Protocol")
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("metadata", "0045_programme_fund_tags"),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            remove_brexit_and_nip_tags, reverse_code=create_brexit_and_nip_tags
+        ),
+    ]

tests/metadata/test_metadata.py

@@ -166,8 +166,6 @@ def test_barrier_tags(self):
         expected = [
             "Scoping (Top 100 priority barrier)",
             "COVID-19",
-            "Brexit",
-            "NI Protocol",
             "Programme Fund",
             "International Standards",
             "Clean Growth",

tests/metadata/test_models.py

@@ -15,9 +15,9 @@ def test_tag_ordering(self):
         assert last_tag.order == new_tag.order
 
         tags = BarrierTag.objects.all()
-        assert 1 == tags[0].order
-        assert 2 == tags[1].order
-        assert 3 == tags[2].order
+        assert tags[0].order == 1
+        assert tags[1].order == 2
+        assert tags[2].order == 6
 
 
 class TestOrganisations(TestCase):