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

Merge pull request #1925 from alphagov/refactored-csv-processing

Browse Source 
Bring in refactored CSV processing
This commit is contained in:
Chris Hill-Scott
2018-03-09 15:16:37 +00:00
committed by GitHub
parent aae04227a7 7609ad3f8c
commit 548ece6c22
8 changed files with 79 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/utils.py
View File

@@ -102,7 +102,7 @@ def get_errors_for_csv(recipients, template_type):
errors = []
if recipients.rows_with_bad_recipients:
if any(recipients.rows_with_bad_recipients):
number_of_bad_recipients = len(list(recipients.rows_with_bad_recipients))
if 'sms' == template_type:
if 1 == number_of_bad_recipients:
@@ -120,7 +120,7 @@ def get_errors_for_csv(recipients, template_type):
else:
errors.append("fix {} addresses".format(number_of_bad_recipients))
if recipients.rows_with_missing_data:
if any(recipients.rows_with_missing_data):
number_of_rows_with_missing_data = len(list(recipients.rows_with_missing_data))
if 1 == number_of_rows_with_missing_data:
errors.append("enter missing data in 1 row")
@@ -156,7 +156,7 @@ def generate_notifications_csv(**kwargs):
values = [
notification['row_number'],
] + [
original_upload[notification['row_number'] - 1].get(header)
original_upload[notification['row_number'] - 1].get(header).data
for header in original_column_headers
] + [
notification['template_name'],