Mirrors/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2025-12-07 10:55:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: "NOT IN" doesn't apply filter properly (#5154)

Browse Source
This commit is contained in:
Michael Genson
2025-03-18 13:07:26 -05:00
committed by GitHub
parent 2deb9c276c
commit 0f58ac5b47
2 changed files with 102 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
mealie/schema/response/query_filter.py
View File

@@ -335,13 +335,25 @@ class QueryFilterBuilder:
return current_model, model_attr, query
@staticmethod
def _get_filter_element(
component: QueryFilterBuilderComponent, model, model_attr, model_attr_type
) -> sa.ColumnElement:
@classmethod
def _transform_model_attr(cls, model_attr: InstrumentedAttribute, model_attr_type: Any) -> InstrumentedAttribute:
if isinstance(model_attr_type, sqltypes.String):
model_attr = sa.func.lower(model_attr)
return model_attr
@classmethod
def _get_filter_element(
cls,
query: sa.Select,
component: QueryFilterBuilderComponent,
model: type[Model],
model_attr: InstrumentedAttribute,
model_attr_type: Any,
) -> sa.ColumnElement:
original_model_attr = model_attr
model_attr = cls._transform_model_attr(model_attr, model_attr_type)
# Keywords
if component.relationship is RelationalKeyword.IS:
element = model_attr.is_(component.validate(model_attr_type))
@@ -350,7 +362,13 @@ class QueryFilterBuilder:
elif component.relationship is RelationalKeyword.IN:
element = model_attr.in_(component.validate(model_attr_type))
elif component.relationship is RelationalKeyword.NOT_IN:
element = model_attr.not_in(component.validate(model_attr_type))
vals = component.validate(model_attr_type)
if original_model_attr.parent.entity != model:
subq = query.with_only_columns(model.id).where(model_attr.in_(vals))
element = sa.not_(model.id.in_(subq))
else:
element = sa.not_(model_attr.in_(vals))
elif component.relationship is RelationalKeyword.CONTAINS_ALL:
primary_model_attr: InstrumentedAttribute = getattr(model, component.attribute_name.split(".")[0])
element = sa.and_()
@@ -428,7 +446,7 @@ class QueryFilterBuilder:
if (column_alias := column_aliases.get(base_attribute_name)) is not None:
model_attr = column_alias
element = self._get_filter_element(component, model, model_attr, model_attr.type)
element = self._get_filter_element(query, component, model, model_attr, model_attr.type)
partial_group.append(element)
# combine the completed groups into one filter