Prodream/ormar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add tests for creation from dictionaries and for m2m relations

Browse Source
This commit is contained in:
collerek
2021-10-09 17:19:17 +02:00
parent 6d2712c0f8
commit 4896a3a982
2 changed files with 51 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
ormar/models/newbasemodel.py
View File

@ -266,7 +266,6 @@ class NewBaseModel(pydantic.BaseModel, ModelTableProxy, metaclass=ModelMetaclass
self._convert_json(
k,
model_fields[k].expand_relationship(v, self, to_register=False)
if k in model_fields
else (v if k in pydantic_fields else model_fields[k]),
),
@ -797,7 +796,7 @@ class NewBaseModel(pydantic.BaseModel, ModelTableProxy, metaclass=ModelMetaclass
own_values = {
k: v for k, v in values.items() if k not in cls.extract_related_names()
}
m = cls.__new__(cls)
model = cls.__new__(cls)
fields_values: Dict[str, Any] = {}
for name, field in cls.__fields__.items():
if name in own_values:
@ -805,33 +804,41 @@ class NewBaseModel(pydantic.BaseModel, ModelTableProxy, metaclass=ModelMetaclass
elif not field.required:
fields_values[name] = field.get_default()
fields_values.update(own_values)
object.__setattr__(m, "__dict__", fields_values)
m._initialize_internal_attributes()
for relation in cls.extract_related_names():
if relation in values:
relation_field = cls.Meta.model_fields[relation]
if isinstance(values[relation], list):
relation_value = [
relation_field.to.construct(**x) if isinstance(x, dict) else x
for x in values[relation]
]
else:
relation_value = [
relation_field.to.construct(**values[relation])
if isinstance(values[relation], dict)
else values[relation]
]
for child in relation_value:
m._orm.add(
parent=child,
child=m,
field=relation_field,
)
object.__setattr__(model, "__dict__", fields_values)
model._initialize_internal_attributes()
cls._construct_relations(model=model, values=values)
if _fields_set is None:
_fields_set = set(values.keys())
object.__setattr__(m, "__fields_set__", _fields_set)
return m
object.__setattr__(model, "__fields_set__", _fields_set)
return model
@classmethod
def _construct_relations(cls: Type["T"], model: "T", values: Dict):
present_relations = [
relation for relation in cls.extract_related_names() if relation in values
]
for relation in present_relations:
value_to_set = values[relation]
if not isinstance(value_to_set, list):
value_to_set = [value_to_set]
relation_field = cls.Meta.model_fields[relation]
relation_value = [
cls.construct_from_dict_if_required(relation_field, value=x)
for x in value_to_set
]
for child in relation_value:
model._orm.add(
parent=child,
child=model,
field=relation_field,
)
@staticmethod
def construct_from_dict_if_required(relation_field: "BaseField", value: Any):
return (
relation_field.to.construct(**value) if isinstance(value, dict) else value
)
def update_from_dict(self, value_dict: Dict) -> "NewBaseModel":
"""