Fixes #623 by properly parsing nested IN conditions during recursive …

…where clause operations
jamessimone · Sep 25, 2024 · e7587ae · e7587ae
1 parent f65ea35
commit e7587ae
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/extra-tests/classes/RollupEvaluatorTests.cls b/extra-tests/classes/RollupEvaluatorTests.cls
@@ -1258,6 +1258,15 @@ private class RollupEvaluatorTests {
     System.assertEquals(false, eval.matches(nonMatch3));
   }
 
+  @IsTest
+  static void stripsExtraParantheticalStructures() {
+    String whereClause = '(Name IN (\'0-Current\', \'1-30 Days\', \'31-60 Days\')) AND Name IN (\'0-Current\', \'1-30 Days\', \'31-60 Days\')';
+
+    RollupEvaluator eval = new RollupEvaluator.WhereFieldEvaluator(whereClause, ContactPointConsent.SObjectType);
+
+    System.assertEquals(true, eval.matches(new ContactPointConsent(Name = '0-Current')));
+  }
+
   private static String getSoqlCompliantDatetime(Datetime dt) {
     return dt.format('yyyy-MM-dd\'T\'HH:mm:ssZ');
   }

diff --git a/rollup/core/classes/RollupEvaluator.cls b/rollup/core/classes/RollupEvaluator.cls
@@ -393,7 +393,14 @@ public without sharing abstract class RollupEvaluator implements Rollup.Evaluato
         String value = words[++index];
         if (criteria.endsWithIgnoreCase('in')) {
           while (value.endsWith(')') == false) {
-            value += ' ' + words[++index];
+            String nextWord = words[++index];
+            value += ' ' + nextWord.removeEnd(')');
+            if (index + 1 == words.size()) {
+              break;
+            }
+          }
+          if (value.startsWith('(') && value.endsWith(')') == false) {
+            value += ')';
           }
         } else if (value.startsWith('\'') && value.endsWith('\'') == false) {
           String tempVal = value;