Proxy tests, put - post proper body content, offset parameters

gencebay · gencebay · commit d7bc688ec667 · 2018-01-23T17:36:23.000+03:00
diff --git a/src/NetCoreStack.Proxy/Extensions/CollectionExtensions.cs b/src/NetCoreStack.Proxy/Extensions/CollectionExtensions.cs
@@ -1,7 +1,34 @@
-﻿namespace NetCoreStack.Proxy.Extensions
+﻿using System.Collections.Generic;
+
+namespace NetCoreStack.Proxy.Extensions
 {
     internal static class CollectionExtensions
     {
+        internal static IEnumerable<ProxyModelMetadata> ToFlat(this ProxyModelMetadata modelMetadata)
+        {
+            List<ProxyModelMetadata> list = new List<ProxyModelMetadata>();
+            var stack = new Stack<IEnumerator<ProxyModelMetadata>>();
+            var enumerator = modelMetadata.Properties.GetEnumerator();
+            while (true)
+            {
+                if (enumerator.MoveNext())
+                {
+                    ProxyModelMetadata element = enumerator.Current;
+                    yield return element;
 
+                    stack.Push(enumerator);
+                    enumerator = element.Properties.GetEnumerator();
+                }
+                else if (stack.Count > 0)
+                {
+                    enumerator.Dispose();
+                    enumerator = stack.Pop();
+                }
+                else
+                {
+                    yield break;
+                }
+            }
+        }
     }
-}
+}
diff --git a/src/NetCoreStack.Proxy/Internal/DefaultProxyTypeManager.cs b/src/NetCoreStack.Proxy/Internal/DefaultProxyTypeManager.cs
@@ -75,6 +75,14 @@ private IList<ProxyDescriptor> GetProxyDescriptors()
                                     "Remove FromBody attribute to proper model binding.");
                             }
                         }
+                        else
+                        {
+                            var properties = modelMetadata.ToFlat().ToList();
+                            if (properties.Any(p => p.IsFormFile))
+                            {
+                                isMultipartFormData = true;
+                            }
+                        }
 
                         proxyMethodDescriptor.Parameters.Add(modelMetadata);
                     }
diff --git a/test/NetCoreStack.Proxy.Mvc.Hosting/Controllers/GuidelineController.cs b/test/NetCoreStack.Proxy.Mvc.Hosting/Controllers/GuidelineController.cs
@@ -1,22 +1,26 @@
-﻿using Microsoft.AspNetCore.Mvc;
+﻿using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using NetCoreStack.Contracts;
 using NetCoreStack.Proxy.Test.Contracts;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Threading.Tasks;
 
 namespace NetCoreStack.Proxy.Mvc.Hosting.Controllers
 {
     [Route("api/[controller]")]
     public class GuidelineController : Controller, IGuidelineApi
     {
+        private readonly IHostingEnvironment _hostingEnvironment;
         private readonly ILoggerFactory _loggerFactory;
         private readonly ILogger _logger;
 
-        public GuidelineController(ILoggerFactory loggerFactory)
+        public GuidelineController(IHostingEnvironment hostingEnvironment, ILoggerFactory loggerFactory)
         {
+            _hostingEnvironment = hostingEnvironment;
             _loggerFactory = loggerFactory;
             _logger = _loggerFactory.CreateLogger<GuidelineController>();
         }
@@ -73,6 +77,24 @@ public async Task TaskActionPost([FromBody]ComplexTypeModel model)
             _logger.LogWarning(JsonConvert.SerializeObject(model));
         }
 
+        [HttpPost(nameof(TaskSingleFileModel))]
+        public async Task TaskSingleFileModel(SingleFileModel model)
+        {
+            await Task.CompletedTask;
+
+            var name = model.File.Name;
+            var fileName = model.File.FileName;
+            var length = model.File.Length;
+
+            using (var ms = new MemoryStream())
+            {
+                model.File.CopyTo(ms);
+                System.IO.File.WriteAllBytes(Path.Combine(_hostingEnvironment.ContentRootPath, fileName), ms.ToArray());
+            }
+
+            _logger.LogWarning(JsonConvert.SerializeObject(new { name, fileName, length }));
+        }
+
         [HttpPut("kv")]
         public async Task<bool> CreateOrUpdateKey(string key, Bar body)
         {
@@ -87,11 +109,38 @@ public Task<bool> CreateOrUpdateKey(string key)
             throw new NotImplementedException();
         }
 
+        [HttpPut(nameof(TaskKeyAndSingleFileModel))]
+        public Task TaskKeyAndSingleFileModel(string key, SingleFileModel model)
+        {
+            throw new NotImplementedException();
+        }
+
+        [HttpPut(nameof(TaskKeySingleFileAndBarModel))]
+        public Task TaskKeySingleFileAndBarModel(string key, SingleFileModel model, Bar bar)
+        {
+            throw new NotImplementedException();
+        }
+
         [HttpDelete(nameof(TaskActionDelete))]
         public async Task TaskActionDelete(long id)
         {
             await Task.CompletedTask;
             _logger.LogWarning(JsonConvert.SerializeObject(new { id }));
         }
+
+        public Task TaskKeyAndSingleFileAndPropsModel(string key, SingleFileAndPropsModel model)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task TaskEnumerableFileModel(EnumerableFileModel model)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task TaskKeyAndEnumerableFileModel(string key, EnumerableFileModel model)
+        {
+            throw new NotImplementedException();
+        }
     }
 }
