darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-04 02:11:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Adding more unit tests

Browse Source
This commit is contained in:
Rebecca Law
2018-02-21 11:49:21 +00:00
parent 13ef2d7bae
commit 011f93c495
2 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/dao/organisation_dao.py
View File

@@ -45,14 +45,14 @@ def dao_add_service_to_organisation(service, organisation_id):
def dao_get_invited_organisation_user(user_id): def dao_get_invited_organisation_user(user_id):
return InvitedOrganisationUser.query.filter_by(id=user_id).first() return InvitedOrganisationUser.query.filter_by(id=user_id).one()
def dao_get_users_for_organisation(organisation_id): def dao_get_users_for_organisation(organisation_id):
return User.query.filter( return User.query.filter(
User.user_to_organisation.any(id=organisation_id), User.user_to_organisation.any(id=organisation_id),
User.state == 'active' User.state == 'active'
).all() ).order_by(User.created_at).all()
def dao_add_user_to_organisation(organisation_id, user_id): def dao_add_user_to_organisation(organisation_id, user_id):

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

@@ -1,5 +1,7 @@
import uuid
import pytest import pytest
from sqlalchemy.exc import IntegrityError from sqlalchemy.exc import IntegrityError, SQLAlchemyError
from app.dao.organisation_dao import ( from app.dao.organisation_dao import (
dao_get_organisations, dao_get_organisations,
@@ -8,11 +10,13 @@ from app.dao.organisation_dao import (
dao_get_organisation_services, dao_get_organisation_services,
dao_update_organisation, dao_update_organisation,
dao_add_service_to_organisation, dao_add_service_to_organisation,
dao_get_invited_organisation_user dao_get_invited_organisation_user,
dao_get_users_for_organisation,
dao_add_user_to_organisation
) )
from app.models import Organisation from app.models import Organisation
from tests.app.db import create_organisation, create_service from tests.app.db import create_organisation, create_service, create_invited_org_user, create_user
def test_get_organisations_gets_all_organisations_alphabetically_with_active_organisations_first( def test_get_organisations_gets_all_organisations_alphabetically_with_active_organisations_first(
@@ -112,5 +116,21 @@ def test_dao_get_invited_organisation_user(sample_invited_org_user):
assert invited_org_user == sample_invited_org_user assert invited_org_user == sample_invited_org_user
def test_dao_get_users_for_organisation(sample_organisation, sample_user): def test_dao_get_invited_organisation_user_returns_none(notify_db):
dao with pytest.raises(expected_exception=SQLAlchemyError):
dao_get_invited_organisation_user(uuid.uuid4())
def test_dao_get_users_for_organisation(sample_organisation):
first = create_user(email='first@invited.com')
second = create_user(email='another@invited.com')
dao_add_user_to_organisation(organisation_id=sample_organisation.id, user_id=first.id)
dao_add_user_to_organisation(organisation_id=sample_organisation.id, user_id=second.id)
results = dao_get_users_for_organisation(organisation_id=sample_organisation.id)
assert len(results) == 2
assert results[0] == first
assert results[1] == second