Request body is now list of nodes

api/download.py

@@ -318,42 +318,62 @@ class Download(base.RequestHandler):
 
     def summary(self):
         """Return a summary of what has been/will be downloaded based on a given query"""
+        res = {}
         req = self.request.json_body
-        req['_id'] = bson.ObjectId(req['_id'])
-        level = req['level']
-
-        containers = ['projects', 'sessions', 'acquisitions']
-        cont_query = {}
-        if level == 'projects':
-            # Grab sessions and their ids
-            sessions = config.db.sessions.find({'project': req['_id']}, {'_id': 1})
-            session_ids = [s['_id'] for s in sessions]
-
-            # for each type of container below it will have a slightly modified match query
-            cont_query = {
-                'projects': {'_id': req['_id']},
-                'sessions': {'project': req['_id']},
-                'acquisitions': {'session': {'$in': session_ids}}
-            }
-        elif level == 'sessions':
-
-            # for each type of container below it will have a slightly modified match query
-            cont_query = {
-                'sessions': {'_id': req['_id']},
-                'acquisitions': {'session': req['_id']}
-            }
-            containers = containers[1:]
-        elif level == 'acquisitions':
-
-            cont_query['acquisitions'] = {'_id': req['_id']}
-            containers = containers[-1:]
-        elif level == 'analyses':
-            cont_query['analyses'] = {'_id': req['_id']}
-            containers = ['analyses']
-        else:
-            self.abort(400, "{} not a recognized level".format(level)) 
+        cont_query = {
+            'projects': {'_id': {'$in':[]}},
+            'sessions': {'_id': {'$in':[]}},
+            'acquisitions': {'_id': {'$in':[]}},
+            'analyses' : {'_id': {'$in':[]}}
+        }
+        for node in req:
+            node['_id'] = bson.ObjectId(node['_id'])
+            level = node['level']
+
+            containers = {'projects':0, 'sessions':0, 'acquisitions':0, 'analyses':0}
+            
+            if level == 'project':
+                # Grab sessions and their ids
+                sessions = config.db.sessions.find({'project': node['_id']}, {'_id': 1})
+                session_ids = [s['_id'] for s in sessions]
+                acquisitions = config.db.acquisitions.find({'session': {'$in': session_ids}}, {'_id': 1})
+                acquisition_ids = [a['_id'] for a in acquisitions]
+
+                containers['projects']=1
+                containers['sessions']=1
+                containers['acquisitions']=1
+
+                # for each type of container below it will have a slightly modified match query
+                cont_query.get('projects',{}).get('_id',{}).get('$in').append(node['_id'])
+                cont_query['sessions']['_id']['$in'] = cont_query['sessions']['_id']['$in'] + session_ids
+                cont_query['acquisitions']['_id']['$in'] = cont_query['acquisitions']['_id']['$in'] + acquisition_ids
+
+            elif level == 'session':
+                acquisitions = config.db.acquisitions.find({'session': node['_id']}, {'_id': 1})
+                acquisition_ids = [a['_id'] for a in acquisitions]
+
+
+                # for each type of container below it will have a slightly modified match query
+                cont_query.get('sessions',{}).get('_id',{}).get('$in').append(node['_id'])
+                cont_query['acquisitions']['_id']['$in'] = cont_query['acquisitions']['_id']['$in'] + acquisition_ids
+
+                containers['sessions']=1
+                containers['acquisitions']=1
+
+            elif level == 'acquisition':
+
+                cont_query.get('acquisitions',{}).get('_id',{}).get('$in').append(node['_id'])
+                containers['acquisitions']=1
+
+            elif level == 'analysis':
+                cont_query.get('analyses',{}).get('_id',{}).get('$in').append(node['_id'])
+                containers['analyses'] = 1
+
+            else:
+                self.abort(400, "{} not a recognized level".format(level)) 
+
+            containers = [cont for cont in containers if containers[cont] == 1]
 
-        res = {}
         for cont_name in containers:
             # Aggregate file types
             pipeline = [

test/integration_tests/python/test_download.py

@@ -425,22 +425,22 @@ def test_summary(data_builder, as_admin, file_form):
 
     missing_object_id = '000000000000000000000000'
 
-    r = as_admin.post('/download/summary', json={"level":"projects", "_id":project})
+    r = as_admin.post('/download/summary', json=[{"level":"project", "_id":project}])
     assert r.ok
     assert len(r.json()) == 1
     assert r.json().get("csv", {}).get("count",0) == 4 
 
-    r = as_admin.post('/download/summary', json={"level":"sessions", "_id":session})
+    r = as_admin.post('/download/summary', json=[{"level":"session", "_id":session}])
     assert r.ok
     assert len(r.json()) == 1
     assert r.json().get("csv", {}).get("count",0) == 2 
 
-    r = as_admin.post('/download/summary', json={"level":"acquisitions", "_id":acquisition})
+    r = as_admin.post('/download/summary', json=[{"level":"acquisition", "_id":acquisition},{"level":"acquisition", "_id":acquisition2}])
     assert r.ok
     assert len(r.json()) == 1
-    assert r.json().get("csv", {}).get("count",0) == 1
+    assert r.json().get("csv", {}).get("count",0) == 2
 
-    r = as_admin.post('/download/summary', json={"level":"groups", "_id":missing_object_id})
+    r = as_admin.post('/download/summary', json=[{"level":"group", "_id":missing_object_id}])
     assert r.status_code == 400
 
     r = as_admin.post('/sessions/' + session + '/analyses',  files=file_form(
@@ -448,7 +448,7 @@ def test_summary(data_builder, as_admin, file_form):
     assert r.ok
     analysis = r.json()['_id']
     
-    r = as_admin.post('/download/summary', json={"level":"analyses", "_id":analysis})
+    r = as_admin.post('/download/summary', json=[{"level":"analysis", "_id":analysis}])
     assert r.ok
     assert len(r.json()) == 1
     assert r.json().get("tabular data", {}).get("count",0) == 1