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):