From 69cc33f77fb24be83a6105cb7eaab6337508ff2b Mon Sep 17 00:00:00 2001 From: Rebecca Law Date: Wed, 21 Feb 2018 17:03:32 +0000 Subject: [PATCH] Removed the check for active user when adding a user to an organisation --- app/dao/organisation_dao.py | 2 +- tests/app/dao/test_organisation_dao.py | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/app/dao/organisation_dao.py b/app/dao/organisation_dao.py index a4edab289..c32d9a8b3 100644 --- a/app/dao/organisation_dao.py +++ b/app/dao/organisation_dao.py @@ -62,7 +62,7 @@ def dao_get_users_for_organisation(organisation_id): @transactional def dao_add_user_to_organisation(organisation_id, user_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) db.session.add(organisation) return user diff --git a/tests/app/dao/test_organisation_dao.py b/tests/app/dao/test_organisation_dao.py index 045de8b5c..62c81041a 100644 --- a/tests/app/dao/test_organisation_dao.py +++ b/tests/app/dao/test_organisation_dao.py @@ -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): with pytest.raises(expected_exception=SQLAlchemyError): 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)