minor adjustments

Author: ImJohnMDaniel

sfdx-source/apex-common-samplecode/main/classes/batchjobs/CreateInvoicesJob.cls

@@ -31,13 +31,13 @@
  *        focusing on passing parameters in and handling errors and notifications
  *
  **/ 
-global with sharing class CreateInvoicesJob
+public with sharing class CreateInvoicesJob
 	implements System.Schedulable, Database.Batchable<SObject>, Database.Stateful  
 {	
 	// Simple job log for errors
 	private List<JobError> jobErrors = new List<JobError>();
 
-	global void execute(SchedulableContext sc)
+	public void execute(SchedulableContext sc)
 	{
 		// Start the job once the scheduled time has arrived
 		Database.executeBatch(new CreateInvoicesJob());		

sfdx-source/apex-common-samplecode/main/classes/service/OpportunitiesService.cls

@@ -24,19 +24,19 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 **/
 
-global with sharing class OpportunitiesService 
+public with sharing class OpportunitiesService 
 {		
-	global static void applyDiscounts(Set<Id> opportunityIds, Decimal discountPercentage)
+	public static void applyDiscounts(Set<Id> opportunityIds, Decimal discountPercentage)
 	{
 		service().applyDiscounts(opportunityIds, discountPercentage);
 	}
 
-	global static Set<Id> createInvoices(Set<Id> opportunityIds, Decimal discountPercentage)
+	public static Set<Id> createInvoices(Set<Id> opportunityIds, Decimal discountPercentage)
 	{		
 		return service().createInvoices(opportunityIds, discountPercentage);
 	}
 
-	global static Id submitInvoicingJob()
+	public static Id submitInvoicingJob()
 	{
 		return service().submitInvoicingJob();
 	}	

sfdx-source/apex-common-samplecode/main/classes/service/OpportunitiesServiceImpl.cls

@@ -42,22 +42,18 @@ public class OpportunitiesServiceImpl
 		);
 	}
 
-	public void applyDiscounts(IOpportunities opportunitiesWithProducts, Decimal discountPercentage)
+	private void applyDiscounts(IOpportunities opportunitiesWithProducts, Decimal discountPercentage)
 	{
 		// Create unit of work to capture work and commit it under one transaction
 	    fflib_ISObjectUnitOfWork uow = Application.UnitOfWork.newInstance();
 
-		applyDiscounts(uow, opportunitiesWithProducts, discountPercentage);
+		// applyDiscounts(uow, opportunitiesWithProducts, discountPercentage);
+		opportunitiesWithProducts.applyDiscount(discountPercentage, uow);
 
 		// Commit updates to opportunities
 		uow.commitWork();
 	}
 
-	public void applyDiscounts(fflib_ISObjectUnitOfWork uow, IOpportunities opportunitiesWithProducts, Decimal discountPercentage)
-	{
-		opportunitiesWithProducts.applyDiscount(discountPercentage, uow);
-	}
-
 	public Set<Id> createInvoices(Set<Id> opportunityIds, Decimal discountPercentage)
 	{
 		// Create unit of work to capture work and commit it under one transaction

sfdx-source/apex-common-samplecode/main/classes/triggerHandlers/OpportunitiesTriggerHandler.cls

@@ -31,29 +31,6 @@ public class OpportunitiesTriggerHandler extends fflib_SObjectDomain
 		// Domain classes are initialised with lists to enforce bulkification throughout
 		super(sObjectList);
 	}
-	
-	public void generate(InvoicingService.InvoiceFactory invoiceFactory)
-	{
-		// Utilise InvoiceFactory to create invoices from Opportunity details
-		for(Opportunity opportunity : (List<Opportunity>) this.records)
-		{
-			InvoicingService.Invoice invoice = new InvoicingService.Invoice();
-			invoice.Account = opportunity.AccountId;
-			invoice.Description = opportunity.Description;
-			invoice.InvoiceDate = opportunity.CloseDate.addDays(14);
-			invoice.Lines = new List<InvoicingService.InvoiceLine>();
-			for(OpportunityLineItem lineItem : opportunity.OpportunityLineItems)
-			{
-				InvoicingService.InvoiceLine invoiceLineItem = new InvoicingService.InvoiceLine();
-				invoiceLineItem.Description = lineItem.Description;
-				invoiceLineItem.Product = lineItem.PricebookEntry.Product2Id;
-				invoiceLineItem.UnitPrice = lineItem.UnitPrice;
-				invoiceLineItem.Quantity = lineItem.Quantity;
-				invoice.Lines.add(invoiceLineItem);
-			}			
-			invoiceFactory.add(invoice);
-		}
-	}
 
 	public override void onApplyDefaults()
 	{
@@ -69,7 +46,7 @@ public class OpportunitiesTriggerHandler extends fflib_SObjectDomain
 		// Validate OpportunityTriggerHandler
 		for(Opportunity opp : (List<Opportunity>) this.records)
 		{
-			if(opp.Type!=null && opp.Type.startsWith('Existing') && opp.AccountId == null)
+			if(opp.Type != null && opp.Type.startsWith('Existing') && opp.AccountId == null)
 			{
 				opp.AccountId.addError( error('You must provide an Account for OpportunityTriggerHandler for existing Customers.', opp, Opportunity.AccountId) );
 			}
@@ -79,10 +56,10 @@ public class OpportunitiesTriggerHandler extends fflib_SObjectDomain
 	public override void onValidate(Map<Id,SObject> existingRecords)
 	{
 		// Validate changes to OpportunityTriggerHandler
-		for(Opportunity opp : (List<Opportunity>) this.records)
+		for (Opportunity opp : (List<Opportunity>) this.records)
 		{
 			Opportunity existingOpp = (Opportunity) existingRecords.get(opp.Id);
-			if(opp.Type != existingOpp.Type)
+			if (opp.Type != existingOpp.Type)
 			{
 				opp.Type.addError( error('You cannot change the Opportunity type once it has been created.', opp, Opportunity.Type) );
 			}
@@ -97,7 +74,7 @@ public class OpportunitiesTriggerHandler extends fflib_SObjectDomain
 	private void updateOpportunityActivityOnAccount()
 	{
 		Set<Id> accountIds =
-				Opportunities.newInstance(this.Records)
+				Opportunities.newInstance(this.records)
 						.getAccountIds();
 
 		if (accountIds.isEmpty()) return;

sfdx-source/apex-common-samplecode/test/classes/service/OpportunitiesServiceTestIntegration.cls renamed to sfdx-source/apex-common-samplecode/test/classes/service/OpportunitiesServiceIntegrationTest.cls

@@ -25,7 +25,7 @@
 **/
 
 @IsTest
-private class OpportunitiesServiceTestIntegration 
+private class OpportunitiesServiceIntegrationTest 
 {
 	@IsTest
 	private static void testServiceClass()