Change parsing of path values for navigation property bindings

Target Path can be (and is) bit more complex than just namespace and target name
http://docs.oasis-open.org/odata/odata-csdl-xml/v4.01/odata-csdl-xml-v4.01.html#sec_IdentifierandPathValues

Author: mamiksik

CHANGELOG.md

@@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Implementation and naming schema of `from_etree` - Martin Miksik
 - Build functions of struct types now handle invalid metadata independently. - Martin Miksik
 - Default value of precision if non is provided in metadata - Martin Miksik 
+- Parsing of path values for navigation property bindings - Martin Miksik
 
 ### Fixed
 - make sure configured error policies are applied for Annotations referencing

pyodata/model/elements.py

@@ -121,12 +121,19 @@ def name(self):
 
     @staticmethod
     def parse(value):
-        parts = value.split('.')
-
-        if len(parts) == 1:
-            return IdentifierInfo(None, value)
-
-        return IdentifierInfo('.'.join(parts[:-1]), parts[-1])
+        segments = value.split('/')
+        path = []
+        for segment in segments:
+            parts = segment.split('.')
+
+            if len(parts) == 1:
+                path.append(IdentifierInfo(None, parts[-1]))
+            else:
+                path.append(IdentifierInfo('.'.join(parts[:-1]), parts[-1]))
+
+        if len(path) == 1:
+            return path[0]
+        return path
 
 
 class Types:

pyodata/v4/build_functions.py

@@ -10,10 +10,10 @@
 from pyodata.exceptions import PyODataParserError, PyODataModelError
 from pyodata.model.build_functions import build_entity_set
 from pyodata.model.elements import ComplexType, Schema, NullType, build_element, EntityType, Types, \
-    StructTypeProperty, build_annotation, Typ
+    StructTypeProperty, build_annotation, Typ, Identifier
 from pyodata.policies import ParserError
 from pyodata.v4.elements import NavigationTypeProperty, NullProperty, ReferentialConstraint, \
-    NavigationPropertyBinding, to_path_info, EntitySet, Unit, EnumMember, EnumType
+    NavigationPropertyBinding, EntitySet, Unit, EnumMember, EnumType
 
 
 # pylint: disable=protected-access,too-many-locals,too-many-branches,too-many-statements
@@ -115,16 +115,29 @@ def build_schema(config: Config, schema_nodes):
                 config.err_policy(ParserError.ENTITY_SET).resolve(ex)
 
     # After all entity sets are parsed resolve the individual bindings among them and entity types
+    entity_set: EntitySet
     for entity_set in schema.entity_sets:
+        nav_prop_bin: NavigationPropertyBinding
         for nav_prop_bin in entity_set.navigation_property_bindings:
-            path_info = nav_prop_bin.path_info
             try:
-                nav_prop_bin.path = schema.entity_type(path_info.type,
-                                                       namespace=path_info.namespace).nav_proprty(path_info.proprty)
-                nav_prop_bin.target = schema.entity_set(nav_prop_bin.target_info)
+                identifiers = nav_prop_bin.path_info
+                entity_identifier = identifiers[0] if isinstance(identifiers, list) else entity_set.entity_type_info
+                entity = schema.entity_type(entity_identifier.name, namespace=entity_identifier.namespace)
+                name = identifiers[-1].name if isinstance(identifiers, list) else identifiers.name
+                nav_prop_bin.path = entity.nav_proprty(name)
+
+                identifiers = nav_prop_bin.target_info
+                if isinstance(identifiers, list):
+                    name = identifiers[-1].name
+                    namespace = identifiers[-1].namespace
+                else:
+                    name = identifiers.name
+                    namespace = identifiers.namespace
+
+                nav_prop_bin.target = schema.entity_set(name, namespace)
             except PyODataModelError as ex:
                 config.err_policy(ParserError.NAVIGATION_PROPERTY_BIDING).resolve(ex)
-                nav_prop_bin.path = NullType(path_info.type)
+                nav_prop_bin.path = NullType(nav_prop_bin.path_info[-1].name)
                 nav_prop_bin.target = NullProperty(nav_prop_bin.target_info)
 
     # TODO: Finally, process Annotation nodes when all Scheme nodes are completely processed.
@@ -148,7 +161,9 @@ def build_navigation_type_property(config: Config, node):
 
 
 def build_navigation_property_binding(config: Config, node, et_info):
-    return NavigationPropertyBinding(to_path_info(node.get('Path'), et_info), node.get('Target'))
+    # return NavigationPropertyBinding(to_path_info(node.get('Path'), et_info), node.get('Target'))
+
+    return NavigationPropertyBinding(Identifier.parse(node.get('Path')), Identifier.parse(node.get('Target')))
 
 
 def build_unit_annotation(config: Config, target: Typ, annotation_node):

