Skip to content

Commit

Permalink
bug(metadata): Allows empty funding organization on submission
Browse files Browse the repository at this point in the history
Before the use of a default funding organization this funding
organization was required on Dataset Submission for review.
Now it is no longer require since BER will be the default
funding organization.

Closes #432
  • Loading branch information
vchendrix committed Aug 29, 2024
1 parent 082d9bd commit f8f5100
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion archive_api/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ def validate(self, data):
errors['missingRequiredFields'].append("archive")

for field in ['sites', 'authors', 'name', 'description', 'contact', 'variables',
'ngee_tropics_resources', 'funding_organizations', 'originating_institution',
'ngee_tropics_resources', 'originating_institution',
'access_level', 'qaqc_method_description']: # Check for required fields
if field in data.keys():
if data[field] is None or (isinstance(data[field], (list, tuple, str)) and not data[field]):
Expand Down
5 changes: 2 additions & 3 deletions archive_api/tests/test_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,6 @@ def test_client_post(self):
'contact',
'variables',
'ngee_tropics_resources',
'funding_organizations',
'originating_institution',
'qaqc_method_description']}, value)

Expand Down Expand Up @@ -331,7 +330,7 @@ def test_user_workflow(self):
self.assertEqual(status.HTTP_400_BAD_REQUEST, response.status_code)
self.assertEqual(
{'description': ['Description must be at least 100 words. Current count is 37.'],
'missingRequiredFields': ['archive', 'authors', 'funding_organizations', 'originating_institution',
'missingRequiredFields': ['archive', 'authors', 'originating_institution',
'qaqc_method_description']},
value)

Expand Down Expand Up @@ -388,7 +387,7 @@ def test_admin_approve_workflow(self):
value = json.loads(response.content.decode('utf-8'))
self.assertEqual(
{'description': ['Description must be at least 100 words. Current count is 37.'],
'missingRequiredFields': ['archive', 'authors', 'funding_organizations', 'originating_institution',
'missingRequiredFields': ['archive', 'authors', 'originating_institution',
'qaqc_method_description']},
value)
self.assertEqual(status.HTTP_400_BAD_REQUEST, response.status_code)
Expand Down

0 comments on commit f8f5100

Please sign in to comment.