Merge pull request #147 from microsoftgraph/supportNavPathBindings

Support nav path bindings

Author: MIchaelMainer

GraphODataTemplateWriter.sln

@@ -34,8 +34,8 @@ Global
 		{5F526973-F69E-4C26-B8AD-612590A17A9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2256EC8D-FD7E-4A49-B616-70755AFC9F6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2256EC8D-FD7E-4A49-B616-70755AFC9F6C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2256EC8D-FD7E-4A49-B616-70755AFC9F6C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2256EC8D-FD7E-4A49-B616-70755AFC9F6C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2256EC8D-FD7E-4A49-B616-70755AFC9F6C}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{2256EC8D-FD7E-4A49-B616-70755AFC9F6C}.Release|Any CPU.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Templates/CSharp/Base/CollectionRequest.Base.template.tt

@@ -143,10 +143,13 @@ public string GetPostAsyncMethodForReferencesRequest(OdcmProperty odcmProperty)
 	if (serviceNavigationProperty == null)
 		return string.Empty;
 
-	//Append the singleton's navigation type to the @odata.id if relevant
 	var implicitNavigationProperty = string.Empty;
+	
+	// If the odcmProperty is a part of Singleton, then we need to determine whether there is a  
+	// NavigationPropertyBinding generation hint. If there is, then we need to use it for 
+	// creating the URL of a reference entity in a POST body. 
 	if (serviceNavigationProperty.GetType() == typeof(OdcmSingleton)) 
-		implicitNavigationProperty = "/" + odcmProperty.Name;
+	    implicitNavigationProperty = "/" + odcmProperty.GetImplicitPropertyName((OdcmSingleton)serviceNavigationProperty);
 
     var stringBuilder = new StringBuilder();
 

src/GraphODataTemplateWriter/Extensions/OdcmModelExtensions.cs

@@ -208,6 +208,21 @@ public static OdcmProperty GetServiceCollectionNavigationPropertyForPropertyType
             }
         }
 
+        public static string GetImplicitPropertyName(this OdcmProperty property, OdcmSingleton singleton)
+        {
+            var implicitPropertyName = property.Name;
+            // Default behavior
+            if (singleton.NavigationPropertyBindings.Count() > 0)
+            {
+                var target = singleton.NavigationPropertyBindings.Where(kv => kv.Key.EndsWith(property.Name)).Select(kvp => kvp.Value).FirstOrDefault();
+                if (target != null)
+                {
+                    implicitPropertyName = target;
+                }
+            }
+            return implicitPropertyName;
+        }
+
         public static IEnumerable<OdcmProperty> NavigationProperties(this OdcmClass odcmClass)
         {
             return odcmClass.Properties.Where(prop => prop.IsNavigation());