From 9ed1f4feb3a72256de9345446f9616128f6c8621 Mon Sep 17 00:00:00 2001 From: James Simone <16430727+jamessimone@users.noreply.github.com> Date: Wed, 16 Oct 2024 13:39:34 -0600 Subject: [PATCH] v1.6.36 - Patches RollupFlowBulkProcessor + Rollup Order By support (#634) * Updating API versions from 61.0 to 62.0 --- README.md | 4 +- .../classes/CustomMetadataDrivenTests.cls | 12 +-- .../CustomMetadataDrivenTests.cls-meta.xml | 2 +- extra-tests/classes/InvocableDrivenTests.cls | 30 +++++++ .../classes/InvocableDrivenTests.cls-meta.xml | 2 +- .../RollupCalcItemReplacerTests.cls-meta.xml | 2 +- .../RollupCalcItemSorterTests.cls-meta.xml | 2 +- .../RollupCalculatorTests.cls-meta.xml | 2 +- .../RollupCurrencyInfoTests.cls-meta.xml | 2 +- .../RollupDateLiteralTests.cls-meta.xml | 2 +- .../classes/RollupEvaluatorTests.cls-meta.xml | 2 +- .../RollupFieldInitializerTests.cls-meta.xml | 2 +- .../classes/RollupFinalizerTests.cls-meta.xml | 2 +- .../RollupFlowBulkProcessorTests.cls-meta.xml | 2 +- ...FlowFullRecalcDispatcherTests.cls-meta.xml | 2 +- .../RollupFlowFullRecalcTests.cls-meta.xml | 4 +- .../classes/RollupFlowTests.cls-meta.xml | 2 +- .../RollupFullRecalcTests.cls-meta.xml | 2 +- .../RollupIntegrationTests.cls-meta.xml | 2 +- .../classes/RollupLimitsTest.cls-meta.xml | 2 +- .../classes/RollupLoggerTests.cls-meta.xml | 2 +- .../RollupMultiCurrencyTests.cls-meta.xml | 4 +- ...llupParentResetProcessorTests.cls-meta.xml | 2 +- .../RollupQueryBuilderTests.cls-meta.xml | 2 +- .../RollupRecursionItemTests.cls-meta.xml | 2 +- ...pRelationshipFieldFinderTests.cls-meta.xml | 2 +- .../RollupRepositoryTests.cls-meta.xml | 2 +- .../RollupSObjectUpdaterTests.cls-meta.xml | 2 +- .../classes/RollupTestUtils.cls-meta.xml | 2 +- extra-tests/classes/RollupTests.cls-meta.xml | 2 +- ....Integration_NumberValue_FIRST.md-meta.xml | 2 +- ...By.Integration_TextValue_FIRST.md-meta.xml | 2 +- ...egration_Clear_Lookup_Fields.flow-meta.xml | 2 +- ..._Comma_Separated_Full_Recalc.flow-meta.xml | 4 +- ...ltiple_Deferred_Case_Rollups.flow-meta.xml | 2 +- ...arent_Where_Clause_Filtering.flow-meta.xml | 2 +- ...fresh_With_Empty_Collections.flow-meta.xml | 4 +- ...Integration_Rollup_Order_Bys.flow-meta.xml | 80 +++++++++++++++++++ ...fresh_on_delete_clears_value.flow-meta.xml | 4 +- .../triggers/AccountTrigger.trigger-meta.xml | 2 +- .../ApplicationLogTrigger.trigger-meta.xml | 2 +- .../ApplicationTrigger.trigger-meta.xml | 2 +- .../ParentApplicationTrigger.trigger-meta.xml | 2 +- .../RollupChildTrigger.trigger-meta.xml | 2 +- package.json | 2 +- .../RollupCustomObjectLogger.cls-meta.xml | 2 +- .../classes/RollupLogBatchPurger.cls-meta.xml | 2 +- .../classes/RollupLogControl.cls-meta.xml | 2 +- .../RollupLogEventHandler.cls-meta.xml | 2 +- .../RollupPurgerSchedulable.cls-meta.xml | 2 +- ...RollupCustomObjectLoggerTests.cls-meta.xml | 2 +- .../RollupLogBatchPurgerTests.cls-meta.xml | 2 +- .../RollupLogEventTrigger.trigger-meta.xml | 2 +- .../RollupNebulaLoggerAdapter.cls-meta.xml | 2 +- .../tests/LogBatchPurgerAll.cls-meta.xml | 2 +- ...RollupNebulaLoggerAdapterTest.cls-meta.xml | 2 +- plugins/RollupCallback/README.md | 2 +- .../classes/RollupDispatch.cls-meta.xml | 2 +- .../tests/RollupDispatchTests.cls-meta.xml | 2 +- rollup-namespaced/README.md | 4 +- rollup-namespaced/sfdx-project.json | 9 ++- ...calculateParentRollupFlexipage.js-meta.xml | 2 +- .../rollupForceRecalculation.js-meta.xml | 2 +- .../rollupOrderBy/rollupOrderBy.js-meta.xml | 2 +- .../lwc/rollupUtils/rolupUtils.js-meta.xml | 2 +- rollup/core/classes/Rollup.cls-meta.xml | 2 +- .../classes/RollupAsyncProcessor.cls-meta.xml | 2 +- .../RollupCalcItemReplacer.cls-meta.xml | 2 +- .../classes/RollupCalcItemSorter.cls-meta.xml | 2 +- .../classes/RollupCalculator.cls-meta.xml | 2 +- .../classes/RollupCurrencyInfo.cls-meta.xml | 2 +- .../classes/RollupDateLiteral.cls-meta.xml | 2 +- ...upDeferredFullRecalcProcessor.cls-meta.xml | 2 +- .../core/classes/RollupEvaluator.cls-meta.xml | 2 +- .../RollupFieldInitializer.cls-meta.xml | 2 +- .../core/classes/RollupFinalizer.cls-meta.xml | 2 +- .../core/classes/RollupFlowBulkProcessor.cls | 3 +- .../RollupFlowBulkProcessor.cls-meta.xml | 2 +- .../classes/RollupFlowBulkSaver.cls-meta.xml | 2 +- ...ollupFlowFullRecalcDispatcher.cls-meta.xml | 2 +- .../RollupFullBatchRecalculator.cls-meta.xml | 2 +- .../RollupFullRecalcProcessor.cls-meta.xml | 2 +- rollup/core/classes/RollupLimits.cls-meta.xml | 2 +- rollup/core/classes/RollupLogger.cls | 2 +- rollup/core/classes/RollupLogger.cls-meta.xml | 2 +- .../classes/RollupMetaPicklists.cls-meta.xml | 2 +- .../RollupParentResetProcessor.cls-meta.xml | 2 +- rollup/core/classes/RollupPlugin.cls-meta.xml | 2 +- .../classes/RollupQueryBuilder.cls-meta.xml | 2 +- .../classes/RollupRecursionItem.cls-meta.xml | 2 +- ...RollupRelationshipFieldFinder.cls-meta.xml | 2 +- .../classes/RollupRepository.cls-meta.xml | 2 +- .../classes/RollupSObjectUpdater.cls-meta.xml | 2 +- .../classes/RollupSchedulable.cls-meta.xml | 2 +- rollup/core/classes/RollupState.cls-meta.xml | 2 +- sfdx-project.json | 9 ++- 96 files changed, 225 insertions(+), 112 deletions(-) create mode 100644 extra-tests/flows/Rollup_Integration_Rollup_Order_Bys.flow-meta.xml diff --git a/README.md b/README.md index 8ca02079..926ae0a3 100644 --- a/README.md +++ b/README.md @@ -24,12 +24,12 @@ As well, don't miss [the Wiki](../../wiki), which includes even more info for co ## Deployment & Setup - + Deploy to Salesforce - + Deploy to Salesforce Sandbox diff --git a/extra-tests/classes/CustomMetadataDrivenTests.cls b/extra-tests/classes/CustomMetadataDrivenTests.cls index 6ecc8d3d..1d00bc8b 100644 --- a/extra-tests/classes/CustomMetadataDrivenTests.cls +++ b/extra-tests/classes/CustomMetadataDrivenTests.cls @@ -14,7 +14,7 @@ private class CustomMetadataDrivenTests { // uses a combination of Rollup__mdt found in extra-tests/customMetadata AND extra-tests/triggers/RollupChildTrigger.trigger RollupParent__c parent = [SELECT Id FROM RollupParent__c]; // uses FIRST with TextField__c as the Order By field, MAX for the NumberField__c - RollupChild__c childOne = new RollupChild__c(Name = 'Child one', TextField__c = 'a', RollupParent__c = parent.Id, NumberField__c = 3); + RollupChild__c childOne = new RollupChild__c(Name = 'Child one', TextField__c = 'a', RollupParent__c = parent.Id, NumberField__c = 2); RollupChild__c childTwo = new RollupChild__c(Name = 'Child two', TextField__c = 'b', RollupParent__c = parent.Id, NumberField__c = 2); Test.startTest(); @@ -34,8 +34,8 @@ private class CustomMetadataDrivenTests { } // uses a combination of Rollup__mdt found in extra-tests/customMetadata AND extra-tests/triggers/RollupChildTrigger.trigger RollupParent__c parent = [SELECT Id FROM RollupParent__c]; - // uses FIRST with TextField__c as the Order By field, MAX for the NumberField__c - RollupChild__c childOne = new RollupChild__c(Name = 'Child one', TextField__c = 'a', RollupParent__c = parent.Id, NumberField__c = 3); + // uses FIRST (with NumberField__c, TextField__c as the Order By fields), MAX for the NumberField__c + RollupChild__c childOne = new RollupChild__c(Name = 'Child one', TextField__c = 'a', RollupParent__c = parent.Id, NumberField__c = 1); RollupChild__c childTwo = new RollupChild__c(Name = 'Child two', TextField__c = 'b', RollupParent__c = parent.Id, NumberField__c = 2); insert new List{ childOne, childTwo }; @@ -55,7 +55,7 @@ private class CustomMetadataDrivenTests { // re-assert on both fields being correct now, just to be sure parent = [SELECT Id, TextField__c, NumberField__c FROM RollupParent__c]; System.assertEquals(childTwo.NumberField__c, parent.NumberField__c); - System.assertEquals(childTwo.TextField__c, parent.TextField__c); + System.assertEquals(childOne.TextField__c, parent.TextField__c); } @IsTest @@ -177,12 +177,12 @@ private class CustomMetadataDrivenTests { RollupParent__c parent = [SELECT Id FROM RollupParent__c]; Test.startTest(); - insertRollupChildrenAsync(parent.Id, 'a', 3); + insertRollupChildrenAsync(parent.Id, 'a', 1); Test.stopTest(); parent = [SELECT Id, TextField__c, NumberField__c FROM RollupParent__c]; System.assertEquals('a', parent.TextField__c); - System.assertEquals(3, parent.NumberField__c); + System.assertEquals(2, parent.NumberField__c); } @Future diff --git a/extra-tests/classes/CustomMetadataDrivenTests.cls-meta.xml b/extra-tests/classes/CustomMetadataDrivenTests.cls-meta.xml index c01f6433..800ee428 100644 --- a/extra-tests/classes/CustomMetadataDrivenTests.cls-meta.xml +++ b/extra-tests/classes/CustomMetadataDrivenTests.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/extra-tests/classes/InvocableDrivenTests.cls b/extra-tests/classes/InvocableDrivenTests.cls index ddd853f6..4ac4cdfb 100644 --- a/extra-tests/classes/InvocableDrivenTests.cls +++ b/extra-tests/classes/InvocableDrivenTests.cls @@ -199,4 +199,34 @@ private class InvocableDrivenTests { acc = [SELECT AnnualRevenue FROM Account WHERE Id = :acc.Id]; System.assertEquals(child.PreferenceRank, acc.AnnualRevenue); } + + @IsTest + static void orderBysRetainRanking() { + RollupParent__c parent = new RollupParent__c(Name = 'Parent'); + insert parent; + + RollupChild__c childOne = new RollupChild__c( + RollupParent__c = parent.Id, + NumberField__c = 1, + TextField__c = 'b', + Id = RollupTestUtils.createId(RollupChild__c.SObjectType) + ); + RollupChild__c childTwo = new RollupChild__c( + RollupParent__c = parent.Id, + NumberField__c = 1, + TextField__c = 'a', + Id = RollupTestUtils.createId(RollupChild__c.SObjectType) + ); + + Flow.Interview flowInterview = new Flow.Interview.Rollup_Integration_Rollup_Order_Bys( + new Map{ 'rollupChildren' => new List{ childOne, childTwo } } + ); + + Test.startTest(); + flowInterview.start(); + Test.stopTest(); + + parent = [SELECT TextField__c FROM RollupParent__c WHERE Id = :parent.Id]; + System.assertEquals(childTwo.TextField__c, parent.TextField__c); + } } diff --git a/extra-tests/classes/InvocableDrivenTests.cls-meta.xml b/extra-tests/classes/InvocableDrivenTests.cls-meta.xml index c01f6433..800ee428 100644 --- a/extra-tests/classes/InvocableDrivenTests.cls-meta.xml +++ b/extra-tests/classes/InvocableDrivenTests.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/extra-tests/classes/RollupCalcItemReplacerTests.cls-meta.xml b/extra-tests/classes/RollupCalcItemReplacerTests.cls-meta.xml index c01f6433..800ee428 100644 --- a/extra-tests/classes/RollupCalcItemReplacerTests.cls-meta.xml +++ b/extra-tests/classes/RollupCalcItemReplacerTests.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/extra-tests/classes/RollupCalcItemSorterTests.cls-meta.xml b/extra-tests/classes/RollupCalcItemSorterTests.cls-meta.xml index c01f6433..800ee428 100644 --- a/extra-tests/classes/RollupCalcItemSorterTests.cls-meta.xml +++ b/extra-tests/classes/RollupCalcItemSorterTests.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/extra-tests/classes/RollupCalculatorTests.cls-meta.xml b/extra-tests/classes/RollupCalculatorTests.cls-meta.xml index c01f6433..800ee428 100644 --- a/extra-tests/classes/RollupCalculatorTests.cls-meta.xml +++ b/extra-tests/classes/RollupCalculatorTests.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/extra-tests/classes/RollupCurrencyInfoTests.cls-meta.xml b/extra-tests/classes/RollupCurrencyInfoTests.cls-meta.xml index c01f6433..800ee428 100644 --- a/extra-tests/classes/RollupCurrencyInfoTests.cls-meta.xml +++ b/extra-tests/classes/RollupCurrencyInfoTests.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/extra-tests/classes/RollupDateLiteralTests.cls-meta.xml b/extra-tests/classes/RollupDateLiteralTests.cls-meta.xml index a12d8367..791ef783 100644 --- a/extra-tests/classes/RollupDateLiteralTests.cls-meta.xml +++ b/extra-tests/classes/RollupDateLiteralTests.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/extra-tests/classes/RollupEvaluatorTests.cls-meta.xml b/extra-tests/classes/RollupEvaluatorTests.cls-meta.xml index 86d7e143..caadc7cb 100644 --- a/extra-tests/classes/RollupEvaluatorTests.cls-meta.xml +++ b/extra-tests/classes/RollupEvaluatorTests.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/extra-tests/classes/RollupFieldInitializerTests.cls-meta.xml b/extra-tests/classes/RollupFieldInitializerTests.cls-meta.xml index c01f6433..800ee428 100644 --- a/extra-tests/classes/RollupFieldInitializerTests.cls-meta.xml +++ b/extra-tests/classes/RollupFieldInitializerTests.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/extra-tests/classes/RollupFinalizerTests.cls-meta.xml b/extra-tests/classes/RollupFinalizerTests.cls-meta.xml index c01f6433..800ee428 100644 --- a/extra-tests/classes/RollupFinalizerTests.cls-meta.xml +++ b/extra-tests/classes/RollupFinalizerTests.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/extra-tests/classes/RollupFlowBulkProcessorTests.cls-meta.xml b/extra-tests/classes/RollupFlowBulkProcessorTests.cls-meta.xml index c01f6433..800ee428 100644 --- a/extra-tests/classes/RollupFlowBulkProcessorTests.cls-meta.xml +++ b/extra-tests/classes/RollupFlowBulkProcessorTests.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/extra-tests/classes/RollupFlowFullRecalcDispatcherTests.cls-meta.xml b/extra-tests/classes/RollupFlowFullRecalcDispatcherTests.cls-meta.xml index c01f6433..800ee428 100644 --- a/extra-tests/classes/RollupFlowFullRecalcDispatcherTests.cls-meta.xml +++ b/extra-tests/classes/RollupFlowFullRecalcDispatcherTests.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/extra-tests/classes/RollupFlowFullRecalcTests.cls-meta.xml b/extra-tests/classes/RollupFlowFullRecalcTests.cls-meta.xml index 3075dcec..800ee428 100644 --- a/extra-tests/classes/RollupFlowFullRecalcTests.cls-meta.xml +++ b/extra-tests/classes/RollupFlowFullRecalcTests.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active - \ No newline at end of file + diff --git a/extra-tests/classes/RollupFlowTests.cls-meta.xml b/extra-tests/classes/RollupFlowTests.cls-meta.xml index c01f6433..800ee428 100644 --- a/extra-tests/classes/RollupFlowTests.cls-meta.xml +++ b/extra-tests/classes/RollupFlowTests.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/extra-tests/classes/RollupFullRecalcTests.cls-meta.xml b/extra-tests/classes/RollupFullRecalcTests.cls-meta.xml index c01f6433..800ee428 100644 --- a/extra-tests/classes/RollupFullRecalcTests.cls-meta.xml +++ b/extra-tests/classes/RollupFullRecalcTests.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/extra-tests/classes/RollupIntegrationTests.cls-meta.xml b/extra-tests/classes/RollupIntegrationTests.cls-meta.xml index c01f6433..800ee428 100644 --- a/extra-tests/classes/RollupIntegrationTests.cls-meta.xml +++ b/extra-tests/classes/RollupIntegrationTests.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/extra-tests/classes/RollupLimitsTest.cls-meta.xml b/extra-tests/classes/RollupLimitsTest.cls-meta.xml index c01f6433..800ee428 100644 --- a/extra-tests/classes/RollupLimitsTest.cls-meta.xml +++ b/extra-tests/classes/RollupLimitsTest.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/extra-tests/classes/RollupLoggerTests.cls-meta.xml b/extra-tests/classes/RollupLoggerTests.cls-meta.xml index c01f6433..800ee428 100644 --- a/extra-tests/classes/RollupLoggerTests.cls-meta.xml +++ b/extra-tests/classes/RollupLoggerTests.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/extra-tests/classes/RollupMultiCurrencyTests.cls-meta.xml b/extra-tests/classes/RollupMultiCurrencyTests.cls-meta.xml index 3075dcec..800ee428 100644 --- a/extra-tests/classes/RollupMultiCurrencyTests.cls-meta.xml +++ b/extra-tests/classes/RollupMultiCurrencyTests.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active - \ No newline at end of file + diff --git a/extra-tests/classes/RollupParentResetProcessorTests.cls-meta.xml b/extra-tests/classes/RollupParentResetProcessorTests.cls-meta.xml index c01f6433..800ee428 100644 --- a/extra-tests/classes/RollupParentResetProcessorTests.cls-meta.xml +++ b/extra-tests/classes/RollupParentResetProcessorTests.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/extra-tests/classes/RollupQueryBuilderTests.cls-meta.xml b/extra-tests/classes/RollupQueryBuilderTests.cls-meta.xml index c01f6433..800ee428 100644 --- a/extra-tests/classes/RollupQueryBuilderTests.cls-meta.xml +++ b/extra-tests/classes/RollupQueryBuilderTests.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/extra-tests/classes/RollupRecursionItemTests.cls-meta.xml b/extra-tests/classes/RollupRecursionItemTests.cls-meta.xml index c01f6433..800ee428 100644 --- a/extra-tests/classes/RollupRecursionItemTests.cls-meta.xml +++ b/extra-tests/classes/RollupRecursionItemTests.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/extra-tests/classes/RollupRelationshipFieldFinderTests.cls-meta.xml b/extra-tests/classes/RollupRelationshipFieldFinderTests.cls-meta.xml index 86d7e143..caadc7cb 100644 --- a/extra-tests/classes/RollupRelationshipFieldFinderTests.cls-meta.xml +++ b/extra-tests/classes/RollupRelationshipFieldFinderTests.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/extra-tests/classes/RollupRepositoryTests.cls-meta.xml b/extra-tests/classes/RollupRepositoryTests.cls-meta.xml index c01f6433..800ee428 100644 --- a/extra-tests/classes/RollupRepositoryTests.cls-meta.xml +++ b/extra-tests/classes/RollupRepositoryTests.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/extra-tests/classes/RollupSObjectUpdaterTests.cls-meta.xml b/extra-tests/classes/RollupSObjectUpdaterTests.cls-meta.xml index c01f6433..800ee428 100644 --- a/extra-tests/classes/RollupSObjectUpdaterTests.cls-meta.xml +++ b/extra-tests/classes/RollupSObjectUpdaterTests.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/extra-tests/classes/RollupTestUtils.cls-meta.xml b/extra-tests/classes/RollupTestUtils.cls-meta.xml index c01f6433..800ee428 100644 --- a/extra-tests/classes/RollupTestUtils.cls-meta.xml +++ b/extra-tests/classes/RollupTestUtils.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/extra-tests/classes/RollupTests.cls-meta.xml b/extra-tests/classes/RollupTests.cls-meta.xml index c01f6433..800ee428 100644 --- a/extra-tests/classes/RollupTests.cls-meta.xml +++ b/extra-tests/classes/RollupTests.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/extra-tests/customMetadata/RollupOrderBy.Integration_NumberValue_FIRST.md-meta.xml b/extra-tests/customMetadata/RollupOrderBy.Integration_NumberValue_FIRST.md-meta.xml index fa49e308..12de6fa5 100644 --- a/extra-tests/customMetadata/RollupOrderBy.Integration_NumberValue_FIRST.md-meta.xml +++ b/extra-tests/customMetadata/RollupOrderBy.Integration_NumberValue_FIRST.md-meta.xml @@ -16,7 +16,7 @@ Ranking__c - 1.0 + 0.0 Rollup__c diff --git a/extra-tests/customMetadata/RollupOrderBy.Integration_TextValue_FIRST.md-meta.xml b/extra-tests/customMetadata/RollupOrderBy.Integration_TextValue_FIRST.md-meta.xml index b0e94481..b8bdb7dd 100644 --- a/extra-tests/customMetadata/RollupOrderBy.Integration_TextValue_FIRST.md-meta.xml +++ b/extra-tests/customMetadata/RollupOrderBy.Integration_TextValue_FIRST.md-meta.xml @@ -16,7 +16,7 @@ Ranking__c - 0.0 + 1.0 Rollup__c diff --git a/extra-tests/flows/Rollup_Integration_Clear_Lookup_Fields.flow-meta.xml b/extra-tests/flows/Rollup_Integration_Clear_Lookup_Fields.flow-meta.xml index d78286ab..4f13e204 100644 --- a/extra-tests/flows/Rollup_Integration_Clear_Lookup_Fields.flow-meta.xml +++ b/extra-tests/flows/Rollup_Integration_Clear_Lookup_Fields.flow-meta.xml @@ -78,7 +78,7 @@ true - 61.0 + 62.0 Add_Records_To_Collections diff --git a/extra-tests/flows/Rollup_Integration_Comma_Separated_Full_Recalc.flow-meta.xml b/extra-tests/flows/Rollup_Integration_Comma_Separated_Full_Recalc.flow-meta.xml index 13a5e477..95bc0d7a 100644 --- a/extra-tests/flows/Rollup_Integration_Comma_Separated_Full_Recalc.flow-meta.xml +++ b/extra-tests/flows/Rollup_Integration_Comma_Separated_Full_Recalc.flow-meta.xml @@ -1,4 +1,4 @@ - + Recalc_Rollups @@ -18,7 +18,7 @@ true 1 - 61.0 + 62.0 Default Rollup Integration: Comma-Separated Full Recalc {!$Flow.CurrentDateTime} diff --git a/extra-tests/flows/Rollup_Integration_Multiple_Deferred_Case_Rollups.flow-meta.xml b/extra-tests/flows/Rollup_Integration_Multiple_Deferred_Case_Rollups.flow-meta.xml index e36c4cd4..60a4f79b 100644 --- a/extra-tests/flows/Rollup_Integration_Multiple_Deferred_Case_Rollups.flow-meta.xml +++ b/extra-tests/flows/Rollup_Integration_Multiple_Deferred_Case_Rollups.flow-meta.xml @@ -333,7 +333,7 @@ true - 61.0 + 62.0 Add_case_and_prior_case_to_collections diff --git a/extra-tests/flows/Rollup_Integration_Parent_Where_Clause_Filtering.flow-meta.xml b/extra-tests/flows/Rollup_Integration_Parent_Where_Clause_Filtering.flow-meta.xml index ad47d873..7e0601dd 100644 --- a/extra-tests/flows/Rollup_Integration_Parent_Where_Clause_Filtering.flow-meta.xml +++ b/extra-tests/flows/Rollup_Integration_Parent_Where_Clause_Filtering.flow-meta.xml @@ -85,7 +85,7 @@ true - 61.0 + 62.0 Add_to_collections diff --git a/extra-tests/flows/Rollup_Integration_Refresh_With_Empty_Collections.flow-meta.xml b/extra-tests/flows/Rollup_Integration_Refresh_With_Empty_Collections.flow-meta.xml index dbdffe8c..31243c5d 100644 --- a/extra-tests/flows/Rollup_Integration_Refresh_With_Empty_Collections.flow-meta.xml +++ b/extra-tests/flows/Rollup_Integration_Refresh_With_Empty_Collections.flow-meta.xml @@ -1,4 +1,4 @@ - + Rollup_ContactPointConsent_Record @@ -44,7 +44,7 @@ true 1 - 61.0 + 62.0 Default Rollup Integration - Refresh With Empty Collections {!$Flow.CurrentDateTime} diff --git a/extra-tests/flows/Rollup_Integration_Rollup_Order_Bys.flow-meta.xml b/extra-tests/flows/Rollup_Integration_Rollup_Order_Bys.flow-meta.xml new file mode 100644 index 00000000..705d23b3 --- /dev/null +++ b/extra-tests/flows/Rollup_Integration_Rollup_Order_Bys.flow-meta.xml @@ -0,0 +1,80 @@ + + + + Call_CMDT_action + + 176 + 134 + RollupFlowBulkProcessor + apex + + T__oldRecordsToRollup + RollupChild__c + + + T__recordsToRollup + RollupChild__c + + CurrentTransaction + + deferProcessing + + false + + + + recordsToRollup + + rollupChildren + + + + rollupContext + + INSERT + + + RollupFlowBulkProcessor + true + 1 + + 62.0 + Default + Rollup Integration - Rollup Order Bys {!$Flow.CurrentDateTime} + + + BuilderType + + LightningFlowBuilder + + + + CanvasMode + + AUTO_LAYOUT_CANVAS + + + + OriginBuilderType + + LightningFlowBuilder + + + AutoLaunchedFlow + + 50 + 0 + + Call_CMDT_action + + + Draft + + rollupChildren + SObject + true + true + false + RollupChild__c + + diff --git a/extra-tests/flows/Rollup_Integration_refresh_on_delete_clears_value.flow-meta.xml b/extra-tests/flows/Rollup_Integration_refresh_on_delete_clears_value.flow-meta.xml index 8f6e73d6..f4d6db85 100644 --- a/extra-tests/flows/Rollup_Integration_refresh_on_delete_clears_value.flow-meta.xml +++ b/extra-tests/flows/Rollup_Integration_refresh_on_delete_clears_value.flow-meta.xml @@ -1,4 +1,4 @@ - + Perform_Rollup @@ -68,7 +68,7 @@ true 1 - 61.0 + 62.0 Add_deleted_record_to_collection diff --git a/extra-tests/triggers/AccountTrigger.trigger-meta.xml b/extra-tests/triggers/AccountTrigger.trigger-meta.xml index bb29e8ad..06737443 100644 --- a/extra-tests/triggers/AccountTrigger.trigger-meta.xml +++ b/extra-tests/triggers/AccountTrigger.trigger-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/extra-tests/triggers/ApplicationLogTrigger.trigger-meta.xml b/extra-tests/triggers/ApplicationLogTrigger.trigger-meta.xml index bb29e8ad..06737443 100644 --- a/extra-tests/triggers/ApplicationLogTrigger.trigger-meta.xml +++ b/extra-tests/triggers/ApplicationLogTrigger.trigger-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/extra-tests/triggers/ApplicationTrigger.trigger-meta.xml b/extra-tests/triggers/ApplicationTrigger.trigger-meta.xml index bb29e8ad..06737443 100644 --- a/extra-tests/triggers/ApplicationTrigger.trigger-meta.xml +++ b/extra-tests/triggers/ApplicationTrigger.trigger-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/extra-tests/triggers/ParentApplicationTrigger.trigger-meta.xml b/extra-tests/triggers/ParentApplicationTrigger.trigger-meta.xml index bb29e8ad..06737443 100644 --- a/extra-tests/triggers/ParentApplicationTrigger.trigger-meta.xml +++ b/extra-tests/triggers/ParentApplicationTrigger.trigger-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/extra-tests/triggers/RollupChildTrigger.trigger-meta.xml b/extra-tests/triggers/RollupChildTrigger.trigger-meta.xml index bb29e8ad..06737443 100644 --- a/extra-tests/triggers/RollupChildTrigger.trigger-meta.xml +++ b/extra-tests/triggers/RollupChildTrigger.trigger-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/package.json b/package.json index b56c89fa..1bc2972e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "apex-rollup", - "version": "1.6.35", + "version": "1.6.36", "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", diff --git a/plugins/CustomObjectRollupLogger/classes/RollupCustomObjectLogger.cls-meta.xml b/plugins/CustomObjectRollupLogger/classes/RollupCustomObjectLogger.cls-meta.xml index c01f6433..800ee428 100644 --- a/plugins/CustomObjectRollupLogger/classes/RollupCustomObjectLogger.cls-meta.xml +++ b/plugins/CustomObjectRollupLogger/classes/RollupCustomObjectLogger.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/plugins/CustomObjectRollupLogger/classes/RollupLogBatchPurger.cls-meta.xml b/plugins/CustomObjectRollupLogger/classes/RollupLogBatchPurger.cls-meta.xml index c01f6433..800ee428 100644 --- a/plugins/CustomObjectRollupLogger/classes/RollupLogBatchPurger.cls-meta.xml +++ b/plugins/CustomObjectRollupLogger/classes/RollupLogBatchPurger.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/plugins/CustomObjectRollupLogger/classes/RollupLogControl.cls-meta.xml b/plugins/CustomObjectRollupLogger/classes/RollupLogControl.cls-meta.xml index c01f6433..800ee428 100644 --- a/plugins/CustomObjectRollupLogger/classes/RollupLogControl.cls-meta.xml +++ b/plugins/CustomObjectRollupLogger/classes/RollupLogControl.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/plugins/CustomObjectRollupLogger/classes/RollupLogEventHandler.cls-meta.xml b/plugins/CustomObjectRollupLogger/classes/RollupLogEventHandler.cls-meta.xml index c01f6433..800ee428 100644 --- a/plugins/CustomObjectRollupLogger/classes/RollupLogEventHandler.cls-meta.xml +++ b/plugins/CustomObjectRollupLogger/classes/RollupLogEventHandler.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/plugins/CustomObjectRollupLogger/classes/RollupPurgerSchedulable.cls-meta.xml b/plugins/CustomObjectRollupLogger/classes/RollupPurgerSchedulable.cls-meta.xml index c01f6433..800ee428 100644 --- a/plugins/CustomObjectRollupLogger/classes/RollupPurgerSchedulable.cls-meta.xml +++ b/plugins/CustomObjectRollupLogger/classes/RollupPurgerSchedulable.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/plugins/CustomObjectRollupLogger/tests/RollupCustomObjectLoggerTests.cls-meta.xml b/plugins/CustomObjectRollupLogger/tests/RollupCustomObjectLoggerTests.cls-meta.xml index c01f6433..800ee428 100644 --- a/plugins/CustomObjectRollupLogger/tests/RollupCustomObjectLoggerTests.cls-meta.xml +++ b/plugins/CustomObjectRollupLogger/tests/RollupCustomObjectLoggerTests.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/plugins/CustomObjectRollupLogger/tests/RollupLogBatchPurgerTests.cls-meta.xml b/plugins/CustomObjectRollupLogger/tests/RollupLogBatchPurgerTests.cls-meta.xml index c01f6433..800ee428 100644 --- a/plugins/CustomObjectRollupLogger/tests/RollupLogBatchPurgerTests.cls-meta.xml +++ b/plugins/CustomObjectRollupLogger/tests/RollupLogBatchPurgerTests.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/plugins/CustomObjectRollupLogger/triggers/RollupLogEventTrigger.trigger-meta.xml b/plugins/CustomObjectRollupLogger/triggers/RollupLogEventTrigger.trigger-meta.xml index bb29e8ad..06737443 100644 --- a/plugins/CustomObjectRollupLogger/triggers/RollupLogEventTrigger.trigger-meta.xml +++ b/plugins/CustomObjectRollupLogger/triggers/RollupLogEventTrigger.trigger-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/plugins/NebulaLogger/classes/RollupNebulaLoggerAdapter.cls-meta.xml b/plugins/NebulaLogger/classes/RollupNebulaLoggerAdapter.cls-meta.xml index c01f6433..800ee428 100644 --- a/plugins/NebulaLogger/classes/RollupNebulaLoggerAdapter.cls-meta.xml +++ b/plugins/NebulaLogger/classes/RollupNebulaLoggerAdapter.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/plugins/NebulaLogger/tests/LogBatchPurgerAll.cls-meta.xml b/plugins/NebulaLogger/tests/LogBatchPurgerAll.cls-meta.xml index c01f6433..800ee428 100644 --- a/plugins/NebulaLogger/tests/LogBatchPurgerAll.cls-meta.xml +++ b/plugins/NebulaLogger/tests/LogBatchPurgerAll.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/plugins/NebulaLogger/tests/RollupNebulaLoggerAdapterTest.cls-meta.xml b/plugins/NebulaLogger/tests/RollupNebulaLoggerAdapterTest.cls-meta.xml index c01f6433..800ee428 100644 --- a/plugins/NebulaLogger/tests/RollupNebulaLoggerAdapterTest.cls-meta.xml +++ b/plugins/NebulaLogger/tests/RollupNebulaLoggerAdapterTest.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/plugins/RollupCallback/README.md b/plugins/RollupCallback/README.md index cceb6fa8..d0776202 100644 --- a/plugins/RollupCallback/README.md +++ b/plugins/RollupCallback/README.md @@ -43,7 +43,7 @@ export default class RollupChangeNotifier extends LightningElement { - 61.0 + 62.0 true Rollup Change Notifier diff --git a/plugins/RollupCallback/classes/RollupDispatch.cls-meta.xml b/plugins/RollupCallback/classes/RollupDispatch.cls-meta.xml index c01f6433..800ee428 100644 --- a/plugins/RollupCallback/classes/RollupDispatch.cls-meta.xml +++ b/plugins/RollupCallback/classes/RollupDispatch.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/plugins/RollupCallback/tests/RollupDispatchTests.cls-meta.xml b/plugins/RollupCallback/tests/RollupDispatchTests.cls-meta.xml index c01f6433..800ee428 100644 --- a/plugins/RollupCallback/tests/RollupDispatchTests.cls-meta.xml +++ b/plugins/RollupCallback/tests/RollupDispatchTests.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/rollup-namespaced/README.md b/rollup-namespaced/README.md index dcc70b51..deb451c5 100644 --- a/rollup-namespaced/README.md +++ b/rollup-namespaced/README.md @@ -18,12 +18,12 @@ For more info, see the base `README`. ## Deployment & Setup - + Deploy to Salesforce - + Deploy to Salesforce Sandbox diff --git a/rollup-namespaced/sfdx-project.json b/rollup-namespaced/sfdx-project.json index f84c61c0..c35bf0fd 100644 --- a/rollup-namespaced/sfdx-project.json +++ b/rollup-namespaced/sfdx-project.json @@ -4,8 +4,8 @@ "default": true, "package": "apex-rollup-namespaced", "path": "rollup-namespaced/source/rollup", - "versionName": "Fixes Rollup Order By sorting to always be deterministic, allows text templates in Full Recalc CMDT-driven Invocable invocable", - "versionNumber": "1.1.28.0", + "versionName": "Fixes Rollup Order By issue when called from RollupFlowBulkProcessor", + "versionNumber": "1.1.29.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": { @@ -31,6 +31,7 @@ "apex-rollup-namespaced@1.1.25": "04t6g000008Obc0AAC", "apex-rollup-namespaced@1.1.26": "04t6g000008ObeVAAS", "apex-rollup-namespaced@1.1.27": "04t6g000008OfJkAAK", - "apex-rollup-namespaced@1.1.28": "04t6g000008OfKnAAK" + "apex-rollup-namespaced@1.1.28": "04t6g000008OfKnAAK", + "apex-rollup-namespaced@1.1.29": "04t6g000008OfMjAAK" } -} +} \ No newline at end of file diff --git a/rollup/app/lwc/recalculateParentRollupFlexipage/recalculateParentRollupFlexipage.js-meta.xml b/rollup/app/lwc/recalculateParentRollupFlexipage/recalculateParentRollupFlexipage.js-meta.xml index 25b6fd3f..ea09ad8f 100644 --- a/rollup/app/lwc/recalculateParentRollupFlexipage/recalculateParentRollupFlexipage.js-meta.xml +++ b/rollup/app/lwc/recalculateParentRollupFlexipage/recalculateParentRollupFlexipage.js-meta.xml @@ -1,6 +1,6 @@ - 61.0 + 62.0 true Recalc Rollups Button diff --git a/rollup/app/lwc/rollupForceRecalculation/rollupForceRecalculation.js-meta.xml b/rollup/app/lwc/rollupForceRecalculation/rollupForceRecalculation.js-meta.xml index 6ec3ec62..33aabc3c 100644 --- a/rollup/app/lwc/rollupForceRecalculation/rollupForceRecalculation.js-meta.xml +++ b/rollup/app/lwc/rollupForceRecalculation/rollupForceRecalculation.js-meta.xml @@ -1,6 +1,6 @@ - 61.0 + 62.0 true lightning__AppPage diff --git a/rollup/app/lwc/rollupOrderBy/rollupOrderBy.js-meta.xml b/rollup/app/lwc/rollupOrderBy/rollupOrderBy.js-meta.xml index 0bef279d..4acf9ac8 100644 --- a/rollup/app/lwc/rollupOrderBy/rollupOrderBy.js-meta.xml +++ b/rollup/app/lwc/rollupOrderBy/rollupOrderBy.js-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 false diff --git a/rollup/app/lwc/rollupUtils/rolupUtils.js-meta.xml b/rollup/app/lwc/rollupUtils/rolupUtils.js-meta.xml index 0bef279d..4acf9ac8 100644 --- a/rollup/app/lwc/rollupUtils/rolupUtils.js-meta.xml +++ b/rollup/app/lwc/rollupUtils/rolupUtils.js-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 false diff --git a/rollup/core/classes/Rollup.cls-meta.xml b/rollup/core/classes/Rollup.cls-meta.xml index c01f6433..800ee428 100644 --- a/rollup/core/classes/Rollup.cls-meta.xml +++ b/rollup/core/classes/Rollup.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/rollup/core/classes/RollupAsyncProcessor.cls-meta.xml b/rollup/core/classes/RollupAsyncProcessor.cls-meta.xml index c01f6433..800ee428 100644 --- a/rollup/core/classes/RollupAsyncProcessor.cls-meta.xml +++ b/rollup/core/classes/RollupAsyncProcessor.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/rollup/core/classes/RollupCalcItemReplacer.cls-meta.xml b/rollup/core/classes/RollupCalcItemReplacer.cls-meta.xml index c01f6433..800ee428 100644 --- a/rollup/core/classes/RollupCalcItemReplacer.cls-meta.xml +++ b/rollup/core/classes/RollupCalcItemReplacer.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/rollup/core/classes/RollupCalcItemSorter.cls-meta.xml b/rollup/core/classes/RollupCalcItemSorter.cls-meta.xml index c01f6433..800ee428 100644 --- a/rollup/core/classes/RollupCalcItemSorter.cls-meta.xml +++ b/rollup/core/classes/RollupCalcItemSorter.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/rollup/core/classes/RollupCalculator.cls-meta.xml b/rollup/core/classes/RollupCalculator.cls-meta.xml index c01f6433..800ee428 100644 --- a/rollup/core/classes/RollupCalculator.cls-meta.xml +++ b/rollup/core/classes/RollupCalculator.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/rollup/core/classes/RollupCurrencyInfo.cls-meta.xml b/rollup/core/classes/RollupCurrencyInfo.cls-meta.xml index a12d8367..791ef783 100644 --- a/rollup/core/classes/RollupCurrencyInfo.cls-meta.xml +++ b/rollup/core/classes/RollupCurrencyInfo.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/rollup/core/classes/RollupDateLiteral.cls-meta.xml b/rollup/core/classes/RollupDateLiteral.cls-meta.xml index a12d8367..791ef783 100644 --- a/rollup/core/classes/RollupDateLiteral.cls-meta.xml +++ b/rollup/core/classes/RollupDateLiteral.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/rollup/core/classes/RollupDeferredFullRecalcProcessor.cls-meta.xml b/rollup/core/classes/RollupDeferredFullRecalcProcessor.cls-meta.xml index a12d8367..791ef783 100644 --- a/rollup/core/classes/RollupDeferredFullRecalcProcessor.cls-meta.xml +++ b/rollup/core/classes/RollupDeferredFullRecalcProcessor.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/rollup/core/classes/RollupEvaluator.cls-meta.xml b/rollup/core/classes/RollupEvaluator.cls-meta.xml index a12d8367..791ef783 100644 --- a/rollup/core/classes/RollupEvaluator.cls-meta.xml +++ b/rollup/core/classes/RollupEvaluator.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/rollup/core/classes/RollupFieldInitializer.cls-meta.xml b/rollup/core/classes/RollupFieldInitializer.cls-meta.xml index c01f6433..800ee428 100644 --- a/rollup/core/classes/RollupFieldInitializer.cls-meta.xml +++ b/rollup/core/classes/RollupFieldInitializer.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/rollup/core/classes/RollupFinalizer.cls-meta.xml b/rollup/core/classes/RollupFinalizer.cls-meta.xml index c01f6433..800ee428 100644 --- a/rollup/core/classes/RollupFinalizer.cls-meta.xml +++ b/rollup/core/classes/RollupFinalizer.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/rollup/core/classes/RollupFlowBulkProcessor.cls b/rollup/core/classes/RollupFlowBulkProcessor.cls index 3341bcc3..67586677 100644 --- a/rollup/core/classes/RollupFlowBulkProcessor.cls +++ b/rollup/core/classes/RollupFlowBulkProcessor.cls @@ -115,7 +115,7 @@ global without sharing class RollupFlowBulkProcessor { // fixup order by children records input.orderByFirstLast = flowInput.orderByFirstLast ?? ''; if (input.orderByFirstLast == '') { - input.orderByFirstLast = getConcatenatedOrderBys(meta.RollupOrderBys__r); + input.orderByFirstLast = getConcatenatedOrderBys(new List(meta.RollupOrderBys__r)); } // metadata values that don't get overridden input.currencyFieldMapping = meta.CurrencyFieldMapping__c; @@ -152,6 +152,7 @@ global without sharing class RollupFlowBulkProcessor { } private static String getConcatenatedOrderBys(List orderBys) { + orderBys.sort(new RollupRepository.OrderBySorter()); List joinedOrderBys = new List(); for (RollupOrderBy__mdt orderBy : orderBys) { String soloOrderBy = ''; diff --git a/rollup/core/classes/RollupFlowBulkProcessor.cls-meta.xml b/rollup/core/classes/RollupFlowBulkProcessor.cls-meta.xml index c01f6433..800ee428 100644 --- a/rollup/core/classes/RollupFlowBulkProcessor.cls-meta.xml +++ b/rollup/core/classes/RollupFlowBulkProcessor.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/rollup/core/classes/RollupFlowBulkSaver.cls-meta.xml b/rollup/core/classes/RollupFlowBulkSaver.cls-meta.xml index c01f6433..800ee428 100644 --- a/rollup/core/classes/RollupFlowBulkSaver.cls-meta.xml +++ b/rollup/core/classes/RollupFlowBulkSaver.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/rollup/core/classes/RollupFlowFullRecalcDispatcher.cls-meta.xml b/rollup/core/classes/RollupFlowFullRecalcDispatcher.cls-meta.xml index c01f6433..800ee428 100644 --- a/rollup/core/classes/RollupFlowFullRecalcDispatcher.cls-meta.xml +++ b/rollup/core/classes/RollupFlowFullRecalcDispatcher.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/rollup/core/classes/RollupFullBatchRecalculator.cls-meta.xml b/rollup/core/classes/RollupFullBatchRecalculator.cls-meta.xml index c01f6433..800ee428 100644 --- a/rollup/core/classes/RollupFullBatchRecalculator.cls-meta.xml +++ b/rollup/core/classes/RollupFullBatchRecalculator.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/rollup/core/classes/RollupFullRecalcProcessor.cls-meta.xml b/rollup/core/classes/RollupFullRecalcProcessor.cls-meta.xml index c01f6433..800ee428 100644 --- a/rollup/core/classes/RollupFullRecalcProcessor.cls-meta.xml +++ b/rollup/core/classes/RollupFullRecalcProcessor.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/rollup/core/classes/RollupLimits.cls-meta.xml b/rollup/core/classes/RollupLimits.cls-meta.xml index c01f6433..800ee428 100644 --- a/rollup/core/classes/RollupLimits.cls-meta.xml +++ b/rollup/core/classes/RollupLimits.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/rollup/core/classes/RollupLogger.cls b/rollup/core/classes/RollupLogger.cls index 4423c921..df094946 100644 --- a/rollup/core/classes/RollupLogger.cls +++ b/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.35'; + private static final String CURRENT_VERSION_NUMBER = 'v1.6.36'; private static final System.LoggingLevel FALLBACK_LOGGING_LEVEL = System.LoggingLevel.DEBUG; private static final RollupPlugin PLUGIN = new RollupPlugin(); diff --git a/rollup/core/classes/RollupLogger.cls-meta.xml b/rollup/core/classes/RollupLogger.cls-meta.xml index c01f6433..800ee428 100644 --- a/rollup/core/classes/RollupLogger.cls-meta.xml +++ b/rollup/core/classes/RollupLogger.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/rollup/core/classes/RollupMetaPicklists.cls-meta.xml b/rollup/core/classes/RollupMetaPicklists.cls-meta.xml index 86d7e143..caadc7cb 100644 --- a/rollup/core/classes/RollupMetaPicklists.cls-meta.xml +++ b/rollup/core/classes/RollupMetaPicklists.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/rollup/core/classes/RollupParentResetProcessor.cls-meta.xml b/rollup/core/classes/RollupParentResetProcessor.cls-meta.xml index c01f6433..800ee428 100644 --- a/rollup/core/classes/RollupParentResetProcessor.cls-meta.xml +++ b/rollup/core/classes/RollupParentResetProcessor.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/rollup/core/classes/RollupPlugin.cls-meta.xml b/rollup/core/classes/RollupPlugin.cls-meta.xml index c01f6433..800ee428 100644 --- a/rollup/core/classes/RollupPlugin.cls-meta.xml +++ b/rollup/core/classes/RollupPlugin.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/rollup/core/classes/RollupQueryBuilder.cls-meta.xml b/rollup/core/classes/RollupQueryBuilder.cls-meta.xml index c01f6433..800ee428 100644 --- a/rollup/core/classes/RollupQueryBuilder.cls-meta.xml +++ b/rollup/core/classes/RollupQueryBuilder.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/rollup/core/classes/RollupRecursionItem.cls-meta.xml b/rollup/core/classes/RollupRecursionItem.cls-meta.xml index c01f6433..800ee428 100644 --- a/rollup/core/classes/RollupRecursionItem.cls-meta.xml +++ b/rollup/core/classes/RollupRecursionItem.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/rollup/core/classes/RollupRelationshipFieldFinder.cls-meta.xml b/rollup/core/classes/RollupRelationshipFieldFinder.cls-meta.xml index 86d7e143..caadc7cb 100644 --- a/rollup/core/classes/RollupRelationshipFieldFinder.cls-meta.xml +++ b/rollup/core/classes/RollupRelationshipFieldFinder.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/rollup/core/classes/RollupRepository.cls-meta.xml b/rollup/core/classes/RollupRepository.cls-meta.xml index c01f6433..800ee428 100644 --- a/rollup/core/classes/RollupRepository.cls-meta.xml +++ b/rollup/core/classes/RollupRepository.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/rollup/core/classes/RollupSObjectUpdater.cls-meta.xml b/rollup/core/classes/RollupSObjectUpdater.cls-meta.xml index c01f6433..800ee428 100644 --- a/rollup/core/classes/RollupSObjectUpdater.cls-meta.xml +++ b/rollup/core/classes/RollupSObjectUpdater.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/rollup/core/classes/RollupSchedulable.cls-meta.xml b/rollup/core/classes/RollupSchedulable.cls-meta.xml index 86d7e143..caadc7cb 100644 --- a/rollup/core/classes/RollupSchedulable.cls-meta.xml +++ b/rollup/core/classes/RollupSchedulable.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/rollup/core/classes/RollupState.cls-meta.xml b/rollup/core/classes/RollupState.cls-meta.xml index c01f6433..800ee428 100644 --- a/rollup/core/classes/RollupState.cls-meta.xml +++ b/rollup/core/classes/RollupState.cls-meta.xml @@ -1,5 +1,5 @@ - 61.0 + 62.0 Active diff --git a/sfdx-project.json b/sfdx-project.json index 5e4f1ded..6d761079 100644 --- a/sfdx-project.json +++ b/sfdx-project.json @@ -5,8 +5,8 @@ "package": "apex-rollup", "path": "rollup", "scopeProfiles": true, - "versionName": "Fixes Rollup Order By sorting to always be deterministic, allows text templates in Full Recalc CMDT-driven Invocable invocable", - "versionNumber": "1.6.35.0", + "versionName": "Fixes Rollup Order By issue when called from RollupFlowBulkProcessor", + "versionNumber": "1.6.36.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": { @@ -85,7 +85,7 @@ ], "namespace": "", "sfdcLoginUrl": "https://login.salesforce.com", - "sourceApiVersion": "61.0", + "sourceApiVersion": "62.0", "packageAliases": { "Apex Rollup - Custom Logger": "0Ho6g000000Gn8ZCAS", "Apex Rollup - Custom Logger@0.0.11-0": "04t6g000008SirvAAC", @@ -105,6 +105,7 @@ "apex-rollup@1.6.32": "04t6g000008ObbvAAC", "apex-rollup@1.6.33": "04t6g000008ObeQAAS", "apex-rollup@1.6.34": "04t6g000008OfJfAAK", - "apex-rollup@1.6.35": "04t6g000008OfKiAAK" + "apex-rollup@1.6.35": "04t6g000008OfKiAAK", + "apex-rollup@1.6.36": "04t6g000008OfMeAAK" } }