Fixes reading restriction annotations for entity types defining navigation properties (#223)

* Read restrictions annotations for entity types annotated out of line

* Refactor code; add test to validate out of line restriction annotation

* Remove unnecessary code

* Update csproj with release note

Author: irvinesunday

src/Microsoft.OpenApi.OData.Reader/Microsoft.OpenAPI.OData.Reader.csproj

@@ -22,6 +22,7 @@
     <RepositoryUrl>https://github.com/Microsoft/OpenAPI.NET.OData</RepositoryUrl>
     <PackageReleaseNotes>
 - Adds list of all derived types for discriminator mapping #219
+- Fixes reading restriction annotations for entity types defining navigation properties #220
     </PackageReleaseNotes>
     <AssemblyName>Microsoft.OpenApi.OData.Reader</AssemblyName>
     <AssemblyOriginatorKeyFile>..\..\tool\Microsoft.OpenApi.OData.snk</AssemblyOriginatorKeyFile>

src/Microsoft.OpenApi.OData.Reader/PathItem/NavigationPropertyPathItemHandler.cs

@@ -44,8 +44,10 @@ internal class NavigationPropertyPathItemHandler : PathItemHandler
         /// </summary>
         protected bool LastSegmentIsRefSegment { get; private set; }
 
-		/// <inheritdoc/>
-		protected override void SetOperations(OpenApiPathItem item)
+        private IEdmEntityType _entityType;
+
+        /// <inheritdoc/>
+        protected override void SetOperations(OpenApiPathItem item)
         {
             IEdmEntitySet entitySet = NavigationSource as IEdmEntitySet;
             IEdmVocabularyAnnotatable target = entitySet;
@@ -78,12 +80,16 @@ protected override void SetOperations(OpenApiPathItem item)
                 {
                     if (LastSegmentIsKeySegment)
                     {
-                        AddUpdateOperation(item, restriction);
+                        UpdateRestrictionsType updateEntity = Context.Model.GetRecord<UpdateRestrictionsType>(_entityType);
+                        if (updateEntity?.IsUpdatable ?? true)
+                        {
+                            AddUpdateOperation(item, restriction);
+                        }
                     }
                     else
                     {
                         InsertRestrictionsType insert = restriction?.InsertRestrictions;
-                        if (insert == null || insert.IsInsertable)
+                        if (insert?.IsInsertable ?? true)
                         {
                             AddOperation(item, OperationType.Post);
                         }
@@ -121,7 +127,8 @@ private void AddGetOperation(OpenApiPathItem item, NavigationPropertyRestriction
                     }
                     else
                     {
-                        if (read.IsReadable)
+                        ReadRestrictionsType readEntity = Context.Model.GetRecord<ReadRestrictionsType>(_entityType);
+                        if (readEntity?.IsReadable ?? true)
                         {
                             AddOperation(item, OperationType.Get);
                         }
@@ -155,13 +162,17 @@ private void AddDeleteOperation(OpenApiPathItem item, NavigationPropertyRestrict
             }
 
             DeleteRestrictionsType delete = restriction?.DeleteRestrictions;
-            if (delete == null || delete.IsDeletable)
+            DeleteRestrictionsType deleteEntity = Context.Model.GetRecord<DeleteRestrictionsType>(_entityType);
+            bool isDeletableDefault = delete == null && deleteEntity == null;
+
+            if (isDeletableDefault ||
+               (delete?.IsDeletable ?? false) ||
+               (deleteEntity?.IsDeletable ?? false))
             {
                 if (NavigationProperty.TargetMultiplicity() != EdmMultiplicity.Many || LastSegmentIsKeySegment)
                 {
                     AddOperation(item, OperationType.Delete);
                 }
-
                 return;
             }
         }
@@ -193,6 +204,7 @@ protected override void Initialize(ODataContext context, ODataPath path)
             LastSegmentIsKeySegment = path.LastSegment.Kind == ODataSegmentKind.Key;
             LastSegmentIsRefSegment = path.LastSegment.Kind == ODataSegmentKind.Ref;
             NavigationProperty = path.OfType<ODataNavigationPropertySegment>().Last().NavigationProperty;
+            _entityType = NavigationProperty.ToEntityType();
         }
 
         /// <inheritdoc/>

test/Microsoft.OpenAPI.OData.Reader.Tests/PathItem/NavigationPropertyPathItemHandlerTests.cs

@@ -1,4 +1,4 @@
-// ------------------------------------------------------------
+// ------------------------------------------------------------
 //  Copyright (c) Microsoft Corporation.  All rights reserved.
 //  Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
 // ------------------------------------------------------------
@@ -14,6 +14,7 @@
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.OData.Edm;
 using Microsoft.OpenApi.OData.Properties;
+using Microsoft.OpenApi.OData.Tests;
 using Xunit;
 
 namespace Microsoft.OpenApi.OData.PathItem.Tests
@@ -471,6 +472,43 @@ public void CreatePathItemForNavigationPropertyAndUpdateMethodUpdateRestrictions
             Assert.Equal(expected, pathItem.Operations.Select(o => o.Key));
         }
 
+        [Fact]
+        public void CreatePathItemForNavigationPropertyWithOutOfLineRestrictionAnnotations()
+        {
+            // Arrange
+            IEdmModel model = EdmModelHelper.GraphBetaModel;
+            OpenApiConvertSettings settings = new()
+            {
+                ExpandDerivedTypesNavigationProperties = false
+            };
+            ODataContext context = new(model, settings);
+            IEdmSingleton ipSingleton = model.EntityContainer.FindSingleton("informationProtection");
+            Assert.NotNull(ipSingleton);
+            IEdmEntityType ipEntity = model.SchemaElements.OfType<IEdmEntityType>().First(c => c.Name == "informationProtection");
+            Assert.NotNull(ipEntity);
+            IEdmNavigationProperty bitlockerNavProp = ipEntity.DeclaredNavigationProperties().First(c => c.Name == "bitlocker");
+            Assert.NotNull(bitlockerNavProp);
+            IEdmEntityType bitlockerEntity = model.SchemaElements.OfType<IEdmEntityType>().First(c => c.Name == "bitlocker");
+            Assert.NotNull(bitlockerEntity);
+            IEdmNavigationProperty rkNavProp = bitlockerEntity.DeclaredNavigationProperties().First(c => c.Name == "recoveryKeys");
+            Assert.NotNull(rkNavProp);
+
+            ODataPath path = new(new ODataNavigationSourceSegment(ipSingleton),
+                new ODataNavigationPropertySegment(bitlockerNavProp),
+                new ODataNavigationPropertySegment(rkNavProp),
+                new ODataKeySegment(rkNavProp.ToEntityType()));
+            Assert.NotNull(path);
+
+            // Act
+            var pathItem = _pathItemHandler.CreatePathItem(context, path);
+
+            // Assert
+            Assert.NotNull(pathItem);
+            Assert.NotNull(pathItem.Operations);
+            Assert.Single(pathItem.Operations);
+            Assert.Equal(OperationType.Get, pathItem.Operations.FirstOrDefault().Key);
+        }
+
         [Fact]
         public void CreateNavigationPropertyPathItemAddsCustomAttributeValuesToPathExtensions()
         {