Merge pull request #24 from apex-enterprise-patterns/bugfix/minor-adjustment-reference-to-secondary-domain

bugfix/minor-adjustment-reference-to-secondary-domain

Author: ImJohnMDaniel

sfdx-source/apex-common-samplecode/main/classes/Application.cls

@@ -52,6 +52,7 @@ public class Application
 	public static final fflib_Application.SelectorFactory Selector = 
 		new fflib_Application.SelectorFactory(
 			new Map<SObjectType, Type> {
+					Account.SObjectType => AccountsSelector.class,
 					Opportunity.SObjectType => OpportunitiesSelector.class,
 					OpportunityLineItem.SObjectType => OpportunityLineItemsSelector.class,
 					PricebookEntry.SObjectType => PricebookEntriesSelector.class,

sfdx-source/apex-common-samplecode/main/classes/domains/AbstractChargeable.cls

@@ -54,7 +54,7 @@ public with sharing abstract class AbstractChargeable extends fflib_SObjectDomai
 
 		Integer hoursWorkedRecordIdx = 0; 
 
-		for(SObject record : Records)
+		for(SObject record : this.records)
 		{
 			record.put(costOfHoursWorkedField, hoursWorked[hoursWorkedRecordIdx++] * 100);	
 		}

sfdx-source/apex-common-samplecode/main/classes/domains/Accounts.cls

@@ -42,12 +42,20 @@ public with sharing class Accounts extends fflib_SObjectDomain
 		super(sObjectList);
 	}
 
-	public void updateOpportunityActivity(fflib_SObjectUnitOfWork uow)
+	public void updateOpportunityActivity(fflib_ISObjectUnitOfWork uow)
 	{
-		for(Account account : (List<Account>) Records)
+		for(Account account : (List<Account>) this.records)
 		{
 			account.Description = 'Last Opportunity Raised ' + System.today();
 			uow.registerDirty(account);
 		}
 	}
+
+	public class Constructor implements fflib_SObjectDomain.IConstructable
+	{
+		public fflib_SObjectDomain construct(List<SObject> sObjectList)
+		{
+			return new Accounts(sObjectList);
+		}
+	}
 }

sfdx-source/apex-common-samplecode/main/classes/domains/DeveloperWorkItems.cls

