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

removed .value because we have StrEnum

Browse Source
This commit is contained in:
Beverly Nguyen
2025-07-04 17:30:30 -07:00
parent 8a41de8f07
commit 9d9fa1c394
7 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/main/views/activity.py
View File

@@ -1,6 +1,7 @@
from flask import abort, render_template, request, url_for
from app import current_service, job_api_client
from app.enums import NotificationStatus
from app.formatters import get_time_left
from app.main import main
from app.utils.pagination import (
@@ -78,8 +79,7 @@ def handle_pagination(jobs, service_id, page):
return prev_page, next_page, pagination
JOB_STATUS_DELIVERED = "delivered"
JOB_STATUS_FAILED = "failed"
def get_job_statistics(job, status):
@@ -109,8 +109,8 @@ def create_job_dict_entry(job):
"activity_time": activity_time,
"created_by": job.get("created_by"),
"template_name": job.get("template_name"),
"delivered_count": get_job_statistics(job, JOB_STATUS_DELIVERED),
"failed_count": get_job_statistics(job, JOB_STATUS_FAILED),
"delivered_count": get_job_statistics(job, NotificationStatus.DELIVERED),
"failed_count": get_job_statistics(job, NotificationStatus.FAILED),
}

2
app/main/views/jobs.py
View File

@@ -399,7 +399,7 @@ def get_job_partials(job):
counts=_get_job_counts(job),
status=filter_args["status"],
notifications_deleted=(
job.status == JobStatus.FINISHED.value and not notifications["notifications"]
job.status == JobStatus.FINISHED and not notifications["notifications"]
),
)
service_data_retention_days = current_service.get_days_of_retention(

6
app/main/views/service_settings.py
View File

@@ -398,10 +398,10 @@ def get_service_verify_reply_to_address_partials(service_id, notification_id):
if replace:
existing = current_service.get_email_reply_to_address(replace)
existing_is_default = existing["is_default"]
verification_status = VerificationStatus.PENDING.value
verification_status = VerificationStatus.PENDING
is_default = True if (request.args.get("is_default", False) == "True") else False
if notification["status"] in DELIVERED_STATUSES:
verification_status = VerificationStatus.SUCCESS.value
verification_status = VerificationStatus.SUCCESS
if notification["to"] not in [
i["email_address"] for i in current_service.email_reply_to_addresses
]:
@@ -442,7 +442,7 @@ def get_service_verify_reply_to_address_partials(service_id, notification_id):
first_email_address=first_email_address,
replace=replace,
),
"stop": 0 if verification_status == VerificationStatus.PENDING.value else 1,
"stop": 0 if verification_status == VerificationStatus.PENDING else 1,
}