Merge pull request #622 from SFDO-Community/reg_fee_fix

No longer deleting fees on registration page, just update old ones or…

Author: rdblake21

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

@@ -184,16 +184,6 @@ public without sharing class SummitEventsReadShared {
         ];
     }
 
-    public static List<Summit_Events_Fee__c> getFeesToDeleteByRegIdFeeIdList(Id registrationId, List<Id> recordedUsedIds) {
-        return [
-                SELECT Id, Event_Fee_Type__c, Event_Fee_Allocation__c, Event_Fee__c
-                FROM Summit_Events_Fee__c
-                WHERE Event_Registration__c = :registrationId
-                AND Id IN :recordedUsedIds
-                WITH SECURITY_ENFORCED
-        ];
-    }
-
     public static Map<Id, Summit_Events_Appointment_Type__c> getAppointmentTypesByEventId(Id eventId, String instanceTitle, Date startDate, Date endDate, String dayOfWeek) {
         return new Map<Id, Summit_Events_Appointment_Type__c>([
                 SELECT Id, Name, Title__c, Description__c, Appointment_Type__c, Appointment_Category__c, Appointment_Limits__c, Chosen_State__c,

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

@@ -469,29 +469,19 @@ public with sharing class SummitEventsRegisterController {
         eventRegistration.Event_Instance_Date_Time_Formatted__c = SummitEventsShared.navBreadcrumbBuilder(evtInstance);
         eventRegistration.Event__c = eventInformation.eventId;
         eventRegistration.Event_Instance__c = eventInformation.instanceId;
-        eventInformation.registrationId = eventRegistration.Id;
+        eventInformation.registrationId = incomingEventRegistrationId;
 
         //Check and create fees and save on registration
-        List<Summit_Events_Fee__c> recordedEventFeeList = SummitEventsReadShared.getEventFeesByRegistrationId(eventInformation.registrationId);
+        List<Summit_Events_Fee__c> recordedEventFeeList = SummitEventsReadShared.getEventFeesByRegistrationId(incomingEventRegistrationId);
         if (recordedEventFeeList.size() > 0) {
             //Fees already exist so checks need to be made if current fees are there
-            List<Id> recordedUsedIds = new List<Id>();
             for (Integer ff = 0; ff < eventFeeList.size(); ff++) {
                 for (Summit_Events_Fee__c recordedFees : recordedEventFeeList) {
                     if (eventFeeList[ff].Event_Fee_Type__c == recordedFees.Event_Fee_Type__c) {
                         eventFeeList[ff].Id = recordedFees.Id;
-                        recordedUsedIds.add(recordedFees.Id);
                     }
                 }
             }
-
-            //Get all currently recorded event fees and delete them
-            List<Summit_Events_Fee__c> deleteEventFees = SummitEventsReadShared.getFeesToDeleteByRegIdFeeIdList(eventInformation.registrationId, recordedUsedIds);
-
-            System.debug('deleteEventFees: ' + deleteEventFees);
-            if (deleteEventFees.size() > 0) {
-                rCRUD.deleteFees(deleteEventFees);
-            }
         }
 
         eventRegistration = rCRUD.updateRegistration(eventRegistration, incomingEventRegistrationId, registrantAudience, eventFeeList);
@@ -594,7 +584,7 @@ public with sharing class SummitEventsRegisterController {
                 }
                 try {
                     if (Schema.SObjectType.Summit_Events_Registration__c.isCreateable()) {
-                        insert upsertFees;
+                        upsert upsertFees;
                     }
                 } catch (Exception ex) {
                     System.debug(ex.getMessage());

force-app/test/default/classes/SummitEventsRegister_TEST.cls

@@ -335,8 +335,8 @@ private class SummitEventsRegister_TEST {
                     FROM Summit_Events_Fee__c
                     WHERE Event_Registration__c = :registerController.eventRegistration.Id
             ];
-            //Extra added fee should be deleted and one should remain
-            System.assertEquals(fees.size(), 1);
+            //Fees no longer get deleted, so the stray fee should still be there
+            System.assertEquals(fees.size(), 3);
             Test.stopTest();
         }
     }