wim/fflib-apex-extensions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug in formula criteria

Browse Source
This commit is contained in:
Wim Velzeboer
2021-08-23 12:06:21 +01:00
parent 7e9c5a7fce
commit 19cb9c8809
2 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sfdx-source/apex-extensions/main/default/classes/criteria/fflib_Criteria.cls
+18 -6
View File
@@ -45,8 +45,6 @@ public virtual with sharing class fflib_Criteria
private String type;
private IFormulaEvaluator formulaEvaluator;
/**
* populate private variables with default settings.
*/
@@ -173,6 +171,7 @@ public virtual with sharing class fflib_Criteria
return this;
}
private interface IFormulaEvaluator
{
Boolean evaluate(Object record, Map<Integer, Boolean> evaluatedResultByNumber);
@@ -384,12 +383,25 @@ public virtual with sharing class fflib_Criteria
private Boolean evaluateFormula(Object record)
{
Map<Integer, Boolean> evaluatedResultByNumber = new Map<Integer, Boolean>();
for (Integer i = 0; i < evaluators.size(); i++)
try
{
evaluatedResultByNumber.put(i, evaluators.get(i).evaluate(record));
Map<Integer, Boolean> evaluatedResultByNumber = new Map<Integer, Boolean>();
for (Integer i = 0; i < evaluators.size(); i++)
{
evaluatedResultByNumber.put(i, evaluators.get(i).evaluate(record));
}
return formulaEvaluator.evaluate(record, evaluatedResultByNumber);
}
catch (Exception e)
{
// If an error occurs during the validation,
// just return a null value and send a warning message to the debug log;
System.debug(
System.LoggingLevel.WARN,
'Criteria condition failure with error: ' + e.getMessage() + '\n' + e.getStackTraceString()
);
return null;
}
return formulaEvaluator.evaluate(record, evaluatedResultByNumber);
}
/**
sfdx-source/apex-extensions/tests/classes/criteria/fflib_CriteriaTest.cls
+16
View File
@@ -615,4 +615,20 @@ private with sharing class fflib_CriteriaTest
.evaluate(new Contact(LastName = 'Smith'))
);
}
@IsTest
static void itShouldEvaluateFormula_ReturnNullOnErrorInFormula()
{
SObject record = fflib_MockSObjectUtil.addRelatedParentObject(
new Contact(LastName = 'Smith'),
new Account(Id = fflib_IDGenerator.generate(Account.SObjectType), Industry = 'Energy'),
'Account');
System.assertEquals(null,
new fflib_Criteria()
.FormulaCriteria('1')
.equalTo('AccountTypo.Industry', 'Energy')
.evaluate(record)
);
}
}