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

Merge pull request #225 from alphagov/revalidate-csv-file

Browse Source 
Revalidate file upload
This commit is contained in:
Rebecca Law
2016-03-03 16:33:30 +00:00
parent 0e663e044f 72ec653846
commit 0fd2572b08
2 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -219,6 +219,10 @@ def check_messages(service_id, upload_id):
form=CsvUploadForm() form=CsvUploadForm()
) )
elif request.method == 'POST': elif request.method == 'POST':
if request.files:
# The csv was invalid, validate the csv again
return send_messages(service_id, template_id)
original_file_name = upload_data.get('original_file_name') original_file_name = upload_data.get('original_file_name')
notification_count = upload_data.get('notification_count') notification_count = upload_data.get('notification_count')
session.pop('upload_data') session.pop('upload_data')

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

@@ -267,3 +267,36 @@ def test_create_job_should_call_api(
assert response.status_code == 200 assert response.status_code == 200
assert 'We’ve started sending your messages' in response.get_data(as_text=True) assert 'We’ve started sending your messages' in response.get_data(as_text=True)
mock_create_job.assert_called_with(job_id, service_id, template_id, original_file_name, notification_count) mock_create_job.assert_called_with(job_id, service_id, template_id, original_file_name, notification_count)
def test_check_messages_should_revalidate_file_when_uploading_file(
app_,
service_one,
api_user_active,
mock_login,
mock_get_service,
job_data,
mock_create_job,
mock_get_service_template,
mock_s3_upload,
mocker,
mock_has_permissions
):
service_id = service_one['id']
contents = 'phone number,name,,,\n++44 7700 900981,test1,,,\n+44 7700 900981,test2,,,\n ,,, \n ,,, \t \t \n'
file_data = (BytesIO(contents.encode('utf-8')), 'invalid.csv')
upload_data = {'file': file_data}
mocker.patch('app.main.views.send.s3download', return_value=contents)
with app_.test_request_context():
with app_.test_client() as client:
client.login(api_user_active)
with client.session_transaction() as session:
session['upload_data'] = {'original_file_name': 'invalid.csv',
'template_id': job_data['template'],
'notification_count': job_data['notification_count']}
url = url_for('main.check_messages', service_id=service_id, upload_id=job_data['id'])
response = client.post(url, data=upload_data, follow_redirects=True)
assert response.status_code == 200
assert 'Your CSV file contained missing or invalid data' in response.get_data(as_text=True)