Merge branch 'support-multiple-pdf-import' into 'master'

Support multiple PDF Import

Closes #520

See merge request !1105

arkindex/dataimport/serializers/imports.py

@@ -128,9 +128,7 @@ class DataImportFromFilesSerializer(serializers.Serializer):
 
     def validate(self, data):
         if data['mode'] == DataImportMode.PDF:
-            if len(data['files']) > 1:
-                self.fail('unique_pdf')
-            if data['files'][0].content_type != 'application/pdf':
+            if not all(f.content_type == 'application/pdf' for f in data['files']):
                 self.fail('pdf_only')
 
         elif data['mode'] == DataImportMode.Images:

arkindex/dataimport/tests/test_imports.py

@@ -5,7 +5,7 @@ import yaml
 from django.urls import reverse
 from rest_framework import status
 
-from arkindex.dataimport.models import DataFile, DataImport, RepositoryType
+from arkindex.dataimport.models import DataImport, RepositoryType
 from arkindex.documents.models import Corpus, ElementType
 from arkindex.project.tests import FixtureAPITestCase
 from arkindex.users.models import User
@@ -730,18 +730,6 @@ class TestImports(FixtureAPITestCase):
         }, format='json')
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
 
-    def test_from_files_pdf_single(self):
-        self.client.force_login(self.user)
-        pdf2 = DataFile.objects.create(
-            name='test2.pdf', size=1337, content_type='application/pdf', corpus=self.corpus)
-        response = self.client.post(reverse('api:import-from-files'), {
-            'files': [str(self.pdf_df.id), str(pdf2.id)],
-            'folder_type': 'volume',
-            'element_type': 'page',
-            'mode': 'pdf',
-        }, format='json')
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-
     def test_from_files_images_wrong_type(self):
         self.client.force_login(self.user)
         response = self.client.post(reverse('api:import-from-files'), {