Issue 280 - CalculateJobId__c not being set

#2
80

rolluptool/src/classes/RollupService.cls

@@ -105,6 +105,13 @@ global with sharing class RollupService
 		Integer scopeSize = (Integer) DeclarativeLookupRollupSummaries__c.getInstance().CalculateJobScopeSize__c;
 		Id jobId = Database.executeBatch(new RollupCalculateJob(lookupId, masterWhereClause), scopeSize == null ? 100 : scopeSize);
 
+		// Update CalculateJobId__c for Custom Object based rollups?
+		if(lookup.Record instanceof LookupRollupSummary__c) {
+			LookupRollupSummary__c rollupSummary = (LookupRollupSummary__c) lookup.Record;
+			rollupSummary.CalculateJobId__c = jobId;
+			update lookup.Record;
+		}
+
 		return jobId;
 	}
 

rolluptool/src/classes/RollupServiceTest3.cls

@@ -112,6 +112,9 @@ private with sharing class RollupServiceTest3
 			System.assert(e.getMessage().equals('A calculate job for rollup \'Test Rollup\' is already executing. If you suspect it is not aleady running try clearing the applicable record from the Lookup Rollup Calculate Jobs tab and try again.'));
 		}
 		Test.stopTest();
+		// Assert job id cleared
+ 		rollupSummary = [select Id, CalculateJobId__c from LookupRollupSummary__c where Id  = :rollupSummary.Id];
+ 		System.assertEquals(jobId, rollupSummary.CalculateJobId__c); 		
 		// Assert job cleared
 		System.assertEquals(0, [select Id from LookupRollupCalculateJob__c].size());