More cleanup.

Signed-off-by: Cliff Hill <Clifford.hill@gsa.gov>

tests/app/celery/test_reporting_tasks.py

@@ -17,7 +17,6 @@ from app.models import (
     KEY_TYPE_NORMAL,
     KEY_TYPE_TEAM,
     KEY_TYPE_TEST,
-    NOTIFICATION_TYPES,
     FactBilling,
     FactNotificationStatus,
     Notification,
@@ -109,7 +108,7 @@ def test_create_nightly_notification_status_triggers_relevant_tasks(
         "app.celery.reporting_tasks.create_nightly_notification_status_for_service_and_day"
     ).apply_async
 
-    for notification_type in NOTIFICATION_TYPES:
+    for notification_type in NotificationType:
         template = create_template(sample_service, template_type=notification_type)
         create_notification(template=template, created_at=notification_date)
 

tests/app/conftest.py

@@ -23,7 +23,6 @@ from app.models import (
     KEY_TYPE_TEAM,
     KEY_TYPE_TEST,
     NOTIFICATION_STATUS_TYPES_COMPLETED,
-    SERVICE_PERMISSION_TYPES,
     ApiKey,
     GuestListRecipientType,
     InvitedUser,
@@ -237,7 +236,7 @@ def sample_service(sample_user):
 def _sample_service_full_permissions(notify_db_session):
     service = create_service(
         service_name="sample service full permissions",
-        service_permissions=set(SERVICE_PERMISSION_TYPES),
+        service_permissions=set(ServicePermissionType),
         check_if_service_exists=True,
     )
     create_inbound_number("12345", service_id=service.id)

tests/app/test_utils.py

@@ -4,7 +4,7 @@ from datetime import date, datetime
 import pytest
 from freezegun import freeze_time
 
-from app.models import UPLOAD_DOCUMENT
+from app.models import ServicePermissionType
 from app.utils import (
     format_sequential_number,
     get_midnight_for_day_before,
@@ -89,7 +89,9 @@ def test_get_uuid_string_or_none():
 
 
 def test_get_public_notify_type_text():
-    assert get_public_notify_type_text(UPLOAD_DOCUMENT) == "document"
+    assert (
+        get_public_notify_type_text(ServicePermissionType.UPLOAD_DOCUMENT) == "document"
+    )
 
 
 # This method is used for simulating bulk sends.  We use localstack and run on a developer's machine to do the