stupid mistakes, so needed to rollback

asulwer · Jun 22, 2024 · 57356f3 · 57356f3
1 parent 31c576c
commit 57356f3
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 16 deletions.
diff --git a/demo/DemoApp/Demos/Basic.cs b/demo/DemoApp/Demos/Basic.cs
@@ -56,7 +56,7 @@ public async Task Run(CancellationToken ct = default)
                 outcome = true;
             });
 
-            resultList.OnFail((eventName) => {
+            resultList.OnFail(() => {
                 outcome = false;
             });
 

diff --git a/demo/DemoApp/Demos/BasicWithCustomTypes.cs b/demo/DemoApp/Demos/BasicWithCustomTypes.cs
@@ -57,15 +57,15 @@ public async Task Run(CancellationToken ct = default)
             ruleResultTree.OnSuccess((eventName) => {
                 Console.WriteLine($"Result '{eventName}' is as expected.");
             });
-            ruleResultTree.OnFail((eventName) => {
+            ruleResultTree.OnFail(() => {
                 Console.WriteLine($"Test outcome: false");
             });
 
             var actionRuleResult = await bre.ExecuteActionWorkflowAsync("Test Workflow Rule 1", "Test Rule", [string1], ct);
             actionRuleResult.Results.OnSuccess((eventName) => {
                 Console.WriteLine($"Result '{eventName}' is as expected.");
             });
-            actionRuleResult.Results.OnFail((eventName) => {
+            actionRuleResult.Results.OnFail(() => {
                 Console.WriteLine($"Test outcome: false");
             });
         }

diff --git a/demo/DemoApp/Demos/EF.cs b/demo/DemoApp/Demos/EF.cs
@@ -70,7 +70,7 @@ public async Task Run(CancellationToken ct = default)
                     discountOffered = $"Discount offered is {eventName} % over MRP.";
                 });
 
-                resultList.OnFail((eventName) => {
+                resultList.OnFail(() => {
                     discountOffered = "The user is not eligible for any discount.";
                 });
 

diff --git a/demo/DemoApp/Demos/JSON.cs b/demo/DemoApp/Demos/JSON.cs
@@ -53,7 +53,7 @@ public async Task Run(CancellationToken ct = default)
                 discountOffered = $"Discount offered is {eventName} % over MRP.";
             });
 
-            resultList.OnFail((eventName) => {
+            resultList.OnFail(() => {
                 discountOffered = "The user is not eligible for any discount.";
             });
 

diff --git a/demo/DemoApp/Demos/NestedInput.cs b/demo/DemoApp/Demos/NestedInput.cs
@@ -59,7 +59,7 @@ public async Task Run(CancellationToken ct = default)
 
                 resultList.OnSuccess((eventName) => {
                     Console.WriteLine($"{workflow.WorkflowName} evaluation resulted in success - {eventName}");
-                }).OnFail((eventName) => {
+                }).OnFail(() => {
                     Console.WriteLine($"{workflow.WorkflowName} evaluation resulted in failure");
                 });
             }

diff --git a/src/RulesEngine/Extensions/ListofRuleResultTreeExtension.cs b/src/RulesEngine/Extensions/ListofRuleResultTreeExtension.cs
@@ -11,7 +11,7 @@ namespace RulesEngine.Extensions
     public static class ListofRuleResultTreeExtension
     {
         public delegate void OnSuccessFunc(string eventName);
-        public delegate void OnFailureFunc(string eventName);
+        public delegate void OnFailureFunc();
 
 
         /// <summary>
@@ -40,13 +40,9 @@ public static List<RuleResultTree> OnSuccess(this List<RuleResultTree> ruleResul
         /// <returns></returns>
         public static List<RuleResultTree> OnFail(this List<RuleResultTree> ruleResultTrees, OnFailureFunc onFailureFunc)
         {
-            var allFailure = ruleResultTrees.FirstOrDefault(ruleResult => ruleResult.IsSuccess == false);
-            if (allFailure != null)
-            {
-                var eventName = allFailure.Rule.ErrorMessage ?? allFailure.Rule.RuleName;
-                onFailureFunc(eventName);
-            }
-
+            bool allFailure = ruleResultTrees.All(ruleResult => ruleResult.IsSuccess == false);
+            if (allFailure)
+                onFailureFunc();
             return ruleResultTrees;
         }
     }

diff --git a/test/RulesEngine.UnitTest/ListofRuleResultTreeExtensionTest.cs b/test/RulesEngine.UnitTest/ListofRuleResultTreeExtensionTest.cs
@@ -164,7 +164,7 @@ public void OnFailWithSuccessTest()
 
             var successEventName = true;
 
-            rulesResultTree.OnFail((eventName) => {
+            rulesResultTree.OnFail(() => {
                 successEventName = false;
             });
 
@@ -203,7 +203,7 @@ public void OnFailWithoutSuccessTest()
 
             var successEventName = true;
 
-            rulesResultTree.OnFail((eventName) => {
+            rulesResultTree.OnFail(() => {
                 successEventName = false;
             });