diff --git a/test/NetCoreStack.Proxy.Mvc.Hosting/Properties/launchSettings.json b/test/NetCoreStack.Proxy.Mvc.Hosting/Properties/launchSettings.json
@@ -3,7 +3,7 @@
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
     "iisExpress": {
-      "applicationUrl": "http://localhost:55062/",
+      "applicationUrl": "http://localhost:5003/",
       "sslPort": 0
     }
   },
@@ -23,7 +23,7 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
-      "applicationUrl": "http://localhost:55063/"
+      "applicationUrl": "http://localhost:5003/"
     }
   }
 }
diff --git a/test/NetCoreStack.Proxy.Test.Contracts/IGuidelineApi.cs b/test/NetCoreStack.Proxy.Test.Contracts/IGuidelineApi.cs
@@ -24,6 +24,24 @@ public interface IGuidelineApi : IApiContract
         [HttpPostMarker]
         Task TaskActionPost(ComplexTypeModel model);
 
+        [HttpPostMarker]
+        Task TaskSingleFileModel(SingleFileModel model);
+
+        [HttpPostMarker]
+        Task TaskEnumerableFileModel(EnumerableFileModel model);
+
+        [HttpPutMarker(Template = "TaskKeyAndSingleFileModel/{key}")]
+        Task TaskKeyAndSingleFileModel(string key, SingleFileModel model);
+
+        [HttpPutMarker(Template = "TaskKeyAndMultipleFileModel/{key}")]
+        Task TaskKeyAndEnumerableFileModel(string key, EnumerableFileModel model);
+
+        [HttpPutMarker(Template = "TaskKeyAndSingleFileAndPropsModel/{key}")]
+        Task TaskKeyAndSingleFileAndPropsModel(string key, SingleFileAndPropsModel model);
+
+        [HttpPutMarker(Template = "TaskKeySingleFileAndBarModel/{key}")]
+        Task TaskKeySingleFileAndBarModel(string key, SingleFileModel model, Bar bar);
+
         /// <summary>
         /// Template and parameter usage, key parameter will be part of the request Url and extracting it as api/guideline/kv/<key>
         /// </summary>
diff --git a/test/NetCoreStack.Proxy.Test.Contracts/TypesModel.cs b/test/NetCoreStack.Proxy.Test.Contracts/TypesModel.cs
@@ -110,6 +110,13 @@ public class SingleFileModel
         public IFormFile File { get; set; }
     }
 
