#109 Update DocumentHelper to avoid dictionary key dups

justinyoo · justinyoo · commit ed7a28d34404 · 2020-08-25T11:00:38.000+09:00
diff --git a/samples/Aliencube.AzureFunctions.FunctionApp.Models/DummyListModel.cs b/samples/Aliencube.AzureFunctions.FunctionApp.Models/DummyListModel.cs
@@ -0,0 +1,9 @@
+﻿using System.Collections.Generic;
+
+namespace Aliencube.AzureFunctions.FunctionApp.Models
+{
+    public class DummyListModel
+    {
+        public List<DummyStringModel> ListValues { get; set; }
+    }
+}
diff --git a/samples/Aliencube.AzureFunctions.FunctionApp.Models/DummyStringModel.cs b/samples/Aliencube.AzureFunctions.FunctionApp.Models/DummyStringModel.cs
@@ -0,0 +1,7 @@
+namespace Aliencube.AzureFunctions.FunctionApp.Models
+{
+    public class DummyStringModel
+    {
+        public string StringValue { get; set; }
+    }
+}
diff --git a/samples/Aliencube.AzureFunctions.FunctionAppV1IoC/DummyHttpTrigger.cs b/samples/Aliencube.AzureFunctions.FunctionAppV1IoC/DummyHttpTrigger.cs
@@ -60,5 +60,19 @@ public static async Task<HttpResponseMessage> AddDummy(
 
             return result;
         }
+
+        [FunctionName(nameof(DummyHttpTrigger.UpdateDummies))]
+        [OpenApiOperation(operationId: "updateDummies", tags: new[] { "dummy" }, Summary = "Updates a list of dummies", Description = "This updates a list of dummies.", Visibility = OpenApiVisibilityType.Advanced)]
+        [OpenApiRequestBody(contentType: "application/json", bodyType: typeof(DummyListModel), Required = true, Description = "Dummy list model")]
+        [OpenApiResponseWithBody(statusCode: HttpStatusCode.OK, contentType: "application/json", bodyType: typeof(List<DummyStringModel>), Summary = "Dummy response", Description = "This returns the dummy response")]
+        public static async Task<HttpResponseMessage> UpdateDummies(
+            [HttpTrigger(AuthorizationLevel.Function, "PUT", Route = "dummies")] HttpRequestMessage req,
+            ILogger log)
+        {
+            var content = new List<DummyStringModel>();
+            var result = req.CreateResponse(HttpStatusCode.OK, content);
+
+            return await Task.FromResult(result).ConfigureAwait(false);
+        }
     }
 }
diff --git a/samples/Aliencube.AzureFunctions.FunctionAppV1Static/DummyHttpTrigger.cs b/samples/Aliencube.AzureFunctions.FunctionAppV1Static/DummyHttpTrigger.cs
@@ -50,5 +50,19 @@ public static async Task<HttpResponseMessage> AddDummy(
 
             return await Task.FromResult(result).ConfigureAwait(false);
         }
+
+        [FunctionName(nameof(DummyHttpTrigger.UpdateDummies))]
+        [OpenApiOperation(operationId: "updateDummies", tags: new[] { "dummy" }, Summary = "Updates a list of dummies", Description = "This updates a list of dummies.", Visibility = OpenApiVisibilityType.Advanced)]
+        [OpenApiRequestBody(contentType: "application/json", bodyType: typeof(DummyListModel), Required = true, Description = "Dummy list model")]
+        [OpenApiResponseWithBody(statusCode: HttpStatusCode.OK, contentType: "application/json", bodyType: typeof(List<DummyStringModel>), Summary = "Dummy response", Description = "This returns the dummy response")]
+        public static async Task<HttpResponseMessage> UpdateDummies(
+            [HttpTrigger(AuthorizationLevel.Function, "PUT", Route = "dummies")] HttpRequestMessage req,
+            ILogger log)
+        {
+            var content = new List<DummyStringModel>();
+            var result = req.CreateResponse(HttpStatusCode.OK, content);
+
+            return await Task.FromResult(result).ConfigureAwait(false);
+        }
     }
 }
diff --git a/samples/Aliencube.AzureFunctions.FunctionAppV2IoC/DummyHttpTrigger.cs b/samples/Aliencube.AzureFunctions.FunctionAppV2IoC/DummyHttpTrigger.cs
@@ -60,5 +60,19 @@ public async Task<IActionResult> AddDummy(
 
             return await Task.FromResult(result).ConfigureAwait(false);
         }
