darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-11 07:42:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

KeyType implemented.

Browse Source 
Signed-off-by: Cliff Hill <Clifford.hill@gsa.gov>
This commit is contained in:
Cliff Hill
2024-01-18 10:28:50 -05:00
parent db3761609b
commit 7416de2a28
20 changed files with 90 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/celery/tasks.py
View File

@@ -20,8 +20,7 @@ from app.dao.service_email_reply_to_dao import dao_get_reply_to_by_id
from app.dao.service_inbound_api_dao import get_service_inbound_api_for_service
from app.dao.service_sms_sender_dao import dao_get_service_sms_senders_by_id
from app.dao.templates_dao import dao_get_template_by_id
from app.enums import NotificationType, JobStatus
from app.models import KEY_TYPE_NORMAL
from app.enums import NotificationType, JobStatus, KeyType
from app.notifications.process_notifications import persist_notification
from app.notifications.validators import check_service_over_total_message_limit
from app.serialised_models import SerialisedService, SerialisedTemplate
@@ -145,7 +144,7 @@ def process_row(row, template, job, service, sender_id=None):
def __total_sending_limits_for_job_exceeded(service, job, job_id):
try:
total_sent = check_service_over_total_message_limit(KEY_TYPE_NORMAL, service)
total_sent = check_service_over_total_message_limit(KeyType.NORMAL, service)
if total_sent + job.notification_count > service.total_message_limit:
raise TotalRequestsError(service.total_message_limit)
else:
@@ -179,7 +178,7 @@ def save_sms(self, service_id, notification_id, encrypted_notification, sender_i
else:
reply_to_text = template.reply_to_text
if not service_allowed_to_send_to(notification["to"], service, KEY_TYPE_NORMAL):
if not service_allowed_to_send_to(notification["to"], service, KeyType.NORMAL):
current_app.logger.debug(
"SMS {} failed as restricted service".format(notification_id)
)
@@ -200,7 +199,7 @@ def save_sms(self, service_id, notification_id, encrypted_notification, sender_i
personalisation=notification.get("personalisation"),
notification_type=NotificationType.SMS,
api_key_id=None,
key_type=KEY_TYPE_NORMAL,
key_type=KeyType.NORMAL,
created_at=datetime.utcnow(),
created_by_id=created_by_id,
job_id=notification.get("job", None),
@@ -245,7 +244,7 @@ def save_email(
else:
reply_to_text = template.reply_to_text
if not service_allowed_to_send_to(notification["to"], service, KEY_TYPE_NORMAL):
if not service_allowed_to_send_to(notification["to"], service, KeyType.NORMAL):
current_app.logger.info(
"Email {} failed as restricted service".format(notification_id)
)
@@ -260,7 +259,7 @@ def save_email(
personalisation=notification.get("personalisation"),
notification_type=NotificationType.EMAIL,
api_key_id=None,
key_type=KEY_TYPE_NORMAL,
key_type=KeyType.NORMAL,
created_at=datetime.utcnow(),
job_id=notification.get("job", None),
job_row_number=notification.get("row_number", None),
@@ -319,7 +318,7 @@ def save_api_email_or_sms(self, encrypted_notification):
notification_type=notification["notification_type"],
client_reference=notification["client_reference"],
api_key_id=notification.get("api_key_id"),
key_type=KEY_TYPE_NORMAL,
key_type=KeyType.NORMAL,
created_at=notification["created_at"],
reply_to_text=notification["reply_to_text"],
status=notification["status"],