All string "constants" in app.models converted to app.enums.

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

app/dao/service_callback_api_dao.py

@@ -2,9 +2,8 @@ from datetime import datetime
 
 from app import create_uuid, db
 from app.dao.dao_utils import autocommit, version_class
+from app.enums import CallbackType
 from app.models import (
-    COMPLAINT_CALLBACK_TYPE,
-    DELIVERY_STATUS_CALLBACK_TYPE,
     ServiceCallbackApi,
 )
 
@@ -40,13 +39,13 @@ def get_service_callback_api(service_callback_api_id, service_id):
 
 def get_service_delivery_status_callback_api_for_service(service_id):
     return ServiceCallbackApi.query.filter_by(
-        service_id=service_id, callback_type=DELIVERY_STATUS_CALLBACK_TYPE
+        service_id=service_id, callback_type=CallbackType.DELIVERY_STATUS,
     ).first()
 
 
 def get_service_complaint_callback_api_for_service(service_id):
     return ServiceCallbackApi.query.filter_by(
-        service_id=service_id, callback_type=COMPLAINT_CALLBACK_TYPE
+        service_id=service_id, callback_type=CallbackType.COMPLAINT,
     ).first()
 
 

app/dao/users_dao.py

@@ -9,8 +9,9 @@ from app import db
 from app.dao.dao_utils import autocommit
 from app.dao.permissions_dao import permission_dao
 from app.dao.service_user_dao import dao_get_service_users_by_user_id
+from app.enums import AuthType
 from app.errors import InvalidRequest
-from app.models import EMAIL_AUTH_TYPE, User, VerifyCode
+from app.models import User, VerifyCode
 from app.utils import escape_special_characters, get_archived_db_column_value
 
 
@@ -171,7 +172,7 @@ def dao_archive_user(user):
 
     user.organizations = []
 
-    user.auth_type = EMAIL_AUTH_TYPE
+    user.auth_type = AuthType.EMAIL
     user.email_address = get_archived_db_column_value(user.email_address)
     user.mobile_number = None
     user.password = str(uuid.uuid4())