PR fixes, updated test, added docs

alirezanet · Aug 31, 2024 · 322550b · 322550b
1 parent f43e8ec
commit 322550b
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 14 deletions.
diff --git a/docs/pages/guide/gridifyMapper.md b/docs/pages/guide/gridifyMapper.md
@@ -103,6 +103,10 @@ This method clears the list of mappings
 
 This method returns list of current mappings.
 
+## GetCurrentMapsByType
+
+This method returns list of current mappings for the given type.
+
 ## GridifyMapperConfiguration
 
 ``` csharp

diff --git a/src/Gridify/GridifyMapper.cs b/src/Gridify/GridifyMapper.cs
@@ -225,25 +225,34 @@ public IEnumerable<IGMap<T>> GetCurrentMapsByType(HashSet<Type> targetTypes)
    {
       foreach (var map in _mappings)
       {
-         if (map.To.Body is UnaryExpression unaryExpression)
+         switch (map.To.Body)
          {
-            if (targetTypes.Contains(unaryExpression.Operand.Type))
+            case UnaryExpression unaryExpression:
             {
-               yield return map;
+               if (targetTypes.Contains(unaryExpression.Operand.Type))
+               {
+                  yield return map;
+               }
+
+               break;
             }
-         }
-         else if (map.To.Body is MethodCallExpression methodCallExpression)
-         {
-            if (targetTypes.Contains(methodCallExpression.Type))
+            case MethodCallExpression methodCallExpression:
             {
-               yield return map;
+               if (targetTypes.Contains(methodCallExpression.Type))
+               {
+                  yield return map;
+               }
+
+               break;
             }
-         }
-         else if (map.To.Body is MemberExpression memberExpression)
-         {
-            if (targetTypes.Contains(memberExpression.Type))
+            case MemberExpression memberExpression:
             {
-               yield return map;
+               if (targetTypes.Contains(memberExpression.Type))
+               {
+                  yield return map;
+               }
+
+               break;
             }
          }
       }

diff --git a/test/Gridify.Tests/GridifyMapperShould.cs b/test/Gridify.Tests/GridifyMapperShould.cs
@@ -151,7 +151,7 @@ public void AddMap_DuplicateKey_ShouldThrowErrorIfOverrideIfExistsIsFalse()
    }
 
    [Theory]
-   [InlineData(typeof(DateTime), 0)]
+   [InlineData(typeof(DateTime), 1)]
    [InlineData(typeof(DateTime?), 1)]
    [InlineData(typeof(Guid), 1)]
    [InlineData(typeof(string), 2)]

diff --git a/test/Gridify.Tests/TestClass.cs b/test/Gridify.Tests/TestClass.cs
@@ -25,6 +25,7 @@ public TestClass(int id, string name, TestClass? classProp, Guid myGuid = defaul
    public string? Name { get; set; } = string.Empty;
    public TestClass? ChildClass { get; set; }
    public DateTime? MyDateTime { get; set; }
+   public DateTime AnotherDateTime { get; set; }
    public Guid MyGuid { get; set; }
    public string? Tag { get; set; }