Merge remote-tracking branch 'origin/master' into develop

Author: jaredcnance

PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,11 @@
+Closes #{ISSUE_NUMBER}
+
+#### BUG FIX
+- [ ] reproduce issue in tests
+- [ ] fix issue
+- [ ] bump package version
+
+#### FEATURE
+- [ ] write tests that address the requirements outlined in the issue
+- [ ] fulfill the feature requirements
+- [ ] bump package version

README.md

@@ -5,6 +5,7 @@
 [![NuGet](https://img.shields.io/nuget/v/JsonApiDotNetCore.svg)](https://www.nuget.org/packages/JsonApiDotNetCore/)
 [![MyGet CI](https://img.shields.io/myget/research-institute/vpre/JsonApiDotNetCore.svg)](https://www.myget.org/feed/research-institute/package/nuget/JsonApiDotNetCore)
 [![Join the chat at https://gitter.im/json-api-dotnet-core/Lobby](https://badges.gitter.im/json-api-dotnet-core/Lobby.svg)](https://gitter.im/json-api-dotnet-core/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![FIRST-TIMERS](https://img.shields.io/badge/first--timers--only-friendly-blue.svg)](http://www.firsttimersonly.com/)
 
 A framework for building [json:api](http://jsonapi.org/) compliant web APIs. The ultimate goal of this library is to eliminate as much boilerplate as possible by offering out-of-the-box features such as sorting, filtering and pagination. You just need to focus on defining the resources and implementing your custom business logic. This library has been designed around dependency injection making extensibility incredibly easy.
 

src/JsonApiDotNetCore/Internal/Query/QuerySet.cs

@@ -101,8 +101,11 @@ private List<FilterQuery> ParseFilterQuery(string key, string value)
                 return (string.Empty, value);
 
             // remove prefix from value
+            if(Enum.TryParse(operation[0], out FilterOperations op) == false)
+                return (string.Empty, value);
+            
             var prefix = operation[0];
-            value = operation[1];
+            value = string.Join(":", operation.Skip(1));
 
             return (prefix, value);
         }

src/JsonApiDotNetCore/JsonApiDotNetCore.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <VersionPrefix>2.1.2</VersionPrefix>
+    <VersionPrefix>2.1.3</VersionPrefix>
     <TargetFrameworks>netstandard1.6</TargetFrameworks>
     <AssemblyName>JsonApiDotNetCore</AssemblyName>
     <PackageId>JsonApiDotNetCore</PackageId>

test/UnitTests/Internal/QuerySet_Tests.cs

@@ -48,6 +48,60 @@ public void Can_Build_Filters()
             Assert.Equal("value", querySet.Filters.Single(f => f.Key == "Key").Value);
         }
 
+        [Fact]
+        public void Filters_Properly_Parses_DateTime_With_Operation()
+        {
+            // arrange
+            const string dt = "2017-08-15T22:43:47.0156350-05:00";
+            var query = new Dictionary<string, StringValues> {
+                { "filter[key]", new StringValues("le:" + dt) }
+            };
+
+            _queryCollectionMock
+                .Setup(m => m.GetEnumerator())
+                .Returns(query.GetEnumerator());
+
+            _jsonApiContextMock
+                .Setup(m => m.GetControllerAttribute<DisableQueryAttribute>())
+                .Returns(new DisableQueryAttribute(QueryParams.None));
+
+            // act -- ctor calls BuildQuerySet()
+            var querySet = new QuerySet(
+                _jsonApiContextMock.Object,
+                _queryCollectionMock.Object);
+
+            // assert
+            Assert.Equal(dt, querySet.Filters.Single(f => f.Key == "Key").Value);
+            Assert.Equal("le", querySet.Filters.Single(f => f.Key == "Key").Operation);
+        }
+
+        [Fact]
+        public void Filters_Properly_Parses_DateTime_Without_Operation()
+        {
+            // arrange
+            const string dt = "2017-08-15T22:43:47.0156350-05:00";
+            var query = new Dictionary<string, StringValues> {
+                { "filter[key]", new StringValues(dt) }
+            };
+
+            _queryCollectionMock
+                .Setup(m => m.GetEnumerator())
+                .Returns(query.GetEnumerator());
+
+            _jsonApiContextMock
+                .Setup(m => m.GetControllerAttribute<DisableQueryAttribute>())
+                .Returns(new DisableQueryAttribute(QueryParams.None));
+
+            // act -- ctor calls BuildQuerySet()
+            var querySet = new QuerySet(
+                _jsonApiContextMock.Object,
+                _queryCollectionMock.Object);
+
+            // assert
+            Assert.Equal(dt, querySet.Filters.Single(f => f.Key == "Key").Value);
+            Assert.Equal(string.Empty, querySet.Filters.Single(f => f.Key == "Key").Operation);
+        }
+
         [Fact]
         public void Can_Disable_Filters()
         {