Incorporate error handling in a few places

package.json

@@ -59,6 +59,7 @@
         "jsonwebtoken": "^9.0.2",
         "mantine-datatable": "^7.12.4",
         "multer": "^1.4.5-lts.1",
-        "next-swagger-doc": "^0.4"
+        "next-swagger-doc": "^0.4",
+        "uuid": "^11.0.3"
     }
 }

src/app/api/run/[runId]/upload/route.test.ts

@@ -1,14 +1,20 @@
-import { describe, expect, it } from 'vitest'
+import { describe, expect, it, beforeEach } from 'vitest'
 import { POST } from './route'
 import { NextRequest } from 'next/server'
 import path from 'path'
 import fs from 'fs'
 import { UPLOAD_DIR } from '@/app/utils'
+import mockFs from 'mock-fs'
+import { v4 as uuidv4 } from 'uuid'
+
+beforeEach(() => {
+    fs.rmSync(UPLOAD_DIR, { recursive: true, force: true })
+})
 
 describe('POST /api/run/[runId]/upload', () => {
     it('should upload a file successfully', async () => {
         const mockFile = new Blob(['id,name\n1,John'], { type: 'text/csv' })
-        const mockRunId = '123'
+        const mockRunId = uuidv4()
 
         const formData = new FormData()
         formData.append('file', new File([mockFile], mockRunId))
@@ -38,9 +44,43 @@ describe('POST /api/run/[runId]/upload', () => {
         const req = {
             formData: async () => formData,
         } as NextRequest
-        const params = { runId: '123' }
+        const params = { runId: uuidv4() }
+        const response = await POST(req, { params })
+        expect(response.status).toBe(400)
+        expect((await response.json()).error).toBe('Form data does not include expected file key')
+    })
+
+    it('should return failure if unexpected form data is included', async () => {
+        const mockFile = new Blob(['id,name\n1,John'], { type: 'text/csv' })
+        const mockRunId = uuidv4()
+
+        const formData = new FormData()
+        formData.append('file', new File([mockFile], mockRunId))
+        formData.append('file2', new File([mockFile], mockRunId))
+
+        const req = {
+            formData: async () => formData,
+        } as NextRequest
+        const params = { runId: uuidv4() }
         const response = await POST(req, { params })
         expect(response.status).toBe(400)
+        expect((await response.json()).error).toBe('Form data includes unexpected data keys')
+    })
+
+    it('should return failure if runId is not a UUID', async () => {
+        const mockRunId = '123'
+
+        const formData = new FormData()
+
+        const req = {
+            formData: async () => formData,
+        } as NextRequest
+
+        const params = { runId: mockRunId }
+
+        const response = await POST(req, { params })
+        expect(response.status).toBe(400)
+        expect((await response.json()).error).toBe('runId is not a UUID')
     })
 
     it('should return an error if no runID is provided', async () => {
@@ -55,4 +95,27 @@ describe('POST /api/run/[runId]/upload', () => {
         const response = await POST(req, { params })
         expect(response.status).toBe(400)
     })
+
+    it('should return an error if the runID has results already', async () => {
+        const mockRunId = uuidv4()
+
+        mockFs({
+            [UPLOAD_DIR]: {
+                [mockRunId]: '',
+            },
+        })
+
+        const formData = new FormData()
+        formData.append('file', '')
+
+        const req = {
+            formData: async () => formData,
+        } as NextRequest
+
+        const params = { runId: mockRunId }
+
+        const response = await POST(req, { params })
+        expect(response.status).toBe(400)
+        expect((await response.json()).error).toBe('Data already exists for runId')
+    })
 })

src/app/api/run/[runId]/upload/route.ts

@@ -1,5 +1,7 @@
 import { NextRequest, NextResponse } from 'next/server'
-import { saveFile } from '@/app/utils'
+import { saveFile, UPLOAD_DIR, isValidUUID } from '@/app/utils'
+import path from 'path'
+import fs from 'fs'
 
 function isFile(obj: any): obj is File {
     return obj instanceof File
@@ -14,6 +16,23 @@ export const POST = async (req: NextRequest, { params }: { params: { runId: stri
         return NextResponse.json({ error: 'Missing runId' }, { status: 400 })
     }
 
+    if (!isValidUUID(runId)) {
+        return NextResponse.json({ error: 'runId is not a UUID' }, { status: 400 })
+    }
+
+    if (!('file' in body)) {
+        return NextResponse.json({ error: 'Form data does not include expected file key' }, { status: 400 })
+    }
+
+    if (Object.keys(body).length !== 1) {
+        return NextResponse.json({ error: 'Form data includes unexpected data keys' }, { status: 400 })
+    }
+
+    const filePath = path.join(UPLOAD_DIR, runId)
+    if (fs.existsSync(filePath)) {
+        return NextResponse.json({ error: 'Data already exists for runId' }, { status: 400 })
+    }
+
     if ('file' in body && isFile(body.file)) {
         await saveFile(body.file, runId)
         return NextResponse.json({}, { status: 200 })

src/app/utils.test.ts

@@ -1,4 +1,11 @@
-import { createUploadDirIfNotExists, deleteFile, generateAuthorizationHeaders, saveFile, UPLOAD_DIR } from './utils'
+import {
+    createUploadDirIfNotExists,
+    deleteFile,
+    generateAuthorizationHeaders,
+    isValidUUID,
+    saveFile,
+    UPLOAD_DIR,
+} from './utils'
 import mockFs from 'mock-fs'
 import path from 'path'
 import jwt from 'jsonwebtoken'
@@ -99,4 +106,14 @@ describe('Utils', () => {
             })
         })
     })
+
+    describe('isValidUUID', () => {
+        it('should return false on an invalid UUID', () => {
+            expect(isValidUUID('123')).toBe(false)
+        })
+
+        it('should return true on a valid UUID', () => {
+            expect(isValidUUID('a9bcdef7-575e-4083-8fbf-e1a743f29f24')).toBe(true)
+        })
+    })
 })

src/app/utils.ts

@@ -2,6 +2,7 @@ import path from 'path'
 import fs from 'fs'
 import os from 'os'
 import jwt from 'jsonwebtoken'
+import { validate as uuidValidate } from 'uuid'
 
 export const UPLOAD_DIR = path.resolve(os.tmpdir(), 'public/uploads')
 
@@ -40,3 +41,7 @@ export const generateAuthorizationHeaders = () => {
         Authorization: `Bearer ${token}`,
     }
 }
+
+export const isValidUUID = (value: string): boolean => {
+    return uuidValidate(value)
+}