darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-02 17:48:50 -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

10
app/enums.py
View File

@@ -1,4 +1,4 @@
from enum import Enum, StrEnum from enum import StrEnum
class NotificationStatus(StrEnum): class NotificationStatus(StrEnum):
@@ -60,15 +60,15 @@ class AuthType(StrEnum):
SMS_AUTH = "sms_auth" SMS_AUTH = "sms_auth"
# TODO: UserRole enum # TODO:
# class UserRole(Enum): # class UserRole(StrEnum):
# ADMIN = "admin" # ADMIN = "admin"
# USER = "user" # USER = "user"
# GUEST = "guest" # GUEST = "guest"
# TODO: NotificationType enum # TODO:
# class NotificationType(Enum): # class NotificationType(StrEnum):
# EMAIL = "email" # EMAIL = "email"
# SMS = "sms" # SMS = "sms"
# PUSH = "push" # PUSH = "push"

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

@@ -1,6 +1,7 @@
from flask import abort, render_template, request, url_for from flask import abort, render_template, request, url_for
from app import current_service, job_api_client from app import current_service, job_api_client
from app.enums import NotificationStatus
from app.formatters import get_time_left from app.formatters import get_time_left
from app.main import main from app.main import main
from app.utils.pagination import ( from app.utils.pagination import (
@@ -78,8 +79,7 @@ def handle_pagination(jobs, service_id, page):
return prev_page, next_page, pagination return prev_page, next_page, pagination
JOB_STATUS_DELIVERED = "delivered"
JOB_STATUS_FAILED = "failed"
def get_job_statistics(job, status): def get_job_statistics(job, status):
@@ -109,8 +109,8 @@ def create_job_dict_entry(job):
"activity_time": activity_time, "activity_time": activity_time,
"created_by": job.get("created_by"), "created_by": job.get("created_by"),
"template_name": job.get("template_name"), "template_name": job.get("template_name"),
"delivered_count": get_job_statistics(job, JOB_STATUS_DELIVERED), "delivered_count": get_job_statistics(job, NotificationStatus.DELIVERED),
"failed_count": get_job_statistics(job, JOB_STATUS_FAILED), "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), counts=_get_job_counts(job),
status=filter_args["status"], status=filter_args["status"],
notifications_deleted=( 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( 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: if replace:
existing = current_service.get_email_reply_to_address(replace) existing = current_service.get_email_reply_to_address(replace)
existing_is_default = existing["is_default"] 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 is_default = True if (request.args.get("is_default", False) == "True") else False
if notification["status"] in DELIVERED_STATUSES: if notification["status"] in DELIVERED_STATUSES:
verification_status = VerificationStatus.SUCCESS.value verification_status = VerificationStatus.SUCCESS
if notification["to"] not in [ if notification["to"] not in [
i["email_address"] for i in current_service.email_reply_to_addresses 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, first_email_address=first_email_address,
replace=replace, replace=replace,
), ),
"stop": 0 if verification_status == VerificationStatus.PENDING.value else 1, "stop": 0 if verification_status == VerificationStatus.PENDING else 1,
} }

4
app/models/user.py
View File

@@ -567,7 +567,7 @@ class InvitedUser(JSONModel):
# current_app.logger.warning( # current_app.logger.warning(
# f"Checking invited user {self.id} for permissions: {permissions}" # f"Checking invited user {self.id} for permissions: {permissions}"
# ) # )
if self.status == InvitedUserStatus.CANCELLED.value: if self.status == InvitedUserStatus.CANCELLED:
return False return False
return set(self.permissions) > set(permissions) return set(self.permissions) > set(permissions)
@@ -575,7 +575,7 @@ class InvitedUser(JSONModel):
# current_app.logger.warn( # current_app.logger.warn(
# f"Checking invited user {self.id} for permission: {permission} on service {service_id}" # f"Checking invited user {self.id} for permission: {permission} on service {service_id}"
# ) # )
if self.status == InvitedUserStatus.CANCELLED.value: if self.status == InvitedUserStatus.CANCELLED:
return False return False
return self.service == service_id and permission in self.permissions return self.service == service_id and permission in self.permissions

4
app/notify_client/invite_api_client.py
View File

@@ -95,7 +95,7 @@ class InviteApiClient(NotifyAdminAPIClient):
return self.get(url=f"/invite/service/check/{token}")["data"] return self.get(url=f"/invite/service/check/{token}")["data"]
def cancel_invited_user(self, service_id, invited_user_id): def cancel_invited_user(self, service_id, invited_user_id):
data = {"status": InvitedUserStatus.CANCELLED.value} data = {"status": InvitedUserStatus.CANCELLED}
data = _attach_current_user(data) data = _attach_current_user(data)
self.post(url=f"/service/{service_id}/invite/{invited_user_id}", data=data) self.post(url=f"/service/{service_id}/invite/{invited_user_id}", data=data)
@@ -132,7 +132,7 @@ class InviteApiClient(NotifyAdminAPIClient):
@cache.delete("service-{service_id}") @cache.delete("service-{service_id}")
@cache.delete("user-{invited_user_id}") @cache.delete("user-{invited_user_id}")
def accept_invite(self, service_id, invited_user_id): def accept_invite(self, service_id, invited_user_id):
data = {"status": InvitedUserStatus.ACCEPTED.value} data = {"status": InvitedUserStatus.ACCEPTED}
self.post(url=f"/service/{service_id}/invite/{invited_user_id}", data=data) self.post(url=f"/service/{service_id}/invite/{invited_user_id}", data=data)

12
app/status/views/healthcheck.py
View File

@@ -14,16 +14,16 @@ from notifications_python_client.errors import HTTPError
@status.route("/_status", methods=["GET"]) @status.route("/_status", methods=["GET"])
def show_status(): def show_status():
if request.args.get("elb", None) or request.args.get("simple", None): if request.args.get("elb", None) or request.args.get("simple", None):
return jsonify(status=HealthStatus.OK.value), 200 return jsonify(status=HealthStatus.OK), 200
else: else:
try: try:
api_status = status_api_client.get_status() api_status = status_api_client.get_status()
except HTTPError as err: except HTTPError as err:
current_app.logger.exception("API failed to respond") current_app.logger.exception("API failed to respond")
return jsonify(status=HealthStatus.ERROR.value, message=str(err.message)), 500 return jsonify(status=HealthStatus.ERROR, message=str(err.message)), 500
return ( return (
jsonify( jsonify(
status=HealthStatus.OK.value, status=HealthStatus.OK,
api=api_status, api=api_status,
git_commit=version.__git_commit__, git_commit=version.__git_commit__,
build_time=version.__time__, build_time=version.__time__,
@@ -61,10 +61,10 @@ def show_redis_status():
) )
except HTTPError as err: except HTTPError as err:
current_app.logger.exception("API failed to respond") current_app.logger.exception("API failed to respond")
return jsonify(status=HealthStatus.ERROR.value, message=str(err.message)), 500 return jsonify(status=HealthStatus.ERROR, message=str(err.message)), 500
return ( return (
jsonify( jsonify(
status=HealthStatus.OK.value, status=HealthStatus.OK,
api=api_status, api=api_status,
git_commit=version.__git_commit__, git_commit=version.__git_commit__,
build_time=version.__time__, build_time=version.__time__,
@@ -77,7 +77,7 @@ def show_redis_status():
) )
return ( return (
jsonify( jsonify(
status=f"{HealthStatus.ERROR.value}: {err}", status=f"{HealthStatus.ERROR}: {err}",
api=api_status, api=api_status,
git_commit=version.__git_commit__, git_commit=version.__git_commit__,
build_time=version.__time__, build_time=version.__time__,