darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-21 07:51:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Removed the check for active user when adding a user to an organisation

Browse Source
This commit is contained in:
Rebecca Law
2018-02-21 17:03:32 +00:00
parent 70f9dfc0f6
commit 69cc33f77f
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/dao/organisation_dao.py
View File

@@ -62,7 +62,7 @@ def dao_get_users_for_organisation(organisation_id):
@transactional @transactional
def dao_add_user_to_organisation(organisation_id, user_id): def dao_add_user_to_organisation(organisation_id, user_id):
organisation = dao_get_organisation_by_id(organisation_id) organisation = dao_get_organisation_by_id(organisation_id)
user = User.query.filter_by(id=user_id).filter_by(state='active').one() user = User.query.filter_by(id=user_id).one()
organisation.users.append(user) organisation.users.append(user)
db.session.add(organisation) db.session.add(organisation)
return user return user

6
tests/app/dao/test_organisation_dao.py
View File

@@ -171,9 +171,3 @@ def test_add_user_to_organisation_when_user_does_not_exist(sample_organisation):
def test_add_user_to_organisation_when_organisation_does_not_exist(sample_user): def test_add_user_to_organisation_when_organisation_does_not_exist(sample_user):
with pytest.raises(expected_exception=SQLAlchemyError): with pytest.raises(expected_exception=SQLAlchemyError):
dao_add_user_to_organisation(organisation_id=uuid.uuid4(), user_id=sample_user.id) dao_add_user_to_organisation(organisation_id=uuid.uuid4(), user_id=sample_user.id)
def test_add_user_to_organisation_raises_exception_when_user_is_not_active(sample_organisation):
first = create_user(state='inactive')
with pytest.raises(expected_exception=SQLAlchemyError):
dao_add_user_to_organisation(organisation_id=sample_organisation.id, user_id=first.id)