chore(githubService): use existing util funcs

isomerpages · Oct 18, 2023 · 97f43d9 · 97f43d9
1 parent 2db8196
commit 97f43d9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/services/db/GitHubService.ts b/src/services/db/GitHubService.ts
@@ -7,7 +7,7 @@ import { ConflictError, inputNameConflictErrorMsg } from "@errors/ConflictError"
 import { NotFoundError } from "@errors/NotFoundError"
 import { UnprocessableError } from "@errors/UnprocessableError"
 
-import { validateStatus } from "@utils/axios-utils"
+import { isAxiosError, validateStatus } from "@utils/axios-utils"
 
 import GithubSessionData from "@root/classes/GithubSessionData"
 import UserWithSiteSessionData from "@root/classes/UserWithSiteSessionData"
@@ -240,7 +240,7 @@ export default class GitHubService {
   }
 
   async readMedia(
-    sessionData: { accessToken?: any; siteName?: any },
+    sessionData: UserWithSiteSessionData,
     {
       fileSha,
       branchName = STAGING_BRANCH,
@@ -451,7 +451,7 @@ export default class GitHubService {
     return data
   }
 
-  async getRepoState(sessionData: { accessToken?: any; siteName?: any }) {
+  async getRepoState(sessionData: UserWithSiteSessionData) {
     const { accessToken } = sessionData
     const { siteName } = sessionData
     const endpoint = `${siteName}/commits`
@@ -495,7 +495,7 @@ export default class GitHubService {
       return latestCommitMeta
     } catch (err) {
       if (err instanceof NotFoundError) throw err
-      if (axios.isAxiosError(err) && err.response) {
+      if (isAxiosError(err) && err.response) {
         const { status } = err.response
         if (status === 422)
           throw new UnprocessableError(`Branch ${branch} does not exist`)
@@ -643,7 +643,7 @@ export default class GitHubService {
       )
       return okAsync(null)
     } catch (error) {
-      if (error instanceof AxiosError && error.response) {
+      if (isAxiosError(error) && error.response) {
         const { status } = error.response
         // If user is unauthorized or site does not exist, show the same NotFoundError
         if (status === 404 || status === 403) {

diff --git a/src/services/db/__tests__/RepoService.spec.ts b/src/services/db/__tests__/RepoService.spec.ts
@@ -200,17 +200,17 @@ describe("RepoService", () => {
       MockCommitServiceGitHub.create.mockResolvedValueOnce(expected)
 
       const actual = await RepoService.create(sessionData, {
-        content: "content",
-        fileName: "test.md",
-        directoryName: "",
+        content: mockDirectoryName,
+        fileName: mockFileName,
+        directoryName: mockDirectoryName,
         isMedia,
       })
 
       expect(actual).toEqual(expected)
       expect(MockCommitServiceGitHub.create).toHaveBeenCalledWith(sessionData, {
-        content: "content",
-        fileName: "test.md",
-        directoryName: "",
+        content: mockContent,
+        fileName: mockFileName,
+        directoryName: mockDirectoryName,
         isMedia,
       })
     })