Merge pull request #890 from scitran/hidden-compliance

Archived acquisitions don't affect session template compliance

api/dao/hierarchy.py

@@ -243,7 +243,7 @@ def is_session_compliant(session, template):
         if not session.get('_id'):
             # New session, won't have any acquisitions. Compliance check fails
             return False
-        acquisitions = list(config.db.acquisitions.find({'session': session['_id']}))
+        acquisitions = list(config.db.acquisitions.find({'session': session['_id'], 'archived':{'$ne':True}}))
         for req in a_requirements:
             req_temp = copy.deepcopy(req)
             min_count = req_temp.pop('minimum')

test/integration_tests/python/test_containers.py

@@ -134,6 +134,13 @@ def test_project_template(data_builder, file_form, as_admin):
     assert 'satisfies_template' not in r.json()
     assert as_admin.put('/sessions/' + session, json={'project': project})
 
+    # archived acqusitions don't affect session compliance
+    assert satisfies_template()
+    # Hide Acq_2 so that no acquisition in the session are compliant
+    assert as_admin.put('/acquisitions/' + acquisition_2, json={'archived': True}).ok
+    assert not satisfies_template() 
+    assert as_admin.put('/acquisitions/' + acquisition_2, json={'archived': False})
+
     # acquisitions.label
     assert satisfies_template()
     assert as_admin.put('/acquisitions/' + acquisition_2, json={'label': 'non-compliant'}).ok