Account for overloaded functions in any segment

microsoft · Oct 1, 2024 · 75d4075 · 75d4075
1 parent 73de896
commit 75d4075
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/EdmOperationOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/EdmOperationOperationHandler.cs
@@ -81,6 +81,7 @@ protected override void SetBasicInfo(OpenApiOperation operation)
                 // duplicates in entity vs entityset functions/actions
 
                 List<string> identifiers = new();
+                string pathHash = string.Empty;
                 foreach (ODataSegment segment in Path.Segments)
                 {
                     if (segment is ODataKeySegment keySegment)
@@ -101,6 +102,16 @@ protected override void SetBasicInfo(OpenApiOperation operation)
                             identifiers.Add(keySegment.Identifier);
                         }
                     }
+                    else if (segment is ODataOperationSegment opSegment)
+                    {
+                        if (opSegment.Operation is IEdmFunction function && Context.Model.IsOperationOverload(function))
+                        {
+                            // Hash the segment to avoid duplicate operationIds
+                            pathHash = segment.GetPathHash(Context.Settings);
+                        }
+
+                        identifiers.Add(segment.Identifier);
+                    }
                     else
                     {
                         identifiers.Add(segment.Identifier);
@@ -109,21 +120,13 @@ protected override void SetBasicInfo(OpenApiOperation operation)
 
                 string operationId = string.Join(".", identifiers);
 
-                if (EdmOperation.IsAction())
+                if (!string.IsNullOrEmpty(pathHash))
                 {
-                    operation.OperationId = operationId;
+                    operation.OperationId = operationId + "-" + pathHash;
                 }
                 else
                 {
-                    if (Path.LastSegment is ODataOperationSegment operationSegment &&
-                        Context.Model.IsOperationOverload(operationSegment.Operation))
-                    {
-                        operation.OperationId = operationId + "-" + Path.LastSegment.GetPathHash(Context.Settings);
-                    }
-                    else
-                    {
-                        operation.OperationId = operationId;
-                    }
+                    operation.OperationId = operationId;
                 }
             }