fix bug with mixed relation search

Author: OleksandrZhydyk

fastapi_sa_orm_filter/__init__.py

@@ -2,7 +2,7 @@
 from fastapi_sa_orm_filter.main import FilterCore # noqa
 from fastapi_sa_orm_filter.operators import Operators as ops # noqa
 
-__version__ = "0.2.3"
+__version__ = "0.2.4"
 
 from .main import FilterCore as FilterCore # noqa
 from .operators import Operators as Operators # noqa

fastapi_sa_orm_filter/sa_expression_builder.py

@@ -20,14 +20,15 @@ def __init__(self, model: type[DeclarativeBase]) -> None:
         self._model_serializers = self.create_pydantic_serializers()
 
     def get_expressions(self, parsed_filters) -> list[BinaryExpression]:
-        model = self.model
-        table = self.model.__tablename__
 
         or_expr = []
 
         for and_parsed_filter in parsed_filters:
             and_expr = []
             for and_filter in and_parsed_filter:
+                model = self.model
+                table = self.model.__tablename__
+
                 if and_filter.has_relation:
                     model = self.get_relation_model(and_filter.relation)
                     table = model.__tablename__

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fastapi-sqlalchemy-filters"
-version = "0.2.3"
+version = "0.2.4"
 description = ""
 authors = ["Alexandr Zhydyk <zhydykalex@ukr.net>"]
 readme = "README.md"

tests/test_join_filter.py

@@ -69,3 +69,16 @@ async def test_reverse_relation(session, get_vacancy_filter_with_join, create_va
     vacancy = vacancies[0]
     assert vacancy.id == 1
     assert vacancy.company_id == 1
+
+
+async def test_relation_mixed_search(session, get_custom_company_filter, create_vacancies):
+    query = get_custom_company_filter.get_query("title__eq=MyCompany2&vacancies.salary_from__gte=100&id__eq=2")
+    res = await session.execute(query)
+    companies = res.unique().scalars().all()
+
+    assert len(companies) == 1
+    assert len(companies[0].vacancies) == 6
+
+    company = companies[0]
+    assert company.id == 2
+    assert company.title == "MyCompany2"