- adds missing navigation properties from uppermost parents

Author: baywet

src/GraphODataTemplateWriter/Extensions/OdcmModelExtensions.cs

@@ -149,11 +149,11 @@ public static IEnumerable<OdcmMethod> GetMethods(this OdcmModel model)
         /// <param name="host">The T4Host that orchestrates applying templates to the OdcmModel.</param>
         /// <returns>A boolean value that indicates whether the current type needs to be disambiguated.</returns>
         public static bool DoesCurrentTypeNeedDisambiguation(this CustomT4Host host)
-        {   
+        {
             // At this point this is only applicable to OdcmProperty.
             // Challenging this assumption will require a lot more investigation.
             if (!(host.CurrentType is OdcmProperty))
-                return false; 
+                return false;
 
             // We only support "Request" dismabiguation at this point. Check whether the
             // current type ends in "Request".
@@ -278,7 +278,8 @@ public static OdcmProperty GetServiceCollectionNavigationPropertyForPropertyType
                 //as an exception so the service has an opportunity to correct this in the metadata
                 throw new Exception("Found no valid EntitySet for the given property.");
 
-            } catch (Exception e)
+            }
+            catch (Exception e)
             {
                 logger.Error("The navigation property \"{0}\" on class \"{1}\" does not specify it is self-contained nor is it defined in an explicit or implicit EntitySet", odcmProperty.Name.ToString(), odcmProperty.Class.FullName.ToString());
                 logger.Error(e);
@@ -327,10 +328,11 @@ public static bool IsBaseAbstractAndReferencedAsPropertyType(this OdcmClass comp
 
         public static IEnumerable<OdcmProperty> NavigationProperties(this OdcmClass odcmClass, bool includeBaseProperties = false)
         {
-            return odcmClass.Properties.Where(prop => prop.IsNavigation())
-                                        .Union(includeBaseProperties && odcmClass.Base != null ?
-                                                odcmClass.Base.Properties.Where(x => x.IsNavigation()) :
-                                                new List<OdcmProperty>());
+            if (includeBaseProperties && odcmClass.Base != null)
+                return odcmClass.Base.NavigationProperties(includeBaseProperties)
+                            .Union(odcmClass.Properties.Where(prop => prop.IsNavigation()));
+            else
+                return odcmClass.Properties.Where(prop => prop.IsNavigation());
         }
 
         public static bool IsNavigation(this OdcmProperty property)