Move prefill logic for DOI query to form. Write view test.

commentaries/forms.py

@@ -34,6 +34,10 @@ class DOIToQueryForm(forms.Form):
     def commentary_exists(self, input_doi):
         return Commentary.objects.filter(pub_DOI=input_doi).exists()
 
+    def request_published_article_form_prefill_data(self):
+        additional_form_data = {'type': 'published', 'pub_DOI': self.cleaned_data['doi']}
+        return {**self.crossref_data, **additional_form_data}
+
 
 class IdentifierToQueryForm(forms.Form):
     identifier = forms.CharField(widget=forms.TextInput(

commentaries/test_views.py

@@ -59,8 +59,7 @@ class PrefillUsingDOITest(TestCase):
         request.user = UserFactory()
 
         response = prefill_using_DOI(request)
-        # Not sure what to test here
-        raise NotImplementedError
+        self.assertEqual(response.status_code, 200)
 
 
 class VetCommentaryRequestsTest(TestCase):

commentaries/views.py

@@ -91,10 +91,8 @@ def prefill_using_DOI(request):
         doi_query_form = DOIToQueryForm(request.POST)
         # The form checks if doi is valid and commentary doesn't already exist.
         if doi_query_form.is_valid():
-            doi = doi_query_form.cleaned_data['doi']
-            additional_form_data = {'type': 'published', 'pub_DOI': doi}
-            total_form_data = {**doi_query_form.crossref_data, **additional_form_data}
-            form = RequestPublishedArticleForm(initial=total_form_data)
+            prefill_data = doi_query_form.request_published_article_form_prefill_data()
+            form = RequestPublishedArticleForm(initial=prefill_data)
         else:
             form = RequestPublishedArticleForm()