darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-01 07:35:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1304 from GSA/API-1265_adding_fields_for_template_stats

Browse Source 
Api 1265 adding fields for template stats
This commit is contained in:
Beverly Nguyen
2024-08-29 12:32:41 -07:00
committed by GitHub
parent 3fd9af62ed 00e0f41d85
commit 0914cd9b5d
4 changed files with 248 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

227
tests/app/dao/test_fact_notification_status_dao.py
View File

@@ -1,5 +1,4 @@
from datetime import date, datetime, timedelta
from unittest import mock
from uuid import UUID
import pytest
@@ -26,6 +25,7 @@ from tests.app.db import (
create_notification,
create_service,
create_template,
create_template_folder,
)
@@ -253,15 +253,18 @@ def test_fetch_notification_status_by_template_for_service_for_today_and_7_previ
notify_db_session,
):
service_1 = create_service(service_name="service_1")
test_folder = create_template_folder(service=service_1, name="Test_Folder_For_This")
sms_template = create_template(
template_name="sms Template 1",
service=service_1,
template_type=TemplateType.SMS,
folder=test_folder,
)
sms_template_2 = create_template(
template_name="sms Template 2",
service=service_1,
template_type=TemplateType.SMS,
folder=test_folder,
)
email_template = create_template(
service=service_1, template_type=TemplateType.EMAIL
@@ -330,82 +333,152 @@ def test_fetch_notification_status_by_template_for_service_for_today_and_7_previ
by_template=True,
)
assert [
(
"email Template Name",
False,
mock.ANY,
NotificationType.EMAIL,
NotificationStatus.DELIVERED,
1,
),
(
"email Template Name",
False,
mock.ANY,
NotificationType.EMAIL,
NotificationStatus.DELIVERED,
3,
),
(
"sms Template 1",
False,
mock.ANY,
NotificationType.SMS,
NotificationStatus.CREATED,
1,
),
(
"sms Template Name",
False,
mock.ANY,
NotificationType.SMS,
NotificationStatus.CREATED,
1,
),
(
"sms Template 1",
False,
mock.ANY,
NotificationType.SMS,
NotificationStatus.DELIVERED,
1,
),
(
"sms Template 2",
False,
mock.ANY,
NotificationType.SMS,
NotificationStatus.DELIVERED,
1,
),
(
"sms Template Name",
False,
mock.ANY,
NotificationType.SMS,
NotificationStatus.DELIVERED,
8,
),
(
"sms Template Name",
False,
mock.ANY,
NotificationType.SMS,
NotificationStatus.DELIVERED,
10,
),
(
"sms Template Name",
False,
mock.ANY,
NotificationType.SMS,
NotificationStatus.DELIVERED,
11,
),
] == sorted(
results, key=lambda x: (x.notification_type, x.status, x.template_name, x.count)
)
expected = [
{
"folder": None,
"template_name": "email Template Name",
"_no_label": False,
"created_by": "Test User",
"last_used": datetime(2018, 10, 31, 0, 0),
"notification_type": NotificationType.EMAIL,
"status": NotificationStatus.DELIVERED,
"count": 1,
},
{
"folder": None,
"template_name": "email Template Name",
"_no_label": False,
"created_by": "Test User",
"last_used": datetime(2018, 10, 29, 0, 0),
"notification_type": NotificationType.EMAIL,
"status": NotificationStatus.DELIVERED,
"count": 3,
},
{
"folder": None,
"template_name": "sms Template Name",
"_no_label": False,
"created_by": "Test User",
"last_used": datetime(2018, 10, 29, 0, 0),
"notification_type": NotificationType.SMS,
"status": NotificationStatus.CREATED,
"count": 1,
},
{
"folder": "Test_Folder_For_This",
"template_name": "sms Template 1",
"_no_label": False,
"created_by": "Test User",
"last_used": datetime(2018, 10, 31, 0, 0),
"notification_type": NotificationType.SMS,
"status": NotificationStatus.CREATED,
"count": 1,
},
{
"folder": None,
"template_name": "sms Template Name",
"_no_label": False,
"created_by": "Test User",
"last_used": datetime(2018, 10, 29, 0, 0),
"notification_type": NotificationType.SMS,
"status": NotificationStatus.DELIVERED,
"count": 10,
},
{
"folder": "Test_Folder_For_This",
"template_name": "sms Template 2",
"_no_label": False,
"created_by": "Test User",
"last_used": datetime(2018, 10, 31, 0, 0),
"notification_type": NotificationType.SMS,
"status": NotificationStatus.DELIVERED,
"count": 1,
},
{
"folder": None,
"template_name": "sms Template Name",
"_no_label": False,
"created_by": "Test User",
"last_used": datetime(2018, 10, 25, 0, 0),
"notification_type": NotificationType.SMS,
"status": NotificationStatus.DELIVERED,
"count": 8,
},
{
"folder": "Test_Folder_For_This",
"template_name": "sms Template 1",
"_no_label": False,
"created_by": "Test User",
"last_used": datetime(2018, 10, 31, 0, 0),
"notification_type": NotificationType.SMS,
"status": NotificationStatus.DELIVERED,
"count": 1,
},
{
"folder": None,
"template_name": "sms Template Name",
"_no_label": False,
"created_by": "Test User",
"last_used": datetime(2018, 10, 29, 0, 0),
"notification_type": NotificationType.SMS,
"status": NotificationStatus.DELIVERED,
"count": 11,
},
]
expected = [
[
str(row[k]) if k != "last_used" else row[k].strftime("%Y-%m-%d")
for k in (
"folder",
"template_name",
"created_by",
"last_used",
"notification_type",
"status",
"count",
)
]
for row in sorted(
expected,
key=lambda x: (
str(x["notification_type"]),
str(x["status"]),
x["folder"] if x["folder"] is not None else "",
x["template_name"],
x["count"],
x["last_used"],
),
)
]
results = [
[
str(row[k]) if k != "last_used" else row[k].strftime("%Y-%m-%d")
for k in (
"folder",
"template_name",
"created_by",
"last_used",
"notification_type",
"status",
"count",
)
]
for row in sorted(
results,
key=lambda x: (
x.notification_type,
x.status,
x.folder if x.folder is not None else "",
x.template_name,
x.count,
x.last_used,
),
)
]
assert expected == results
@pytest.mark.parametrize(

10
tests/app/template_statistics/test_rest.py
View File

@@ -79,6 +79,11 @@ def test_get_template_statistics_for_service_by_day_goes_to_db(
template_name=sample_template.name,
notification_type=sample_template.template_type,
status=NotificationStatus.CREATED,
template_folder_id="123456",
folder="Some_Folder",
created_by_id="987654",
created_by="Mr. Nobody",
last_used="0/0/0",
)
],
)
@@ -95,6 +100,11 @@ def test_get_template_statistics_for_service_by_day_goes_to_db(
"template_name": sample_template.name,
"template_type": sample_template.template_type,
"status": NotificationStatus.CREATED,
"template_folder_id": "123456",
"template_folder": "Some_Folder",
"created_by_id": "987654",
"created_by": "Mr. Nobody",
"last_used": "0/0/0",
}
]
# dao only called for 2nd, since redis returned values for first call