Navigation Source in Filter ODataQueryOptions is skipping one level when querying for collection objects

[gupta-aashika]

We are trying to apply a filter query on a collection object which is two-level deep in my entity. Our entity model looks like the following:

	public class MockOpenType
	{
                [DataMember(Name = "customId")]
		public string CustomId { get; set; }
		public Competitor Competitor { get; set; }
	}
	public class Competitor
	{
                [DataMember(Name = "customId")]
		public string CustomId { get; set; }
		public List<Location> Locations { get; set; }
	}
	public class Location
	{
                [DataMember(Name = "customId")]
		public string CustomId { get; set; }
		public string Name { get; set; }
	}

Here is how we are building our EDM model.

            var builder = new ODataConventionModelBuilder();
            var type = typeof(MockOpenType);
            var entityTypeConfiguration = builder.AddEntityType(type);
            entityTypeConfiguration.HasKey(type.GetProperty("CustomId"));
            builder.AddEntitySet(type.Name, entityTypeConfiguration);
            var conf = builder.EntitySet<MockOpenType>(type.Name);
            conf.EntityType.Property(p => p.CustomId).Name = "customId";
            
            var edmModels = builder.GetEdmModel();

The OData query looks like http://localhost/User?$filter=competitor/locations/any(m: m/name eq 'test')

The OData query translates into ODataQueryOptions which has NavigationSource. The navigation source is formed incorrectly. It skips the the competitor in the path. Internally the path segments for "locations" has only single value i.e. ["MockOpenType"]. It skips the "Competitor" entity. Due to this my resultant response is wrong.

Note: Due to some reason, the navigation source is formed correctly if I replace "CustomId" with "Id". Here the path segments is created with two values ["MockOpenType", "Competitor"] and thus the filter works fine.