darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-06 15:58:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Note existing live services in go live ticket

Browse Source 
It’s useful for analysing our growth to know if someone who’s requesting
to go live is already a live user of Notify.
This commit is contained in:
Chris Hill-Scott
2018-12-12 12:22:38 +00:00
parent 3cb0b164e8
commit 688bdd1d7a
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/main/views/service_settings.py
View File

@@ -163,6 +163,7 @@ def submit_request_to_go_live(service_id):
'\nText messages in next year: {volume_sms}' '\nText messages in next year: {volume_sms}'
'\nLetters in next year: {volume_letter}' '\nLetters in next year: {volume_letter}'
'\nConsent to research: {research_consent}' '\nConsent to research: {research_consent}'
'\nOther live services: {existing_live}'
'\n' '\n'
'\n---' '\n---'
'\n' '\n'
@@ -189,6 +190,7 @@ def submit_request_to_go_live(service_id):
volume_letter=form.volume_letter.data, volume_letter=form.volume_letter.data,
volume_letter_normalised=form.volume_letter.data.replace(',', ''), volume_letter_normalised=form.volume_letter.data.replace(',', ''),
research_consent=form.research_consent.data.title(), research_consent=form.research_consent.data.title(),
existing_live='Yes' if user_api_client.user_has_live_services(current_user) else 'No',
service_id=current_service.id, service_id=current_service.id,
organisation=AgreementInfo.from_current_user().owner, organisation=AgreementInfo.from_current_user().owner,
user_name=current_user.name, user_name=current_user.name,

5
app/notify_client/user_api_client.py
View File

@@ -219,6 +219,11 @@ class UserApiClient(NotifyAdminAPIClient):
), []) ), [])
return sorted(all_services, key=lambda service: service['name']) return sorted(all_services, key=lambda service: service['name'])
def user_has_live_services(self, user):
return not all(
service['restricted'] for service in self.get_services_for_user(user)
)
def get_service_ids_for_user(self, user): def get_service_ids_for_user(self, user):
return { return {
service['id'] for service in self.get_services_for_user(user) service['id'] for service in self.get_services_for_user(user)

2
tests/app/main/views/test_service_settings.py
View File

@@ -806,6 +806,7 @@ def test_should_redirect_after_request_to_go_live(
single_reply_to_email_address, single_reply_to_email_address,
single_letter_contact_block, single_letter_contact_block,
mock_get_service_organisation, mock_get_service_organisation,
mock_get_organisations_and_services_for_user,
single_sms_sender, single_sms_sender,
mock_get_service_settings_page_common, mock_get_service_settings_page_common,
mock_get_service_templates, mock_get_service_templates,
@@ -849,6 +850,7 @@ def test_should_redirect_after_request_to_go_live(
'Text messages in next year: 222,222\n' 'Text messages in next year: 222,222\n'
'Letters in next year: 333,333\n' 'Letters in next year: 333,333\n'
'Consent to research: Yes\n' 'Consent to research: Yes\n'
'Other live services: No\n'
'\n' '\n'
'---\n' '---\n'
'{}, None, service one, Test User, test@user.gov.uk, -, 21/12/2012, 222222, 111111, 333333' '{}, None, service one, Test User, test@user.gov.uk, -, 21/12/2012, 222222, 111111, 333333'