Skip to content
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

fix: filter years before account creation #449

Merged
merged 3 commits into from
Feb 7, 2023
Merged

fix: filter years before account creation #449

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4cb7ce4
fix: filter years before account creation
DenverCoder1 Feb 7, 2023
841780c
refactor: Remove use of contributionYears
DenverCoder1 Feb 7, 2023
8e8d14b
Add an exception for 1 year of backdated commits
DenverCoder1 Feb 7, 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
23 changes: 16 additions & 7 deletions src/stats.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ function buildContributionGraphQuery(string $user, int $year): string
$end = "$year-12-31T23:59:59Z";
return "query {
user(login: \"$user\") {
createdAt
contributionsCollection(from: \"$start\", to: \"$end\") {
contributionYears
contributionCalendar {
Expand Down Expand Up @@ -122,17 +123,25 @@ function getContributionGraphs(string $user): array
// get the list of years the user has contributed and the current year's contribution graph
$currentYear = intval(date("Y"));
$responses = executeContributionGraphRequests($user, [$currentYear]);
$contributionYears = $responses[$currentYear]->data->user->contributionsCollection->contributionYears ?? [];
// get user's created date (YYYY-MM-DDTHH:MM:SSZ format)
$userCreatedDateTimeString = $responses[$currentYear]->data->user->createdAt ?? null;
// if there are no contribution years, an API error must have occurred
if (empty($contributionYears)) {
if (empty($userCreatedDateTimeString)) {
throw new AssertionError("Failed to retrieve contributions. This is likely a GitHub API issue.", 500);
}
// remove the current year from the list since it's already been fetched
$contributionYears = array_filter($contributionYears, function ($year) use ($currentYear) {
return $year !== $currentYear;
});
// extract the year from the created datetime string
$userCreatedYear = intval(explode("-", $userCreatedDateTimeString)[0]);
// create an array of years from the user's created year to one year before the current year
$yearsToRequest = range($userCreatedYear, $currentYear - 1);
// also check the first contribution year if the year is before 2005 (the year Git was created)
// since the user may have backdated some commits to a specific year such as 1970 (see #448)
$contributionYears = $responses[$currentYear]->data->user->contributionsCollection->contributionYears ?? [];
$firstContributionYear = $contributionYears[count($contributionYears) - 1] ?? $userCreatedYear;
if ($firstContributionYear < 2005) {
array_unshift($yearsToRequest, $firstContributionYear);
}
// get the contribution graphs for the previous years
$responses += executeContributionGraphRequests($user, $contributionYears);
$responses += executeContributionGraphRequests($user, $yearsToRequest);
return $responses;
}

Expand Down