Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #349 -- subtract lists in Baker.get_fields() instead of casting to set #352

Merged
merged 3 commits into from
Oct 13, 2022
Merged

Fix #349 -- subtract lists in Baker.get_fields() instead of casting to set #352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
26e8f71
Fix #349 -- substract lists in `Baker.get_fields()` instead of castin…
amureki Oct 11, 2022
f417b71
Remove `Baker.get_related` in favor of Django API methods
amureki Oct 11, 2022
8c332a4
Add CHANGELOG.md entry
amureki Oct 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Added

### Changed
- Improve `Baker.get_fields()` to substract lists instead of extra set cast [PR #352](https://github.com/model-bakers/model_bakery/pull/352)

### Removed

Expand Down
21 changes: 8 additions & 13 deletions model_bakery/baker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,7 @@
from django.db.models.fields.related import (
ReverseManyToOneDescriptor as ForeignRelatedObjectsDescriptor,
)
from django.db.models.fields.reverse_related import (
ManyToManyRel,
ManyToOneRel,
OneToOneRel,
)
from django.db.models.fields.reverse_related import ManyToOneRel, OneToOneRel

from . import generators, random_gen
from ._types import M, NewM
Expand Down Expand Up @@ -403,13 +399,12 @@ def prepare(
params.update(attrs)
return self._make(**params)

def get_fields(self) -> Any:
return set(self.model._meta.get_fields()) - set(self.get_related())

def get_related(
self,
) -> List[Union[ManyToOneRel, OneToOneRel, ManyToManyRel]]:
return [r for r in self.model._meta.related_objects]
def get_fields(self) -> List[Any]:
return [
f
for f in self.model._meta.get_fields()
if f not in self.model._meta.related_objects
]

def _make(
self,
Expand Down Expand Up @@ -474,7 +469,7 @@ def _make(
_save_kwargs=_save_kwargs,
)
if commit:
for related in self.get_related():
for related in self.model._meta.related_objects:
self.create_by_related_name(instance, related)

if _refresh_after_create:
Expand Down