Lots more cleanup.

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

app/dao/users_dao.py

@@ -9,7 +9,7 @@ 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.enums import AuthType, PermissionType
 from app.errors import InvalidRequest
 from app.models import User, VerifyCode
 from app.utils import escape_special_characters, get_archived_db_column_value
@@ -198,7 +198,7 @@ def user_can_be_archived(user):
             return False
 
         if not any(
-            "manage_settings" in user.get_permissions(service.id)
+            PermissionType.MANAGE_SETTINGS in user.get_permissions(service.id)
             for user in other_active_users
         ):
             # no-one else has manage settings

app/service/statistics.py

@@ -28,10 +28,10 @@ def format_admin_stats(statistics):
         else:
             counts[row.notification_type]["total"] += row.count
             if row.status in (
-                "technical-failure",
-                "permanent-failure",
-                "temporary-failure",
-                "virus-scan-failed",
+                NotificationStatus.TECHNICAL_FAILURE,
+                NotificationStatus.PERMANENT_FAILURE,
+                NotificationStatus.TEMPORARY_FAILURE,
+                NotificationStatus.VIRUS_SCAN_FAILED,
             ):
                 counts[row.notification_type]["failures"][row.status] += row.count
 
@@ -47,10 +47,10 @@ def create_stats_dict():
             stats_dict[template][status] = 0
 
         stats_dict[template]["failures"] = {
-            "technical-failure": 0,
-            "permanent-failure": 0,
-            "temporary-failure": 0,
-            "virus-scan-failed": 0,
+            NotificationStatus.TECHNICAL_FAILURE: 0,
+            NotificationStatus.PERMANENT_FAILURE: 0,
+            NotificationStatus.TEMPORARY_FAILURE: 0,
+            NotificationStatus.VIRUS_SCAN_FAILED: 0,
         }
     return stats_dict