From 6e7ea2a30c2e1290c90fde67257fb2052d5a8ad3 Mon Sep 17 00:00:00 2001 From: ks129 <45097959+ks129@users.noreply.github.com> Date: Wed, 2 Dec 2020 13:12:45 +0200 Subject: Fix Question circular import and use cls instead self for validators --- backend/models/form.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'backend/models') diff --git a/backend/models/form.py b/backend/models/form.py index d0f0a3c..79d1d54 100644 --- a/backend/models/form.py +++ b/backend/models/form.py @@ -3,7 +3,7 @@ import typing as t from pydantic import BaseModel, Field, validator from backend.constants import FormFeatures -from backend.models import Question +from .question import Question class Form(BaseModel): @@ -14,7 +14,7 @@ class Form(BaseModel): questions: t.List[Question] @validator("features") - def validate_features(self, value: t.List[str]) -> t.Optional[t.List[str]]: + def validate_features(cls, value: t.List[str]) -> t.Optional[t.List[str]]: """Validates is all features in allowed list.""" # Uppercase everything to avoid mixed case in DB value = [v.upper() for v in value] -- cgit v1.2.3 From a47c49900c291f5d6f13411c780da8fbe2133718 Mon Sep 17 00:00:00 2001 From: ks129 <45097959+ks129@users.noreply.github.com> Date: Wed, 2 Dec 2020 13:13:10 +0200 Subject: Use cls instead self for Question model validators --- backend/models/question.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'backend/models') diff --git a/backend/models/question.py b/backend/models/question.py index 2324a47..22565fd 100644 --- a/backend/models/question.py +++ b/backend/models/question.py @@ -14,7 +14,7 @@ class Question(BaseModel): data: t.Dict[str, t.Any] @validator("type", pre=True) - def validate_question_type(self, value: str) -> t.Optional[str]: + def validate_question_type(cls, value: str) -> t.Optional[str]: """Checks if question type in currently allowed types list.""" value = value.lower() if value not in QUESTION_TYPES: @@ -27,19 +27,19 @@ class Question(BaseModel): @validator("data") def validate_question_data( - self, + cls, value: t.Dict[str, t.Any] ) -> t.Optional[t.Dict[str, t.Any]]: """Check does required data exists for question type and remove other data.""" # When question type don't need data, don't add anything to keep DB clean. - if self.type not in REQUIRED_QUESTION_TYPE_DATA: + if cls.type not in REQUIRED_QUESTION_TYPE_DATA: return {} # Required keys (and values) will be stored to here # to remove all unnecessary stuff result = {} - for key, data_type in REQUIRED_QUESTION_TYPE_DATA[self.type].items(): + for key, data_type in REQUIRED_QUESTION_TYPE_DATA[cls.type].items(): if key not in value: raise ValueError(f"Required question data key '{key}' not provided.") -- cgit v1.2.3 From 16552df4c5862004f63a8d8a7c0f8e0dd16f8a0e Mon Sep 17 00:00:00 2001 From: ks129 <45097959+ks129@users.noreply.github.com> Date: Wed, 2 Dec 2020 14:14:57 +0200 Subject: Fix form features validation and allow passing ID as id not _id --- backend/models/form.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'backend/models') diff --git a/backend/models/form.py b/backend/models/form.py index 79d1d54..a8c5f92 100644 --- a/backend/models/form.py +++ b/backend/models/form.py @@ -13,12 +13,16 @@ class Form(BaseModel): features: t.List[str] questions: t.List[Question] + class Config: + allow_population_by_field_name = True + @validator("features") def validate_features(cls, value: t.List[str]) -> t.Optional[t.List[str]]: """Validates is all features in allowed list.""" # Uppercase everything to avoid mixed case in DB value = [v.upper() for v in value] - if not all(v in FormFeatures.__members__.values() for v in value): + allowed_values = list(v.value for v in FormFeatures.__members__.values()) + if not all(v in allowed_values for v in value): raise ValueError("Form features list contains one or more invalid values.") if FormFeatures.COLLECT_EMAIL in value and FormFeatures.REQUIRES_LOGIN not in value: # noqa -- cgit v1.2.3 From f04af89d8fc4e3ca45ecab83f39dd581c207d3cd Mon Sep 17 00:00:00 2001 From: ks129 <45097959+ks129@users.noreply.github.com> Date: Wed, 2 Dec 2020 14:15:26 +0200 Subject: Parse type and data in same validator and allow passing ID as id not _id --- backend/models/question.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'backend/models') diff --git a/backend/models/question.py b/backend/models/question.py index 22565fd..d6b4946 100644 --- a/backend/models/question.py +++ b/backend/models/question.py @@ -1,6 +1,6 @@ import typing as t -from pydantic import BaseModel, Field, validator +from pydantic import BaseModel, Field, root_validator, validator from backend.constants import QUESTION_TYPES, REQUIRED_QUESTION_TYPE_DATA @@ -13,6 +13,9 @@ class Question(BaseModel): type: str data: t.Dict[str, t.Any] + class Config: + allow_population_by_field_name = True + @validator("type", pre=True) def validate_question_type(cls, value: str) -> t.Optional[str]: """Checks if question type in currently allowed types list.""" @@ -25,30 +28,30 @@ class Question(BaseModel): return value - @validator("data") + @root_validator def validate_question_data( cls, value: t.Dict[str, t.Any] ) -> t.Optional[t.Dict[str, t.Any]]: """Check does required data exists for question type and remove other data.""" # When question type don't need data, don't add anything to keep DB clean. - if cls.type not in REQUIRED_QUESTION_TYPE_DATA: + if value.get("type") not in REQUIRED_QUESTION_TYPE_DATA: return {} # Required keys (and values) will be stored to here # to remove all unnecessary stuff result = {} - for key, data_type in REQUIRED_QUESTION_TYPE_DATA[cls.type].items(): - if key not in value: + for key, data_type in REQUIRED_QUESTION_TYPE_DATA[value.get("type")].items(): + if key not in value.get("data", {}): raise ValueError(f"Required question data key '{key}' not provided.") - if not isinstance(value[key], data_type): + if not isinstance(value["data"][key], data_type): raise ValueError( f"Question data key '{key}' expects {data_type.__name__}, " - f"got {type(value[key]).__name__} instead." + f"got {type(value['data'][key]).__name__} instead." ) - result[key] = value[key] + result[key] = value["data"][key] return result -- cgit v1.2.3 From 4736125395c9103bba10c78a1e97f7f99b343745 Mon Sep 17 00:00:00 2001 From: ks129 <45097959+ks129@users.noreply.github.com> Date: Wed, 2 Dec 2020 14:31:25 +0200 Subject: Fix question validator --- backend/models/question.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'backend/models') diff --git a/backend/models/question.py b/backend/models/question.py index d6b4946..1a012ff 100644 --- a/backend/models/question.py +++ b/backend/models/question.py @@ -36,11 +36,7 @@ class Question(BaseModel): """Check does required data exists for question type and remove other data.""" # When question type don't need data, don't add anything to keep DB clean. if value.get("type") not in REQUIRED_QUESTION_TYPE_DATA: - return {} - - # Required keys (and values) will be stored to here - # to remove all unnecessary stuff - result = {} + return value for key, data_type in REQUIRED_QUESTION_TYPE_DATA[value.get("type")].items(): if key not in value.get("data", {}): @@ -52,6 +48,4 @@ class Question(BaseModel): f"got {type(value['data'][key]).__name__} instead." ) - result[key] = value["data"][key] - - return result + return value -- cgit v1.2.3