Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ describe('DwC-A locality export (admin-only)', () => {

expect(result.status).toEqual(200)
expect(result.headers['content-type']).toMatch(/application\/zip/i)
expect(result.headers['content-disposition']).toMatch(/attachment;\s*filename="now_dwc_localities_test_export_/i)
expect(result.headers['content-disposition']).toMatch(/attachment;\s*filename="now_dwc_localities_export_/i)

const zip = await JSZip.loadAsync(result.body as unknown as Buffer)
expect(zip.file('location.csv')).toBeTruthy()
Expand All @@ -57,6 +57,39 @@ describe('DwC-A locality export (admin-only)', () => {
expect(measurementCsv).toContain('"verbatimMeasurementType"')
})

it('returns a filtered ZIP archive for POST requests', async () => {
const loginResult = await send<{ token: string }>('user/login', 'POST', { username: 'testSu', password: 'test' })
expect(loginResult.status).toEqual(200)

const result = await request(app)
.post('/locality/export/dwc-archive')
.set('authorization', `bearer ${loginResult.body.token}`)
.send({ ids: [21050] })
.buffer(true)
.parse(parseBinary)

expect(result.status).toEqual(200)
expect(result.headers['content-type']).toMatch(/application\/zip/i)

const zip = await JSZip.loadAsync(result.body as unknown as Buffer)
const locationCsv = await zip.file('location.csv')!.async('string')
expect(locationCsv).toContain('NOW:LOC:21050')
expect(locationCsv).not.toContain('NOW:LOC:24750')
})

it('returns 400 for invalid POST id payloads', async () => {
const loginResult = await send<{ token: string }>('user/login', 'POST', { username: 'testSu', password: 'test' })
expect(loginResult.status).toEqual(200)

const result = await request(app)
.post('/locality/export/dwc-archive')
.set('authorization', `bearer ${loginResult.body.token}`)
.send({ ids: ['21050.5'] })

expect(result.status).toEqual(400)
expect(result.body).toEqual({ error: 'ids must contain only integers.' })
})

it('rejects non-admin requests', async () => {
const result = await request(app).get('/locality/export/dwc-archive')
expect(result.status).toEqual(403)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ describe('DwC-A occurrence export (admin-only)', () => {

expect(result.status).toEqual(200)
expect(result.headers['content-type']).toMatch(/application\/zip/i)
expect(result.headers['content-disposition']).toMatch(/attachment;\s*filename="now_dwc_occurrences_test_export_/i)
expect(result.headers['content-disposition']).toMatch(/attachment;\s*filename="now_dwc_occurrences_export_/i)

const zip = await JSZip.loadAsync(result.body as unknown as Buffer)
expect(zip.file('location.csv')).toBeTruthy()
Expand All @@ -62,6 +62,75 @@ describe('DwC-A occurrence export (admin-only)', () => {
expect(measurementCsv).toContain('"verbatimMeasurementType"')
})

it('returns a filtered ZIP archive for POST requests', async () => {
const loginResult = await send<{ token: string }>('user/login', 'POST', { username: 'testSu', password: 'test' })
expect(loginResult.status).toEqual(200)

const result = await request(app)
.post('/occurrence/export/dwc-archive')
.set('authorization', `bearer ${loginResult.body.token}`)
.send({ columnFilters: [{ id: 'lid_now_loc', value: '21050' }], sorting: [] })
.buffer(true)
.parse(parseBinary)

expect(result.status).toEqual(200)
expect(result.headers['content-type']).toMatch(/application\/zip/i)

const zip = await JSZip.loadAsync(result.body as unknown as Buffer)
const occurrenceCsv = await zip.file('occurrence.csv')!.async('string')
expect(occurrenceCsv).toContain('NOW:OCC:21050:')
expect(occurrenceCsv).not.toContain('NOW:OCC:24750:')
})

it('uses the unfiltered export path for empty POST filters', async () => {
const loginResult = await send<{ token: string }>('user/login', 'POST', { username: 'testSu', password: 'test' })
expect(loginResult.status).toEqual(200)

const result = await request(app)
.post('/occurrence/export/dwc-archive')
.set('authorization', `bearer ${loginResult.body.token}`)
.send({ columnFilters: [], sorting: [] })
.buffer(true)
.parse(parseBinary)

expect(result.status).toEqual(200)
const zip = await JSZip.loadAsync(result.body as unknown as Buffer)
const occurrenceCsv = await zip.file('occurrence.csv')!.async('string')
expect(occurrenceCsv).toContain('NOW:OCC:21050:')
expect(occurrenceCsv).toContain('NOW:OCC:24750:')
})

it('returns an empty filtered DwC-DP ZIP archive for POST requests', async () => {
const loginResult = await send<{ token: string }>('user/login', 'POST', { username: 'testSu', password: 'test' })
expect(loginResult.status).toEqual(200)

const result = await request(app)
.post('/occurrence/export/dwc-data-package')
.set('authorization', `bearer ${loginResult.body.token}`)
.send({ columnFilters: [{ id: 'lid_now_loc', value: '9999999' }], sorting: [] })
.buffer(true)
.parse(parseBinary)

expect(result.status).toEqual(200)
const zip = await JSZip.loadAsync(result.body as unknown as Buffer)
const occurrenceCsv = await zip.file('occurrence.csv')!.async('string')
expect(occurrenceCsv).toContain('"occurrenceID"')
expect(occurrenceCsv).not.toContain('NOW:OCC:')
})

it('returns structured validation errors for invalid POST filters', async () => {
const loginResult = await send<{ token: string }>('user/login', 'POST', { username: 'testSu', password: 'test' })
expect(loginResult.status).toEqual(200)

const result = await request(app)
.post('/occurrence/export/dwc-data-package')
.set('authorization', `bearer ${loginResult.body.token}`)
.send({ columnFilters: [{ id: '', value: '21050' }], sorting: [] })

expect(result.status).toEqual(400)
expect(result.body).toEqual([{ name: 'Column Filters', error: 'Invalid or missing id field in filter' }])
})

it('rejects non-admin requests', async () => {
const result = await request(app).get('/occurrence/export/dwc-archive')
expect(result.status).toEqual(403)
Expand All @@ -80,7 +149,7 @@ describe('DwC-A occurrence export (admin-only)', () => {

expect(result.status).toEqual(200)
expect(result.headers['content-type']).toMatch(/application\/zip/i)
expect(result.headers['content-disposition']).toMatch(/attachment;\s*filename="now_dwc_dp_test_export_/i)
expect(result.headers['content-disposition']).toMatch(/attachment;\s*filename="now_dwc_dp_export_/i)

const zip = await JSZip.loadAsync(result.body as unknown as Buffer)
expect(zip.file('datapackage.json')).toBeTruthy()
Expand Down Expand Up @@ -110,7 +179,7 @@ describe('DwC-A occurrence export (admin-only)', () => {

expect(result.status).toEqual(200)
expect(result.headers['content-type']).toMatch(/application\/zip/i)
expect(result.headers['content-disposition']).toMatch(/attachment;\s*filename="now_dwc_full_test_export_/i)
expect(result.headers['content-disposition']).toMatch(/attachment;\s*filename="now_dwc_full_export_/i)

const zip = await JSZip.loadAsync(result.body as unknown as Buffer)
expect(zip.file('README.txt')).toBeTruthy()
Expand Down
35 changes: 34 additions & 1 deletion backend/src/api-tests/species/dwcArchiveExport.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ describe('DwC-A species export (admin-only)', () => {

expect(result.status).toEqual(200)
expect(result.headers['content-type']).toMatch(/application\/zip/i)
expect(result.headers['content-disposition']).toMatch(/attachment;\s*filename="now_dwc_test_export_/i)
expect(result.headers['content-disposition']).toMatch(/attachment;\s*filename="now_dwc_export_/i)

const zip = await JSZip.loadAsync(result.body as unknown as Buffer)
expect(zip.file('taxon.csv')).toBeTruthy()
Expand All @@ -66,6 +66,39 @@ describe('DwC-A species export (admin-only)', () => {
expect(metaXml).toContain('<extension')
})

it('returns a filtered ZIP archive for POST requests', async () => {
const loginResult = await send<{ token: string }>('user/login', 'POST', { username: 'testSu', password: 'test' })
expect(loginResult.status).toEqual(200)

const result = await request(app)
.post('/species/export/dwc-archive')
.set('authorization', `bearer ${loginResult.body.token}`)
.send({ ids: [85729] })
.buffer(true)
.parse(parseBinary)

expect(result.status).toEqual(200)
expect(result.headers['content-type']).toMatch(/application\/zip/i)

const zip = await JSZip.loadAsync(result.body as unknown as Buffer)
const taxonCsv = await zip.file('taxon.csv')!.async('string')
expect(taxonCsv).toContain('NOW:85729')
expect(taxonCsv).not.toContain('NOW:85730')
})

it('returns 400 for invalid POST id payloads', async () => {
const loginResult = await send<{ token: string }>('user/login', 'POST', { username: 'testSu', password: 'test' })
expect(loginResult.status).toEqual(200)

const result = await request(app)
.post('/species/export/dwc-archive')
.set('authorization', `bearer ${loginResult.body.token}`)
.send({ ids: ['85729abc'] })

expect(result.status).toEqual(400)
expect(result.body).toEqual({ error: 'ids must contain only integers.' })
})

it('rejects non-admin requests', async () => {
const result = await request(app).get('/species/export/dwc-archive')
expect(result.status).toEqual(403)
Expand Down
26 changes: 19 additions & 7 deletions backend/src/routes/locality.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Request, Router } from 'express'
import { Request, Response, Router } from 'express'
import {
getAllLocalities,
canEditRestrictedWriteLocality,
Expand All @@ -12,6 +12,7 @@ import { AccessError, requireOneOf } from '../middlewares/authorizer'
import { deleteLocality, writeLocality } from '../services/write/locality'
import { buildDwcLocalityArchiveZipBuffer } from '../services/dwcArchiveExportLocalities'
import { currentDateAsString } from '../../../frontend/src/shared/currentDateAsString'
import { parseRequiredNumericIdsBody } from './utils/exportFilters'

const router = Router()

Expand All @@ -20,14 +21,25 @@ router.get('/all', async (req, res) => {
return res.status(200).send(fixBigInt(localities))
})

router.get('/export/dwc-archive', requireOneOf([Role.Admin]), async (_req, res) => {
const zipBuffer = await buildDwcLocalityArchiveZipBuffer()
const sendDwcArchive = async (ids: number[] | undefined, res: Response) => {
const zipBuffer = await buildDwcLocalityArchiveZipBuffer(ids)
res.setHeader('Content-Type', 'application/zip')
res.setHeader(
'Content-Disposition',
`attachment; filename="now_dwc_localities_test_export_${currentDateAsString()}.zip"`
)
res.setHeader('Content-Disposition', `attachment; filename="now_dwc_localities_export_${currentDateAsString()}.zip"`)
return res.status(200).send(zipBuffer)
}

router.get('/export/dwc-archive', requireOneOf([Role.Admin]), async (_req, res) => {
return sendDwcArchive(undefined, res)
})

router.post('/export/dwc-archive', requireOneOf([Role.Admin]), async (req, res) => {
let ids: number[]
try {
ids = parseRequiredNumericIdsBody(req.body)
} catch (error) {
return res.status(400).send({ error: error instanceof Error ? error.message : 'Invalid export filters.' })
}
return sendDwcArchive(ids, res)
})
Comment thread
Copilot marked this conversation as resolved.
Comment on lines +35 to 43

router.get('/:id', async (req, res) => {
Expand Down
Loading
Loading