Merge pull request #67 from trenoncourt/develop

trenoncourt · web-flow · commit dedf2fc88998 · 2018-08-05T20:18:33.000+02:00
fix: add decimal management in query string
diff --git a/sample/AutoQueryable.Sample.EfCore/Startup.cs b/sample/AutoQueryable.Sample.EfCore/Startup.cs
@@ -90,7 +90,7 @@ private void Seed(AutoQueryableDbContext context)
                     Color = i % 2 == 0 ? "red" : "black",
                     ProductCategory = i % 2 == 0 ? redCategory : blackCategory,
                     ProductModel = model1,
-                    ListPrice = i,
+                    ListPrice = (decimal) (i / 5.0),
                     Name = $"Product {i}",
                     ProductNumber = Guid.NewGuid().ToString(),
                     Rowguid = Guid.NewGuid(),
diff --git a/src/AutoQueryable.AspNet.Filter/AutoQueryable.AspNet.Filter.csproj b/src/AutoQueryable.AspNet.Filter/AutoQueryable.AspNet.Filter.csproj
@@ -3,7 +3,7 @@
     <Description>AutoQueryable.AspNetCore.Filter add filterAttribute for AutoQueryable to Asp.Net &gt;=4.6.</Description>
     <AssemblyTitle>AutoQueryable.AspNetCore.Filter add filterAttribute for AutoQueryable to Asp.Net &gt;=4.6.</AssemblyTitle>
     <VersionPrefix>1.7.0</VersionPrefix>
-    <Version>2.0.3-beta</Version>
+    <Version>2.0.4-beta</Version>
     <Authors>Thibaut Renoncourt</Authors>
     <TargetFramework>net46</TargetFramework>
     <AssemblyName>AutoQueryable.AspNet.Filter</AssemblyName>
diff --git a/src/AutoQueryable.AspNet/AutoQueryable.AspNet.csproj b/src/AutoQueryable.AspNet/AutoQueryable.AspNet.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net46</TargetFramework>
-    <Version>2.0.3-beta</Version>
+    <Version>2.0.4-beta</Version>
     <PackageLicenseUrl>https://raw.githubusercontent.com/trenoncourt/AutoQueryable/master/LICENSE</PackageLicenseUrl>
     <Authors>Thibaut Renoncourt</Authors>
     <Product>AutoQueryable</Product>
diff --git a/src/AutoQueryable.AspNetCore.Filter/AutoQueryable.AspNetCore.Filter.csproj b/src/AutoQueryable.AspNetCore.Filter/AutoQueryable.AspNetCore.Filter.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Description>AutoQueryable.AspNetCore.Filter add filterAttribute for AutoQueryable to Asp.Net Core.</Description>
     <AssemblyTitle>AutoQueryable.AspNetCore.Filter add filterAttribute for AutoQueryable to Asp.Net Core.</AssemblyTitle>
-    <Version>2.0.3-beta</Version>
+    <Version>2.0.4-beta</Version>
     <Authors>Thibaut Renoncourt</Authors>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>AutoQueryable.AspNetCore.Filter</AssemblyName>
diff --git a/src/AutoQueryable.AspNetCore.Swagger/AutoQueryable.AspNetCore.Swagger.csproj b/src/AutoQueryable.AspNetCore.Swagger/AutoQueryable.AspNetCore.Swagger.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Description>AutoQueryable.AspNetCore.Swagger add Swagger parameters for AutoQueryable to Asp.Net Core.</Description>
     <AssemblyTitle>AutoQueryable.AspNetCore.Swagger add Swagger parameters for AutoQueryable to Asp.Net Core.</AssemblyTitle>
-    <Version>2.0.3-beta</Version>
+    <Version>2.0.4-beta</Version>
     <Authors>Thibaut Renoncourt</Authors>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>AutoQueryable.AspNetCore.Swagger</AssemblyName>
diff --git a/src/AutoQueryable.Extensions.Autofac/AutoQueryable.Extensions.Autofac.csproj b/src/AutoQueryable.Extensions.Autofac/AutoQueryable.Extensions.Autofac.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net46</TargetFramework>
-    <Version>2.0.3-beta</Version>
+    <Version>2.0.4-beta</Version>
     <Authors>Thibaut Renoncourt</Authors>
     <Company>-</Company>
     <Product>AutoQueryable</Product>
