aggify 0.2.6__tar.gz → 0.2.7__tar.gz

{aggify-0.2.6 → aggify-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aggify
-Version: 0.2.6
+Version: 0.2.7
 Summary: A MongoDB aggregation generator for Mongoengine
 Home-page: https://github.com/Aggify/aggify
 Author: SeYeD.Dev

{aggify-0.2.6 → aggify-0.2.7}/aggify/aggify.py

@@ -495,6 +495,39 @@ class Aggify:
 
         return merged_pipeline
 
+    # check_fields_exist(self.base_model, let)  # noqa
+    def get_field_name_recursively(self, field: str) -> str:
+        """
+        Recursively fetch the field name by following the hierarchy indicated by the field parameter.
+
+        The function traverses the field hierarchy indicated by double underscores in the field parameter.
+        At each level, it checks if the field exists and then fetches the database field name for it.
+        The entire hierarchy is then joined using a dot (.) separator.
+
+        Parameters:
+        - field (str): A string indicating the hierarchy of fields, separated by double underscores.
+
+        Returns:
+        - str: A dot-separated string representing the full path to the field in the database.
+        """
+
+        field_name = []
+        prev_base = self.base_model
+
+        # Split the field based on double underscores and process each item
+        for index, item in enumerate(field.split("__")):
+            # Ensure the field exists at the current level of hierarchy
+            check_fields_exist(prev_base, [item])  # noqa
+
+            # Append the database field name to the field_name list
+            field_name.append(get_db_field(prev_base, item))
+
+            # Move to the next level in the model hierarchy
+            prev_base = self.get_model_field(prev_base, item)
+
+        # Join the entire hierarchy using dots and return
+        return ".".join(field_name)
+
     @last_out_stage_check
     def lookup(
         self,
@@ -544,11 +577,12 @@ class Aggify:
         else:
             if not query:
                 raise InvalidArgument(expected_list=["query"])
-            check_fields_exist(self.base_model, let)  # noqa
+
             let_dict = {
-                field: f"${get_db_field(self.base_model, field)}"  # noqa
-                for field in let  # noqa
+                field: f"${get_db_field(self.base_model, self.get_field_name_recursively(field))}"  # noqa
+                for field in let
             }
+
             for q in query:
                 # Construct the match stage for each query
                 if isinstance(q, Q):

{aggify-0.2.6 → aggify-0.2.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aggify"
-version = "0.2.6"
+version = "0.2.7"
 authors = ["SeYeD.Dev <me@seyed.dev>"]
 repository = "https://github.com/Aggify/aggify"
 documentation = "https://github.com/Aggify/aggify/docs"