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

Only show live services in live services query

Browse Source
This commit is contained in:
Pea Tyczynska
2019-05-02 10:39:45 +01:00
parent b280181a00
commit e7add1c729
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/dao/services_dao.py
View File

@@ -111,7 +111,9 @@ def dao_fetch_live_services_data():
).outerjoin( ).outerjoin(
User, Service.go_live_user_id == User.id User, Service.go_live_user_id == User.id
).filter( ).filter(
Service.count_as_live == True # noqa Service.count_as_live.is_(True),
Service.active.is_(True),
Service.restricted.is_(False),
).group_by( ).group_by(
Service.id, Service.id,
Organisation.name, Organisation.name,

3
tests/app/dao/test_services_dao.py
View File

@@ -391,6 +391,9 @@ def test_dao_fetch_live_services_data(sample_user, mock):
template = create_template(service=service) template = create_template(service=service)
service_2 = create_service(service_name='second', go_live_user=sample_user, go_live_at='2017-04-20T10:00:00') service_2 = create_service(service_name='second', go_live_user=sample_user, go_live_at='2017-04-20T10:00:00')
create_service(service_name='third', go_live_at='2016-04-20T10:00:00') create_service(service_name='third', go_live_at='2016-04-20T10:00:00')
# below services should be filtered out:
create_service(service_name='restricted', restricted=True)
create_service(service_name='not_active', active=False)
create_service(service_name='not_live', count_as_live=False) create_service(service_name='not_live', count_as_live=False)
template2 = create_template(service=service, template_type='email') template2 = create_template(service=service, template_type='email')
template_letter_1 = create_template(service=service, template_type='letter') template_letter_1 = create_template(service=service, template_type='letter')