add error handlers and zerialization

vacuumlabs · May 3, 2024 · 2f8b236 · 2f8b236
1 parent ce22f4a
commit 2f8b236
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 20 deletions.
diff --git a/src/components/sections/contest/GithubFileSelect.tsx b/src/components/sections/contest/GithubFileSelect.tsx
@@ -26,7 +26,8 @@ const GithubFileSelect = () => {
   const {data: publicReposData, isLoading: publicReposIsLoading} =
     useGetPublicRepos()
   const {data: repoFilesData, isLoading: repoFilesIsLoading} = useGetRepoFiles(
-    selectedRepo ?? undefined,
+    selectedRepo ?? {defaultBranch: '', owner: '', repo: ''},
+    {enabled: selectedRepo !== null},
   )
 
   if (session.data?.user.provider !== 'github') {

diff --git a/src/lib/queries/github/getGitHub.ts b/src/lib/queries/github/getGitHub.ts
@@ -8,10 +8,11 @@ import {
   getRepoFiles,
 } from '@/server/actions/github/getGithub'
 import {useUserId} from '@/lib/hooks/useUserId'
+import {withApiErrorHandler} from '@/lib/utils/common/error'
 
 const getPublicReposQueryOptions = (userId: string | undefined) => ({
   queryKey: queryKeys.gitHub.publicRepos(userId).queryKey,
-  queryFn: () => getPublicRepos(),
+  queryFn: withApiErrorHandler(() => getPublicRepos()),
 })
 
 export const useGetPublicRepos = () => {
@@ -20,10 +21,12 @@ export const useGetPublicRepos = () => {
   return useQuery({...getPublicReposQueryOptions(userId), enabled: !!userId})
 }
 
-const getRepoFilesQueryOptions = (params: GetRepoFilesParams | undefined) => ({
+const getRepoFilesQueryOptions = (params: GetRepoFilesParams) => ({
   queryKey: queryKeys.gitHub.repoFiles(params).queryKey,
-  queryFn: () => (params ? getRepoFiles(params) : null),
+  queryFn: withApiErrorHandler(() => getRepoFiles(params)),
 })
 
-export const useGetRepoFiles = (params: GetRepoFilesParams | undefined) =>
-  useQuery({...getRepoFilesQueryOptions(params), enabled: !!params})
+export const useGetRepoFiles = (
+  params: GetRepoFilesParams,
+  options?: {enabled?: boolean},
+) => useQuery({...options, ...getRepoFilesQueryOptions(params)})
diff --git a/src/lib/queries/keys.ts b/src/lib/queries/keys.ts
@@ -21,6 +21,6 @@ export const queryKeys = createQueryKeyStore({
   },
   gitHub: {
     publicRepos: (userId: string | undefined) => [userId],
-    repoFiles: (params: GetRepoFilesParams | undefined) => [params],
+    repoFiles: (params: GetRepoFilesParams) => [params],
   },
 })
diff --git a/src/server/actions/github/getGithub.ts b/src/server/actions/github/getGithub.ts
@@ -5,10 +5,14 @@ import {z} from 'zod'
 
 import {requireGitHubAuth} from '@/server/utils/auth'
 import {db} from '@/server/db'
+import {ServerError} from '@/lib/types/error'
+import {serializeServerErrors} from '@/lib/utils/common/error'
 
-export type GetPublicReposResponse = Awaited<ReturnType<typeof getPublicRepos>>
+export type GetPublicReposResponse = Awaited<
+  ReturnType<typeof getPublicReposAction>
+>
 
-export const getPublicRepos = async () => {
+const getPublicReposAction = async () => {
   const session = await requireGitHubAuth()
 
   const account = await db.query.accounts.findFirst({
@@ -18,7 +22,7 @@ export const getPublicRepos = async () => {
   })
 
   if (!account) {
-    throw new Error('GitHub account not found')
+    throw new ServerError('GitHub account not found')
   }
 
   const octokit = new Octokit({
@@ -39,7 +43,11 @@ export const getPublicRepos = async () => {
     }))
 }
 
-export type GetRepoFilesResponse = Awaited<ReturnType<typeof getRepoFiles>>
+export const getPublicRepos = serializeServerErrors(getPublicReposAction)
+
+export type GetRepoFilesResponse = Awaited<
+  ReturnType<typeof getRepoFilesAction>
+>
 
 const getRepoFilesParamsSchema = z.object({
   repo: z.string(),
@@ -49,16 +57,10 @@ const getRepoFilesParamsSchema = z.object({
 
 export type GetRepoFilesParams = z.infer<typeof getRepoFilesParamsSchema>
 
-export const getRepoFiles = async (request: GetRepoFilesParams) => {
+const getRepoFilesAction = async (request: GetRepoFilesParams) => {
   const session = await requireGitHubAuth()
 
-  const result = getRepoFilesParamsSchema.safeParse(request)
-
-  if (!result.success) {
-    throw new Error('Invalid request')
-  }
-
-  const {repo, owner, defaultBranch} = result.data
+  const {repo, owner, defaultBranch} = getRepoFilesParamsSchema.parse(request)
 
   const account = await db.query.accounts.findFirst({
     columns: {access_token: true},
@@ -67,7 +69,7 @@ export const getRepoFiles = async (request: GetRepoFilesParams) => {
   })
 
   if (!account) {
-    throw new Error('GitHub account not found')
+    throw new ServerError('GitHub account not found')
   }
 
   const octokit = new Octokit({
@@ -95,3 +97,5 @@ export const getRepoFiles = async (request: GetRepoFilesParams) => {
 
   return data.tree
 }
+
+export const getRepoFiles = serializeServerErrors(getRepoFilesAction)