maxmustermann/OpenAPI.NET.OData
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Modify the bug for Operation path

Browse source
This commit is contained in:
Sam Xu 2018-09-17 17:16:51 -07:00
parent 39da108afd
commit fdebe42a71
1 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/Microsoft.OpenApi.OData.Reader/Edm/ODataPathProvider.cs
View file

@ -252,7 +252,7 @@ namespace Microsoft.OpenApi.OData.Edm
}
// 2. Search for generated navigation property
foreach(var path in npPaths)
foreach (var path in npPaths)
{
ODataNavigationPropertySegment npSegment = path.Segments.Last(s => s is ODataNavigationPropertySegment) as ODataNavigationPropertySegment;
IEdmEntityType navPropertyEntityType = npSegment.NavigationProperty.ToEntityType();
@ -262,13 +262,31 @@ namespace Microsoft.OpenApi.OData.Edm
}
bool isLastKeySegment = path.LastSegment is ODataKeySegment;
if ((isCollection && !isLastKeySegment) || (!isCollection && isLastKeySegment))
if (isCollection)
{
ODataPath newPath = path.Clone();
newPath.Push(new ODataOperationSegment(edmOperation));
_allODataPaths.Add(newPath);
found = true;
if (isLastKeySegment)
{
continue;
}
if (npSegment.NavigationProperty.TargetMultiplicity() != EdmMultiplicity.Many)
{
continue;
}
}
else
{
if (!isLastKeySegment && npSegment.NavigationProperty.TargetMultiplicity() == EdmMultiplicity.Many)
{
continue;
}
}
ODataPath newPath = path.Clone();
newPath.Push(new ODataOperationSegment(edmOperation));
_allODataPaths.Add(newPath);
found = true;
}
if (found)