V1.3.20 - Date Literal Function Support and RollupParentResetProcessor bugfix (#225)

* Fixes #179 by ensuring RollupParentResetProcessor recalcs always run first when multiple operations are enqueued. Also added logging for when those parent-level fields are reset

* Added support for date literal functions, started exploring any possible issues associated with #224

* Swapping the ordering of some ALL ROWS calls around where ORDER BY is being used for full recalcs

Author: jamessimone

README.md

@@ -22,12 +22,12 @@ You have several different options when it comes to making use of `Rollup`:
 
 ## Deployment
 
-<a href="https://login.salesforce.com/packaging/installPackage.apexp?p0=04t6g000008SiVIAA0">
+<a href="https://login.salesforce.com/packaging/installPackage.apexp?p0=04t6g000008SiaJAAS">
   <img alt="Deploy to Salesforce"
        src="./media/deploy-package-to-prod.png">
 </a>
 
-<a href="https://test.salesforce.com/packaging/installPackage.apexp?p0=04t6g000008SiVIAA0">
+<a href="https://test.salesforce.com/packaging/installPackage.apexp?p0=04t6g000008SiaJAAS">
   <img alt="Deploy to Salesforce Sandbox"
        src="./media/deploy-package-to-sandbox.png">
 </a>

extra-tests/classes/RollupDateLiteralTests.cls

@@ -689,6 +689,13 @@ private class RollupEvaluatorTests {
     System.assertEquals(new List<String>{ 'Owner.Name' }, eval.getQueryFields());
   }
 
+  @IsTest
+  static void shouldReturnDateFunctionFields() {
+    String queryString = 'HOUR_IN_DAY(CreatedDate) = 15';
+    RollupEvaluator.WhereFieldEvaluator eval = new RollupEvaluator.WhereFieldEvaluator(queryString, Account.SObjectType);
+    System.assertEquals(new List<String>{ 'CreatedDate' }, eval.getQueryFields());
+  }
+
   @SuppressWarnings('PMD.ApexUnitTestClassShouldHaveAsserts')
   @IsTest
   static void shouldThrowExceptionForImproperlyEnteredWhereClause() {
@@ -1016,16 +1023,25 @@ private class RollupEvaluatorTests {
   static void shouldProperlyEvaluateDateLiteral() {
     String whereClause = 'CloseDate = THIS_YEAR';
     RollupEvaluator.WhereFieldEvaluator eval = new RollupEvaluator.WhereFieldEvaluator(whereClause, Opportunity.SObjectType);
-    System.assertEquals(true, eval.matches(new Opportunity(CloseDate = System.today().addDays(-1))));
+    System.assertEquals(true, eval.matches(new Opportunity(CloseDate = System.today())));
     System.assertEquals(false, eval.matches(new Opportunity(CloseDate = System.today().addYears(-1))));
   }
 
   @IsTest
-  static void shouldStripOutDateFunctionsFromSelectStatements() {
-    String whereClause = 'CALENDAR_YEAR(CreatedDate) = ' + System.today().year();
-    RollupEvaluator.WhereFieldEvaluator eval = new RollupEvaluator.WhereFieldEvaluator(whereClause, ContactPointAddress.SObjectType);
-    List<String> queryFields = eval.getQueryFields();
-    System.assertEquals(true, queryFields.isEmpty(), 'Query fields should have been empty but contained: ' + queryFields);
+  static void shouldProperlyEvaluateDateFunction() {
+    String whereClause = 'HOUR_IN_DAY(ReminderDateTime) = 5';
+    RollupEvaluator.WhereFieldEvaluator eval = new RollupEvaluator.WhereFieldEvaluator(whereClause, Task.SObjectType);
+    Time fifthHour = Time.newInstance(5, 0, 0, 0);
+    Datetime fifthHourDt = Datetime.newInstanceGmt(System.today(), fifthHour);
+    System.assertEquals(true, eval.matches(new Task(ReminderDateTime = fifthHourDt)));
+  }
+
+  @IsTest
+  static void shouldProperlyEvaluateLiteralDateFunctions() {
+    Date comparisonDate = Date.newInstance(2020, 3, 7);
+    String whereClause = 'DAY_ONLY(ReminderDateTime) = 2020-03-07';
+    RollupEvaluator.WhereFieldEvaluator eval = new RollupEvaluator.WhereFieldEvaluator(whereClause, Task.SObjectType);
+    System.assertEquals(true, eval.matches(new Task(ReminderDateTime = Datetime.newInstanceGmt(comparisonDate, Time.newInstance(0, 0, 0, 0)))));
   }
 
   @IsTest

extra-tests/classes/RollupEvaluatorTests.cls

@@ -108,6 +108,8 @@ private class RollupFieldInitializerTests {
      * (java.math.BigDecimal and java.lang.Integer are in module java.base of loader 'bootstrap')
      */
     RollupFieldInitializer init = RollupFieldInitializer.Current;
+    // never ever fill out the Name field here; there's a reason it's blank
+    // and it would cause this test to pass without exercising the actual underlying fix
     Account one = new Account();
     Account two = new Account();
 

extra-tests/classes/RollupFieldInitializerTests.cls

@@ -9,7 +9,7 @@ private class RollupFullRecalcTests {
   }
 
   @IsTest
-  static void shouldSortFullRecalcsToEnd() {
+  static void shouldSortParentResetProcessorsToBeginning() {
     RollupAsyncProcessor actualProcessor = RollupAsyncProcessor.getProcessor(
       new Rollup.FilterResults(),
       Contact.Id,
@@ -23,14 +23,26 @@ private class RollupFullRecalcTests {
       null,
       null
     );
+    RollupParentResetProcessor resetProcessor = new RollupParentResetProcessor(
+      new List<Rollup__mdt>(),
+      null,
+      '',
+      new Set<Id>(),
+      Rollup.InvocationPoint.FROM_APEX
+    );
     List<RollupAsyncProcessor> processors = new List<RollupAsyncProcessor>{
+      resetProcessor,
+      actualProcessor,
+      actualProcessor,
+      resetProcessor,
       actualProcessor,
-      new RollupDeferredFullRecalcProcessor(new List<Rollup__mdt>(), null, null, null, null),
-      actualProcessor
+      resetProcessor
     };
     processors.sort();
 
-    System.assertEquals(true, processors[2] instanceof RollupDeferredFullRecalcProcessor, processors);
+    System.assertEquals(true, processors[0] instanceof RollupParentResetProcessor, processors[0]);
+    System.assertEquals(true, processors[1] instanceof RollupParentResetProcessor, processors[0]);
+    System.assertEquals(true, processors[2] instanceof RollupParentResetProcessor, processors[0]);
   }
 
   @IsTest

extra-tests/classes/RollupFullRecalcTests.cls

@@ -1,6 +1,6 @@
 {
   "name": "apex-rollup",
-  "version": "1.3.19",
+  "version": "1.3.20",
   "description": "Fast, configurable, elastically scaling custom rollup solution. Apex Invocable action, one-liner Apex trigger/CMDT-driven logic, and scheduled Apex-ready.",
   "repository": {
     "type": "git",

package.json

@@ -1927,7 +1927,7 @@ global without sharing virtual class Rollup {
     } else if (shouldQueue) {
       return new RollupDeferredFullRecalcProcessor(matchingMeta, calcItemType, queryString, recordIds, invokePoint);
     } else {
-      String queryWithOrderBy = (queryString + getFullRecalcQueryString(matchingMeta)).replace('ALL ROWS', '');
+      String queryWithOrderBy = (queryString + getFullRecalcQueryString(matchingMeta));
       return new RollupFullBatchRecalculator(queryWithOrderBy, invokePoint, matchingMeta, calcItemType, recordIds);
     }
   }

rollup/core/classes/Rollup.cls

@@ -11,6 +11,7 @@ global virtual without sharing class RollupAsyncProcessor extends Rollup impleme
   protected Boolean isProcessed = false;
   protected Boolean overridesRunCalc = false;
   protected FullRecalcProcessor fullRecalcProcessor;
+  protected Boolean shouldSortToFront = false;
 
   private RollupRelationshipFieldFinder.Traversal traversal;
   private Map<SObjectType, Set<String>> lookupObjectToUniqueFieldNames;
@@ -209,9 +210,9 @@ global virtual without sharing class RollupAsyncProcessor extends Rollup impleme
     Integer numberToReturn = 0;
     if (otherRollup instanceof RollupAsyncProcessor) {
       RollupAsyncProcessor that = (RollupAsyncProcessor) otherRollup;
-      if (this.op == null && that.op != null) {
+      if (this.shouldSortToFront == false && that.shouldSortToFront) {
         numberToReturn = 1;
-      } else if (that.op == null && this.op != null) {
+      } else if (that.shouldSortToFront == false && this.shouldSortToFront) {
         numberToReturn = -1;
       } else if (this.op != null && that.op != null) {
         Boolean thisDelete = this.op.name().contains('DELETE');