[fix] core: return correct elements during parsing

* ensure that deeply nested customizers are supported
* correctly increase index when parsing row
* include common parameters when expanding query

Author: AndreyMarkinPPC

libs/core/garf_core/__init__.py

@@ -26,4 +26,4 @@
   'ApiReportFetcher',
 ]
 
-__version__ = '0.6.2'
+__version__ = '0.6.3'

libs/core/garf_core/parsers.py

@@ -150,6 +150,14 @@ def _process_customizer_slice(self, row, customizer, field):
 
   def _process_nested_field(self, row, customizer, field):
     nested_field = self.get_row_element(row, field)
+    values_ = str(customizer.value).split('.')
+    if len(values_) > 1:
+      new_customizer = query_parser.Customizer(
+        type='nested_field', value='.'.join(values_[1:])
+      )
+      return self._process_nested_field(
+        row=nested_field, customizer=new_customizer, field=values_[0]
+      )
     if isinstance(nested_field, MutableSequence):
       return list(
         {
@@ -198,9 +206,10 @@ def parse_row(
         result = self.process_virtual_column(row, virtual_column)
       elif customizer := self.query_spec.customizers.get(column):
         result = self.process_customizer(row, customizer, fields[index])
+        index += 1
       else:
         result = self.parse_row_element(row, fields[index])
-        index = index + 1
+        index += 1
       results.append(result)
     return results
 

libs/core/garf_core/query_editor.py

@@ -156,7 +156,9 @@ def replace_params_template(
       else:
         query_text = self.expand_jinja(query_text, {})
       if macros := params.macro:
-        query_text = query_text.format(**macros)
+        query_text = query_text.format(
+          **macros, **CommonParametersMixin().common_params
+        )
         logger.debug('Query text after macro substitution:\n%s', query_text)
     else:
       query_text = self.expand_jinja(query_text, {})

libs/core/tests/unit/test_parsers.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from typing import Union
+
 import pydantic
 import pytest
 from garf_core import api_clients, parsers, query_editor, query_parser
@@ -21,20 +23,20 @@
 ).generate()
 
 
-class NestedResource(pydantic.BaseModel):
-  nested_element: int
+class ArrayElement(pydantic.BaseModel):
+  element: int = 1
 
 
-class ArrayElement(pydantic.BaseModel):
-  element: int
+class NestedResource(pydantic.BaseModel):
+  nested_element: Union[int, list[ArrayElement]] = 1
 
 
 class FakeProtoMessage(pydantic.BaseModel):
-  resource: str
-  resource_id: int
-  resource_name: str
-  resource_data: NestedResource
-  array_data: list[ArrayElement]
+  resource: str = ''
+  resource_id: int = 1
+  resource_name: str = ''
+  resource_data: NestedResource = NestedResource()
+  array_data: list[ArrayElement] = pydantic.Field(default_factory=list)
 
 
 class TestDictParser:
@@ -229,7 +231,8 @@ def test_parser(self):
         resource_id + 1 AS next_resource_id,
         resource_name,
         resource_data.nested_element,
-        array_data[0].element AS slice_element
+        array_data[0].element AS slice_element,
+        resource_id AS same_resource_id,
       FROM test
         """
     ).generate()
@@ -245,7 +248,7 @@ def test_parse_row_returns_converted_numeric_values(self, test_parser):
     )
 
     parsed_row = test_parser.parse_row(test_row)
-    expected_row = [1, 2, 'test', 10, [100]]
+    expected_row = [1, 2, 'test', 10, [100], 1]
 
     assert parsed_row == expected_row
 
@@ -272,3 +275,23 @@ def test_parse_response_raises_customizer_error_on_missing_nested_attribute(
       match='nested field missing_element is missing in row',
     ):
       test_parser.parse_response(test_response)
+
+  def test_parse_row_process_deeply_nested_customizer(self):
+    spec = query_editor.QuerySpecification(
+      """
+      SELECT
+        resource_id,
+        resource_data:nested_element.element AS numeric_element
+      FROM test
+        """
+    ).generate()
+    test_parser = parsers.ProtoParser(spec)
+    test_row = FakeProtoMessage(
+      resource_id=1,
+      resource_data=NestedResource(nested_element=[ArrayElement(element=100)]),
+    )
+
+    parsed_row = test_parser.parse_row(test_row)
+    expected_row = [1, [100]]
+
+    assert parsed_row == expected_row