diff options
| -rw-r--r-- | backend/models/discord_user.py | 11 | ||||
| -rw-r--r-- | backend/models/form_response.py | 19 |
2 files changed, 2 insertions, 28 deletions
diff --git a/backend/models/discord_user.py b/backend/models/discord_user.py index 99d6248..e835176 100644 --- a/backend/models/discord_user.py +++ b/backend/models/discord_user.py @@ -1,6 +1,6 @@ import typing as t -from pydantic import BaseModel, root_validator +from pydantic import BaseModel class DiscordUser(BaseModel): @@ -22,12 +22,3 @@ class DiscordUser(BaseModel): # Custom fields admin: bool - - @root_validator - def validate_data(cls, values: t.Dict[str, t.Any]) -> t.Dict[str, t.Any]: - """Validates email data when email collection is required.""" - if values.get("require_email", False) is True: - if values.get("email") is None or values.get("verified") is None: - raise ValueError("Email information about user is required.") - - return values diff --git a/backend/models/form_response.py b/backend/models/form_response.py index 9fffdde..bea070f 100644 --- a/backend/models/form_response.py +++ b/backend/models/form_response.py @@ -1,8 +1,7 @@ import typing as t -from pydantic import BaseModel, Field, root_validator +from pydantic import BaseModel, Field -from backend.constants import FormFeatures from .antispam import AntiSpam from .discord_user import DiscordUser @@ -18,19 +17,3 @@ class FormResponse(BaseModel): class Config: allow_population_by_field_name = True - - @root_validator - def validate_data(cls, values: t.Dict[str, t.Any]) -> t.Dict[str, t.Any]: - """Validates is all required (based on flags) is provided.""" - flags = values.get("flags", []) - - if FormFeatures.DISABLE_ANTISPAM not in flags and values.get("antispam") is None: # noqa - raise ValueError("Antispam information required.") - - if FormFeatures.REQUIRES_LOGIN in flags: - if values.get("user") is None: - raise ValueError("User information required.") - - values["user"]["require_email"] = FormFeatures.COLLECT_EMAIL in flags - - return values |