Merge pull request #277 from czqoocavatsim/JoshuaMicallefYBSU-patch-2

Update Roster & Fix Kernel Bug
czqoocavatsim · Aug 15, 2024 · 37af685 · 37af685
2 parents ffd3398 + fec2e68
commit 37af685
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
@@ -6,7 +6,7 @@
 use App\Jobs\ProcessSessionLogging;
 use App\Jobs\ProcessSessionReminders;
 use App\Jobs\ProcessSoloCertExpiryWarnings;
-use App\Job\ProcessShanwickController;
+use App\Jobs\ProcessShanwickController;
 use App\Models\Roster\RosterMember;
 use App\Notifications\Network\OneWeekInactivityReminder;
 use App\Notifications\Network\TwoWeekInactivityReminder;

diff --git a/app/Http/Controllers/Roster/RosterController.php b/app/Http/Controllers/Roster/RosterController.php
@@ -23,21 +23,21 @@ class RosterController extends Controller
     public function publicRoster()
     {
         // Get CZQO Roster
-        $roster = RosterMember::where('certification', '!=', 'not_certified')
+        $czqo_roster = RosterMember::where('certification', '!=', 'not_certified')
             ->select(['id', 'certification', 'active', 'user_id'])
             ->with('user:id,fname,lname,rating_short,display_fname,display_cid_only,display_last_name,division_name,division_code')
             ->get();
 
         // Get EGGX Roster
-        // $shanwick_controllers = ShanwickController::all();
+        $shanwick_controllers = ShanwickController::all();
 
-        // // Transform EGGX data to Eloquent-like objects
-        // $eggx_roster = $shanwick_controllers->map(function($controller) {
-        //     return $this->transformShanwickControllerToRoster($controller);
-        // });
+        // Transform EGGX data into Eloquent Model (For Full Name etc)
+        $eggx_roster = $shanwick_controllers->map(function($controller) {
+            return $this->transformShanwickControllerToRoster($controller);
+        });
 
-        // // Combine Data
-        // $roster = $czqo_roster->concat($eggx_roster);   
+        // Combine Data
+        $roster = $czqo_roster->concat($eggx_roster);   
 
         // return $roster;