Skip to content

Archived acquisitions don't affect session template compliance #890

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 4, 2017
Merged

Archived acquisitions don't affect session template compliance #890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/dao/hierarchy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ def check_cont(cont, reqs):
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')
Expand Down
7 changes: 7 additions & 0 deletions test/integration_tests/python/test_containers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,13 @@ def satisfies_template():
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
Expand Down