+
+        [FunctionName(nameof(DummyHttpTrigger.UpdateDummies))]
+        [OpenApiOperation(operationId: "updateDummies", tags: new[] { "dummy" }, Summary = "Updates a list of dummies", Description = "This updates a list of dummies.", Visibility = OpenApiVisibilityType.Advanced)]
+        [OpenApiRequestBody(contentType: "application/json", bodyType: typeof(DummyListModel), Required = true, Description = "Dummy list model")]
+        [OpenApiResponseWithBody(statusCode: HttpStatusCode.OK, contentType: "application/json", bodyType: typeof(List<DummyStringModel>), Summary = "Dummy response", Description = "This returns the dummy response")]
+        public async Task<IActionResult> UpdateDummies(
+            [HttpTrigger(AuthorizationLevel.Function, "PUT", Route = "dummies")] HttpRequest req,
+            ILogger log)
+        {
+            var content = new List<DummyStringModel>();
+            var result = new OkObjectResult(content);
+
+            return await Task.FromResult(result).ConfigureAwait(false);
+        }
     }
 }
diff --git a/samples/Aliencube.AzureFunctions.FunctionAppV2Static/DummyHttpTrigger.cs b/samples/Aliencube.AzureFunctions.FunctionAppV2Static/DummyHttpTrigger.cs
@@ -51,5 +51,19 @@ public static async Task<IActionResult> AddDummy(
 
             return await Task.FromResult(result).ConfigureAwait(false);
         }
+
+        [FunctionName(nameof(DummyHttpTrigger.UpdateDummies))]
+        [OpenApiOperation(operationId: "updateDummies", tags: new[] { "dummy" }, Summary = "Updates a list of dummies", Description = "This updates a list of dummies.", Visibility = OpenApiVisibilityType.Advanced)]
+        [OpenApiRequestBody(contentType: "application/json", bodyType: typeof(DummyListModel), Required = true, Description = "Dummy list model")]
+        [OpenApiResponseWithBody(statusCode: HttpStatusCode.OK, contentType: "application/json", bodyType: typeof(List<DummyStringModel>), Summary = "Dummy response", Description = "This returns the dummy response")]
+        public static async Task<IActionResult> UpdateDummies(
+            [HttpTrigger(AuthorizationLevel.Function, "PUT", Route = "dummies")] HttpRequest req,
+            ILogger log)
+        {
+            var content = new List<DummyStringModel>();
+            var result = new OkObjectResult(content);
+
+            return await Task.FromResult(result).ConfigureAwait(false);
+        }
     }
 }
diff --git a/samples/Aliencube.AzureFunctions.FunctionAppV3IoC/DummyHttpTrigger.cs b/samples/Aliencube.AzureFunctions.FunctionAppV3IoC/DummyHttpTrigger.cs
@@ -60,5 +60,19 @@ public async Task<IActionResult> AddDummy(
 
             return await Task.FromResult(result).ConfigureAwait(false);
         }
+
+        [FunctionName(nameof(DummyHttpTrigger.UpdateDummies))]
+        [OpenApiOperation(operationId: "updateDummies", tags: new[] { "dummy" }, Summary = "Updates a list of dummies", Description = "This updates a list of dummies.", Visibility = OpenApiVisibilityType.Advanced)]
+        [OpenApiRequestBody(contentType: "application/json", bodyType: typeof(DummyListModel), Required = true, Description = "Dummy list model")]
+        [OpenApiResponseWithBody(statusCode: HttpStatusCode.OK, contentType: "application/json", bodyType: typeof(List<DummyStringModel>), Summary = "Dummy response", Description = "This returns the dummy response")]
+        public async Task<IActionResult> UpdateDummies(
+            [HttpTrigger(AuthorizationLevel.Function, "PUT", Route = "dummies")] HttpRequest req,
+            ILogger log)
+        {
+            var content = new List<DummyStringModel>();
+            var result = new OkObjectResult(content);
+
+            return await Task.FromResult(result).ConfigureAwait(false);
+        }
     }
 }
