darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-23 17:01:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add organisation type to live services report

Browse Source
This commit is contained in:
Pea Tyczynska
2019-05-03 11:00:53 +01:00
parent b89ab0cd87
commit 689ff57c32
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/dao/services_dao.py
View File

@@ -84,6 +84,7 @@ def dao_fetch_live_services_data():
data = db.session.query(
Service.id,
Organisation.name.label("organisation_name"),
Organisation.organisation_type,
Service.name.label("service_name"),
Service.consent_to_research,
Service.go_live_user_id,
@@ -117,6 +118,7 @@ def dao_fetch_live_services_data():
).group_by(
Service.id,
Organisation.name,
Organisation.organisation_type,
Service.name,
Service.consent_to_research,
Service.count_as_live,
@@ -151,6 +153,7 @@ def dao_fetch_live_services_data():
"service_id": row.id,
"service_name": row.service_name,
"organisation_name": row.organisation_name,
"organisation_type": row.organisation_type,
"consent_to_research": row.consent_to_research,
"contact_name": row.user_name,
"contact_email": row.email_address,