nlbone 0.6.11__py3-none-any.whl → 0.6.12__py3-none-any.whl

nlbone/adapters/db/postgres/query_builder.py

@@ -28,6 +28,50 @@ class _InvalidEnum(Exception):
     pass
 
 
+from sqlalchemy.orm import aliased
+from sqlalchemy.inspection import inspect
+from sqlalchemy.orm.attributes import InstrumentedAttribute
+from sqlalchemy.orm.relationships import RelationshipProperty
+
+
+def _resolve_column_and_joins(entity, query, field_path: str, join_cache: dict[str, Any]):
+    parts = [p for p in field_path.split(".") if p]
+    if not parts:
+        return None, query
+
+    current_cls_or_alias = entity
+    current_path_key_parts: list[str] = []
+
+    for i, part in enumerate(parts):
+        current_path_key_parts.append(part)
+        path_key = ".".join(current_path_key_parts)
+
+        if not hasattr(current_cls_or_alias, part):
+            return None, query
+
+        attr = getattr(current_cls_or_alias, part)
+
+        prop = getattr(attr, "property", None)
+        if isinstance(prop, RelationshipProperty):
+            alias = join_cache.get(path_key)
+            if alias is None:
+                alias = aliased(prop.mapper.class_)
+                query = query.outerjoin(alias, attr)
+                join_cache[path_key] = alias
+            current_cls_or_alias = alias
+            continue
+
+        if isinstance(attr, InstrumentedAttribute):
+            if i == len(parts) - 1:
+                return attr, query
+            else:
+                return None, query
+
+        return None, query
+
+    return None, query
+
+
 def _apply_order(pagination: PaginateRequest, entity, query):
     order_clauses = []
 
@@ -112,6 +156,7 @@ def _apply_filters(pagination, entity, query):
         return query
 
     predicates = []
+    join_cache: dict[str, Any] = {}
 
     if getattr(pagination, "filters", None):
         for raw_field, value in pagination.filters.items():
@@ -120,10 +165,10 @@ def _apply_filters(pagination, entity, query):
 
             field, op_hint = _parse_field_and_op(raw_field)
 
-            if not hasattr(entity, field):
+            col, query2 = _resolve_column_and_joins(entity, query, field, join_cache)
+            if col is None:
                 continue
-
-            col = getattr(entity, field)
+            query = query2
             coltype = getattr(col, "type", None)
 
             def coerce(v):
@@ -259,13 +304,13 @@ def _serialize_item(item: Any, output_cls: OutputType) -> Any:
 
 
 def get_paginated_response(
-    pagination,
-    entity,
-    session: Session,
-    *,
-    with_count: bool = True,
-    output_cls: Optional[Type] = None,
-    eager_options: Optional[Sequence[LoaderOption]] = None,
+        pagination,
+        entity,
+        session: Session,
+        *,
+        with_count: bool = True,
+        output_cls: Optional[Type] = None,
+        eager_options: Optional[Sequence[LoaderOption]] = None,
 ) -> dict:
     query = session.query(entity)
     if eager_options:

{nlbone-0.6.11.dist-info → nlbone-0.6.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nlbone
-Version: 0.6.11
+Version: 0.6.12
 Summary: Backbone package for interfaces and infrastructure in Python projects
 Author-email: Amir Hosein Kahkbazzadeh <a.khakbazzadeh@gmail.com>
 License: MIT

{nlbone-0.6.11.dist-info → nlbone-0.6.12.dist-info}/RECORD

@@ -15,7 +15,7 @@ nlbone/adapters/db/postgres/__init__.py,sha256=6JYJH0xZs3aR-zuyMpRhsdzFugmqz8npr
 nlbone/adapters/db/postgres/audit.py,sha256=8f5XOuW7_ybJyy_STam1FNzqmZAAVAu7tmMRUkCGJOM,4594
 nlbone/adapters/db/postgres/base.py,sha256=kha9xmklzhuQAK8QEkNBn-mAHq8dUKbOM-3abaBpWmQ,71
 nlbone/adapters/db/postgres/engine.py,sha256=UCegauVB1gvo42ThytYnn5VIcQBwR-5xhcXYFApRFNk,3448
-nlbone/adapters/db/postgres/query_builder.py,sha256=HVGtgWm0AtbjAtW3E3K9KVnJixcZWXMuk5uNqzZQJnQ,9381
+nlbone/adapters/db/postgres/query_builder.py,sha256=SNNkmoMuzcuOwxZlTlplAGqJ0mDQevixLOruqHPa8zM,10855
 nlbone/adapters/db/postgres/repository.py,sha256=J_DBE73JhHPYCk90c5-O7lQtZbxDgqjjN9OcWy4Omvs,1660
 nlbone/adapters/db/postgres/schema.py,sha256=NlE7Rr8uXypsw4oWkdZhZwcIBHQEPIpoHLxcUo98i6s,1039
 nlbone/adapters/db/postgres/uow.py,sha256=nRxNpY-WoWHpym-XeZ8VHm0MYvtB9wuopOeNdV_ebk8,2088
@@ -84,8 +84,8 @@ nlbone/utils/context.py,sha256=MmclJ24BG2uvSTg1IK7J-Da9BhVFDQ5ag4Ggs2FF1_w,1600
 nlbone/utils/http.py,sha256=UXUoXgQdTRNT08ho8zl-C5ekfDsD8uf-JiMQ323ooqw,872
 nlbone/utils/redactor.py,sha256=-V4HrHmHwPi3Kez587Ek1uJlgK35qGSrwBOvcbw8Jas,1279
 nlbone/utils/time.py,sha256=DjjyQ9GLsfXoT6NK8RDW2rOlJg3e6sF04Jw6PBUrSvg,1268
-nlbone-0.6.11.dist-info/METADATA,sha256=_AtHFMQwxHiwO8I-RV-hNDm3ToQMmbuidYTkvvQPnmc,2228
-nlbone-0.6.11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-nlbone-0.6.11.dist-info/entry_points.txt,sha256=CpIL45t5nbhl1dGQPhfIIDfqqak3teK0SxPGBBr7YCk,59
-nlbone-0.6.11.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nlbone-0.6.11.dist-info/RECORD,,
+nlbone-0.6.12.dist-info/METADATA,sha256=l0a2XnCXdUv6VvOv_p880moTJFSwVLzLCC6L8NtapMg,2228
+nlbone-0.6.12.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+nlbone-0.6.12.dist-info/entry_points.txt,sha256=CpIL45t5nbhl1dGQPhfIIDfqqak3teK0SxPGBBr7YCk,59
+nlbone-0.6.12.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+nlbone-0.6.12.dist-info/RECORD,,