Add ContainsKey features for issue: #384

Author: JonathanMagnan

Z.Dynamic.Core.Lab/Program.cs

@@ -6,7 +6,7 @@ class Program
 	{
 		static void Main(string[] args)
 		{
-            Request_GroupBy_IEqualityComparer.Execute();
-		}
+            Request_AddMethod.Execute();
+        }
 	}
 }

Z.Dynamic.Core.Lab/Request_AddMethod.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Dynamic.Core;
+using System.Linq.Dynamic.Core.Parser;
+using System.Linq.Expressions;
+using System.Text;
+
+namespace Z.Dynamic.Core.Lab
+{
+    class Request_AddMethod
+    {
+        public class Customer
+        {
+            public string City { get; set; }
+            public Dictionary<string, Order> Orders { get; set; }
+            public string CompanyName { get; set; }
+            public string Phone { get; set; }
+        }
+        public class Order
+        {
+        }
+
+        public static void Execute()
+        {
+            List<Customer> customers = new List<Customer>()
+            {
+                new Customer() { City = "ZZZ1", CompanyName = "ZZZ", Orders = new Dictionary<string, Order>() },
+                new Customer() { City = "ZZZ2", CompanyName = "ZZZ", Orders = new Dictionary<string, Order>()  },
+                new Customer() { City = "ZZZ3", CompanyName = "ZZZ", Orders = new Dictionary<string, Order>()  }
+            };
+            customers.ForEach(x => x.Orders.Add(x.City + "TEST", new Order()));
+
+
+
+            var query = customers.AsQueryable()
+                .Where("Orders.ContainsKey(\"ZZZ2TEST\")", "ZZZ", 1)
+                .OrderBy("CompanyName")
+                .Select("new(City as City, Phone)").ToDynamicList();
+
+
+
+
+            var data = customers.AsQueryable()
+                .Where("Orders.ContainsKey(it.City + \"TEST\")")
+                .OrderBy("City")
+                .Select("new(City as City, Phone)").ToDynamicList();
+        }
+    }
+}

src/System.Linq.Dynamic.Core/Parser/ExpressionParser.cs

@@ -1616,6 +1616,15 @@ Expression ParseMemberAccess(Type type, Expression instance)
             {
                 if (instance != null && type != typeof(string))
                 {
+                    Type dictionaryType = TypeHelper.FindGenericType(typeof(IDictionary<,>), type);
+                    if (dictionaryType != null)
+                    {
+                        if(TryParseDictionary(instance, id, type, out var expression))
+                        {
+                            return expression;
+                        }
+                    }
+
                     Type enumerableType = TypeHelper.FindGenericType(typeof(IEnumerable<>), type);
                     if (enumerableType != null)
                     {
@@ -1716,6 +1725,22 @@ Expression ParseMemberAccess(Type type, Expression instance)
             throw ParseError(errorPos, Res.UnknownPropertyOrField, id, TypeHelper.GetTypeName(type));
         }
 
+        bool TryParseDictionary(Expression instance, string methodName, Type type, out Expression expression)
+        {
+            expression = null;
+
+            Expression[] args = ParseArgumentList();
+
+            if (!_methodFinder.ContainsMethod(typeof(IDictionarySignatures), methodName, false, args))
+            {
+                return false;
+            }
+
+            var method = type.GetMethod(methodName);
+            expression = Expression.Call(instance, method, args);
+            return true;
+        }
+
         Expression ParseAggregate(Expression instance, Type elementType, string methodName, int errorPos, bool isQueryable)
         {
             var oldParent = _parent;

src/System.Linq.Dynamic.Core/Parser/SupportedMethods/IDictionarySignatures.cs

@@ -0,0 +1,7 @@
+namespace System.Linq.Dynamic.Core.Parser.SupportedMethods
+{
+    internal interface IDictionarySignatures
+    {
+        void ContainsKey(object selector);
+    }
+}

test/System.Linq.Dynamic.Core.Tests/MikArea/Dictionary.cs

@@ -0,0 +1,67 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using NFluent;
+using Xunit;
+
+namespace System.Linq.Dynamic.Core.Tests.MikArea
+{
+    public class Dictionary
+    {
+        public class Customer
+        {
+            public string City { get; set; }
+            public Dictionary<string, Order> Orders { get; set; }
+            public string CompanyName { get; set; }
+            public string Phone { get; set; }
+        }
+        public class Order
+        {
+        }
+
+        [Fact]
+        public void Test_ContainsKey_1()
+        {
+            List<Customer> customers = new List<Customer>()
+            {
+                new Customer() { City = "ZZZ1", CompanyName = "ZZZ", Orders = new Dictionary<string, Order>() },
+                new Customer() { City = "ZZZ2", CompanyName = "ZZZ", Orders = new Dictionary<string, Order>()  },
+                new Customer() { City = "ZZZ3", CompanyName = "ZZZ", Orders = new Dictionary<string, Order>()  }
+            };
+            customers.ForEach(x => x.Orders.Add(x.City + "TEST", new Order()));
+
+
+
+            var data = customers.AsQueryable()
+                .Where("Orders.ContainsKey(\"ZZZ2TEST\")")
+                .OrderBy("CompanyName")
+                .Select("new(City as City, Phone)").ToDynamicList();
+
+            Check.That("ZZZ2").IsEqualTo((string)data.First().City);
+        }
+
+        [Fact]
+        public void Test_ContainsKey_2()
+        {
+            List<Customer> customers = new List<Customer>()
+            {
+                new Customer() { City = "ZZZ1", CompanyName = "ZZZ", Orders = new Dictionary<string, Order>() },
+                new Customer() { City = "ZZZ2", CompanyName = "ZZZ", Orders = new Dictionary<string, Order>()  },
+                new Customer() { City = "ZZZ3", CompanyName = "ZZZ", Orders = new Dictionary<string, Order>()  }
+            };
+            customers.ForEach(x => x.Orders.Add(x.City + "TEST", new Order()));
+
+
+
+            var data = customers.AsQueryable()
+                .Where("Orders.ContainsKey(it.City + \"TEST\")")
+                .OrderBy("City")
+                .Select("new(City as City, Phone)").ToDynamicList();
+
+            Check.That("ZZZ1").IsEqualTo((string)data.First().City);
+            Check.That(3).IsEqualTo(data.Count);
+        }
+    }
+}