diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 7c372d61..fac55927 100644 --- 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 index 20a3bfaa..10f2107b 100644 --- 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;