darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-19 05:58:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix dead-code related to the addition of the data_key argument

Browse Source 
Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
This commit is contained in:
Carlo Costino
2025-05-06 12:03:14 -04:00
parent 21e4345d2e
commit d2fc023622
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/schemas.py
View File

@@ -138,14 +138,14 @@ class UserSchema(BaseSchema):
@validates("name") @validates("name")
def validate_name(self, value, data_key): def validate_name(self, value, data_key):
if not value: if not value:
raise ValidationError("Invalid name") raise ValidationError(f"{data_key}: Invalid name")
@validates("email_address") @validates("email_address")
def validate_email_address(self, value, data_key): def validate_email_address(self, value, data_key):
try: try:
validate_email_address(value) validate_email_address(value)
except InvalidEmailError as e: except InvalidEmailError as e:
raise ValidationError(str(e)) raise ValidationError(f"{data_key}: {str(e)}")
@validates("mobile_number") @validates("mobile_number")
def validate_mobile_number(self, value, data_key): def validate_mobile_number(self, value, data_key):
@@ -153,7 +153,7 @@ class UserSchema(BaseSchema):
if value is not None: if value is not None:
validate_phone_number(value, international=True) validate_phone_number(value, international=True)
except InvalidPhoneError as error: except InvalidPhoneError as error:
raise ValidationError(f"Invalid phone number: {error}") raise ValidationError(f"{data_key}: Invalid phone number ({error})")
class UserUpdateAttributeSchema(BaseSchema): class UserUpdateAttributeSchema(BaseSchema):
@@ -178,14 +178,14 @@ class UserUpdateAttributeSchema(BaseSchema):
@validates("name") @validates("name")
def validate_name(self, value, data_key): def validate_name(self, value, data_key):
if not value: if not value:
raise ValidationError("Invalid name") raise ValidationError(f"{data_key}: Invalid name")
@validates("email_address") @validates("email_address")
def validate_email_address(self, value, data_key): def validate_email_address(self, value, data_key):
try: try:
validate_email_address(value) validate_email_address(value)
except InvalidEmailError as e: except InvalidEmailError as e:
raise ValidationError(str(e)) raise ValidationError(f"{data_key}: {str(e)}")
@validates("mobile_number") @validates("mobile_number")
def validate_mobile_number(self, value, data_key): def validate_mobile_number(self, value, data_key):
@@ -193,7 +193,7 @@ class UserUpdateAttributeSchema(BaseSchema):
if value is not None: if value is not None:
validate_phone_number(value, international=True) validate_phone_number(value, international=True)
except InvalidPhoneError as error: except InvalidPhoneError as error:
raise ValidationError(f"Invalid phone number: {error}") raise ValidationError(f"{data_key}: Invalid phone number ({error})")
@validates_schema(pass_original=True) @validates_schema(pass_original=True)
def check_unknown_fields(self, data, original_data, **kwargs): def check_unknown_fields(self, data, original_data, **kwargs):
@@ -286,7 +286,7 @@ class ServiceSchema(BaseSchema, UUIDsAsStringsMixin):
permissions = [v.permission for v in value] permissions = [v.permission for v in value]
for p in permissions: for p in permissions:
if p not in {e for e in ServicePermissionType}: if p not in {e for e in ServicePermissionType}:
raise ValidationError(f"Invalid Service Permission: '{p}'") raise ValidationError(f"{data_key}: Invalid Service Permission ('{p}')")
if len(set(permissions)) != len(permissions): if len(set(permissions)) != len(permissions):
duplicates = list(set([x for x in permissions if permissions.count(x) > 1])) duplicates = list(set([x for x in permissions if permissions.count(x) > 1]))
@@ -517,7 +517,7 @@ class SmsNotificationSchema(NotificationSchema):
try: try:
validate_phone_number(value, international=True) validate_phone_number(value, international=True)
except InvalidPhoneError as error: except InvalidPhoneError as error:
raise ValidationError("Invalid phone number: {}".format(error)) raise ValidationError(f"{data_key}: Invalid phone number ({error}")
@post_load @post_load
def format_phone_number(self, item, **kwargs): def format_phone_number(self, item, **kwargs):
@@ -534,7 +534,7 @@ class EmailNotificationSchema(NotificationSchema):
try: try:
validate_email_address(value) validate_email_address(value)
except InvalidEmailError as e: except InvalidEmailError as e:
raise ValidationError(str(e)) raise ValidationError(f"{data_key}: {str(e)}")
class SmsTemplateNotificationSchema(SmsNotificationSchema): class SmsTemplateNotificationSchema(SmsNotificationSchema):
@@ -658,7 +658,7 @@ class InvitedUserSchema(BaseSchema):
try: try:
validate_email_address(value) validate_email_address(value)
except InvalidEmailError as e: except InvalidEmailError as e:
raise ValidationError(str(e)) raise ValidationError(f"{data_key}: {str(e)}")
class EmailDataSchema(ma.Schema): class EmailDataSchema(ma.Schema):
@@ -680,7 +680,7 @@ class EmailDataSchema(ma.Schema):
try: try:
validate_email_address(value) validate_email_address(value)
except InvalidEmailError as e: except InvalidEmailError as e:
raise ValidationError(str(e)) raise ValidationError(f"{data_key}: {str(e)}")
class NotificationsFilterSchema(ma.Schema): class NotificationsFilterSchema(ma.Schema):