fix data corruption during delete of soft credits

src/classes/PSC_ManageSoftCredits_CTRL.cls

@@ -292,6 +292,13 @@ public with sharing class PSC_ManageSoftCredits_CTRL {
                 }
 
             } else {
+                 // Because we turn off UI requirement validation on the contact 
+                 // we need to check on the server side to make sure the contact is populated
+                if (sc.contactRole.ContactId == null) {
+                    Apexpages.addMessage(new ApexPages.Message(ApexPages.Severity.WARNING, System.Label.pscManageSoftCreditsContactMissing));
+                    return null;
+                }
+
                 if (sc.partial.Id != null) {
                     toDelete.add(sc.partial);
                 }

src/classes/PSC_ManageSoftCredits_TEST.cls

@@ -354,27 +354,33 @@ public with sharing class PSC_ManageSoftCredits_TEST {
     }
 
     /*******************************************************************************************************
-    * @description delete some existing PSCs by clearing their contactId.
-    * verify PSC's deleted, OCR's deleted
+    * @description verify empty contact records are not saved.
+    * verify PSC's are not deleted and OCR's are not deleted
     */ 
-    static testmethod void deleteExistingPSCsByClearContactId() {
+    @IsTest
+    private static void verifyEmptyContactRecordsAreNotSaved() {
         initTestDataWithPscs();
         Test.setCurrentPage(Page.PSC_ManageSoftCredits);
         PSC_ManageSoftCredits_CTRL ctrl = new PSC_ManageSoftCredits_CTRL(new ApexPages.StandardController(opp));
-        system.assertEquals(cPSCExisting, ctrl.softCredits.size());        
-        system.assertEquals(cPSCExisting * 100 , ctrl.oppTotalSoftCredit.Amount);
-        for (integer i = 0; i < cPSCExisting; i++)
+        System.assertEquals(cPSCExisting, ctrl.softCredits.size());
+        System.assertEquals(cPSCExisting * 100 , ctrl.oppTotalSoftCredit.Amount);
+
+        for (Integer i = 0; i < cPSCExisting; i++) {
             ctrl.softCredits[i].contactRole.ContactId = null;
-
+        }
+
+        List<OpportunityContactRole> existingOCRs = [SELECT Id, ContactId, OpportunityId, Role FROM OpportunityContactRole];
+
         Test.startTest();
-        system.assertNotEquals(null, ctrl.save());
+        System.assertEquals(null, ctrl.save());
+        UTIL_UnitTestData_TEST.assertPageHasMessage(System.Label.pscManageSoftCreditsContactMissing, ApexPages.Severity.WARNING);
         Test.stopTest();
 
-        list<Partial_Soft_Credit__c> listPSC = [select Id, Contact__c, Opportunity__c, Amount__c, Role_Name__c from Partial_Soft_Credit__c];
-        system.assertEquals(0, listPSC.size());
-        
-        list<OpportunityContactRole> listOCR = [select Id, ContactId, OpportunityId, Role from OpportunityContactRole];
-        system.assertEquals(0, listOCR.size());        
+        List<Partial_Soft_Credit__c> listPSC = [SELECT Id, Contact__c, Opportunity__c, Amount__c, Role_Name__c FROM Partial_Soft_Credit__c];
+        System.assertEquals(cPSCExisting, listPSC.size());
+
+        List<OpportunityContactRole> listOCR = [SELECT Id, ContactId, OpportunityId, Role FROM OpportunityContactRole];
+        System.assertEquals(existingOCRs.size(), listOCR.size());
     }
 
     /*******************************************************************************************************
@@ -612,4 +618,5 @@ public with sharing class PSC_ManageSoftCredits_TEST {
             System.assertNotEquals(0, ApexPages.getMessages().size(), 'A message should be displayed on the page.');
         }
     }
+
 }

src/components/UTIL_FormField.component

@@ -7,6 +7,7 @@
     <apex:attribute name="styleClass" type="String" default="" description="The style to apply to the outer form element." />
     <apex:attribute name="labelOverride" type="String" default="" description="Override the standard field label with this text" />
     <apex:attribute name="showLabel" type="Boolean" default="true" description="When false, hide the field label" />
+    <apex:attribute name="overrideRequired" type="Boolean" default="false" description="When true, it will set the field as not required" />
 
     <!-- Action Support assumes onchange event and calling page has an action status component on the page -->
     <apex:attribute name="actSup" type="Boolean" default="false" description="When true the input field will render action support, defaults to false." />
@@ -65,7 +66,7 @@
                 onchange="{!onchange}" actSupAction="{!actSupAction}"
                 actSupReRender="{!actSupReRender}" actSup="{!actSup}" 
                 actSupStatus="{!actSupStatus}" actSupImmediate="{!actSupImmediate}"
-                required="{!IF(required == true, true, NOT($ObjectType[sObjType].fields[field].nillable))}" 
+                required="{!IF(overrideRequired, false, IF(required == true, true, NOT($ObjectType[sObjType].fields[field].nillable)))}" 
                 id="inputx"
             />
         </div>

src/labels/CustomLabels.labels

@@ -5277,6 +5277,14 @@ To check your GAU Allocation settings, go to Donations | GAU Allocations.</value
         <shortDescription>pscManageSoftCreditsAmountMissing</shortDescription>
         <value>Please enter an amount or percent for each soft credit.</value>
     </labels>
+    <labels>
+        <fullName>pscManageSoftCreditsContactMissing</fullName>
+        <categories>Manage Soft Credits</categories>
+        <language>en_US</language>
+        <protected>false</protected>
+        <shortDescription>pscManageSoftCreditsContactMissing</shortDescription>
+        <value>You must enter a Contact for each soft credit.</value>
+    </labels>
     <labels>
         <fullName>pscManageSoftCreditsAmountOrPercent</fullName>
         <categories>Manage Soft Credits</categories>

src/package.xml

@@ -1778,6 +1778,7 @@
         <members>pscManageSoftCreditsAdd</members>
         <members>pscManageSoftCreditsAmount</members>
         <members>pscManageSoftCreditsAmountMissing</members>
+        <members>pscManageSoftCreditsContactMissing</members>
         <members>pscManageSoftCreditsAmountOrPercent</members>
         <members>pscManageSoftCreditsCantChangeCurrency</members>
         <members>pscManageSoftCreditsFull</members>

src/pages/PSC_ManageSoftCredits.page

@@ -87,7 +87,8 @@
                     <tr>
                         <td>
                             <c:UTIL_FormField sObj="{!credit.contactRole}" sObjType="OpportunityContactRole" field="ContactId"
-                                  showLabel="false" actSup="true" actSupAction="{!refresh}" actSupReRender="totalSelected, totalUn"/>
+                                  showLabel="false" actSup="true" actSupAction="{!refresh}" actSupReRender="totalSelected, totalUn" 
+                                  overrideRequired="true"/>
 
                         </td>
                         <td>
@@ -114,7 +115,9 @@
                             </apex:outputPanel>
                         </td>
                         <td>
-                            <apex:commandButton styleClass="slds-button slds-button_destructive" value="{!$Label.alloDeleteRow}" id="delRowBTN" title="{!$Label.alloDeleteRow}" action="{!delRow}" reRender="tablePanel, totalSelected, totalUn" immediate="true">
+                            <apex:commandButton styleClass="slds-button slds-button_destructive" value="{!$Label.alloDeleteRow}" id="delRowBTN" 
+                                title="{!$Label.alloDeleteRow}" action="{!delRow}" reRender="tablePanel, totalSelected, totalUn" 
+                                immediate="false">
                                 <span class="slds-form-element__label slds-assistive-text">
                                     {!$Label.pscDeleteRow} {!cnt}
                                 </span>