apply pr feedback

Author: NullVoxPopuli

README.md

@@ -107,9 +107,7 @@ dotnet test
 #### Cleaning
 
 Sometimes the compiled files can be dirty / corrupt from other branches / failed builds.
-If your bash prompt supports the globstar, you can recursively delete the `bin` and `obj` directories:
 
 ```bash
-shopt -s globstar
-rm -rf **/bin && rm -rf **/obj
+dotnet clean
 ```

src/JsonApiDotNetCore/Extensions/IQueryableExtensions.cs

@@ -127,34 +127,22 @@ public static IQueryable<TSource> Filter<TSource>(this IQueryable<TSource> sourc
 
                     return source.Where(lambdaIn);
                 }
-                else if (op == FilterOperations.@is || op == FilterOperations.isnot) {
+                else if (op == FilterOperations.isnotnull || op == FilterOperations.isnull) {
+                    // {model}
                     var parameter = Expression.Parameter(concreteType, "model");
                     // {model.Id}
                     var left = Expression.PropertyOrField(parameter, property.Name);
-                    var right = Expression.Constant(filterQuery.PropertyValue, typeof(string));
+                    var right = Expression.Constant(null);
 
                     var body = GetFilterExpressionLambda(left, right, op);
                     var lambda = Expression.Lambda<Func<TSource, bool>>(body, parameter);
 
                     return source.Where(lambda);
                 }
                 else
-                {   
-                    var isNullabe = IsNullable(property.PropertyType);
-                    var propertyValue = filterQuery.PropertyValue;
-                    var value = propertyValue;
-
-                    if (op == FilterOperations.@isnot || op == FilterOperations.isnot)
-                    {
-                        if (isNullabe && propertyValue == "null") 
-                        {
-                            value = null;
-                        }
-                    }
-
-                    // convert the incoming value to the target value type
+                {   // convert the incoming value to the target value type
                     // "1" -> 1
-                    var convertedValue = TypeHelper.ConvertType(value, property.PropertyType);
+                    var convertedValue = TypeHelper.ConvertType(filterQuery.PropertyValue, property.PropertyType);
                     // {model}
                     var parameter = Expression.Parameter(concreteType, "model");
                     // {model.Id}
@@ -264,11 +252,11 @@ private static Expression GetFilterExpressionLambda(Expression left, Expression
                 case FilterOperations.ne:
                     body = Expression.NotEqual(left, right);
                     break;
-                case FilterOperations.isnot:
+                case FilterOperations.isnotnull:
                     // {model.Id != null}
                     body = Expression.NotEqual(left, right);
                     break;
-                case FilterOperations.@is:
+                case FilterOperations.isnull:
                     // {model.Id == null}
                     body = Expression.Equal(left, right);
                     break;

src/JsonApiDotNetCore/Internal/Query/FilterOperations.cs

@@ -12,7 +12,7 @@ public enum FilterOperations
         ne = 6,
         @in = 7, // prefix with @ to use keyword
         nin = 8,
-        @is = 9,
-        isnot = 10
+        isnull = 9,
+        isnotnull = 10
     }
 }

test/JsonApiDotNetCoreExampleTests/Acceptance/TodoItemsControllerTests.cs

@@ -92,7 +92,7 @@ public async Task Can_Filter_TodoItems()
         }
 
         [Fact]
-        public async Task Can_Filter_TodoItems_Using_IsNot_Operator()
+        public async Task Can_Filter_TodoItems_Using_IsNotNull_Operator()
         {
             // Arrange
             var todoItem = _todoItemFaker.Generate();
@@ -101,21 +101,23 @@ public async Task Can_Filter_TodoItems_Using_IsNot_Operator()
             _context.SaveChanges();
 
             var httpMethod = new HttpMethod("GET");
-            var route = $"/api/v1/todo-items?filter[updated-date]=isnot:null";
+            var route = $"/api/v1/todo-items?filter[updated-date]=isnotnull:";
             var request = new HttpRequestMessage(httpMethod, route);
 
             // Act
             var response = await _fixture.Client.SendAsync(request);
+
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
             var body = await response.Content.ReadAsStringAsync();
             var deserializedBody = _fixture.GetService<IJsonApiDeSerializer>().DeserializeList<TodoItem>(body);
 
             // Assert
-            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
             Assert.NotEmpty(deserializedBody);
         }
 
         [Fact]
-        public async Task Can_Filter_TodoItems_Using_Is_Operator()
+        public async Task Can_Filter_TodoItems_Using_IsNull_Operator()
         {
             // Arrange
             var todoItem = _todoItemFaker.Generate();
@@ -124,16 +126,18 @@ public async Task Can_Filter_TodoItems_Using_Is_Operator()
             _context.SaveChanges();
 
             var httpMethod = new HttpMethod("GET");
-            var route = $"/api/v1/todo-items?filter[updated-date]=is:null";
+            var route = $"/api/v1/todo-items?filter[updated-date]=isnull:";
             var request = new HttpRequestMessage(httpMethod, route);
 
             // Act
             var response = await _fixture.Client.SendAsync(request);
+
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
             var body = await response.Content.ReadAsStringAsync();
             var deserializedBody = _fixture.GetService<IJsonApiDeSerializer>().DeserializeList<TodoItem>(body);
 
             // Assert
-            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
             Assert.NotEmpty(deserializedBody);
         }