Shrmp 101/support receive logs (#36)

* receive logs at upload endpont

* lint

* label data sent to mgmt as result or log

* lint

* fix tests

---------

Co-authored-by: Chris Bendel <[email protected]>

Author: kswanson33

src/app/api/job/[jobId]/approve/route.ts

@@ -15,7 +15,7 @@ export async function POST(request: NextRequest, { params }: { params: Promise<{
     if (fs.existsSync(filePath)) {
         const fileBuffer = await fs.promises.readFile(filePath)
 
-        const response = await uploadResults(jobId, fileBuffer, 'text/csv')
+        const response = await uploadResults(jobId, fileBuffer, 'text/csv', 'result')
 
         if (!response.ok) {
             log(`BMA: Unable to post file for job ID ${jobId}`, 'error')

src/app/api/job/[jobId]/upload/route.test.ts

@@ -190,7 +190,7 @@ daz67mcy8FIz1nBJ4z9P7ekCAwEAAQ==`),
 
         const response = await POST(req, { params })
 
-        expect(mgmt.uploadResults).toHaveBeenCalledWith(mockJobId, expect.any(Blob), 'application/zip')
+        expect(mgmt.uploadResults).toHaveBeenCalledWith(mockJobId, expect.any(Blob), 'application/zip', 'result')
         expect(response.status).toBe(200)
     })
 

src/app/api/job/[jobId]/upload/route.ts

@@ -60,10 +60,11 @@ export const POST = async (req: NextRequest, { params }: { params: Promise<{ job
         }
     } else {
         log('Encrypting results with public keys ...')
+        const fileType = 'file' in body ? 'result' : 'log'
         const data: Blob = body.file ? ((await body.file) as Blob) : new Blob([body.logs])
         const resultsBuffer = await data.arrayBuffer()
         const encryptedResults = await encryptResults(jobId, resultsBuffer, publicKeys.keys)
-        const response = await uploadResults(jobId, encryptedResults, 'application/zip')
+        const response = await uploadResults(jobId, encryptedResults, 'application/zip', fileType)
         if (!response.ok) {
             errorMessage = `Failed to post encrypted results: ${response.status}`
         } else {

src/app/management-app-requests.test.ts

@@ -41,7 +41,7 @@ describe('uploadResults', () => {
             ok: true,
         })
 
-        const res = await uploadResults('123', new Blob(), 'application/zip')
+        const res = await uploadResults('123', new Blob(), 'application/zip', 'result')
         expect(global.fetch).toHaveBeenCalledWith('http://bma/api/job/123/results', {
             method: 'POST',
             body: expect.any(FormData),

src/app/management-app-requests.ts

@@ -28,9 +28,14 @@ export const getPublicKeys = async (jobId: string): Promise<{ keys: ManagementAp
     return body
 }
 
-export const uploadResults = async (jobId: string, results: Buffer | Blob, type: 'text/csv' | 'application/zip') => {
+export const uploadResults = async (
+    jobId: string,
+    results: Buffer | Blob,
+    type: 'text/csv' | 'application/zip',
+    fileType: 'result' | 'log',
+) => {
     const formData = new FormData()
-    formData.append('file', new File([results], jobId, { type: type }))
+    formData.append(fileType, new File([results], jobId, { type: type }))
 
     const endpoint = `${process.env.MANAGEMENT_APP_API_URL}/api/job/${jobId}/results`
     log(`BMA: Uploading results ${endpoint}`)