usage report updated for anlaysis containers

Author: hkethi002

api/handlers/reporthandler.py

@@ -880,10 +880,9 @@ def _build_project_report(self, base_query):
             acquisition_ids = [a['_id'] for a in acquisitions]
 
             # For the project and each session and acquisition, create a list of analysis ids
-            analysis_ids = [an['_id'] for an in p.get('analyses', [])]
-            analysis_ids.extend([an['_id'] for an in s.get('analyses', []) for s in sessions])
-            analysis_ids.extend([an['_id'] for an in a.get('analyses', []) for a in acquisitions])
-
+            ids = session_ids + acquisition_ids + [p['_id']]
+            analysis_ids = [an['_id'] for an in config.db.analyses.find({'parent.id': {'$in': ids}})]
+            
             report_obj['session_count'] = len(session_ids)
 
             # for each type of container below it will have a slightly modified match query

test/integration_tests/python/test_reports.py

@@ -284,3 +284,17 @@ def test_usage_report(data_builder, file_form, as_user, as_admin):
     assert usage[0]['session_count'] == 1
     assert usage[0]['file_mbs'] > 0
     assert usage[0]['gear_execution_count'] == 1
+
+    # Test if empty project breaks Usage report
+    group = data_builder.create_group()
+    r = as_admin.post('/projects', params={'inherit': 'false'}, json={'label': 'project2', 'group': group})
+    assert r.ok
+    project = r.json()['_id']
+
+    # get project-aggregated usage report
+    r = as_admin.get('/report/usage', params={'type': 'project'})
+    assert r.ok
+
+    # delete project
+    r= as_admin.delete('/projects/' + project)
+    assert r.ok