Skip to content

Commit

Permalink
Merge pull request #1380 from bcgov/bugfix/ALCS-1585
Browse files Browse the repository at this point in the history 
Improve public application submission search view performance
  • Loading branch information
@trslater
trslater authored Feb 2, 2024
2 parents 3f1a9c0 + c2c0d8e commit 191f294
Show file tree
Hide file tree
Showing 2 changed files with 220 additions and 91 deletions.
177 changes: 86 additions & 91 deletions ...s/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts
View file
Original file line number Diff line number Diff line change
@@ -1,105 +1,100 @@
import {
DataSource,
JoinColumn,
ManyToOne,
PrimaryColumn,
ViewColumn,
ViewEntity,
} from 'typeorm';
import { ApplicationDecision } from '../../../../alcs/application-decision/application-decision.entity';
import { SUBMISSION_STATUS } from '../../../../alcs/application/application-submission-status/submission-status.dto';
import { ApplicationSubmissionToSubmissionStatus } from '../../../../alcs/application/application-submission-status/submission-status.entity';
import { Application } from '../../../../alcs/application/application.entity';
import { ApplicationType } from '../../../../alcs/code/application-code/application-type/application-type.entity';
import { LocalGovernment } from '../../../../alcs/local-government/local-government.entity';
import { ApplicationSubmission } from '../../../application-submission/application-submission.entity';
import { LinkedStatusType } from '../public-search.dto';

