From bc68d2f7363d81c3a36f4c5641377dd4d024a932 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Tue, 8 Dec 2020 10:41:04 +0200
Subject: Create DiscordUser Pydantic model for form response

---
 backend/models/discord_user.py | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 backend/models/discord_user.py

(limited to 'backend/models/discord_user.py')

diff --git a/backend/models/discord_user.py b/backend/models/discord_user.py
new file mode 100644
index 0000000..99d6248
--- /dev/null
+++ b/backend/models/discord_user.py
@@ -0,0 +1,33 @@
+import typing as t
+
+from pydantic import BaseModel, root_validator
+
+
+class DiscordUser(BaseModel):
+    """Schema model of Discord user for form response."""
+
+    # Discord default fields
+    id: int  # This is actually snowflake, but we simplify it here
+    username: str
+    discriminator: str
+    avatar: t.Optional[str]
+    bot: t.Optional[bool]
+    system: t.Optional[bool]
+    locale: t.Optional[str]
+    verified: t.Optional[bool]
+    email: t.Optional[str]
+    flags: t.Optional[int]
+    premium_type: t.Optional[int]
+    public_flags: t.Optional[int]
+
+    # 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
-- 
cgit v1.2.3


From f04f605c89446dd854956162ad47698c2933ff8c Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Wed, 9 Dec 2020 19:30:38 +0200
Subject: Remove some validators from models because they don't work

---
 backend/models/discord_user.py  | 11 +----------
 backend/models/form_response.py | 19 +------------------
 2 files changed, 2 insertions(+), 28 deletions(-)

(limited to 'backend/models/discord_user.py')

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
-- 
cgit v1.2.3