Skip to content

LPA Dashboard Speedup, issue count bug and unnecessary function calls #1135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pooleycodes merged 4 commits into from
Nov 25, 2025
Merged

LPA Dashboard Speedup, issue count bug and unnecessary function calls #1135

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ab9cb7f
remove fetch entryissuecounts, fetchresources and entity count in das…
pooleycodes Nov 24, 2025
ffdde91
lint
pooleycodes Nov 24, 2025
e29318d
empty entity issue count handling
pooleycodes Nov 24, 2025
cfc522b
Merge branch 'main' into 1608-lpa-dashboard-speedup-pt-2
pooleycodes Nov 25, 2025
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
28 changes: 8 additions & 20 deletions src/middleware/lpa-overview.middleware.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
*/

import performanceDbApi from '../services/performanceDbApi.js'
import { expectationFetcher, expectations, fetchEndpointSummary, fetchEntryIssueCounts, fetchOrgInfo, fetchResources, logPageError, noop, setAvailableDatasets } from './common.middleware.js'
import { fetchMany, FetchOptions, renderTemplate, fetchOneFromAllDatasets, parallel } from './middleware.builders.js'
import { expectationFetcher, expectations, fetchEndpointSummary, fetchOrgInfo, logPageError, noop, setAvailableDatasets } from './common.middleware.js'
import { fetchMany, FetchOptions, renderTemplate, parallel } from './middleware.builders.js'
import { getDeadlineHistory, requiredDatasets } from '../utils/utils.js'
import _ from 'lodash'
import logger from '../utils/logger.js'
Expand All @@ -33,14 +33,6 @@ const fetchProvisions = fetchMany({
result: 'provisions'
})

const fetchEntityCounts = fetchOneFromAllDatasets({
Comment thread
eveleighoj marked this conversation as resolved.
query: ({ req }) => `
select count(entity) as entity_count
from entity
WHERE organisation_entity = '${req.orgInfo.entity}'`,
result: 'entityCounts'
})

/**
* Calculates overall "health" of the datasets (not)provided by an organisation.
*
Expand Down Expand Up @@ -70,6 +62,8 @@ const orgStatsReducer = (accumulator, dataset) => {
* @description
* This middleware function checks if a dataset has been submitted within a certain timeframe
* and sets flags for due and overdue notices accordingly.
*
* Does not work and not used currently, TODO: fix or delete
*/
export const datasetSubmissionDeadlineCheck = (req, res, next) => {
const { resources } = req
Expand Down Expand Up @@ -120,6 +114,7 @@ export const datasetSubmissionDeadlineCheck = (req, res, next) => {
next()
}

// TODO: Not used, fix or delete
export function groupResourcesByDataset (req, res, next) {
const { resources } = req

Expand Down Expand Up @@ -319,11 +314,9 @@ export const getOverview = renderTemplate({
})

export function groupIssuesCountsByDataset (req, res, next) {
const { entityIssueCounts, entryIssueCounts } = req
const { entityIssueCounts = [] } = req

// merge arrays and handle undefined
const issueCounts = [...(entityIssueCounts || []), ...(entryIssueCounts || [])]
req.issues = issueCounts.reduce((acc, current) => {
req.issues = entityIssueCounts.reduce((acc, current) => {
if (!acc[current.dataset]) {
acc[current.dataset] = []
}
Expand Down Expand Up @@ -359,18 +352,13 @@ const fetchOutOfBoundsExpectations = expectationFetcher({
export default [
parallel([
fetchOrgInfo,
fetchResources,
fetchEndpointSummary,
fetchEntityIssueCountsPerformanceDb,
fetchProvisions
]),
parallel([
fetchEntryIssueCounts, // needs fetchResources to complete
fetchEntityCounts // needs fetchOrgInfo to complete
]),

setAvailableDatasets,
isFeatureEnabled('expectationOutOfBoundsTask') ? fetchOutOfBoundsExpectations : noop,
groupResourcesByDataset,
groupIssuesCountsByDataset,
groupEndpointsByDataset,

Expand Down