Merge pull request #115 from vatsimnetwork/development

vatsimnetwork · Oct 27, 2023 · fc9c50b · fc9c50b
2 parents 2422447 + 4801c64
commit fc9c50b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/Http/Controllers/Api/PluginDataController.php b/app/Http/Controllers/Api/PluginDataController.php
@@ -31,7 +31,7 @@ public function allRclMessages(Request $request)
         return Cache::remember(
             'rcl-messages:'.($track->id ?? 'all'),
             60,
-            fn () => RclMessage::with('clxMessages')
+            fn () => RclMessage::with(['clxMessages', 'track'])
                 ->when($track, fn (Builder $q) => $q->whereBelongsTo($track))
                 ->get()
                 ->map(self::serializeRclMessage(...))
@@ -51,7 +51,7 @@ public function allClxMessages(Request $request)
         return Cache::remember(
             'clx-messages:'.($track->id ?? 'all'),
             60,
-            fn () => ClxMessage::with('rclMessage')
+            fn () => ClxMessage::with(['rclMessage', 'track'])
                 ->when($track, fn (Builder $q) => $q->whereBelongsTo($track))
                 ->get()
                 ->map(self::serializeClxMessage(...))

diff --git a/app/Http/Livewire/Controllers/PgClxMessages.php b/app/Http/Livewire/Controllers/PgClxMessages.php
@@ -51,7 +51,7 @@ public function datasource(): ?Collection
                         $query->where('is_concorde', true);
                     }
                 })
-                ->with('rclMessage')
+                ->with(['rclMessage', 'track'])
                 ->orderByDesc('created_at')
                 ->get();
 

diff --git a/app/Http/Livewire/Controllers/PgPendingRclMessages.php b/app/Http/Livewire/Controllers/PgPendingRclMessages.php
@@ -49,7 +49,7 @@ public function datasource(): ?Collection
                 } elseif ($track == 'CONC') {
                     $query->where('is_concorde', true);
                 }
-            })->get();
+            })->with('track')->get();
             foreach ($trackMsgs as $msg) {
                 $pendingRclMsgs->add($msg);
             }