Merge 2f87ff5 into 147ccb5

esac-ic · Oct 18, 2023 · 5d925ff · 5d925ff
2 parents 147ccb5 + 2f87ff5
commit 5d925ff
Showing 1 changed file with 18 additions and 16 deletions.
diff --git a/app/Services/AgendaApplicationFormService.php b/app/Services/AgendaApplicationFormService.php
@@ -15,43 +15,46 @@ public function getRegisteredUsers(AgendaItem $agendaItem): array
     {
         // Eager load necessary relationships
         $agendaItem->load('getApplicationForm.applicationFormRows', 'getApplicationFormResponses.getApplicationResponseUser', 'getApplicationFormResponses.getApplicationFormResponseRows.getApplicationFormRow');
-    
+
         // Retrieve necessary objects
         $applicationForm = $agendaItem->getApplicationForm;
         $applicationResponses = $agendaItem->getApplicationFormResponses;
-
+
+        if (is_null($applicationForm)) {
+            return [];
+        }
+
         // Map custom fields
         $customfields = $applicationForm->applicationFormRows
             ->pluck('applicationFormRowName')
             ->map->text()
             ->all();
-    
+
         // Map user data
         $userdata = $applicationResponses->map(function ($response) use ($agendaItem) {
             $user = $response->getApplicationResponseUser;
             $user["_signupId"] = $response->id;
-            
-            $response->getApplicationFormResponseRows->each(function($responseRow) use (&$user) {
+
+            $response->getApplicationFormResponseRows->each(function ($responseRow) use (&$user) {
                 $columnname = $responseRow->getApplicationFormRow->applicationFormRowName->text();
                 $user[$columnname] = $responseRow->value;
             });
-            
+
             if ($agendaItem->climbing_activity) {
                 $user['certificate_names'] = $user->getCertificationsAbbreviations();
             }
             return $user;
         })->all();
-    
+
         // Build the final array to return
         return [
-            "agendaitem"   => $agendaItem->agendaItemTitle->text(),
-            "agendaId"     => $agendaItem->id,
-            "userdata"     => $userdata,
-            "customfields" => $customfields
+            "agendaitem" => $agendaItem->agendaItemTitle->text(),
+            "agendaId" => $agendaItem->id,
+            "userdata" => $userdata,
+            "customfields" => $customfields,
         ];
     }
 
-
     /**
      * @param AgendaItem $agendaItem
      * @return array
@@ -69,15 +72,14 @@ public function getRegisteredUserIds(AgendaItem $agendaItem): array
 
         return $userdataIds;
     }
-
 
     /**
      * @param AgendaItem $agendaItem
      * @return Collection
      */
     public function getExportData(AgendaItem $agendaItem): Collection
     {
-        $users            = $this->getRegisteredUsers($agendaItem);
+        $users = $this->getRegisteredUsers($agendaItem);
         $selectedElements = array(
             "firstname",
             "preposition",
@@ -86,7 +88,7 @@ public function getExportData(AgendaItem $agendaItem): Collection
             "houseNumber",
             "city",
             "email",
-            "phonenumber"
+            "phonenumber",
         );
         $selectedElements = array_merge($selectedElements, $users["customfields"]);
 
@@ -102,4 +104,4 @@ public function getExportData(AgendaItem $agendaItem): Collection
         return new Collection($activeUsers);
     }
 
-}
+}