Merge pull request #1004 from onaio/csv-import-use-django-storage

switch to using django storage for csv import processing

onadata/apps/api/viewsets/xform_viewset.py

@@ -555,10 +555,13 @@ def csv_import(self, request, *args, **kwargs):
                     resp.update(submit_csv(request.user.username,
                                            self.object, csv_file))
                 else:
-                    tmp_file_path = utils.generate_tmp_path(csv_file)
+                    csv_file.seek(0)
+                    upload_to = os.path.join(request.user.username,
+                                             'csv_imports', csv_file.name)
+                    file_name = default_storage.save(upload_to, csv_file)
                     task = submit_csv_async.delay(request.user.username,
                                                   self.object,
-                                                  tmp_file_path)
+                                                  file_name)
                     if task is None:
                         raise ParseError('Task not found')
                     else:

onadata/libs/utils/csv_import.py

@@ -1,4 +1,3 @@
-import codecs
 import cStringIO
 import json
 import uuid
@@ -11,6 +10,7 @@
 from celery.backends.amqp import BacklogLimitExceeded
 from celery.result import AsyncResult
 from django.contrib.auth.models import User
+from django.core.files.storage import default_storage
 
 from onadata.apps.logger.models import Instance
 from onadata.libs.utils.async_status import (FAILED, async_status,
@@ -110,8 +110,8 @@ def dict_pathkeys_to_nested_dicts(dictionary):
 
 
 @task()
-def submit_csv_async(username, xform, csv_file_temp_path):
-    with codecs.open(csv_file_temp_path, encoding='utf-8') as csv_file:
+def submit_csv_async(username, xform, file_path):
+    with default_storage.open(file_path) as csv_file:
         return submit_csv(username, xform, csv_file)