Merge branch 'master' into fix-billable-units-query

app/schema_validation/__init__.py

@@ -30,8 +30,10 @@ def validate(json_to_validate, schema):
 def build_error_message(errors):
     fields = []
     for e in errors:
-        field = "{} {}".format(e.path[0], e.schema.get('validationMessage')) if e.schema.get(
-            'validationMessage') else __format_message(e)
+        field = (
+            "{} {}".format(e.path[0], e.schema['validationMessage'])
+            if 'validationMessage' in e.schema else __format_message(e)
+        )
         fields.append({"error": "ValidationError", "message": field})
     message = {
         "status_code": 400,
@@ -52,13 +54,10 @@ def __format_message(e):
             return error_path
 
     def get_error_message(e):
-        error_message = None
-        try:
-            error_message = e.cause.message
-        except AttributeError:
-            error_message = e.message
-        finally:
-            return error_message.replace("'", '')
+        # e.cause is an exception (such as InvalidPhoneError). if it's not present it was a standard jsonschema error
+        # such as a required field not being present
+        error_message = str(e.cause) if e.cause else e.message
+        return error_message.replace("'", '')
 
     path = get_path(e)
     message = get_error_message(e)

app/schemas.py

@@ -124,7 +124,7 @@ class UserUpdateAttributeSchema(BaseSchema):
         try:
             validate_email_address(value)
         except InvalidEmailError as e:
-            raise ValidationError(e.message)
+            raise ValidationError(str(e))
 
     @validates('mobile_number')
     def validate_mobile_number(self, value):
@@ -314,7 +314,7 @@ class EmailNotificationSchema(NotificationSchema):
         try:
             validate_email_address(value)
         except InvalidEmailError as e:
-            raise ValidationError(e.message)
+            raise ValidationError(str(e))
 
 
 class SmsTemplateNotificationSchema(SmsNotificationSchema):
@@ -413,7 +413,7 @@ class InvitedUserSchema(BaseSchema):
         try:
             validate_email_address(value)
         except InvalidEmailError as e:
-            raise ValidationError(e.message)
+            raise ValidationError(str(e))
 
 
 class PermissionSchema(BaseSchema):
@@ -446,7 +446,7 @@ class EmailDataSchema(ma.Schema):
         try:
             validate_email_address(value)
         except InvalidEmailError as e:
-            raise ValidationError(e.message)
+            raise ValidationError(str(e))
 
 
 class NotificationsFilterSchema(ma.Schema):