Skip to content

Commit

Permalink
Merge pull request #276 from czqoocavatsim/JoshuaMicallefYBSU-patch-2
Browse files Browse the repository at this point in the history
Update RosterController.php
  • Loading branch information
JoshuaMicallefYBSU authored Aug 15, 2024
2 parents 6258d57 + dfe1831 commit ffd3398
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions app/Http/Controllers/Roster/RosterController.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,21 @@ class RosterController extends Controller
public function publicRoster()
{
// Get CZQO Roster
$czqo_roster = RosterMember::where('certification', '!=', 'not_certified')
$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 to Eloquent-like objects
// $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;

Expand Down

0 comments on commit ffd3398

Please sign in to comment.