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

Refactor organisation_dao

Browse Source
This commit is contained in:
Ken Tsang
2018-02-12 18:26:51 +00:00
parent 44f9143d08
commit 085110417f
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/dao/organisation_dao.py
View File

@@ -1,6 +1,6 @@
from app import db from app import db
from app.dao.dao_utils import transactional from app.dao.dao_utils import transactional
from app.models import Organisation, Service from app.models import Organisation
def dao_get_organisations(): def dao_get_organisations():
@@ -20,7 +20,7 @@ def dao_get_organisation_by_id(organisation_id):
def dao_get_organisation_by_service_id(service_id): def dao_get_organisation_by_service_id(service_id):
return Organisation.query.join(Organisation.services).filter(Service.id == service_id).first() return Organisation.query.join(Organisation.services).filter_by(id=service_id).first()
@transactional @transactional

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

@@ -85,9 +85,7 @@ def test_get_organisation_services(notify_db, notify_db_session, sample_service,
org_services = dao_get_organisation_services(sample_organisation.id) org_services = dao_get_organisation_services(sample_organisation.id)
other_org_services = dao_get_organisation_services(another_org.id) other_org_services = dao_get_organisation_services(another_org.id)
assert len(org_services) == 2 assert [sample_service.name, another_service.name] == sorted([s.name for s in org_services])
assert org_services[0].name == sample_service.name
assert org_services[1].name == another_service.name
assert not other_org_services assert not other_org_services
@@ -98,8 +96,8 @@ def test_get_organisation_by_service_id(notify_db, notify_db_session, sample_ser
dao_add_service_to_organisation(sample_service, sample_organisation.id) dao_add_service_to_organisation(sample_service, sample_organisation.id)
dao_add_service_to_organisation(another_service, another_org.id) dao_add_service_to_organisation(another_service, another_org.id)
organisation_1 = dao_get_organisation_by_service_id(str(sample_service.id)) organisation_1 = dao_get_organisation_by_service_id(sample_service.id)
organisation_2 = dao_get_organisation_by_service_id(str(another_service.id)) organisation_2 = dao_get_organisation_by_service_id(another_service.id)
assert organisation_1 == sample_organisation assert organisation_1 == sample_organisation
assert organisation_2 == another_org assert organisation_2 == another_org