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 #1181 from GSA/service-bundle-stats

Browse Source 
Bundle stats with service object
This commit is contained in:
Carlo Costino
2024-02-14 17:55:40 -05:00
committed by GitHub
parent ddf017707f 10f732b390
commit 048872fb12
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/__init__.py
View File

@@ -381,6 +381,10 @@ def load_service_before_request():
request_ctx.service = Service( request_ctx.service = Service(
service_api_client.get_service(service_id)["data"] service_api_client.get_service(service_id)["data"]
) )
stats = service_api_client.get_service_statistics(
service_id, limit_days=7
)
request_ctx.service.stats = stats
except HTTPError as exc: except HTTPError as exc:
# if service id isn't real, then 404 rather than 500ing later because we expect service to be set # if service id isn't real, then 404 rather than 500ing later because we expect service to be set
if exc.status_code == 404: if exc.status_code == 404:

3
tests/app/main/views/test_api_integration.py
View File

@@ -325,6 +325,7 @@ def test_route_permissions(
def _get(mocker): def _get(mocker):
return {"count": 0} return {"count": 0}
mocker.patch("app.service_api_client.get_service_statistics")
mocker.patch( mocker.patch(
"app.service_api_client.get_global_notification_count", side_effect=_get "app.service_api_client.get_global_notification_count", side_effect=_get
) )
@@ -358,6 +359,8 @@ def test_route_invalid_permissions(
def _get(mocker): def _get(mocker):
return {"count": 0} return {"count": 0}
mocker.patch("app.service_api_client.get_service_statistics")
mocker.patch( mocker.patch(
"app.service_api_client.get_global_notification_count", side_effect=_get "app.service_api_client.get_global_notification_count", side_effect=_get
) )

2
tests/conftest.py
View File

@@ -2319,6 +2319,8 @@ def client_request(logged_in_client, mocker, service_one): # noqa (C901 too com
def _get(mocker): def _get(mocker):
return {"count": 0} return {"count": 0}
mocker.patch("app.service_api_client.get_service_statistics")
mocker.patch( mocker.patch(
"app.service_api_client.get_global_notification_count", side_effect=_get "app.service_api_client.get_global_notification_count", side_effect=_get
) )