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

Black & isort.

Browse Source 
Signed-off-by: Cliff Hill <clifford.hill@gsa.gov>
This commit is contained in:
Cliff Hill
2024-08-02 14:50:52 -04:00
parent 27ee039b2d
commit 6b8be20ed2
5 changed files with 75 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/notify_client/job_api_client.py
View File

@@ -1,7 +1,8 @@
import datetime import datetime
from flask import current_app
from zoneinfo import ZoneInfo from zoneinfo import ZoneInfo
from flask import current_app
from app.extensions import redis_client from app.extensions import redis_client
from app.notify_client import NotifyAdminAPIClient, _attach_current_user, cache from app.notify_client import NotifyAdminAPIClient, _attach_current_user, cache
from app.utils.csv import get_user_preferred_timezone from app.utils.csv import get_user_preferred_timezone
@@ -28,9 +29,7 @@ class JobApiClient(NotifyAdminAPIClient):
def get_job(self, service_id, job_id): def get_job(self, service_id, job_id):
params = {} params = {}
job = self.get( job = self.get(url=f"/service/{service_id}/job/{job_id}", params=params)
url=f"/service/{service_id}/job/{job_id}", params=params
)
return job return job
@@ -43,6 +42,7 @@ class JobApiClient(NotifyAdminAPIClient):
job = self.get(url=f"/service/{service_id}/job", params=params) job = self.get(url=f"/service/{service_id}/job", params=params)
from json import dumps from json import dumps
current_app.logger.info(dumps(job)) current_app.logger.info(dumps(job))
return job return job

2
tests/app/main/views/test_dashboard.py
View File

