diff --git a/app/main/forms.py b/app/main/forms.py index 1a904a420..c72a20eb4 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -1264,7 +1264,7 @@ class OrganisationAgreementSignedForm(StripWhitespaceForm): ) -class OrganisationDomainsForm(StripWhitespaceForm): +class AdminOrganisationDomainsForm(StripWhitespaceForm): def populate(self, domains_list): for index, value in enumerate(domains_list): @@ -1302,7 +1302,7 @@ class CreateNhsServiceForm(CreateServiceForm): ) -class NewOrganisationForm( +class AdminNewOrganisationForm( RenameOrganisationForm, OrganisationOrganisationTypeForm, OrganisationCrownStatusForm, @@ -1313,7 +1313,7 @@ class NewOrganisationForm( self.crown_status.choices = self.crown_status.choices[:-1] -class FreeSMSAllowance(StripWhitespaceForm): +class AdminServiceSMSAllowanceForm(StripWhitespaceForm): free_sms_allowance = GovukIntegerField( 'Numbers of text message fragments per year', validators=[ @@ -1322,7 +1322,7 @@ class FreeSMSAllowance(StripWhitespaceForm): ) -class MessageLimit(StripWhitespaceForm): +class AdminServiceMessageLimitForm(StripWhitespaceForm): message_limit = GovukIntegerField( 'Number of messages the service is allowed to send each day', validators=[ @@ -1331,7 +1331,7 @@ class MessageLimit(StripWhitespaceForm): ) -class RateLimit(StripWhitespaceForm): +class AdminServiceRateLimitForm(StripWhitespaceForm): rate_limit = GovukIntegerField( 'Number of messages the service can send in a rolling 60 second window', validators=[ @@ -1734,13 +1734,13 @@ class EstimateUsageForm(StripWhitespaceForm): return super().validate(*args, **kwargs) -class ProviderForm(StripWhitespaceForm): +class AdminProviderForm(StripWhitespaceForm): priority = GovukIntegerField( 'Priority', [validators.NumberRange(min=1, max=100, message="Must be between 1 and 100")] ) -class ProviderRatioForm(StripWhitespaceForm): +class AdminProviderRatioForm(StripWhitespaceForm): ratio = GovukRadiosField(choices=[ (str(value), '{}% / {}%'.format(value, 100 - value)) @@ -1823,11 +1823,11 @@ class ServiceEditInboundNumberForm(StripWhitespaceForm): is_default = GovukCheckboxField("Make this text message sender the default") -class EditNotesForm(StripWhitespaceForm): +class AdminNotesForm(StripWhitespaceForm): notes = TextAreaField(validators=[]) -class BillingDetailsForm(StripWhitespaceForm): +class AdminBillingDetailsForm(StripWhitespaceForm): billing_contact_email_addresses = GovukTextInputField('Contact email addresses') billing_contact_names = GovukTextInputField('Contact names') billing_reference = GovukTextInputField('Reference') @@ -2035,7 +2035,7 @@ class SearchByNameForm(StripWhitespaceForm): ) -class SearchUsersByEmailForm(StripWhitespaceForm): +class AdminSearchUsersByEmailForm(StripWhitespaceForm): search = GovukSearchField( 'Search by name or email address', @@ -2083,7 +2083,7 @@ class PlaceholderForm(StripWhitespaceForm): pass -class ServiceInboundNumberForm(StripWhitespaceForm): +class AdminServiceInboundNumberForm(StripWhitespaceForm): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) self.inbound_number.choices = kwargs['inbound_number_choices'] @@ -2166,7 +2166,7 @@ class SetTemplateSenderForm(StripWhitespaceForm): sender = GovukRadiosField() -class LinkOrganisationsForm(StripWhitespaceForm): +class AdminSetOrganisationForm(StripWhitespaceForm): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) @@ -2245,7 +2245,7 @@ class SomethingElseBrandingForm(StripWhitespaceForm): ) -class ServiceDataRetentionForm(StripWhitespaceForm): +class AdminServiceAddDataRetentionForm(StripWhitespaceForm): notification_type = GovukRadiosField( 'What notification type?', @@ -2262,14 +2262,14 @@ class ServiceDataRetentionForm(StripWhitespaceForm): ) -class ServiceDataRetentionEditForm(StripWhitespaceForm): +class AdminServiceEditDataRetentionForm(StripWhitespaceForm): days_of_retention = GovukIntegerField( label="Days of retention", validators=[validators.NumberRange(min=3, max=90, message="Must be between 3 and 90")], ) -class ReturnedLettersForm(StripWhitespaceForm): +class AdminReturnedLettersForm(StripWhitespaceForm): references = TextAreaField( u'Letter references', validators=[ @@ -2421,7 +2421,7 @@ class TemplateAndFoldersSelectionForm(Form): ], required_message='Select the type of template you want to add') -class ClearCacheForm(StripWhitespaceForm): +class AdminClearCacheForm(StripWhitespaceForm): model_type = GovukCheckboxesField( 'What do you want to clear today', ) @@ -2431,7 +2431,7 @@ class ClearCacheForm(StripWhitespaceForm): raise ValidationError('Select at least one option') -class GoLiveNotesForm(StripWhitespaceForm): +class AdminOrganisationGoLiveNotesForm(StripWhitespaceForm): request_to_go_live_notes = TextAreaField( 'Go live notes', filters=[lambda x: x or None], diff --git a/app/main/views/find_users.py b/app/main/views/find_users.py index d3857ee45..d01d2c6be 100644 --- a/app/main/views/find_users.py +++ b/app/main/views/find_users.py @@ -5,7 +5,7 @@ from notifications_python_client.errors import HTTPError from app import user_api_client from app.event_handlers import create_archive_user_event from app.main import main -from app.main.forms import AuthTypeForm, SearchUsersByEmailForm +from app.main.forms import AdminSearchUsersByEmailForm, AuthTypeForm from app.models.user import User from app.utils.user import user_is_platform_admin @@ -13,7 +13,7 @@ from app.utils.user import user_is_platform_admin @main.route("/find-users-by-email", methods=['GET', 'POST']) @user_is_platform_admin def find_users_by_email(): - form = SearchUsersByEmailForm() + form = AdminSearchUsersByEmailForm() users_found = None if form.validate_on_submit(): users_found = user_api_client.find_users_by_full_or_partial_email(form.search.data)['data'] diff --git a/app/main/views/organisations.py b/app/main/views/organisations.py index 8808800a8..13b8a21ae 100644 --- a/app/main/views/organisations.py +++ b/app/main/views/organisations.py @@ -19,17 +19,17 @@ from app.main import main from app.main.forms import ( AddGPOrganisationForm, AddNHSLocalOrganisationForm, + AdminBillingDetailsForm, + AdminNewOrganisationForm, + AdminNotesForm, + AdminOrganisationDomainsForm, + AdminOrganisationGoLiveNotesForm, AdminPreviewBrandingForm, AdminSetEmailBrandingForm, AdminSetLetterBrandingForm, - BillingDetailsForm, - EditNotesForm, - GoLiveNotesForm, InviteOrgUserForm, - NewOrganisationForm, OrganisationAgreementSignedForm, OrganisationCrownStatusForm, - OrganisationDomainsForm, OrganisationOrganisationTypeForm, RenameOrganisationForm, SearchByNameForm, @@ -60,7 +60,7 @@ def organisations(): @main.route("/organisations/add", methods=['GET', 'POST']) @user_is_platform_admin def add_organisation(): - form = NewOrganisationForm() + form = AdminNewOrganisationForm() if form.validate_on_submit(): try: @@ -495,7 +495,7 @@ def organisation_preview_letter_branding(org_id): @user_is_platform_admin def edit_organisation_domains(org_id): - form = OrganisationDomainsForm() + form = AdminOrganisationDomainsForm() if form.validate_on_submit(): try: @@ -530,7 +530,7 @@ def edit_organisation_domains(org_id): @user_is_platform_admin def edit_organisation_go_live_notes(org_id): - form = GoLiveNotesForm() + form = AdminOrganisationGoLiveNotesForm() if form.validate_on_submit(): organisations_client.update_organisation( @@ -551,7 +551,7 @@ def edit_organisation_go_live_notes(org_id): @main.route("/organisations//settings/notes", methods=['GET', 'POST']) @user_is_platform_admin def edit_organisation_notes(org_id): - form = EditNotesForm(notes=current_organisation.notes) + form = AdminNotesForm(notes=current_organisation.notes) if form.validate_on_submit(): @@ -572,7 +572,7 @@ def edit_organisation_notes(org_id): @main.route("/organisations//settings/edit-billing-details", methods=['GET', 'POST']) @user_is_platform_admin def edit_organisation_billing_details(org_id): - form = BillingDetailsForm( + form = AdminBillingDetailsForm( billing_contact_email_addresses=current_organisation.billing_contact_email_addresses, billing_contact_names=current_organisation.billing_contact_names, billing_reference=current_organisation.billing_reference, diff --git a/app/main/views/platform_admin.py b/app/main/views/platform_admin.py index 23018ee94..fddba4a62 100644 --- a/app/main/views/platform_admin.py +++ b/app/main/views/platform_admin.py @@ -18,11 +18,11 @@ from app import ( from app.extensions import redis_client from app.main import main from app.main.forms import ( + AdminClearCacheForm, + AdminReturnedLettersForm, BillingReportDateFilterForm, - ClearCacheForm, DateFilterForm, RequiredDateFilterForm, - ReturnedLettersForm, ) from app.statistics_utils import ( get_formatted_percentage, @@ -341,7 +341,7 @@ def platform_admin_list_complaints(): @main.route("/platform-admin/returned-letters", methods=["GET", "POST"]) @user_is_platform_admin def platform_admin_returned_letters(): - form = ReturnedLettersForm() + form = AdminReturnedLettersForm() if form.validate_on_submit(): references = [ @@ -419,7 +419,7 @@ def clear_cache(): ]), ]) - form = ClearCacheForm() + form = AdminClearCacheForm() form.model_type.choices = [ (key, key.replace('_', ' ').title()) for key in CACHE_KEYS diff --git a/app/main/views/providers.py b/app/main/views/providers.py index 977936cc9..0868f1a63 100644 --- a/app/main/views/providers.py +++ b/app/main/views/providers.py @@ -7,7 +7,7 @@ from werkzeug.utils import redirect from app import format_date_numeric, provider_client from app.main import main -from app.main.forms import ProviderForm, ProviderRatioForm +from app.main.forms import AdminProviderForm, AdminProviderRatioForm from app.utils.user import user_is_platform_admin PROVIDER_PRIORITY_MEANING_SWITCHOVER = datetime(2019, 11, 29, 11, 0).isoformat() @@ -48,7 +48,7 @@ def add_monthly_traffic(domestic_sms_providers): @user_is_platform_admin def edit_provider(provider_id): provider = provider_client.get_provider_by_id(provider_id)['provider_details'] - form = ProviderForm(active=provider['active'], priority=provider['priority']) + form = AdminProviderForm(active=provider['active'], priority=provider['priority']) if form.validate_on_submit(): provider_client.update_provider(provider_id, form.priority.data) @@ -67,7 +67,7 @@ def edit_sms_provider_ratio(): if provider['notification_type'] == 'sms' ], key=itemgetter('identifier'), reverse=True) - form = ProviderRatioForm(ratio=providers[0]['priority']) + form = AdminProviderRatioForm(ratio=providers[0]['priority']) if len(providers) < 2: abort(400) diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py index eb2ca5dee..ecf0eb537 100644 --- a/app/main/views/service_settings.py +++ b/app/main/views/service_settings.py @@ -38,29 +38,29 @@ from app.extensions import zendesk_client from app.formatters import email_safe from app.main import main from app.main.forms import ( + AdminBillingDetailsForm, + AdminNotesForm, AdminPreviewBrandingForm, + AdminServiceAddDataRetentionForm, + AdminServiceEditDataRetentionForm, + AdminServiceInboundNumberForm, + AdminServiceMessageLimitForm, + AdminServiceRateLimitForm, + AdminServiceSMSAllowanceForm, AdminSetEmailBrandingForm, AdminSetLetterBrandingForm, - BillingDetailsForm, + AdminSetOrganisationForm, ChooseBrandingForm, ChooseEmailBrandingForm, ChooseLetterBrandingForm, - EditNotesForm, EstimateUsageForm, - FreeSMSAllowance, - LinkOrganisationsForm, - MessageLimit, - RateLimit, RenameServiceForm, SearchByNameForm, ServiceBroadcastAccountTypeForm, ServiceBroadcastChannelForm, ServiceBroadcastNetworkForm, ServiceContactDetailsForm, - ServiceDataRetentionEditForm, - ServiceDataRetentionForm, ServiceEditInboundNumberForm, - ServiceInboundNumberForm, ServiceLetterContactBlockForm, ServiceOnOffSettingForm, ServiceReplyToEmailForm, @@ -650,7 +650,7 @@ def service_set_inbound_number(service_id): (number['id'], number['number']) for number in available_inbound_numbers['data'] ] no_available_numbers = available_inbound_numbers['data'] == [] - form = ServiceInboundNumberForm( + form = AdminServiceInboundNumberForm( inbound_number_choices=inbound_numbers_value_and_label ) @@ -972,7 +972,7 @@ def service_delete_sms_sender(service_id, sms_sender_id): @user_is_platform_admin def set_free_sms_allowance(service_id): - form = FreeSMSAllowance(free_sms_allowance=current_service.free_sms_fragment_limit) + form = AdminServiceSMSAllowanceForm(free_sms_allowance=current_service.free_sms_fragment_limit) if form.validate_on_submit(): billing_api_client.create_or_update_free_sms_fragment_limit(service_id, form.free_sms_allowance.data) @@ -989,7 +989,7 @@ def set_free_sms_allowance(service_id): @user_is_platform_admin def set_message_limit(service_id): - form = MessageLimit(message_limit=current_service.message_limit) + form = AdminServiceMessageLimitForm(message_limit=current_service.message_limit) if form.validate_on_submit(): current_service.update(message_limit=form.message_limit.data) @@ -1006,7 +1006,7 @@ def set_message_limit(service_id): @user_is_platform_admin def set_rate_limit(service_id): - form = RateLimit(rate_limit=current_service.rate_limit) + form = AdminServiceRateLimitForm(rate_limit=current_service.rate_limit) if form.validate_on_submit(): current_service.update(rate_limit=form.rate_limit.data) @@ -1115,7 +1115,7 @@ def link_service_to_organisation(service_id): all_organisations = organisations_client.get_organisations() - form = LinkOrganisationsForm( + form = AdminSetOrganisationForm( choices=convert_dictionary_to_wtforms_choices_format(all_organisations, 'id', 'name'), organisations=current_service.organisation_id ) @@ -1313,7 +1313,7 @@ def data_retention(service_id): @main.route("/services//data-retention/add", methods=['GET', 'POST']) @user_is_platform_admin def add_data_retention(service_id): - form = ServiceDataRetentionForm() + form = AdminServiceAddDataRetentionForm() if form.validate_on_submit(): service_api_client.create_service_data_retention(service_id, form.notification_type.data, @@ -1329,7 +1329,7 @@ def add_data_retention(service_id): @user_is_platform_admin def edit_data_retention(service_id, data_retention_id): data_retention_item = current_service.get_data_retention_item(data_retention_id) - form = ServiceDataRetentionEditForm(days_of_retention=data_retention_item['days_of_retention']) + form = AdminServiceEditDataRetentionForm(days_of_retention=data_retention_item['days_of_retention']) if form.validate_on_submit(): service_api_client.update_service_data_retention(service_id, data_retention_id, form.days_of_retention.data) return redirect(url_for('.data_retention', service_id=service_id)) @@ -1344,7 +1344,7 @@ def edit_data_retention(service_id, data_retention_id): @main.route("/services//notes", methods=['GET', 'POST']) @user_is_platform_admin def edit_service_notes(service_id): - form = EditNotesForm(notes=current_service.notes) + form = AdminNotesForm(notes=current_service.notes) if form.validate_on_submit(): @@ -1365,7 +1365,7 @@ def edit_service_notes(service_id): @main.route("/services//edit-billing-details", methods=['GET', 'POST']) @user_is_platform_admin def edit_service_billing_details(service_id): - form = BillingDetailsForm( + form = AdminBillingDetailsForm( billing_contact_email_addresses=current_service.billing_contact_email_addresses, billing_contact_names=current_service.billing_contact_names, billing_reference=current_service.billing_reference,