Merge pull request #153 from Research-Institute/fix/#152

fix(QuerySet): filter was not properly parsing queries with colons

Author: jaredcnance

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()
         {