diff --git a/samples/Aliencube.AzureFunctions.FunctionAppV3Static/DummyHttpTrigger.cs b/samples/Aliencube.AzureFunctions.FunctionAppV3Static/DummyHttpTrigger.cs
@@ -51,5 +51,19 @@ public static async Task<IActionResult> AddDummy(
 
             return await Task.FromResult(result).ConfigureAwait(false);
         }
+
+        [FunctionName(nameof(DummyHttpTrigger.UpdateDummies))]
+        [OpenApiOperation(operationId: "updateDummies", tags: new[] { "dummy" }, Summary = "Updates a list of dummies", Description = "This updates a list of dummies.", Visibility = OpenApiVisibilityType.Advanced)]
+        [OpenApiRequestBody(contentType: "application/json", bodyType: typeof(DummyListModel), Required = true, Description = "Dummy list model")]
+        [OpenApiResponseWithBody(statusCode: HttpStatusCode.OK, contentType: "application/json", bodyType: typeof(List<DummyStringModel>), Summary = "Dummy response", Description = "This returns the dummy response")]
+        public static async Task<IActionResult> UpdateDummies(
+            [HttpTrigger(AuthorizationLevel.Function, "PUT", Route = "dummies")] HttpRequest req,
+            ILogger log)
+        {
+            var content = new List<DummyStringModel>();
+            var result = new OkObjectResult(content);
+
+            return await Task.FromResult(result).ConfigureAwait(false);
+        }
     }
 }
