add request utils + remove duplicate codes

niyabits · Jul 11, 2020 · 001062d · 001062d
1 parent c25319e
commit 001062d
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 74 deletions.
diff --git a/src/fetchRepo.js b/src/fetchRepo.js
@@ -1,49 +1,39 @@
-const axios = require("axios");
+const { request } = require("./utils");
 
 async function fetchRepo(username, reponame) {
   if (!username || !reponame) {
     throw new Error("Invalid username or reponame");
   }
 
-  const res = await axios({
-    url: "https://api.github.com/graphql",
-    method: "post",
-    headers: {
-      Authorization: `bearer ${process.env.GITHUB_TOKEN}`,
-    },
-    data: {
-      query: `
-        fragment RepoInfo on Repository {
-          name
-          stargazers {
-            totalCount
-          }
-          description
-          primaryLanguage {
-            color
-            id
-            name
-          }
-          forkCount
+  const res = await request(`
+    fragment RepoInfo on Repository {
+      name
+      stargazers {
+        totalCount
+      }
+      description
+      primaryLanguage {
+        color
+        id
+        name
+      }
+      forkCount
+    }
+    query getRepo($login: String!, $repo: String!) {
+      user(login: $login) {
+        repository(name: $repo) {
+          ...RepoInfo
         }
-        query getRepo($login: String!, $repo: String!) {
-          user(login: $login) {
-            repository(name: $repo) {
-              ...RepoInfo
-            }
-          }
-          organization(login: $login) {
-            repository(name: $repo) {
-              ...RepoInfo
-            }
-          }
+      }
+      organization(login: $login) {
+        repository(name: $repo) {
+          ...RepoInfo
         }
-      `,
-      variables: {
-        login: username,
-        repo: reponame,
-      },
-    },
+      }
+    }
+  `, {
+    login: username,
+    repo: reponame,
   });
 
   const data = res.data.data;

diff --git a/src/fetchStats.js b/src/fetchStats.js
@@ -1,47 +1,35 @@
-const axios = require("axios");
+const { request } = require("./utils");
 require("dotenv").config();
 
 async function fetchStats(username) {
   if (!username) throw Error("Invalid username");
 
-  const res = await axios({
-    url: "https://api.github.com/graphql",
-    method: "post",
-    headers: {
-      Authorization: `bearer ${process.env.GITHUB_TOKEN}`,
-    },
-    data: {
-      query: `
-        query userInfo($login: String!) {
-          user(login: $login) {
-            name
-            repositoriesContributedTo(first: 100, contributionTypes: [COMMIT, ISSUE, PULL_REQUEST, REPOSITORY]) {
-              totalCount
-            }
-            contributionsCollection {
-              totalCommitContributions
-            }
-            pullRequests(first: 100) {
-              totalCount
-            }
-            issues(first: 100) {
+  const res = await request(`
+    query userInfo($login: String!) {
+      user(login: $login) {
+        name
+        repositoriesContributedTo(first: 100, contributionTypes: [COMMIT, ISSUE, PULL_REQUEST, REPOSITORY]) {
+          totalCount
+        }
+        contributionsCollection {
+          totalCommitContributions
+        }
+        pullRequests(first: 100) {
+          totalCount
+        }
+        issues(first: 100) {
+          totalCount
+        }
+        repositories(first: 100) {
+          nodes {
+            stargazers {
               totalCount
             }
-            repositories(first: 100) {
-              nodes {
-                stargazers {
-                  totalCount
-                }
-              }
-            }
           }
         }
-      `,
-      variables: {
-        login: username,
-      },
-    },
-  });
+      }
+    }
+  `, { login: username });
 
   const stats = {
     name: "",

diff --git a/src/utils.js b/src/utils.js
@@ -1,3 +1,5 @@
+const axios = require("axios");
+
 const renderError = (message) => {
   return `
     <svg width="495" height="100" viewBox="0 0 495 100" fill="none" xmlns="http://www.w3.org/2000/svg">
@@ -25,4 +27,22 @@ function kFormatter(num) {
     : Math.sign(num) * Math.abs(num);
 }
 
-module.exports = { renderError, kFormatter, encodeHTML };
+function request(query, variables) {
+  return new Promise((resolve, reject) => {
+    axios({
+      url: "https://api.github.com/graphql",
+      method: "post",
+      headers: {
+        Authorization: `bearer ${process.env.GITHUB_TOKEN}`,
+      },
+      data: {
+        query,
+        variables,
+      },
+    })
+      .then((response) => resolve(response))
+      .catch((error) => reject(error));
+  });
+}
+
+module.exports = { renderError, kFormatter, encodeHTML, request };