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

Merge pull request #2147 from GSA/notify-admin-1426

Browse Source 
add carrier column to reports
This commit is contained in:
Carlo Costino
2024-11-25 12:14:45 -05:00
committed by GitHub
parent 971db71936 1417f12ccf
commit a01b93073b
6 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.ds.baseline
View File

@@ -161,7 +161,7 @@
"filename": "app/config.py", "filename": "app/config.py",
"hashed_secret": "577a4c667e4af8682ca431857214b3a920883efc", "hashed_secret": "577a4c667e4af8682ca431857214b3a920883efc",
"is_verified": false, "is_verified": false,
"line_number": 125, "line_number": 123,
"is_secret": false "is_secret": false
} }
], ],
@@ -684,5 +684,5 @@
} }
] ]
}, },
"generated_at": "2024-11-14T15:53:44Z" "generated_at": "2024-11-21T23:08:45Z"
} }

4
app/config.py
View File

@@ -91,9 +91,7 @@ class Config(object):
getenv("FEATURE_BEST_PRACTICES_ENABLED", "false") == "true" getenv("FEATURE_BEST_PRACTICES_ENABLED", "false") == "true"
) )
FEATURE_ABOUT_PAGE_ENABLED = ( FEATURE_ABOUT_PAGE_ENABLED = getenv("FEATURE_ABOUT_PAGE_ENABLED", "false") == "true"
getenv("FEATURE_ABOUT_PAGE_ENABLED", "false") == "true"
)
def _s3_credentials_from_env(bucket_prefix): def _s3_credentials_from_env(bucket_prefix):

10
app/main/views/index.py
View File

@@ -30,15 +30,13 @@ from notifications_utils.url_safe_token import generate_token
# Hook to check for feature flags # Hook to check for feature flags
@main.before_request @main.before_request
def check_feature_flags(): def check_feature_flags():
if ( if request.path.startswith("/guides/best-practices") and not current_app.config.get(
request.path.startswith("/guides/best-practices") "FEATURE_BEST_PRACTICES_ENABLED", False
and not current_app.config.get("FEATURE_BEST_PRACTICES_ENABLED", False)
): ):
abort(404) abort(404)
if ( if request.path.startswith("/about") and not current_app.config.get(
request.path.startswith("/about") "FEATURE_ABOUT_PAGE_ENABLED", False
and not current_app.config.get("FEATURE_ABOUT_PAGE_ENABLED", False)
): ):
abort(404) abort(404)

2
app/navigation.py
View File

@@ -53,7 +53,7 @@ class HeaderNavigation(Navigation):
"establish_trust", "establish_trust",
"write_for_action", "write_for_action",
"multiple_languages", "multiple_languages",
"benchmark_performance" "benchmark_performance",
}, },
"using_notify": { "using_notify": {
"get_started", "get_started",

4
app/utils/csv.py
View File

@@ -103,6 +103,7 @@ def generate_notifications_csv(**kwargs):
"Carrier Response", "Carrier Response",
"Status", "Status",
"Time", "Time",
"Carrier",
] ]
for header in original_column_headers: for header in original_column_headers:
if header.lower() != "phone number": if header.lower() != "phone number":
@@ -118,6 +119,7 @@ def generate_notifications_csv(**kwargs):
"Carrier Response", "Carrier Response",
"Status", "Status",
"Time", "Time",
"Carrier",
] ]
yield ",".join(fieldnames) + "\n" yield ",".join(fieldnames) + "\n"
@@ -140,6 +142,7 @@ def generate_notifications_csv(**kwargs):
notification["provider_response"], notification["provider_response"],
notification["status"], notification["status"],
preferred_tz_created_at, preferred_tz_created_at,
notification["carrier"],
] ]
for header in original_column_headers: for header in original_column_headers:
if header.lower() != "phone number": if header.lower() != "phone number":
@@ -158,6 +161,7 @@ def generate_notifications_csv(**kwargs):
notification["provider_response"], notification["provider_response"],
notification["status"], notification["status"],
preferred_tz_created_at, preferred_tz_created_at,
notification["carrier"],
] ]
yield Spreadsheet.from_rows([map(str, values)]).as_csv_data yield Spreadsheet.from_rows([map(str, values)]).as_csv_data

15
tests/app/utils/test_csv.py
View File

@@ -58,6 +58,7 @@ def _get_notifications_csv(
"to": recipient, "to": recipient,
"recipient": recipient, "recipient": recipient,
"client_reference": "ref 1234", "client_reference": "ref 1234",
"carrier": "AT&T Mobility",
} }
for i in range(rows) for i in range(rows)
], ],
@@ -88,15 +89,15 @@ def get_notifications_csv_mock(
( (
None, None,
[ [
"Phone Number,Template,Sent by,Batch File,Carrier Response,Status,Time\n", "Phone Number,Template,Sent by,Batch File,Carrier Response,Status,Time,Carrier\n",
"8005555555,foo,,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n", "8005555555,foo,,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern,AT&T Mobility\r\n",
], ],
), ),
( (
"Anne Example", "Anne Example",
[ [
"Phone Number,Template,Sent by,Batch File,Carrier Response,Status,Time\n", "Phone Number,Template,Sent by,Batch File,Carrier Response,Status,Time,Carrier\n",
"8005555555,foo,Anne Example,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n", # noqa "8005555555,foo,Anne Example,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern,AT&T Mobility\r\n", # noqa
], ],
), ),
], ],
@@ -135,6 +136,7 @@ def test_generate_notifications_csv_without_job(
"Carrier Response", "Carrier Response",
"Status", "Status",
"Time", "Time",
"Carrier",
], ],
[ [
"8005555555", "8005555555",
@@ -144,6 +146,7 @@ def test_generate_notifications_csv_without_job(
"Did not like it", "Did not like it",
"Delivered", "Delivered",
"1943-04-19 08:00:00 AM US/Eastern", "1943-04-19 08:00:00 AM US/Eastern",
"AT&T Mobility",
], ],
), ),
( (
@@ -159,6 +162,7 @@ def test_generate_notifications_csv_without_job(
"Carrier Response", "Carrier Response",
"Status", "Status",
"Time", "Time",
"Carrier",
"a", "a",
"b", "b",
"c", "c",
@@ -171,6 +175,7 @@ def test_generate_notifications_csv_without_job(
"Did not like it", "Did not like it",
"Delivered", "Delivered",
"1943-04-19 08:00:00 AM US/Eastern", "1943-04-19 08:00:00 AM US/Eastern",
"AT&T Mobility",
"🐜", "🐜",
"🐝", "🐝",
"🦀", "🦀",
@@ -189,6 +194,7 @@ def test_generate_notifications_csv_without_job(
"Carrier Response", "Carrier Response",
"Status", "Status",
"Time", "Time",
"Carrier",
"a", "a",
"b", "b",
"c", "c",
@@ -201,6 +207,7 @@ def test_generate_notifications_csv_without_job(
"Did not like it", "Did not like it",
"Delivered", "Delivered",
"1943-04-19 08:00:00 AM US/Eastern", "1943-04-19 08:00:00 AM US/Eastern",
"AT&T Mobility",
"🐜,🐜", "🐜,🐜",
"🐝,🐝", "🐝,🐝",
"🦀", "🦀",