v1.6.22 - Grandparent COUNT_DISTINCT deletion bugfix (#582)

* Fixes #581 by properly handling COUNT_DISTINCT for grandparent rollup deletions

README.md

@@ -24,12 +24,12 @@ As well, don't miss [the Wiki](../../wiki), which includes even more info for co
 
 ## Deployment & Setup
 
-<a href="https://login.salesforce.com/packaging/installPackage.apexp?p0=04t6g000008OatsAAC">
+<a href="https://login.salesforce.com/packaging/installPackage.apexp?p0=04t6g000008OavAAAS">
  <img alt="Deploy to Salesforce"
  src="./media/deploy-package-to-prod.png">
 </a>
 
-<a href="https://test.salesforce.com/packaging/installPackage.apexp?p0=04t6g000008OatsAAC">
+<a href="https://test.salesforce.com/packaging/installPackage.apexp?p0=04t6g000008OavAAAS">
  <img alt="Deploy to Salesforce Sandbox"
  src="./media/deploy-package-to-sandbox.png">
 </a>

extra-tests/classes/RollupIntegrationTests.cls

@@ -673,6 +673,53 @@ private class RollupIntegrationTests {
  System.assertEquals(greatGrandparent.Name, updatedGreatGrandparent.Name, 'Great-grandparent name should not have been appended based on exclusions');
  }
 
+ @IsTest
+ static void shouldCountDistinctForGrandparentDeletes() {
+ if (RollupTestUtils.IS_NAMESPACED_PACKAGE_ORG) {
+ return;
+ }
+
+ Rollup.onlyUseMockMetadata = true;
+ Rollup.shouldFlattenAsyncProcesses = true;
+ Rollup.rollupMetadata = new List<Rollup__mdt>{
+ new Rollup__mdt(
+ CalcItem__c = ApplicationLog__c.SObjectType.getDescribe(SObjectDescribeOptions.DEFERRED).getName(),
+ RollupFieldOnCalcItem__c = 'Name',
+ LookupFieldOnCalcItem__c = ApplicationLog__c.Application__c.getDescribe().getName(),
+ LookupObject__c = 'Account',
+ LookupFieldOnLookupObject__c = 'Id',
+ RollupFieldOnLookupObject__c = 'AnnualRevenue',
+ RollupOperation__c = 'COUNT_DISTINCT',
+ GrandparentRelationshipFieldPath__c = RollupTestUtils.getRelationshipPath(
+ new List<Schema.SObjectField>{ ApplicationLog__c.Application__c, Application__c.ParentApplication__c, ParentApplication__c.Account__c, Account.Name }
+ )
+ )
+ };
+
+ Account greatGrandparent = new Account(Name = 'Great-grandparent 1');
+ insert greatGrandparent;
+
+ ParentApplication__c grandParent = new ParentApplication__c(Name = 'Grandparent 1', Account__c = greatGrandparent.Id);
+ ParentApplication__c secondGrandparent = new ParentApplication__c(Name = 'Grandparent 2', Account__c = greatGrandparent.Id);
+ List<ParentApplication__c> parentApps = new List<ParentApplication__c>{ grandParent, secondGrandparent };
+ insert parentApps;
+
+ Application__c parent = new Application__c(Name = 'Parent 1', ParentApplication__c = grandParent.Id);
+ Application__c secondParent = new Application__c(Name = 'Parent 2', ParentApplication__c = secondGrandparent.Id);
+ insert new List<Application__c>{ parent, secondParent };
+
+ ApplicationLog__c child = new ApplicationLog__c(Application__c = secondParent.Id, Name = 'Will Still Exist');
+ ApplicationLog__c secondChild = new ApplicationLog__c(Name = 'To be deleted', Application__c = parent.Id);
+ insert new List<ApplicationLog__c>{ child, secondChild };
+
+ Test.startTest();
+ delete secondChild;
+ Test.stopTest();
+
+ greatGrandparent = [SELECT AnnualRevenue FROM Account WHERE Id = :greatGrandparent.Id];
+ Assert.areEqual(1, greatGrandparent.AnnualRevenue, 'Should still count non-deleted great-grandchild');
+ }
+
  @IsTest
  static void shouldProperlyFilterPolymorphicWhatFields() {
  Account acc = new Account(Name = 'Matching type');

package.json

@@ -1,6 +1,6 @@
 {
  "name": "apex-rollup",
- "version": "1.6.21",
+ "version": "1.6.22",
  "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",

rollup-namespaced/README.md

@@ -18,12 +18,12 @@ For more info, see the base `README`.
 
 ## Deployment & Setup
 
-<a href="https://login.salesforce.com/packaging/installPackage.apexp?p0=04t6g000008OatxAAC">
+<a href="https://login.salesforce.com/packaging/installPackage.apexp?p0=04t6g000008OavFAAS">
  <img alt="Deploy to Salesforce"
  src="./media/deploy-package-to-prod.png">
 </a>
 
-<a href="https://test.salesforce.com/packaging/installPackage.apexp?p0=04t6g000008OatxAAC">
+<a href="https://test.salesforce.com/packaging/installPackage.apexp?p0=04t6g000008OavFAAS">
  <img alt="Deploy to Salesforce Sandbox"
  src="./media/deploy-package-to-sandbox.png">
 </a>

rollup-namespaced/sfdx-project.json

@@ -25,6 +25,6 @@
  "apex-rollup-namespaced@1.1.13": "04t6g000008OaYwAAK",
  "apex-rollup-namespaced@1.1.14": "04t6g000008OaZBAA0",
  "apex-rollup-namespaced@1.1.16": "04t6g000008OaZaAAK",
- "apex-rollup-namespaced@1.1.17": "04t6g000008OatxAAC"
+ "apex-rollup-namespaced@1.1.17": "04t6g000008OavFAAS"
  }
 }

rollup/core/classes/RollupAsyncProcessor.cls

@@ -586,7 +586,9 @@ global virtual without sharing class RollupAsyncProcessor extends Rollup impleme
  // calling clear in a loop here might look interesting - and it would be a massive problem if not for the
  // bag only responding to the very first clear() invocation. everything after that is a no-op (so, any rollup with more
  // than one rollup operation going at a time)
- if (rollup.triggerContext == System.TriggerOperation.BEFORE_DELETE || rollup.op.name().contains('DELETE')) {
+ if (
+ (rollup.triggerContext == System.TriggerOperation.BEFORE_DELETE || rollup.op.name().contains('DELETE')) && rollup.traversal?.getIsFinished() != true
+ ) {
  bag.clear();
  }
  }

rollup/core/classes/RollupLogger.cls

@@ -1,7 +1,7 @@
 global without sharing virtual class RollupLogger implements ILogger {
  @TestVisible
  // this gets updated via the pipeline as the version number gets incremented
- private static final String CURRENT_VERSION_NUMBER = 'v1.6.21';
+ private static final String CURRENT_VERSION_NUMBER = 'v1.6.22';
  private static final System.LoggingLevel FALLBACK_LOGGING_LEVEL = System.LoggingLevel.DEBUG;
  private static final RollupPlugin PLUGIN = new RollupPlugin();
 

rollup/core/classes/RollupRelationshipFieldFinder.cls

@@ -654,6 +654,9 @@ public without sharing class RollupRelationshipFieldFinder {
  .setArg(inclusiveIds)
  .setArg(bindVar, this.records)
  .get();
+ if (this.metadata.RollupOperation__c.contains('DELETE')) {
+ this.records.clear();
+ }
  this.records.addAll(additionalCalcItems);
  return additionalCalcItems;
  } catch (Exception ex) {

sfdx-project.json

@@ -5,8 +5,8 @@
  "package": "apex-rollup",
  "path": "rollup",
  "scopeProfiles": true,
- "versionName": "Updating to null coalesce operator when applicable",
- "versionNumber": "1.6.21.0",
+ "versionName": "Fixes grandparent rollup logic for deletes with COUNT_DISTINCT",
+ "versionNumber": "1.6.22.0",
  "versionDescription": "Fast, configurable, elastically scaling custom rollup solution. Apex Invocable action, one-liner Apex trigger/CMDT-driven logic, and scheduled Apex-ready.",
  "releaseNotesUrl": "https://github.com/jamessimone/apex-rollup/releases/latest",
  "unpackagedMetadata": {
@@ -104,6 +104,7 @@
  "apex-rollup@1.6.18": "04t6g000008Oak1AAC",
  "apex-rollup@1.6.19": "04t6g000008Oal4AAC",
  "apex-rollup@1.6.20": "04t6g000008OanPAAS",
- "apex-rollup@1.6.21": "04t6g000008OatsAAC"
+ "apex-rollup@1.6.21": "04t6g000008OatsAAC",
+ "apex-rollup@1.6.22": "04t6g000008OavAAAS"
  }
 }