@@ -1362,7 +1362,7 @@ def test_menu_all_services_for_platform_admin_user(
page = str(page) page = str(page)
assert url_for("main.choose_template", service_id=service_one["id"]) in page assert url_for("main.choose_template", service_id=service_one["id"]) in page
assert url_for("main.service_settings", service_id=service_one["id"]) in page assert url_for("main.service_settings", service_id=service_one["id"]) in page
assert url_for('main.api_keys', service_id=service_one['id']) not in page assert url_for("main.api_keys", service_id=service_one["id"]) not in page
def test_route_for_service_permissions( def test_route_for_service_permissions(

2
tests/app/main/views/test_jobs.py
View File

@@ -494,5 +494,5 @@ def test_should_show_message_note(
assert normalize_spaces(page.select_one("main p.notification-status").text) == ( assert normalize_spaces(page.select_one("main p.notification-status").text) == (
'Messages are sent immediately to the cell phone carrier, but will remain in "pending" status until we hear ' 'Messages are sent immediately to the cell phone carrier, but will remain in "pending" status until we hear '
'back from the carrier they have received it and attempted deliver. More information on delivery status.' "back from the carrier they have received it and attempted deliver. More information on delivery status."
) )

110
tests/app/main/views/test_jobs_activity.py
View File

@@ -29,13 +29,13 @@ MOCK_JOBS = {
"updated_at": "2024-01-25T23:02:25+00:00", "updated_at": "2024-01-25T23:02:25+00:00",
} }
], ],
'links': { "links": {
'last': '/service/21b3ee3d-1cb0-4666-bfa0-9c5ac26d3fe3/job?page=3', "last": "/service/21b3ee3d-1cb0-4666-bfa0-9c5ac26d3fe3/job?page=3",
'next': '/service/21b3ee3d-1cb0-4666-bfa0-9c5ac26d3fe3/job?page=3', "next": "/service/21b3ee3d-1cb0-4666-bfa0-9c5ac26d3fe3/job?page=3",
'prev': '/service/21b3ee3d-1cb0-4666-bfa0-9c5ac26d3fe3/job?page=1' "prev": "/service/21b3ee3d-1cb0-4666-bfa0-9c5ac26d3fe3/job?page=1",
}, },
'page_size': 50, "page_size": 50,
'total': 115 "total": 115,
} }
@@ -58,59 +58,62 @@ def test_all_activity(
assert "All activity" in response.text assert "All activity" in response.text
mock_get_page_of_jobs.assert_called_with(SERVICE_ONE_ID, page=current_page) mock_get_page_of_jobs.assert_called_with(SERVICE_ONE_ID, page=current_page)
page = BeautifulSoup(response.data, 'html.parser') page = BeautifulSoup(response.data, "html.parser")
table = page.find('table') table = page.find("table")
assert table is not None, "Table not found in the response" assert table is not None, "Table not found in the response"
headers = [th.get_text(strip=True) for th in table.find_all('th')] headers = [th.get_text(strip=True) for th in table.find_all("th")]
expected_headers = ["Job ID#", "Template", "Time sent", "Sender", "Report"] expected_headers = ["Job ID#", "Template", "Time sent", "Sender", "Report"]
assert headers == expected_headers, f"Expected headers {expected_headers}, but got {headers}" assert (
headers == expected_headers
), f"Expected headers {expected_headers}, but got {headers}"
rows = table.find('tbody').find_all('tr', class_='table-row') rows = table.find("tbody").find_all("tr", class_="table-row")
assert len(rows) == 1, "Expected one job row in the table" assert len(rows) == 1, "Expected one job row in the table"
job_row = rows[0] job_row = rows[0]
cells = job_row.find_all('td') cells = job_row.find_all("td")
assert len(cells) == 5, "Expected five columns in the job row" assert len(cells) == 5, "Expected five columns in the job row"
job_id_cell = cells[0].find('a').get_text(strip=True) job_id_cell = cells[0].find("a").get_text(strip=True)
assert job_id_cell == "55b242b5", f"Expected job ID '55b242b5', but got '{job_id_cell}'" assert (
job_id_cell == "55b242b5"
), f"Expected job ID '55b242b5', but got '{job_id_cell}'"
template_cell = cells[1].get_text(strip=True) template_cell = cells[1].get_text(strip=True)
assert template_cell == "Mock Template Name", ( assert (
f"Expected template 'Mock Template Name', but got '{template_cell}'" template_cell == "Mock Template Name"
) ), f"Expected template 'Mock Template Name', but got '{template_cell}'"
time_sent_cell = cells[2].get_text(strip=True) time_sent_cell = cells[2].get_text(strip=True)
assert time_sent_cell == "01-25-2024 at 06:02 PM", ( assert (
f"Expected time sent '01-25-2024 at 06:02 PM', but got '{time_sent_cell}'" time_sent_cell == "01-25-2024 at 06:02 PM"
) ), f"Expected time sent '01-25-2024 at 06:02 PM', but got '{time_sent_cell}'"
sender_cell = cells[3].get_text(strip=True) sender_cell = cells[3].get_text(strip=True)
assert sender_cell == "mocked_user", f"Expected sender 'mocked_user', but got '{sender_cell}'" assert (
sender_cell == "mocked_user"
), f"Expected sender 'mocked_user', but got '{sender_cell}'"
report_cell = cells[4].find('span').get_text(strip=True) report_cell = cells[4].find("span").get_text(strip=True)
assert report_cell == "N/A", f"Expected report 'N/A', but got '{report_cell}'" assert report_cell == "N/A", f"Expected report 'N/A', but got '{report_cell}'"
mock_get_page_of_jobs.assert_called_with(SERVICE_ONE_ID, page=current_page) mock_get_page_of_jobs.assert_called_with(SERVICE_ONE_ID, page=current_page)
def test_all_activity_no_jobs( def test_all_activity_no_jobs(client_request, mocker):
client_request,
mocker
):
current_page = get_page_from_request() current_page = get_page_from_request()
mock_get_page_of_jobs = mocker.patch( mock_get_page_of_jobs = mocker.patch(
"app.job_api_client.get_page_of_jobs", "app.job_api_client.get_page_of_jobs",
return_value={ return_value={
"data": [], "data": [],
'links': { "links": {
'last': '/service/21b3ee3d-1cb0-4666-bfa0-9c5ac26d3fe3/job?page=1', "last": "/service/21b3ee3d-1cb0-4666-bfa0-9c5ac26d3fe3/job?page=1",
'next': None, "next": None,
'prev': None "prev": None,
}, },
'page_size': 50, "page_size": 50,
'total': 0 "total": 0,
} },
) )
response = client_request.get_response( response = client_request.get_response(
"main.all_jobs_activity", "main.all_jobs_activity",
@@ -120,17 +123,17 @@ def test_all_activity_no_jobs(
assert response.status_code == 200, "Request failed" assert response.status_code == 200, "Request failed"
page = BeautifulSoup(response.data, 'html.parser') page = BeautifulSoup(response.data, "html.parser")
no_jobs_message_td = page.find('td', class_='table-empty-message') no_jobs_message_td = page.find("td", class_="table-empty-message")
assert no_jobs_message_td is not None, "No jobs message not found in the response" assert no_jobs_message_td is not None, "No jobs message not found in the response"
expected_message = "No batched job messages found (messages are kept for 7 days)." expected_message = "No batched job messages found (messages are kept for 7 days)."
actual_message = no_jobs_message_td.get_text(strip=True) actual_message = no_jobs_message_td.get_text(strip=True)
assert expected_message == actual_message, ( assert (
f"Expected message '{expected_message}', but got '{actual_message}'" expected_message == actual_message
) ), f"Expected message '{expected_message}', but got '{actual_message}'"
mock_get_page_of_jobs.assert_called_with(SERVICE_ONE_ID, page=current_page) mock_get_page_of_jobs.assert_called_with(SERVICE_ONE_ID, page=current_page)
@@ -148,17 +151,18 @@ def test_all_activity_pagination(client_request, mocker):
"processing_started": "2024-01-25T23:02:24+00:00", "processing_started": "2024-01-25T23:02:24+00:00",
"template_name": "Mock Template Name", "template_name": "Mock Template Name",
"original_file_name": "mocked_file.csv", "original_file_name": "mocked_file.csv",
"notification_count": 1 "notification_count": 1,
} for i in range(1, 101) }
for i in range(1, 101)
], ],
'links': { "links": {
'last': '/service/21b3ee3d-1cb0-4666-bfa0-9c5ac26d3fe3/job?page=2', "last": "/service/21b3ee3d-1cb0-4666-bfa0-9c5ac26d3fe3/job?page=2",
'next': '/service/21b3ee3d-1cb0-4666-bfa0-9c5ac26d3fe3/job?page=2', "next": "/service/21b3ee3d-1cb0-4666-bfa0-9c5ac26d3fe3/job?page=2",
'prev': None "prev": None,
}, },
'page_size': 50, "page_size": 50,
'total': 100 "total": 100,
} },
) )
response = client_request.get_response( response = client_request.get_response(
@@ -168,12 +172,12 @@ def test_all_activity_pagination(client_request, mocker):
) )
mock_get_page_of_jobs.assert_called_with(SERVICE_ONE_ID, page=current_page) mock_get_page_of_jobs.assert_called_with(SERVICE_ONE_ID, page=current_page)
page = BeautifulSoup(response.data, 'html.parser') page = BeautifulSoup(response.data, "html.parser")
pagination_controls = page.find_all('li', class_='usa-pagination__item') pagination_controls = page.find_all("li", class_="usa-pagination__item")
assert pagination_controls, "Pagination controls not found in the response" assert pagination_controls, "Pagination controls not found in the response"
pagination_texts = [item.get_text(strip=True) for item in pagination_controls] pagination_texts = [item.get_text(strip=True) for item in pagination_controls]
expected_pagination_texts = ['1', '2', 'Next'] expected_pagination_texts = ["1", "2", "Next"]
assert pagination_texts == expected_pagination_texts, ( assert (
f"Expected pagination controls {expected_pagination_texts}, but got {pagination_texts}" pagination_texts == expected_pagination_texts
) ), f"Expected pagination controls {expected_pagination_texts}, but got {pagination_texts}"

