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
12 changes: 11 additions & 1 deletion src/middleware/entityIssueDetails.middleware.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,17 @@ export const IssueDetailsQueryParams = v.object({
dataset: v.string(),
issue_type: v.string(),
issue_field: v.string(),
pageNumber: v.optional(v.pipe(v.string(), v.transform(s => parseInt(s, 10)), v.minValue(1)), '1'),
pageNumber: v.optional(
v.pipe(
v.string(),
v.regex(/^\d+$/),
v.transform(s => Number(s)),
v.number(),
v.integer(),
v.minValue(1)
),
'1'
),
resourceId: v.optional(v.string())
})

Expand Down
29 changes: 28 additions & 1 deletion test/unit/middleware/entityIssueDetails.middleware.test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { describe, it, vi, expect, beforeEach } from 'vitest'
import { getIssueDetails, getIssueField, prepareEntity, setRecordCount, show404ifNoIssues } from '../../../src/middleware/entityIssueDetails.middleware.js'
import * as v from 'valibot'
import { isValiError } from 'valibot'
import { IssueDetailsQueryParams, getIssueDetails, getIssueField, prepareEntity, setRecordCount, show404ifNoIssues } from '../../../src/middleware/entityIssueDetails.middleware.js'
import { MiddlewareError } from '../../../src/utils/errors.js'

vi.mock('../../../src/services/performanceDbApi.js')
Expand Down Expand Up @@ -255,4 +257,29 @@ describe('issueDetails.middleware.js', () => {
expect(next).toHaveBeenCalledWith()
})
})

describe('IssueDetailsQueryParams', () => {
const validBaseParams = {
lpa: 'local-authority:LIV',
dataset: 'tree-preservation-zone',
issue_type: 'missing associated entity',
issue_field: 'tree-preservation-order'
}

it('transforms a valid numeric pageNumber string to a number', () => {
const result = v.parse(IssueDetailsQueryParams, { ...validBaseParams, pageNumber: '2' })
expect(result.pageNumber).toBe(2)
})

it('throws a ValiError when pageNumber is not numeric', () => {
let thrown
try {
v.parse(IssueDetailsQueryParams, { ...validBaseParams, pageNumber: 'TPO335.G19' })
} catch (error) {
thrown = error
}
expect(thrown).toBeDefined()
expect(isValiError(thrown)).toBe(true)
})
Comment thread
coderabbitai[bot] marked this conversation as resolved.
})
})
Loading