diff --git a/src/Aliencube.AzureFunctions.Extensions.OpenApi.Core/DocumentHelper.cs b/src/Aliencube.AzureFunctions.Extensions.OpenApi.Core/DocumentHelper.cs
@@ -215,9 +215,8 @@ public Dictionary<string, OpenApiSchema> GetOpenApiSchemas(List<MethodInfo> elem
             this._acceptor.Schemas = schemas;
 
             this._acceptor.Accept(collection, namingStrategy);
-            //types.ForEach(p => schemas.AddRange(p.ToOpenApiSchemas(namingStrategy)));
 
-            var union = schemas.Union(rootSchemas)
+            var union = schemas.Concat(rootSchemas.Where(p => !schemas.Keys.Contains(p.Key)))
                                .Distinct()
                                .OrderBy(p => p.Key)
                                .ToDictionary(p => p.Key,

Original file line number	Diff line number	Diff line change
`@@ -60,5 +60,19 @@ public static async Task<HttpResponseMessage> AddDummy(`
`60`	`60`
`61`	`61`	`return result;`
`62`	`62`	`}`
	`63`	`+`
	`64`	`+ [FunctionName(nameof(DummyHttpTrigger.UpdateDummies))]`
	`65`	`+ [OpenApiOperation(operationId: "updateDummies", tags: new[] { "dummy" }, Summary = "Updates a list of dummies", Description = "This updates a list of dummies.", Visibility = OpenApiVisibilityType.Advanced)]`
	`66`	`+ [OpenApiRequestBody(contentType: "application/json", bodyType: typeof(DummyListModel), Required = true, Description = "Dummy list model")]`
	`67`	`+ [OpenApiResponseWithBody(statusCode: HttpStatusCode.OK, contentType: "application/json", bodyType: typeof(List<DummyStringModel>), Summary = "Dummy response", Description = "This returns the dummy response")]`
	`68`	`+ public static async Task<HttpResponseMessage> UpdateDummies(`
	`69`	`+ [HttpTrigger(AuthorizationLevel.Function, "PUT", Route = "dummies")] HttpRequestMessage req,`
	`70`	`+ ILogger log)`
	`71`	`+ {`
	`72`	`+ var content = new List<DummyStringModel>();`
	`73`	`+ var result = req.CreateResponse(HttpStatusCode.OK, content);`
	`74`	`+`
	`75`	`+ return await Task.FromResult(result).ConfigureAwait(false);`
	`76`	`+ }`
`63`	`77`	`}`
`64`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,5 +50,19 @@ public static async Task<HttpResponseMessage> AddDummy(`
`50`	`50`
`51`	`51`	`return await Task.FromResult(result).ConfigureAwait(false);`
`52`	`52`	`}`
	`53`	`+`
	`54`	`+ [FunctionName(nameof(DummyHttpTrigger.UpdateDummies))]`
	`55`	`+ [OpenApiOperation(operationId: "updateDummies", tags: new[] { "dummy" }, Summary = "Updates a list of dummies", Description = "This updates a list of dummies.", Visibility = OpenApiVisibilityType.Advanced)]`
	`56`	`+ [OpenApiRequestBody(contentType: "application/json", bodyType: typeof(DummyListModel), Required = true, Description = "Dummy list model")]`
	`57`	`+ [OpenApiResponseWithBody(statusCode: HttpStatusCode.OK, contentType: "application/json", bodyType: typeof(List<DummyStringModel>), Summary = "Dummy response", Description = "This returns the dummy response")]`
	`58`	`+ public static async Task<HttpResponseMessage> UpdateDummies(`
	`59`	`+ [HttpTrigger(AuthorizationLevel.Function, "PUT", Route = "dummies")] HttpRequestMessage req,`
	`60`	`+ ILogger log)`
	`61`	`+ {`
	`62`	`+ var content = new List<DummyStringModel>();`
	`63`	`+ var result = req.CreateResponse(HttpStatusCode.OK, content);`
	`64`	`+`
	`65`	`+ return await Task.FromResult(result).ConfigureAwait(false);`
	`66`	`+ }`
`53`	`67`	`}`
`54`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,5 +60,19 @@ public async Task<IActionResult> AddDummy(`
`60`	`60`
`61`	`61`	`return await Task.FromResult(result).ConfigureAwait(false);`
`62`	`62`	`}`
	`63`	`+`
	`64`	`+ [FunctionName(nameof(DummyHttpTrigger.UpdateDummies))]`
	`65`	`+ [OpenApiOperation(operationId: "updateDummies", tags: new[] { "dummy" }, Summary = "Updates a list of dummies", Description = "This updates a list of dummies.", Visibility = OpenApiVisibilityType.Advanced)]`
	`66`	`+ [OpenApiRequestBody(contentType: "application/json", bodyType: typeof(DummyListModel), Required = true, Description = "Dummy list model")]`
	`67`	`+ [OpenApiResponseWithBody(statusCode: HttpStatusCode.OK, contentType: "application/json", bodyType: typeof(List<DummyStringModel>), Summary = "Dummy response", Description = "This returns the dummy response")]`
	`68`	`+ public async Task<IActionResult> UpdateDummies(`
	`69`	`+ [HttpTrigger(AuthorizationLevel.Function, "PUT", Route = "dummies")] HttpRequest req,`
	`70`	`+ ILogger log)`
	`71`	`+ {`
	`72`	`+ var content = new List<DummyStringModel>();`
	`73`	`+ var result = new OkObjectResult(content);`
	`74`	`+`
	`75`	`+ return await Task.FromResult(result).ConfigureAwait(false);`
	`76`	`+ }`
`63`	`77`	`}`
`64`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,5 +51,19 @@ public static async Task<IActionResult> AddDummy(`
`51`	`51`
`52`	`52`	`return await Task.FromResult(result).ConfigureAwait(false);`
`53`	`53`	`}`
	`54`	`+`
	`55`	`+ [FunctionName(nameof(DummyHttpTrigger.UpdateDummies))]`
	`56`	`+ [OpenApiOperation(operationId: "updateDummies", tags: new[] { "dummy" }, Summary = "Updates a list of dummies", Description = "This updates a list of dummies.", Visibility = OpenApiVisibilityType.Advanced)]`
	`57`	`+ [OpenApiRequestBody(contentType: "application/json", bodyType: typeof(DummyListModel), Required = true, Description = "Dummy list model")]`
	`58`	`+ [OpenApiResponseWithBody(statusCode: HttpStatusCode.OK, contentType: "application/json", bodyType: typeof(List<DummyStringModel>), Summary = "Dummy response", Description = "This returns the dummy response")]`
	`59`	`+ public static async Task<IActionResult> UpdateDummies(`
	`60`	`+ [HttpTrigger(AuthorizationLevel.Function, "PUT", Route = "dummies")] HttpRequest req,`
	`61`	`+ ILogger log)`
	`62`	`+ {`
	`63`	`+ var content = new List<DummyStringModel>();`
	`64`	`+ var result = new OkObjectResult(content);`
	`65`	`+`
	`66`	`+ return await Task.FromResult(result).ConfigureAwait(false);`
	`67`	`+ }`
`54`	`68`	`}`
`55`	`69`	`}`