fix: a few type errors

src/middleware/common.middleware.js

@@ -39,8 +39,17 @@ export const fetchDatasetInfo = fetchOne({
  * @returns {boolean}
  */
 export const isResourceAccessible = (req) => req.resourceStatus.status === '200'
+export const isResourceIdValid = (req) => req.resourceStatus.resource.trim() !== ''
 export const isResourceNotAccessible = (req) => !isResourceAccessible(req)
 export const isResourceIdInParams = ({ params }) => !('resourceId' in params)
+export const isResourceDataPresent = (req) => 'resource' in req
+
+export const and = (...args) => {
+  return (req) => args.every(arg => arg(req))
+}
+export const or = (...args) => {
+  return (req) => args.some(arg => arg(req))
+}
 
 /**
  * Middleware. Updates req with `resource`.
@@ -72,7 +81,7 @@ export const fetchOrgInfo = fetchOne({
 
 /**
  * Middleware. Validates query params according to schema.
- * Short circuits with 400 error if validation fails
+ * Short circuits with 400 error if validation fails. Potentially updates req with `parsedParams`
  *
  * `this` needs: `{ schema }`
  *
@@ -82,7 +91,7 @@ export const fetchOrgInfo = fetchOne({
  */
 export function validateQueryParamsFn (req, res, next) {
   try {
-    v.parse(this.schema || v.any(), req.params)
+    req.parsedParams = v.parse(this.schema || v.any(), req.params)
     next()
   } catch (error) {
     res.status(400).render('errorPages/400', {})

src/middleware/datasetOverview.middleware.js

@@ -2,6 +2,8 @@ import { fetchDatasetInfo, fetchLatestResource, fetchLpaDatasetIssues, fetchOrgI
 import { fetchOne, fetchIf, fetchMany, renderTemplate, FetchOptions, onlyIf } from './middleware.builders.js'
 import { fetchResourceStatus, prepareDatasetTaskListErrorTemplateParams } from './datasetTaskList.middleware.js'
 import performanceDbApi from '../services/performanceDbApi.js'
+import logger from '../utils/logger.js'
+import { types } from '../utils/logging.js'
 
 const fetchColumnSummary = fetchMany({
   query: ({ params }) => `
@@ -36,11 +38,24 @@ const fetchSpecification = fetchOne({
   result: 'specification'
 })
 
+/**
+ * Middleware. Updates req with `datasetSpecification`
+ *
+ * @param req
+ * @param res
+ * @param next
+ */
 export const pullOutDatasetSpecification = (req, res, next) => {
   const { specification } = req
-  const collectionSpecifications = JSON.parse(specification.json)
-  const datasetSpecification = collectionSpecifications.find((spec) => spec.dataset === req.dataset.dataset)
-  req.specification = datasetSpecification
+  let collectionSpecifications
+  try {
+    collectionSpecifications = JSON.parse(specification.json)
+  } catch (e) {
+    // we can proceed but we probably should notify the user the displayed data may not be complete
+    logger.info('failed to parse specification JSON', { type: types.DataValidation, collection: req.dataset.collection })
+    collectionSpecifications = []
+  }
+  req.datasetSpecification = collectionSpecifications.find((spec) => spec.dataset === req.dataset.dataset)
   next()
 }
 
@@ -105,21 +120,21 @@ const fetchEntityCount = fetchOne({
 })
 
 export const prepareDatasetOverviewTemplateParams = (req, res, next) => {
-  const { orgInfo, specification, columnSummary, entityCount, sources, dataset, issues } = req
+  const { orgInfo, datasetSpecification, columnSummary, entityCount, sources, dataset, issues } = req
 
   const mappingFields = columnSummary[0]?.mapping_field?.split(';') ?? []
   const nonMappingFields = columnSummary[0]?.non_mapping_field?.split(';') ?? []
   const allFields = [...mappingFields, ...nonMappingFields]
 
-  const numberOfFieldsSupplied = specification.fields.map(field => field.field).reduce((acc, current) => {
-    return allFields.includes(current) ? acc + 1 : acc
+  const specFields = datasetSpecification ? datasetSpecification.fields : []
+  const numberOfFieldsSupplied = specFields.reduce((acc, field) => {
+    return allFields.includes(field.field) ? acc + 1 : acc
   }, 0)
-
-  const numberOfFieldsMatched = specification.fields.map(field => field.field).reduce((acc, current) => {
-    return mappingFields.includes(current) ? acc + 1 : acc
+  const numberOfFieldsMatched = specFields.reduce((acc, field) => {
+    return mappingFields.includes(field.field) ? acc + 1 : acc
   }, 0)
 
-  const numberOfExpectedFields = specification.fields.length
+  const numberOfExpectedFields = specFields.length
 
   // I'm pretty sure every endpoint has a separate documentation-url, but this isn't currently represented in the performance db. need to double check this and update if so
   const endpoints = sources.sort((a, b) => {

src/middleware/datasetTaskList.middleware.js

@@ -1,4 +1,15 @@
-import { fetchDatasetInfo, isResourceAccessible, isResourceNotAccessible, fetchLatestResource, fetchEntityCount, logPageError, fetchLpaDatasetIssues, validateQueryParams, getDatasetTaskListError } from './common.middleware.js'
+import {
+  fetchDatasetInfo,
+  isResourceAccessible,
+  isResourceNotAccessible,
+  fetchLatestResource,
+  fetchEntityCount,
+  logPageError,
+  fetchLpaDatasetIssues,
+  validateQueryParams,
+  getDatasetTaskListError,
+  isResourceIdValid, and
+} from './common.middleware.js'
 import { fetchOne, fetchIf, onlyIf, renderTemplate } from './middleware.builders.js'
 import performanceDbApi from '../services/performanceDbApi.js'
 import { statusToTagClass } from '../filters/filters.js'
@@ -46,7 +57,6 @@ export const prepareDatasetTaskListTemplateParams = (req, res, next) => {
   const { issues, entityCount: entityCountRow, params, dataset, orgInfo: organisation } = req
   const { entity_count: entityCount } = entityCountRow ?? { entity_count: 0 }
   const { lpa, dataset: datasetId } = params
-  console.assert(req.resourceStatus.resource === req.resource.resource, 'mismatch between resourceStatus and resource data')
   console.assert(typeof entityCount === 'number', 'entityCount should be a number')
 
   const taskList = issues.map((issue) => {
@@ -113,14 +123,17 @@ const validateParams = validateQueryParams({
   })
 })
 
+/* eslint-disable-next-line no-return-assign */
+const zeroEntityCount = (req) => req.entityCount = { entity_count: 0 }
+
 export default [
   validateParams,
   fetchResourceStatus,
   fetchOrgInfoWithStatGeo,
   fetchDatasetInfo,
   fetchIf(isResourceAccessible, fetchLatestResource),
   fetchIf(isResourceAccessible, fetchLpaDatasetIssues),
-  fetchIf(isResourceAccessible, fetchEntityCount),
+  fetchIf(and(isResourceAccessible, isResourceIdValid), fetchEntityCount, zeroEntityCount),
   onlyIf(isResourceAccessible, prepareDatasetTaskListTemplateParams),
   onlyIf(isResourceAccessible, getDatasetTaskList),
   onlyIf(isResourceNotAccessible, prepareDatasetTaskListErrorTemplateParams),