added bug test representation

Author: CosmoV

fastapi_jsonapi/data_layers/filtering/sqlalchemy.py

@@ -26,7 +26,7 @@
 from fastapi_jsonapi.data_typing import TypeModel, TypeSchema
 from fastapi_jsonapi.exceptions import InvalidFilters, InvalidType
 from fastapi_jsonapi.exceptions.json_api import HTTPException
-from fastapi_jsonapi.schema import get_model_field, get_relationships
+from fastapi_jsonapi.schema import JSONAPISchemaIntrospectionError, get_model_field, get_relationships
 
 log = logging.getLogger(__name__)
 
@@ -288,7 +288,10 @@ def get_model_column(
     schema: Type[TypeSchema],
     field_name: str,
 ) -> InstrumentedAttribute:
-    model_field = get_model_field(schema, field_name)
+    try:
+        model_field = get_model_field(schema, field_name)
+    except JSONAPISchemaIntrospectionError as e:
+        raise InvalidFilters(str(e))
 
     try:
         return getattr(model, model_field)

fastapi_jsonapi/schema.py

@@ -122,6 +122,10 @@ class JSONAPIResultDetailSchema(BaseJSONAPIResultSchema):
 ]
 
 
+class JSONAPISchemaIntrospectionError(Exception):
+    pass
+
+
 def get_model_field(schema: Type["TypeSchema"], field: str) -> str:
     """
     Get the model field of a schema field.
@@ -145,7 +149,7 @@ class ComputerSchema(pydantic_base):
             schema=schema.__name__,
             field=field,
         )
-        raise Exception(msg)
+        raise JSONAPISchemaIntrospectionError(msg)
     return field
 
 

tests/models.py

@@ -387,5 +387,6 @@ class Delta(Base):
     __tablename__ = "delta"
 
     id = Column(Integer, primary_key=True, autoincrement=True)
+    name = Column(String)
     gammas: List["Gamma"] = relationship("Gamma", back_populates="delta", lazy="noload")
     betas: List["Beta"] = relationship("Beta", secondary="beta_delta_binding", back_populates="deltas", lazy="noload")

tests/schemas.py

@@ -466,6 +466,7 @@ class GammaSchema(BaseModel):
 
 
 class DeltaSchema(BaseModel):
+    name: str
     gammas: Optional["GammaSchema"] = Field(
         None,
         relationship=RelationshipInfo(

tests/test_api/test_api_sqla_with_includes.py

@@ -19,13 +19,17 @@
 
 from fastapi_jsonapi.views.view_base import ViewBase
 from tests.common import is_postgres_tests
-from tests.fixtures.app import build_app_custom
+from tests.fixtures.app import ResourceInfoDTO, build_app_custom, build_custom_app_by_schemas
 from tests.fixtures.entities import build_workplace, create_user
 from tests.misc.utils import fake
 from tests.models import (
+    Alpha,
+    Beta,
     Computer,
     ContainsTimestamp,
     CustomUUIDItem,
+    Delta,
+    Gamma,
     Post,
     PostComment,
     SelfRelationship,
@@ -34,8 +38,12 @@
     Workplace,
 )
 from tests.schemas import (
+    AlphaSchema,
+    BetaSchema,
     CustomUserAttributesSchema,
     CustomUUIDItemAttributesSchema,
+    DeltaSchema,
+    GammaSchema,
     PostAttributesBaseSchema,
     PostCommentAttributesBaseSchema,
     SelfRelationshipSchema,
@@ -2740,6 +2748,99 @@ async def test_join_by_relationships_works_correctly_with_many_filters_for_one_f
             "meta": {"count": 0, "totalPages": 1},
         }
 
+    async def test_join_by_relationships_for_one_model_by_different_join_chains(
+        self,
+        async_session: AsyncSession,
+    ):
+        app = build_custom_app_by_schemas(
+            [
+                ResourceInfoDTO(
+                    path="/alpha",
+                    resource_type="alpha",
+                    model=Alpha,
+                    schema_=AlphaSchema,
+                ),
+                ResourceInfoDTO(
+                    path="/beta",
+                    resource_type="beta",
+                    model=Beta,
+                    schema_=BetaSchema,
+                ),
+                ResourceInfoDTO(
+                    path="/gamma",
+                    resource_type="gamma",
+                    model=Gamma,
+                    schema_=GammaSchema,
+                ),
+                ResourceInfoDTO(
+                    path="/delta",
+                    resource_type="delta",
+                    model=Delta,
+                    schema_=DeltaSchema,
+                ),
+            ],
+        )
+
+        # acc_1 = Account(name="account-1")
+        # role_1 = Role(delta=acc_1)
+        # user_1 = User()
+
+        delta_1 = Delta(name="delta_1")
+        beta_1, beta_2 = Beta(), Beta()
+
+        gamma_1 = Gamma(delta=delta_1)
+        gamma_1.betas = [beta_1]
+        gamma_2 = Gamma(delta=delta_1)
+        gamma_2.betas = [beta_2]
+        delta_1.betas = [beta_1, beta_2]
+
+        delta_2 = Delta(name="delta_2")
+        beta_3 = Beta()
+        beta_4 = Beta()
+        gamma_3 = Gamma(delta=delta_2)
+        gamma_3.betas = [beta_3]
+        gamma_4 = Gamma(delta=delta_2)
+        gamma_4.betas = [beta_4]
+        delta_2.betas = [beta_3, beta_4]
+
+        alpha_1 = Alpha(beta=beta_1, gamma=gamma_3)
+        alpha_2 = Alpha(beta=beta_3, gamma=gamma_3)
+
+        async_session.add_all(
+            [
+                delta_1,
+                delta_2,
+                gamma_1,
+                gamma_2,
+                gamma_3,
+                gamma_4,
+                alpha_1,
+                alpha_2,
+            ],
+        )
+        await async_session.commit()
+
+        async with AsyncClient(app=app, base_url="http://test") as client:
+            params = {
+                "filter": json.dumps(
+                    [
+                        {"name": "beta.gammas.delta.name", "op": "ilike", "val": delta_1.name},
+                        {"name": "gamma.delta.name", "op": "ilike", "val": delta_2.name},
+                    ],
+                ),
+            }
+
+            resource_type = "alpha"
+            url = app.url_path_for(f"get_{resource_type}_list")
+            response = await client.get(url, params=params)
+
+            assert response.status_code == status.HTTP_200_OK, response.text
+            assert response.json() == {
+                "data": [{"attributes": {}, "id": str(alpha_1.id), "type": "alpha"}],
+                "jsonapi": {"version": "1.0"},
+                "meta": {"count": 1, "totalPages": 1},
+            }
+
 
 ASCENDING = ""
 DESCENDING = "-"