Merge pull request #103 from open-contracting/102-fix-to-json

Fix to-json for url input

default/views.py

@@ -262,7 +262,10 @@ def upload_url(request):
         if 'input_url' in data:
             url = request.POST.get(data)
             basename = data
-            extension = ".json"
+            if request.POST.get('type') == 'csv xlsx zip':
+                extension = os.path.splitext(urlparse(url).path)[1]
+            else:
+                extension = ".json"
             folder = 'media'
             data_file = DataFile(basename, extension)
 

tests/test_upload_url.py

@@ -54,6 +54,16 @@ def test_upload_url_status(self):
         response = self.client.get('/upload-url/status/')
         self.assertEqual(response.status_code, 200)
 
+    def test_upload_csv_xlsx_zip(self):
+        file_url = {
+            'input_url_0': 'https://github.com/open-contracting/toucan/blob/master/tests/fixtures/'
+                           '1.1/spreadsheets/flattened.xlsx?raw=true',
+            'type': 'csv xlsx zip'
+        }
+        self.client.post('/upload-url/', file_url)
+        response = self.client.get('/upload-url/status/')
+        self.assertEqual(response.status_code, 200)
+
     def test_bad_url(self):
         bad_files_urls = {
             'input_url_0': 'https://raw.githubusercontent.com/open-contracting/toucan/'