KeyType implemented.

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

app/organization/invite_rest.py

@@ -12,9 +12,9 @@ from app.dao.invited_org_user_dao import (
     save_invited_org_user,
 )
 from app.dao.templates_dao import dao_get_template_by_id
-from app.enums import NotificationType
+from app.enums import NotificationType, KeyType
 from app.errors import InvalidRequest, register_errors
-from app.models import KEY_TYPE_NORMAL, InvitedOrganizationUser
+from app.models import InvitedOrganizationUser
 from app.notifications.process_notifications import (
     persist_notification,
     send_notification_to_queue,
@@ -67,7 +67,7 @@ def invite_user_to_org(organization_id):
         },
         notification_type=NotificationType.EMAIL,
         api_key_id=None,
-        key_type=KEY_TYPE_NORMAL,
+        key_type=KeyType.NORMAL,
         reply_to_text=invited_org_user.invited_by.email_address,
     )
 

app/organization/rest.py

@@ -20,8 +20,9 @@ from app.dao.organization_dao import (
 from app.dao.services_dao import dao_fetch_service_by_id
 from app.dao.templates_dao import dao_get_template_by_id
 from app.dao.users_dao import get_user_by_id
+from app.enums import KeyType
 from app.errors import InvalidRequest, register_errors
-from app.models import KEY_TYPE_NORMAL, Organization
+from app.models import Organization
 from app.notifications.process_notifications import (
     persist_notification,
     send_notification_to_queue,
@@ -205,7 +206,7 @@ def send_notifications_on_mou_signed(organization_id):
             personalisation=personalisation,
             notification_type=template.template_type,
             api_key_id=None,
-            key_type=KEY_TYPE_NORMAL,
+            key_type=KeyType.NORMAL,
             reply_to_text=notify_service.get_default_reply_to_email_address(),
         )
         send_notification_to_queue(saved_notification, queue=QueueNames.NOTIFY)