api tests, content binder updates

gencebay · gencebay · commit 24070af61f4a · 2018-01-22T17:43:48.000+03:00
diff --git a/src/NetCoreStack.Proxy/Binders/HttpDeleteContentBinder.cs b/src/NetCoreStack.Proxy/Binders/HttpDeleteContentBinder.cs
@@ -11,7 +11,7 @@ public class HttpDeleteContentBinder : ContentModelBinder
 
         public override void BindContent(ContentModelBindingContext bindingContext)
         {
-            ModelDictionaryResult result = bindingContext.GetResolvedContentResult();
+            ModelDictionaryResult result = bindingContext.ModelContentResolver.Resolve(bindingContext.Parameters, bindingContext.Args);
             List<string> keys = result.Dictionary.Keys.ToList();
             EnsureTemplate(bindingContext.MethodMarkerTemplate, bindingContext.UriDefinition, result.Dictionary, keys);
 
diff --git a/src/NetCoreStack.Proxy/Binders/HttpGetContentBinder.cs b/src/NetCoreStack.Proxy/Binders/HttpGetContentBinder.cs
@@ -11,7 +11,7 @@ public class HttpGetContentBinder : ContentModelBinder
 
         public override void BindContent(ContentModelBindingContext bindingContext)
         {
-            ModelDictionaryResult result = bindingContext.GetResolvedContentResult();
+            ModelDictionaryResult result = bindingContext.ModelContentResolver.Resolve(bindingContext.Parameters, bindingContext.Args);
             List<string> keys = result.Dictionary.Keys.ToList();
             EnsureTemplate(bindingContext.MethodMarkerTemplate, bindingContext.UriDefinition, result.Dictionary, keys);
 
diff --git a/src/NetCoreStack.Proxy/Binders/HttpPostContentBinder.cs b/src/NetCoreStack.Proxy/Binders/HttpPostContentBinder.cs
@@ -1,5 +1,4 @@
-﻿using NetCoreStack.Proxy.Extensions;
-using System.Net.Http;
+﻿using System.Net.Http;
 
 namespace NetCoreStack.Proxy
 {
@@ -12,7 +11,7 @@ public override void BindContent(ContentModelBindingContext bindingContext)
             var isMultiPartFormData = bindingContext.IsMultiPartFormData;
             if (isMultiPartFormData)
             {
-                ModelDictionaryResult result = bindingContext.GetResolvedContentResult();
+                ModelDictionaryResult result = bindingContext.ModelContentResolver.Resolve(bindingContext.Parameters, bindingContext.Args);
                 var content = GetMultipartFormDataContent(result);
                 bindingContext.ContentResult = ContentModelBindingResult.Success(content);
                 return;
diff --git a/src/NetCoreStack.Proxy/Binders/HttpPutContentBinder.cs b/src/NetCoreStack.Proxy/Binders/HttpPutContentBinder.cs
@@ -1,5 +1,4 @@
-﻿using NetCoreStack.Proxy.Extensions;
-using System.Collections.Generic;
+﻿using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
 
@@ -12,18 +11,25 @@ public class HttpPutContentBinder : BodyContentBinder
         public override void BindContent(ContentModelBindingContext bindingContext)
         {
             var isMultiPartFormData = bindingContext.IsMultiPartFormData;
-            var templateKeys = bindingContext.UriDefinition.TemplateKeys;
-
-            // bindingContext.Parameters.Select(p => p.PropertyName);
-
-            //if (bindingContext.ArgsLength == 1)
+            //var templateParameterKeys = bindingContext.UriDefinition.TemplateParameterKeys;
+            //List<ProxyModelMetadata> modelMetadataKeyList = new List<ProxyModelMetadata>();
+            //int parameterOffset = 0;
+            //foreach (var key in templateParameterKeys)
             //{
-
+            //    // Key template must be top level object property or parameter
+            //    ProxyModelMetadata keyModelMetadata = bindingContext.Parameters.FirstOrDefault(p => p.PropertyName == key);
+            //    if (keyModelMetadata != null)
+            //    {
+            //        modelMetadataKeyList.Add(keyModelMetadata);
+            //        bindingContext.Parameters.Remove(keyModelMetadata);
+            //        parameterOffset++;
+            //    }
             //}
 
-            ModelDictionaryResult result = bindingContext.GetResolvedContentResult();
+            ModelDictionaryResult result = bindingContext.ModelContentResolver.Resolve(bindingContext.Parameters, bindingContext.Args);
             List<string> keys = result.Dictionary.Keys.ToList();
             EnsureTemplate(bindingContext.MethodMarkerTemplate, bindingContext.UriDefinition, result.Dictionary, keys);
+
             if (isMultiPartFormData)
             { 
                 var content = GetMultipartFormDataContent(result);
diff --git a/src/NetCoreStack.Proxy/DefaultContentModelBinder.cs b/src/NetCoreStack.Proxy/DefaultContentModelBinder.cs
diff --git a/src/NetCoreStack.Proxy/DefaultModelContentResolver.cs b/src/NetCoreStack.Proxy/DefaultModelContentResolver.cs
@@ -2,6 +2,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using System.Reflection;
 
 namespace NetCoreStack.Proxy
@@ -227,7 +228,7 @@ public ModelDictionaryResult Resolve(List<ProxyModelMetadata> parameters, object
         {
             var result = new ModelDictionaryResult(new Dictionary<string, string>(StringComparer.Ordinal), 
                 new Dictionary<string, IFormFile>(StringComparer.Ordinal));
-
+            
             for (int i = 0; i < parameters.Count; i++)
             {
                 var modelMetadata = parameters[i];
diff --git a/src/NetCoreStack.Proxy/Extensions/ContentModelBindingContextExtensions.cs b/src/NetCoreStack.Proxy/Extensions/ContentModelBindingContextExtensions.cs
@@ -6,11 +6,6 @@ namespace NetCoreStack.Proxy.Extensions
 {
     public static class ContentModelBindingContextExtensions
     {
-        public static ModelDictionaryResult GetResolvedContentResult(this ContentModelBindingContext bindingContext)
-        {
-            return bindingContext.ModelContentResolver.Resolve(bindingContext.Parameters, bindingContext.Args);
-        }
-
         public static void TrySetContent(this ContentModelBindingContext bindingContext, HttpRequestMessage httpRequest)
         {
             if (bindingContext.ContentResult != null && bindingContext.ContentResult.IsContentSet)
diff --git a/src/NetCoreStack.Proxy/Interfaces/IModelContentResolver.cs b/src/NetCoreStack.Proxy/Interfaces/IModelContentResolver.cs
@@ -6,4 +6,4 @@ public interface IModelContentResolver
     {
         ModelDictionaryResult Resolve(List<ProxyModelMetadata> parameters, object[] args);
     }
-}
+}
diff --git a/src/NetCoreStack.Proxy/Types/ProxyModelMetadata.cs b/src/NetCoreStack.Proxy/Types/ProxyModelMetadata.cs
@@ -45,7 +45,7 @@ public class ProxyModelMetadata: IEquatable<ProxyModelMetadata>
 
         public bool IsReferenceOrNullableType { get; private set; }
 
-        public IReadOnlyList<ProxyModelMetadata> Properties { get; private set; }
+        public IList<ProxyModelMetadata> Properties { get; private set; }
 
         public int PropertiesCount => Properties.Count;
 
diff --git a/src/NetCoreStack.Proxy/Types/ProxyUriDefinition.cs b/src/NetCoreStack.Proxy/Types/ProxyUriDefinition.cs
@@ -16,12 +16,15 @@ public class ProxyUriDefinition
 
         public List<string> TemplateKeys { get; private set; }
 
+        public List<string> TemplateParameterKeys { get; private set; }
+
         public List<TemplatePart> ParameterParts { get; private set; }
 
         public ProxyUriDefinition(UriBuilder uriBuilder)
         {
             UriBuilder = uriBuilder;
             TemplateKeys = new List<string>();
+            TemplateParameterKeys = new List<string>();
         }
 
         public void ResolveTemplate(RouteTemplate routeTemplate, string route, string template)
@@ -45,6 +48,10 @@ public void ResolveTemplate(RouteTemplate routeTemplate, string route, string te
                         .SelectMany(s => s.Parts.Where(p => p.IsLiteral)
                         .Select(t => t.Text)).ToList();
 
+                    TemplateParameterKeys = routeTemplate.Segments
+                        .SelectMany(s => s.Parts.Where(p => p.IsParameter)
+                        .Select(t => t.Name)).ToList();
+
                     tmpl = string.Join("/", TemplateKeys);
                     TemplateCache.Add(key, tmpl);
 
diff --git a/test/NetCoreStack.Proxy.Mvc.Hosting/Controllers/GuidelineController.cs b/test/NetCoreStack.Proxy.Mvc.Hosting/Controllers/GuidelineController.cs
@@ -26,7 +26,7 @@ public async Task GetComplexType(ComplexTypeModel model)
         {
             await Task.CompletedTask;
             var query = HttpContext.Request.QueryString.HasValue ? HttpContext.Request.QueryString.Value : string.Empty;
-            _logger.LogDebug(JsonConvert.SerializeObject(model));
+            _logger.LogWarning(JsonConvert.SerializeObject(model));
         }
 
         [HttpGet(nameof(TaskOperation))]
@@ -40,7 +40,7 @@ public async Task<int> PrimitiveReturn(int i, string s, long l, DateTime dt)
         {
             await Task.CompletedTask;
             var query = HttpContext.Request.QueryString.HasValue ? HttpContext.Request.QueryString.Value : string.Empty;
-            _logger.LogDebug(JsonConvert.SerializeObject(new { i, s, l, dt, query }));
+            _logger.LogWarning(JsonConvert.SerializeObject(new { i, s, l, dt, query }));
             return 17;
         }
 
@@ -49,7 +49,7 @@ public async Task GetWithComplexReferenceType(CollectionRequest request)
         {
             await Task.CompletedTask;
             var query = HttpContext.Request.QueryString.HasValue ? HttpContext.Request.QueryString.Value : string.Empty;
-            _logger.LogDebug(JsonConvert.SerializeObject(new { request, query }));
+            _logger.LogWarning(JsonConvert.SerializeObject(new { request, query }));
         }
 
         [HttpGet(nameof(GetEnumerableModels))]
@@ -70,29 +70,22 @@ public Task<CollectionResult<SampleModel>> GetCollectionStreamTask()
         public async Task TaskActionPost([FromBody]ComplexTypeModel model)
         {
             await Task.CompletedTask;
-            _logger.LogDebug(JsonConvert.SerializeObject(model));
+            _logger.LogWarning(JsonConvert.SerializeObject(model));
         }
 
-        [HttpPut(nameof(TaskActionPut))]
-        public async Task TaskActionPut(long id, SampleModel model)
-        {
-            await Task.CompletedTask;
-            _logger.LogDebug(JsonConvert.SerializeObject(new { id, model }));
-        }
-
-        [HttpPut(nameof(CreateOrUpdateKey))]
+        [HttpPut("kv")]
         public async Task<bool> CreateOrUpdateKey(string key, Bar body)
         {
             await Task.CompletedTask;
-            _logger.LogDebug(JsonConvert.SerializeObject(new { key, body }));
+            _logger.LogWarning(JsonConvert.SerializeObject(new { key, body }));
             return true;
         }
 
         [HttpDelete(nameof(TaskActionDelete))]
         public async Task TaskActionDelete(long id)
         {
             await Task.CompletedTask;
-            _logger.LogDebug(JsonConvert.SerializeObject(new { id }));
+            _logger.LogWarning(JsonConvert.SerializeObject(new { id }));
         }
     }
 }
diff --git a/test/NetCoreStack.Proxy.Mvc.Hosting/NetCoreStack.Proxy.Mvc.Hosting.csproj b/test/NetCoreStack.Proxy.Mvc.Hosting/NetCoreStack.Proxy.Mvc.Hosting.csproj
@@ -1,20 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Remove="wwwroot\**" />
-    <Content Remove="wwwroot\**" />
-    <EmbeddedResource Remove="wwwroot\**" />
-    <None Remove="wwwroot\**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore" Version="2.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="1.1.0" />
   </ItemGroup>
 
diff --git a/test/NetCoreStack.Proxy.Mvc.Hosting/Program.cs b/test/NetCoreStack.Proxy.Mvc.Hosting/Program.cs
@@ -1,18 +1,34 @@
-﻿using Microsoft.AspNetCore;
-using Microsoft.AspNetCore.Hosting;
+﻿using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
+using System.IO;
 
 namespace NetCoreStack.Proxy.Mvc.Hosting
 {
     public class Program
     {
         public static void Main(string[] args)
         {
-            BuildWebHost(args).Run();
-        }
+            var webHost = new WebHostBuilder()
+       .UseKestrel()
+       .UseContentRoot(Directory.GetCurrentDirectory())
+       .ConfigureAppConfiguration((hostingContext, config) =>
+       {
+           var env = hostingContext.HostingEnvironment;
+           config.AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
+                 .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true, reloadOnChange: true);
+           config.AddEnvironmentVariables();
+       })
+       .ConfigureLogging((hostingContext, logging) =>
+       {
+           logging.AddConfiguration(hostingContext.Configuration.GetSection("Logging"));
+           logging.AddConsole();
+           logging.AddDebug();
+       })
+       .UseStartup<Startup>()
+       .Build();
 
-        public static IWebHost BuildWebHost(string[] args) =>
-            WebHost.CreateDefaultBuilder(args)
-                .UseStartup<Startup>()
-                .Build();
+            webHost.Run();
+        }
     }
 }
diff --git a/test/NetCoreStack.Proxy.Test.Contracts/IGuidelineApi.cs b/test/NetCoreStack.Proxy.Test.Contracts/IGuidelineApi.cs
@@ -24,9 +24,6 @@ public interface IGuidelineApi : IApiContract
         [HttpPostMarker]
         Task TaskActionPost(ComplexTypeModel model);
 
-        [HttpPutMarker]
-        Task TaskActionPut(long id, SampleModel model);
-
         /// <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.Tests/ModelTypeTests.cs b/test/NetCoreStack.Proxy.Tests/ModelTypeTests.cs
@@ -1,5 +1,4 @@
-﻿using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.Internal;
+﻿using Microsoft.AspNetCore.Http.Internal;
 using NetCoreStack.Proxy.Test.Contracts;
 using System;
 using System.Collections.Generic;
diff --git a/test/NetCoreStack.Proxy.Tests/ProxyCreationTests.cs b/test/NetCoreStack.Proxy.Tests/ProxyCreationTests.cs
@@ -2,7 +2,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using NetCoreStack.Contracts;
 using NetCoreStack.Proxy.Test.Contracts;
-using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -120,19 +119,6 @@ public async Task GetCollectionStreamTest()
             Assert.True(collection.Data.Count() == 5);
         }
 
-        [Fact]
-        public async Task TaskActionPutTest()
-        {
-            var guidelineApi = Resolver.GetService<IGuidelineApi>();
-            await guidelineApi.TaskActionPut(1, new SampleModel
-            {
-                Date = DateTime.Now,
-                String = "Sample model"
-            });
-
-            Assert.True(true);
-        }
-
         [Fact]
         public async Task CreateOrUpdateKeyTest()
         {
diff --git a/test/NetCoreStack.Proxy.Tests/appsettings.json b/test/NetCoreStack.Proxy.Tests/appsettings.json
@@ -1,7 +1,7 @@
 ﻿{
   "ProxySettings": {
     "RegionKeys": {
-      "Main": "http://localhost:5003/,http://localhost:5003/",
+      "Main": "http://localhost:5003/,http://localhost:5004/",
       "Consul": "http://localhost:8500/"
     }
   }
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
`@@ -11,7 +11,7 @@ public class HttpDeleteContentBinder : ContentModelBinder`
`11`	`11`
`12`	`12`	`public override void BindContent(ContentModelBindingContext bindingContext)`
`13`	`13`	`{`
`14`		`- ModelDictionaryResult result = bindingContext.GetResolvedContentResult();`
	`14`	`+ ModelDictionaryResult result = bindingContext.ModelContentResolver.Resolve(bindingContext.Parameters, bindingContext.Args);`
`15`	`15`	`List<string> keys = result.Dictionary.Keys.ToList();`
`16`	`16`	`EnsureTemplate(bindingContext.MethodMarkerTemplate, bindingContext.UriDefinition, result.Dictionary, keys);`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public class HttpGetContentBinder : ContentModelBinder`
`11`	`11`
`12`	`12`	`public override void BindContent(ContentModelBindingContext bindingContext)`
`13`	`13`	`{`
`14`		`- ModelDictionaryResult result = bindingContext.GetResolvedContentResult();`
	`14`	`+ ModelDictionaryResult result = bindingContext.ModelContentResolver.Resolve(bindingContext.Parameters, bindingContext.Args);`
`15`	`15`	`List<string> keys = result.Dictionary.Keys.ToList();`
`16`	`16`	`EnsureTemplate(bindingContext.MethodMarkerTemplate, bindingContext.UriDefinition, result.Dictionary, keys);`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`		`-using NetCoreStack.Proxy.Extensions;`
`2`		`-using System.Net.Http;`
	`1`	`+using System.Net.Http;`
`3`	`2`
`4`	`3`	`namespace NetCoreStack.Proxy`
`5`	`4`	`{`
`@@ -12,7 +11,7 @@ public override void BindContent(ContentModelBindingContext bindingContext)`
`12`	`11`	`var isMultiPartFormData = bindingContext.IsMultiPartFormData;`
`13`	`12`	`if (isMultiPartFormData)`
`14`	`13`	`{`
`15`		`- ModelDictionaryResult result = bindingContext.GetResolvedContentResult();`
	`14`	`+ ModelDictionaryResult result = bindingContext.ModelContentResolver.Resolve(bindingContext.Parameters, bindingContext.Args);`
`16`	`15`	`var content = GetMultipartFormDataContent(result);`
`17`	`16`	`bindingContext.ContentResult = ContentModelBindingResult.Success(content);`
`18`	`17`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,6 @@ namespace NetCoreStack.Proxy.Extensions`
`6`	`6`	`{`
`7`	`7`	`public static class ContentModelBindingContextExtensions`
`8`	`8`	`{`
`9`		`- public static ModelDictionaryResult GetResolvedContentResult(this ContentModelBindingContext bindingContext)`
`10`		`- {`
`11`		`- return bindingContext.ModelContentResolver.Resolve(bindingContext.Parameters, bindingContext.Args);`
`12`		`- }`
`13`		`-`
`14`	`9`	`public static void TrySetContent(this ContentModelBindingContext bindingContext, HttpRequestMessage httpRequest)`
`15`	`10`	`{`
`16`	`11`	`if (bindingContext.ContentResult != null && bindingContext.ContentResult.IsContentSet)`
Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,4 @@ public interface IModelContentResolver`
`6`	`6`	`{`
`7`	`7`	`ModelDictionaryResult Resolve(List<ProxyModelMetadata> parameters, object[] args);`
`8`	`8`	`}`
`9`		`-}`
	`9`	`+}`