PR review fix

Check for: Context.Settings.EnableDerivedTypesReferencesForResponses
microsoft · Jun 26, 2024 · 33ffc43 · 33ffc43
1 parent 9bafba9
commit 33ffc43
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 16 deletions.
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/ComplexPropertyGetOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/ComplexPropertyGetOperationHandler.cs
@@ -144,9 +144,23 @@ protected override void SetExtensions(OpenApiOperation operation)
     protected override void SetResponses(OpenApiOperation operation)
     {
         if (ComplexPropertySegment.Property.Type.IsCollection())
+        {
             SetCollectionResponse(operation, ComplexPropertySegment.ComplexType.FullName());
+        }
         else
-            SetSingleResponse(operation, ComplexPropertySegment.ComplexType.FullName());
+        {
+            OpenApiSchema schema = new()
+            {
+                UnresolvedReference = true,
+                Reference = new OpenApiReference
+                {
+                    Type = ReferenceType.Schema,
+                    Id = ComplexPropertySegment.ComplexType.FullName()
+                }
+            };
+
+            SetSingleResponse(operation, schema);
+        }
 
         operation.AddErrorResponses(Context.Settings, false);
         base.SetResponses(operation);

diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/ODataTypeCastGetOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/ODataTypeCastGetOperationHandler.cs
@@ -197,9 +197,33 @@ protected override void SetBasicInfo(OpenApiOperation operation)
 	protected override void SetResponses(OpenApiOperation operation)
     {
         if (IsSingleElement)
-			SetSingleResponse(operation, TargetSchemaElement.FullName());
+		{
+            OpenApiSchema schema = null;
+
+            if (Context.Settings.EnableDerivedTypesReferencesForResponses)
+            {
+                schema = EdmModelHelper.GetDerivedTypesReferenceSchema(targetStructuredType, Context.Model);
+            }
+
+            if (schema == null)
+            {
+                schema = new OpenApiSchema
+                {
+                    UnresolvedReference = true,
+                    Reference = new OpenApiReference
+                    {
+                        Type = ReferenceType.Schema,
+                        Id = TargetSchemaElement.FullName()
+                    }
+                };
+            }
+
+            SetSingleResponse(operation, schema);
+        }
 		else
-			SetCollectionResponse(operation, TargetSchemaElement.FullName());
+		{
+            SetCollectionResponse(operation, TargetSchemaElement.FullName());
+        }			
 
 		operation.AddErrorResponses(Context.Settings, false);
 

diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/OperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/OperationHandler.cs
@@ -318,21 +318,11 @@ internal void SetCollectionResponse(OpenApiOperation operation, string targetEle
             };
         }
 
-        internal void SetSingleResponse(OpenApiOperation operation, string targetElementFullName)
+        internal void SetSingleResponse(OpenApiOperation operation, OpenApiSchema schema)
         {
             Utils.CheckArgumentNull(operation, nameof(operation));
-            Utils.CheckArgumentNullOrEmpty(targetElementFullName, nameof(targetElementFullName));
-
-            var schema = new OpenApiSchema
-            {
-                UnresolvedReference = true,
-                Reference = new OpenApiReference
-                {
-                    Type = ReferenceType.Schema,
-                    Id = targetElementFullName
-                }
-            };
-
+            Utils.CheckArgumentNull(schema, nameof(schema));
+
             operation.Responses = new OpenApiResponses
             {
                 {