mirror of
https://github.com/GSA/notifications-api.git
synced 2026-02-04 02:11:11 -05:00
More changes for enums.
Signed-off-by: Cliff Hill <Clifford.hill@gsa.gov>
This commit is contained in:
@@ -18,7 +18,6 @@ from app.dao.fact_notification_status_dao import (
|
||||
update_fact_notification_status,
|
||||
)
|
||||
from app.models import (
|
||||
EMAIL_TYPE,
|
||||
KEY_TYPE_TEAM,
|
||||
KEY_TYPE_TEST,
|
||||
NOTIFICATION_CREATED,
|
||||
@@ -30,8 +29,8 @@ from app.models import (
|
||||
NOTIFICATION_SENT,
|
||||
NOTIFICATION_TECHNICAL_FAILURE,
|
||||
NOTIFICATION_TEMPORARY_FAILURE,
|
||||
SMS_TYPE,
|
||||
FactNotificationStatus,
|
||||
TemplateType,
|
||||
)
|
||||
from tests.app.db import (
|
||||
create_ft_notification_status,
|
||||
@@ -167,9 +166,9 @@ def test_fetch_notification_status_for_service_for_today_and_7_previous_days(
|
||||
notify_db_session,
|
||||
):
|
||||
service_1 = create_service(service_name="service_1")
|
||||
sms_template = create_template(service=service_1, template_type=SMS_TYPE)
|
||||
sms_template_2 = create_template(service=service_1, template_type=SMS_TYPE)
|
||||
email_template = create_template(service=service_1, template_type=EMAIL_TYPE)
|
||||
sms_template = create_template(service=service_1, template_type=TemplateType.SMS)
|
||||
sms_template_2 = create_template(service=service_1, template_type=TemplateType.SMS)
|
||||
email_template = create_template(service=service_1, template_type=TemplateType.EMAIL)
|
||||
|
||||
create_ft_notification_status(date(2018, 10, 29), "sms", service_1, count=10)
|
||||
create_ft_notification_status(date(2018, 10, 25), "sms", service_1, count=8)
|
||||
@@ -222,15 +221,15 @@ def test_fetch_notification_status_by_template_for_service_for_today_and_7_previ
|
||||
):
|
||||
service_1 = create_service(service_name="service_1")
|
||||
sms_template = create_template(
|
||||
template_name="sms Template 1", service=service_1, template_type=SMS_TYPE
|
||||
template_name="sms Template 1", service=service_1, template_type=TemplateType.SMS
|
||||
)
|
||||
sms_template_2 = create_template(
|
||||
template_name="sms Template 2", service=service_1, template_type=SMS_TYPE
|
||||
template_name="sms Template 2", service=service_1, template_type=TemplateType.SMS
|
||||
)
|
||||
email_template = create_template(service=service_1, template_type=EMAIL_TYPE)
|
||||
email_template = create_template(service=service_1, template_type=TemplateType.EMAIL)
|
||||
|
||||
# create unused email template
|
||||
create_template(service=service_1, template_type=EMAIL_TYPE)
|
||||
create_template(service=service_1, template_type=TemplateType.EMAIL)
|
||||
|
||||
create_ft_notification_status(date(2018, 10, 29), "sms", service_1, count=10)
|
||||
create_ft_notification_status(date(2018, 10, 29), "sms", service_1, count=11)
|
||||
@@ -323,8 +322,8 @@ def test_fetch_notification_status_totals_for_all_services_works_in_est(
|
||||
notify_db_session,
|
||||
):
|
||||
service_1 = create_service(service_name="service_1")
|
||||
sms_template = create_template(service=service_1, template_type=SMS_TYPE)
|
||||
email_template = create_template(service=service_1, template_type=EMAIL_TYPE)
|
||||
sms_template = create_template(service=service_1, template_type=TemplateType.SMS)
|
||||
email_template = create_template(service=service_1, template_type=TemplateType.EMAIL)
|
||||
|
||||
create_notification(
|
||||
sms_template, created_at=datetime(2018, 4, 20, 12, 0, 0), status="delivered"
|
||||
@@ -367,8 +366,8 @@ def test_fetch_notification_status_totals_for_all_services_works_in_est(
|
||||
def set_up_data():
|
||||
service_2 = create_service(service_name="service_2")
|
||||
service_1 = create_service(service_name="service_1")
|
||||
sms_template = create_template(service=service_1, template_type=SMS_TYPE)
|
||||
email_template = create_template(service=service_1, template_type=EMAIL_TYPE)
|
||||
sms_template = create_template(service=service_1, template_type=TemplateType.SMS)
|
||||
email_template = create_template(service=service_1, template_type=TemplateType.EMAIL)
|
||||
create_ft_notification_status(date(2018, 10, 24), "sms", service_1, count=8)
|
||||
create_ft_notification_status(date(2018, 10, 29), "sms", service_1, count=10)
|
||||
create_ft_notification_status(
|
||||
|
||||
@@ -5,7 +5,7 @@ from app.dao.service_guest_list_dao import (
|
||||
dao_fetch_service_guest_list,
|
||||
dao_remove_service_guest_list,
|
||||
)
|
||||
from app.models import EMAIL_TYPE, ServiceGuestList
|
||||
from app.models import GuestListRecipientType, ServiceGuestList
|
||||
from tests.app.db import create_service
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ def test_fetch_service_guest_list_ignores_other_service(sample_service_guest_lis
|
||||
|
||||
def test_add_and_commit_guest_list_contacts_saves_data(sample_service):
|
||||
guest_list = ServiceGuestList.from_string(
|
||||
sample_service.id, EMAIL_TYPE, "foo@example.com"
|
||||
sample_service.id, GuestListRecipientType.EMAIL, "foo@example.com"
|
||||
)
|
||||
|
||||
dao_add_and_commit_guest_list_contacts([guest_list])
|
||||
@@ -37,10 +37,10 @@ def test_remove_service_guest_list_only_removes_for_my_service(notify_db_session
|
||||
dao_add_and_commit_guest_list_contacts(
|
||||
[
|
||||
ServiceGuestList.from_string(
|
||||
service_1.id, EMAIL_TYPE, "service1@example.com"
|
||||
service_1.id, GuestListRecipientType.EMAIL, "service1@example.com"
|
||||
),
|
||||
ServiceGuestList.from_string(
|
||||
service_2.id, EMAIL_TYPE, "service2@example.com"
|
||||
service_2.id, GuestListRecipientType.EMAIL, "service2@example.com"
|
||||
),
|
||||
]
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user