pyodata/v4/elements.py

@@ -1,26 +1,12 @@
 """ Repository of elements specific to the ODATA V4"""
 from typing import Optional, List
 
-import collections
-
 from pyodata.model import elements
 from pyodata.exceptions import PyODataModelError, PyODataException
-from pyodata.model.elements import VariableDeclaration, StructType, TypeInfo, Annotation, Identifier
+from pyodata.model.elements import VariableDeclaration, StructType, Annotation, Identifier, IdentifierInfo
 from pyodata.model.type_traits import TypTraits
 from pyodata.v4.type_traits import EnumTypTrait
 
-PathInfo = collections.namedtuple('PathInfo', 'namespace type proprty')
-
-
-def to_path_info(value: str, et_info: TypeInfo):
-    """ Helper function for parsing Path attribute on NavigationPropertyBinding property """
-    if '/' in value:
-        parts = value.split('.')
-        entity_name, property_name = parts[-1].split('/')
-        return PathInfo('.'.join(parts[:-1]), entity_name, property_name)
-
-    return PathInfo(et_info.namespace, et_info.name, value)
-
 
 class NullProperty:
     """ Defines fallback class when parser is unable to process property defined in xml """
@@ -114,7 +100,7 @@ class NavigationPropertyBinding:
         https://docs.oasis-open.org/odata/odata-csdl-xml/v4.01/csprd06/odata-csdl-xml-v4.01-csprd06.html#sec_NavigationPropertyBinding
     """
 
-    def __init__(self, path_info: PathInfo, target_info: str):
+    def __init__(self, path_info: [IdentifierInfo], target_info: str):
         self._path_info = path_info
         self._target_info = target_info
         self._path: Optional[NavigationTypeProperty] = None
@@ -127,7 +113,7 @@ def __str__(self):
         return f"{self.__class__.__name__}({self.path}, {self.target})"
 
     @property
-    def path_info(self) -> PathInfo:
+    def path_info(self) -> [IdentifierInfo]:
         return self._path_info
 
     @property

tests/v4/test_build_functions.py

@@ -1,10 +1,11 @@
 import pytest
 from lxml import etree
 
-from pyodata.model.elements import build_element, TypeInfo, Typ, ComplexType, EntityType, StructTypeProperty
+from pyodata.model.elements import build_element, TypeInfo, Typ, ComplexType, EntityType, StructTypeProperty, \
+    IdentifierInfo
 from pyodata.model.type_traits import EdmIntTypTraits, EdmBooleanTypTraits
 from pyodata.v4 import NavigationTypeProperty, NavigationPropertyBinding
-from pyodata.v4.elements import PathInfo, Unit, EntitySet, EnumType
+from pyodata.v4.elements import Unit, EntitySet, EnumType
 
 
 class TestSchema:
@@ -73,15 +74,17 @@ def test_build_navigation_property_binding(config):
     et_info = TypeInfo('SampleService', 'Person', False)
     node = etree.fromstring('<NavigationPropertyBinding Path="Friends" Target="People" />')
     navigation_property_binding = build_element(NavigationPropertyBinding, config, node=node, et_info=et_info)
-    assert navigation_property_binding.path_info == PathInfo('SampleService', 'Person', 'Friends')
-    assert navigation_property_binding.target_info == 'People'
+    assert navigation_property_binding.path_info == IdentifierInfo(None, 'Friends')
+    assert navigation_property_binding.target_info == IdentifierInfo(None, 'People')
 
     node = etree.fromstring(
         '<NavigationPropertyBinding Path="SampleService.Flight/Airline" Target="Airlines" />'
     )
     navigation_property_binding = build_element(NavigationPropertyBinding, config, node=node, et_info=et_info)
-    assert navigation_property_binding.path_info == PathInfo('SampleService', 'Flight', 'Airline')
-    assert navigation_property_binding.target_info == 'Airlines'
+    assert navigation_property_binding.path_info == [
+        IdentifierInfo('SampleService', 'Flight'),
+        IdentifierInfo(None, 'Airline')]
+    assert navigation_property_binding.target_info == IdentifierInfo(None, 'Airlines')
 
 
 def test_build_unit_annotation(config):
@@ -122,7 +125,7 @@ def test_build_entity_set_with_v4_builder(config, inline_namespaces):
     entity_set = build_element(EntitySet, config, entity_set_node=entity_set_node)
     assert entity_set.name == 'People'
     assert entity_set.entity_type_info == TypeInfo('SampleService', 'Person', False)
-    assert entity_set.navigation_property_bindings[0].path_info == PathInfo('SampleService', 'Person', 'Friends')
+    assert entity_set.navigation_property_bindings[0].path_info == IdentifierInfo(None, 'Friends')
 
 
 def test_build_enum_type(config, inline_namespaces):