W-7780834 BDI Donation Stage Defaults to "Opportunity Stage When Fully Paid" value

force-app/main/default/classes/BDI_Donations.cls

@@ -61,22 +61,37 @@ public class BDI_Donations {
  */ 
  private Map<Id, npe01__OppPayment__c> paymentsByDataImportId = new Map<Id, npe01__OppPayment__c>();
 
+ /*******************************************************************************************************
+ * @description Contact Settings custom setting
+ */
+ private static npe01__Contacts_And_Orgs_Settings__c contactSettings{
+ get {
+ if (contactSettings == null) {
+ contactSettings = UTIL_CustomSettingsFacade.getContactsSettings();
+ }
+ return contactSettings;
+ }
+ set;
+ }
  /*******************************************************************************************************
  * @description provides a valid Close Won Opportunity Stage
  */
  private static String defaultClosedWonStage {
- get { 
- if (defaultClosedWonStage == null){
- List<OpportunityStage> stages = [
- SELECT MasterLabel
- FROM OpportunityStage
- WHERE IsActive = true
- AND IsWon = true
- ];
- if (stages.size() > 0) {
- defaultClosedWonStage = stages[0].MasterLabel;
+ get {
+ if (defaultClosedWonStage == null) {
+ // contact setting value takes priority
+ if (contactSettings.Payments_Auto_Close_Stage_Name__c != null) {
+ defaultClosedWonStage = contactSettings.Payments_Auto_Close_Stage_Name__c;
  } else {
- defaultClosedWonStage = '';
+ // if no stage name is specified in Contact Setting
+ // then query for the active isWon value and use that
+ List<OpportunityStage> stages = [
+ SELECT MasterLabel
+ FROM OpportunityStage
+ WHERE IsActive = TRUE
+ AND IsWon = TRUE
+ ];
+ defaultClosedWonStage = stages.size()>0 ? stages[0].MasterLabel : '';
  }
  }
  return defaultClosedWonStage;
@@ -255,9 +270,8 @@ public class BDI_Donations {
  }
 
  // when we mark Payments paid, ensure they will close our Opp.
- npe01__Contacts_And_Orgs_Settings__c cs = UTIL_CustomSettingsFacade.getContactsSettings();
- if (cs.Payments_Auto_Close_Stage_Name__c == null) {
- cs.Payments_Auto_Close_Stage_Name__c = defaultClosedWonStage;
+ if (contactSettings.Payments_Auto_Close_Stage_Name__c == null) {
+ contactSettings.Payments_Auto_Close_Stage_Name__c = defaultClosedWonStage;
  }
 
  if (elevateDIs.size() > 0) {

force-app/main/default/classes/BDI_Donations_TEST.cls

@@ -3092,6 +3092,51 @@ public with sharing class BDI_Donations_TEST {
  }
  }
 
+ /**
+ * @description If DI.Donation_Stage__c field has a value, use it for donation status, otherwise use the status
+ * in Contact Setting Payments_Auto_Close_Stage_Name__c
+ */
+ @IsTest
+ static void donationStageNameTests() {
+ String diClosedStatus = 'DIClosed';
+ String contactSettingClosedStatus = 'CSClosed';
+ // set Contact Setting Closed Status
+ npe01__Contacts_And_Orgs_Settings__c contactSettings = UTIL_CustomSettingsFacade.getContactsSettings();
+ contactSettings.Payments_Auto_Close_Stage_Name__c = contactSettingClosedStatus;
+
+ // create DI setting to be used for processing
+ Data_Import_Settings__c dis = UTIL_CustomSettingsFacade.getDataImportSettings();
+ dis.Field_Mapping_Method__c = BDI_DataImportService.FM_DATA_IMPORT_FIELD_MAPPING;
+ dis.Default_Data_Import_Field_Mapping_Set__c =
+ BDI_MappingServiceAdvanced.DEFAULT_DATA_IMPORT_FIELD_MAPPING_SET_NAME;
+ UTIL_CustomSettingsFacade.setDataImportSettings(dis);
+
+ // create a DI to test for Opportunity Stage should be value from Contact Setting
+ DataImport__c testDI1 = new DataImport__c(Contact1_Firstname__c = 'Jane',
+ Contact1_Lastname__c = 'Smith',
+ Contact1_Personal_Email__c = '[email protected]',
+ Donation_Amount__c = 100,
+ Donation_Stage__c = null);
+
+ // create a DI to test for Opportunity Stage should be value from DI
+ DataImport__c testDI2 = new DataImport__c(Contact1_Firstname__c = 'John',
+ Contact1_Lastname__c = 'Doe',
+ Contact1_Personal_Email__c = '[email protected]',
+ Donation_Amount__c = 100,
+ Donation_Stage__c = diClosedStatus);
+
+ DataImport__c[] testDIs = new DataImport__c[]{testDI1,testDI2};
+ insert testDIs;
+
+ Test.startTest();
+ BDI_DataImport_API.processDataImportRecords(dis, testDIs,false);
+ Test.stopTest();
+
+ List<Opportunity> opps = [SELECT Name, Amount, StageName, IsWon FROM Opportunity];
+ System.assertEquals(2, opps.size());
+ System.assertEquals(contactSettingClosedStatus, opps[0].StageName); // confirm status is the one in CS
+ System.assertEquals(diClosedStatus, opps[1].StageName); // confirm status is the one in DI
+ }
  private static Opportunity getOpportunityWithPayments(Id oppId) {
  // requery the Opportunity for all fields that we need.
  return [SELECT Id, IsWon, IsClosed, Amount, npe01__Amount_Outstanding__c,