From 4d299d46788d94fd49e3a8ba3e76782a253b7574 Mon Sep 17 00:00:00 2001 From: ryo-ma Date: Tue, 4 May 2021 12:57:11 +0900 Subject: [PATCH] Refactor the UserInfo class --- src/card.ts | 2 +- src/github_api_client.ts | 73 +++--------------------------------- src/user_info.ts | 81 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 88 insertions(+), 68 deletions(-) create mode 100644 src/user_info.ts diff --git a/src/card.ts b/src/card.ts index 3a20b91..4e13e10 100644 --- a/src/card.ts +++ b/src/card.ts @@ -12,7 +12,7 @@ import { Joined2020Trophy, AllSuperRankTrophy, } from "./trophies.ts"; -import { UserInfo } from "./github_api_client.ts"; +import { UserInfo } from "./user_info.ts"; import { RANK_ORDER, RANK } from "./utils.ts"; import { Theme } from "./theme.ts"; diff --git a/src/github_api_client.ts b/src/github_api_client.ts index 50f94f9..d6734b8 100644 --- a/src/github_api_client.ts +++ b/src/github_api_client.ts @@ -1,26 +1,6 @@ import { soxa } from "../deps.ts"; -export class UserInfo { - constructor( - public totalCommits: number, - public totalFollowers: number, - public totalIssues: number, - public totalPullRequests: number, - public totalStargazers: number, - public totalRepositories: number, - public languageCount: number, - public durationYear: number, - public ancientAccount: number, - public joined2020: number, - ) { - } -} -type Language = { name: string }; -type Stargazers = { totalCount: number }; - -type Repository = { - languages: { nodes: Language[] }; - stargazers: Stargazers; -}; +import { UserInfo } from "./user_info.ts" +import type { GitHubUserData } from "./user_info.ts"; export class GithubAPIClient { constructor() { @@ -69,51 +49,10 @@ export class GithubAPIClient { headers: { Authorization: `bearer ${token}` }, }, ); - const userData = response.data.data.user; - if (userData === null) { - return null; + if (response.status != 200) { + throw new Error(response) } - const totalCommits = - userData.contributionsCollection.restrictedContributionsCount + - userData.contributionsCollection.totalCommitContributions; - const totalStargazers = userData.repositories.nodes.reduce( - (prev: number, node: Repository) => { - return prev + node.stargazers.totalCount; - }, - 0, - ); - - const languages = new Set(); - userData.repositories.nodes.forEach((node: Repository) => { - if (node.languages.nodes != undefined) { - node.languages.nodes.forEach((node: Language) => { - if (node != undefined) { - languages.add(node.name); - } - }); - } - }); - const durationTime = new Date().getTime() - - new Date(userData.createdAt).getTime(); - const durationYear = new Date(durationTime).getUTCFullYear() - 1970; - const ancientAccount = new Date(userData.createdAt).getFullYear() <= 2010 - ? 1 - : 0; - const joined2020 = new Date(userData.createdAt).getFullYear() == 2020 - ? 1 - : 0; - const userInfo = new UserInfo( - totalCommits, - userData.followers.totalCount, - userData.issues.totalCount, - userData.pullRequests.totalCount, - totalStargazers, - userData.repositories.totalCount, - languages.size, - durationYear, - ancientAccount, - joined2020, - ); - return userInfo; + const userData: GitHubUserData = response.data.data.user; + return new UserInfo(userData); } } diff --git a/src/user_info.ts b/src/user_info.ts new file mode 100644 index 0000000..17e8a0c --- /dev/null +++ b/src/user_info.ts @@ -0,0 +1,81 @@ +type Language = { name: string }; +type Stargazers = { totalCount: number }; +type Repository = { + languages: { nodes: Language[] }; + stargazers: Stargazers; +}; +export type GitHubUserData = { + createdAt: string; + contributionsCollection: { + totalCommitContributions: number; + restrictedContributionsCount: number; + }; + pullRequests: { + totalCount: number; + }; + issues: { + totalCount: number; + }; + followers: { + totalCount: number; + }; + repositories: { + totalCount: number; + nodes: Repository[]; + }; +}; +export class UserInfo { + public readonly totalCommits: number; + public readonly totalFollowers: number; + public readonly totalIssues: number; + public readonly totalPullRequests: number; + public readonly totalStargazers: number; + public readonly totalRepositories: number; + public readonly languageCount: number; + public readonly durationYear: number; + public readonly ancientAccount: number; + public readonly joined2020: number; + constructor( + userData: GitHubUserData, + ) { + const totalCommits = + userData.contributionsCollection.restrictedContributionsCount + + userData.contributionsCollection.totalCommitContributions; + const totalStargazers = userData.repositories.nodes.reduce( + (prev: number, node: Repository) => { + return prev + node.stargazers.totalCount; + }, + 0, + ); + + const languages = new Set(); + userData.repositories.nodes.forEach((node: Repository) => { + if (node.languages.nodes != undefined) { + node.languages.nodes.forEach((node: Language) => { + if (node != undefined) { + languages.add(node.name); + } + }); + } + }); + const durationTime = new Date().getTime() - + new Date(userData.createdAt).getTime(); + const durationYear = new Date(durationTime).getUTCFullYear() - 1970; + const ancientAccount = new Date(userData.createdAt).getFullYear() <= 2010 + ? 1 + : 0; + const joined2020 = new Date(userData.createdAt).getFullYear() == 2020 + ? 1 + : 0; + this.totalCommits = totalCommits; + this.totalFollowers = userData.followers.totalCount; + this.totalIssues = userData.issues.totalCount; + this.totalPullRequests = userData.pullRequests.totalCount; + this.totalStargazers = totalStargazers; + this.totalRepositories = userData.repositories.totalCount; + this.languageCount = languages.size; + this.durationYear = durationYear; + this.ancientAccount = ancientAccount; + this.joined2020 = joined2020; + } +}