darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-23 07:46:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use new value of SMS_CHAR_COUNT_LIMIT from utils

Browse Source 
Admin, API and utils were all defining a value for SMS_CHAR_COUNT_LIMIT.
This value has been updated in notifications-utils to allow text
messages to be 4 fragments long and notifications-admin now gets the value of
SMS_CHAR_COUNT_LIMIT from notifications-utils instead of defining it in
config.
This commit is contained in:
Katie Smith
2018-08-16 16:51:32 +01:00
parent cdd828da20
commit 1b6c357dea
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/config.py
View File

@@ -51,8 +51,6 @@ class Config(object):
SESSION_COOKIE_SECURE = True
SESSION_REFRESH_EACH_REQUEST = True
SHOW_STYLEGUIDE = True
# TODO: move to utils
SMS_CHAR_COUNT_LIMIT = 459
WTF_CSRF_ENABLED = True
WTF_CSRF_TIME_LIMIT = None
CSV_UPLOAD_BUCKET_NAME = 'local-notifications-csv-upload'

3
app/main/views/send.py
View File

@@ -15,6 +15,7 @@ from flask import (
)
from flask_login import current_user, login_required
from notifications_python_client.errors import HTTPError
from notifications_utils import SMS_CHAR_COUNT_LIMIT
from notifications_utils.columns import Columns
from notifications_utils.recipients import (
RecipientCSV,
@@ -852,7 +853,7 @@ def get_template_error_dict(exception):
return {
'error': error,
'SMS_CHAR_COUNT_LIMIT': current_app.config['SMS_CHAR_COUNT_LIMIT'],
'SMS_CHAR_COUNT_LIMIT': SMS_CHAR_COUNT_LIMIT,
'current_service': current_service,
# used to trigger CSV specific err msg content, so not needed for single notification errors.

3
app/templates/views/pricing.html
View File

@@ -47,7 +47,8 @@
{% for message_length, charge in [
('Up to 160 characters', '1 text message'),
('Up to 306 characters', '2 text messages'),
('Up to 459 characters', '3 text messages')
('Up to 459 characters', '3 text messages'),
('Up to 612 characters', '4 text messages'),
] %}
{% call row() %}
{{ text_field(message_length) }}

6
tests/app/main/views/test_send.py
View File

@@ -2916,7 +2916,7 @@ TRIAL_MODE_MSG = (
'Can’t send to this recipient when service is in trial mode – '
'see https://www.notifications.service.gov.uk/trial-mode'
)
TOO_LONG_MSG = 'Content for template has a character count greater than the limit of 495'
TOO_LONG_MSG = 'Content for template has a character count greater than the limit of 612'
SERVICE_DAILY_LIMIT_MSG = 'Exceeded send limits (1000) for today'
@@ -2929,7 +2929,7 @@ SERVICE_DAILY_LIMIT_MSG = 'Exceeded send limits (1000) for today'
(
TOO_LONG_MSG,
'Message too long',
'Text messages can’t be longer than 459 characters. Your message is 554 characters.'
'Text messages can’t be longer than 612 characters. Your message is 654 characters.'
),
(
SERVICE_DAILY_LIMIT_MSG,
@@ -2957,7 +2957,7 @@ def test_send_notification_shows_error_if_400(
)
with client_request.session_transaction() as session:
session['recipient'] = '07700900001'
session['placeholders'] = {'name': 'a' * 500}
session['placeholders'] = {'name': 'a' * 600}
page = client_request.post(
'main.send_notification',