calculate entities with issues instead of entries with issues

src/middleware/common.middleware.js

@@ -170,7 +170,7 @@ export async function reformatIssuesToBeByEntryNumber (req, res, next) {
 
 export function formatErrorSummaryParams (req, res, next) {
   const { lpa, dataset: datasetId, issue_type: issueType, issue_field: issueField } = req.params
-  const { issuesByEntryNumber, entityCount: entityCountRow, issueEntitiesCount } = req
+  const { issuesByEntryNumber, entityCount: entityCountRow, issues } = req
 
   const { entity_count: entityCount } = entityCountRow ?? { entity_count: 0 }
 
@@ -180,7 +180,7 @@ export function formatErrorSummaryParams (req, res, next) {
   let issueItems
 
   if (Object.keys(issuesByEntryNumber).length < entityCount) {
-    errorHeading = performanceDbApi.getTaskMessage({ issue_type: issueType, num_issues: issueEntitiesCount, entityCount, field: issueField }, true)
+    errorHeading = performanceDbApi.getTaskMessage({ issue_type: issueType, num_issues: issues.length, entityCount, field: issueField }, true)
     issueItems = Object.keys(issuesByEntryNumber).map((entryNumber, i) => {
       return {
         html: performanceDbApi.getTaskMessage({ issue_type: issueType, num_issues: 1, field: issueField }) + ` in record ${entryNumber}`,
@@ -189,7 +189,7 @@ export function formatErrorSummaryParams (req, res, next) {
     })
   } else {
     issueItems = [{
-      html: performanceDbApi.getTaskMessage({ issue_type: issueType, num_issues: issueEntitiesCount, entityCount, field: issueField }, true)
+      html: performanceDbApi.getTaskMessage({ issue_type: issueType, num_issues: issues.length, entityCount, field: issueField }, true)
     }]
   }
 
@@ -216,6 +216,16 @@ export const fetchEntitiesFromOrganisationAndEntryNumbers = fetchMany({
   dataset: FetchOptions.fromParams
 })
 
+export const paginateEntitiesAndPullOutCount = (req, res, next) => {
+  const { entities, pagination } = req
+
+  req.entitiesWithIssuesCount = entities.length
+
+  req.entities = entities.slice(pagination.offset, pagination.offset + pagination.limit)
+
+  next()
+}
+
 export const getPaginationOptions = (resultsCount) => (req, res, next) => {
   const { pageNumber } = req.params
 

src/middleware/issueTable.middleware.js

@@ -5,7 +5,6 @@ import {
   fetchDatasetInfo,
   fetchEntitiesFromOrganisationAndEntryNumbers,
   fetchEntityCount,
-  fetchIssueEntitiesCount,
   fetchIssues,
   fetchLatestResource,
   fetchOrgInfo,
@@ -16,6 +15,7 @@ import {
   isResourceIdNotInParams,
   logPageError,
   nestEntityFields,
+  paginateEntitiesAndPullOutCount,
   pullOutDatasetSpecification,
   reformatIssuesToBeByEntryNumber,
   replaceUnderscoreWithHyphenForEntities,
@@ -111,10 +111,10 @@ export const prepareIssueTableTemplateParams = (req, res, next) => {
  * @returns {void}
  */
 export const createPaginationTemplatePrams = (req, res, next) => {
-  const { issueEntitiesCount } = req
+  const { entitiesWithIssuesCount } = req
   const { pageNumber, lpa, dataset: datasetId, issue_type: issueType, issue_field: issueField } = req.params
 
-  const totalPages = Math.ceil(issueEntitiesCount / paginationPageLength)
+  const totalPages = Math.floor(entitiesWithIssuesCount / paginationPageLength)
 
   const BaseSubpath = `/organisations/${lpa}/${datasetId}/${issueType}/${issueField}/`
 
@@ -173,11 +173,11 @@ export default [
   fetchIssues,
   getEntryNumbersWithIssues,
   fetchEntitiesFromOrganisationAndEntryNumbers,
+  paginateEntitiesAndPullOutCount,
   extractJsonFieldFromEntities,
   replaceUnderscoreWithHyphenForEntities,
   nestEntityFields,
   addIssuesToEntities,
-  fetchIssueEntitiesCount,
   fetchEntityCount,
   reformatIssuesToBeByEntryNumber,
   formatErrorSummaryParams,

src/services/performanceDbApi.js

@@ -457,8 +457,10 @@ export default {
       LEFT JOIN entity e ON f.entity = e.entity
       WHERE e.organisation_entity = ${organisationEntity}
       AND entry_number in (${entryNumbers.join(', ')})
-      LIMIT ${pagination.limit}
-      OFFSET ${pagination.offset}
     `
+    // Can't have pagination here as we need to know the count of all the entities with issues anyway, something for the performance db?
+    //   LIMIT ${pagination.limit}
+    //   OFFSET ${pagination.offset}
+    // `
   }
 }