PT-346: Performance optimization: LINQless BlockConditionAndOr.IsSati…

…sfiedBy (#179)
VirtoCommerce · Mar 12, 2021 · 898d678 · 898d678
1 parent b178b62
commit 898d678
Showing 1 changed file with 28 additions and 10 deletions.
diff --git a/src/VirtoCommerce.CoreModule.Core/Conditions/BlockConditionAndOr.cs b/src/VirtoCommerce.CoreModule.Core/Conditions/BlockConditionAndOr.cs
@@ -1,6 +1,5 @@
-using System.Linq;
+using System.Collections.Generic;
 using VirtoCommerce.CoreModule.Core.Common;
-using VirtoCommerce.Platform.Core.Common;
 
 namespace VirtoCommerce.CoreModule.Core.Conditions
 {
@@ -16,25 +15,44 @@ public override bool IsSatisfiedBy(IEvaluationContext context)
         {
             var result = false;
 
-            if (Children.IsNullOrEmpty())
-            {
-                return true;
-            }
-
-            if (Children != null && Children.Any())
+            if (Children != null && Children.Count > 0)
             {
                 if (!Not)
                 {
-                    result = All ? Children.All(ch => ch.IsSatisfiedBy(context)) : Children.Any(ch => ch.IsSatisfiedBy(context));
+                    result = All ? AllSatisfied(Children, context) : AnySatisfied(Children, context);
                 }
                 else
                 {
-                    result = All ? !Children.All(ch => ch.IsSatisfiedBy(context)) : !Children.Any(ch => ch.IsSatisfiedBy(context));
+                    result = All ? !AllSatisfied(Children, context) : !AnySatisfied(Children, context);
                 }
 
             }
+            else
+            {
+                result = true;
+            }
 
             return result;
         }
+
+        private bool AnySatisfied(IList<IConditionTree> children, IEvaluationContext context)
+        {
+            foreach (var ch in children)
+            {
+                if (ch.IsSatisfiedBy(context)) return true;
+            }
+            return false;
+        }
+
+        private bool AllSatisfied(IList<IConditionTree> children, IEvaluationContext context)
+        {
+            foreach (var ch in children)
+            {
+                if (!ch.IsSatisfiedBy(context)) return false;
+            }
+            return true;
+        }
     }
+
+
 }