Merge pull request GeoNode#2 from lucernae/geosafe

Move save impact layer to celery tasks

geosafe/models.py

@@ -9,7 +9,6 @@
 
 from geonode.layers.models import Layer
 from geonode.people.models import Profile
-from geonode.layers.utils import file_upload
 
 # geosafe
 import os
@@ -256,11 +255,3 @@ def run_analysis_post_save(sender, instance, created, **kwargs):
     """Call InaSAFE headless here"""
     arguments, output_file, layer_folder, output_folder = instance.generate_cli()
     run_analysis_docker.delay(arguments=arguments, output_file=output_file, layer_folder=layer_folder, output_folder=output_folder)
-
-    impact_layer = file_upload(
-        output_file,
-        overwrite=True,
-    )
-    impact_layer.set_default_permissions()
-    instance.impact_layer = impact_layer
-    instance.save()

geosafe/tasks/analysis.py

@@ -1,7 +1,7 @@
 import os
 from subprocess import call, Popen, PIPE
 from celery.task import task
-
+from geonode.layers.utils import file_upload
 
 __author__ = 'lucernae'
 
@@ -16,6 +16,11 @@ def run_analysis_docker(arguments, output_file, layer_folder, output_folder):
     # call system function
     call(["inasafe", arguments, layer_folder, output_folder])
     # TODO: Save the layer file and all info to geonode (upload?)
+    saved_layer = file_upload(
+        output_file,
+        overwrite=True,
+    )
+    saved_layer.set_default_permissions()
 
 
 @task(name='geosafe.tasks.analysis.run_analysis_cli', queue='cleanup')