Merge pull request #491 from navikt/TOLK-3471-Course

TOLK-3471 Forbedre koden vår Apex Guru Del 2 Kurs

Author: SFBenjaminle

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

@@ -77,14 +77,13 @@ public class CourseRegistrationHelper {
             return;
         }
 
-        Map<Id, Course__c> coursesWithCapacity = new Map<Id, Course__c>();
-        for (Course__c course : [
-            SELECT Id, MaxNumberOfParticipants__c, RegistrationSignupsCount__c
-            FROM Course__c
-            WHERE Id IN :courseIds
-        ]) {
-            coursesWithCapacity.put(course.Id, course);
-        }
+        Map<Id, Course__c> coursesWithCapacity = new Map<Id, Course__c>(
+            [
+                SELECT Id, MaxNumberOfParticipants__c, RegistrationSignupsCount__c
+                FROM Course__c
+                WHERE Id IN :courseIds
+            ]
+        );
 
         for (Id courseId : courseIds) {
             Course__c relatedCourse = coursesWithCapacity.get(courseId);
@@ -156,7 +155,26 @@ public class CourseRegistrationHelper {
             FROM Course__c
             WHERE Id IN :courseIdsToProcess
         ];
+
         Map<Id, Course__c> courseMap = new Map<Id, Course__c>(courses);
+        Map<Id, List<CourseRegistration__c>> waitlistMap = new Map<Id, List<CourseRegistration__c>>();
+
+        // Query all waitlisted registrations for the courses being processed, ordered by CreatedDate to ensure FIFO promotion
+        List<CourseRegistration__c> allWaitlistedRegistrations = [
+            SELECT Id, Status__c, Course__c, CreatedDate, NumberOfParticipants__c
+            FROM CourseRegistration__c
+            WHERE Course__c IN :courseIdsToProcess AND Status__c = 'Venteliste'
+            ORDER BY CreatedDate ASC
+        ];
+
+        // Group waitlisted registrations by course
+        for (CourseRegistration__c reg : allWaitlistedRegistrations) {
+            // Create a new list for the course if it doesn't exist
+            if (!waitlistMap.containsKey(reg.Course__c)) {
+                waitlistMap.put(reg.Course__c, new List<CourseRegistration__c>());
+            }
+            waitlistMap.get(reg.Course__c).add(reg);
+        }
 
         for (Id courseId : courseIdsToProcess) {
             Course__c currentCourse = courseMap.get(courseId);
@@ -183,12 +201,10 @@ public class CourseRegistrationHelper {
             if (availableSlots <= 0)
                 continue;
 
-            List<CourseRegistration__c> waitlistedRegistrations = [
-                SELECT Id, Status__c, Course__c, CreatedDate, NumberOfParticipants__c
-                FROM CourseRegistration__c
-                WHERE Course__c = :courseId AND Status__c = 'Venteliste'
-                ORDER BY CreatedDate ASC
-            ];
+            // Get waitlisted registrations for this course
+            List<CourseRegistration__c> waitlistedRegistrations = waitlistMap.containsKey(courseId)
+                ? waitlistMap.get(courseId)
+                : new List<CourseRegistration__c>();
             if (waitlistedRegistrations.isEmpty())
                 continue;