Skip to content

improve _add_class_id_filter #1268

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

Open
CAPITAINMARVEL wants to merge 1 commit into
base: main
Choose a base branch
from
Open

improve _add_class_id_filter #1268

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 9 additions & 16 deletions beanie/odm/interfaces/find.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,36 +434,29 @@ async def count(cls) -> int:

@classmethod
def _add_class_id_filter(cls, args: Tuple, with_children: bool = False):
settings = cls.get_settings()
class_id = settings.class_id

# skip if _class_id is already added
if any(
(
True
for a in args
if isinstance(a, Iterable) and cls.get_settings().class_id in a
)
):
if any(isinstance(a, Iterable) and class_id in a for a in args):
return args

if (
cls.get_model_type() == ModelType.Document
and cls._inheritance_inited
):
if not with_children:
args += ({cls.get_settings().class_id: cls._class_id},)
args += ({class_id: cls._class_id},)
else:
args += (
{
cls.get_settings().class_id: {
class_id: {
"$in": [cls._class_id]
+ [cname for cname in cls._children.keys()]
+ [cname for cname in cls._children]
}
},
)

if cls.get_settings().union_doc:
args += (
{
cls.get_settings().class_id: cls.get_settings().union_doc_alias
},
)
if settings.union_doc:
args += ({class_id: settings.union_doc_alias},)
return args
Loading