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

Merge pull request #1082 from alphagov/persist-letters

Browse Source 
allow creation of letter jobs
This commit is contained in:
Leo Hemsted
2017-01-31 10:31:34 +00:00
committed by GitHub
parent 53561c8a82 51f3e0478a
commit 2cd8304061
2 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -369,7 +369,6 @@ def recheck_messages(service_id, template_type, upload_id):
@login_required @login_required
@user_has_permissions('send_texts', 'send_emails', 'send_letters') @user_has_permissions('send_texts', 'send_emails', 'send_letters')
def start_job(service_id, upload_id): def start_job(service_id, upload_id):
upload_data = session['upload_data'] upload_data = session['upload_data']
if request.files or not upload_data.get('valid'): if request.files or not upload_data.get('valid'):
@@ -378,14 +377,6 @@ def start_job(service_id, upload_id):
session.pop('upload_data') session.pop('upload_data')
template = service_api_client.get_service_template(
service_id,
upload_data.get('template_id')
)['data']
if template['template_type'] == 'letter':
abort(403)
job_api_client.create_job( job_api_client.create_job(
upload_id, upload_id,
service_id, service_id,

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

@@ -409,31 +409,24 @@ def test_create_job_should_call_api(
) )
def test_cant_start_letters_job( def test_can_start_letters_job(
app_, logged_in_client,
client,
service_one,
mock_get_service,
active_user_with_permissions,
mock_create_job, mock_create_job,
mock_get_service_letter_template, mock_get_service_letter_template,
mocker,
fake_uuid fake_uuid
): ):
client.login(active_user_with_permissions, mocker, service_one) with logged_in_client.session_transaction() as session:
with client.session_transaction() as session:
session['upload_data'] = { session['upload_data'] = {
'original_file_name': 'example.csv', 'original_file_name': 'example.csv',
'template_id': fake_uuid, 'template_id': fake_uuid,
'notification_count': 123, 'notification_count': 123,
'valid': True 'valid': True
} }
response = client.post( response = logged_in_client.post(
url_for('main.start_job', service_id=fake_uuid, upload_id=fake_uuid), url_for('main.start_job', service_id=fake_uuid, upload_id=fake_uuid),
data={} data={}
) )
assert response.status_code == 403 assert response.status_code == 302
mock_create_job.assert_not_called()
@pytest.mark.parametrize( @pytest.mark.parametrize(