@ViewEntity({
expression: (datasource: DataSource) =>
datasource
.createQueryBuilder()
.select('app_sub.uuid', 'uuid')
.addSelect('app_sub.file_number', 'file_number')
.addSelect('app_sub.applicant', 'applicant')
.addSelect('app_sub.local_government_uuid', 'local_government_uuid')
.addSelect('localGovernment.name', 'local_government_name')
.addSelect('app_sub.type_code', 'application_type_code')
.addSelect('app.date_submitted_to_alc', 'date_submitted_to_alc')
.addSelect('app.decision_date', 'decision_date')
.addSelect('decision_date.outcome', 'outcome')
.addSelect('decision_date.dest_rank', 'dest_rank')
.addSelect('app.uuid', 'application_uuid')
.addSelect('app.region_code', 'application_region_code')
.addSelect(
'GREATEST(status_link.effective_date, decision_date.date)',
'last_update',
)
.addSelect(
'alcs.get_current_status_for_application_submission_by_uuid(app_sub.uuid)',
'status',
)
.from(ApplicationSubmission, 'app_sub')
.innerJoin(
Application,
'app',
'app.file_number = app_sub.file_number AND app.hide_from_portal = FALSE',
)
.innerJoinAndSelect(
ApplicationType,
'applicationType',
'app_sub.type_code = applicationType.code',
)
.leftJoin(
LocalGovernment,
'localGovernment',
'app_sub.local_government_uuid = localGovernment.uuid',
)
.leftJoin(
(qb) =>
qb
.from(ApplicationSubmissionToSubmissionStatus, 'status_link')
.select('MAX("effective_date")', 'effective_date')
.addSelect('submission_uuid', 'submission_uuid')
.groupBy('submission_uuid'),
'status_link',
'status_link."submission_uuid" = app_sub.uuid',
)
.leftJoin(
(qb) =>
qb
.from(ApplicationDecision, 'decision_date')
.select('decisiondate', 'date')
.addSelect('outcome', 'outcome')
.addSelect('dest_rank', 'dest_rank')
.distinctOn(['application_uuid'])
.addSelect('applicationuuid', 'application_uuid')
.from(
qb
.subQuery()
.select('outcome_code', 'outcome')
.addSelect('date', 'decisiondate')
.addSelect('application_uuid', 'applicationuuid')
.addSelect(
'RANK() OVER (PARTITION BY application_uuid ORDER BY date DESC, audit_created_at DESC)',
'dest_rank',
)
.where('is_draft = FALSE')
.from(ApplicationDecision, 'decision')
.getQuery(),
'decisions',
)
.where('dest_rank = 1'),
'decision_date',
'decision_date."application_uuid" = app.uuid',
)
.where('app_sub.is_draft = FALSE')
.andWhere(
'(app.date_received_all_items IS NOT NULL AND app.date_received_all_items <= NOW())',
)
.andWhere(
`alcs.get_current_status_for_application_submission_by_uuid(app_sub.uuid)->>'status_type_code' != '${SUBMISSION_STATUS.CANCELLED}'`,
),
expression: `
SELECT
app_sub.uuid,
app_sub.applicant,
app.uuid AS application_uuid,
"applicationType".audit_deleted_date_at AS "applicationType_audit_deleted_date_at",
"applicationType".audit_created_at AS "applicationType_audit_created_at",
"applicationType".audit_updated_at AS "applicationType_audit_updated_at",
"applicationType".audit_created_by AS "applicationType_audit_created_by",
"applicationType".audit_updated_by AS "applicationType_audit_updated_by",
"applicationType".label AS "applicationType_label",
"applicationType".code AS "applicationType_code",
"applicationType".description AS "applicationType_description",
"applicationType".short_label AS "applicationType_short_label",
"applicationType".background_color AS "applicationType_background_color",
"applicationType".text_color AS "applicationType_text_color",
"applicationType".html_description AS "applicationType_html_description",
"applicationType".portal_label AS "applicationType_portal_label",
"applicationType".portal_order AS "applicationType_portal_order",
"applicationType".requires_government_review AS "applicationType_requires_government_review",
"applicationType".alc_fee_amount AS "applicationType_alc_fee_amount",
"applicationType".government_fee_amount AS "applicationType_government_fee_amount",
"localGovernment".name AS local_government_name,
app_sub.file_number,
app_sub.local_government_uuid,
app_sub.type_code AS application_type_code,
app.date_submitted_to_alc,
app.decision_date,
decision_date.outcome,
decision_date.dest_rank,
app.region_code AS application_region_code,
GREATEST(status_link.effective_date, decision_date.date) AS last_update,
alcs.get_current_status_for_application_submission_by_uuid(app_sub.uuid) AS status
FROM
alcs.application_submission app_sub
JOIN alcs.application app ON app.file_number :: text = app_sub.file_number :: text
AND app.hide_from_portal = false
AND app.audit_deleted_date_at IS NULL
JOIN alcs.application_type "applicationType" ON app_sub.type_code :: text = "applicationType".code
LEFT JOIN alcs.local_government "localGovernment" ON app_sub.local_government_uuid = "localGovernment".uuid
AND "localGovernment".audit_deleted_date_at IS NULL
LEFT JOIN (
SELECT
max(status_link_1.effective_date) AS effective_date,
status_link_1.submission_uuid
FROM
alcs.application_submission_to_submission_status status_link_1
GROUP BY
status_link_1.submission_uuid
) status_link ON status_link.submission_uuid = app_sub.uuid
LEFT JOIN (
SELECT
DISTINCT ON (decisions.applicationuuid) decisions.decisiondate AS date,
decisions.outcome,
decisions.dest_rank,
decisions.applicationuuid AS application_uuid
FROM
(
SELECT
decision.outcome_code AS outcome,
decision.date AS decisiondate,
decision.application_uuid AS applicationuuid,
rank() OVER (
PARTITION BY decision.application_uuid
ORDER BY
decision.date DESC,
decision.audit_created_at DESC
) AS dest_rank
FROM
alcs.application_decision decision
WHERE
decision.is_draft = false
AND decision.audit_deleted_date_at IS NULL
) decisions
WHERE
decisions.dest_rank = 1
) decision_date ON decision_date.application_uuid = app.uuid
WHERE
app_sub.is_draft = false
AND app.date_received_all_items IS NOT NULL
AND app.date_received_all_items <= now()
AND (
alcs.get_current_status_for_application_submission_by_uuid(app_sub.uuid) ->> 'status_type_code' :: text
) <> 'CANC' :: text
AND app_sub.audit_deleted_date_at IS NULL;
`,
})
export class PublicApplicationSubmissionSearchView {
@ViewColumn()
Expand Down
Loading

0 comments on commit 191f294

Please sign in to comment.