Merge pull request #2722 from uktrade/make-enquiries-contact-required…

…-field Make enquiries contact required field for catalogue items
uktrade · Aug 15, 2023 · 4287160 · 4287160
2 parents 3e8bec3 + ef5b470
commit 4287160
Show file tree

Hide file tree

Showing 4 changed files with 172 additions and 8 deletions.
diff --git a/dataworkspace/dataworkspace/apps/dw_admin/forms.py b/dataworkspace/dataworkspace/apps/dw_admin/forms.py
@@ -61,6 +61,8 @@ def __init__(self, *args, **kwargs):
             self.fields["information_asset_owner"].required = True
         if "information_asset_manager" in self.fields:
             self.fields["information_asset_manager"].required = True
+        if "enquiries_contact" in self.fields:
+            self.fields["enquiries_contact"].required = True
         if "sort_field" in self.fields:
             self.fields["sort_field"].queryset = self.instance.fields.all()
 
@@ -531,6 +533,7 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields["information_asset_owner"].required = True
         self.fields["information_asset_manager"].required = True
+        self.fields["enquiries_contact"].required = True
 
     class Meta:
         model = MasterDataset
@@ -545,6 +548,7 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields["information_asset_owner"].required = True
         self.fields["information_asset_manager"].required = True
+        self.fields["enquiries_contact"].required = True
 
     class Meta:
         model = MasterDataset
@@ -718,6 +722,7 @@ def __init__(self, *args, **kwargs):
 
         self.fields["information_asset_owner"].required = True
         self.fields["information_asset_manager"].required = True
+        self.fields["enquiries_contact"].required = True
 
 
 class VisualisationLinkForm(forms.ModelForm):

diff --git a/dataworkspace/dataworkspace/tests/datasets/test_views.py b/dataworkspace/dataworkspace/tests/datasets/test_views.py
@@ -4795,6 +4795,7 @@ def test_csv_upload(
                 published=True,
                 user_access_type=UserAccessType.REQUIRES_AUTHENTICATION,
                 information_asset_manager=user,
+                enquiries_contact=user,
             ),
             schema="test",
             table="table1",

diff --git a/dataworkspace/dataworkspace/tests/factories.py b/dataworkspace/dataworkspace/tests/factories.py
@@ -86,6 +86,7 @@ class DataSetFactory(factory.django.DjangoModelFactory):
     type = DataSetType.DATACUT
     information_asset_owner = factory.SubFactory(UserFactory)
     information_asset_manager = factory.SubFactory(UserFactory)
+    enquiries_contact = factory.SubFactory(UserFactory)
 
     class Meta:
         model = "datasets.DataSet"