Fix Typos and styling issues

William Velzeboer · William Velzeboer · commit ce3cba86a536 · 2020-12-10T15:58:47.000Z
diff --git a/sfdx-source/apex-common-samplecode/main/classes/batchjobs/CreateInvoicesJob.cls b/sfdx-source/apex-common-samplecode/main/classes/batchjobs/CreateInvoicesJob.cls
@@ -28,7 +28,7 @@
  * Class implements the required interfaces for Scheduling and executing in Batch
  *
  * NOTE: The server and selector methods are reused, logic in this batch class is thus very light,
- *        focusing on passing paramters in and handling errors and notfications
+ *        focusing on passing parameters in and handling errors and notifications
  *
  **/ 
 global with sharing class CreateInvoicesJob
@@ -45,15 +45,15 @@ global with sharing class CreateInvoicesJob
 	
 	public Database.QueryLocator start(Database.BatchableContext context)
 	{
-		// Obtain appoprite query locator from the selector
+		// Obtain appropriate query locator from the selector
 		return new OpportunitiesSelector().queryLocatorReadyToInvoice();	
 	}
 	
 	public void execute(Database.BatchableContext context, List<Opportunity> opps)
 	{
 		try
 		{
-			// Opportunites ready to be invoiced
+			// Opportunities ready to be invoiced
 			Set<Id> opportunitiesToInvoice = new Map<Id, SObject>(opps).keySet();
 						
 			// Create invoices
@@ -71,7 +71,7 @@ global with sharing class CreateInvoicesJob
 	
 	public void finish(Database.BatchableContext context)
 	{
-		// Simple notifiation of any errors received via email
+		// Simple notification of any errors received via email
 		if(jobErrors.size() > 0)
 		{
 			// Email address from user
@@ -83,16 +83,18 @@ global with sharing class CreateInvoicesJob
 			for(JobError jobError : jobErrors)
 			{
 				List<String> failedOpps = new List<String>();
-				for(Opportunity opp : jobError.records)
+				for (Opportunity opp : jobError.records)
+				{
 					failedOpps.add(opp.Name);
-				emailBody += String.format('<p>Error {0} occured during the processing of Opportunities {1}</p>', 
+				}
+				emailBody += String.format('<p>Error {0} occurred during the processing of Opportunities {1}</p>',
 					new List<String> { jobError.message, String.join(failedOpps, ',') });					
 			}			
 			// Send email
 			Messaging.SingleEmailMessage mail = new Messaging.SingleEmailMessage();
 			mail.setToAddresses(new String[] { usersEmail.get(UserInfo.getUserId()) });
 			mail.setReplyTo(usersEmail.get(UserInfo.getUserId()));
-			mail.setSenderDisplayName(userInfo.getUserName());
+			mail.setSenderDisplayName(UserInfo.getUserName());
 			mail.setSubject('Create Invoice Job Failures');
 			mail.setHtmlBody(emailBody);
 			Messaging.sendEmail(new Messaging.SingleEmailMessage[] { mail });			
diff --git a/sfdx-source/apex-common-samplecode/main/classes/controllers/OpportunityApplyDiscountController.cls b/sfdx-source/apex-common-samplecode/main/classes/controllers/OpportunityApplyDiscountController.cls
@@ -28,7 +28,7 @@
  * Controller shared by Apply Discount and Apply Discounts Custom Buttons (and related pages) on the Opportunity
  * 
  * NOTE: The same service method is called regardless, logic in this controller is thus very light,
- *        focusing on passing paramters in and handling errors and notfications
+ *        focusing on passing parameters in and handling errors and notifications
  **/
 public with sharing class OpportunityApplyDiscountController 
 {
@@ -54,7 +54,7 @@ public with sharing class OpportunityApplyDiscountController
 		{
 			// Apply discount entered to the current Opportunity
 			OpportunitiesService.applyDiscounts(
-				new Set<ID> { standardController.getId() }, DiscountPercentage);
+				new Set<Id> { standardController.getId() }, DiscountPercentage);
 		}
 		catch (Exception e)
 		{
@@ -69,15 +69,15 @@ public with sharing class OpportunityApplyDiscountController
 		try
 		{
 			// Selected Opportunity Id's
-			Set<Id> selectedOpportuntyIds = 
+			Set<Id> selectedOpportunityIds =
 				new Map<Id, SObject>(standardSetController.getSelected()).keySet();
 			
 			// Apply discount entered to the selected Opportunities
 			OpportunitiesService.applyDiscounts(
-				selectedOpportuntyIds, DiscountPercentage);
+					selectedOpportunityIds, DiscountPercentage);
 			
 			// Confirm submission
-			ApexPages.addMessage(new ApexPages.Message(ApexPages.Severity.Info, 'Opportunities updated.'));
+			ApexPages.addMessage(new ApexPages.Message(ApexPages.Severity.INFO, 'Opportunities updated.'));
 		}
 		catch (Exception e)
 		{
diff --git a/sfdx-source/apex-common-samplecode/main/classes/controllers/OpportunityConsoleController.cls b/sfdx-source/apex-common-samplecode/main/classes/controllers/OpportunityConsoleController.cls
@@ -30,6 +30,6 @@ public with sharing class OpportunityConsoleController
 	public static void applyDiscount(Id opportunityId, Decimal discountPercent)
 	{
 		// Call service
-		OpportunitiesService.applyDiscounts(new Set<ID> { opportunityId }, discountPercent);
+		OpportunitiesService.applyDiscounts(new Set<Id> { opportunityId }, discountPercent);
 	}
 }
diff --git a/sfdx-source/apex-common-samplecode/main/classes/controllers/OpportunityCreateInvoiceController.cls b/sfdx-source/apex-common-samplecode/main/classes/controllers/OpportunityCreateInvoiceController.cls
@@ -28,7 +28,7 @@
  * Controller shared by Create Invoice and Create Invoices Custom Buttons (and related pages) on the Opportunity
  * 
  * NOTE: The same service method is called regardless, logic in this controller is thus very light,
- *        focusing on passing paramters in and handling errors and notfications
+ *        focusing on passing parameters in and handling errors and notifications
  **/
 public with sharing class OpportunityCreateInvoiceController 
 {
@@ -54,7 +54,7 @@ public with sharing class OpportunityCreateInvoiceController
 		{
 			// Create Invoice the Opportunity
 			Set<Id> invoiceIds = OpportunitiesService.createInvoices(
-				new Set<ID> { standardController.getId() }, DiscountPercentage);
+				new Set<Id> { standardController.getId() }, DiscountPercentage);
 			
 			// Redirect to Invoice 
 			return new PageReference('/'+new List<Id>(invoiceIds)[0]);
@@ -72,14 +72,14 @@ public with sharing class OpportunityCreateInvoiceController
 		try
 		{
 			// Selected Opportunity Id's
-			Set<Id> selectedOpportuntyIds = 
+			Set<Id> selectedOpportunityIds =
 				new Map<Id, SObject>(standardSetController.getSelected()).keySet();
 			
 			// Create invoices for selected Invoices, optionally applying discount before hand
-			OpportunitiesService.createInvoices(selectedOpportuntyIds, DiscountPercentage);
+			OpportunitiesService.createInvoices(selectedOpportunityIds, DiscountPercentage);
 			
 			// Confirm
-			ApexPages.addMessage(new ApexPages.Message(ApexPages.Severity.Info, 'Invoices created.'));			
+			ApexPages.addMessage(new ApexPages.Message(ApexPages.Severity.INFO, 'Invoices created.'));
 		}
 		catch (Exception e)		
 		{
diff --git a/sfdx-source/apex-common-samplecode/main/classes/controllers/OpportunityInvoicingController.cls b/sfdx-source/apex-common-samplecode/main/classes/controllers/OpportunityInvoicingController.cls
@@ -35,7 +35,7 @@ public with sharing class OpportunityInvoicingController
 	{
 		ApexPages.addMessage(
 			new ApexPages.Message(
-				ApexPages.Severity.Info, 'Click Start to scan Opportunities that are ready for invoicing and process them.'));
+				ApexPages.Severity.INFO, 'Click Start to scan Opportunities that are ready for invoicing and process them.'));
 	}
 	
 	public PageReference startJob()
@@ -48,7 +48,7 @@ public with sharing class OpportunityInvoicingController
 			// Confirm
 			ApexPages.addMessage(
 				new ApexPages.Message(
-					ApexPages.Severity.Info, 'The job has been submitted, you will receive an email notificaiton of any issues.'));
+					ApexPages.Severity.INFO, 'The job has been submitted, you will receive an email notificaiton of any issues.'));
 		}
 		catch (Exception e)
 		{
diff --git a/sfdx-source/apex-common-samplecode/main/classes/controllers/QuickOpportunityWizardController.cls b/sfdx-source/apex-common-samplecode/main/classes/controllers/QuickOpportunityWizardController.cls
@@ -49,7 +49,7 @@ public with sharing class QuickOpportunityWizardController
 			
 		// Recently used Opportunity lines
 		List<OpportunityLineItem> lines = 
-			[select 
+			[SELECT
 				Id, 
 				Description, 
 				ListPrice, 
@@ -72,10 +72,10 @@ public with sharing class QuickOpportunityWizardController
 				PricebookEntry.Pricebook2.IsActive,
 				PricebookEntry.Pricebook2.IsStandard,
 				PricebookEntry.Pricebook2.Name 
-			 from OpportunityLineItem
-			 where Opportunity.Account.id = :account.Id 
-			 order by SystemModstamp 
-			 desc limit 10];
+			 FROM OpportunityLineItem
+			 WHERE Opportunity.Account.Id = :account.Id
+			 ORDER BY SystemModstamp
+			 DESC LIMIT 10];
 			 
 		//  Clone these to be available for selection for the new opportunity
 		for(OpportunityLineItem item : lines)
diff --git a/sfdx-source/apex-common-samplecode/main/classes/domains/AbstractChargeable.cls b/sfdx-source/apex-common-samplecode/main/classes/domains/AbstractChargeable.cls
@@ -50,7 +50,7 @@ public with sharing abstract class AbstractChargeable extends fflib_SObjectDomai
 	{
 		List<Integer> hoursWorked = calculateHoursWorked();
 		
-		Schema.SobjectField costOfHoursWorkedField = getCostOfHoursWorkedField();
+		Schema.SObjectField costOfHoursWorkedField = getCostOfHoursWorkedField();
 		
 		Integer hoursWorkedRecordIdx = 0; 
 		
diff --git a/sfdx-source/apex-common-samplecode/main/classes/domains/Opportunities.cls b/sfdx-source/apex-common-samplecode/main/classes/domains/Opportunities.cls
@@ -39,7 +39,7 @@ public class Opportunities extends fflib_SObjectDomain
 	
 	public Opportunities(List<Opportunity> sObjectList)
 	{
-		// Domain classes are initialised with lists to enforce bulkification throughout
+		// Domain classes are initialised with lists to enforce nullification throughout
 		super(sObjectList);
 	}
 	
@@ -104,13 +104,17 @@ public class Opportunities extends fflib_SObjectDomain
 	{
 		// Related Accounts
 		List<Id> accountIds = new List<Id>();
-		for(Opportunity opp : (List<Opportunity>) Records)
-			if(opp.AccountId!=null)
+		for (Opportunity opp : (List<Opportunity>) 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 accounts = new Accounts([SELECT Id, Name FROM Account WHERE Id IN :accountIds]);
 		accounts.updateOpportunityActivity(uow);
 		uow.commitWork();				
 	}
@@ -126,7 +130,7 @@ public class Opportunities extends fflib_SObjectDomain
 		// Apply discount 
 		for(Opportunity opportunity : (List<Opportunity>) Records)
 		{
-			// Appply to the Opporunity Amount?
+			// Apply to the Opportunity Amount?
 			if(opportunity.OpportunityLineItems == null || 
 			   opportunity.OpportunityLineItems.size()==0)
 			{
diff --git a/sfdx-source/apex-common-samplecode/main/classes/domains/OpportunityLineItems.cls b/sfdx-source/apex-common-samplecode/main/classes/domains/OpportunityLineItems.cls
@@ -41,7 +41,7 @@ public with sharing class OpportunityLineItems extends fflib_SObjectDomain
 	{
 		super(sObjectList);
 	}
-	
+
 	public void applyDiscount(IOpportunities opps, Decimal discountPercentage, fflib_ISObjectUnitOfWork uow)
 	{
 		// Opportunties by Id
@@ -56,9 +56,13 @@ public with sharing class OpportunityLineItems extends fflib_SObjectDomain
 		{
 			// Skip products that have not been approved for discounting
 			Opportunity opportunity = opportunitiesById.get(line.OpportunityId);
-			if(opportunity.DiscountType__c == 'Approved Products')
-				if(line.PricebookEntry.Product2.DiscountingApproved__c == false)
-					continue;			
+			if (opportunity.DiscountType__c == 'Approved Products')
+			{
+				if (line.PricebookEntry.Product2.DiscountingApproved__c == false)
+				{
+					continue;
+				}
+			}
 					
 			// Adjust UnitPrice
 			line.UnitPrice = line.UnitPrice * factor;
diff --git a/sfdx-source/apex-common-samplecode/main/classes/restapis/OpportunitiesResource.cls b/sfdx-source/apex-common-samplecode/main/classes/restapis/OpportunitiesResource.cls
@@ -24,7 +24,7 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 **/
 
-@RestResource(urlMapping='/opportunities/*/applydiscount')
+@RestResource(UrlMapping='/opportunities/*/applydiscount')
 global with sharing class OpportunitiesResource 
 {
 	@HttpPost
@@ -33,15 +33,14 @@ global with sharing class OpportunitiesResource
 	{
     	// Take apart the URI to discover the Opportunity Id
         RestRequest req = RestContext.request;
-        RestResponse res = RestContext.response;
-        String[] uriParts = req.requestURI.split('/');
+		String[] uriParts = req.requestURI.split('/');
 		
 		// Determine service parameter values from REST context
-		ID opportunityId = uriParts[2]; // get from URL path
+		Id opportunityId = uriParts[2]; // get from URL path
 		String discountParam = req.params.get('discount');
 		Decimal discountPercent = discountParam!=null ? Decimal.valueOf(discountParam) : 0;
 		
 		// Call Service Method
-		OpportunitiesService.applyDiscounts(new Set<ID> { opportunityId }, discountPercent );
+		OpportunitiesService.applyDiscounts(new Set<Id> { opportunityId }, discountPercent );
 	}
 }
diff --git a/sfdx-source/apex-common-samplecode/main/classes/selectors/AccountsSelector.cls b/sfdx-source/apex-common-samplecode/main/classes/selectors/AccountsSelector.cls
@@ -46,10 +46,10 @@ public class AccountsSelector extends fflib_SObjectSelector
 
 	public Schema.SObjectType getSObjectType()
 	{
-		return Account.sObjectType;
+		return Account.SObjectType;
 	}
 
-	public List<Account> selectById(Set<ID> idSet)
+	public List<Account> selectById(Set<Id> idSet)
 	{
 		return (List<Account>) selectSObjectsById(idSet);
 	}
@@ -58,9 +58,13 @@ public class AccountsSelector extends fflib_SObjectSelector
 	{
 		// Related Accounts
 		Set<Id> accountIds = new Set<Id>();
-		for(Opportunity opp : (List<Opportunity>) opportunities)
-			if(opp.AccountId!=null)
-				accountIds.add(opp.AccountId);		
+		for (Opportunity opp : (List<Opportunity>) opportunities)
+		{
+			if (opp.AccountId != null)
+			{
+				accountIds.add(opp.AccountId);
+			}
+		}
 		return selectById(accountIds);
 	}	
 }
diff --git a/sfdx-source/apex-common-samplecode/main/classes/selectors/IAccountsSelector.cls b/sfdx-source/apex-common-samplecode/main/classes/selectors/IAccountsSelector.cls
@@ -26,6 +26,6 @@
 
 public interface IAccountsSelector extends fflib_ISObjectSelector 
 {
-	List<Account> selectById(Set<ID> idSet);
+	List<Account> selectById(Set<Id> idSet);
 	List<Account> selectByOpportunity(List<Opportunity> opportunities);
 }
diff --git a/sfdx-source/apex-common-samplecode/main/classes/selectors/IOpportunitiesSelector.cls b/sfdx-source/apex-common-samplecode/main/classes/selectors/IOpportunitiesSelector.cls
@@ -26,5 +26,5 @@
 
 public interface IOpportunitiesSelector extends fflib_ISObjectSelector 
 {
-	List<Opportunity> selectByIdWithProducts(Set<ID> idSet);	
+	List<Opportunity> selectByIdWithProducts(Set<Id> idSet);
 }
diff --git a/sfdx-source/apex-common-samplecode/main/classes/selectors/OpportunitiesSelector.cls b/sfdx-source/apex-common-samplecode/main/classes/selectors/OpportunitiesSelector.cls
@@ -52,15 +52,15 @@ public class OpportunitiesSelector extends fflib_SObjectSelector
 	
 	public Schema.SObjectType getSObjectType()
 	{
-		return Opportunity.sObjectType;
+		return Opportunity.SObjectType;
 	}
 
-	public List<Opportunity> selectById(Set<ID> idSet)
+	public List<Opportunity> selectById(Set<Id> idSet)
 	{
 		return (List<Opportunity>) selectSObjectsById(idSet);
 	}
 
-	public List<Opportunity> selectByIdWithProducts(Set<ID> idSet)
+	public List<Opportunity> selectByIdWithProducts(Set<Id> idSet)
 	{
 		fflib_QueryFactory opportunitiesQueryFactory = newQueryFactory();
 
@@ -84,8 +84,8 @@ public class OpportunitiesSelector extends fflib_SObjectSelector
 		List<OpportunityInfo> opportunityInfos = new List<OpportunityInfo>();
 		for(Opportunity opportunity : Database.query(
 				newQueryFactory(false).
-					selectField(Opportunity.Id).
-					selectField(Opportunity.StageName).
+					selectField(opportunity.Id).
+					selectField(opportunity.StageName).
 					selectField('Account.Name').
 					selectField('Account.AccountNumber').
 					selectField('Account.Owner.Name').
diff --git a/sfdx-source/apex-common-samplecode/main/classes/selectors/OpportunityLineItemsSelector.cls b/sfdx-source/apex-common-samplecode/main/classes/selectors/OpportunityLineItemsSelector.cls
@@ -49,15 +49,15 @@ public class OpportunityLineItemsSelector extends fflib_SObjectSelector
 
 	public Schema.SObjectType getSObjectType()
 	{
-		return OpportunityLineItem.sObjectType;
+		return OpportunityLineItem.SObjectType;
 	}
 
 	public override String getOrderBy()
 	{
 		return 'SortOrder,PricebookEntry.Name';
 	}
 
-	public List<OpportunityLineItem> selectById(Set<ID> idSet)
+	public List<OpportunityLineItem> selectById(Set<Id> idSet)
 	{
 		return (List<OpportunityLineItem>) selectSObjectsById(idSet);
 	}
diff --git a/sfdx-source/apex-common-samplecode/main/classes/selectors/PricebookEntriesSelector.cls b/sfdx-source/apex-common-samplecode/main/classes/selectors/PricebookEntriesSelector.cls
@@ -48,10 +48,10 @@ public class PricebookEntriesSelector extends fflib_SObjectSelector
 
 	public Schema.SObjectType getSObjectType()
 	{
-		return PricebookEntry.sObjectType;
+		return PricebookEntry.SObjectType;
 	}
 
-	public List<PricebookEntry> selectById(Set<ID> idSet)
+	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}', 
diff --git a/sfdx-source/apex-common-samplecode/main/classes/selectors/PricebooksSelector.cls b/sfdx-source/apex-common-samplecode/main/classes/selectors/PricebooksSelector.cls
diff --git a/sfdx-source/apex-common-samplecode/main/classes/selectors/ProductsSelector.cls b/sfdx-source/apex-common-samplecode/main/classes/selectors/ProductsSelector.cls
diff --git a/sfdx-source/apex-common-samplecode/main/classes/selectors/UsersSelector.cls b/sfdx-source/apex-common-samplecode/main/classes/selectors/UsersSelector.cls
diff --git a/sfdx-source/apex-common-samplecode/main/classes/service/IOpportunitiesService.cls b/sfdx-source/apex-common-samplecode/main/classes/service/IOpportunitiesService.cls
diff --git a/sfdx-source/apex-common-samplecode/main/classes/service/InvoicingServiceImpl.cls b/sfdx-source/apex-common-samplecode/main/classes/service/InvoicingServiceImpl.cls
diff --git a/sfdx-source/apex-common-samplecode/main/classes/service/OpportunitiesService.cls b/sfdx-source/apex-common-samplecode/main/classes/service/OpportunitiesService.cls
diff --git a/sfdx-source/apex-common-samplecode/main/classes/service/OpportunitiesServiceImpl.cls b/sfdx-source/apex-common-samplecode/main/classes/service/OpportunitiesServiceImpl.cls

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`* Class implements the required interfaces for Scheduling and executing in Batch`
`29`	`29`	`*`
`30`	`30`	`* NOTE: The server and selector methods are reused, logic in this batch class is thus very light,`
`31`		`- * focusing on passing paramters in and handling errors and notfications`
	`31`	`+ * focusing on passing parameters in and handling errors and notifications`
`32`	`32`	`*`
`33`	`33`	`**/`
`34`	`34`	`global with sharing class CreateInvoicesJob`
`@@ -45,15 +45,15 @@ global with sharing class CreateInvoicesJob`
`45`	`45`
`46`	`46`	`public Database.QueryLocator start(Database.BatchableContext context)`
`47`	`47`	`{`
`48`		`- // Obtain appoprite query locator from the selector`
	`48`	`+ // Obtain appropriate query locator from the selector`
`49`	`49`	`return new OpportunitiesSelector().queryLocatorReadyToInvoice();`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`public void execute(Database.BatchableContext context, List<Opportunity> opps)`
`53`	`53`	`{`
`54`	`54`	`try`
`55`	`55`	`{`
`56`		`- // Opportunites ready to be invoiced`
	`56`	`+ // Opportunities ready to be invoiced`
`57`	`57`	`Set<Id> opportunitiesToInvoice = new Map<Id, SObject>(opps).keySet();`
`58`	`58`
`59`	`59`	`// Create invoices`
`@@ -71,7 +71,7 @@ global with sharing class CreateInvoicesJob`
`71`	`71`
`72`	`72`	`public void finish(Database.BatchableContext context)`
`73`	`73`	`{`
`74`		`- // Simple notifiation of any errors received via email`
	`74`	`+ // Simple notification of any errors received via email`
`75`	`75`	`if(jobErrors.size() > 0)`
`76`	`76`	`{`
`77`	`77`	`// Email address from user`
`@@ -83,16 +83,18 @@ global with sharing class CreateInvoicesJob`
`83`	`83`	`for(JobError jobError : jobErrors)`
`84`	`84`	`{`
`85`	`85`	`List<String> failedOpps = new List<String>();`
`86`		`- for(Opportunity opp : jobError.records)`
	`86`	`+ for (Opportunity opp : jobError.records)`
	`87`	`+ {`
`87`	`88`	`failedOpps.add(opp.Name);`
`88`		`- emailBody += String.format('<p>Error {0} occured during the processing of Opportunities {1}</p>',`
	`89`	`+ }`
	`90`	`+ emailBody += String.format('<p>Error {0} occurred during the processing of Opportunities {1}</p>',`
`89`	`91`	`new List<String> { jobError.message, String.join(failedOpps, ',') });`
`90`	`92`	`}`
`91`	`93`	`// Send email`
`92`	`94`	`Messaging.SingleEmailMessage mail = new Messaging.SingleEmailMessage();`
`93`	`95`	`mail.setToAddresses(new String[] { usersEmail.get(UserInfo.getUserId()) });`
`94`	`96`	`mail.setReplyTo(usersEmail.get(UserInfo.getUserId()));`
`95`		`- mail.setSenderDisplayName(userInfo.getUserName());`
	`97`	`+ mail.setSenderDisplayName(UserInfo.getUserName());`
`96`	`98`	`mail.setSubject('Create Invoice Job Failures');`
`97`	`99`	`mail.setHtmlBody(emailBody);`
`98`	`100`	`Messaging.sendEmail(new Messaging.SingleEmailMessage[] { mail });`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,6 @@ public with sharing class OpportunityConsoleController`
`30`	`30`	`public static void applyDiscount(Id opportunityId, Decimal discountPercent)`
`31`	`31`	`{`
`32`	`32`	`// Call service`
`33`		`- OpportunitiesService.applyDiscounts(new Set<ID> { opportunityId }, discountPercent);`
	`33`	`+ OpportunitiesService.applyDiscounts(new Set<Id> { opportunityId }, discountPercent);`
`34`	`34`	`}`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public with sharing class OpportunityInvoicingController`
`35`	`35`	`{`
`36`	`36`	`ApexPages.addMessage(`
`37`	`37`	`new ApexPages.Message(`
`38`		`- ApexPages.Severity.Info, 'Click Start to scan Opportunities that are ready for invoicing and process them.'));`
	`38`	`+ ApexPages.Severity.INFO, 'Click Start to scan Opportunities that are ready for invoicing and process them.'));`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`public PageReference startJob()`
`@@ -48,7 +48,7 @@ public with sharing class OpportunityInvoicingController`
`48`	`48`	`// Confirm`
`49`	`49`	`ApexPages.addMessage(`
`50`	`50`	`new ApexPages.Message(`
`51`		`- ApexPages.Severity.Info, 'The job has been submitted, you will receive an email notificaiton of any issues.'));`
	`51`	`+ ApexPages.Severity.INFO, 'The job has been submitted, you will receive an email notificaiton of any issues.'));`
`52`	`52`	`}`
`53`	`53`	`catch (Exception e)`
`54`	`54`	`{`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public with sharing abstract class AbstractChargeable extends fflib_SObjectDomai`
`50`	`50`	`{`
`51`	`51`	`List<Integer> hoursWorked = calculateHoursWorked();`
`52`	`52`
`53`		`- Schema.SobjectField costOfHoursWorkedField = getCostOfHoursWorkedField();`
	`53`	`+ Schema.SObjectField costOfHoursWorkedField = getCostOfHoursWorkedField();`
`54`	`54`
`55`	`55`	`Integer hoursWorkedRecordIdx = 0;`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public class Opportunities extends fflib_SObjectDomain`
`39`	`39`
`40`	`40`	`public Opportunities(List<Opportunity> sObjectList)`
`41`	`41`	`{`
`42`		`- // Domain classes are initialised with lists to enforce bulkification throughout`
	`42`	`+ // Domain classes are initialised with lists to enforce nullification throughout`
`43`	`43`	`super(sObjectList);`
`44`	`44`	`}`
`45`	`45`
`@@ -104,13 +104,17 @@ public class Opportunities extends fflib_SObjectDomain`
`104`	`104`	`{`
`105`	`105`	`// Related Accounts`
`106`	`106`	`List<Id> accountIds = new List<Id>();`
`107`		`- for(Opportunity opp : (List<Opportunity>) Records)`
`108`		`- if(opp.AccountId!=null)`
	`107`	`+ for (Opportunity opp : (List<Opportunity>) Records)`
	`108`	`+ {`
	`109`	`+ if (opp.AccountId != null)`
	`110`	`+ {`
`109`	`111`	`accountIds.add(opp.AccountId);`
	`112`	`+ }`
	`113`	`+ }`
`110`	`114`
`111`	`115`	`// Update last Opportunity activity on the related Accounts (via the Accounts domain class)`
`112`	`116`	`fflib_SObjectUnitOfWork uow = new fflib_SObjectUnitOfWork(new Schema.SObjectType[] { Account.SObjectType });`
`113`		`- Accounts accounts = new Accounts([select Id, Name from Account where id in :accountIds]);`
	`117`	`+ Accounts accounts = new Accounts([SELECT Id, Name FROM Account WHERE Id IN :accountIds]);`
`114`	`118`	`accounts.updateOpportunityActivity(uow);`
`115`	`119`	`uow.commitWork();`
`116`	`120`	`}`
`@@ -126,7 +130,7 @@ public class Opportunities extends fflib_SObjectDomain`
`126`	`130`	`// Apply discount`
`127`	`131`	`for(Opportunity opportunity : (List<Opportunity>) Records)`
`128`	`132`	`{`
`129`		`- // Appply to the Opporunity Amount?`
	`133`	`+ // Apply to the Opportunity Amount?`
`130`	`134`	`if(opportunity.OpportunityLineItems == null \|\|`
`131`	`135`	`opportunity.OpportunityLineItems.size()==0)`
`132`	`136`	`{`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public with sharing class OpportunityLineItems extends fflib_SObjectDomain`
`41`	`41`	`{`
`42`	`42`	`super(sObjectList);`
`43`	`43`	`}`
`44`		`-`
	`44`	`+`
`45`	`45`	`public void applyDiscount(IOpportunities opps, Decimal discountPercentage, fflib_ISObjectUnitOfWork uow)`
`46`	`46`	`{`
`47`	`47`	`// Opportunties by Id`
`@@ -56,9 +56,13 @@ public with sharing class OpportunityLineItems extends fflib_SObjectDomain`
`56`	`56`	`{`
`57`	`57`	`// Skip products that have not been approved for discounting`
`58`	`58`	`Opportunity opportunity = opportunitiesById.get(line.OpportunityId);`
`59`		`- if(opportunity.DiscountType__c == 'Approved Products')`
`60`		`- if(line.PricebookEntry.Product2.DiscountingApproved__c == false)`
`61`		`- continue;`
	`59`	`+ if (opportunity.DiscountType__c == 'Approved Products')`
	`60`	`+ {`
	`61`	`+ if (line.PricebookEntry.Product2.DiscountingApproved__c == false)`
	`62`	`+ {`
	`63`	`+ continue;`
	`64`	`+ }`
	`65`	`+ }`
`62`	`66`
`63`	`67`	`// Adjust UnitPrice`
`64`	`68`	`line.UnitPrice = line.UnitPrice * factor;`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.`
`25`	`25`	`**/`
`26`	`26`
`27`		`-@RestResource(urlMapping='/opportunities/*/applydiscount')`
	`27`	`+@RestResource(UrlMapping='/opportunities/*/applydiscount')`
`28`	`28`	`global with sharing class OpportunitiesResource`
`29`	`29`	`{`
`30`	`30`	`@HttpPost`
`@@ -33,15 +33,14 @@ global with sharing class OpportunitiesResource`
`33`	`33`	`{`
`34`	`34`	`// Take apart the URI to discover the Opportunity Id`
`35`	`35`	`RestRequest req = RestContext.request;`
`36`		`- RestResponse res = RestContext.response;`
`37`		`- String[] uriParts = req.requestURI.split('/');`
	`36`	`+ String[] uriParts = req.requestURI.split('/');`
`38`	`37`
`39`	`38`	`// Determine service parameter values from REST context`
`40`		`- ID opportunityId = uriParts[2]; // get from URL path`
	`39`	`+ Id opportunityId = uriParts[2]; // get from URL path`
`41`	`40`	`String discountParam = req.params.get('discount');`
`42`	`41`	`Decimal discountPercent = discountParam!=null ? Decimal.valueOf(discountParam) : 0;`
`43`	`42`
`44`	`43`	`// Call Service Method`
`45`		`- OpportunitiesService.applyDiscounts(new Set<ID> { opportunityId }, discountPercent );`
	`44`	`+ OpportunitiesService.applyDiscounts(new Set<Id> { opportunityId }, discountPercent );`
`46`	`45`	`}`
`47`	`46`	`}`