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

Revert "fix: caching" #114

Merged
merged 1 commit into from
Sep 28, 2024
Merged

Revert "fix: caching" #114

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
212 changes: 109 additions & 103 deletions lib/github/service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,127 +5,133 @@ import { TPullRequest, ZPullRequest } from "@/types/pullRequest";
import { Octokit } from "@octokit/rest";
import { unstable_cache } from "next/cache";

import { GITHUB_APP_ACCESS_TOKEN, OSS_GG_LABEL } from "../constants";
import { GITHUB_APP_ACCESS_TOKEN, GITHUB_CACHE_REVALIDATION_INTERVAL, OSS_GG_LABEL } from "../constants";
import { githubCache } from "./cache";
import { extractPointsFromLabels } from "./utils";

type PullRequestStatus = "open" | "merged" | "closed" | undefined;

const octokit = new Octokit({ auth: GITHUB_APP_ACCESS_TOKEN });

const fetchPullRequestsByGithubLogin = async (
export const getPullRequestsByGithubLogin = (
playerRepositoryIds: string[],
githubLogin: string,
status?: PullRequestStatus
): Promise<TPullRequest[]> => {
if (!playerRepositoryIds || playerRepositoryIds.length === 0) {
console.warn("No repository IDs provided. Returning empty array.");
return [];
}

const pullRequests: TPullRequest[] = [];

let statusQuery = "is:pr";
if (status === "open") statusQuery += " is:open";
else if (status === "merged") statusQuery += " is:merged";
else if (status === "closed") statusQuery += " is:closed -is:merged";

const repoQuery = playerRepositoryIds.map((id) => `repo:${id}`).join(" ");
const query = `${repoQuery} ${statusQuery} author:${githubLogin}`;

try {
const { data } = await octokit.search.issuesAndPullRequests({
q: query,
per_page: 99,
sort: "created",
order: "desc",
});

for (const pr of data.items) {
let prStatus: "open" | "merged" | "closed";
if (pr.state === "open") {
prStatus = "open";
} else if (pr.pull_request?.merged_at) {
prStatus = "merged";
} else {
prStatus = "closed";
) =>
unstable_cache(
async (): Promise<TPullRequest[]> => {
if (!playerRepositoryIds || playerRepositoryIds.length === 0) {
console.warn("No repository IDs provided. Returning empty array.");
return [];
}

const prLabels = pr.labels.filter((label) => label.name !== undefined) as { name: string }[];
const pullRequests: TPullRequest[] = [];

let statusQuery = "is:pr";
if (status === "open") statusQuery += " is:open";
else if (status === "merged") statusQuery += " is:merged";
else if (status === "closed") statusQuery += " is:closed -is:merged";

const repoQuery = playerRepositoryIds.map((id) => `repo:${id}`).join(" ");
const query = `${repoQuery} ${statusQuery} author:${githubLogin}`;

try {
const pullRequest: TPullRequest = ZPullRequest.parse({
title: pr.title,
href: pr.html_url,
author: pr.user?.login || "",
repositoryFullName: pr.repository_url.split("/").slice(-2).join("/"),
dateOpened: pr.created_at,
dateMerged: pr.pull_request?.merged_at || null,
dateClosed: pr.closed_at,
status: prStatus,
points: prLabels ? extractPointsFromLabels(prLabels) : null,
const { data } = await octokit.search.issuesAndPullRequests({
q: query,
per_page: 99,
sort: "created",
order: "desc",
});

pullRequests.push(pullRequest);
for (const pr of data.items) {
let prStatus: "open" | "merged" | "closed";
if (pr.state === "open") {
prStatus = "open";
} else if (pr.pull_request?.merged_at) {
prStatus = "merged";
} else {
prStatus = "closed";
}

const prLabels = pr.labels.filter((label) => label.name !== undefined) as { name: string }[];

try {
const pullRequest: TPullRequest = ZPullRequest.parse({
title: pr.title,
href: pr.html_url,
author: pr.user?.login || "",
repositoryFullName: pr.repository_url.split("/").slice(-2).join("/"),
dateOpened: pr.created_at,
dateMerged: pr.pull_request?.merged_at || null,
dateClosed: pr.closed_at,
status: prStatus,
points: prLabels ? extractPointsFromLabels(prLabels) : null,
});

pullRequests.push(pullRequest);
} catch (error) {
console.error(`Error parsing pull request: ${pr.title}`, error);
}
}
} catch (error) {
console.error(`Error parsing pull request: ${pr.title}`, error);
console.error(`Error fetching or processing pull requests:`, error);
}

// Sort pullRequests by dateOpened in descending order
pullRequests.sort((a, b) => new Date(b.dateOpened).getTime() - new Date(a.dateOpened).getTime());

return pullRequests;
},
[`getPullRequests-${githubLogin}-${status}-${playerRepositoryIds.join(",")}`],
{
tags: [githubCache.tag.byGithubLogin(githubLogin)],
revalidate: GITHUB_CACHE_REVALIDATION_INTERVAL,
}
} catch (error) {
console.error(`Error fetching or processing pull requests:`, error);
}

pullRequests.sort((a, b) => new Date(b.dateOpened).getTime() - new Date(a.dateOpened).getTime());

return pullRequests;
};

export const getPullRequestsByGithubLogin = unstable_cache(
fetchPullRequestsByGithubLogin,
["fetchPullRequestsByGithubLogin"],
{ revalidate: 60 }
);

const fetchAllOssGgIssuesOfRepos = async (repoGithubIds: number[]): Promise<TPullRequest[]> => {
const githubHeaders = {
Authorization: `Bearer ${GITHUB_APP_ACCESS_TOKEN}`,
Accept: "application/vnd.github.v3+json",
};

const allIssues = await Promise.all(
repoGithubIds.map(async (repoGithubId) => {
const repoResponse = await fetch(`https://api.github.com/repositories/${repoGithubId}`, {
headers: githubHeaders,
});
const repoData = await repoResponse.json();

const issuesResponse = await fetch(
`https://api.github.com/search/issues?q=repo:${repoData.full_name}+is:issue+is:open+label:"${OSS_GG_LABEL}"&sort=created&order=desc`,
{ headers: githubHeaders }
);
const issuesData = await issuesResponse.json();
const validatedData = ZGithubApiResponseSchema.parse(issuesData);

return validatedData.items.map((issue) =>
ZPullRequest.parse({
title: issue.title,
href: issue.html_url,
author: issue.user.login,
repositoryFullName: repoData.full_name,
dateOpened: issue.created_at,
dateMerged: null,
dateClosed: issue.closed_at,
status: "open",
points: extractPointsFromLabels(issue.labels),
)();

export const getAllOssGgIssuesOfRepos = (repoGithubIds: number[]) =>
unstable_cache(
async (): Promise<TPullRequest[]> => {
const githubHeaders = {
Authorization: `Bearer ${GITHUB_APP_ACCESS_TOKEN}`,
Accept: "application/vnd.github.v3+json",
};

const allIssues = await Promise.all(
repoGithubIds.map(async (repoGithubId) => {
const repoResponse = await fetch(`https://api.github.com/repositories/${repoGithubId}`, {
headers: githubHeaders,
});
const repoData = await repoResponse.json();

const issuesResponse = await fetch(
`https://api.github.com/search/issues?q=repo:${repoData.full_name}+is:issue+is:open+label:"${OSS_GG_LABEL}"&sort=created&order=desc`,
{ headers: githubHeaders }
);
const issuesData = await issuesResponse.json();
const validatedData = ZGithubApiResponseSchema.parse(issuesData);

// Map the GitHub API response to TPullRequest format
return validatedData.items.map((issue) =>
ZPullRequest.parse({
title: issue.title,
href: issue.html_url,
author: issue.user.login,
repositoryFullName: repoData.full_name,
dateOpened: issue.created_at,
dateMerged: null,
dateClosed: issue.closed_at,
status: "open",
points: extractPointsFromLabels(issue.labels),
})
);
})
);
})
);

return allIssues.flat();
};

export const getAllOssGgIssuesOfRepos = unstable_cache(
fetchAllOssGgIssuesOfRepos,
["fetchAllOssGgIssuesOfRepos"],
{ revalidate: 60 }
);
return allIssues.flat();
},
[`getAllOssGgIssuesOfRepos-${repoGithubIds.join("-")}`],
{
revalidate: GITHUB_CACHE_REVALIDATION_INTERVAL,
}
)();
Loading