Merge pull request #1563 from bmacarini/feature/removeWhitespacesInRelationshipCriteriaFields

fix(validation): Trim whitespace from "Relationship Criteria Fields" input

Author: aheber

dlrs/main/classes/RollupService.cls

@@ -1059,7 +1059,7 @@ global with sharing class RollupService {
             '[\r\n]+'
           )
         ) {
-          lookupFields.add(criteriaField);
+          lookupFields.add(criteriaField.trim());
         }
       }
       // only include order by fields when query based rollup (concat, first, last, etc.) since changes to them

dlrs/main/classes/RollupServiceTest6.cls

@@ -790,4 +790,88 @@ private class RollupServiceTest6 {
       .NumberOfEmployees
     );
   }
-}
+
+  @IsTest
+  static void testTrimWhitespaceFromRelationshipCriteriaFieldsInput() {
+    // Test supported?
+    if (!TestContext.isSupported())
+      return;
+
+    // Configure rollup
+    LookupRollupSummary__c rollupSummary = new LookupRollupSummary__c();
+    rollupSummary.Name = 'Test Whitespace Trim';
+    rollupSummary.ParentObject__c = 'Account';
+    rollupSummary.ChildObject__c = 'Opportunity';
+    rollupSummary.RelationShipField__c = 'AccountId';
+    rollupSummary.RelationShipCriteria__c = 'StageName != \'Prospecting\'';
+    rollupSummary.RelationshipCriteriaFields__c = ' StageName';
+    rollupSummary.FieldToAggregate__c = 'Amount';
+    rollupSummary.AggregateOperation__c = 'Sum';
+    rollupSummary.AggregateResultField__c = 'AnnualRevenue';
+    rollupSummary.AggregateAllRows__c = true;
+    rollupSummary.Active__c = true;
+    rollupSummary.CalculationMode__c = 'Realtime';
+    insert new List<LookupRollupSummary__c>{ rollupSummary };
+
+    // Test data
+    Account account = new Account();
+    account.Name = 'Test Account';
+    insert account;
+    Opportunity opp = new Opportunity();
+    opp.Name = 'Test Opportunity';
+    opp.StageName = 'Closed Won';
+    opp.CloseDate = System.today();
+    opp.AccountId = account.Id;
+    opp.Amount = 100;
+
+    Test.startTest();
+    insert opp;
+    Test.stopTest();
+
+    // Assert rollup
+    Account reloadedAcct = [
+      SELECT AnnualRevenue 
+      FROM Account 
+      WHERE Id = :account.Id
+    ];
+    Assert.areEqual(
+      100, 
+      reloadedAcct.AnnualRevenue,
+      'Rollup should have been calculated even with whitespace in criteria fields'
+    );
+  }
+
+  @IsTest
+  static void testInvalidRelationshipCriteriaFieldWithWhitespace() {
+    // Test supported?
+    if (!TestContext.isSupported())
+      return;
+
+    // Configure rollup
+    LookupRollupSummary__c rollupSummary = new LookupRollupSummary__c();
+    rollupSummary.Name = 'Test Whitespace Trim';
+    rollupSummary.ParentObject__c = 'Account';
+    rollupSummary.ChildObject__c = 'Opportunity';
+    rollupSummary.RelationShipField__c = 'AccountId';
+    rollupSummary.RelationShipCriteria__c = 'StageName != \'Prospecting\'';
+    rollupSummary.RelationshipCriteriaFields__c = ' InvalidField';
+    rollupSummary.FieldToAggregate__c = 'Amount';
+    rollupSummary.AggregateOperation__c = 'Sum';
+    rollupSummary.AggregateResultField__c = 'AnnualRevenue';
+    rollupSummary.AggregateAllRows__c = true;
+    rollupSummary.Active__c = true;
+    rollupSummary.CalculationMode__c = 'Realtime';
+    
+    try {
+      insert new List<LookupRollupSummary__c>{ rollupSummary };
+      Assert.fail(
+        'Expected DmlException for invalid relationship criteria fields'
+      );
+    } catch (DmlException e) {
+      Assert.isTrue(
+        e.getMessage().contains('does not exist on the child object'),
+        'Expected error message for invalid relationship criteria fields'
+      );
+    }
+  }
+}

dlrs/main/classes/RollupSummaries.cls

@@ -176,9 +176,10 @@ public class RollupSummaries extends fflib_SObjectDomain {
         // Aggregate Result field
         aggregateResultField = parentObject.getFieldsMap()
           .get(lookupRollupSummary.AggregateResultField);
-        if (aggregateResultField != null)
+        if (aggregateResultField != null) {
           lookupRollupSummary.AggregateResultField = aggregateResultField.getDescribe()
             .getName();
+        }
       }
       // Check the list of fields expressed in the relationship critiera fields
       if (
@@ -190,12 +191,16 @@ public class RollupSummaries extends fflib_SObjectDomain {
           '\r\n'
         );
         for (String field : fieldList) {
+          String trimmedCriteriaField = field.trim();
+          if (String.isBlank(trimmedCriteriaField)) {
+            continue;
+          }
           SObjectField relationshipCriteriaField = childObject.getFieldsMap()
-            .get(field);
+            .get(trimmedCriteriaField);
           relationshipCriteriaFields.add(
             relationshipCriteriaField != null
               ? relationshipCriteriaField.getDescribe().getName()
-              : field
+              : trimmedCriteriaField
           );
         }
         lookupRollupSummary.RelationshipCriteriaFields = String.join(
@@ -357,11 +362,15 @@ public class RollupSummaries extends fflib_SObjectDomain {
           '[\r\n]+'
         );
         String[] fieldsInError = new List<String>();
-        for (String field : fieldList)
-          if (field.length() > 0)
-            if (childObject.getFieldsMap().get(field) == null)
-              fieldsInError.add(field);
-        if (fieldsInError.size() == 1)
+        for (String field : fieldList) {
+          String trimmedCriteriaField = field.trim();
+          if (!String.isBlank(trimmedCriteriaField)) {
+            if (childObject.getFieldsMap().get(trimmedCriteriaField) == null) {
+              fieldsInError.add(trimmedCriteriaField);
+            }
+          }
+        }
+        if (fieldsInError.size() == 1) {
           lookupRollupSummary.Fields.RelationshipCriteriaFields.addError(
             error(
               'Field ' +
@@ -371,7 +380,7 @@ public class RollupSummaries extends fflib_SObjectDomain {
               LookupRollupSummary__c.RelationshipCriteriaFields__c
             )
           );
-        else if (fieldsInError.size() > 1)
+        } else if (fieldsInError.size() > 1) {
           lookupRollupSummary.Fields.RelationshipCriteriaFields.addError(
             error(
               'Fields ' +
@@ -381,6 +390,7 @@ public class RollupSummaries extends fflib_SObjectDomain {
               LookupRollupSummary__c.RelationshipCriteriaFields__c
             )
           );
+        }
       }
       // Row limit is only supported for certain operations
       LREngine.RollupOperation operation = OPERATION_PICKLIST_TO_ENUMS.get(
@@ -654,4 +664,4 @@ public class RollupSummaries extends fflib_SObjectDomain {
 
     return parsedOrderByClause;
   }
-}
+}

dlrs/main/classes/RollupSummary.cls

@@ -219,7 +219,7 @@ public class RollupSummary {
       return (String) Record.get('RelationshipCriteriaFields__c');
     }
     set {
-      Record.put('RelationshipCriteriaFields__c', value);
+      Record.put('RelationshipCriteriaFields__c', value?.trim());
     }
   }