oplnk-python-utils 1.2.3__tar.gz → 1.2.5__tar.gz

{oplnk_python_utils-1.2.3/oplnk_python_utils.egg-info → oplnk_python_utils-1.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oplnk-python-utils
-Version: 1.2.3
+Version: 1.2.5
 Summary: Reusable utilities for caching, data manipulation, parsing, and MongoDB query building
 Home-page: https://github.com/openlinkspa/oplnk-python-utils
 Author: OpenLink SpA

{oplnk_python_utils-1.2.3 → oplnk_python_utils-1.2.5}/oplnk_python_utils/__init__.py

@@ -7,7 +7,7 @@ from . import core
 from . import cache
 from . import query
 
-__version__ = "1.2.3"
+__version__ = "1.2.5"
 __author__ = "OpenLink SpA"
 
 __all__ = ["core", "cache", "query", "reports", "__version__"]

{oplnk_python_utils-1.2.3 → oplnk_python_utils-1.2.5}/oplnk_python_utils/query/query_builder.py

@@ -626,10 +626,11 @@ class QueryBuilder:
         return {"$sort": sort_pipeline}
 
     def build_fields_pipeline(
-        self, fields_params: List[str], populate_params: Optional[List] = None
+        self, fields_params: List[str], populate_params: Optional[Any] = None
     ) -> Dict[str, Any]:
         """
         Build fields projection pipeline with support for dot notation and array notation.
+        Automatically includes aliases for populated fields when fields is specified.
         """
         fields_pipeline = {}
 
@@ -648,15 +649,43 @@ class QueryBuilder:
 
         # Process populate_params if provided
         if populate_params:
-            for field in populate_params:
+            # Convert to list if it's a dict
+            populate_list = (
+                populate_params
+                if isinstance(populate_params, list)
+                else list(populate_params.keys())
+            )
+
+            for field in populate_list:
                 try:
+                    # Add the original field so sanitization can work
                     normalized_field = normalize_field_path(field)
                     if validate_field_path(normalized_field):
                         fields_pipeline[normalized_field] = 1
+
+                    # Add the populated alias for audit fields
+                    if field in RESERVED_AUDIT_FIELDS:
+                        alias = RESERVED_AUDIT_FIELDS[field]["alias"]
+                        normalized_alias = normalize_field_path(alias)
+                        if validate_field_path(normalized_alias):
+                            fields_pipeline[normalized_alias] = 1
                     else:
-                        print(
-                            f"Warning: Invalid populate field path '{field}', skipping in projection"
-                        )
+                        # For normal relations, find the alias and add it
+                        for relation in self.relations:
+                            relation_name = relation[1]
+                            base_name = relation_name.replace("_ids", "").replace(
+                                "_id", ""
+                            )
+                            if base_name == field:
+                                # Use custom alias if provided (5th element)
+                                if len(relation) > 4 and relation[4]:
+                                    alias = relation[4]
+                                else:
+                                    alias = base_name
+                                normalized_alias = normalize_field_path(alias)
+                                if validate_field_path(normalized_alias):
+                                    fields_pipeline[normalized_alias] = 1
+                                break
                 except Exception as e:
                     print(
                         f"Warning: Error processing populate field '{field}' in projection: {e}"
@@ -842,27 +871,56 @@ class QueryBuilder:
             meta_result = {"totalCount": 0}
 
         # Sanitize populate fields: remove original ID fields when populated (unless requested in fields)
+        # Also ensure populated fields return null if lookup failed (instead of missing)
         if "populate" in query and isinstance(data_result, list):
             fields_requested = query.get("fields", [])
             populated_fields = self._get_populated_fields_list(query["populate"])
 
             for doc in data_result:
-                # For audit fields: remove original if populated version exists and not requested in fields
+                # For audit fields
                 for field_name, field_config in RESERVED_AUDIT_FIELDS.items():
                     if field_name in populated_fields:
-                        # If the populated alias exists and original field is not explicitly requested
-                        if (
-                            field_config["alias"] in doc
-                            and field_name not in fields_requested
-                        ):
-                            if field_name in doc:
+                        alias = field_config["alias"]
+                        original_exists = field_name in doc
+                        alias_exists = alias in doc
+
+                        # If populate was requested but alias doesn't exist, set to null
+                        # (only if the original field exists - meaning the field is part of the document)
+                        if not alias_exists and original_exists:
+                            doc[alias] = None
+
+                        # Remove original field if not explicitly requested in fields
+                        if alias_exists and field_name not in fields_requested:
+                            if original_exists:
                                 del doc[field_name]
 
-                # For normal relations: remove original ID unless explicitly requested in fields
+                # For normal relations
                 for populated_field in populated_fields:
                     if populated_field not in RESERVED_AUDIT_FIELDS:
-                        # Try to find the ID field for this relation
+                        # Find the ID field and alias for this relation
                         id_field = self._get_id_field_for_relation(populated_field)
+
+                        # Determine the alias (same as base name or custom alias)
+                        alias = populated_field
+                        for relation in self.relations:
+                            relation_name = relation[1]
+                            base_name = relation_name.replace("_ids", "").replace(
+                                "_id", ""
+                            )
+                            if base_name == populated_field:
+                                # Use custom alias if provided (5th element)
+                                if len(relation) > 4 and relation[4]:
+                                    alias = relation[4]
+                                break
+
+                        original_exists = id_field and id_field in doc
+                        alias_exists = alias in doc
+
+                        # If populate was requested but alias doesn't exist, set to null
+                        if not alias_exists and original_exists:
+                            doc[alias] = None
+
+                        # Remove original ID field if not explicitly requested in fields
                         if id_field and id_field not in fields_requested:
                             if id_field in doc:
                                 del doc[id_field]

{oplnk_python_utils-1.2.3 → oplnk_python_utils-1.2.5/oplnk_python_utils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oplnk-python-utils
-Version: 1.2.3
+Version: 1.2.5
 Summary: Reusable utilities for caching, data manipulation, parsing, and MongoDB query building
 Home-page: https://github.com/openlinkspa/oplnk-python-utils
 Author: OpenLink SpA

{oplnk_python_utils-1.2.3 → oplnk_python_utils-1.2.5}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="oplnk-python-utils",
-    version="1.2.3",
+    version="1.2.5",
     author="OpenLink SpA",
     author_email="contacto@openlink.cl",
     description="Reusable utilities for caching, data manipulation, parsing, and MongoDB query building",