diff --git a/src/AutoQueryable.Extensions.DependencyInjection/AutoQueryable.Extensions.DependencyInjection.csproj b/src/AutoQueryable.Extensions.DependencyInjection/AutoQueryable.Extensions.DependencyInjection.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Version>2.0.3-beta</Version>
+    <Version>2.0.4-beta</Version>
     <TargetFramework>netstandard2.0</TargetFramework>
     <LangVersion>7.1</LangVersion>
     <Product>AutoQueryable</Product>
diff --git a/src/AutoQueryable/AutoQueryable.csproj b/src/AutoQueryable/AutoQueryable.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Description>AutoQueryable add auto querying functionality like OData with best url practices to Asp.Net Core.</Description>
     <AssemblyTitle>AutoQueryable add auto querying functionality like OData with best url practices to Asp.Net Core.</AssemblyTitle>
-    <Version>2.0.3-beta</Version>
+    <Version>2.0.4-beta</Version>
     <Authors>Thibaut Renoncourt, Nils Goovaerts</Authors>
     <TargetFramework>netstandard1.3</TargetFramework>
     <AssemblyName>AutoQueryable</AssemblyName>
diff --git a/src/AutoQueryable/Helpers/ConvertHelper.cs b/src/AutoQueryable/Helpers/ConvertHelper.cs
@@ -31,6 +31,11 @@ public static dynamic Convert(string value, Type type, IFormatProvider formatPro
                 return Guid.Parse(value);
             }
 
+            if (Equals(type.GetTypeInfo(), typeof(decimal).GetTypeInfo()))
+            {
+                return decimal.Parse(value, CultureInfo.InvariantCulture);
+            }
+
             if (Equals(type.GetTypeInfo(), typeof(DateTime).GetTypeInfo()))
             {
                 if (formatProvider != null)
diff --git a/test/AutoQueryable.UnitTest/DataInitializer.cs b/test/AutoQueryable.UnitTest/DataInitializer.cs
@@ -58,7 +58,7 @@ public static void InitializeSeed(AutoQueryableDbContext dbContext)
                         Color = i % 2 == 0 ? "red" : "black",
                         ProductCategory = i % 2 == 0 ? redCategory : blackCategory,
                         ProductModel = model1,
-                        ListPrice = i,
+                        ListPrice = (decimal) (i / 5.0),
                         Name = i % 2 == 0 ? null : $"Product {i}",
                         ProductNumber = Guid.NewGuid().ToString(),
                         Rowguid = Guid.Parse(GuidString),
diff --git a/test/AutoQueryable.UnitTest/FilterTest.cs b/test/AutoQueryable.UnitTest/FilterTest.cs
@@ -477,5 +477,19 @@ public void DateYearShouldNotEqual2011()
                 query.Count().Should().Be(0);
             }
         }
+        
+        [Fact]
+        public void FilterWithDecimalPoints_Query_ResultsCountShouldBeOne()
+        {
+            using (var context = new AutoQueryableDbContext())
+            {
+                _queryStringAccessor.SetQueryString("ListPrice=1.6");
+
+                DataInitializer.InitializeSeed(context);
+                var query = context.Product.AutoQueryable(_autoQueryableContext)  as IQueryable<object>;
+
+                query.Count().Should().Be(1);
+            }
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,11 @@ public static dynamic Convert(string value, Type type, IFormatProvider formatPro`
`31`	`31`	`return Guid.Parse(value);`
`32`	`32`	`}`
`33`	`33`
	`34`	`+ if (Equals(type.GetTypeInfo(), typeof(decimal).GetTypeInfo()))`
	`35`	`+ {`
	`36`	`+ return decimal.Parse(value, CultureInfo.InvariantCulture);`
	`37`	`+ }`
	`38`	`+`
`34`	`39`	`if (Equals(type.GetTypeInfo(), typeof(DateTime).GetTypeInfo()))`
`35`	`40`	`{`
`36`	`41`	`if (formatProvider != null)`