Only submit_to_dspace once

closes #69

kepler/tasks.py

@@ -60,18 +60,26 @@ def index_geotiff(job, data):
 
 
 def submit_to_dspace(job, data):
-    username = current_app.config['SWORD_SERVICE_USERNAME']
-    password = current_app.config['SWORD_SERVICE_PASSWORD']
-    pkg = sword.SWORDPackage(uuid=job.item.uri)
-    tiff = get_geotiff(data)
-    pkg.datafiles.append(tiff)
-    pkg.metadata = _fgdc_to_mods(get_fgdc(data))
-    with tempfile.NamedTemporaryFile(suffix='.zip') as fp:
-        pkg.write(fp)
-        handle = sword.submit(current_app.config['SWORD_SERVICE_URL'], fp.name,
-                              auth=(username, password))
-    job.item.handle = handle
-    db.session.commit()
+    """Upload GeoTIFF to DSpace.
+
+        .. note:: only runs if `Item.handle` has not previously been set.
+
+        :param job: :class:`~kepler.models.Job`
+        :param data: absolute path to bag containing GeoTIFF
+    """
+    if not job.item.handle:
+        username = current_app.config['SWORD_SERVICE_USERNAME']
+        password = current_app.config['SWORD_SERVICE_PASSWORD']
+        pkg = sword.SWORDPackage(uuid=job.item.uri)
+        tiff = get_geotiff(data)
+        pkg.datafiles.append(tiff)
+        pkg.metadata = _fgdc_to_mods(get_fgdc(data))
+        with tempfile.NamedTemporaryFile(suffix='.zip') as fp:
+            pkg.write(fp)
+            handle = sword.submit(current_app.config['SWORD_SERVICE_URL'], fp.name,
+                                  auth=(username, password))
+        job.item.handle = handle
+        db.session.commit()
 
 
 def upload_shapefile(job, data):

tests/test_tasks.py

@@ -16,6 +16,7 @@
 @pytest.fixture
 def job():
     j = Mock()
+    j.item.handle = None
     j.item.uri = 'urn:uuid:c8921f5a-eac7-509b-bac5-bd1b2cb202dc'
     j.item.access = 'public'
     return j
@@ -55,6 +56,19 @@ def testSubmitToDspaceAddsHandleToItem(job, bag_tif):
         assert job.item.handle == 'foobar'
 
 
+def testSubmitToDspaceWithExistingHandleDoesNotSubmit(job, bag_tif):
+    job.item.handle = "popcorn"
+    with patch('kepler.tasks.sword.submit') as mock:
+        submit_to_dspace(job, bag_tif)
+        assert not mock.called
+
+
+def testSubmitToDspaceWithExistingHandleDoesNotChangeHandle(job, bag_tif):
+    job.item.handle = "popcorn"
+    submit_to_dspace(job, bag_tif)
+    assert job.item.handle == "popcorn"
+
+
 def testUploadShapefileCallsUploadWithMimetype(job, bag, shapefile):
     with patch('kepler.tasks._upload_to_geoserver') as mock:
         upload_shapefile(job, bag)