Added support for Count Distinct

See #9 9
SFDO-Community · Feb 11, 2015 · e9a322e · e9a322e
1 parent df849ad
commit e9a322e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/rolluptool/src/classes/LREngine.cls b/rolluptool/src/classes/LREngine.cls
@@ -208,7 +208,7 @@ public class LREngine {
        Which rollup operation you want to perform 
     */ 
     public enum RollupOperation {
-        Sum, Max, Min, Avg, Count
+        Sum, Max, Min, Avg, Count, Count_Distinct
     }
 
     /**

diff --git a/rolluptool/src/classes/RollupServiceTest.cls b/rolluptool/src/classes/RollupServiceTest.cls
@@ -64,7 +64,12 @@ private with sharing class RollupServiceTest
 	{
 		testSingleRollup(new List<Decimal> { 250, 250, 50, 50 }, 4, RollupSummaries.AggregateOperation.Count, null);	
 	}
-
+
+	private testmethod static void testSingleCountDistinctRollup()
+	{
+		testSingleRollup(new List<Decimal> { 250, 250, 50, 50 }, 2, RollupSummaries.AggregateOperation.Count_Distinct, null);
+	}
+
 	private testmethod static void testSingleSumRollupConditional()
 	{
 		testSingleRollup(new List<Decimal> { 250, 250, 50, 50 }, 500, RollupSummaries.AggregateOperation.Sum, 'Amount > 200');	
@@ -922,7 +927,7 @@ private with sharing class RollupServiceTest
 		rollupSummary.RelationShipField__c = 'AccountId';
 		rollupSummary.RelationShipCriteria__c = condition; // 'Amount > 200';
 		rollupSummary.FieldToAggregate__c = 'Amount';
-		rollupSummary.AggregateOperation__c = operation.name();
+		rollupSummary.AggregateOperation__c = operation.name().replace('_', ' ');
 		rollupSummary.AggregateResultField__c = 'AnnualRevenue';
 		rollupSummary.Active__c = true;
 		rollupSummary.CalculationMode__c = 'Realtime';

diff --git a/rolluptool/src/classes/RollupSummaries.cls b/rolluptool/src/classes/RollupSummaries.cls
@@ -42,7 +42,8 @@ public with sharing class RollupSummaries extends SObjectDomain
         	AggregateOperation.Max.name() => LREngine.RollupOperation.Max,
 	        AggregateOperation.Min.name() => LREngine.RollupOperation.Min,
 	        AggregateOperation.Avg.name() => LREngine.RollupOperation.Avg,
-	        AggregateOperation.Count.name() => LREngine.RollupOperation.Count			
+	        AggregateOperation.Count.name() => LREngine.RollupOperation.Count,
+	        AggregateOperation.Count_Distinct.name().replace('_', ' ') => LREngine.RollupOperation.Count_Distinct
 		};
 
 	/**
@@ -64,7 +65,8 @@ public with sharing class RollupSummaries extends SObjectDomain
         Max, 
         Min,
         Avg,
-        Count
+        Count,
+        Count_Distinct
     }
 
 	public RollupSummaries(List<LookupRollupSummary__c> records)

diff --git a/rolluptool/src/objects/LookupRollupSummary__c.object b/rolluptool/src/objects/LookupRollupSummary__c.object
@@ -74,6 +74,10 @@
                 <fullName>Count</fullName>
                 <default>false</default>
             </picklistValues>
+            <picklistValues>
+                <fullName>Count Distinct</fullName>
+                <default>false</default>
+            </picklistValues>
             <sorted>false</sorted>
         </picklist>
         <type>Picklist</type>