+    public class SingleFileAndPropsModel
+    {
+        public string String { get; set; }
+        public int Int { get; set; }
+        public IFormFile File { get; set; }
+    }
+
     public class EnumerableFileModel
     {
         public IEnumerable<IFormFile> Files { get; set; }
diff --git a/test/NetCoreStack.Proxy.Tests/ModelTypeTests.cs b/test/NetCoreStack.Proxy.Tests/ModelTypeTests.cs
@@ -358,11 +358,8 @@ public void ProxyModelMetadataInfoForAnonymousObject()
         [Fact]
         public void ProxyModelMetadataInfoForSingleFile()
         {
-            var content = "some text content";
-            var bytes = Encoding.UTF8.GetBytes(content);
-            var length = bytes.Length;
-            var ms = new MemoryStream();
-            var formFile = new FormFile(ms, 0, length, "file", "some_text_file.txt");
+            var formFile = TestHelper.GetFormFile("file");
+            var length = formFile.Length;
             var model = new SingleFileModel
             {
                 File = formFile
@@ -381,11 +378,9 @@ public void ProxyModelMetadataInfoForSingleFile()
         [Fact]
         public void ProxyModelMetadataInfoForEnumerableFile()
         {
-            var content = "some text content";
-            var bytes = Encoding.UTF8.GetBytes(content);
-            var length = bytes.Length;
-            var ms = new MemoryStream();
-            var formFile = new FormFile(ms, 0, length, "file", "some_text_file.txt");
+            var formFile = TestHelper.GetFormFile("file");
+            var length = formFile.Length;
+
             var model = new EnumerableFileModel
             {
                 Files = new[] { formFile }
@@ -403,11 +398,7 @@ public void ProxyModelMetadataInfoForEnumerableFile()
         [Fact]
         public void ProxyModelMetadataInfoForFileModel()
         {
-            var content = "some text content";
-            var bytes = Encoding.UTF8.GetBytes(content);
-            var length = bytes.Length;
-            var ms = new MemoryStream();
-            var formFile = new FormFile(ms, 0, length, "file", "some_text_file.txt");
+            var formFile = TestHelper.GetFormFile("file");
             var model = new FileModel
             {
                 InnerFileModel = new InnerFileModel
diff --git a/test/NetCoreStack.Proxy.Tests/ProxyCreationTests.cs b/test/NetCoreStack.Proxy.Tests/ProxyCreationTests.cs
@@ -1,10 +1,15 @@
-﻿using Microsoft.Extensions.Configuration;
+﻿using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Internal;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Net.Http.Headers;
 using NetCoreStack.Contracts;
 using NetCoreStack.Proxy.Test.Contracts;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
+using System.Text;
 using System.Threading.Tasks;
 using Xunit;
 
@@ -119,6 +124,78 @@ public async Task GetCollectionStreamTest()
             Assert.True(collection.Data.Count() == 5);
         }
 
+        [Fact]
+        public async Task TaskSingleFileModel()
+        {
+            var guidelineApi = Resolver.GetService<IGuidelineApi>();
+
+            var model = new SingleFileModel
+            {
+                File = TestHelper.GetFormFile("file")
+            };
+
+            await guidelineApi.TaskSingleFileModel(model);
+            Assert.True(true);
+        }
+
+        [Fact]
+        public async Task TaskKeyAndSingleFileModel()
+        {
+            var guidelineApi = Resolver.GetService<IGuidelineApi>();
+
+            var model = new SingleFileModel
+            {
+                File = TestHelper.GetFormFile("file")
+            };
+
+            await guidelineApi.TaskKeyAndSingleFileModel(_someKey, model);
+            Assert.True(true);
+        }
+
+        [Fact]
+        public async Task TaskKeyAndSingleFileAndPropsModel()
+        {
+            var guidelineApi = Resolver.GetService<IGuidelineApi>();
+
+            var model = new SingleFileAndPropsModel
+            {
+                Int = 6,
+                String = "Some string value!",
+                File = TestHelper.GetFormFile("file")
+            };
+
+            await guidelineApi.TaskKeyAndSingleFileAndPropsModel(_someKey, model);
+            Assert.True(true);
+        }
+
+        [Fact]
+        public async Task TaskEnumerableFileModel()
+        {
+            var guidelineApi = Resolver.GetService<IGuidelineApi>();
+
+            var model = new EnumerableFileModel
+            {
+                Files = new[] { TestHelper.GetFormFile("files", "file1.txt"), TestHelper.GetFormFile("files", "file2.txt") }
+            };
+
+            await guidelineApi.TaskEnumerableFileModel(model);
+            Assert.True(true);
+        }
+
+        [Fact]
+        public async Task TaskKeyAndEnumerableFileModel()
+        {
+            var guidelineApi = Resolver.GetService<IGuidelineApi>();
+
+            var model = new EnumerableFileModel
+            {
+                Files = new[] { TestHelper.GetFormFile("files", "file1.txt"), TestHelper.GetFormFile("files", "file2.txt") }
+            };
+
+            await guidelineApi.TaskKeyAndEnumerableFileModel(_someKey, model);
+            Assert.True(true);
+        }
+
         [Fact]
         public async Task CreateOrUpdateNoBodyKeyTest()
         {
diff --git a/test/NetCoreStack.Proxy.Tests/TestHelper.cs b/test/NetCoreStack.Proxy.Tests/TestHelper.cs
@@ -6,11 +6,13 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Primitives;
+using Microsoft.Net.Http.Headers;
 using Moq;
 using NetCoreStack.Proxy.Test.Contracts;
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Text;
 
 namespace NetCoreStack.Proxy.Tests
 {
@@ -80,5 +82,25 @@ static TestHelper()
 
             CreateHttpContext(services.BuildServiceProvider());
         }
+
+        public static FormFile GetFormFile(string name, string fileName = "")
+        {
+            var content = "some text content";
+            var bytes = Encoding.UTF8.GetBytes(content);
+            var length = bytes.Length;
+            var ms = new MemoryStream(bytes);
+
+            fileName = string.IsNullOrEmpty(fileName) ? "some_text_file.txt" : fileName;
+            var formFile = new FormFile(ms, 0, length, name, fileName)
+            {
+                Headers = new HeaderDictionary
+                {
+                    [HeaderNames.ContentType] = "text/plain",
+                    [HeaderNames.ContentDisposition] = $"form-data; name=\"{name}\"; filename=\"{fileName}\""
+                }
+            };
+
+            return formFile;
+        }
     }
-}
+}
diff --git a/test/NetCoreStack.Proxy.Tests/httplive.db b/test/NetCoreStack.Proxy.Tests/httplive.db

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,14 @@ private IList<ProxyDescriptor> GetProxyDescriptors()`
`75`	`75`	`"Remove FromBody attribute to proper model binding.");`
`76`	`76`	`}`
`77`	`77`	`}`
	`78`	`+ else`
	`79`	`+ {`
	`80`	`+ var properties = modelMetadata.ToFlat().ToList();`
	`81`	`+ if (properties.Any(p => p.IsFormFile))`
	`82`	`+ {`
	`83`	`+ isMultipartFormData = true;`
	`84`	`+ }`
	`85`	`+ }`
`78`	`86`
`79`	`87`	`proxyMethodDescriptor.Parameters.Add(modelMetadata);`
`80`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"windowsAuthentication": false,`
`4`	`4`	`"anonymousAuthentication": true,`
`5`	`5`	`"iisExpress": {`
`6`		`- "applicationUrl": "http://localhost:55062/",`
	`6`	`+ "applicationUrl": "http://localhost:5003/",`
`7`	`7`	`"sslPort": 0`
`8`	`8`	`}`
`9`	`9`	`},`
`@@ -23,7 +23,7 @@`
`23`	`23`	`"environmentVariables": {`
`24`	`24`	`"ASPNETCORE_ENVIRONMENT": "Development"`
`25`	`25`	`},`
`26`		`- "applicationUrl": "http://localhost:55063/"`
	`26`	`+ "applicationUrl": "http://localhost:5003/"`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,13 @@ public class SingleFileModel`
`110`	`110`	`public IFormFile File { get; set; }`
`111`	`111`	`}`
`112`	`112`
	`113`	`+ public class SingleFileAndPropsModel`
	`114`	`+ {`
	`115`	`+ public string String { get; set; }`
	`116`	`+ public int Int { get; set; }`
	`117`	`+ public IFormFile File { get; set; }`
	`118`	`+ }`
	`119`	`+`
`113`	`120`	`public class EnumerableFileModel`
`114`	`121`	`{`
`115`	`122`	`public IEnumerable<IFormFile> Files { get; set; }`