Fixed more stuff.

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

app/schemas.py

@@ -24,7 +24,7 @@ from notifications_utils.recipients import (
 
 from app import ma, models
 from app.dao.permissions_dao import permission_dao
-from app.enums import TemplateType
+from app.enums import ServicePermissionType, TemplateType
 from app.models import ServicePermission
 from app.utils import DATETIME_FORMAT_NO_TIMEZONE, get_template_instance
 
@@ -153,7 +153,7 @@ class UserSchema(BaseSchema):
             if value is not None:
                 validate_phone_number(value, international=True)
         except InvalidPhoneError as error:
-            raise ValidationError("Invalid phone number: {}".format(error))
+            raise ValidationError(f"Invalid phone number: {error}")
 
 
 class UserUpdateAttributeSchema(BaseSchema):
@@ -193,13 +193,13 @@ class UserUpdateAttributeSchema(BaseSchema):
             if value is not None:
                 validate_phone_number(value, international=True)
         except InvalidPhoneError as error:
-            raise ValidationError("Invalid phone number: {}".format(error))
+            raise ValidationError(f"Invalid phone number: {error}")
 
     @validates_schema(pass_original=True)
     def check_unknown_fields(self, data, original_data, **kwargs):
         for key in original_data:
             if key not in self.fields:
-                raise ValidationError("Unknown field name {}".format(key))
+                raise ValidationError(f"Unknown field name {key}")
 
 
 class UserUpdatePasswordSchema(BaseSchema):
@@ -210,7 +210,7 @@ class UserUpdatePasswordSchema(BaseSchema):
     def check_unknown_fields(self, data, original_data, **kwargs):
         for key in original_data:
             if key not in self.fields:
-                raise ValidationError("Unknown field name {}".format(key))
+                raise ValidationError(f"Unknown field name {key}")
 
 
 class ProviderDetailsSchema(BaseSchema):
@@ -285,12 +285,12 @@ class ServiceSchema(BaseSchema, UUIDsAsStringsMixin):
     def validate_permissions(self, value):
         permissions = [v.permission for v in value]
         for p in permissions:
-            if p not in models.SERVICE_PERMISSION_TYPES:
-                raise ValidationError("Invalid Service Permission: '{}'".format(p))
+            if p not in {e for e in ServicePermissionType}:
+                raise ValidationError(f"Invalid Service Permission: '{p}'")
 
         if len(set(permissions)) != len(permissions):
             duplicates = list(set([x for x in permissions if permissions.count(x) > 1]))
-            raise ValidationError("Duplicate Service Permission: {}".format(duplicates))
+            raise ValidationError(f"Duplicate Service Permission: {duplicates}")
 
     @pre_load()
     def format_for_data_model(self, in_data, **kwargs):

tests/app/service/test_rest.py

@@ -768,7 +768,7 @@ def test_update_service_flags(client, sample_service):
     json_resp = resp.json
     assert resp.status_code == 200
     assert json_resp["data"]["name"] == sample_service.name
-    data = {"permissions": {ServicePermissionType.INTERNATIONAL_SMS}}
+    data = {"permissions": [ServicePermissionType.INTERNATIONAL_SMS]}
 
     auth_header = create_admin_authorization_header()
 
@@ -855,7 +855,7 @@ def test_update_service_flags_with_service_without_default_service_permissions(
 ):
     auth_header = create_admin_authorization_header()
     data = {
-        "permissions": {ServicePermissionType.INTERNATIONAL_SMS},
+        "permissions": [ServicePermissionType.INTERNATIONAL_SMS],
     }
 
     resp = client.post(
@@ -888,7 +888,7 @@ def test_update_service_flags_will_remove_service_permissions(
         p.permission for p in service.permissions
     }
 
-    data = {"permissions": {ServicePermissionType.SMS, ServicePermissionType.EMAIL}}
+    data = {"permissions": [ServicePermissionType.SMS, ServicePermissionType.EMAIL]}
 
     resp = client.post(
         "/service/{}".format(service.id),
@@ -912,7 +912,7 @@ def test_update_permissions_will_override_permission_flags(
 ):
     auth_header = create_admin_authorization_header()
 
-    data = {"permissions": {ServicePermissionType.INTERNATIONAL_SMS}}
+    data = {"permissions": [ServicePermissionType.INTERNATIONAL_SMS]}
 
     resp = client.post(
         "/service/{}".format(service_with_no_permissions.id),
@@ -922,9 +922,9 @@ def test_update_permissions_will_override_permission_flags(
     result = resp.json
 
     assert resp.status_code == 200
-    assert set(result["data"]["permissions"]) == {
+    assert set(result["data"]["permissions"]) == [
         ServicePermissionType.INTERNATIONAL_SMS
-    }
+    ]
 
 
 def test_update_service_permissions_will_add_service_permissions(
@@ -932,7 +932,7 @@ def test_update_service_permissions_will_add_service_permissions(
 ):
     auth_header = create_admin_authorization_header()
 
-    data = {"permissions": {ServicePermissionType.EMAIL, ServicePermissionType.SMS}}
+    data = {"permissions": [ServicePermissionType.EMAIL, ServicePermissionType.SMS]}
 
     resp = client.post(
         "/service/{}".format(sample_service.id),
@@ -986,11 +986,11 @@ def test_update_permissions_with_an_invalid_permission_will_raise_error(
     invalid_permission = "invalid_permission"
 
     data = {
-        "permissions": {
+        "permissions": [
             ServicePermissionType.EMAIL,
             ServicePermissionType.SMS,
             invalid_permission,
-        }
+        ]
     }
 
     resp = client.post(
@@ -1014,11 +1014,11 @@ def test_update_permissions_with_duplicate_permissions_will_raise_error(
     auth_header = create_admin_authorization_header()
 
     data = {
-        "permissions": {
+        "permissions": [
             ServicePermissionType.EMAIL,
             ServicePermissionType.SMS,
             ServicePermissionType.SMS,
-        }
+        ]
     }
 
     resp = client.post(