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

fix testing

Browse Source
This commit is contained in:
Beverly Nguyen
2024-08-29 17:10:51 -07:00
parent 65ef22f26e
commit be14a4a0c4
2 changed files with 44 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/main/views/dashboard.py
View File

@@ -329,15 +329,31 @@ def aggregate_template_usage(template_statistics, sort_key="count"):
templates.append(
{
"template_id": k,
"template_name": template_stats[0]["template_name"],
"template_type": template_stats[0]["template_type"],
"template_name": (
template_stats[0].get("template_name") if template_stats else None
),
"template_type": (
template_stats[0].get("template_type") if template_stats else None
),
"count": sum(s["count"] for s in template_stats),
"last_used": max(s["last_used"] for s in template_stats if s["last_used"]),
"created_by": template_stats[0]["created_by"],
"created_by_id": template_stats[0]["created_by_id"],
"status": template_stats[0]["status"],
"template_folder": template_stats[0]["template_folder"],
"template_folder_id": template_stats[0]["template_folder_id"],
"created_by": (
template_stats[0].get("created_by") if template_stats else None
),
"created_by_id": (
template_stats[0].get("created_by_id") if template_stats else None
),
"last_used": (
template_stats[0].get("last_used") if template_stats else None
),
"status": template_stats[0].get("status") if template_stats else None,
"template_folder": (
template_stats[0].get("template_folder") if template_stats else None
),
"template_folder_id": (
template_stats[0].get("template_folder_id")
if template_stats
else None
),
}
)

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

@@ -133,6 +133,11 @@ stub_template_stats = [
"template_id": "id-1",
"status": "created",
"count": 50,
"last_used": "2024-01-25T23:02:25+00:00",
"created_by": "Test user",
"created_by_id": "987654",
"template_folder": "Some_folder",
"template_folder_id": "123456",
},
{
"template_type": "email",
@@ -140,6 +145,11 @@ stub_template_stats = [
"template_id": "id-2",
"status": "created",
"count": 100,
"last_used": "2024-01-25T23:02:25+00:00",
"created_by": "Test user",
"created_by_id": "987654",
"template_folder": "Some_folder",
"template_folder_id": "123456",
},
{
"template_type": "email",
@@ -147,6 +157,11 @@ stub_template_stats = [
"template_id": "id-2",
"status": "technical-failure",
"count": 100,
"last_used": "2024-01-25T23:02:25+00:00",
"created_by": "Test user",
"created_by_id": "987654",
"template_folder": "Some_folder",
"template_folder_id": "123456",
},
{
"template_type": "sms",
@@ -154,6 +169,11 @@ stub_template_stats = [
"template_id": "id-1",
"status": "delivered",
"count": 50,
"last_used": "2024-01-25T23:02:25+00:00",
"created_by": "Test user",
"created_by_id": "987654",
"template_folder": "Some_folder",
"template_folder_id": "123456",
},
]