Fmd 984 replace owner refs from app

feedback/migrations/0003_alter_issue_reason.py

@@ -0,0 +1,27 @@
+# Generated by Django 5.1.3 on 2024-11-14 14:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("feedback", "0002_remove_issue_user_email_issue_created_by"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="issue",
+            name="reason",
+            field=models.CharField(
+                choices=[
+                    ("Link is broken", "Broken Link"),
+                    ("Data Custodian is incorrect", "Incorrect Custodian"),
+                    ("Contact is outdated", "Outdated Contact"),
+                    ("Other", "Other"),
+                ],
+                max_length=50,
+                verbose_name="What is wrong with this page?",
+            ),
+        ),
+    ]

feedback/migrations/0004_rename_data_owner_email_issue_data_custodian_email_and_more.py

@@ -0,0 +1,32 @@
+# Generated by Django 5.1.3 on 2024-11-18 11:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("feedback", "0003_alter_issue_reason"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="issue",
+            old_name="data_owner_email",
+            new_name="data_custodian_email",
+        ),
+        migrations.AlterField(
+            model_name="issue",
+            name="reason",
+            field=models.CharField(
+                choices=[
+                    ("Link is broken", "Broken Link"),
+                    ("Data custodian is incorrect", "Incorrect Custodian"),
+                    ("Contact is outdated", "Outdated Contact"),
+                    ("Other", "Other"),
+                ],
+                max_length=50,
+                verbose_name="What is wrong with this page?",
+            ),
+        ),
+    ]

feedback/models.py

@@ -54,4 +54,4 @@ class IssueChoices(models.TextChoices):
     )
     entity_name = models.CharField(max_length=250)
     entity_url = models.CharField(max_length=250)
-    data_owner_email = models.CharField(max_length=250)
+    data_custodian_email = models.CharField(max_length=250)

feedback/service.py

@@ -28,7 +28,7 @@ def send(
 
     personalisation = {
         "assetOwner": (
-            issue.data_owner_email if issue.data_owner_email else "Data Catalog Team"
+            issue.data_custodian_email if issue.data_custodian_email else "Data Catalog Team"
         ),
         "userEmail": issue.created_by.email if issue.created_by else "",
         "assetName": issue.entity_name,
@@ -39,11 +39,11 @@ def send(
     reference = str(issue.id)
 
     # Notify Data Owner
-    if issue.data_owner_email:
+    if issue.data_custodian_email:
         notify(
             personalisation=personalisation,
             template_id=settings.NOTIFY_DATA_OWNER_TEMPLATE_ID,
-            email_address=issue.data_owner_email,
+            email_address=issue.data_custodian_email,
             reference=reference,
             client=client,
         )

feedback/views.py

@@ -47,7 +47,7 @@ def report_issue_view(request) -> HttpResponse:
             issue = form.save(commit=False)
             issue.entity_name = request.session.get("entity_name")
             issue.entity_url = request.session.get("entity_url")
-            issue.data_owner_email = request.session.get("data_owner_email")
+            issue.data_custodian_email = request.session.get("data_custodian_email")
 
             # in production, there should always be a signed in user,
             # but this may not be the case in local development/unit tests
@@ -81,7 +81,7 @@ def report_issue_view(request) -> HttpResponse:
 
         request.session["entity_name"] = entity_name
         request.session["entity_url"] = entity_url
-        request.session["data_owner_email"] = _(request.GET.get("data_owner_email", ""))
+        request.session["data_custodian_email"] = _(request.GET.get("data_custodian_email", ""))
 
         form = IssueForm()
 

templates/partial/contact_info.html

@@ -69,6 +69,6 @@ <h2 class="govuk-heading-s govuk-!-margin-bottom-1">{% translate "Data custodian
 
 {% if NOTIFY_ENABLED and entity_name %}
   <div class="govuk-body">
-    <a type="button" class="govuk-button" href="{% url 'feedback:report-issue' %}?entity_name={{ entity_name }}&data_owner_email={{ data_owner_email }}&entity_url={{ request.build_absolute_uri}}" class="govuk-link">Report an issue</a>
+    <a type="button" class="govuk-button" href="{% url 'feedback:report-issue' %}?entity_name={{ entity_name }}&data_custodian_email={{ data_custodian_email }}&entity_url={{ request.build_absolute_uri}}" class="govuk-link">Report an issue</a>
   </div>
 {% endif %}

tests/feedback/test_notify_service.py

@@ -11,7 +11,7 @@ def test_send_all_notifications(mock_notifications_client, reporter):
         "additional_info": "This is some additional information.",
         "entity_name": "my_entity",
         "entity_url": "http://localhost/my_entity",
-        "data_owner_email": "[email protected]",
+        "data_custodian_email": "[email protected]",
         "created_by": reporter,
     }
 
@@ -24,7 +24,7 @@ def test_send_all_notifications(mock_notifications_client, reporter):
 
 
 @pytest.mark.django_db
-def test_send_notifications_no_data_owner_email(mock_notifications_client, reporter):
+def test_send_notifications_no_data_custodian_email(mock_notifications_client, reporter):
     data = {
         "reason": "Other",
         "additional_info": "This is some additional information.",
@@ -48,7 +48,7 @@ def test_send_all_notifications_no_reporter(mock_notifications_client):
         "additional_info": "This is some additional information.",
         "entity_name": "my_entity",
         "entity_url": "http://localhost/my_entity",
-        "data_owner_email": "[email protected]",
+        "data_custodian_email": "[email protected]",
     }
 
     issue = Issue.objects.create(**data)
@@ -59,7 +59,7 @@ def test_send_all_notifications_no_reporter(mock_notifications_client):
 
 
 @pytest.mark.django_db
-def test_send_all_notifications_no_reporter_no_data_owner_email(
+def test_send_all_notifications_no_reporter_no_data_custodian_email(
     mock_notifications_client, reporter
 ):
     data = {

tests/feedback/test_views.py

@@ -36,7 +36,7 @@ def test_form_renders(self, client):
             data={
                 "entity_name": "my_entity",
                 "entity_url": "http://localhost/my_entity",
-                "data_owner_email": "[email protected]",
+                "data_custodian_email": "[email protected]",
             },
         )
         assert response.status_code == 200