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
4 changes: 4 additions & 0 deletions src/middleware/entityIssueDetails.middleware.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@ export function prepareEntity (req, res, next) {
const { issueEntities, issues, specification } = req
const { pageNumber, issue_type: issueType } = req.parsedParams

if (!issueEntities || issueEntities.length === 0) {
return next(new MiddlewareError('No issues for entity', 404))
}

const entityData = issueEntities[pageNumber - 1]
const entityIssues = issues.filter(issue => issue.entity === entityData.entity)

Expand Down
41 changes: 27 additions & 14 deletions test/unit/middleware/entityIssueDetails.middleware.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ describe('issueDetails.middleware.js', () => {
expect(next).toHaveBeenCalledTimes(1)
})

it('sets the record count to 0 if req.issues is undefined', () => {
it('sets the record count to 0 if req.issueEntities is undefined', () => {
const req = {}
const res = {}
const next = vi.fn()
Expand All @@ -55,8 +55,8 @@ describe('issueDetails.middleware.js', () => {
expect(next).toHaveBeenCalledTimes(1)
})

it('sets the record count to 0 if req.issues is null', () => {
const req = { issues: null }
it('sets the record count to 0 if req.issueEntities is undefined', () => {
const req = { issues: null, issueEntities: undefined }
const res = {}
const next = vi.fn()

Expand All @@ -68,27 +68,32 @@ describe('issueDetails.middleware.js', () => {
})

describe('prepareEntity', () => {
const req = {}
const res = {}

beforeEach(() => {
req.issueEntities = [
const reqTemplate = {
issueEntities: [
{ entity: 'entity1', name: 'Entity 1', field1: 'value1', field2: 'value2', geometry: 'POINT (-0.10 51.49)' },
{ entity: 'entity2', name: 'Entity 2', field1: 'value3', field2: 'value4', geometry: undefined }
]
req.issues = [
],
issues: [
{ entity: 'entity1', field: 'field1', message: 'Error 1' },
{ entity: 'entity1', field: 'field2', message: 'Error 2' },
{ entity: 'entity2', field: 'field1', message: 'Error 3' }
]
req.specification = {
],
specification: {
fields: [
{ field: 'field1', datasetField: 'datasetField1' },
{ field: 'field2', datasetField: 'datasetField2' },
{ field: 'geometry', datasetField: 'geometry_field' }
]
}
req.parsedParams = { pageNumber: 1, issue_type: 'issueType' }
},
parsedParams: { pageNumber: 1, issue_type: 'issueType' }
}
const resTemplate = {}
let req = {}
let res = {}

beforeEach(() => {
req = structuredClone(reqTemplate)
res = structuredClone(resTemplate)
})

it('should set req.entry with correct title and fields', () => {
Expand Down Expand Up @@ -154,6 +159,14 @@ describe('issueDetails.middleware.js', () => {
geometries: []
})
})
it('should handle no issueEntities', () => {
const request = structuredClone(req)
Object.assign(request, { issueEntities: [] })
const next = vi.fn()
prepareEntity(request, {}, next)
expect(request.entry).toBeUndefined()
expect(next).toHaveBeenCalledWith(new MiddlewareError('No issues for entity', 404))
})
})

describe('getIssueDetails', () => {
Expand Down