Skip to content

Feature/leaderboards/all years #623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
brazilsunshine wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Feature/leaderboards/all years #623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f483ecc
learning redis
brazilsunshine May 17, 2023
0ae7eff
feature/leaderboards/all-years
brazilsunshine May 18, 2023
3f42c27
refactored
brazilsunshine May 18, 2023
a8b768e
get months
brazilsunshine May 20, 2023
7d76037
filter months/years
brazilsunshine May 23, 2023
d41c557
global leaderboard for year and month
brazilsunshine Aug 26, 2023
aa40243
leaderboard for year and month
brazilsunshine Aug 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
208 changes: 196 additions & 12 deletions app/Http/Controllers/Leaderboard/GetUsersForGlobalLeaderboardController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,81 @@ public function __invoke ()
$total = 1;
$userIds = [];
$queryFilter = "xp_redis";
$year = null;
$month = null;

if (request()->has('timeFilter')) {
if (request()->has('timeFilter'))
{
$timeFilter = request('timeFilter');
}

if (request()->has('year'))
{
$year = request('year');

if (request()->has('month'))
{
$month = request('month');
}
}

// Get the current page
$page = (int) request('page', 1); // 1, 2, 3...
$start = ($page - 1) * self::PER_PAGE; // 0, 100, 200...
$end = $start + self::PER_PAGE - 1; // 99, 199, 299...

// Get the values we need, depending on the filters given
if ($timeFilter === null || $timeFilter === 'all-time')
if ($timeFilter !== null)
{
$timeFilterData = $this->getDataForTimeFilter($timeFilter, $start, $end);

$total = $timeFilterData['total'];
$userIds = $timeFilterData['userIds'];
$queryFilter = $timeFilterData['queryFilter'];

$users = $this->getUsersForTimeFilter($userIds, $queryFilter, $start);
}
else if ($year !== null && $month === null)
{
$yearData = $this->getDataForYear($year, $start, $end);

$total = $yearData['total'];
$userIds = $yearData['userIds'];
$queryFilter = $yearData['queryFilter'];

$users = $this->getUsersForCustomYear($userIds, $queryFilter, $start, $year);
}
else if ($year !== null && $month !== null)
{
$monthData = $this->getDataForMonth($year, $month, $start, $end);

$total = $monthData['total'];
$userIds = $monthData['userIds'];
$queryFilter = $monthData['queryFilter'];

$users = $this->getUsersForCustomMonth($userIds, $queryFilter, $start, $year, $month);
}

return [
'success' => true,
'users' => $users,
'hasNextPage' => $total > $end + 1
];
}

/**
* @param $timeFilter
* @param $start
* @param $end
* @return array
*/
protected function getDataForTimeFilter ($timeFilter, $start, $end): array
{
$total = 0;
$userIds = null;
$queryFilter = 'xp_redis';

if ($timeFilter === 'all-time')
{
$total = Redis::zcount('xp.users', '-inf', '+inf');
$userIds = Redis::zrevrange("xp.users", $start, $end);
Expand Down Expand Up @@ -99,7 +162,63 @@ public function __invoke ()
}
}

$users = User::query()
return [
'total' => $total,
'userIds' => $userIds,
'queryFilter' => $queryFilter
];
}

/**
* Retrieve data based on the year filter.
* @param $year
* @param $start
* @param $end
* @return array
*/
protected function getDataForYear ($year, $start, $end): array
{
$total = Redis::zcount("leaderboard:users:$year", '-inf', '+inf');
$userIds = Redis::zrevrange("leaderboard:users:$year", $start, $end);

$queryFilter = "custom_year_xp";

return [
'total' => $total,
'userIds' => $userIds,
'queryFilter' => $queryFilter
];
}

/**
* @param $year
* @param $start
* @param $end
* @return array
*/
protected function getDataForMonth ($year, $month, $start, $end): array
{
$total = Redis::zcount("leaderboard:users:$year:$month", '-inf', '+inf');
$userIds = Redis::zrevrange("leaderboard:users:$year:$month", $start, $end);

$queryFilter = "custom_month_xp";

return [
'total' => $total,
'userIds' => $userIds,
'queryFilter' => $queryFilter
];
}

/**
* @param $userIds
* @param $queryFilter
* @param $start
* @return array
*/
protected function getUsersForTimeFilter ($userIds, $queryFilter, $start)
{
return User::query()
->with(['teams:id,name'])
->whereIn('id', $userIds)
->get()
Expand All @@ -108,10 +227,10 @@ public function __invoke ()
->values()
->map(function (User $user, $index) use ($start, $queryFilter) {
$showTeamName = $user->active_team && $user->teams
->where('pivot.team_id', $user->active_team)
->first(function ($value, $key) {
return $value->pivot->show_name_leaderboards || $value->pivot->show_username_leaderboards;
});
->where('pivot.team_id', $user->active_team)
->first(function ($value, $key) {
return $value->pivot->show_name_leaderboards || $value->pivot->show_username_leaderboards;
});

return [
'name' => $user->show_name ? $user->name : '',
Expand All @@ -124,11 +243,76 @@ public function __invoke ()
];
})
->toArray();
}

return [
'success' => true,
'users' => $users,
'hasNextPage' => $total > $end + 1
];
/**
*
*/
protected function getUsersForCustomYear ($userIds, $queryFilter, $start, $year)
{
return User::query()
->with(['teams:id,name'])
->whereIn('id', $userIds)
->get()
->map(function (User $user, $index) use ($start, $queryFilter, $year) {

$user->setAttribute('custom_year', $year);

$showTeamName = $user->active_team && $user->teams
->where('pivot.team_id', $user->active_team)
->first(function ($value, $key) {
return $value->pivot->show_name_leaderboards || $value->pivot->show_username_leaderboards;
});

return [
'name' => $user->show_name ? $user->name : '',
'username' => $user->show_username ? ('@' . $user->username) : '',
'xp' => $user->custom_year_xp,
'global_flag' => $user->global_flag,
'social' => !empty($user->social_links) ? $user->social_links : null,
'team' => $showTeamName ? $user->team->name : '',
];
})
->sortByDesc(function ($user) {
return intval($user['xp']);
})
->values()
->toArray();
}

/**
*
*/
protected function getUsersForCustomMonth ($userIds, $queryFilter, $start, $year, $month)
{
return User::query()
->with(['teams:id,name'])
->whereIn('id', $userIds)
->get()
->map(function (User $user, $index) use ($start, $queryFilter, $year, $month) {

$user->setAttribute('custom_year', $year);
$user->setAttribute('custom_month', $month);

$showTeamName = $user->active_team && $user->teams
->where('pivot.team_id', $user->active_team)
->first(function ($value, $key) {
return $value->pivot->show_name_leaderboards || $value->pivot->show_username_leaderboards;
});

return [
'name' => $user->show_name ? $user->name : '',
'username' => $user->show_username ? ('@' . $user->username) : '',
'xp' => $user->custom_month_xp,
'global_flag' => $user->global_flag,
'social' => !empty($user->social_links) ? $user->social_links : null,
'team' => $showTeamName ? $user->team->name : '',
];
})
->sortByDesc(function ($user) {
return intval($user['xp']);
})
->values()
->toArray();
}
}
Loading