Lots more cleanup.

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

tests/app/dao/test_invited_user_dao.py

@@ -12,7 +12,7 @@ from app.dao.invited_user_dao import (
     get_invited_users_for_service,
     save_invited_user,
 )
-from app.enums import InvitedUserStatus
+from app.enums import InvitedUserStatus, PermissionType
 from app.models import InvitedUser
 from tests.app.db import create_invited_user
 
@@ -109,12 +109,12 @@ def test_save_invited_user_sets_status_to_cancelled(
 ):
     assert InvitedUser.query.count() == 1
     saved = InvitedUser.query.get(sample_invited_user.id)
-    assert saved.status == "pending"
-    saved.status = "cancelled"
+    assert saved.status == InvitedUserStatus.PENDING
+    saved.status = InvitedUserStatus.CANCELLED
     save_invited_user(saved)
     assert InvitedUser.query.count() == 1
     cancelled_invited_user = InvitedUser.query.get(sample_invited_user.id)
-    assert cancelled_invited_user.status == "cancelled"
+    assert cancelled_invited_user.status == InvitedUserStatus.CANCELLED
 
 
 def test_should_delete_all_invitations_more_than_one_day_old(
@@ -195,9 +195,9 @@ def make_invitation(user, service, age=None, email_address="test@test.com"):
         email_address=email_address,
         from_user=user,
         service=service,
-        status="pending",
+        status=InvitedUserStatus.PENDING,
         created_at=datetime.utcnow() - (age or timedelta(hours=0)),
-        permissions="manage_settings",
+        permissions=PermissionType.MANAGE_SETTINGS,
         folder_permissions=[str(uuid.uuid4())],
     )
     db.session.add(verify_code)

tests/app/dao/test_jobs_dao.py

@@ -214,7 +214,7 @@ def test_get_jobs_for_service_in_processed_at_then_created_at_order(
 
 
 def test_update_job(sample_job):
-    assert sample_job.job_status == "pending"
+    assert sample_job.job_status == JobStatus.PENDING
 
     sample_job.job_status = "in progress"
 
@@ -268,8 +268,8 @@ def test_set_scheduled_jobs_to_pending_updates_rows(sample_template):
     create_job(sample_template, scheduled_for=one_hour_ago, job_status="scheduled")
     jobs = dao_set_scheduled_jobs_to_pending()
     assert len(jobs) == 2
-    assert jobs[0].job_status == "pending"
-    assert jobs[1].job_status == "pending"
+    assert jobs[0].job_status == JobStatus.PENDING
+    assert jobs[1].job_status == JobStatus.PENDING
 
 
 def test_get_future_scheduled_job_gets_a_job_yet_to_send(sample_scheduled_job):
@@ -444,7 +444,7 @@ def test_find_jobs_with_missing_rows_returns_nothing_for_a_job_completed_more_th
     assert len(results) == 0
 
 
-@pytest.mark.parametrize("status", ["pending", "in progress", "cancelled", "scheduled"])
+@pytest.mark.parametrize("status", [JobStatus.PENDING, JobStatus.IN_PROGRESS, JobStatus.CANCELLED, JobStatus.SCHEDULED,],)
 def test_find_jobs_with_missing_rows_doesnt_return_jobs_that_are_not_finished(
     sample_email_template, status
 ):

tests/app/dao/test_permissions_dao.py

@@ -1,5 +1,6 @@
 from app.dao import DAOClass
 from app.dao.permissions_dao import permission_dao
+from app.enums import PermissionType
 from tests.app.db import create_service
 
 
@@ -10,13 +11,13 @@ def test_get_permissions_by_user_id_returns_all_permissions(sample_service):
     assert len(permissions) == 7
     assert sorted(
         [
-            "manage_users",
-            "manage_templates",
-            "manage_settings",
-            "send_texts",
-            "send_emails",
-            "manage_api_keys",
-            "view_activity",
+            PermissionType.MANAGE_USERS,
+            PermissionType.MANAGE_TEMPLATES,
+            PermissionType.MANAGE_SETTINGS,
+            PermissionType.SEND_TEXTS,
+            PermissionType.SEND_EMAILS,
+            PermissionType.MANAGE_API_KEYS,
+            PermissionType.VIEW_ACTIVITY,
         ]
     ) == sorted([i.permission for i in permissions])
 

tests/app/dao/test_users_dao.py

@@ -25,7 +25,7 @@ from app.dao.users_dao import (
     update_user_password,
     user_can_be_archived,
 )
-from app.enums import AuthType
+from app.enums import AuthType, PermissionType
 from app.errors import InvalidRequest
 from app.models import User, VerifyCode
 from tests.app.db import (
@@ -208,14 +208,14 @@ def test_dao_archive_user(sample_user, sample_organization, fake_uuid):
     service_1 = create_service(service_name="Service 1")
     service_1_user = create_user(email="1@test.com")
     service_1.users = [sample_user, service_1_user]
-    create_permissions(sample_user, service_1, "manage_settings")
-    create_permissions(service_1_user, service_1, "manage_settings", "view_activity")
+    create_permissions(sample_user, service_1, PermissionType.MANAGE_SETTINGS)
+    create_permissions(service_1_user, service_1, PermissionType.MANAGE_SETTINGS, PermissionType.VIEW_ACTIVITY,)
 
     service_2 = create_service(service_name="Service 2")
     service_2_user = create_user(email="2@test.com")
     service_2.users = [sample_user, service_2_user]
-    create_permissions(sample_user, service_2, "view_activity")
-    create_permissions(service_2_user, service_2, "manage_settings")
+    create_permissions(sample_user, service_2, PermissionType.VIEW_ACTIVITY)
+    create_permissions(service_2_user, service_2, PermissionType.MANAGE_SETTINGS)
 
     # make sample_user an org member
     sample_organization.users = [sample_user]
@@ -265,10 +265,10 @@ def test_user_can_be_archived_if_the_other_service_members_have_the_manage_setti
 
     sample_service.users = [user_1, user_2, user_3]
 
-    create_permissions(user_1, sample_service, "manage_settings")
-    create_permissions(user_2, sample_service, "manage_settings", "view_activity")
+    create_permissions(user_1, sample_service, PermissionType.MANAGE_SETTINGS)
+    create_permissions(user_2, sample_service, PermissionType.MANAGE_SETTINGS, PermissionType.VIEW_ACTIVITY,)
     create_permissions(
-        user_3, sample_service, "manage_settings", "send_emails", "send_texts"
+        user_3, sample_service, PermissionType.MANAGE_SETTINGS, PermissionType.SEND_EMAILS, PermissionType.SEND_TEXTS,
     )
 
     assert len(sample_service.users) == 3
@@ -304,9 +304,9 @@ def test_user_cannot_be_archived_if_the_other_service_members_do_not_have_the_ma
 
     sample_service.users = [active_user, pending_user, inactive_user]
 
-    create_permissions(active_user, sample_service, "manage_settings")
-    create_permissions(pending_user, sample_service, "view_activity")
-    create_permissions(inactive_user, sample_service, "send_emails", "send_texts")
+    create_permissions(active_user, sample_service, PermissionType.MANAGE_SETTINGS)
+    create_permissions(pending_user, sample_service, PermissionType.VIEW_ACTIVITY)
+    create_permissions(inactive_user, sample_service, PermissionType.SEND_EMAILS, PermissionType.SEND_TEXTS,)
 
     assert len(sample_service.users) == 3
     assert not user_can_be_archived(active_user)