Merge pull request #820 from scitran/analysis-download

analysis downloads use label istead of id

api/dao/liststorage.py

@@ -226,6 +226,10 @@ class AnalysesStorage(ListStorage):
         else:
             return files
 
+    def get_analysis(self, _id, analysis_id):
+        _id = bson.ObjectId(_id)
+        return self._get_el(_id, {'_id': analysis_id})
+
     def add_note(self, _id, analysis_id, payload):
         _id = bson.ObjectId(_id)
         query = {

api/handlers/listhandler.py

@@ -797,7 +797,8 @@ class AnalysesHandler(ListHandler):
                 ticket = util.download_ticket(self.request.client_addr, 'file', _id, filename, total_size, origin=self.origin)
             else:
                 targets, total_size, file_cnt = self._prepare_batch(fileinfo)
-                filename = 'analysis_' + analysis_id + '.tar'
+                analysis_label = util.sanitize_string_to_filename(storage.get_analysis(_id, analysis_id).get('label', 'No Label'))
+                filename = 'analysis_' + analysis_label + '.tar'
                 ticket = util.download_ticket(self.request.client_addr, 'batch', targets, filename, total_size, origin=self.origin)
             return {
                 'ticket': config.db.downloads.insert_one(ticket).inserted_id,

test/integration_tests/python/test_download.py

@@ -179,6 +179,9 @@ def test_analysis_download(data_builder, file_form, as_admin):
     assert r.ok
     ticket = r.json()['ticket']
 
+    # filename is analysis_<label> not analysis_<_id>
+    assert r.json()['filename'] == 'analysis_test.tar'
+
     # batch download analysis files w/ ticket
     r = as_admin.get(analysis_files, params={'ticket': ticket})
     assert r.ok