Optional Any func (#72)

* Optional Any func (#71) * throw error when func is null, return default if supressed
ZEXSM · Jul 10, 2021 · 6531eb2 · 6531eb2
1 parent 83d7052
commit 6531eb2
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 1 deletion.
diff --git a/src/OData.QueryBuilder/Conventions/Operators/IODataOperator.cs b/src/OData.QueryBuilder/Conventions/Operators/IODataOperator.cs
@@ -9,6 +9,8 @@ public interface IODataOperator
 
         bool All<T>(IEnumerable<T> columnName, Func<T, bool> func);
 
+        bool Any<T>(IEnumerable<T> columnName);
+
         bool Any<T>(IEnumerable<T> columnName, Func<T, bool> func);
     }
 }
diff --git a/src/OData.QueryBuilder/Expressions/Visitors/ODataOptionFilterExpressionVisitor.cs b/src/OData.QueryBuilder/Expressions/Visitors/ODataOptionFilterExpressionVisitor.cs
@@ -78,7 +78,22 @@ protected override string VisitMethodCallExpression(MethodCallExpression methodC
                     return $"{all0}/{nameof(IODataOperator.All).ToLowerInvariant()}({all1})";
                 case nameof(IODataOperator.Any):
                     var any0 = VisitExpression(methodCallExpression.Arguments[0]);
-                    var any1 = VisitExpression(methodCallExpression.Arguments[1]);
+                    var any1 = default(string);
+
+                    if (methodCallExpression.Arguments.Count > 1)
+                    {
+                        any1 = VisitExpression(methodCallExpression.Arguments[1]);
+
+                        if (any1.IsNullOrQuotes())
+                        {
+                            if (!_odataQueryBuilderOptions.SuppressExceptionOfNullOrEmptyOperatorArgs)
+                            {
+                                throw new ArgumentException("Func is null");
+                            }
+
+                            return default;
+                        }
+                    }
 
                     return $"{any0}/{nameof(IODataOperator.Any).ToLowerInvariant()}({any1})";
                 case nameof(IODataFunction.Date):

diff --git a/test/OData.QueryBuilder.Test/ODataQueryCollectionTest.cs b/test/OData.QueryBuilder.Test/ODataQueryCollectionTest.cs
@@ -333,6 +333,50 @@ public void ODataQueryBuilderList_Filter_Any_With_Func_Success()
             uri.Should().Be("http://mock/odata/ODataType?$filter=ODataKind/ODataCodes/any(v:date(v/Created) eq 2019-02-09T00:00:00Z)");
         }
 
+        [Fact(DisplayName = "(ODataQueryBuilderList) Filter Any without func => Success")]
+        public void ODataQueryBuilderList_Filter_Any_Without_Func()
+        {
+            var uri = _odataQueryBuilderDefault
+                .For<ODataTypeEntity>(s => s.ODataType)
+                .ByList()
+                .Filter((s, f, o) => o.Any(s.Labels))
+                .ToUri();
+
+            uri.Should().Be("http://mock/odata/ODataType?$filter=Labels/any()");
+        }
+
+        [Fact(DisplayName = "(ODataQueryBuilderList) Filter Any with func null supressed => Success")]
+        public void ODataQueryBuilderList_Filter_Any_With_Func_null_Supressed()
+        {
+            var odataQueryBuilderOptions = new ODataQueryBuilderOptions { SuppressExceptionOfNullOrEmptyOperatorArgs = true };
+            var odataQueryBuilder = new ODataQueryBuilder<ODataInfoContainer>(
+                _commonFixture.BaseUri, odataQueryBuilderOptions);
+
+            var func = default(Func<string, bool>);
+
+            var uri = odataQueryBuilder
+                .For<ODataTypeEntity>(s => s.ODataType)
+                .ByList()
+                .Filter((s, _, o) => o.Any(s.Labels, func))
+                .ToUri();
+
+            uri.Should().Be("http://mock/odata/ODataType?$filter=");
+        }
+
+        [Fact(DisplayName = "(ODataQueryBuilderList) Filter Any with func null => ArgumentException")]
+        public void ODataQueryBuilderList_Filter_Any_With_Func_null()
+        {
+            var func = default(Func<string, bool>);
+
+            _odataQueryBuilderDefault.Invoking(
+                (r) => r
+                    .For<ODataTypeEntity>(s => s.ODataType)
+                    .ByList()
+                    .Filter((s, _, o) => o.Any(s.Labels, func))
+                    .ToUri())
+                .Should().Throw<ArgumentException>().WithMessage("Func is null");
+        }
+
         [Fact(DisplayName = "Expand,Filter,Select,OrderBy,OrderByDescending,Skip,Top,Count => Success")]
         public void ODataQueryBuilderList_Expand_Filter_Select_OrderBy_OrderByDescending_Skip_Top_Count_Success()
         {