@@ -52,7 +52,7 @@ public with sharing class DeveloperWorkItems extends AbstractChargeable
 	{
 		// Calculate the hours worked for each record
 		List<Integer> hoursWorked = new List<Integer>(); 
-		for(DeveloperWorkItem__c workItem : (List<DeveloperWorkItem__c>) Records)
+		for(DeveloperWorkItem__c workItem : (List<DeveloperWorkItem__c>) this.records)
 		{
 			// This calculation is intentionally simplistic for illustration purposes
 			hoursWorked.add((Integer)  

sfdx-source/apex-common-samplecode/main/classes/domains/IAccounts.cls

@@ -26,5 +26,5 @@
 
 public interface IAccounts extends fflib_ISObjectDomain
 {
-	void updateOpportunityActivity(fflib_SObjectUnitOfWork uow);
+	void updateOpportunityActivity(fflib_ISObjectUnitOfWork uow);
 }

sfdx-source/apex-common-samplecode/main/classes/domains/Opportunities.cls

@@ -46,7 +46,7 @@ public class Opportunities extends fflib_SObjectDomain
 	public void generate(InvoicingService.InvoiceFactory invoiceFactory)
 	{
 		// Utilise InvoiceFactory to create invoices from Opportunity details
-		for(Opportunity opportunity : (List<Opportunity>) Records)
+		for(Opportunity opportunity : (List<Opportunity>) this.records)
 		{
 			InvoicingService.Invoice invoice = new InvoicingService.Invoice();
 			invoice.Account = opportunity.AccountId;
@@ -69,7 +69,7 @@ public class Opportunities extends fflib_SObjectDomain
 	public override void onApplyDefaults()
 	{
 		// Apply defaults to Opportunities
-		for(Opportunity opportunity : (List<Opportunity>) Records)
+		for(Opportunity opportunity : (List<Opportunity>) this.records)
 		{
 			opportunity.DiscountType__c = OpportunitySettings__c.getInstance().DiscountType__c;						
 		}
@@ -78,7 +78,7 @@ public class Opportunities extends fflib_SObjectDomain
 	public override void onValidate()	
 	{
 		// Validate Opportunities
-		for(Opportunity opp : (List<Opportunity>) Records)
+		for(Opportunity opp : (List<Opportunity>) this.records)
 		{
 			if(opp.Type!=null && opp.Type.startsWith('Existing') && opp.AccountId == null)
 			{
@@ -90,7 +90,7 @@ public class Opportunities extends fflib_SObjectDomain
 	public override void onValidate(Map<Id,SObject> existingRecords)
 	{
 		// Validate changes to Opportunities
-		for(Opportunity opp : (List<Opportunity>) Records)
+		for(Opportunity opp : (List<Opportunity>) this.records)
 		{
 			Opportunity existingOpp = (Opportunity) existingRecords.get(opp.Id);
 			if(opp.Type != existingOpp.Type)
@@ -103,16 +103,27 @@ public class Opportunities extends fflib_SObjectDomain
 	public override void onAfterInsert()
 	{
 		// Related Accounts
-		List<Id> accountIds = new List<Id>();
-		for(Opportunity opp : (List<Opportunity>) Records)
-			if(opp.AccountId!=null)
+		Set<Id> accountIds = new Set<Id>();
+		for(Opportunity opp : (List<Opportunity>) this.records)
+		{
+			if( opp.AccountId != null)
+			{
 				accountIds.add(opp.AccountId);
-				
-		// Update last Opportunity activity on the related Accounts (via the Accounts domain class)
-		fflib_SObjectUnitOfWork uow = new fflib_SObjectUnitOfWork(new Schema.SObjectType[] { Account.SObjectType }); 
-		Accounts accounts = new Accounts([select Id, Name from Account where id in :accountIds]);
-		accounts.updateOpportunityActivity(uow);
-		uow.commitWork();				
+			}
+		}
+		
+		if ( ! accountIds.isEmpty() ) 
+		{
+			// Update last Opportunity activity on the related Accounts (via the Accounts domain class)
+			fflib_ISObjectUnitOfWork uow = new fflib_SObjectUnitOfWork(new Schema.SObjectType[] { Account.SObjectType }); 
+		
+			
+			IAccounts accounts = (IAccounts)Application.Domain.newInstance( accountIds );
+		
+			accounts.updateOpportunityActivity(uow);
+			
+			uow.commitWork();				
+		}
 	}
 
 	public void applyDiscount(Decimal discountPercentage, fflib_ISObjectUnitOfWork uow)
@@ -124,7 +135,7 @@ public class Opportunities extends fflib_SObjectDomain
 		List<OpportunityLineItem> linesToApplyDiscount = new List<OpportunityLineItem>();
 
 		// Apply discount 
-		for(Opportunity opportunity : (List<Opportunity>) Records)
+		for(Opportunity opportunity : (List<Opportunity>) this.records)
 		{
 			// Appply to the Opporunity Amount?
 			if(opportunity.OpportunityLineItems == null || 

sfdx-source/apex-common-samplecode/main/classes/domains/OpportunityLineItems.cls

@@ -52,7 +52,7 @@ public with sharing class OpportunityLineItems extends fflib_SObjectDomain
 		Decimal factor = Opportunities.calculateDiscountFactor(discountPercentage);
 
 		// Adjust UnitPrice of each line according to Discount Type of Opportunity
-		for(OpportunityLineItem line : (List<OpportunityLineItem>) Records)
+		for(OpportunityLineItem line : (List<OpportunityLineItem>) this.records)
 		{
 			// Skip products that have not been approved for discounting
 			Opportunity opportunity = opportunitiesById.get(line.OpportunityId);

sfdx-source/apex-common-samplecode/main/classes/selectors/PricebookEntriesSelector.cls

@@ -53,13 +53,6 @@ public class PricebookEntriesSelector extends fflib_SObjectSelector
 
 	public List<PricebookEntry> selectById(Set<ID> idSet)
 	{
-		assertIsAccessible();
-		String query = String.format('select {0},{3},{4} FROM {1} WHERE id in :idSet order by {2}', 
-			new List<String>{
-				getFieldListString(),
-				getSObjectName(),
-				getOrderBy()
-			});
-		return (List<PricebookEntry>) Database.query(query);
+		return (List<PricebookEntry>) selectSObjectsById(idSet);
 	}
 }