mirror of
https://github.com/GSA/notifications-api.git
synced 2026-02-04 02:11:11 -05:00
Stop validate function from being too complex by moving subfunctions out of it
This commit is contained in:
@@ -8,27 +8,30 @@ from notifications_utils.recipients import (validate_phone_number, validate_emai
|
|||||||
InvalidEmailError)
|
InvalidEmailError)
|
||||||
|
|
||||||
|
|
||||||
def validate(json_to_validate, schema):
|
|
||||||
format_checker = FormatChecker()
|
format_checker = FormatChecker()
|
||||||
|
|
||||||
|
|
||||||
@format_checker.checks("validate_uuid", raises=Exception)
|
@format_checker.checks("validate_uuid", raises=Exception)
|
||||||
def validate_uuid(instance):
|
def validate_uuid(instance):
|
||||||
if isinstance(instance, str):
|
if isinstance(instance, str):
|
||||||
UUID(instance)
|
UUID(instance)
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
@format_checker.checks('phone_number', raises=InvalidPhoneError)
|
@format_checker.checks('phone_number', raises=InvalidPhoneError)
|
||||||
def validate_schema_phone_number(instance):
|
def validate_schema_phone_number(instance):
|
||||||
if isinstance(instance, str):
|
if isinstance(instance, str):
|
||||||
validate_phone_number(instance, international=True)
|
validate_phone_number(instance, international=True)
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
@format_checker.checks('email_address', raises=InvalidEmailError)
|
@format_checker.checks('email_address', raises=InvalidEmailError)
|
||||||
def validate_schema_email_address(instance):
|
def validate_schema_email_address(instance):
|
||||||
if isinstance(instance, str):
|
if isinstance(instance, str):
|
||||||
validate_email_address(instance)
|
validate_email_address(instance)
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
@format_checker.checks('postage', raises=ValidationError)
|
@format_checker.checks('postage', raises=ValidationError)
|
||||||
def validate_schema_postage(instance):
|
def validate_schema_postage(instance):
|
||||||
if isinstance(instance, str):
|
if isinstance(instance, str):
|
||||||
@@ -36,6 +39,7 @@ def validate(json_to_validate, schema):
|
|||||||
raise ValidationError("invalid. It must be either first or second.")
|
raise ValidationError("invalid. It must be either first or second.")
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
@format_checker.checks('datetime_within_next_day', raises=ValidationError)
|
@format_checker.checks('datetime_within_next_day', raises=ValidationError)
|
||||||
def validate_schema_date_with_hour(instance):
|
def validate_schema_date_with_hour(instance):
|
||||||
if isinstance(instance, str):
|
if isinstance(instance, str):
|
||||||
@@ -50,6 +54,8 @@ def validate(json_to_validate, schema):
|
|||||||
"https://en.wikipedia.org/wiki/ISO_8601")
|
"https://en.wikipedia.org/wiki/ISO_8601")
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
def validate(json_to_validate, schema):
|
||||||
validator = Draft7Validator(schema, format_checker=format_checker)
|
validator = Draft7Validator(schema, format_checker=format_checker)
|
||||||
errors = list(validator.iter_errors(json_to_validate))
|
errors = list(validator.iter_errors(json_to_validate))
|
||||||
if errors.__len__() > 0:
|
if errors.__len__() > 0:
|
||||||
|
|||||||
Reference in New Issue
Block a user