14
tests/app/utils/test_pagination.py
View File

@@ -36,8 +36,18 @@ def test_generate_previous_next_dict_adds_other_url_args(client_request):
(500, 50, 1, {"current": 1, "pages": [1, 2, 3, 4, 5, 6, 7, 8, 9], "last": 10}), (500, 50, 1, {"current": 1, "pages": [1, 2, 3, 4, 5, 6, 7, 8, 9], "last": 10}),
(500, 50, 5, {"current": 5, "pages": [1, 2, 3, 4, 5, 6, 7, 8, 9], "last": 10}), (500, 50, 5, {"current": 5, "pages": [1, 2, 3, 4, 5, 6, 7, 8, 9], "last": 10}),
(500, 50, 6, {"current": 6, "pages": [2, 3, 4, 5, 6, 7, 8, 9, 10], "last": 10}), (500, 50, 6, {"current": 6, "pages": [2, 3, 4, 5, 6, 7, 8, 9, 10], "last": 10}),
(500, 50, 10, {"current": 10, "pages": [2, 3, 4, 5, 6, 7, 8, 9, 10], "last": 10}), (
(950, 50, 15, {"current": 15, "pages": [11, 12, 13, 14, 15, 16, 17, 18, 19], "last": 19}), 500,
50,
10,
{"current": 10, "pages": [2, 3, 4, 5, 6, 7, 8, 9, 10], "last": 10},
),
(
950,
50,
15,
{"current": 15, "pages": [11, 12, 13, 14, 15, 16, 17, 18, 19], "last": 19},
),
], ],
) )
def test_generate_pagination_pages(total_items, page_size, current_page, expected): def test_generate_pagination_pages(total_items, page_size, current_page, expected):