From b66fd89dd20e904dcdddf1169381d0b2b23e8d3a Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Mon, 29 Apr 2024 13:23:03 -0700 Subject: [PATCH 001/103] New Pass on Public Search * Write all services to use multiple small queries * Add in search caching with redis and object-hash * Add logging for slow queries * Delete unused fields from search views and add indexes --- .../notice-of-intent.entity.ts | 1 + .../notice-of-intent-submission.entity.ts | 2 + .../public-application-search-view.entity.ts | 26 +- .../public-application-search.service.spec.ts | 76 ++- .../public-application-search.service.ts | 461 +++++++++++------- ...lic-notice-of-intent-search-view.entity.ts | 47 +- ...ic-notice-of-intent-search.service.spec.ts | 70 ++- .../public-notice-of-intent-search.service.ts | 403 +++++++++------ .../public-notification-search-view.entity.ts | 37 +- ...public-notification-search.service.spec.ts | 70 ++- .../public-notification-search.service.ts | 329 ++++++++----- .../search/public-search.controller.spec.ts | 14 + .../public/search/public-search.controller.ts | 38 +- .../public/search/public-search.module.ts | 16 +- ...2-clean_up_public_app_public_noi_search.ts | 88 ++++ ...14434697883-rebuild_notification_search.ts | 63 +++ .../alcs/src/providers/typeorm/orm.config.ts | 1 + services/apps/alcs/src/utils/set-helper.ts | 18 + services/apps/alcs/test/mocks/mockTypes.ts | 19 + services/package-lock.json | 16 + services/package.json | 2 + 21 files changed, 1163 insertions(+), 634 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1714430741432-clean_up_public_app_public_noi_search.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1714434697883-rebuild_notification_search.ts create mode 100644 services/apps/alcs/src/utils/set-helper.ts diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts index 3359c3dc8c..2ef0aa8518 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.entity.ts @@ -46,6 +46,7 @@ export class NoticeOfIntent extends Base { }) hideFromPortal?: boolean; + @Index() @Column({ type: 'uuid', nullable: true }) cardUuid: string; diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts index 81144bc6eb..8def865dfe 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts @@ -3,6 +3,7 @@ import { AfterLoad, Column, Entity, + Index, JoinColumn, ManyToOne, OneToMany, @@ -42,6 +43,7 @@ export class NoticeOfIntentSubmission extends Base { @PrimaryGeneratedColumn('uuid') uuid: string; + @Index() @AutoMap({}) @Column({ comment: 'File Number of attached application', diff --git a/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts b/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts index 82b18c61eb..6f0a112b0d 100644 --- a/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts +++ b/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts @@ -14,15 +14,10 @@ import { LinkedStatusType } from '../public-search.dto'; .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', @@ -92,15 +87,6 @@ export class PublicApplicationSubmissionSearchView { @PrimaryColumn() uuid: string; - @ViewColumn() - applicationUuid: string; - - @ViewColumn() - lastUpdate: Date; - - @ViewColumn() - applicationRegionCode?: string; - @ViewColumn() fileNumber: string; @@ -108,7 +94,7 @@ export class PublicApplicationSubmissionSearchView { applicant?: string; @ViewColumn() - localGovernmentUuid?: string; + lastUpdate: Date; @ViewColumn() localGovernmentName?: string; @@ -116,18 +102,12 @@ export class PublicApplicationSubmissionSearchView { @ViewColumn() applicationTypeCode: string; - @ViewColumn() - status: LinkedStatusType; - @ViewColumn() dateSubmittedToAlc: Date | null; @ViewColumn() - decisionDate: Date | null; - - @ViewColumn() - destRank: number | null; + outcome: string | null; @ViewColumn() - outcome: string | null; + status: LinkedStatusType; } diff --git a/services/apps/alcs/src/portal/public/search/application/public-application-search.service.spec.ts b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.spec.ts index df6412927a..d3ab14263f 100644 --- a/services/apps/alcs/src/portal/public/search/application/public-application-search.service.spec.ts +++ b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.spec.ts @@ -1,8 +1,12 @@ +import { RedisService } from '@app/common/redis/redis.service'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; +import { createMockQuery } from '../../../../../test/mocks/mockTypes'; +import { Application } from '../../../../alcs/application/application.entity'; import { LocalGovernment } from '../../../../alcs/local-government/local-government.entity'; +import { ApplicationSubmission } from '../../../application-submission/application-submission.entity'; import { SearchRequestDto } from '../public-search.dto'; import { PublicApplicationSubmissionSearchView } from './public-application-search-view.entity'; import { PublicApplicationSearchService } from './public-application-search.service'; @@ -13,6 +17,11 @@ describe('PublicApplicationSearchService', () => { Repository >; let mockLocalGovernmentRepository: DeepMocked>; + let mockApplicationRepository: DeepMocked>; + let mockApplicationSubmissionRepository: DeepMocked< + Repository + >; + let mockRedisService: DeepMocked; const mockSearchRequestDto: SearchRequestDto = { fileNumber: '123', @@ -36,22 +45,11 @@ describe('PublicApplicationSearchService', () => { beforeEach(async () => { mockApplicationSubmissionSearchViewRepository = createMock(); mockLocalGovernmentRepository = createMock(); + mockApplicationRepository = createMock(); + mockApplicationSubmissionRepository = createMock(); + mockRedisService = createMock(); - mockQuery = { - getMany: jest.fn().mockResolvedValue([]), - getCount: jest.fn().mockResolvedValue(0), - orderBy: jest.fn().mockReturnThis(), - offset: jest.fn().mockReturnThis(), - limit: jest.fn().mockReturnThis(), - innerJoinAndMapOne: jest.fn().mockReturnThis(), - groupBy: jest.fn().mockReturnThis(), - where: jest.fn().mockReturnThis(), - andWhere: jest.fn().mockReturnThis(), - setParameters: jest.fn().mockReturnThis(), - leftJoin: jest.fn().mockReturnThis(), - innerJoin: jest.fn().mockReturnThis(), - withDeleted: jest.fn().mockReturnThis(), - }; + mockQuery = createMockQuery(); const module: TestingModule = await Test.createTestingModule({ providers: [ @@ -64,6 +62,18 @@ describe('PublicApplicationSearchService', () => { provide: getRepositoryToken(LocalGovernment), useValue: mockLocalGovernmentRepository, }, + { + provide: getRepositoryToken(Application), + useValue: mockApplicationRepository, + }, + { + provide: getRepositoryToken(ApplicationSubmission), + useValue: mockApplicationSubmissionRepository, + }, + { + provide: RedisService, + useValue: mockRedisService, + }, ], }).compile(); @@ -74,6 +84,11 @@ describe('PublicApplicationSearchService', () => { mockLocalGovernmentRepository.findOneByOrFail.mockResolvedValue( new LocalGovernment(), ); + + mockRedisService.getClient.mockReturnValue({ + get: async () => null, + setEx: async () => null, + } as any); }); it('should be defined', () => { @@ -81,30 +96,39 @@ describe('PublicApplicationSearchService', () => { }); it('should successfully build a query using all search parameters defined', async () => { - mockApplicationSubmissionSearchViewRepository.createQueryBuilder.mockReturnValue( - mockQuery as any, + mockApplicationRepository.find.mockResolvedValue([]); + mockApplicationRepository.createQueryBuilder.mockReturnValue(mockQuery); + mockApplicationSubmissionRepository.find.mockResolvedValue([]); + mockApplicationSubmissionRepository.createQueryBuilder.mockReturnValue( + mockQuery, ); const result = await service.searchApplications(mockSearchRequestDto); expect(result).toEqual({ data: [], total: 0 }); + expect(mockApplicationRepository.find).toHaveBeenCalledTimes(3); + expect(mockApplicationRepository.createQueryBuilder).toHaveBeenCalledTimes( + 2, + ); expect( - mockApplicationSubmissionSearchViewRepository.createQueryBuilder, - ).toBeCalledTimes(1); - expect(mockQuery.andWhere).toBeCalledTimes(10); + mockApplicationSubmissionRepository.createQueryBuilder, + ).toHaveBeenCalledTimes(3); + expect(mockQuery.andWhere).toHaveBeenCalledTimes(6); }); it('should call compileApplicationSearchQuery method correctly', async () => { - const compileApplicationSearchQuerySpy = jest - .spyOn(service as any, 'compileApplicationSearchQuery') - .mockResolvedValue(mockQuery); + const searchForFilerNumbers = jest + .spyOn(service as any, 'searchForFilerNumbers') + .mockResolvedValue(new Set('100000')); + + mockApplicationSubmissionSearchViewRepository.createQueryBuilder.mockReturnValue( + mockQuery as any, + ); const result = await service.searchApplications(mockSearchRequestDto); expect(result).toEqual({ data: [], total: 0 }); - expect(compileApplicationSearchQuerySpy).toBeCalledWith( - mockSearchRequestDto, - ); + expect(searchForFilerNumbers).toHaveBeenCalledWith(mockSearchRequestDto); expect(mockQuery.orderBy).toHaveBeenCalledTimes(1); expect(mockQuery.offset).toHaveBeenCalledTimes(1); expect(mockQuery.limit).toHaveBeenCalledTimes(1); diff --git a/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts index b099df1a69..990bbdd7cc 100644 --- a/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts +++ b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts @@ -1,12 +1,17 @@ +import { RedisService } from '@app/common/redis/redis.service'; import { Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; -import { Brackets, Repository } from 'typeorm'; +import * as hash from 'object-hash'; +import { Brackets, In, Repository } from 'typeorm'; import { ApplicationDecisionComponent } from '../../../../alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity'; import { ApplicationDecision } from '../../../../alcs/application-decision/application-decision.entity'; +import { Application } from '../../../../alcs/application/application.entity'; import { LocalGovernment } from '../../../../alcs/local-government/local-government.entity'; import { formatStringToPostgresSearchStringArrayWithWildCard } from '../../../../utils/search-helper'; +import { intersectSets } from '../../../../utils/set-helper'; import { ApplicationOwner } from '../../../application-submission/application-owner/application-owner.entity'; import { ApplicationParcel } from '../../../application-submission/application-parcel/application-parcel.entity'; +import { ApplicationSubmission } from '../../../application-submission/application-submission.entity'; import { AdvancedSearchResultDto, SearchRequestDto, @@ -22,13 +27,47 @@ export class PublicApplicationSearchService { private applicationSearchRepository: Repository, @InjectRepository(LocalGovernment) private governmentRepository: Repository, + @InjectRepository(ApplicationSubmission) + private applicationSubmissionRepository: Repository, + @InjectRepository(Application) + private applicationRepository: Repository, + private redisService: RedisService, ) {} async searchApplications( searchDto: SearchRequestDto, ): Promise> { - let query = await this.compileApplicationSearchQuery(searchDto); - query = this.compileApplicationGroupBySearchQuery(query); + const searchHash = hash(searchDto); + const searchKey = `search_public_application_${searchHash}`; + + const client = this.redisService.getClient(); + const cachedSearch = await client.get(searchKey); + + let fileNumbers = new Set(); + if (cachedSearch) { + const cachedNumbers = JSON.parse(cachedSearch) as string[]; + fileNumbers = new Set(cachedNumbers); + } else { + fileNumbers = await this.searchForFilerNumbers(searchDto); + await client.setEx( + searchKey, + 180, + JSON.stringify([...fileNumbers.values()]), + ); + } + + if (fileNumbers.size === 0) { + return { + data: [], + total: 0, + }; + } + + let query = this.applicationSearchRepository + .createQueryBuilder('appSearch') + .andWhere('appSearch.fileNumber IN(:...fileNumbers)', { + fileNumbers: [...fileNumbers.values()], + }); const sortQuery = this.compileSortQuery(searchDto); @@ -73,132 +112,241 @@ export class PublicApplicationSearchService { } } - private compileApplicationGroupBySearchQuery(query) { - query = query - // FIXME: This is a quick fix for the search performance issues. It temporarily allows - // submissions with deleted application types to be shown. For now, there are no - // deleted application types, so this should be fine, but should be fixed soon. - .withDeleted() - .groupBy( - ` - "appSearch"."uuid" - , "appSearch"."application_uuid" - , "appSearch"."application_region_code" - , "appSearch"."file_number" - , "appSearch"."applicant" - , "appSearch"."local_government_uuid" - , "appSearch"."local_government_name" - , "appSearch"."application_type_code" - , "appSearch"."status" - , "appSearch"."outcome" - , "appSearch"."dest_rank" - , "appSearch"."date_submitted_to_alc" - , "appSearch"."decision_date" - , "appSearch"."last_update" - `, - ); - return query; - } - - private async compileApplicationSearchQuery(searchDto: SearchRequestDto) { - const query = - this.applicationSearchRepository.createQueryBuilder('appSearch'); + private async searchForFilerNumbers(searchDto: SearchRequestDto) { + const promises: Promise<{ fileNumber: string }[]>[] = []; if (searchDto.fileNumber) { - query - .andWhere('appSearch.file_number = :fileNumber') - .setParameters({ fileNumber: searchDto.fileNumber ?? null }); + this.addFileNumberResults(searchDto, promises); } if (searchDto.portalStatusCodes && searchDto.portalStatusCodes.length > 0) { - query.andWhere( - "alcs.get_current_status_for_application_submission_by_uuid(appSearch.uuid) ->> 'status_type_code' IN(:...statuses)", - { - statuses: searchDto.portalStatusCodes, - }, - ); - } - - if (searchDto.decisionOutcome && searchDto.decisionOutcome.length > 0) { - query.andWhere('appSearch.outcome IN(:...outcomes)', { - outcomes: searchDto.decisionOutcome, - }); + this.addPortalStatusResults(searchDto, promises); } if (searchDto.governmentName) { - const government = await this.governmentRepository.findOneByOrFail({ - name: searchDto.governmentName, - }); - - query.andWhere( - 'appSearch.local_government_uuid = :local_government_uuid', - { - local_government_uuid: government.uuid, - }, - ); + await this.addGovernmentResults(searchDto, promises); } - if (searchDto.regionCodes && searchDto.regionCodes.length > 0) { - query.andWhere('appSearch.application_region_code IN(:...regions)', { - regions: searchDto.regionCodes, - }); + this.addRegionResults(searchDto, promises); } - this.compileSearchByNameQuery(searchDto, query); - this.compileParcelSearchQuery(searchDto, query); - this.compileDecisionSearchQuery(searchDto, query); - this.compileFileTypeSearchQuery(searchDto, query); + if (searchDto.name) { + this.addNameResults(searchDto, promises); + } - return query; - } + if (searchDto.pid || searchDto.civicAddress) { + this.addParcelResults(searchDto, promises); + } - private compileDecisionSearchQuery(searchDto: SearchRequestDto, query) { if ( searchDto.dateDecidedTo !== undefined || searchDto.dateDecidedFrom !== undefined || searchDto.decisionMakerCode !== undefined ) { - query = this.joinApplicationDecision(query); - - if (searchDto.dateDecidedFrom !== undefined) { - query = query.andWhere('decision.date >= :dateDecidedFrom', { - dateDecidedFrom: new Date(searchDto.dateDecidedFrom), - }); - } - - if (searchDto.dateDecidedTo !== undefined) { - query = query.andWhere('decision.date <= :dateDecidedTo', { - dateDecidedTo: new Date(searchDto.dateDecidedTo), - }); - } - - if (searchDto.decisionMakerCode !== undefined) { - query = query.andWhere( - 'decision.decision_maker_code = :decisionMakerCode', - { - decisionMakerCode: searchDto.decisionMakerCode, - }, - ); - } + this.addDecisionResults(searchDto, promises); } - return query; - } - private joinApplicationDecision(query: any) { - query = query.innerJoin( - ApplicationDecision, - 'decision', - 'decision.application_uuid = "appSearch"."application_uuid" AND decision.is_draft = FALSE', + if (searchDto.decisionOutcome && searchDto.decisionOutcome.length > 0) { + this.addDecisionOutcomeResults(searchDto, promises); + } + + if (searchDto.fileTypes.length > 0) { + this.addFileTypeResults(searchDto, promises); + } + + //Intersect Sets + const t0 = performance.now(); + const queryResults = await Promise.all(promises); + + const allIds: Set[] = []; + for (const result of queryResults) { + const fileNumbers = new Set(); + result.forEach((currentValue) => { + fileNumbers.add(currentValue.fileNumber); + }); + allIds.push(fileNumbers); + } + + const finalResult = intersectSets(allIds); + + const t1 = performance.now(); + this.logger.debug( + `Application pre-search search took ${t1 - t0} milliseconds.`, ); - return query; + return finalResult; } - private compileParcelSearchQuery(searchDto: SearchRequestDto, query) { - query = query.leftJoin( - ApplicationParcel, - 'parcel', - 'parcel.application_submission_uuid = appSearch.uuid', - ); + private addFileNumberResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const promise = this.applicationRepository.find({ + where: { + fileNumber: searchDto.fileNumber, + }, + select: { + fileNumber: true, + }, + }); + promises.push(promise); + } + + private addRegionResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const promise = this.applicationRepository.find({ + where: { + regionCode: In(searchDto.regionCodes!), + }, + select: { + fileNumber: true, + }, + }); + promises.push(promise); + } + + private addDecisionOutcomeResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const promise = this.applicationSearchRepository.find({ + where: { + outcome: In(searchDto.decisionOutcome!), + }, + select: { + fileNumber: true, + }, + }); + + promises.push(promise); + } + + private async addGovernmentResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const government = await this.governmentRepository.findOneByOrFail({ + name: searchDto.governmentName, + }); + + const promise = this.applicationRepository.find({ + where: { + localGovernmentUuid: government.uuid, + }, + select: { + fileNumber: true, + }, + }); + promises.push(promise); + } + + private addPortalStatusResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const promise = this.applicationSubmissionRepository + .createQueryBuilder('appSubs') + .select('appSubs.fileNumber') + .where( + "alcs.get_current_status_for_application_submission_by_uuid(appSubs.uuid) ->> 'status_type_code' IN(:...statusCodes)", + { + statusCodes: searchDto.portalStatusCodes, + }, + ) + .getMany(); + promises.push(promise); + } + + private addNameResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const formattedSearchString = + formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); + const promise = this.applicationSubmissionRepository + .createQueryBuilder('appSub') + .select('appSub.fileNumber') + .leftJoin( + ApplicationOwner, + 'application_owner', + 'application_owner.application_submission_uuid = appSub.uuid', + ) + .andWhere( + new Brackets((qb) => + qb + .where( + "LOWER(application_owner.first_name || ' ' || application_owner.last_name) LIKE ANY (:names)", + { + names: formattedSearchString, + }, + ) + .orWhere('LOWER(application_owner.first_name) LIKE ANY (:names)', { + names: formattedSearchString, + }) + .orWhere('LOWER(application_owner.last_name) LIKE ANY (:names)', { + names: formattedSearchString, + }) + .orWhere( + 'LOWER(application_owner.organization_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ), + ), + ) + .getMany(); + promises.push(promise); + } + + private addDecisionResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + let query = this.applicationRepository + .createQueryBuilder('app') + .select('app.fileNumber') + .innerJoin( + ApplicationDecision, + 'decision', + 'decision.application_uuid = "app"."uuid" AND decision.is_draft = FALSE', + ); + + if (searchDto.dateDecidedFrom !== undefined) { + query = query.andWhere('decision.date >= :dateDecidedFrom', { + dateDecidedFrom: new Date(searchDto.dateDecidedFrom), + }); + } + + if (searchDto.dateDecidedTo !== undefined) { + query = query.andWhere('decision.date <= :dateDecidedTo', { + dateDecidedTo: new Date(searchDto.dateDecidedTo), + }); + } + + if (searchDto.decisionMakerCode !== undefined) { + query = query.andWhere( + 'decision.decision_maker_code = :decisionMakerCode', + { + decisionMakerCode: searchDto.decisionMakerCode, + }, + ); + } + promises.push(query.getMany()); + } + + private addParcelResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + let query = this.applicationSubmissionRepository + .createQueryBuilder('appSub') + .select('appSub.fileNumber') + .leftJoin( + ApplicationParcel, + 'parcel', + 'parcel.application_submission_uuid = appSub.uuid', + ); if (searchDto.pid) { query = query.andWhere('parcel.pid = :pid', { pid: searchDto.pid }); @@ -212,83 +360,44 @@ export class PublicApplicationSearchService { }, ); } - return query; - } - private compileSearchByNameQuery(searchDto: SearchRequestDto, query) { - if (searchDto.name) { - const formattedSearchString = - formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); - - query = query - .leftJoin( - ApplicationOwner, - 'application_owner', - 'application_owner.application_submission_uuid = appSearch.uuid', - ) - .andWhere( - new Brackets((qb) => - qb - .where( - "LOWER(application_owner.first_name || ' ' || application_owner.last_name) LIKE ANY (:names)", - { - names: formattedSearchString, - }, - ) - .orWhere( - 'LOWER(application_owner.first_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ) - .orWhere('LOWER(application_owner.last_name) LIKE ANY (:names)', { - names: formattedSearchString, - }) - .orWhere( - 'LOWER(application_owner.organization_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ), - ), - ); - } - return query; + promises.push(query.getMany()); } - private compileFileTypeSearchQuery(searchDto: SearchRequestDto, query) { - if (searchDto.fileTypes.length > 0) { - // if decision is not joined yet -> join it. The join of decision happens in compileApplicationDecisionSearchQuery - if ( - searchDto.dateDecidedFrom === undefined && - searchDto.dateDecidedTo === undefined && - searchDto.decisionMakerCode === undefined - ) { - query = this.joinApplicationDecision(query); - } - - query = query.leftJoin( - ApplicationDecisionComponent, - 'decisionComponent', - 'decisionComponent.application_decision_uuid = decision.uuid', + private addFileTypeResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + let query = this.applicationRepository + .createQueryBuilder('app') + .select('app.fileNumber') + .innerJoin( + ApplicationDecision, + 'decision', + 'decision.application_uuid = "app"."uuid" AND decision.is_draft = FALSE', ); - query = query.andWhere( - new Brackets((qb) => - qb - .where('appSearch.application_type_code IN (:...typeCodes)', { + query = query.leftJoin( + ApplicationDecisionComponent, + 'decisionComponent', + 'decisionComponent.application_decision_uuid = decision.uuid', + ); + + query = query.andWhere( + new Brackets((qb) => + qb + .where('appSearch.application_type_code IN (:...typeCodes)', { + typeCodes: searchDto.fileTypes, + }) + .orWhere( + 'decisionComponent.application_decision_component_type_code IN (:...typeCodes)', + { typeCodes: searchDto.fileTypes, - }) - .orWhere( - 'decisionComponent.application_decision_component_type_code IN (:...typeCodes)', - { - typeCodes: searchDto.fileTypes, - }, - ), - ), - ); - } + }, + ), + ), + ); - return query; + promises.push(query.getMany()); } } diff --git a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts index 5fc66c5976..5737844e66 100644 --- a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts +++ b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts @@ -1,16 +1,8 @@ -import { - DataSource, - JoinColumn, - ManyToOne, - PrimaryColumn, - ViewColumn, - ViewEntity, -} from 'typeorm'; +import { DataSource, PrimaryColumn, ViewColumn, ViewEntity } from 'typeorm'; import { LocalGovernment } from '../../../../alcs/local-government/local-government.entity'; import { NoticeOfIntentDecision } from '../../../../alcs/notice-of-intent-decision/notice-of-intent-decision.entity'; import { NOI_SUBMISSION_STATUS } from '../../../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; import { NoticeOfIntentSubmissionToSubmissionStatus } from '../../../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.entity'; -import { NoticeOfIntentType } from '../../../../alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.entity'; import { NoticeOfIntent } from '../../../../alcs/notice-of-intent/notice-of-intent.entity'; import { NoticeOfIntentSubmission } from '../../../notice-of-intent-submission/notice-of-intent-submission.entity'; import { LinkedStatusType } from '../public-search.dto'; @@ -22,15 +14,10 @@ import { LinkedStatusType } from '../public-search.dto'; .select('noi_sub.uuid', 'uuid') .addSelect('noi_sub.file_number', 'file_number') .addSelect('noi_sub.applicant', 'applicant') - .addSelect('noi_sub.local_government_uuid', 'local_government_uuid') .addSelect('localGovernment.name', 'local_government_name') .addSelect('noi_sub.type_code', 'notice_of_intent_type_code') .addSelect('noi.date_submitted_to_alc', 'date_submitted_to_alc') - .addSelect('noi.decision_date', 'decision_date') .addSelect('decision_date.outcome', 'outcome') - .addSelect('decision_date.dest_rank', 'dest_rank') - .addSelect('noi.uuid', 'notice_of_intent_uuid') - .addSelect('noi.region_code', 'notice_of_intent_region_code') .addSelect( 'GREATEST(status_link.effective_date, decision_date.date)', 'last_update', @@ -45,11 +32,6 @@ import { LinkedStatusType } from '../public-search.dto'; 'noi', 'noi.file_number = noi_sub.file_number AND noi.hide_from_portal = FALSE', ) - .innerJoinAndSelect( - NoticeOfIntentType, - 'noticeOfIntentType', - 'noi_sub.type_code = noticeOfIntentType.code', - ) .leftJoin( LocalGovernment, 'localGovernment', @@ -105,48 +87,27 @@ export class PublicNoticeOfIntentSubmissionSearchView { @PrimaryColumn() uuid: string; - @ViewColumn() - noticeOfIntentUuid: string; - - @ViewColumn() - lastUpdate: Date; - - @ViewColumn() - noticeOfIntentRegionCode?: string; - @ViewColumn() fileNumber: string; @ViewColumn() applicant?: string; - @ViewColumn() - localGovernmentUuid?: string; - @ViewColumn() localGovernmentName?: string; @ViewColumn() noticeOfIntentTypeCode: string; - @ViewColumn() - status: LinkedStatusType; - @ViewColumn() dateSubmittedToAlc: Date | null; @ViewColumn() - decisionDate: Date | null; + outcome: string | null; @ViewColumn() - destRank: number | null; + lastUpdate: Date; @ViewColumn() - outcome: string | null; - - @ManyToOne(() => NoticeOfIntentType, { - nullable: false, - }) - @JoinColumn({ name: 'notice_of_intent_type_code' }) - noticeOfIntentType: NoticeOfIntentType; + status: LinkedStatusType; } diff --git a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.spec.ts b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.spec.ts index 680829610d..683663eaae 100644 --- a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.spec.ts +++ b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.spec.ts @@ -1,11 +1,15 @@ +import { RedisService } from '@app/common/redis/redis.service'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; +import { createMockQuery } from '../../../../../test/mocks/mockTypes'; import { LocalGovernment } from '../../../../alcs/local-government/local-government.entity'; +import { NoticeOfIntent } from '../../../../alcs/notice-of-intent/notice-of-intent.entity'; +import { NoticeOfIntentSubmission } from '../../../notice-of-intent-submission/notice-of-intent-submission.entity'; import { SearchRequestDto } from '../public-search.dto'; -import { PublicNoticeOfIntentSearchService } from './public-notice-of-intent-search.service'; import { PublicNoticeOfIntentSubmissionSearchView } from './public-notice-of-intent-search-view.entity'; +import { PublicNoticeOfIntentSearchService } from './public-notice-of-intent-search.service'; describe('PublicNoticeOfIntentSearchService', () => { let service: PublicNoticeOfIntentSearchService; @@ -13,6 +17,11 @@ describe('PublicNoticeOfIntentSearchService', () => { Repository >; let mockLocalGovernmentRepository: DeepMocked>; + let mockNOIRepository: DeepMocked>; + let mockNOISubmissionRepository: DeepMocked< + Repository + >; + let mockRedisService: DeepMocked; const mockSearchDto: SearchRequestDto = { fileNumber: '123', @@ -36,20 +45,11 @@ describe('PublicNoticeOfIntentSearchService', () => { beforeEach(async () => { mockNoticeOfIntentSubmissionSearchViewRepository = createMock(); mockLocalGovernmentRepository = createMock(); + mockNOIRepository = createMock(); + mockNOISubmissionRepository = createMock(); + mockRedisService = createMock(); - mockQuery = { - getManyAndCount: jest.fn().mockResolvedValue([[], 0]), - orderBy: jest.fn().mockReturnThis(), - offset: jest.fn().mockReturnThis(), - limit: jest.fn().mockReturnThis(), - innerJoinAndMapOne: jest.fn().mockReturnThis(), - groupBy: jest.fn().mockReturnThis(), - where: jest.fn().mockReturnThis(), - andWhere: jest.fn().mockReturnThis(), - setParameters: jest.fn().mockReturnThis(), - leftJoin: jest.fn().mockReturnThis(), - withDeleted: jest.fn().mockReturnThis(), - }; + mockQuery = createMockQuery(); const module: TestingModule = await Test.createTestingModule({ providers: [ @@ -62,6 +62,18 @@ describe('PublicNoticeOfIntentSearchService', () => { provide: getRepositoryToken(LocalGovernment), useValue: mockLocalGovernmentRepository, }, + { + provide: getRepositoryToken(NoticeOfIntent), + useValue: mockNOIRepository, + }, + { + provide: getRepositoryToken(NoticeOfIntentSubmission), + useValue: mockNOISubmissionRepository, + }, + { + provide: RedisService, + useValue: mockRedisService, + }, ], }).compile(); @@ -72,6 +84,11 @@ describe('PublicNoticeOfIntentSearchService', () => { mockLocalGovernmentRepository.findOneByOrFail.mockResolvedValue( new LocalGovernment(), ); + + mockRedisService.getClient.mockReturnValue({ + get: async () => null, + setEx: async () => null, + } as any); }); it('should be defined', () => { @@ -80,27 +97,36 @@ describe('PublicNoticeOfIntentSearchService', () => { it('should successfully build a query using all search parameters defined', async () => { mockNoticeOfIntentSubmissionSearchViewRepository.createQueryBuilder.mockReturnValue( - mockQuery as any, + mockQuery, ); + mockNOIRepository.find.mockResolvedValue([]); + mockNOIRepository.createQueryBuilder.mockReturnValue(mockQuery); + mockNOISubmissionRepository.createQueryBuilder.mockReturnValue(mockQuery); const result = await service.searchNoticeOfIntents(mockSearchDto); expect(result).toEqual({ data: [], total: 0 }); + expect(mockNOIRepository.find).toHaveBeenCalledTimes(3); + expect(mockNOIRepository.createQueryBuilder).toHaveBeenCalledTimes(1); expect( - mockNoticeOfIntentSubmissionSearchViewRepository.createQueryBuilder, - ).toBeCalledTimes(1); - expect(mockQuery.andWhere).toBeCalledTimes(9); + mockNOISubmissionRepository.createQueryBuilder, + ).toHaveBeenCalledTimes(3); + expect(mockQuery.andWhere).toHaveBeenCalledTimes(5); }); it('should call compileNoticeOfIntentSearchQuery method correctly', async () => { - const compileApplicationSearchQuerySpy = jest - .spyOn(service as any, 'compileNoticeOfIntentSearchQuery') - .mockResolvedValue(mockQuery); + const searchForFileNumbers = jest + .spyOn(service as any, 'searchForFileNumbers') + .mockResolvedValue(new Set('100000')); + + mockNoticeOfIntentSubmissionSearchViewRepository.createQueryBuilder.mockReturnValue( + mockQuery, + ); const result = await service.searchNoticeOfIntents(mockSearchDto); expect(result).toEqual({ data: [], total: 0 }); - expect(compileApplicationSearchQuerySpy).toBeCalledWith(mockSearchDto); + expect(searchForFileNumbers).toHaveBeenCalledWith(mockSearchDto); expect(mockQuery.orderBy).toHaveBeenCalledTimes(1); expect(mockQuery.offset).toHaveBeenCalledTimes(1); expect(mockQuery.limit).toHaveBeenCalledTimes(1); diff --git a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts index b3b70ba44b..522df077c9 100644 --- a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts +++ b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts @@ -1,11 +1,16 @@ +import { RedisService } from '@app/common/redis/redis.service'; import { Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; -import { Brackets, Repository } from 'typeorm'; +import * as hash from 'object-hash'; +import { Brackets, In, Repository } from 'typeorm'; import { LocalGovernment } from '../../../../alcs/local-government/local-government.entity'; import { NoticeOfIntentDecision } from '../../../../alcs/notice-of-intent-decision/notice-of-intent-decision.entity'; +import { NoticeOfIntent } from '../../../../alcs/notice-of-intent/notice-of-intent.entity'; import { formatStringToPostgresSearchStringArrayWithWildCard } from '../../../../utils/search-helper'; +import { intersectSets } from '../../../../utils/set-helper'; import { NoticeOfIntentOwner } from '../../../notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity'; import { NoticeOfIntentParcel } from '../../../notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity'; +import { NoticeOfIntentSubmission } from '../../../notice-of-intent-submission/notice-of-intent-submission.entity'; import { AdvancedSearchResultDto, SearchRequestDto, @@ -19,8 +24,13 @@ export class PublicNoticeOfIntentSearchService { constructor( @InjectRepository(PublicNoticeOfIntentSubmissionSearchView) private noiSearchRepository: Repository, + @InjectRepository(NoticeOfIntentSubmission) + private noiSubmissionRepository: Repository, + @InjectRepository(NoticeOfIntent) + private noiRepository: Repository, @InjectRepository(LocalGovernment) private governmentRepository: Repository, + private redisService: RedisService, ) {} async searchNoticeOfIntents( @@ -28,24 +38,53 @@ export class PublicNoticeOfIntentSearchService { ): Promise< AdvancedSearchResultDto > { - const query = await this.compileNoticeOfIntentSearchQuery(searchDto); + const searchHash = hash(searchDto); + const searchKey = `search_public_noi_${searchHash}`; + + const client = this.redisService.getClient(); + const cachedSearch = await client.get(searchKey); + + let fileNumbers = new Set(); + if (cachedSearch) { + const cachedNumbers = JSON.parse(cachedSearch) as string[]; + fileNumbers = new Set(cachedNumbers); + } else { + fileNumbers = await this.searchForFileNumbers(searchDto); + await client.setEx( + searchKey, + 180, + JSON.stringify([...fileNumbers.values()]), + ); + } - this.compileGroupBySearchQuery(query); + if (fileNumbers.size === 0) { + return { + data: [], + total: 0, + }; + } + + let query = this.noiSearchRepository + .createQueryBuilder('noiSearch') + .andWhere('noiSearch.fileNumber IN(:...fileNumbers)', { + fileNumbers: [...fileNumbers.values()], + }); const sortQuery = this.compileSortQuery(searchDto); - query + query = query .orderBy(sortQuery, searchDto.sortDirection) .offset((searchDto.page - 1) * searchDto.pageSize) .limit(searchDto.pageSize); const t0 = performance.now(); - const result = await query.getManyAndCount(); + const results = await Promise.all([query.getMany(), query.getCount()]); const t1 = performance.now(); this.logger.debug(`NOI public search took ${t1 - t0} milliseconds.`); + return { - data: result[0], - total: result[1], + data: results[0], + total: results[1], }; } @@ -72,142 +111,237 @@ export class PublicNoticeOfIntentSearchService { } } - private compileGroupBySearchQuery(query) { - query = query - // FIXME: This is a quick fix for the search performance issues. It temporarily allows - // submissions with deleted NOI types to be shown. For now, there are no - // deleted application types, so this should be fine, but should be fixed soon. - .withDeleted() - .innerJoinAndMapOne( - 'noiSearch.noticeOfIntentType', - 'noiSearch.noticeOfIntentType', - 'noticeOfIntentType', - ) - .groupBy( - ` - "noiSearch"."uuid" - , "noiSearch"."notice_of_intent_uuid" - , "noiSearch"."notice_of_intent_region_code" - , "noiSearch"."file_number" - , "noiSearch"."applicant" - , "noiSearch"."local_government_uuid" - , "noiSearch"."local_government_name" - , "noiSearch"."notice_of_intent_type_code" - , "noiSearch"."status" - , "noiSearch"."date_submitted_to_alc" - , "noiSearch"."decision_date" - , "noiSearch"."outcome" - , "noiSearch"."dest_rank" - , "noiSearch"."last_update" - , "noticeOfIntentType"."audit_deleted_date_at" - , "noticeOfIntentType"."audit_created_at" - , "noticeOfIntentType"."audit_updated_by" - , "noticeOfIntentType"."audit_updated_at" - , "noticeOfIntentType"."audit_created_by" - , "noticeOfIntentType"."short_label" - , "noticeOfIntentType"."label" - , "noticeOfIntentType"."code" - , "noticeOfIntentType"."html_description" - , "noticeOfIntentType"."portal_label" - `, - ); - return query; - } - - private async compileNoticeOfIntentSearchQuery(searchDto: SearchRequestDto) { - const query = this.noiSearchRepository.createQueryBuilder('noiSearch'); + private async searchForFileNumbers(searchDto: SearchRequestDto) { + const promises: Promise<{ fileNumber: string }[]>[] = []; if (searchDto.fileNumber) { - query - .andWhere('noiSearch.file_number = :fileNumber') - .setParameters({ fileNumber: searchDto.fileNumber ?? null }); + this.addFileNumberResults(searchDto, promises); } if (searchDto.portalStatusCodes && searchDto.portalStatusCodes.length > 0) { - query.andWhere( - "alcs.get_current_status_for_notice_of_intent_submission_by_uuid(noiSearch.uuid) ->> 'status_type_code' IN(:...statuses)", - { - statuses: searchDto.portalStatusCodes, - }, - ); + this.addPortalStatusResult(searchDto, promises); } if (searchDto.governmentName) { - const government = await this.governmentRepository.findOneByOrFail({ - name: searchDto.governmentName, - }); - - query.andWhere( - 'noiSearch.local_government_uuid = :local_government_uuid', - { - local_government_uuid: government.uuid, - }, - ); + await this.addGovernmentResults(searchDto, promises); } if (searchDto.decisionOutcome && searchDto.decisionOutcome.length > 0) { - query.andWhere('noiSearch.outcome IN(:...outcomes)', { - outcomes: searchDto.decisionOutcome, - }); + this.addDecisionOutcomeResults(searchDto, promises); } if (searchDto.regionCodes && searchDto.regionCodes.length > 0) { - query.andWhere('noiSearch.notice_of_intent_region_code IN(:...regions)', { - regions: searchDto.regionCodes, - }); + this.addRegionResults(searchDto, promises); } - this.compileSearchByNameQuery(searchDto, query); - this.compileParcelSearchQuery(searchDto, query); - this.compileDecisionSearchQuery(searchDto, query); + if (searchDto.name) { + this.addNameResults(searchDto, promises); + } - return query; - } + if (searchDto.pid || searchDto.civicAddress) { + this.addParcelResults(searchDto, promises); + } - private compileDecisionSearchQuery(searchDto: SearchRequestDto, query) { if ( searchDto.dateDecidedTo !== undefined || searchDto.dateDecidedFrom !== undefined || searchDto.decisionMakerCode !== undefined ) { - query = this.joinDecision(query); - - if (searchDto.dateDecidedFrom !== undefined) { - query = query.andWhere('decision.date >= :dateDecidedFrom', { - dateDecidedFrom: new Date(searchDto.dateDecidedFrom), - }); - } - - if (searchDto.dateDecidedTo !== undefined) { - query = query.andWhere('decision.date <= :dateDecidedTo', { - dateDecidedTo: new Date(searchDto.dateDecidedTo), - }); - } - - if (searchDto.decisionMakerCode !== undefined) { - query = query.andWhere('decision.decision_maker IS NOT NULL'); - } + this.addDecisionResults(searchDto, promises); + } + + //Intersect Sets + const t0 = performance.now(); + const queryResults = await Promise.all(promises); + + const allIds: Set[] = []; + for (const result of queryResults) { + const fileNumbers = new Set(); + result.forEach((currentValue) => { + fileNumbers.add(currentValue.fileNumber); + }); + allIds.push(fileNumbers); + } + + const finalResult = intersectSets(allIds); + + const t1 = performance.now(); + this.logger.debug(`NOI pre-search search took ${t1 - t0} milliseconds.`); + return finalResult; + } + + private addDecisionResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + let query = this.noiRepository + .createQueryBuilder('noi') + .select('noi.fileNumber') + .innerJoin( + NoticeOfIntentDecision, + 'decision', + 'decision.notice_of_intent_uuid = "noi"."uuid" AND decision.is_draft = FALSE', + ); + + if (searchDto.dateDecidedFrom !== undefined) { + query = query.andWhere('decision.date >= :dateDecidedFrom', { + dateDecidedFrom: new Date(searchDto.dateDecidedFrom), + }); + } + + if (searchDto.dateDecidedTo !== undefined) { + query = query.andWhere('decision.date <= :dateDecidedTo', { + dateDecidedTo: new Date(searchDto.dateDecidedTo), + }); + } + + if (searchDto.decisionMakerCode !== undefined) { + query = query.andWhere('decision.decision_maker IS NOT NULL'); } - return query; + promises.push(query.getMany()); } - private joinDecision(query: any) { - query = query.leftJoin( - NoticeOfIntentDecision, - 'decision', - 'decision.notice_of_intent_uuid = "noiSearch"."notice_of_intent_uuid" AND decision.is_draft = FALSE', - ); - return query; + private addFileNumberResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const promise = this.noiRepository.find({ + where: { + fileNumber: searchDto.fileNumber, + }, + select: { + fileNumber: true, + }, + }); + promises.push(promise); } - private compileParcelSearchQuery(searchDto: SearchRequestDto, query) { - if (searchDto.pid || searchDto.civicAddress) { - query = query.leftJoin( + private addPortalStatusResult( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const promise = this.noiSubmissionRepository + .createQueryBuilder('noiSubs') + .select('noiSubs.fileNumber') + .where( + "alcs.get_current_status_for_notice_of_intent_submission_by_uuid(noiSubs.uuid) ->> 'status_type_code' IN(:...statusCodes)", + { + statusCodes: searchDto.portalStatusCodes, + }, + ) + .getMany(); + promises.push(promise); + } + + private async addGovernmentResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const government = await this.governmentRepository.findOneByOrFail({ + name: searchDto.governmentName, + }); + + const promise = this.noiRepository.find({ + where: { + localGovernmentUuid: government.uuid, + }, + select: { + fileNumber: true, + }, + }); + promises.push(promise); + } + + private addDecisionOutcomeResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const promise = this.noiSearchRepository.find({ + where: { + outcome: In(searchDto.decisionOutcome!), + }, + select: { + fileNumber: true, + }, + }); + + promises.push(promise); + } + + private addRegionResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const promise = this.noiRepository.find({ + where: { + regionCode: In(searchDto.regionCodes!), + }, + select: { + fileNumber: true, + }, + }); + promises.push(promise); + } + + private addNameResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const formattedSearchString = + formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); + const promise = this.noiSubmissionRepository + .createQueryBuilder('noiSub') + .select('noiSub.fileNumber') + .leftJoin( + NoticeOfIntentOwner, + 'notice_of_intent_owner', + 'notice_of_intent_owner.notice_of_intent_submission_uuid = noiSub.uuid', + ) + .andWhere( + new Brackets((qb) => + qb + .where( + "LOWER(notice_of_intent_owner.first_name || ' ' || notice_of_intent_owner.last_name) LIKE ANY (:names)", + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(notice_of_intent_owner.first_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(notice_of_intent_owner.last_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(notice_of_intent_owner.organization_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ), + ), + ) + .getMany(); + promises.push(promise); + } + + private addParcelResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + let query = this.noiSubmissionRepository + .createQueryBuilder('noiSub') + .select('noiSub.fileNumber') + .leftJoin( NoticeOfIntentParcel, 'parcel', - 'parcel.notice_of_intent_submission_uuid = noiSearch.uuid', + 'parcel.notice_of_intent_submission_uuid = noiSub.uuid', ); - } if (searchDto.pid) { query = query.andWhere('parcel.pid = :pid', { pid: searchDto.pid }); @@ -221,50 +355,7 @@ export class PublicNoticeOfIntentSearchService { }, ); } - return query; - } - private compileSearchByNameQuery(searchDto: SearchRequestDto, query) { - if (searchDto.name) { - const formattedSearchString = - formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); - - query = query - .leftJoin( - NoticeOfIntentOwner, - 'notice_of_intent_owner', - 'notice_of_intent_owner.notice_of_intent_submission_uuid = noiSearch.uuid', - ) - .andWhere( - new Brackets((qb) => - qb - .where( - "LOWER(notice_of_intent_owner.first_name || ' ' || notice_of_intent_owner.last_name) LIKE ANY (:names)", - { - names: formattedSearchString, - }, - ) - .orWhere( - 'LOWER(notice_of_intent_owner.first_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ) - .orWhere( - 'LOWER(notice_of_intent_owner.last_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ) - .orWhere( - 'LOWER(notice_of_intent_owner.organization_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ), - ), - ); - } - return query; + promises.push(query.getMany()); } } diff --git a/services/apps/alcs/src/portal/public/search/notification/public-notification-search-view.entity.ts b/services/apps/alcs/src/portal/public/search/notification/public-notification-search-view.entity.ts index f553def390..7d45180431 100644 --- a/services/apps/alcs/src/portal/public/search/notification/public-notification-search-view.entity.ts +++ b/services/apps/alcs/src/portal/public/search/notification/public-notification-search-view.entity.ts @@ -1,13 +1,5 @@ -import { - DataSource, - JoinColumn, - ManyToOne, - PrimaryColumn, - ViewColumn, - ViewEntity, -} from 'typeorm'; +import { DataSource, PrimaryColumn, ViewColumn, ViewEntity } from 'typeorm'; import { LocalGovernment } from '../../../../alcs/local-government/local-government.entity'; -import { NotificationType } from '../../../../alcs/notification/notification-type/notification-type.entity'; import { Notification } from '../../../../alcs/notification/notification.entity'; import { NotificationSubmission } from '../../../notification-submission/notification-submission.entity'; import { LinkedStatusType } from '../public-search.dto'; @@ -19,12 +11,9 @@ import { LinkedStatusType } from '../public-search.dto'; .select('noti_sub.uuid', 'uuid') .addSelect('noti_sub.file_number', 'file_number') .addSelect('noti_sub.applicant', 'applicant') - .addSelect('noti_sub.local_government_uuid', 'local_government_uuid') .addSelect('localGovernment.name', 'local_government_name') .addSelect('noti.type_code', 'notification_type_code') .addSelect('noti.date_submitted_to_alc', 'date_submitted_to_alc') - .addSelect('noti.uuid', 'notification_uuid') - .addSelect('noti.region_code', 'notification_region_code') .addSelect( 'alcs.get_current_status_for_notification_submission_by_uuid(noti_sub.uuid)', 'status', @@ -35,11 +24,6 @@ import { LinkedStatusType } from '../public-search.dto'; 'noti', 'noti.file_number = noti_sub.file_number', ) - .innerJoinAndSelect( - NotificationType, - 'notificationType', - 'noti_sub.type_code = notificationType.code', - ) .leftJoin( LocalGovernment, 'localGovernment', @@ -54,36 +38,21 @@ export class PublicNotificationSubmissionSearchView { @PrimaryColumn() uuid: string; - @ViewColumn() - notificationUuid: string; - - @ViewColumn() - notificationRegionCode?: string; - @ViewColumn() fileNumber: string; @ViewColumn() applicant?: string; - @ViewColumn() - localGovernmentUuid?: string; - @ViewColumn() localGovernmentName?: string; @ViewColumn() notificationTypeCode: string; - @ViewColumn() - status: LinkedStatusType; - @ViewColumn() dateSubmittedToAlc: Date | null; - @ManyToOne(() => NotificationType, { - nullable: false, - }) - @JoinColumn({ name: 'notification_type_code' }) - notificationType: NotificationType; + @ViewColumn() + status: LinkedStatusType; } diff --git a/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.spec.ts b/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.spec.ts index 480ecf3c88..a9cbfcaea7 100644 --- a/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.spec.ts +++ b/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.spec.ts @@ -1,11 +1,15 @@ +import { RedisService } from '@app/common/redis/redis.service'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; +import { createMockQuery } from '../../../../../test/mocks/mockTypes'; import { LocalGovernment } from '../../../../alcs/local-government/local-government.entity'; +import { Notification } from '../../../../alcs/notification/notification.entity'; +import { NotificationSubmission } from '../../../notification-submission/notification-submission.entity'; import { SearchRequestDto } from '../public-search.dto'; -import { PublicNotificationSearchService } from './public-notification-search.service'; import { PublicNotificationSubmissionSearchView } from './public-notification-search-view.entity'; +import { PublicNotificationSearchService } from './public-notification-search.service'; describe('PublicNotificationSearchService', () => { let service: PublicNotificationSearchService; @@ -13,6 +17,11 @@ describe('PublicNotificationSearchService', () => { Repository >; let mockLocalGovernmentRepository: DeepMocked>; + let mockNotificationRepository: DeepMocked>; + let mockNotificationSubmissionRepository: DeepMocked< + Repository + >; + let mockRedisService: DeepMocked; const mockSearchDto: SearchRequestDto = { fileNumber: '123', @@ -36,20 +45,11 @@ describe('PublicNotificationSearchService', () => { beforeEach(async () => { mockNotificationSubmissionSearchViewRepository = createMock(); mockLocalGovernmentRepository = createMock(); + mockNotificationRepository = createMock(); + mockNotificationSubmissionRepository = createMock(); + mockRedisService = createMock(); - mockQuery = { - getManyAndCount: jest.fn().mockResolvedValue([[], 0]), - orderBy: jest.fn().mockReturnThis(), - offset: jest.fn().mockReturnThis(), - limit: jest.fn().mockReturnThis(), - innerJoinAndMapOne: jest.fn().mockReturnThis(), - groupBy: jest.fn().mockReturnThis(), - where: jest.fn().mockReturnThis(), - andWhere: jest.fn().mockReturnThis(), - setParameters: jest.fn().mockReturnThis(), - leftJoin: jest.fn().mockReturnThis(), - withDeleted: jest.fn().mockReturnThis(), - }; + mockQuery = createMockQuery(); const module: TestingModule = await Test.createTestingModule({ providers: [ @@ -62,6 +62,18 @@ describe('PublicNotificationSearchService', () => { provide: getRepositoryToken(LocalGovernment), useValue: mockLocalGovernmentRepository, }, + { + provide: getRepositoryToken(Notification), + useValue: mockNotificationRepository, + }, + { + provide: getRepositoryToken(NotificationSubmission), + useValue: mockNotificationSubmissionRepository, + }, + { + provide: RedisService, + useValue: mockRedisService, + }, ], }).compile(); @@ -72,6 +84,11 @@ describe('PublicNotificationSearchService', () => { mockLocalGovernmentRepository.findOneByOrFail.mockResolvedValue( new LocalGovernment(), ); + + mockRedisService.getClient.mockReturnValue({ + get: async () => null, + setEx: async () => null, + } as any); }); it('should be defined', () => { @@ -79,28 +96,35 @@ describe('PublicNotificationSearchService', () => { }); it('should successfully build a query using all search parameters defined', async () => { - mockNotificationSubmissionSearchViewRepository.createQueryBuilder.mockReturnValue( + mockNotificationRepository.find.mockResolvedValue([]); + mockNotificationSubmissionRepository.find.mockResolvedValue([]); + mockNotificationSubmissionRepository.createQueryBuilder.mockReturnValue( mockQuery as any, ); const result = await service.search(mockSearchDto); expect(result).toEqual({ data: [], total: 0 }); + expect(mockNotificationRepository.find).toHaveBeenCalledTimes(3); expect( - mockNotificationSubmissionSearchViewRepository.createQueryBuilder, - ).toBeCalledTimes(1); - expect(mockQuery.andWhere).toBeCalledTimes(7); + mockNotificationSubmissionRepository.createQueryBuilder, + ).toHaveBeenCalledTimes(4); + expect(mockQuery.andWhere).toHaveBeenCalledTimes(5); }); - it('should call compileNotificationSearchQuery method correctly', async () => { - const compileSearchQuerySpy = jest - .spyOn(service as any, 'compileNotificationSearchQuery') - .mockResolvedValue(mockQuery); + it('should call searchForFileNumbers method correctly', async () => { + const searchForFileNumbers = jest + .spyOn(service as any, 'searchForFileNumbers') + .mockResolvedValue(new Set('100000')); + + mockNotificationSubmissionSearchViewRepository.createQueryBuilder.mockReturnValue( + mockQuery as any, + ); const result = await service.search(mockSearchDto); expect(result).toEqual({ data: [], total: 0 }); - expect(compileSearchQuerySpy).toBeCalledWith(mockSearchDto); + expect(searchForFileNumbers).toHaveBeenCalledWith(mockSearchDto); expect(mockQuery.orderBy).toHaveBeenCalledTimes(1); expect(mockQuery.offset).toHaveBeenCalledTimes(1); expect(mockQuery.limit).toHaveBeenCalledTimes(1); diff --git a/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.ts b/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.ts index cada752d9d..9b44b4f3d2 100644 --- a/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.ts +++ b/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.ts @@ -1,9 +1,14 @@ +import { RedisService } from '@app/common/redis/redis.service'; import { Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; -import { Brackets, Repository } from 'typeorm'; +import * as hash from 'object-hash'; +import { Brackets, In, Repository } from 'typeorm'; import { LocalGovernment } from '../../../../alcs/local-government/local-government.entity'; +import { Notification } from '../../../../alcs/notification/notification.entity'; import { formatStringToPostgresSearchStringArrayWithWildCard } from '../../../../utils/search-helper'; +import { intersectSets } from '../../../../utils/set-helper'; import { NotificationParcel } from '../../../notification-submission/notification-parcel/notification-parcel.entity'; +import { NotificationSubmission } from '../../../notification-submission/notification-submission.entity'; import { NotificationTransferee } from '../../../notification-submission/notification-transferee/notification-transferee.entity'; import { AdvancedSearchResultDto, @@ -17,9 +22,14 @@ export class PublicNotificationSearchService { constructor( @InjectRepository(PublicNotificationSubmissionSearchView) - private notificationSearchViewRepo: Repository, + private notificationSearchRepo: Repository, @InjectRepository(LocalGovernment) private governmentRepository: Repository, + @InjectRepository(Notification) + private notificationRepository: Repository, + @InjectRepository(NotificationSubmission) + private notificationSubRepository: Repository, + private redisService: RedisService, ) {} async search( @@ -27,9 +37,37 @@ export class PublicNotificationSearchService { ): Promise< AdvancedSearchResultDto > { - let query = await this.compileNotificationSearchQuery(searchDto); + const searchHash = hash(searchDto); + const searchKey = `search_public_notification_${searchHash}`; - query = this.compileGroupBySearchQuery(query); + const client = this.redisService.getClient(); + const cachedSearch = await client.get(searchKey); + + let fileNumbers = new Set(); + if (cachedSearch) { + const cachedNumbers = JSON.parse(cachedSearch) as string[]; + fileNumbers = new Set(cachedNumbers); + } else { + fileNumbers = await this.searchForFileNumbers(searchDto); + await client.setEx( + searchKey, + 180, + JSON.stringify([...fileNumbers.values()]), + ); + } + + if (fileNumbers.size === 0) { + return { + data: [], + total: 0, + }; + } + + let query = this.notificationSearchRepo + .createQueryBuilder('notificationSearch') + .andWhere('notificationSearch.fileNumber IN(:...fileNumbers)', { + fileNumbers: [...fileNumbers.values()], + }); const sortQuery = this.compileSortQuery(searchDto); @@ -39,14 +77,15 @@ export class PublicNotificationSearchService { .limit(searchDto.pageSize); const t0 = performance.now(); - const result = await query.getManyAndCount(); + const results = await Promise.all([query.getMany(), query.getCount()]); const t1 = performance.now(); this.logger.debug( `Notification public search took ${t1 - t0} milliseconds.`, ); + return { - data: result[0], - total: result[1], + data: results[0], + total: results[1], }; } @@ -73,99 +112,184 @@ export class PublicNotificationSearchService { } } - private compileGroupBySearchQuery(query) { - query = query - // FIXME: This is a quick fix for the search performance issues. It temporarily allows - // submissions with deleted notification types to be shown. For now, there are no - // deleted application types, so this should be fine, but should be fixed soon. - .withDeleted() - .innerJoinAndMapOne( - 'notificationSearch.notificationType', - 'notificationSearch.notificationType', - 'notificationType', - ) - .groupBy( - ` - "notificationSearch"."uuid" - , "notificationSearch"."notification_uuid" - , "notificationSearch"."notification_region_code" - , "notificationSearch"."file_number" - , "notificationSearch"."applicant" - , "notificationSearch"."local_government_uuid" - , "notificationSearch"."local_government_name" - , "notificationSearch"."notification_type_code" - , "notificationSearch"."status" - , "notificationSearch"."date_submitted_to_alc" - , "notificationType"."audit_deleted_date_at" - , "notificationType"."audit_created_at" - , "notificationType"."audit_updated_by" - , "notificationType"."audit_updated_at" - , "notificationType"."audit_created_by" - , "notificationType"."short_label" - , "notificationType"."label" - , "notificationType"."code" - , "notificationType"."html_description" - , "notificationType"."portal_label" - `, - ); - return query; - } - - private async compileNotificationSearchQuery(searchDto: SearchRequestDto) { - let query = - this.notificationSearchViewRepo.createQueryBuilder('notificationSearch'); + private async searchForFileNumbers(searchDto: SearchRequestDto) { + const promises: Promise<{ fileNumber: string }[]>[] = []; if (searchDto.fileNumber) { - query = query - .andWhere('notificationSearch.file_number = :fileNumber') - .setParameters({ fileNumber: searchDto.fileNumber ?? null }); + this.addFileNumberResults(searchDto, promises); } if (searchDto.portalStatusCodes && searchDto.portalStatusCodes.length > 0) { - query = query.andWhere( - "alcs.get_current_status_for_notification_submission_by_uuid(notificationSearch.uuid) ->> 'status_type_code' IN(:...statuses)", - { - statuses: searchDto.portalStatusCodes, - }, - ); + this.addPortalStatusResults(searchDto, promises); } if (searchDto.governmentName) { - const government = await this.governmentRepository.findOneByOrFail({ - name: searchDto.governmentName, - }); - - query = query.andWhere( - 'notificationSearch.local_government_uuid = :local_government_uuid', - { - local_government_uuid: government.uuid, - }, - ); + await this.addGovernmentResults(searchDto, promises); } if (searchDto.regionCodes && searchDto.regionCodes.length > 0) { - query = query.andWhere( - 'notificationSearch.notification_region_code IN(:...regions)', + this.addRegionResults(searchDto, promises); + } + + if (searchDto.name) { + this.addNameResults(searchDto, promises); + } + + if (searchDto.pid || searchDto.civicAddress) { + this.addParcelResults(searchDto, promises); + } + + if (searchDto.pid || searchDto.civicAddress) { + this.addParcelResults(searchDto, promises); + } + + //Intersect Sets + const t0 = performance.now(); + const queryResults = await Promise.all(promises); + + const allIds: Set[] = []; + for (const result of queryResults) { + const fileNumbers = new Set(); + result.forEach((currentValue) => { + fileNumbers.add(currentValue.fileNumber); + }); + allIds.push(fileNumbers); + } + + const finalResult = intersectSets(allIds); + + const t1 = performance.now(); + this.logger.debug( + `Notification pre-search search took ${t1 - t0} milliseconds.`, + ); + return finalResult; + } + + private addFileNumberResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const promise = this.notificationRepository.find({ + where: { + fileNumber: searchDto.fileNumber, + }, + select: { + fileNumber: true, + }, + }); + promises.push(promise); + } + + private addPortalStatusResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const promise = this.notificationSubRepository + .createQueryBuilder('notiSub') + .select('notiSub.fileNumber') + .where( + "alcs.get_current_status_for_notification_submission_by_uuid(notiSub.uuid) ->> 'status_type_code' IN(:...statusCodes)", { - regions: searchDto.regionCodes, + statusCodes: searchDto.portalStatusCodes, }, - ); - } + ) + .getMany(); + promises.push(promise); + } - query = this.compileSearchByNameQuery(searchDto, query); - query = this.compileParcelSearchQuery(searchDto, query); + private async addGovernmentResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const government = await this.governmentRepository.findOneByOrFail({ + name: searchDto.governmentName, + }); - return query; + const promise = this.notificationRepository.find({ + where: { + localGovernmentUuid: government.uuid, + }, + select: { + fileNumber: true, + }, + }); + promises.push(promise); } - private compileParcelSearchQuery(searchDto: SearchRequestDto, query) { - if (searchDto.pid || searchDto.civicAddress) { - query = query.leftJoin( + private addRegionResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const promise = this.notificationRepository.find({ + where: { + regionCode: In(searchDto.regionCodes!), + }, + select: { + fileNumber: true, + }, + }); + promises.push(promise); + } + + private addNameResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const formattedSearchString = + formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); + const promise = this.notificationSubRepository + .createQueryBuilder('notiSub') + .select('notiSub.fileNumber') + .leftJoin( + NotificationTransferee, + 'notification_transferee', + 'notification_transferee.notification_submission_uuid = notiSub.uuid', + ) + .andWhere( + new Brackets((qb) => + qb + .where( + "LOWER(notification_transferee.first_name || ' ' || notification_transferee.last_name) LIKE ANY (:names)", + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(notification_transferee.first_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(notification_transferee.last_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(notification_transferee.organization_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ), + ), + ) + .getMany(); + promises.push(promise); + } + + private addParcelResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + let query = this.notificationSubRepository + .createQueryBuilder('notiSub') + .select('notiSub.fileNumber') + .leftJoin( NotificationParcel, 'parcel', - 'parcel.notification_submission_uuid = notificationSearch.uuid', + 'parcel.notification_submission_uuid = notiSub.uuid', ); - } if (searchDto.pid) { query = query.andWhere('parcel.pid = :pid', { pid: searchDto.pid }); @@ -179,50 +303,7 @@ export class PublicNotificationSearchService { }, ); } - return query; - } - private compileSearchByNameQuery(searchDto: SearchRequestDto, query) { - if (searchDto.name) { - const formattedSearchString = - formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); - - query = query - .leftJoin( - NotificationTransferee, - 'notification_transferee', - 'notification_transferee.notification_submission_uuid = notificationSearch.uuid', - ) - .andWhere( - new Brackets((qb) => - qb - .where( - "LOWER(notification_transferee.first_name || ' ' || notification_transferee.last_name) LIKE ANY (:names)", - { - names: formattedSearchString, - }, - ) - .orWhere( - 'LOWER(notification_transferee.first_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ) - .orWhere( - 'LOWER(notification_transferee.last_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ) - .orWhere( - 'LOWER(notification_transferee.organization_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ), - ), - ); - } - return query; + promises.push(query.getMany()); } } diff --git a/services/apps/alcs/src/portal/public/search/public-search.controller.spec.ts b/services/apps/alcs/src/portal/public/search/public-search.controller.spec.ts index f3fcc7c730..efa7d20c1d 100644 --- a/services/apps/alcs/src/portal/public/search/public-search.controller.spec.ts +++ b/services/apps/alcs/src/portal/public/search/public-search.controller.spec.ts @@ -7,6 +7,8 @@ import { ClsService } from 'nestjs-cls'; import { Repository } from 'typeorm'; import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; import { ApplicationType } from '../../../alcs/code/application-code/application-type/application-type.entity'; +import { NoticeOfIntentType } from '../../../alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.entity'; +import { NotificationType } from '../../../alcs/notification/notification-type/notification-type.entity'; import { PublicApplicationSearchService } from './application/public-application-search.service'; import { PublicNoticeOfIntentSearchService } from './notice-of-intent/public-notice-of-intent-search.service'; import { PublicNotificationSearchService } from './notification/public-notification-search.service'; @@ -19,12 +21,16 @@ describe('PublicSearchController', () => { let mockAppPublicSearchService: DeepMocked; let mockNotiPublicSearchService: DeepMocked; let mockAppTypeRepo: DeepMocked>; + let mockNOITypeRepo: DeepMocked>; + let mockNotificationTypeRepo: DeepMocked>; beforeEach(async () => { mockNOIPublicSearchService = createMock(); mockAppPublicSearchService = createMock(); mockNotiPublicSearchService = createMock(); mockAppTypeRepo = createMock(); + mockNOITypeRepo = createMock(); + mockNotificationTypeRepo = createMock(); const module: TestingModule = await Test.createTestingModule({ imports: [ @@ -49,6 +55,14 @@ describe('PublicSearchController', () => { provide: getRepositoryToken(ApplicationType), useValue: mockAppTypeRepo, }, + { + provide: getRepositoryToken(NoticeOfIntentType), + useValue: mockNOITypeRepo, + }, + { + provide: getRepositoryToken(NotificationType), + useValue: mockNotificationTypeRepo, + }, { provide: ClsService, useValue: {}, diff --git a/services/apps/alcs/src/portal/public/search/public-search.controller.ts b/services/apps/alcs/src/portal/public/search/public-search.controller.ts index 1a6c74ac11..dc3bc8206a 100644 --- a/services/apps/alcs/src/portal/public/search/public-search.controller.ts +++ b/services/apps/alcs/src/portal/public/search/public-search.controller.ts @@ -5,6 +5,8 @@ import { InjectMapper } from 'automapper-nestjs'; import { Public } from 'nest-keycloak-connect'; import { Repository } from 'typeorm'; import { ApplicationType } from '../../../alcs/code/application-code/application-type/application-type.entity'; +import { NoticeOfIntentType } from '../../../alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.entity'; +import { NotificationType } from '../../../alcs/notification/notification-type/notification-type.entity'; import { isStringSetAndNotEmpty } from '../../../utils/string-helper'; import { APPLICATION_SUBMISSION_TYPES } from '../../pdf-generation/generate-submission-document.service'; import { PublicApplicationSubmissionSearchView } from './application/public-application-search-view.entity'; @@ -32,6 +34,10 @@ export class PublicSearchController { private notificationSearchService: PublicNotificationSearchService, @InjectRepository(ApplicationType) private appTypeRepo: Repository, + @InjectRepository(NoticeOfIntentType) + private noiTypeRepo: Repository, + @InjectRepository(NotificationType) + private notificationTypeRepo: Repository, ) {} @Post('/') @@ -211,18 +217,40 @@ export class PublicSearchController { const mappedNoticeOfIntents: NoticeOfIntentSearchResultDto[] = []; if (noticeOfIntents && noticeOfIntents.data.length > 0) { + const noiTypes = await this.noiTypeRepo.find({ + select: { + code: true, + label: true, + }, + }); + const noiTypeMap = new Map(); + for (const type of noiTypes) { + noiTypeMap.set(type.code, type); + } + mappedNoticeOfIntents.push( ...noticeOfIntents.data.map((noi) => - this.mapNoticeOfIntentToSearchResult(noi), + this.mapNoticeOfIntentToSearchResult(noi, noiTypeMap), ), ); } const mappedNotifications: NotificationSearchResultDto[] = []; if (notifications && notifications.data && notifications.data.length > 0) { + const notificationTypes = await this.notificationTypeRepo.find({ + select: { + code: true, + label: true, + }, + }); + const notificationTypeMap = new Map(); + for (const type of notificationTypes) { + notificationTypeMap.set(type.code, type); + } + mappedNotifications.push( ...notifications.data.map((notification) => - this.mapNotificationToSearchResult(notification), + this.mapNotificationToSearchResult(notification, notificationTypeMap), ), ); } @@ -256,13 +284,14 @@ export class PublicSearchController { private mapNoticeOfIntentToSearchResult( noi: PublicNoticeOfIntentSubmissionSearchView, + noiTypeMap: Map, ): NoticeOfIntentSearchResultDto { return { referenceId: noi.fileNumber, fileNumber: noi.fileNumber, lastUpdate: noi.lastUpdate?.getTime(), dateSubmitted: noi.dateSubmittedToAlc?.getTime(), - type: noi.noticeOfIntentType.label, + type: noiTypeMap.get(noi.noticeOfIntentTypeCode)!.label, localGovernmentName: noi.localGovernmentName, ownerName: noi.applicant, class: 'NOI', @@ -272,13 +301,14 @@ export class PublicSearchController { private mapNotificationToSearchResult( notification: PublicNotificationSubmissionSearchView, + notificationTypeMap: Map, ): NotificationSearchResultDto { return { referenceId: notification.fileNumber, fileNumber: notification.fileNumber, lastUpdate: notification.status.effective_date, dateSubmitted: notification.dateSubmittedToAlc?.getTime(), - type: notification.notificationType.label, + type: notificationTypeMap.get(notification.notificationTypeCode)!.label, localGovernmentName: notification.localGovernmentName, ownerName: notification.applicant, class: 'NOTI', diff --git a/services/apps/alcs/src/portal/public/search/public-search.module.ts b/services/apps/alcs/src/portal/public/search/public-search.module.ts index 7777fc8ffa..fb9ff9f462 100644 --- a/services/apps/alcs/src/portal/public/search/public-search.module.ts +++ b/services/apps/alcs/src/portal/public/search/public-search.module.ts @@ -3,24 +3,34 @@ import { TypeOrmModule } from '@nestjs/typeorm'; 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 { NoticeOfIntentType } from '../../../alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.entity'; import { NoticeOfIntent } from '../../../alcs/notice-of-intent/notice-of-intent.entity'; +import { NotificationType } from '../../../alcs/notification/notification-type/notification-type.entity'; import { Notification } from '../../../alcs/notification/notification.entity'; import { ApplicationProfile } from '../../../common/automapper/application.automapper.profile'; -import { PublicApplicationSearchService } from './application/public-application-search.service'; +import { ApplicationSubmission } from '../../application-submission/application-submission.entity'; +import { NoticeOfIntentSubmission } from '../../notice-of-intent-submission/notice-of-intent-submission.entity'; +import { NotificationSubmission } from '../../notification-submission/notification-submission.entity'; import { PublicApplicationSubmissionSearchView } from './application/public-application-search-view.entity'; -import { PublicNoticeOfIntentSearchService } from './notice-of-intent/public-notice-of-intent-search.service'; +import { PublicApplicationSearchService } from './application/public-application-search.service'; import { PublicNoticeOfIntentSubmissionSearchView } from './notice-of-intent/public-notice-of-intent-search-view.entity'; -import { PublicNotificationSearchService } from './notification/public-notification-search.service'; +import { PublicNoticeOfIntentSearchService } from './notice-of-intent/public-notice-of-intent-search.service'; import { PublicNotificationSubmissionSearchView } from './notification/public-notification-search-view.entity'; +import { PublicNotificationSearchService } from './notification/public-notification-search.service'; import { PublicSearchController } from './public-search.controller'; @Module({ imports: [ TypeOrmModule.forFeature([ Application, + ApplicationSubmission, ApplicationType, NoticeOfIntent, + NoticeOfIntentSubmission, + NoticeOfIntentType, Notification, + NotificationSubmission, + NotificationType, LocalGovernment, PublicApplicationSubmissionSearchView, PublicNoticeOfIntentSubmissionSearchView, diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1714430741432-clean_up_public_app_public_noi_search.ts b/services/apps/alcs/src/providers/typeorm/migrations/1714430741432-clean_up_public_app_public_noi_search.ts new file mode 100644 index 0000000000..cc236189c9 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1714430741432-clean_up_public_app_public_noi_search.ts @@ -0,0 +1,88 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class CleanUpPublicAppPublicNoiSearch1714430741432 + implements MigrationInterface +{ + name = 'CleanUpPublicAppPublicNoiSearch1714430741432'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'public_application_submission_search_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."public_application_submission_search_view"`, + ); + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'public_notice_of_intent_submission_search_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."public_notice_of_intent_submission_search_view"`, + ); + + await queryRunner.query( + `CREATE VIEW "alcs"."public_notice_of_intent_submission_search_view" AS SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", decision_date.outcome AS "outcome", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."hide_from_portal" = FALSE AND "noi"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT DISTINCT ON (notice_of_intentuuid) decisiondate AS "date", outcome AS "outcome", dest_rank AS "dest_rank", notice_of_intentuuid AS "notice_of_intent_uuid" FROM (SELECT outcome_code AS "outcome", date AS "decisiondate", notice_of_intent_uuid AS "notice_of_intentuuid", RANK() OVER (PARTITION BY notice_of_intent_uuid ORDER BY date DESC, audit_created_at DESC) AS "dest_rank" FROM "alcs"."notice_of_intent_decision" "decision" WHERE ( is_draft = FALSE ) AND ( "decision"."audit_deleted_date_at" IS NULL )) "decisions" WHERE dest_rank = 1) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND ("noi"."date_received_all_items" IS NOT NULL AND "noi"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>'status_type_code' != 'CANC' ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'public_notice_of_intent_submission_search_view', + 'SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", decision_date.outcome AS "outcome", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."hide_from_portal" = FALSE AND "noi"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT DISTINCT ON (notice_of_intentuuid) decisiondate AS "date", outcome AS "outcome", dest_rank AS "dest_rank", notice_of_intentuuid AS "notice_of_intent_uuid" FROM (SELECT outcome_code AS "outcome", date AS "decisiondate", notice_of_intent_uuid AS "notice_of_intentuuid", RANK() OVER (PARTITION BY notice_of_intent_uuid ORDER BY date DESC, audit_created_at DESC) AS "dest_rank" FROM "alcs"."notice_of_intent_decision" "decision" WHERE ( is_draft = FALSE ) AND ( "decision"."audit_deleted_date_at" IS NULL )) "decisions" WHERE dest_rank = 1) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND ("noi"."date_received_all_items" IS NOT NULL AND "noi"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>\'status_type_code\' != \'CANC\' ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + await queryRunner.query( + `CREATE VIEW "alcs"."public_application_submission_search_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", decision_date.outcome AS "outcome", 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" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."hide_from_portal" = FALSE AND "app"."audit_deleted_date_at" IS NULL 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("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT DISTINCT ON (application_uuid) decisiondate AS "date", outcome AS "outcome", dest_rank AS "dest_rank", applicationuuid AS "application_uuid" FROM (SELECT outcome_code AS "outcome", date AS "decisiondate", application_uuid AS "applicationuuid", RANK() OVER (PARTITION BY application_uuid ORDER BY date DESC, audit_created_at DESC) AS "dest_rank" FROM "alcs"."application_decision" "decision" WHERE ( is_draft = FALSE ) AND ( "decision"."audit_deleted_date_at" IS NULL )) "decisions" WHERE 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' != 'CANC' ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'public_application_submission_search_view', + 'SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", decision_date.outcome AS "outcome", 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" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."hide_from_portal" = FALSE AND "app"."audit_deleted_date_at" IS NULL 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("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT DISTINCT ON (application_uuid) decisiondate AS "date", outcome AS "outcome", dest_rank AS "dest_rank", applicationuuid AS "application_uuid" FROM (SELECT outcome_code AS "outcome", date AS "decisiondate", application_uuid AS "applicationuuid", RANK() OVER (PARTITION BY application_uuid ORDER BY date DESC, audit_created_at DESC) AS "dest_rank" FROM "alcs"."application_decision" "decision" WHERE ( is_draft = FALSE ) AND ( "decision"."audit_deleted_date_at" IS NULL )) "decisions" WHERE 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\' != \'CANC\' ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'public_application_submission_search_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."public_application_submission_search_view"`, + ); + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'public_notice_of_intent_submission_search_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."public_notice_of_intent_submission_search_view"`, + ); + + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'planning_review_search_view', + 'SELECT "planning_review"."uuid" AS "uuid", "planningReviewType"."audit_deleted_date_at" AS "planningReviewType_audit_deleted_date_at", "planningReviewType"."audit_created_at" AS "planningReviewType_audit_created_at", "planningReviewType"."audit_updated_at" AS "planningReviewType_audit_updated_at", "planningReviewType"."audit_created_by" AS "planningReviewType_audit_created_by", "planningReviewType"."audit_updated_by" AS "planningReviewType_audit_updated_by", "planningReviewType"."label" AS "planningReviewType_label", "planningReviewType"."code" AS "planningReviewType_code", "planningReviewType"."description" AS "planningReviewType_description", "planningReviewType"."short_label" AS "planningReviewType_short_label", "planningReviewType"."background_color" AS "planningReviewType_background_color", "planningReviewType"."text_color" AS "planningReviewType_text_color", "planningReviewType"."html_description" AS "planningReviewType_html_description", "localGovernment"."name" AS "local_government_name", "planning_review"."file_number" AS "file_number", "planning_review"."document_name" AS "document_name", "planning_review"."local_government_uuid" AS "local_government_uuid", "planning_review"."type_code" AS "planning_review_type_code", "planning_review"."region_code" AS "region_code" FROM "alcs"."planning_review" "planning_review" INNER JOIN "alcs"."planning_review_type" "planningReviewType" ON "planning_review"."type_code" = "planningReviewType"."code" LEFT JOIN "alcs"."local_government" "localGovernment" ON "planning_review"."local_government_uuid" = "localGovernment"."uuid"', + ], + ); + await queryRunner.query( + `CREATE VIEW "alcs"."public_notice_of_intent_submission_search_view" AS SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "noticeOfIntentType"."alc_fee_amount" AS "noticeOfIntentType_alc_fee_amount", "noticeOfIntentType"."government_fee_amount" AS "noticeOfIntentType_government_fee_amount", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."hide_from_portal" = FALSE AND "noi"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT DISTINCT ON (notice_of_intentuuid) decisiondate AS "date", outcome AS "outcome", dest_rank AS "dest_rank", notice_of_intentuuid AS "notice_of_intent_uuid" FROM (SELECT outcome_code AS "outcome", date AS "decisiondate", notice_of_intent_uuid AS "notice_of_intentuuid", RANK() OVER (PARTITION BY notice_of_intent_uuid ORDER BY date DESC, audit_created_at DESC) AS "dest_rank" FROM "alcs"."notice_of_intent_decision" "decision" WHERE ( is_draft = FALSE ) AND ( "decision"."audit_deleted_date_at" IS NULL )) "decisions" WHERE dest_rank = 1) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND ("noi"."date_received_all_items" IS NOT NULL AND "noi"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>'status_type_code' != 'CANC' ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'public_application_submission_search_view', + 'SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "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" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."hide_from_portal" = FALSE AND "app"."audit_deleted_date_at" IS NULL 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("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT DISTINCT ON (application_uuid) decisiondate AS "date", outcome AS "outcome", dest_rank AS "dest_rank", applicationuuid AS "application_uuid" FROM (SELECT outcome_code AS "outcome", date AS "decisiondate", application_uuid AS "applicationuuid", RANK() OVER (PARTITION BY application_uuid ORDER BY date DESC, audit_created_at DESC) AS "dest_rank" FROM "alcs"."application_decision" "decision" WHERE ( is_draft = FALSE ) AND ( "decision"."audit_deleted_date_at" IS NULL )) "decisions" WHERE 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\' != \'CANC\' ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + } +} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1714434697883-rebuild_notification_search.ts b/services/apps/alcs/src/providers/typeorm/migrations/1714434697883-rebuild_notification_search.ts new file mode 100644 index 0000000000..1f15d00a90 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1714434697883-rebuild_notification_search.ts @@ -0,0 +1,63 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class RebuildNotificationSearch1714434697883 + implements MigrationInterface +{ + name = 'RebuildNotificationSearch1714434697883'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'public_notification_submission_search_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."public_notification_submission_search_view"`, + ); + await queryRunner.query( + `CREATE INDEX "IDX_2f863dc7ab4f76a87b160f3288" ON "alcs"."notice_of_intent" ("card_uuid") `, + ); + await queryRunner.query( + `CREATE INDEX "IDX_07e0aa0c43cb5a2bfc2c00282d" ON "alcs"."notice_of_intent_submission" ("file_number") `, + ); + await queryRunner.query( + `CREATE VIEW "alcs"."public_notification_submission_search_view" AS SELECT "noti_sub"."uuid" AS "uuid", "noti_sub"."applicant" AS "applicant", "localGovernment"."name" AS "local_government_name", "noti_sub"."file_number" AS "file_number", "noti"."type_code" AS "notification_type_code", "noti"."date_submitted_to_alc" AS "date_submitted_to_alc", alcs.get_current_status_for_notification_submission_by_uuid("noti_sub"."uuid") AS "status" FROM "alcs"."notification_submission" "noti_sub" INNER JOIN "alcs"."notification" "noti" ON "noti"."file_number" = "noti_sub"."file_number" AND "noti"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noti"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE ( alcs.get_current_status_for_notification_submission_by_uuid("noti_sub"."uuid")->>'status_type_code' = 'ALCR' ) AND ( "noti_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'public_notification_submission_search_view', + 'SELECT "noti_sub"."uuid" AS "uuid", "noti_sub"."applicant" AS "applicant", "localGovernment"."name" AS "local_government_name", "noti_sub"."file_number" AS "file_number", "noti"."type_code" AS "notification_type_code", "noti"."date_submitted_to_alc" AS "date_submitted_to_alc", alcs.get_current_status_for_notification_submission_by_uuid("noti_sub"."uuid") AS "status" FROM "alcs"."notification_submission" "noti_sub" INNER JOIN "alcs"."notification" "noti" ON "noti"."file_number" = "noti_sub"."file_number" AND "noti"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noti"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE ( alcs.get_current_status_for_notification_submission_by_uuid("noti_sub"."uuid")->>\'status_type_code\' = \'ALCR\' ) AND ( "noti_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'public_notification_submission_search_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."public_notification_submission_search_view"`, + ); + await queryRunner.query( + `DROP INDEX "alcs"."IDX_07e0aa0c43cb5a2bfc2c00282d"`, + ); + await queryRunner.query( + `DROP INDEX "alcs"."IDX_2f863dc7ab4f76a87b160f3288"`, + ); + await queryRunner.query( + `CREATE VIEW "alcs"."public_notification_submission_search_view" AS SELECT "noti_sub"."uuid" AS "uuid", "noti_sub"."applicant" AS "applicant", "noti"."uuid" AS "notification_uuid", "notificationType"."audit_deleted_date_at" AS "notificationType_audit_deleted_date_at", "notificationType"."audit_created_at" AS "notificationType_audit_created_at", "notificationType"."audit_updated_at" AS "notificationType_audit_updated_at", "notificationType"."audit_created_by" AS "notificationType_audit_created_by", "notificationType"."audit_updated_by" AS "notificationType_audit_updated_by", "notificationType"."label" AS "notificationType_label", "notificationType"."code" AS "notificationType_code", "notificationType"."description" AS "notificationType_description", "notificationType"."short_label" AS "notificationType_short_label", "notificationType"."background_color" AS "notificationType_background_color", "notificationType"."text_color" AS "notificationType_text_color", "notificationType"."html_description" AS "notificationType_html_description", "notificationType"."portal_label" AS "notificationType_portal_label", "localGovernment"."name" AS "local_government_name", "noti_sub"."file_number" AS "file_number", "noti_sub"."local_government_uuid" AS "local_government_uuid", "noti"."type_code" AS "notification_type_code", "noti"."date_submitted_to_alc" AS "date_submitted_to_alc", "noti"."region_code" AS "notification_region_code", alcs.get_current_status_for_notification_submission_by_uuid("noti_sub"."uuid") AS "status" FROM "alcs"."notification_submission" "noti_sub" INNER JOIN "alcs"."notification" "noti" ON "noti"."file_number" = "noti_sub"."file_number" AND "noti"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notification_type" "notificationType" ON "noti_sub"."type_code" = "notificationType"."code" AND "notificationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noti"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE ( alcs.get_current_status_for_notification_submission_by_uuid("noti_sub"."uuid")->>'status_type_code' = 'ALCR' ) AND ( "noti_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'public_notification_submission_search_view', + 'SELECT "noti_sub"."uuid" AS "uuid", "noti_sub"."applicant" AS "applicant", "noti"."uuid" AS "notification_uuid", "notificationType"."audit_deleted_date_at" AS "notificationType_audit_deleted_date_at", "notificationType"."audit_created_at" AS "notificationType_audit_created_at", "notificationType"."audit_updated_at" AS "notificationType_audit_updated_at", "notificationType"."audit_created_by" AS "notificationType_audit_created_by", "notificationType"."audit_updated_by" AS "notificationType_audit_updated_by", "notificationType"."label" AS "notificationType_label", "notificationType"."code" AS "notificationType_code", "notificationType"."description" AS "notificationType_description", "notificationType"."short_label" AS "notificationType_short_label", "notificationType"."background_color" AS "notificationType_background_color", "notificationType"."text_color" AS "notificationType_text_color", "notificationType"."html_description" AS "notificationType_html_description", "notificationType"."portal_label" AS "notificationType_portal_label", "localGovernment"."name" AS "local_government_name", "noti_sub"."file_number" AS "file_number", "noti_sub"."local_government_uuid" AS "local_government_uuid", "noti"."type_code" AS "notification_type_code", "noti"."date_submitted_to_alc" AS "date_submitted_to_alc", "noti"."region_code" AS "notification_region_code", alcs.get_current_status_for_notification_submission_by_uuid("noti_sub"."uuid") AS "status" FROM "alcs"."notification_submission" "noti_sub" INNER JOIN "alcs"."notification" "noti" ON "noti"."file_number" = "noti_sub"."file_number" AND "noti"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notification_type" "notificationType" ON "noti_sub"."type_code" = "notificationType"."code" AND "notificationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noti"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE ( alcs.get_current_status_for_notification_submission_by_uuid("noti_sub"."uuid")->>\'status_type_code\' = \'ALCR\' ) AND ( "noti_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + } +} diff --git a/services/apps/alcs/src/providers/typeorm/orm.config.ts b/services/apps/alcs/src/providers/typeorm/orm.config.ts index 7a9facbb2d..dba25d9749 100644 --- a/services/apps/alcs/src/providers/typeorm/orm.config.ts +++ b/services/apps/alcs/src/providers/typeorm/orm.config.ts @@ -17,6 +17,7 @@ export const getTypeOrmModuleOptions = ( namingStrategy: new SnakeNamingStrategy(), uuidExtension: 'pgcrypto', applicationName: 'alcs', + maxQueryExecutionTime: 5000, replication: { defaultMode: 'master', master: { diff --git a/services/apps/alcs/src/utils/set-helper.ts b/services/apps/alcs/src/utils/set-helper.ts new file mode 100644 index 0000000000..5e5e434030 --- /dev/null +++ b/services/apps/alcs/src/utils/set-helper.ts @@ -0,0 +1,18 @@ +export const intersectSets = (sets: Set[]): Set => { + // If there are no sets, return an empty set + if (sets.length === 0) { + return new Set(); + } + + // Start with the first set + let intersection = new Set(sets[0]); + + // Iterate over the remaining sets + for (let i = 1; i < sets.length; i++) { + intersection = new Set( + [...intersection].filter((item) => sets[i].has(item)), + ); + } + + return intersection; +}; diff --git a/services/apps/alcs/test/mocks/mockTypes.ts b/services/apps/alcs/test/mocks/mockTypes.ts index bef47f5fee..3a7cb04b8f 100644 --- a/services/apps/alcs/test/mocks/mockTypes.ts +++ b/services/apps/alcs/test/mocks/mockTypes.ts @@ -39,3 +39,22 @@ export const mockKeyCloakProviders = [ useValue: {}, }, ]; + +export const createMockQuery = () => { + return { + select: jest.fn().mockReturnThis(), + getMany: jest.fn().mockResolvedValue([]), + getCount: jest.fn().mockResolvedValue(0), + orderBy: jest.fn().mockReturnThis(), + offset: jest.fn().mockReturnThis(), + limit: jest.fn().mockReturnThis(), + innerJoinAndMapOne: jest.fn().mockReturnThis(), + groupBy: jest.fn().mockReturnThis(), + where: jest.fn().mockReturnThis(), + andWhere: jest.fn().mockReturnThis(), + setParameters: jest.fn().mockReturnThis(), + leftJoin: jest.fn().mockReturnThis(), + innerJoin: jest.fn().mockReturnThis(), + withDeleted: jest.fn().mockReturnThis(), + }; +}; diff --git a/services/package-lock.json b/services/package-lock.json index 8cf3cdb67f..8f741db526 100644 --- a/services/package-lock.json +++ b/services/package-lock.json @@ -45,6 +45,7 @@ "nestjs-grpc-reflection": "^0.2.2", "nestjs-spelunker": "^1.3.0", "node-jose": "^2.2.0", + "object-hash": "^3.0.0", "pg": "^8.11.5", "redis": "^4.6.13", "reflect-metadata": "^0.1.14", @@ -69,6 +70,7 @@ "@types/jest": "^29.5.12", "@types/node": "^20.12.4", "@types/node-jose": "^1.1.13", + "@types/object-hash": "^3.0.6", "@types/source-map-support": "^0.5.10", "@types/supertest": "^6.0.2", "@types/uuid": "^9.0.8", @@ -4468,6 +4470,12 @@ "@types/node": "*" } }, + "node_modules/@types/object-hash": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/@types/object-hash/-/object-hash-3.0.6.tgz", + "integrity": "sha512-fOBV8C1FIu2ELinoILQ+ApxcUKz4ngq+IWUYrxSGjXzzjUALijilampwkMgEtJ+h2njAW3pi853QpzNVCHB73w==", + "dev": true + }, "node_modules/@types/qs": { "version": "6.9.14", "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.14.tgz", @@ -11449,6 +11457,14 @@ "node": ">=0.10.0" } }, + "node_modules/object-hash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz", + "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==", + "engines": { + "node": ">= 6" + } + }, "node_modules/object-inspect": { "version": "1.13.1", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", diff --git a/services/package.json b/services/package.json index 04d3277cb5..6e1f569355 100644 --- a/services/package.json +++ b/services/package.json @@ -64,6 +64,7 @@ "nestjs-grpc-reflection": "^0.2.2", "nestjs-spelunker": "^1.3.0", "node-jose": "^2.2.0", + "object-hash": "^3.0.0", "pg": "^8.11.5", "redis": "^4.6.13", "reflect-metadata": "^0.1.14", @@ -88,6 +89,7 @@ "@types/jest": "^29.5.12", "@types/node": "^20.12.4", "@types/node-jose": "^1.1.13", + "@types/object-hash": "^3.0.6", "@types/source-map-support": "^0.5.10", "@types/supertest": "^6.0.2", "@types/uuid": "^9.0.8", From f4070fb4951566c7f9f3a5b84b4a817604f129d8 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 30 Apr 2024 13:39:47 -0700 Subject: [PATCH 002/103] Add Region dropdown to SRW Intake Page --- .../notification/intake/intake.component.html | 37 +++++++++++++------ .../notification/intake/intake.component.scss | 4 ++ .../intake/intake.component.spec.ts | 11 +++++- .../notification/intake/intake.component.ts | 35 ++++++++++++++++-- .../services/notification/notification.dto.ts | 2 +- .../src/alcs/notification/notification.dto.ts | 4 ++ .../alcs/notification/notification.service.ts | 6 +++ 7 files changed, 82 insertions(+), 17 deletions(-) diff --git a/alcs-frontend/src/app/features/notification/intake/intake.component.html b/alcs-frontend/src/app/features/notification/intake/intake.component.html index f76c2a9342..86e84c971d 100644 --- a/alcs-frontend/src/app/features/notification/intake/intake.component.html +++ b/alcs-frontend/src/app/features/notification/intake/intake.component.html @@ -1,5 +1,5 @@

ALC Intake

-
+
Submitted to ALC
ALC Intake info_outline + >info_outline
@@ -28,20 +28,12 @@

ALC Intake
- warningFailed + warning + Failed
-
-
Local / First Nation Government
- - -
Primary Contact Email
ALC Intake >
+
+
L/FNG Information
+
+
+
+
Local/First Nation Government
+ +
+
+
Region
+ +
+
diff --git a/alcs-frontend/src/app/features/notification/intake/intake.component.scss b/alcs-frontend/src/app/features/notification/intake/intake.component.scss index 56c3f6190b..31c5c7605b 100644 --- a/alcs-frontend/src/app/features/notification/intake/intake.component.scss +++ b/alcs-frontend/src/app/features/notification/intake/intake.component.scss @@ -6,7 +6,11 @@ grid-row-gap: 48px; grid-column-gap: 48px; width: 100%; +} + +.header-row { margin-top: 48px; + margin-bottom: 24px; } .icon { diff --git a/alcs-frontend/src/app/features/notification/intake/intake.component.spec.ts b/alcs-frontend/src/app/features/notification/intake/intake.component.spec.ts index 845bade2d8..25b0966a52 100644 --- a/alcs-frontend/src/app/features/notification/intake/intake.component.spec.ts +++ b/alcs-frontend/src/app/features/notification/intake/intake.component.spec.ts @@ -3,13 +3,15 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatSnackBarModule } from '@angular/material/snack-bar'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { BehaviorSubject } from 'rxjs'; +import { ApplicationRegionDto } from '../../../services/application/application-code.dto'; import { ApplicationLocalGovernmentService } from '../../../services/application/application-local-government/application-local-government.service'; +import { ApplicationService } from '../../../services/application/application.service'; import { NotificationDetailService } from '../../../services/notification/notification-detail.service'; import { NotificationSubmissionService } from '../../../services/notification/notification-submission/notification-submission.service'; +import { NotificationTimelineService } from '../../../services/notification/notification-timeline/notification-timeline.service'; import { NotificationDto } from '../../../services/notification/notification.dto'; import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service'; import { IntakeComponent } from './intake.component'; -import { NotificationTimelineService } from '../../../services/notification/notification-timeline/notification-timeline.service'; describe('IntakeComponent', () => { let component: IntakeComponent; @@ -18,14 +20,17 @@ describe('IntakeComponent', () => { let mockLgService: DeepMocked; let mockSubmissionService: DeepMocked; let mockTimelineService: DeepMocked; + let mockApplicationService: DeepMocked; beforeEach(async () => { mockDetailService = createMock(); mockLgService = createMock(); mockSubmissionService = createMock(); mockTimelineService = createMock(); + mockApplicationService = createMock(); mockDetailService.$notification = new BehaviorSubject(undefined); + mockApplicationService.$applicationRegions = new BehaviorSubject([]); await TestBed.configureTestingModule({ imports: [MatSnackBarModule], @@ -50,6 +55,10 @@ describe('IntakeComponent', () => { provide: ConfirmationDialogService, useValue: {}, }, + { + provide: ApplicationService, + useValue: mockApplicationService, + }, ], declarations: [IntakeComponent], schemas: [NO_ERRORS_SCHEMA], diff --git a/alcs-frontend/src/app/features/notification/intake/intake.component.ts b/alcs-frontend/src/app/features/notification/intake/intake.component.ts index 6fc3c99fab..1cdd070cbc 100644 --- a/alcs-frontend/src/app/features/notification/intake/intake.component.ts +++ b/alcs-frontend/src/app/features/notification/intake/intake.component.ts @@ -1,7 +1,9 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import moment from 'moment'; +import { Subject, takeUntil } from 'rxjs'; import { environment } from '../../../../environments/environment'; import { ApplicationLocalGovernmentService } from '../../../services/application/application-local-government/application-local-government.service'; +import { ApplicationService } from '../../../services/application/application.service'; import { NotificationDetailService } from '../../../services/notification/notification-detail.service'; import { NotificationSubmissionService } from '../../../services/notification/notification-submission/notification-submission.service'; import { NotificationTimelineService } from '../../../services/notification/notification-timeline/notification-timeline.service'; @@ -14,13 +16,16 @@ import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/c templateUrl: './intake.component.html', styleUrls: ['./intake.component.scss'], }) -export class IntakeComponent implements OnInit { +export class IntakeComponent implements OnInit, OnDestroy { + $destroy = new Subject(); + dateSubmittedToAlc?: string; notification?: NotificationDto; localGovernments: { label: string; value: string; disabled?: boolean | null }[] = []; contactEmail: string | null = null; responseSent = false; responseDate: number | null = null; + regions: { label: string; value: string }[] = []; constructor( private notificationDetailService: NotificationDetailService, @@ -28,11 +33,12 @@ export class IntakeComponent implements OnInit { private notificationTimelineService: NotificationTimelineService, private localGovernmentService: ApplicationLocalGovernmentService, private confirmationDialogService: ConfirmationDialogService, + private applicationService: ApplicationService, private toastService: ToastService, ) {} ngOnInit(): void { - this.notificationDetailService.$notification.subscribe((notification) => { + this.notificationDetailService.$notification.pipe(takeUntil(this.$destroy)).subscribe((notification) => { if (notification) { this.dateSubmittedToAlc = moment(notification.dateSubmittedToAlc).format(environment.dateFormat); this.notification = notification; @@ -41,9 +47,21 @@ export class IntakeComponent implements OnInit { } }); + this.applicationService.$applicationRegions.pipe(takeUntil(this.$destroy)).subscribe((regions) => { + this.regions = regions.map((region) => ({ + label: region.label, + value: region.code, + })); + }); + this.loadGovernments(); } + ngOnDestroy(): void { + this.$destroy.next(); + this.$destroy.complete(); + } + async updateNotificationDate(field: keyof UpdateNotificationDto, time: number) { const notification = this.notification; if (notification) { @@ -101,6 +119,17 @@ export class IntakeComponent implements OnInit { }); } + async updateRegion($event: string | string[] | null) { + if (this.notification && $event && !Array.isArray($event)) { + const update = await this.notificationDetailService.update(this.notification.fileNumber, { + regionCode: $event, + }); + if (update) { + this.toastService.showSuccessToast('Notification updated'); + } + } + } + async resendResponse() { if (this.notification) { const res = await this.notificationDetailService.resendResponse(this.notification.fileNumber); diff --git a/alcs-frontend/src/app/services/notification/notification.dto.ts b/alcs-frontend/src/app/services/notification/notification.dto.ts index a85c2ba4aa..357309a5eb 100644 --- a/alcs-frontend/src/app/services/notification/notification.dto.ts +++ b/alcs-frontend/src/app/services/notification/notification.dto.ts @@ -1,5 +1,4 @@ import { BaseCodeDto } from '../../shared/dto/base.dto'; -import { LocalGovernmentDto } from '../admin-local-government/admin-local-government.dto'; import { ApplicationRegionDto } from '../application/application-code.dto'; import { ApplicationLocalGovernmentDto } from '../application/application-local-government/application-local-government.dto'; import { CardDto } from '../card/card.dto'; @@ -31,6 +30,7 @@ export interface UpdateNotificationDto { summary?: string; staffObservations?: string; proposalEndDate?: number; + regionCode?: string; } export interface NotificationTypeDto extends BaseCodeDto { diff --git a/services/apps/alcs/src/alcs/notification/notification.dto.ts b/services/apps/alcs/src/alcs/notification/notification.dto.ts index 95ac6dd44a..65322c9dca 100644 --- a/services/apps/alcs/src/alcs/notification/notification.dto.ts +++ b/services/apps/alcs/src/alcs/notification/notification.dto.ts @@ -58,6 +58,10 @@ export class UpdateNotificationDto { @IsOptional() @IsNumber() proposalEndDate?: number; + + @IsOptional() + @IsString() + regionCode?: string; } export class CreateNotificationServiceDto { diff --git a/services/apps/alcs/src/alcs/notification/notification.service.ts b/services/apps/alcs/src/alcs/notification/notification.service.ts index 8e6e88fdc8..a9dabf3155 100644 --- a/services/apps/alcs/src/alcs/notification/notification.service.ts +++ b/services/apps/alcs/src/alcs/notification/notification.service.ts @@ -218,6 +218,12 @@ export class NotificationService { ); } + if (updateDto.regionCode) { + notification.region = await this.codeService.fetchRegion( + updateDto.regionCode, + ); + } + notification.staffObservations = filterUndefined( updateDto.staffObservations, notification.staffObservations, From 104ced9bcc2bfa81d0d05dea4e0cf858a8f8abe5 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 30 Apr 2024 14:45:35 -0700 Subject: [PATCH 003/103] Fix File Type on Public Search * Was broken for all types! --- .../public-application-search.service.ts | 2 +- .../public-notice-of-intent-search.service.ts | 18 ++++++++++++++++++ .../public-notification-search.service.ts | 18 ++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts index 990bbdd7cc..2cbf0d6cf4 100644 --- a/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts +++ b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts @@ -386,7 +386,7 @@ export class PublicApplicationSearchService { query = query.andWhere( new Brackets((qb) => qb - .where('appSearch.application_type_code IN (:...typeCodes)', { + .where('app.type_code IN (:...typeCodes)', { typeCodes: searchDto.fileTypes, }) .orWhere( diff --git a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts index 522df077c9..5c13ac3af5 100644 --- a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts +++ b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts @@ -118,6 +118,10 @@ export class PublicNoticeOfIntentSearchService { this.addFileNumberResults(searchDto, promises); } + if (searchDto.fileTypes) { + this.addFileTypeResults(searchDto, promises); + } + if (searchDto.portalStatusCodes && searchDto.portalStatusCodes.length > 0) { this.addPortalStatusResult(searchDto, promises); } @@ -358,4 +362,18 @@ export class PublicNoticeOfIntentSearchService { promises.push(query.getMany()); } + + private addFileTypeResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + if (searchDto.fileTypes.includes('NOI')) { + const query = this.noiRepository.find({ + select: { + fileNumber: true, + }, + }); + promises.push(query); + } + } } diff --git a/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.ts b/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.ts index 9b44b4f3d2..a70ce98b44 100644 --- a/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.ts +++ b/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.ts @@ -127,6 +127,10 @@ export class PublicNotificationSearchService { await this.addGovernmentResults(searchDto, promises); } + if (searchDto.fileTypes) { + this.addFileTypeResults(searchDto, promises); + } + if (searchDto.regionCodes && searchDto.regionCodes.length > 0) { this.addRegionResults(searchDto, promises); } @@ -306,4 +310,18 @@ export class PublicNotificationSearchService { promises.push(query.getMany()); } + + private addFileTypeResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + if (searchDto.fileTypes.includes('SRW')) { + const query = this.notificationRepository.find({ + select: { + fileNumber: true, + }, + }); + promises.push(query); + } + } } From e69e81d5af2621d5ad3a048f29c5988eb057a4a5 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 30 Apr 2024 16:24:44 -0700 Subject: [PATCH 004/103] Allow Snowplow via CSP * Track page changes --- alcs-frontend/nginx.conf | 2 +- alcs-frontend/src/app/app.component.ts | 11 +++++++++-- alcs-frontend/src/app/app.module.ts | 2 ++ .../app/services/analytics/analytics.service.ts | 17 +++++++++++++++++ portal-frontend/nginx.conf | 2 +- portal-frontend/src/app/app.component.ts | 1 + 6 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 alcs-frontend/src/app/services/analytics/analytics.service.ts diff --git a/alcs-frontend/nginx.conf b/alcs-frontend/nginx.conf index 6ccc98d57e..b7847867d7 100644 --- a/alcs-frontend/nginx.conf +++ b/alcs-frontend/nginx.conf @@ -19,7 +19,7 @@ http { add_header 'X-XSS-Protection' '1; mode=block'; add_header 'Strict-Transport-Security' 'max-age=31536000; includeSubDomains; preload'; add_header 'Cache-control' 'no-cache'; - add_header 'Content-Security-Policy' "default-src 'self';img-src 'self';style-src 'unsafe-inline' 'self';connect-src $ENABLED_CONNECT_SRC; font-src 'self' https://fonts.gstatic.com https://fonts.googleapis.com; base-uri 'self'; object-src https://nrs.objectstore.gov.bc.ca; frame-src https://alcs-metabase-test.apps.silver.devops.gov.bc.ca https://alcs-metabase-prod.apps.silver.devops.gov.bc.ca https://nrs.objectstore.gov.bc.ca;"; + add_header 'Content-Security-Policy' "default-src 'self'; img-src 'self'; style-src 'unsafe-inline' 'self'; connect-src $ENABLED_CONNECT_SRC; font-src 'self' https://fonts.gstatic.com https://fonts.googleapis.com; base-uri 'self'; object-src https://nrs.objectstore.gov.bc.ca; frame-src https://alcs-metabase-test.apps.silver.devops.gov.bc.ca https://alcs-metabase-prod.apps.silver.devops.gov.bc.ca https://nrs.objectstore.gov.bc.ca; script-src 'self' https://www2.gov.bc.ca"; add_header 'Permissions-Policy' 'camera=(), geolocation=(), microphone=()'; add_header 'Referrer-Policy' 'same-origin'; diff --git a/alcs-frontend/src/app/app.component.ts b/alcs-frontend/src/app/app.component.ts index fd3a584643..295e4b5efb 100644 --- a/alcs-frontend/src/app/app.component.ts +++ b/alcs-frontend/src/app/app.component.ts @@ -1,10 +1,17 @@ -import { Component } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; +import { AnalyticsService } from './services/analytics/analytics.service'; @Component({ selector: 'app-root', templateUrl: './app.component.html', styleUrls: ['./app.component.scss'], }) -export class AppComponent { +export class AppComponent implements OnInit { title = 'alcs-frontend'; + + constructor(private analyticsService: AnalyticsService) {} + + ngOnInit(): void { + this.analyticsService.init(); + } } diff --git a/alcs-frontend/src/app/app.module.ts b/alcs-frontend/src/app/app.module.ts index dda3216465..f6f7d1d014 100644 --- a/alcs-frontend/src/app/app.module.ts +++ b/alcs-frontend/src/app/app.module.ts @@ -12,6 +12,7 @@ import { AuthorizationComponent } from './features/authorization/authorization.c import { NotFoundComponent } from './features/errors/not-found/not-found.component'; import { LoginComponent } from './features/login/login.component'; import { ProvisionComponent } from './features/provision/provision.component'; +import { AnalyticsService } from './services/analytics/analytics.service'; import { AuthInterceptor } from './services/authentication/auth.interceptor'; import { TokenRefreshService } from './services/authentication/token-refresh.service'; import { UnauthorizedInterceptor } from './services/authentication/unauthorized.interceptor'; @@ -37,6 +38,7 @@ import { SharedModule } from './shared/shared.module'; ], imports: [BrowserModule, BrowserAnimationsModule, SharedModule.forRoot(), AppRoutingModule, MomentDateModule], providers: [ + AnalyticsService, { provide: HTTP_INTERCEPTORS, useClass: AuthInterceptor, multi: true }, { provide: HTTP_INTERCEPTORS, useClass: UnauthorizedInterceptor, multi: true }, { provide: MAT_DIALOG_DEFAULT_OPTIONS, useValue: { panelClass: 'mat-dialog-override' } }, diff --git a/alcs-frontend/src/app/services/analytics/analytics.service.ts b/alcs-frontend/src/app/services/analytics/analytics.service.ts new file mode 100644 index 0000000000..107e47bf05 --- /dev/null +++ b/alcs-frontend/src/app/services/analytics/analytics.service.ts @@ -0,0 +1,17 @@ +import { Injectable } from '@angular/core'; +import { NavigationEnd, Router } from '@angular/router'; + +@Injectable({ + providedIn: 'root', +}) +export class AnalyticsService { + constructor(private router: Router) {} + + init() { + this.router.events.subscribe((event) => { + if (event instanceof NavigationEnd) { + (window as any).snowplow('trackPageView'); + } + }); + } +} diff --git a/portal-frontend/nginx.conf b/portal-frontend/nginx.conf index 8db9efc810..09766604d8 100644 --- a/portal-frontend/nginx.conf +++ b/portal-frontend/nginx.conf @@ -19,7 +19,7 @@ http { add_header 'X-XSS-Protection' '1; mode=block'; add_header 'Strict-Transport-Security' 'max-age=31536000; includeSubDomains; preload'; add_header 'Cache-control' 'no-cache'; - add_header 'Content-Security-Policy' "default-src 'self';img-src 'self';style-src 'unsafe-inline' 'self';connect-src $ENABLED_CONNECT_SRC; font-src 'self' https://fonts.gstatic.com https://fonts.googleapis.com; base-uri 'self'; object-src https://nrs.objectstore.gov.bc.ca; frame-src https://nrs.objectstore.gov.bc.ca;"; + add_header 'Content-Security-Policy' "default-src 'self'; img-src 'self'; style-src 'unsafe-inline' 'self'; connect-src $ENABLED_CONNECT_SRC; font-src 'self' https://fonts.gstatic.com https://fonts.googleapis.com; base-uri 'self'; object-src https://nrs.objectstore.gov.bc.ca; frame-src https://nrs.objectstore.gov.bc.ca; script-src 'self' https://www2.gov.bc.ca;"; add_header 'Permissions-Policy' 'camera=(), geolocation=(), microphone=()'; add_header 'Referrer-Policy' 'same-origin'; diff --git a/portal-frontend/src/app/app.component.ts b/portal-frontend/src/app/app.component.ts index a0fdf755fe..b3aa9e931c 100644 --- a/portal-frontend/src/app/app.component.ts +++ b/portal-frontend/src/app/app.component.ts @@ -17,6 +17,7 @@ export class AppComponent implements OnInit { this.router.events.subscribe((event) => { if (event instanceof NavigationEnd) { this.showHeaderFooter = !event.url.includes('/alcs/'); + (window as any).snowplow('trackPageView'); } }); } From c9ea98c76e17c6d8ba17fc3d8abcf1353c99dc6f Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 30 Apr 2024 16:53:53 -0700 Subject: [PATCH 005/103] Move snowplow to its own script --- portal-frontend/src/assets/snowplow.js | 30 +++++++++++++++++++++ portal-frontend/src/index.html | 36 +------------------------- 2 files changed, 31 insertions(+), 35 deletions(-) create mode 100644 portal-frontend/src/assets/snowplow.js diff --git a/portal-frontend/src/assets/snowplow.js b/portal-frontend/src/assets/snowplow.js new file mode 100644 index 0000000000..d87b492873 --- /dev/null +++ b/portal-frontend/src/assets/snowplow.js @@ -0,0 +1,30 @@ +// +(function(p, l, o, w, i, n, g) { + if (!p[i]) { + p.GlobalSnowplowNamespace = p.GlobalSnowplowNamespace || []; + p.GlobalSnowplowNamespace.push(i); + p[i] = function() { + (p[i].q = p[i].q || []).push(arguments); + }; + p[i].q = p[i].q || []; + n = l.createElement(o); + g = l.getElementsByTagName(o)[0]; + n.async = 1; + n.src = w; + g.parentNode.insertBefore(n, g); + } +})(window, document, "script", "https://www2.gov.bc.ca/StaticWebResources/static/sp/sp-2-14-0.js", "snowplow"); +var collector = "spm.apps.gov.bc.ca"; +window.snowplow("newTracker", "rt", collector, { + appId: "Snowplow_standalone", + cookieLifetime: 86400 * 548, + platform: "web", + post: true, + forceSecureTracker: true, + contexts: { + webPage: true, performanceTiming: true + } +}); +window.snowplow("enableActivityTracking", 30, 30); // Ping every 30 seconds after 30 seconds +window.snowplow("enableLinkClickTracking"); +// diff --git a/portal-frontend/src/index.html b/portal-frontend/src/index.html index ca34a10771..8f28f22c83 100644 --- a/portal-frontend/src/index.html +++ b/portal-frontend/src/index.html @@ -9,41 +9,7 @@ - - + From 59b01cf40dd0c16c3feeb1cd4d097d837093dece Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 1 May 2024 10:40:35 -0700 Subject: [PATCH 006/103] More Snowplow * Add script hash to enable it to load inline * Remove analytics service from ALCS, we are only doing tracking on portal --- alcs-frontend/src/app/app.component.ts | 11 +++-------- alcs-frontend/src/app/app.module.ts | 2 -- .../app/services/analytics/analytics.service.ts | 17 ----------------- portal-frontend/nginx.conf | 2 +- 4 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 alcs-frontend/src/app/services/analytics/analytics.service.ts diff --git a/alcs-frontend/src/app/app.component.ts b/alcs-frontend/src/app/app.component.ts index 295e4b5efb..b9e3e83ade 100644 --- a/alcs-frontend/src/app/app.component.ts +++ b/alcs-frontend/src/app/app.component.ts @@ -1,17 +1,12 @@ -import { Component, OnInit } from '@angular/core'; -import { AnalyticsService } from './services/analytics/analytics.service'; +import { Component } from '@angular/core'; @Component({ selector: 'app-root', templateUrl: './app.component.html', styleUrls: ['./app.component.scss'], }) -export class AppComponent implements OnInit { +export class AppComponent { title = 'alcs-frontend'; - constructor(private analyticsService: AnalyticsService) {} - - ngOnInit(): void { - this.analyticsService.init(); - } + constructor() {} } diff --git a/alcs-frontend/src/app/app.module.ts b/alcs-frontend/src/app/app.module.ts index f6f7d1d014..dda3216465 100644 --- a/alcs-frontend/src/app/app.module.ts +++ b/alcs-frontend/src/app/app.module.ts @@ -12,7 +12,6 @@ import { AuthorizationComponent } from './features/authorization/authorization.c import { NotFoundComponent } from './features/errors/not-found/not-found.component'; import { LoginComponent } from './features/login/login.component'; import { ProvisionComponent } from './features/provision/provision.component'; -import { AnalyticsService } from './services/analytics/analytics.service'; import { AuthInterceptor } from './services/authentication/auth.interceptor'; import { TokenRefreshService } from './services/authentication/token-refresh.service'; import { UnauthorizedInterceptor } from './services/authentication/unauthorized.interceptor'; @@ -38,7 +37,6 @@ import { SharedModule } from './shared/shared.module'; ], imports: [BrowserModule, BrowserAnimationsModule, SharedModule.forRoot(), AppRoutingModule, MomentDateModule], providers: [ - AnalyticsService, { provide: HTTP_INTERCEPTORS, useClass: AuthInterceptor, multi: true }, { provide: HTTP_INTERCEPTORS, useClass: UnauthorizedInterceptor, multi: true }, { provide: MAT_DIALOG_DEFAULT_OPTIONS, useValue: { panelClass: 'mat-dialog-override' } }, diff --git a/alcs-frontend/src/app/services/analytics/analytics.service.ts b/alcs-frontend/src/app/services/analytics/analytics.service.ts deleted file mode 100644 index 107e47bf05..0000000000 --- a/alcs-frontend/src/app/services/analytics/analytics.service.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { Injectable } from '@angular/core'; -import { NavigationEnd, Router } from '@angular/router'; - -@Injectable({ - providedIn: 'root', -}) -export class AnalyticsService { - constructor(private router: Router) {} - - init() { - this.router.events.subscribe((event) => { - if (event instanceof NavigationEnd) { - (window as any).snowplow('trackPageView'); - } - }); - } -} diff --git a/portal-frontend/nginx.conf b/portal-frontend/nginx.conf index 09766604d8..24ca3ba89c 100644 --- a/portal-frontend/nginx.conf +++ b/portal-frontend/nginx.conf @@ -19,7 +19,7 @@ http { add_header 'X-XSS-Protection' '1; mode=block'; add_header 'Strict-Transport-Security' 'max-age=31536000; includeSubDomains; preload'; add_header 'Cache-control' 'no-cache'; - add_header 'Content-Security-Policy' "default-src 'self'; img-src 'self'; style-src 'unsafe-inline' 'self'; connect-src $ENABLED_CONNECT_SRC; font-src 'self' https://fonts.gstatic.com https://fonts.googleapis.com; base-uri 'self'; object-src https://nrs.objectstore.gov.bc.ca; frame-src https://nrs.objectstore.gov.bc.ca; script-src 'self' https://www2.gov.bc.ca;"; + add_header 'Content-Security-Policy' "default-src 'self'; img-src 'self'; style-src 'unsafe-inline' 'self'; connect-src $ENABLED_CONNECT_SRC; font-src 'self' https://fonts.gstatic.com https://fonts.googleapis.com; base-uri 'self'; object-src https://nrs.objectstore.gov.bc.ca; frame-src https://nrs.objectstore.gov.bc.ca; script-src 'self' https://www2.gov.bc.ca sha256-evje5KswYvntfuZqc5jmvUSANhIntI7Or6vVnjxGGQE=;"; add_header 'Permissions-Policy' 'camera=(), geolocation=(), microphone=()'; add_header 'Referrer-Policy' 'same-origin'; From 00088fcdb59f98161370ff183074fd19e03aa903 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 1 May 2024 11:40:56 -0700 Subject: [PATCH 007/103] Add connect-src for snowplower, fix main docker --- alcs-frontend/Dockerfile | 6 ++++-- portal-frontend/Dockerfile | 2 ++ portal-frontend/nginx.conf | 2 +- services/config/default.json | 12 ++++++++---- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/alcs-frontend/Dockerfile b/alcs-frontend/Dockerfile index 8b3552cf30..0e4e9569d5 100644 --- a/alcs-frontend/Dockerfile +++ b/alcs-frontend/Dockerfile @@ -5,14 +5,16 @@ FROM node:20-alpine AS build WORKDIR /app # Copy package.json file -COPY package.json . +COPY package.json package-lock.json ./ # Install dependencies -RUN npm install +RUN npm ci # Copy the source code to the /app directory COPY . . +ENV NODE_OPTIONS="--max-old-space-size=2048" + # Build the application RUN npm run build -- --output-path=dist --output-hashing=all diff --git a/portal-frontend/Dockerfile b/portal-frontend/Dockerfile index 8b3f351595..212720b0e3 100644 --- a/portal-frontend/Dockerfile +++ b/portal-frontend/Dockerfile @@ -13,6 +13,8 @@ RUN npm ci # Copy the source code to the /app directory COPY . . +ENV NODE_OPTIONS="--max-old-space-size=2048" + # Build the application RUN npm run build -- --output-path=dist --output-hashing=all diff --git a/portal-frontend/nginx.conf b/portal-frontend/nginx.conf index 24ca3ba89c..4f9a35f8a8 100644 --- a/portal-frontend/nginx.conf +++ b/portal-frontend/nginx.conf @@ -19,7 +19,7 @@ http { add_header 'X-XSS-Protection' '1; mode=block'; add_header 'Strict-Transport-Security' 'max-age=31536000; includeSubDomains; preload'; add_header 'Cache-control' 'no-cache'; - add_header 'Content-Security-Policy' "default-src 'self'; img-src 'self'; style-src 'unsafe-inline' 'self'; connect-src $ENABLED_CONNECT_SRC; font-src 'self' https://fonts.gstatic.com https://fonts.googleapis.com; base-uri 'self'; object-src https://nrs.objectstore.gov.bc.ca; frame-src https://nrs.objectstore.gov.bc.ca; script-src 'self' https://www2.gov.bc.ca sha256-evje5KswYvntfuZqc5jmvUSANhIntI7Or6vVnjxGGQE=;"; + add_header 'Content-Security-Policy' "default-src 'self'; img-src 'self'; style-src 'unsafe-inline' 'self'; connect-src $ENABLED_CONNECT_SRC https://spm.apps.gov.bc.ca; font-src 'self' https://fonts.gstatic.com https://fonts.googleapis.com; base-uri 'self'; object-src https://nrs.objectstore.gov.bc.ca; frame-src https://nrs.objectstore.gov.bc.ca; script-src 'self' https://www2.gov.bc.ca 'sha256-evje5KswYvntfuZqc5jmvUSANhIntI7Or6vVnjxGGQE=';"; add_header 'Permissions-Policy' 'camera=(), geolocation=(), microphone=()'; add_header 'Referrer-Policy' 'same-origin'; diff --git a/services/config/default.json b/services/config/default.json index f4b411c42c..6cfa5e4351 100644 --- a/services/config/default.json +++ b/services/config/default.json @@ -32,7 +32,9 @@ "AUTH_SERVER": "test.loginproxy.gov.bc.ca", "AUTH_SERVER_URL": "https://test.loginproxy.gov.bc.ca/auth", "AUTH_TOKEN_URL": "https://test.loginproxy.gov.bc.ca/auth/realms/standard/protocol/openid-connect/token", - "SCOPES": ["openid"], + "SCOPES": [ + "openid" + ], "REALM": "standard" }, "SITEMINDER": { @@ -61,12 +63,14 @@ "MAX_FILE_SIZE": 104857600 }, "REDIS": { - "HOST": "localhost", + "HOST": "redis", "PORT": "6379", - "PASSWORD": "" + "PASSWORD": "redis" }, "EMAIL": { - "DEFAULT_ADMINS": [""] + "DEFAULT_ADMINS": [ + "" + ] }, "GRPC": { "BIND_URL": "localhost:50057", From 8575bac32f9b0a5d9723b3b6fb79f2fea634f578 Mon Sep 17 00:00:00 2001 From: Mekhti Date: Thu, 2 May 2024 11:15:57 -0700 Subject: [PATCH 008/103] wip status reset --- .../lfng_status_adjustment/__init__.py | 1 + .../lfng_status_adjustment.py | 231 ++++++++++++++++++ .../sql/oats_latest_lfng_status.sql | 78 ++++++ .../sql/oats_latest_lfng_status_back.sql | 38 +++ .../sql/oats_latest_lfng_status_count.sql | 32 +++ .../applications/post_launch/__init__.py | 1 + .../menu/post_launch_commands/applications.py | 18 ++ bin/migrate-oats-data/migrate.py | 17 +- 8 files changed, 401 insertions(+), 15 deletions(-) create mode 100644 bin/migrate-oats-data/applications/lfng_status_adjustment/__init__.py create mode 100644 bin/migrate-oats-data/applications/lfng_status_adjustment/lfng_status_adjustment.py create mode 100644 bin/migrate-oats-data/applications/lfng_status_adjustment/sql/oats_latest_lfng_status.sql create mode 100644 bin/migrate-oats-data/applications/lfng_status_adjustment/sql/oats_latest_lfng_status_back.sql create mode 100644 bin/migrate-oats-data/applications/lfng_status_adjustment/sql/oats_latest_lfng_status_count.sql diff --git a/bin/migrate-oats-data/applications/lfng_status_adjustment/__init__.py b/bin/migrate-oats-data/applications/lfng_status_adjustment/__init__.py new file mode 100644 index 0000000000..50612f8947 --- /dev/null +++ b/bin/migrate-oats-data/applications/lfng_status_adjustment/__init__.py @@ -0,0 +1 @@ +from .lfng_status_adjustment import readjust_lfng_statuses \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/lfng_status_adjustment/lfng_status_adjustment.py b/bin/migrate-oats-data/applications/lfng_status_adjustment/lfng_status_adjustment.py new file mode 100644 index 0000000000..a1781e2752 --- /dev/null +++ b/bin/migrate-oats-data/applications/lfng_status_adjustment/lfng_status_adjustment.py @@ -0,0 +1,231 @@ +from common import ( + BATCH_UPLOAD_SIZE, + setup_and_get_logger, + add_timezone_and_keep_date_part, +) +from db import inject_conn_pool +from psycopg2.extras import RealDictCursor, execute_batch + +etl_name = "readjust_lfng_statuses" +logger = setup_and_get_logger(etl_name) + + +@inject_conn_pool +def readjust_lfng_statuses(conn=None, batch_size=BATCH_UPLOAD_SIZE): + """ + TODO copy description from JIRA + + Args: + conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. + batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE. + """ + + logger.info(f"Start {etl_name}") + with conn.cursor(cursor_factory=RealDictCursor) as cursor: + with open( + "applications/lfng_status_adjustment/sql/oats_latest_lfng_status_count.sql", + "r", + encoding="utf-8", + ) as sql_file: + count_query = sql_file.read() + cursor.execute(count_query) + count_total = dict(cursor.fetchone())["count"] + logger.info(f"Total applications to process: {count_total}") + + failed_inserts = 0 + successful_updates_count = 0 + last_entry_id = 0 + with open( + "applications/lfng_status_adjustment/sql/oats_latest_lfng_status.sql", + "r", + encoding="utf-8", + ) as sql_file: + query = sql_file.read() + while True: + cursor.execute( + f""" + {query} + AND lols.alr_application_id > {last_entry_id} + ORDER BY lols.alr_application_id; + """ + ) + + rows = cursor.fetchmany(batch_size) + + if not rows: + break + try: + processed_applications_count = _process_statuses_for_update( + conn, batch_size, cursor, rows + ) + + successful_updates_count = ( + successful_updates_count + processed_applications_count + ) + last_entry_id = dict(rows[-1])["alr_application_id"] + + logger.debug( + f"retrieved/inserted items count: {0}; total successfully updated entries so far {successful_updates_count}; last updated alr_application_id: {last_entry_id}" + ) + except Exception as err: + logger.exception(err) + conn.rollback() + failed_inserts = count_total - successful_updates_count + last_entry_id = last_entry_id + 1 + + logger.info( + f"Finished {etl_name}: total amount of successful inserts {successful_updates_count}, total failed inserts {failed_inserts}" + ) + + +def _process_statuses_for_update(conn, batch_size, cursor, rows): + + update_statements = [] + grouped_by_fn = [] + processed_applications_count = 0 + + for row in rows: + if not grouped_by_fn or ( + grouped_by_fn + and grouped_by_fn[0]["alr_application_id"] == row["alr_application_id"] + ): + grouped_by_fn.append(row) + else: + _prepare_update_statement(grouped_by_fn, update_statements) + + processed_applications_count += 1 + grouped_by_fn = [] + grouped_by_fn.append(row) + # TODO: delete this + # for update_statement in update_statements: + # cursor.execute(update_statement) + + # conn.commit() + + combined_statements = "; ".join(update_statements) + print('combined_statements: ', combined_statements) + #TODO uncomment this + # cursor.execute(combined_statements) + # conn.commit() + return processed_applications_count + + +def _prepare_update_statement(statuses, update_statements): + """ + 1. get OATS status + 2. map it to ALCS status + 3. check if statuses have the status from step 2 + 4. get the weight of status from step 2 + 5. check if status from step 2 is of max weight + 6. if yes then proceed otherwise for all statuses that are higher weight rest effective_date and email_sent + """ + oats_status = statuses[0]["accomplishment_code"] + alcs_status = _map_oats_accomplishment_code_to_alcs_status_code(oats_status) + + print( + "oats_status ", + oats_status, + " ", + alcs_status, + ) + + if alcs_status == "RFFG": + update_statements.append( + _compile_update_statement(statuses, oats_status, "RFFG", []) + ) + # check if RFFG exists in statuses and if yes do nothing, otherwise set to specific value + # status = _get_status(statuses, "RFFG") + # if status: + # print("no action needed") + # else: + # print("Set RFFG value") + # date = add_timezone_and_keep_date_part(status["completion_date"]) + # update_statements.append( + # f""" + # UPDATE alcs.application_submission_to_submission_status + # SET effective_date = {date}, + # email_sent_date = '0001-01-01 06:00:00.000 -0800' + # WHERE status_type_code = 'RFFG' AND submission_uuid = {status["uuid"]}; + # """ + # ) + elif alcs_status == "REVG": + update_statements.append( + _compile_update_statement(statuses, oats_status, "REVG", ["RFFG"]) + ) + elif alcs_status == "SUBG": + update_statements.append( + _compile_update_statement(statuses, oats_status, "SUBG", ["RFFG", "REVG"]) + ) + elif alcs_status == "INCM": + update_statements.append( + _compile_update_statement( + statuses, oats_status, "INCM", ["RFFG", "REVG", "SUBG", "WRNG"] + ) + ) + elif alcs_status == "WRNG": + update_statements.append( + _compile_update_statement( + statuses, oats_status, "WRNG", ["RFFG", "REVG", "SUBG", "INCM"] + ) + ) + + +def _compile_update_statement( + statuses, oats_target_status, alcs_target_status, alcs_reset_statuses_codes=None +): + oats_status = _get_oats_status(statuses, oats_target_status) + alcs_status = _get_alcs_status(statuses, oats_target_status) + print("status retrieved ", oats_status, alcs_status, statuses) + + str_statuses_to_reset = "" + reset_statuses_query = "" + + if alcs_reset_statuses_codes: + str_statuses_to_reset = "', '".join(alcs_reset_statuses_codes) + reset_statuses_query = f""" + UPDATE alcs.application_submission_to_submission_status + SET effective_date = NULL, + email_sent_date = NULL + WHERE status_type_code in ('{str_statuses_to_reset}') AND submission_uuid = '{oats_status["uuid"]}'; + """ + + if alcs_status: + print(f"reset {str_statuses_to_reset}") + return reset_statuses_query + else: + print(f"{str_statuses_to_reset} and set {alcs_target_status}") + date = add_timezone_and_keep_date_part(oats_status["completion_date"]) + return f""" + {reset_statuses_query} + + UPDATE alcs.application_submission_to_submission_status + SET effective_date = '{date}', + email_sent_date = '0001-01-01 06:00:00.000 -0800' + WHERE status_type_code = '{alcs_target_status}' AND submission_uuid = '{oats_status["uuid"]}'; + """ + + +def _get_oats_status(statuses, code): + for status in statuses: + if status["accomplishment_code"] == code: + return status + return None + +def _get_alcs_status(statuses, code): + for status in statuses: + if status["status_type_code"] == code: + return status + return None + + +def _map_oats_accomplishment_code_to_alcs_status_code(code): + if code == "LRF": + return "RFFG" + if code == "SLG": + return "SUBG" + if code == "WLG": + return "WRNG" + if code == "ULG": + return "REVG" + if code == "LGI": + return "INCM" diff --git a/bin/migrate-oats-data/applications/lfng_status_adjustment/sql/oats_latest_lfng_status.sql b/bin/migrate-oats-data/applications/lfng_status_adjustment/sql/oats_latest_lfng_status.sql new file mode 100644 index 0000000000..fb05be4ad7 --- /dev/null +++ b/bin/migrate-oats-data/applications/lfng_status_adjustment/sql/oats_latest_lfng_status.sql @@ -0,0 +1,78 @@ +WITH when_updated_grouped AS ( + SELECT + a.when_updated, + a.alr_application_id, + a.accomplishment_code, + COUNT(*) OVER (PARTITION BY a.when_updated, a.alr_application_id) as cnt + FROM + oats.oats_accomplishments a + WHERE a.when_updated IS NOT NULL +), when_updated_with_status AS ( + SELECT + when_updated, + alr_application_id, + accomplishment_code, + cnt + FROM + when_updated_grouped + WHERE + cnt > 1 +), completion_grouped AS ( + SELECT + wuws.when_updated, + wuws.alr_application_id, + wuws.accomplishment_code, + COUNT(*) OVER (PARTITION BY oa.completion_date, wuws.alr_application_id) as cnt + FROM + when_updated_with_status wuws + JOIN oats.oats_accomplishments oa ON oa.alr_application_id = wuws.alr_application_id AND oa.accomplishment_code = wuws.accomplishment_code + WHERE oa.completion_date IS NOT NULL +), completion_with_status AS ( + SELECT + when_updated, + alr_application_id, + accomplishment_code, + cnt + FROM + completion_grouped + WHERE + cnt > 1 +), +alr_applications_to_exclude AS ( SELECT alr_application_id FROM completion_with_status) +, submitted_under_review AS ( + SELECT astss.submission_uuid AS initial_sub_uuid FROM alcs.application_submission_to_submission_status astss + JOIN alcs.application_submission as2 ON as2."uuid" = astss.submission_uuid AND as2.audit_created_by='oats_etl' AND as2.audit_updated_by IS NULL + WHERE astss.effective_date IS NOT NULL AND astss.status_type_code IN ('SUBG', 'REVG') + GROUP BY astss.submission_uuid +) +, returned_incomplete_refused AS ( + SELECT as2.file_number, string_agg(astss.status_type_code, ', ') + FROM submitted_under_review sur + JOIN alcs.application_submission_to_submission_status astss ON astss.submission_uuid = sur.initial_sub_uuid + JOIN alcs.application_submission as2 ON as2.uuid = astss.submission_uuid + WHERE astss.effective_date IS NOT NULL AND astss.status_type_code IN ('WRNG', 'INCM', 'RFFG', 'SUBG', 'REVG') + GROUP BY as2.file_number +) +, oats_accomplishments AS ( + SELECT rir.*, oaac.* FROM oats.oats_accomplishments oaac + JOIN returned_incomplete_refused AS rir ON rir.file_number::bigint = oaac.alr_application_id + WHERE oaac.accomplishment_code IN ('LRF', 'SLG', 'WLG', 'ULG', 'LGI') +) +-- ranked_statuses will select the latest status based on max completion_date, then when_updated, then when_created for all records per file_number +, ranked_statuses AS ( + SELECT *, + ROW_NUMBER() OVER (PARTITION BY file_number ORDER BY COALESCE(completion_date, '0001-01-01') DESC, COALESCE(when_updated, '0001-01-01') DESC, COALESCE(when_created, '0001-01-01') DESC) AS rn + FROM oats_accomplishments +) +, latest_oats_lfng_status AS ( + SELECT alr_application_id, accomplishment_code, completion_date, when_created, when_updated, revision_count FROM ranked_statuses + WHERE rn = 1 + ORDER BY file_number::bigint +) +SELECT as2.uuid, lols.alr_application_id, accomplishment_code, lols.completion_date, when_created, when_updated, astss.status_type_code, astss.effective_date, asst.weight +FROM alcs.application_submission_to_submission_status astss +JOIN alcs.application_submission as2 ON as2.uuid = astss.submission_uuid +JOIN alcs.application_submission_status_type asst ON asst.code = astss.status_type_code +JOIN latest_oats_lfng_status lols ON lols.alr_application_id = as2.file_number::bigint +LEFT JOIN alr_applications_to_exclude aate ON aate.alr_application_id = lols.alr_application_id +WHERE astss.effective_date IS NOT NULL AND astss.status_type_code IN ('WRNG', 'INCM', 'RFFG', 'SUBG', 'REVG') AND aate.alr_application_id IS NULL \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/lfng_status_adjustment/sql/oats_latest_lfng_status_back.sql b/bin/migrate-oats-data/applications/lfng_status_adjustment/sql/oats_latest_lfng_status_back.sql new file mode 100644 index 0000000000..5f2ca65b49 --- /dev/null +++ b/bin/migrate-oats-data/applications/lfng_status_adjustment/sql/oats_latest_lfng_status_back.sql @@ -0,0 +1,38 @@ + +WITH submitted_under_review AS ( + SELECT astss.submission_uuid AS initial_sub_uuid FROM alcs.application_submission_to_submission_status astss + JOIN alcs.application_submission as2 ON as2."uuid" = astss.submission_uuid AND as2.audit_created_by='oats_etl' AND as2.audit_updated_by IS NULL + WHERE astss.effective_date IS NOT NULL AND astss.status_type_code IN ('SUBG', 'REVG') + GROUP BY astss.submission_uuid +) +, returned_incomplete_refused AS ( + SELECT as2.file_number, string_agg(astss.status_type_code, ', ') + FROM submitted_under_review sur + JOIN alcs.application_submission_to_submission_status astss ON astss.submission_uuid = sur.initial_sub_uuid + JOIN alcs.application_submission as2 ON as2.uuid = astss.submission_uuid + WHERE astss.effective_date IS NOT NULL AND astss.status_type_code IN ('WRNG', 'INCM', 'RFFG', 'SUBG', 'REVG') + GROUP BY as2.file_number +) +, oats_accomplishments AS ( + SELECT rir.*, oaac.* FROM oats.oats_accomplishments oaac + JOIN returned_incomplete_refused AS rir ON rir.file_number::bigint = oaac.alr_application_id + WHERE oaac.accomplishment_code IN ('LRF', 'SLG', 'WLG', 'ULG', 'LGI') +) +-- ranked_statuses will select the latest status based on max completion_date, then when_updated, then when_created for all records per file_number +, ranked_statuses AS ( + SELECT *, + ROW_NUMBER() OVER (PARTITION BY file_number ORDER BY COALESCE(completion_date, '0001-01-01') DESC, COALESCE(when_updated, '0001-01-01') DESC, COALESCE(when_created, '0001-01-01') DESC) AS rn + FROM oats_accomplishments +) +, latest_oats_lfng_status AS ( + SELECT alr_application_id, accomplishment_code, completion_date, when_created, when_updated, revision_count FROM ranked_statuses + WHERE rn = 1 + ORDER BY file_number::bigint +) +SELECT as2.uuid, lols.alr_application_id, accomplishment_code, lols.completion_date, when_created, when_updated, astss.status_type_code, astss.effective_date, asst.weight +FROM alcs.application_submission_to_submission_status astss +JOIN alcs.application_submission as2 ON as2.uuid = astss.submission_uuid +JOIN alcs.application_submission_status_type asst ON asst.code = astss.status_type_code +JOIN latest_oats_lfng_status lols ON lols.alr_application_id = as2.file_number::bigint +WHERE astss.effective_date IS NOT NULL AND astss.status_type_code IN ('WRNG', 'INCM', 'RFFG', 'SUBG', 'REVG') +ORDER BY lols.alr_application_id \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/lfng_status_adjustment/sql/oats_latest_lfng_status_count.sql b/bin/migrate-oats-data/applications/lfng_status_adjustment/sql/oats_latest_lfng_status_count.sql new file mode 100644 index 0000000000..d004f511ff --- /dev/null +++ b/bin/migrate-oats-data/applications/lfng_status_adjustment/sql/oats_latest_lfng_status_count.sql @@ -0,0 +1,32 @@ +-- select latest OATS government status +WITH submitted_under_review AS ( + SELECT astss.submission_uuid AS initial_sub_uuid FROM alcs.application_submission_to_submission_status astss + JOIN alcs.application_submission as2 ON as2."uuid" = astss.submission_uuid AND as2.audit_created_by='oats_etl' AND as2.audit_updated_by IS NULL + WHERE astss.effective_date IS NOT NULL AND astss.status_type_code IN ('SUBG', 'REVG') + GROUP BY astss.submission_uuid +) +, returned_incomplete_refused AS ( + SELECT as2.file_number, string_agg(astss.status_type_code, ', ') + FROM submitted_under_review sur + JOIN alcs.application_submission_to_submission_status astss ON astss.submission_uuid = sur.initial_sub_uuid + JOIN alcs.application_submission as2 ON as2.uuid = astss.submission_uuid + WHERE astss.effective_date IS NOT NULL AND astss.status_type_code IN ('WRNG', 'INCM', 'RFFG', 'SUBG', 'REVG') + GROUP BY as2.file_number +) +, oats_accomplishments AS ( + SELECT rir.*, oaac.* FROM oats.oats_accomplishments oaac + JOIN returned_incomplete_refused AS rir ON rir.file_number::bigint = oaac.alr_application_id + WHERE oaac.accomplishment_code IN ('LRF', 'SLG', 'WLG', 'ULG', 'LGI') +) +-- ranked_statuses will select the latest status based on max between when_created or when_updated for all records per file_number +, ranked_statuses AS ( + SELECT *, GREATEST(COALESCE(when_created, '0001-01-01'), COALESCE(when_updated, '0001-01-01')) AS max_date, ROW_NUMBER() OVER (PARTITION BY file_number ORDER BY GREATEST(COALESCE(when_created, '0001-01-01'), COALESCE(when_updated, '0001-01-01')) DESC) AS rn + FROM oats_accomplishments +) +, latest_oats_lfng_status AS ( + SELECT * FROM ranked_statuses + WHERE + rn = 1 + ORDER BY file_number::bigint +) +SELECT count(*) FROM latest_oats_lfng_status diff --git a/bin/migrate-oats-data/applications/post_launch/__init__.py b/bin/migrate-oats-data/applications/post_launch/__init__.py index 006e44acec..53fac83984 100644 --- a/bin/migrate-oats-data/applications/post_launch/__init__.py +++ b/bin/migrate-oats-data/applications/post_launch/__init__.py @@ -1,2 +1,3 @@ from .migrate_application import * from .clean import * +from ..lfng_status_adjustment import * diff --git a/bin/migrate-oats-data/menu/post_launch_commands/applications.py b/bin/migrate-oats-data/menu/post_launch_commands/applications.py index ef24ab2b59..9910a92199 100644 --- a/bin/migrate-oats-data/menu/post_launch_commands/applications.py +++ b/bin/migrate-oats-data/menu/post_launch_commands/applications.py @@ -1,6 +1,7 @@ from applications.post_launch import ( process_application_etl, clean_alcs_applications, + readjust_lfng_statuses, ) @@ -23,3 +24,20 @@ def application_clean(console): console.log("Beginning ALCS application clean") with console.status("[bold green]Cleaning ALCS Applications...\n") as status: clean_alcs_applications() + + +def application_local_government_status_reset(console, args): + console.log( + "Beginning OATS -> ALCS application local government status reset process" + ) + with console.status( + "[bold green]application import (Application and application related table update in ALCS)...\n" + ) as status: + if args.batch_size: + import_batch_size = args.batch_size + + console.log( + f"Processing applications local government status reset in batch size = {import_batch_size}" + ) + + readjust_lfng_statuses(batch_size=import_batch_size) diff --git a/bin/migrate-oats-data/migrate.py b/bin/migrate-oats-data/migrate.py index 4ddb57a0a1..3748f5d361 100644 --- a/bin/migrate-oats-data/migrate.py +++ b/bin/migrate-oats-data/migrate.py @@ -6,24 +6,17 @@ from menu import setup_menu_args_parser from menu.post_launch_commands import ( - import_all, - clean_all, - application_import, - application_clean, notice_of_intent_import, notice_of_intent_clean, - srw_import, - srw_clean, document_import, document_clean, planning_review_clean, planning_review_import, inquiry_import, inquiry_clean, - document_import_pr_inq, - document_clean_pr_inq, import_all_pr_inq, clean_all_pr_inq, + application_local_government_status_reset, ) from menu import start_obfuscation from db import connection_pool @@ -51,13 +44,7 @@ case "noi-clean": notice_of_intent_clean(console) case "application-import": - application_import(console, args) - case "application-clean": - application_clean(console) - case "srw-import": - srw_import(console, args) - case "srw-clean": - srw_clean(console) + application_local_government_status_reset(console, args) case "document-import": document_import(console, args) case "document-clean": From 2afac1b86ffb9aa5ce2eb95fad603b75ff4a0a01 Mon Sep 17 00:00:00 2001 From: Mekhti Date: Thu, 2 May 2024 15:33:32 -0700 Subject: [PATCH 009/103] reset lfng statuses for applications --- .../lfng_status_adjustment.py | 55 ++++--------------- 1 file changed, 10 insertions(+), 45 deletions(-) diff --git a/bin/migrate-oats-data/applications/lfng_status_adjustment/lfng_status_adjustment.py b/bin/migrate-oats-data/applications/lfng_status_adjustment/lfng_status_adjustment.py index a1781e2752..7b42a538a7 100644 --- a/bin/migrate-oats-data/applications/lfng_status_adjustment/lfng_status_adjustment.py +++ b/bin/migrate-oats-data/applications/lfng_status_adjustment/lfng_status_adjustment.py @@ -4,7 +4,7 @@ add_timezone_and_keep_date_part, ) from db import inject_conn_pool -from psycopg2.extras import RealDictCursor, execute_batch +from psycopg2.extras import RealDictCursor etl_name = "readjust_lfng_statuses" logger = setup_and_get_logger(etl_name) @@ -64,8 +64,8 @@ def readjust_lfng_statuses(conn=None, batch_size=BATCH_UPLOAD_SIZE): ) last_entry_id = dict(rows[-1])["alr_application_id"] - logger.debug( - f"retrieved/inserted items count: {0}; total successfully updated entries so far {successful_updates_count}; last updated alr_application_id: {last_entry_id}" + logger.info( + f"retrieved/updated items count: {processed_applications_count}; total successfully updated entries so far {successful_updates_count}; last updated alr_application_id: {last_entry_id}" ) except Exception as err: logger.exception(err) @@ -96,58 +96,23 @@ def _process_statuses_for_update(conn, batch_size, cursor, rows): processed_applications_count += 1 grouped_by_fn = [] grouped_by_fn.append(row) - # TODO: delete this - # for update_statement in update_statements: - # cursor.execute(update_statement) - - # conn.commit() combined_statements = "; ".join(update_statements) - print('combined_statements: ', combined_statements) - #TODO uncomment this - # cursor.execute(combined_statements) - # conn.commit() + # this is useful for debugging + # logger.debug("combined_statements: %s", combined_statements) + cursor.execute(combined_statements) + conn.commit() return processed_applications_count def _prepare_update_statement(statuses, update_statements): - """ - 1. get OATS status - 2. map it to ALCS status - 3. check if statuses have the status from step 2 - 4. get the weight of status from step 2 - 5. check if status from step 2 is of max weight - 6. if yes then proceed otherwise for all statuses that are higher weight rest effective_date and email_sent - """ oats_status = statuses[0]["accomplishment_code"] alcs_status = _map_oats_accomplishment_code_to_alcs_status_code(oats_status) - print( - "oats_status ", - oats_status, - " ", - alcs_status, - ) - if alcs_status == "RFFG": update_statements.append( _compile_update_statement(statuses, oats_status, "RFFG", []) ) - # check if RFFG exists in statuses and if yes do nothing, otherwise set to specific value - # status = _get_status(statuses, "RFFG") - # if status: - # print("no action needed") - # else: - # print("Set RFFG value") - # date = add_timezone_and_keep_date_part(status["completion_date"]) - # update_statements.append( - # f""" - # UPDATE alcs.application_submission_to_submission_status - # SET effective_date = {date}, - # email_sent_date = '0001-01-01 06:00:00.000 -0800' - # WHERE status_type_code = 'RFFG' AND submission_uuid = {status["uuid"]}; - # """ - # ) elif alcs_status == "REVG": update_statements.append( _compile_update_statement(statuses, oats_status, "REVG", ["RFFG"]) @@ -175,7 +140,6 @@ def _compile_update_statement( ): oats_status = _get_oats_status(statuses, oats_target_status) alcs_status = _get_alcs_status(statuses, oats_target_status) - print("status retrieved ", oats_status, alcs_status, statuses) str_statuses_to_reset = "" reset_statuses_query = "" @@ -190,10 +154,10 @@ def _compile_update_statement( """ if alcs_status: - print(f"reset {str_statuses_to_reset}") + logger.debug(f"reset {str_statuses_to_reset}") return reset_statuses_query else: - print(f"{str_statuses_to_reset} and set {alcs_target_status}") + logger.debug(f"{str_statuses_to_reset} and set {alcs_target_status}") date = add_timezone_and_keep_date_part(oats_status["completion_date"]) return f""" {reset_statuses_query} @@ -211,6 +175,7 @@ def _get_oats_status(statuses, code): return status return None + def _get_alcs_status(statuses, code): for status in statuses: if status["status_type_code"] == code: From 8c1df848060581734ed9ca463d48a17a8e98fc42 Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Fri, 12 Apr 2024 12:34:42 -0700 Subject: [PATCH 010/103] Give login test a better name --- e2e/tests/portal/login.spec.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/e2e/tests/portal/login.spec.ts b/e2e/tests/portal/login.spec.ts index 9689e5c839..61321d8315 100644 --- a/e2e/tests/portal/login.spec.ts +++ b/e2e/tests/portal/login.spec.ts @@ -2,8 +2,6 @@ import { test, expect, UserPrefix } from './fixtures'; test.use({ userPrefix: UserPrefix.BceidBasic }); -test('test', async ({ inboxLoggedIn }) => { - await expect( - inboxLoggedIn.getByRole('heading', { name: 'Portal Inbox' }) - ).toBeVisible(); +test('should redirect to inbox after login', async ({ inboxLoggedIn }) => { + await expect(inboxLoggedIn.getByRole('heading', { name: 'Portal Inbox' })).toBeVisible(); }); From 776951eac38fe4c95a6b81b0b4b7baad6967c882 Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Fri, 12 Apr 2024 12:37:19 -0700 Subject: [PATCH 011/103] Create reliable TUR creation steps --- e2e/tests/portal/tur.spec.ts | 151 +++++++++++++++++++++++++++++++++++ 1 file changed, 151 insertions(+) create mode 100644 e2e/tests/portal/tur.spec.ts diff --git a/e2e/tests/portal/tur.spec.ts b/e2e/tests/portal/tur.spec.ts new file mode 100644 index 0000000000..f92c0f9088 --- /dev/null +++ b/e2e/tests/portal/tur.spec.ts @@ -0,0 +1,151 @@ +import { test, expect, UserPrefix } from './fixtures'; + +test.use({ userPrefix: UserPrefix.BceidLg }); + +test('TUR', async ({ inboxLoggedIn }) => { + // Create TUR app + await inboxLoggedIn.getByRole('button', { name: '+ Create New' }).click(); + await inboxLoggedIn.getByText('Application', { exact: true }).click(); + await inboxLoggedIn.getByRole('button', { name: 'Next' }).click(); + await inboxLoggedIn.getByText('Transportation, Utility, or Recreational Trail Uses within the ALR').click(); + await inboxLoggedIn.getByRole('button', { name: 'create' }).click(); + await inboxLoggedIn.getByText('Parcel Details', { exact: true }).click(); // Ensure parcels page + + // Step 1a: Parcels + await inboxLoggedIn.getByRole('button', { name: 'Fee Simple' }).click(); + await inboxLoggedIn.getByPlaceholder('Type legal description').fill('Parcel description'); + await inboxLoggedIn.getByPlaceholder('Type parcel size').fill('1'); + await inboxLoggedIn.getByPlaceholder('Type PID').fill('111-111-111'); + await inboxLoggedIn.getByRole('button', { name: 'Open calendar' }).click(); + await inboxLoggedIn.getByText('2014').click(); + await inboxLoggedIn.getByText('Apr').click(); + await inboxLoggedIn.getByText('23').click(); + await inboxLoggedIn.getByText('Yes').click(); + await inboxLoggedIn.getByPlaceholder('Type Address').fill('123 Street Rd'); + + // Upload + const titleFileChooserPromise = inboxLoggedIn.waitForEvent('filechooser'); + await inboxLoggedIn.getByRole('button', { name: 'Choose file to Upload', exact: true }).click(); + const titleFileChooser = await titleFileChooserPromise; + titleFileChooser.setFiles('data/temp.txt'); + + // Step 1b: Parcel Owners + await inboxLoggedIn.getByRole('button', { name: 'Add new owner' }).click(); + await inboxLoggedIn.getByRole('button', { name: 'Individual' }).click(); + await inboxLoggedIn.getByPlaceholder('Enter First Name').fill('1'); + await inboxLoggedIn.getByPlaceholder('Enter Last Name').fill('1'); + await inboxLoggedIn.getByPlaceholder('(555) 555-5555').fill('(111) 111-11111'); + await inboxLoggedIn.getByPlaceholder('Enter Email').fill('1@1'); + await inboxLoggedIn.getByRole('button', { name: 'Add' }).click(); + await inboxLoggedIn + .getByText('I confirm that the owner information provided above matches the current Certific') + .click(); + await inboxLoggedIn.getByText('Other Owned Parcels', { exact: true }).click(); + + // Step 2: Other Parcels + await inboxLoggedIn.getByRole('button', { name: 'Yes' }).click(); + await inboxLoggedIn + .getByLabel('Describe the other parcels including their location, who owns or leases them, and their use.') + .fill('Other parcels'); + await inboxLoggedIn.getByText('Primary Contact', { exact: true }).click(); + + // Step 3: Primary Contact + await inboxLoggedIn.getByRole('button', { name: 'Yes' }).click(); + await inboxLoggedIn.getByLabel('1 1').check(); + await inboxLoggedIn.getByText('Government', { exact: true }).click(); + + // Step 4: Government + await inboxLoggedIn.getByPlaceholder('Type government').click(); + await inboxLoggedIn.getByPlaceholder('Type government').fill('peace'); + await inboxLoggedIn.getByText('Peace River Regional District').click(); + await inboxLoggedIn.getByText('Land Use').click(); + + // Step 5: Land Use + await inboxLoggedIn.getByLabel('Describe all agriculture that currently takes place on the parcel(s).').fill('This'); + await inboxLoggedIn.getByLabel('Describe all agricultural improvements made to the parcel(s).').fill('That'); + await inboxLoggedIn + .getByLabel('Describe all other uses that currently take place on the parcel(s).') + .fill('The other'); + console.log(); + + // North + await inboxLoggedIn.getByPlaceholder('Main Land Use Type').nth(0).click(); + await inboxLoggedIn.getByRole('option', { name: 'Agricultural / Farm' }).click(); + await inboxLoggedIn.getByRole('textbox', { name: 'North land use type description' }).click(); + await inboxLoggedIn.getByRole('textbox', { name: 'North land use type description' }).fill('1'); + await inboxLoggedIn.getByPlaceholder('Main Land Use Type').nth(0).press('Escape'); // Close dropdown + + // East + await inboxLoggedIn.getByPlaceholder('Main Land Use Type').nth(1).click(); + await inboxLoggedIn.getByRole('option', { name: 'Civic / Institutional' }).click(); + await inboxLoggedIn.getByRole('textbox', { name: 'East land use type description' }).click(); + await inboxLoggedIn.getByRole('textbox', { name: 'East land use type description' }).fill('1'); + await inboxLoggedIn.getByPlaceholder('Main Land Use Type').nth(1).press('Escape'); // Close dropdown + + // South + await inboxLoggedIn.getByPlaceholder('Main Land Use Type').nth(2).click(); + await inboxLoggedIn.getByRole('option', { name: 'Commercial / Retail' }).click(); + await inboxLoggedIn.getByRole('textbox', { name: 'South land use type description' }).click(); + await inboxLoggedIn.getByRole('textbox', { name: 'South land use type description' }).fill('1'); + await inboxLoggedIn.getByPlaceholder('Main Land Use Type').nth(2).press('Escape'); // Close dropdown + + // West + await inboxLoggedIn.getByPlaceholder('Main Land Use Type').nth(3).click(); + await inboxLoggedIn.getByRole('option', { name: 'Industrial' }).click(); + await inboxLoggedIn.getByRole('textbox', { name: 'West land use type description' }).click(); + await inboxLoggedIn.getByRole('textbox', { name: 'West land use type description' }).fill('1'); + await inboxLoggedIn.getByPlaceholder('Main Land Use Type').nth(3).press('Escape'); // Close dropdown + + await inboxLoggedIn.getByText('Proposal', { exact: true }).click(); + + // Step 6: Proposal + await inboxLoggedIn.getByLabel('What is the purpose of the proposal?').fill('This'); + await inboxLoggedIn + .getByLabel( + 'Specify any agricultural activities such as livestock operations, greenhouses or horticultural activities in proximity to the proposal.', + ) + .fill('That'); + await inboxLoggedIn + .getByLabel('What steps will you take to reduce potential negative impacts on surrounding agricultural lands?') + .fill('The other'); + await inboxLoggedIn + .getByLabel('Could this proposal be accommodated on lands outside of the ALR?') + .fill('And another'); + await inboxLoggedIn.getByPlaceholder('Type total area').fill('1'); + await inboxLoggedIn + .getByText('I confirm that all affected property owners with land in the ALR have been notif') + .click(); + + // File upload + const proofOfServiceNoticeFileChooserPromise = inboxLoggedIn.waitForEvent('filechooser'); + await inboxLoggedIn.getByRole('button', { name: 'Choose file to Upload', exact: true }).nth(0).click(); + const proofOfServiceNoticeFileChooser = await proofOfServiceNoticeFileChooserPromise; + proofOfServiceNoticeFileChooser.setFiles('data/temp.txt'); + + // File upload + const proposalMapFileChooserPromise = inboxLoggedIn.waitForEvent('filechooser'); + await inboxLoggedIn.getByRole('button', { name: 'Choose file to Upload', exact: true }).nth(1).click(); + const proposalMapFileChooser = await proposalMapFileChooserPromise; + proposalMapFileChooser.setFiles('data/temp.txt'); + + await inboxLoggedIn.getByText('Upload Attachments').click(); + + // Step 7: Optional attachments + // File upload first file + const optionalFile1ChooserPromise = inboxLoggedIn.waitForEvent('filechooser'); + await inboxLoggedIn.getByRole('button', { name: 'Choose file to Upload', exact: true }).click(); + const optionalFile1Chooser = await optionalFile1ChooserPromise; + optionalFile1Chooser.setFiles('data/temp.txt'); + await inboxLoggedIn.getByPlaceholder('Select a type').nth(0).click(); + await inboxLoggedIn.getByText('Professional Report').click(); + await inboxLoggedIn.getByPlaceholder('Type description').nth(0).fill('Desc'); + + // File upload second file + const optionalFile2ChooserPromise = inboxLoggedIn.waitForEvent('filechooser'); + await inboxLoggedIn.getByRole('button', { name: 'Choose file to Upload', exact: true }).click(); + const optionalFile2Chooser = await optionalFile2ChooserPromise; + optionalFile2Chooser.setFiles('data/temp.txt'); + await inboxLoggedIn.getByPlaceholder('Select a type').nth(1).click(); + await inboxLoggedIn.getByText('Site Photo').click(); + await inboxLoggedIn.getByPlaceholder('Type description').nth(1).fill('Desc'); +}); From 9f23ce24b8d6cf1c1360642d8dc60c18a35d44e5 Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Fri, 12 Apr 2024 12:37:58 -0700 Subject: [PATCH 012/103] Add parcel 1 review assertions --- e2e/tests/portal/tur.spec.ts | 39 ++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/e2e/tests/portal/tur.spec.ts b/e2e/tests/portal/tur.spec.ts index f92c0f9088..25fe45195e 100644 --- a/e2e/tests/portal/tur.spec.ts +++ b/e2e/tests/portal/tur.spec.ts @@ -66,35 +66,26 @@ test('TUR', async ({ inboxLoggedIn }) => { await inboxLoggedIn .getByLabel('Describe all other uses that currently take place on the parcel(s).') .fill('The other'); - console.log(); // North await inboxLoggedIn.getByPlaceholder('Main Land Use Type').nth(0).click(); - await inboxLoggedIn.getByRole('option', { name: 'Agricultural / Farm' }).click(); - await inboxLoggedIn.getByRole('textbox', { name: 'North land use type description' }).click(); + await inboxLoggedIn.locator('#northLandUseType-panel').getByRole('option', { name: 'Agricultural / Farm' }).click(); await inboxLoggedIn.getByRole('textbox', { name: 'North land use type description' }).fill('1'); - await inboxLoggedIn.getByPlaceholder('Main Land Use Type').nth(0).press('Escape'); // Close dropdown // East await inboxLoggedIn.getByPlaceholder('Main Land Use Type').nth(1).click(); - await inboxLoggedIn.getByRole('option', { name: 'Civic / Institutional' }).click(); - await inboxLoggedIn.getByRole('textbox', { name: 'East land use type description' }).click(); + await inboxLoggedIn.locator('#eastLandUseType-panel').getByRole('option', { name: 'Civic / Institutional' }).click(); await inboxLoggedIn.getByRole('textbox', { name: 'East land use type description' }).fill('1'); - await inboxLoggedIn.getByPlaceholder('Main Land Use Type').nth(1).press('Escape'); // Close dropdown // South await inboxLoggedIn.getByPlaceholder('Main Land Use Type').nth(2).click(); - await inboxLoggedIn.getByRole('option', { name: 'Commercial / Retail' }).click(); - await inboxLoggedIn.getByRole('textbox', { name: 'South land use type description' }).click(); + await inboxLoggedIn.locator('#southLandUseType-panel').getByRole('option', { name: 'Commercial / Retail' }).click(); await inboxLoggedIn.getByRole('textbox', { name: 'South land use type description' }).fill('1'); - await inboxLoggedIn.getByPlaceholder('Main Land Use Type').nth(2).press('Escape'); // Close dropdown // West await inboxLoggedIn.getByPlaceholder('Main Land Use Type').nth(3).click(); - await inboxLoggedIn.getByRole('option', { name: 'Industrial' }).click(); - await inboxLoggedIn.getByRole('textbox', { name: 'West land use type description' }).click(); + await inboxLoggedIn.locator('#westLandUseType-panel').getByRole('option', { name: 'Industrial' }).click(); await inboxLoggedIn.getByRole('textbox', { name: 'West land use type description' }).fill('1'); - await inboxLoggedIn.getByPlaceholder('Main Land Use Type').nth(3).press('Escape'); // Close dropdown await inboxLoggedIn.getByText('Proposal', { exact: true }).click(); @@ -148,4 +139,26 @@ test('TUR', async ({ inboxLoggedIn }) => { await inboxLoggedIn.getByPlaceholder('Select a type').nth(1).click(); await inboxLoggedIn.getByText('Site Photo').click(); await inboxLoggedIn.getByPlaceholder('Type description').nth(1).fill('Desc'); + + await inboxLoggedIn.getByText('Review & Submit').click(); + + // Step 8: Review + // Parcel 1 + await expect(inboxLoggedIn.getByTestId('parcel-0-type')).toHaveText('Fee Simple'); + await expect(inboxLoggedIn.getByTestId('parcel-0-legal-description')).toHaveText('Parcel description'); + await expect(inboxLoggedIn.getByTestId('parcel-0-map-area')).toHaveText('1 ha'); + await expect(inboxLoggedIn.getByTestId('parcel-0-pid')).toHaveText('111-111-111'); + await expect(inboxLoggedIn.getByTestId('parcel-0-purchase-date')).toHaveText('Apr 23, 2014'); + await expect(inboxLoggedIn.getByTestId('parcel-0-is-farm')).toHaveText('Yes'); + await expect(inboxLoggedIn.getByTestId('parcel-0-civic-address')).toHaveText('123 Street Rd'); + await expect(inboxLoggedIn.getByTestId('parcel-0-certificate-of-title')).toHaveText('temp.txt'); + + // Owners + await expect(inboxLoggedIn.getByTestId('parcel-0-owner-0-name')).toHaveText('1 1'); + await expect(inboxLoggedIn.getByTestId('parcel-0-owner-0-organization')).toHaveText('No Data'); + await expect(inboxLoggedIn.getByTestId('parcel-0-owner-0-phone-number')).toHaveText('(111) 111-1111'); + await expect(inboxLoggedIn.getByTestId('parcel-0-owner-0-email')).toHaveText('1@1'); + await expect(inboxLoggedIn.getByTestId('parcel-0-owner-0-corporate-summary')).toHaveText('Not Applicable'); + + await expect(inboxLoggedIn.getByTestId('parcel-0-is-confirmed-by-applicant')).toHaveText('Yes'); }); From 3c7df10dabf3c1bdcf8a47a76f4979d60d9b0ae1 Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Fri, 12 Apr 2024 18:08:18 -0700 Subject: [PATCH 013/103] Add missed test upload file --- e2e/data/temp.txt | 1 + .../parcel/parcel.component.html | 42 ++++++++++++------- 2 files changed, 27 insertions(+), 16 deletions(-) create mode 100644 e2e/data/temp.txt diff --git a/e2e/data/temp.txt b/e2e/data/temp.txt new file mode 100644 index 0000000000..5eced95754 --- /dev/null +++ b/e2e/data/temp.txt @@ -0,0 +1 @@ +Foobar \ No newline at end of file diff --git a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html index 0dc66f22f6..9f21e051f6 100644 --- a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html @@ -25,13 +25,13 @@

Parcel #{{ parcelInd + 1 }}

Parcel Type
-
+
{{ parcel.ownershipType?.label }}
Legal Description
-
+
{{ parcel.legalDescription }} Parcel #{{ parcelInd + 1 }} >
Approx. Map Area
-
+
{{ parcel.mapAreaHectares }} ha Parcel #{{ parcelInd + 1 }}
PID {{ parcel.ownershipType.code === PARCEL_OWNERSHIP_TYPES.CROWN ? '(optional)' : '' }}
-
+
{{ parcel.pid | mask : '000-000-000' }} Parcel #{{ parcelInd + 1 }}
PIN (optional)
-
+
{{ parcel.pin }} Parcel #{{ parcelInd + 1 }}
Purchase Date
-
+
{{ parcel.purchasedDate | date }} Parcel #{{ parcelInd + 1 }}
Farm Classification
-
+
{{ parcel.isFarm ? 'Yes' : 'No' }}
Civic Address
-
+
{{ parcel.civicAddress }}
Certificate Of Title
-
+
@@ -146,15 +150,21 @@
Government Parcel Contact
Phone
Email
Corporate Summary
- -
{{ owner.displayName }}
-
+ +
+ {{ owner.displayName }} +
+
{{ owner.organizationName }}
-
{{ owner.phoneNumber ?? '' | mask : '(000) 000-0000' }}
-
{{ owner.email }}
-
+
+ {{ owner.phoneNumber ?? '' | mask : '(000) 000-0000' }} +
+
+ {{ owner.email }} +
+
{{ owner.corporateSummary.fileName }} @@ -174,7 +184,7 @@
Government Parcel Contact
I confirm that the owner information provided above matches the current Certificate of Title
-
+
Yes
From 87be43617664c2517e3b4a4c498d08a9ab35456c Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Fri, 12 Apr 2024 18:39:09 -0700 Subject: [PATCH 014/103] Add other parcel and primary contact review assertions --- e2e/tests/portal/tur.spec.ts | 13 +++++++++++++ .../application-details.component.html | 18 +++++++++--------- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/e2e/tests/portal/tur.spec.ts b/e2e/tests/portal/tur.spec.ts index 25fe45195e..2d7bdc0324 100644 --- a/e2e/tests/portal/tur.spec.ts +++ b/e2e/tests/portal/tur.spec.ts @@ -143,6 +143,7 @@ test('TUR', async ({ inboxLoggedIn }) => { await inboxLoggedIn.getByText('Review & Submit').click(); // Step 8: Review + // Parcels // Parcel 1 await expect(inboxLoggedIn.getByTestId('parcel-0-type')).toHaveText('Fee Simple'); await expect(inboxLoggedIn.getByTestId('parcel-0-legal-description')).toHaveText('Parcel description'); @@ -161,4 +162,16 @@ test('TUR', async ({ inboxLoggedIn }) => { await expect(inboxLoggedIn.getByTestId('parcel-0-owner-0-corporate-summary')).toHaveText('Not Applicable'); await expect(inboxLoggedIn.getByTestId('parcel-0-is-confirmed-by-applicant')).toHaveText('Yes'); + + // Other Parcels + await expect(inboxLoggedIn.getByTestId('has-other-parcels')).toHaveText('Yes'); + await expect(inboxLoggedIn.getByTestId('other-parcels-description')).toHaveText('Other parcels'); + + // Primary Contact + await expect(inboxLoggedIn.getByTestId('primary-contact-type')).toHaveText('Land Owner'); + await expect(inboxLoggedIn.getByTestId('primary-contact-first-name')).toHaveText('1'); + await expect(inboxLoggedIn.getByTestId('primary-contact-last-name')).toHaveText('1'); + await expect(inboxLoggedIn.getByTestId('primary-contact-organization')).toHaveText('No Data'); + await expect(inboxLoggedIn.getByTestId('primary-contact-phone-number')).toHaveText('(111) 111-1111'); + await expect(inboxLoggedIn.getByTestId('primary-contact-email')).toHaveText('1@1'); }); diff --git a/portal-frontend/src/app/features/applications/application-details/application-details.component.html b/portal-frontend/src/app/features/applications/application-details/application-details.component.html index 5e3ba672d1..5ea9457679 100644 --- a/portal-frontend/src/app/features/applications/application-details/application-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/application-details.component.html @@ -13,7 +13,7 @@

2. Other Owned Parcels

Do any of the land owners added previously own or lease other parcels that might inform this application process?
-
+
{{ applicationSubmission.hasOtherParcelsInCommunity ? 'Yes' : 'No' }} @@ -26,7 +26,7 @@

2. Other Owned Parcels

Describe the other parcels including their location, who owns or leases them, and their use.
-
+
{{ applicationSubmission.otherParcelsDescription }}
@@ -40,17 +40,17 @@

2. Other Owned Parcels

3. Primary Contact

Type
-
+
{{ primaryContact?.type?.label }}
First Name
-
+
{{ primaryContact?.firstName }}
Last Name
-
+
{{ primaryContact?.lastName }}
@@ -62,7 +62,7 @@

3. Primary Contact

Ministry/Department Responsible Department
-
+
{{ primaryContact?.organizationName }} 3. Primary Contact >
Phone
-
+
{{ primaryContact?.phoneNumber ?? '' | mask : '(000) 000-0000' }} 3. Primary Contact >
Email
-
+
{{ primaryContact?.email }} Invalid Format
Authorization Letter(s)
-
+
Date: Fri, 12 Apr 2024 19:28:31 -0700 Subject: [PATCH 015/103] Add remaining review assertions --- e2e/tests/portal/tur.spec.ts | 43 +++++++++++++++++-- .../application-details.component.html | 32 +++++++------- .../tur-details/tur-details.component.html | 16 +++---- 3 files changed, 64 insertions(+), 27 deletions(-) diff --git a/e2e/tests/portal/tur.spec.ts b/e2e/tests/portal/tur.spec.ts index 2d7bdc0324..31abd33dd2 100644 --- a/e2e/tests/portal/tur.spec.ts +++ b/e2e/tests/portal/tur.spec.ts @@ -143,7 +143,7 @@ test('TUR', async ({ inboxLoggedIn }) => { await inboxLoggedIn.getByText('Review & Submit').click(); // Step 8: Review - // Parcels + // 1. Parcels // Parcel 1 await expect(inboxLoggedIn.getByTestId('parcel-0-type')).toHaveText('Fee Simple'); await expect(inboxLoggedIn.getByTestId('parcel-0-legal-description')).toHaveText('Parcel description'); @@ -163,15 +163,52 @@ test('TUR', async ({ inboxLoggedIn }) => { await expect(inboxLoggedIn.getByTestId('parcel-0-is-confirmed-by-applicant')).toHaveText('Yes'); - // Other Parcels + // 2. Other Parcels await expect(inboxLoggedIn.getByTestId('has-other-parcels')).toHaveText('Yes'); await expect(inboxLoggedIn.getByTestId('other-parcels-description')).toHaveText('Other parcels'); - // Primary Contact + // 3. Primary Contact await expect(inboxLoggedIn.getByTestId('primary-contact-type')).toHaveText('Land Owner'); await expect(inboxLoggedIn.getByTestId('primary-contact-first-name')).toHaveText('1'); await expect(inboxLoggedIn.getByTestId('primary-contact-last-name')).toHaveText('1'); await expect(inboxLoggedIn.getByTestId('primary-contact-organization')).toHaveText('No Data'); await expect(inboxLoggedIn.getByTestId('primary-contact-phone-number')).toHaveText('(111) 111-1111'); await expect(inboxLoggedIn.getByTestId('primary-contact-email')).toHaveText('1@1'); + + // 4. Government + await expect(inboxLoggedIn.getByTestId('government-name')).toHaveText('Peace River Regional District'); + + // 5. Land Use + await expect(inboxLoggedIn.getByTestId('parcels-agriculture-description')).toHaveText('This'); + await expect(inboxLoggedIn.getByTestId('parcels-agriculture-improvement-description')).toHaveText('That'); + await expect(inboxLoggedIn.getByTestId('parcels-non-agriculture-description')).toHaveText('The other'); + await expect(inboxLoggedIn.getByTestId('north-land-use-type')).toHaveText('Agricultural / Farm'); + await expect(inboxLoggedIn.getByTestId('north-land-use-description')).toHaveText('1'); + await expect(inboxLoggedIn.getByTestId('east-land-use-type')).toHaveText('Civic / Institutional'); + await expect(inboxLoggedIn.getByTestId('east-land-use-description')).toHaveText('1'); + await expect(inboxLoggedIn.getByTestId('south-land-use-type')).toHaveText('Commercial / Retail'); + await expect(inboxLoggedIn.getByTestId('south-land-use-description')).toHaveText('1'); + await expect(inboxLoggedIn.getByTestId('west-land-use-type')).toHaveText('Industrial'); + await expect(inboxLoggedIn.getByTestId('west-land-use-description')).toHaveText('1'); + + // 6. Proposal + await expect(inboxLoggedIn.getByTestId('tur-purpose')).toHaveText('This'); + await expect(inboxLoggedIn.getByTestId('tur-agricultural-activities')).toHaveText('That'); + await expect(inboxLoggedIn.getByTestId('tur-reduce-negative-impacts')).toHaveText('The other'); + await expect(inboxLoggedIn.getByTestId('tur-outside-lands')).toHaveText('And another'); + await expect(inboxLoggedIn.getByTestId('tur-total-corridor-area')).toHaveText('1 ha'); + await expect(inboxLoggedIn.getByTestId('tur-all-owners-notified')).toHaveText('Yes'); + await expect(inboxLoggedIn.getByTestId('tur-proof-of-serving-notice')).toHaveText('temp.txt'); + await expect(inboxLoggedIn.getByTestId('tur-proposal-map')).toHaveText('temp.txt'); + + // 7. Optional Documents + // Doc 1 + await expect(inboxLoggedIn.getByTestId('optional-document-0-file-name')).toHaveText('temp.txt'); + await expect(inboxLoggedIn.getByTestId('optional-document-0-type')).toHaveText('Professional Report'); + await expect(inboxLoggedIn.getByTestId('optional-document-0-description')).toHaveText('Desc'); + + // Doc 2 + await expect(inboxLoggedIn.getByTestId('optional-document-1-file-name')).toHaveText('temp.txt'); + await expect(inboxLoggedIn.getByTestId('optional-document-1-type')).toHaveText('Site Photo'); + await expect(inboxLoggedIn.getByTestId('optional-document-1-description')).toHaveText('Desc'); }); diff --git a/portal-frontend/src/app/features/applications/application-details/application-details.component.html b/portal-frontend/src/app/features/applications/application-details/application-details.component.html index 5ea9457679..c633ffe485 100644 --- a/portal-frontend/src/app/features/applications/application-details/application-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/application-details.component.html @@ -108,7 +108,7 @@

3. Primary Contact

4. Government

Local or First Nation Government
-
+
{{ localGovernment?.name }} @@ -144,7 +144,7 @@

5. Land Use

Land Use of Parcel(s) under Application

Describe all agriculture that currently takes place on the parcel(s).
-
+
{{ applicationSubmission.parcelsAgricultureDescription }} Land Use of Parcel(s) under Application >
Describe all agricultural improvements made to the parcel(s).
-
+
{{ applicationSubmission.parcelsAgricultureImprovementDescription }} Land Use of Parcel(s) under Application >
Describe all other uses that currently take place on the parcel(s).
-
+
{{ applicationSubmission.parcelsNonAgricultureUseDescription }} Land Use of Adjacent Parcels
Main Land Use Type
Specific Activity
North
-
+
{{ applicationSubmission.northLandUseType }}
-
+
{{ applicationSubmission.northLandUseTypeDescription }} Land Use of Adjacent Parcels >
East
-
+
{{ applicationSubmission.eastLandUseType }}
-
+
{{ applicationSubmission.eastLandUseTypeDescription }} Land Use of Adjacent Parcels >
South
-
+
{{ applicationSubmission.southLandUseType }}
-
+
{{ applicationSubmission.southLandUseTypeDescription }} Land Use of Adjacent Parcels >
West
-
+
{{ applicationSubmission.westLandUseType }}
-
+
{{ applicationSubmission.westLandUseTypeDescription }} 7. Optional Documents
Type
Description
- -
+ +
{{ file.fileName }}
-
+
{{ file.type?.label }}
-
+
{{ file.description }}
diff --git a/portal-frontend/src/app/features/applications/application-details/tur-details/tur-details.component.html b/portal-frontend/src/app/features/applications/application-details/tur-details/tur-details.component.html index e33da56b0a..a405d6db94 100644 --- a/portal-frontend/src/app/features/applications/application-details/tur-details/tur-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/tur-details/tur-details.component.html @@ -1,6 +1,6 @@
What is the purpose of the proposal?
-
+
{{ _applicationSubmission.purpose }}
@@ -8,24 +8,24 @@ Specify any agricultural activities such as livestock operations, greenhouses or horticultural activities in proximity to the proposal.
-
+
{{ _applicationSubmission.turAgriculturalActivities }}
What steps will you take to reduce potential negative impacts on surrounding agricultural lands?
-
+
{{ _applicationSubmission.turReduceNegativeImpacts }}
Could this proposal be accommodated on lands outside of the ALR?
-
+
{{ _applicationSubmission.turOutsideLands }}
Total area of corridor
-
+
{{ _applicationSubmission.turTotalCorridorArea }} ha @@ -34,19 +34,19 @@
I confirm that all affected property owners with land in the ALR have been notified.
-
+
Yes
Proof of Serving Notice
-
+
{{ notice.fileName }}
Proposal Map / Site Plan
-
+
{{ file.fileName }} From 1466c434f545ace02ef9551e5415ebff41c133df Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Fri, 12 Apr 2024 19:29:05 -0700 Subject: [PATCH 016/103] Fix TUR test using not yet added user type --- e2e/tests/portal/tur.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/tests/portal/tur.spec.ts b/e2e/tests/portal/tur.spec.ts index 31abd33dd2..51cfb0605b 100644 --- a/e2e/tests/portal/tur.spec.ts +++ b/e2e/tests/portal/tur.spec.ts @@ -1,6 +1,6 @@ import { test, expect, UserPrefix } from './fixtures'; -test.use({ userPrefix: UserPrefix.BceidLg }); +test.use({ userPrefix: UserPrefix.BceidBasic }); test('TUR', async ({ inboxLoggedIn }) => { // Create TUR app From b19980438cec50a66ca41ceee0c11f6b511ef2aa Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Thu, 18 Apr 2024 16:42:34 -0700 Subject: [PATCH 017/103] Make login page POM and change the way login works To allow for checking data in ALCS, multiple browser contexts are needed. The fixture method breaks down under these conditions. --- e2e/tests/portal/fixtures.ts | 30 --- e2e/tests/portal/login.spec.ts | 7 - e2e/tests/portal/pages/login-page.ts | 29 +++ e2e/tests/portal/tur.spec.ts | 266 +++++++++++++-------------- 4 files changed, 161 insertions(+), 171 deletions(-) delete mode 100644 e2e/tests/portal/fixtures.ts delete mode 100644 e2e/tests/portal/login.spec.ts create mode 100644 e2e/tests/portal/pages/login-page.ts diff --git a/e2e/tests/portal/fixtures.ts b/e2e/tests/portal/fixtures.ts deleted file mode 100644 index b171c33a7f..0000000000 --- a/e2e/tests/portal/fixtures.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { test as base, Page } from '@playwright/test'; -export { expect } from '@playwright/test'; - -export enum UserPrefix { - BceidBasic = 'BCEID_BASIC', -} - -interface FixtureOptions { - userPrefix: string; -} - -interface Fixtures { - inboxLoggedIn: Page; -} - -export const test = base.extend({ - userPrefix: UserPrefix.BceidBasic, - inboxLoggedIn: async ({ page, userPrefix }, use) => { - await page.goto(process.env.PORTAL_BASE_URL); - await page.getByRole('button', { name: 'Portal Login' }).click(); - await page - .locator('#user') - .fill(process.env[userPrefix + '_USERNAME'] ?? ''); - await page - .getByLabel('Password') - .fill(process.env[userPrefix + '_PASSWORD'] ?? ''); - await page.getByRole('button', { name: /continue/i }).click(); - await use(page); - }, -}); diff --git a/e2e/tests/portal/login.spec.ts b/e2e/tests/portal/login.spec.ts deleted file mode 100644 index 61321d8315..0000000000 --- a/e2e/tests/portal/login.spec.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { test, expect, UserPrefix } from './fixtures'; - -test.use({ userPrefix: UserPrefix.BceidBasic }); - -test('should redirect to inbox after login', async ({ inboxLoggedIn }) => { - await expect(inboxLoggedIn.getByRole('heading', { name: 'Portal Inbox' })).toBeVisible(); -}); diff --git a/e2e/tests/portal/pages/login-page.ts b/e2e/tests/portal/pages/login-page.ts new file mode 100644 index 0000000000..a42bdcf647 --- /dev/null +++ b/e2e/tests/portal/pages/login-page.ts @@ -0,0 +1,29 @@ +import { type Locator, type Page } from '@playwright/test'; + +export class LoginPage { + readonly page: Page; + readonly loginButton: Locator; + readonly userIdTextField: Locator; + readonly passwordTextField: Locator; + readonly continueButton: Locator; + + constructor(page: Page) { + this.page = page; + this.loginButton = page.getByRole('button', { name: 'Portal Login' }); + // There is an error with the username label on BCeID page + this.userIdTextField = page.getByRole('textbox').nth(0); + this.passwordTextField = page.getByLabel('Password'); + this.continueButton = page.getByRole('button', { name: 'Continue' }); + } + + async goto() { + await this.page.goto('/'); + } + + async logIn(username: string, password: string) { + await this.loginButton.click(); + await this.userIdTextField.fill(username); + await this.passwordTextField.fill(password); + await this.continueButton.click(); + } +} diff --git a/e2e/tests/portal/tur.spec.ts b/e2e/tests/portal/tur.spec.ts index 51cfb0605b..01aea83dce 100644 --- a/e2e/tests/portal/tur.spec.ts +++ b/e2e/tests/portal/tur.spec.ts @@ -1,214 +1,212 @@ -import { test, expect, UserPrefix } from './fixtures'; +import { test, expect } from '@playwright/test'; +import { LoginPage } from './pages/login-page'; -test.use({ userPrefix: UserPrefix.BceidBasic }); +test('TUR', async ({ browser }) => { + const context = await browser.newContext({ baseURL: process.env.PORTAL_BASE_URL }); + const page = await context.newPage(); + + const loginPage = new LoginPage(page); + await loginPage.goto(); + await loginPage.logIn(process.env.BCEID_BASIC_USERNAME, process.env.BCEID_BASIC_PASSWORD); -test('TUR', async ({ inboxLoggedIn }) => { // Create TUR app - await inboxLoggedIn.getByRole('button', { name: '+ Create New' }).click(); - await inboxLoggedIn.getByText('Application', { exact: true }).click(); - await inboxLoggedIn.getByRole('button', { name: 'Next' }).click(); - await inboxLoggedIn.getByText('Transportation, Utility, or Recreational Trail Uses within the ALR').click(); - await inboxLoggedIn.getByRole('button', { name: 'create' }).click(); - await inboxLoggedIn.getByText('Parcel Details', { exact: true }).click(); // Ensure parcels page + await page.getByRole('button', { name: '+ Create New' }).click(); + await page.getByText('Application', { exact: true }).click(); + await page.getByRole('button', { name: 'Next' }).click(); + await page.getByText('Transportation, Utility, or Recreational Trail Uses within the ALR').click(); + await page.getByRole('button', { name: 'create' }).click(); + await page.getByText('Parcel Details', { exact: true }).click(); // Ensure parcels page // Step 1a: Parcels - await inboxLoggedIn.getByRole('button', { name: 'Fee Simple' }).click(); - await inboxLoggedIn.getByPlaceholder('Type legal description').fill('Parcel description'); - await inboxLoggedIn.getByPlaceholder('Type parcel size').fill('1'); - await inboxLoggedIn.getByPlaceholder('Type PID').fill('111-111-111'); - await inboxLoggedIn.getByRole('button', { name: 'Open calendar' }).click(); - await inboxLoggedIn.getByText('2014').click(); - await inboxLoggedIn.getByText('Apr').click(); - await inboxLoggedIn.getByText('23').click(); - await inboxLoggedIn.getByText('Yes').click(); - await inboxLoggedIn.getByPlaceholder('Type Address').fill('123 Street Rd'); + await page.getByRole('button', { name: 'Fee Simple' }).click(); + await page.getByPlaceholder('Type legal description').fill('Parcel description'); + await page.getByPlaceholder('Type parcel size').fill('1'); + await page.getByPlaceholder('Type PID').fill('111-111-111'); + await page.getByRole('button', { name: 'Open calendar' }).click(); + await page.getByText('2014').click(); + await page.getByText('Apr').click(); + await page.getByText('23').click(); + await page.getByText('Yes').click(); + await page.getByPlaceholder('Type Address').fill('123 Street Rd'); // Upload - const titleFileChooserPromise = inboxLoggedIn.waitForEvent('filechooser'); - await inboxLoggedIn.getByRole('button', { name: 'Choose file to Upload', exact: true }).click(); + const titleFileChooserPromise = page.waitForEvent('filechooser'); + await page.getByRole('button', { name: 'Choose file to Upload', exact: true }).click(); const titleFileChooser = await titleFileChooserPromise; titleFileChooser.setFiles('data/temp.txt'); // Step 1b: Parcel Owners - await inboxLoggedIn.getByRole('button', { name: 'Add new owner' }).click(); - await inboxLoggedIn.getByRole('button', { name: 'Individual' }).click(); - await inboxLoggedIn.getByPlaceholder('Enter First Name').fill('1'); - await inboxLoggedIn.getByPlaceholder('Enter Last Name').fill('1'); - await inboxLoggedIn.getByPlaceholder('(555) 555-5555').fill('(111) 111-11111'); - await inboxLoggedIn.getByPlaceholder('Enter Email').fill('1@1'); - await inboxLoggedIn.getByRole('button', { name: 'Add' }).click(); - await inboxLoggedIn - .getByText('I confirm that the owner information provided above matches the current Certific') - .click(); - await inboxLoggedIn.getByText('Other Owned Parcels', { exact: true }).click(); + await page.getByRole('button', { name: 'Add new owner' }).click(); + await page.getByRole('button', { name: 'Individual' }).click(); + await page.getByPlaceholder('Enter First Name').fill('1'); + await page.getByPlaceholder('Enter Last Name').fill('1'); + await page.getByPlaceholder('(555) 555-5555').fill('(111) 111-11111'); + await page.getByPlaceholder('Enter Email').fill('1@1'); + await page.getByRole('button', { name: 'Add' }).click(); + await page.getByText('I confirm that the owner information provided above matches the current Certific').click(); + await page.getByText('Other Owned Parcels', { exact: true }).click(); // Step 2: Other Parcels - await inboxLoggedIn.getByRole('button', { name: 'Yes' }).click(); - await inboxLoggedIn + await page.getByRole('button', { name: 'Yes' }).click(); + await page .getByLabel('Describe the other parcels including their location, who owns or leases them, and their use.') .fill('Other parcels'); - await inboxLoggedIn.getByText('Primary Contact', { exact: true }).click(); + await page.getByText('Primary Contact', { exact: true }).click(); // Step 3: Primary Contact - await inboxLoggedIn.getByRole('button', { name: 'Yes' }).click(); - await inboxLoggedIn.getByLabel('1 1').check(); - await inboxLoggedIn.getByText('Government', { exact: true }).click(); + await page.getByRole('button', { name: 'Yes' }).click(); + await page.getByLabel('1 1').check(); + await page.getByText('Government', { exact: true }).click(); // Step 4: Government - await inboxLoggedIn.getByPlaceholder('Type government').click(); - await inboxLoggedIn.getByPlaceholder('Type government').fill('peace'); - await inboxLoggedIn.getByText('Peace River Regional District').click(); - await inboxLoggedIn.getByText('Land Use').click(); + await page.getByPlaceholder('Type government').click(); + await page.getByPlaceholder('Type government').fill('peace'); + await page.getByText('Peace River Regional District').click(); + await page.getByText('Land Use').click(); // Step 5: Land Use - await inboxLoggedIn.getByLabel('Describe all agriculture that currently takes place on the parcel(s).').fill('This'); - await inboxLoggedIn.getByLabel('Describe all agricultural improvements made to the parcel(s).').fill('That'); - await inboxLoggedIn - .getByLabel('Describe all other uses that currently take place on the parcel(s).') - .fill('The other'); + await page.getByLabel('Describe all agriculture that currently takes place on the parcel(s).').fill('This'); + await page.getByLabel('Describe all agricultural improvements made to the parcel(s).').fill('That'); + await page.getByLabel('Describe all other uses that currently take place on the parcel(s).').fill('The other'); // North - await inboxLoggedIn.getByPlaceholder('Main Land Use Type').nth(0).click(); - await inboxLoggedIn.locator('#northLandUseType-panel').getByRole('option', { name: 'Agricultural / Farm' }).click(); - await inboxLoggedIn.getByRole('textbox', { name: 'North land use type description' }).fill('1'); + await page.getByPlaceholder('Main Land Use Type').nth(0).click(); + await page.locator('#northLandUseType-panel').getByRole('option', { name: 'Agricultural / Farm' }).click(); + await page.getByRole('textbox', { name: 'North land use type description' }).fill('1'); // East - await inboxLoggedIn.getByPlaceholder('Main Land Use Type').nth(1).click(); - await inboxLoggedIn.locator('#eastLandUseType-panel').getByRole('option', { name: 'Civic / Institutional' }).click(); - await inboxLoggedIn.getByRole('textbox', { name: 'East land use type description' }).fill('1'); + await page.getByPlaceholder('Main Land Use Type').nth(1).click(); + await page.locator('#eastLandUseType-panel').getByRole('option', { name: 'Civic / Institutional' }).click(); + await page.getByRole('textbox', { name: 'East land use type description' }).fill('1'); // South - await inboxLoggedIn.getByPlaceholder('Main Land Use Type').nth(2).click(); - await inboxLoggedIn.locator('#southLandUseType-panel').getByRole('option', { name: 'Commercial / Retail' }).click(); - await inboxLoggedIn.getByRole('textbox', { name: 'South land use type description' }).fill('1'); + await page.getByPlaceholder('Main Land Use Type').nth(2).click(); + await page.locator('#southLandUseType-panel').getByRole('option', { name: 'Commercial / Retail' }).click(); + await page.getByRole('textbox', { name: 'South land use type description' }).fill('1'); // West - await inboxLoggedIn.getByPlaceholder('Main Land Use Type').nth(3).click(); - await inboxLoggedIn.locator('#westLandUseType-panel').getByRole('option', { name: 'Industrial' }).click(); - await inboxLoggedIn.getByRole('textbox', { name: 'West land use type description' }).fill('1'); + await page.getByPlaceholder('Main Land Use Type').nth(3).click(); + await page.locator('#westLandUseType-panel').getByRole('option', { name: 'Industrial' }).click(); + await page.getByRole('textbox', { name: 'West land use type description' }).fill('1'); - await inboxLoggedIn.getByText('Proposal', { exact: true }).click(); + await page.getByText('Proposal', { exact: true }).click(); // Step 6: Proposal - await inboxLoggedIn.getByLabel('What is the purpose of the proposal?').fill('This'); - await inboxLoggedIn + await page.getByLabel('What is the purpose of the proposal?').fill('This'); + await page .getByLabel( 'Specify any agricultural activities such as livestock operations, greenhouses or horticultural activities in proximity to the proposal.', ) .fill('That'); - await inboxLoggedIn + await page .getByLabel('What steps will you take to reduce potential negative impacts on surrounding agricultural lands?') .fill('The other'); - await inboxLoggedIn - .getByLabel('Could this proposal be accommodated on lands outside of the ALR?') - .fill('And another'); - await inboxLoggedIn.getByPlaceholder('Type total area').fill('1'); - await inboxLoggedIn - .getByText('I confirm that all affected property owners with land in the ALR have been notif') - .click(); + await page.getByLabel('Could this proposal be accommodated on lands outside of the ALR?').fill('And another'); + await page.getByPlaceholder('Type total area').fill('1'); + await page.getByText('I confirm that all affected property owners with land in the ALR have been notif').click(); // File upload - const proofOfServiceNoticeFileChooserPromise = inboxLoggedIn.waitForEvent('filechooser'); - await inboxLoggedIn.getByRole('button', { name: 'Choose file to Upload', exact: true }).nth(0).click(); + const proofOfServiceNoticeFileChooserPromise = page.waitForEvent('filechooser'); + await page.getByRole('button', { name: 'Choose file to Upload', exact: true }).nth(0).click(); const proofOfServiceNoticeFileChooser = await proofOfServiceNoticeFileChooserPromise; proofOfServiceNoticeFileChooser.setFiles('data/temp.txt'); // File upload - const proposalMapFileChooserPromise = inboxLoggedIn.waitForEvent('filechooser'); - await inboxLoggedIn.getByRole('button', { name: 'Choose file to Upload', exact: true }).nth(1).click(); + const proposalMapFileChooserPromise = page.waitForEvent('filechooser'); + await page.getByRole('button', { name: 'Choose file to Upload', exact: true }).nth(1).click(); const proposalMapFileChooser = await proposalMapFileChooserPromise; proposalMapFileChooser.setFiles('data/temp.txt'); - await inboxLoggedIn.getByText('Upload Attachments').click(); + await page.getByText('Upload Attachments').click(); // Step 7: Optional attachments // File upload first file - const optionalFile1ChooserPromise = inboxLoggedIn.waitForEvent('filechooser'); - await inboxLoggedIn.getByRole('button', { name: 'Choose file to Upload', exact: true }).click(); + const optionalFile1ChooserPromise = page.waitForEvent('filechooser'); + await page.getByRole('button', { name: 'Choose file to Upload', exact: true }).click(); const optionalFile1Chooser = await optionalFile1ChooserPromise; optionalFile1Chooser.setFiles('data/temp.txt'); - await inboxLoggedIn.getByPlaceholder('Select a type').nth(0).click(); - await inboxLoggedIn.getByText('Professional Report').click(); - await inboxLoggedIn.getByPlaceholder('Type description').nth(0).fill('Desc'); + await page.getByPlaceholder('Select a type').nth(0).click(); + await page.getByText('Professional Report').click(); + await page.getByPlaceholder('Type description').nth(0).fill('Desc'); // File upload second file - const optionalFile2ChooserPromise = inboxLoggedIn.waitForEvent('filechooser'); - await inboxLoggedIn.getByRole('button', { name: 'Choose file to Upload', exact: true }).click(); + const optionalFile2ChooserPromise = page.waitForEvent('filechooser'); + await page.getByRole('button', { name: 'Choose file to Upload', exact: true }).click(); const optionalFile2Chooser = await optionalFile2ChooserPromise; optionalFile2Chooser.setFiles('data/temp.txt'); - await inboxLoggedIn.getByPlaceholder('Select a type').nth(1).click(); - await inboxLoggedIn.getByText('Site Photo').click(); - await inboxLoggedIn.getByPlaceholder('Type description').nth(1).fill('Desc'); + await page.getByPlaceholder('Select a type').nth(1).click(); + await page.getByText('Site Photo').click(); + await page.getByPlaceholder('Type description').nth(1).fill('Desc'); - await inboxLoggedIn.getByText('Review & Submit').click(); + await page.getByText('Review & Submit').click(); // Step 8: Review // 1. Parcels // Parcel 1 - await expect(inboxLoggedIn.getByTestId('parcel-0-type')).toHaveText('Fee Simple'); - await expect(inboxLoggedIn.getByTestId('parcel-0-legal-description')).toHaveText('Parcel description'); - await expect(inboxLoggedIn.getByTestId('parcel-0-map-area')).toHaveText('1 ha'); - await expect(inboxLoggedIn.getByTestId('parcel-0-pid')).toHaveText('111-111-111'); - await expect(inboxLoggedIn.getByTestId('parcel-0-purchase-date')).toHaveText('Apr 23, 2014'); - await expect(inboxLoggedIn.getByTestId('parcel-0-is-farm')).toHaveText('Yes'); - await expect(inboxLoggedIn.getByTestId('parcel-0-civic-address')).toHaveText('123 Street Rd'); - await expect(inboxLoggedIn.getByTestId('parcel-0-certificate-of-title')).toHaveText('temp.txt'); + await expect(page.getByTestId('parcel-0-type')).toHaveText('Fee Simple'); + await expect(page.getByTestId('parcel-0-legal-description')).toHaveText('Parcel description'); + await expect(page.getByTestId('parcel-0-map-area')).toHaveText('1 ha'); + await expect(page.getByTestId('parcel-0-pid')).toHaveText('111-111-111'); + await expect(page.getByTestId('parcel-0-purchase-date')).toHaveText('Apr 23, 2014'); + await expect(page.getByTestId('parcel-0-is-farm')).toHaveText('Yes'); + await expect(page.getByTestId('parcel-0-civic-address')).toHaveText('123 Street Rd'); + await expect(page.getByTestId('parcel-0-certificate-of-title')).toHaveText('temp.txt'); // Owners - await expect(inboxLoggedIn.getByTestId('parcel-0-owner-0-name')).toHaveText('1 1'); - await expect(inboxLoggedIn.getByTestId('parcel-0-owner-0-organization')).toHaveText('No Data'); - await expect(inboxLoggedIn.getByTestId('parcel-0-owner-0-phone-number')).toHaveText('(111) 111-1111'); - await expect(inboxLoggedIn.getByTestId('parcel-0-owner-0-email')).toHaveText('1@1'); - await expect(inboxLoggedIn.getByTestId('parcel-0-owner-0-corporate-summary')).toHaveText('Not Applicable'); + await expect(page.getByTestId('parcel-0-owner-0-name')).toHaveText('1 1'); + await expect(page.getByTestId('parcel-0-owner-0-organization')).toHaveText('No Data'); + await expect(page.getByTestId('parcel-0-owner-0-phone-number')).toHaveText('(111) 111-1111'); + await expect(page.getByTestId('parcel-0-owner-0-email')).toHaveText('1@1'); + await expect(page.getByTestId('parcel-0-owner-0-corporate-summary')).toHaveText('Not Applicable'); - await expect(inboxLoggedIn.getByTestId('parcel-0-is-confirmed-by-applicant')).toHaveText('Yes'); + await expect(page.getByTestId('parcel-0-is-confirmed-by-applicant')).toHaveText('Yes'); // 2. Other Parcels - await expect(inboxLoggedIn.getByTestId('has-other-parcels')).toHaveText('Yes'); - await expect(inboxLoggedIn.getByTestId('other-parcels-description')).toHaveText('Other parcels'); + await expect(page.getByTestId('has-other-parcels')).toHaveText('Yes'); + await expect(page.getByTestId('other-parcels-description')).toHaveText('Other parcels'); // 3. Primary Contact - await expect(inboxLoggedIn.getByTestId('primary-contact-type')).toHaveText('Land Owner'); - await expect(inboxLoggedIn.getByTestId('primary-contact-first-name')).toHaveText('1'); - await expect(inboxLoggedIn.getByTestId('primary-contact-last-name')).toHaveText('1'); - await expect(inboxLoggedIn.getByTestId('primary-contact-organization')).toHaveText('No Data'); - await expect(inboxLoggedIn.getByTestId('primary-contact-phone-number')).toHaveText('(111) 111-1111'); - await expect(inboxLoggedIn.getByTestId('primary-contact-email')).toHaveText('1@1'); + await expect(page.getByTestId('primary-contact-type')).toHaveText('Land Owner'); + await expect(page.getByTestId('primary-contact-first-name')).toHaveText('1'); + await expect(page.getByTestId('primary-contact-last-name')).toHaveText('1'); + await expect(page.getByTestId('primary-contact-organization')).toHaveText('No Data'); + await expect(page.getByTestId('primary-contact-phone-number')).toHaveText('(111) 111-1111'); + await expect(page.getByTestId('primary-contact-email')).toHaveText('1@1'); // 4. Government - await expect(inboxLoggedIn.getByTestId('government-name')).toHaveText('Peace River Regional District'); + await expect(page.getByTestId('government-name')).toHaveText('Peace River Regional District'); // 5. Land Use - await expect(inboxLoggedIn.getByTestId('parcels-agriculture-description')).toHaveText('This'); - await expect(inboxLoggedIn.getByTestId('parcels-agriculture-improvement-description')).toHaveText('That'); - await expect(inboxLoggedIn.getByTestId('parcels-non-agriculture-description')).toHaveText('The other'); - await expect(inboxLoggedIn.getByTestId('north-land-use-type')).toHaveText('Agricultural / Farm'); - await expect(inboxLoggedIn.getByTestId('north-land-use-description')).toHaveText('1'); - await expect(inboxLoggedIn.getByTestId('east-land-use-type')).toHaveText('Civic / Institutional'); - await expect(inboxLoggedIn.getByTestId('east-land-use-description')).toHaveText('1'); - await expect(inboxLoggedIn.getByTestId('south-land-use-type')).toHaveText('Commercial / Retail'); - await expect(inboxLoggedIn.getByTestId('south-land-use-description')).toHaveText('1'); - await expect(inboxLoggedIn.getByTestId('west-land-use-type')).toHaveText('Industrial'); - await expect(inboxLoggedIn.getByTestId('west-land-use-description')).toHaveText('1'); + await expect(page.getByTestId('parcels-agriculture-description')).toHaveText('This'); + await expect(page.getByTestId('parcels-agriculture-improvement-description')).toHaveText('That'); + await expect(page.getByTestId('parcels-non-agriculture-description')).toHaveText('The other'); + await expect(page.getByTestId('north-land-use-type')).toHaveText('Agricultural / Farm'); + await expect(page.getByTestId('north-land-use-description')).toHaveText('1'); + await expect(page.getByTestId('east-land-use-type')).toHaveText('Civic / Institutional'); + await expect(page.getByTestId('east-land-use-description')).toHaveText('1'); + await expect(page.getByTestId('south-land-use-type')).toHaveText('Commercial / Retail'); + await expect(page.getByTestId('south-land-use-description')).toHaveText('1'); + await expect(page.getByTestId('west-land-use-type')).toHaveText('Industrial'); + await expect(page.getByTestId('west-land-use-description')).toHaveText('1'); // 6. Proposal - await expect(inboxLoggedIn.getByTestId('tur-purpose')).toHaveText('This'); - await expect(inboxLoggedIn.getByTestId('tur-agricultural-activities')).toHaveText('That'); - await expect(inboxLoggedIn.getByTestId('tur-reduce-negative-impacts')).toHaveText('The other'); - await expect(inboxLoggedIn.getByTestId('tur-outside-lands')).toHaveText('And another'); - await expect(inboxLoggedIn.getByTestId('tur-total-corridor-area')).toHaveText('1 ha'); - await expect(inboxLoggedIn.getByTestId('tur-all-owners-notified')).toHaveText('Yes'); - await expect(inboxLoggedIn.getByTestId('tur-proof-of-serving-notice')).toHaveText('temp.txt'); - await expect(inboxLoggedIn.getByTestId('tur-proposal-map')).toHaveText('temp.txt'); + await expect(page.getByTestId('tur-purpose')).toHaveText('This'); + await expect(page.getByTestId('tur-agricultural-activities')).toHaveText('That'); + await expect(page.getByTestId('tur-reduce-negative-impacts')).toHaveText('The other'); + await expect(page.getByTestId('tur-outside-lands')).toHaveText('And another'); + await expect(page.getByTestId('tur-total-corridor-area')).toHaveText('1 ha'); + await expect(page.getByTestId('tur-all-owners-notified')).toHaveText('Yes'); + await expect(page.getByTestId('tur-proof-of-serving-notice')).toHaveText('temp.txt'); + await expect(page.getByTestId('tur-proposal-map')).toHaveText('temp.txt'); // 7. Optional Documents // Doc 1 - await expect(inboxLoggedIn.getByTestId('optional-document-0-file-name')).toHaveText('temp.txt'); - await expect(inboxLoggedIn.getByTestId('optional-document-0-type')).toHaveText('Professional Report'); - await expect(inboxLoggedIn.getByTestId('optional-document-0-description')).toHaveText('Desc'); + await expect(page.getByTestId('optional-document-0-file-name')).toHaveText('temp.txt'); + await expect(page.getByTestId('optional-document-0-type')).toHaveText('Professional Report'); + await expect(page.getByTestId('optional-document-0-description')).toHaveText('Desc'); // Doc 2 - await expect(inboxLoggedIn.getByTestId('optional-document-1-file-name')).toHaveText('temp.txt'); - await expect(inboxLoggedIn.getByTestId('optional-document-1-type')).toHaveText('Site Photo'); - await expect(inboxLoggedIn.getByTestId('optional-document-1-description')).toHaveText('Desc'); + await expect(page.getByTestId('optional-document-1-file-name')).toHaveText('temp.txt'); + await expect(page.getByTestId('optional-document-1-type')).toHaveText('Site Photo'); + await expect(page.getByTestId('optional-document-1-description')).toHaveText('Desc'); }); From 73cf4c82ff8682965283978e75f5daf15fc44c9f Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Thu, 18 Apr 2024 16:47:27 -0700 Subject: [PATCH 018/103] Centralize tests Since we're checking ALCS in the same test, breaking tests into portal/ALCS doesn't make sense --- .../pages/login-page.ts => pages/portal-login-page.ts} | 2 +- e2e/tests/{portal => }/tur.spec.ts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) rename e2e/tests/{portal/pages/login-page.ts => pages/portal-login-page.ts} (96%) rename e2e/tests/{portal => }/tur.spec.ts (97%) diff --git a/e2e/tests/portal/pages/login-page.ts b/e2e/tests/pages/portal-login-page.ts similarity index 96% rename from e2e/tests/portal/pages/login-page.ts rename to e2e/tests/pages/portal-login-page.ts index a42bdcf647..55da986f33 100644 --- a/e2e/tests/portal/pages/login-page.ts +++ b/e2e/tests/pages/portal-login-page.ts @@ -1,6 +1,6 @@ import { type Locator, type Page } from '@playwright/test'; -export class LoginPage { +export class PortalLoginPage { readonly page: Page; readonly loginButton: Locator; readonly userIdTextField: Locator; diff --git a/e2e/tests/portal/tur.spec.ts b/e2e/tests/tur.spec.ts similarity index 97% rename from e2e/tests/portal/tur.spec.ts rename to e2e/tests/tur.spec.ts index 01aea83dce..db6d842f60 100644 --- a/e2e/tests/portal/tur.spec.ts +++ b/e2e/tests/tur.spec.ts @@ -1,13 +1,13 @@ import { test, expect } from '@playwright/test'; -import { LoginPage } from './pages/login-page'; +import { PortalLoginPage } from './pages/portal-login-page'; test('TUR', async ({ browser }) => { const context = await browser.newContext({ baseURL: process.env.PORTAL_BASE_URL }); const page = await context.newPage(); - const loginPage = new LoginPage(page); - await loginPage.goto(); - await loginPage.logIn(process.env.BCEID_BASIC_USERNAME, process.env.BCEID_BASIC_PASSWORD); + const portalLoginPage = new PortalLoginPage(page); + await portalLoginPage.goto(); + await portalLoginPage.logIn(process.env.BCEID_BASIC_USERNAME, process.env.BCEID_BASIC_PASSWORD); // Create TUR app await page.getByRole('button', { name: '+ Create New' }).click(); From d91344793e800cae947d3c60f91ab0f0f2826c62 Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Thu, 18 Apr 2024 17:11:55 -0700 Subject: [PATCH 019/103] Create inbox POM --- e2e/tests/pages/inbox-page.ts | 53 +++++++++++++++++++++++++++++++++++ e2e/tests/tur.spec.ts | 10 ++----- 2 files changed, 56 insertions(+), 7 deletions(-) create mode 100644 e2e/tests/pages/inbox-page.ts diff --git a/e2e/tests/pages/inbox-page.ts b/e2e/tests/pages/inbox-page.ts new file mode 100644 index 0000000000..35f273fe14 --- /dev/null +++ b/e2e/tests/pages/inbox-page.ts @@ -0,0 +1,53 @@ +import { expect, type Locator, type Page } from '@playwright/test'; + +export enum SubmissionType { + Application = 'Application', + NoticeOfIntent = 'Notice of Intent', + SRW = 'Notification of Statutory Right of Way (SRW)', +} + +export enum ApplicationType { + Inclusion = 'Include Land into the ALR', + NARU = 'Non-Adhering Residential Use within the ALR', + POFO = 'Placement of Fill within the ALR', + PFRS = 'Removal of Soil (Extraction) and Placement of Fill within the ALR', + ROSO = 'Removal of Soil (Extraction) within the ALR', + NFU = 'Non-Farm Uses within the ALR', + Subdivision = 'Subdivide Land in the ALR', + TUR = 'Transportation, Utility, or Recreational Trail Uses within the ALR', + Exclusion = 'Exclude Land from the ALR', + Covenant = 'Register a Restrictive Covenant within the ALR', +} + +export class InboxPage { + readonly page: Page; + readonly startCreateButton: Locator; + readonly nextButton: Locator; + readonly finishCreateButton: Locator; + readonly createNewDialog: Locator; + + constructor(page: Page) { + this.page = page; + this.startCreateButton = page.getByRole('button', { name: '+ Create New' }); + this.nextButton = page.getByRole('button', { name: 'Next' }); + this.finishCreateButton = page.getByRole('button', { name: 'create' }); + this.createNewDialog = page.getByRole('dialog', { name: 'Create New' }); + } + + async createApplication(type: ApplicationType) { + await this.startCreateButton.click(); + await this.setSubmissionType(SubmissionType.Application); + await this.nextButton.click(); + await this.setApplicationType(type); + await this.finishCreateButton.click(); + await expect(this.createNewDialog).toBeHidden(); + } + + async setSubmissionType(type: SubmissionType) { + await this.page.getByRole('radio', { name: type }).check(); + } + + async setApplicationType(type: ApplicationType) { + await this.page.getByRole('radio', { name: type }).click(); + } +} diff --git a/e2e/tests/tur.spec.ts b/e2e/tests/tur.spec.ts index db6d842f60..9281edc66a 100644 --- a/e2e/tests/tur.spec.ts +++ b/e2e/tests/tur.spec.ts @@ -1,5 +1,6 @@ import { test, expect } from '@playwright/test'; import { PortalLoginPage } from './pages/portal-login-page'; +import { ApplicationType, InboxPage } from './pages/inbox-page'; test('TUR', async ({ browser }) => { const context = await browser.newContext({ baseURL: process.env.PORTAL_BASE_URL }); @@ -9,13 +10,8 @@ test('TUR', async ({ browser }) => { await portalLoginPage.goto(); await portalLoginPage.logIn(process.env.BCEID_BASIC_USERNAME, process.env.BCEID_BASIC_PASSWORD); - // Create TUR app - await page.getByRole('button', { name: '+ Create New' }).click(); - await page.getByText('Application', { exact: true }).click(); - await page.getByRole('button', { name: 'Next' }).click(); - await page.getByText('Transportation, Utility, or Recreational Trail Uses within the ALR').click(); - await page.getByRole('button', { name: 'create' }).click(); - await page.getByText('Parcel Details', { exact: true }).click(); // Ensure parcels page + const inbox = new InboxPage(page); + await inbox.createApplication(ApplicationType.TUR); // Step 1a: Parcels await page.getByRole('button', { name: 'Fee Simple' }).click(); From df6db00dcd6a155d7035876e14cd81b67a312b82 Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Mon, 22 Apr 2024 16:00:47 -0700 Subject: [PATCH 020/103] Fix month--year labels formatted incorrectly Both display and a11y labels were showing only the year, when they should be month and year. --- portal-frontend/src/app/shared/utils/date-format.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/shared/utils/date-format.ts b/portal-frontend/src/app/shared/utils/date-format.ts index 4afe8a1c8a..a9e9007243 100644 --- a/portal-frontend/src/app/shared/utils/date-format.ts +++ b/portal-frontend/src/app/shared/utils/date-format.ts @@ -6,9 +6,9 @@ export const DATE_FORMATS = { }, display: { dateInput: environment.dateFormat, - monthYearLabel: 'YYYY', + monthYearLabel: 'MMM YYYY', dateA11yLabel: 'LL', - monthYearA11yLabel: 'YYYY', + monthYearA11yLabel: 'MMMM YYYY', monthLabel: 'MMM', monthDayLabel: 'MMM-DD', popupHeaderDateLabel: 'YYYY-MMM-DD', From 102b4bf6e3e01673d17588b9814664509474aef3 Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Fri, 26 Apr 2024 13:59:11 -0700 Subject: [PATCH 021/103] Align terminology with Playwright role terminology --- e2e/tests/pages/portal-login-page.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/e2e/tests/pages/portal-login-page.ts b/e2e/tests/pages/portal-login-page.ts index 55da986f33..85210ab4d1 100644 --- a/e2e/tests/pages/portal-login-page.ts +++ b/e2e/tests/pages/portal-login-page.ts @@ -3,16 +3,16 @@ import { type Locator, type Page } from '@playwright/test'; export class PortalLoginPage { readonly page: Page; readonly loginButton: Locator; - readonly userIdTextField: Locator; - readonly passwordTextField: Locator; + readonly userIdTextbox: Locator; + readonly passwordTextbox: Locator; readonly continueButton: Locator; constructor(page: Page) { this.page = page; this.loginButton = page.getByRole('button', { name: 'Portal Login' }); // There is an error with the username label on BCeID page - this.userIdTextField = page.getByRole('textbox').nth(0); - this.passwordTextField = page.getByLabel('Password'); + this.userIdTextbox = page.getByRole('textbox').nth(0); + this.passwordTextbox = page.getByLabel('Password'); this.continueButton = page.getByRole('button', { name: 'Continue' }); } @@ -22,8 +22,8 @@ export class PortalLoginPage { async logIn(username: string, password: string) { await this.loginButton.click(); - await this.userIdTextField.fill(username); - await this.passwordTextField.fill(password); + await this.userIdTextbox.fill(username); + await this.passwordTextbox.fill(password); await this.continueButton.click(); } } From ec59e2908998bbea7e2766eac83e0f651af0286c Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Thu, 2 May 2024 17:13:07 -0700 Subject: [PATCH 022/103] Convert the rest of the portal sections and review --- e2e/data/temp2.txt | 1 + e2e/tests/pages/portal/government-page.ts | 18 + e2e/tests/pages/portal/inbox-page.ts | 53 +++ e2e/tests/pages/portal/land-use-page.ts | 77 ++++ .../pages/portal/optional-attachments-page.ts | 72 ++++ e2e/tests/pages/portal/other-parcels-page.ts | 23 ++ e2e/tests/pages/portal/parcels-page.ts | 290 ++++++++++++++ e2e/tests/pages/portal/portal-login-page.ts | 29 ++ .../pages/portal/portal-steps-navigation.ts | 57 +++ .../pages/portal/primary-contact-page.ts | 67 ++++ .../government-section.ts | 15 + .../land-use-section.ts | 27 ++ .../optional-documents-section.ts | 28 ++ .../other-owned-parcels-section.ts | 21 + .../review-and-submit-page/parcels-section.ts | 130 +++++++ .../primary-contact-section.ts | 45 +++ .../review-and-submit-page.ts | 64 +++ .../tur-proposal-section.ts | 41 ++ .../pages/portal/submission-success-page.ts | 26 ++ e2e/tests/pages/portal/tur-proposal-page.ts | 65 ++++ e2e/tests/tur.spec.ts | 366 ++++++++---------- .../application-details.component.html | 29 +- .../parcel/parcel.component.html | 38 +- .../land-use/land-use.component.html | 32 +- .../tur-proposal/tur-proposal.component.html | 2 + .../custom-stepper.component.html | 2 +- 26 files changed, 1384 insertions(+), 234 deletions(-) create mode 100644 e2e/data/temp2.txt create mode 100644 e2e/tests/pages/portal/government-page.ts create mode 100644 e2e/tests/pages/portal/inbox-page.ts create mode 100644 e2e/tests/pages/portal/land-use-page.ts create mode 100644 e2e/tests/pages/portal/optional-attachments-page.ts create mode 100644 e2e/tests/pages/portal/other-parcels-page.ts create mode 100644 e2e/tests/pages/portal/parcels-page.ts create mode 100644 e2e/tests/pages/portal/portal-login-page.ts create mode 100644 e2e/tests/pages/portal/portal-steps-navigation.ts create mode 100644 e2e/tests/pages/portal/primary-contact-page.ts create mode 100644 e2e/tests/pages/portal/review-and-submit-page/government-section.ts create mode 100644 e2e/tests/pages/portal/review-and-submit-page/land-use-section.ts create mode 100644 e2e/tests/pages/portal/review-and-submit-page/optional-documents-section.ts create mode 100644 e2e/tests/pages/portal/review-and-submit-page/other-owned-parcels-section.ts create mode 100644 e2e/tests/pages/portal/review-and-submit-page/parcels-section.ts create mode 100644 e2e/tests/pages/portal/review-and-submit-page/primary-contact-section.ts create mode 100644 e2e/tests/pages/portal/review-and-submit-page/review-and-submit-page.ts create mode 100644 e2e/tests/pages/portal/review-and-submit-page/tur-proposal-section.ts create mode 100644 e2e/tests/pages/portal/submission-success-page.ts create mode 100644 e2e/tests/pages/portal/tur-proposal-page.ts diff --git a/e2e/data/temp2.txt b/e2e/data/temp2.txt new file mode 100644 index 0000000000..5eced95754 --- /dev/null +++ b/e2e/data/temp2.txt @@ -0,0 +1 @@ +Foobar \ No newline at end of file diff --git a/e2e/tests/pages/portal/government-page.ts b/e2e/tests/pages/portal/government-page.ts new file mode 100644 index 0000000000..9c5a2a33bb --- /dev/null +++ b/e2e/tests/pages/portal/government-page.ts @@ -0,0 +1,18 @@ +import { type Locator, type Page } from '@playwright/test'; + +export class GovernmentPage { + readonly page: Page; + readonly textbox: Locator; + + constructor(page: Page) { + this.page = page; + this.textbox = page.getByPlaceholder('Type government'); + } + + async fill(name: string) { + // Type half the name + await this.textbox.fill(name.slice(0, Math.floor(name.length / 2))); + // Find in autocomplete list + await this.page.getByText(name).click(); + } +} diff --git a/e2e/tests/pages/portal/inbox-page.ts b/e2e/tests/pages/portal/inbox-page.ts new file mode 100644 index 0000000000..35f273fe14 --- /dev/null +++ b/e2e/tests/pages/portal/inbox-page.ts @@ -0,0 +1,53 @@ +import { expect, type Locator, type Page } from '@playwright/test'; + +export enum SubmissionType { + Application = 'Application', + NoticeOfIntent = 'Notice of Intent', + SRW = 'Notification of Statutory Right of Way (SRW)', +} + +export enum ApplicationType { + Inclusion = 'Include Land into the ALR', + NARU = 'Non-Adhering Residential Use within the ALR', + POFO = 'Placement of Fill within the ALR', + PFRS = 'Removal of Soil (Extraction) and Placement of Fill within the ALR', + ROSO = 'Removal of Soil (Extraction) within the ALR', + NFU = 'Non-Farm Uses within the ALR', + Subdivision = 'Subdivide Land in the ALR', + TUR = 'Transportation, Utility, or Recreational Trail Uses within the ALR', + Exclusion = 'Exclude Land from the ALR', + Covenant = 'Register a Restrictive Covenant within the ALR', +} + +export class InboxPage { + readonly page: Page; + readonly startCreateButton: Locator; + readonly nextButton: Locator; + readonly finishCreateButton: Locator; + readonly createNewDialog: Locator; + + constructor(page: Page) { + this.page = page; + this.startCreateButton = page.getByRole('button', { name: '+ Create New' }); + this.nextButton = page.getByRole('button', { name: 'Next' }); + this.finishCreateButton = page.getByRole('button', { name: 'create' }); + this.createNewDialog = page.getByRole('dialog', { name: 'Create New' }); + } + + async createApplication(type: ApplicationType) { + await this.startCreateButton.click(); + await this.setSubmissionType(SubmissionType.Application); + await this.nextButton.click(); + await this.setApplicationType(type); + await this.finishCreateButton.click(); + await expect(this.createNewDialog).toBeHidden(); + } + + async setSubmissionType(type: SubmissionType) { + await this.page.getByRole('radio', { name: type }).check(); + } + + async setApplicationType(type: ApplicationType) { + await this.page.getByRole('radio', { name: type }).click(); + } +} diff --git a/e2e/tests/pages/portal/land-use-page.ts b/e2e/tests/pages/portal/land-use-page.ts new file mode 100644 index 0000000000..811d61cdf1 --- /dev/null +++ b/e2e/tests/pages/portal/land-use-page.ts @@ -0,0 +1,77 @@ +import { expect, type Locator, type Page } from '@playwright/test'; + +export enum Direction { + North = 'north', + East = 'east', + South = 'south', + West = 'west', +} + +export enum LandUseType { + Agricultural = 'Agricultural / Farm', + Civic = 'Civic / Institutional', + Commercial = 'Commercial / Retail', + Industrial = 'Industrial', + Other = 'Other', + Recreational = 'Recreational', + Residential = 'Residential', + Transportation = 'Transportation / Utilities', + Unused = 'Unused', +} + +export interface LandUseDetails { + currentAgriculture: string; + improvements: string; + otherUses: string; + neighbouringLandUse: Map; +} + +interface NeighbouringLandUse { + type: LandUseType; + activity: string; +} + +export class LandUsePage { + readonly page: Page; + readonly currentAgricultureTextField: Locator; + readonly improvementsTextField: Locator; + readonly otherUsesTextField: Locator; + + constructor(page: Page) { + this.page = page; + this.currentAgricultureTextField = page.getByRole('textbox', { + name: 'Describe all agriculture that currently takes place on the parcel(s).', + }); + this.improvementsTextField = page.getByRole('textbox', { + name: 'Describe all agricultural improvements made to the parcel(s).', + }); + this.otherUsesTextField = page.getByRole('textbox', { + name: 'Describe all other uses that currently take place on the parcel(s).', + }); + } + + async fill(landUse: LandUseDetails) { + await this.currentAgricultureTextField.fill(landUse.currentAgriculture); + await this.improvementsTextField.fill(landUse.improvements); + await this.otherUsesTextField.fill(landUse.otherUses); + + for (const [direction, { type, activity }] of landUse.neighbouringLandUse) { + await this.setNeighbouringType(direction, type); + await this.neighbouringActivityTextbox(direction).fill(activity); + } + } + + async setNeighbouringType(direction: Direction, type: LandUseType) { + await this.neighbouringTypeCombobox(direction).click(); + await this.page.getByRole('option', { name: type }).click(); + await expect(this.page.getByRole('listbox')).toBeHidden(); + } + + neighbouringTypeCombobox(direction: Direction): Locator { + return this.page.getByTestId(`${direction}-type-combobox`); + } + + neighbouringActivityTextbox(direction: Direction): Locator { + return this.page.getByTestId(`${direction}-activity-textbox`); + } +} diff --git a/e2e/tests/pages/portal/optional-attachments-page.ts b/e2e/tests/pages/portal/optional-attachments-page.ts new file mode 100644 index 0000000000..4f20756ba1 --- /dev/null +++ b/e2e/tests/pages/portal/optional-attachments-page.ts @@ -0,0 +1,72 @@ +import { type Locator, type Page } from '@playwright/test'; + +// // Step 7: Optional attachments +// // File upload first file +// const optionalFile1ChooserPromise = page.waitForEvent('filechooser'); +// await page.getByRole('button', { name: 'Choose file to Upload', exact: true }).click(); +// const optionalFile1Chooser = await optionalFile1ChooserPromise; +// optionalFile1Chooser.setFiles('data/temp.txt'); +// await page.getByPlaceholder('Select a type').nth(0).click(); +// await page.getByText('Professional Report').click(); +// await page.getByPlaceholder('Type description').nth(0).fill('Desc'); + +// // File upload second file +// const optionalFile2ChooserPromise = page.waitForEvent('filechooser'); +// await page.getByRole('button', { name: 'Choose file to Upload', exact: true }).click(); +// const optionalFile2Chooser = await optionalFile2ChooserPromise; +// optionalFile2Chooser.setFiles('data/temp.txt'); +// await page.getByPlaceholder('Select a type').nth(1).click(); +// await page.getByText('Site Photo').click(); +// await page.getByPlaceholder('Type description').nth(1).fill('Desc'); + +// await page.getByText('Review & Submit').click(); + +export enum OptionalAttachmentType { + SitePhoto = 'Site Photo', + ProfessionalReport = 'Professional Report', + Other = 'Other', +} + +export interface OptionalAttachment { + path: string; + type: OptionalAttachmentType; + description: string; +} + +export class OptionalAttachmentsPage { + readonly page: Page; + readonly uploadButton: Locator; + readonly typeComboboxes: Locator; + readonly descriptionTextboxes: Locator; + + constructor(page: Page) { + this.page = page; + this.uploadButton = page.getByRole('button', { name: 'Choose file to Upload', exact: true }); + this.typeComboboxes = page.getByRole('combobox', { name: 'type' }); + this.descriptionTextboxes = page.getByRole('textbox', { name: 'description' }); + } + + async addAttachments(attachments: OptionalAttachment[]) { + for (const { path, type, description } of attachments) { + await this.uploadAttachment(path); + await this.setLastType(type); + await this.fillLastDescription(description); + } + } + + async uploadAttachment(path: string) { + const fileChooserPromise = this.page.waitForEvent('filechooser'); + await this.uploadButton.click(); + const fileChooser = await fileChooserPromise; + await fileChooser.setFiles(path); + } + + async setLastType(type: OptionalAttachmentType) { + await this.typeComboboxes.last().click(); + await this.page.getByText(type).click(); + } + + async fillLastDescription(description: string) { + await this.descriptionTextboxes.last().fill(description); + } +} diff --git a/e2e/tests/pages/portal/other-parcels-page.ts b/e2e/tests/pages/portal/other-parcels-page.ts new file mode 100644 index 0000000000..9358902ecf --- /dev/null +++ b/e2e/tests/pages/portal/other-parcels-page.ts @@ -0,0 +1,23 @@ +import { type Locator, type Page } from '@playwright/test'; + +export class OtherParcelsPage { + readonly page: Page; + readonly yesButton: Locator; + readonly noButton: Locator; + + constructor(page: Page) { + this.page = page; + this.yesButton = page.getByRole('button', { name: 'Yes' }); + this.noButton = page.getByRole('button', { name: 'No' }); + } + + async setHasOtherParcels(hasOtherParcels: boolean) { + await (hasOtherParcels ? this.yesButton.click() : this.noButton.click()); + } + + async fillDescription(description: string) { + await this.page + .getByLabel('Describe the other parcels including their location, who owns or leases them, and their use.') + .fill(description); + } +} diff --git a/e2e/tests/pages/portal/parcels-page.ts b/e2e/tests/pages/portal/parcels-page.ts new file mode 100644 index 0000000000..c2788e9cd0 --- /dev/null +++ b/e2e/tests/pages/portal/parcels-page.ts @@ -0,0 +1,290 @@ +import { expect, type Locator, type Page } from '@playwright/test'; + +export enum ParcelType { + FeeSimple = 'Fee Simple', + Crown = 'Crown', +} + +export enum OwnerType { + Individual = 'Individual', + Organization = 'Organization', + ProvincialCrown = 'Provincial Crown', + FederalCrown = 'Federal Crown', +} + +export interface ParcelDetails { + type: ParcelType; + legalDescription: string; + mapArea: string; + pid?: string; + pin?: string; + year?: string; + month?: string; + day?: string; + isFarm: boolean; + civicAddress: string; + certificateOfTitlePath: string; + isConfirmed: boolean; + owners: ParcelOwnerDetails[]; +} + +export interface ParcelOwnerDetails { + type: OwnerType; + organization?: string; + corporateSummaryPath?: string; + firstName: string; + lastName: string; + phoneNumber: string; + email: string; +} + +export class ParcelsPage { + readonly page: Page; + readonly parcelAddButton: Locator; + readonly ownerAddDialog: Locator; + readonly ownerOrganizationTexbox: Locator; + readonly ownerMinistryTexbox: Locator; + readonly ownerFirstNameTexbox: Locator; + readonly ownerLastNameTexbox: Locator; + readonly ownerPhoneNumberTexbox: Locator; + readonly ownerEmailTexbox: Locator; + readonly ownerSaveButton: Locator; + + constructor(page: Page) { + this.page = page; + this.parcelAddButton = page.getByRole('button', { name: 'Add another parcel to the application' }); + this.ownerAddDialog = page.getByRole('dialog', { name: 'Add New Owner' }); + this.ownerOrganizationTexbox = page.getByPlaceholder('Enter Organization Name'); + this.ownerMinistryTexbox = page.getByPlaceholder('Type ministry or department name'); + this.ownerFirstNameTexbox = page.getByPlaceholder('Enter First Name'); + this.ownerLastNameTexbox = page.getByPlaceholder('Enter Last Name'); + this.ownerPhoneNumberTexbox = page.getByPlaceholder('(555) 555-5555'); + this.ownerEmailTexbox = page.getByPlaceholder('Enter Email'); + this.ownerSaveButton = page.getByRole('button', { name: 'Add' }); + } + + // Scenarios + // --------- + + async fill(parcels: ParcelDetails[]) { + for (const [parcel, i] of parcels.map((parcel, i): [ParcelDetails, number] => [parcel, i])) { + const parcelNumber = i + 1; + + await this.fillParcelDetails(parcelNumber, parcel); + + for (const owner of parcel.owners) { + await this.addOwner(parcelNumber, owner); + } + + if (parcel.isConfirmed) { + await this.checkConfirmationCheckbox(parcelNumber); + } + } + } + + /* Assumptions: + * - parcel must be expanded, so must be added sequentially, though + * this is currently not reliable. + */ + async fillParcelDetails(parcelNumber: number, parcel: ParcelDetails) { + if (parcel.type === ParcelType.FeeSimple) { + // Make sure required details are supplied + await expect(parcel.pid).toBeDefined(); + await expect(parcel.year).toBeDefined(); + await expect(parcel.month).toBeDefined(); + await expect(parcel.day).toBeDefined(); + } + + await this.setParcelType(parcelNumber, parcel.type); + await this.legalDescriptionTexbox(parcelNumber).fill(parcel.legalDescription); + await this.mapAreaTexbox(parcelNumber).fill(parcel.mapArea); + + if (parcel.pid !== undefined) { + await this.pidTexbox(parcelNumber).fill(parcel.pid); + } + + if (parcel.type === ParcelType.Crown && parcel.pin !== undefined) { + await this.pinTexbox(parcelNumber).fill(parcel.pin); + } + + if ( + parcel.type === ParcelType.FeeSimple && + parcel.year !== undefined && + parcel.month !== undefined && + parcel.day !== undefined + ) { + await this.setDate(parcelNumber, parcel.year, parcel.month, parcel.day); + } + + await this.setIsFarm(parcelNumber, parcel.isFarm); + await this.civicAddressTexbox(parcelNumber).fill(parcel.civicAddress); + await this.uploadCertificateOfTitle(parcelNumber, parcel.certificateOfTitlePath); + } + + /* Assumptions: + * - parcel must be expanded, so must be added sequentially, though + * this is currently not reliable. + */ + async addOwner(parcelNumber: number, owner: ParcelOwnerDetails) { + const parcelType = await this.parcelType(parcelNumber); + + if (parcelType === ParcelType.FeeSimple) { + await this.nonCrownOwnerAddButton(parcelNumber).click(); + await expect([OwnerType.Individual, OwnerType.Organization]).toContain(owner.type); + } else if (parcelType === ParcelType.Crown) { + await this.crownOwnerAddButton(parcelNumber).click(); + await expect([OwnerType.ProvincialCrown, OwnerType.FederalCrown]).toContain(owner.type); + } + + if ([OwnerType.Organization, OwnerType.ProvincialCrown, OwnerType.FederalCrown].includes(owner.type)) { + await expect(owner.organization).toBeDefined(); + } + if (owner.type === OwnerType.Organization) { + await expect(owner.corporateSummaryPath).toBeDefined(); + } + + await this.setOwnerType(owner.type); + + if ( + owner.type === OwnerType.Organization && + owner.organization !== undefined && + owner.corporateSummaryPath !== undefined + ) { + await this.ownerOrganizationTexbox.fill(owner.organization); + await this.uploadCorporateSummary(owner.corporateSummaryPath); + } else if ( + (owner.type === OwnerType.ProvincialCrown || owner.type === OwnerType.FederalCrown) && + owner.organization !== undefined + ) { + await this.ownerMinistryTexbox.fill(owner.organization); + } + + // Universal fields + await this.ownerFirstNameTexbox.fill(owner.firstName); + await this.ownerLastNameTexbox.fill(owner.lastName); + await this.ownerPhoneNumberTexbox.fill(owner.phoneNumber); + await this.ownerEmailTexbox.fill(owner.email); + + await this.ownerSaveButton.click(); + + // Wait for dialog to disappear + await expect(this.ownerAddDialog).toBeHidden(); + } + + // Actions + // ------- + + async addParcel() { + await this.parcelAddButton.click(); + } + + async setParcelType(parcelNumber: number, parcelType: ParcelType) { + await this.parcelBody(parcelNumber).getByRole('button', { name: parcelType }).click(); + } + + // Month uses 3-letter abbreviation (e.g., 'Apr') + async setDate(parcelNumber: number, year: string, month: string, day: string) { + await this.parcelBody(parcelNumber).getByRole('button', { name: 'Open calendar' }).click(); + // Can't have more than one datepicker open at once + // We just have to trust the correct one is still open + await this.page.getByRole('button', { name: year }).click(); + await this.page.getByRole('button').getByText(month).click(); + await this.page.getByRole('button', { name: day }).click(); + } + + async setIsFarm(parcelNumber: number, isFarm: boolean) { + await this.parcelBody(parcelNumber) + .getByRole('button', { name: isFarm ? 'Yes' : 'Else' }) + .click(); + } + + async uploadCertificateOfTitle(parcelNumber: number, path: string) { + const fileChooserPromise = this.page.waitForEvent('filechooser'); + await this.parcelBody(parcelNumber).getByRole('button', { name: 'Choose file to Upload', exact: true }).click(); + const fileChooser = await fileChooserPromise; + await fileChooser.setFiles(path); + } + + async setOwnerType(type: OwnerType) { + await this.page.getByRole('button', { name: type }).click(); + } + + async uploadCorporateSummary(path: string) { + const fileChooserPromise = this.page.waitForEvent('filechooser'); + await this.ownerAddDialog.getByRole('button', { name: 'Choose file to Upload', exact: true }).click(); + const fileChooser = await fileChooserPromise; + await fileChooser.setFiles(path); + } + + async checkConfirmationCheckbox(parcelNumber: number) { + await this.confirmationCheckbox(parcelNumber).check(); + } + + // Locator Getters + // --------------- + + parcelHeading(parcelNumber: number): Locator { + return this.page.getByRole('button', { name: new RegExp(`^\s*Parcel #${parcelNumber}`) }); + } + + // parcelNumber is 1-indexed (i.e., the user-facing parcel number) + parcelBody(parcelNumber: number): Locator { + return this.page.getByRole('region', { name: `Parcel #${parcelNumber}`, includeHidden: true }); + } + + legalDescriptionTexbox(parcelNumber: number): Locator { + return this.parcelBody(parcelNumber).getByPlaceholder('Type legal description'); + } + + mapAreaTexbox(parcelNumber: number): Locator { + return this.parcelBody(parcelNumber).getByPlaceholder('Type parcel size'); + } + + pidTexbox(parcelNumber: number): Locator { + return this.parcelBody(parcelNumber).getByPlaceholder('Type PID'); + } + + pinTexbox(parcelNumber: number): Locator { + return this.parcelBody(parcelNumber).getByPlaceholder('Type PIN'); + } + + civicAddressTexbox(parcelNumber: number): Locator { + return this.parcelBody(parcelNumber).getByPlaceholder('Type Address'); + } + + nonCrownOwnerAddButton(parcelNumber: number): Locator { + return this.parcelBody(parcelNumber).getByRole('button', { name: 'Add new owner' }); + } + + crownOwnerAddButton(parcelNumber: number): Locator { + return this.parcelBody(parcelNumber).getByRole('button', { name: 'Add new gov contact' }); + } + + confirmationCheckbox(parcelNumber: number): Locator { + return this.parcelBody(parcelNumber).getByRole('checkbox', { + name: 'I confirm that the owner information provided above matches the current Certificate', + }); + } + + // State Getters + // ------------- + + async parcelType(parcelNumber: number): Promise { + const results = await Promise.all( + Object.values(ParcelType).map( + (type) => + new Promise<[ParcelType, boolean]>((resolve) => { + this.parcelBody(parcelNumber) + .getByRole('button', { name: type }) + .getAttribute('aria-pressed') + .then((isPressed) => { + resolve([type, isPressed === 'true']); + }); + }), + ), + ); + const [type, _] = results.filter(([_, isPressed]) => isPressed)[0]; + + return type; + } +} diff --git a/e2e/tests/pages/portal/portal-login-page.ts b/e2e/tests/pages/portal/portal-login-page.ts new file mode 100644 index 0000000000..85210ab4d1 --- /dev/null +++ b/e2e/tests/pages/portal/portal-login-page.ts @@ -0,0 +1,29 @@ +import { type Locator, type Page } from '@playwright/test'; + +export class PortalLoginPage { + readonly page: Page; + readonly loginButton: Locator; + readonly userIdTextbox: Locator; + readonly passwordTextbox: Locator; + readonly continueButton: Locator; + + constructor(page: Page) { + this.page = page; + this.loginButton = page.getByRole('button', { name: 'Portal Login' }); + // There is an error with the username label on BCeID page + this.userIdTextbox = page.getByRole('textbox').nth(0); + this.passwordTextbox = page.getByLabel('Password'); + this.continueButton = page.getByRole('button', { name: 'Continue' }); + } + + async goto() { + await this.page.goto('/'); + } + + async logIn(username: string, password: string) { + await this.loginButton.click(); + await this.userIdTextbox.fill(username); + await this.passwordTextbox.fill(password); + await this.continueButton.click(); + } +} diff --git a/e2e/tests/pages/portal/portal-steps-navigation.ts b/e2e/tests/pages/portal/portal-steps-navigation.ts new file mode 100644 index 0000000000..5d68a9b9ea --- /dev/null +++ b/e2e/tests/pages/portal/portal-steps-navigation.ts @@ -0,0 +1,57 @@ +import { type Locator, type Page } from '@playwright/test'; + +export class PortalStepsNavigation { + readonly page: Page; + readonly parcelsPageLink: Locator; + readonly otherParcelsPageLink: Locator; + readonly primaryContactPageLink: Locator; + readonly governmentPageLink: Locator; + readonly landUsePageLink: Locator; + readonly proposalPageLink: Locator; + readonly optionalAttachmentsPageLink: Locator; + readonly reviewAndSubmitPageLink: Locator; + + constructor(page: Page) { + this.page = page; + this.parcelsPageLink = page.getByTestId('steps').getByText('Parcel Details'); + this.otherParcelsPageLink = page.getByTestId('steps').getByText('Other Owned Parcels'); + this.primaryContactPageLink = page.getByTestId('steps').getByText('Primary Contact'); + this.governmentPageLink = page.getByTestId('steps').getByText('Government'); + this.landUsePageLink = page.getByTestId('steps').getByText('Land Use'); + this.proposalPageLink = page.getByTestId('steps').getByText('Proposal'); + this.optionalAttachmentsPageLink = page.getByTestId('steps').getByText('Upload Attachments'); + this.reviewAndSubmitPageLink = page.getByTestId('steps').getByText('Review & Submit'); + } + + async gotoParcelsPage() { + await this.parcelsPageLink.click(); + } + + async gotoOtherParcelsPage() { + await this.otherParcelsPageLink.click(); + } + + async gotoPrimaryContactPage() { + await this.primaryContactPageLink.click(); + } + + async gotoGovernmentPage() { + await this.governmentPageLink.click(); + } + + async gotoLandUsePage() { + await this.landUsePageLink.click(); + } + + async gotoProposalPage() { + await this.proposalPageLink.click(); + } + + async gotoOptionalAttachmentsPage() { + await this.optionalAttachmentsPageLink.click(); + } + + async gotoReviewAndSubmitPage() { + await this.reviewAndSubmitPageLink.click(); + } +} diff --git a/e2e/tests/pages/portal/primary-contact-page.ts b/e2e/tests/pages/portal/primary-contact-page.ts new file mode 100644 index 0000000000..904a039952 --- /dev/null +++ b/e2e/tests/pages/portal/primary-contact-page.ts @@ -0,0 +1,67 @@ +import { type Locator, type Page } from '@playwright/test'; + +export enum PrimaryContactType { + LandOwner = 'Land Owner', + ThirdParty = 'Third-Party Agent', +} + +export interface ThirdPartyContactDetails { + firstName: string; + lastName: string; + organization?: string; + phoneNumber: string; + email: string; +} + +export class PrimaryContactPage { + readonly page: Page; + readonly yesButton: Locator; + readonly noButton: Locator; + readonly firstNameTextbox: Locator; + readonly lastNameTextbox: Locator; + readonly organizationTextbox: Locator; + readonly phoneNumberTextbox: Locator; + readonly emailTextbox: Locator; + + constructor(page: Page) { + this.page = page; + this.yesButton = page.getByRole('button', { name: 'Yes', exact: true }); + this.noButton = page.getByRole('button', { name: 'No', exact: true }); + this.firstNameTextbox = page.getByPlaceholder('Enter First Name'); + this.lastNameTextbox = page.getByPlaceholder('Enter Last Name'); + this.organizationTextbox = page.getByPlaceholder('Enter Organization Name'); + this.phoneNumberTextbox = page.getByPlaceholder('(555) 555-5555'); + this.emailTextbox = page.getByPlaceholder('Enter Email'); + } + + async setPrimaryContactType(type: PrimaryContactType) { + if (type === PrimaryContactType.ThirdParty) { + await this.noButton.click(); + } else { + await this.yesButton.click(); + } + } + + async selectExistingContact(firstName: string, lastName: string) { + await this.page.getByRole('radio', { name: `${firstName} ${lastName}` }).check(); + } + + async fillThirdPartyContact(contact: ThirdPartyContactDetails) { + await this.firstNameTextbox.fill(contact.firstName); + await this.lastNameTextbox.fill(contact.lastName); + if (contact.organization !== undefined) { + await this.organizationTextbox.fill(contact.organization); + } + await this.phoneNumberTextbox.fill(contact.phoneNumber); + await this.emailTextbox.fill(contact.email); + } + + async uploadAuthorizationLetters(paths: string[]) { + for (const path of paths) { + const fileChooserPromise = this.page.waitForEvent('filechooser'); + await this.page.getByRole('button', { name: 'Choose file to Upload', exact: true }).click(); + const fileChooser = await fileChooserPromise; + await fileChooser.setFiles(path); + } + } +} diff --git a/e2e/tests/pages/portal/review-and-submit-page/government-section.ts b/e2e/tests/pages/portal/review-and-submit-page/government-section.ts new file mode 100644 index 0000000000..64827a0ae4 --- /dev/null +++ b/e2e/tests/pages/portal/review-and-submit-page/government-section.ts @@ -0,0 +1,15 @@ +import { expect, type Locator, type Page } from '@playwright/test'; + +export class GovernmentSection { + readonly page: Page; + readonly text: Locator; + + constructor(page: Page) { + this.page = page; + this.text = page.getByTestId('government-name'); + } + + async expectGovernment(government: string) { + await expect(this.text).toHaveText(government); + } +} diff --git a/e2e/tests/pages/portal/review-and-submit-page/land-use-section.ts b/e2e/tests/pages/portal/review-and-submit-page/land-use-section.ts new file mode 100644 index 0000000000..2e6068e1bb --- /dev/null +++ b/e2e/tests/pages/portal/review-and-submit-page/land-use-section.ts @@ -0,0 +1,27 @@ +import { expect, type Locator, type Page } from '@playwright/test'; +import { type LandUseDetails } from '../land-use-page'; + +export class LandUseSection { + readonly page: Page; + readonly currentAgricultureText: Locator; + readonly improvementsText: Locator; + readonly otherUsesText: Locator; + + constructor(page: Page) { + this.page = page; + this.currentAgricultureText = page.getByTestId('parcels-agriculture-description'); + this.improvementsText = page.getByTestId('parcels-agriculture-improvement-description'); + this.otherUsesText = page.getByTestId('parcels-non-agriculture-description'); + } + + async expectLandUse(landUse: LandUseDetails) { + await expect(this.currentAgricultureText).toHaveText(landUse.currentAgriculture); + await expect(this.improvementsText).toHaveText(landUse.improvements); + await expect(this.otherUsesText).toHaveText(landUse.otherUses); + + for (const [direction, neighbouring] of landUse.neighbouringLandUse) { + await expect(this.page.getByTestId(`${direction}-land-use-type`)).toHaveText(neighbouring.type); + await expect(this.page.getByTestId(`${direction}-land-use-description`)).toHaveText(neighbouring.activity); + } + } +} diff --git a/e2e/tests/pages/portal/review-and-submit-page/optional-documents-section.ts b/e2e/tests/pages/portal/review-and-submit-page/optional-documents-section.ts new file mode 100644 index 0000000000..290cea32b0 --- /dev/null +++ b/e2e/tests/pages/portal/review-and-submit-page/optional-documents-section.ts @@ -0,0 +1,28 @@ +import { expect, type Locator, type Page } from '@playwright/test'; +import { OptionalAttachment } from '../optional-attachments-page'; + +export class OptionalDocumentsSection { + readonly page: Page; + readonly fileNameTexts: Locator; + readonly typeTexts: Locator; + readonly descriptionTexts: Locator; + + constructor(page: Page) { + this.page = page; + this.fileNameTexts = page.getByTestId(`optional-document-file-name`); + this.typeTexts = page.getByTestId(`optional-document-type`); + this.descriptionTexts = page.getByTestId(`optional-document-description`); + } + + async expectAttachments(attachments: OptionalAttachment[]) { + for (const attachment of attachments) { + await expect(this.fileNameTexts.filter({ hasText: this.fileName(attachment.path) })).toBeVisible(); + await expect(this.typeTexts.filter({ hasText: attachment.type })).toBeVisible(); + await expect(this.descriptionTexts.filter({ hasText: attachment.description })).toBeVisible(); + } + } + + fileName(path: string): string { + return path.substring(path.lastIndexOf('/') + 1); + } +} diff --git a/e2e/tests/pages/portal/review-and-submit-page/other-owned-parcels-section.ts b/e2e/tests/pages/portal/review-and-submit-page/other-owned-parcels-section.ts new file mode 100644 index 0000000000..3773110006 --- /dev/null +++ b/e2e/tests/pages/portal/review-and-submit-page/other-owned-parcels-section.ts @@ -0,0 +1,21 @@ +import { expect, type Locator, type Page } from '@playwright/test'; + +export class OtherOwnedParcelsSection { + readonly page: Page; + readonly hasOtherParcelsText: Locator; + readonly descriptionText: Locator; + + constructor(page: Page) { + this.page = page; + this.hasOtherParcelsText = page.getByTestId('has-other-parcels'); + this.descriptionText = page.getByTestId('other-parcels-description'); + } + + async expectHasOtherParcels(hasOtherParcels: boolean) { + await expect(this.hasOtherParcelsText).toHaveText(hasOtherParcels ? 'Yes' : 'No'); + } + + async expectDescription(description: string) { + await expect(this.descriptionText).toHaveText(description); + } +} diff --git a/e2e/tests/pages/portal/review-and-submit-page/parcels-section.ts b/e2e/tests/pages/portal/review-and-submit-page/parcels-section.ts new file mode 100644 index 0000000000..90d9a68d57 --- /dev/null +++ b/e2e/tests/pages/portal/review-and-submit-page/parcels-section.ts @@ -0,0 +1,130 @@ +import { expect, type Locator, type Page } from '@playwright/test'; +import { type ParcelDetails, type ParcelOwnerDetails } from '../parcels-page'; + +export class ParcelsSection { + readonly page: Page; + + constructor(page: Page) { + this.page = page; + } + + async expectParcels(parcels: ParcelDetails[]) { + for (const [parcel, i] of parcels.map((parcel, i): [ParcelDetails, number] => [parcel, i])) { + const parcelNumber = i + 1; + + await this.expectParcelDetails(parcelNumber, parcel); + await this.expectParcelOwners(parcelNumber, parcel.owners); + } + } + + async expectParcelDetails(parcelNumber: number, parcel: ParcelDetails) { + await expect(this.typeText(parcelNumber)).toHaveText(parcel.type); + await expect(this.legalDescriptionText(parcelNumber)).toHaveText(parcel.legalDescription); + await expect(this.mapAreaText(parcelNumber)).toHaveText(`${parcel.mapArea} ha`); + if (parcel.pid !== undefined) { + await expect(this.pidText(parcelNumber)).toHaveText(parcel.pid); + } + if (parcel.pin !== undefined) { + await expect(this.pinText(parcelNumber)).toHaveText(parcel.pin); + } + if (parcel.month !== undefined && parcel.day !== undefined && parcel.year !== undefined) { + await expect(this.purchaseDateText(parcelNumber)).toHaveText(`${parcel.month} ${parcel.day}, ${parcel.year}`); + } + await expect(this.isFarmText(parcelNumber)).toHaveText(parcel.isFarm ? 'Yes' : 'No'); + await expect(this.civicAddressText(parcelNumber)).toHaveText(parcel.civicAddress); + await expect(this.certificateOfTitleText(parcelNumber)).toHaveText(this.fileName(parcel.certificateOfTitlePath)); + await expect(this.confirmationText(parcelNumber)).toHaveText(parcel.isConfirmed ? 'Yes' : 'No'); + } + + async expectParcelOwners(parcelNumber: number, owners: ParcelOwnerDetails[]) { + const nameTexts = this.ownerNameTexts(parcelNumber); + const organizationTexts = this.ownerOrganizationTexts(parcelNumber); + const phoneNumberTexts = this.ownerPhoneNumberTexts(parcelNumber); + const emailTexts = this.ownerEmailTexts(parcelNumber); + const corporateSummaryTexts = this.ownerCorporateSummaryTexts(parcelNumber); + + for (const owner of owners) { + await expect(nameTexts.filter({ hasText: `${owner.firstName} ${owner.lastName}` })).toBeVisible(); + if (owner.organization !== undefined) { + await expect(organizationTexts.filter({ hasText: owner.organization })).toBeVisible(); + } + await expect(phoneNumberTexts.filter({ hasText: owner.phoneNumber })).toBeVisible(); + await expect(emailTexts.filter({ hasText: owner.email })).toBeVisible(); + if (owner.corporateSummaryPath !== undefined) { + await expect( + corporateSummaryTexts.filter({ hasText: this.fileName(owner.corporateSummaryPath) }), + ).toBeVisible(); + } + } + } + + // Locator Getters + // --------------- + + typeText(parcelNumber: number): Locator { + return this.page.getByTestId(`parcel-${parcelNumber}-type`); + } + + legalDescriptionText(parcelNumber: number): Locator { + return this.page.getByTestId(`parcel-${parcelNumber}-legal-description`); + } + + mapAreaText(parcelNumber: number): Locator { + return this.page.getByTestId(`parcel-${parcelNumber}-map-area`); + } + + pidText(parcelNumber: number): Locator { + return this.page.getByTestId(`parcel-${parcelNumber}-pid`); + } + + pinText(parcelNumber: number): Locator { + return this.page.getByTestId(`parcel-${parcelNumber}-pin`); + } + + purchaseDateText(parcelNumber: number): Locator { + return this.page.getByTestId(`parcel-${parcelNumber}-purchase-date`); + } + + isFarmText(parcelNumber: number): Locator { + return this.page.getByTestId(`parcel-${parcelNumber}-is-farm`); + } + + civicAddressText(parcelNumber: number): Locator { + return this.page.getByTestId(`parcel-${parcelNumber}-civic-address`); + } + + certificateOfTitleText(parcelNumber: number): Locator { + return this.page.getByTestId(`parcel-${parcelNumber}-certificate-of-title`); + } + + confirmationText(parcelNumber: number): Locator { + return this.page.getByTestId(`parcel-${parcelNumber}-is-confirmed-by-applicant`); + } + + ownerNameTexts(parcelNumber: number) { + return this.page.getByTestId(`parcel-${parcelNumber}-owner-name`); + } + + ownerOrganizationTexts(parcelNumber: number) { + return this.page.getByTestId(`parcel-${parcelNumber}-owner-organization`); + } + + ownerPhoneNumberTexts(parcelNumber: number) { + return this.page.getByTestId(`parcel-${parcelNumber}-owner-phone-number`); + } + + ownerEmailTexts(parcelNumber: number) { + return this.page.getByTestId(`parcel-${parcelNumber}-owner-email`); + } + + ownerCorporateSummaryTexts(parcelNumber: number) { + return this.page.getByTestId(`parcel-${parcelNumber}-owner-corporate-summary`); + } + + // Utils + // ----- + + fileName(path: string): string { + return path.substring(path.lastIndexOf('/') + 1); + } +} diff --git a/e2e/tests/pages/portal/review-and-submit-page/primary-contact-section.ts b/e2e/tests/pages/portal/review-and-submit-page/primary-contact-section.ts new file mode 100644 index 0000000000..f7ca37efeb --- /dev/null +++ b/e2e/tests/pages/portal/review-and-submit-page/primary-contact-section.ts @@ -0,0 +1,45 @@ +import { expect, type Locator, type Page } from '@playwright/test'; +import { PrimaryContactType, type ThirdPartyContactDetails } from '../primary-contact-page'; + +export class PrimaryContactSection { + readonly page: Page; + readonly typeText: Locator; + readonly firstNameText: Locator; + readonly lastNameText: Locator; + readonly organizationText: Locator; + readonly phoneNumberText: Locator; + readonly emailText: Locator; + readonly authorizationLetterTexts: Locator; + + constructor(page: Page) { + this.page = page; + this.typeText = page.getByTestId('primary-contact-type'); + this.firstNameText = page.getByTestId('primary-contact-first-name'); + this.lastNameText = page.getByTestId('primary-contact-last-name'); + this.organizationText = page.getByTestId('primary-contact-organization'); + this.phoneNumberText = page.getByTestId('primary-contact-phone-number'); + this.emailText = page.getByTestId('primary-contact-email'); + this.authorizationLetterTexts = page.getByTestId('authorization-letter'); + } + + async expectThirdPartyContact(contact: ThirdPartyContactDetails) { + await expect(this.typeText).toHaveText(PrimaryContactType.ThirdParty); + await expect(this.firstNameText).toHaveText(contact.firstName); + await expect(this.lastNameText).toHaveText(contact.lastName); + if (contact.organization !== undefined) { + await expect(this.organizationText).toHaveText(contact.organization); + } + await expect(this.phoneNumberText).toHaveText(contact.phoneNumber); + await expect(this.emailText).toHaveText(contact.email); + } + + async expectAuthorizationLetters(authorizationLetterPaths: string[]) { + for (const path of authorizationLetterPaths) { + await expect(this.authorizationLetterTexts.filter({ hasText: this.fileName(path) })).toBeVisible(); + } + } + + fileName(path: string): string { + return path.substring(path.lastIndexOf('/') + 1); + } +} diff --git a/e2e/tests/pages/portal/review-and-submit-page/review-and-submit-page.ts b/e2e/tests/pages/portal/review-and-submit-page/review-and-submit-page.ts new file mode 100644 index 0000000000..ed40893fe3 --- /dev/null +++ b/e2e/tests/pages/portal/review-and-submit-page/review-and-submit-page.ts @@ -0,0 +1,64 @@ +import { type Locator, type Page } from '@playwright/test'; +import { ParcelsSection } from './parcels-section'; +import { PrimaryContactSection } from './primary-contact-section'; +import { OtherOwnedParcelsSection } from './other-owned-parcels-section'; +import { GovernmentSection } from './government-section'; +import { LandUseSection } from './land-use-section'; +import { TURProposalSection } from './tur-proposal-section'; +import { OptionalDocumentsSection } from './optional-documents-section'; + +export class ReviewAndSubmitPage { + readonly page: Page; + + // Locators + readonly submitButton: Locator; + readonly informationUseCheckbox: Locator; + readonly informationCorrectnessCheckbox: Locator; + readonly acceptVerificationCheckbox: Locator; + readonly submitDialog: Locator; + readonly finalSubmitButton: Locator; + + // Sections + readonly parcelsSection: ParcelsSection; + readonly otherOwnedParcelsSection: OtherOwnedParcelsSection; + readonly primaryContactSection: PrimaryContactSection; + readonly governmentSection: GovernmentSection; + readonly landUseSection: LandUseSection; + readonly turProposalSection: TURProposalSection; + readonly optionalDocumentsSection: OptionalDocumentsSection; + + constructor(page: Page) { + this.page = page; + + // Locators + this.submitButton = page.getByRole('button', { name: 'Submit' }); + this.informationUseCheckbox = page.getByRole('checkbox', { + name: 'I/we consent to the use of the information provided in the application and all supporting documents to process the application in accordance with the Agricultural Land Commission Act, the Agricultural Land Reserve General Regulation, and the Agricultural Land Reserve Use Regulation.', + }); + this.informationCorrectnessCheckbox = page.getByRole('checkbox', { + name: 'I/we declare that the information provided in the application and all the supporting documents are, to the best of my/our knowledge, true and correct.', + }); + this.acceptVerificationCheckbox = page.getByRole('checkbox', { + name: 'I/we understand that the Agricultural Land Commission will take the steps necessary to confirm the accuracy of the information and documents provided. This information, excluding phone numbers and emails, will be available for review by any member of the public once received by the ALC.', + }); + this.submitDialog = page.getByRole('dialog').filter({ hasText: 'Submit Application' }); + this.finalSubmitButton = this.submitDialog.getByRole('button', { name: 'Submit' }); + + // Sections + this.parcelsSection = new ParcelsSection(page); + this.otherOwnedParcelsSection = new OtherOwnedParcelsSection(page); + this.primaryContactSection = new PrimaryContactSection(page); + this.governmentSection = new GovernmentSection(page); + this.landUseSection = new LandUseSection(page); + this.turProposalSection = new TURProposalSection(page); + this.optionalDocumentsSection = new OptionalDocumentsSection(page); + } + + async submit() { + await this.submitButton.click(); + await this.informationUseCheckbox.check(); + await this.informationCorrectnessCheckbox.check(); + await this.acceptVerificationCheckbox.check(); + await this.finalSubmitButton.click(); + } +} diff --git a/e2e/tests/pages/portal/review-and-submit-page/tur-proposal-section.ts b/e2e/tests/pages/portal/review-and-submit-page/tur-proposal-section.ts new file mode 100644 index 0000000000..1d9f8b4725 --- /dev/null +++ b/e2e/tests/pages/portal/review-and-submit-page/tur-proposal-section.ts @@ -0,0 +1,41 @@ +import { expect, type Locator, type Page } from '@playwright/test'; +import { TURProposal } from '../tur-proposal-page'; + +export class TURProposalSection { + readonly page: Page; + readonly purposeText: Locator; + readonly activitiesText: Locator; + readonly stepsToReduceImpactText: Locator; + readonly alternativeLandText: Locator; + readonly totalAreaText: Locator; + readonly allOwnersNotifiedText: Locator; + readonly proofOfServingNoticeText: Locator; + readonly proposalMapText: Locator; + + constructor(page: Page) { + this.page = page; + this.purposeText = page.getByTestId('tur-purpose'); + this.activitiesText = page.getByTestId('tur-agricultural-activities'); + this.stepsToReduceImpactText = page.getByTestId('tur-reduce-negative-impacts'); + this.alternativeLandText = page.getByTestId('tur-outside-lands'); + this.totalAreaText = page.getByTestId('tur-total-corridor-area'); + this.allOwnersNotifiedText = page.getByTestId('tur-all-owners-notified'); + this.proofOfServingNoticeText = page.getByTestId('tur-proof-of-serving-notice'); + this.proposalMapText = page.getByTestId('tur-proposal-map'); + } + + async expectProposal(proposal: TURProposal) { + await expect(this.purposeText).toHaveText(proposal.purpose); + await expect(this.activitiesText).toHaveText(proposal.activities); + await expect(this.stepsToReduceImpactText).toHaveText(proposal.stepsToReduceImpact); + await expect(this.alternativeLandText).toHaveText(proposal.alternativeLand); + await expect(this.totalAreaText).toHaveText(`${proposal.totalArea} ha`); + await expect(this.allOwnersNotifiedText).toHaveText(proposal.isConfirmed ? 'Yes' : 'No'); + await expect(this.proofOfServingNoticeText).toHaveText(this.fileName(proposal.proofOfServingNoticePath)); + await expect(this.proposalMapText).toHaveText(this.fileName(proposal.proposalMapPath)); + } + + fileName(path: string): string { + return path.substring(path.lastIndexOf('/') + 1); + } +} diff --git a/e2e/tests/pages/portal/submission-success-page.ts b/e2e/tests/pages/portal/submission-success-page.ts new file mode 100644 index 0000000000..378ce1143a --- /dev/null +++ b/e2e/tests/pages/portal/submission-success-page.ts @@ -0,0 +1,26 @@ +import { expect, type Locator, type Page } from '@playwright/test'; + +export class SubmissionSuccessPage { + readonly page: Page; + readonly heading: Locator; + + constructor(page: Page) { + this.page = page; + this.heading = page.getByRole('heading', { name: 'Application ID' }); + } + + async fileId(): Promise { + const headingText = await this.heading.textContent(); + + await expect(headingText).not.toBeNull(); + + const matches = headingText!.match(/(?<=Application ID: )\d*/); + + await expect(matches).not.toBeNull(); + + const fileId: string = matches![0]; + + // Should never return empty string, but necessary to appease TypeScript + return fileId; + } +} diff --git a/e2e/tests/pages/portal/tur-proposal-page.ts b/e2e/tests/pages/portal/tur-proposal-page.ts new file mode 100644 index 0000000000..db59d66679 --- /dev/null +++ b/e2e/tests/pages/portal/tur-proposal-page.ts @@ -0,0 +1,65 @@ +import { type Locator, type Page } from '@playwright/test'; + +export interface TURProposal { + purpose: string; + activities: string; + stepsToReduceImpact: string; + alternativeLand: string; + totalArea: string; + isConfirmed: boolean; + proofOfServingNoticePath: string; + proposalMapPath: string; +} + +export class TURProposalPage { + readonly page: Page; + readonly purposeTextbox: Locator; + readonly activitiesTextbox: Locator; + readonly stepsToReduceImpactTextbox: Locator; + readonly alternativeLandTextbox: Locator; + readonly totalAreaTextbox: Locator; + readonly confirmationCheckbox: Locator; + + constructor(page: Page) { + this.page = page; + this.purposeTextbox = page.getByLabel('What is the purpose of the proposal?'); + this.activitiesTextbox = page.getByLabel( + 'Specify any agricultural activities such as livestock operations, greenhouses or horticultural activities in proximity to the proposal.', + ); + this.stepsToReduceImpactTextbox = page.getByLabel( + 'What steps will you take to reduce potential negative impacts on surrounding agricultural lands?', + ); + this.alternativeLandTextbox = page.getByLabel('Could this proposal be accommodated on lands outside of the ALR?'); + this.totalAreaTextbox = page.getByPlaceholder('Type total area'); + this.confirmationCheckbox = page.getByText( + 'I confirm that all affected property owners with land in the ALR have been notif', + ); + } + + async fill(proposal: TURProposal) { + await this.purposeTextbox.fill(proposal.purpose); + await this.activitiesTextbox.fill(proposal.activities); + await this.stepsToReduceImpactTextbox.fill(proposal.stepsToReduceImpact); + await this.alternativeLandTextbox.fill(proposal.alternativeLand); + await this.totalAreaTextbox.fill(proposal.totalArea); + if (proposal.isConfirmed) { + await this.confirmationCheckbox.check(); + } + await this.uploadProofOfServingNotice(proposal.proofOfServingNoticePath); + await this.uploadProposalMap(proposal.proposalMapPath); + } + + async uploadProofOfServingNotice(path: string) { + const fileChooserPromise = this.page.waitForEvent('filechooser'); + await this.page.getByTestId('proof-of-serving-notice-filechooser').click(); + const fileChooser = await fileChooserPromise; + await fileChooser.setFiles(path); + } + + async uploadProposalMap(path: string) { + const fileChooserPromise = this.page.waitForEvent('filechooser'); + await this.page.getByTestId('proposal-map-filechooser').click(); + const fileChooser = await fileChooserPromise; + await fileChooser.setFiles(path); + } +} diff --git a/e2e/tests/tur.spec.ts b/e2e/tests/tur.spec.ts index 9281edc66a..b2f9cbfcec 100644 --- a/e2e/tests/tur.spec.ts +++ b/e2e/tests/tur.spec.ts @@ -1,8 +1,122 @@ -import { test, expect } from '@playwright/test'; -import { PortalLoginPage } from './pages/portal-login-page'; -import { ApplicationType, InboxPage } from './pages/inbox-page'; +import { test } from '@playwright/test'; +import { PortalLoginPage } from './pages/portal/portal-login-page'; +import { ApplicationType, InboxPage } from './pages/portal/inbox-page'; +import { PortalStepsNavigation } from './pages/portal/portal-steps-navigation'; +import { OwnerType, ParcelType, ParcelsPage } from './pages/portal/parcels-page'; +import { OtherParcelsPage } from './pages/portal/other-parcels-page'; +import { PrimaryContactPage, PrimaryContactType } from './pages/portal/primary-contact-page'; +import { GovernmentPage } from './pages/portal/government-page'; +import { Direction, LandUsePage, LandUseType } from './pages/portal/land-use-page'; +import { TURProposalPage } from './pages/portal/tur-proposal-page'; +import { OptionalAttachmentType, OptionalAttachmentsPage } from './pages/portal/optional-attachments-page'; +import { ReviewAndSubmitPage } from './pages/portal/review-and-submit-page/review-and-submit-page'; +import { SubmissionSuccessPage } from './pages/portal/submission-success-page'; test('TUR', async ({ browser }) => { + const parcels = [ + { + type: ParcelType.FeeSimple, + legalDescription: 'Legal description 1', + mapArea: '1', + pid: '111-111-111', + year: '2014', + month: 'Apr', + day: '21', + isFarm: true, + civicAddress: '123 Street Rd', + certificateOfTitlePath: 'data/temp.txt', + isConfirmed: true, + owners: [ + { + type: OwnerType.Individual, + firstName: 'John', + lastName: 'Doe', + phoneNumber: '(111) 111-1111', + email: '1@1', + }, + { + type: OwnerType.Organization, + organization: 'Company X', + corporateSummaryPath: 'data/temp.txt', + firstName: 'Jane', + lastName: 'Doe', + phoneNumber: '(222) 222-2222', + email: '2@2', + }, + ], + }, + ]; + const otherParcelsDescription = 'Other parcels description'; + const hasOtherParcels = true; + const primaryContactType = PrimaryContactType.ThirdParty; + const thirdPartPrimaryContact = { + firstName: 'Person', + lastName: 'Human', + phoneNumber: '(555) 555-5555', + email: '1@1', + }; + const authorizationLetterPaths = ['data/temp.txt', 'data/temp2.txt']; + const government = 'Peace River Regional District'; + const landUse = { + currentAgriculture: 'Current agriculture', + improvements: 'Improvements', + otherUses: 'Other uses', + neighbouringLandUse: new Map([ + [ + Direction.North, + { + type: LandUseType.Agricultural, + activity: 'Doing agriculture', + }, + ], + [ + Direction.East, + { + type: LandUseType.Civic, + activity: 'Doing agriculture', + }, + ], + [ + Direction.South, + { + type: LandUseType.Commercial, + activity: 'Doing agriculture', + }, + ], + [ + Direction.West, + { + type: LandUseType.Industrial, + activity: 'Doing agriculture', + }, + ], + ]), + }; + const turProposal = { + purpose: 'To do stuff', + activities: 'Doing stuff', + stepsToReduceImpact: 'Steps 1, 2, and 3', + alternativeLand: 'This land over here', + totalArea: '1', + isConfirmed: true, + proofOfServingNoticePath: 'data/temp.txt', + proposalMapPath: 'data/temp2.txt', + }; + const optionalAttachments = [ + { + path: 'data/temp.txt', + type: OptionalAttachmentType.SitePhoto, + description: 'Some site photo', + }, + { + path: 'data/temp2.txt', + type: OptionalAttachmentType.ProfessionalReport, + description: 'Some professional report', + }, + ]; + + let submittedFileId: string; + const context = await browser.newContext({ baseURL: process.env.PORTAL_BASE_URL }); const page = await context.newPage(); @@ -13,196 +127,58 @@ test('TUR', async ({ browser }) => { const inbox = new InboxPage(page); await inbox.createApplication(ApplicationType.TUR); - // Step 1a: Parcels - await page.getByRole('button', { name: 'Fee Simple' }).click(); - await page.getByPlaceholder('Type legal description').fill('Parcel description'); - await page.getByPlaceholder('Type parcel size').fill('1'); - await page.getByPlaceholder('Type PID').fill('111-111-111'); - await page.getByRole('button', { name: 'Open calendar' }).click(); - await page.getByText('2014').click(); - await page.getByText('Apr').click(); - await page.getByText('23').click(); - await page.getByText('Yes').click(); - await page.getByPlaceholder('Type Address').fill('123 Street Rd'); - - // Upload - const titleFileChooserPromise = page.waitForEvent('filechooser'); - await page.getByRole('button', { name: 'Choose file to Upload', exact: true }).click(); - const titleFileChooser = await titleFileChooserPromise; - titleFileChooser.setFiles('data/temp.txt'); - - // Step 1b: Parcel Owners - await page.getByRole('button', { name: 'Add new owner' }).click(); - await page.getByRole('button', { name: 'Individual' }).click(); - await page.getByPlaceholder('Enter First Name').fill('1'); - await page.getByPlaceholder('Enter Last Name').fill('1'); - await page.getByPlaceholder('(555) 555-5555').fill('(111) 111-11111'); - await page.getByPlaceholder('Enter Email').fill('1@1'); - await page.getByRole('button', { name: 'Add' }).click(); - await page.getByText('I confirm that the owner information provided above matches the current Certific').click(); - await page.getByText('Other Owned Parcels', { exact: true }).click(); - - // Step 2: Other Parcels - await page.getByRole('button', { name: 'Yes' }).click(); - await page - .getByLabel('Describe the other parcels including their location, who owns or leases them, and their use.') - .fill('Other parcels'); - await page.getByText('Primary Contact', { exact: true }).click(); - - // Step 3: Primary Contact - await page.getByRole('button', { name: 'Yes' }).click(); - await page.getByLabel('1 1').check(); - await page.getByText('Government', { exact: true }).click(); - - // Step 4: Government - await page.getByPlaceholder('Type government').click(); - await page.getByPlaceholder('Type government').fill('peace'); - await page.getByText('Peace River Regional District').click(); - await page.getByText('Land Use').click(); - - // Step 5: Land Use - await page.getByLabel('Describe all agriculture that currently takes place on the parcel(s).').fill('This'); - await page.getByLabel('Describe all agricultural improvements made to the parcel(s).').fill('That'); - await page.getByLabel('Describe all other uses that currently take place on the parcel(s).').fill('The other'); - - // North - await page.getByPlaceholder('Main Land Use Type').nth(0).click(); - await page.locator('#northLandUseType-panel').getByRole('option', { name: 'Agricultural / Farm' }).click(); - await page.getByRole('textbox', { name: 'North land use type description' }).fill('1'); - - // East - await page.getByPlaceholder('Main Land Use Type').nth(1).click(); - await page.locator('#eastLandUseType-panel').getByRole('option', { name: 'Civic / Institutional' }).click(); - await page.getByRole('textbox', { name: 'East land use type description' }).fill('1'); - - // South - await page.getByPlaceholder('Main Land Use Type').nth(2).click(); - await page.locator('#southLandUseType-panel').getByRole('option', { name: 'Commercial / Retail' }).click(); - await page.getByRole('textbox', { name: 'South land use type description' }).fill('1'); - - // West - await page.getByPlaceholder('Main Land Use Type').nth(3).click(); - await page.locator('#westLandUseType-panel').getByRole('option', { name: 'Industrial' }).click(); - await page.getByRole('textbox', { name: 'West land use type description' }).fill('1'); - - await page.getByText('Proposal', { exact: true }).click(); - - // Step 6: Proposal - await page.getByLabel('What is the purpose of the proposal?').fill('This'); - await page - .getByLabel( - 'Specify any agricultural activities such as livestock operations, greenhouses or horticultural activities in proximity to the proposal.', - ) - .fill('That'); - await page - .getByLabel('What steps will you take to reduce potential negative impacts on surrounding agricultural lands?') - .fill('The other'); - await page.getByLabel('Could this proposal be accommodated on lands outside of the ALR?').fill('And another'); - await page.getByPlaceholder('Type total area').fill('1'); - await page.getByText('I confirm that all affected property owners with land in the ALR have been notif').click(); - - // File upload - const proofOfServiceNoticeFileChooserPromise = page.waitForEvent('filechooser'); - await page.getByRole('button', { name: 'Choose file to Upload', exact: true }).nth(0).click(); - const proofOfServiceNoticeFileChooser = await proofOfServiceNoticeFileChooserPromise; - proofOfServiceNoticeFileChooser.setFiles('data/temp.txt'); - - // File upload - const proposalMapFileChooserPromise = page.waitForEvent('filechooser'); - await page.getByRole('button', { name: 'Choose file to Upload', exact: true }).nth(1).click(); - const proposalMapFileChooser = await proposalMapFileChooserPromise; - proposalMapFileChooser.setFiles('data/temp.txt'); - - await page.getByText('Upload Attachments').click(); - - // Step 7: Optional attachments - // File upload first file - const optionalFile1ChooserPromise = page.waitForEvent('filechooser'); - await page.getByRole('button', { name: 'Choose file to Upload', exact: true }).click(); - const optionalFile1Chooser = await optionalFile1ChooserPromise; - optionalFile1Chooser.setFiles('data/temp.txt'); - await page.getByPlaceholder('Select a type').nth(0).click(); - await page.getByText('Professional Report').click(); - await page.getByPlaceholder('Type description').nth(0).fill('Desc'); - - // File upload second file - const optionalFile2ChooserPromise = page.waitForEvent('filechooser'); - await page.getByRole('button', { name: 'Choose file to Upload', exact: true }).click(); - const optionalFile2Chooser = await optionalFile2ChooserPromise; - optionalFile2Chooser.setFiles('data/temp.txt'); - await page.getByPlaceholder('Select a type').nth(1).click(); - await page.getByText('Site Photo').click(); - await page.getByPlaceholder('Type description').nth(1).fill('Desc'); - - await page.getByText('Review & Submit').click(); - - // Step 8: Review - // 1. Parcels - // Parcel 1 - await expect(page.getByTestId('parcel-0-type')).toHaveText('Fee Simple'); - await expect(page.getByTestId('parcel-0-legal-description')).toHaveText('Parcel description'); - await expect(page.getByTestId('parcel-0-map-area')).toHaveText('1 ha'); - await expect(page.getByTestId('parcel-0-pid')).toHaveText('111-111-111'); - await expect(page.getByTestId('parcel-0-purchase-date')).toHaveText('Apr 23, 2014'); - await expect(page.getByTestId('parcel-0-is-farm')).toHaveText('Yes'); - await expect(page.getByTestId('parcel-0-civic-address')).toHaveText('123 Street Rd'); - await expect(page.getByTestId('parcel-0-certificate-of-title')).toHaveText('temp.txt'); - - // Owners - await expect(page.getByTestId('parcel-0-owner-0-name')).toHaveText('1 1'); - await expect(page.getByTestId('parcel-0-owner-0-organization')).toHaveText('No Data'); - await expect(page.getByTestId('parcel-0-owner-0-phone-number')).toHaveText('(111) 111-1111'); - await expect(page.getByTestId('parcel-0-owner-0-email')).toHaveText('1@1'); - await expect(page.getByTestId('parcel-0-owner-0-corporate-summary')).toHaveText('Not Applicable'); - - await expect(page.getByTestId('parcel-0-is-confirmed-by-applicant')).toHaveText('Yes'); - - // 2. Other Parcels - await expect(page.getByTestId('has-other-parcels')).toHaveText('Yes'); - await expect(page.getByTestId('other-parcels-description')).toHaveText('Other parcels'); - - // 3. Primary Contact - await expect(page.getByTestId('primary-contact-type')).toHaveText('Land Owner'); - await expect(page.getByTestId('primary-contact-first-name')).toHaveText('1'); - await expect(page.getByTestId('primary-contact-last-name')).toHaveText('1'); - await expect(page.getByTestId('primary-contact-organization')).toHaveText('No Data'); - await expect(page.getByTestId('primary-contact-phone-number')).toHaveText('(111) 111-1111'); - await expect(page.getByTestId('primary-contact-email')).toHaveText('1@1'); - - // 4. Government - await expect(page.getByTestId('government-name')).toHaveText('Peace River Regional District'); - - // 5. Land Use - await expect(page.getByTestId('parcels-agriculture-description')).toHaveText('This'); - await expect(page.getByTestId('parcels-agriculture-improvement-description')).toHaveText('That'); - await expect(page.getByTestId('parcels-non-agriculture-description')).toHaveText('The other'); - await expect(page.getByTestId('north-land-use-type')).toHaveText('Agricultural / Farm'); - await expect(page.getByTestId('north-land-use-description')).toHaveText('1'); - await expect(page.getByTestId('east-land-use-type')).toHaveText('Civic / Institutional'); - await expect(page.getByTestId('east-land-use-description')).toHaveText('1'); - await expect(page.getByTestId('south-land-use-type')).toHaveText('Commercial / Retail'); - await expect(page.getByTestId('south-land-use-description')).toHaveText('1'); - await expect(page.getByTestId('west-land-use-type')).toHaveText('Industrial'); - await expect(page.getByTestId('west-land-use-description')).toHaveText('1'); - - // 6. Proposal - await expect(page.getByTestId('tur-purpose')).toHaveText('This'); - await expect(page.getByTestId('tur-agricultural-activities')).toHaveText('That'); - await expect(page.getByTestId('tur-reduce-negative-impacts')).toHaveText('The other'); - await expect(page.getByTestId('tur-outside-lands')).toHaveText('And another'); - await expect(page.getByTestId('tur-total-corridor-area')).toHaveText('1 ha'); - await expect(page.getByTestId('tur-all-owners-notified')).toHaveText('Yes'); - await expect(page.getByTestId('tur-proof-of-serving-notice')).toHaveText('temp.txt'); - await expect(page.getByTestId('tur-proposal-map')).toHaveText('temp.txt'); - - // 7. Optional Documents - // Doc 1 - await expect(page.getByTestId('optional-document-0-file-name')).toHaveText('temp.txt'); - await expect(page.getByTestId('optional-document-0-type')).toHaveText('Professional Report'); - await expect(page.getByTestId('optional-document-0-description')).toHaveText('Desc'); - - // Doc 2 - await expect(page.getByTestId('optional-document-1-file-name')).toHaveText('temp.txt'); - await expect(page.getByTestId('optional-document-1-type')).toHaveText('Site Photo'); - await expect(page.getByTestId('optional-document-1-description')).toHaveText('Desc'); + const portalStepsNavigation = new PortalStepsNavigation(page); + + const parcelsPage = new ParcelsPage(page); + await parcelsPage.fill(parcels); + + await portalStepsNavigation.gotoOtherParcelsPage(); + + const otherParcelsPage = new OtherParcelsPage(page); + await otherParcelsPage.setHasOtherParcels(hasOtherParcels); + await otherParcelsPage.fillDescription(otherParcelsDescription); + + await portalStepsNavigation.gotoPrimaryContactPage(); + + const primaryContactPage = new PrimaryContactPage(page); + await primaryContactPage.setPrimaryContactType(primaryContactType); + await primaryContactPage.fillThirdPartyContact(thirdPartPrimaryContact); + await primaryContactPage.uploadAuthorizationLetters(authorizationLetterPaths); + + await portalStepsNavigation.gotoGovernmentPage(); + + const governmentPage = new GovernmentPage(page); + await governmentPage.fill(government); + + await portalStepsNavigation.gotoLandUsePage(); + + const landUsePage = new LandUsePage(page); + await landUsePage.fill(landUse); + + await portalStepsNavigation.gotoProposalPage(); + + const turProposalPage = new TURProposalPage(page); + await turProposalPage.fill(turProposal); + + await portalStepsNavigation.gotoOptionalAttachmentsPage(); + + const optionalAttachmentsPage = new OptionalAttachmentsPage(page); + await optionalAttachmentsPage.addAttachments(optionalAttachments); + + await portalStepsNavigation.gotoReviewAndSubmitPage(); + + const reviewAndSubmitPage = new ReviewAndSubmitPage(page); + await reviewAndSubmitPage.parcelsSection.expectParcels(parcels); + await reviewAndSubmitPage.otherOwnedParcelsSection.expectHasOtherParcels(hasOtherParcels); + await reviewAndSubmitPage.otherOwnedParcelsSection.expectDescription(otherParcelsDescription); + await reviewAndSubmitPage.primaryContactSection.expectThirdPartyContact(thirdPartPrimaryContact); + await reviewAndSubmitPage.primaryContactSection.expectAuthorizationLetters(authorizationLetterPaths); + await reviewAndSubmitPage.governmentSection.expectGovernment(government); + await reviewAndSubmitPage.landUseSection.expectLandUse(landUse); + await reviewAndSubmitPage.turProposalSection.expectProposal(turProposal); + await reviewAndSubmitPage.optionalDocumentsSection.expectAttachments(optionalAttachments); + await reviewAndSubmitPage.submit(); + + const submissionSuccessPage = new SubmissionSuccessPage(page); + submittedFileId = await submissionSuccessPage.fileId(); }); diff --git a/portal-frontend/src/app/features/applications/application-details/application-details.component.html b/portal-frontend/src/app/features/applications/application-details/application-details.component.html index c633ffe485..5a11d6f5db 100644 --- a/portal-frontend/src/app/features/applications/application-details/application-details.component.html +++ b/portal-frontend/src/app/features/applications/application-details/application-details.component.html @@ -15,8 +15,8 @@

2. Other Owned Parcels

{{ - applicationSubmission.hasOtherParcelsInCommunity ? 'Yes' : 'No' - }} + applicationSubmission.hasOtherParcelsInCommunity ? 'Yes' : 'No' + }} 3. Primary Contact
Organization (optional)Organization (optional) Ministry/Department Responsible Department @@ -71,12 +71,11 @@

3. Primary Contact

Phone
- {{ primaryContact?.phoneNumber ?? '' | mask : '(000) 000-0000' }} + {{ primaryContact?.phoneNumber ?? '' | mask: '(000) 000-0000' }} Invalid Format - + >Invalid Format +
Email
@@ -86,13 +85,13 @@

3. Primary Contact

Authorization Letter(s)
-
+
Authorization letters are not required, please remove them @@ -115,8 +114,8 @@

4. Government

This local/First Nation government is not set up with the ALC Portal to receive submissions. You can continue to fill out the form but you will be unable to submit. Please contact the ALC directly as soon as possible:  ALC.Portal@gov.bc.ca / 236-468-3342 + >236-468-3342 Type
Description
- -
+ +
{{ file.fileName }}
-
+
{{ file.type?.label }}
-
+
{{ file.description }}
diff --git a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html index 9f21e051f6..4a7d1ca754 100644 --- a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html @@ -25,13 +25,13 @@

Parcel #{{ parcelInd + 1 }}

Parcel Type
-
+
{{ parcel.ownershipType?.label }}
Legal Description
-
+
{{ parcel.legalDescription }} Parcel #{{ parcelInd + 1 }} >
Approx. Map Area
-
+
{{ parcel.mapAreaHectares }} ha Parcel #{{ parcelInd + 1 }}
PID {{ parcel.ownershipType.code === PARCEL_OWNERSHIP_TYPES.CROWN ? '(optional)' : '' }}
-
- {{ parcel.pid | mask : '000-000-000' }} +
+ {{ parcel.pid | mask: '000-000-000' }} Parcel #{{ parcelInd + 1 }}
PIN (optional)
-
+
{{ parcel.pin }} Parcel #{{ parcelInd + 1 }}
Purchase Date
-
+
{{ parcel.purchasedDate | date }} Parcel #{{ parcelInd + 1 }}
Farm Classification
-
+
{{ parcel.isFarm ? 'Yes' : 'No' }}
Civic Address
-
+
{{ parcel.civicAddress }}
@@ -95,7 +95,7 @@

Parcel #{{ parcelInd + 1 }}

{{ parcel.certificateOfTitle.fileName }} @@ -126,7 +126,7 @@
Government Parcel Contact
Phone
- {{ parcel.owners[0].phoneNumber ?? '' | mask : '(000) 000-0000' }} + {{ parcel.owners[0].phoneNumber ?? '' | mask: '(000) 000-0000' }}
Email
@@ -150,21 +150,21 @@
Government Parcel Contact
Phone
Email
Corporate Summary
- -
+ +
{{ owner.displayName }}
-
+
{{ owner.organizationName }}
-
- {{ owner.phoneNumber ?? '' | mask : '(000) 000-0000' }} +
+ {{ owner.phoneNumber ?? '' | mask: '(000) 000-0000' }}
-
+
{{ owner.email }}
-
+
{{ owner.corporateSummary.fileName }} @@ -184,7 +184,7 @@
Government Parcel Contact
I confirm that the owner information provided above matches the current Certificate of Title
-
+
Yes
diff --git a/portal-frontend/src/app/features/applications/edit-submission/land-use/land-use.component.html b/portal-frontend/src/app/features/applications/edit-submission/land-use/land-use.component.html index 81693b4eda..1c2ecf7ac2 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/land-use/land-use.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/land-use/land-use.component.html @@ -117,7 +117,12 @@
Choose and describe neighbouring land uses.
- + {{ enum.value }} @@ -140,6 +145,7 @@
Choose and describe neighbouring land uses.
maxlength="500" [formControl]="northLandUseTypeDescription" aria-label="North land use type description" + data-testid="north-activity-textbox" />
Choose and describe neighbouring land uses.
- + {{ enum.value }} @@ -185,6 +196,7 @@
Choose and describe neighbouring land uses.
matInput maxlength="500" aria-label="East land use type description" + data-testid="east-activity-textbox" />
Choose and describe neighbouring land uses.
- + {{ enum.value }} @@ -230,6 +247,7 @@
Choose and describe neighbouring land uses.
matInput [formControl]="southLandUseTypeDescription" aria-label="South land use type description" + data-testid="south-activity-textbox" />
Choose and describe neighbouring land uses.
- + {{ enum.value }} @@ -275,6 +298,7 @@
Choose and describe neighbouring land uses.
matInput [formControl]="westLandUseTypeDescription" aria-label="West land use type description" + data-testid="west-activity-textbox" />
Proposal [showErrors]="showErrors" [isRequired]="true" [showVirusError]="showServingNoticeVirus" + data-testid="proof-of-serving-notice-filechooser" >
@@ -193,6 +194,7 @@

Proposal

[showErrors]="showErrors" [isRequired]="true" [showVirusError]="showProposalMapVirus" + data-testid="proposal-map-filechooser" >
diff --git a/portal-frontend/src/app/shared/custom-stepper/custom-stepper.component.html b/portal-frontend/src/app/shared/custom-stepper/custom-stepper.component.html index 1f0bc75923..623df9798e 100644 --- a/portal-frontend/src/app/shared/custom-stepper/custom-stepper.component.html +++ b/portal-frontend/src/app/shared/custom-stepper/custom-stepper.component.html @@ -4,7 +4,7 @@ -
+
From 47dfe86ab47af7249e92c291bb572240a0361eac Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Thu, 2 May 2024 17:14:59 -0700 Subject: [PATCH 023/103] Add ALCS verification - Split to separate sequential test to avoid redirect issue --- .../application-details.component.html | 46 +++---- .../parcel/parcel.component.html | 44 +++--- .../tur-details/tur-details.component.html | 16 +-- e2e/tests/pages/alcs/alcs-login-page.ts | 31 +++++ .../applicant-info-page.ts | 27 ++++ .../applicant-info-page/land-use-section.ts | 27 ++++ .../optional-documents-section.ts | 28 ++++ .../other-owned-parcels-section.ts | 21 +++ .../applicant-info-page/parcels-section.ts | 125 ++++++++++++++++++ .../primary-contact-section.ts | 45 +++++++ .../tur-proposal-section.ts | 39 ++++++ e2e/tests/pages/alcs/details-navigation.ts | 15 +++ e2e/tests/pages/alcs/home-page.ts | 36 +++++ e2e/tests/tur.spec.ts | 117 +++++++++------- 14 files changed, 523 insertions(+), 94 deletions(-) create mode 100644 e2e/tests/pages/alcs/alcs-login-page.ts create mode 100644 e2e/tests/pages/alcs/applicant-info-page/applicant-info-page.ts create mode 100644 e2e/tests/pages/alcs/applicant-info-page/land-use-section.ts create mode 100644 e2e/tests/pages/alcs/applicant-info-page/optional-documents-section.ts create mode 100644 e2e/tests/pages/alcs/applicant-info-page/other-owned-parcels-section.ts create mode 100644 e2e/tests/pages/alcs/applicant-info-page/parcels-section.ts create mode 100644 e2e/tests/pages/alcs/applicant-info-page/primary-contact-section.ts create mode 100644 e2e/tests/pages/alcs/applicant-info-page/tur-proposal-section.ts create mode 100644 e2e/tests/pages/alcs/details-navigation.ts create mode 100644 e2e/tests/pages/alcs/home-page.ts diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html index aa03160e66..a5e9cb754d 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html @@ -14,7 +14,7 @@

Other Owned Parcels

Do any of the land owners added previously own or lease other parcels that might inform this application process?
-
+
{{ submission.hasOtherParcelsInCommunity ? 'Yes' : 'No' }} @@ -24,7 +24,7 @@

Other Owned Parcels

Describe the other parcels including their location, who owns or leases them, and their use.
-
+
{{ submission.otherParcelsDescription }}
@@ -42,17 +42,17 @@

Other Owned Parcels

Primary Contact Information

Type
-
+
{{ submission.primaryContact?.type?.label }}
First Name
-
+
{{ submission.primaryContact?.firstName }}
Last Name
-
+
{{ submission.primaryContact?.lastName }}
@@ -63,17 +63,17 @@

Primary Contact Information

Ministry/Department Responsible Department
-
+
{{ submission.primaryContact?.organizationName }}
Phone
-
+
{{ submission.primaryContact?.phoneNumber }}
Email
-
+
{{ submission.primaryContact?.email }}
@@ -81,7 +81,7 @@

Primary Contact Information

Authorization Letter(s)
@@ -99,15 +99,15 @@

Land Use

Land Use of Parcel(s) under Application

Describe all agriculture that currently takes place on the parcel(s).
-
+
{{ submission.parcelsAgricultureDescription }}
Describe all agricultural improvements made to the parcel(s).
-
+
{{ submission.parcelsAgricultureImprovementDescription }}
Describe all other uses that currently take place on the parcel(s).
-
+
{{ submission.parcelsNonAgricultureUseDescription }}
@@ -118,31 +118,31 @@

Land Use of Adjacent Parcels

Main Land Use Type
Specific Activity
North
-
+
{{ submission.northLandUseType }}
-
+
{{ submission.northLandUseTypeDescription }}
East
-
+
{{ submission.eastLandUseType }}
-
+
{{ submission.eastLandUseTypeDescription }}
South
-
+
{{ submission.southLandUseType }}
-
+
{{ submission.southLandUseTypeDescription }}
West
-
+
{{ submission.westLandUseType }}
-
+
{{ submission.westLandUseTypeDescription }}
@@ -225,13 +225,13 @@

Optional Documents

Description
-
+
{{ file.fileName }}
-
+
{{ file.type?.label }}
-
+
{{ file.description }}
diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html index 21935309a3..42018c50b0 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html @@ -12,53 +12,57 @@

Parcel #{{ parcelInd + 1 }}: Parcel and Owner Information

Ownership Type
-
+
{{ parcel.ownershipType?.label }}
Legal Description
-
+
{{ parcel.legalDescription }}
Area (Hectares)
-
+
{{ parcel.mapAreaHectares }}
PID {{ parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.CROWN ? '(optional)' : '' }}
-
+
{{ parcel.pid | mask: '000-000-000' }}
PIN (optional)
-
+
{{ parcel.pin }}
Purchase Date
-
+
{{ parcel.purchasedDate | date }}
Farm Classification
-
+
{{ parcel.isFarm ? 'Yes' : 'No' }}
Civic Address
-
+
{{ parcel.civicAddress }}
Certificate Of Title
-
+
@@ -108,17 +112,23 @@
Government Parcel Contact
Email
Corporate Summary
-
{{ owner.displayName }}
-
+
+ {{ owner.displayName }} +
+
{{ owner.organizationName }}
-
{{ owner.phoneNumber }}
-
{{ owner.email }}
-
- {{ - owner.corporateSummary.fileName - }} +
+ {{ owner.phoneNumber }} +
+
+ {{ owner.email }} +
+ diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/tur-details/tur-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/tur-details/tur-details.component.html index c463469f5d..1652cc058d 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/tur-details/tur-details.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/tur-details/tur-details.component.html @@ -1,37 +1,37 @@
What is the purpose of the proposal?
-
+
{{ _application.purpose }}
Specify any agricultural activities such as livestock operations, greenhouses or horticultural activities in proximity to the proposal.
-
+
{{ _application.turAgriculturalActivities }}
What steps will you take to reduce potential negative impacts on surrounding agricultural lands?
-
+
{{ _application.turReduceNegativeImpacts }}
Could this proposal be accommodated on lands outside of the ALR?
-
+
{{ _application.turOutsideLands }}
Total area of corridor
-
- {{ _application.turTotalCorridorArea }}ha +
+ {{ _application.turTotalCorridorArea }} ha
Proof of Serving Notice
-
+
{{ notice.fileName }}
Proposal Map / Site Plan
-
+
{{ file.fileName }} diff --git a/e2e/tests/pages/alcs/alcs-login-page.ts b/e2e/tests/pages/alcs/alcs-login-page.ts new file mode 100644 index 0000000000..440e72eafd --- /dev/null +++ b/e2e/tests/pages/alcs/alcs-login-page.ts @@ -0,0 +1,31 @@ +import { type Locator, type Page } from '@playwright/test'; + +export class ALCSLoginPage { + readonly page: Page; + readonly baseUrl: string; + readonly idirLink: Locator; + readonly userIdTextbox: Locator; + readonly passwordTextbox: Locator; + readonly continueButton: Locator; + + constructor(page: Page, baseUrl: string) { + this.page = page; + this.baseUrl = baseUrl; + this.idirLink = page.getByRole('link', { name: 'IDIR' }); + // There is an error with the username label on BCeID page + this.userIdTextbox = page.getByRole('textbox').nth(0); + this.passwordTextbox = page.getByLabel('Password'); + this.continueButton = page.getByRole('button', { name: 'Continue' }); + } + + async goto() { + await this.page.goto(this.baseUrl); + } + + async login(username: string, password: string) { + await this.idirLink.click(); + await this.userIdTextbox.fill(username); + await this.passwordTextbox.fill(password); + await this.continueButton.click(); + } +} diff --git a/e2e/tests/pages/alcs/applicant-info-page/applicant-info-page.ts b/e2e/tests/pages/alcs/applicant-info-page/applicant-info-page.ts new file mode 100644 index 0000000000..f63373670c --- /dev/null +++ b/e2e/tests/pages/alcs/applicant-info-page/applicant-info-page.ts @@ -0,0 +1,27 @@ +import { type Locator, type Page } from '@playwright/test'; +import { ParcelsSection } from './parcels-section'; +import { PrimaryContactSection } from './primary-contact-section'; +import { OtherOwnedParcelsSection } from './other-owned-parcels-section'; +import { LandUseSection } from './land-use-section'; +import { TURProposalSection } from './tur-proposal-section'; +import { OptionalDocumentsSection } from './optional-documents-section'; + +export class ALCSApplicantInfoPage { + readonly page: Page; + readonly parcelsSection: ParcelsSection; + readonly otherOwnedParcelsSection: OtherOwnedParcelsSection; + readonly primaryContactSection: PrimaryContactSection; + readonly landUseSection: LandUseSection; + readonly turProposalSection: TURProposalSection; + readonly optionalDocumentsSection: OptionalDocumentsSection; + + constructor(page: Page) { + this.page = page; + this.parcelsSection = new ParcelsSection(page); + this.otherOwnedParcelsSection = new OtherOwnedParcelsSection(page); + this.primaryContactSection = new PrimaryContactSection(page); + this.landUseSection = new LandUseSection(page); + this.turProposalSection = new TURProposalSection(page); + this.optionalDocumentsSection = new OptionalDocumentsSection(page); + } +} diff --git a/e2e/tests/pages/alcs/applicant-info-page/land-use-section.ts b/e2e/tests/pages/alcs/applicant-info-page/land-use-section.ts new file mode 100644 index 0000000000..c515e96c5c --- /dev/null +++ b/e2e/tests/pages/alcs/applicant-info-page/land-use-section.ts @@ -0,0 +1,27 @@ +import { expect, type Locator, type Page } from '@playwright/test'; +import { type LandUseDetails } from '../../portal/land-use-page'; + +export class LandUseSection { + readonly page: Page; + readonly currentAgricultureText: Locator; + readonly improvementsText: Locator; + readonly otherUsesText: Locator; + + constructor(page: Page) { + this.page = page; + this.currentAgricultureText = page.getByTestId('parcels-agriculture-description'); + this.improvementsText = page.getByTestId('parcels-agriculture-improvement-description'); + this.otherUsesText = page.getByTestId('parcels-non-agriculture-description'); + } + + async expectLandUse(landUse: LandUseDetails) { + await expect(this.currentAgricultureText).toHaveText(landUse.currentAgriculture); + await expect(this.improvementsText).toHaveText(landUse.improvements); + await expect(this.otherUsesText).toHaveText(landUse.otherUses); + + for (const [direction, neighbouring] of landUse.neighbouringLandUse) { + await expect(this.page.getByTestId(`${direction}-land-use-type`)).toHaveText(neighbouring.type); + await expect(this.page.getByTestId(`${direction}-land-use-description`)).toHaveText(neighbouring.activity); + } + } +} diff --git a/e2e/tests/pages/alcs/applicant-info-page/optional-documents-section.ts b/e2e/tests/pages/alcs/applicant-info-page/optional-documents-section.ts new file mode 100644 index 0000000000..65c6e673c0 --- /dev/null +++ b/e2e/tests/pages/alcs/applicant-info-page/optional-documents-section.ts @@ -0,0 +1,28 @@ +import { expect, type Locator, type Page } from '@playwright/test'; +import { OptionalAttachment } from '../../portal/optional-attachments-page'; + +export class OptionalDocumentsSection { + readonly page: Page; + readonly fileNameTexts: Locator; + readonly typeTexts: Locator; + readonly descriptionTexts: Locator; + + constructor(page: Page) { + this.page = page; + this.fileNameTexts = page.getByTestId(`optional-document-file-name`); + this.typeTexts = page.getByTestId(`optional-document-type`); + this.descriptionTexts = page.getByTestId(`optional-document-description`); + } + + async expectAttachments(attachments: OptionalAttachment[]) { + for (const attachment of attachments) { + await expect(this.fileNameTexts.filter({ hasText: this.fileName(attachment.path) })).toBeVisible(); + await expect(this.typeTexts.filter({ hasText: attachment.type })).toBeVisible(); + await expect(this.descriptionTexts.filter({ hasText: attachment.description })).toBeVisible(); + } + } + + fileName(path: string): string { + return path.substring(path.lastIndexOf('/') + 1); + } +} diff --git a/e2e/tests/pages/alcs/applicant-info-page/other-owned-parcels-section.ts b/e2e/tests/pages/alcs/applicant-info-page/other-owned-parcels-section.ts new file mode 100644 index 0000000000..3773110006 --- /dev/null +++ b/e2e/tests/pages/alcs/applicant-info-page/other-owned-parcels-section.ts @@ -0,0 +1,21 @@ +import { expect, type Locator, type Page } from '@playwright/test'; + +export class OtherOwnedParcelsSection { + readonly page: Page; + readonly hasOtherParcelsText: Locator; + readonly descriptionText: Locator; + + constructor(page: Page) { + this.page = page; + this.hasOtherParcelsText = page.getByTestId('has-other-parcels'); + this.descriptionText = page.getByTestId('other-parcels-description'); + } + + async expectHasOtherParcels(hasOtherParcels: boolean) { + await expect(this.hasOtherParcelsText).toHaveText(hasOtherParcels ? 'Yes' : 'No'); + } + + async expectDescription(description: string) { + await expect(this.descriptionText).toHaveText(description); + } +} diff --git a/e2e/tests/pages/alcs/applicant-info-page/parcels-section.ts b/e2e/tests/pages/alcs/applicant-info-page/parcels-section.ts new file mode 100644 index 0000000000..29b3d7520e --- /dev/null +++ b/e2e/tests/pages/alcs/applicant-info-page/parcels-section.ts @@ -0,0 +1,125 @@ +import { expect, type Locator, type Page } from '@playwright/test'; +import { type ParcelDetails, type ParcelOwnerDetails } from '../../portal/parcels-page'; + +export class ParcelsSection { + readonly page: Page; + + constructor(page: Page) { + this.page = page; + } + + async expectParcels(parcels: ParcelDetails[]) { + for (const [parcel, i] of parcels.map((parcel, i): [ParcelDetails, number] => [parcel, i])) { + const parcelNumber = i + 1; + + await this.expectParcelDetails(parcelNumber, parcel); + await this.expectParcelOwners(parcelNumber, parcel.owners); + } + } + + async expectParcelDetails(parcelNumber: number, parcel: ParcelDetails) { + await expect(this.typeText(parcelNumber)).toHaveText(parcel.type); + await expect(this.legalDescriptionText(parcelNumber)).toHaveText(parcel.legalDescription); + await expect(this.mapAreaText(parcelNumber)).toHaveText(parcel.mapArea); + if (parcel.pid !== undefined) { + await expect(this.pidText(parcelNumber)).toHaveText(parcel.pid); + } + if (parcel.pin !== undefined) { + await expect(this.pinText(parcelNumber)).toHaveText(parcel.pin); + } + if (parcel.month !== undefined && parcel.day !== undefined && parcel.year !== undefined) { + await expect(this.purchaseDateText(parcelNumber)).toHaveText(`${parcel.month} ${parcel.day}, ${parcel.year}`); + } + await expect(this.isFarmText(parcelNumber)).toHaveText(parcel.isFarm ? 'Yes' : 'No'); + await expect(this.civicAddressText(parcelNumber)).toHaveText(parcel.civicAddress); + await expect(this.certificateOfTitleText(parcelNumber)).toHaveText(this.fileName(parcel.certificateOfTitlePath)); + } + + async expectParcelOwners(parcelNumber: number, owners: ParcelOwnerDetails[]) { + const nameTexts = this.ownerNameTexts(parcelNumber); + const organizationTexts = this.ownerOrganizationTexts(parcelNumber); + const phoneNumberTexts = this.ownerPhoneNumberTexts(parcelNumber); + const emailTexts = this.ownerEmailTexts(parcelNumber); + const corporateSummaryTexts = this.ownerCorporateSummaryTexts(parcelNumber); + + for (const owner of owners) { + await expect(nameTexts.filter({ hasText: `${owner.firstName} ${owner.lastName}` })).toBeVisible(); + if (owner.organization !== undefined) { + await expect(organizationTexts.filter({ hasText: owner.organization })).toBeVisible(); + } + await expect(phoneNumberTexts.filter({ hasText: owner.phoneNumber.replace(/\D/g, '') })).toBeVisible(); + await expect(emailTexts.filter({ hasText: owner.email })).toBeVisible(); + if (owner.corporateSummaryPath !== undefined) { + await expect( + corporateSummaryTexts.filter({ hasText: this.fileName(owner.corporateSummaryPath) }), + ).toBeVisible(); + } + } + } + + // Locator Getters + // --------------- + + typeText(parcelNumber: number): Locator { + return this.page.getByTestId(`parcel-${parcelNumber}-type`); + } + + legalDescriptionText(parcelNumber: number): Locator { + return this.page.getByTestId(`parcel-${parcelNumber}-legal-description`); + } + + mapAreaText(parcelNumber: number): Locator { + return this.page.getByTestId(`parcel-${parcelNumber}-map-area`); + } + + pidText(parcelNumber: number): Locator { + return this.page.getByTestId(`parcel-${parcelNumber}-pid`); + } + + pinText(parcelNumber: number): Locator { + return this.page.getByTestId(`parcel-${parcelNumber}-pin`); + } + + purchaseDateText(parcelNumber: number): Locator { + return this.page.getByTestId(`parcel-${parcelNumber}-purchase-date`); + } + + isFarmText(parcelNumber: number): Locator { + return this.page.getByTestId(`parcel-${parcelNumber}-is-farm`); + } + + civicAddressText(parcelNumber: number): Locator { + return this.page.getByTestId(`parcel-${parcelNumber}-civic-address`); + } + + certificateOfTitleText(parcelNumber: number): Locator { + return this.page.getByTestId(`parcel-${parcelNumber}-certificate-of-title`); + } + + ownerNameTexts(parcelNumber: number) { + return this.page.getByTestId(`parcel-${parcelNumber}-owner-name`); + } + + ownerOrganizationTexts(parcelNumber: number) { + return this.page.getByTestId(`parcel-${parcelNumber}-owner-organization`); + } + + ownerPhoneNumberTexts(parcelNumber: number) { + return this.page.getByTestId(`parcel-${parcelNumber}-owner-phone-number`); + } + + ownerEmailTexts(parcelNumber: number) { + return this.page.getByTestId(`parcel-${parcelNumber}-owner-email`); + } + + ownerCorporateSummaryTexts(parcelNumber: number) { + return this.page.getByTestId(`parcel-${parcelNumber}-owner-corporate-summary`); + } + + // Utils + // ----- + + fileName(path: string): string { + return path.substring(path.lastIndexOf('/') + 1); + } +} diff --git a/e2e/tests/pages/alcs/applicant-info-page/primary-contact-section.ts b/e2e/tests/pages/alcs/applicant-info-page/primary-contact-section.ts new file mode 100644 index 0000000000..726d2fe648 --- /dev/null +++ b/e2e/tests/pages/alcs/applicant-info-page/primary-contact-section.ts @@ -0,0 +1,45 @@ +import { expect, type Locator, type Page } from '@playwright/test'; +import { PrimaryContactType, type ThirdPartyContactDetails } from '../../portal/primary-contact-page'; + +export class PrimaryContactSection { + readonly page: Page; + readonly typeText: Locator; + readonly firstNameText: Locator; + readonly lastNameText: Locator; + readonly organizationText: Locator; + readonly phoneNumberText: Locator; + readonly emailText: Locator; + readonly authorizationLetterTexts: Locator; + + constructor(page: Page) { + this.page = page; + this.typeText = page.getByTestId('primary-contact-type'); + this.firstNameText = page.getByTestId('primary-contact-first-name'); + this.lastNameText = page.getByTestId('primary-contact-last-name'); + this.organizationText = page.getByTestId('primary-contact-organization'); + this.phoneNumberText = page.getByTestId('primary-contact-phone-number'); + this.emailText = page.getByTestId('primary-contact-email'); + this.authorizationLetterTexts = page.getByTestId('authorization-letter'); + } + + async expectThirdPartyContact(contact: ThirdPartyContactDetails) { + await expect(this.typeText).toHaveText(PrimaryContactType.ThirdParty); + await expect(this.firstNameText).toHaveText(contact.firstName); + await expect(this.lastNameText).toHaveText(contact.lastName); + if (contact.organization !== undefined) { + await expect(this.organizationText).toHaveText(contact.organization); + } + await expect(this.phoneNumberText).toHaveText(contact.phoneNumber.replace(/\D/g, '')); + await expect(this.emailText).toHaveText(contact.email); + } + + async expectAuthorizationLetters(authorizationLetterPaths: string[]) { + for (const path of authorizationLetterPaths) { + await expect(this.authorizationLetterTexts.filter({ hasText: this.fileName(path) })).toBeVisible(); + } + } + + fileName(path: string): string { + return path.substring(path.lastIndexOf('/') + 1); + } +} diff --git a/e2e/tests/pages/alcs/applicant-info-page/tur-proposal-section.ts b/e2e/tests/pages/alcs/applicant-info-page/tur-proposal-section.ts new file mode 100644 index 0000000000..c8a52be3ed --- /dev/null +++ b/e2e/tests/pages/alcs/applicant-info-page/tur-proposal-section.ts @@ -0,0 +1,39 @@ +import { expect, type Locator, type Page } from '@playwright/test'; +import { TURProposal } from '../../portal/tur-proposal-page'; + +export class TURProposalSection { + readonly page: Page; + readonly purposeText: Locator; + readonly activitiesText: Locator; + readonly stepsToReduceImpactText: Locator; + readonly alternativeLandText: Locator; + readonly totalAreaText: Locator; + readonly allOwnersNotifiedText: Locator; + readonly proofOfServingNoticeText: Locator; + readonly proposalMapText: Locator; + + constructor(page: Page) { + this.page = page; + this.purposeText = page.getByTestId('tur-purpose'); + this.activitiesText = page.getByTestId('tur-agricultural-activities'); + this.stepsToReduceImpactText = page.getByTestId('tur-reduce-negative-impacts'); + this.alternativeLandText = page.getByTestId('tur-outside-lands'); + this.totalAreaText = page.getByTestId('tur-total-corridor-area'); + this.proofOfServingNoticeText = page.getByTestId('tur-proof-of-serving-notice'); + this.proposalMapText = page.getByTestId('tur-proposal-map'); + } + + async expectProposal(proposal: TURProposal) { + await expect(this.purposeText).toHaveText(proposal.purpose); + await expect(this.activitiesText).toHaveText(proposal.activities); + await expect(this.stepsToReduceImpactText).toHaveText(proposal.stepsToReduceImpact); + await expect(this.alternativeLandText).toHaveText(proposal.alternativeLand); + await expect(this.totalAreaText).toHaveText(`${proposal.totalArea} ha`); + await expect(this.proofOfServingNoticeText).toHaveText(this.fileName(proposal.proofOfServingNoticePath)); + await expect(this.proposalMapText).toHaveText(this.fileName(proposal.proposalMapPath)); + } + + fileName(path: string): string { + return path.substring(path.lastIndexOf('/') + 1); + } +} diff --git a/e2e/tests/pages/alcs/details-navigation.ts b/e2e/tests/pages/alcs/details-navigation.ts new file mode 100644 index 0000000000..8132e28931 --- /dev/null +++ b/e2e/tests/pages/alcs/details-navigation.ts @@ -0,0 +1,15 @@ +import { type Locator, type Page } from '@playwright/test'; + +export class ALCSDetailsNavigation { + readonly page: Page; + readonly applicantInfoLink: Locator; + + constructor(page: Page) { + this.page = page; + this.applicantInfoLink = page.getByText('Applicant Info'); + } + + async gotoApplicantInfoPage() { + await this.applicantInfoLink.click(); + } +} diff --git a/e2e/tests/pages/alcs/home-page.ts b/e2e/tests/pages/alcs/home-page.ts new file mode 100644 index 0000000000..97c261059f --- /dev/null +++ b/e2e/tests/pages/alcs/home-page.ts @@ -0,0 +1,36 @@ +import { type Locator, type Page } from '@playwright/test'; + +export class ALCSHomePage { + readonly page: Page; + readonly baseUrl: string; + readonly idirLink: Locator; + readonly userIdTextbox: Locator; + readonly passwordTextbox: Locator; + readonly continueButton: Locator; + + constructor(page: Page) { + this.page = page; + this.idirLink = page.getByRole('link', { name: 'IDIR' }); + // There is an error with the username label on BCeID page + this.userIdTextbox = page.getByRole('textbox').nth(0); + this.passwordTextbox = page.getByLabel('Password'); + this.continueButton = page.getByRole('button', { name: 'Continue' }); + } + + async goto() { + await this.page.goto(this.baseUrl); + } + + async login(username: string, password: string) { + await this.idirLink.click(); + await this.userIdTextbox.fill(username); + await this.passwordTextbox.fill(password); + await this.continueButton.click(); + } + + async search(fileId: string) { + await this.page.getByRole('button').filter({ hasText: 'search' }).click(); + await this.page.getByPlaceholder('Search by File ID').fill(fileId); + await this.page.keyboard.press('Enter'); + } +} diff --git a/e2e/tests/tur.spec.ts b/e2e/tests/tur.spec.ts index b2f9cbfcec..edf579ec6b 100644 --- a/e2e/tests/tur.spec.ts +++ b/e2e/tests/tur.spec.ts @@ -11,8 +11,12 @@ import { TURProposalPage } from './pages/portal/tur-proposal-page'; import { OptionalAttachmentType, OptionalAttachmentsPage } from './pages/portal/optional-attachments-page'; import { ReviewAndSubmitPage } from './pages/portal/review-and-submit-page/review-and-submit-page'; import { SubmissionSuccessPage } from './pages/portal/submission-success-page'; +import { ALCSLoginPage } from './pages/alcs/alcs-login-page'; +import { ALCSHomePage } from './pages/alcs/home-page'; +import { ALCSDetailsNavigation } from './pages/alcs/details-navigation'; +import { ALCSApplicantInfoPage } from './pages/alcs/applicant-info-page/applicant-info-page'; -test('TUR', async ({ browser }) => { +test.describe.serial('Portal TUR submission and ALCS applicant info flow', () => { const parcels = [ { type: ParcelType.FeeSimple, @@ -117,68 +121,89 @@ test('TUR', async ({ browser }) => { let submittedFileId: string; - const context = await browser.newContext({ baseURL: process.env.PORTAL_BASE_URL }); - const page = await context.newPage(); + test('should have working UI, data should populate review, and submission should succeed', async ({ page }) => { + const portalLoginPage = new PortalLoginPage(page, process.env.PORTAL_BASE_URL); + await portalLoginPage.goto(); + await portalLoginPage.logIn(process.env.BCEID_BASIC_USERNAME, process.env.BCEID_BASIC_PASSWORD); - const portalLoginPage = new PortalLoginPage(page); - await portalLoginPage.goto(); - await portalLoginPage.logIn(process.env.BCEID_BASIC_USERNAME, process.env.BCEID_BASIC_PASSWORD); + const inboxPage = new InboxPage(page); + await inboxPage.createApplication(ApplicationType.TUR); - const inbox = new InboxPage(page); - await inbox.createApplication(ApplicationType.TUR); + const portalStepsNavigation = new PortalStepsNavigation(page); - const portalStepsNavigation = new PortalStepsNavigation(page); + const parcelsPage = new ParcelsPage(page); + await parcelsPage.fill(parcels); - const parcelsPage = new ParcelsPage(page); - await parcelsPage.fill(parcels); + await portalStepsNavigation.gotoOtherParcelsPage(); - await portalStepsNavigation.gotoOtherParcelsPage(); + const otherParcelsPage = new OtherParcelsPage(page); + await otherParcelsPage.setHasOtherParcels(hasOtherParcels); + await otherParcelsPage.fillDescription(otherParcelsDescription); - const otherParcelsPage = new OtherParcelsPage(page); - await otherParcelsPage.setHasOtherParcels(hasOtherParcels); - await otherParcelsPage.fillDescription(otherParcelsDescription); + await portalStepsNavigation.gotoPrimaryContactPage(); - await portalStepsNavigation.gotoPrimaryContactPage(); + const primaryContactPage = new PrimaryContactPage(page); + await primaryContactPage.setPrimaryContactType(primaryContactType); + await primaryContactPage.fillThirdPartyContact(thirdPartPrimaryContact); + await primaryContactPage.uploadAuthorizationLetters(authorizationLetterPaths); - const primaryContactPage = new PrimaryContactPage(page); - await primaryContactPage.setPrimaryContactType(primaryContactType); - await primaryContactPage.fillThirdPartyContact(thirdPartPrimaryContact); - await primaryContactPage.uploadAuthorizationLetters(authorizationLetterPaths); + await portalStepsNavigation.gotoGovernmentPage(); - await portalStepsNavigation.gotoGovernmentPage(); + const governmentPage = new GovernmentPage(page); + await governmentPage.fill(government); - const governmentPage = new GovernmentPage(page); - await governmentPage.fill(government); + await portalStepsNavigation.gotoLandUsePage(); - await portalStepsNavigation.gotoLandUsePage(); + const landUsePage = new LandUsePage(page); + await landUsePage.fill(landUse); - const landUsePage = new LandUsePage(page); - await landUsePage.fill(landUse); + await portalStepsNavigation.gotoProposalPage(); - await portalStepsNavigation.gotoProposalPage(); + const turProposalPage = new TURProposalPage(page); + await turProposalPage.fill(turProposal); - const turProposalPage = new TURProposalPage(page); - await turProposalPage.fill(turProposal); + await portalStepsNavigation.gotoOptionalAttachmentsPage(); - await portalStepsNavigation.gotoOptionalAttachmentsPage(); + const optionalAttachmentsPage = new OptionalAttachmentsPage(page); + await optionalAttachmentsPage.addAttachments(optionalAttachments); - const optionalAttachmentsPage = new OptionalAttachmentsPage(page); - await optionalAttachmentsPage.addAttachments(optionalAttachments); + await portalStepsNavigation.gotoReviewAndSubmitPage(); - await portalStepsNavigation.gotoReviewAndSubmitPage(); + const reviewAndSubmitPage = new ReviewAndSubmitPage(page); + await reviewAndSubmitPage.parcelsSection.expectParcels(parcels); + await reviewAndSubmitPage.otherOwnedParcelsSection.expectHasOtherParcels(hasOtherParcels); + await reviewAndSubmitPage.otherOwnedParcelsSection.expectDescription(otherParcelsDescription); + await reviewAndSubmitPage.primaryContactSection.expectThirdPartyContact(thirdPartPrimaryContact); + await reviewAndSubmitPage.primaryContactSection.expectAuthorizationLetters(authorizationLetterPaths); + await reviewAndSubmitPage.governmentSection.expectGovernment(government); + await reviewAndSubmitPage.landUseSection.expectLandUse(landUse); + await reviewAndSubmitPage.turProposalSection.expectProposal(turProposal); + await reviewAndSubmitPage.optionalDocumentsSection.expectAttachments(optionalAttachments); + await reviewAndSubmitPage.submit(); - const reviewAndSubmitPage = new ReviewAndSubmitPage(page); - await reviewAndSubmitPage.parcelsSection.expectParcels(parcels); - await reviewAndSubmitPage.otherOwnedParcelsSection.expectHasOtherParcels(hasOtherParcels); - await reviewAndSubmitPage.otherOwnedParcelsSection.expectDescription(otherParcelsDescription); - await reviewAndSubmitPage.primaryContactSection.expectThirdPartyContact(thirdPartPrimaryContact); - await reviewAndSubmitPage.primaryContactSection.expectAuthorizationLetters(authorizationLetterPaths); - await reviewAndSubmitPage.governmentSection.expectGovernment(government); - await reviewAndSubmitPage.landUseSection.expectLandUse(landUse); - await reviewAndSubmitPage.turProposalSection.expectProposal(turProposal); - await reviewAndSubmitPage.optionalDocumentsSection.expectAttachments(optionalAttachments); - await reviewAndSubmitPage.submit(); + const submissionSuccessPage = new SubmissionSuccessPage(page); + submittedFileId = await submissionSuccessPage.fileId(); + }); - const submissionSuccessPage = new SubmissionSuccessPage(page); - submittedFileId = await submissionSuccessPage.fileId(); + test('submission data should appear in ALCS applicant info', async ({ page }) => { + const alcsLoginPage = new ALCSLoginPage(page, process.env.ALCS_BASE_URL); + await alcsLoginPage.goto(); + await alcsLoginPage.login(process.env.IDIR_USERNAME, process.env.IDIR_PASSWORD); + + const alcsHomePage = new ALCSHomePage(page); + await alcsHomePage.search(submittedFileId); + + const alcsDetailsNavigation = new ALCSDetailsNavigation(page); + await alcsDetailsNavigation.gotoApplicantInfoPage(); + + const alcsApplicantInfoPage = new ALCSApplicantInfoPage(page); + await alcsApplicantInfoPage.parcelsSection.expectParcels(parcels); + await alcsApplicantInfoPage.otherOwnedParcelsSection.expectHasOtherParcels(hasOtherParcels); + await alcsApplicantInfoPage.otherOwnedParcelsSection.expectDescription(otherParcelsDescription); + await alcsApplicantInfoPage.primaryContactSection.expectThirdPartyContact(thirdPartPrimaryContact); + await alcsApplicantInfoPage.primaryContactSection.expectAuthorizationLetters(authorizationLetterPaths); + await alcsApplicantInfoPage.landUseSection.expectLandUse(landUse); + await alcsApplicantInfoPage.turProposalSection.expectProposal(turProposal); + await alcsApplicantInfoPage.optionalDocumentsSection.expectAttachments(optionalAttachments); + }); }); From 860dcb6746de612d5c08a39bf751d39d25fe59e8 Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Thu, 2 May 2024 17:15:50 -0700 Subject: [PATCH 024/103] Update .env template to include other users/URL's --- e2e/template.env | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/e2e/template.env b/e2e/template.env index 9feb6fb1f4..eabff51721 100644 --- a/e2e/template.env +++ b/e2e/template.env @@ -1,3 +1,11 @@ PORTAL_BASE_URL= +ALCS_BASE_URL= + BCEID_BASIC_USERNAME= BCEID_BASIC_PASSWORD= + +BCEID_LG_USERNAME= +BCEID_LG_PASSWORD= + +IDIR_USERNAME= +IDIR_PASSWORD= From 4bc5e6017b7f433b30946b691548be9a9f022c7f Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Thu, 2 May 2024 17:20:51 -0700 Subject: [PATCH 025/103] Move pages outside of tests directory --- e2e/{tests => }/pages/alcs/alcs-login-page.ts | 0 .../applicant-info-page.ts | 0 .../applicant-info-page/land-use-section.ts | 0 .../optional-documents-section.ts | 0 .../other-owned-parcels-section.ts | 0 .../applicant-info-page/parcels-section.ts | 0 .../primary-contact-section.ts | 0 .../tur-proposal-section.ts | 0 .../pages/alcs/details-navigation.ts | 0 e2e/{tests => }/pages/alcs/home-page.ts | 0 e2e/{tests => }/pages/inbox-page.ts | 0 e2e/{tests => }/pages/portal-login-page.ts | 0 .../pages/portal/government-page.ts | 0 e2e/{tests => }/pages/portal/inbox-page.ts | 0 e2e/{tests => }/pages/portal/land-use-page.ts | 0 .../pages/portal/optional-attachments-page.ts | 0 .../pages/portal/other-parcels-page.ts | 0 e2e/{tests => }/pages/portal/parcels-page.ts | 0 .../pages/portal/portal-login-page.ts | 0 .../pages/portal/portal-steps-navigation.ts | 0 .../pages/portal/primary-contact-page.ts | 0 .../government-section.ts | 0 .../land-use-section.ts | 0 .../optional-documents-section.ts | 0 .../other-owned-parcels-section.ts | 0 .../review-and-submit-page/parcels-section.ts | 0 .../primary-contact-section.ts | 0 .../review-and-submit-page.ts | 0 .../tur-proposal-section.ts | 0 .../pages/portal/submission-success-page.ts | 0 .../pages/portal/tur-proposal-page.ts | 0 e2e/tests/tur.spec.ts | 32 +++++++++---------- 32 files changed, 16 insertions(+), 16 deletions(-) rename e2e/{tests => }/pages/alcs/alcs-login-page.ts (100%) rename e2e/{tests => }/pages/alcs/applicant-info-page/applicant-info-page.ts (100%) rename e2e/{tests => }/pages/alcs/applicant-info-page/land-use-section.ts (100%) rename e2e/{tests => }/pages/alcs/applicant-info-page/optional-documents-section.ts (100%) rename e2e/{tests => }/pages/alcs/applicant-info-page/other-owned-parcels-section.ts (100%) rename e2e/{tests => }/pages/alcs/applicant-info-page/parcels-section.ts (100%) rename e2e/{tests => }/pages/alcs/applicant-info-page/primary-contact-section.ts (100%) rename e2e/{tests => }/pages/alcs/applicant-info-page/tur-proposal-section.ts (100%) rename e2e/{tests => }/pages/alcs/details-navigation.ts (100%) rename e2e/{tests => }/pages/alcs/home-page.ts (100%) rename e2e/{tests => }/pages/inbox-page.ts (100%) rename e2e/{tests => }/pages/portal-login-page.ts (100%) rename e2e/{tests => }/pages/portal/government-page.ts (100%) rename e2e/{tests => }/pages/portal/inbox-page.ts (100%) rename e2e/{tests => }/pages/portal/land-use-page.ts (100%) rename e2e/{tests => }/pages/portal/optional-attachments-page.ts (100%) rename e2e/{tests => }/pages/portal/other-parcels-page.ts (100%) rename e2e/{tests => }/pages/portal/parcels-page.ts (100%) rename e2e/{tests => }/pages/portal/portal-login-page.ts (100%) rename e2e/{tests => }/pages/portal/portal-steps-navigation.ts (100%) rename e2e/{tests => }/pages/portal/primary-contact-page.ts (100%) rename e2e/{tests => }/pages/portal/review-and-submit-page/government-section.ts (100%) rename e2e/{tests => }/pages/portal/review-and-submit-page/land-use-section.ts (100%) rename e2e/{tests => }/pages/portal/review-and-submit-page/optional-documents-section.ts (100%) rename e2e/{tests => }/pages/portal/review-and-submit-page/other-owned-parcels-section.ts (100%) rename e2e/{tests => }/pages/portal/review-and-submit-page/parcels-section.ts (100%) rename e2e/{tests => }/pages/portal/review-and-submit-page/primary-contact-section.ts (100%) rename e2e/{tests => }/pages/portal/review-and-submit-page/review-and-submit-page.ts (100%) rename e2e/{tests => }/pages/portal/review-and-submit-page/tur-proposal-section.ts (100%) rename e2e/{tests => }/pages/portal/submission-success-page.ts (100%) rename e2e/{tests => }/pages/portal/tur-proposal-page.ts (100%) diff --git a/e2e/tests/pages/alcs/alcs-login-page.ts b/e2e/pages/alcs/alcs-login-page.ts similarity index 100% rename from e2e/tests/pages/alcs/alcs-login-page.ts rename to e2e/pages/alcs/alcs-login-page.ts diff --git a/e2e/tests/pages/alcs/applicant-info-page/applicant-info-page.ts b/e2e/pages/alcs/applicant-info-page/applicant-info-page.ts similarity index 100% rename from e2e/tests/pages/alcs/applicant-info-page/applicant-info-page.ts rename to e2e/pages/alcs/applicant-info-page/applicant-info-page.ts diff --git a/e2e/tests/pages/alcs/applicant-info-page/land-use-section.ts b/e2e/pages/alcs/applicant-info-page/land-use-section.ts similarity index 100% rename from e2e/tests/pages/alcs/applicant-info-page/land-use-section.ts rename to e2e/pages/alcs/applicant-info-page/land-use-section.ts diff --git a/e2e/tests/pages/alcs/applicant-info-page/optional-documents-section.ts b/e2e/pages/alcs/applicant-info-page/optional-documents-section.ts similarity index 100% rename from e2e/tests/pages/alcs/applicant-info-page/optional-documents-section.ts rename to e2e/pages/alcs/applicant-info-page/optional-documents-section.ts diff --git a/e2e/tests/pages/alcs/applicant-info-page/other-owned-parcels-section.ts b/e2e/pages/alcs/applicant-info-page/other-owned-parcels-section.ts similarity index 100% rename from e2e/tests/pages/alcs/applicant-info-page/other-owned-parcels-section.ts rename to e2e/pages/alcs/applicant-info-page/other-owned-parcels-section.ts diff --git a/e2e/tests/pages/alcs/applicant-info-page/parcels-section.ts b/e2e/pages/alcs/applicant-info-page/parcels-section.ts similarity index 100% rename from e2e/tests/pages/alcs/applicant-info-page/parcels-section.ts rename to e2e/pages/alcs/applicant-info-page/parcels-section.ts diff --git a/e2e/tests/pages/alcs/applicant-info-page/primary-contact-section.ts b/e2e/pages/alcs/applicant-info-page/primary-contact-section.ts similarity index 100% rename from e2e/tests/pages/alcs/applicant-info-page/primary-contact-section.ts rename to e2e/pages/alcs/applicant-info-page/primary-contact-section.ts diff --git a/e2e/tests/pages/alcs/applicant-info-page/tur-proposal-section.ts b/e2e/pages/alcs/applicant-info-page/tur-proposal-section.ts similarity index 100% rename from e2e/tests/pages/alcs/applicant-info-page/tur-proposal-section.ts rename to e2e/pages/alcs/applicant-info-page/tur-proposal-section.ts diff --git a/e2e/tests/pages/alcs/details-navigation.ts b/e2e/pages/alcs/details-navigation.ts similarity index 100% rename from e2e/tests/pages/alcs/details-navigation.ts rename to e2e/pages/alcs/details-navigation.ts diff --git a/e2e/tests/pages/alcs/home-page.ts b/e2e/pages/alcs/home-page.ts similarity index 100% rename from e2e/tests/pages/alcs/home-page.ts rename to e2e/pages/alcs/home-page.ts diff --git a/e2e/tests/pages/inbox-page.ts b/e2e/pages/inbox-page.ts similarity index 100% rename from e2e/tests/pages/inbox-page.ts rename to e2e/pages/inbox-page.ts diff --git a/e2e/tests/pages/portal-login-page.ts b/e2e/pages/portal-login-page.ts similarity index 100% rename from e2e/tests/pages/portal-login-page.ts rename to e2e/pages/portal-login-page.ts diff --git a/e2e/tests/pages/portal/government-page.ts b/e2e/pages/portal/government-page.ts similarity index 100% rename from e2e/tests/pages/portal/government-page.ts rename to e2e/pages/portal/government-page.ts diff --git a/e2e/tests/pages/portal/inbox-page.ts b/e2e/pages/portal/inbox-page.ts similarity index 100% rename from e2e/tests/pages/portal/inbox-page.ts rename to e2e/pages/portal/inbox-page.ts diff --git a/e2e/tests/pages/portal/land-use-page.ts b/e2e/pages/portal/land-use-page.ts similarity index 100% rename from e2e/tests/pages/portal/land-use-page.ts rename to e2e/pages/portal/land-use-page.ts diff --git a/e2e/tests/pages/portal/optional-attachments-page.ts b/e2e/pages/portal/optional-attachments-page.ts similarity index 100% rename from e2e/tests/pages/portal/optional-attachments-page.ts rename to e2e/pages/portal/optional-attachments-page.ts diff --git a/e2e/tests/pages/portal/other-parcels-page.ts b/e2e/pages/portal/other-parcels-page.ts similarity index 100% rename from e2e/tests/pages/portal/other-parcels-page.ts rename to e2e/pages/portal/other-parcels-page.ts diff --git a/e2e/tests/pages/portal/parcels-page.ts b/e2e/pages/portal/parcels-page.ts similarity index 100% rename from e2e/tests/pages/portal/parcels-page.ts rename to e2e/pages/portal/parcels-page.ts diff --git a/e2e/tests/pages/portal/portal-login-page.ts b/e2e/pages/portal/portal-login-page.ts similarity index 100% rename from e2e/tests/pages/portal/portal-login-page.ts rename to e2e/pages/portal/portal-login-page.ts diff --git a/e2e/tests/pages/portal/portal-steps-navigation.ts b/e2e/pages/portal/portal-steps-navigation.ts similarity index 100% rename from e2e/tests/pages/portal/portal-steps-navigation.ts rename to e2e/pages/portal/portal-steps-navigation.ts diff --git a/e2e/tests/pages/portal/primary-contact-page.ts b/e2e/pages/portal/primary-contact-page.ts similarity index 100% rename from e2e/tests/pages/portal/primary-contact-page.ts rename to e2e/pages/portal/primary-contact-page.ts diff --git a/e2e/tests/pages/portal/review-and-submit-page/government-section.ts b/e2e/pages/portal/review-and-submit-page/government-section.ts similarity index 100% rename from e2e/tests/pages/portal/review-and-submit-page/government-section.ts rename to e2e/pages/portal/review-and-submit-page/government-section.ts diff --git a/e2e/tests/pages/portal/review-and-submit-page/land-use-section.ts b/e2e/pages/portal/review-and-submit-page/land-use-section.ts similarity index 100% rename from e2e/tests/pages/portal/review-and-submit-page/land-use-section.ts rename to e2e/pages/portal/review-and-submit-page/land-use-section.ts diff --git a/e2e/tests/pages/portal/review-and-submit-page/optional-documents-section.ts b/e2e/pages/portal/review-and-submit-page/optional-documents-section.ts similarity index 100% rename from e2e/tests/pages/portal/review-and-submit-page/optional-documents-section.ts rename to e2e/pages/portal/review-and-submit-page/optional-documents-section.ts diff --git a/e2e/tests/pages/portal/review-and-submit-page/other-owned-parcels-section.ts b/e2e/pages/portal/review-and-submit-page/other-owned-parcels-section.ts similarity index 100% rename from e2e/tests/pages/portal/review-and-submit-page/other-owned-parcels-section.ts rename to e2e/pages/portal/review-and-submit-page/other-owned-parcels-section.ts diff --git a/e2e/tests/pages/portal/review-and-submit-page/parcels-section.ts b/e2e/pages/portal/review-and-submit-page/parcels-section.ts similarity index 100% rename from e2e/tests/pages/portal/review-and-submit-page/parcels-section.ts rename to e2e/pages/portal/review-and-submit-page/parcels-section.ts diff --git a/e2e/tests/pages/portal/review-and-submit-page/primary-contact-section.ts b/e2e/pages/portal/review-and-submit-page/primary-contact-section.ts similarity index 100% rename from e2e/tests/pages/portal/review-and-submit-page/primary-contact-section.ts rename to e2e/pages/portal/review-and-submit-page/primary-contact-section.ts diff --git a/e2e/tests/pages/portal/review-and-submit-page/review-and-submit-page.ts b/e2e/pages/portal/review-and-submit-page/review-and-submit-page.ts similarity index 100% rename from e2e/tests/pages/portal/review-and-submit-page/review-and-submit-page.ts rename to e2e/pages/portal/review-and-submit-page/review-and-submit-page.ts diff --git a/e2e/tests/pages/portal/review-and-submit-page/tur-proposal-section.ts b/e2e/pages/portal/review-and-submit-page/tur-proposal-section.ts similarity index 100% rename from e2e/tests/pages/portal/review-and-submit-page/tur-proposal-section.ts rename to e2e/pages/portal/review-and-submit-page/tur-proposal-section.ts diff --git a/e2e/tests/pages/portal/submission-success-page.ts b/e2e/pages/portal/submission-success-page.ts similarity index 100% rename from e2e/tests/pages/portal/submission-success-page.ts rename to e2e/pages/portal/submission-success-page.ts diff --git a/e2e/tests/pages/portal/tur-proposal-page.ts b/e2e/pages/portal/tur-proposal-page.ts similarity index 100% rename from e2e/tests/pages/portal/tur-proposal-page.ts rename to e2e/pages/portal/tur-proposal-page.ts diff --git a/e2e/tests/tur.spec.ts b/e2e/tests/tur.spec.ts index edf579ec6b..df25b39b47 100644 --- a/e2e/tests/tur.spec.ts +++ b/e2e/tests/tur.spec.ts @@ -1,20 +1,20 @@ import { test } from '@playwright/test'; -import { PortalLoginPage } from './pages/portal/portal-login-page'; -import { ApplicationType, InboxPage } from './pages/portal/inbox-page'; -import { PortalStepsNavigation } from './pages/portal/portal-steps-navigation'; -import { OwnerType, ParcelType, ParcelsPage } from './pages/portal/parcels-page'; -import { OtherParcelsPage } from './pages/portal/other-parcels-page'; -import { PrimaryContactPage, PrimaryContactType } from './pages/portal/primary-contact-page'; -import { GovernmentPage } from './pages/portal/government-page'; -import { Direction, LandUsePage, LandUseType } from './pages/portal/land-use-page'; -import { TURProposalPage } from './pages/portal/tur-proposal-page'; -import { OptionalAttachmentType, OptionalAttachmentsPage } from './pages/portal/optional-attachments-page'; -import { ReviewAndSubmitPage } from './pages/portal/review-and-submit-page/review-and-submit-page'; -import { SubmissionSuccessPage } from './pages/portal/submission-success-page'; -import { ALCSLoginPage } from './pages/alcs/alcs-login-page'; -import { ALCSHomePage } from './pages/alcs/home-page'; -import { ALCSDetailsNavigation } from './pages/alcs/details-navigation'; -import { ALCSApplicantInfoPage } from './pages/alcs/applicant-info-page/applicant-info-page'; +import { PortalLoginPage } from '../pages/portal/portal-login-page'; +import { ApplicationType, InboxPage } from '../pages/portal/inbox-page'; +import { PortalStepsNavigation } from '../pages/portal/portal-steps-navigation'; +import { OwnerType, ParcelType, ParcelsPage } from '../pages/portal/parcels-page'; +import { OtherParcelsPage } from '../pages/portal/other-parcels-page'; +import { PrimaryContactPage, PrimaryContactType } from '../pages/portal/primary-contact-page'; +import { GovernmentPage } from '../pages/portal/government-page'; +import { Direction, LandUsePage, LandUseType } from '../pages/portal/land-use-page'; +import { TURProposalPage } from '../pages/portal/tur-proposal-page'; +import { OptionalAttachmentType, OptionalAttachmentsPage } from '../pages/portal/optional-attachments-page'; +import { ReviewAndSubmitPage } from '../pages/portal/review-and-submit-page/review-and-submit-page'; +import { SubmissionSuccessPage } from '../pages/portal/submission-success-page'; +import { ALCSLoginPage } from '../pages/alcs/alcs-login-page'; +import { ALCSHomePage } from '../pages/alcs/home-page'; +import { ALCSDetailsNavigation } from '../pages/alcs/details-navigation'; +import { ALCSApplicantInfoPage } from '../pages/alcs/applicant-info-page/applicant-info-page'; test.describe.serial('Portal TUR submission and ALCS applicant info flow', () => { const parcels = [ From a3ef722b0f9886b43a916046f6bea2681472b4c5 Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Thu, 2 May 2024 17:21:12 -0700 Subject: [PATCH 026/103] Fix portal login URL --- e2e/pages/portal/portal-login-page.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/e2e/pages/portal/portal-login-page.ts b/e2e/pages/portal/portal-login-page.ts index 85210ab4d1..72239758bb 100644 --- a/e2e/pages/portal/portal-login-page.ts +++ b/e2e/pages/portal/portal-login-page.ts @@ -2,13 +2,15 @@ import { type Locator, type Page } from '@playwright/test'; export class PortalLoginPage { readonly page: Page; + readonly baseUrl: string; readonly loginButton: Locator; readonly userIdTextbox: Locator; readonly passwordTextbox: Locator; readonly continueButton: Locator; - constructor(page: Page) { + constructor(page: Page, baseUrl: string) { this.page = page; + this.baseUrl = baseUrl; this.loginButton = page.getByRole('button', { name: 'Portal Login' }); // There is an error with the username label on BCeID page this.userIdTextbox = page.getByRole('textbox').nth(0); @@ -17,7 +19,7 @@ export class PortalLoginPage { } async goto() { - await this.page.goto('/'); + await this.page.goto(this.baseUrl); } async logIn(username: string, password: string) { From 39c3ab8d88d3c3be6b692b31197000b6f98371ff Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Thu, 2 May 2024 17:48:33 -0700 Subject: [PATCH 027/103] Fix portal login URL (for real this time) --- e2e/pages/portal-login-page.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/e2e/pages/portal-login-page.ts b/e2e/pages/portal-login-page.ts index 85210ab4d1..72239758bb 100644 --- a/e2e/pages/portal-login-page.ts +++ b/e2e/pages/portal-login-page.ts @@ -2,13 +2,15 @@ import { type Locator, type Page } from '@playwright/test'; export class PortalLoginPage { readonly page: Page; + readonly baseUrl: string; readonly loginButton: Locator; readonly userIdTextbox: Locator; readonly passwordTextbox: Locator; readonly continueButton: Locator; - constructor(page: Page) { + constructor(page: Page, baseUrl: string) { this.page = page; + this.baseUrl = baseUrl; this.loginButton = page.getByRole('button', { name: 'Portal Login' }); // There is an error with the username label on BCeID page this.userIdTextbox = page.getByRole('textbox').nth(0); @@ -17,7 +19,7 @@ export class PortalLoginPage { } async goto() { - await this.page.goto('/'); + await this.page.goto(this.baseUrl); } async logIn(username: string, password: string) { From ba20fb00c5ed9a7fe0e6236c71ed634cc4afedc4 Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Thu, 2 May 2024 17:50:44 -0700 Subject: [PATCH 028/103] Clean up comments --- e2e/pages/portal/optional-attachments-page.ts | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/e2e/pages/portal/optional-attachments-page.ts b/e2e/pages/portal/optional-attachments-page.ts index 4f20756ba1..fd7ba2c759 100644 --- a/e2e/pages/portal/optional-attachments-page.ts +++ b/e2e/pages/portal/optional-attachments-page.ts @@ -1,26 +1,5 @@ import { type Locator, type Page } from '@playwright/test'; -// // Step 7: Optional attachments -// // File upload first file -// const optionalFile1ChooserPromise = page.waitForEvent('filechooser'); -// await page.getByRole('button', { name: 'Choose file to Upload', exact: true }).click(); -// const optionalFile1Chooser = await optionalFile1ChooserPromise; -// optionalFile1Chooser.setFiles('data/temp.txt'); -// await page.getByPlaceholder('Select a type').nth(0).click(); -// await page.getByText('Professional Report').click(); -// await page.getByPlaceholder('Type description').nth(0).fill('Desc'); - -// // File upload second file -// const optionalFile2ChooserPromise = page.waitForEvent('filechooser'); -// await page.getByRole('button', { name: 'Choose file to Upload', exact: true }).click(); -// const optionalFile2Chooser = await optionalFile2ChooserPromise; -// optionalFile2Chooser.setFiles('data/temp.txt'); -// await page.getByPlaceholder('Select a type').nth(1).click(); -// await page.getByText('Site Photo').click(); -// await page.getByPlaceholder('Type description').nth(1).fill('Desc'); - -// await page.getByText('Review & Submit').click(); - export enum OptionalAttachmentType { SitePhoto = 'Site Photo', ProfessionalReport = 'Professional Report', From 2bef60b7c90c35f1d97fa7ece30898449e56207a Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Thu, 2 May 2024 17:52:08 -0700 Subject: [PATCH 029/103] Clean up old portal pages in wrong directory --- e2e/pages/inbox-page.ts | 53 ---------------------------------- e2e/pages/portal-login-page.ts | 31 -------------------- 2 files changed, 84 deletions(-) delete mode 100644 e2e/pages/inbox-page.ts delete mode 100644 e2e/pages/portal-login-page.ts diff --git a/e2e/pages/inbox-page.ts b/e2e/pages/inbox-page.ts deleted file mode 100644 index 35f273fe14..0000000000 --- a/e2e/pages/inbox-page.ts +++ /dev/null @@ -1,53 +0,0 @@ -import { expect, type Locator, type Page } from '@playwright/test'; - -export enum SubmissionType { - Application = 'Application', - NoticeOfIntent = 'Notice of Intent', - SRW = 'Notification of Statutory Right of Way (SRW)', -} - -export enum ApplicationType { - Inclusion = 'Include Land into the ALR', - NARU = 'Non-Adhering Residential Use within the ALR', - POFO = 'Placement of Fill within the ALR', - PFRS = 'Removal of Soil (Extraction) and Placement of Fill within the ALR', - ROSO = 'Removal of Soil (Extraction) within the ALR', - NFU = 'Non-Farm Uses within the ALR', - Subdivision = 'Subdivide Land in the ALR', - TUR = 'Transportation, Utility, or Recreational Trail Uses within the ALR', - Exclusion = 'Exclude Land from the ALR', - Covenant = 'Register a Restrictive Covenant within the ALR', -} - -export class InboxPage { - readonly page: Page; - readonly startCreateButton: Locator; - readonly nextButton: Locator; - readonly finishCreateButton: Locator; - readonly createNewDialog: Locator; - - constructor(page: Page) { - this.page = page; - this.startCreateButton = page.getByRole('button', { name: '+ Create New' }); - this.nextButton = page.getByRole('button', { name: 'Next' }); - this.finishCreateButton = page.getByRole('button', { name: 'create' }); - this.createNewDialog = page.getByRole('dialog', { name: 'Create New' }); - } - - async createApplication(type: ApplicationType) { - await this.startCreateButton.click(); - await this.setSubmissionType(SubmissionType.Application); - await this.nextButton.click(); - await this.setApplicationType(type); - await this.finishCreateButton.click(); - await expect(this.createNewDialog).toBeHidden(); - } - - async setSubmissionType(type: SubmissionType) { - await this.page.getByRole('radio', { name: type }).check(); - } - - async setApplicationType(type: ApplicationType) { - await this.page.getByRole('radio', { name: type }).click(); - } -} diff --git a/e2e/pages/portal-login-page.ts b/e2e/pages/portal-login-page.ts deleted file mode 100644 index 72239758bb..0000000000 --- a/e2e/pages/portal-login-page.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { type Locator, type Page } from '@playwright/test'; - -export class PortalLoginPage { - readonly page: Page; - readonly baseUrl: string; - readonly loginButton: Locator; - readonly userIdTextbox: Locator; - readonly passwordTextbox: Locator; - readonly continueButton: Locator; - - constructor(page: Page, baseUrl: string) { - this.page = page; - this.baseUrl = baseUrl; - this.loginButton = page.getByRole('button', { name: 'Portal Login' }); - // There is an error with the username label on BCeID page - this.userIdTextbox = page.getByRole('textbox').nth(0); - this.passwordTextbox = page.getByLabel('Password'); - this.continueButton = page.getByRole('button', { name: 'Continue' }); - } - - async goto() { - await this.page.goto(this.baseUrl); - } - - async logIn(username: string, password: string) { - await this.loginButton.click(); - await this.userIdTextbox.fill(username); - await this.passwordTextbox.fill(password); - await this.continueButton.click(); - } -} From b88683e7d3aae5df6753078dc52df953c83329cc Mon Sep 17 00:00:00 2001 From: Mekhti Date: Mon, 6 May 2024 09:19:57 -0700 Subject: [PATCH 030/103] tidy --- .../lfng_status_adjustment.py | 11 ++-- .../sql/oats_latest_lfng_status_back.sql | 38 ------------- .../sql/oats_latest_lfng_status_count.sql | 57 ++++++++++++++++--- 3 files changed, 54 insertions(+), 52 deletions(-) delete mode 100644 bin/migrate-oats-data/applications/lfng_status_adjustment/sql/oats_latest_lfng_status_back.sql diff --git a/bin/migrate-oats-data/applications/lfng_status_adjustment/lfng_status_adjustment.py b/bin/migrate-oats-data/applications/lfng_status_adjustment/lfng_status_adjustment.py index 7b42a538a7..ad45746d37 100644 --- a/bin/migrate-oats-data/applications/lfng_status_adjustment/lfng_status_adjustment.py +++ b/bin/migrate-oats-data/applications/lfng_status_adjustment/lfng_status_adjustment.py @@ -13,7 +13,7 @@ @inject_conn_pool def readjust_lfng_statuses(conn=None, batch_size=BATCH_UPLOAD_SIZE): """ - TODO copy description from JIRA + This function is responsible for resetting LFNG status on application to the final state from OATS. Args: conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator. @@ -56,7 +56,7 @@ def readjust_lfng_statuses(conn=None, batch_size=BATCH_UPLOAD_SIZE): break try: processed_applications_count = _process_statuses_for_update( - conn, batch_size, cursor, rows + conn, cursor, rows ) successful_updates_count = ( @@ -78,7 +78,7 @@ def readjust_lfng_statuses(conn=None, batch_size=BATCH_UPLOAD_SIZE): ) -def _process_statuses_for_update(conn, batch_size, cursor, rows): +def _process_statuses_for_update(conn, cursor, rows): update_statements = [] grouped_by_fn = [] @@ -98,7 +98,6 @@ def _process_statuses_for_update(conn, batch_size, cursor, rows): grouped_by_fn.append(row) combined_statements = "; ".join(update_statements) - # this is useful for debugging # logger.debug("combined_statements: %s", combined_statements) cursor.execute(combined_statements) conn.commit() @@ -154,10 +153,10 @@ def _compile_update_statement( """ if alcs_status: - logger.debug(f"reset {str_statuses_to_reset}") + # logger.debug(f"reset {str_statuses_to_reset}") return reset_statuses_query else: - logger.debug(f"{str_statuses_to_reset} and set {alcs_target_status}") + # logger.debug(f"{str_statuses_to_reset} and set {alcs_target_status}") date = add_timezone_and_keep_date_part(oats_status["completion_date"]) return f""" {reset_statuses_query} diff --git a/bin/migrate-oats-data/applications/lfng_status_adjustment/sql/oats_latest_lfng_status_back.sql b/bin/migrate-oats-data/applications/lfng_status_adjustment/sql/oats_latest_lfng_status_back.sql deleted file mode 100644 index 5f2ca65b49..0000000000 --- a/bin/migrate-oats-data/applications/lfng_status_adjustment/sql/oats_latest_lfng_status_back.sql +++ /dev/null @@ -1,38 +0,0 @@ - -WITH submitted_under_review AS ( - SELECT astss.submission_uuid AS initial_sub_uuid FROM alcs.application_submission_to_submission_status astss - JOIN alcs.application_submission as2 ON as2."uuid" = astss.submission_uuid AND as2.audit_created_by='oats_etl' AND as2.audit_updated_by IS NULL - WHERE astss.effective_date IS NOT NULL AND astss.status_type_code IN ('SUBG', 'REVG') - GROUP BY astss.submission_uuid -) -, returned_incomplete_refused AS ( - SELECT as2.file_number, string_agg(astss.status_type_code, ', ') - FROM submitted_under_review sur - JOIN alcs.application_submission_to_submission_status astss ON astss.submission_uuid = sur.initial_sub_uuid - JOIN alcs.application_submission as2 ON as2.uuid = astss.submission_uuid - WHERE astss.effective_date IS NOT NULL AND astss.status_type_code IN ('WRNG', 'INCM', 'RFFG', 'SUBG', 'REVG') - GROUP BY as2.file_number -) -, oats_accomplishments AS ( - SELECT rir.*, oaac.* FROM oats.oats_accomplishments oaac - JOIN returned_incomplete_refused AS rir ON rir.file_number::bigint = oaac.alr_application_id - WHERE oaac.accomplishment_code IN ('LRF', 'SLG', 'WLG', 'ULG', 'LGI') -) --- ranked_statuses will select the latest status based on max completion_date, then when_updated, then when_created for all records per file_number -, ranked_statuses AS ( - SELECT *, - ROW_NUMBER() OVER (PARTITION BY file_number ORDER BY COALESCE(completion_date, '0001-01-01') DESC, COALESCE(when_updated, '0001-01-01') DESC, COALESCE(when_created, '0001-01-01') DESC) AS rn - FROM oats_accomplishments -) -, latest_oats_lfng_status AS ( - SELECT alr_application_id, accomplishment_code, completion_date, when_created, when_updated, revision_count FROM ranked_statuses - WHERE rn = 1 - ORDER BY file_number::bigint -) -SELECT as2.uuid, lols.alr_application_id, accomplishment_code, lols.completion_date, when_created, when_updated, astss.status_type_code, astss.effective_date, asst.weight -FROM alcs.application_submission_to_submission_status astss -JOIN alcs.application_submission as2 ON as2.uuid = astss.submission_uuid -JOIN alcs.application_submission_status_type asst ON asst.code = astss.status_type_code -JOIN latest_oats_lfng_status lols ON lols.alr_application_id = as2.file_number::bigint -WHERE astss.effective_date IS NOT NULL AND astss.status_type_code IN ('WRNG', 'INCM', 'RFFG', 'SUBG', 'REVG') -ORDER BY lols.alr_application_id \ No newline at end of file diff --git a/bin/migrate-oats-data/applications/lfng_status_adjustment/sql/oats_latest_lfng_status_count.sql b/bin/migrate-oats-data/applications/lfng_status_adjustment/sql/oats_latest_lfng_status_count.sql index d004f511ff..e9a328918d 100644 --- a/bin/migrate-oats-data/applications/lfng_status_adjustment/sql/oats_latest_lfng_status_count.sql +++ b/bin/migrate-oats-data/applications/lfng_status_adjustment/sql/oats_latest_lfng_status_count.sql @@ -1,5 +1,45 @@ --- select latest OATS government status -WITH submitted_under_review AS ( +WITH when_updated_grouped AS ( + SELECT + a.when_updated, + a.alr_application_id, + a.accomplishment_code, + COUNT(*) OVER (PARTITION BY a.when_updated, a.alr_application_id) as cnt + FROM + oats.oats_accomplishments a + WHERE a.when_updated IS NOT NULL +), when_updated_with_status AS ( + SELECT + when_updated, + alr_application_id, + accomplishment_code, + cnt + FROM + when_updated_grouped + WHERE + cnt > 1 +), completion_grouped AS ( + SELECT + wuws.when_updated, + wuws.alr_application_id, + wuws.accomplishment_code, + COUNT(*) OVER (PARTITION BY oa.completion_date, wuws.alr_application_id) as cnt + FROM + when_updated_with_status wuws + JOIN oats.oats_accomplishments oa ON oa.alr_application_id = wuws.alr_application_id AND oa.accomplishment_code = wuws.accomplishment_code + WHERE oa.completion_date IS NOT NULL +), completion_with_status AS ( + SELECT + when_updated, + alr_application_id, + accomplishment_code, + cnt + FROM + completion_grouped + WHERE + cnt > 1 +), +alr_applications_to_exclude AS ( SELECT alr_application_id FROM completion_with_status) +, submitted_under_review AS ( SELECT astss.submission_uuid AS initial_sub_uuid FROM alcs.application_submission_to_submission_status astss JOIN alcs.application_submission as2 ON as2."uuid" = astss.submission_uuid AND as2.audit_created_by='oats_etl' AND as2.audit_updated_by IS NULL WHERE astss.effective_date IS NOT NULL AND astss.status_type_code IN ('SUBG', 'REVG') @@ -18,15 +58,16 @@ WITH submitted_under_review AS ( JOIN returned_incomplete_refused AS rir ON rir.file_number::bigint = oaac.alr_application_id WHERE oaac.accomplishment_code IN ('LRF', 'SLG', 'WLG', 'ULG', 'LGI') ) --- ranked_statuses will select the latest status based on max between when_created or when_updated for all records per file_number +-- ranked_statuses will select the latest status based on max completion_date, then when_updated, then when_created for all records per file_number , ranked_statuses AS ( - SELECT *, GREATEST(COALESCE(when_created, '0001-01-01'), COALESCE(when_updated, '0001-01-01')) AS max_date, ROW_NUMBER() OVER (PARTITION BY file_number ORDER BY GREATEST(COALESCE(when_created, '0001-01-01'), COALESCE(when_updated, '0001-01-01')) DESC) AS rn + SELECT *, + ROW_NUMBER() OVER (PARTITION BY file_number ORDER BY COALESCE(completion_date, '0001-01-01') DESC, COALESCE(when_updated, '0001-01-01') DESC, COALESCE(when_created, '0001-01-01') DESC) AS rn FROM oats_accomplishments ) , latest_oats_lfng_status AS ( - SELECT * FROM ranked_statuses - WHERE - rn = 1 + SELECT alr_application_id, accomplishment_code, completion_date, when_created, when_updated, revision_count FROM ranked_statuses + WHERE rn = 1 ORDER BY file_number::bigint ) -SELECT count(*) FROM latest_oats_lfng_status +SELECT count(*) +FROM latest_oats_lfng_status; From 5fff3a3e55b94c8ce937ed4341360805392c96b4 Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Mon, 6 May 2024 13:51:38 -0700 Subject: [PATCH 031/103] Check submission status after submitted Check application status changes to 'Submitted to ALC' after being submitted. --- e2e/pages/portal/submission-success-page.ts | 28 +++++++++++++++++++ e2e/tests/tur.spec.ts | 6 ++-- ...view-application-submission.component.html | 2 +- 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/e2e/pages/portal/submission-success-page.ts b/e2e/pages/portal/submission-success-page.ts index 378ce1143a..70354874f1 100644 --- a/e2e/pages/portal/submission-success-page.ts +++ b/e2e/pages/portal/submission-success-page.ts @@ -1,12 +1,32 @@ import { expect, type Locator, type Page } from '@playwright/test'; +export enum ApplicationStatus { + UnderReviewByALC = 'Under Review by ALC', + ReceivedByALC = 'Received By ALC', + SubmittedToALCIncomplete = 'Submitted to ALC - Incomplete', + SubmittedToALC = 'Submitted to ALC', + UnderReviewByLFNG = 'Under Review by L/FNG', + SubmittedToLFNG = 'Submitted to L/FNG', + InProgress = 'In Progress', + LFNGReturnedAsIncomplete = 'L/FNG Returned as Incomplete', + WrongLFNG = 'Wrong L/FNG', + ALCReturnedToLFNG = 'ALC Returned to L/FNG', + Cancelled = 'Cancelled', + LFNGRefusedToForward = 'L/FNG Refused to Forward', + DecisionReleased = 'Decision Released', +} + export class SubmissionSuccessPage { readonly page: Page; readonly heading: Locator; + readonly viewSubmissionButton: Locator; + readonly applicationStatusText: Locator; constructor(page: Page) { this.page = page; this.heading = page.getByRole('heading', { name: 'Application ID' }); + this.viewSubmissionButton = page.getByRole('button', { name: 'view submission' }); + this.applicationStatusText = page.getByTestId('application-status'); } async fileId(): Promise { @@ -23,4 +43,12 @@ export class SubmissionSuccessPage { // Should never return empty string, but necessary to appease TypeScript return fileId; } + + async viewSubmission() { + await this.viewSubmissionButton.click(); + } + + async expectApplicationStatus(status: ApplicationStatus) { + await expect(this.applicationStatusText).toHaveText(status); + } } diff --git a/e2e/tests/tur.spec.ts b/e2e/tests/tur.spec.ts index df25b39b47..30ff74ad95 100644 --- a/e2e/tests/tur.spec.ts +++ b/e2e/tests/tur.spec.ts @@ -10,7 +10,7 @@ import { Direction, LandUsePage, LandUseType } from '../pages/portal/land-use-pa import { TURProposalPage } from '../pages/portal/tur-proposal-page'; import { OptionalAttachmentType, OptionalAttachmentsPage } from '../pages/portal/optional-attachments-page'; import { ReviewAndSubmitPage } from '../pages/portal/review-and-submit-page/review-and-submit-page'; -import { SubmissionSuccessPage } from '../pages/portal/submission-success-page'; +import { ApplicationStatus, SubmissionSuccessPage } from '../pages/portal/submission-success-page'; import { ALCSLoginPage } from '../pages/alcs/alcs-login-page'; import { ALCSHomePage } from '../pages/alcs/home-page'; import { ALCSDetailsNavigation } from '../pages/alcs/details-navigation'; @@ -50,8 +50,8 @@ test.describe.serial('Portal TUR submission and ALCS applicant info flow', () => ], }, ]; - const otherParcelsDescription = 'Other parcels description'; const hasOtherParcels = true; + const otherParcelsDescription = 'Other parcels description'; const primaryContactType = PrimaryContactType.ThirdParty; const thirdPartPrimaryContact = { firstName: 'Person', @@ -183,6 +183,8 @@ test.describe.serial('Portal TUR submission and ALCS applicant info flow', () => const submissionSuccessPage = new SubmissionSuccessPage(page); submittedFileId = await submissionSuccessPage.fileId(); + await submissionSuccessPage.viewSubmission(); + await submissionSuccessPage.expectApplicationStatus(ApplicationStatus.SubmittedToALC); }); test('submission data should appear in ALCS applicant info', async ({ page }) => { diff --git a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html index 40fa941cf2..052186e600 100644 --- a/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html +++ b/portal-frontend/src/app/features/applications/view-submission/view-application-submission.component.html @@ -9,7 +9,7 @@

Application ID: {{ application.fileNumber }} | {{ applic

Application Status
- {{ application.status.label }} + {{ application.status.label }}
From dc9036afc4f4b65f1b1238beced8ac0d2d043c3b Mon Sep 17 00:00:00 2001 From: Mekhti Date: Mon, 6 May 2024 15:13:35 -0700 Subject: [PATCH 032/103] new requirement to exclude submission where no LFNG review or it was updated --- .../lfng_status_adjustment/sql/oats_latest_lfng_status.sql | 3 ++- .../sql/oats_latest_lfng_status_count.sql | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/migrate-oats-data/applications/lfng_status_adjustment/sql/oats_latest_lfng_status.sql b/bin/migrate-oats-data/applications/lfng_status_adjustment/sql/oats_latest_lfng_status.sql index fb05be4ad7..f7701ddc05 100644 --- a/bin/migrate-oats-data/applications/lfng_status_adjustment/sql/oats_latest_lfng_status.sql +++ b/bin/migrate-oats-data/applications/lfng_status_adjustment/sql/oats_latest_lfng_status.sql @@ -42,7 +42,8 @@ alr_applications_to_exclude AS ( SELECT alr_application_id FROM completion_with_ , submitted_under_review AS ( SELECT astss.submission_uuid AS initial_sub_uuid FROM alcs.application_submission_to_submission_status astss JOIN alcs.application_submission as2 ON as2."uuid" = astss.submission_uuid AND as2.audit_created_by='oats_etl' AND as2.audit_updated_by IS NULL - WHERE astss.effective_date IS NOT NULL AND astss.status_type_code IN ('SUBG', 'REVG') + LEFT JOIN alcs.application_submission_review asr ON asr.application_file_number = as2.file_number + WHERE astss.effective_date IS NOT NULL AND astss.status_type_code IN ('SUBG', 'REVG') AND ( asr.uuid IS NULL OR asr.audit_created_by='oats_etl' AND asr.audit_updated_by IS NULL) GROUP BY astss.submission_uuid ) , returned_incomplete_refused AS ( diff --git a/bin/migrate-oats-data/applications/lfng_status_adjustment/sql/oats_latest_lfng_status_count.sql b/bin/migrate-oats-data/applications/lfng_status_adjustment/sql/oats_latest_lfng_status_count.sql index e9a328918d..b55cf45817 100644 --- a/bin/migrate-oats-data/applications/lfng_status_adjustment/sql/oats_latest_lfng_status_count.sql +++ b/bin/migrate-oats-data/applications/lfng_status_adjustment/sql/oats_latest_lfng_status_count.sql @@ -42,7 +42,8 @@ alr_applications_to_exclude AS ( SELECT alr_application_id FROM completion_with_ , submitted_under_review AS ( SELECT astss.submission_uuid AS initial_sub_uuid FROM alcs.application_submission_to_submission_status astss JOIN alcs.application_submission as2 ON as2."uuid" = astss.submission_uuid AND as2.audit_created_by='oats_etl' AND as2.audit_updated_by IS NULL - WHERE astss.effective_date IS NOT NULL AND astss.status_type_code IN ('SUBG', 'REVG') + LEFT JOIN alcs.application_submission_review asr ON asr.application_file_number = as2.file_number + WHERE astss.effective_date IS NOT NULL AND astss.status_type_code IN ('SUBG', 'REVG') AND ( asr.uuid IS NULL OR asr.audit_created_by='oats_etl' AND asr.audit_updated_by IS NULL) GROUP BY astss.submission_uuid ) , returned_incomplete_refused AS ( From 3f721cf70f6a866d23526f31360cd8a3436603ac Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Mon, 6 May 2024 15:35:26 -0700 Subject: [PATCH 033/103] Check submission PDF in ALCS documents table --- .../application/application.component.html | 2 +- e2e/pages/alcs/details-navigation.ts | 10 +++++++++- e2e/pages/alcs/documents-page.ts | 19 +++++++++++++++++++ e2e/tests/tur.spec.ts | 6 ++++++ 4 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 e2e/pages/alcs/documents-page.ts diff --git a/alcs-frontend/src/app/features/application/application.component.html b/alcs-frontend/src/app/features/application/application.component.html index 82ccfb9d5c..b2f12fbb41 100644 --- a/alcs-frontend/src/app/features/application/application.component.html +++ b/alcs-frontend/src/app/features/application/application.component.html @@ -11,7 +11,7 @@ >
-
+
diff --git a/e2e/pages/alcs/board-page.ts b/e2e/pages/alcs/board-page.ts new file mode 100644 index 0000000000..32ba5ae8bb --- /dev/null +++ b/e2e/pages/alcs/board-page.ts @@ -0,0 +1,15 @@ +import { expect, type Locator, type Page } from '@playwright/test'; + +export class ALCSBoardPage { + readonly page: Page; + readonly cards: Locator; + + constructor(page: Page) { + this.page = page; + this.cards = page.getByTestId('card'); + } + + async expectCard(fileId: string) { + await expect(this.cards.filter({ hasText: fileId })).toBeVisible(); + } +} diff --git a/e2e/pages/alcs/main-navigation.ts b/e2e/pages/alcs/main-navigation.ts new file mode 100644 index 0000000000..019ee913f7 --- /dev/null +++ b/e2e/pages/alcs/main-navigation.ts @@ -0,0 +1,20 @@ +import { type Locator, type Page } from '@playwright/test'; + +export class ALCSMainNavigation { + readonly page: Page; + readonly boardsLink: Locator; + + constructor(page: Page) { + this.page = page; + this.boardsLink = page.getByRole('button', { name: 'Boards' }); + } + + async gotoBoardPage(board: string) { + await this.boardsLink.click(); + await this.boardLink(board).click(); + } + + boardLink(board: string): Locator { + return this.page.getByRole('menu').getByText(board); + } +} diff --git a/e2e/tests/tur.spec.ts b/e2e/tests/tur.spec.ts index 6bd3495707..27ac46662b 100644 --- a/e2e/tests/tur.spec.ts +++ b/e2e/tests/tur.spec.ts @@ -16,6 +16,8 @@ import { ALCSHomePage } from '../pages/alcs/home-page'; import { ALCSDetailsNavigation } from '../pages/alcs/details-navigation'; import { ALCSApplicantInfoPage } from '../pages/alcs/applicant-info-page/applicant-info-page'; import { ALCSDocumentsPage } from '../pages/alcs/documents-page'; +import { ALCSMainNavigation } from '../pages/alcs/main-navigation'; +import { ALCSBoardPage } from '../pages/alcs/board-page'; test.describe.serial('Portal TUR submission and ALCS applicant info flow', () => { const parcels = [ @@ -193,6 +195,8 @@ test.describe.serial('Portal TUR submission and ALCS applicant info flow', () => await alcsLoginPage.goto(); await alcsLoginPage.login(process.env.IDIR_USERNAME, process.env.IDIR_PASSWORD); + const alcsMainNavidation = new ALCSMainNavigation(page); + const alcsHomePage = new ALCSHomePage(page); await alcsHomePage.search(submittedFileId); @@ -213,5 +217,10 @@ test.describe.serial('Portal TUR submission and ALCS applicant info flow', () => const alcsDocumentsPage = new ALCSDocumentsPage(page); await alcsDocumentsPage.expectSubmissionOriginalPdfInTable(submittedFileId); + + await alcsMainNavidation.gotoBoardPage('Vetting'); + + const vettingBoardPage = new ALCSBoardPage(page); + await vettingBoardPage.expectCard(submittedFileId); }); }); From 1bc399d4f584091d61cc92423b6eb585cf2102d7 Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Mon, 6 May 2024 15:55:10 -0700 Subject: [PATCH 035/103] Remove unused import --- e2e/pages/alcs/applicant-info-page/applicant-info-page.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/pages/alcs/applicant-info-page/applicant-info-page.ts b/e2e/pages/alcs/applicant-info-page/applicant-info-page.ts index f63373670c..5dd9147117 100644 --- a/e2e/pages/alcs/applicant-info-page/applicant-info-page.ts +++ b/e2e/pages/alcs/applicant-info-page/applicant-info-page.ts @@ -1,4 +1,4 @@ -import { type Locator, type Page } from '@playwright/test'; +import { type Page } from '@playwright/test'; import { ParcelsSection } from './parcels-section'; import { PrimaryContactSection } from './primary-contact-section'; import { OtherOwnedParcelsSection } from './other-owned-parcels-section'; From 84d961d054117a473ce9e68f4c5f3ff31f176e01 Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Mon, 6 May 2024 15:57:26 -0700 Subject: [PATCH 036/103] Add known issues --- e2e/README.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/e2e/README.md b/e2e/README.md index 86f069031d..06bebfe6d1 100644 --- a/e2e/README.md +++ b/e2e/README.md @@ -4,7 +4,8 @@ - [Running Tests](#running-tests) - [Local Setup](#local-setup) - [Installation](#installation) - - [Configure secrets](#configure-secrets) + - [Configure Secrets](#configure-secrets) +- [Known Issues](#known-issues) E2E test automation is implemented using the [Playwright](https://playwright.dev/). @@ -81,7 +82,12 @@ Install browsers: $ npx playwright install ``` -### Configure secrets +### Configure Secrets 1. Copy `template.env` --> `.env` 2. Fill in details + +## Known Issues + +- When signed in, navigation via URL always redirects to login page +- Parcel entry step UI is not fully functional, stick to single parcel for now From 996071796970dc09f722753607469b20b2f04737 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Mon, 6 May 2024 11:41:48 -0700 Subject: [PATCH 037/103] Update ALCS Advanced Search * Use new architecture of querying multiple times * Add stack traces to error logs --- ...pplication-advanced-search.service.spec.ts | 85 +-- .../application-advanced-search.service.ts | 527 +++++++++++------- .../application-search-view.entity.ts | 36 +- .../inquiry-advanced-search.service.spec.ts | 76 +-- .../inquiry-advanced-search.service.ts | 356 +++++++----- .../inquiry/inquiry-search-view.entity.ts | 8 - ...-of-intent-advanced-search.service.spec.ts | 98 ++-- ...otice-of-intent-advanced-search.service.ts | 504 ++++++++++------- ...tification-advanced-search.service.spec.ts | 86 ++- .../notification-advanced-search.service.ts | 389 ++++++++----- ...ing-review-advanced-search.service.spec.ts | 71 ++- ...planning-review-advanced-search.service.ts | 345 ++++++++---- .../src/alcs/search/search.controller.spec.ts | 9 +- .../alcs/src/alcs/search/search.controller.ts | 48 +- .../alcs/src/alcs/search/search.module.ts | 16 +- services/apps/alcs/src/main.ts | 16 +- .../public-application-search.service.spec.ts | 10 +- .../public-application-search.service.ts | 46 +- ...1715021195773-refresh_alcs_search_views.ts | 83 +++ services/apps/alcs/test/mocks/mockTypes.ts | 2 + .../common/src/exceptions/exception.filter.ts | 2 +- 21 files changed, 1740 insertions(+), 1073 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1715021195773-refresh_alcs_search_views.ts diff --git a/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.spec.ts b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.spec.ts index 00c8e75046..2333a17123 100644 --- a/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.spec.ts +++ b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.spec.ts @@ -1,7 +1,11 @@ +import { RedisService } from '@app/common/redis/redis.service'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { QueryRunner, Repository } from 'typeorm'; +import { createMockQuery } from '../../../../test/mocks/mockTypes'; +import { ApplicationSubmission } from '../../../portal/application-submission/application-submission.entity'; +import { Application } from '../../application/application.entity'; import { LocalGovernment } from '../../local-government/local-government.entity'; import { SearchRequestDto } from '../search.dto'; import { ApplicationAdvancedSearchService } from './application-advanced-search.service'; @@ -13,6 +17,10 @@ describe('ApplicationAdvancedSearchService', () => { Repository >; let mockLocalGovernmentRepository: DeepMocked>; + let mockAppRepo: DeepMocked>; + let mockAppSubmissionRepo: DeepMocked>; + let mockRedisService: DeepMocked; + const sortFields = [ 'fileId', 'type', @@ -48,21 +56,10 @@ describe('ApplicationAdvancedSearchService', () => { beforeEach(async () => { mockApplicationSubmissionSearchViewRepository = createMock(); mockLocalGovernmentRepository = createMock(); - - mockQuery = { - getMany: jest.fn().mockResolvedValue([]), - getCount: jest.fn().mockResolvedValue(0), - orderBy: jest.fn().mockReturnThis(), - offset: jest.fn().mockReturnThis(), - limit: jest.fn().mockReturnThis(), - innerJoinAndMapOne: jest.fn().mockReturnThis(), - groupBy: jest.fn().mockReturnThis(), - where: jest.fn().mockReturnThis(), - andWhere: jest.fn().mockReturnThis(), - setParameters: jest.fn().mockReturnThis(), - leftJoin: jest.fn().mockReturnThis(), - withDeleted: jest.fn().mockReturnThis(), - }; + mockAppRepo = createMock(); + mockAppSubmissionRepo = createMock(); + mockRedisService = createMock(); + mockQuery = createMockQuery(); const module: TestingModule = await Test.createTestingModule({ providers: [ @@ -75,6 +72,18 @@ describe('ApplicationAdvancedSearchService', () => { provide: getRepositoryToken(LocalGovernment), useValue: mockLocalGovernmentRepository, }, + { + provide: getRepositoryToken(Application), + useValue: mockAppRepo, + }, + { + provide: getRepositoryToken(ApplicationSubmission), + useValue: mockAppSubmissionRepo, + }, + { + provide: RedisService, + useValue: mockRedisService, + }, ], }).compile(); @@ -85,6 +94,15 @@ describe('ApplicationAdvancedSearchService', () => { mockLocalGovernmentRepository.findOneByOrFail.mockResolvedValue( new LocalGovernment(), ); + + mockApplicationSubmissionSearchViewRepository.createQueryBuilder.mockReturnValue( + mockQuery as any, + ); + + mockRedisService.getClient.mockReturnValue({ + get: async () => null, + setEx: async () => null, + } as any); }); it('should be defined', () => { @@ -92,9 +110,10 @@ describe('ApplicationAdvancedSearchService', () => { }); it('should successfully build a query using all search parameters defined', async () => { - mockApplicationSubmissionSearchViewRepository.createQueryBuilder.mockReturnValue( - mockQuery as any, - ); + mockAppRepo.find.mockResolvedValue([]); + mockAppRepo.createQueryBuilder.mockReturnValue(mockQuery); + mockAppSubmissionRepo.find.mockResolvedValue([]); + mockAppSubmissionRepo.createQueryBuilder.mockReturnValue(mockQuery); const mockQueryRunner = createMock(); @@ -104,17 +123,17 @@ describe('ApplicationAdvancedSearchService', () => { ); expect(result).toEqual({ data: [], total: 0 }); - expect( - mockApplicationSubmissionSearchViewRepository.createQueryBuilder, - ).toHaveBeenCalledTimes(1); - expect(mockQuery.andWhere).toHaveBeenCalledTimes(15); - expect(mockQuery.where).toHaveBeenCalledTimes(1); + expect(mockAppRepo.find).toHaveBeenCalledTimes(4); + expect(mockAppRepo.createQueryBuilder).toHaveBeenCalledTimes(4); + expect(mockAppSubmissionRepo.createQueryBuilder).toHaveBeenCalledTimes(3); + expect(mockQuery.andWhere).toHaveBeenCalledTimes(9); + expect(mockQuery.where).toHaveBeenCalledTimes(2); }); it('should call compileApplicationSearchQuery method correctly', async () => { - const compileApplicationSearchQuerySpy = jest - .spyOn(service as any, 'compileApplicationSearchQuery') - .mockResolvedValue(mockQuery); + const searchForFileNumbersSpy = jest + .spyOn(service as any, 'searchForFileNumbers') + .mockResolvedValue(new Set(['100000'])); const mockQueryRunner = createMock(); @@ -124,10 +143,7 @@ describe('ApplicationAdvancedSearchService', () => { ); expect(result).toEqual({ data: [], total: 0 }); - expect(compileApplicationSearchQuerySpy).toHaveBeenCalledWith( - mockSearchRequestDto, - {}, - ); + expect(searchForFileNumbersSpy).toHaveBeenCalledWith(mockSearchRequestDto); expect(mockQuery.orderBy).toHaveBeenCalledTimes(1); expect(mockQuery.offset).toHaveBeenCalledTimes(1); expect(mockQuery.limit).toHaveBeenCalledTimes(1); @@ -137,9 +153,9 @@ describe('ApplicationAdvancedSearchService', () => { it(`should sort by ${sortField}`, async () => { const mockQueryRunner = createMock(); - const compileApplicationSearchQuerySpy = jest - .spyOn(service as any, 'compileApplicationSearchQuery') - .mockResolvedValue(mockQuery); + const searchForFileNumbersSpy = jest + .spyOn(service as any, 'searchForFileNumbers') + .mockResolvedValue(new Set(['100000'])); mockSearchRequestDto.sortField = sortField; mockSearchRequestDto.sortDirection = 'DESC'; @@ -150,9 +166,8 @@ describe('ApplicationAdvancedSearchService', () => { ); expect(result).toEqual({ data: [], total: 0 }); - expect(compileApplicationSearchQuerySpy).toHaveBeenCalledWith( + expect(searchForFileNumbersSpy).toHaveBeenCalledWith( mockSearchRequestDto, - {}, ); expect(mockQuery.orderBy).toHaveBeenCalledTimes(1); expect(mockQuery.offset).toHaveBeenCalledTimes(1); diff --git a/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts index 464c247373..61f0e1d489 100644 --- a/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts @@ -1,38 +1,75 @@ -import { Injectable } from '@nestjs/common'; +import { RedisService } from '@app/common/redis/redis.service'; +import { Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; -import { Brackets, QueryRunner, Repository, SelectQueryBuilder } from 'typeorm'; +import * as hash from 'object-hash'; +import { Brackets, QueryRunner, Repository } from 'typeorm'; import { ApplicationOwner } from '../../../portal/application-submission/application-owner/application-owner.entity'; import { ApplicationParcel } from '../../../portal/application-submission/application-parcel/application-parcel.entity'; +import { ApplicationSubmission } from '../../../portal/application-submission/application-submission.entity'; import { getNextDayToPacific, getStartOfDayToPacific, } from '../../../utils/pacific-date-time-helper'; import { formatStringToPostgresSearchStringArrayWithWildCard } from '../../../utils/search-helper'; +import { intersectSets } from '../../../utils/set-helper'; import { ApplicationDecisionComponent } from '../../application-decision/application-decision-v2/application-decision/component/application-decision-component.entity'; import { ApplicationDecision } from '../../application-decision/application-decision.entity'; +import { Application } from '../../application/application.entity'; import { LocalGovernment } from '../../local-government/local-government.entity'; import { AdvancedSearchResultDto, SearchRequestDto } from '../search.dto'; import { ApplicationSubmissionSearchView } from './application-search-view.entity'; @Injectable() export class ApplicationAdvancedSearchService { + private logger: Logger = new Logger(ApplicationAdvancedSearchService.name); + constructor( @InjectRepository(ApplicationSubmissionSearchView) private applicationSearchRepository: Repository, + @InjectRepository(ApplicationSubmission) + private applicationSubmissionRepository: Repository, + @InjectRepository(Application) + private applicationRepository: Repository, @InjectRepository(LocalGovernment) private governmentRepository: Repository, + private redisService: RedisService, ) {} async searchApplications( searchDto: SearchRequestDto, queryRunner: QueryRunner, ): Promise> { + const searchHash = hash(searchDto); + const searchKey = `search_alcs_application_${searchHash}`; + + const client = this.redisService.getClient(); + const cachedSearch = await client.get(searchKey); + + let fileNumbers = new Set(); + if (cachedSearch) { + const cachedNumbers = JSON.parse(cachedSearch) as string[]; + fileNumbers = new Set(cachedNumbers); + } else { + fileNumbers = await this.searchForFileNumbers(searchDto); + await client.setEx( + searchKey, + 180, //Seconds + JSON.stringify([...fileNumbers.values()]), + ); + } + + if (fileNumbers.size === 0) { + return { + data: [], + total: 0, + }; + } + let query = this.applicationSearchRepository .createQueryBuilder('appSearch', queryRunner) - .where('appSearch.is_draft = false'); - - query = await this.compileApplicationSearchQuery(searchDto, query); - query = this.compileApplicationGroupBySearchQuery(query); + .andWhere('appSearch.fileNumber IN(:...fileNumbers)', { + fileNumbers: [...fileNumbers.values()], + }); const sortQuery = this.compileSortQuery(searchDto); @@ -45,7 +82,10 @@ export class ApplicationAdvancedSearchService { .offset((searchDto.page - 1) * searchDto.pageSize) .limit(searchDto.pageSize); + const t0 = performance.now(); const results = await Promise.all([query.getMany(), query.getCount()]); + const t1 = performance.now(); + this.logger.debug(`ALCS Application search took ${t1 - t0} milliseconds.`); return { data: results[0], @@ -76,275 +116,330 @@ export class ApplicationAdvancedSearchService { } } - private compileApplicationGroupBySearchQuery(query) { - query = query - // FIXME: This is a quick fix for the search performance issues. It temporarily allows - // submissions with deleted submission types to be shown. For now, there are no - // deleted submission types, so this should be fine, but should be fixed soon. - .withDeleted() - .groupBy( - ` - "appSearch"."uuid" - , "appSearch"."application_uuid" - , "appSearch"."application_region_code" - , "appSearch"."file_number" - , "appSearch"."applicant" - , "appSearch"."local_government_uuid" - , "appSearch"."local_government_name" - , "appSearch"."application_type_code" - , "appSearch"."legacy_id" - , "appSearch"."status" - , "appSearch"."date_submitted_to_alc" - , "appSearch"."decision_date" - , "appSearch"."is_draft" - `, - ); - return query; - } + private async searchForFileNumbers(searchDto: SearchRequestDto) { + const promises: Promise<{ fileNumber: string }[]>[] = []; - private async compileApplicationSearchQuery( - searchDto: SearchRequestDto, - query: SelectQueryBuilder, - ) { if (searchDto.fileNumber) { - query = query - .andWhere('appSearch.file_number = :fileNumber') - .setParameters({ fileNumber: searchDto.fileNumber ?? null }); + this.addFileNumberResults(searchDto, promises); } if (searchDto.legacyId) { - query = query.andWhere('appSearch.legacy_id = :legacyId', { - legacyId: searchDto.legacyId, - }); + this.addLegacyIDResults(searchDto, promises); } if (searchDto.portalStatusCode) { - query = query.andWhere( - "alcs.get_current_status_for_application_submission_by_uuid(appSearch.uuid) ->> 'status_type_code' = :status", - { - status: searchDto.portalStatusCode, - }, - ); + this.addPortalStatusResults(searchDto, promises); } if (searchDto.governmentName) { - const government = await this.governmentRepository.findOneByOrFail({ - name: searchDto.governmentName, - }); - - query = query.andWhere( - 'appSearch.local_government_uuid = :local_government_uuid', - { - local_government_uuid: government.uuid, - }, - ); + await this.addGovernmentResults(searchDto, promises); } if (searchDto.regionCode) { - query = query.andWhere( - 'appSearch.application_region_code = :application_region_code', - { - application_region_code: searchDto.regionCode, - }, - ); + this.addRegionResults(searchDto, promises); } - query = this.compileApplicationSearchByNameQuery(searchDto, query); - query = this.compileApplicationParcelSearchQuery(searchDto, query); - query = this.compileApplicationDecisionSearchQuery(searchDto, query); - query = this.compileApplicationFileTypeSearchQuery(searchDto, query); - query = this.compileApplicationDateRangeSearchQuery(searchDto, query); + if (searchDto.name) { + this.addNameResults(searchDto, promises); + } - return query; - } + if (searchDto.pid || searchDto.civicAddress) { + this.addParcelResults(searchDto, promises); + } - private compileApplicationDateRangeSearchQuery( - searchDto: SearchRequestDto, - query: SelectQueryBuilder, - ) { - if (searchDto.dateSubmittedFrom) { - query = query.andWhere( - 'appSearch.date_submitted_to_alc >= :date_submitted_from_alc', - { - date_submitted_from_alc: getStartOfDayToPacific( - searchDto.dateSubmittedFrom, - ).toISOString(), - }, - ); + if (searchDto.resolutionNumber || searchDto.resolutionYear) { + this.addDecisionResolutionResults(searchDto, promises); } - if (searchDto.dateSubmittedTo) { - query = query.andWhere( - 'appSearch.date_submitted_to_alc < :date_submitted_to_alc', - { - date_submitted_to_alc: getNextDayToPacific( - searchDto.dateSubmittedTo, - ).toISOString(), - }, - ); + if (searchDto.fileTypes.length > 0) { + this.addFileTypeResults(searchDto, promises); } - if (searchDto.dateDecidedFrom) { - query = query.andWhere('appSearch.decision_date >= :decision_date', { - decision_date: getStartOfDayToPacific( - searchDto.dateDecidedFrom, - ).toISOString(), - }); + if (searchDto.dateSubmittedTo || searchDto.dateSubmittedFrom) { + this.addSubmittedDateResults(searchDto, promises); } - if (searchDto.dateDecidedTo) { - query = query.andWhere('appSearch.decision_date < :decision_date_to', { - decision_date_to: getNextDayToPacific( - searchDto.dateDecidedTo, - ).toISOString(), + if (searchDto.dateDecidedFrom || searchDto.dateDecidedTo) { + this.addDecisionDateResults(searchDto, promises); + } + + //Intersect Sets + const t0 = performance.now(); + const queryResults = await Promise.all(promises); + + const allIds: Set[] = []; + for (const result of queryResults) { + const fileNumbers = new Set(); + result.forEach((currentValue) => { + fileNumbers.add(currentValue.fileNumber); }); + allIds.push(fileNumbers); } - return query; + + const finalResult = intersectSets(allIds); + + const t1 = performance.now(); + this.logger.debug( + `ALCS Application pre-search search took ${t1 - t0} milliseconds.`, + ); + return finalResult; } - private compileApplicationDecisionSearchQuery( + private addFileNumberResults( searchDto: SearchRequestDto, - query: SelectQueryBuilder, + promises: Promise<{ fileNumber: string }[]>[], ) { - if ( - searchDto.resolutionNumber !== undefined || - searchDto.resolutionYear !== undefined - ) { - query = this.joinApplicationDecision(query); - - if (searchDto.resolutionNumber !== undefined) { - query = query.andWhere( - 'decision.resolution_number = :resolution_number', - { - resolution_number: searchDto.resolutionNumber, - }, - ); - } - - if (searchDto.resolutionYear !== undefined) { - query = query.andWhere('decision.resolution_year = :resolution_year', { - resolution_year: searchDto.resolutionYear, - }); - } - } - return query; + const promise = this.applicationRepository.find({ + where: { + fileNumber: searchDto.fileNumber, + }, + select: { + fileNumber: true, + }, + }); + promises.push(promise); } - private joinApplicationDecision( - query: SelectQueryBuilder, + private addLegacyIDResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], ) { - query = query.leftJoin( - ApplicationDecision, - 'decision', - 'decision.application_uuid = "appSearch"."application_uuid" AND decision.is_draft = false', - ); - return query; + const promise = this.applicationRepository.find({ + where: { + legacyId: searchDto.legacyId, + }, + select: { + fileNumber: true, + }, + }); + promises.push(promise); } - private compileApplicationParcelSearchQuery( + private addPortalStatusResults( searchDto: SearchRequestDto, - query: SelectQueryBuilder, + promises: Promise<{ fileNumber: string }[]>[], ) { - query = query.leftJoin( - ApplicationParcel, - 'parcel', - 'parcel.application_submission_uuid = appSearch.uuid', - ); + const promise = this.applicationSubmissionRepository + .createQueryBuilder('appSubs') + .select('appSubs.fileNumber') + .where( + "alcs.get_current_status_for_application_submission_by_uuid(appSubs.uuid) ->> 'status_type_code' = :statusCode", + { + statusCode: searchDto.portalStatusCode, + }, + ) + .getMany(); + promises.push(promise); + } + + private async addGovernmentResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const government = await this.governmentRepository.findOneByOrFail({ + name: searchDto.governmentName, + }); + + const promise = this.applicationRepository.find({ + where: { + localGovernmentUuid: government.uuid, + }, + select: { + fileNumber: true, + }, + }); + promises.push(promise); + } + + private addRegionResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const promise = this.applicationRepository.find({ + where: { + regionCode: searchDto.regionCode, + }, + select: { + fileNumber: true, + }, + }); + promises.push(promise); + } + + private addNameResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const formattedSearchString = + formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); + const promise = this.applicationSubmissionRepository + .createQueryBuilder('appSub') + .select('appSub.fileNumber') + .leftJoin( + ApplicationOwner, + 'application_owner', + 'application_owner.application_submission_uuid = appSub.uuid', + ) + .andWhere( + new Brackets((qb) => + qb + .where( + "LOWER(application_owner.first_name || ' ' || application_owner.last_name) LIKE ANY (:names)", + { + names: formattedSearchString, + }, + ) + .orWhere('LOWER(application_owner.first_name) LIKE ANY (:names)', { + names: formattedSearchString, + }) + .orWhere('LOWER(application_owner.last_name) LIKE ANY (:names)', { + names: formattedSearchString, + }) + .orWhere( + 'LOWER(application_owner.organization_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ), + ), + ) + .getMany(); + promises.push(promise); + } + + private addParcelResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const query = this.applicationSubmissionRepository + .createQueryBuilder('appSub') + .select('appSub.fileNumber') + .leftJoin( + ApplicationParcel, + 'parcel', + 'parcel.application_submission_uuid = appSub.uuid', + ); if (searchDto.pid) { - query = query.andWhere('parcel.pid = :pid', { pid: searchDto.pid }); + query.andWhere('parcel.pid = :pid', { pid: searchDto.pid }); } if (searchDto.civicAddress) { - query = query.andWhere( - 'LOWER(parcel.civic_address) like LOWER(:civic_address)', - { - civic_address: `%${searchDto.civicAddress}%`.toLowerCase(), - }, - ); + query.andWhere('LOWER(parcel.civic_address) like LOWER(:civic_address)', { + civic_address: `%${searchDto.civicAddress}%`.toLowerCase(), + }); } - return query; + + promises.push(query.getMany()); } - private compileApplicationSearchByNameQuery( + private addDecisionResolutionResults( searchDto: SearchRequestDto, - query: SelectQueryBuilder, + promises: Promise<{ fileNumber: string }[]>[], ) { - if (searchDto.name) { - const formattedSearchString = - formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); - - query = query - .leftJoin( - ApplicationOwner, - 'application_owner', - 'application_owner.application_submission_uuid = appSearch.uuid', - ) - .andWhere( - new Brackets((qb) => - qb - .where( - "LOWER(application_owner.first_name || ' ' || application_owner.last_name) LIKE ANY (:names)", - { - names: formattedSearchString, - }, - ) - .orWhere( - 'LOWER(application_owner.first_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ) - .orWhere('LOWER(application_owner.last_name) LIKE ANY (:names)', { - names: formattedSearchString, - }) - .orWhere( - 'LOWER(application_owner.organization_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ), - ), - ); + const query = this.applicationRepository + .createQueryBuilder('app') + .select('app.fileNumber') + .leftJoin( + ApplicationDecision, + 'decision', + 'decision.application_uuid = "app"."uuid" AND decision.is_draft = false', + ); + + if (searchDto.resolutionNumber !== undefined) { + query.andWhere('decision.resolution_number = :resolution_number', { + resolution_number: searchDto.resolutionNumber, + }); } - return query; + + if (searchDto.resolutionYear !== undefined) { + query.andWhere('decision.resolution_year = :resolution_year', { + resolution_year: searchDto.resolutionYear, + }); + } + promises.push(query.getMany()); } - private compileApplicationFileTypeSearchQuery( + private addFileTypeResults( searchDto: SearchRequestDto, - query: SelectQueryBuilder, + promises: Promise<{ fileNumber: string }[]>[], ) { - if (searchDto.fileTypes.length > 0) { - // if decision is not joined yet -> join it. The join of decision happens in compileApplicationDecisionSearchQuery - if ( - searchDto.resolutionNumber === undefined && - searchDto.resolutionYear === undefined - ) { - query = this.joinApplicationDecision(query); - } - - query = query.leftJoin( + const query = this.applicationRepository + .createQueryBuilder('app') + .select('app.fileNumber') + .leftJoin( + ApplicationDecision, + 'decision', + 'decision.application_uuid = "app"."uuid" AND decision.is_draft = FALSE', + ) + .leftJoin( ApplicationDecisionComponent, 'decisionComponent', 'decisionComponent.application_decision_uuid = decision.uuid', + ) + .where('app.type_code IN (:...typeCodes)', { + typeCodes: searchDto.fileTypes, + }) + .orWhere( + 'decisionComponent.application_decision_component_type_code IN (:...typeCodes)', + { + typeCodes: searchDto.fileTypes, + }, ); - query = query.andWhere( - new Brackets((qb) => - qb - .where('appSearch.application_type_code IN (:...typeCodes)', { - typeCodes: searchDto.fileTypes, - }) - .orWhere( - 'decisionComponent.application_decision_component_type_code IN (:...typeCodes)', - { - typeCodes: searchDto.fileTypes, - }, - ), - ), + promises.push(query.getMany()); + } + + private addSubmittedDateResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const query = this.applicationRepository + .createQueryBuilder('app') + .select('app.fileNumber'); + + if (searchDto.dateSubmittedFrom !== undefined) { + query.andWhere('app.date_submitted_to_alc >= :date_submitted', { + date_submitted: new Date(searchDto.dateSubmittedFrom), + }); + } + + if (searchDto.dateSubmittedTo !== undefined) { + query.andWhere('app.date_submitted_to_alc <= :date_submitted', { + date_submitted: new Date(searchDto.dateSubmittedTo), + }); + } + promises.push(query.getMany()); + } + + private addDecisionDateResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const query = this.applicationRepository + .createQueryBuilder('app') + .select('app.fileNumber') + .innerJoin( + ApplicationDecision, + 'decision', + 'decision.application_uuid = "app"."uuid" AND decision.is_draft = false', ); + + if (searchDto.dateDecidedFrom) { + query.andWhere('decision.date >= :decision_date', { + decision_date: getStartOfDayToPacific( + searchDto.dateDecidedFrom, + ).toISOString(), + }); } - return query; + if (searchDto.dateDecidedTo) { + query.andWhere('decision.date <= :decision_date_to', { + decision_date_to: getNextDayToPacific( + searchDto.dateDecidedTo, + ).toISOString(), + }); + } + promises.push(query.getMany()); } } diff --git a/services/apps/alcs/src/alcs/search/application/application-search-view.entity.ts b/services/apps/alcs/src/alcs/search/application/application-search-view.entity.ts index f8356b1f1f..30d8c40a7a 100644 --- a/services/apps/alcs/src/alcs/search/application/application-search-view.entity.ts +++ b/services/apps/alcs/src/alcs/search/application/application-search-view.entity.ts @@ -18,28 +18,25 @@ export class SearchApplicationSubmissionStatusType { expression: (datasource: DataSource) => datasource .createQueryBuilder() - .select('as2.uuid', 'uuid') - .addSelect('as2.file_number', 'file_number') - .addSelect('as2.applicant', 'applicant') - .addSelect('as2.local_government_uuid', 'local_government_uuid') + .select('app_sub.uuid', 'uuid') + .addSelect('app_sub.file_number', 'file_number') + .addSelect('app_sub.applicant', 'applicant') .addSelect('localGovernment.name', 'local_government_name') - .addSelect('as2.type_code', 'application_type_code') - .addSelect('as2.is_draft', 'is_draft') - .addSelect('a.legacy_id', 'legacy_id') - .addSelect('a.date_submitted_to_alc', 'date_submitted_to_alc') - .addSelect('a.decision_date', 'decision_date') - .addSelect('a.uuid', 'application_uuid') - .addSelect('a.region_code', 'application_region_code') + .addSelect('app.type_code', 'application_type_code') + .addSelect('app.date_submitted_to_alc', 'date_submitted_to_alc') + .addSelect('app.decision_date', 'decision_date') + .addSelect('app.uuid', 'application_uuid') + .addSelect('app.region_code', 'application_region_code') .addSelect( - 'alcs.get_current_status_for_application_submission_by_uuid(as2.uuid)', + 'alcs.get_current_status_for_application_submission_by_uuid(app_sub.uuid)', 'status', ) - .from(ApplicationSubmission, 'as2') - .innerJoin(Application, 'a', 'a.file_number = as2.file_number') + .from(ApplicationSubmission, 'app_sub') + .innerJoin(Application, 'app', 'app.file_number = app_sub.file_number') .leftJoin( LocalGovernment, 'localGovernment', - 'as2.local_government_uuid = localGovernment.uuid', + 'app_sub.local_government_uuid = localGovernment.uuid', ), }) export class ApplicationSubmissionSearchView { @@ -50,9 +47,6 @@ export class ApplicationSubmissionSearchView { @ViewColumn() applicationUuid: string; - @ViewColumn() - isDraft: boolean; - @ViewColumn() applicationRegionCode?: string; @@ -62,18 +56,12 @@ export class ApplicationSubmissionSearchView { @ViewColumn() applicant?: string; - @ViewColumn() - localGovernmentUuid?: string; - @ViewColumn() localGovernmentName?: string; @ViewColumn() applicationTypeCode: string; - @ViewColumn() - legacyId?: string; - @ViewColumn() status: SearchApplicationSubmissionStatusType; diff --git a/services/apps/alcs/src/alcs/search/inquiry/inquiry-advanced-search.service.spec.ts b/services/apps/alcs/src/alcs/search/inquiry/inquiry-advanced-search.service.spec.ts index 6e1878d9ac..111f63d9ae 100644 --- a/services/apps/alcs/src/alcs/search/inquiry/inquiry-advanced-search.service.spec.ts +++ b/services/apps/alcs/src/alcs/search/inquiry/inquiry-advanced-search.service.spec.ts @@ -1,7 +1,10 @@ -import { DeepMocked, createMock } from '@golevelup/nestjs-testing'; +import { RedisService } from '@app/common/redis/redis.service'; +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; +import { createMockQuery } from '../../../../test/mocks/mockTypes'; +import { Inquiry } from '../../inquiry/inquiry.entity'; import { LocalGovernment } from '../../local-government/local-government.entity'; import { SearchRequestDto } from '../search.dto'; import { InquiryAdvancedSearchService } from './inquiry-advanced-search.service'; @@ -13,6 +16,8 @@ describe('InquiryAdvancedSearchService', () => { Repository >; let mockLocalGovernmentRepository: DeepMocked>; + let mockInquiryRepository: DeepMocked>; + let mockRedisService: DeepMocked; const sortFields = [ 'fileId', @@ -43,20 +48,10 @@ describe('InquiryAdvancedSearchService', () => { beforeEach(async () => { mockInquirySearchViewRepository = createMock(); mockLocalGovernmentRepository = createMock(); + mockInquiryRepository = createMock(); + mockRedisService = createMock(); - mockQuery = { - getManyAndCount: jest.fn().mockResolvedValue([[], 0]), - orderBy: jest.fn().mockReturnThis(), - offset: jest.fn().mockReturnThis(), - limit: jest.fn().mockReturnThis(), - innerJoinAndMapOne: jest.fn().mockReturnThis(), - groupBy: jest.fn().mockReturnThis(), - where: jest.fn().mockReturnThis(), - andWhere: jest.fn().mockReturnThis(), - setParameters: jest.fn().mockReturnThis(), - leftJoin: jest.fn().mockReturnThis(), - withDeleted: jest.fn().mockReturnThis(), - }; + mockQuery = createMockQuery(); const module: TestingModule = await Test.createTestingModule({ providers: [ @@ -69,6 +64,14 @@ describe('InquiryAdvancedSearchService', () => { provide: getRepositoryToken(LocalGovernment), useValue: mockLocalGovernmentRepository, }, + { + provide: getRepositoryToken(Inquiry), + useValue: mockInquiryRepository, + }, + { + provide: RedisService, + useValue: mockRedisService, + }, ], }).compile(); @@ -79,6 +82,15 @@ describe('InquiryAdvancedSearchService', () => { mockLocalGovernmentRepository.findOneByOrFail.mockResolvedValue( new LocalGovernment(), ); + + mockInquirySearchViewRepository.createQueryBuilder.mockReturnValue( + mockQuery, + ); + + mockRedisService.getClient.mockReturnValue({ + get: async () => null, + setEx: async () => null, + } as any); }); it('should be defined', () => { @@ -86,28 +98,26 @@ describe('InquiryAdvancedSearchService', () => { }); it('should successfully build a query using all search parameters defined', async () => { - mockInquirySearchViewRepository.createQueryBuilder.mockReturnValue( - mockQuery as any, - ); + mockInquiryRepository.find.mockResolvedValue([]); + mockInquiryRepository.createQueryBuilder.mockReturnValue(mockQuery); - const result = await service.search(mockSearchDto); + const result = await service.search(mockSearchDto, {} as any); expect(result).toEqual({ data: [], total: 0 }); - expect( - mockInquirySearchViewRepository.createQueryBuilder, - ).toHaveBeenCalledTimes(1); - expect(mockQuery.andWhere).toHaveBeenCalledTimes(9); + expect(mockInquiryRepository.find).toHaveBeenCalledTimes(3); + expect(mockInquiryRepository.createQueryBuilder).toHaveBeenCalledTimes(4); + expect(mockQuery.andWhere).toHaveBeenCalledTimes(4); }); - it('should call compileInquirySearchQuery method correctly', async () => { - const compileSearchQuerySpy = jest - .spyOn(service as any, 'compileInquirySearchQuery') - .mockResolvedValue(mockQuery); + it('should call searchForFileNumbers method correctly', async () => { + const searchForFileNumbersSpy = jest + .spyOn(service as any, 'searchForFileNumbers') + .mockResolvedValue(new Set(['100000'])); - const result = await service.search(mockSearchDto); + const result = await service.search(mockSearchDto, {} as any); expect(result).toEqual({ data: [], total: 0 }); - expect(compileSearchQuerySpy).toHaveBeenCalledWith(mockSearchDto); + expect(searchForFileNumbersSpy).toHaveBeenCalledWith(mockSearchDto); expect(mockQuery.orderBy).toHaveBeenCalledTimes(1); expect(mockQuery.offset).toHaveBeenCalledTimes(1); expect(mockQuery.limit).toHaveBeenCalledTimes(1); @@ -115,17 +125,17 @@ describe('InquiryAdvancedSearchService', () => { sortFields.forEach((sortField) => { it(`should sort by ${sortField}`, async () => { - const compileSearchQuerySpy = jest - .spyOn(service as any, 'compileInquirySearchQuery') - .mockResolvedValue(mockQuery); + const searchForFileNumbersSpy = jest + .spyOn(service as any, 'searchForFileNumbers') + .mockResolvedValue(new Set(['100000'])); mockSearchDto.sortField = sortField; mockSearchDto.sortDirection = 'DESC'; - const result = await service.search(mockSearchDto); + const result = await service.search(mockSearchDto, {} as any); expect(result).toEqual({ data: [], total: 0 }); - expect(compileSearchQuerySpy).toHaveBeenCalledWith(mockSearchDto); + expect(searchForFileNumbersSpy).toHaveBeenCalledWith(mockSearchDto); expect(mockQuery.orderBy).toHaveBeenCalledTimes(1); expect(mockQuery.offset).toHaveBeenCalledTimes(1); expect(mockQuery.limit).toHaveBeenCalledTimes(1); diff --git a/services/apps/alcs/src/alcs/search/inquiry/inquiry-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/inquiry/inquiry-advanced-search.service.ts index 976a186ad5..8d4e2a374a 100644 --- a/services/apps/alcs/src/alcs/search/inquiry/inquiry-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/inquiry/inquiry-advanced-search.service.ts @@ -1,31 +1,70 @@ -import { Injectable } from '@nestjs/common'; +import { RedisService } from '@app/common/redis/redis.service'; +import { Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; -import { Brackets, Repository, SelectQueryBuilder } from 'typeorm'; -import { - getNextDayToPacific, - getStartOfDayToPacific, -} from '../../../utils/pacific-date-time-helper'; +import * as hash from 'object-hash'; +import { QueryRunner, Repository } from 'typeorm'; import { formatStringToPostgresSearchStringArrayWithWildCard } from '../../../utils/search-helper'; +import { intersectSets } from '../../../utils/set-helper'; import { InquiryParcel } from '../../inquiry/inquiry-parcel/inquiry-parcel.entity'; +import { Inquiry } from '../../inquiry/inquiry.entity'; import { LocalGovernment } from '../../local-government/local-government.entity'; import { AdvancedSearchResultDto, SearchRequestDto } from '../search.dto'; import { InquirySearchView } from './inquiry-search-view.entity'; @Injectable() export class InquiryAdvancedSearchService { + private logger: Logger = new Logger(InquiryAdvancedSearchService.name); + constructor( @InjectRepository(InquirySearchView) private inquirySearchViewRepository: Repository, + @InjectRepository(Inquiry) + private inquiryRepository: Repository, @InjectRepository(LocalGovernment) private governmentRepository: Repository, + private redisService: RedisService, ) {} async search( searchDto: SearchRequestDto, + queryRunner: QueryRunner, ): Promise> { - let query = await this.compileInquirySearchQuery(searchDto); + const searchHash = hash(searchDto); + const searchKey = `search_alcs_inquiry_${searchHash}`; + + const client = this.redisService.getClient(); + const cachedSearch = await client.get(searchKey); + + let fileNumbers = new Set(); + if (cachedSearch) { + const cachedNumbers = JSON.parse(cachedSearch) as string[]; + fileNumbers = new Set(cachedNumbers); + } else { + fileNumbers = await this.searchForFileNumbers(searchDto); + await client.setEx( + searchKey, + 180, //Seconds + JSON.stringify([...fileNumbers.values()]), + ); + } - query = this.compileGroupBySearchQuery(query); + if (fileNumbers.size === 0) { + return { + data: [], + total: 0, + }; + } + + let query = this.inquirySearchViewRepository + .createQueryBuilder('inquirySearch', queryRunner) + .innerJoinAndMapOne( + 'inquirySearch.inquiryType', + 'inquirySearch.inquiryType', + 'inquiryType', + ) + .andWhere('inquirySearch.fileNumber IN(:...fileNumbers)', { + fileNumbers: [...fileNumbers.values()], + }); const sortQuery = this.compileSortQuery(searchDto); @@ -38,11 +77,14 @@ export class InquiryAdvancedSearchService { .offset((searchDto.page - 1) * searchDto.pageSize) .limit(searchDto.pageSize); - const result = await query.getManyAndCount(); + const t0 = performance.now(); + const results = await query.getManyAndCount(); + const t1 = performance.now(); + this.logger.debug(`ALCS Inquiry search took ${t1 - t0} milliseconds.`); return { - data: result[0], - total: result[1], + data: results[0], + total: results[1], }; } @@ -69,123 +111,144 @@ export class InquiryAdvancedSearchService { } } - private compileGroupBySearchQuery( - query: SelectQueryBuilder, - ) { - query = query - // FIXME: This is a quick fix for the search performance issues. It temporarily allows - // submissions with deleted submission types to be shown. For now, there are no - // deleted submission types, so this should be fine, but should be fixed soon. - .withDeleted() - .innerJoinAndMapOne( - 'inquirySearch.inquiryType', - 'inquirySearch.inquiryType', - 'inquiryType', - ) - .groupBy( - ` - "inquirySearch"."inquiry_uuid" - , "inquirySearch"."inquiry_region_code" - , "inquirySearch"."file_number" - , "inquirySearch"."local_government_uuid" - , "inquirySearch"."local_government_name" - , "inquirySearch"."inquirer_first_name" - , "inquirySearch"."inquirer_last_name" - , "inquirySearch"."inquirer_organization" - , "inquirySearch"."open" - , "inquirySearch"."inquiry_type_code" - , "inquirySearch"."date_submitted_to_alc" - , "inquiryType"."audit_deleted_date_at" - , "inquiryType"."audit_created_at" - , "inquiryType"."audit_updated_by" - , "inquiryType"."audit_updated_at" - , "inquiryType"."audit_created_by" - , "inquiryType"."short_label" - , "inquiryType"."label" - , "inquiryType"."code" - , "inquiryType"."html_description" - `, - ); - return query; - } - - private async compileInquirySearchQuery(searchDto: SearchRequestDto) { - let query = - this.inquirySearchViewRepository.createQueryBuilder('inquirySearch'); + private async searchForFileNumbers(searchDto: SearchRequestDto) { + const promises: Promise<{ fileNumber: string }[]>[] = []; if (searchDto.fileNumber) { - query = query - .andWhere('inquirySearch.file_number = :fileNumber') - .setParameters({ fileNumber: searchDto.fileNumber ?? null }); + this.addFileNumberResults(searchDto, promises); } if (searchDto.governmentName) { - const government = await this.governmentRepository.findOneByOrFail({ - name: searchDto.governmentName, - }); - - query = query.andWhere( - 'inquirySearch.local_government_uuid = :local_government_uuid', - { - local_government_uuid: government.uuid, - }, - ); + await this.addGovernmentResults(searchDto, promises); } if (searchDto.regionCode) { - query = query.andWhere( - 'inquirySearch.inquiry_region_code = :region_code', - { - region_code: searchDto.regionCode, - }, - ); + this.addRegionResults(searchDto, promises); } - query = this.compileSearchByNameQuery(searchDto, query); - query = this.compileParcelSearchQuery(searchDto, query); - query = this.compileDateRangeSearchQuery(searchDto, query); - query = this.compileFileTypeSearchQuery(searchDto, query); + if (searchDto.name) { + this.addNameResults(searchDto, promises); + } - return query; - } + if (searchDto.pid || searchDto.civicAddress) { + this.addParcelResults(searchDto, promises); + } - private compileDateRangeSearchQuery(searchDto: SearchRequestDto, query) { - if (searchDto.dateSubmittedFrom) { - query = query.andWhere( - 'inquirySearch.date_submitted_to_alc >= :date_submitted_from_alc', - { - date_submitted_from_alc: getStartOfDayToPacific( - searchDto.dateSubmittedFrom, - ).toISOString(), - }, - ); + if (searchDto.dateSubmittedTo || searchDto.dateSubmittedFrom) { + this.addSubmittedDateResults(searchDto, promises); } - if (searchDto.dateSubmittedTo) { - query = query.andWhere( - 'inquirySearch.date_submitted_to_alc < :date_submitted_to_alc', - { - date_submitted_to_alc: getNextDayToPacific( - searchDto.dateSubmittedTo, - ).toISOString(), - }, - ); + if (searchDto.fileTypes.length > 0) { + this.addFileTypeResults(searchDto, promises); + } + + //Intersect Sets + const t0 = performance.now(); + const queryResults = await Promise.all(promises); + + const allIds: Set[] = []; + for (const result of queryResults) { + const fileNumbers = new Set(); + result.forEach((currentValue) => { + fileNumbers.add(currentValue.fileNumber); + }); + allIds.push(fileNumbers); } - return query; + const finalResult = intersectSets(allIds); + + const t1 = performance.now(); + this.logger.debug( + `ALCS Inquiry pre-search search took ${t1 - t0} milliseconds.`, + ); + return finalResult; } - private compileParcelSearchQuery( + private addFileNumberResults( searchDto: SearchRequestDto, - query: SelectQueryBuilder, + promises: Promise<{ fileNumber: string }[]>[], ) { - if (searchDto.pid || searchDto.civicAddress) { - query = query.leftJoin( - InquiryParcel, - 'parcel', - 'parcel.inquiry_uuid = inquirySearch.inquiry_uuid', - ); - } + const promise = this.inquiryRepository.find({ + where: { + fileNumber: searchDto.fileNumber, + }, + select: { + fileNumber: true, + }, + }); + promises.push(promise); + } + + private async addGovernmentResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const government = await this.governmentRepository.findOneByOrFail({ + name: searchDto.governmentName, + }); + + const promise = this.inquiryRepository.find({ + where: { + localGovernmentUuid: government.uuid, + }, + select: { + fileNumber: true, + }, + }); + promises.push(promise); + } + + private addRegionResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const promise = this.inquiryRepository.find({ + where: { + regionCode: searchDto.regionCode, + }, + select: { + fileNumber: true, + }, + }); + promises.push(promise); + } + + private addNameResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const formattedSearchString = + formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); + const promise = this.inquiryRepository + .createQueryBuilder('inquiry') + .select('inquiry.fileNumber') + .where( + "LOWER(inquirySearch.inquirer_first_name || ' ' || inquirySearch.inquirer_last_name) LIKE ANY (:names)", + { + names: formattedSearchString, + }, + ) + .orWhere('LOWER(inquirySearch.inquirer_first_name) LIKE ANY (:names)', { + names: formattedSearchString, + }) + .orWhere('LOWER(inquirySearch.inquirer_last_name) LIKE ANY (:names)', { + names: formattedSearchString, + }) + .orWhere('LOWER(inquirySearch.inquirer_organization) LIKE ANY (:names)', { + names: formattedSearchString, + }) + .getMany(); + promises.push(promise); + } + + private addParcelResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + let query = this.inquiryRepository + .createQueryBuilder('inquiry') + .select('inquiry.fileNumber') + .leftJoin(InquiryParcel, 'parcel', 'parcel.inquiry_uuid = inquiry.uuid'); if (searchDto.pid) { query = query.andWhere('parcel.pid = :pid', { pid: searchDto.pid }); @@ -199,64 +262,49 @@ export class InquiryAdvancedSearchService { }, ); } - return query; + + promises.push(query.getMany()); } - private compileSearchByNameQuery( + private addFileTypeResults( searchDto: SearchRequestDto, - query: SelectQueryBuilder, + promises: Promise<{ fileNumber: string }[]>[], ) { - if (searchDto.name) { - const formattedSearchString = - formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); + const query = this.inquiryRepository + .createQueryBuilder('inquiry') + .select('inquiry.fileNumber') + .where('inquiry.type_code IN (:...typeCodes)', { + typeCodes: searchDto.fileTypes, + }); - query = query.andWhere( - new Brackets((qb) => - qb - .where( - "LOWER(inquirySearch.inquirer_first_name || ' ' || inquirySearch.inquirer_last_name) LIKE ANY (:names)", - { - names: formattedSearchString, - }, - ) - .orWhere( - 'LOWER(inquirySearch.inquirer_first_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ) - .orWhere( - 'LOWER(inquirySearch.inquirer_last_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ) - .orWhere( - 'LOWER(inquirySearch.inquirer_organization) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ), - ), - ); - } - return query; + promises.push(query.getMany()); } - private compileFileTypeSearchQuery( + private addSubmittedDateResults( searchDto: SearchRequestDto, - query: SelectQueryBuilder, + promises: Promise<{ fileNumber: string }[]>[], ) { - if (searchDto.fileTypes.length > 0) { + let query = this.inquiryRepository + .createQueryBuilder('inquiry') + .select('inquiry.fileNumber'); + + if (searchDto.dateSubmittedFrom !== undefined) { query = query.andWhere( - new Brackets((qb) => - qb.where('inquirySearch.inquiry_type_code IN (:...typeCodes)', { - typeCodes: searchDto.fileTypes, - }), - ), + 'inquiry.date_submitted_to_alc >= :date_submitted', + { + date_submitted: new Date(searchDto.dateSubmittedFrom), + }, ); } - return query; + if (searchDto.dateSubmittedTo !== undefined) { + query = query.andWhere( + 'inquiry.date_submitted_to_alc <= :date_submitted', + { + date_submitted: new Date(searchDto.dateSubmittedTo), + }, + ); + } + promises.push(query.getMany()); } } diff --git a/services/apps/alcs/src/alcs/search/inquiry/inquiry-search-view.entity.ts b/services/apps/alcs/src/alcs/search/inquiry/inquiry-search-view.entity.ts index d9b62c0a59..63959c0f61 100644 --- a/services/apps/alcs/src/alcs/search/inquiry/inquiry-search-view.entity.ts +++ b/services/apps/alcs/src/alcs/search/inquiry/inquiry-search-view.entity.ts @@ -22,9 +22,7 @@ import { LocalGovernment } from '../../local-government/local-government.entity' .addSelect('inquiry.type_code', 'inquiry_type_code') .addSelect('inquiry.open', 'open') .addSelect('inquiry.date_submitted_to_alc', 'date_submitted_to_alc') - .addSelect('inquiry.local_government_uuid', 'local_government_uuid') .addSelect('localGovernment.name', 'local_government_name') - .addSelect('inquiry.region_code', 'inquiry_region_code') .from(Inquiry, 'inquiry') .innerJoinAndSelect( InquiryType, @@ -42,9 +40,6 @@ export class InquirySearchView { @PrimaryColumn() inquiryUuid: string; - @ViewColumn() - inquiryRegionCode?: string; - @ViewColumn() fileNumber: string; @@ -57,9 +52,6 @@ export class InquirySearchView { @ViewColumn() inquirerOrganization?: string; - @ViewColumn() - localGovernmentUuid?: string; - @ViewColumn() localGovernmentName?: string; diff --git a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.spec.ts b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.spec.ts index 4389497052..4bc7f487f4 100644 --- a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.spec.ts +++ b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.spec.ts @@ -1,8 +1,12 @@ +import { RedisService } from '@app/common/redis/redis.service'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; +import { createMockQuery } from '../../../../test/mocks/mockTypes'; +import { NoticeOfIntentSubmission } from '../../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; import { LocalGovernment } from '../../local-government/local-government.entity'; +import { NoticeOfIntent } from '../../notice-of-intent/notice-of-intent.entity'; import { SearchRequestDto } from '../search.dto'; import { NoticeOfIntentAdvancedSearchService } from './notice-of-intent-advanced-search.service'; import { NoticeOfIntentSubmissionSearchView } from './notice-of-intent-search-view.entity'; @@ -13,6 +17,11 @@ describe('NoticeOfIntentService', () => { Repository >; let mockLocalGovernmentRepository: DeepMocked>; + let mockNOIRepository: DeepMocked>; + let mockNOISubmissionRepository: DeepMocked< + Repository + >; + let mockRedisService: DeepMocked; const sortFields = [ 'fileId', @@ -48,20 +57,11 @@ describe('NoticeOfIntentService', () => { beforeEach(async () => { mockNoticeOfIntentSubmissionSearchViewRepository = createMock(); mockLocalGovernmentRepository = createMock(); + mockNOIRepository = createMock(); + mockNOISubmissionRepository = createMock(); + mockRedisService = createMock(); - mockQuery = { - getManyAndCount: jest.fn().mockResolvedValue([[], 0]), - orderBy: jest.fn().mockReturnThis(), - offset: jest.fn().mockReturnThis(), - limit: jest.fn().mockReturnThis(), - innerJoinAndMapOne: jest.fn().mockReturnThis(), - groupBy: jest.fn().mockReturnThis(), - where: jest.fn().mockReturnThis(), - andWhere: jest.fn().mockReturnThis(), - setParameters: jest.fn().mockReturnThis(), - leftJoin: jest.fn().mockReturnThis(), - withDeleted: jest.fn().mockReturnThis(), - }; + mockQuery = createMockQuery(); const module: TestingModule = await Test.createTestingModule({ providers: [ @@ -74,6 +74,18 @@ describe('NoticeOfIntentService', () => { provide: getRepositoryToken(LocalGovernment), useValue: mockLocalGovernmentRepository, }, + { + provide: getRepositoryToken(NoticeOfIntent), + useValue: mockNOIRepository, + }, + { + provide: getRepositoryToken(NoticeOfIntentSubmission), + useValue: mockNOISubmissionRepository, + }, + { + provide: RedisService, + useValue: mockRedisService, + }, ], }).compile(); @@ -84,6 +96,15 @@ describe('NoticeOfIntentService', () => { mockLocalGovernmentRepository.findOneByOrFail.mockResolvedValue( new LocalGovernment(), ); + + mockNoticeOfIntentSubmissionSearchViewRepository.createQueryBuilder.mockReturnValue( + mockQuery as any, + ); + + mockRedisService.getClient.mockReturnValue({ + get: async () => null, + setEx: async () => null, + } as any); }); it('should be defined', () => { @@ -91,31 +112,37 @@ describe('NoticeOfIntentService', () => { }); it('should successfully build a query using all search parameters defined', async () => { - mockNoticeOfIntentSubmissionSearchViewRepository.createQueryBuilder.mockReturnValue( - mockQuery as any, - ); + mockNOIRepository.find.mockResolvedValue([]); + mockNOIRepository.createQueryBuilder.mockReturnValue(mockQuery); + mockNOISubmissionRepository.createQueryBuilder.mockReturnValue(mockQuery); - const result = await service.searchNoticeOfIntents(mockSearchDto); + const result = await service.searchNoticeOfIntents( + mockSearchDto, + {} as any, + ); expect(result).toEqual({ data: [], total: 0 }); - expect( - mockNoticeOfIntentSubmissionSearchViewRepository.createQueryBuilder, - ).toHaveBeenCalledTimes(1); - expect(mockQuery.andWhere).toHaveBeenCalledTimes(13); + expect(mockQuery.andWhere).toHaveBeenCalledTimes(9); expect(mockQuery.where).toHaveBeenCalledTimes(1); + expect(mockNOIRepository.find).toHaveBeenCalledTimes(3); + expect(mockNOIRepository.createQueryBuilder).toHaveBeenCalledTimes(3); + expect( + mockNOISubmissionRepository.createQueryBuilder, + ).toHaveBeenCalledTimes(3); }); - it('should call compileNoticeOfIntentSearchQuery method correctly', async () => { - const compileApplicationSearchQuerySpy = jest - .spyOn(service as any, 'compileNoticeOfIntentSearchQuery') - .mockResolvedValue(mockQuery); - - const result = await service.searchNoticeOfIntents(mockSearchDto); + it('should call searchForFileNumbers method correctly', async () => { + const searchForFileNumbersSpy = jest + .spyOn(service as any, 'searchForFileNumbers') + .mockResolvedValue(new Set(['100000'])); - expect(result).toEqual({ data: [], total: 0 }); - expect(compileApplicationSearchQuerySpy).toHaveBeenCalledWith( + const result = await service.searchNoticeOfIntents( mockSearchDto, + {} as any, ); + + expect(result).toEqual({ data: [], total: 0 }); + expect(searchForFileNumbersSpy).toHaveBeenCalledWith(mockSearchDto); expect(mockQuery.orderBy).toHaveBeenCalledTimes(1); expect(mockQuery.offset).toHaveBeenCalledTimes(1); expect(mockQuery.limit).toHaveBeenCalledTimes(1); @@ -123,17 +150,20 @@ describe('NoticeOfIntentService', () => { sortFields.forEach((sortField) => { it(`should sort by ${sortField}`, async () => { - const compileSearchQuerySpy = jest - .spyOn(service as any, 'compileNoticeOfIntentSearchQuery') - .mockResolvedValue(mockQuery); + const searchForFileNumbersSpy = jest + .spyOn(service as any, 'searchForFileNumbers') + .mockResolvedValue(new Set(['100000'])); mockSearchDto.sortField = sortField; mockSearchDto.sortDirection = 'DESC'; - const result = await service.searchNoticeOfIntents(mockSearchDto); + const result = await service.searchNoticeOfIntents( + mockSearchDto, + {} as any, + ); expect(result).toEqual({ data: [], total: 0 }); - expect(compileSearchQuerySpy).toHaveBeenCalledWith(mockSearchDto); + expect(searchForFileNumbersSpy).toHaveBeenCalledWith(mockSearchDto); expect(mockQuery.orderBy).toHaveBeenCalledTimes(1); expect(mockQuery.offset).toHaveBeenCalledTimes(1); expect(mockQuery.limit).toHaveBeenCalledTimes(1); diff --git a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts index bde961617c..ed6e38b391 100644 --- a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts @@ -1,33 +1,79 @@ -import { Injectable } from '@nestjs/common'; +import { RedisService } from '@app/common/redis/redis.service'; +import { Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; -import { Brackets, Repository, SelectQueryBuilder } from 'typeorm'; +import * as hash from 'object-hash'; +import { Brackets, QueryRunner, Repository } from 'typeorm'; import { NoticeOfIntentOwner } from '../../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity'; import { NoticeOfIntentParcel } from '../../../portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity'; +import { NoticeOfIntentSubmission } from '../../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; import { getNextDayToPacific, getStartOfDayToPacific, } from '../../../utils/pacific-date-time-helper'; import { formatStringToPostgresSearchStringArrayWithWildCard } from '../../../utils/search-helper'; +import { intersectSets } from '../../../utils/set-helper'; import { LocalGovernment } from '../../local-government/local-government.entity'; import { NoticeOfIntentDecision } from '../../notice-of-intent-decision/notice-of-intent-decision.entity'; +import { NoticeOfIntent } from '../../notice-of-intent/notice-of-intent.entity'; import { AdvancedSearchResultDto, SearchRequestDto } from '../search.dto'; import { NoticeOfIntentSubmissionSearchView } from './notice-of-intent-search-view.entity'; @Injectable() export class NoticeOfIntentAdvancedSearchService { + private logger: Logger = new Logger(NoticeOfIntentAdvancedSearchService.name); + constructor( @InjectRepository(NoticeOfIntentSubmissionSearchView) private noiSearchRepository: Repository, + @InjectRepository(NoticeOfIntent) + private noiRepository: Repository, + @InjectRepository(NoticeOfIntentSubmission) + private noiSubmissionRepository: Repository, @InjectRepository(LocalGovernment) private governmentRepository: Repository, + private redisService: RedisService, ) {} async searchNoticeOfIntents( searchDto: SearchRequestDto, + queryRunner: QueryRunner, ): Promise> { - let query = await this.compileNoticeOfIntentSearchQuery(searchDto); + const searchHash = hash(searchDto); + const searchKey = `search_alcs_noi_${searchHash}`; + + const client = this.redisService.getClient(); + const cachedSearch = await client.get(searchKey); + + let fileNumbers = new Set(); + if (cachedSearch) { + const cachedNumbers = JSON.parse(cachedSearch) as string[]; + fileNumbers = new Set(cachedNumbers); + } else { + fileNumbers = await this.searchForFileNumbers(searchDto); + await client.setEx( + searchKey, + 180, //Seconds + JSON.stringify([...fileNumbers.values()]), + ); + } - query = this.compileGroupBySearchQuery(query); + if (fileNumbers.size === 0) { + return { + data: [], + total: 0, + }; + } + + let query = this.noiSearchRepository + .createQueryBuilder('noiSearch', queryRunner) + .innerJoinAndMapOne( + 'noiSearch.noticeOfIntentType', + 'noiSearch.noticeOfIntentType', + 'noticeOfIntentType', + ) + .andWhere('noiSearch.fileNumber IN(:...fileNumbers)', { + fileNumbers: [...fileNumbers.values()], + }); const sortQuery = this.compileSortQuery(searchDto); @@ -40,11 +86,14 @@ export class NoticeOfIntentAdvancedSearchService { .offset((searchDto.page - 1) * searchDto.pageSize) .limit(searchDto.pageSize); - const result = await query.getManyAndCount(); + const t0 = performance.now(); + const results = await Promise.all([query.getMany(), query.getCount()]); + const t1 = performance.now(); + this.logger.debug(`NOI ALCS search took ${t1 - t0} milliseconds.`); return { - data: result[0], - total: result[1], + data: results[0], + total: results[1], }; } @@ -71,200 +120,239 @@ export class NoticeOfIntentAdvancedSearchService { } } - private compileGroupBySearchQuery( - query: SelectQueryBuilder, - ) { - query = query - // FIXME: This is a quick fix for the search performance issues. It temporarily allows - // submissions with deleted submission types to be shown. For now, there are no - // deleted submission types, so this should be fine, but should be fixed soon. - .withDeleted() - .innerJoinAndMapOne( - 'noiSearch.noticeOfIntentType', - 'noiSearch.noticeOfIntentType', - 'noticeOfIntentType', - ) - .groupBy( - ` - "noiSearch"."uuid" - , "noiSearch"."notice_of_intent_uuid" - , "noiSearch"."notice_of_intent_region_code" - , "noiSearch"."file_number" - , "noiSearch"."applicant" - , "noiSearch"."legacy_id" - , "noiSearch"."local_government_uuid" - , "noiSearch"."local_government_name" - , "noiSearch"."notice_of_intent_type_code" - , "noiSearch"."status" - , "noiSearch"."date_submitted_to_alc" - , "noiSearch"."decision_date" - , "noticeOfIntentType"."audit_deleted_date_at" - , "noticeOfIntentType"."audit_created_at" - , "noticeOfIntentType"."audit_updated_by" - , "noticeOfIntentType"."audit_updated_at" - , "noticeOfIntentType"."audit_created_by" - , "noticeOfIntentType"."short_label" - , "noticeOfIntentType"."label" - , "noticeOfIntentType"."code" - , "noticeOfIntentType"."html_description" - , "noticeOfIntentType"."portal_label" - , "noiSearch"."is_draft" - `, - ); - return query; - } - - private async compileNoticeOfIntentSearchQuery(searchDto: SearchRequestDto) { - let query = this.noiSearchRepository - .createQueryBuilder('noiSearch') - .where('noiSearch.is_draft = false'); + private async searchForFileNumbers(searchDto: SearchRequestDto) { + const promises: Promise<{ fileNumber: string }[]>[] = []; if (searchDto.fileNumber) { - query = query - .andWhere('noiSearch.file_number = :fileNumber') - .setParameters({ fileNumber: searchDto.fileNumber ?? null }); + this.addFileNumberResults(searchDto, promises); + } + + if (searchDto.legacyId) { + this.addLegacyIDResults(searchDto, promises); } if (searchDto.portalStatusCode) { - query = query.andWhere( - "alcs.get_current_status_for_notice_of_intent_submission_by_uuid(noiSearch.uuid) ->> 'status_type_code' = :status", - { - status: searchDto.portalStatusCode, - }, - ); + this.addPortalStatusResults(searchDto, promises); } if (searchDto.governmentName) { - const government = await this.governmentRepository.findOneByOrFail({ - name: searchDto.governmentName, - }); + await this.addGovernmentResults(searchDto, promises); + } - query = query.andWhere( - 'noiSearch.local_government_uuid = :local_government_uuid', - { - local_government_uuid: government.uuid, - }, - ); + if (searchDto.regionCode) { + this.addRegionResults(searchDto, promises); } - if (searchDto.legacyId) { - query = query.andWhere('noiSearch.legacy_id = :legacyId', { - legacyId: searchDto.legacyId, - }); + if (searchDto.name) { + this.addNameResults(searchDto, promises); } - if (searchDto.regionCode) { - query = query.andWhere( - 'noiSearch.notice_of_intent_region_code = :noi_region_code', - { - noi_region_code: searchDto.regionCode, - }, - ); + if (searchDto.pid || searchDto.civicAddress) { + this.addParcelResults(searchDto, promises); } - query = this.compileSearchByNameQuery(searchDto, query); + if (searchDto.resolutionNumber || searchDto.resolutionYear) { + this.addDecisionResolutionResults(searchDto, promises); + } - query = this.compileParcelSearchQuery(searchDto, query); + if (searchDto.fileTypes.length > 0) { + this.addFileTypeResults(searchDto, promises); + } - query = this.compileDecisionSearchQuery(searchDto, query); + if (searchDto.dateSubmittedTo || searchDto.dateSubmittedFrom) { + this.addSubmittedDateResults(searchDto, promises); + } - query = this.compileDateRangeSearchQuery(searchDto, query); + if (searchDto.dateDecidedFrom || searchDto.dateDecidedTo) { + this.addDecisionDateResults(searchDto, promises); + } + + //Intersect Sets + const t0 = performance.now(); + const queryResults = await Promise.all(promises); + + const allIds: Set[] = []; + for (const result of queryResults) { + const fileNumbers = new Set(); + result.forEach((currentValue) => { + fileNumbers.add(currentValue.fileNumber); + }); + allIds.push(fileNumbers); + } + + const finalResult = intersectSets(allIds); - return query; + const t1 = performance.now(); + this.logger.debug( + `ALCS Application pre-search search took ${t1 - t0} milliseconds.`, + ); + return finalResult; } - private compileDateRangeSearchQuery( + private addDecisionResolutionResults( searchDto: SearchRequestDto, - query: SelectQueryBuilder, + promises: Promise<{ fileNumber: string }[]>[], ) { - if (searchDto.dateSubmittedFrom) { - query = query.andWhere( - 'noiSearch.date_submitted_to_alc >= :date_submitted_from_alc', - { - date_submitted_from_alc: getStartOfDayToPacific( - searchDto.dateSubmittedFrom, - ).toISOString(), - }, + let query = this.noiRepository + .createQueryBuilder('noi') + .select('noi.fileNumber') + .leftJoin( + NoticeOfIntentDecision, + 'decision', + 'decision.notice_of_intent_uuid = "noi"."uuid" AND decision.is_draft = false', ); - } - if (searchDto.dateSubmittedTo) { + if (searchDto.resolutionNumber !== undefined) { query = query.andWhere( - 'noiSearch.date_submitted_to_alc < :date_submitted_to_alc', + 'decision.resolution_number = :resolution_number', { - date_submitted_to_alc: getNextDayToPacific( - searchDto.dateSubmittedTo, - ).toISOString(), + resolution_number: searchDto.resolutionNumber, }, ); } - if (searchDto.dateDecidedFrom) { - query = query.andWhere('noiSearch.decision_date >= :decision_date', { - decision_date: getStartOfDayToPacific( - searchDto.dateDecidedFrom, - ).toISOString(), + if (searchDto.resolutionYear !== undefined) { + query = query.andWhere('decision.resolution_year = :resolution_year', { + resolution_year: searchDto.resolutionYear, }); } + promises.push(query.getMany()); + } - if (searchDto.dateDecidedTo) { - query = query.andWhere('noiSearch.decision_date < :decision_date_to', { - decision_date_to: getNextDayToPacific( - searchDto.dateDecidedTo, - ).toISOString(), - }); - } - return query; + private addFileNumberResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const promise = this.noiRepository.find({ + where: { + fileNumber: searchDto.fileNumber, + }, + select: { + fileNumber: true, + }, + }); + promises.push(promise); } - private compileDecisionSearchQuery( + private addLegacyIDResults( searchDto: SearchRequestDto, - query: SelectQueryBuilder, + promises: Promise<{ fileNumber: string }[]>[], ) { - if ( - searchDto.resolutionNumber !== undefined || - searchDto.resolutionYear !== undefined - ) { - query = this.joinDecision(query); - - if (searchDto.resolutionNumber !== undefined) { - query = query.andWhere( - 'decision.resolution_number = :resolution_number AND decision.is_draft = false', - { - resolution_number: searchDto.resolutionNumber, - }, - ); - } - - if (searchDto.resolutionYear !== undefined) { - query = query.andWhere('decision.resolution_year = :resolution_year', { - resolution_year: searchDto.resolutionYear, - }); - } - } - return query; + const promise = this.noiRepository.find({ + where: { + legacyId: searchDto.legacyId, + }, + select: { + fileNumber: true, + }, + }); + promises.push(promise); } - private joinDecision(query: any) { - query = query.leftJoin( - NoticeOfIntentDecision, - 'decision', - 'decision.notice_of_intent_uuid = "noiSearch"."notice_of_intent_uuid" AND decision.is_draft = false', - ); - return query; + private addPortalStatusResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const promise = this.noiSubmissionRepository + .createQueryBuilder('noiSubs') + .select('noiSubs.fileNumber') + .where( + "alcs.get_current_status_for_notice_of_intent_submission_by_uuid(noiSubs.uuid) ->> 'status_type_code' = :statusCode", + { + statusCode: searchDto.portalStatusCode, + }, + ) + .getMany(); + promises.push(promise); } - private compileParcelSearchQuery( + private async addGovernmentResults( searchDto: SearchRequestDto, - query: SelectQueryBuilder, + promises: Promise<{ fileNumber: string }[]>[], ) { - if (searchDto.pid || searchDto.civicAddress) { - query = query.leftJoin( + const government = await this.governmentRepository.findOneByOrFail({ + name: searchDto.governmentName, + }); + + const promise = this.noiRepository.find({ + where: { + localGovernmentUuid: government.uuid, + }, + select: { + fileNumber: true, + }, + }); + promises.push(promise); + } + + private addRegionResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const promise = this.noiRepository.find({ + where: { + regionCode: searchDto.regionCode, + }, + select: { + fileNumber: true, + }, + }); + promises.push(promise); + } + + private addNameResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const formattedSearchString = + formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); + const promise = this.noiSubmissionRepository + .createQueryBuilder('noiSub') + .select('noiSub.fileNumber') + .leftJoin( + NoticeOfIntentOwner, + 'application_owner', + 'application_owner.application_submission_uuid = appSub.uuid', + ) + .andWhere( + new Brackets((qb) => + qb + .where( + "LOWER(application_owner.first_name || ' ' || application_owner.last_name) LIKE ANY (:names)", + { + names: formattedSearchString, + }, + ) + .orWhere('LOWER(application_owner.first_name) LIKE ANY (:names)', { + names: formattedSearchString, + }) + .orWhere('LOWER(application_owner.last_name) LIKE ANY (:names)', { + names: formattedSearchString, + }) + .orWhere( + 'LOWER(application_owner.organization_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ), + ), + ) + .getMany(); + promises.push(promise); + } + + private addParcelResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + let query = this.noiSubmissionRepository + .createQueryBuilder('noiSub') + .select('noiSub.fileNumber') + .leftJoin( NoticeOfIntentParcel, 'parcel', - 'parcel.notice_of_intent_submission_uuid = noiSearch.uuid', + 'parcel.notice_of_intent_submission_uuid = noiSub.uuid', ); - } if (searchDto.pid) { query = query.andWhere('parcel.pid = :pid', { pid: searchDto.pid }); @@ -278,53 +366,75 @@ export class NoticeOfIntentAdvancedSearchService { }, ); } - return query; + + promises.push(query.getMany()); + } + + private addFileTypeResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + if (searchDto.fileTypes.includes('NOI')) { + const query = this.noiRepository.find({ + select: { + fileNumber: true, + }, + }); + + promises.push(query); + } } - private compileSearchByNameQuery( + private addSubmittedDateResults( searchDto: SearchRequestDto, - query: SelectQueryBuilder, + promises: Promise<{ fileNumber: string }[]>[], ) { - if (searchDto.name) { - const formattedSearchString = - formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); - - query = query - .leftJoin( - NoticeOfIntentOwner, - 'notice_of_intent_owner', - 'notice_of_intent_owner.notice_of_intent_submission_uuid = noiSearch.uuid', - ) - .andWhere( - new Brackets((qb) => - qb - .where( - "LOWER(notice_of_intent_owner.first_name || ' ' || notice_of_intent_owner.last_name) LIKE ANY (:names)", - { - names: formattedSearchString, - }, - ) - .orWhere( - 'LOWER(notice_of_intent_owner.first_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ) - .orWhere( - 'LOWER(notice_of_intent_owner.last_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ) - .orWhere( - 'LOWER(notice_of_intent_owner.organization_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ), - ), - ); + let query = this.noiRepository + .createQueryBuilder('noi') + .select('noi.fileNumber'); + + if (searchDto.dateSubmittedFrom !== undefined) { + query = query.andWhere('noi.date_submitted_to_alc >= :date_submitted', { + date_submitted: new Date(searchDto.dateSubmittedFrom), + }); + } + + if (searchDto.dateSubmittedTo !== undefined) { + query = query.andWhere('noi.date_submitted_to_alc <= :date_submitted', { + date_submitted: new Date(searchDto.dateSubmittedTo), + }); + } + promises.push(query.getMany()); + } + + private addDecisionDateResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + let query = this.noiRepository + .createQueryBuilder('noi') + .select('noi.fileNumber') + .innerJoin( + NoticeOfIntentDecision, + 'decision', + 'decision.notice_of_intent_uuid = "noi"."uuid" AND decision.is_draft = false', + ); + + if (searchDto.dateDecidedFrom) { + query = query.andWhere('decision.date >= :decision_date', { + decision_date: getStartOfDayToPacific( + searchDto.dateDecidedFrom, + ).toISOString(), + }); + } + + if (searchDto.dateDecidedTo) { + query = query.andWhere('decision.date <= :decision_date_to', { + decision_date_to: getNextDayToPacific( + searchDto.dateDecidedTo, + ).toISOString(), + }); } - return query; + promises.push(query.getMany()); } } diff --git a/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.spec.ts b/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.spec.ts index e2995795db..cb9d5e13b3 100644 --- a/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.spec.ts +++ b/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.spec.ts @@ -1,8 +1,12 @@ +import { RedisService } from '@app/common/redis/redis.service'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; +import { createMockQuery } from '../../../../test/mocks/mockTypes'; +import { NotificationSubmission } from '../../../portal/notification-submission/notification-submission.entity'; import { LocalGovernment } from '../../local-government/local-government.entity'; +import { Notification } from '../../notification/notification.entity'; import { SearchRequestDto } from '../search.dto'; import { NotificationAdvancedSearchService } from './notification-advanced-search.service'; import { NotificationSubmissionSearchView } from './notification-search-view.entity'; @@ -13,6 +17,12 @@ describe('NotificationAdvancedSearchService', () => { Repository >; let mockLocalGovernmentRepository: DeepMocked>; + let mockNotificationRepo: DeepMocked>; + let mockNotificationSubmissionRepo: DeepMocked< + Repository + >; + let mockRedisService: DeepMocked; + const sortFields = [ 'fileId', 'type', @@ -47,20 +57,11 @@ describe('NotificationAdvancedSearchService', () => { beforeEach(async () => { mockNotificationSubmissionSearchViewRepository = createMock(); mockLocalGovernmentRepository = createMock(); + mockNotificationRepo = createMock(); + mockNotificationSubmissionRepo = createMock(); + mockRedisService = createMock(); - mockQuery = { - getManyAndCount: jest.fn().mockResolvedValue([[], 0]), - orderBy: jest.fn().mockReturnThis(), - offset: jest.fn().mockReturnThis(), - limit: jest.fn().mockReturnThis(), - innerJoinAndMapOne: jest.fn().mockReturnThis(), - groupBy: jest.fn().mockReturnThis(), - where: jest.fn().mockReturnThis(), - andWhere: jest.fn().mockReturnThis(), - setParameters: jest.fn().mockReturnThis(), - leftJoin: jest.fn().mockReturnThis(), - withDeleted: jest.fn().mockReturnThis(), - }; + mockQuery = createMockQuery(); const module: TestingModule = await Test.createTestingModule({ providers: [ @@ -73,6 +74,18 @@ describe('NotificationAdvancedSearchService', () => { provide: getRepositoryToken(LocalGovernment), useValue: mockLocalGovernmentRepository, }, + { + provide: getRepositoryToken(Notification), + useValue: mockNotificationRepo, + }, + { + provide: getRepositoryToken(NotificationSubmission), + useValue: mockNotificationSubmissionRepo, + }, + { + provide: RedisService, + useValue: mockRedisService, + }, ], }).compile(); @@ -80,9 +93,18 @@ describe('NotificationAdvancedSearchService', () => { NotificationAdvancedSearchService, ); + mockNotificationSubmissionSearchViewRepository.createQueryBuilder.mockReturnValue( + mockQuery as any, + ); + mockLocalGovernmentRepository.findOneByOrFail.mockResolvedValue( new LocalGovernment(), ); + + mockRedisService.getClient.mockReturnValue({ + get: async () => null, + setEx: async () => null, + } as any); }); it('should be defined', () => { @@ -90,28 +112,32 @@ describe('NotificationAdvancedSearchService', () => { }); it('should successfully build a query using all search parameters defined', async () => { - mockNotificationSubmissionSearchViewRepository.createQueryBuilder.mockReturnValue( - mockQuery as any, + mockNotificationRepo.find.mockResolvedValue([]); + mockNotificationRepo.createQueryBuilder.mockReturnValue(mockQuery); + mockNotificationSubmissionRepo.createQueryBuilder.mockReturnValue( + mockQuery, ); - const result = await service.search(mockSearchDto); + const result = await service.search(mockSearchDto, {} as any); expect(result).toEqual({ data: [], total: 0 }); + expect(mockQuery.andWhere).toHaveBeenCalledTimes(4); expect( - mockNotificationSubmissionSearchViewRepository.createQueryBuilder, - ).toBeCalledTimes(1); - expect(mockQuery.andWhere).toBeCalledTimes(9); + mockNotificationSubmissionRepo.createQueryBuilder, + ).toHaveBeenCalledTimes(3); + expect(mockNotificationRepo.createQueryBuilder).toHaveBeenCalledTimes(2); + expect(mockNotificationRepo.find).toHaveBeenCalledTimes(3); }); - it('should call compileNotificationSearchQuery method correctly', async () => { - const compileSearchQuerySpy = jest - .spyOn(service as any, 'compileNotificationSearchQuery') - .mockResolvedValue(mockQuery); + it('should call searchForFileNumbers method correctly', async () => { + const searchForFileNumbersSpy = jest + .spyOn(service as any, 'searchForFileNumbers') + .mockResolvedValue(new Set(['100000'])); - const result = await service.search(mockSearchDto); + const result = await service.search(mockSearchDto, {} as any); expect(result).toEqual({ data: [], total: 0 }); - expect(compileSearchQuerySpy).toBeCalledWith(mockSearchDto); + expect(searchForFileNumbersSpy).toHaveBeenCalledWith(mockSearchDto); expect(mockQuery.orderBy).toHaveBeenCalledTimes(1); expect(mockQuery.offset).toHaveBeenCalledTimes(1); expect(mockQuery.limit).toHaveBeenCalledTimes(1); @@ -119,17 +145,17 @@ describe('NotificationAdvancedSearchService', () => { sortFields.forEach((sortField) => { it(`should sort by ${sortField}`, async () => { - const compileSearchQuerySpy = jest - .spyOn(service as any, 'compileNotificationSearchQuery') - .mockResolvedValue(mockQuery); + const searchForFileNumbersSpy = jest + .spyOn(service as any, 'searchForFileNumbers') + .mockResolvedValue(new Set(['100000'])); mockSearchDto.sortField = sortField; mockSearchDto.sortDirection = 'DESC'; - const result = await service.search(mockSearchDto); + const result = await service.search(mockSearchDto, {} as any); expect(result).toEqual({ data: [], total: 0 }); - expect(compileSearchQuerySpy).toHaveBeenCalledWith(mockSearchDto); + expect(searchForFileNumbersSpy).toHaveBeenCalledWith(mockSearchDto); expect(mockQuery.orderBy).toHaveBeenCalledTimes(1); expect(mockQuery.offset).toHaveBeenCalledTimes(1); expect(mockQuery.limit).toHaveBeenCalledTimes(1); diff --git a/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.ts index 228e62a7c7..655216c9ff 100644 --- a/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.ts @@ -1,32 +1,74 @@ -import { Injectable } from '@nestjs/common'; +import { RedisService } from '@app/common/redis/redis.service'; +import { Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; -import { Brackets, Repository, SelectQueryBuilder } from 'typeorm'; +import * as hash from 'object-hash'; +import { QueryRunner, Repository } from 'typeorm'; import { NotificationParcel } from '../../../portal/notification-submission/notification-parcel/notification-parcel.entity'; +import { NotificationSubmission } from '../../../portal/notification-submission/notification-submission.entity'; import { NotificationTransferee } from '../../../portal/notification-submission/notification-transferee/notification-transferee.entity'; -import { - getNextDayToPacific, - getStartOfDayToPacific, -} from '../../../utils/pacific-date-time-helper'; import { formatStringToPostgresSearchStringArrayWithWildCard } from '../../../utils/search-helper'; +import { intersectSets } from '../../../utils/set-helper'; import { LocalGovernment } from '../../local-government/local-government.entity'; +import { Notification } from '../../notification/notification.entity'; import { AdvancedSearchResultDto, SearchRequestDto } from '../search.dto'; import { NotificationSubmissionSearchView } from './notification-search-view.entity'; @Injectable() export class NotificationAdvancedSearchService { + private logger: Logger = new Logger(NotificationAdvancedSearchService.name); + constructor( @InjectRepository(NotificationSubmissionSearchView) - private notificationSearchViewRepo: Repository, + private notificationSearchRepository: Repository, + @InjectRepository(Notification) + private notificationRepository: Repository, + @InjectRepository(NotificationSubmission) + private notificationSubmissionRepository: Repository, @InjectRepository(LocalGovernment) private governmentRepository: Repository, + private redisService: RedisService, ) {} async search( searchDto: SearchRequestDto, + queryRunner: QueryRunner, ): Promise> { - let query = await this.compileNotificationSearchQuery(searchDto); + const searchHash = hash(searchDto); + const searchKey = `search_alcs_notification_${searchHash}`; + + const client = this.redisService.getClient(); + const cachedSearch = await client.get(searchKey); + + let fileNumbers = new Set(); + if (cachedSearch) { + const cachedNumbers = JSON.parse(cachedSearch) as string[]; + fileNumbers = new Set(cachedNumbers); + } else { + fileNumbers = await this.searchForFileNumbers(searchDto); + await client.setEx( + searchKey, + 180, //Seconds + JSON.stringify([...fileNumbers.values()]), + ); + } + + if (fileNumbers.size === 0) { + return { + data: [], + total: 0, + }; + } - query = this.compileGroupBySearchQuery(query); + let query = this.notificationSearchRepository + .createQueryBuilder('notificationSearch', queryRunner) + .innerJoinAndMapOne( + 'notificationSearch.notificationType', + 'notificationSearch.notificationType', + 'notificationType', + ) + .andWhere('notificationSearch.fileNumber IN(:...fileNumbers)', { + fileNumbers: [...fileNumbers.values()], + }); const sortQuery = this.compileSortQuery(searchDto); @@ -39,11 +81,14 @@ export class NotificationAdvancedSearchService { .offset((searchDto.page - 1) * searchDto.pageSize) .limit(searchDto.pageSize); - const result = await query.getManyAndCount(); + const t0 = performance.now(); + const results = await Promise.all([query.getMany(), query.getCount()]); + const t1 = performance.now(); + this.logger.debug(`Notification ALCS search took ${t1 - t0} milliseconds.`); return { - data: result[0], - total: result[1], + data: results[0], + total: results[1], }; } @@ -70,131 +115,176 @@ export class NotificationAdvancedSearchService { } } - private compileGroupBySearchQuery( - query: SelectQueryBuilder, - ) { - query = query - // FIXME: This is a quick fix for the search performance issues. It temporarily allows - // submissions with deleted submission types to be shown. For now, there are no - // deleted submission types, so this should be fine, but should be fixed soon. - .withDeleted() - .innerJoinAndMapOne( - 'notificationSearch.notificationType', - 'notificationSearch.notificationType', - 'notificationType', - ) - .groupBy( - ` - "notificationSearch"."uuid" - , "notificationSearch"."notification_uuid" - , "notificationSearch"."notification_region_code" - , "notificationSearch"."file_number" - , "notificationSearch"."applicant" - , "notificationSearch"."local_government_uuid" - , "notificationSearch"."local_government_name" - , "notificationSearch"."notification_type_code" - , "notificationSearch"."status" - , "notificationSearch"."date_submitted_to_alc" - , "notificationType"."audit_deleted_date_at" - , "notificationType"."audit_created_at" - , "notificationType"."audit_updated_by" - , "notificationType"."audit_updated_at" - , "notificationType"."audit_created_by" - , "notificationType"."short_label" - , "notificationType"."label" - , "notificationType"."code" - , "notificationType"."html_description" - , "notificationType"."portal_label" - `, - ); - return query; - } - - private async compileNotificationSearchQuery(searchDto: SearchRequestDto) { - let query = - this.notificationSearchViewRepo.createQueryBuilder('notificationSearch'); + private async searchForFileNumbers(searchDto: SearchRequestDto) { + const promises: Promise<{ fileNumber: string }[]>[] = []; if (searchDto.fileNumber) { - query = query - .andWhere('notificationSearch.file_number = :fileNumber') - .setParameters({ fileNumber: searchDto.fileNumber ?? null }); + this.addFileNumberResults(searchDto, promises); } if (searchDto.portalStatusCode) { - query = query.andWhere( - "alcs.get_current_status_for_notification_submission_by_uuid(notificationSearch.uuid) ->> 'status_type_code' = :status", - { - status: searchDto.portalStatusCode, - }, - ); + this.addPortalStatusResults(searchDto, promises); } if (searchDto.governmentName) { - const government = await this.governmentRepository.findOneByOrFail({ - name: searchDto.governmentName, - }); - - query = query.andWhere( - 'notificationSearch.local_government_uuid = :local_government_uuid', - { - local_government_uuid: government.uuid, - }, - ); + await this.addGovernmentResults(searchDto, promises); } if (searchDto.regionCode) { - query = query.andWhere( - 'notificationSearch.notification_region_code = :region_code', - { - region_code: searchDto.regionCode, - }, - ); + this.addRegionResults(searchDto, promises); } - query = this.compileSearchByNameQuery(searchDto, query); - query = this.compileParcelSearchQuery(searchDto, query); - query = this.compileDateRangeSearchQuery(searchDto, query); + if (searchDto.name) { + this.addNameResults(searchDto, promises); + } - return query; + if (searchDto.pid || searchDto.civicAddress) { + this.addParcelResults(searchDto, promises); + } + if (searchDto.fileTypes.length > 0) { + this.addFileTypeResults(searchDto, promises); + } + + if (searchDto.dateSubmittedTo || searchDto.dateSubmittedFrom) { + this.addSubmittedDateResults(searchDto, promises); + } + + //Intersect Sets + const t0 = performance.now(); + const queryResults = await Promise.all(promises); + + const allIds: Set[] = []; + for (const result of queryResults) { + const fileNumbers = new Set(); + result.forEach((currentValue) => { + fileNumbers.add(currentValue.fileNumber); + }); + allIds.push(fileNumbers); + } + + const finalResult = intersectSets(allIds); + + const t1 = performance.now(); + this.logger.debug( + `ALCS Application pre-search search took ${t1 - t0} milliseconds.`, + ); + return finalResult; } - private compileDateRangeSearchQuery(searchDto: SearchRequestDto, query) { - if (searchDto.dateSubmittedFrom) { - query = query.andWhere( - 'notificationSearch.date_submitted_to_alc >= :date_submitted_from_alc', + private addFileNumberResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const promise = this.notificationRepository.find({ + where: { + fileNumber: searchDto.fileNumber, + }, + select: { + fileNumber: true, + }, + }); + promises.push(promise); + } + + private addPortalStatusResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const promise = this.notificationSubmissionRepository + .createQueryBuilder('notiSub') + .select('notiSub.fileNumber') + .where( + "alcs.get_current_status_for_notification_submission_by_uuid(notiSub.uuid) ->> 'status_type_code' = :statusCode", { - date_submitted_from_alc: getStartOfDayToPacific( - searchDto.dateSubmittedFrom, - ).toISOString(), + statusCode: searchDto.portalStatusCode, }, - ); - } + ) + .getMany(); + promises.push(promise); + } - if (searchDto.dateSubmittedTo) { - query = query.andWhere( - 'notificationSearch.date_submitted_to_alc < :date_submitted_to_alc', + private async addGovernmentResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const government = await this.governmentRepository.findOneByOrFail({ + name: searchDto.governmentName, + }); + + const promise = this.notificationRepository.find({ + where: { + localGovernmentUuid: government.uuid, + }, + select: { + fileNumber: true, + }, + }); + promises.push(promise); + } + + private addRegionResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const promise = this.notificationRepository.find({ + where: { + regionCode: searchDto.regionCode, + }, + select: { + fileNumber: true, + }, + }); + promises.push(promise); + } + + private addNameResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const formattedSearchString = + formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); + const promise = this.notificationSubmissionRepository + .createQueryBuilder('notiSub') + .select('notiSub.fileNumber') + .leftJoin( + NotificationTransferee, + 'notification_transferee', + 'notification_transferee.notification_submission_uuid = notificationSearch.uuid', + ) + .where( + "LOWER(notification_transferee.first_name || ' ' || notification_transferee.last_name) LIKE ANY (:names)", { - date_submitted_to_alc: getNextDayToPacific( - searchDto.dateSubmittedTo, - ).toISOString(), + names: formattedSearchString, }, - ); - } - - return query; + ) + .orWhere('LOWER(notification_transferee.first_name) LIKE ANY (:names)', { + names: formattedSearchString, + }) + .orWhere('LOWER(notification_transferee.last_name) LIKE ANY (:names)', { + names: formattedSearchString, + }) + .orWhere( + 'LOWER(notification_transferee.organization_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ) + .getMany(); + promises.push(promise); } - private compileParcelSearchQuery( + private addParcelResults( searchDto: SearchRequestDto, - query: SelectQueryBuilder, + promises: Promise<{ fileNumber: string }[]>[], ) { - if (searchDto.pid || searchDto.civicAddress) { - query = query.leftJoin( + let query = this.notificationSubmissionRepository + .createQueryBuilder('notiSub') + .select('notiSub.fileNumber') + .leftJoin( NotificationParcel, 'parcel', - 'parcel.notification_submission_uuid = notificationSearch.uuid', + 'parcel.notification_submission_uuid = notiSub.uuid', ); - } if (searchDto.pid) { query = query.andWhere('parcel.pid = :pid', { pid: searchDto.pid }); @@ -208,53 +298,48 @@ export class NotificationAdvancedSearchService { }, ); } - return query; + + promises.push(query.getMany()); } - private compileSearchByNameQuery( + private addFileTypeResults( searchDto: SearchRequestDto, - query: SelectQueryBuilder, + promises: Promise<{ fileNumber: string }[]>[], ) { - if (searchDto.name) { - const formattedSearchString = - formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); - - query = query - .leftJoin( - NotificationTransferee, - 'notification_transferee', - 'notification_transferee.notification_submission_uuid = notificationSearch.uuid', - ) - .andWhere( - new Brackets((qb) => - qb - .where( - "LOWER(notification_transferee.first_name || ' ' || notification_transferee.last_name) LIKE ANY (:names)", - { - names: formattedSearchString, - }, - ) - .orWhere( - 'LOWER(notification_transferee.first_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ) - .orWhere( - 'LOWER(notification_transferee.last_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ) - .orWhere( - 'LOWER(notification_transferee.organization_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ), - ), - ); + const query = this.notificationRepository + .createQueryBuilder('notification') + .select('notification.fileNumber') + .where('notification.type_code IN (:...typeCodes)', { + typeCodes: searchDto.fileTypes, + }); + promises.push(query.getMany()); + } + + private addSubmittedDateResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + let query = this.notificationRepository + .createQueryBuilder('notification') + .select('notification.fileNumber'); + + if (searchDto.dateSubmittedFrom !== undefined) { + query = query.andWhere( + 'notification.date_submitted_to_alc >= :date_submitted', + { + date_submitted: new Date(searchDto.dateSubmittedFrom), + }, + ); + } + + if (searchDto.dateSubmittedTo !== undefined) { + query = query.andWhere( + 'notification.date_submitted_to_alc <= :date_submitted', + { + date_submitted: new Date(searchDto.dateSubmittedTo), + }, + ); } - return query; + promises.push(query.getMany()); } } diff --git a/services/apps/alcs/src/alcs/search/planning-review/planning-review-advanced-search.service.spec.ts b/services/apps/alcs/src/alcs/search/planning-review/planning-review-advanced-search.service.spec.ts index 088e8db422..6f9552220f 100644 --- a/services/apps/alcs/src/alcs/search/planning-review/planning-review-advanced-search.service.spec.ts +++ b/services/apps/alcs/src/alcs/search/planning-review/planning-review-advanced-search.service.spec.ts @@ -1,8 +1,11 @@ +import { RedisService } from '@app/common/redis/redis.service'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; +import { createMockQuery } from '../../../../test/mocks/mockTypes'; import { LocalGovernment } from '../../local-government/local-government.entity'; +import { PlanningReview } from '../../planning-review/planning-review.entity'; import { SearchRequestDto } from '../search.dto'; import { PlanningReviewAdvancedSearchService } from './planning-review-advanced-search.service'; import { PlanningReviewSearchView } from './planning-review-search-view.entity'; @@ -11,6 +14,9 @@ describe('PlanningReviewAdvancedSearchService', () => { let service: PlanningReviewAdvancedSearchService; let mockPRSearchView: DeepMocked>; let mockLocalGovernmentRepository: DeepMocked>; + let mockPlanningReviewRepository: DeepMocked>; + let mockRedisService: DeepMocked; + const sortFields = [ 'fileId', 'type', @@ -45,20 +51,10 @@ describe('PlanningReviewAdvancedSearchService', () => { beforeEach(async () => { mockPRSearchView = createMock(); mockLocalGovernmentRepository = createMock(); + mockPlanningReviewRepository = createMock(); + mockRedisService = createMock(); - mockQuery = { - getManyAndCount: jest.fn().mockResolvedValue([[], 0]), - orderBy: jest.fn().mockReturnThis(), - offset: jest.fn().mockReturnThis(), - limit: jest.fn().mockReturnThis(), - innerJoinAndMapOne: jest.fn().mockReturnThis(), - groupBy: jest.fn().mockReturnThis(), - where: jest.fn().mockReturnThis(), - andWhere: jest.fn().mockReturnThis(), - setParameters: jest.fn().mockReturnThis(), - leftJoin: jest.fn().mockReturnThis(), - withDeleted: jest.fn().mockReturnThis(), - }; + mockQuery = createMockQuery(); const module: TestingModule = await Test.createTestingModule({ providers: [ @@ -71,6 +67,14 @@ describe('PlanningReviewAdvancedSearchService', () => { provide: getRepositoryToken(LocalGovernment), useValue: mockLocalGovernmentRepository, }, + { + provide: getRepositoryToken(PlanningReview), + useValue: mockPlanningReviewRepository, + }, + { + provide: RedisService, + useValue: mockRedisService, + }, ], }).compile(); @@ -81,6 +85,13 @@ describe('PlanningReviewAdvancedSearchService', () => { mockLocalGovernmentRepository.findOneByOrFail.mockResolvedValue( new LocalGovernment(), ); + + mockPRSearchView.createQueryBuilder.mockReturnValue(mockQuery); + + mockRedisService.getClient.mockReturnValue({ + get: async () => null, + setEx: async () => null, + } as any); }); it('should be defined', () => { @@ -88,24 +99,28 @@ describe('PlanningReviewAdvancedSearchService', () => { }); it('should successfully build a query using all search parameters defined', async () => { - mockPRSearchView.createQueryBuilder.mockReturnValue(mockQuery as any); + mockPlanningReviewRepository.find.mockResolvedValue([]); + mockPlanningReviewRepository.createQueryBuilder.mockReturnValue(mockQuery); - const result = await service.search(mockSearchDto); + const result = await service.search(mockSearchDto, {} as any); expect(result).toEqual({ data: [], total: 0 }); - expect(mockPRSearchView.createQueryBuilder).toHaveBeenCalledTimes(1); - expect(mockQuery.andWhere).toHaveBeenCalledTimes(9); + expect(mockPlanningReviewRepository.find).toHaveBeenCalledTimes(3); + expect( + mockPlanningReviewRepository.createQueryBuilder, + ).toHaveBeenCalledTimes(5); + expect(mockQuery.andWhere).toHaveBeenCalledTimes(6); }); - it('should call compileSearchQuery method correctly', async () => { - const compileSearchQuerySpy = jest - .spyOn(service as any, 'compileSearchQuery') - .mockResolvedValue(mockQuery); + it('should call searchForFileNumbers method correctly', async () => { + const searchForFileNumbersSpy = jest + .spyOn(service as any, 'searchForFileNumbers') + .mockResolvedValue(new Set(['100000'])); - const result = await service.search(mockSearchDto); + const result = await service.search(mockSearchDto, {} as any); expect(result).toEqual({ data: [], total: 0 }); - expect(compileSearchQuerySpy).toHaveBeenCalledWith(mockSearchDto); + expect(searchForFileNumbersSpy).toHaveBeenCalledWith(mockSearchDto); expect(mockQuery.orderBy).toHaveBeenCalledTimes(1); expect(mockQuery.offset).toHaveBeenCalledTimes(1); expect(mockQuery.limit).toHaveBeenCalledTimes(1); @@ -113,17 +128,17 @@ describe('PlanningReviewAdvancedSearchService', () => { sortFields.forEach((sortField) => { it(`should sort by ${sortField}`, async () => { - const compileSearchQuerySpy = jest - .spyOn(service as any, 'compileSearchQuery') - .mockResolvedValue(mockQuery); + const searchForFileNumbersSpy = jest + .spyOn(service as any, 'searchForFileNumbers') + .mockResolvedValue(new Set(['100000'])); mockSearchDto.sortField = sortField; mockSearchDto.sortDirection = 'DESC'; - const result = await service.search(mockSearchDto); + const result = await service.search(mockSearchDto, {} as any); expect(result).toEqual({ data: [], total: 0 }); - expect(compileSearchQuerySpy).toHaveBeenCalledWith(mockSearchDto); + expect(searchForFileNumbersSpy).toHaveBeenCalledWith(mockSearchDto); expect(mockQuery.orderBy).toHaveBeenCalledTimes(1); expect(mockQuery.offset).toHaveBeenCalledTimes(1); expect(mockQuery.limit).toHaveBeenCalledTimes(1); diff --git a/services/apps/alcs/src/alcs/search/planning-review/planning-review-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/planning-review/planning-review-advanced-search.service.ts index 2af8db9c5d..d5dcdd6ab9 100644 --- a/services/apps/alcs/src/alcs/search/planning-review/planning-review-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/planning-review/planning-review-advanced-search.service.ts @@ -1,29 +1,70 @@ -import { Injectable } from '@nestjs/common'; +import { RedisService } from '@app/common/redis/redis.service'; +import { Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; -import { Repository, SelectQueryBuilder } from 'typeorm'; +import * as hash from 'object-hash'; +import { QueryRunner, Repository } from 'typeorm'; import { getNextDayToPacific, getStartOfDayToPacific, } from '../../../utils/pacific-date-time-helper'; import { formatStringToPostgresSearchStringArrayWithWildCard } from '../../../utils/search-helper'; +import { intersectSets } from '../../../utils/set-helper'; import { LocalGovernment } from '../../local-government/local-government.entity'; +import { PlanningReferral } from '../../planning-review/planning-referral/planning-referral.entity'; import { PlanningReviewDecision } from '../../planning-review/planning-review-decision/planning-review-decision.entity'; +import { PlanningReview } from '../../planning-review/planning-review.entity'; import { AdvancedSearchResultDto, SearchRequestDto } from '../search.dto'; import { PlanningReviewSearchView } from './planning-review-search-view.entity'; @Injectable() export class PlanningReviewAdvancedSearchService { + private logger: Logger = new Logger(PlanningReviewAdvancedSearchService.name); + constructor( @InjectRepository(PlanningReviewSearchView) - private planningReviewSearchRepo: Repository, + private planningReviewSearchRepository: Repository, + @InjectRepository(PlanningReview) + private planningReviewRepository: Repository, @InjectRepository(LocalGovernment) private governmentRepository: Repository, + private redisService: RedisService, ) {} async search( searchDto: SearchRequestDto, + queryRunner: QueryRunner, ): Promise> { - let query = await this.compileSearchQuery(searchDto); + const searchHash = hash(searchDto); + const searchKey = `search_alcs_planning_review_${searchHash}`; + + const client = this.redisService.getClient(); + const cachedSearch = await client.get(searchKey); + + let fileNumbers = new Set(); + if (cachedSearch) { + const cachedNumbers = JSON.parse(cachedSearch) as string[]; + fileNumbers = new Set(cachedNumbers); + } else { + fileNumbers = await this.searchForFileNumbers(searchDto); + await client.setEx( + searchKey, + 180, //Seconds + JSON.stringify([...fileNumbers.values()]), + ); + } + + if (fileNumbers.size === 0) { + return { + data: [], + total: 0, + }; + } + + let query = this.planningReviewSearchRepository + .createQueryBuilder('planningReviewSearch', queryRunner) + .where('planningReviewSearch.fileNumber IN(:...fileNumbers)', { + fileNumbers: [...fileNumbers.values()], + }); const sortQuery = this.compileSortQuery(searchDto); @@ -36,11 +77,16 @@ export class PlanningReviewAdvancedSearchService { .offset((searchDto.page - 1) * searchDto.pageSize) .limit(searchDto.pageSize); - const result = await query.getManyAndCount(); + const t0 = performance.now(); + const results = await Promise.all([query.getMany(), query.getCount()]); + const t1 = performance.now(); + this.logger.debug( + `ALCS Planning Review search took ${t1 - t0} milliseconds.`, + ); return { - data: result[0], - total: result[1], + data: results[0], + total: results[1], }; } @@ -67,144 +113,225 @@ export class PlanningReviewAdvancedSearchService { } } - private async compileSearchQuery(searchDto: SearchRequestDto) { - let query = this.planningReviewSearchRepo.createQueryBuilder( - 'planningReviewSearch', - ); + private async searchForFileNumbers(searchDto: SearchRequestDto) { + const promises: Promise<{ fileNumber: string }[]>[] = []; if (searchDto.fileNumber) { - query = query - .andWhere('planningReviewSearch.file_number = :fileNumber') - .setParameters({ fileNumber: searchDto.fileNumber ?? null }); + this.addFileNumberResults(searchDto, promises); } if (searchDto.governmentName) { - const government = await this.governmentRepository.findOneByOrFail({ - name: searchDto.governmentName, - }); - - query = query.andWhere( - 'planningReviewSearch.local_government_uuid = :local_government_uuid', - { - local_government_uuid: government.uuid, - }, - ); + await this.addGovernmentResults(searchDto, promises); } if (searchDto.regionCode) { - query = query.andWhere( - 'planningReviewSearch.region_code = :region_code', - { - region_code: searchDto.regionCode, - }, - ); + this.addRegionResults(searchDto, promises); } - query = this.compileSearchByNameQuery(searchDto, query); - query = this.compileDecisionSearchQuery(searchDto, query); - query = this.compileDateRangeSearchQuery(searchDto, query); - query = this.compileSearchByTypeQuery(searchDto, query); + if (searchDto.name) { + this.addNameResults(searchDto, promises); + } - return query; + if (searchDto.resolutionNumber || searchDto.resolutionYear) { + this.addDecisionResolutionResults(searchDto, promises); + } + + if (searchDto.fileTypes.length > 0) { + this.addFileTypeResults(searchDto, promises); + } + + if (searchDto.dateSubmittedTo || searchDto.dateSubmittedFrom) { + this.addSubmittedDateResults(searchDto, promises); + } + + if (searchDto.dateDecidedFrom || searchDto.dateDecidedTo) { + this.addDecisionDateResults(searchDto, promises); + } + + //Intersect Sets + const t0 = performance.now(); + const queryResults = await Promise.all(promises); + + const allIds: Set[] = []; + for (const result of queryResults) { + const fileNumbers = new Set(); + result.forEach((currentValue) => { + fileNumbers.add(currentValue.fileNumber); + }); + allIds.push(fileNumbers); + } + + const finalResult = intersectSets(allIds); + + const t1 = performance.now(); + this.logger.debug( + `ALCS Planning Review pre-search search took ${t1 - t0} milliseconds.`, + ); + return finalResult; } - private compileDateRangeSearchQuery( + private addFileNumberResults( searchDto: SearchRequestDto, - query: SelectQueryBuilder, + promises: Promise<{ fileNumber: string }[]>[], ) { - if (searchDto.dateSubmittedFrom) { - query = query.andWhere( - 'planningReviewSearch.date_submitted_to_alc >= :date_submitted_from_alc', - { - date_submitted_from_alc: getStartOfDayToPacific( - searchDto.dateSubmittedFrom, - ).toISOString(), - }, - ); - } + const promise = this.planningReviewRepository.find({ + where: { + fileNumber: searchDto.fileNumber, + }, + select: { + fileNumber: true, + }, + }); + promises.push(promise); + } - if (searchDto.dateSubmittedTo) { - query = query.andWhere( - 'planningReviewSearch.date_submitted_to_alc < :date_submitted_to_alc', - { - date_submitted_to_alc: getNextDayToPacific( - searchDto.dateSubmittedTo, - ).toISOString(), - }, + private async addGovernmentResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const government = await this.governmentRepository.findOneByOrFail({ + name: searchDto.governmentName, + }); + + const promise = this.planningReviewRepository.find({ + where: { + localGovernmentUuid: government.uuid, + }, + select: { + fileNumber: true, + }, + }); + promises.push(promise); + } + + private addRegionResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const promise = this.planningReviewRepository.find({ + where: { + regionCode: searchDto.regionCode, + }, + select: { + fileNumber: true, + }, + }); + promises.push(promise); + } + + private addNameResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const formattedSearchString = + formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); + + const promise = this.planningReviewRepository + .createQueryBuilder('planningReview') + .select('planningReview.fileNumber') + .where('LOWER(planningReview.document_name) LIKE ANY (:names)', { + names: formattedSearchString, + }) + .getMany(); + promises.push(promise); + } + + private addDecisionResolutionResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const query = this.planningReviewRepository + .createQueryBuilder('planningReview') + .select('planningReview.fileNumber') + .leftJoin( + PlanningReviewDecision, + 'decision', + 'decision.planning_review_uuid = "planningReview"."uuid" AND decision.is_draft = false', ); + + if (searchDto.resolutionNumber !== undefined) { + query.andWhere('decision.resolution_number = :resolution_number', { + resolution_number: searchDto.resolutionNumber, + }); } - return query; + if (searchDto.resolutionYear !== undefined) { + query.andWhere('decision.resolution_year = :resolution_year', { + resolution_year: searchDto.resolutionYear, + }); + } + promises.push(query.getMany()); } - private compileDecisionSearchQuery( + private addFileTypeResults( searchDto: SearchRequestDto, - query: SelectQueryBuilder, + promises: Promise<{ fileNumber: string }[]>[], ) { - if ( - searchDto.resolutionNumber !== undefined || - searchDto.resolutionYear !== undefined - ) { - query = this.joinDecision(query); - - if (searchDto.resolutionNumber !== undefined) { - query = query.andWhere( - 'decision.resolution_number = :resolution_number AND decision.is_draft = false', - { - resolution_number: searchDto.resolutionNumber, - }, - ); - } - - if (searchDto.resolutionYear !== undefined) { - query = query.andWhere('decision.resolution_year = :resolution_year', { - resolution_year: searchDto.resolutionYear, - }); - } - } - return query; - } + const query = this.planningReviewRepository + .createQueryBuilder('planningReview') + .select('planningReview.fileNumber') + .where('planningReview.type_code IN (:...typeCodes)', { + typeCodes: searchDto.fileTypes, + }); - private joinDecision(query: any) { - query = query.leftJoin( - PlanningReviewDecision, - 'decision', - 'decision.planning_review_uuid = "planningReviewSearch"."uuid" AND decision.is_draft = false', - ); - return query; + promises.push(query.getMany()); } - private compileSearchByNameQuery( + private addSubmittedDateResults( searchDto: SearchRequestDto, - query: SelectQueryBuilder, + promises: Promise<{ fileNumber: string }[]>[], ) { - if (searchDto.name) { - const formattedSearchString = - formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); - - query = query.andWhere( - 'LOWER(planningReviewSearch.document_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, + const query = this.planningReviewRepository + .createQueryBuilder('planningReview') + .select('planningReview.fileNumber') + .innerJoin( + PlanningReferral, + 'referral', + 'planningReview.uuid = referral.planning_review_uuid', ); + + if (searchDto.dateSubmittedFrom !== undefined) { + query.andWhere('referral.submission_date >= :date_submitted', { + date_submitted: new Date(searchDto.dateSubmittedFrom), + }); } - return query; + + if (searchDto.dateSubmittedTo !== undefined) { + query.andWhere('referral.submission_date <= :date_submitted', { + date_submitted: new Date(searchDto.dateSubmittedTo), + }); + } + promises.push(query.getMany()); } - private compileSearchByTypeQuery( + private addDecisionDateResults( searchDto: SearchRequestDto, - query: SelectQueryBuilder, + promises: Promise<{ fileNumber: string }[]>[], ) { - if (searchDto.fileTypes.length > 0) { - query = query.andWhere( - 'planningReviewSearch.planning_review_type_code IN (:...typeCodes)', - { - typeCodes: searchDto.fileTypes, - }, + const query = this.planningReviewRepository + .createQueryBuilder('planningReview') + .select('planningReview.fileNumber') + .innerJoin( + PlanningReviewDecision, + 'decision', + 'decision.planning_review_uuid = "planningReview"."uuid" AND decision.is_draft = false', ); + + if (searchDto.dateDecidedFrom) { + query.andWhere('decision.date >= :decision_date', { + decision_date: getStartOfDayToPacific( + searchDto.dateDecidedFrom, + ).toISOString(), + }); } - return query; + if (searchDto.dateDecidedTo) { + query.andWhere('decision.date <= :decision_date_to', { + decision_date_to: getNextDayToPacific( + searchDto.dateDecidedTo, + ).toISOString(), + }); + } + promises.push(query.getMany()); } } diff --git a/services/apps/alcs/src/alcs/search/search.controller.spec.ts b/services/apps/alcs/src/alcs/search/search.controller.spec.ts index ea32f22ca3..3ef31a8118 100644 --- a/services/apps/alcs/src/alcs/search/search.controller.spec.ts +++ b/services/apps/alcs/src/alcs/search/search.controller.spec.ts @@ -183,13 +183,14 @@ describe('SearchController', () => { ).toHaveBeenCalledTimes(1); expect( mockNoticeOfIntentAdvancedSearchService.searchNoticeOfIntents, - ).toHaveBeenCalledWith(mockSearchRequestDto); + ).toHaveBeenCalledWith(mockSearchRequestDto, {}); expect(result.noticeOfIntents).toBeDefined(); expect(result.totalNoticeOfIntents).toBe(0); expect(mockInquiryAdvancedSearchService.search).toHaveBeenCalledTimes(1); expect(mockInquiryAdvancedSearchService.search).toHaveBeenCalledWith( mockSearchRequestDto, + {}, ); expect(result.noticeOfIntents).toBeDefined(); expect(result.totalNoticeOfIntents).toBe(0); @@ -238,7 +239,7 @@ describe('SearchController', () => { ).toHaveBeenCalledTimes(1); expect( mockNoticeOfIntentAdvancedSearchService.searchNoticeOfIntents, - ).toHaveBeenCalledWith(mockSearchRequestDto); + ).toHaveBeenCalledWith(mockSearchRequestDto, {}); expect(result.data).toBeDefined(); expect(result.total).toBe(0); }); @@ -286,7 +287,7 @@ describe('SearchController', () => { ).toHaveBeenCalledTimes(1); expect( mockNoticeOfIntentAdvancedSearchService.searchNoticeOfIntents, - ).toHaveBeenCalledWith(mockSearchRequestDto); + ).toHaveBeenCalledWith(mockSearchRequestDto, {}); expect(result.noticeOfIntents).toBeDefined(); expect(result.totalNoticeOfIntents).toBe(0); }); @@ -307,6 +308,7 @@ describe('SearchController', () => { expect(mockInquiryAdvancedSearchService.search).toHaveBeenCalledTimes(1); expect(mockInquiryAdvancedSearchService.search).toHaveBeenCalledWith( mockSearchRequestDto, + {}, ); expect(result.inquiries).toBeDefined(); expect(result.totalInquiries).toBe(0); @@ -330,6 +332,7 @@ describe('SearchController', () => { ).toHaveBeenCalledTimes(1); expect(mockPlanningReviewAdvancedSearchService.search).toHaveBeenCalledWith( mockSearchRequestDto, + {}, ); expect(result.inquiries).toBeDefined(); expect(result.totalInquiries).toBe(0); diff --git a/services/apps/alcs/src/alcs/search/search.controller.ts b/services/apps/alcs/src/alcs/search/search.controller.ts index f4472d5949..9f9c8e11d2 100644 --- a/services/apps/alcs/src/alcs/search/search.controller.ts +++ b/services/apps/alcs/src/alcs/search/search.controller.ts @@ -146,26 +146,35 @@ export class SearchController { noticeOfIntentSearchService = await this.noticeOfIntentSearchService.searchNoticeOfIntents( searchDto, + queryRunner, ); } let notifications: AdvancedSearchResultDto< NotificationSubmissionSearchView[] > | null = null; if (searchNotifications) { - notifications = await this.notificationSearchService.search(searchDto); + notifications = await this.notificationSearchService.search( + searchDto, + queryRunner, + ); } let planningReviews: AdvancedSearchResultDto< PlanningReviewSearchView[] > | null = null; if (searchPlanningReviews) { - planningReviews = - await this.planningReviewSearchService.search(searchDto); + planningReviews = await this.planningReviewSearchService.search( + searchDto, + queryRunner, + ); } let inquiries: AdvancedSearchResultDto | null = null; if (searchInquiries) { - inquiries = await this.inquirySearchService.search(searchDto); + inquiries = await this.inquirySearchService.search( + searchDto, + queryRunner, + ); } return await this.mapAdvancedSearchResults( @@ -216,8 +225,13 @@ export class SearchController { async advancedSearchNoticeOfIntents( @Body() searchDto: SearchRequestDto, ): Promise> { + const queryRunner = this.dataSource.createQueryRunner('slave'); + const noticeOfIntents = - await this.noticeOfIntentSearchService.searchNoticeOfIntents(searchDto); + await this.noticeOfIntentSearchService.searchNoticeOfIntents( + searchDto, + queryRunner, + ); const mappedSearchResult = await this.mapAdvancedSearchResults( null, @@ -238,8 +252,12 @@ export class SearchController { async advancedSearchNotifications( @Body() searchDto: SearchRequestDto, ): Promise> { - const notifications = - await this.notificationSearchService.search(searchDto); + const queryRunner = this.dataSource.createQueryRunner('slave'); + + const notifications = await this.notificationSearchService.search( + searchDto, + queryRunner, + ); const mappedSearchResult = await this.mapAdvancedSearchResults( null, @@ -260,8 +278,12 @@ export class SearchController { async advancedSearchPlanningReviews( @Body() searchDto: SearchRequestDto, ): Promise> { - const planningReviews = - await this.planningReviewSearchService.search(searchDto); + const queryRunner = this.dataSource.createQueryRunner('slave'); + + const planningReviews = await this.planningReviewSearchService.search( + searchDto, + queryRunner, + ); const mappedSearchResult = await this.mapAdvancedSearchResults( null, @@ -282,7 +304,12 @@ export class SearchController { async advancedSearchInquiries( @Body() searchDto: SearchRequestDto, ): Promise> { - const inquiries = await this.inquirySearchService.search(searchDto); + const queryRunner = this.dataSource.createQueryRunner('slave'); + + const inquiries = await this.inquirySearchService.search( + searchDto, + queryRunner, + ); const mappedSearchResult = await this.mapAdvancedSearchResults( null, @@ -358,6 +385,7 @@ export class SearchController { !searchDto.dateDecidedTo && !searchDto.resolutionNumber && !searchDto.resolutionYear && + !searchDto.portalStatusCode && !isStringSetAndNotEmpty(searchDto.legacyId); return { diff --git a/services/apps/alcs/src/alcs/search/search.module.ts b/services/apps/alcs/src/alcs/search/search.module.ts index 8fc6a539de..70b12f1261 100644 --- a/services/apps/alcs/src/alcs/search/search.module.ts +++ b/services/apps/alcs/src/alcs/search/search.module.ts @@ -1,6 +1,9 @@ import { Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; import { ApplicationProfile } from '../../common/automapper/application.automapper.profile'; +import { ApplicationSubmission } from '../../portal/application-submission/application-submission.entity'; +import { NoticeOfIntentSubmission } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; +import { NotificationSubmission } from '../../portal/notification-submission/notification-submission.entity'; import { Application } from '../application/application.entity'; import { ApplicationType } from '../code/application-code/application-type/application-type.entity'; import { Inquiry } from '../inquiry/inquiry.entity'; @@ -26,16 +29,19 @@ import { SearchService } from './search.service'; TypeOrmModule.forFeature([ Application, ApplicationType, + ApplicationSubmission, + ApplicationSubmissionSearchView, NoticeOfIntent, + NoticeOfIntentSubmission, + NoticeOfIntentSubmissionSearchView, PlanningReview, + PlanningReviewSearchView, Notification, - Inquiry, - LocalGovernment, - ApplicationSubmissionSearchView, - NoticeOfIntentSubmissionSearchView, + NotificationSubmission, NotificationSubmissionSearchView, - PlanningReviewSearchView, + Inquiry, InquirySearchView, + LocalGovernment, ]), ], providers: [ diff --git a/services/apps/alcs/src/main.ts b/services/apps/alcs/src/main.ts index 1079e75b4e..c7e19d33f8 100644 --- a/services/apps/alcs/src/main.ts +++ b/services/apps/alcs/src/main.ts @@ -11,6 +11,7 @@ import { DocumentBuilder, SwaggerModule } from '@nestjs/swagger'; import * as config from 'config'; import { S3StreamLogger } from 's3-streamlogger'; import { install } from 'source-map-support'; +import { SPLAT } from 'triple-beam'; import * as winston from 'winston'; import { createLogger } from 'winston'; import { generateModuleGraph } from './commands/graph'; @@ -116,7 +117,7 @@ function setupLogger() { }); const messageFormat = winston.format.printf((info) => { - return `${info.timestamp} [${info.level.toUpperCase()}]${info.context ? ` [${info.context}]` : ''} ${info.message}`; + return `${info.timestamp} [${info.level.toUpperCase()}]${info.context ? ` [${info.context}]` : ''} ${info.message} ${info[SPLAT] ? `\n${info[SPLAT]}` : ''}`; }); const colorFormat = winston.format.colorize({ @@ -132,11 +133,20 @@ function setupLogger() { const s3Transport = new winston.transports.Stream({ level: config.get('LOG_LEVEL'), stream: s3Stream, - format: winston.format.combine(timeStampFormat, messageFormat), + format: winston.format.combine( + winston.format.errors({ stack: true }), + timeStampFormat, + messageFormat, + ), }); const consoleTransport = new winston.transports.Console({ level: config.get('LOG_LEVEL'), - format: winston.format.combine(timeStampFormat, messageFormat, colorFormat), + format: winston.format.combine( + winston.format.errors({ stack: true }), + timeStampFormat, + messageFormat, + colorFormat, + ), }); return createLogger({ diff --git a/services/apps/alcs/src/portal/public/search/application/public-application-search.service.spec.ts b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.spec.ts index d3ab14263f..627898ed5b 100644 --- a/services/apps/alcs/src/portal/public/search/application/public-application-search.service.spec.ts +++ b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.spec.ts @@ -98,7 +98,6 @@ describe('PublicApplicationSearchService', () => { it('should successfully build a query using all search parameters defined', async () => { mockApplicationRepository.find.mockResolvedValue([]); mockApplicationRepository.createQueryBuilder.mockReturnValue(mockQuery); - mockApplicationSubmissionRepository.find.mockResolvedValue([]); mockApplicationSubmissionRepository.createQueryBuilder.mockReturnValue( mockQuery, ); @@ -113,12 +112,13 @@ describe('PublicApplicationSearchService', () => { expect( mockApplicationSubmissionRepository.createQueryBuilder, ).toHaveBeenCalledTimes(3); - expect(mockQuery.andWhere).toHaveBeenCalledTimes(6); + expect(mockQuery.andWhere).toHaveBeenCalledTimes(5); + expect(mockQuery.orWhere).toHaveBeenCalledTimes(1); }); it('should call compileApplicationSearchQuery method correctly', async () => { - const searchForFilerNumbers = jest - .spyOn(service as any, 'searchForFilerNumbers') + const searchForFileNumbers = jest + .spyOn(service as any, 'searchForFileNumbers') .mockResolvedValue(new Set('100000')); mockApplicationSubmissionSearchViewRepository.createQueryBuilder.mockReturnValue( @@ -128,7 +128,7 @@ describe('PublicApplicationSearchService', () => { const result = await service.searchApplications(mockSearchRequestDto); expect(result).toEqual({ data: [], total: 0 }); - expect(searchForFilerNumbers).toHaveBeenCalledWith(mockSearchRequestDto); + expect(searchForFileNumbers).toHaveBeenCalledWith(mockSearchRequestDto); expect(mockQuery.orderBy).toHaveBeenCalledTimes(1); expect(mockQuery.offset).toHaveBeenCalledTimes(1); expect(mockQuery.limit).toHaveBeenCalledTimes(1); diff --git a/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts index 2cbf0d6cf4..396fe7f945 100644 --- a/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts +++ b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts @@ -48,7 +48,7 @@ export class PublicApplicationSearchService { const cachedNumbers = JSON.parse(cachedSearch) as string[]; fileNumbers = new Set(cachedNumbers); } else { - fileNumbers = await this.searchForFilerNumbers(searchDto); + fileNumbers = await this.searchForFileNumbers(searchDto); await client.setEx( searchKey, 180, @@ -112,7 +112,7 @@ export class PublicApplicationSearchService { } } - private async searchForFilerNumbers(searchDto: SearchRequestDto) { + private async searchForFileNumbers(searchDto: SearchRequestDto) { const promises: Promise<{ fileNumber: string }[]>[] = []; if (searchDto.fileNumber) { @@ -126,6 +126,7 @@ export class PublicApplicationSearchService { if (searchDto.governmentName) { await this.addGovernmentResults(searchDto, promises); } + if (searchDto.regionCodes && searchDto.regionCodes.length > 0) { this.addRegionResults(searchDto, promises); } @@ -171,7 +172,7 @@ export class PublicApplicationSearchService { const t1 = performance.now(); this.logger.debug( - `Application pre-search search took ${t1 - t0} milliseconds.`, + `Public Application pre-search search took ${t1 - t0} milliseconds.`, ); return finalResult; } @@ -368,36 +369,29 @@ export class PublicApplicationSearchService { searchDto: SearchRequestDto, promises: Promise<{ fileNumber: string }[]>[], ) { - let query = this.applicationRepository + const query = this.applicationRepository .createQueryBuilder('app') .select('app.fileNumber') - .innerJoin( + .leftJoin( ApplicationDecision, 'decision', 'decision.application_uuid = "app"."uuid" AND decision.is_draft = FALSE', + ) + .leftJoin( + ApplicationDecisionComponent, + 'decisionComponent', + 'decisionComponent.application_decision_uuid = decision.uuid', + ) + .where('app.type_code IN (:...typeCodes)', { + typeCodes: searchDto.fileTypes, + }) + .orWhere( + 'decisionComponent.application_decision_component_type_code IN (:...typeCodes)', + { + typeCodes: searchDto.fileTypes, + }, ); - query = query.leftJoin( - ApplicationDecisionComponent, - 'decisionComponent', - 'decisionComponent.application_decision_uuid = decision.uuid', - ); - - query = query.andWhere( - new Brackets((qb) => - qb - .where('app.type_code IN (:...typeCodes)', { - typeCodes: searchDto.fileTypes, - }) - .orWhere( - 'decisionComponent.application_decision_component_type_code IN (:...typeCodes)', - { - typeCodes: searchDto.fileTypes, - }, - ), - ), - ); - promises.push(query.getMany()); } } diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1715021195773-refresh_alcs_search_views.ts b/services/apps/alcs/src/providers/typeorm/migrations/1715021195773-refresh_alcs_search_views.ts new file mode 100644 index 0000000000..86e0b94245 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1715021195773-refresh_alcs_search_views.ts @@ -0,0 +1,83 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class RefreshAlcsSearchViews1715021195773 implements MigrationInterface { + name = 'RefreshAlcsSearchViews1715021195773'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'inquiry_search_view', 'alcs'], + ); + await queryRunner.query(`DROP VIEW "alcs"."inquiry_search_view"`); + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'application_submission_search_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."application_submission_search_view"`, + ); + await queryRunner.query( + `CREATE VIEW "alcs"."inquiry_search_view" AS SELECT "inquiry"."uuid" AS "inquiry_uuid", "inquiry"."open" AS "open", "inquiryType"."audit_deleted_date_at" AS "inquiryType_audit_deleted_date_at", "inquiryType"."audit_created_at" AS "inquiryType_audit_created_at", "inquiryType"."audit_updated_at" AS "inquiryType_audit_updated_at", "inquiryType"."audit_created_by" AS "inquiryType_audit_created_by", "inquiryType"."audit_updated_by" AS "inquiryType_audit_updated_by", "inquiryType"."label" AS "inquiryType_label", "inquiryType"."code" AS "inquiryType_code", "inquiryType"."description" AS "inquiryType_description", "inquiryType"."short_label" AS "inquiryType_short_label", "inquiryType"."background_color" AS "inquiryType_background_color", "inquiryType"."text_color" AS "inquiryType_text_color", "inquiryType"."html_description" AS "inquiryType_html_description", "localGovernment"."name" AS "local_government_name", "inquiry"."file_number" AS "file_number", "inquiry"."inquirer_first_name" AS "inquirer_first_name", "inquiry"."inquirer_last_name" AS "inquirer_last_name", "inquiry"."inquirer_organization" AS "inquirer_organization", "inquiry"."type_code" AS "inquiry_type_code", "inquiry"."date_submitted_to_alc" AS "date_submitted_to_alc" FROM "alcs"."inquiry" "inquiry" INNER JOIN "alcs"."inquiry_type" "inquiryType" ON "inquiry"."type_code" = "inquiryType"."code" AND "inquiryType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "inquiry"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "inquiry"."audit_deleted_date_at" IS NULL`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'inquiry_search_view', + 'SELECT "inquiry"."uuid" AS "inquiry_uuid", "inquiry"."open" AS "open", "inquiryType"."audit_deleted_date_at" AS "inquiryType_audit_deleted_date_at", "inquiryType"."audit_created_at" AS "inquiryType_audit_created_at", "inquiryType"."audit_updated_at" AS "inquiryType_audit_updated_at", "inquiryType"."audit_created_by" AS "inquiryType_audit_created_by", "inquiryType"."audit_updated_by" AS "inquiryType_audit_updated_by", "inquiryType"."label" AS "inquiryType_label", "inquiryType"."code" AS "inquiryType_code", "inquiryType"."description" AS "inquiryType_description", "inquiryType"."short_label" AS "inquiryType_short_label", "inquiryType"."background_color" AS "inquiryType_background_color", "inquiryType"."text_color" AS "inquiryType_text_color", "inquiryType"."html_description" AS "inquiryType_html_description", "localGovernment"."name" AS "local_government_name", "inquiry"."file_number" AS "file_number", "inquiry"."inquirer_first_name" AS "inquirer_first_name", "inquiry"."inquirer_last_name" AS "inquirer_last_name", "inquiry"."inquirer_organization" AS "inquirer_organization", "inquiry"."type_code" AS "inquiry_type_code", "inquiry"."date_submitted_to_alc" AS "date_submitted_to_alc" FROM "alcs"."inquiry" "inquiry" INNER JOIN "alcs"."inquiry_type" "inquiryType" ON "inquiry"."type_code" = "inquiryType"."code" AND "inquiryType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "inquiry"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "inquiry"."audit_deleted_date_at" IS NULL', + ], + ); + await queryRunner.query( + `CREATE VIEW "alcs"."application_submission_search_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", "app"."region_code" AS "application_region_code", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "app_sub"."audit_deleted_date_at" IS NULL`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'application_submission_search_view', + 'SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", "app"."region_code" AS "application_region_code", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "app_sub"."audit_deleted_date_at" IS NULL', + ], + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'application_submission_search_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."application_submission_search_view"`, + ); + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'inquiry_search_view', 'alcs'], + ); + await queryRunner.query(`DROP VIEW "alcs"."inquiry_search_view"`); + await queryRunner.query( + `CREATE VIEW "alcs"."application_submission_search_view" AS SELECT "as2"."uuid" AS "uuid", "as2"."applicant" AS "applicant", "a"."uuid" AS "application_uuid", "localGovernment"."name" AS "local_government_name", "as2"."file_number" AS "file_number", "as2"."local_government_uuid" AS "local_government_uuid", "as2"."type_code" AS "application_type_code", "as2"."is_draft" AS "is_draft", "a"."legacy_id" AS "legacy_id", "a"."date_submitted_to_alc" AS "date_submitted_to_alc", "a"."decision_date" AS "decision_date", "a"."region_code" AS "application_region_code", alcs.get_current_status_for_application_submission_by_uuid("as2"."uuid") AS "status" FROM "alcs"."application_submission" "as2" INNER JOIN "alcs"."application" "a" ON "a"."file_number" = "as2"."file_number" AND "a"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "as2"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "as2"."audit_deleted_date_at" IS NULL`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'application_submission_search_view', + 'SELECT "as2"."uuid" AS "uuid", "as2"."applicant" AS "applicant", "a"."uuid" AS "application_uuid", "localGovernment"."name" AS "local_government_name", "as2"."file_number" AS "file_number", "as2"."local_government_uuid" AS "local_government_uuid", "as2"."type_code" AS "application_type_code", "as2"."is_draft" AS "is_draft", "a"."legacy_id" AS "legacy_id", "a"."date_submitted_to_alc" AS "date_submitted_to_alc", "a"."decision_date" AS "decision_date", "a"."region_code" AS "application_region_code", alcs.get_current_status_for_application_submission_by_uuid("as2"."uuid") AS "status" FROM "alcs"."application_submission" "as2" INNER JOIN "alcs"."application" "a" ON "a"."file_number" = "as2"."file_number" AND "a"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "as2"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "as2"."audit_deleted_date_at" IS NULL', + ], + ); + await queryRunner.query( + `CREATE VIEW "alcs"."inquiry_search_view" AS SELECT "inquiry"."uuid" AS "inquiry_uuid", "inquiry"."open" AS "open", "inquiryType"."audit_deleted_date_at" AS "inquiryType_audit_deleted_date_at", "inquiryType"."audit_created_at" AS "inquiryType_audit_created_at", "inquiryType"."audit_updated_at" AS "inquiryType_audit_updated_at", "inquiryType"."audit_created_by" AS "inquiryType_audit_created_by", "inquiryType"."audit_updated_by" AS "inquiryType_audit_updated_by", "inquiryType"."label" AS "inquiryType_label", "inquiryType"."code" AS "inquiryType_code", "inquiryType"."description" AS "inquiryType_description", "inquiryType"."short_label" AS "inquiryType_short_label", "inquiryType"."background_color" AS "inquiryType_background_color", "inquiryType"."text_color" AS "inquiryType_text_color", "inquiryType"."html_description" AS "inquiryType_html_description", "localGovernment"."name" AS "local_government_name", "inquiry"."file_number" AS "file_number", "inquiry"."inquirer_first_name" AS "inquirer_first_name", "inquiry"."inquirer_last_name" AS "inquirer_last_name", "inquiry"."inquirer_organization" AS "inquirer_organization", "inquiry"."type_code" AS "inquiry_type_code", "inquiry"."date_submitted_to_alc" AS "date_submitted_to_alc", "inquiry"."local_government_uuid" AS "local_government_uuid", "inquiry"."region_code" AS "inquiry_region_code" FROM "alcs"."inquiry" "inquiry" INNER JOIN "alcs"."inquiry_type" "inquiryType" ON "inquiry"."type_code" = "inquiryType"."code" AND "inquiryType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "inquiry"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "inquiry"."audit_deleted_date_at" IS NULL`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'inquiry_search_view', + 'SELECT "inquiry"."uuid" AS "inquiry_uuid", "inquiry"."open" AS "open", "inquiryType"."audit_deleted_date_at" AS "inquiryType_audit_deleted_date_at", "inquiryType"."audit_created_at" AS "inquiryType_audit_created_at", "inquiryType"."audit_updated_at" AS "inquiryType_audit_updated_at", "inquiryType"."audit_created_by" AS "inquiryType_audit_created_by", "inquiryType"."audit_updated_by" AS "inquiryType_audit_updated_by", "inquiryType"."label" AS "inquiryType_label", "inquiryType"."code" AS "inquiryType_code", "inquiryType"."description" AS "inquiryType_description", "inquiryType"."short_label" AS "inquiryType_short_label", "inquiryType"."background_color" AS "inquiryType_background_color", "inquiryType"."text_color" AS "inquiryType_text_color", "inquiryType"."html_description" AS "inquiryType_html_description", "localGovernment"."name" AS "local_government_name", "inquiry"."file_number" AS "file_number", "inquiry"."inquirer_first_name" AS "inquirer_first_name", "inquiry"."inquirer_last_name" AS "inquirer_last_name", "inquiry"."inquirer_organization" AS "inquirer_organization", "inquiry"."type_code" AS "inquiry_type_code", "inquiry"."date_submitted_to_alc" AS "date_submitted_to_alc", "inquiry"."local_government_uuid" AS "local_government_uuid", "inquiry"."region_code" AS "inquiry_region_code" FROM "alcs"."inquiry" "inquiry" INNER JOIN "alcs"."inquiry_type" "inquiryType" ON "inquiry"."type_code" = "inquiryType"."code" AND "inquiryType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "inquiry"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "inquiry"."audit_deleted_date_at" IS NULL', + ], + ); + } +} diff --git a/services/apps/alcs/test/mocks/mockTypes.ts b/services/apps/alcs/test/mocks/mockTypes.ts index 3a7cb04b8f..192a24c407 100644 --- a/services/apps/alcs/test/mocks/mockTypes.ts +++ b/services/apps/alcs/test/mocks/mockTypes.ts @@ -45,6 +45,7 @@ export const createMockQuery = () => { select: jest.fn().mockReturnThis(), getMany: jest.fn().mockResolvedValue([]), getCount: jest.fn().mockResolvedValue(0), + getManyAndCount: jest.fn().mockResolvedValue([[], 0]), orderBy: jest.fn().mockReturnThis(), offset: jest.fn().mockReturnThis(), limit: jest.fn().mockReturnThis(), @@ -52,6 +53,7 @@ export const createMockQuery = () => { groupBy: jest.fn().mockReturnThis(), where: jest.fn().mockReturnThis(), andWhere: jest.fn().mockReturnThis(), + orWhere: jest.fn().mockReturnThis(), setParameters: jest.fn().mockReturnThis(), leftJoin: jest.fn().mockReturnThis(), innerJoin: jest.fn().mockReturnThis(), diff --git a/services/libs/common/src/exceptions/exception.filter.ts b/services/libs/common/src/exceptions/exception.filter.ts index a779ce4440..dd2f50a04c 100644 --- a/services/libs/common/src/exceptions/exception.filter.ts +++ b/services/libs/common/src/exceptions/exception.filter.ts @@ -12,7 +12,7 @@ export class HttpExceptionFilter implements ExceptionFilter { const request = ctx.getRequest(); const status = exception.getStatus(); - this.logger.error(exception.message, exception.stack); + this.logger.error(exception); response .status(status) From adc22530d2b4a83b9d54e80a4fd0cf277f465c54 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 7 May 2024 13:14:41 -0700 Subject: [PATCH 038/103] Add Additional Information to Public NOIs * Hook up built component * Fix CSS and Rename --- .../public-notice-of-intent.component.html | 4 ++-- .../additional-information.component.html | 2 +- .../additional-information.component.scss | 18 +++++++++++++++ .../additional-information.component.spec.ts | 3 +++ .../additional-information.component.ts | 23 ++++++++++++++----- .../submission-details.component.html | 6 ++++- .../submission-details.component.ts | 4 ++-- 7 files changed, 48 insertions(+), 12 deletions(-) diff --git a/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.html b/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.html index 10852c202b..fe7ae0b134 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.html +++ b/portal-frontend/src/app/features/public/notice-of-intent/public-notice-of-intent.component.html @@ -29,8 +29,8 @@

Notice of Intent ID: {{ submission.fileNumber }} | {{ sub

Applicant Submission

- - + +

diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.html b/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.html index 6a8258029b..eae65e18b5 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.html +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.html @@ -11,7 +11,7 @@
The total floor area (m2) of the proposed structure(s)
-
+
#
Type
Area
diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.scss b/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.scss index bfe0899632..7fcfd7a918 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.scss +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.scss @@ -1,5 +1,23 @@ +@use '../../../../../../styles/functions' as *; + .multiple-documents { a { display: block; } } + +.structure-table { + display: grid; + grid-template-columns: min-content max-content max-content; + overflow-x: auto; + grid-column-gap: rem(36); + grid-row-gap: rem(12); + + @media screen and (min-width: $tabletBreakpoint) { + grid-template-columns: 0.55fr 1fr 1fr; + } + + @media screen and (min-width: $midBreakpoint) { + grid-template-columns: 1fr 1fr 2fr; + } +} diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.spec.ts b/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.spec.ts index f747f2270f..718a668c27 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.spec.ts +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.spec.ts @@ -24,6 +24,9 @@ describe('AdditionalInformationComponent', () => { fixture = TestBed.createComponent(AdditionalInformationComponent); component = fixture.componentInstance; + component.noiSubmission = { + soilProposedStructures: [], + } as any; fixture.detectChanges(); }); diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.ts b/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.ts index 7e72ef939c..0c2bc8f563 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.ts +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.ts @@ -1,14 +1,13 @@ import { Component, Input, OnInit } from '@angular/core'; -import { Router } from '@angular/router'; import { PublicNoticeOfIntentSubmissionDto } from '../../../../../services/public/public-notice-of-intent.dto'; import { PublicDocumentDto } from '../../../../../services/public/public.dto'; import { PublicService } from '../../../../../services/public/public.service'; import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto'; +import { openFileInline } from '../../../../../shared/utils/file'; import { RESIDENTIAL_STRUCTURE_TYPES, STRUCTURE_TYPES, } from '../../../../notice-of-intents/edit-submission/additional-information/additional-information.component'; -import { openFileInline } from '../../../../../shared/utils/file'; @Component({ selector: 'app-additional-information', @@ -32,24 +31,36 @@ export class AdditionalInformationComponent implements OnInit { isSoilStructureResidentialAccessoryUseReasonVisible = false; isSoilOtherStructureVisible = false; - constructor(private router: Router, private publicService: PublicService) {} + constructor(private publicService: PublicService) {} ngOnInit(): void { this.setVisibilityForResidentialFields(); this.setValidatorsForAccessoryFields(); this.setVisibilityForFarmFields(); this.setVisibilityForOtherFields(); + + switch (this.noiSubmission.typeCode) { + case 'ROSO': + this.firstQuestion = 'Are you placing fill in order to build a structure?'; + break; + case 'POFO': + this.firstQuestion = 'Are you placing fill in order to build a structure?'; + break; + case 'PFRS': + this.firstQuestion = 'Are you removing soil and placing fill in order to build a structure?'; + break; + } } private setVisibilityForResidentialFields() { this.isSoilStructureResidentialUseReasonVisible = !!this.noiSubmission?.soilProposedStructures.some( - (structure) => structure.type && RESIDENTIAL_STRUCTURE_TYPES.includes(structure.type) + (structure) => structure.type && RESIDENTIAL_STRUCTURE_TYPES.includes(structure.type), ); } private setValidatorsForAccessoryFields() { this.isSoilStructureResidentialAccessoryUseReasonVisible = !!this.noiSubmission?.soilProposedStructures.some( - (structure) => structure.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE + (structure) => structure.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE, ); } @@ -67,7 +78,7 @@ export class AdditionalInformationComponent implements OnInit { private setVisibilityForOtherFields() { this.isSoilOtherStructureVisible = !!this.noiSubmission?.soilProposedStructures.some( - (structure) => structure.type === STRUCTURE_TYPES.OTHER_STRUCTURE + (structure) => structure.type === STRUCTURE_TYPES.OTHER_STRUCTURE, ); } diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.html b/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.html index 617744affc..ae2c8af915 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.html +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.html @@ -22,7 +22,7 @@

Primary Contact

Organization (optional)Organization (optional) Ministry/Department Responsible Department @@ -128,3 +128,7 @@

Proposal

[noiDocuments]="documents" > +
+

Additional Information

+ +
diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.ts b/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.ts index ca1191f0a1..6b9ec682bc 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.ts +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.ts @@ -7,7 +7,7 @@ import { PublicDocumentDto, PublicOwnerDto, PublicParcelDto } from '../../../../ import { OWNER_TYPE } from '../../../../shared/dto/owner.dto'; @Component({ - selector: 'app-public-app-submission-details', + selector: 'app-public-noi-submission-details', templateUrl: './submission-details.component.html', styleUrls: ['./submission-details.component.scss'], }) @@ -30,7 +30,7 @@ export class SubmissionDetailsComponent implements OnInit, OnDestroy { this.loadGovernments(); if (this.submission) { this.primaryContact = this.submission.owners.find( - (owner) => owner.uuid === this.submission.primaryContactOwnerUuid + (owner) => owner.uuid === this.submission.primaryContactOwnerUuid, ); this.populateLocalGovernment(this.submission.localGovernmentUuid); } From b9633aa8474e64e94f330aa5c03dd4fbf8c2da0a Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 7 May 2024 13:58:37 -0700 Subject: [PATCH 039/103] Remove visibility flag from PR Decision Docs --- .../decision-document-upload-dialog.component.html | 6 ------ .../decision-document-upload-dialog.component.ts | 2 -- 2 files changed, 8 deletions(-) diff --git a/alcs-frontend/src/app/features/planning-review/decision/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.html b/alcs-frontend/src/app/features/planning-review/decision/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.html index c0ed9811c1..380a50982f 100644 --- a/alcs-frontend/src/app/features/planning-review/decision/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.html +++ b/alcs-frontend/src/app/features/planning-review/decision/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.html @@ -78,12 +78,6 @@

{{ title }} Document

-
- Visible To: -
- Commissioner -
-
diff --git a/alcs-frontend/src/app/features/planning-review/decision/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts b/alcs-frontend/src/app/features/planning-review/decision/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts index 8cb4121902..07db3cf753 100644 --- a/alcs-frontend/src/app/features/planning-review/decision/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts +++ b/alcs-frontend/src/app/features/planning-review/decision/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.ts @@ -26,7 +26,6 @@ export class DecisionDocumentUploadDialogComponent implements OnInit { name = new FormControl('', [Validators.required]); type = new FormControl({ disabled: true, value: undefined }, [Validators.required]); source = new FormControl({ disabled: true, value: DOCUMENT_SOURCE.ALC }, [Validators.required]); - visibleToCommissioner = new FormControl({ disabled: true, value: true }, [Validators.required]); documentSources = Object.values(DOCUMENT_SOURCE); @@ -34,7 +33,6 @@ export class DecisionDocumentUploadDialogComponent implements OnInit { name: this.name, type: this.type, source: this.source, - visibleToCommissioner: this.visibleToCommissioner, }); pendingFile: File | undefined; From 0b92ad716b90be10b175d373b314751fc5b65a1e Mon Sep 17 00:00:00 2001 From: Mekhti Date: Wed, 8 May 2024 08:44:12 -0700 Subject: [PATCH 040/103] backup table and RSL --- .../lfng_status_adjustment.py | 2 +- .../sql/oats_latest_lfng_status.sql | 2 +- .../sql/oats_latest_lfng_status_count.sql | 2 +- ...ackup-application-LFNG-statuses-for-ETL.ts | 145 ++++++++++++++++++ 4 files changed, 148 insertions(+), 3 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1715106913828-backup-application-LFNG-statuses-for-ETL.ts diff --git a/bin/migrate-oats-data/applications/lfng_status_adjustment/lfng_status_adjustment.py b/bin/migrate-oats-data/applications/lfng_status_adjustment/lfng_status_adjustment.py index ad45746d37..66d4747049 100644 --- a/bin/migrate-oats-data/applications/lfng_status_adjustment/lfng_status_adjustment.py +++ b/bin/migrate-oats-data/applications/lfng_status_adjustment/lfng_status_adjustment.py @@ -185,7 +185,7 @@ def _get_alcs_status(statuses, code): def _map_oats_accomplishment_code_to_alcs_status_code(code): if code == "LRF": return "RFFG" - if code == "SLG": + if code == "SLG" or code == 'RSL': return "SUBG" if code == "WLG": return "WRNG" diff --git a/bin/migrate-oats-data/applications/lfng_status_adjustment/sql/oats_latest_lfng_status.sql b/bin/migrate-oats-data/applications/lfng_status_adjustment/sql/oats_latest_lfng_status.sql index f7701ddc05..e100e081fc 100644 --- a/bin/migrate-oats-data/applications/lfng_status_adjustment/sql/oats_latest_lfng_status.sql +++ b/bin/migrate-oats-data/applications/lfng_status_adjustment/sql/oats_latest_lfng_status.sql @@ -57,7 +57,7 @@ alr_applications_to_exclude AS ( SELECT alr_application_id FROM completion_with_ , oats_accomplishments AS ( SELECT rir.*, oaac.* FROM oats.oats_accomplishments oaac JOIN returned_incomplete_refused AS rir ON rir.file_number::bigint = oaac.alr_application_id - WHERE oaac.accomplishment_code IN ('LRF', 'SLG', 'WLG', 'ULG', 'LGI') + WHERE oaac.accomplishment_code IN ('LRF', 'SLG', 'WLG', 'ULG', 'LGI', 'RSL') ) -- ranked_statuses will select the latest status based on max completion_date, then when_updated, then when_created for all records per file_number , ranked_statuses AS ( diff --git a/bin/migrate-oats-data/applications/lfng_status_adjustment/sql/oats_latest_lfng_status_count.sql b/bin/migrate-oats-data/applications/lfng_status_adjustment/sql/oats_latest_lfng_status_count.sql index b55cf45817..4c943f96ae 100644 --- a/bin/migrate-oats-data/applications/lfng_status_adjustment/sql/oats_latest_lfng_status_count.sql +++ b/bin/migrate-oats-data/applications/lfng_status_adjustment/sql/oats_latest_lfng_status_count.sql @@ -57,7 +57,7 @@ alr_applications_to_exclude AS ( SELECT alr_application_id FROM completion_with_ , oats_accomplishments AS ( SELECT rir.*, oaac.* FROM oats.oats_accomplishments oaac JOIN returned_incomplete_refused AS rir ON rir.file_number::bigint = oaac.alr_application_id - WHERE oaac.accomplishment_code IN ('LRF', 'SLG', 'WLG', 'ULG', 'LGI') + WHERE oaac.accomplishment_code IN ('LRF', 'SLG', 'WLG', 'ULG', 'LGI', 'RSL') ) -- ranked_statuses will select the latest status based on max completion_date, then when_updated, then when_created for all records per file_number , ranked_statuses AS ( diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1715106913828-backup-application-LFNG-statuses-for-ETL.ts b/services/apps/alcs/src/providers/typeorm/migrations/1715106913828-backup-application-LFNG-statuses-for-ETL.ts new file mode 100644 index 0000000000..47b441add8 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1715106913828-backup-application-LFNG-statuses-for-ETL.ts @@ -0,0 +1,145 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class BackupApplicationLFNGStatusesForETL1715106913828 + implements MigrationInterface +{ + public async up(queryRunner: QueryRunner): Promise { + queryRunner.query(` + DO $$ + BEGIN + IF EXISTS (SELECT schema_name FROM information_schema.schemata WHERE schema_name = 'oats') THEN + CREATE TABLE IF NOT EXISTS public.backup_lfng_statuses_for_application ( + alcs_submission_uuid UUID NOT NULL, + alcs_status_type_code TEXT NOT NULL, + alcs_effective_date timestamptz, + alcs_weight int, + oats_alr_application_id int, + oats_accomplishment_code TEXT, + oats_completion_date text, + oats_when_created timestamptz, + oats_when_updated timestamptz, + PRIMARY KEY (alcs_submission_uuid, alcs_status_type_code) + ); + + COMMENT ON TABLE public.backup_lfng_statuses_for_application IS 'This is a backup table for Application Submission LFNG tatuses that will be reset by ETL. Delete once confirmed that migration is successful. + Logic that is used for resetting statuses: + . Identify all submissions created by the ETL process that are currently have a "Submitted to LFNG" or "Under Review by LFNG" in ALCS. + + 2. From the submissions found in step 1, further narrow down the selection to those that also have an effective date for any of the following statuses: "LFNG returned as incomplete," "wrong local government," or "L/FNG Refused to Forward." + + 3. For the file numbers obtained from steps 1 and 2, retrieve the corresponding local government statuses from OATS. Consider both the "when_created" and "when_updated" timestamps and choose the status with the most recent of these dates. + + 4. Use the status data gathered from OATS to update the ALCS. Map the OATS status to the equivalent ALCS status, and if the ALCS status has a higher weight than the OATS status, reset the ALCS status to match the OATS status. + + Here is an example to illustrate the process: + + Consider the following table of LFNG statuses, listed in descending order by weight: + + Status Code Status Description Weight + RFFG L/FNG Refused to Forward 10 + REVG Under Review by L/FNG 3 + SUBG Submitted to L/FNG 2 + INCM L/FNG Returned as Incomplete 1 + WRNG Wrong L/FNG 1 + If OATS indicates "WRNG" as the correct status for a particular file number, you should reset the ALCS statuses for that file number, ensuring that only "WRNG" remains, with its effective date set to the latest "when_created" or "when_updated" timestamp from OATS. All other LFNG statuses for that file number should have their effective_date and email_sent_date fields set to null.'; + END IF; + END $$; + `); + + queryRunner.query( + ` + DO $$ + BEGIN + IF EXISTS (SELECT schema_name FROM information_schema.schemata WHERE schema_name = 'oats') THEN + + INSERT INTO public.backup_lfng_statuses_for_application (alcs_submission_uuid, alcs_status_type_code, alcs_effective_date, alcs_weight, oats_alr_application_id,oats_accomplishment_code,oats_completion_date,oats_when_created,oats_when_updated) + WITH when_updated_grouped AS ( + SELECT + a.when_updated, + a.alr_application_id, + a.accomplishment_code, + COUNT(*) OVER (PARTITION BY a.when_updated, a.alr_application_id) as cnt + FROM + oats.oats_accomplishments a + WHERE a.when_updated IS NOT NULL + ), when_updated_with_status AS ( + SELECT + when_updated, + alr_application_id, + accomplishment_code, + cnt + FROM + when_updated_grouped + WHERE + cnt > 1 + ), completion_grouped AS ( + SELECT + wuws.when_updated, + wuws.alr_application_id, + wuws.accomplishment_code, + COUNT(*) OVER (PARTITION BY oa.completion_date, wuws.alr_application_id) as cnt + FROM + when_updated_with_status wuws + JOIN oats.oats_accomplishments oa ON oa.alr_application_id = wuws.alr_application_id AND oa.accomplishment_code = wuws.accomplishment_code + WHERE oa.completion_date IS NOT NULL + ), completion_with_status AS ( + SELECT + when_updated, + alr_application_id, + accomplishment_code, + cnt + FROM + completion_grouped + WHERE + cnt > 1 + ), + alr_applications_to_exclude AS ( SELECT alr_application_id FROM completion_with_status) + , submitted_under_review AS ( + SELECT astss.submission_uuid AS initial_sub_uuid FROM alcs.application_submission_to_submission_status astss + JOIN alcs.application_submission as2 ON as2."uuid" = astss.submission_uuid AND as2.audit_created_by='oats_etl' AND as2.audit_updated_by IS NULL + LEFT JOIN alcs.application_submission_review asr ON asr.application_file_number = as2.file_number + WHERE astss.effective_date IS NOT NULL AND astss.status_type_code IN ('SUBG', 'REVG') AND ( asr.uuid IS NULL OR asr.audit_created_by='oats_etl' AND asr.audit_updated_by IS NULL) + GROUP BY astss.submission_uuid + ) + , returned_incomplete_refused AS ( + SELECT as2.file_number, string_agg(astss.status_type_code, ', ') + FROM submitted_under_review sur + JOIN alcs.application_submission_to_submission_status astss ON astss.submission_uuid = sur.initial_sub_uuid + JOIN alcs.application_submission as2 ON as2.uuid = astss.submission_uuid + WHERE astss.effective_date IS NOT NULL AND astss.status_type_code IN ('WRNG', 'INCM', 'RFFG', 'SUBG', 'REVG') + GROUP BY as2.file_number + ) + , oats_accomplishments AS ( + SELECT rir.*, oaac.* FROM oats.oats_accomplishments oaac + JOIN returned_incomplete_refused AS rir ON rir.file_number::bigint = oaac.alr_application_id + WHERE oaac.accomplishment_code IN ('LRF', 'SLG', 'WLG', 'ULG', 'LGI', 'RSL') + ) + -- ranked_statuses will select the latest status based on max completion_date, then when_updated, then when_created for all records per file_number + , ranked_statuses AS ( + SELECT *, + ROW_NUMBER() OVER (PARTITION BY file_number ORDER BY COALESCE(completion_date, '0001-01-01') DESC, COALESCE(when_updated, '0001-01-01') DESC, COALESCE(when_created, '0001-01-01') DESC) AS rn + FROM oats_accomplishments + ) + , latest_oats_lfng_status AS ( + SELECT alr_application_id, accomplishment_code, completion_date, when_created, when_updated, revision_count FROM ranked_statuses + WHERE rn = 1 + ORDER BY file_number::bigint + ) + SELECT + as2.uuid, astss.status_type_code, astss.effective_date, asst.weight, lols.alr_application_id, accomplishment_code, lols.completion_date, when_created, when_updated + FROM alcs.application_submission_to_submission_status astss + JOIN alcs.application_submission as2 ON as2.uuid = astss.submission_uuid + JOIN alcs.application_submission_status_type asst ON asst.code = astss.status_type_code + JOIN latest_oats_lfng_status lols ON lols.alr_application_id = as2.file_number::bigint + LEFT JOIN alr_applications_to_exclude aate ON aate.alr_application_id = lols.alr_application_id + WHERE astss.effective_date IS NOT NULL AND astss.status_type_code IN ('WRNG', 'INCM', 'RFFG', 'SUBG', 'REVG') AND aate.alr_application_id IS NULL; + END IF; + END $$; + `, + ); + } + + public async down(): Promise { + // not applicable + } +} From 8ff704a9a398f4ce0692f28664eb3297c7685707 Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Wed, 8 May 2024 09:32:23 -0700 Subject: [PATCH 041/103] Remove irrelevant comment --- e2e/pages/portal/submission-success-page.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/e2e/pages/portal/submission-success-page.ts b/e2e/pages/portal/submission-success-page.ts index 70354874f1..dd02814114 100644 --- a/e2e/pages/portal/submission-success-page.ts +++ b/e2e/pages/portal/submission-success-page.ts @@ -40,7 +40,6 @@ export class SubmissionSuccessPage { const fileId: string = matches![0]; - // Should never return empty string, but necessary to appease TypeScript return fileId; } From 35bf998212eee714bb930985a5d784abf25a6ed3 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 8 May 2024 14:13:13 -0700 Subject: [PATCH 042/103] Code Review Feedback --- .../application-advanced-search.service.ts | 3 +- .../inquiry-advanced-search.service.spec.ts | 10 +++-- .../inquiry-advanced-search.service.ts | 3 +- ...-of-intent-advanced-search.service.spec.ts | 10 +++-- ...otice-of-intent-advanced-search.service.ts | 3 +- ...tification-advanced-search.service.spec.ts | 10 +++-- .../notification-advanced-search.service.ts | 3 +- ...ing-review-advanced-search.service.spec.ts | 10 +++-- ...planning-review-advanced-search.service.ts | 3 +- .../alcs/src/alcs/search/search.config.ts | 1 + .../src/alcs/search/search.controller.spec.ts | 44 +++++++------------ 11 files changed, 51 insertions(+), 49 deletions(-) create mode 100644 services/apps/alcs/src/alcs/search/search.config.ts diff --git a/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts index 61f0e1d489..5d830e8e3b 100644 --- a/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts @@ -16,6 +16,7 @@ import { ApplicationDecisionComponent } from '../../application-decision/applica import { ApplicationDecision } from '../../application-decision/application-decision.entity'; import { Application } from '../../application/application.entity'; import { LocalGovernment } from '../../local-government/local-government.entity'; +import { SEARCH_CACHE_TIME } from '../search.config'; import { AdvancedSearchResultDto, SearchRequestDto } from '../search.dto'; import { ApplicationSubmissionSearchView } from './application-search-view.entity'; @@ -53,7 +54,7 @@ export class ApplicationAdvancedSearchService { fileNumbers = await this.searchForFileNumbers(searchDto); await client.setEx( searchKey, - 180, //Seconds + SEARCH_CACHE_TIME, JSON.stringify([...fileNumbers.values()]), ); } diff --git a/services/apps/alcs/src/alcs/search/inquiry/inquiry-advanced-search.service.spec.ts b/services/apps/alcs/src/alcs/search/inquiry/inquiry-advanced-search.service.spec.ts index 111f63d9ae..24910af44d 100644 --- a/services/apps/alcs/src/alcs/search/inquiry/inquiry-advanced-search.service.spec.ts +++ b/services/apps/alcs/src/alcs/search/inquiry/inquiry-advanced-search.service.spec.ts @@ -2,7 +2,7 @@ import { RedisService } from '@app/common/redis/redis.service'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; -import { Repository } from 'typeorm'; +import { QueryRunner, Repository } from 'typeorm'; import { createMockQuery } from '../../../../test/mocks/mockTypes'; import { Inquiry } from '../../inquiry/inquiry.entity'; import { LocalGovernment } from '../../local-government/local-government.entity'; @@ -18,6 +18,7 @@ describe('InquiryAdvancedSearchService', () => { let mockLocalGovernmentRepository: DeepMocked>; let mockInquiryRepository: DeepMocked>; let mockRedisService: DeepMocked; + let mockQueryRunner: DeepMocked; const sortFields = [ 'fileId', @@ -52,6 +53,7 @@ describe('InquiryAdvancedSearchService', () => { mockRedisService = createMock(); mockQuery = createMockQuery(); + mockQueryRunner = createMock(); const module: TestingModule = await Test.createTestingModule({ providers: [ @@ -101,7 +103,7 @@ describe('InquiryAdvancedSearchService', () => { mockInquiryRepository.find.mockResolvedValue([]); mockInquiryRepository.createQueryBuilder.mockReturnValue(mockQuery); - const result = await service.search(mockSearchDto, {} as any); + const result = await service.search(mockSearchDto, mockQueryRunner); expect(result).toEqual({ data: [], total: 0 }); expect(mockInquiryRepository.find).toHaveBeenCalledTimes(3); @@ -114,7 +116,7 @@ describe('InquiryAdvancedSearchService', () => { .spyOn(service as any, 'searchForFileNumbers') .mockResolvedValue(new Set(['100000'])); - const result = await service.search(mockSearchDto, {} as any); + const result = await service.search(mockSearchDto, mockQueryRunner); expect(result).toEqual({ data: [], total: 0 }); expect(searchForFileNumbersSpy).toHaveBeenCalledWith(mockSearchDto); @@ -132,7 +134,7 @@ describe('InquiryAdvancedSearchService', () => { mockSearchDto.sortField = sortField; mockSearchDto.sortDirection = 'DESC'; - const result = await service.search(mockSearchDto, {} as any); + const result = await service.search(mockSearchDto, mockQueryRunner); expect(result).toEqual({ data: [], total: 0 }); expect(searchForFileNumbersSpy).toHaveBeenCalledWith(mockSearchDto); diff --git a/services/apps/alcs/src/alcs/search/inquiry/inquiry-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/inquiry/inquiry-advanced-search.service.ts index 8d4e2a374a..2c11ca75b4 100644 --- a/services/apps/alcs/src/alcs/search/inquiry/inquiry-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/inquiry/inquiry-advanced-search.service.ts @@ -8,6 +8,7 @@ import { intersectSets } from '../../../utils/set-helper'; import { InquiryParcel } from '../../inquiry/inquiry-parcel/inquiry-parcel.entity'; import { Inquiry } from '../../inquiry/inquiry.entity'; import { LocalGovernment } from '../../local-government/local-government.entity'; +import { SEARCH_CACHE_TIME } from '../search.config'; import { AdvancedSearchResultDto, SearchRequestDto } from '../search.dto'; import { InquirySearchView } from './inquiry-search-view.entity'; @@ -43,7 +44,7 @@ export class InquiryAdvancedSearchService { fileNumbers = await this.searchForFileNumbers(searchDto); await client.setEx( searchKey, - 180, //Seconds + SEARCH_CACHE_TIME, JSON.stringify([...fileNumbers.values()]), ); } diff --git a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.spec.ts b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.spec.ts index 4bc7f487f4..d72e772097 100644 --- a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.spec.ts +++ b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.spec.ts @@ -2,7 +2,7 @@ import { RedisService } from '@app/common/redis/redis.service'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; -import { Repository } from 'typeorm'; +import { QueryRunner, Repository } from 'typeorm'; import { createMockQuery } from '../../../../test/mocks/mockTypes'; import { NoticeOfIntentSubmission } from '../../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; import { LocalGovernment } from '../../local-government/local-government.entity'; @@ -22,6 +22,7 @@ describe('NoticeOfIntentService', () => { Repository >; let mockRedisService: DeepMocked; + let mockQueryRunner: DeepMocked; const sortFields = [ 'fileId', @@ -60,6 +61,7 @@ describe('NoticeOfIntentService', () => { mockNOIRepository = createMock(); mockNOISubmissionRepository = createMock(); mockRedisService = createMock(); + mockQueryRunner = createMock(); mockQuery = createMockQuery(); @@ -118,7 +120,7 @@ describe('NoticeOfIntentService', () => { const result = await service.searchNoticeOfIntents( mockSearchDto, - {} as any, + mockQueryRunner, ); expect(result).toEqual({ data: [], total: 0 }); @@ -138,7 +140,7 @@ describe('NoticeOfIntentService', () => { const result = await service.searchNoticeOfIntents( mockSearchDto, - {} as any, + mockQueryRunner, ); expect(result).toEqual({ data: [], total: 0 }); @@ -159,7 +161,7 @@ describe('NoticeOfIntentService', () => { const result = await service.searchNoticeOfIntents( mockSearchDto, - {} as any, + mockQueryRunner, ); expect(result).toEqual({ data: [], total: 0 }); diff --git a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts index ed6e38b391..4a32cfea44 100644 --- a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts @@ -15,6 +15,7 @@ import { intersectSets } from '../../../utils/set-helper'; import { LocalGovernment } from '../../local-government/local-government.entity'; import { NoticeOfIntentDecision } from '../../notice-of-intent-decision/notice-of-intent-decision.entity'; import { NoticeOfIntent } from '../../notice-of-intent/notice-of-intent.entity'; +import { SEARCH_CACHE_TIME } from '../search.config'; import { AdvancedSearchResultDto, SearchRequestDto } from '../search.dto'; import { NoticeOfIntentSubmissionSearchView } from './notice-of-intent-search-view.entity'; @@ -52,7 +53,7 @@ export class NoticeOfIntentAdvancedSearchService { fileNumbers = await this.searchForFileNumbers(searchDto); await client.setEx( searchKey, - 180, //Seconds + SEARCH_CACHE_TIME, JSON.stringify([...fileNumbers.values()]), ); } diff --git a/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.spec.ts b/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.spec.ts index cb9d5e13b3..55cd57f3e3 100644 --- a/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.spec.ts +++ b/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.spec.ts @@ -2,7 +2,7 @@ import { RedisService } from '@app/common/redis/redis.service'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; -import { Repository } from 'typeorm'; +import { QueryRunner, Repository } from 'typeorm'; import { createMockQuery } from '../../../../test/mocks/mockTypes'; import { NotificationSubmission } from '../../../portal/notification-submission/notification-submission.entity'; import { LocalGovernment } from '../../local-government/local-government.entity'; @@ -22,6 +22,7 @@ describe('NotificationAdvancedSearchService', () => { Repository >; let mockRedisService: DeepMocked; + let mockQueryRunner: DeepMocked; const sortFields = [ 'fileId', @@ -60,6 +61,7 @@ describe('NotificationAdvancedSearchService', () => { mockNotificationRepo = createMock(); mockNotificationSubmissionRepo = createMock(); mockRedisService = createMock(); + mockQueryRunner = createMock(); mockQuery = createMockQuery(); @@ -118,7 +120,7 @@ describe('NotificationAdvancedSearchService', () => { mockQuery, ); - const result = await service.search(mockSearchDto, {} as any); + const result = await service.search(mockSearchDto, mockQueryRunner); expect(result).toEqual({ data: [], total: 0 }); expect(mockQuery.andWhere).toHaveBeenCalledTimes(4); @@ -134,7 +136,7 @@ describe('NotificationAdvancedSearchService', () => { .spyOn(service as any, 'searchForFileNumbers') .mockResolvedValue(new Set(['100000'])); - const result = await service.search(mockSearchDto, {} as any); + const result = await service.search(mockSearchDto, mockQueryRunner); expect(result).toEqual({ data: [], total: 0 }); expect(searchForFileNumbersSpy).toHaveBeenCalledWith(mockSearchDto); @@ -152,7 +154,7 @@ describe('NotificationAdvancedSearchService', () => { mockSearchDto.sortField = sortField; mockSearchDto.sortDirection = 'DESC'; - const result = await service.search(mockSearchDto, {} as any); + const result = await service.search(mockSearchDto, mockQueryRunner); expect(result).toEqual({ data: [], total: 0 }); expect(searchForFileNumbersSpy).toHaveBeenCalledWith(mockSearchDto); diff --git a/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.ts index 655216c9ff..82ffb924ff 100644 --- a/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.ts @@ -10,6 +10,7 @@ import { formatStringToPostgresSearchStringArrayWithWildCard } from '../../../ut import { intersectSets } from '../../../utils/set-helper'; import { LocalGovernment } from '../../local-government/local-government.entity'; import { Notification } from '../../notification/notification.entity'; +import { SEARCH_CACHE_TIME } from '../search.config'; import { AdvancedSearchResultDto, SearchRequestDto } from '../search.dto'; import { NotificationSubmissionSearchView } from './notification-search-view.entity'; @@ -47,7 +48,7 @@ export class NotificationAdvancedSearchService { fileNumbers = await this.searchForFileNumbers(searchDto); await client.setEx( searchKey, - 180, //Seconds + SEARCH_CACHE_TIME, JSON.stringify([...fileNumbers.values()]), ); } diff --git a/services/apps/alcs/src/alcs/search/planning-review/planning-review-advanced-search.service.spec.ts b/services/apps/alcs/src/alcs/search/planning-review/planning-review-advanced-search.service.spec.ts index 6f9552220f..fac5069ce3 100644 --- a/services/apps/alcs/src/alcs/search/planning-review/planning-review-advanced-search.service.spec.ts +++ b/services/apps/alcs/src/alcs/search/planning-review/planning-review-advanced-search.service.spec.ts @@ -2,7 +2,7 @@ import { RedisService } from '@app/common/redis/redis.service'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; -import { Repository } from 'typeorm'; +import { QueryRunner, Repository } from 'typeorm'; import { createMockQuery } from '../../../../test/mocks/mockTypes'; import { LocalGovernment } from '../../local-government/local-government.entity'; import { PlanningReview } from '../../planning-review/planning-review.entity'; @@ -16,6 +16,7 @@ describe('PlanningReviewAdvancedSearchService', () => { let mockLocalGovernmentRepository: DeepMocked>; let mockPlanningReviewRepository: DeepMocked>; let mockRedisService: DeepMocked; + let mockQueryRunner: DeepMocked; const sortFields = [ 'fileId', @@ -53,6 +54,7 @@ describe('PlanningReviewAdvancedSearchService', () => { mockLocalGovernmentRepository = createMock(); mockPlanningReviewRepository = createMock(); mockRedisService = createMock(); + mockQueryRunner = createMock(); mockQuery = createMockQuery(); @@ -102,7 +104,7 @@ describe('PlanningReviewAdvancedSearchService', () => { mockPlanningReviewRepository.find.mockResolvedValue([]); mockPlanningReviewRepository.createQueryBuilder.mockReturnValue(mockQuery); - const result = await service.search(mockSearchDto, {} as any); + const result = await service.search(mockSearchDto, mockQueryRunner); expect(result).toEqual({ data: [], total: 0 }); expect(mockPlanningReviewRepository.find).toHaveBeenCalledTimes(3); @@ -117,7 +119,7 @@ describe('PlanningReviewAdvancedSearchService', () => { .spyOn(service as any, 'searchForFileNumbers') .mockResolvedValue(new Set(['100000'])); - const result = await service.search(mockSearchDto, {} as any); + const result = await service.search(mockSearchDto, mockQueryRunner); expect(result).toEqual({ data: [], total: 0 }); expect(searchForFileNumbersSpy).toHaveBeenCalledWith(mockSearchDto); @@ -135,7 +137,7 @@ describe('PlanningReviewAdvancedSearchService', () => { mockSearchDto.sortField = sortField; mockSearchDto.sortDirection = 'DESC'; - const result = await service.search(mockSearchDto, {} as any); + const result = await service.search(mockSearchDto, mockQueryRunner); expect(result).toEqual({ data: [], total: 0 }); expect(searchForFileNumbersSpy).toHaveBeenCalledWith(mockSearchDto); diff --git a/services/apps/alcs/src/alcs/search/planning-review/planning-review-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/planning-review/planning-review-advanced-search.service.ts index d5dcdd6ab9..c9aea92f18 100644 --- a/services/apps/alcs/src/alcs/search/planning-review/planning-review-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/planning-review/planning-review-advanced-search.service.ts @@ -13,6 +13,7 @@ import { LocalGovernment } from '../../local-government/local-government.entity' import { PlanningReferral } from '../../planning-review/planning-referral/planning-referral.entity'; import { PlanningReviewDecision } from '../../planning-review/planning-review-decision/planning-review-decision.entity'; import { PlanningReview } from '../../planning-review/planning-review.entity'; +import { SEARCH_CACHE_TIME } from '../search.config'; import { AdvancedSearchResultDto, SearchRequestDto } from '../search.dto'; import { PlanningReviewSearchView } from './planning-review-search-view.entity'; @@ -48,7 +49,7 @@ export class PlanningReviewAdvancedSearchService { fileNumbers = await this.searchForFileNumbers(searchDto); await client.setEx( searchKey, - 180, //Seconds + SEARCH_CACHE_TIME, JSON.stringify([...fileNumbers.values()]), ); } diff --git a/services/apps/alcs/src/alcs/search/search.config.ts b/services/apps/alcs/src/alcs/search/search.config.ts new file mode 100644 index 0000000000..88a979427c --- /dev/null +++ b/services/apps/alcs/src/alcs/search/search.config.ts @@ -0,0 +1 @@ +export const SEARCH_CACHE_TIME = 180; //SECONDS diff --git a/services/apps/alcs/src/alcs/search/search.controller.spec.ts b/services/apps/alcs/src/alcs/search/search.controller.spec.ts index 3ef31a8118..dd9cb489de 100644 --- a/services/apps/alcs/src/alcs/search/search.controller.spec.ts +++ b/services/apps/alcs/src/alcs/search/search.controller.spec.ts @@ -156,7 +156,7 @@ describe('SearchController', () => { }); it('should call advanced search to retrieve Applications, NOIs, PlanningReviews, Covenants, Notifications, Inquiries', async () => { - const mockSearchRequestDto = { + const mockSearchRequestDto: SearchRequestDto = { pageSize: 1, page: 1, sortField: '1', @@ -165,9 +165,7 @@ describe('SearchController', () => { fileTypes: [], }; - const result = await controller.advancedSearch( - mockSearchRequestDto as SearchRequestDto, - ); + const result = await controller.advancedSearch(mockSearchRequestDto); expect( mockApplicationAdvancedSearchService.searchApplications, @@ -197,7 +195,7 @@ describe('SearchController', () => { }); it('should call applications advanced search to retrieve Applications', async () => { - const mockSearchRequestDto = { + const mockSearchRequestDto: SearchRequestDto = { pageSize: 1, page: 1, sortField: '1', @@ -205,9 +203,8 @@ describe('SearchController', () => { fileTypes: [], }; - const result = await controller.advancedSearchApplications( - mockSearchRequestDto as SearchRequestDto, - ); + const result = + await controller.advancedSearchApplications(mockSearchRequestDto); expect(mockDataSource.createQueryRunner).toHaveBeenCalledTimes(1); expect( @@ -222,7 +219,7 @@ describe('SearchController', () => { }); it('should call NOI advanced search to retrieve NOIs', async () => { - const mockSearchRequestDto = { + const mockSearchRequestDto: SearchRequestDto = { pageSize: 1, page: 1, sortField: '1', @@ -230,9 +227,8 @@ describe('SearchController', () => { fileTypes: [], }; - const result = await controller.advancedSearchNoticeOfIntents( - mockSearchRequestDto as SearchRequestDto, - ); + const result = + await controller.advancedSearchNoticeOfIntents(mockSearchRequestDto); expect( mockNoticeOfIntentAdvancedSearchService.searchNoticeOfIntents, @@ -245,7 +241,7 @@ describe('SearchController', () => { }); it('should call advanced search to retrieve Applications only when application file type selected', async () => { - const mockSearchRequestDto = { + const mockSearchRequestDto: SearchRequestDto = { pageSize: 1, page: 1, sortField: '1', @@ -253,9 +249,7 @@ describe('SearchController', () => { fileTypes: ['NFUP'], }; - const result = await controller.advancedSearch( - mockSearchRequestDto as SearchRequestDto, - ); + const result = await controller.advancedSearch(mockSearchRequestDto); expect(mockDataSource.createQueryRunner).toHaveBeenCalledTimes(1); expect( @@ -270,7 +264,7 @@ describe('SearchController', () => { }); it('should call advanced search to retrieve NOIs only when NOI file type selected', async () => { - const mockSearchRequestDto = { + const mockSearchRequestDto: SearchRequestDto = { pageSize: 1, page: 1, sortField: '1', @@ -278,9 +272,7 @@ describe('SearchController', () => { fileTypes: ['NOI'], }; - const result = await controller.advancedSearch( - mockSearchRequestDto as SearchRequestDto, - ); + const result = await controller.advancedSearch(mockSearchRequestDto); expect( mockNoticeOfIntentAdvancedSearchService.searchNoticeOfIntents, @@ -293,7 +285,7 @@ describe('SearchController', () => { }); it('should call advanced search to retrieve Inquiries only when Inquiry file type selected', async () => { - const mockSearchRequestDto = { + const mockSearchRequestDto: SearchRequestDto = { pageSize: 1, page: 1, sortField: '1', @@ -301,9 +293,7 @@ describe('SearchController', () => { fileTypes: ['GENC'], }; - const result = await controller.advancedSearch( - mockSearchRequestDto as SearchRequestDto, - ); + const result = await controller.advancedSearch(mockSearchRequestDto); expect(mockInquiryAdvancedSearchService.search).toHaveBeenCalledTimes(1); expect(mockInquiryAdvancedSearchService.search).toHaveBeenCalledWith( @@ -315,7 +305,7 @@ describe('SearchController', () => { }); it('should call advanced search to retrieve Planning Review only when Planning Review file type selected', async () => { - const mockSearchRequestDto = { + const mockSearchRequestDto: SearchRequestDto = { pageSize: 1, page: 1, sortField: '1', @@ -323,9 +313,7 @@ describe('SearchController', () => { fileTypes: ['MISC'], }; - const result = await controller.advancedSearch( - mockSearchRequestDto as SearchRequestDto, - ); + const result = await controller.advancedSearch(mockSearchRequestDto); expect( mockPlanningReviewAdvancedSearchService.search, From c7a3abe4bb59ee47ec80ea515502e6d757e1c5ac Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 8 May 2024 13:55:32 -0700 Subject: [PATCH 043/103] Remove import jobs, add new ogr command to import from GDB --- README.md | 2 +- docs/jobs.md | 27 +- services/apps/alcs/src/alcs/alcs.module.ts | 6 +- .../import/application-import.service.spec.ts | 168 -------- .../alcs/import/application-import.service.ts | 251 ------------ .../alcs/src/alcs/import/import.module.ts | 22 - .../src/alcs/import/noi-import.service.ts | 375 ------------------ services/apps/alcs/src/commands/import.ts | 32 -- services/apps/alcs/src/main.ts | 4 - .../src/portal/parcel/parcel-lookup.entity.ts | 9 +- .../1715205731639-remove_objectid.ts | 17 + 11 files changed, 48 insertions(+), 865 deletions(-) delete mode 100644 services/apps/alcs/src/alcs/import/application-import.service.spec.ts delete mode 100644 services/apps/alcs/src/alcs/import/application-import.service.ts delete mode 100644 services/apps/alcs/src/alcs/import/import.module.ts delete mode 100644 services/apps/alcs/src/alcs/import/noi-import.service.ts delete mode 100644 services/apps/alcs/src/commands/import.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1715205731639-remove_objectid.ts diff --git a/README.md b/README.md index 8a456bc5c9..d309042321 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ To report bugs/issues/features requests, please file an [issue](https://github.c - [Pipelines](./docs/pipelines.md) - [SchemaSpy - ALCS](https://bcgov.github.io/alcs/schemaspy/alcs/index.html) - [SchemaSpy - OATS](https://bcgov.github.io/alcs/schemaspy/oats/index.html) -- [One time Jobs](./docs/jobs.md) +- [Maintenance Jobs](./docs/jobs.md) ## Development Environment Setup diff --git a/docs/jobs.md b/docs/jobs.md index 8bce6c365c..74572f7801 100644 --- a/docs/jobs.md +++ b/docs/jobs.md @@ -1,16 +1,33 @@ -# Jobs in Openshift +# Maintenance Jobs -The main ALCS service has been programmed with several useful jobs. Jobs can be executed locally by checking the package json and running the relevant commands. +## PMBC Import -## Openshift +We receive the parcel data in a GDB from PMBC, this data changes and needs to be imported once a year. + +1. Grab the new PMBC export in GDB and download to local machine +1. Setup Portforwading as necessary to get access to Postgres +1. Truncate the existing parcel_lookup table +1. Run the following command replacing username and password as + necessary: `ogr2ogr -f "PostgreSQL" PG:"host=localhost port=5432 dbname=app user=postgres password=postgres active_schema=alcs" PMBC_export.gdb -nln parcel_lookup` +1. Be patient, this will import ~2 million rows and will take ~10 minutes + +## Running Jobs in Openshift + +The main ALCS service has been programmed with several useful jobs. Jobs can be executed locally by checking the package +json and running the relevant commands. + +### Openshift + +Using the template below these jobs can be executed inside openshift. Once logged into OpenShift go to the Jobs tab and +Click new Job. Paste the below yml and update the following pieces: -Using the template below these jobs can be executed inside openshift. Once logged into OpenShift go to the Jobs tab and Click new Job. Paste the below yml and update the following pieces: * Replace the JOB_NAME with the jobs name * Replace NAMESPACE with the project where you want to run the job * Replace VERSION_HERE with the version of the image to use * Replace COMMAND_HERE with the command to execute such as import -## Template +### Template + ``` apiVersion: batch/v1 kind: Job diff --git a/services/apps/alcs/src/alcs/alcs.module.ts b/services/apps/alcs/src/alcs/alcs.module.ts index 220e2c09b8..6c9eb645b6 100644 --- a/services/apps/alcs/src/alcs/alcs.module.ts +++ b/services/apps/alcs/src/alcs/alcs.module.ts @@ -11,11 +11,11 @@ import { CodeModule } from './code/code.module'; import { CommentModule } from './comment/comment.module'; import { CommissionerModule } from './commissioner/commissioner.module'; import { HomeModule } from './home/home.module'; -import { ImportModule } from './import/import.module'; import { InquiryModule } from './inquiry/inquiry.module'; import { LocalGovernmentModule } from './local-government/local-government.module'; -import { MessageModule } from './message/message.module'; +import { MaintenanceModule } from './maintenance/maintenance.module'; import { MeetingModule } from './meetings/meeting.module'; +import { MessageModule } from './message/message.module'; import { NoticeOfIntentDecisionModule } from './notice-of-intent-decision/notice-of-intent-decision.module'; import { NoticeOfIntentSubmissionStatusModule } from './notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.module'; import { NoticeOfIntentTimelineModule } from './notice-of-intent/notice-of-intent-timeline/notice-of-intent-timeline.module'; @@ -28,11 +28,9 @@ import { PlanningReviewTimelineModule } from './planning-review/planning-review- import { PlanningReviewModule } from './planning-review/planning-review.module'; import { SearchModule } from './search/search.module'; import { StaffJournalModule } from './staff-journal/staff-journal.module'; -import { MaintenanceModule } from './maintenance/maintenance.module'; @Module({ imports: [ - ImportModule, ApplicationModule, CommentModule, MessageModule, diff --git a/services/apps/alcs/src/alcs/import/application-import.service.spec.ts b/services/apps/alcs/src/alcs/import/application-import.service.spec.ts deleted file mode 100644 index b22592ecee..0000000000 --- a/services/apps/alcs/src/alcs/import/application-import.service.spec.ts +++ /dev/null @@ -1,168 +0,0 @@ -import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; -import { Test, TestingModule } from '@nestjs/testing'; -import * as dayjs from 'dayjs'; -import * as timezone from 'dayjs/plugin/timezone'; -import * as utc from 'dayjs/plugin/utc'; -import { Volume } from 'memfs'; -import * as path from 'path'; -import { initApplicationMockEntity } from '../../../test/mocks/mockEntities'; -import { ApplicationMeeting } from '../application/application-meeting/application-meeting.entity'; -import { ApplicationMeetingService } from '../application/application-meeting/application-meeting.service'; -import { ApplicationPaused } from '../application/application-paused.entity'; -import { ApplicationPausedService } from '../application/application-paused/application-paused.service'; -import { ApplicationSubmissionStatusService } from '../application/application-submission-status/application-submission-status.service'; -import { ApplicationService } from '../application/application.service'; -import { BoardService } from '../board/board.service'; -import { Card } from '../card/card.entity'; -import { LocalGovernment } from '../local-government/local-government.entity'; -import { LocalGovernmentService } from '../local-government/local-government.service'; -import { ApplicationImportService } from './application-import.service'; - -dayjs.extend(utc); -dayjs.extend(timezone); - -jest.mock('fs', () => { - const fs = jest.requireActual('fs'); - - const unionfs = require('unionfs').default; - return unionfs.use(fs); -}); - -describe('ImportService', () => { - let service: ApplicationImportService; - let mockApplicationservice: DeepMocked; - let mockApplicationMeetingService: DeepMocked; - let mockPausedService: DeepMocked; - let mockLocalGovernmentService: DeepMocked; - let mockBoardService: DeepMocked; - let mockApplicationSubmissionStatusService: DeepMocked; - - let mockDataRow; - let mockApplication; - - beforeEach(async () => { - jest.resetAllMocks(); - - mockApplicationservice = createMock(); - mockApplicationMeetingService = createMock(); - mockPausedService = createMock(); - mockLocalGovernmentService = createMock(); - mockBoardService = createMock(); - mockApplicationSubmissionStatusService = createMock(); - - const module: TestingModule = await Test.createTestingModule({ - providers: [ - ApplicationImportService, - { - provide: ApplicationService, - useValue: mockApplicationservice, - }, - { - provide: ApplicationMeetingService, - useValue: mockApplicationMeetingService, - }, - { - provide: ApplicationPausedService, - useValue: mockPausedService, - }, - { - provide: LocalGovernmentService, - useValue: mockLocalGovernmentService, - }, - { - provide: BoardService, - useValue: mockBoardService, - }, - { - provide: ApplicationSubmissionStatusService, - useValue: mockApplicationSubmissionStatusService, - }, - ], - }).compile(); - - service = module.get(ApplicationImportService); - - mockDataRow = { - 'App ID': '1', - Name: 'fake-applicant', - 'Submitted to ALC': new Date(), - 'Decision Maker': 'Executive', - Region: 'fake-region', - }; - - mockApplication = initApplicationMockEntity(mockDataRow['App ID']); - mockApplicationservice.get.mockResolvedValue(mockApplication); - mockApplicationservice.create.mockResolvedValue(mockApplication); - mockApplicationservice.update.mockResolvedValue(mockApplication); - mockApplicationSubmissionStatusService.setStatusDateByFileNumber.mockResolvedValue( - {} as any, - ); - - mockLocalGovernmentService.getByName.mockResolvedValue({ - uuid: 'government-uuid', - } as LocalGovernment); - }); - - it('should be defined', () => { - expect(service).toBeDefined(); - }); - - it('should load the mapping and data files from fs', async () => { - const trackingSheetPath = path.resolve( - __dirname, - '..', - 'Tracking_Sheet.csv', - ); - const mappingSheetPath = path.resolve(__dirname, '..', 'App_Listing.csv'); - - const mockFs = require('fs'); - const newVolume = Volume.fromJSON({ - [trackingSheetPath]: - '"App ID","Type","Submitted to ALC"\n"51231","SCH","2022-05-08', - [mappingSheetPath]: '"App ID","Type","Local Gov"\n"51231","SCH","Cats', - }); - mockFs.use(newVolume); - - await service.importCsv(); - - expect(mockApplicationservice.update).toHaveBeenCalledTimes(1); - }); - - it('should create a meeting and a pause for row with request date', async () => { - const dataRowWithRequests = { - ...mockDataRow, - 'Request Sent (Paused)': new Date(), - 'Request Received (Active)': new Date(), - }; - mockPausedService.createOrUpdate.mockResolvedValue({} as ApplicationPaused); - mockApplicationMeetingService.create.mockResolvedValue( - {} as ApplicationMeeting, - ); - - await service.parseRow(dataRowWithRequests); - - expect(mockApplicationservice.get).toHaveBeenCalledTimes(1); - expect(mockPausedService.createOrUpdate).toHaveBeenCalledTimes(1); - expect(mockApplicationMeetingService.create).toHaveBeenCalledTimes(1); - }); - - it('should create a meeting and a two pauses for row with site visit', async () => { - const dataRowWithRequests = { - ...mockDataRow, - 'Site Visit Requested (Paused)': new Date(), - ' Site Visit Conducted (Active)': new Date(), - 'Draft SVR Provided (Paused)': new Date(), - 'Draft SVR Verified by Applicant (Active)': new Date(), - }; - mockPausedService.createOrUpdate.mockResolvedValue({} as ApplicationPaused); - mockApplicationMeetingService.create.mockResolvedValue( - {} as ApplicationMeeting, - ); - - await service.parseRow(dataRowWithRequests); - - expect(mockApplicationservice.get).toHaveBeenCalledTimes(1); - expect(mockPausedService.createOrUpdate).toHaveBeenCalledTimes(2); - expect(mockApplicationMeetingService.create).toHaveBeenCalledTimes(1); - }); -}); diff --git a/services/apps/alcs/src/alcs/import/application-import.service.ts b/services/apps/alcs/src/alcs/import/application-import.service.ts deleted file mode 100644 index 4cdc654a56..0000000000 --- a/services/apps/alcs/src/alcs/import/application-import.service.ts +++ /dev/null @@ -1,251 +0,0 @@ -import { Injectable, Logger } from '@nestjs/common'; -import * as csv from 'csv-parser'; -import * as dayjs from 'dayjs'; -import * as timezone from 'dayjs/plugin/timezone'; -import * as utc from 'dayjs/plugin/utc'; -import * as fs from 'fs'; -import * as path from 'path'; -import { ApplicationMeetingService } from '../application/application-meeting/application-meeting.service'; -import { ApplicationPausedService } from '../application/application-paused/application-paused.service'; -import { ApplicationSubmissionStatusService } from '../application/application-submission-status/application-submission-status.service'; -import { SUBMISSION_STATUS } from '../application/application-submission-status/submission-status.dto'; -import { Application } from '../application/application.entity'; -import { ApplicationService } from '../application/application.service'; - -dayjs.extend(utc); -dayjs.extend(timezone); - -export type ApplicationRow = { - fileNumber: string; - applicant: string; - submittedToAlc: Date; - feeReceived: Date | undefined; - ackDeficient: Date | undefined; - ackDeficientComplete: Date | undefined; - ackAllComplete: Date | undefined; - ackComplete: Date | undefined; - requestSent1: Date | undefined; - requestRec1: Date | undefined; - requestSent2: Date | undefined; - requestRec2: Date | undefined; - requestSent3: Date | undefined; - requestRec3: Date | undefined; - requestSent4: Date | undefined; - requestRec4: Date | undefined; - siteVisitRequest: Date | undefined; - siteVisitConducted: Date | undefined; - siteReportSent: Date | undefined; - siteReportReviewed: Date | undefined; - meetingScheduled: Date | undefined; - meetingConducted: Date | undefined; - meetingReportSent: Date | undefined; - meetingReportReview: Date | undefined; - decisionReleased: Date | undefined; - decisionSentToApplication: Date | undefined; - decisionMaker: string; - region: string; -}; - -@Injectable() -export class ApplicationImportService { - private logger: Logger = new Logger(ApplicationImportService.name); - - constructor( - private applicationService: ApplicationService, - private meetingService: ApplicationMeetingService, - private pausedService: ApplicationPausedService, - private applicationSubmissionStatusService: ApplicationSubmissionStatusService, - ) {} - - importCsv() { - this.logger.log('Import Setup Started'); - return new Promise(async (resolve) => { - const filePath = path.resolve(__dirname, '..', 'Tracking_Sheet.csv'); - const stream = fs.createReadStream(filePath); - const processing: Promise[] = []; - stream - .pipe(csv()) - .on('data', (data) => { - const promise = this.parseRow(data); - processing.push(promise); - }) - .on('end', () => { - Promise.all(processing).then(() => { - this.logger.log(`Processed ${processing.length} Records`); - resolve('Complete'); - }); - }); - }); - } - - async parseRow(data: ApplicationRow): Promise { - const mappedRow = this.mapRow(data); - const existingApplication = await this.applicationService.get( - mappedRow.fileNumber, - ); - if (existingApplication) { - const updatedApp = await this.applicationService.update( - existingApplication, - { - dateReceivedAllItems: mappedRow.ackAllComplete, - dateAcknowledgedComplete: mappedRow.ackComplete, - }, - ); - - await this.applicationSubmissionStatusService.setStatusDateByFileNumber( - existingApplication.fileNumber, - SUBMISSION_STATUS.RECEIVED_BY_ALC, - mappedRow.ackAllComplete, - ); - - await this.createMeetings(mappedRow, updatedApp); - } else { - this.logger.error(`${mappedRow.fileNumber}: Application does not exist`); - } - } - - private mapRow(data: any): ApplicationRow { - return { - fileNumber: data['App ID'], - applicant: data['Name'], - submittedToAlc: dayjs(data['Submitted to ALC']) - .tz('Canada/Pacific') - .startOf('day') - .toDate(), - feeReceived: this.handleDate(data["Fee Rec'd by ALC"]), - ackDeficient: this.handleDate(data['Deficient Email Sent']), - ackDeficientComplete: this.handleDate(data["Rec'd All Deficient Items"]), - ackAllComplete: this.handleDate(data["Rec'd All Items"]), - ackComplete: this.handleDate(data['Ack by ALC']), - requestSent1: this.handleDate(data['Request Sent (Paused)']), - requestRec1: this.handleDate(data['Request Received (Active)']), - requestSent2: this.handleDate(data['Request Sent (Paused)_1']), - requestRec2: this.handleDate(data['Request Received (Active)_2']), - requestSent3: this.handleDate(data['Request Sent (Paused)_3']), - requestRec3: this.handleDate(data['Request Received (Active)_4']), - requestSent4: this.handleDate(data['Request Sent (Paused)_5']), - requestRec4: this.handleDate(data['Request Received (Active)_6']), - siteVisitRequest: this.handleDate(data['Site Visit Requested (Paused)']), - siteVisitConducted: this.handleDate( - data[' Site Visit Conducted (Active)'], - ), - siteReportSent: this.handleDate(data['Draft SVR Provided (Paused)']), - siteReportReviewed: this.handleDate( - data['Draft SVR Verified by Applicant (Active)'], - ), - meetingScheduled: this.handleDate(data['Scheduled (Paused)']), - meetingConducted: this.handleDate(data['Day of Meeting (Active)']), - meetingReportSent: this.handleDate( - data['Draft Report Provided to Applicant (Paused)'], - ), - meetingReportReview: this.handleDate( - data['Draft Report Verified by Applicant (Active)'], - ), - decisionReleased: this.handleDate(data['Decision Released (Active)']), - decisionSentToApplication: this.handleDate( - data['Decision provided to Applicant (Final Active Day)'], - ), - decisionMaker: data['Decision Maker'], - region: data['Region'], - }; - } - - private handleDate(date: string | undefined) { - return date - ? dayjs(date).tz('Canada/Pacific').startOf('day').toDate() - : undefined; - } - - private async createMeeting( - application: Application, - typeCode: 'IR' | 'AM' | 'SV', - startDate?: Date, - endDate?: Date, - startDate2?: Date, - endDate2?: Date, - ) { - try { - if (startDate) { - const pause = await this.pausedService.createOrUpdate({ - application, - startDate, - endDate, - }); - - let pause2; - if (startDate2) { - pause2 = await this.pausedService.createOrUpdate({ - application, - startDate: startDate2, - endDate: endDate2, - }); - } - - await this.meetingService.create({ - typeCode, - application, - meetingPause: pause || undefined, - reportPause: pause2, - }); - } - } catch (e) { - this.logger.error( - `Failed to create meeting for ${application.fileNumber} ${e.message}`, - ); - } - } - - private async createMeetings( - mappedRow: ApplicationRow, - application: Application, - ) { - //Create Info Requests - await this.createMeeting( - application, - 'IR', - mappedRow.requestSent1, - mappedRow.requestRec1, - ); - - await this.createMeeting( - application, - 'IR', - mappedRow.requestSent2, - mappedRow.requestRec2, - ); - - await this.createMeeting( - application, - 'IR', - mappedRow.requestSent3, - mappedRow.requestRec3, - ); - - await this.createMeeting( - application, - 'IR', - mappedRow.requestSent4, - mappedRow.requestRec4, - ); - - //Create Site Visits - await this.createMeeting( - application, - 'SV', - mappedRow.siteVisitRequest, - mappedRow.siteVisitConducted, - mappedRow.siteReportSent, - mappedRow.siteReportReviewed, - ); - - //Create Applicant Meetings - await this.createMeeting( - application, - 'AM', - mappedRow.meetingScheduled, - mappedRow.meetingConducted, - mappedRow.meetingReportSent, - mappedRow.meetingReportReview, - ); - } -} diff --git a/services/apps/alcs/src/alcs/import/import.module.ts b/services/apps/alcs/src/alcs/import/import.module.ts deleted file mode 100644 index f64258d8b4..0000000000 --- a/services/apps/alcs/src/alcs/import/import.module.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { Module } from '@nestjs/common'; -import { ApplicationSubmissionStatusModule } from '../application/application-submission-status/application-submission-status.module'; -import { ApplicationModule } from '../application/application.module'; -import { BoardModule } from '../board/board.module'; -import { CardModule } from '../card/card.module'; -import { NoticeOfIntentDecisionModule } from '../notice-of-intent-decision/notice-of-intent-decision.module'; -import { NoticeOfIntentModule } from '../notice-of-intent/notice-of-intent.module'; -import { ApplicationImportService } from './application-import.service'; -import { NoticeOfIntentImportService } from './noi-import.service'; - -@Module({ - providers: [ApplicationImportService, NoticeOfIntentImportService], - imports: [ - ApplicationModule, - ApplicationSubmissionStatusModule, - BoardModule, - NoticeOfIntentModule, - NoticeOfIntentDecisionModule, - CardModule, - ], -}) -export class ImportModule {} diff --git a/services/apps/alcs/src/alcs/import/noi-import.service.ts b/services/apps/alcs/src/alcs/import/noi-import.service.ts deleted file mode 100644 index 4c4e415325..0000000000 --- a/services/apps/alcs/src/alcs/import/noi-import.service.ts +++ /dev/null @@ -1,375 +0,0 @@ -import { Injectable, Logger } from '@nestjs/common'; -import * as csv from 'csv-parser'; -import * as dayjs from 'dayjs'; -import * as timezone from 'dayjs/plugin/timezone'; -import * as utc from 'dayjs/plugin/utc'; -import * as fs from 'fs'; -import * as path from 'path'; -import { FALLBACK_APPLICANT_NAME } from '../../utils/owner.constants'; -import { BoardService } from '../board/board.service'; -import { CardService } from '../card/card.service'; -import { LocalGovernmentService } from '../local-government/local-government.service'; -import { NoticeOfIntentDecisionV2Service } from '../notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service'; -import { NoticeOfIntentMeetingService } from '../notice-of-intent/notice-of-intent-meeting/notice-of-intent-meeting.service'; -import { NoticeOfIntentSubtype } from '../notice-of-intent/notice-of-intent-subtype.entity'; -import { NoticeOfIntent } from '../notice-of-intent/notice-of-intent.entity'; -import { NoticeOfIntentService } from '../notice-of-intent/notice-of-intent.service'; - -dayjs.extend(utc); -dayjs.extend(timezone); - -export type NOIRow = { - fileNumber: string; - applicant?: string; - submittedToAlc: Date; - feeReceived: Date | undefined; - ackDeficient: Date | undefined; - ackAllComplete: Date | undefined; - ackComplete: Date | undefined; - subtype1: string | undefined; - subtype2: string | undefined; - retroactive: string | undefined; - requestSent1: Date | undefined; - requestRec1: Date | undefined; - requestSent2: Date | undefined; - requestRec2: Date | undefined; - requestSent3: Date | undefined; - requestRec3: Date | undefined; - requestSent4: Date | undefined; - requestRec4: Date | undefined; - decisionReleased: Date | undefined; - decisionSentToApplication: Date | undefined; - cityOrDistrict: string; - region: string; - outcome: string | undefined; - auditDate: Date | undefined; -}; - -const REGION_CODE_MAP = { - Interior: 'INTR', - 'North ': 'NORR', - Island: 'ISLR', - island: 'ISLR', - Kootenay: 'KOOR', - Okanagan: 'OKAR', - 'South Coast': 'SOUR', -}; - -const GOVERNMENT_NAME_MAP = { - 'district of chetwynd': 'District of Chetwynd', - 'Regional District of Okanagan-Similkameen': - 'Okanagan Similkameen Regional District', - 'Okanagan-Similkameen Regional District': - 'Okanagan Similkameen Regional District', - 'Regional District of North Okanagan': 'North Okanagan Regional District', - 'Corporation of Delta': 'City of Delta', - 'District of Fraser Fort George': 'Fraser Fort George Regional District', - 'Kitimat-Stikine Regional District': 'Kitimat Stikine Regional District', - 'Dist of North Cowichan': 'District of North Cowichan', - 'city of Abbotsford': 'City of Abbotsford', - 'Bulkley-Nechako': 'Bulkley-Nechako Regional District', -}; - -@Injectable() -export class NoticeOfIntentImportService { - private logger: Logger = new Logger(NoticeOfIntentImportService.name); - - private subTypes: NoticeOfIntentSubtype[] = []; - - constructor( - private noticeOfIntentService: NoticeOfIntentService, - private meetingService: NoticeOfIntentMeetingService, - private boardService: BoardService, - private localGovernmentService: LocalGovernmentService, - private cardService: CardService, - private noticeOfIntentDecisionService: NoticeOfIntentDecisionV2Service, - ) {} - - importNoiCsv() { - this.logger.log('Import Setup Started'); - - return new Promise(async (resolve) => { - this.subTypes = await this.noticeOfIntentService.listSubtypes(); - - const mapping = await this.loadMappingSheet(); - - const filePath = path.resolve(__dirname, '..', 'NOI_Import.csv'); - const stream = fs.createReadStream(filePath); - const processing: Promise[] = []; - stream - .pipe(csv()) - .on('data', (data) => { - if ( - data['Notice ID'] === '' || - (data['Decision Version'] !== '' && - data['Decision Version'] !== '1') - ) { - return; - } - - const promise = this.parseRow(data, mapping); - processing.push(promise); - }) - .on('end', () => { - Promise.all(processing).then(() => { - this.logger.log(`Processed ${processing.length} Records`); - resolve('Complete'); - }); - }); - }); - } - - async parseRow(data: any, mapping: Map): Promise { - const mappedRow = this.mapRow(data); - - try { - await this.noticeOfIntentService.getByFileNumber(mappedRow.fileNumber); - this.logger.debug(`${mappedRow.fileNumber}: Application already exists`); - return; - } catch (e) {} - - try { - const resolutionData = mapping.get(mappedRow.fileNumber); - if (!resolutionData && mappedRow.decisionReleased) { - this.logger.warn(`${mappedRow.fileNumber}: Not in mapping sheet`); - return; - } - - const mappedGovernmentName = this.getGovernmentName( - mappedRow.cityOrDistrict.trim(), - ); - - const localGovernment = - await this.localGovernmentService.getByName(mappedGovernmentName); - - if (!localGovernment) { - this.logger.error( - `${mappedRow.fileNumber}: Failed to load government "${mappedGovernmentName}"`, - ); - return; - } - - const vettingBoard = await this.boardService.getOneOrFail({ - code: 'vett', - }); - const regionCode = REGION_CODE_MAP[mappedRow.region]; - if (!regionCode) { - this.logger.error( - `${mappedRow.fileNumber}: Failed to find region ${mappedRow.region}`, - ); - return; - } - - const noticeOfIntent = await this.noticeOfIntentService.create( - { - typeCode: '', - fileNumber: mappedRow.fileNumber, - applicant: mappedRow.applicant || FALLBACK_APPLICANT_NAME, - dateSubmittedToAlc: mappedRow.submittedToAlc, - localGovernmentUuid: localGovernment.uuid, - regionCode: regionCode, - }, - vettingBoard, - ); - const subtypes = this.mapSubTypes(mappedRow); - - //Set Payment / ACK Dates - const updatedNoi = await this.noticeOfIntentService.update( - noticeOfIntent.fileNumber, - { - feePaidDate: mappedRow.feeReceived?.getTime(), - dateAcknowledgedIncomplete: mappedRow.ackDeficient?.getTime(), - dateReceivedAllItems: mappedRow.ackAllComplete?.getTime(), - dateAcknowledgedComplete: mappedRow.ackComplete?.getTime(), - retroactive: mappedRow.retroactive === 'Y', - subtype: subtypes, - }, - ); - - await this.createMeetings(mappedRow, updatedNoi); - - if (mappedRow.ackComplete) { - await this.boardService.changeBoard(updatedNoi.cardUuid, 'noi'); - } - - if (mappedRow.outcome) { - await this.cardService.archive(updatedNoi.cardUuid); - } - - await this.createDecisions(mappedRow, updatedNoi, resolutionData); - } catch (e) { - this.logger.error(`${mappedRow.fileNumber}: ${e.message}`); - } - } - - private mapSubTypes(mappedRow: NOIRow) { - const subtypes: string[] = []; - - ['subtype1', 'subtype2'].forEach((fieldKey) => { - let subtype = mappedRow[fieldKey]; - - //Quick data fix for single type with typo - if (subtype === 'Farm Building - Intensive Livestock') { - subtype = 'Farm Building - Intensive Livestock'; - } - - if (subtype) { - const mappedType = this.subTypes.find((type) => type.label === subtype); - if (mappedType && !subtypes.includes(mappedType.code)) { - subtypes.push(mappedType.code); - } else if (!mappedType) { - console.log(`Failed to Match Subtype ${subtype}`); - } - } - }); - - return subtypes; - } - - private mapRow(data: any): NOIRow { - const keys = Object.keys(data); - return { - fileNumber: data['Notice ID'], - applicant: data['Name'], - submittedToAlc: dayjs(data['Submitted to ALC']) - .tz('Canada/Pacific') - .startOf('day') - .toDate(), - feeReceived: this.handleDate(data["Fee Rec'd by ALC"]), - ackDeficient: this.handleDate(data['Deficient Email Sent']), - ackAllComplete: this.handleDate(data["Rec'd All Items"]), - ackComplete: this.handleDate(data['Ack Complete by ALC']), - subtype1: data['NOI Type Primary '], - subtype2: data['NOI Type Secondary \n(if applicable) '], - retroactive: data['Retroactive NOI \n(Y/N)'], - //Use keys here as they all have the same column name - requestSent1: this.handleDate(data[keys[15]]), - requestRec1: this.handleDate(data[keys[16]]), - requestSent2: this.handleDate(data[keys[17]]), - requestRec2: this.handleDate(data[keys[18]]), - requestSent3: this.handleDate(data[keys[19]]), - requestRec3: this.handleDate(data[keys[20]]), - requestSent4: this.handleDate(data[keys[21]]), - requestRec4: this.handleDate(data[keys[22]]), - decisionReleased: this.handleDate(data['Letter Released ']), - decisionSentToApplication: this.handleDate( - data['Decision provided to Applicant (Final Active Day)'], - ), - cityOrDistrict: data['City or District'], - region: data['Region '], - outcome: data['Outcome'], - auditDate: this.handleDate(data['Audited ']), - }; - } - - private handleDate(date: string | undefined) { - return date - ? dayjs(date).tz('Canada/Pacific').startOf('day').toDate() - : undefined; - } - - private async createMeeting( - noticeOfIntent: NoticeOfIntent, - startDate?: Date, - endDate?: Date, - ) { - if (!startDate) { - return; - } - - try { - await this.meetingService.create({ - meetingTypeCode: 'IR', - meetingStartDate: startDate.getTime(), - meetingEndDate: endDate?.getTime(), - noticeOfIntentUuid: noticeOfIntent.uuid, - }); - } catch (e) { - this.logger.error( - `Failed to create meeting for ${noticeOfIntent.fileNumber} ${e.message}`, - ); - } - } - - private loadMappingSheet(): Promise> { - const mapping = new Map(); - const filePath = path.resolve(__dirname, '..', 'NOI_Listing.csv'); - const stream = fs.createReadStream(filePath); - let i = 0; - return new Promise((resolve) => { - stream - .pipe(csv()) - .on('data', (data) => { - i++; - const appId = data[Object.keys(data)[0]]; - const resolutionNumber = data[Object.keys(data)[1]]; - mapping.set(appId, resolutionNumber); - }) - .on('end', () => { - this.logger.log(`Processed ${i} Mapping Records`); - resolve(mapping); - }); - }); - } - - private async createMeetings( - mappedRow: NOIRow, - noticeOfIntent: NoticeOfIntent, - ) { - //Create Info Requests - await this.createMeeting( - noticeOfIntent, - mappedRow.requestSent1, - mappedRow.requestRec1, - ); - - await this.createMeeting( - noticeOfIntent, - mappedRow.requestSent2, - mappedRow.requestRec2, - ); - - await this.createMeeting( - noticeOfIntent, - mappedRow.requestSent3, - mappedRow.requestRec3, - ); - - await this.createMeeting( - noticeOfIntent, - mappedRow.requestSent4, - mappedRow.requestRec4, - ); - } - - private getGovernmentName(governmentName: string) { - const mappedName = GOVERNMENT_NAME_MAP[governmentName]; - return mappedName ?? governmentName; - } - - private async createDecisions( - mappedRow: NOIRow, - updatedApp: NoticeOfIntent, - resolutionData: string | undefined, - ) { - if (mappedRow.decisionReleased && resolutionData) { - const resolutionYear = parseInt(resolutionData?.split('/')[1]); - const resolutionNumber = parseInt(resolutionData?.split('/')[0]); - - await this.noticeOfIntentDecisionService.create( - { - date: mappedRow.decisionReleased.getTime(), - decisionMaker: 'CEO Delegate', - fileNumber: mappedRow.fileNumber, - outcomeCode: mappedRow.outcome === 'Approved' ? 'APPR' : 'ONTP', - resolutionNumber: resolutionNumber, - resolutionYear: resolutionYear, - auditDate: mappedRow.auditDate?.getTime(), - isDraft: false, - }, - updatedApp, - undefined, - ); - } - } -} diff --git a/services/apps/alcs/src/commands/import.ts b/services/apps/alcs/src/commands/import.ts deleted file mode 100644 index 492c1b8c16..0000000000 --- a/services/apps/alcs/src/commands/import.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { Logger } from '@nestjs/common'; -import { NestFactory } from '@nestjs/core'; -import winston from 'winston'; -import { ApplicationImportService } from '../alcs/import/application-import.service'; -import { NoticeOfIntentImportService } from '../alcs/import/noi-import.service'; -import { MainModule } from '../main.module'; - -export async function importApplications(logger: winston.Logger) { - const app = await NestFactory.createApplicationContext(MainModule, { - bufferLogs: false, - logger, - }); - - await app.init(); - - const importService = app.get(ApplicationImportService); - await importService.importCsv(); - process.exit(0); -} - -export async function importNOIs() { - const app = await NestFactory.createApplicationContext(MainModule, { - bufferLogs: false, - }); - app.useLogger(app.get(Logger)); - - await app.init(); - - const importService = app.get(NoticeOfIntentImportService); - await importService.importNoiCsv(); - process.exit(0); -} diff --git a/services/apps/alcs/src/main.ts b/services/apps/alcs/src/main.ts index 1079e75b4e..f916faa9e3 100644 --- a/services/apps/alcs/src/main.ts +++ b/services/apps/alcs/src/main.ts @@ -14,7 +14,6 @@ import { install } from 'source-map-support'; import * as winston from 'winston'; import { createLogger } from 'winston'; import { generateModuleGraph } from './commands/graph'; -import { importApplications } from './commands/import'; import { MainModule } from './main.module'; const registerSwagger = (app: NestFastifyApplication) => { @@ -175,9 +174,6 @@ async function bootstrap() { if (extraArg === 'graph') { await generateModuleGraph(app); } - if (extraArg == 'import') { - await importApplications(logger); - } // config variables const port: number = config.get('ALCS.PORT'); diff --git a/services/apps/alcs/src/portal/parcel/parcel-lookup.entity.ts b/services/apps/alcs/src/portal/parcel/parcel-lookup.entity.ts index 88555323f3..490fe86367 100644 --- a/services/apps/alcs/src/portal/parcel/parcel-lookup.entity.ts +++ b/services/apps/alcs/src/portal/parcel/parcel-lookup.entity.ts @@ -4,10 +4,13 @@ import { Column, Entity, Index, PrimaryColumn } from 'typeorm'; comment: 'Data from ParcelMapBC for use in the Portal', }) export class ParcelLookup { - @PrimaryColumn({ type: 'int4' }) - objectid: number; + constructor(data?: Partial) { + if (data) { + Object.assign(this, data); + } + } - @Column({ type: 'varchar', length: 254 }) + @PrimaryColumn({ type: 'varchar', length: 254 }) globalUid: string; @Column({ type: 'varchar', length: 50 }) diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1715205731639-remove_objectid.ts b/services/apps/alcs/src/providers/typeorm/migrations/1715205731639-remove_objectid.ts new file mode 100644 index 0000000000..732aef57cb --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1715205731639-remove_objectid.ts @@ -0,0 +1,17 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class RemoveObjectid1715205731639 implements MigrationInterface { + name = 'RemoveObjectid1715205731639'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."parcel_lookup" DROP COLUMN "objectid"`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."parcel_lookup" ADD "objectid" integer NOT NULL`, + ); + } +} From 2919faa0a9d5eaa1e45cc46dc4c5d8005738613f Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 8 May 2024 16:16:20 -0700 Subject: [PATCH 044/103] Allow statuses to come in later than results * The input setters are called in any order, this results that even if all of the inputs are populated in the parent they may not be populated in the child yet * Add logic so that when either the statuses or results are set, we re-hydrated the results --- .../application-search-table.component.ts | 23 +++++++++---- ...notice-of-intent-search-table.component.ts | 24 ++++++++++---- .../notification-search-table.component.ts | 32 ++++++++++++------- .../public/search/public-search.component.ts | 3 +- .../search-list/search-list.component.html | 2 +- .../search-list/search-list.component.ts | 26 +++++++++++---- 6 files changed, 74 insertions(+), 36 deletions(-) diff --git a/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts b/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts index ba149448e8..e1c9901539 100644 --- a/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts +++ b/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.ts @@ -16,17 +16,22 @@ export class ApplicationSearchTableComponent { @ViewChild(MatPaginator) paginator!: MatPaginator; @ViewChild(MatSort) sort?: MatSort; - _applications: ApplicationSearchResultDto[] = []; @Input() pageIndex: number = 0; + @Input() totalCount: number | undefined; + _applications!: ApplicationSearchResultDto[]; @Input() set applications(applications: ApplicationSearchResultDto[]) { this._applications = applications; this.isLoading = false; - this.dataSource = new MatTableDataSource(this.mapApplications(applications)); + this.mapApplications(); + } + + _statuses!: ApplicationStatusDto[]; + @Input() set statuses(statuses: ApplicationStatusDto[]) { + this._statuses = statuses; + this.mapApplications(); } - @Input() totalCount: number | undefined; - @Input() statuses: ApplicationStatusDto[] = []; @Output() tableChange = new EventEmitter(); displayedColumns = displayedColumns; @@ -70,14 +75,18 @@ export class ApplicationSearchTableComponent { await this.router.navigateByUrl(`/public/application/${record.referenceId}`); } - private mapApplications(applications: ApplicationSearchResultDto[]): SearchResult[] { - return applications.map((e) => { - const status = this.statuses.find((st) => st.code === e.status); + private mapApplications() { + if (!this._applications || !this._statuses) { + return; + } + const results = this._applications.map((e) => { + const status = this._statuses.find((st) => st.code === e.status); return { ...e, status, }; }); + this.dataSource = new MatTableDataSource(results); } } diff --git a/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts index 36d66a571c..b53f0058cb 100644 --- a/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts +++ b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts @@ -16,16 +16,22 @@ export class NoticeOfIntentSearchTableComponent { @ViewChild(MatPaginator) paginator!: MatPaginator; @ViewChild(MatSort) sort?: MatSort; + @Input() pageIndex: number = 0; + @Input() totalCount: number | undefined; + _noticeOfIntents: NoticeOfIntentSearchResultDto[] = []; @Input() set noticeOfIntents(noticeOfIntents: NoticeOfIntentSearchResultDto[]) { this._noticeOfIntents = noticeOfIntents; - this.dataSource = new MatTableDataSource(this.mapNoticeOfIntent(noticeOfIntents)); + this.mapNoticeOfIntent(); this.isLoading = false; } - @Input() pageIndex: number = 0; - @Input() totalCount: number | undefined; - @Input() statuses: ApplicationStatusDto[] = []; + _statuses!: ApplicationStatusDto[]; + @Input() set statuses(statuses: ApplicationStatusDto[]) { + this._statuses = statuses; + this.mapNoticeOfIntent(); + } + @Output() tableChange = new EventEmitter(); displayedColumns = displayedColumns; @@ -69,14 +75,18 @@ export class NoticeOfIntentSearchTableComponent { await this.router.navigateByUrl(`/public/notice-of-intent/${record.referenceId}`); } - private mapNoticeOfIntent(applications: NoticeOfIntentSearchResultDto[]): SearchResult[] { - return applications.map((e) => { - const status = this.statuses.find((st) => st.code === e.status); + private mapNoticeOfIntent() { + if (!this._noticeOfIntents || !this._statuses) { + return; + } + const results = this._noticeOfIntents.map((e) => { + const status = this._statuses.find((st) => st.code === e.status); return { ...e, status, }; }); + this.dataSource = new MatTableDataSource(results); } } diff --git a/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.ts b/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.ts index 5cb2b3e4f3..ca1067409a 100644 --- a/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.ts +++ b/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.ts @@ -1,9 +1,8 @@ -import { Component, EventEmitter, Input, OnDestroy, Output } from '@angular/core'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; import { PageEvent } from '@angular/material/paginator'; import { Sort, SortDirection } from '@angular/material/sort'; import { MatTableDataSource } from '@angular/material/table'; import { Router } from '@angular/router'; -import { Subject } from 'rxjs'; import { ApplicationStatusDto } from '../../../../services/application-submission/application-submission.dto'; import { NotificationSearchResultDto } from '../../../../services/search/search.dto'; import { SearchResult, TableChange } from '../search.interface'; @@ -14,17 +13,22 @@ import { SearchResult, TableChange } from '../search.interface'; styleUrls: ['./notification-search-table.component.scss'], }) export class NotificationSearchTableComponent { - _notifications: NotificationSearchResultDto[] = []; - - @Input() statuses: ApplicationStatusDto[] = []; + @Input() totalCount: number | undefined; + @Input() pageIndex: number = 0; + _notifications: NotificationSearchResultDto[] = []; @Input() set notifications(notifications: NotificationSearchResultDto[]) { this._notifications = notifications; - this.dataSource = new MatTableDataSource(this.mapNotifications(notifications)); + this.mapNotifications(); + this.isLoading = false; + } + + _statuses!: ApplicationStatusDto[]; + @Input() set statuses(statuses: ApplicationStatusDto[]) { + this._statuses = statuses; + this.mapNotifications(); } - @Input() totalCount: number | undefined; - @Input() pageIndex: number = 0; @Output() tableChange = new EventEmitter(); displayedColumns = ['fileId', 'ownerName', 'type', 'portalStatus', 'lastUpdate', 'government']; @@ -33,7 +37,7 @@ export class NotificationSearchTableComponent { total = 0; sortDirection: SortDirection = 'desc'; sortField = 'lastUpdate'; - isLoading = false; + isLoading = true; constructor(private router: Router) {} @@ -65,14 +69,18 @@ export class NotificationSearchTableComponent { await this.router.navigateByUrl(`/public/notification/${record.referenceId}`); } - private mapNotifications(notifications: NotificationSearchResultDto[]): SearchResult[] { - return notifications.map((e) => { - const status = this.statuses.find((st) => st.code === e.status); + private mapNotifications() { + if (!this._notifications || !this._statuses) { + return; + } + const results = this._notifications.map((e) => { + const status = this._statuses.find((st) => st.code === e.status); return { ...e, status, }; }); + this.dataSource = new MatTableDataSource(results); } } diff --git a/portal-frontend/src/app/features/public/search/public-search.component.ts b/portal-frontend/src/app/features/public/search/public-search.component.ts index 23aae08253..5b31540663 100644 --- a/portal-frontend/src/app/features/public/search/public-search.component.ts +++ b/portal-frontend/src/app/features/public/search/public-search.component.ts @@ -416,15 +416,14 @@ export class PublicSearchComponent implements OnInit, OnDestroy { private async loadStatuses() { const statuses = await this.statusService.getStatuses(); - if (statuses) { this.populateAllStatuses(statuses); } } private populateAllStatuses(statuses: ApplicationStatusDto[]) { + statuses.sort((a, b) => (a.label > b.label ? 1 : -1)); this.statuses = statuses; - this.statuses.sort((a, b) => (a.label > b.label ? 1 : -1)); } private populateForm(storedSearch: SearchRequestDto) { diff --git a/portal-frontend/src/app/features/public/search/search-list/search-list.component.html b/portal-frontend/src/app/features/public/search/search-list/search-list.component.html index bcbafa4825..a171d84ff5 100644 --- a/portal-frontend/src/app/features/public/search/search-list/search-list.component.html +++ b/portal-frontend/src/app/features/public/search/search-list/search-list.component.html @@ -1,5 +1,5 @@
-
+
{{ result.fileNumber }} - {{ result.ownerName }}
{{ result.type }}
{{ result.localGovernmentName }}
diff --git a/portal-frontend/src/app/features/public/search/search-list/search-list.component.ts b/portal-frontend/src/app/features/public/search/search-list/search-list.component.ts index 4b177f952f..93457c304e 100644 --- a/portal-frontend/src/app/features/public/search/search-list/search-list.component.ts +++ b/portal-frontend/src/app/features/public/search/search-list/search-list.component.ts @@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, OnDestroy, Output } from '@angular/core import { Router } from '@angular/router'; import { Subject } from 'rxjs'; import { ApplicationStatusDto } from '../../../../services/application-submission/application-submission.dto'; -import { ApplicationSearchResultDto, BaseSearchResultDto } from '../../../../services/search/search.dto'; +import { BaseSearchResultDto } from '../../../../services/search/search.dto'; import { SearchResult } from '../search.interface'; const CLASS_TO_URL_MAP: Record = { @@ -20,16 +20,24 @@ export class SearchListComponent implements OnDestroy { $destroy = new Subject(); @Input() totalCount = 0; - @Input() statuses: ApplicationStatusDto[] = []; @Input() pageIndex: number = 0; @Input() type = ''; - _results: SearchResult[] = []; + _statuses!: ApplicationStatusDto[]; + @Input() set statuses(statuses: ApplicationStatusDto[]) { + this._statuses = statuses; + this.mapResults(); + } + + _results: BaseSearchResultDto[] = []; @Input() set results(results: BaseSearchResultDto[]) { - this._results = this.mapResults(results); + this._results = results; this.visibleCount = this._results.length; + this.mapResults(); } + mappedResults: SearchResult[] = []; + @Output() loadMore = new EventEmitter(); visibleCount = 0; @@ -45,9 +53,13 @@ export class SearchListComponent implements OnDestroy { await this.router.navigateByUrl(`/public/${targetUrl}/${record.referenceId}`); } - private mapResults(applications: ApplicationSearchResultDto[]): SearchResult[] { - return applications.map((e) => { - const status = this.statuses.find((st) => st.code === e.status); + private mapResults() { + if (!this._results || !this._statuses) { + return; + } + + this.mappedResults = this._results.map((e) => { + const status = this._statuses.find((st) => st.code === e.status); return { ...e, From 6c89e1ebdac2bec4faccb15124004f41cb9e557d Mon Sep 17 00:00:00 2001 From: Mekhti Date: Thu, 9 May 2024 11:08:40 -0700 Subject: [PATCH 045/103] update file mime-type, update for clamAV --- .../apps/alcs/src/clamav/clamav.service.ts | 6 ++-- .../1715274839125-fix-mime-types-for-files.ts | 31 +++++++++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1715274839125-fix-mime-types-for-files.ts diff --git a/services/apps/alcs/src/clamav/clamav.service.ts b/services/apps/alcs/src/clamav/clamav.service.ts index 93e4a2c00f..8d8ba4e348 100644 --- a/services/apps/alcs/src/clamav/clamav.service.ts +++ b/services/apps/alcs/src/clamav/clamav.service.ts @@ -8,13 +8,13 @@ import { firstValueFrom } from 'rxjs'; export class ClamAVService { private logger = new Logger(ClamAVService.name); private scanner: NodeClam; - private readonly isEnabled = false; + private isEnabled = false; constructor( @Inject(CONFIG_TOKEN) private config: IConfig, private httpService: HttpService, ) { - this.isEnabled = this.config.get('CLAMAV.ENABLED'); + this.isEnabled = this.config.get('CLAMAV.ENABLED'); if (this.isEnabled) { this.initClam(); } @@ -31,7 +31,7 @@ export class ClamAVService { async scanFile(fileUrl: string) { if (!this.isEnabled) { - return true; + return false; } const response = await this.downloadFileAsStream(fileUrl); diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1715274839125-fix-mime-types-for-files.ts b/services/apps/alcs/src/providers/typeorm/migrations/1715274839125-fix-mime-types-for-files.ts new file mode 100644 index 0000000000..1fb6cf7b44 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1715274839125-fix-mime-types-for-files.ts @@ -0,0 +1,31 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class FixMimeTypesForFiles1715274839125 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `WITH documents_with_extensions AS ( + SELECT + trim(lower(SUBSTRING(file_name FROM '\.([^\.]*)$'))) AS file_extension, + * + FROM + alcs."document" d + ), + pdf_documents AS ( + SELECT + * + FROM + documents_with_extensions + WHERE + file_extension = 'pdf' + ) + UPDATE alcs."document" + SET mime_type = 'application/pdf' + FROM pdf_documents + WHERE pdf_documents.uuid = alcs."document"."uuid" AND alcs."document".mime_type <> 'application/pdf';`, + ); + } + + public async down(): Promise { + // no + } +} From 2a9f40e36a373f084cf15eee9bd5ee6dd1ee6a08 Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Fri, 10 May 2024 17:53:23 -0700 Subject: [PATCH 046/103] Update parcel owners directly Instead of updating the parcel owners list by filtering the submission owners, we now update the parcel owners directly. --- .../parcel-entry/parcel-entry.component.html | 2 +- .../parcel-entry/parcel-entry.component.ts | 10 +++------- .../parcel-owners/parcel-owners.component.ts | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html index 46c6eeeb9c..fc40f1a3df 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html @@ -256,7 +256,7 @@
Government Parcel Contact
[parcelUuid]="parcel.uuid" [owners]="parcel.owners" (saveParcel)="saveParcelProgress()" - (onOwnersUpdated)="onOwnerEdited()" + (onOwnersUpdated)="onOwnerEdited($event)" (onOwnerRemoved)="onRemoveOwner($event)" (onOwnersDeleted)="onDeleteOwner()" [documentService]="applicationDocumentService" diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts index 53b92f4a8b..5bafd533b2 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts @@ -175,12 +175,6 @@ export class ParcelEntryComponent implements OnInit { : undefined; this.selectedOwner = selectedOwner; - this.parcel.owners = this.parcel.owners - .filter((owner) => owners.some((updatedOwner) => updatedOwner.uuid === owner.uuid)) - .map((owner) => { - const updatedOwner = owners.find((uOwner) => uOwner.uuid === owner.uuid); - return updatedOwner || owner; - }); }); } @@ -412,13 +406,15 @@ export class ParcelEntryComponent implements OnInit { }); } - onOwnerEdited() { + onOwnerEdited(updatedOwner: any) { this.parcelForm.patchValue( { isConfirmedByApplicant: false, }, { emitEvent: false }, ); + const updatedOwners = this.parcel.owners.map((owner) => (owner.uuid === updatedOwner.uuid ? updatedOwner : owner)); + this.updateParcelOwners(updatedOwners); this.onOwnersUpdated.emit(); } diff --git a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts index 1b00395ede..7e68fa397c 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts +++ b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts @@ -97,7 +97,7 @@ export class ParcelOwnersComponent { if (result.action === 'delete') { this.onOwnersDeleted.emit(); } else { - this.onOwnersUpdated.emit(); + this.onOwnersUpdated.emit(result); } } }); From 382c78d361130e6e886c147788600aaca03cc50f Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Fri, 10 May 2024 18:23:38 -0700 Subject: [PATCH 047/103] Revery previous commit --- .../parcel-entry/parcel-entry.component.html | 2 +- .../parcel-entry/parcel-entry.component.ts | 10 +++++++--- .../parcel-owners/parcel-owners.component.ts | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html index fc40f1a3df..46c6eeeb9c 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html @@ -256,7 +256,7 @@
Government Parcel Contact
[parcelUuid]="parcel.uuid" [owners]="parcel.owners" (saveParcel)="saveParcelProgress()" - (onOwnersUpdated)="onOwnerEdited($event)" + (onOwnersUpdated)="onOwnerEdited()" (onOwnerRemoved)="onRemoveOwner($event)" (onOwnersDeleted)="onDeleteOwner()" [documentService]="applicationDocumentService" diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts index 5bafd533b2..53b92f4a8b 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts @@ -175,6 +175,12 @@ export class ParcelEntryComponent implements OnInit { : undefined; this.selectedOwner = selectedOwner; + this.parcel.owners = this.parcel.owners + .filter((owner) => owners.some((updatedOwner) => updatedOwner.uuid === owner.uuid)) + .map((owner) => { + const updatedOwner = owners.find((uOwner) => uOwner.uuid === owner.uuid); + return updatedOwner || owner; + }); }); } @@ -406,15 +412,13 @@ export class ParcelEntryComponent implements OnInit { }); } - onOwnerEdited(updatedOwner: any) { + onOwnerEdited() { this.parcelForm.patchValue( { isConfirmedByApplicant: false, }, { emitEvent: false }, ); - const updatedOwners = this.parcel.owners.map((owner) => (owner.uuid === updatedOwner.uuid ? updatedOwner : owner)); - this.updateParcelOwners(updatedOwners); this.onOwnersUpdated.emit(); } diff --git a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts index 7e68fa397c..1b00395ede 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts +++ b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts @@ -97,7 +97,7 @@ export class ParcelOwnersComponent { if (result.action === 'delete') { this.onOwnersDeleted.emit(); } else { - this.onOwnersUpdated.emit(result); + this.onOwnersUpdated.emit(); } } }); From 880820945a49664333cf1bf6a5c9313997d67954 Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Fri, 10 May 2024 18:25:14 -0700 Subject: [PATCH 048/103] Update parcel owners directly Instead of updating the parcel owners list by filtering the submission owners, we now update the parcel owners directly. --- .../parcel-entry/parcel-entry.component.html | 2 +- .../parcel-entry/parcel-entry.component.ts | 10 +++------- .../parcel-owners/parcel-owners.component.ts | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html index 46c6eeeb9c..fc40f1a3df 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html @@ -256,7 +256,7 @@
Government Parcel Contact
[parcelUuid]="parcel.uuid" [owners]="parcel.owners" (saveParcel)="saveParcelProgress()" - (onOwnersUpdated)="onOwnerEdited()" + (onOwnersUpdated)="onOwnerEdited($event)" (onOwnerRemoved)="onRemoveOwner($event)" (onOwnersDeleted)="onDeleteOwner()" [documentService]="applicationDocumentService" diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts index 53b92f4a8b..5bafd533b2 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts @@ -175,12 +175,6 @@ export class ParcelEntryComponent implements OnInit { : undefined; this.selectedOwner = selectedOwner; - this.parcel.owners = this.parcel.owners - .filter((owner) => owners.some((updatedOwner) => updatedOwner.uuid === owner.uuid)) - .map((owner) => { - const updatedOwner = owners.find((uOwner) => uOwner.uuid === owner.uuid); - return updatedOwner || owner; - }); }); } @@ -412,13 +406,15 @@ export class ParcelEntryComponent implements OnInit { }); } - onOwnerEdited() { + onOwnerEdited(updatedOwner: any) { this.parcelForm.patchValue( { isConfirmedByApplicant: false, }, { emitEvent: false }, ); + const updatedOwners = this.parcel.owners.map((owner) => (owner.uuid === updatedOwner.uuid ? updatedOwner : owner)); + this.updateParcelOwners(updatedOwners); this.onOwnersUpdated.emit(); } diff --git a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts index 1b00395ede..7e68fa397c 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts +++ b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts @@ -97,7 +97,7 @@ export class ParcelOwnersComponent { if (result.action === 'delete') { this.onOwnersDeleted.emit(); } else { - this.onOwnersUpdated.emit(); + this.onOwnersUpdated.emit(result); } } }); From 0bea113978b93ca070e7ce2294479f4a409e8b5f Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Mon, 13 May 2024 09:21:08 -0700 Subject: [PATCH 049/103] show the deactivated LG on overview page of PR (#1672) add an endpoint to return all governments do not show inactive governments on overview page of PR unless it is assigned to PR if the gov is inactive mark it as disabled --- .../application-dialog.component.spec.ts | 1 + .../inquiry/inquiry-dialog.component.spec.ts | 1 + .../notice-of-intent-dialog.component.spec.ts | 1 + .../notification-dialog.component.spec.ts | 1 + .../planning-review-dialog.component.spec.ts | 1 + .../inquiry/header/header.component.spec.ts | 1 + .../header/header.component.spec.ts | 1 + .../overview/overview.component.ts | 16 ++++++---- .../application-local-government.dto.ts | 1 + .../application-local-government.service.ts | 4 +++ .../application/application.service.spec.ts | 1 + .../application.controller.spec.ts | 1 + .../commissioner.controller.spec.ts | 1 + .../local-government.controller.spec.ts | 30 +++++++++++++++---- .../local-government.controller.ts | 19 ++++++++++-- .../local-government/local-government.dto.ts | 1 + .../local-government.service.ts | 4 +-- 17 files changed, 69 insertions(+), 16 deletions(-) diff --git a/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.spec.ts b/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.spec.ts index 56386e0ab0..0e567176ab 100644 --- a/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.spec.ts @@ -58,6 +58,7 @@ describe('ApplicationDialogComponent', () => { name: 'Local Government', preferredRegionCode: 'FAKE_CODE', isFirstNation: false, + isActive: true, }, summary: 'MOCK SUMMARY', activeDays: 10, diff --git a/alcs-frontend/src/app/features/board/dialogs/inquiry/inquiry-dialog.component.spec.ts b/alcs-frontend/src/app/features/board/dialogs/inquiry/inquiry-dialog.component.spec.ts index 0bf5738c67..4874724032 100644 --- a/alcs-frontend/src/app/features/board/dialogs/inquiry/inquiry-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/board/dialogs/inquiry/inquiry-dialog.component.spec.ts @@ -42,6 +42,7 @@ describe('InquiryDialogComponent', () => { uuid: 'uuid', preferredRegionCode: 'CODE', isFirstNation: false, + isActive: true, }, fileNumber: 'file-number', dateSubmittedToAlc: 0, diff --git a/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.spec.ts b/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.spec.ts index 602d978e4d..fcc1d8a637 100644 --- a/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.spec.ts @@ -43,6 +43,7 @@ describe('NoticeOfIntentDialogComponent', () => { uuid: 'uuid', preferredRegionCode: 'CODE', isFirstNation: false, + isActive: true, }, fileNumber: 'file-number', card: { diff --git a/alcs-frontend/src/app/features/board/dialogs/notification/notification-dialog.component.spec.ts b/alcs-frontend/src/app/features/board/dialogs/notification/notification-dialog.component.spec.ts index 8c4608b6b7..33ab223b64 100644 --- a/alcs-frontend/src/app/features/board/dialogs/notification/notification-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/board/dialogs/notification/notification-dialog.component.spec.ts @@ -55,6 +55,7 @@ describe('NotificationDialogComponent', () => { name: 'Local Government', preferredRegionCode: 'FAKE_CODE', isFirstNation: false, + isActive: true, }, summary: 'MOCK SUMMARY', dateSubmittedToAlc: Date.now(), diff --git a/alcs-frontend/src/app/features/board/dialogs/planning-review/planning-review-dialog.component.spec.ts b/alcs-frontend/src/app/features/board/dialogs/planning-review/planning-review-dialog.component.spec.ts index 3ba75a9cca..75f25d1d2c 100644 --- a/alcs-frontend/src/app/features/board/dialogs/planning-review/planning-review-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/board/dialogs/planning-review/planning-review-dialog.component.spec.ts @@ -41,6 +41,7 @@ describe('PlanningReviewDialogComponent', () => { uuid: 'uuid', preferredRegionCode: 'CODE', isFirstNation: false, + isActive: true, }, fileNumber: 'file-number', meetings: [], diff --git a/alcs-frontend/src/app/features/inquiry/header/header.component.spec.ts b/alcs-frontend/src/app/features/inquiry/header/header.component.spec.ts index d13f537196..1fbf84b75b 100644 --- a/alcs-frontend/src/app/features/inquiry/header/header.component.spec.ts +++ b/alcs-frontend/src/app/features/inquiry/header/header.component.spec.ts @@ -31,6 +31,7 @@ describe('HeaderComponent', () => { name: '', isFirstNation: false, preferredRegionCode: '', + isActive: true, }, open: false, region: { diff --git a/alcs-frontend/src/app/features/planning-review/header/header.component.spec.ts b/alcs-frontend/src/app/features/planning-review/header/header.component.spec.ts index f8970f5495..d9c86b0a54 100644 --- a/alcs-frontend/src/app/features/planning-review/header/header.component.spec.ts +++ b/alcs-frontend/src/app/features/planning-review/header/header.component.spec.ts @@ -28,6 +28,7 @@ describe('HeaderComponent', () => { name: '', isFirstNation: false, preferredRegionCode: '', + isActive: true, }, open: false, referrals: [], diff --git a/alcs-frontend/src/app/features/planning-review/overview/overview.component.ts b/alcs-frontend/src/app/features/planning-review/overview/overview.component.ts index 608ab0653d..a5e1e7190d 100644 --- a/alcs-frontend/src/app/features/planning-review/overview/overview.component.ts +++ b/alcs-frontend/src/app/features/planning-review/overview/overview.component.ts @@ -37,6 +37,7 @@ export class OverviewComponent implements OnInit, OnDestroy { this.planningReview = review; if (review) { this.loadEvents(review.fileNumber); + this.loadGovernments(); } }); @@ -47,7 +48,6 @@ export class OverviewComponent implements OnInit, OnDestroy { })); }); this.loadTypes(); - this.loadGovernments(); } private async loadTypes() { @@ -61,12 +61,16 @@ export class OverviewComponent implements OnInit, OnDestroy { } private async loadGovernments() { - const governments = await this.localGovernmentService.list(); + const governments = await this.localGovernmentService.listAll(); + if (governments) { - this.localGovernments = governments.map((government) => ({ - label: government.name, - value: government.uuid, - })); + this.localGovernments = governments + .filter((gov) => gov.isActive || gov.uuid === this.planningReview?.localGovernment?.uuid) + .map((government) => ({ + label: government.name, + value: government.uuid, + disabled: !government.isActive, + })); } } diff --git a/alcs-frontend/src/app/services/application/application-local-government/application-local-government.dto.ts b/alcs-frontend/src/app/services/application/application-local-government/application-local-government.dto.ts index 5c07c41759..2bc22f3ce0 100644 --- a/alcs-frontend/src/app/services/application/application-local-government/application-local-government.dto.ts +++ b/alcs-frontend/src/app/services/application/application-local-government/application-local-government.dto.ts @@ -3,4 +3,5 @@ export interface ApplicationLocalGovernmentDto { name: string; preferredRegionCode: string; isFirstNation: boolean; + isActive: boolean; } diff --git a/alcs-frontend/src/app/services/application/application-local-government/application-local-government.service.ts b/alcs-frontend/src/app/services/application/application-local-government/application-local-government.service.ts index 8cfb1cb79d..c1c57e1f8a 100644 --- a/alcs-frontend/src/app/services/application/application-local-government/application-local-government.service.ts +++ b/alcs-frontend/src/app/services/application/application-local-government/application-local-government.service.ts @@ -15,4 +15,8 @@ export class ApplicationLocalGovernmentService { async list() { return firstValueFrom(this.http.get(`${this.baseUrl}`)); } + + async listAll() { + return firstValueFrom(this.http.get(`${this.baseUrl}/all`)); + } } diff --git a/alcs-frontend/src/app/services/application/application.service.spec.ts b/alcs-frontend/src/app/services/application/application.service.spec.ts index f69f395673..3a80598460 100644 --- a/alcs-frontend/src/app/services/application/application.service.spec.ts +++ b/alcs-frontend/src/app/services/application/application.service.spec.ts @@ -26,6 +26,7 @@ describe('ApplicationService', () => { name: '', preferredRegionCode: '', isFirstNation: false, + isActive: true, }, paused: false, pausedDays: 0, diff --git a/services/apps/alcs/src/alcs/application/application.controller.spec.ts b/services/apps/alcs/src/alcs/application/application.controller.spec.ts index 2b12492388..473a5fe842 100644 --- a/services/apps/alcs/src/alcs/application/application.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application/application.controller.spec.ts @@ -58,6 +58,7 @@ describe('ApplicationController', () => { name: 'Local Government', preferredRegionCode: 'fake', isFirstNation: false, + isActive: true, }, activeDays: 2, pausedDays: 0, diff --git a/services/apps/alcs/src/alcs/commissioner/commissioner.controller.spec.ts b/services/apps/alcs/src/alcs/commissioner/commissioner.controller.spec.ts index 1846d68b7a..cd9fd532bf 100644 --- a/services/apps/alcs/src/alcs/commissioner/commissioner.controller.spec.ts +++ b/services/apps/alcs/src/alcs/commissioner/commissioner.controller.spec.ts @@ -154,6 +154,7 @@ describe('CommissionerController', () => { uuid: '', name: 'goverment-name', preferredRegionCode: 'code', + isActive: true, }, } as any; mockApplicationService.mapToDtos.mockResolvedValue([mockDto]); diff --git a/services/apps/alcs/src/alcs/local-government/local-government.controller.spec.ts b/services/apps/alcs/src/alcs/local-government/local-government.controller.spec.ts index 69aaec7e3e..9d26581db7 100644 --- a/services/apps/alcs/src/alcs/local-government/local-government.controller.spec.ts +++ b/services/apps/alcs/src/alcs/local-government/local-government.controller.spec.ts @@ -1,9 +1,10 @@ -import { classes } from 'automapper-classes'; -import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { ClsService } from 'nestjs-cls'; import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes'; +import { ApplicationRegion } from '../code/application-code/application-region/application-region.entity'; import { LocalGovernmentController } from './local-government.controller'; import { LocalGovernment } from './local-government.entity'; import { LocalGovernmentService } from './local-government.service'; @@ -44,14 +45,33 @@ describe('LocalGovernmentController', () => { }); it('should call through for list', async () => { - const mockGovernment = { + const mockGovernment = new LocalGovernment({ + name: 'Government', + uuid: 'uuid', + preferredRegion: { + code: 'code', + label: 'label', + } as ApplicationRegion, + isActive: true, + }); + mockService.listActive.mockResolvedValue([mockGovernment]); + const res = await mockService.listActive(); + + expect(mockService.listActive).toHaveBeenCalledTimes(1); + expect(res.length).toEqual(1); + expect(res[0].name).toEqual(mockGovernment.name); + }); + + it('should call through for list of all governments', async () => { + const mockGovernment = new LocalGovernment({ name: 'Government', uuid: 'uuid', preferredRegion: { code: 'code', label: 'label', - }, - } as LocalGovernment; + } as ApplicationRegion, + isActive: false, + }); mockService.list.mockResolvedValue([mockGovernment]); const res = await mockService.list(); diff --git a/services/apps/alcs/src/alcs/local-government/local-government.controller.ts b/services/apps/alcs/src/alcs/local-government/local-government.controller.ts index e5a20081e2..4cc6edf658 100644 --- a/services/apps/alcs/src/alcs/local-government/local-government.controller.ts +++ b/services/apps/alcs/src/alcs/local-government/local-government.controller.ts @@ -5,6 +5,7 @@ import { ANY_AUTH_ROLE } from '../../common/authorization/roles'; import { RolesGuard } from '../../common/authorization/roles-guard.service'; import { UserRoles } from '../../common/authorization/roles.decorator'; import { LocalGovernmentDto } from './local-government.dto'; +import { LocalGovernment } from './local-government.entity'; import { LocalGovernmentService } from './local-government.service'; @ApiOAuth2(config.get('KEYCLOAK.SCOPES')) @@ -21,11 +22,25 @@ export class LocalGovernmentController { const localGovernments = await this.applicationLocalGovernmentService.listActive(); - return localGovernments.map((government) => ({ + return localGovernments.map((government) => this.mapGovernment(government)); + } + + @Get('/all') + @UserRoles(...ANY_AUTH_ROLE) + async listAll(): Promise { + const localGovernments = + await this.applicationLocalGovernmentService.list(); + + return localGovernments.map((government) => this.mapGovernment(government)); + } + + private mapGovernment(government: LocalGovernment): LocalGovernmentDto { + return { name: government.name, preferredRegionCode: government.preferredRegion.code, uuid: government.uuid, isFirstNation: government.isFirstNation, - })); + isActive: government.isActive, + }; } } diff --git a/services/apps/alcs/src/alcs/local-government/local-government.dto.ts b/services/apps/alcs/src/alcs/local-government/local-government.dto.ts index 6ea96f59e0..b7a32099e8 100644 --- a/services/apps/alcs/src/alcs/local-government/local-government.dto.ts +++ b/services/apps/alcs/src/alcs/local-government/local-government.dto.ts @@ -3,4 +3,5 @@ export class LocalGovernmentDto { name: string; preferredRegionCode: string; isFirstNation: boolean; + isActive: boolean; } diff --git a/services/apps/alcs/src/alcs/local-government/local-government.service.ts b/services/apps/alcs/src/alcs/local-government/local-government.service.ts index 154e6d2378..769ae34c1e 100644 --- a/services/apps/alcs/src/alcs/local-government/local-government.service.ts +++ b/services/apps/alcs/src/alcs/local-government/local-government.service.ts @@ -30,9 +30,7 @@ export class LocalGovernmentService { async listActive() { return await this.repository.find({ - where: { - isActive: true, - }, + where: { isActive: true }, order: { name: 'ASC', }, From 2f5b84ba915a01133ebae9da06e78769e1474da1 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 9 May 2024 15:37:31 -0700 Subject: [PATCH 050/103] Send one email per decision * Move decision emails for Apps/NOIs to their own scheduler/queues * Add new columns to decisions to track emails --- .../application-decision-v2.service.ts | 16 +- .../application-decision.dto.ts | 5 + .../application-decision.entity.ts | 7 + ...lication-submission-status.service.spec.ts | 7 +- .../application-submission-status.service.ts | 5 +- .../notice-of-intent-decision-v2.service.ts | 16 +- .../notice-of-intent-decision.dto.ts | 5 + .../notice-of-intent-decision.entity.ts | 7 + ...f-intent-submission-status.service.spec.ts | 39 +--- ...ice-of-intent-submission-status.service.ts | 18 +- .../notice-of-intent.module.ts | 1 + .../email/status-email.service.spec.ts | 36 ++-- .../providers/email/status-email.service.ts | 52 +++-- ...5276586900-add_email_sent_for_decisions.ts | 37 ++++ .../decision-emails.consumer.spec.ts | 193 ++++++++++++++++++ .../decision-emails.consumer.ts | 130 ++++++++++++ .../status-emails.consumer.spec.ts | 69 ------- .../status-emails/status-emails.consumer.ts | 2 +- .../decision-emails.consumer.spec.ts | 162 +++++++++++++++ .../decision-emails.consumer.ts | 90 ++++++++ .../status-emails.consumer.spec.ts | 156 -------------- .../status-emails.consumer.ts | 104 ---------- .../src/queues/scheduler/scheduler.module.ts | 17 +- .../scheduler/scheduler.service.spec.ts | 56 +++-- .../src/queues/scheduler/scheduler.service.ts | 31 ++- 25 files changed, 793 insertions(+), 468 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1715276586900-add_email_sent_for_decisions.ts create mode 100644 services/apps/alcs/src/queues/scheduler/application/decision-emails/decision-emails.consumer.spec.ts create mode 100644 services/apps/alcs/src/queues/scheduler/application/decision-emails/decision-emails.consumer.ts create mode 100644 services/apps/alcs/src/queues/scheduler/notice-of-intent/decision-emails.consumer.spec.ts create mode 100644 services/apps/alcs/src/queues/scheduler/notice-of-intent/decision-emails.consumer.ts delete mode 100644 services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.spec.ts delete mode 100644 services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.ts diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts index 0156bd7e59..9e4a1b6083 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts @@ -1,7 +1,7 @@ import { MultipartFile } from '@fastify/multipart'; import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; -import { In, IsNull, Repository } from 'typeorm'; +import { In, IsNull, LessThan, Repository } from 'typeorm'; import { v4 } from 'uuid'; import { ServiceNotFoundException, @@ -290,6 +290,7 @@ export class ApplicationDecisionV2Service { existingDecision.wasReleased || !updateDto.isDraft; existingDecision.linkedResolutionOutcomeCode = updateDto.linkedResolutionOutcomeCode; + existingDecision.emailSent = updateDto.emailSent; if (updateDto.outcomeCode) { existingDecision.outcome = await this.getOutcomeByCode( @@ -815,4 +816,17 @@ export class ApplicationDecisionV2Service { source: DOCUMENT_SOURCE.ALC, }); } + + async getDecisionsPendingEmail(tomorrow: Date) { + return this.appDecisionRepository.find({ + where: { + emailSent: IsNull(), + date: LessThan(tomorrow), + isDraft: false, + }, + relations: { + application: true, + }, + }); + } } diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision.dto.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision.dto.ts index f3857de6fc..cc9f176ca7 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision.dto.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision.dto.ts @@ -2,6 +2,7 @@ import { AutoMap } from 'automapper-classes'; import { IsArray, IsBoolean, + IsDate, IsNumber, IsOptional, IsString, @@ -105,6 +106,10 @@ export class UpdateApplicationDecisionDto { @IsOptional() @IsArray() conditions?: UpdateApplicationDecisionConditionDto[]; + + @IsOptional() + @IsDate() + emailSent?: Date; } export class CreateApplicationDecisionDto extends UpdateApplicationDecisionDto { diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-decision.entity.ts index e7b395c98c..6ac7d2011a 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision.entity.ts @@ -173,6 +173,13 @@ export class ApplicationDecision extends Base { }) applicationUuid: string; + @Column({ + type: 'timestamptz', + nullable: true, + comment: 'Used to track if/when the email was sent for this decision', + }) + emailSent: Date | null; + @AutoMap(() => [ApplicationDecisionDocument]) @OneToMany(() => ApplicationDecisionDocument, (document) => document.decision) documents: ApplicationDecisionDocument[]; diff --git a/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.spec.ts b/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.spec.ts index 2389132797..fa764e421a 100644 --- a/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.spec.ts +++ b/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.spec.ts @@ -435,7 +435,7 @@ describe('ApplicationSubmissionStatusService', () => { expect(result).toMatchObject(copiedStatuses); }); - it('should call find to retrieve ALCD and REVA statuses', async () => { + it('should call find to retrieve REVA statuses', async () => { const mockStatuses = [ new ApplicationSubmissionToSubmissionStatus({ statusTypeCode: SUBMISSION_STATUS.ALC_DECISION, @@ -456,10 +456,7 @@ describe('ApplicationSubmissionStatusService', () => { mockApplicationSubmissionToSubmissionStatusRepository.find, ).toBeCalledWith({ where: { - statusTypeCode: In([ - SUBMISSION_STATUS.ALC_DECISION, - SUBMISSION_STATUS.IN_REVIEW_BY_ALC, - ]), + statusTypeCode: In([SUBMISSION_STATUS.IN_REVIEW_BY_ALC]), emailSentDate: IsNull(), effectiveDate: And(Not(IsNull()), LessThan(date)), }, diff --git a/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.ts b/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.ts index 7ba1eceadf..38680a6c42 100644 --- a/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.ts +++ b/services/apps/alcs/src/alcs/application/application-submission-status/application-submission-status.service.ts @@ -152,10 +152,7 @@ export class ApplicationSubmissionStatusService { async getSubmissionToSubmissionStatusForSendingEmails(date: Date) { return await this.statusesRepository.find({ where: { - statusTypeCode: In([ - SUBMISSION_STATUS.ALC_DECISION, - SUBMISSION_STATUS.IN_REVIEW_BY_ALC, - ]), + statusTypeCode: In([SUBMISSION_STATUS.IN_REVIEW_BY_ALC]), emailSentDate: IsNull(), effectiveDate: And(Not(IsNull()), LessThan(date)), // this will get only statuses < tomorrow start of day since the status service converts all days to .startOf('day') }, diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts index c1d38e2179..2d7134bb00 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts @@ -5,7 +5,7 @@ import { import { MultipartFile } from '@fastify/multipart'; import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; -import { In, IsNull, Repository } from 'typeorm'; +import { In, IsNull, LessThan, Repository } from 'typeorm'; import { v4 } from 'uuid'; import { DOCUMENT_SOURCE, @@ -215,6 +215,7 @@ export class NoticeOfIntentDecisionV2Service { existingDecision.rescindedComment = updateDto.rescindedComment; existingDecision.wasReleased = existingDecision.wasReleased || !updateDto.isDraft; + existingDecision.emailSent = updateDto.emailSent; if (updateDto.outcomeCode) { existingDecision.outcome = await this.getOutcomeByCode( @@ -693,4 +694,17 @@ export class NoticeOfIntentDecisionV2Service { source: DOCUMENT_SOURCE.ALC, }); } + + async getDecisionsPendingEmail(tomorrow: Date) { + return this.noticeOfIntentDecisionRepository.find({ + where: { + emailSent: IsNull(), + date: LessThan(tomorrow), + isDraft: false, + }, + relations: { + noticeOfIntent: true, + }, + }); + } } diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts index 31f7864203..53a039c5a8 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts @@ -2,6 +2,7 @@ import { AutoMap } from 'automapper-classes'; import { IsArray, IsBoolean, + IsDate, IsNumber, IsOptional, IsString, @@ -78,6 +79,10 @@ export class UpdateNoticeOfIntentDecisionDto { @IsOptional() @IsArray() conditions?: UpdateNoticeOfIntentDecisionConditionDto[]; + + @IsDate() + @IsOptional() + emailSent?: Date | null; } export class CreateNoticeOfIntentDecisionDto extends UpdateNoticeOfIntentDecisionDto { diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.entity.ts index d22453e273..03ccd0cceb 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.entity.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.entity.ts @@ -135,6 +135,13 @@ export class NoticeOfIntentDecision extends Base { }) noticeOfIntentUuid: string; + @Column({ + type: 'timestamptz', + nullable: true, + comment: 'Used to track if/when the email was sent for this decision', + }) + emailSent: Date | null; + @ManyToMany( () => NoticeOfIntentModification, (modification) => modification.modifiesDecisions, diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.spec.ts index bf584c2b92..a4a328f779 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.spec.ts @@ -5,7 +5,7 @@ import { getRepositoryToken } from '@nestjs/typeorm'; import * as dayjs from 'dayjs'; import * as timezone from 'dayjs/plugin/timezone'; import * as utc from 'dayjs/plugin/utc'; -import { And, In, IsNull, LessThan, Not, Repository } from 'typeorm'; +import { Repository } from 'typeorm'; import { NoticeOfIntentSubmission } from '../../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; import { NoticeOfIntentSubmissionStatusType } from './notice-of-intent-status-type.entity'; import { NOI_SUBMISSION_STATUS } from './notice-of-intent-status.dto'; @@ -157,9 +157,8 @@ describe('NoticeOfIntentSubmissionStatusService', () => { }), ); - const statuses = await service.getCurrentStatusesByFileNumber( - fakeFileNumber, - ); + const statuses = + await service.getCurrentStatusesByFileNumber(fakeFileNumber); expect( mockSubmissionToSubmissionStatusRepository.findBy, @@ -432,38 +431,6 @@ describe('NoticeOfIntentSubmissionStatusService', () => { expect(result).toMatchObject(copiedStatuses); }); - it('should call find to retrieve ALCD statuses', async () => { - const mockStatuses = [ - new NoticeOfIntentSubmissionToSubmissionStatus({ - statusTypeCode: NOI_SUBMISSION_STATUS.ALC_DECISION, - }), - ]; - - mockSubmissionToSubmissionStatusRepository.find.mockResolvedValue( - mockStatuses, - ); - const date = new Date(); - - const result = - await service.getSubmissionToSubmissionStatusForSendingEmails(date); - - expect(mockSubmissionToSubmissionStatusRepository.find).toBeCalledTimes(1); - expect(mockSubmissionToSubmissionStatusRepository.find).toBeCalledWith({ - where: { - statusTypeCode: In([NOI_SUBMISSION_STATUS.ALC_DECISION]), - emailSentDate: IsNull(), - effectiveDate: And(Not(IsNull()), LessThan(date)), - }, - relations: { - submission: { - owners: true, - submissionStatuses: true, - }, - }, - }); - expect(result).toEqual(mockStatuses); - }); - it('should call save to save SubmissionToSubmissionStatus', async () => { const mockNoi = new NoticeOfIntentSubmissionToSubmissionStatus(); diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.ts index 87e7c14355..b77bbafdec 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service.ts @@ -4,7 +4,7 @@ import { InjectRepository } from '@nestjs/typeorm'; import * as dayjs from 'dayjs'; import * as timezone from 'dayjs/plugin/timezone'; import * as utc from 'dayjs/plugin/utc'; -import { And, In, IsNull, LessThan, Not, Repository } from 'typeorm'; +import { Repository } from 'typeorm'; import { NoticeOfIntentSubmission } from '../../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; import { NoticeOfIntentSubmissionStatusType } from './notice-of-intent-status-type.entity'; import { NOI_SUBMISSION_STATUS } from './notice-of-intent-status.dto'; @@ -147,22 +147,6 @@ export class NoticeOfIntentSubmissionStatusService { return newStatuses; } - async getSubmissionToSubmissionStatusForSendingEmails(date: Date) { - return await this.statusesRepository.find({ - where: { - statusTypeCode: In([NOI_SUBMISSION_STATUS.ALC_DECISION]), - emailSentDate: IsNull(), - effectiveDate: And(Not(IsNull()), LessThan(date)), // this will get only statuses < tomorrow start of day since the status service converts all days to .startOf('day'). - }, - relations: { - submission: { - owners: true, - submissionStatuses: true, - }, - }, - }); - } - async saveSubmissionToSubmissionStatus( submissionStatus: NoticeOfIntentSubmissionToSubmissionStatus, ) { diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.module.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.module.ts index 4e6969b75d..10ec091d6a 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.module.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.module.ts @@ -72,6 +72,7 @@ import { NoticeOfIntentService } from './notice-of-intent.service'; NoticeOfIntentService, NoticeOfIntentMeetingService, NoticeOfIntentDocumentService, + NoticeOfIntentSubmissionService, ], }) export class NoticeOfIntentModule {} diff --git a/services/apps/alcs/src/providers/email/status-email.service.spec.ts b/services/apps/alcs/src/providers/email/status-email.service.spec.ts index b45784a7be..33ac4883b8 100644 --- a/services/apps/alcs/src/providers/email/status-email.service.spec.ts +++ b/services/apps/alcs/src/providers/email/status-email.service.spec.ts @@ -1,17 +1,24 @@ import { CONFIG_TOKEN, ConfigModule } from '@app/common/config/config.module'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; -import { MJMLParseResults } from 'mjml-core'; import * as config from 'config'; +import { MJMLParseResults } from 'mjml-core'; +import { ApplicationDecisionDocument } from '../../alcs/application-decision/application-decision-document/application-decision-document.entity'; +import { ApplicationDecisionV2Service } from '../../alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service'; +import { ApplicationDecision } from '../../alcs/application-decision/application-decision.entity'; import { ApplicationSubmissionStatusType } from '../../alcs/application/application-submission-status/submission-status-type.entity'; import { SUBMISSION_STATUS } from '../../alcs/application/application-submission-status/submission-status.dto'; import { ApplicationService } from '../../alcs/application/application.service'; import { PARENT_TYPE } from '../../alcs/card/card-subtask/card-subtask.dto'; import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; +import { NoticeOfIntentDecisionDocument } from '../../alcs/notice-of-intent-decision/notice-of-intent-decision-document/notice-of-intent-decision-document.entity'; +import { NoticeOfIntentDecisionV2Service } from '../../alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service'; +import { NoticeOfIntentDecision } from '../../alcs/notice-of-intent-decision/notice-of-intent-decision.entity'; import { NoticeOfIntentSubmissionStatusType } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status-type.entity'; import { NOI_SUBMISSION_STATUS } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; import { NoticeOfIntentService } from '../../alcs/notice-of-intent/notice-of-intent.service'; +import { Document } from '../../document/document.entity'; import { ApplicationOwner } from '../../portal/application-submission/application-owner/application-owner.entity'; import { ApplicationSubmission } from '../../portal/application-submission/application-submission.entity'; import { ApplicationSubmissionService } from '../../portal/application-submission/application-submission.service'; @@ -20,13 +27,6 @@ import { NoticeOfIntentSubmission } from '../../portal/notice-of-intent-submissi import { NoticeOfIntentSubmissionService } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.service'; import { EmailService } from './email.service'; import { StatusEmailService } from './status-email.service'; -import { ApplicationDecisionV2Service } from '../../alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service'; -import { NoticeOfIntentDecisionV2Service } from '../../alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service'; -import { ApplicationDecision } from '../../alcs/application-decision/application-decision.entity'; -import { ApplicationDecisionDocument } from '../../alcs/application-decision/application-decision-document/application-decision-document.entity'; -import { Document } from '../../document/document.entity'; -import { NoticeOfIntentDecisionDocument } from '../../alcs/notice-of-intent-decision/notice-of-intent-decision-document/notice-of-intent-decision-document.entity'; -import { NoticeOfIntentDecision } from '../../alcs/notice-of-intent-decision/notice-of-intent-decision.entity'; describe('StatusEmailService', () => { let service: StatusEmailService; @@ -166,15 +166,11 @@ describe('StatusEmailService', () => { documents: [mockDocument1, mockDocument2], }); - mockApplicationDecisionService.getByAppFileNumber.mockResolvedValue([ - mockDecision, - ]); + mockApplicationDecisionService.get.mockResolvedValue(mockDecision); - const res = await service.getApplicationDocumentEmailData('file-number'); + const res = await service.getApplicationDecisionDocuments('file-number'); - expect(mockApplicationDecisionService.getByAppFileNumber).toBeCalledTimes( - 1, - ); + expect(mockApplicationDecisionService.get).toBeCalledTimes(1); const baseUrl = config.get('ALCS.BASE_URL'); @@ -203,15 +199,11 @@ describe('StatusEmailService', () => { documents: [mockDocument1, mockDocument2], }); - mockNoticeOfIntentDecisionService.getByFileNumber.mockResolvedValue([ - mockDecision, - ]); + mockNoticeOfIntentDecisionService.get.mockResolvedValue(mockDecision); - const res = await service.getNoticeOfIntentDocumentEmailData('file-number'); + const res = await service.getNoticeOfIntentDecisionDocuments('uuid'); - expect(mockNoticeOfIntentDecisionService.getByFileNumber).toBeCalledTimes( - 1, - ); + expect(mockNoticeOfIntentDecisionService.get).toBeCalledTimes(1); const baseUrl = config.get('ALCS.BASE_URL'); diff --git a/services/apps/alcs/src/providers/email/status-email.service.ts b/services/apps/alcs/src/providers/email/status-email.service.ts index 71ee679a83..43598823a8 100644 --- a/services/apps/alcs/src/providers/email/status-email.service.ts +++ b/services/apps/alcs/src/providers/email/status-email.service.ts @@ -1,11 +1,15 @@ import { CONFIG_TOKEN, IConfig } from '@app/common/config/config.module'; import { Inject, Injectable, Logger, NotFoundException } from '@nestjs/common'; import { MJMLParseResults } from 'mjml-core'; +import { ApplicationDecisionV2Service } from '../../alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service'; +import { ApplicationDecision } from '../../alcs/application-decision/application-decision.entity'; import { SUBMISSION_STATUS } from '../../alcs/application/application-submission-status/submission-status.dto'; import { ApplicationService } from '../../alcs/application/application.service'; import { PARENT_TYPE } from '../../alcs/card/card-subtask/card-subtask.dto'; import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; +import { NoticeOfIntentDecisionV2Service } from '../../alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service'; +import { NoticeOfIntentDecision } from '../../alcs/notice-of-intent-decision/notice-of-intent-decision.entity'; import { NOI_SUBMISSION_STATUS } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; import { NoticeOfIntentService } from '../../alcs/notice-of-intent/notice-of-intent.service'; import { ApplicationOwner } from '../../portal/application-submission/application-owner/application-owner.entity'; @@ -16,10 +20,6 @@ import { NoticeOfIntentSubmission } from '../../portal/notice-of-intent-submissi import { NoticeOfIntentSubmissionService } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.service'; import { FALLBACK_APPLICANT_NAME } from '../../utils/owner.constants'; import { EmailService } from './email.service'; -import { ApplicationDecisionV2Service } from '../../alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service'; -import { NoticeOfIntentDecisionV2Service } from '../../alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service'; -import { ApplicationDecision } from '../../alcs/application-decision/application-decision.entity'; -import { NoticeOfIntentDecision } from '../../alcs/notice-of-intent-decision/notice-of-intent-decision.entity'; export interface StatusUpdateEmail { fileNumber: string; @@ -133,43 +133,37 @@ export class StatusEmailService { return { primaryContact, submissionGovernment }; } - async getApplicationDocumentEmailData(fileNumber: string) { - const decisions = - await this.applicationDecisionService.getByAppFileNumber(fileNumber); + async getApplicationDecisionDocuments(decisionUuid: string) { + const decision = await this.applicationDecisionService.get(decisionUuid); - return this.sortAndMapDecisionDocuments(decisions, PARENT_TYPE.APPLICATION); + return this.sortAndMapDecisionDocuments(decision, PARENT_TYPE.APPLICATION); } - async getNoticeOfIntentDocumentEmailData(fileNumber: string) { - const decisions = - await this.noticeOfIntentDecisionService.getByFileNumber(fileNumber); + async getNoticeOfIntentDecisionDocuments(decisionUuid: string) { + const decision = await this.noticeOfIntentDecisionService.get(decisionUuid); return this.sortAndMapDecisionDocuments( - decisions, + decision, PARENT_TYPE.NOTICE_OF_INTENT, ); } private sortAndMapDecisionDocuments( - decisions: ApplicationDecision[] | NoticeOfIntentDecision[], + decision: ApplicationDecision | NoticeOfIntentDecision, type: PARENT_TYPE, ): DocumentEmailData[] { - return decisions - .sort( - (a, b) => new Date(b.date!).valueOf() - new Date(a.date!).valueOf(), - )[0] - .documents.map((doc) => { - const baseUrl = this.config.get('ALCS.BASE_URL'); - const controller = `public/${type}/decision`; - const endpoint = 'email'; - - const url = `${baseUrl}/${controller}/${doc.uuid}/${endpoint}`; - - return { - name: doc.document.fileName, - url, - }; - }); + return decision.documents.map((doc) => { + const baseUrl = this.config.get('ALCS.BASE_URL'); + const controller = `public/${type}/decision`; + const endpoint = 'email'; + + const url = `${baseUrl}/${controller}/${doc.uuid}/${endpoint}`; + + return { + name: doc.document.fileName, + url, + }; + }); } private async getApplicationEmailTemplate(data: ApplicationEmailData) { diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1715276586900-add_email_sent_for_decisions.ts b/services/apps/alcs/src/providers/typeorm/migrations/1715276586900-add_email_sent_for_decisions.ts new file mode 100644 index 0000000000..77fb94d495 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1715276586900-add_email_sent_for_decisions.ts @@ -0,0 +1,37 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class AddEmailSentForDecisions1715276586900 + implements MigrationInterface +{ + name = 'AddEmailSentForDecisions1715276586900'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision" ADD "email_sent" TIMESTAMP WITH TIME ZONE`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_decision"."email_sent" IS 'Used to track if/when the email was sent for this decision'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision" ADD "email_sent" TIMESTAMP WITH TIME ZONE`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_decision"."email_sent" IS 'Used to track if/when the email was sent for this decision'`, + ); + await queryRunner.query( + `UPDATE "alcs"."application_decision" set "email_sent" = NOW() WHERE "date" <= NOW() AND "is_draft" = FALSE`, //Assume existing job has handled them up until today + ); + await queryRunner.query( + `UPDATE "alcs"."notice_of_intent_decision" set "email_sent" = NOW() WHERE "date" <= NOW() AND "is_draft" = FALSE`, //Assume existing job has handled them up until today + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision" DROP COLUMN "email_sent"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision" DROP COLUMN "email_sent"`, + ); + } +} diff --git a/services/apps/alcs/src/queues/scheduler/application/decision-emails/decision-emails.consumer.spec.ts b/services/apps/alcs/src/queues/scheduler/application/decision-emails/decision-emails.consumer.spec.ts new file mode 100644 index 0000000000..3b45f3d0fe --- /dev/null +++ b/services/apps/alcs/src/queues/scheduler/application/decision-emails/decision-emails.consumer.spec.ts @@ -0,0 +1,193 @@ +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { generateALCDApplicationHtml } from '../../../../../../../templates/emails/decision-released'; +import { ApplicationDecisionV2Service } from '../../../../alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service'; +import { ApplicationDecision } from '../../../../alcs/application-decision/application-decision.entity'; +import { ApplicationSubmissionStatusService } from '../../../../alcs/application/application-submission-status/application-submission-status.service'; +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 { PARENT_TYPE } from '../../../../alcs/card/card-subtask/card-subtask.dto'; +import { LocalGovernment } from '../../../../alcs/local-government/local-government.entity'; +import { ApplicationOwner } from '../../../../portal/application-submission/application-owner/application-owner.entity'; +import { ApplicationSubmission } from '../../../../portal/application-submission/application-submission.entity'; +import { StatusEmailService } from '../../../../providers/email/status-email.service'; +import { ApplicationDecisionEmailConsumer } from './decision-emails.consumer'; + +describe('ApplicationDecisionEmailConsumer', () => { + let consumer: ApplicationDecisionEmailConsumer; + let mockStatusEmailService: DeepMocked; + let mockApplicationSubmissionStatusService: DeepMocked; + let mockApplicationDecisionService: DeepMocked; + + beforeAll(() => { + jest.useFakeTimers().setSystemTime(new Date('2022-01-01')); + }); + + beforeEach(async () => { + mockStatusEmailService = createMock(); + mockApplicationSubmissionStatusService = createMock(); + mockApplicationDecisionService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + providers: [ + ApplicationDecisionEmailConsumer, + { + provide: StatusEmailService, + useValue: mockStatusEmailService, + }, + { + provide: ApplicationSubmissionStatusService, + useValue: mockApplicationSubmissionStatusService, + }, + { + provide: ApplicationDecisionV2Service, + useValue: mockApplicationDecisionService, + }, + ], + }).compile(); + + consumer = module.get( + ApplicationDecisionEmailConsumer, + ); + }); + + afterAll(() => { + jest.useRealTimers(); + }); + + it('should be defined', () => { + expect(consumer).toBeDefined(); + }); + + it('should send email and update decision emailSentDate', async () => { + const mockSubmission = new ApplicationSubmission({ + fileNumber: 'fake', + status: new ApplicationSubmissionToSubmissionStatus({ + statusTypeCode: SUBMISSION_STATUS.ALC_DECISION, + }), + }); + const mockPrimaryContact = new ApplicationOwner(); + const mockLocalGovernment = new LocalGovernment(); + const mockDocuments = [{ name: 'fake-document', url: 'fake-url' }]; + + mockApplicationDecisionService.getDecisionsPendingEmail.mockResolvedValue([ + new ApplicationDecision({ + uuid: 'uuid', + application: new Application({ + fileNumber: mockSubmission.fileNumber, + }), + }), + ]); + mockApplicationDecisionService.update.mockResolvedValue( + new ApplicationDecision(), + ); + mockStatusEmailService.getApplicationDecisionDocuments.mockResolvedValue( + mockDocuments, + ); + mockApplicationSubmissionStatusService.getCurrentStatusByFileNumber.mockResolvedValue( + new ApplicationSubmissionToSubmissionStatus({ + submission: mockSubmission, + statusTypeCode: SUBMISSION_STATUS.ALC_DECISION, + }), + ); + mockStatusEmailService.getApplicationEmailData.mockResolvedValue({ + applicationSubmission: mockSubmission, + primaryContact: mockPrimaryContact, + submissionGovernment: mockLocalGovernment, + }); + mockStatusEmailService.sendApplicationStatusEmail.mockResolvedValue(); + + await consumer.process(); + + expect( + mockApplicationDecisionService.getDecisionsPendingEmail, + ).toHaveBeenCalledTimes(1); + + expect( + mockStatusEmailService.getApplicationEmailData, + ).toHaveBeenCalledTimes(1); + expect(mockStatusEmailService.getApplicationEmailData).toHaveBeenCalledWith( + 'fake', + ); + expect( + mockStatusEmailService.sendApplicationStatusEmail, + ).toHaveBeenCalledTimes(1); + expect( + mockStatusEmailService.sendApplicationStatusEmail, + ).toHaveBeenCalledWith({ + applicationSubmission: mockSubmission, + government: mockLocalGovernment, + parentType: PARENT_TYPE.APPLICATION, + primaryContact: mockPrimaryContact, + ccGovernment: true, + generateStatusHtml: generateALCDApplicationHtml, + status: SUBMISSION_STATUS.ALC_DECISION, + documents: mockDocuments, + }); + expect(mockApplicationDecisionService.update).toHaveBeenCalledTimes(1); + expect(mockApplicationDecisionService.update).toHaveBeenCalledWith( + 'uuid', + { + emailSent: new Date('2022-01-01'), + isDraft: false, + }, + undefined, + undefined, + ); + }); + + it('should not send email if no primary contact', async () => { + const mockSubmission = new ApplicationSubmission({ + fileNumber: 'fake', + status: new ApplicationSubmissionToSubmissionStatus({ + statusTypeCode: SUBMISSION_STATUS.ALC_DECISION, + }), + }); + const mockLocalGovernment = new LocalGovernment(); + const mockDocuments = [{ name: 'fake-document', url: 'fake-url' }]; + + mockApplicationDecisionService.getDecisionsPendingEmail.mockResolvedValue([ + new ApplicationDecision({ + application: new Application({ + fileNumber: mockSubmission.fileNumber, + }), + }), + ]); + mockApplicationDecisionService.update.mockResolvedValue( + new ApplicationDecision(), + ); + mockStatusEmailService.getApplicationDecisionDocuments.mockResolvedValue( + mockDocuments, + ); + mockApplicationSubmissionStatusService.getCurrentStatusByFileNumber.mockResolvedValue( + new ApplicationSubmissionToSubmissionStatus({ + submission: mockSubmission, + statusTypeCode: SUBMISSION_STATUS.ALC_DECISION, + }), + ); + + mockStatusEmailService.getApplicationEmailData.mockResolvedValue({ + applicationSubmission: mockSubmission, + primaryContact: undefined, + submissionGovernment: mockLocalGovernment, + }); + mockStatusEmailService.sendApplicationStatusEmail.mockResolvedValue(); + + await consumer.process(); + + expect( + mockApplicationSubmissionStatusService.saveSubmissionToSubmissionStatus, + ).toBeCalledTimes(0); + + expect(mockStatusEmailService.getApplicationEmailData).toHaveBeenCalledWith( + 'fake', + ); + expect( + mockStatusEmailService.getApplicationEmailData, + ).toHaveBeenCalledTimes(1); + expect( + mockStatusEmailService.sendApplicationStatusEmail, + ).toHaveBeenCalledTimes(0); + }); +}); diff --git a/services/apps/alcs/src/queues/scheduler/application/decision-emails/decision-emails.consumer.ts b/services/apps/alcs/src/queues/scheduler/application/decision-emails/decision-emails.consumer.ts new file mode 100644 index 0000000000..feb0e13bf6 --- /dev/null +++ b/services/apps/alcs/src/queues/scheduler/application/decision-emails/decision-emails.consumer.ts @@ -0,0 +1,130 @@ +import { OnWorkerEvent, Processor, WorkerHost } from '@nestjs/bullmq'; +import { Logger } from '@nestjs/common'; +import * as dayjs from 'dayjs'; +import * as timezone from 'dayjs/plugin/timezone'; +import * as utc from 'dayjs/plugin/utc'; +import { generateALCDApplicationHtml } from '../../../../../../../templates/emails/decision-released'; +import { generateREVAHtml } from '../../../../../../../templates/emails/under-review-by-alc.template'; +import { ApplicationDecisionV2Service } from '../../../../alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service'; +import { ApplicationSubmissionStatusService } from '../../../../alcs/application/application-submission-status/application-submission-status.service'; +import { SUBMISSION_STATUS } from '../../../../alcs/application/application-submission-status/submission-status.dto'; +import { ApplicationSubmissionToSubmissionStatus } from '../../../../alcs/application/application-submission-status/submission-status.entity'; +import { PARENT_TYPE } from '../../../../alcs/card/card-subtask/card-subtask.dto'; +import { LocalGovernment } from '../../../../alcs/local-government/local-government.entity'; +import { ApplicationOwner } from '../../../../portal/application-submission/application-owner/application-owner.entity'; +import { ApplicationSubmission } from '../../../../portal/application-submission/application-submission.entity'; +import { StatusEmailService } from '../../../../providers/email/status-email.service'; +import { QUEUES } from '../../scheduler.service'; + +dayjs.extend(utc); +dayjs.extend(timezone); + +@Processor(QUEUES.APPLICATION_DECISION_EMAILS) +export class ApplicationDecisionEmailConsumer extends WorkerHost { + private logger = new Logger(ApplicationDecisionEmailConsumer.name); + + constructor( + private submissionStatusService: ApplicationSubmissionStatusService, + private appDecisionService: ApplicationDecisionV2Service, + private statusEmailService: StatusEmailService, + ) { + super(); + } + + async process() { + try { + this.logger.debug('Starting application decision email consumer.'); + + const tomorrow = dayjs(new Date()) + .tz('Canada/Pacific') + .startOf('day') + .add(1, 'day') + .toDate(); + + const decisions = + await this.appDecisionService.getDecisionsPendingEmail(tomorrow); + + for (const decision of decisions) { + try { + const { + applicationSubmission, + primaryContact, + submissionGovernment, + } = await this.statusEmailService.getApplicationEmailData( + decision.application.fileNumber, + ); + + const submissionStatus = + await this.submissionStatusService.getCurrentStatusByFileNumber( + decision.application.fileNumber, + ); + + await this.sendEmail( + applicationSubmission, + submissionGovernment, + primaryContact, + submissionStatus, + decision.uuid, + ); + + await this.appDecisionService.update( + decision.uuid, + { + isDraft: false, + emailSent: new Date(), + }, + undefined, + undefined, + ); + this.logger.debug( + `Email sent for Application Decision ${decision.uuid}`, + ); + } catch (e) { + this.logger.error(e); + } + } + } catch (e) { + this.logger.error(e); + } + } + + @OnWorkerEvent('completed') + onCompleted() { + this.logger.debug('Completed ApplicationDecisionEmailConsumer job.'); + } + + private async sendEmail( + applicationSubmission: ApplicationSubmission, + submissionGovernment: LocalGovernment | null, + primaryContact: ApplicationOwner | undefined, + submissionStatus: ApplicationSubmissionToSubmissionStatus, + decisionUuid: string, + ) { + if ( + primaryContact && + applicationSubmission.status.statusTypeCode === + submissionStatus.statusTypeCode + ) { + const generateStatusHtml = + submissionStatus.statusTypeCode === SUBMISSION_STATUS.ALC_DECISION + ? generateALCDApplicationHtml + : generateREVAHtml; + + const documents = + await this.statusEmailService.getApplicationDecisionDocuments( + decisionUuid, + ); + + await this.statusEmailService.sendApplicationStatusEmail({ + applicationSubmission, + government: submissionGovernment, + parentType: PARENT_TYPE.APPLICATION, + primaryContact, + ccGovernment: true, + generateStatusHtml, + status: submissionStatus.statusTypeCode, + documents, + }); + } + } +} diff --git a/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.spec.ts b/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.spec.ts index ae46cc19a7..08eaf024d9 100644 --- a/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.spec.ts +++ b/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.spec.ts @@ -1,6 +1,5 @@ import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; -import { generateALCDApplicationHtml } from '../../../../../../../templates/emails/decision-released'; import { generateREVAHtml } from '../../../../../../../templates/emails/under-review-by-alc.template'; import { ApplicationSubmissionStatusService } from '../../../../alcs/application/application-submission-status/application-submission-status.service'; import { SUBMISSION_STATUS } from '../../../../alcs/application/application-submission-status/submission-status.dto'; @@ -105,74 +104,6 @@ describe('ApplicationSubmissionStatusEmailConsumer', () => { }); }); - it('should send email and update submissionToStatus entry of ALC_DECISION status', async () => { - const mockSubmission = new ApplicationSubmission({ - fileNumber: 'fake', - submissionStatuses: [ - new ApplicationSubmissionToSubmissionStatus({ - statusTypeCode: SUBMISSION_STATUS.ALC_DECISION, - effectiveDate: new Date(), - }), - ], - }); - mockSubmission.populateCurrentStatus(); - const mockPrimaryContact = new ApplicationOwner(); - const mockLocalGovernment = new LocalGovernment(); - const mockDocuments = [{ name: 'fake-document', url: 'fake-url' }]; - - mockApplicationSubmissionStatusService.getSubmissionToSubmissionStatusForSendingEmails.mockResolvedValue( - [ - new ApplicationSubmissionToSubmissionStatus({ - submission: mockSubmission, - statusTypeCode: SUBMISSION_STATUS.ALC_DECISION, - }), - ], - ); - mockApplicationSubmissionStatusService.saveSubmissionToSubmissionStatus.mockResolvedValue( - new ApplicationSubmissionToSubmissionStatus(), - ); - - mockStatusEmailService.getApplicationEmailData.mockResolvedValue({ - applicationSubmission: mockSubmission, - primaryContact: mockPrimaryContact, - submissionGovernment: mockLocalGovernment, - }); - mockStatusEmailService.getApplicationDocumentEmailData.mockResolvedValue( - mockDocuments, - ); - mockStatusEmailService.sendApplicationStatusEmail.mockResolvedValue(); - - await consumer.process(); - - expect( - mockApplicationSubmissionStatusService.getSubmissionToSubmissionStatusForSendingEmails, - ).toBeCalledTimes(1); - expect( - mockApplicationSubmissionStatusService.saveSubmissionToSubmissionStatus, - ).toBeCalledTimes(1); - - expect(mockStatusEmailService.getApplicationEmailData).toBeCalledWith( - 'fake', - ); - expect(mockStatusEmailService.getApplicationEmailData).toBeCalledTimes(1); - expect( - mockStatusEmailService.getApplicationDocumentEmailData, - ).toBeCalledTimes(1); - expect(mockStatusEmailService.sendApplicationStatusEmail).toBeCalledTimes( - 1, - ); - expect(mockStatusEmailService.sendApplicationStatusEmail).toBeCalledWith({ - applicationSubmission: mockSubmission, - government: mockLocalGovernment, - parentType: PARENT_TYPE.APPLICATION, - primaryContact: mockPrimaryContact, - ccGovernment: true, - generateStatusHtml: generateALCDApplicationHtml, - status: SUBMISSION_STATUS.ALC_DECISION, - documents: mockDocuments, - }); - }); - it('should not send email if no primary contact', async () => { const mockSubmission = new ApplicationSubmission({ fileNumber: 'fake' }); const mockLocalGovernment = new LocalGovernment(); diff --git a/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.ts b/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.ts index 998ab477d7..ed36107288 100644 --- a/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.ts +++ b/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.ts @@ -132,6 +132,6 @@ export class ApplicationSubmissionStatusEmailConsumer extends WorkerHost { } private async getDecisionDocuments(fileNumber: string) { - return this.statusEmailService.getApplicationDocumentEmailData(fileNumber); + return this.statusEmailService.getApplicationDecisionDocuments(fileNumber); } } diff --git a/services/apps/alcs/src/queues/scheduler/notice-of-intent/decision-emails.consumer.spec.ts b/services/apps/alcs/src/queues/scheduler/notice-of-intent/decision-emails.consumer.spec.ts new file mode 100644 index 0000000000..fde64828d9 --- /dev/null +++ b/services/apps/alcs/src/queues/scheduler/notice-of-intent/decision-emails.consumer.spec.ts @@ -0,0 +1,162 @@ +import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; +import { Test, TestingModule } from '@nestjs/testing'; +import { generateALCDNoticeOfIntentHtml } from '../../../../../../templates/emails/decision-released'; +import { PARENT_TYPE } from '../../../alcs/card/card-subtask/card-subtask.dto'; +import { LocalGovernment } from '../../../alcs/local-government/local-government.entity'; +import { NoticeOfIntentDecisionV2Service } from '../../../alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service'; +import { NoticeOfIntentDecision } from '../../../alcs/notice-of-intent-decision/notice-of-intent-decision.entity'; +import { NOI_SUBMISSION_STATUS } from '../../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; +import { NoticeOfIntentSubmissionService } from '../../../alcs/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service'; +import { NoticeOfIntent } from '../../../alcs/notice-of-intent/notice-of-intent.entity'; +import { NoticeOfIntentOwner } from '../../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity'; +import { NoticeOfIntentSubmission } from '../../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; +import { StatusEmailService } from '../../../providers/email/status-email.service'; +import { NoticeOfIntentDecisionEmailsConsumer } from './decision-emails.consumer'; + +describe('NoticeOfIntentDecisionEmailsConsumer', () => { + let consumer: NoticeOfIntentDecisionEmailsConsumer; + let mockStatusEmailService: DeepMocked; + let mockNOISubmissionService: DeepMocked; + let mockNOIDecisionService: DeepMocked; + + beforeAll(() => { + jest.useFakeTimers().setSystemTime(new Date('2022-01-01')); + }); + + beforeEach(async () => { + mockStatusEmailService = createMock(); + mockNOISubmissionService = createMock(); + mockNOIDecisionService = createMock(); + + const module: TestingModule = await Test.createTestingModule({ + providers: [ + NoticeOfIntentDecisionEmailsConsumer, + { + provide: StatusEmailService, + useValue: mockStatusEmailService, + }, + { + provide: NoticeOfIntentSubmissionService, + useValue: mockNOISubmissionService, + }, + { + provide: NoticeOfIntentDecisionV2Service, + useValue: mockNOIDecisionService, + }, + ], + }).compile(); + + consumer = module.get( + NoticeOfIntentDecisionEmailsConsumer, + ); + }); + + afterAll(() => { + jest.useRealTimers(); + }); + + it('should be defined', () => { + expect(consumer).toBeDefined(); + }); + + it('should send email and update decisions emailSent date', async () => { + const mockSubmission = new NoticeOfIntentSubmission({ fileNumber: 'fake' }); + const mockPrimaryContact = new NoticeOfIntentOwner(); + const mockLocalGovernment = new LocalGovernment(); + const mockDocuments = [{ name: 'fake-document', url: 'fake-url' }]; + + mockNOIDecisionService.getDecisionsPendingEmail.mockResolvedValue([ + new NoticeOfIntentDecision({ + uuid: 'uuid', + noticeOfIntent: new NoticeOfIntent({ fileNumber: 'fake' }), + }), + ]); + mockNOIDecisionService.update.mockResolvedValue( + new NoticeOfIntentDecision(), + ); + mockStatusEmailService.getNoticeOfIntentDecisionDocuments.mockResolvedValue( + mockDocuments, + ); + mockNOISubmissionService.get.mockResolvedValue(mockSubmission); + + mockStatusEmailService.getNoticeOfIntentEmailData.mockResolvedValue({ + primaryContact: mockPrimaryContact, + submissionGovernment: mockLocalGovernment, + }); + mockStatusEmailService.sendNoticeOfIntentStatusEmail.mockResolvedValue(); + + await consumer.process(); + + expect(mockNOISubmissionService.get).toHaveBeenCalledTimes(1); + expect( + mockNOIDecisionService.getDecisionsPendingEmail, + ).toHaveBeenCalledTimes(1); + expect( + mockStatusEmailService.getNoticeOfIntentDecisionDocuments, + ).toBeCalledTimes(1); + expect( + mockStatusEmailService.getNoticeOfIntentEmailData, + ).toHaveBeenCalledWith(mockSubmission); + expect( + mockStatusEmailService.sendNoticeOfIntentStatusEmail, + ).toBeCalledTimes(1); + expect( + mockStatusEmailService.sendNoticeOfIntentStatusEmail, + ).toHaveBeenCalledWith({ + noticeOfIntentSubmission: mockSubmission, + government: mockLocalGovernment, + parentType: PARENT_TYPE.NOTICE_OF_INTENT, + primaryContact: mockPrimaryContact, + ccGovernment: true, + generateStatusHtml: generateALCDNoticeOfIntentHtml, + status: NOI_SUBMISSION_STATUS.ALC_DECISION, + documents: mockDocuments, + }); + expect(mockNOIDecisionService.update).toHaveBeenCalledTimes(1); + expect(mockNOIDecisionService.update).toHaveBeenCalledWith( + 'uuid', + { + emailSent: new Date('2022-01-01'), + }, + undefined, + ); + }); + + it('should not send email if no primary contact', async () => { + const mockSubmission = new NoticeOfIntentSubmission({ fileNumber: 'fake' }); + const mockLocalGovernment = new LocalGovernment(); + const mockDocuments = [{ name: 'fake-document', url: 'fake-url' }]; + + mockNOIDecisionService.getDecisionsPendingEmail.mockResolvedValue([ + new NoticeOfIntentDecision({ + noticeOfIntent: new NoticeOfIntent(), + }), + ]); + mockStatusEmailService.getNoticeOfIntentDecisionDocuments.mockResolvedValue( + mockDocuments, + ); + mockNOISubmissionService.get.mockResolvedValue(mockSubmission); + + mockStatusEmailService.getNoticeOfIntentEmailData.mockResolvedValue({ + primaryContact: undefined, + submissionGovernment: mockLocalGovernment, + }); + mockStatusEmailService.sendNoticeOfIntentStatusEmail.mockResolvedValue(); + + await consumer.process(); + + expect(mockNOISubmissionService.get).toHaveBeenCalledTimes(1); + expect( + mockNOIDecisionService.getDecisionsPendingEmail, + ).toHaveBeenCalledTimes(1); + expect( + mockStatusEmailService.getNoticeOfIntentDecisionDocuments, + ).toHaveBeenCalledTimes(1); + expect( + mockStatusEmailService.getNoticeOfIntentEmailData, + ).toHaveBeenCalledWith(mockSubmission); + expect( + mockStatusEmailService.sendNoticeOfIntentStatusEmail, + ).toHaveBeenCalledTimes(0); + }); +}); diff --git a/services/apps/alcs/src/queues/scheduler/notice-of-intent/decision-emails.consumer.ts b/services/apps/alcs/src/queues/scheduler/notice-of-intent/decision-emails.consumer.ts new file mode 100644 index 0000000000..d980c6dc6c --- /dev/null +++ b/services/apps/alcs/src/queues/scheduler/notice-of-intent/decision-emails.consumer.ts @@ -0,0 +1,90 @@ +import { OnWorkerEvent, Processor, WorkerHost } from '@nestjs/bullmq'; +import { Logger } from '@nestjs/common'; +import * as dayjs from 'dayjs'; +import * as timezone from 'dayjs/plugin/timezone'; +import * as utc from 'dayjs/plugin/utc'; +import { generateALCDNoticeOfIntentHtml } from '../../../../../../templates/emails/decision-released'; +import { PARENT_TYPE } from '../../../alcs/card/card-subtask/card-subtask.dto'; +import { NoticeOfIntentDecisionV2Service } from '../../../alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service'; +import { NOI_SUBMISSION_STATUS } from '../../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; +import { NoticeOfIntentSubmissionService } from '../../../alcs/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service'; +import { StatusEmailService } from '../../../providers/email/status-email.service'; +import { QUEUES } from '../scheduler.service'; + +dayjs.extend(utc); +dayjs.extend(timezone); + +@Processor(QUEUES.NOTICE_OF_INTENTS_DECISION_EMAILS) +export class NoticeOfIntentDecisionEmailsConsumer extends WorkerHost { + private logger = new Logger(NoticeOfIntentDecisionEmailsConsumer.name); + + constructor( + private statusEmailService: StatusEmailService, + private noiDecisionService: NoticeOfIntentDecisionV2Service, + private noiSubmissionService: NoticeOfIntentSubmissionService, + ) { + super(); + } + + async process() { + this.logger.debug('Starting NOI decision email consumer.'); + try { + const tomorrow = dayjs(new Date()) + .tz('Canada/Pacific') + .startOf('day') + .add(1, 'day') + .toDate(); + + const decisions = + await this.noiDecisionService.getDecisionsPendingEmail(tomorrow); + + for (const decision of decisions) { + try { + const submission = await this.noiSubmissionService.get( + decision.noticeOfIntent.fileNumber, + ); + const { primaryContact, submissionGovernment } = + await this.statusEmailService.getNoticeOfIntentEmailData( + submission, + ); + + const documents = + await this.statusEmailService.getNoticeOfIntentDecisionDocuments( + decision.uuid, + ); + + if (primaryContact) { + await this.statusEmailService.sendNoticeOfIntentStatusEmail({ + generateStatusHtml: generateALCDNoticeOfIntentHtml, + status: NOI_SUBMISSION_STATUS.ALC_DECISION, + noticeOfIntentSubmission: submission, + government: submissionGovernment, + parentType: PARENT_TYPE.NOTICE_OF_INTENT, + primaryContact, + ccGovernment: true, + documents, + }); + + await this.noiDecisionService.update( + decision.uuid, + { + emailSent: new Date(), + }, + undefined, + ); + this.logger.debug(`Email sent for NOI Decision ${decision.uuid}`); + } + } catch (e) { + this.logger.error(e); + } + } + } catch (e) { + this.logger.error(e); + } + } + + @OnWorkerEvent('completed') + onCompleted() { + this.logger.debug('Completed NoticeOfIntentDecisionEmailsConsumer job.'); + } +} diff --git a/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.spec.ts b/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.spec.ts deleted file mode 100644 index 35aad396fa..0000000000 --- a/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.spec.ts +++ /dev/null @@ -1,156 +0,0 @@ -import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; -import { Test, TestingModule } from '@nestjs/testing'; -import { generateALCDNoticeOfIntentHtml } from '../../../../../../templates/emails/decision-released'; -import { PARENT_TYPE } from '../../../alcs/card/card-subtask/card-subtask.dto'; -import { LocalGovernment } from '../../../alcs/local-government/local-government.entity'; -import { NOI_SUBMISSION_STATUS } from '../../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; -import { NoticeOfIntentSubmissionToSubmissionStatus } from '../../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.entity'; -import { NoticeOfIntentSubmissionStatusService } from '../../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; -import { NoticeOfIntentOwner } from '../../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity'; -import { NoticeOfIntentSubmission } from '../../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; -import { StatusEmailService } from '../../../providers/email/status-email.service'; -import { NoticeOfIntentSubmissionStatusEmailConsumer } from './status-emails.consumer'; - -describe('NoticeOfIntentSubmissionStatusEmailConsumer', () => { - let consumer: NoticeOfIntentSubmissionStatusEmailConsumer; - let mockStatusEmailService: DeepMocked; - let mockNoticeOfIntentSubmissionStatusService: DeepMocked; - - beforeEach(async () => { - mockStatusEmailService = createMock(); - mockNoticeOfIntentSubmissionStatusService = createMock(); - - const module: TestingModule = await Test.createTestingModule({ - providers: [ - NoticeOfIntentSubmissionStatusEmailConsumer, - { - provide: StatusEmailService, - useValue: mockStatusEmailService, - }, - { - provide: NoticeOfIntentSubmissionStatusService, - useValue: mockNoticeOfIntentSubmissionStatusService, - }, - ], - }).compile(); - - consumer = module.get( - NoticeOfIntentSubmissionStatusEmailConsumer, - ); - }); - - it('should be defined', () => { - expect(consumer).toBeDefined(); - }); - - it('should send email and update submissionToStatus entry of ALC_DECISION status', async () => { - const mockSubmission = new NoticeOfIntentSubmission({ fileNumber: 'fake' }); - const mockPrimaryContact = new NoticeOfIntentOwner(); - const mockLocalGovernment = new LocalGovernment(); - const mockDocuments = [{ name: 'fake-document', url: 'fake-url' }]; - - mockNoticeOfIntentSubmissionStatusService.getSubmissionToSubmissionStatusForSendingEmails.mockResolvedValue( - [ - new NoticeOfIntentSubmissionToSubmissionStatus({ - submission: mockSubmission, - statusTypeCode: NOI_SUBMISSION_STATUS.ALC_DECISION, - }), - ], - ); - mockNoticeOfIntentSubmissionStatusService.saveSubmissionToSubmissionStatus.mockResolvedValue( - new NoticeOfIntentSubmissionToSubmissionStatus(), - ); - - mockStatusEmailService.getNoticeOfIntentEmailData.mockResolvedValue({ - primaryContact: mockPrimaryContact, - submissionGovernment: mockLocalGovernment, - }); - mockStatusEmailService.getNoticeOfIntentDocumentEmailData.mockResolvedValue( - mockDocuments, - ); - mockStatusEmailService.sendNoticeOfIntentStatusEmail.mockResolvedValue(); - - await consumer.process(); - - expect( - mockNoticeOfIntentSubmissionStatusService.getSubmissionToSubmissionStatusForSendingEmails, - ).toBeCalledTimes(1); - expect( - mockNoticeOfIntentSubmissionStatusService.saveSubmissionToSubmissionStatus, - ).toBeCalledTimes(1); - - expect(mockStatusEmailService.getNoticeOfIntentEmailData).toBeCalledWith( - mockSubmission, - ); - expect(mockStatusEmailService.getNoticeOfIntentEmailData).toBeCalledTimes( - 1, - ); - expect( - mockStatusEmailService.getNoticeOfIntentDocumentEmailData, - ).toBeCalledTimes(1); - expect( - mockStatusEmailService.sendNoticeOfIntentStatusEmail, - ).toBeCalledTimes(1); - expect(mockStatusEmailService.sendNoticeOfIntentStatusEmail).toBeCalledWith( - { - noticeOfIntentSubmission: mockSubmission, - government: mockLocalGovernment, - parentType: PARENT_TYPE.NOTICE_OF_INTENT, - primaryContact: mockPrimaryContact, - ccGovernment: true, - generateStatusHtml: generateALCDNoticeOfIntentHtml, - status: NOI_SUBMISSION_STATUS.ALC_DECISION, - documents: mockDocuments, - }, - ); - }); - - it('should not send email if no primary contact', async () => { - const mockSubmission = new NoticeOfIntentSubmission({ fileNumber: 'fake' }); - const mockLocalGovernment = new LocalGovernment(); - const mockDocuments = [{ name: 'fake-document', url: 'fake-url' }]; - - mockNoticeOfIntentSubmissionStatusService.getSubmissionToSubmissionStatusForSendingEmails.mockResolvedValue( - [ - new NoticeOfIntentSubmissionToSubmissionStatus({ - submission: mockSubmission, - statusTypeCode: NOI_SUBMISSION_STATUS.ALC_DECISION, - }), - ], - ); - mockNoticeOfIntentSubmissionStatusService.saveSubmissionToSubmissionStatus.mockResolvedValue( - new NoticeOfIntentSubmissionToSubmissionStatus(), - ); - - mockStatusEmailService.getNoticeOfIntentEmailData.mockResolvedValue({ - primaryContact: undefined, - submissionGovernment: mockLocalGovernment, - }); - mockStatusEmailService.getNoticeOfIntentDocumentEmailData.mockResolvedValue( - mockDocuments, - ); - mockStatusEmailService.sendNoticeOfIntentStatusEmail.mockResolvedValue(); - - await consumer.process(); - - expect( - mockNoticeOfIntentSubmissionStatusService.getSubmissionToSubmissionStatusForSendingEmails, - ).toBeCalledTimes(1); - expect( - mockNoticeOfIntentSubmissionStatusService.saveSubmissionToSubmissionStatus, - ).toBeCalledTimes(0); - - expect(mockStatusEmailService.getNoticeOfIntentEmailData).toBeCalledWith( - mockSubmission, - ); - expect(mockStatusEmailService.getNoticeOfIntentEmailData).toBeCalledTimes( - 1, - ); - expect( - mockStatusEmailService.getNoticeOfIntentDocumentEmailData, - ).toBeCalledTimes(1); - expect( - mockStatusEmailService.sendNoticeOfIntentStatusEmail, - ).toBeCalledTimes(0); - }); -}); diff --git a/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.ts b/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.ts deleted file mode 100644 index 939e187f0a..0000000000 --- a/services/apps/alcs/src/queues/scheduler/notice-of-intent/status-emails.consumer.ts +++ /dev/null @@ -1,104 +0,0 @@ -import { OnWorkerEvent, Processor, WorkerHost } from '@nestjs/bullmq'; -import { Logger } from '@nestjs/common'; -import * as dayjs from 'dayjs'; -import * as timezone from 'dayjs/plugin/timezone'; -import * as utc from 'dayjs/plugin/utc'; -import { generateALCDNoticeOfIntentHtml } from '../../../../../../templates/emails/decision-released'; -import { PARENT_TYPE } from '../../../alcs/card/card-subtask/card-subtask.dto'; -import { NOI_SUBMISSION_STATUS } from '../../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.dto'; -import { NoticeOfIntentSubmissionToSubmissionStatus } from '../../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.entity'; -import { NoticeOfIntentSubmissionStatusService } from '../../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; -import { StatusEmailService } from '../../../providers/email/status-email.service'; -import { QUEUES } from '../scheduler.service'; - -dayjs.extend(utc); -dayjs.extend(timezone); - -@Processor(QUEUES.NOTICE_OF_INTENTS_STATUS_EMAILS) -export class NoticeOfIntentSubmissionStatusEmailConsumer extends WorkerHost { - private logger = new Logger(NoticeOfIntentSubmissionStatusEmailConsumer.name); - - constructor( - private submissionStatusService: NoticeOfIntentSubmissionStatusService, - private statusEmailService: StatusEmailService, - ) { - super(); - } - - async process() { - try { - const tomorrow = dayjs(new Date()) - .tz('Canada/Pacific') - .startOf('day') - .add(1, 'day') - .toDate(); - - const submissionStatuses = - await this.submissionStatusService.getSubmissionToSubmissionStatusForSendingEmails( - tomorrow, - ); - - for (const submissionStatus of submissionStatuses) { - try { - const { primaryContact, submissionGovernment } = - await this.statusEmailService.getNoticeOfIntentEmailData( - submissionStatus.submission, - ); - - const documents = await this.getDecisionDocuments( - submissionStatus.submission.fileNumber, - ); - - if (primaryContact) { - await this.statusEmailService.sendNoticeOfIntentStatusEmail({ - generateStatusHtml: generateALCDNoticeOfIntentHtml, - status: NOI_SUBMISSION_STATUS.ALC_DECISION, - noticeOfIntentSubmission: submissionStatus.submission, - government: submissionGovernment, - parentType: PARENT_TYPE.NOTICE_OF_INTENT, - primaryContact, - ccGovernment: true, - documents, - }); - - await this.updateSubmissionStatus(submissionStatus); - this.logger.debug( - `Status email sent for NOI ${submissionStatus.submissionUuid}`, - ); - } - } catch (e) { - this.logger.error(e); - } - } - } catch (e) { - this.logger.error(e); - } - } - - @OnWorkerEvent('completed') - onCompleted() { - this.logger.debug( - 'Completed NoticeOfIntentSubmissionStatusEmailConsumer job.', - ); - } - - private async updateSubmissionStatus( - submissionStatus: NoticeOfIntentSubmissionToSubmissionStatus, - ) { - const today = dayjs(new Date()) - .tz('Canada/Pacific') - .startOf('day') - .toDate(); - - submissionStatus.emailSentDate = today; - await this.submissionStatusService.saveSubmissionToSubmissionStatus( - submissionStatus, - ); - } - - private async getDecisionDocuments(fileNumber: string) { - return this.statusEmailService.getNoticeOfIntentDocumentEmailData( - fileNumber, - ); - } -} diff --git a/services/apps/alcs/src/queues/scheduler/scheduler.module.ts b/services/apps/alcs/src/queues/scheduler/scheduler.module.ts index 4cd660e0bd..6fbe2d9217 100644 --- a/services/apps/alcs/src/queues/scheduler/scheduler.module.ts +++ b/services/apps/alcs/src/queues/scheduler/scheduler.module.ts @@ -1,15 +1,19 @@ import { BullModule } from '@nestjs/bullmq'; import { Module, OnApplicationBootstrap } from '@nestjs/common'; +import { ApplicationDecisionModule } from '../../alcs/application-decision/application-decision.module'; import { ApplicationSubmissionStatusModule } from '../../alcs/application/application-submission-status/application-submission-status.module'; import { ApplicationModule } from '../../alcs/application/application.module'; import { MessageModule } from '../../alcs/message/message.module'; +import { NoticeOfIntentDecisionModule } from '../../alcs/notice-of-intent-decision/notice-of-intent-decision.module'; import { NoticeOfIntentSubmissionStatusModule } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.module'; +import { NoticeOfIntentModule } from '../../alcs/notice-of-intent/notice-of-intent.module'; import { EmailModule } from '../../providers/email/email.module'; import { BullConfigService } from '../bullConfig.service'; import { ApplicationExpiryConsumer } from './application/application-expiry/application-expiry.consumer'; +import { ApplicationDecisionEmailConsumer } from './application/decision-emails/decision-emails.consumer'; import { ApplicationSubmissionStatusEmailConsumer } from './application/status-emails/status-emails.consumer'; import { CleanUpNotificationsConsumer } from './cleanUpNotifications.consumer'; -import { NoticeOfIntentSubmissionStatusEmailConsumer } from './notice-of-intent/status-emails.consumer'; +import { NoticeOfIntentDecisionEmailsConsumer } from './notice-of-intent/decision-emails.consumer'; import { QUEUES, SchedulerService } from './scheduler.service'; @Module({ @@ -27,20 +31,27 @@ import { QUEUES, SchedulerService } from './scheduler.service'; name: QUEUES.APPLICATION_STATUS_EMAILS, }), BullModule.registerQueue({ - name: QUEUES.NOTICE_OF_INTENTS_STATUS_EMAILS, + name: QUEUES.APPLICATION_DECISION_EMAILS, + }), + BullModule.registerQueue({ + name: QUEUES.NOTICE_OF_INTENTS_DECISION_EMAILS, }), EmailModule, ApplicationModule, MessageModule, ApplicationSubmissionStatusModule, NoticeOfIntentSubmissionStatusModule, + NoticeOfIntentModule, + NoticeOfIntentDecisionModule, + ApplicationDecisionModule, ], providers: [ SchedulerService, ApplicationExpiryConsumer, CleanUpNotificationsConsumer, ApplicationSubmissionStatusEmailConsumer, - NoticeOfIntentSubmissionStatusEmailConsumer, + ApplicationDecisionEmailConsumer, + NoticeOfIntentDecisionEmailsConsumer, ], exports: [SchedulerService], }) diff --git a/services/apps/alcs/src/queues/scheduler/scheduler.service.spec.ts b/services/apps/alcs/src/queues/scheduler/scheduler.service.spec.ts index ae5b7ab8b1..8c0f05de96 100644 --- a/services/apps/alcs/src/queues/scheduler/scheduler.service.spec.ts +++ b/services/apps/alcs/src/queues/scheduler/scheduler.service.spec.ts @@ -4,10 +4,10 @@ import { Test, TestingModule } from '@nestjs/testing'; import { isDST } from '../../utils/pacific-date-time-helper'; import { BullConfigService } from '../bullConfig.service'; import { - EVERYDAY_MIDNIGHT_PDT_IN_UTC, - EVERYDAY_MIDNIGHT_PST_IN_UTC, EVERY_15_MINUTES_STARTING_FROM_8AM_PDT_IN_UTC, EVERY_15_MINUTES_STARTING_FROM_8AM_PST_IN_UTC, + EVERYDAY_MIDNIGHT_PDT_IN_UTC, + EVERYDAY_MIDNIGHT_PST_IN_UTC, QUEUES, SchedulerService, } from './scheduler.service'; @@ -17,7 +17,8 @@ describe('SchedulerService', () => { let mockAppExpiryQueue; let mockNotificationCleanUpQueue; let mockApplicationStatusEmailsQueue; - let mockNoticeOfIntentStatusEmailsQueue; + let mockNoticeOfIntentDecisionEmailsQueue; + let mockApplicationDecisionEmailsQueue; beforeEach(async () => { mockAppExpiryQueue = { @@ -39,7 +40,13 @@ describe('SchedulerService', () => { getRepeatableJobs: jest.fn().mockResolvedValue([]), }; - mockNoticeOfIntentStatusEmailsQueue = { + mockNoticeOfIntentDecisionEmailsQueue = { + add: jest.fn(), + process: jest.fn(), + getRepeatableJobs: jest.fn().mockResolvedValue([]), + }; + + mockApplicationDecisionEmailsQueue = { add: jest.fn(), process: jest.fn(), getRepeatableJobs: jest.fn().mockResolvedValue([]), @@ -68,8 +75,12 @@ describe('SchedulerService', () => { useValue: mockApplicationStatusEmailsQueue, }, { - provide: getQueueToken(QUEUES.NOTICE_OF_INTENTS_STATUS_EMAILS), - useValue: mockNoticeOfIntentStatusEmailsQueue, + provide: getQueueToken(QUEUES.NOTICE_OF_INTENTS_DECISION_EMAILS), + useValue: mockNoticeOfIntentDecisionEmailsQueue, + }, + { + provide: getQueueToken(QUEUES.APPLICATION_DECISION_EMAILS), + useValue: mockApplicationDecisionEmailsQueue, }, ], }).compile(); @@ -92,7 +103,7 @@ describe('SchedulerService', () => { // { // repeat: { // pattern: isDST() - // ? MONDAY_TO_FRIDAY_AT_2AM_PDT_IN_UTC + // ? MONDAY_TO_FRIDAY_AT_2AM_PDT_IN_UTC // : MONDAY_TO_FRIDAY_AT_2AM_PST_IN_UTC, // }, // }, @@ -110,7 +121,7 @@ describe('SchedulerService', () => { repeat: { pattern: isDST() ? EVERYDAY_MIDNIGHT_PDT_IN_UTC - : EVERYDAY_MIDNIGHT_PST_IN_UTC, + : EVERYDAY_MIDNIGHT_PST_IN_UTC, }, }, ); @@ -135,14 +146,33 @@ describe('SchedulerService', () => { ); }); - it('should call add for notice of intent status email', async () => { + it('should call add for application emails', async () => { + await schedulerService.setup(); + expect( + mockApplicationDecisionEmailsQueue.getRepeatableJobs, + ).toBeCalledTimes(1); + expect(mockApplicationDecisionEmailsQueue.add).toBeCalledTimes(1); + expect(mockApplicationDecisionEmailsQueue.add).toBeCalledWith( + 'applicationDecisionEmails', + {}, + { + repeat: { + pattern: isDST() + ? EVERY_15_MINUTES_STARTING_FROM_8AM_PDT_IN_UTC + : EVERY_15_MINUTES_STARTING_FROM_8AM_PST_IN_UTC, + }, + }, + ); + }); + + it('should call add for notice of intent decision emails', async () => { await schedulerService.setup(); expect( - mockNoticeOfIntentStatusEmailsQueue.getRepeatableJobs, + mockNoticeOfIntentDecisionEmailsQueue.getRepeatableJobs, ).toBeCalledTimes(1); - expect(mockNoticeOfIntentStatusEmailsQueue.add).toBeCalledTimes(1); - expect(mockNoticeOfIntentStatusEmailsQueue.add).toBeCalledWith( - 'noticeOfIntentSubmissionStatusEmails', + expect(mockNoticeOfIntentDecisionEmailsQueue.add).toBeCalledTimes(1); + expect(mockNoticeOfIntentDecisionEmailsQueue.add).toBeCalledWith( + 'noticeOfIntentDecisionEmails', {}, { repeat: { diff --git a/services/apps/alcs/src/queues/scheduler/scheduler.service.ts b/services/apps/alcs/src/queues/scheduler/scheduler.service.ts index 47bfd16050..0eadd12961 100644 --- a/services/apps/alcs/src/queues/scheduler/scheduler.service.ts +++ b/services/apps/alcs/src/queues/scheduler/scheduler.service.ts @@ -18,7 +18,8 @@ export const QUEUES = { APP_EXPIRY: 'ApplicationExpiry', CLEANUP_NOTIFICATIONS: 'CleanupNotifications', APPLICATION_STATUS_EMAILS: 'ApplicationSubmissionStatusEmails', - NOTICE_OF_INTENTS_STATUS_EMAILS: 'NoticeOfIntentSubmissionStatusEmails', + APPLICATION_DECISION_EMAILS: 'ApplicationDecisionEmails', + NOTICE_OF_INTENTS_DECISION_EMAILS: 'NoticeOfIntentDecisionEmails', }; @Injectable() @@ -29,8 +30,10 @@ export class SchedulerService { private cleanupNotificationsQueue: Queue, @InjectQueue(QUEUES.APPLICATION_STATUS_EMAILS) private applicationSubmissionStatusEmailsQueue: Queue, - @InjectQueue(QUEUES.NOTICE_OF_INTENTS_STATUS_EMAILS) - private noticeOfIntentSubmissionStatusEmailsQueue: Queue, + @InjectQueue(QUEUES.NOTICE_OF_INTENTS_DECISION_EMAILS) + private noticeOfIntentDecisionEmailsQueue: Queue, + @InjectQueue(QUEUES.APPLICATION_DECISION_EMAILS) + private applicationDecisionEmailsQueue: Queue, ) {} async setup() { @@ -40,8 +43,8 @@ export class SchedulerService { // await this.scheduleApplicationExpiry(); await this.scheduleCleanupNotifications(); - await this.scheduleSubmissionEmails(); + await this.scheduleDecisionEmails(); } private async scheduleApplicationExpiry() { @@ -91,10 +94,24 @@ export class SchedulerService { }, }, ); + } + + private async scheduleDecisionEmails() { + const cronExpression = this.getCronExpressionBasedOnDst( + EVERY_15_MINUTES_STARTING_FROM_8AM_PST_IN_UTC, + EVERY_15_MINUTES_STARTING_FROM_8AM_PDT_IN_UTC, + ); + + await this.removeRepeatJobs(this.applicationDecisionEmailsQueue); + await this.applicationDecisionEmailsQueue.add( + 'applicationDecisionEmails', + {}, + { repeat: { pattern: cronExpression } }, + ); - await this.removeRepeatJobs(this.noticeOfIntentSubmissionStatusEmailsQueue); - await this.noticeOfIntentSubmissionStatusEmailsQueue.add( - 'noticeOfIntentSubmissionStatusEmails', + await this.removeRepeatJobs(this.noticeOfIntentDecisionEmailsQueue); + await this.noticeOfIntentDecisionEmailsQueue.add( + 'noticeOfIntentDecisionEmails', {}, { repeat: { pattern: cronExpression } }, ); From b7037d117dc5d1580fd521f6dce7aeadf74244f1 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Mon, 13 May 2024 10:43:38 -0700 Subject: [PATCH 051/103] UI Improvements on Public Search * Add close button to all controls * Update type dropdown to reset typed values unless they are valid and clear filter when blurring --- .../file-type-filter-drop-down.component.html | 14 +++- .../file-type-filter-drop-down.component.scss | 10 +++ .../file-type-filter-drop-down.component.ts | 9 ++- .../search/public-search.component.html | 66 +++++++++++++++++-- .../search/public-search.component.scss | 25 +++++++ 5 files changed, 112 insertions(+), 12 deletions(-) diff --git a/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html b/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html index ced3864337..9305e80966 100644 --- a/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html +++ b/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html @@ -6,8 +6,14 @@ (input)="filterChanged($event)" [matAutocomplete]="auto" [formControl]="componentTypeControl" + (blur)="onBlur()" /> - arrow_drop_down + arrow_drop_down + Please select an item from below @@ -17,7 +23,8 @@ class="checklist-leaf-node" [checked]="checklistSelection.isSelected(node)" (change)="leafItemSelectionToggle(node)" - >{{ node.item?.label ?? node.item }}{{ node.item?.label ?? node.item }} + @@ -32,7 +39,8 @@ [indeterminate]="descendantsPartiallySelected(node)" (change)="itemSelectionToggle(node)" > - {{ node.item?.label ?? node.item }} diff --git a/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss b/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss index f7a76450a2..76217447ab 100644 --- a/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss +++ b/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss @@ -4,10 +4,20 @@ width: 100%; } +#type { + text-overflow: ellipsis; +} + .tall-autocomplete { max-height: rem(600) !important; } .dropdown-arrow { color: rgba(0, 0, 0, 0.54); + cursor: pointer; + padding: 0 !important; + + &:last-child { + padding-right: 8px !important; + } } diff --git a/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.ts b/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.ts index fcdf3dd3da..765327d54b 100644 --- a/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.ts +++ b/portal-frontend/src/app/features/public/search/file-type-filter-drop-down/file-type-filter-drop-down.component.ts @@ -3,7 +3,6 @@ import { FlatTreeControl } from '@angular/cdk/tree'; import { AfterViewInit, Component, EventEmitter, Input, Output } from '@angular/core'; import { FormControl } from '@angular/forms'; import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree'; -import { Observable } from 'rxjs'; import { FileTypeDataSourceService, FlatTreeNode, @@ -28,7 +27,6 @@ export class FileTypeFilterDropDownComponent implements AfterViewInit { /** The selection for checklist */ checklistSelection = new SelectionModel(true); - filteredOptions = new Observable(); componentTypeControl = new FormControl(undefined); @Output() fileTypeChange = new EventEmitter(); @@ -179,7 +177,7 @@ export class FileTypeFilterDropDownComponent implements AfterViewInit { this.fileTypeChange.emit( this.checklistSelection.selected .filter((selectedItem) => selectedItem.item.value) - .map((selectedItem) => selectedItem.item.value!) + .map((selectedItem) => selectedItem.item.value!), ); } @@ -191,4 +189,9 @@ export class FileTypeFilterDropDownComponent implements AfterViewInit { ngAfterViewInit(): void { this.treeControl.expandAll(); } + + onBlur() { + this.populateSelectedItems(); + this.fileTypeData.filter(''); + } } diff --git a/portal-frontend/src/app/features/public/search/public-search.component.html b/portal-frontend/src/app/features/public/search/public-search.component.html index 5f4dd39d51..13878c517d 100644 --- a/portal-frontend/src/app/features/public/search/public-search.component.html +++ b/portal-frontend/src/app/features/public/search/public-search.component.html @@ -16,12 +16,22 @@

Search by one or more of the following fields:

+
+
warning @@ -32,6 +42,11 @@

Search by one or more of the following fields:

+
warning @@ -42,6 +57,11 @@

Search by one or more of the following fields:

+
warning @@ -59,6 +79,11 @@

Search by one or more of the following fields:

formControlName="government" [matAutocomplete]="auto" /> + {{ option.name }} @@ -72,6 +97,11 @@

Search by one or more of the following fields:

{{ region.label }} +
@@ -82,6 +112,11 @@

Search by one or more of the following fields:

{{ decision[0] }} +
@@ -89,9 +124,15 @@

Search by one or more of the following fields:

{{ - decisionMaker.label - }} + decisionMaker.label + }} + +
@@ -110,6 +151,11 @@

Search by one or more of the following fields:

{{ status[0] }} +
@@ -119,9 +165,17 @@

Search by one or more of the following fields:

+ + > +
@@ -140,7 +194,7 @@

Search Result

- Applications: {{ applicationTotal }} + Applications: {{ applicationTotal }} Search Result - Notice of Intent: {{ noticeOfIntentTotal }} + Notice of Intent: {{ noticeOfIntentTotal }} Search Result - Notifications: {{ notificationTotal }} + Notifications: {{ notificationTotal }} *[role=img] { + width: rem(16); + height: rem(16); + font-size: rem(16); + + svg { + width: rem(16); + height: rem(16); + } + } + + .mat-mdc-button-touch-target { + width: rem(24) !important; + height: rem(24) !important; + } +} + .search-form { display: grid; grid-template-columns: 1fr; From fd9d8d53b65583b987080e59e3545c9a4e250792 Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Mon, 13 May 2024 10:47:38 -0700 Subject: [PATCH 052/103] how to cyberduck (#1676) --- docs/imgs/cyberduck/cyberduck_1.png | Bin 0 -> 86644 bytes docs/imgs/cyberduck/cyberduck_2.png | Bin 0 -> 41305 bytes docs/imgs/cyberduck/cyberduck_3.png | Bin 0 -> 125227 bytes docs/logs.md | 15 +++++++++++++++ services/README.md | 10 +++++++--- 5 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 docs/imgs/cyberduck/cyberduck_1.png create mode 100644 docs/imgs/cyberduck/cyberduck_2.png create mode 100644 docs/imgs/cyberduck/cyberduck_3.png create mode 100644 docs/logs.md diff --git a/docs/imgs/cyberduck/cyberduck_1.png b/docs/imgs/cyberduck/cyberduck_1.png new file mode 100644 index 0000000000000000000000000000000000000000..c835b1c31a44d01b8a7d713705eec924a2bb0d93 GIT binary patch literal 86644 zcmZ^K1z23Y)-~={+_emYdvS*%#VJx;N^y60w-zt%?(XjH?(XjTPy62c-TT|{zzHYW z$w^Ko*?X;(5P4Z~WCVN!FfcG=NeNL!Ffb@8Ffi~9I2h2K_zhT8Ffh1E6A=-4Nf8lJ zd0VR=Cgz4V(EJ5s zNLftdDu>k63!8g$%fcP33$gCi=M}=Fh(yJ{&lJrr4XGItiWlCs(Sss&Zwr`>sE_xI4>S@MXXsq?oVanU!+x?LHak|NQP80&ak zuF_IR3v4p3eGMg-i(E@9P7bajZ~h?xUMXxYLvBi8Z)~rxc&uUXyvKggr~)*v&SNVs z*En>VH4iaWlwT6)-|c&cl#5l$ziGTBIHZ@poAm}p5O7$$xew!L(9+ghtXJC2pRKyJ ztvt`Rc|4;M^4cFg&8(Z5%Fd^8+1+Vstv)^>A|t;yI3G^! zT9s?Ix}G*4b6C22T?dg^t(v~St8jUy~KC0Tk-vu#hm=4uGn_C52ZW z9T1iqjV9^u`ypr`cZb{t1(iy5TX_frf_5p(q)O zs(&R%KxlW@VzUUYO#@pjCz3L?pGF;IUahynr=5-8(rqZeyU@4&B_idSue-QXZ@H9+ zLflWCEi8RhaySko#>J}UJZ0%$Ozb3UuQEr)kGWNzAU;sU!$#4fNp^kYOScLV9UBnt z&KZ9#6APE_V#-wftvNK{6?Q6oX5vC<4~yXL1LTrtgDRjr&X)Y%YWu51g1Zg!YmBl) z7rpK);noU~M2du~6Fe>lT=0oVwkId_rkXHEvR~g1gl+_%4HyP@$4QAaWV-UbOiwCU zia9VIcj(}j!QQm#j;+sbvB>*AZ$7+Vj{KF_NR)^nArC$+On>YMmc^W!=KD1*24@5v zV1UtLV-rKsG6lrkeKr{Vfs-?mabfwLG@83fq`i#Yp}54gQN7Pg+6g`3;}6uBt857L zdlbwhR-e3dpHMzb;!)U7*h;}gxe89`z!MpRS5gN2I84(gJ8PZs?g}{|8~wKM(iiVB z-lTA3;=5(83_GrfbE7NCLkLS2SY^+axi0#? zeAV&i!yW}7An@gb%L5ykueeRemt5a_?$6KDzz;)5=7WSC zWY@x^P1-mc#OYyMtYjB4aFss|{6_7v6;3vxwAoN8S7FG^s%T}2Dtc>q*%ixNHip>2 zR|u(EO=DGB13?cOkPa@S;a$i9u7?!x>_?4hm0eK}88L;64^L$rE4P(V5G^wINi!B} zDWh!+1}D|rCKr~Z3ZK6!en~H|6^(yCfHVHYf7B_3d3YSF%H=F)4FjHFiQG99^;`B+ z7o(j2VFJWJ3Obl)yP&O1XkalqW;hDjwrGIGb?i

v55psYJdPaIND_OyY#jUFdW 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

YG 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

BqEg_RSUkW+~!Wl0%TKaSbHSxW%4?VE?a zU!&aLZ<(m_ovqu;v3J3L-gLU0$N8#(MXr4rO$mH^BjAQMp-Qz|5{?)!@`L99g+U}zh0ft zZuqZQYEo}a2pjJ3hoZmnxY)(Yicgf2{x8C_QsxoRTIBg}LU-4pxj2bP(tfFvpeJm^ zYLKy#bG&>2UZ;Y9A5jtW(lKMN6+d@XRbzA&xfzG#ZsolC)q6)+=}OleSuM!{gy8u0 z9rxfgFrE)A2n;*Vo;!A2_4VANrG_8;&q50tuBNw9OiHvp#7>6g#i=ai8LrE%xlcz6 znuxCvxbv{$aiNyC%OS%_s$H>K`Z7UxK}a{QIFK~xTcxr)Ac83FoT!wv*u9{q(Y<9! z8t;7lcmYoN?B(jOO`Bb%jN1v6b=FuU`|Kc;jjK4C1W$rbKdB%fO%{__fGr>tR|Pps z`w&`u#3d+aGB!t9@{UBO)P`dd1M8GL_Ur_za1(bp?B9c&^`mm2`o;N#_g6cLy2;-J ze_fwE{MxU1`6e4VaE=d(;iSUxLKC@S1-~fTUXVGVHrB7|CNOzF1wuL9Vh|qMHK%U0 zRLrE*rDZV@C2$p++cO=tT}@2)t{5Pg&+$owe=Oa}G-POb*O0P2?|!PEooRSXHCRwD zC*)}uY9Rm7UHnzt7+>*__DEm%kH+Fm+e?hp0*g*d{kk8z*SA2o2@5&XgsRw$;DCUC z_Ea89ROti4D>^>sul{-hB5_7;M6zK)kH=3Y{i3$%?JRTN6%pS@35+jfWRzC2M2P>3 z>uULZFZg2GG#H7$Pa+~8xo1o%6J7Rlv)s0Q{YNViDYX{B%wt|xY=T-!C2&F5OYZWI}o)Uah*raLjAq7Lz{e% zk?B-zu>p-?xaioy>ze9F(rkQ`i}dHa-67Ww%W6-0>SqFC(*E~7-cDJWW$#_quNm`h z;coXN-ycv%j{l>f{mc5?r$kp*)wOZLB->eDyt2CxHSIh^fzc~eJLjdTaer8y#?*tw z@oGXbCWpzkb}fggaJCP$`Qg36wa7xpFoA3RGJKj(~2<5Z@nqkMiMJ|0U! z@=1~b7q^GU1M%QrT29|)7PWh6eznHq*(Ye6Nw=uIT9ke!(>*q6FY{;jXnB#D;VRS+ z1j7G8Fswg$ZgpsZg~=k{kYvZK7DjJPPgtp2;GQWecLIbTnW%h#MMq{x84fo{G~3B2 zp9T_J(wCrwj9m64g9Yqib9SR9Q*$flUM>0OmGz0R59S#K|bpy*ZNspi_S z1N-@ZB>(tfkSAeY+Ba#0t9e!N?o(`^QIA6Yhihy6iv0HG*aS&UUg%Una_hgQ!-I)^ zshgceH0^UMlrK6|FCaf1;Mf0d2#nV1!~aorcyRVQ_sR(Qc(J{*y25_4B;+a_uFWNw ze}*!BP2$pOyXV+((3*_@+)SN)xggR>!oy9DW%`UqiV9c3ni?4k%y03Uf;H5%(ZN;Q z;9Pj;cLai{RH|QAZvD+Rim4cux+4mnk`Bz~wnHrRihaIB$7IZ&$Q6PY^K%iU%~CGA z&5fFI7&7G)QPcZE{CLJXw-d-y7x=4nAvUTGFEuZ+?u)hWVrANiyMTfrS((P9w7|k7 z;AZ7z_f*6ls+3-)n2R|^r5yB0$2VTp(TkDMu(_(S@OCQZ5#?UqL@uK$&;QvotR8@3+OKJVlSIM9Edf;9bw#bu;PUl>J7#Bat)n80h z)>MQc873ukcu=z@xZl-)D2hU~$0=lA8L3AT`H8Q2$GU0_q@wH~anKZU+|XRX?ZF=x z4B)+|gF+~x)1zjZ75sB`_n^3ePXK5;cIT5A3iBZ?>SPs)*L#WU@aklPun4TW+q)vn z?k0vyTdS;DtatTcO-*adt(D5Z6S^0zD!wjs<(QW6EC?7*e$`w`y4Czu!G@OKjkm>} zU_90OO>U97hHt!&U>TudXr(=RP`ppzh}p_KOA-fogf{K0G}%PbGpHm-Si|jC|2f!l z!95sq_~OPh4Z4!t?OIfyU@+hB&-K+aTRE@cBcB1{J<=te%i-@`%*8L7T~6sVaoZ;1 zQj=!A_`w8lEVrTM0*cqCS|*XvN3kltwbzq|Vm5$7Y4W~R(XoWhW!_FlL654)14SjW zU;s@Cw2;#ki5%kr5Zi}XlU#N){m{(*Q?{{QPhE58Adt&~|I9d=bWF!o_GdtIe~sZp z=-=U80dr!f3peni&Y_j@cB>5FSmyc)F>y9v%sp4nHf~q;_1+$y*vfUipddIQh>v{& z1ZdPu?az7LNneVTMDPgMAdyY`uY*LyJ6GVZh*i$sxI>Gz-Xd_i0(mU%33B)uEL5N| zgvS%8Vm4sHWNF(_$UjkrQ3BAtHdX%KtesA@jclDWJV~{=Bu+IZrjEotV5!q<-7RG9 z(0ZP;F6Bs_8U2UkoFEC_S;55*L^M6$(VxCCsBb5Is|@oyVoT|}(pa8tyz__co7?NX zz~Hjtxiny`1j61X-04ls@UTMX1B7_>?)p6i|E)>TL@^0HYqdBC09HCYtdEif1T;F> zi?MXo;ZjagY{cMfVFH=(8aHC?m*k>5_cgSq{*TeL|NHBSRU&r5yjy+_8YXI~cOilN@tP9SQi-4dHil6wY}^^w$eusJb3b zU&qEnBVh=fcsnw?;eL&Exuy2n)`WUs<)4mqX9W8}K!;-}XSuCo){nU{3+54juW1nx z>6@(Fqtw7bUxil6WHGvh=C+`Ac-?&NbsKGuzpUBISL;%d1k9G5lp<3ZHENDeXj1Jk zcKo^WOYPChriZe;%T(Oal)PAhPR|k z`ejOK_tg;p-&?Hnl+xoLUc1}Pdd1idxCy8U3B2mZfm5G1S8cP`BsRPwz6dY@evf;m zRqh3km8|qO=O>}=B);rvtzlO?x@Gxam|C548M!*a+~mCiX5WsN8&rA2Yyve^7*JX; zg~O}@E5#&(Ig5IIY(H19*AnlHR`&lH=eGE<&Vc4Dg{F;V0=xB+da{yA^9$jT_|{4O z`vb5b&*eEwRE=@gEs1IUAv8D>AY8+T4Qu+8Abos3Yn^G)Up2?~@;dj~(u!k3=07(y zfBJ=rTWhOo=}q<;@Qb<1hSiwc3!r0rnP%RS?}p008KdyCBc*W4`mGC* z-_|hF?699nY%bzOX6QFz!Escxav|EPK?WiBb@Z|W8=J-j{wpb6I$p36p;qaqIO{@= zvrGgJ>}Axv7)^EL_R)c?acb=(TpO6Y@-Kq-R3}vifOr}%n^M2MVNixNcpRZ2jRh;) z;chA=(lws1<33sHgg6?Kgk0yi>grudD?*ZAD+*)rvza%_(h#vWDe-+b(SND@PBZ*s#!$R3&o~B4S&ewJX$Phx zmFQ+%CF8=?=5OZ05^3f~M&@6OF#&ZsF-AP7s0~>V7qwly+7KbXi#F5{RyB`pno?&Jy( zI%>nL4OM@Z%(R26igcrNP8`pK3v~3rq zf@>#GTu}-(Aym`G6PdJFQO{0{fmth zD6XZSW~qz3lTc{yosfIp;G=EVyby6_T2PN4zF$QWz5u)yM>1?%XfQn=RUuy3hux$z;e> zVIy$_W$D7-63v-mqH}8&k;?aaV4wrwekRvezrtpRYWp)NfXuotDrNSOkG%L{RO8E4 z3*uK-irytYSPbVXBi45Ja@}QFI=D2PPI0~6Fzac%9hmbaF)`s(kCDFp!ud33%@&Ob zllRvDp?(`?s}!_;&FU+Jk)f~{YykMH9wW$YiKeR{bo~Oo|%$ z3|(P-iVS~xP0(bShb!*O`xz}HiY#n7LG~#4-?z&`Fo8?Xl%`=;;mg%3{FtqWi>T@1 zpW~-DHpV|8PzAYR1yYr26V4E4;%XlkQyZzyIcV`Shu^MIpp-&Y{AHT~qP$VS$@f;b z(27~2vjkS}!d#5VYvwyBKk9QiOD<$hbKACQR+lPGs2C!xW2OKaMIabj6e3h1dHg@G zd5!!P`C%x9Tigk94KaXWdzX~(*z!(E&Q_*U)RRgtp^p`@ivkH%goY8H9{pf+AqD)I6jM>V#lB9$q1JJo9`(+Do6-qy`m};_r znm;*}97*_GA2?o;RmaV^A>@*DEbC4-jvzx7u7DdzWTjyZd$ld_;(2XO`qTN&DDOr@ zqg8Epffa{p`6H_O-@9_R z4aZ;m@Wiw1;Hbe^ZMni(%t7g=IcTUIc0dAvFEoef_8<`B_dV1&q^Tjf&*I8aPhPCd zePOSZo9P-r?Tl8{Ddhkb_2-K{!V(x07`l|=N&G8aMC%RUDTdo?*+(@v9e7{cV`rt? zQ_@txABq$!ef3@#2kXvas=l#j=)w>C(aDrGF6-9g0!4qM6w8P*LsoX4)SZ43*hA*z z37$RjeX#h;J(7Y)>eQje+K!O3@n`=)6J!J9vPkeK#dH~%MC+sRQ12JcpPQWZ{T>ew zkdTM&f7W$9m@;l{DCT4aM2>%MNwPbv z*!^^I9_>DCyWScFrLX<{VC~Q3JbXt)KgY!(Q@!{NAem9^S zOT94o%^a`0MREJYoPM-vM!DtFs{BrffAm-BF~gA_J-#$=7!M-~>w|HOU_x6W3{8Fda4wo~>Bg>7Sl5-)X9gB)8hCA-B}4Lt%~}z3%XyqlnzuhEOUBx2l_L}hn_q^e zkk2YsBy5s5L2LR(sT6pvBm38tn$Se7jC)C}Tq-#p`YVo#&*CjLYqT(}eqiVa8AQac zQr&)}{-c_|So$uITIjKT25!3%fgyhTReczGDzH}+falhfrJt5~GCw9)=@q_Qg$+9o zzSV-hu7Ieu9jR$C-xXpVt<2j@#wC5HM0;s~P2^d8z8m?WEOLsKA$^5o3om`JWOGzZ zv(L*K(gLa6x3W+vFyX(+c^+gJ{ZvLEbbN0%#vwSt#(NIy6$3WR(u$Q;+;4`QfJj)6 z1N-^);i?+~1R2UTJe*=F_olo# znFWx!!^u#OAdv=5-D1E{XPQ?Q1Wc&J)ri?E)|*>C5t?xlJ(s*(cR zIa~CSv&bX3v1~BE_z;ME9k007bnKHJBB=;~E?5in2^s*-0*OmYToS0v2`6J68B{XG zBUGo+?YJZ?UUi0lfwL}7pIIL?7yve{^uaLXwObwd0Vlp-@Bm5P-myNaF`2O6=xr~{ z<#-KaHjOxcoB3Tlt5B4zN3N9vO|7P&>#_Fg)wQdO z9k&yh533KDGmSI6)%}R!67x9#yVD=y8*ZG>Em*{pj=ERKJh{gL#vi*RgQg$D>Yrir z_l$Dlpfqg>DdyZ8@11aA5~=vz0c31QdUnH4l*JACW+DHv{tB-lDTJ+y!{?N9Nddbl zji8Pt49_USYUb{cWun;5l8qY3X7GQ3ddglcP#_O`l;GJ<4!PFfUqbQc)^Z-z1;;Na z)QdcsUj+Gnm&U=5?m=+qJI{+(`s75NoB2rQVL?6Ob46VewQ{0*BiW+GVR|U_9oF{r zY}t&ynJ93UY7(0V9v%@8=tmiD2Ia*E?Ck_-J&5QNR8H5gqs-tOaF!ER>rBVm;}vUQ zRYpg*!veP|VspcnWy?I8(AME6f+covdjd$Smqhm@Yx;Q5$_PiYFU&}7f+l5&B(0%H z%`zGhFV)_Z+zj>uPqcnYI>fizrMdbO`i!b%#dEM z=2CEtoT`gXd-lfFfr{3X(Z`t{#A1xLZ zT0|WS0Cw6M%+9t_7>m<})*?>utl#PwXtCRT-PqDvhbU7vvQkINrZ48xOdjy6MDI=) z>&OJAi(5wInKJ46%VIZZ*|MnxhqI4Eus30h-MFajJ7$62O9^ra72s6je$^;}Ll;~O zt8kCd>cb3DkAY9CVPj59-7MxkkkBVe~|s{WT4vat&#C zF|6HQwA?KLq`p@vy^ld}Z|4wl9C#U1?p+=3A>T9{B;Jh@U0BlJ4LWAk$A<^7C-?r^ zW4K*uNZc&}YQ*Z7Mz%=_V}W@Sa;PCyNSfD@94fHlwNz5IDSuMUerv&1oPkx?ep+Zq zCs#jJQ*sW{Ca2EoSm)s-b+>fPS*8+22!kOra)kic{XjeAG1YX2{S(m~(ZAx+Y&&uH zk}pfYv0aigzkxHH_<$&bvj8UyfqI3_-osph_61d~r%9GK8iL+esgr=q1O)VTn>WO5 zCWIl>K>Nr?l)R@PE#RWXX-`m%5~1E7s79<1DD?(Sv06>bHu5`?pFO10cyCuIT`j7Y z|2=p?E00S&V_l2H*cV6X56*XN(v!RG0X#%4f%7mu4SgmQU+MktW}lm}j(DKb*4(R~ zXyEMpoCKcmH%w#?%s6TL{LF@j`fbwm6-+y{954+YDKi`7SG;BXdMEAk;D8!XHCVYtJRC*`k1e zz%-YQ3BV+9I|x<()QB0S)F7)F%g|uuhz?3$$qe$2sBI}JeSDktK3$cFRp>TSc@&E@ z8Fzuvj2O4NVz4!U-?W}DT!!`;QcgMy{kh z)ina?I{u}t)u>v#4?CqG$fv$6D7`FLpj7Ukg5y}XHeq}Mg^{(`GZWz465PLGS3z+r zp^IUf&K?S>L2A^l$2iy@&{8)D~^J7|b$;@s%4SJeux0MW=3RTR%Bj~5SHAf$uuq546=sFgm z2+1CnJyt!A<+v66QG2f#(Q@4eGQvY8fn39%;^i3cZZ*U5OlA)nr>2JRVh2lNIOC?_ zL?g@=Y^=S(i%dXo#;ES^rYatptN{Mg^$u;rf?JNDBSxmBQ2ui`!P+{I*cw~?D;>eC z_>6d(_F5~ikKvzk0b(bzo$~H$-E)(R#g&CU(8K20bQ1a^iSQfyArd&S4k3{o+?!p) z@Y3`wXwba&`ag8CEdgr97di_mIF%NNe7lpaA=9h!Ee6( z!F+bbuXUu?5g%K)m5ZSfumIWX#A80_3f0~=i7s6=^aqKQq~?| zxPq^IX+3i`|Ft6bTj^4H;)ykaLya&9dk(TY6GfloJ^2lEVX22ECb*MSjci$8%d zj45@WwDTC8U}#sun+(_BHqX5uwMWWlT-=fNc|_3@y(W47Q&Jt2v~7Whis<$~sg_p0 zpN}7)BJ?+#HoS^i?N2zq0BPQenoCP(I<1$6;2D}*i0 z1wC>9wEw{nb0d{;&uO%3M_7YE>~T(C>03RHkENCR0!9w@s?<3Qe zBY_nr<>_QCw=c}L#bv;iVX!q!rL92LGVU% z*QJrDJ7k&|7H|GRSF`2T2?y1%6sEmzNyfhrF9h4#ta8?2i(Ji2nBp_x-)|(>hDJ5h z$WSE11<{2;h4mTQkRMYqXpDSi!E(jaNoR55e8mF} zQZPU(U03QkT)hALNP4CL z9}{$pBg=BhDeB^s3={pGiTY;pytd+BsO_(bX4Z3LDBL7*Qjj4>sRJQv!3@0oNykm~@8c?kObT{Z2}A(>0%$ww`AWB2gaP}yYtoEHxO4`OLg$jp zkmFE2;6=ksp~iDaK0tH%!FXOtbI>w<4~)k5@EAj%RtTs#W+e*QYM$N7LVaI~_;xb- zSB|IR_p#slXv1_tf+Y-H8=84{(u3x0e~$KgQ{nY2nPHEOj?#~77?0CtI7h}D@Lc6ngC58TF424>OX}tY&Ki_7e`4CfC z+|TB_Qfar`sCA9x&~&7=Kl+`svPu^DLQGiI=PsTb;#|)}q(KUBN@(k^QbGga4dPi- zSb+fjUe78SzzneS4o~6i-wpmcv`sCN4O{)~q_Y7m+ZG?~6>DttiCqh<)NAYoe~!Zk zxytNosclMRw1A6^$Z#oQ3^EXa9BKmXS&5ie!Bxfvsth zH?S2;@%YQ~c5~*?=jOiUG|A9WUJdHHvaP}|>eWnNY^Y$EX}6T$BGrLWl~B5K6-NY* z(A=47ELmP>3 zqc(oxq~1j?$(T-R3oT($bc)x1;FV+AC zcFwga@*@?)#lM$}$%D*x0$}@#O~Iy#rCKIK^ntpag4CaoU_l?>;I*aS|JU!KpQHn; zD88`r@tlQN<>EN4Ybdp3vq1dw$G^l=1~l?|G2NFN%#(-c^p_#VU%YhNL1n^bm_PGY zv-v!k8^z2x2wxk}S#(S=wQpsFR_}coY=qH(%cy%hqwj+VBcH=kP?sk&vruKIL1Jxo zV9>}#mT}@OPYs`RsHjyG{Fv`)0I|Ojy%-zAGbRtKpt8uDF&EW?*&JWtjR22{_nLT; z`mhHJs>Ina036$Q&-Cu=KRvihM*-_MWX?J$$}b@}eZlpzA;8RJJ7O3WcYL1r2eey} zWkNToWG^wjX&zM15~_nAW*?f_2(z2rd$qSd@}M&c*?McSp%V#A1j|+e-O!{Mlr7 zmjn(>UX5e_=B;^)ZBiC zfQgv&NX#WSkZDn4X_exPGAA)UzzVY`oB^hke;(%D3S~9TW#DfEcMpNe;>Ua;gC>j+ z`D`@2>2+&~CjD6y?9rc44Szk-73aD5WkEl>KZBAfTs@fUol}dAVsPZC{73D4Q@DsG zLwMa{n5W%~*)wn`k+tzMsRz2Yhg)`gd&0OQXWXZ~I1~S?`YcrV8XAw1S@>t*GC+ zsI7k5zV3Q2@3YUZTAd6yNLzVZ&oofrw-9&Rlyu-F9<5fRITG$=FF9qT(bqH>i{{$E z`+^hS2pHzq6smKAY+WNrF`(!-N#dkLuwGr`BD1EgckA84hktNPuKLeqZVgt514})9IRMe7_RhFK_QyGfusVdyG zz_GbN9dLU-lG^3LJ+2x-S^o!q9(XDe_>xBWULIg$Fz-)@gn9&v;h$36i)eg6Grh(*O>%Uib$WV?8LLDV#WlLDhGWY32`lsKVQMQc#n zXWZ36p5s(f*qSovVWmFFG8*(+nIJFM>5t+nNywtrx&}Y!_n=WZLcg{Ne|7F8#&z%% z>@J^yTpJ9hsk||5I7vEdEowvNlFFohUicOE&dhW3c9k<*{+odcb}7ilhJ}c{`E4=j zHxGr5#~!V9q$zAxG}bQZsldn=g+QMTk33f;ckI&q{%#?9Go-Q?_?7fpZxRb5toI`w zuJ4;pPPXT(#aWh%@Rv0$>*CeyAHhz|3L18D41Mvspgku3P<}GPXL-X?ZyeC!k~D7j zrDt6r!^FR`A;P;mHxhqbfC!v3>K$pNlQYAX*<#TD%V*SJ!2Zd;!%$DDlLkU&ARdk8 zA>2LfrjW+26l}nozcPCRgJp?}N^UT&Nr>6)xbDsltyoBNYa4o(bb$AhSu|O44BFCa z63KidyKY9DmANNr{bxFBdY~%p530E<+5ece*3BPv47>h@X~nvGAOUVLi6&07dA~Vt z3drJ<3!lKfbSJ)pmw5hFrl~M#`+THlxq2mGMhr`IBN$vr@SH7kAM-@GzVTB3rkGdx3 zz&z=T*z&CA6t0oiUbeqGS+Bb^xi|5Hh21j&w|8stT%aKou}8v3W?%5IKu5BBXZtUh zW^_^Zz6y2!k>*%Im&`a&Np}UArp*Ez`(+Oh|hQEE2ePCo{D^r;teAu_ySN0735SLo|~ZHX`1RlW=))1 z%@A%lWP0UT6mrr5MuU!Yt>3@A)UVe=hR=BX!jydM8uOJUh42d!f0L*bx}Bc09Xrp` zL#Ad&r4wvMV{q6wm0LtLt(W2R<~4Q{$U1RodwN+1vCNnnm zpOfnQF>(nrD(KhD*-VsN`g6)0b5)hVY(x1*Nv~7;6rZG3QH*rnJHbum8x5UWn!mkt z$#T3=PibX4z2(N^D{WM~ycgw%q0%;FPvwNPGczHlg=-LGU`Mka)2KLLmj%7-s%oLa z)4|iBi9kk+JWf^U0o>e0!F<>BjiQ;rI6B2VKk+=%f-PWZ#m=3fdovnE#{a+K6O-tu zYy2hd(VB3|sv7QN2M1+L4{-4j@}9BTBo|25>)JyZI2gPUFWcVmctX6YjTz@f@V!z0 zG}8dxUAt`vSaYT7*LD?H+#67R=*8yn`e7=0Q-~rHtDb8rHB(bTn!03 zCwPC8?ajynA08i9{XW>mb;xy%Zk&oW9SmtA*k9L>0fLXa9j-g{)ZCsFVch4?yLt~A z(Qh;JYW=^(6fkh)x1|zULYIf7a@$KV`~FTk1$h!A__D}WRpj;hG7>E97H>+j*=-{w zrXE8@f`4|I1)~W-*?d?jhRFzZ;f5hHeU8k$<=mZ?7K!OR%OE?=vYRn1?9Cz#%C=^~&3o-->sqfYCPrNKWo zVi&|Bm3p^Si~Eme+Woib6E}Qc>tlR@EqfJnp%4wx4YqMpo*x#PFV)77V=$34xlmlV z)1vmw2rxljg0#n#>P$~ zmmnO$)87}g&&ngs%=5}Oc0yKwL3{g)K>To|ot?O5NQen@ea)si3mvfQf04837rKoM z89>XLkQv|1b3bf_*KKLeaD!db_Xjr1^~t=d+KS!~1nl=_#R%EZr`fX7)fmp=&}+8r zmipgc`t{v>YQM3lz32~DYjr>Nfvp{0*K9E~gWez{yc#-z`0cE0aaC_P--jsd>NWEV zs0Pl*hWWt>Nr3|q@+xU65Q;6ft%`LtPOo{91_{&mEyC(A8tGWEs_9H(?mvL)PLoaZ z=53y^6T=%Ele@>2UPi=JShDhHI-{QH_%CK6nH+Ztp}lmkwqJMv2Sa#5ZGRWY_v@)1 z+GZY-Y~+=uWPcVOmnAW2e|MQ;YWeVCOXTY7Z324j{~gj1sB@4Y0l2_7u#7ybsEwa~!TkF-P;}@sM5pid0H_{<1ehB{eqf|Mc3ebUL9hX9 zke`}&{@On2@3jxnxQ9g~&!XO)bdW8>8mpOi-BUz#|F+3)V+h>H+#w#LIDUSN2F?x(Y_lbG-cdnKGbDMX4AIA4-09rB(XcZw$_#Cx>^Kr!=04D12F#* zFH=~znQ4~I_w1`^Zc!kctc|UF8TnMo<5UJl=? zFtDChbVCjX)d>cN z{@TXlXeXrKJA>p!uoz{tV)rwmn(YbfYzbo)#6sCOWWnea;@{0q?~Czkth3j^a#IZ` z2k5o`S8%32i5@{^VH>uEQ^dccN8QDXKCbS3g}p|!1*xCslIA-XB9grTfAOlW7v`l0 zu!5L_9rhpUZUouNnqswasvCPt;?`BO-khVz_D(}sF|6e4VS|bTw2yZUUOjb9QnDU? zo@6quwSRANfkBV_Rla7?mpmuGgJ~}jtI4N34=7K1p@}0r-Oq@sV`+uif#8>xVajvr zxiY><3ZRjsw%(z9nE1ot2r%M)Ez@|zU(k9ih5^PdX@;zJ>$cWdPwyS9#~zMEJiGyZ zA#S3j0h_*O--v*Om#6Sbh>|3KF|%yE@j_tZRaVu+Kt4cOV|oHUZywhw@f6YliQ6f$C&9SKC6>v2MNx{J+;aRPCU!k@jIHy z1&yVgF4Ay>>;6b-DeJabbhjw5h4rtrV-1`=c}BW+*p`#7Imfzwc`koDz6iI*&5pcA z>Z${(XPuul7iT|Ax()^j(Yo_N8Qk;1+?t0IhV`ZxbLc==gh^Zz(br5@gy{J$}LuTg@ zNutf!hgYp86o)JXrxA@v#bnxL(0`S-ucE)gLLN5y9xt3Z3dOJfq-_Z64_-3p9_300 zvGS1ZY(=xy)X1ddXlZohqKpQ;v>^H=4qBgt_2QPl}ljx&p12`oNj77Y!kUoH1q8i#Cvcdfnl@?wxcPH{?D71s4Vt`->1iE9^SXT;+(ewc;RSa_V|i09j~1wNNyLxD zgb|P`7mRYKmv%4}|AlNZd)3ZR`H6V1`cMb7p7A1R3-K79>IDM&VY69PylHhSfx2R= z;b}hMfrslnEA8w52IerRfXtTI)%91sg>?!w&#^uGD1+M~o&PY;(YikYy!!tqxElwQ zw{rM+{F#Ny$wTwm6qElLG2UJ$f6k+%?0E3ul8!+N-+YUQz3trV5G_ew#J&m;T}vXC zZb=gJUZTINimu*>B->W9y0Qpe*WG---N^p0lOhDo?|_8sg+-j?%go2Hz1>b>pAO2x zVflDM&)73k#f#6jW2)-~=0U*s`;r#;NFkUACH33-NsPAWW7t&7lK>!yyerkzx3ljN zU*}$U^%llm2v=r*WHkn_Myc#JQHpsAR~*M=u@}^%{fAW|gztND1g(cL=15I1lUEsDP?LK@+6{^?=QdJH+TY0RGAvTgbK z&35*!j=kLM_yVKm_bjk4hRtC|8Peud(R z`<69ay#rBA^wzxXpI@7rg#f;~BAmz9`>fM&RgII5^rt^Vln4*@T{giw1Oi3y@S|)%aLaL>@&T}c z=()wZFe7md(DBr5qOl7G8;(~0IdUCUmv+lb!|T`&_;fXnm711aom)-r_A;wxK)>I4 z9*1%J&+DIhZ*|bVx(q!EF|9FXLwyKV=ySCt{>>Pq)yazvHr-(=rJ3(2O^YXp7q4U) zxM~Mb`2m=!DLj>b{y&<&GOW$6=@#-7D51rQ6boL8Lve>fad&rj2=25LcXxMpch}%j zpg6(Z{iN@?zW@2Lv+q5&X4aaF12^X0bZZYxtJhCV6X%|8sqtuJ+*OAL=~qZM`xVUq zJ0-Z=>H0c%8jYY>*TpmQmh|4L@o}Xna1zhOJ`IAY?yL%5k>4E^jBvwDBtSzD znYC4c*3-jMs%fOIU|roDYl&?f<7YIExoxdi@|4n04Y|TjX*q0i*i6I;U56$Pqk`Z##hX&Wl=)StTIudaE)eEcm{KB}v z$O9dILWDdhXoVcgI!egu4M?CP&1aUE;$hdy*HEiaU{x8LZcabR0EM27Hy;-pWUs&A zh5R9N*1?s^Nn_5IBz}fMPZqg&foCMuXkb^TWeD5tH^3)M;P6|I1Y(l$THcLyy4s(V zcL-2D{hVR2_PG(!IW7;71`=nP8S!xWZUAv@|*v;~V51wP{|6`V5S6iqw7@;9QU%_-xb^0CII)jaMyCifC` zJsj!UKQZIhyCrf))VxwnhqG<|sq9XofqOc0*t^Xy6oueS8B@F=H_dKW9(@u?neX%Y z)&7EN@d@^B&1aALrVlV$CZ`a{`HSuJyGVB75L}e;YB0MO)XG?|C=E&zGbLwT&OZZc$dkV=`%{ zUfOnFf&%~e(R_P_;W!(0db-WZp~~BgkE;#mkX8m23D^q3w}!}AQ9V2lTbt`GfHgAIyD{*-%B9_ZQXpXOC@tX^!_ z8A|77PY8eY0W_ykh&cCm0fV&QHV>*uWOhHi{4rr(qAg88(d`xhC?DIXLrGoN-Nt z;d`ETwd$_*B)NAA+TZ_9K8GdxoyTj9^sX!L*Y$kt{rvI*(H9c{@U_BB(&E~KM@q0CH$bh)v_>z)~hkEc7b}kIIAir zn`y2Mq~dh(xE|+~DFduw02`#Uw?zvZA*i?im^a5py*(>p-xe%_8^b*?xnY zz|jt5i%+??8eJWD1V1m*{KKSm{MF|Ey7b(d=|JLwZGoKO`>VB}eqjcX>4vb@MmF{L z`|r3e-=%Qyihz?o|Bo}8w}E2Xt5FFaMALI;5Z5$6im4vy$f5i~k|nLOF`8y#x$XSzIpfnSR79ujOyoQ*i)ev&l@c@4 z!>gRo<$X{pwz-;?kwkqPb7AyLJ2pgp9?Z4zSTW-T?dWN-=DVW1;r{H0I4sJTXAC2+ zV8cWk_LQ)y|Ne<6v!VP=P(zK>eff7qWVV?us0~m8xa3PVtjt9AJyu$0kO0$2f5?|j z-t5Z<%J_-I_6rX`L1XC7CdTeF*EWB8Z$-Fi3&9c)Putzwgwvw=->w3QmP<}<*@l)+ zWLcThB!ja_m#MGkmAM}$oBRBPw+fv-jy3Hfd~Z5t3@KOZ{P?KOD-F+Vt%M9uJm|l= zbC~qSVuTu%IHQP;2d!93*-i$17~`|-3C{TEOL*$EW*|ED`1F6msy}wXVG%5U`uOcVh!LF|JxmQ2kP&ow;i+=`2OUsc` z98>(DA#^vPTa=hQU`Wm*!HvJfi~yRu;!REQd^l?r^*~@yD_HYgNz4WR7I##ewYDmm zsb0qM>K6%{Ugi9qxzEPfF!PiCqW!CA!GSuzOpwZzdmUzZkU=LDk+%n1y#Q`)m5Kl1 zBAw%_d;#^IpXj$2M`DOp_^nNAO^kS)$>+l-_Pz)b!9{QILyd|33b3JH@>WZL=t?uj53tB2m7qyD= zJCkEDHSHOno;_Aat`Nf9K(p4!sIdCSn1(D6mY94LT{AwGfXQX zHR0-=3Ow%zdu4w`xVU`_0Q+M>dYJbVkiR&B9|j5)cZZ!uOH{Z_TT2*b?uQ@x1R;=3 z{dd8m%GWAc`8g}A^1%dGqwgJI|y|T_sU{>t)e;JWho4=aYP@+zZ{6F88NpuTawPnHnF| z7cTkDYhMF^rRINWVJ#h8l($GnBPt9KB2(_)`qR_?LK;SRSL*xN2KTfk+U!-`OC06y z6|!sbb)ebRjq|2P#yaf>rn+*Q7&9U=?%uv(;;8gCYTRVwxpmire!6mPqt$DF zdk9u71nK@kVnAWnThu+2^~!#~7E621iV$G-qetbWl?q8h%rPdNuqY zFr%{3>CL|xJH92MhHln=_SvGr?_iB+X1Qit$Da#Gc;~Z?WB&8ZPM+}TXvW5r7V)dP z++rS2O<8KPu~tFy@@BuK^`?l3q04!djJuGe=L)+Aq)bIBCb`DOQwG4Lt-gX8wk zthJ)m4$m%Oe=t>s=z8nyHH^Pm)(;mHWHS_vPdbqrygxX-fE`PQzZmfP7@Xp4Oh9&K ztWwa}iT?5L4xi!mh|%%`&mxoXI;;VA#tKUaKCor)8k+i~rH)rF3p3@ceW5OJZ4n z_8=j{UK+mL5q3?>rTR&n<;&y7AI zNuaXZKF_dtq=KQl%4)hIttNms~Z?dhQcT6PeM7o3mn>r|Old3(wYu zs?fR^tiz=y0qLb(nQc(yq%YmV5h-eOHWI1KcraQoNYN|%>1pw+Nu~MI2tOLy0K-5jSgJBs;$?s4MEZUSu1v%j6CYC-Ex5nHZ|zEN*Pqg$GqbJ%>u29tCDa{?30^Ur>1UX=y%5jYrLBO1ZcFZrM^k< zuLb($Fw{E)I9Y6bnhnonLubZ7)Vp*Ko}R+ae{^5p@yt zuctR_yEEP^BWy9Br=!*sElpEpiaI#k(#w-{h2UUGPzOn(QWkmNAG-smaMkAqWnI@X zx;cq4Xd~#=sn@;#&0DL%FU8eGISu45r!z)MRz>FUuK ziZgCDQE!iT4Ab8ik1Z|iY}e&SwvCSVP8jvnYYkMy$W`*!(T2_)Q}j~8xq_2A>CyB; zUbYEV`Fw@rc>75ed+zXj?mi=ev}%oF`Ng>rIT7%t-a<}*oHm@=?S&i%ZAa1;mqil~ zz6>V}c{B_RNZwm{%SM{%$x4-|WI#M6RABzGB6$yiXj#5p$;s9a?=ER!%inHQ@bMLL zW{Ptf8ZqG0Z06CPTO;V7Y2I0(G=k?BRJr#lEf3?YuQ$IY41A8H49Cjr#1!kksAD%> z1d}h&t8G|eEwK;oXW`7(|Ky`O74O9R5j_a>Nzjna-3@4x?kAiNF&@Ya6H4%K5j+KS zG)LFdh$`9f3$J!v0mr=DO|y^=Pq1%$S8y-)#GXFynQcb7mPw|ECF?x_2e)C_(jH8D z;P`Orynr#c*ewIe-qL{A7wijl`Gm_{B) zTiUa17;`Ouf3HS4P}A)93(u~N3pd>dHT_&NL$(jX=MEiVL|G7+9QGo2@8ax9Anmyz z!oH}dzUP_w$Pcd}=hW5R?oUc*M6+oeuDeqMEZiw=m1#?er{w#|g;wl3c!u`*H8`HE zS&OL?Ll54kK(BhhEQh>gG6X0Ih<>FN^!zTaGs(s;mVu&m)gD-WuD5&PdzB?nBdLS^ z5##fqJFCyN@bCL2(<7-tM^V~qbMtXH=EU}QP}miPjN4H=W_sCKEIl17k`S6P&sTZQ zZ3)x+j0iZToN3@_qmOmgZDn>jwl1p@sEJ)o1(6TlD#Uzbjuy6o_=EomGU-PEs^3)k z={H|(OZ_FPcMAJ!MU@s?-#`Huuf0(S@lTNoG>F*LWXtqB$9w+;&S&L{w|&5#^vvtJ zacKeKiK!8gY0~iOL<2n~y9Kx|;%PU%n*m9*ens=UzdJViu!qk+tkgMV-ktwGJ>hFP z3iGVfF}?ax;6%>ODBhxJNTr&xtV>Izs>l=aFu6Tit^syx3sas&T zbdiLE-#qcVvQM>6!#$Hi{W1Rdh5k`hRsMcLBdO~B-v;IIZM%VZBliqf6J7MJ2N zT*feOb2niONvhK}fNskV_$B$*f2i#)uzcCFqP^n&tF*7_j=fbO;QFTC)avGIrjdtH zx6cH-yC9@<-yx&6vtBTmQBIc=}HQf~aTm|FxGBTchJI!TJzRL^R? z^M>1mLK)``sx}lLZWHI9-~boSBg2$P2;D3N6wV z0aVi6$OS!);zl7k&(cBh$Ca?JkHg5{eWjR?Pu5J9ApazN49>q4XXr#`88pBq zYrpB6`U($T=V4FN;gfz|IJ3<_HAEiHX?k50Q*V-cNe^FfFef*(^ z3O}*dve{61kQGvttV+O0H$nTrWQs>AOFbDH=lFLI_URB1^uabm#HTf#W>LTLI5SJT2Gc)2M zSqX18ukfr0*8X~5xY^Z`bgx+ovi5Hlu?)6wcEB(J((@GGpS2g7-~^M!RWR)RIzCV0 zC7BuO;kt1z4!kJ88uuS=8?4u>LHSQ)JZD_*ha?FjN;G|bbPtD=eAJn4F*UlQcc4b{_A0+{ z^g2qvY=UyHVc%OK=wDgCovsNh9jT3!o3&$$oskUp_|9dm1otwNIm(4=&<#%#4~H6w z4BvlFs^F!)8&2t1OBc8@j$G5MyQKLj)C@?O59!~|N{?1{SZBd12JK9m*DVi35VS9A zA>Lz6*ZpqUmWQ(yYaXp?rGGj6Tk7XR1EbyZ>;*YMqOhmA8YU6KWFOLS5K_H<%~iq&G=+SZbd1IAWf1^t@QmkhZ!9XqX z#ij=?3mez6DW_)rmYaE2m-$Cw-LP6CY%PE)7a(&j*jIOVB2N^QrFe5lq6-tr$=}(jW1KI|!FK!W(V&oX>9uNqt1l0xk&6G7n9R zUi4*dke6REd;t1zpuL#xSj0unQe3o1XmG2owh;j=e)<5oKSMxKT2wgZ%S4!_`J()* z&h2rMdIp{uRtY6N{MbuT{H9pyq&j*OrUJXN&Qww>(i?HD!c|zy>Fs#}IZhMR@qdeD z27u)rwVDG@h9$U7{9+CV&b*KJC}!7JzjLy-;e(jRW1ye6$@jLw-Aa08FwQU6Zmy5z zA~U!WqvD_u=E>e6ls=)sJ$2F4O2MdiO2|=lL)~0&@rT9%Q5TDf@QQt(t4t;1AmLaa ztA~l{V^L+91(`CSn9G#;2LRs}U{=bxoNRupSI-Ao`o57H1j%;OkTJA(UBtRzMkm(R z=i7t*gEpnp7BaWXtG|&xJ~9*nkDN$QL&7~K#d560YDI>P+y~VwpRldH#5?*v%U1e9Q4wcHaUE ze2VrxD?yibbB&EIN9Q}f+C8j&?7d|tDZHc0rkVIHBW*;MMqZ!)xqGvWyJ_WZPw>FlQRFV&Lq z#O;5v8Ysa=In^Hq%FuHEV(F><4p z!3$s!vq@@GU;ivfSG?4y##X=6^eF!s8SNkSK6)rt_)5!0Q>^Uw=g|rSE<~`{kV<== zw|gh;xiNzM`u-%dAIY@GPxqGaKk1986fb2XIMTTRqpVbLFNB6GnmnVi?cd3%Ez@2$ ze)GjHDd&!IR_h`2P9&*LnA2{4Sl>vN<;!5AL*(bWczb$#JA(~C<5!-b%$PV9voWFP z)K{Z>RK1tDY>4$rB}K6a?l9D`<0baA3x?6ex1Bgp$niQ8Q^j(`w>!DQcn1CmlLT2` zrh9MH=bH5Mac+1Ib{HRr!wis-=BMSdJ(W_kpvQunDA1Yc{wN3hS?g|?h$UqNt6XSP zXMWk$h|1~_%n^D6yEBiLUH^t;+*poT=?1)d2_jHuTM{)4O&S(W4;zfJmOYr&_+%%$5YO=IMJ{BtwS9TTtG2_VVXYlzWck1kyc78%!gW*` z!ev+*11nU#YJ|`Z{(ZqwBr~W$X!cujX;}2us@PuY1d4n*2xYN6;I}q4!-E@9)<4Cj z4q!L`fN##HZHP?VcoDhkkw4X%02oXTXocxtNRaWn--bGry z+i25BZMt`%lYsm5HjSMfC1}A}gCUi%N;N^9xm=J6+X*yWHDM9qdE9U}%4c<1TG@RA z?AG0T>RA2()8uCR59^5rk$S$o4&ZjaPSUj$yPy9Xt1UALwuVa_h>mEa#B5W@vJjRy zYUfwnG6)x6{MsDy+v2#T zY~-2bmL$6hZ|rQk6JqpgU)kZ+f_8TvI=58^CApkxZYD0q^r$%nQun5Tx-J~#A=M=X z(ho!oPF~#k@MD9PH<04s_-^qwOnGxM9zQ6`$%+XCp;vkWvFt3p8-@b!X} zl?jUl-q+k~H5ureIZxDJ|U7b*&w`)qv&2%+^JB4Flo@C4^qp zW@I=np=56!1JB}6{C%uMXdBqYKufp)G4>6{-CnQKgHdRC?CK;MkWPO}5OGduVacCj z+t2#iX++*>sCGZL=8a!cPE&tL@>=&e!J-CgsuMOLzoqSM}G5N?R<2MzjIsRQ*mZErln&G9TFChR)qB zPW5D_|#a5ob-h&yQCrfMcwf-S)^6)+Ydb$J!yN0mcu%7UWV>kxL z(4I*kA5CGf?0 zA>6SssJ&M24u`e(9rdo|Jd#_Eu50n-Hk{e!p7lp(GlB4=ca_0C)OQR|_zZtF8v0kwTz49tEc=qemNf8~K z%m(H(2EiuY2wOd3bY4F~LVVz9nKZ#qhVN9%V9FmTxA`W|EBsvWXm2|K*%v(8ai;;U zbPH|As@-RCwgvd~-%%&~nsK(>kQcZ5JeVX`3!39+w}fqV zabNIpBfxF_12z8(ElAWPwz|_A*4)PNmow_zw2JGvylK11N<>?E-UaeX`-kwn8qi+3{DU)oz`G4b?g>@@Wb~jWb8PB2 zQmr@lxki)xZ@*xNpl43 zfUO1f)|Yv1m2RKPQ>${}wiRj22Y)>rPKl47%$+WT=}5V8ITUkz^`#Ob+xi3qHd#Kw z-mfk4nPfoQ^?zq`XxcMNL|Z?@5B6YVKd@@L>ykUQZg+atZ@B?mk*8@z(QoBr|U`O&k;4%B$#ooQ4;G%{t{HIx~@ zPr3LV!?T(R`sMF*tOUqAw?i^}!@}gSN=vs)G_h zu@fL)X(R`KzYWOG4mu*tKvNB*#Gj9o}w9e@7G+wlYSw+xk}h4)pL&hVgV5w$(D znOMqqim)2EXjG0hQTt(!?z%5&k%9G-$dgY&Lh^KDA#Bd^9u+~qkI$s;`tG}$piOh2 z7o@5Ti}=EVjS_-GH@OFnpnbgRQ`ri3tG*6OEHiWaw_7o@5bk*U+1PyllEjbrMP_JdBehk!+klj!&sM`)hk%l+h#NeG8{_~gYs@P8S93%hXI3e6$BLtIks)oDtIvQJC15 zr2V}ItQjh5Gyl7sQ;V(4QX9YnW54z6(f4Zt+bmfweT)05xGk31CAPc8fh_kFZ9<-6xas%s51sLIlF2Riz>?%pD48_wsZ;U;RklZ+E;PY6#~eFjzqRGJ7Cbybwsk z3Hw6W{*@o)y1XlGvebUl=CnWJKtsg$K6 zU4OxYH1RE5I*x8hQ7hwNtdUXpB9iqwxufRg-h6{HIQ)M(op$wq4eK=R9JQ_d=Sf!S z)3f5(wG)A{WqhW5*1Ms#rpV(x%O*;QujvPA3lCSHGNoQzWqF~mp0g)L=qG)NM(Peo z0U>j@j|-|%3DuNbqu6d`fV{N#mu5DpJ`Bq}!8&cB@dVXQvNk(-7Y&Z*J|35Bk+EGk zef*mCtV93%AdLWfNCbb}wWIQtiy*f1`wyIM;gw&i`>Tct_)b)LhEm`MC%LQ`=}pI> zaiQ7@!lh53f1Ti4)0enUXDy~@2Xl8>o0`lqrUI^?x$T2t|0=6?}gAHb86K}sl5Nif;#N#Q>V_*wRW6L z$p}6|ChQ#rEctuJTL);SX!wEZC-oe>-K9${>d%=n3H((KW|QZi(vFHoTU$jw{2PfH z36a{V#6IZqwj56y5-_K>sy71st$SOfo6vwIaf0%2>|85%fKq7g2N;8OPR=G2K5b|p z2FsaUNPI3)4N>ZAaVs4c%vp75~PJQI^eI`rU;z zpMCc8KL{8B+)O)F*ggV>Fz&rNOT4B3G;d)!Dec!2F&UPBviii^bh+K{l_$JZ$ zIU+I8>PBqP+=9?=KjOzNjug+Z7AGtbXa-~z!leuE&I*YI1cTPmS~A+7gQUh%0dEev zwx({xzg-ELOh8ukQM9H%Xv@^!D_8@i%&<5X7moI0YETE=-nwqr`0g7kXwbB~z>&Dk zem_IosjC_5oxBpLm6#<6h*>R5RHoUr^?aji=U&NmOu}3qiY2}3$w-K3zv!@%2Gr(a zONSfI%*PuVmD1&r@~YGWa~J?W;4m1P+}5vnItEj%%DJH0M*NG~R#gpmO$J$9(9i4l zgURcfo+ll9e?8yG{=`hxM*g+-s_2{lkLBx>I=lykXOwB{?bS_IpQH6E{C+kZ){-K; zkNx6&y;_(FZ_eSTH*tXplkXJleRoSKQO$spvL%r2VbY1_$_q=`f?c`%$IwB;SSnm9 zu)Z+-*J?4?&<)f+--$>n#qrYOm*K<2^AZK~$djY)nA+fgPICD!ZT$xZu!h>nRAW{q zn3z5yqF&30dN$(%SFVOjp_K4kopdX1JFvZ)|%tY39vlq zZgayf<4S^RLGW*cxl(;E-Rb3gRz~#`9y^@OJgDlmwz4Iu*1lsNm}zHv6Y@#16;cWxVw9-r(nH$9eFuWnk6Eq#cTHx|TtD+@O^;(hCL-n(7EE?;qpY@`_Xw)0a8%Eu0G?|$%cPwT>Ss3%i7=H0g^8+% z?@P(+{q4|UuC?#ZoRJtnLD=U?1e{a~0OJl7(+k4Nac?;8ac_qOq3{8zZ zR$mkLO;v^adrd`E5h=#Ah?(_{ntx4%c#Zf40GJW_$<;g~=z5uP`e6@;vlOuWU)Q{* zW6O5)9~1Fz6YJ_9(pta!tsD+!t5c&KPv0E|o(o6PLH~SV6qLN-^)lxk`pv}_>E0Rm z6AdWnZ}c_#AsA$E@a91b1(TmzPf0q*D6P>dtGMmap;(P04|UE9HqP#6H27IVzGZ8z zq|_Lj1kmPWK%i{wr#FKiuTqeo8zLWa{E&cHG$f!^lPWcoBREuq?Ct_ul1lb8i5M-V zzTHQ2W_)(295VXWHZKRL)2)pYGWZ_$8!lSGsHbxkgNTG6+E$ECvVk_R0&kr6&=nFz z5tqD+WF?LZ%Gx!%e3&el%ak^i%Q0o4`=m6*z<+UZu`jsFx!j?>$6W{*jMN0a=p;d| zR{jcyAe$}t%&3%)kEvFrQyZ zcHg1@@3@&*!=A?AA$Pm9zVxf$^Y?K_7viLR;~0FS4}F}^*a(9>F^F-h?e0Jhb55Zg zFWbC%O!5Sl$lPJsY>s_3R+bdCZ8Sqeuwm>wM69nW`d;?4R-;Qtqy22z^)%;6`EUZl z=Mpb0G$j9FYIH2e%~XcrIeUJ>aJo`4Clc2a@G4+A<~l@VbEqOKo| zoMbr&SYUrD+pkP;ZDsE~!3=}}GH6wqpaT_}A2amgyEibdsW8wVEC*6IHqEm3pHO0)z1oG??eq85yry0i*DDdZJk zBo9v&8y0TzA-c*&j(7v+Z!@N{Qc{+_(>uQ0Kf=7++i(PXS6;UGs(u7l zwMQYVj0`CF013j{n5+Jf+!5kx4%KpeGf)-z=R30ir#JbvU3d~36UX5`iJZdCsJ(Z0 z;q@2?g-MWahvU>~${>pgDr_iQ<9V`kF;Ts?;cNi~syf+feZo6Db}CE&=?4UDg#Nsy zottv0pMU<)kU*m9bjWd3D+TurF)rJ%70nU|IrwKq!`tc5CTQbw=jawY3}>HqLL+R;35uzM0_A3C9zNf%o`CJIvaTD-Eq_xaMl$i2LeoG7K_M=X@o zc>2e~)$vE#4JDBlQ8}Nv5TA8}Zi&P2nwCHgf6~3gS;5fS-ua%?qg7m4h5XgS{P)kW z^HJ#0fx;vr<2yJqmAisr(ZXIC!Ti@2%@tl+rSvKIX?6QRP{8mYpYs#a_+kfBum2>K zv|xaONf;_=7)&s)F%MqiTY2s3fM$bEtRSJZ^6P#{_40Gy1aAXFhqF1i{T)W)CU z!kO#NuJ*#O#9)JdoM*Cz8a3L`VInPugo`PF!!LmR#yxO~ybF4vT`MF+bAdfL7pnRZ zG3A$v>r*Us?RDL0r}5KKNmH(@HpY00d_=Cp@LXa83DA2>Ec&%Bwex~ydL}o997-*>1>A6 zDTnWjsjPN-gZd1j!-mT%F#S=c<=qbm~Uy0nMFT#qHnTW2VHkV`z>Tq6r799g7?oIC&-Bj4*z!PoyL5qN@oL- zLt|3YxlnjLRrM!ai^nI7#F6MTZ!O+;eMcRf97*-;Uz=NJ8Oe1LWceO3gV4efWb<7R3~|3XZS%!H0sm*$fml_XP5on5IXn3u-9;(-*TIVe^+~ahusmo6}Y_6GL-3 zo!)zf-Qggn5wg1&jW<&$n*NZy|Mbjtm(If70ufob1#tBXNlR7g$ArV_sM-H}PuIYF z;xLPM6=Y}yRf{_d%<`%mN2JaH9$}e_%Jjawyt_Ap#%Qz~fE}IfMw~PJjzmY0r_H^l z*ujM^g70yh`InKLB;g5S8~D|$>Br0rE*{6~!d1-49A?_@Nt)|mVD`u+5x)^$yvyxsen5k%yK2_z4UAbQ@O<@P%0@K3)?ok)K@s-HC3}bq+ z6?gGxyQfNdefzBADX6*A{nV`6=|2{&O;o+fhpb}=<|n>_k+RZ<_20vLG}F_o_Z_;BKfe-AW&G2dvbjF% zsv#$WVM`KmQzun#^IUA{!(=s-Am-9wNvAL5aa&5-CADOoBs|IZAA(!06ZN@}$YH^6 zNQLA@lQtrIelKT>8)N7jC~ksxta+;=Q8Xb_)uzg?9Zs|LFmB7Wv$Bk~j^2MFWMUGN zo5jV)WzO8OnbKySX)z=ME9|co>aYoPYUO>WULipJh8b&vqy6>sk?zB_UlUKabw8Pn z@1P3BV9jnoPt0`C)0Ms@=00FG#rUHb1&v9QfrN^}78PyzH2@cOA`ReqSu34Ac{zLK85I>JN!mUE^Sv!Q`y02cVmAl#VRwRTx||iovFUm5mtMlB(~A40B5o*c*#h7hh(I zS;=&TIt?i+J^1<3I(Q3POF~#UA`qHJ>wf}&rBl7KODME)H_NMK7^~@eIU2_G^+Z+6 zgxYBB$VY`#r2Z|1GzLAspJ&}Y@CK~W5^nAjb%>qN8D$9+E{@^_#Iu`O@`pu;rSxq@ zh?z=w_C7$Una-Hs&jSkE?~??%|mAy!`Y=zbq={C33n>e-s z>DBO{$ds90aP5d9tFkWn8q>WNijag$ZOSj*Yk*^kKLG8gF~iA1V6E+t%$bb^Sz2hZ zdP0Yu>djWR4&B~r)O%UT%$?Z-+`hjSU>0^QlhOvXzJD;W)wk3CDZ=%fEs&*tO&|PT z+c=hstnO2-e_|SKV!k7)DC|X}mJ9wl8sy{#(c@bDIht7b8-LeD@+%2q6mO|bZ8T)T zx+~ukj$k5qTWkEPIaJZX>csDTuF<{yP(H3Pl9Sl1Y28o_@|X)m~z8-=Hy%rq#LXesS|y+chC8y7v$kPTlPAC zJiWM47E0WIjZK|-MNKN!7&a0aBRIDG#LNvM&~5v}2Xf_?Z`n@8x8N(+V1#(zQ*GT} zqED!9%$Wfe(IRfyaOgu6T-?EEdDbFN`M(Y7K93b^Fl*BdYCj|s<{Nyh2(=0vj0KWL zCi_NBzN_)UfVs)+4#0D$n3=9i!c^Th_6>iz+Ft!dpGF*^S<|;YdE*KOl%1(l!=F{o zSj2$`<+v$Ge2<0*r6W?i3J5y2;Hci?8mbe*O@0e&a2^Nf!H$1N zbm#Y*OsZUa+m$0){wx00wDwxr;g1l>H?$1o^sfY(%#w0m)^OQZjb70-Yb?m zgnlahY*sVQhFkN+b%aaA`?w$}wo_@zW&yjsx@cLL5XcEEcle?qYh{u4?%Sx$?ql-g zR>eR~rV{rMW@uO#+BUkJ|7X0OmYk*W#4O+1zKJ^Vzcj)}gy-L3$)_xk&MO1Eqj(Oy zXL5N&%@r8+F|RkcLu{+GKhIN-;La6PwlP2Ka6b|9dhv4txkPe~e?6{8<5q(XT=4__ zOmh{YATE77BbGZcV4zDCW$@kObiFSI*|ph(qGB=e?{Syvb;9=O3E0M0I>EVX*`Ri} z>r0k~h3U6^F+-?NoDox}3<1tJqw0b@x%0w|I*Tbem|7vXPh^RdF2=NsFw>Ko-_X)d z%7>JEZb~@zf6zg;xc{|PTt!x03n=PpH{UaJulqj)O=`c15IV|>pOjLCald+Tmv<{N z9u+67c$|sH63We@@vCi?%o9E09RmrEJcXd{)PiPc>qfLv87A=refHr)>6(`|?e#6O zo3Y`TyN@@obic+~J0`AdCViwK4U&O>bBAkLx-ugkKd%M(dRF`t_=`#UA~`k4r>g2xOevP#YlgG>V=O`43;MI5+|8` zf*WQt3kfTS%sGaxJ@GYG4RFHALdTtcU3Z6WhiW&iH)Fr zT|PDbe>u%aCDCOKA_EqTDwqRc=@$G~`3Ft==1gM&BD4RFqJlj9SF&xrhkmCV0;nS0 zoPHAZ$}i?}qt&FJLWsa1ScN#msk{HJv^$2ebgs=Mis7@69DFOz?7CN@riUN%x4T}Y zvTpyZH_IgL=tW7QF(djvflusf`gAi8Ho^<^-XRtNJIv4F2Krv6*3S$`W*Vj%3GL%U z?*(k18HS4Hv7+~zaC?0I0 z(i6SIi{`5c_H1G9H0_4Iqm5+)U7MR#oD^p_Fibp)HZ?GekHJ=AekO+Df8q1G9HO+2 zcCYw196YwDrt*R`Bvp5$JON2QjVXP^T(U;Ig9<)8kd#4zH??o6gd^R5!ePuVc9Uzw zKeOr9%qatO1I7}(7&2)<@~CVAM=xG3oevY?Lp`W}pv1V00O7(3SMmexk6pvKR!$hq zu{m&9=0)Al^P)VqBlU_I`_87i;L{ks(M*o&~?dcI}x?n3*4!*X+`8*)C(Ww z_V>GMX2XI>9VMf~$P-TNsK<Mu5~rerm~CjXDFw+@Ty z+y2J|MHCTGx<$IB8&niTx*LQcq+{qt5Jb9b041fnI|l@Y?yecShGu5?j_>>2&+obS z`up=dXFuocz4lsbuXydXh9+Yj4h=2J%n2S2iy&D#;^!#iC7Ak^d1CDL$TxAhpER0> zJlfL7yMHW_@^XasZ6wD}$NrICMH|zHglN4A*Z5Qnn=0KsR-JF6nTd>WSvo&@)<8+Y zJMdcz`#$MoU47yvjTNqwk_sE2)Nmf`eN?=hi zox>|)mNu$3wQR+VqGrIE_y_jp65v|&Meh~L8yIAXf{zD@2VXjdAqxeU?iN?pq=l0KZmv6(! zT8MWI%>vIROIy&jxXo>9DePc+vZ)#l-QWw5wX4Chv=sOz16!ML@hwCdEg#%t3sRc+jy|d_1v{gWRVOOwymP zd*RmazsFXIo(Rjn+~8gE;qe__i}wp{!PVwBj2$RLQ{6o5+4SsWI?2e=yij;Z%2W2sjV^q&L)6h0kb-R-y zA0N$N&M>EQjn~_`C*XsdIe<(-TgsyeMKa66hBPAA=k)e}G`K#-fv$fkv7M$(v1pD` zx&h9H_AwpX?J9G1E#4MR%L(!KFD(%2vS(Q!0&wB-CcVK(z>opfv=f>}UaQ7UZFy^eAF4L%y@iZ{05T|T=(8};ZCwUm``N1;wSrK^ z{;?FOI)x|VR@@=rvcePfj!3{7Zu@>NN3EzW;O)adj>rPb52^YxxZ|`9<4mIx-$0e> zJ!8C_A4#2<&v1TliW&UYoOFBUVP)xgE#$CF6@YeJGmTznXaxQacdCNrwaCNGgL=%b zw!JDL0zo!CGIQ}Y01>Kqk0od=r@pbDL~A$&_mqL3e%;~LdGtVq<&?8mIJzO*nOu5w z<{7y@N}i>$@za=vdI#iM6i~fHHVk#|wu_zSMGiF94y-GNiA0H$P=-^|4EDl3+e}z* zXO4by=x2l5KqF7;0m+H~q*1W3=38X?^#_t_Pes|@&JDV$&d;yT5qm*(nu91%Ulq9& z%6EjBvC|1f*f4-^u`axx*^iMrrHC2QUbPw64h|w(PAWlSeJWb+*ItcAB?U>9g6D2G z1}Y4be$$TMm69em4QTTA)3}L}bpR9Xhxx%L1VQhbS)z7yghnoSe-sEUx9p60%VsTg zI0`Z38_BGjkR7lJ8a@_Dz6a&{A!CW3X3iEnqox`d~VKPy^1AC^CLw zW6iTOSjky1NA?OB&w6K0)qYYh93F>zvKPM}k+SJiAsbqwxfnB-b2A*t)5{Na5^a=p z{GCFHHLB~IrMQ(QXpO7ad-X2mPbe}3$4p$-;`M2;l}v(m8OeLn9z#PS_bG+aB0IR7 zbHr6dAN1Wq_mjGOoMWr`xCG&u)#077NvKW7=^%aimd4(IZgohk@4|BOPA5pOb-Hb< zHmTHgz^i0gUI)UhEy*?qF*H9In>@``o-Z^qDDeq*czITS@-eqZ6^jymwd?473>z_f zEa@9OkW!<_d75%74xK*P;N1o1Uz?HD2vLL5l$}HEekWYMsuJ&-Ar;petd)L9G#i8o zz3i&n3HG0FaIJkfL)-SQ&fd;k^4#-{YuVz5XRQlA#MobC_v~(d5yfEfBj9_X(0Cgx zTiG&q-<-eURaw=1S{n-()v#4nhdZ+)sFUPcZn+?EvO+rQB(j{g5#L>GqEI?-BT`0{ zmal(x^=&}4c#oD&B)KkWQ1WT=9srNRTq#PCoCK!F+a*kD!bTW{fZAKQad}tGfvjY1 zX8H^yg_xX}W}w5c%9JWNDtmL71;&L}_K%uuhbk1e*>1cHsnlYOs_2(0DWl=qZ}8@7lIdYbH6+IkV(nED|n4EOh$S)meF zh7irTZ=NVBNU643Xqvh*I4QU!f ze~3VCmL1LGZo%kruwbM{_$!x9fxg-zX|Z+M`Jo2D zw@_3@d8PZ5Yb|dv z4xuK_{X;MsUK=Y?tJ=+t#s=kSLJ!Y`~A9lSm8z0 z`{|-mD@UQtFF>?#;8x26cKF3-T1!s9f;^z2FLX8bl`Xtq(jVd@;x|Y))+bK`bO+RU zngD`homMiT@tymduaxF-W7Y=nt_u{_dFxpVvXm~&UKK@qN;+5v+C~PLeE1?V5Fv6* z6*2go9KC<&f_#zMWct=>u1iH9=bbex^>(1t!F*vShpaM++WbbbYR%RtJ#0Z{YhrP5 zOT2;N3=7-JO(M;&@kM^4cB)+XshA}f4V-UA)>&B`s<~-HXF1j{l*26BrT<~5(-S`C zJOrqvaS!^!-j8DB1FN^@ug4JzvX1KUWR<(n?8!M-D$+0b*$<8INUb=g*kSke<4}#6 z3eK33aV+qU-_@iaQA2ao`$7;V+9sQE7adDE!*>O|_NYy*r(xy+(2W!-pc5~+Uf=Nw z^pA>ujRiS3t#C9#f6F zQcXp0HNOzPGE2CN`#V5^p~Z5X4a%VzL>c z6e3oT^0kmk_Ib!?Q*Fn~L8?FQP;o!2%JYqCo8pC;V-Gd5Ldw#mU-?8Q0xs{!i~Wx` z|3W!%kzF;dlv=%kWGd$J74IDdOM2sj$;lW5Xe1}1wyyDEq|J(1sY~l9{GR`k^qyb>AJ~~2{-LqJC+Lf{ z?WIfXv}g;IvC(AOEfzt4IBj+=k|is14LrSVn_L`;y;2kFWxOVnm)xjV-QY`q6bv7c zb`RvviS$upd%Q+UZ;%{Mg)0WwXfWwqN{4WS*P1evC{d|X4j=qXqV+_Z zk^8EFCnCVXC$G&pg*f4j%ZfNO_r9D+Ji>Wk4aanO?C$jjuPc?|mpduf=eB!#%|pfP z=ybi_0fdhmPEj+`%Wc)h?{3$k(NL2#^mHx{#OkwGoLHjWt#}O=Km7oW5$!7n_5f>G zv_Y4IZ~4?N1|>PM+q7^ti#VcjXD)nEASdU96od5Bt;U@!<4Q7^GrmSVEvp-SioP3)e36;U}UvGGhk!yw`feiQR9?pqgt8r zp1kvas>iRE^eA`) z^zLOiNUl8K!`1mZRuTP2ijqh>V znts`^p^hgawXX5OPvSHw&aM?-6AE8r+?>h2yZ8`oSQeKxK)%M+g+{29lR&MX#UeQl z!Wuu`j_*N@wQcr7Zb0zZ(3`c)vnXjFdE|mtxceYZk17*IHySgP?#QTndt!Q(l%_zl*71e`FtOLO0V81ZRt(Pipu?| zw?vSSZ(nS12lRy@etCjE0lQ|l;-I%}T1-*z?BIEx!9pUZmA~dJ)VqA%r4nV!F& zqwo^n+!8M%={o3K$(~7b-F1aWJ=xPzPX^YG9fZvddX0OGbX(GLPg^%vQ5bPDgPD28 zlh{v@&NS81JnKn3nep6*^^X9lLU+?ibK`=};h@T`LceN+BvV^Dw=PIU zCvpL*?_WP};YDk#gV4 z|4g;EZq+A}=LyWOusooUzY-BzL^nO1QJ|S|qxx8Srwpxo1h-FSRZh%E>9T z8IOt?ZsGqJA(hNig%nxa$?x^a>XDuuIP+*$Za|a4s_vr;?^}_Jdphzh^~glSDA?09#|&qU!6J>!vzypQ(47{nV$P#+;2!H|`z?Gmn>atqt z`vZ=i4U~M(f3;sWQ-mx`k`(swpv113gSt0Y#cqd$gPPV%EQBCMNiN6!8DO0H<$Lu*S;ka@@cLiI_0Tqy3@TQByA;Bg3L)f^+&dT zzFiw_&BN#bhoY)3o`Ya6WmSvW0GMfRv-*)my0`Fp6euIyz1q%oKz(ovII#%ZY77}Z z=aIF~iWu2S7OoEwcY7{Sj|RE;gjo)FB~2P~YqwPzlz+qn9zJ8D0(hQXqnDc_j$SU0 z-|xp;TRmo6Gi%~ff|u1`vs0PCleE;Wilq1IM^LH?kwdSZA^I5gflhK>F2*=NtL9e6 z=#nr=_Z)G0t>jdC0e~1&=}p=UdnwHyOxzXDtnANPpP@o%?@ZR~w;jGk=1*N`cC4tU z<8cJojT-xY^XsCl5!{%wpqL_1d~37Kr|=MK;g8Py1uw=6z6=gV%h9lY6dXB7zvi#5 z%Zr6%e?QHH=wQ=%e`?NGljAb6vA2KfU7}`Cd#=_(<$h~=B)TzgW3}XpQmsk^0{KBu zdW&J@wwSEuSSKqWNLGpoW_AlqWd>|soololq=q;(xKh&Fb(G-gS2Mf(IqzM%e`Xr`x~6p%r)QDUv(dib8PJsN9R&3X&D8#0&F0S)#SkCI&3vWX#4 zOmt3Il^10Cs6?Zb81@vg`E{@W-7<{hlq@JFV}cMxKlEgu z_~H|aZhbnOm!i^klnk_rZ$N>tnA>UNfl@SSgH%~!#OUNLIbL%Zfq(pnFb#4gE=BY? zR)pN$sc+eXtvRB@P79?L+lZXuwSdyjOoS68Da$5iko+V2Kj@QdmH=i1TqH^7F{|Sf z-q(Rhb``HR&Q6#q(5b|Nt4$zk4;E24uh%j)_<0~>P)9q3B@gPqFIce=3@+@jPjT71g!B-1UT#Ml`efPsYu*05*< za0zeZeN6evu-ADxJK#~}S!7UVlPY)!?`=R{f@c-5?%yKrz zTYyice`K<+BP$6Ndqwm6p!5X%3Z@X@W&=DVpk}uC;h*t~f$YH3=djW$-(QTGJ%l!< z+iQ_(2)(iZOs&98&7QX=0;)eyQ@TY6uc5-<%@OfbPZ=6{B%{$l%Q01ZM+TCq_TbIu zk-$nWE`-b4`nomj(__B%*-d^Lc_GI9e4nn$1Q+mrSV1CP_>`lwABPaO^mXu)m9q`n zk<{wMbs7AAiZw1XR!PLeB5>`g)wS zs}DhuwUv-gu%8!eAL2TcCHPWds80gaZ<>1mxiIyO*!7G{zdu=;yramOzCU{2XQ|rd z!Iu5U=F7r7VXg&~UV^5pYENM$hTXN~Ma6jOgj39)yK_{R?mwSV|FL;x@##7q_rcSy zpui5^)DnK>pEj?5Rz#IC`a=2Za0wxJvRyV3)|;Sd3hyAY@UhB?_00*ysSfy+Uzya* z?ni})bReVAjWxnAY6R9d9Dx#WZ^Y>MK=T-|9>ILLY=f~8?8F4QqtIb+-wotb&~}qa z;(*FPt7-HxX&>cc0%bhVgl~9<^_`pH>&uJ@pvT(y{bO}j=b|PIa-5~FOQc=u!ztyi zi=FtU`N3~}!Z77W=Hn0sws>6F(oGDG(mJ1lcZw)*8!D`{zGpq(=zG2Aq&!j({|xp) zCbc~{+F9+&3zr9|4Zi?-h!j5<6d}vQEX?7kJUGyBjS3whxfD+nmYT_$u=X*wK4f3r z5P|rm*+}qk3CVa2$njm)(`_F#n&mVl@LVwkoiad%Um2!~Y9sMwj!|VNgNrIgN2ImF zBWuLI*gs9;0@*+?tsdNe@YW%iE?E59zmxV4$o1Xa^|%g1n8#J=#Jg%(CR-w*!G`Yl z{Xf=RkWGx~tbLoT3u^hY@sn0)W)ISJD&t5*(e-TT9Vm$IRXlXP024#{R8H)k`!1hk z@bC#AcBF_v+A~m1RBHkexcxvGYlkZ9%Osd8)p8=db}^s56JY3DIt6VmIw?YNUe6`{$3Th`3+} zfoEV_sA{-JSa9T;no~9(nd#c^&8I8Q!rgPs(Nrx+!JA%4>O4*ypBvM)B?WANidI_U zx?$2l9~-8kFb%L};X>+_(J+@6n$|tE?OomtI#vEcQF8STtDZk%$blT!?~u6x`5>fM zUo_qdHvZg)XErA8!H4x_u3qn*lt0)2CY)nes6rBb(i`nXxM7CQ=X??GhiM|bVHY_1 zo)U-!RWvG~gfJkg@3$;NF@69PXOkxR735u)Q+c+1kWNU+7O#AJ zDVy~LG&mJkNHWX(KCJK<9lyJW#Y@z%U2ui#TNf}C)j3r8p0rlr`7l#gttPT1UC05C z%U0>?H!e^Vhm!hnElNbVezaUOl8PpfPF-PmEKQ^(=ogdbCo>#izV#sJtD7t9VQsEo zk&YoqjAxEDD$Z}P!ecOdyS9);pD2eyFC%8;(&oBtBrCpbKZgg#bn=rb>_o(TXp=8| zDdH18J1;cCUdY-~V_<08c*eoBODHw|4S^HAKL^u~H^5A(%Lnn#(0R_)Y@*ql-O+V{ z;c1C_F*?1HHbbFX6TRHQ>`l?96(T$n2M=UTrtec75PhQ^X}R-~bRPXNUZ_+VtN}tp z1oIheA7{cTqNX?yz>W>8l1>;s8? zs%oE-2(i^Ldb3CC_j=wpRKLbq{G+iVF&8AEHpW&&Fk)s~;A`c%B=v<<+v*Fbrc%vA zuJGZooo`hP@%LpCG38wh;)(^*q2W@lXVwgOGRqhh7$+FDK-p#`2IsWM@k zeXoEt$OZx~m+)Q|aF6RUf#pzE5e!yWb_54VYQJ!)kw%Ghd(rH^*$YDQlEAO2d9`ll zm_=B*kbVl#+qxk*fZu&%sKoc}m&ynpTc(xE6J{o}_ZPY)wH!)t)ybREts5BM=_)!9 zaF6Jh#*ec+Y0Xr{?;5Udi@6Gld?wA)Yr!@h_@;+9L&By&7eNPCbU7(G69w__Mfet< zpE1(H)l()t-(I6664eQhY!=Cn)LTDhN@j^ole17X^_u3s+l}WvL8wgmw6D3ZJle8s z?*DGYuC|z#QmY*RdDwQlpN5_iNXB#U1P1+Jw36iNBiZ#^7&e~trBjIbx)Z;ha z7d-*5JXOATV>%$yO5w5G_3Q)y)KTp5o>IOWQ_e4%)}-h=9V-Q935(Y0@$`?q=Ot7Q zwu6k!cj7#p%Z;_Gv*At9{j7FX%l3UVzEvcmV61(s2LYM|T{Bo5ru!EKiswtgxwrHO zE9OM>L4abX9xor7pbr}i(*4sqk0?(=Jyt`}+QxuL=cx9b-p{IeuKA3@THY7dMgZp8 zN+Wg}F=cRUL1c1GO4QBo=JWmx&hE;S?0#qL^Iig!J zFoI1rLe^O$rj_h6`)a>9SUd3Ig!k~Xh7U)%nlOusPfHi$W)vLyJa(cUHU{$BI4hNg zPxD>-_z%GVo{FHHUg^r1EOeR#=H6k1=bE~Sd-*>j^Lf!YuDm5}`t2P#ne zfk+%ZRhlW58$$Y0<*U}T7}=@jb`9-?Ps?0>$FwPkxN{;)C$xFudx7v4Z-&3ma+kW) zsS_~mq1mXNG7NXNJ~bc_1GG(k=KIc(KUH=rmp$(~-%^Os80=$82IQ{eH8_45Q6|E1 zTXXc{D{lQcg-DCu1hn_Xe+P1{ZE|iVlhtufyN&9*jo;@CsTS|}Ryn3&Fs{F#m&7__ z$@l5apQC3Sr=gs2QCGB?tnx=d`YvQrQv92crn;WU!qiKqBZzw5+=mZu9ALi>*(nRz{cIxosEb!+OuDH9q8M0V@#y2BL( z+Vj_3TB@a}*|J+j?ruW#Eyq89Opjn?h+x(I!ITw3_{L;+4)fk0#89~AC%EOU>Q0_3 zt5oOO*VY|2Ss&e}zmwd{dmni+Y{uG(4e#3MoF0$V4HIiMqthv7)R4Ej7{=Oxd0>t> zso<9qbSp0OtctIvRAAT9)D5uDmu)l`4G%(a6hMv$oxcN{9S-JJ>T0VdzR5EPEmoZ zck>`ZJ;VyracvYK&4YyHFwAa%;6+Dd?^~M>Te<5)@(l(hS?ckFRPr)q>0_7ohC7}f z^f-DAwJePSJlThahkKng!!5&QWi}&Sbv+j`CZUY#4ixGq9in(g`K~rL%Gb5Rw;pG` zg(tUE&PqP0;Vau7J&RP+!_xG6Ub4;{{m#o9V7MFoVT5W^a?Zb4npxw=HQYs#j_!K- zW1zDnxu_!YUmPiXZYguYW?I-$4JlAA|e$-LSiwj!N2el*G? z%4CTLqQbFhNvD3I2I_%110nMO3#mCN2;l}0z+X*cGptP&K0IdQ@$0@v_FVgJR4ECzom{(U>?p8q^StcrZG zzX%FS)d>m~ltm7wo=VuGlNBi=K&$@i*j9e5u02LOeqS`^)9e#%w4TCEzXeC+X`kPU zC6v&Mx8H$j+MJW{Ih;%@31o{>`0CWacX~~uYx7dok(X&-r757q;V?VwJUI+U1zpA1 z_9|$$xFzLVjLh3pm1hde<_hx>v26_*a{&w|YAuED4*T4^b5q@EQN_jK^NR4)$i?41 z)KqT!K{duF_(jE^(}#*zWdiPrV$*FhtJp<6={Y6u2B7b0r~$rJ_dYRNS2}S-(vW@y ze_`rVC?u{A2YayL6z1Lv+>jv4fo7BP+Ac~605 zAK8(Q%6mZ88wX6ef&Gnx-QVnF=D>o)s#yPa5?S-v)BHAUJjs5-c8n}0avGQ4l3j65l^JjrIo4FeDD4DH+a7BtGw-lZdD!yAOON zpaVIPErPB1;*J2FBJd-J2)|cnIU+ep?MET)H!}9GEIr<$<}97%1G%Ngk|LN3OJAvr5jv}EA4S8YxaKjpF>g*P3wKhgreeP zh#JB7;z$dgq^@ilP<|%6mTm8>pQx@=tm-Zwx_t$nu?JvuI*G)lMPiTaLN&i@QS8#uQ=sdO z^vvdpN(R&Bi$AydW^j(HugcPgJn}y59Z#<-&glPC6Vp-%beOg-DSy-M!YudhIf0!i zX(u1*%@CikXtVJ9y3eNFfcJSV&I>L4XWxsepr&Zv4yZt70Bj=j&Yh>}Uv<^6t7HHg zn6%;n&8Zn?yc$+O+4&E!iW6W0EU`Dn?G4W8T(`Ub+KjeW<6@nm697&+87?PMWqxe>qCu=N})L4d9jUl!`(aAjxAYQ#qUo3odr zb8s=~0>?(3)sT6(1gyuYT_-?V`qo>qyLdw8qV`a8FUK{~r_I+je&upGCYOE%x$M&} z#oPh~NWq`UEcbazT|GOk7@;M%Lr^8Q0L3CR;6oC?WrLB9skm45uN=|ru&;&zN3=ky zYrG0|3la)AiB)kb^&fjaAXjG^40z67d!OG;=kV-FnXj?R@Fo0 zrwE-)nwHW##KkWgJWDP0XKa?Fu72EOf9=qR6xy6Ofb(ES@*XL5E2 zYtKf>^{^$J^=H5Q6r>;Lp>*zQD^>7oePUal%D->YAsCN7#C)4;!MeJq1RQ1_Fg?*x zPy;*i<}Zx1i%lHxo_SG;^0lD%9F&ZCu`{d3sYQl9J=M>X&H2PCzlr&F=_-&52qVch zI9LX=YbKU|i+7XHQ+eCyjh7$ttOJy%e;V# zU#Gr|Kw9tbQ`2Vzkj|VVA~1o#&khlm(Tm+@W=|fT3fR8>Nkl(=B5C{K%q{5cP!ZAM zXktCVp};qbj*tuo)sJP#S%#G&m0wTwCu3yY&%M$~!b|e&qQ$E3prowh!Ws+JD>9t; zTPI5}j#NHbJK9P;9;Ii5`F(w)BAj(n#-=>CHdpVcdtF4QpGn0AJQ;+3M)x3}f3)=# zK_M$|++@FRn~<@&ZiZ)z-c*P&#^wAfB&keth$L!r+5i%xUx+7*%xD99kWy{&G>uPi zGtC>>jT%p%Ux@|If_`bbD0`yDmed`>y>zQ87#pj0o@WxdS%Gdpp1g{Z?Sg0ca>_y> z2kh9S-QQAP9ej_7N4c&T{aU5b+%5R{lj{2zC$Z2kUu61B^_wk|%UVg72^ow_)h(&t z3Qxmg1>bKO%x5>FeR^On=PC6B_zH*}@%WFo_DKRO!6tpr*;1ZTbxy<5Gf#$p>nlC^ zo+ntNyK37KvPWtw{9318ZhaC`f-lZ_6F4>;uwd=c2fteQsgyxM!#G|u@J?-qzWKtq-158 zbVH1>GaCND2vxJ&b}E#m*^>;xJgjaP({IAeP`pfTWDpXKF(d*(9dv1W8mk4aT=`fbMo-g#-u;iZ!$e;J=7~qYziFLkSwnb zHb+%3Nr*3oe!HK|1lI2#IVtUP^KIB8LDsX=eVE}5D%L4};ZaR|933eY{Y*yp(9D_Ad<)hqhr=2PsfP0-+Vyn7W6p(DZZP3Ux}X{pX5t3@*)WZHLQu zZFeEcO2H52TczAw+?Nol6e~p|XhMPT-MFGo^rH%wllod~2@L%U>Z#1ex7(19&}#j% zr+DdY>n4f9X7iWLI81CTUg8*Loqi@Z^7u)*_MXpfEZmzj!mH>DeP~Ul71+afwGL%M zb*5Mxc#!guWA2t1x^t#gQR~Vd7b!h!cjWWrKwnSCmXwZ@tv{cySB-&H4MtbIEh zlNBXx$C1b$?Nk!dlQ`Qm7bn!KNg2I){<9dR^r$Hddhl4&-ap=kZXv6_{E-X`f%@yr zKngD60uWWirqUV!tzM^vv2Ww1z3{+KYyvQ4Fm87{^*C!&b+7?xoLp;s*Fd({ZJ^tA zi?nBs^>q%R^C8qiOy)SF%*@*%<*o@kZeIKn_qcA{7%-B~($FEeK@qEO;YSfL&q2|l zgJ_${?e=+|@v=_)v(uR|>oz5DY14gtB1huml?S&#nNS2#GLIE(lQ;kT*ZEk}L-a9) z7Jnete(^n+2M^trQtETDXYV%fdhKF0+W> z6eKC;+GeaPdbUv*=~P_l(|1L`b-WZk1xYQh$x>_C=T6wW@suGIMHN$TQgZoF*CWC2Q(J zj}|E}ISB4J)5@`PMi84K3)yKg!}n^zc0pw;3@#Q&Rh*t>5ZJWs1BPwKfh7P9w7W;7 zQxxFK_^C7xWbLPXq~&O74MF?-4?XLj?k)2`-aL__FYaAW3F^BZKL3cmdP;Nm0?N7f zrB)tmyEod~#eL2qJ)ezKFEwceXcb7-CMdJi=Zu_6_=H?!1ePtVYl=BpiCan0d+?`g ztd$lqvM-BjtLOUSml$|kyfXTZc{*SdmQkEs5}RI4Ad649_>Tm@@?ZPgr5j=4a*JM> z3Mt@K=pD}3Xgu#Vv@DaTeJbh5H-@}QX{&vzL&wUerC zW@x5kC#3Q6l|K8WchOfm3eaGOB8h)Bz3tUiKkpivZ|UL(z!F0uc*|+g-K51iOJR367!g6dzu^%*?z*E?A#I7Y=%p(jJMJC1t749 z?vMY>_m4~V$7uZb1J%dCg?a~kq$zM+CG_bqI=S`#z5Dk-VS21SWxkc0Rcxurr6$+n zW{P&0(-0%1{l4q=78U%(k3G4->uce!lPf9}sya4o1UE6d{p}XqtLW-ltDkYMwB62K z`yQl444Egb^I2j1OO>`_Cc7dh+haj+J+~~;r5)0<)gXMg`oo)uHHFsmO=hXzxdn7xsaJbSGCdBwrc^~FEo%>Vupl{&^vF||waGU&%< z`Q1%-W!xFH8@9Ech?K)mpE_#vQGh+$v^Hn{3)Z9>{wIz z&%ypjN&m->#57j>o>p^KZpRaP>&-Aro(vq0+#&3iz*4A_s5X+*TxJO?<%6H3fBn45 ziys}?%1WbPZZ-FL4vzyHQSiz9@&4a z;Qt;v%7_|#Z!bniezs4)p(OObDe#|{K<+3XeXj5IN!+l$I_p_-Uuk9U9K-!@D*Wpk zt89)NeZ!qjv%`-Yc}~!?_t6<@UO^rnsz!ThTz-=k?=s}H_`l!%$67kF+%H_%eBXo&uabWWFVvI0L>&(!KGxxp{OKQsPGTba zdO{`7e$pW-qkT)fkGxkFTKCPl(^p44A;2bws}P42C}YTC%Br%$abM3wmY?$DsbJrU z^yNu^;!X95MWM`#ngYCZnl@VC-*@_lQQ+R*9-ZeH^xby+BW}Nw@B+y4MP0q?h(8M6 zoZODsijR&^DZ78lWMiwK62^UZ%6-XZg7bfR<=fX+ z7ymn1Uq@nUFVP7ySMaC;9b?fYF#dz+|2%wJ!TAI1*wMPy3pEf$e%iA1zpy0rjm)|8 zm4{u(`k#Tjv!1lx9)@0uFCA|r*O)ksNL=Cqv8ht8TAs1I{ri7Ae&ZZxJvT(x&s6s4 zB5WdU-F`ncc)cwvHGfAOrR;Kv=A&a$fo(9iCm=hGDD3~|BLl<@=mG_26*thH@x<{g zx;#px)wod0+SAz-9X6KJze@eSLg0Jjy;)Pvvw{yh#dKNcx>*8?QZS&TWq8%Ee}Gf} zCBW!^mz3PQV;p&(PN-02QGV9^yy343FaQ%)(6NR}*uJL5EP3=d{dbS(1r~{~^SZkq z%w0?Mg!;$>{L@3*iX`{1>w_2s78e(re4R=s^hcKa&vi0*Av$l~H~)1omvrC~x9VBB){;$7z9rzw6!ru`147?ogu+%g)=GP-ldo%iTO5c6SRa@5m zU*^JJh=slr>E5UOY!#cQUW2;!@88By#z4HtXMXgjcE^86*1sM)v~X6H!|e0;cmMM8 zkJJ=lo^_{WUCx5nmBWg5JJ9uR{#UTjd{x$=dAFBEiy95RtQ0v3#P|7hjx~ts;JcUQ zcH}wYoohqvT`XG6kFWMu;<2;8mii`lC$@ucikizp>RxiLoR%)NUix`of?(nW-ZRb1 z0{R!o%as-6aQij!1d_7-gt9rgW%Dj`?ITsW&lY?0${lirTduInUbCP`gyFAjEnJCN zBjPl5cVw1MIN9;U=(y`Jy={lGd8P$g-&}t6y?qLaK%Zy|B&h0_?YGV42dD}Eo2A20 zzwOXw?Ur@oC9&m`C~^|Kzb-*#RTu|X>YL}3tI*Z(-E`@Mwg`H3z55DsX=O>3?{1Y= zy#BUZ3c>y7ymT7>$!K}+-ox*5@7`$CChFJQyW)HHOE+iHK`(-7oyjKIUA1*Ge zpe_!*+b?gM%5RFwX=Kvi2Lk1uikH+YCmBmKeh1Y}w8$~q1Ie4QXy?xq#y8{sW5{Ft zyQ8H7$@9X)0{@%4Z9k}`U;fIgYv>wkSG&FGHuLB@^Y93@RKDwn0Q3Uk3p^ z=z#bCGL<7M&f<;`^HA2otY7bu4@|82kAct~a$nPbGKXeL0zFr)_W3s_=-p#nlDcMY zAN5_i^!2|?G`>z;BK1EZjc@i|hWq`xO)I}nJDe&<`G>|rUA$ppciFddS-yVlC&$uD z4k&1G6B>_mku~ITLa^cgxqH>M+}rSyQ0gSQx%sfE_!dpX@zx{Xqdn9?J96sq=nmtl4e*N)m-qC}UlJuG$bwYfZWZ*RU;xdTwQpR%_vB8&acPcv_&TpYX? z79Re__gUp`Za(t!xGd5}%3Kav`e7uK3ooD_u#rQn_R_K4nA}NVFB_&>Xhk(Jz4|FDj!Xu}&i_#Q`0@3-!p6B}+6jDf#GS zpe=0HZkd7V%=6kMVAk#8AzbnZ&Loce-^>1o257_b0HX!H6SPTQLCcd_>lXwE9$P(TYIfa&q7jsK3Zpa9+r^ZpGQw>G%88DVQddDz+o&}ugmGwO7}`*M zjGNInauqR>V#`}2%I!VZzTI}N-=257A%%)Zg}y$b7SsbVDE!Bc{rdsbhTq5;bBXx`R=%LR(U2$LWUGhhb_>Zbe z+BuF|bT}ZV9iEEtkAo1#XYY;qeTakFB%OVImymr9h`!@OY$ks+yI0($_211Q(F!O0 zefs?~Qkk~ZC#c)Q+xENL5Q;M~vdVPhP|2#(@b;^b8`^uw?`wMuBR){Rg7U9D9t8im zMgPrp=qf~`-seKCThTX+hN5thb##dhsnf*@-n$UbmircP#@`V(!Sh44fHjd8P zl}}ocOkH=ph?p&yKMHo~PrZpX;goAIk9!?Rdlk3_=Jo%>q2HV&XbOVIJT9uUmXP4P zt2>twzl)it#$XRLIrm;8#7iLsQpmzJY6w5X<$_p`llV3=AA$3x}obqCsk&-Y$*`N9WC1LJ^KQ%D^XJh1WMp5^X z;F~O8)RRzU<CxTWf9TYgnGyiXv^Zx%4FRlNho-b<` zaN+;uyA{CMm8R?a|LrdUR)p(;NBxA%DKo%nh68X&!&%V&^Je?&e=q6(_bR{o{~62u ZfAtG>ZA4W?Z}c$$fv2mV%Q~loCIB(4mgxWh literal 0 HcmV?d00001 diff --git a/docs/imgs/cyberduck/cyberduck_2.png b/docs/imgs/cyberduck/cyberduck_2.png new file mode 100644 index 0000000000000000000000000000000000000000..8d5f76b14f358ea1bc8be04e9f82c60bc9892ba1 GIT binary patch literal 41305 zcmZU(1z23m(lv}T_~7mg?tvh|A-KD{6C8rO1qkj0mk`|D3GNU)xVyW4lXLGm=f3|x z&$HQ0@2=MB>RPKSTv1*E1(5&|0s;a>N>WT20s;!0hQtNHfpbQUK1D%50IID-MHQt) zMadMM?9Ht{nL$8U2ArgOsH$j?40N7>f?;~-BWVqV`f{Zu^#Q>cfs7HYU%trbbpe6F zLJ4H-)=AaFn%c#!eT5ZYT^)+C@3iNYBBhDNKAO&y%q|UUnh{A9-*zxYEaab%Iui|e zPk8LTuKIM|Ih}>A`P}LIq5-yxc6ZEvtppI23#Z_bQWCuP4j#OP`?L=6!C{g~t$ZR< zUUDCvLgu0DG!wEfnN#?vr|6x^e4)Wd0YQ z#QJx#x3F_0HZ}HyKJgePkm)j?2CAulM}hM{)68Y%jFU|ih(bi$=$45=EnKtzM(!e& z@!Rvpwoib4N*NTIGq2rSng=4^SVxa)a^{Y9nn3-Owf)^iP(& zo?L(r4{pa;lRIbu_O3`6@G^K>U-(qfUq6c#(3g0*eA11{YWKW5`0dx#6)YT-5K5Im z-SN)pIyG^o+A96}tE1Ldt#e)T+2M8QGXf^k8@JVE;@x+g7pupocjh>69&_*@QeV}_ zi;U*0T^7wI%L^JanPg_2*Mo?pQuT8E+JQeH%o5w_RIILyJ&)|EwlF%zXeyCy&4Y;?p}S~1kp&|zdi3)7rrsIo|&I^ z##9!+WkR>Wbj;q+`Llj>51y7J3k80m0X*WPQ=yW?^UVwzVvPu`K#639i*$=&hFDD) zrs_R10^Wtsnq!D#5o%&7Xlfb)37(iZqKWv;`yJ!g$@t_kNh}azu5d_Fv`AnETrp88 zQKtPUAt(d((B0nb#z{(ig?7V-^ zC`&sUa3O-TH(s6VxFKa(6=y_@ImZV6Q$7%E#;hVPH#&qPH@SbE*1RO?SFE|oGHp5A zY?Ze3Rq~Boia!YJRf&EFs9gBVY6ea&T{`UtVq8QTFq|qdE~1botQ+$18AujnsLWTOv7XXp_Hp>Grzo|&2&hwFl~e0s=P)bfYmH z!8%=!JiW~yV!7k4Pcc~SfWXBt@fQcgp6Xz`_wZ3;SfSWZ-6*>E$9Zvlgqr$eqA&8O z;$@JZ?-79>36cCo0ew-ow1nf(FVG&zGYCbN0^j-I;3jRWilqF}GieKoyeNtyf#ZmX z1Jv$Yo758Sg-W!;cLV8T%#vxs8!LlCRIV;zzIrx?>RLBW^gkIkTd!wIO{Ypbf zw7M4!9}~E~_bKucbW-K^6)H^SUNeDA#8jOKUjwSlavt{KQ7rMg)~}DM+>>~g{ndFW zae+v3b!T9xRWPtEWeBEPP9Zm|?UzJv98W2W-0G1K&Z1*c*$&yrH<3z;%dgUepFn2@ zttVs`V-m86C=ZmE=T;&xF`ND=(i@UVNS@5w#xl?$OGdUz+w%R=21nX{}b7Z++Zne>ayEnM)v{DO4aWPrkLOsVHR3lR z23de#EU>XWAc$w*fbDcF6b%q99m?$hK3rUNU1MkU zHe#0KK~Hk?0MTxT(LGcGcn2god=?37neQaTW(>ayREmeQVupWkscb0)D_({vJ3&cn z*+=q;Adz(3t^h09D#s_AJnb*kn^l__i@*!b#igao2PnvILA8yzh{Qxh#Kf5y8JU@S zy1IJ5o0^-w+}%AJZZ56oJK7r?V=C?8;|3=(QcP-V^;*-Eoxg&F9~wX(a0%yw#>Q_r zi}qx-mg4foYlnE`JjKoD+*P8J<)-A*pI7Vh4$dYRvu?V>YGw9DGdm5ZHfst;1oWCc zZ68{0unD<*UO(>KX13lQuehzRZ%_`D$g5_T6!Yt7tT|l#E?rw`dNA2K`5E!L(ir>h1ldIjNoziQbOynce`^=SBYh5i{t?V~HRQg6#B! z1bR=$)!R2MCIJ)7n~7O-0w>qEsENf_3$>k;pt>-)f}#|H2|q~D`o?USCeA#t52J3T zDP=Av2SE=`10W#7tRP^(DM;``0Dd4KpyNX!;K6SU@FSK3_4ijO#2o0q(~!7-3JR-; zN=bp=Dke^5W_He&_Acjl;~C(p=B!jTT{Punc}?tXnT<^Cjm?PXEbfp&HzBg{GV$nW(*!8QFVgR%TWT0Yow~GCn6$ zb6#aJ@&Ag0|Kq2yba8RuWnpo1b7OXU$87Ip!NSJF!^6VL&ce>l1TMkk>|y6(v3+mfC0e}@GgAj_XG zENslIEdSIE7Ulbs%d2SRZuUt_%*qx#J>WJ3*tvN4{wn|f`|@v#|0AjSuOufs`~OP* z&zJwNq?)stlc>EdxJeg*e^=(e!vFj6zk+-$e@6a4Gx48k{wo(e&jN^iEdQ*T0HPXD zGZg|t2trCsSk)c!I1@et>*MXf8neteJ`5HRhz*1U;R%f{{(3j?GeaKP0yXt!{GGq& zBkq<*gt5@akG)?3fnT7cRfXcWGmKtu%9pr)eHdj%8tp-CyIWj6tXS?msJJV=D`~BT zLwV##&dg-0)*Q9pq+(!@dH-pF3?!Wxdvi383EC!)_AbDr*e2H>0pgY`TwzvXlt*%p zO?2$e-`0;=8d%DJni($$ihNuwwv9#oIQ5PSnZd=5n)jR0?N4YbVEbgMRhKz9p08FF zKEEu!SZqy1bG@>o9%>F~HW@*;uWxM^^?K?U0>kVeonUaGpI63P#B-VE|`93tAfOS=w2rCkq~`%R?vuuQvc(X zlWZ&P#t#7yvld76+Dtu;z37z^jjJN=38m6b*0S&F5lyaNJ#o2)XjBo2t;{b#I3=1< z^k=A%0GvtLB`Nkwz1BHgiYSwls^lqoWraHEqq*`CX#ejv@IPq4KfC4}fh5ZhbuqxA zi#jP^e)wt38;e%&4Nc+D`!a*p zN)IaV;lhv7)?pLOpjv&22ce1ZEY0)Qv20JF<}XW0h!E#yhhs*kTjcG$w_DRNKKX!$ z>{kKX`g;6Ydoj?zmNz3<@+1joKcw+W+sqK@^$W< zaJx2_<5Je4X*6aFJHteQ-ax0KMqsdm>{9{dOtz?);xL<_jefIJA)`)%>~Jy@O})*0 z908}bg0mZ~BCu z<(5A#f`=T5B)0xc=7a%I>Mg#KkkIebvoJp8N48gHgAQHwN`0oQy@?dTw`Udei7ci_ zT$W_%BzmbdcC%;h?>Nx5+0~J919hxC3ST`4Dj%9cl^TOReQdO!?|&)4x4fhZ4uQwS z%_Ssdwbs!-Q>wwT3Ji(em)oE`&L%em;6a7@gI@*2kk{<-Wquap8FZqd-bXjieG%C0 zM_GKu*R|RY#S%v*U`GugLWZ>jS0I4^e*kdQf`<3Spfuj-2~lo5Wu9(!w#b$&)LxKS z5EShKvce!kf?o?2fFE|R&sP(fNk$E-<=V5YRQrkXkRp}qlrT^}6$jfOe(Yv4rWVV& zy%2uG;jS?VDMcJ3DoA(Pzr?|{1Z)QRAMRG@wepVm`BZjleae=F+Gl&rcrKYA%71Xl zj&%{ahuDm`cZx-z`Zk-FM&&7zDS&xS?%x@70OSlRUCZ8j z+@TMXIITmm5K)$#^O*BPo4EwBT9Sx>aIBNg9XW(R)PF7GU#l6b1<2|2n2)3XjK$AF zFO~=+gh+<)NoiV$Bsz&h>`H8HB37^23ELnQ>VJiJ06EKGe7h@HD^!_Z;O`?=4igKN z!e4PkCqpv5C}|-oDa!p>EVo9m%J2U+HR$2Yo`(Zj4+jh@6h?p^@GgNQuiRB}%Ds># z_wpuJ&axxauoIt$T?>!yy2$xmG zzkAM9jOzSx>L&lzC03XSE~t`8wX^(lPE^oDb%nvYY!$6#i!U}$Zy1_b4H}JMWCENS z0oDJuW=@_n2jLkNr~&Q2h2U7IKu~FpYNWaR2(SN}D3=-iLCM-7+uuqV@eWG1XQ~?P&|H-NaH*)p?#-S2 ztoCq35TeQ0R;;vjfb#6|^>zMOZ){t-8c8DHTd5#b54>3~0#^e5)?` zXQS9g`^$G=I-k$z3AyI`&zEU2F{qcFKgQCas38G#@ml_GM=ceDYEN-3i9qmgd9;%YoBS z?uUALdP9Oex9cI6y86A#fUU@Wbp0NZM3th-jXC-m0f6 zo2f9PIrv4XQ$FsE-&=&-x}NcGH5c+kH;m@@=ol=tw~O7eLDaZIOtC*dqYxZlAe+ca zW|FgBhZ+n&lEQN26-yGJ@_(G_qkS%8EQ8-%(%HlEB|~a)SNaVi6=^$_7=p5@cs<{t zMV%%ulc7ESP2wz_d`SfnAG;+FH8?I{t-*6M`MBDVa55g7U^+sl)uOoa?VUw*+vPBW zua8(RBG#5H5-xKhn&7iymggZIDYG`#sQQu_BbR~SOa1d*=Ub9}=ga3XZVP@cB$PiE zn3fs9-Og}&AnI}W4W;IjtHTE%?us_|h;UfH#}-E>dtzZU*s>M)l!f9|k;lSf@qhCr zLY#*_*!Pm7sl>nr;S9qAM13}DXRP${h5EjkDCJy%h^2CBj}07jDIc7AWqEeHRtjXk z5nQgMhKvtjPM4~op4IGbBgU_`dyR~+bTYag%_aRr6Ku;V>*KY(+#Z@P*WuD?_pCqe zcsk8`7V6S>-+=W)wj%R+ygryNkix|0vdiGGUtKQ3P5yyx15xJu*D_#H!YEz}%Ay@% z#J9Tku2P_pU{kL&A}^3Z4^Zy`@h>FE2n#d&i21`iR6n*mo{mN4X5}nk4jYss^okPn zI8GMzTKQ@#8w&}DiBcZ`Bd^mjb)l#FeIj9>kz&3kI((1EQ0`$%ox9BHKrsZgI8AjcKv0({J}2FHqA?X42XHb@E?lMd%T@ju5uYMK-`-t1Gje zYf@uYMhU>Z34r=?EkN1Jq*X86k%={N=oUY+C%4iftOs{dWq|CyJ*25cQ9L;q9F6?Hlrjl zM3e1JvC`^>D>=U0?Cg`RQ*XUfD}uGaO*2hS1a?RhnDttyG|UG6YtO8N$QGp)Tk{6p zR7|E%>QfnY=zLAGn|PDnH_#X4B0Z>gdj=a411exZ2vgk40L|4n7&bt#&=z2*XdpJc zu0rXY6Zdj0cx_Lzc^dR$+^^o6lA=93JY?~6Z;%lBEf#~P(6l@LX1ZQa?!kD0H2y>q zhKAqwGJAY_-8T)Z#&ifn@Y~s9ZP7%e8N}UBp1lmriLuCRyS5AQY~Ox-i~A6NqARAe z+Hu~IZ)aLU?xSo2_b5Us%zB4XFcHKXaX51@WI#+TPIJFG*mdeIUI-qc1yWv@AKs4# zMf$~Co4NA z+sd@Mc)Qa>jw)I!CKWO)J^o`iSz!>vAjHV&*S_LDn0r@IS@H#Mz_si)qugHI*Xq_!R ze8fqZ+S=pZWYrk{5F;9nVRsSceEK!*yojjDKyf-lNVSS&-OuCYX1<*h;@8_~+PjdC z0gP~B^coe%0fyNU+**{7QbI0}Wd3rQylQq}JAZaHkP*X4q17Kv%;2`>)9402Q+bv( z?SNq`bM@=CKnmeWC6m{cL+bOQ8Sa_|=UXqPlUuaFqovW76vi9{-{l}>7DwCTVd+Jg zbzD~_Wb=CKc2S0tG~deS|DONTK|<_Gk_zPqr67-K{6VN-h|mNF&K#46cq*y@_HCKi zFKye9FNx){6h3-Px^kT_)q|~IDwGqkjUhMDOSR@KM{s*eLwsbbGCGMxV%%+bx!sQ! zXLYE`*GIPh<&?yDOk&mhN-jI_fH*zie;k`zd_odXsPKtpyTNxfrhC^V6@8dz%SKtt3 zj%X-yxJD!rOeA!S%->F70V$+jQO<_&*otRxLTy2rm#4wj0?la|YB;x?j9&}}r!khI zu@GYm|EF%`%_e`rxgEIeI|UAI8-7P1)Me=n`Am|II2y*7?YDNT+GOtJO?@cxaHbLB zRxX7nxn+Uhk2f}^FD;yQyY1q>-;&d54IvFfCuEQuqSiO^w#0-?$VU2)*xC+D6uj-RmJ@{^1@jK@b^D z8p&-ApOb52KaAA}m6ODd>nj`DFJ#^PGWAF+_oXiUS1MyWy#*5!6DTh-N7u za%tCCL=yd}TCC!9?sM(Arl5`D@bg*cTZiGaJ=mYhy55TZAYX-gK1fDWCQGmIeL09$ zNJG~#q!EY6Wm0%m&v8FDY3C)yS>kuzywjKC$RG@NqpH|EShO99rL z{UO$s74?1wC;RYI6XWucV+@CSsv10AGLx4XFSPhRPP+uoKF|)zA;h33kLZyCCn9aB zG%&mfDD}xduZEUBYAp<6qCnI)_iXmKcw^Z-T<)y;bn^lRg=)^B8FnAHX!fd2{)65E zm?R*WhHSq5e*5Kv&(n8D9PQ@ZKcFyri{j#EALM=hv)?w!QUBVA%Us68!Zr2X0Mlrt zR&CeNQ9maZ(a*pq?Rsku8AzTf_- zLWPGj$BwdO_YwZb;r_$}b-M9k(E|65d;5%V{$kZ3?ju8wwtuB^TT&cGVj-#v9wOfg z=7)O3NgUUF`B~I1-^qz^*eDOaJPK*oFCBP7V->_Foj8PiauigH^%$K38e|G%{drPqkwzx5aOkG#khxx zcC>m`{<~d8@wSBF@=mnITkCNBq(w8}SNTZbH}WRLz$7wjHbpKmG89Hkf8_H8QODX?IpaVX)rg^POT0A~)DtmL?waXnhGuTm_K zFQ9-*GN|85i+`?$=eR&c@%8@JLkd{QY~Brr#8?HF`VYcRi-5ohsF6=fa*|$amtBYp zX0@3(^Cm+goU2UoICZ@BxY~WRN6saUG>#t~CH<(d5*u7rW~iq)@-Y!6=Z+j5B)#3_ z9iY3WBb|X!G;J zU-xLNnh$8Kd`lKox*R($GFJ91d1dnl<>h8oa5R1aS&{Gp%CE)9XyB* zhTRt~#!_(Ph4n);9LA`Dd3us9AM+s<}urr^|wAn1%~zfOHHJO3z5MYg|9h!#fg0Y10Y|-}kI+P@rQVt3TVCdf?;X-NyeIN}dX(32MGq5-1BX<|FBKT+} zCOlPDHHhv{1;$eOgTJfcz?;I*1ZH>aTcZjvBx=HY?@It~nNH(4gD(gH2n~YSi254N zi2wvhLYT#x_QaCmoyN&51pTAIh5%D$s2@&}!p2IJcF;ba|F z+Z|XWoIx;>dsneGXY|)@WQTz1LK?2 zD^VcnR`7GRIgt+6rY^hIVj{Wo^`>&V-bRB5?C9_GVk#tpp+04L->oycCiv#U`({>y z?jn`fwdDEyCmP+a&$okV?<|JF?xovjyyIss%m6S{mA={?duiCq@)`z1Dk@5e=;cvu zF>2XVvdYfaNAnbhA6;MZ-))0w9;}KJQ>ml|<37Yc4lFX^ds#R%62{KAS1+e(V;7=j zIA9Ph!WRN)#Ybr(sPIXycW}ntL$T4Z72m31(4=->j#gS5XUeoxI=~X0Ctzx5x>Tcb z^h2EOqzR7WipwuKI-SSu1chy|qc5MPo;vu4V(0)nyK?3}2ZbqrID~Jb8X4@!`0Qd? zUZ>5QGoT|GI5Piu>#4kuXYd7tJ{{O^eRb-?*65X64&e`3^L>(A^?Q5iF<&$7;Ix?= zOr%p$X5JrVi4st))Yn4=BX6tuip=b<X>G=|I1Mz$5#M(%=**YI~zd7wBX$*s%e+DpdRP7B0ewU4%FHF9h;3KwJ*Ylw8)xFCfQotY#mAC-x zDqnni-p`Lo{%zMP2OjPgJk-MHYyqE5SJS0&P>L=Ezt`>Zrd_^lx1q}AoQ^%hI~+_= zLkl7Q0ZjaF*7Frie`p0pt(sm2E0VZfyh5*K$AKXUQlIUOE>DNcA(|1h6usR6Cdqzc zx8;q2)F3ngO~q}U4|B3vd|HQdP-;HFe7O`9i`2j2^a&i?T3M1-_fPYI&b`!%u@T zU^kK9yq?>T&)o_QF!W+;V1%KvZSyD#%#wCab=+?v3EJR+8AN0-#E+c(#_gC#N>tH) zt1ZZ_>pH7;af72IB0`GK?NE8#xaR8wW>Sh&TYv?sLBPzdyuA$VMmr|IhYAKDH#Aq9ob>;IWP1QaoJ9r^~Hh5U|B6;FwFnDgS>3g2ohGX~V$>xOUe7=nA zq-lEphaI}Ya6&#WTGtx-zmPXuq=0G!1w0rHaii{DiKjAzJ7HE z3=2vFy95Orp|cCrk09q@E-&g}M0gH4A_K!HuU>Px@s{zQ(`HFrXOyzI9jL(sbi;az zM6)wy-VC)|`nCcFrZ(7;zeK@{ij#}NDaNNxD(QovDiH4Utm8>u-|K`kfQa_02m{M? zXE^Dl&-Ju<&-3Fh!`i4HGOEcy^o^}?k3~Z+q67j0G@|+FpIKey4J?HXks?jl0q^w- zTpkz%td)dm4M{Cjvk9YoLz|iSJnWq4RLI8OV_-^~Redmfjkjk#4 zDBD;2531~x4?a(`$hs)-4~XS>)NA;p6@bityI}H%kc`2^L4Fil+o$x|c`$p7o}4)N zRrIuW9*D#o3!YnruF$o__f@{EIpQIZSWXb)nj!lvr#LVaVnlNVV5aHk8RmS4kCy_5 z6_T){C`JP88oQ>0t!jzt5ZdbY249-3L)LYsvyqXl>gCTUrx^)9ut6YvYrQ*~XVIRy zeMbbDNPh==M=<{!#kIPR&Dh~f&DC}v9*!ucG7kXXB#y+u7MnkJRTr9|M4(2(;%H_{ zF|@%JT9FJ3sp1imVe>M~UvFX@9+L(^*;|Tn3##1`C4@0a0(j;IXopA-5vYVOYBad_ zM3Su_U+wUChl8Win52Wh0RtY4Z$+D=E^5h#>={iyM+H&|axp)!UXg2)7
    lD2s{ zd}Txu?{dRP4kIzdarrZy$9eR5;ugTn{ll5x+mS_$UW*GljuZ$fXfi=T;DCullf(tM z*{0avq_+P78c#E~DjzCTg2++KdkiW9Es)cE6wm&`upxSTuO#O*)UH1egMT;GWczZ2 zCB_8LHY^~nV@e`;4Ouy_XT4P$?#+ZDoVjI!Y_PecN`a{7CV&&66vDIwOh%+Lk%+_J&}M~nQ+4u<4r|f` znFVW639MUwxahZ~F+uM_9K7$=%%ciO*huvXwh3}XU=M$yOETQl04Y2sM{{cSr0zRp zS2?1wlGI=)ihq;E*oW@%8Nne=@fKlwD7xcWsL4IAW;A3{+)>~&Df=GQW@JQJBrM

    F4r*+rJZ^VkCUU+C8 zb$z=3`fmK(l{LY_{0ByP{vXDyJ?J~O+WjD9%)PTe85{K6z^%Kf)CxT>z|rv?VB`Cw zFn|H!2p;H~&tW}7tKe2mT|l8ZBcs=Z{^JQ8J@8e~D9{TsK2+$t10*XnjcHXclYguN z?z?H4!~B?;fiC>MdECL5f&5BZCEtOq7{OIcklHoa!d1AbvE~od4L?Fx1cj0Ma_ht1 zV1z}6METf8UMa@|tc3Pe67PlG75A4E7?AOXIJRDnCwI3Xn4LPH$YC@^SFVnKH8SPa;h+(e&2z$jB zxuD4f%tZeosB~51uK4mo(8y_Yt^M_s%Z1wKaRLR^x&JKYc~9`|BI2y&s3L)6+$9R>+@1TG$mM@LE7yIn;h^pn6FUZjmU?lNaYRjY;u_lq@el=`Xc>=Q3;5iv1Dn* znl?hn>4=^=FCq;Bn~J=^kT^EfcnBlOc}+~$-yeUQ2=YW-gxV0vKy5|eay2jC3Vb&( zQgIS8s0K{do^L}3LvHxaK9{`ZlW$RY0EsDUbwdqXZ>PX~1T8PjIhx&=L~fI+QYuOm*X$7*1#EKmDy62i&Xt-WBsl)!c%1MMho4m4>E^)a zI^1@P*v!4rPW6RpxP1jP;}PG*D{gvp_dfpe+^}Yf5McKx)~XH7#&bdoeWGt7?QtYS zyH-5oIn}w9lDO8q<1zmtSN@Z> zJqP$kkwZZ3O(jVo#LCxI{HW0fjFM=Hp!S`DW4%~u{QyGpr)(_(Z8Y5$E^mXPudMIc zl6P-dVFEXBxLb&8X=$x-aOj{ujC}nrDZDJUBmT??n zgwr+p=7my1Yh8p#l(>C?hJyq^I!aSH$S_os$zR2VMX|?5_Bzuai1!?V?{ove0T^2F zjXc|PhHRq#UP8F2xV061tv^-N4zRHJ5J@8;BJ}3*gpegEsWQh7{IXeMLnk8@v(SW# zK@>*iQGFRl0f=;l#sDl%sQa3HhQr7f{?aut6@UTQ#}o=rC3Z&h`5qH-mTHmuSO(@P z&z+qDcZ8UryLo}vd^qrfSdK^Yl~+$QgT@k@bywZYzgp~-hpP(s_|AY&W&|H_yS}$=pMMnMK;3sGF!5!FF zm_)oEz5~iR$*_rjRYbv!9EbQe`hd_~wVI7+%*y&%sDEh;aCi_|j&x=$3VY6zCTbOe z5XKjkqo6~-%aSpF7fDeLj^tRL`GA|5zZnuqaJY^^Ih5(7k1J`FCi)KPbPq+J5W)L< zE`|7BM=~(i146oWF9;j^m%m7hgowlgN3vA`&R2sCk-Ch#268#j2GViaa|jDW%8>wZ9GEGP_xQ%v6rBW#A>=+W085sYa%7)yS!HMW@6?2xH@@qC^5v0vVRiN&XxHtYRv zjM`-nF4E?}!NS9GT=0Nk24Q8%Q{+3d%k0vvfsgH1qeV!jT|Wv5IcrUK;F>S$7cY;# zauOC|QyVXqpg664a5g=8ba39&FfSW$G4dVid;i*!VlkY^Q;eWqeNyK-3S5u}1cyWz ztq7|p$3xE1Qe}Ns#D(dFn9k9u8zE;_>Q6v2BbfTy(78pPGs@QaPKA2NB1IyK0OYpf znnHsJ4qmwW$id%v2|Mrs=P2!@zqx-*6XX+0^`$3R%VxXWh>&46N(M*3e4!v|x?0P_ zz;JcimEHAKd(r;RDWuYn!TEa&esPWR;wSt!&3B8PQj1L1kTSh0(72!CX}`k%%9UyO z5p|+vDSCQr?seO}^d5#CHh{GsJ_Xtan;SJ)cm-&*k*AHt&2laH5Kmg}Le!H0xQrE) zkV6#%^ZDQ~ugkMHf$K@pLNE!&Znw-0j^Fg@=t3qH(4|($VzkI`6z}k80?s#wG-&V% z{u(Pwk=oJ*?JUY14m}qh?KB8Dn=T%rOz-YWT`qXI?##_wAXP-X=aP%>zB^^+>fn`; z-ZdR++){7yW_z%Cig3Csu3!1cczLN2xg8#}J2I_yv|W{qy;FU4B%Kzobr~O76cu!b zylpsmzvHxLVDt2flG&tuTcV*&pE#6^+9;QdIyO8s(CpLlvYqbKMY6Ng$AZhNF~pwM zVVF5np(>)^`8{Cy_A&eN6>X%zG(1(;+miF)X=?T=gN64*pR3i+Yv1^kmB;KY!fAjm zH=A&Iem+!AcjK{M5r;d^Nu)L6@_f-Xq$rK|E|mgI(HIcSG14`Wleq1@o8RGSkOO(# zm+|)elGD_(eA^RLm#J+j)LrDAt`WxPxeO>i{cxc*ebFE_ePw@B(EOpY^MlRMU4n+x z$}nhq^_{g$A3JD!ciwzR+M;d&SN6<`(PqAHd+BXFxx14&MXw||u{64bx#;r`DwFT! z@um71AlK4l2lvWED}}R-r|Zao8*sKrfHjO#4hKaN~;*0=>tU-}=ZjOdLFBE-lhF`!j4OPs27YdDXJ zs%(dDSxe62Y@`k{atU4NAm3XRC$c0lX%Op)GVkm5?fLySnsx5-PGj?He;OMe?40=h z(OPx%$?=0jYyCtvyES5`2foMP#$t;RemAzumW|(VZ(6C@9dF^z)RpeDotbw#*ufYy zg>g}ipFG;Ii3dV$&aig*l3{GR+Eovu{5y2XrIRiE0uc|JEk-<3RGn%_N6+uvi@2WV~#_7U5UCKoZ6 zF|4hv^)jd?Vq7lno3R^TN_Q$e3^~tnBZ(-&h-UVj)=5-RkLuUSOY^K;*4ucI7SU$i zb2ssk(dU0Ji-({10b&(dlNE)$We#@z%exU234geJAYzJE~pRPj`yK?z>B0*>);W-r((I zBl=)EzIr!>%cjNCDecUgG-Naj z?soEslf+>aAmeJAblRg5k^R{BQD1)C$EiiI2s%9(Gm-!D*Gv-oQ2p#sTpi!$aBYLh zI z?nzD}8}L(|U!x|OZHuxSY4+e(9xfR3>0LLb|&mkDy4+y@JGwC!i0>6P{rZg7bg9?}3#wX5nXBnEdmQ=5$ zu?y9|n>Hj44<%pP?M5bkhFlY4Ig$*-#mzV~kMlZKULwt!tFBp>Hf+$Y)Rt<#JK?bl z)t9PptDO?Bmww=jMNHa=W<6Hx{QB-H?6I2mdF!4)03YNfoMNrq>J(jCS(9<$t|`$i z=ai!|3jZE0qEz@Mz9#SnMxKXwsiy7vSbai=st%>6dwkPzTv+Y-YxY(xS{a2X5nb-t zI3{h8TNy?9vg}e3@%nT|(pFxD+E2M7yVdSa#sutWZ{+N{p0UxsvBY`lHKWMwFLT(Y zQxP}54VhaG%{v9@PNH^iBgx;*9f#N22UbovigmQJoJ}{zx!zoco7;qVzrb%1xykPk zNeOkh+TL~4WzCewZ#6_rcS!NXSe5FHNOSI?Zn%l85>_wJJ>RfDHzsAdkEM2wGu)Zl z4Bu5uRKB$b%oHn6Yl%n?`^s@oq{^nZt0$K^%te}%dNGLInb=6ONN`Y(>7Ov-CGAu_ z`K4gnyqA278`%ziq4%(fwdcMg?VM1PP`m1U*XasBudqbFalYhtSK~C=f$cLsUtzb- zsO~XuCF{~_lKV6U)?66%G#&Yp9f#6`D+5O{&IikFWraDo7y~+$J-bDMI7naX6e^C8gsVCjxRD0GS&vWx&7f$59XL|O2%BAOKynX%JU03nYWX<+$DVRKUe z`^>zpIZY4G*<5%${MTw9o!BxYE~&Pfoj`SRtJKe^6C+1XVE>c&%_)f96KzYt{pnE; zd`*Dibf@FIb3IVh_xl>wIcDzRb^8^s*>y8ICu>@IQumpc%ePne?NEbZ=gGCY7H9bw z%dSR9s7u{!s)jXaBg1_NDHuo&LwRU>%xb%_j1{!}i}fr@lcLBKzzka+6r04P#03xI z)P96Ek7Px!YQT=zA+sJod}*R{kCNAv`Ml5JvG-J{ytn}q-iu;p3^)b=e)I`VfXes> zZC;So;ZKLoIbfLKHfIoXpU6o~{5!*b%9Ua3G?`FLg2Ob^1bkY&!G!cHj7GUOsNL%> z`Q>iSFCWu9vxjqDmr{Z6BG^szQzAJ=_hYbq#{)G+g7v(fiBVfL4LGjU$v?(xCp{L@ z4SLsI7fIOovOhMYhoV;yw=%(Pg|SsGpPk)#LwnCNl``yDPyh97)3c_?S>u_Pl5c2o zZ4Aeem`oGM%X{^%hd1E+IC}sEO1xr?(k2E#H1DTD%c4L{ipv z7zw(QMlX+pqdA(YQ{$}PkGvw)o!MIOJFllzppJ>FOor_-a+znINqDzXPfOk=fn+zt z(j@1A3|ApD!PZyj3s3u8S{3Dj##*cb znepD)7Pb!c>0p?*zA{hr)#>FsRjeVI)>E?IAB8D6nIe9T_oaSR?bgE6ZmNg1;6ako zlDIWzLbiQ5Uglf>nz7HwTLx>0B7T=*G1R10>fKsaAQp!kE0%fIi05WXTA(g zXadhuFSp~iqQA{_-?a;l^o`9z+ihpBXR$XQpIc9tBjHq})@q7rX4o%+AyZn25T1gT z$+~1ss~@+y>=uc1a+Q2QJyHN!?=n?bQ>+0}u)Tm{a*I=&RyQ{5Vm0~?&FVb9n;8|S z5vImL{<~$$CY;+9Hvq=W`tx`9G5~0qScvJwK64u@m*EWOGILr$Qz(msdoAtzh!kd{;tB5Fg!l%z zsK+DuWiaI4@zbtKS|Qv9T%cJg>yh_%&_m5YJtmAz7ykH3_ow?>wvlaty+`gGS>ke&6f5U4M4FiT8ZHpU=nh zaeur_0t`jA7Nji-zxTToEd8>2+(EB%J~t}Ya{fqb5{JtK-@Lk{&SaT}b^7ekrlag**n=>y_$T;+FT=ujTr0M^>=QklZ9ua-_fwC1ZpE+EqgT5Kw&+!eepFX(wB6hj&pX0my)&K&-vo8DQ zh!aLUdFA59brKa<>oI!K)%#7y3(C=LX&`g?x$7g(k93#*o+Rb&vF_>3qt)z*vUhj_ zNf$5Ez2hm3%*%^8gl;TdhU_s(^rV>4uFuDHbCI6y<>qXzIZdETSVe;I0dV5CNS1S0NyU> zJW7h4IiGfBbfi^F*hSBm+LCbDA*Nz7{ASwVhXm;MqEgU?f{Rs}RUz}Un7eygJIgNQ z)?`&!n`$~od#h}jh00o7U+(~QBrThYFR+>q`?5M%hKlr!#j5|@@Jb-i$!q%kL#tbqGY%JplbBsYdWzGv6D zdtkE^_ms)nMuKE%`N}14x!*Lx@^aIM?yN@qVlo-$oi@Q_{Y#gg6vAia=cxp~lR~@O z&GH0iUZqy%v{J-{m{sTp-&4MrP&%XVOr$+=dSOIVJukGeC#=!&4CkF@m10pqif-9-K$b*mZNMdI zMcT$UzmG#v$8-AGp^Y2E7n2&t&by7F3x_An*-F3UhGnP&+w1wiW_=5Uv>JI7rFHKJ zy}+5Ydgnahl$0!|hw|*73d()6k*eg1eDUPqeCkqVId^7@75(h;@+R%q&d`?YIFF7! z9X|AhDhddb@3vwdJ~kL<31rj7qf3S@3F15Dx$!MjYaM|Ax(hhqBgqY^ z6>2CFM4-M=6!<0NKLgMkI^7R%0(p>`0GoqAYN*U%ImH2nB)ylrpaGjid_t2)l_`Y< zRnsAer0=Jr5s^CDW$ikDBF`7K#g9ZusMpH=RfsHLeo)<0-k>0;AuI_Aqu9jTMdK2% zwZm}~b}1D^!=u=Ap%2R3qfABw{)1lvR~7{}mGsLxUvA#>mX~xA2Hn`NtEj3)4C$Nr z93@p3$E1HU{jYTpsBi3fI=AyCe}*fgR5_dL_(Mp3e1uO@#oZzncybRX{I|EO4+*^} zEz4TXzXyfhV@D~NFPr&y)ylnIY{t(OEC}xb8rP$NkIM;*jU)r=Zb*#4e=L~CbawYqo<9`>kZ37rXy_r7wk}Cq+@-0w z-Mzi{tr5np;1?uahu!mZCEOUl+5WvxI@l5VLji>=PhDRp&6gBj8&7qMY-xPVisX3^ zl3|^?kKWV4##WV$fc2@#%dG4wv%iK{T_~)_m|<^Wen(H#*&6#AHiZd6qeeq<>*Txr z+Dg=z)E>7=EQ;`Kk!+38Fggh>kQCz;tCUa<7qoxPmUIV-=0pH8*|@CtOQC8-?>I>Xa^4dm<`{Or(?DJ*r~2SP!wKE%E#fBcu*>VQEFN(|@X!V?mWCmg7xyIA6}3~(lKVd;<| zFL@4s1mz-;5aHoLt40gZk6V(Xx!7X}BYuYQQYz-zlUH9>4=GQeez;)7TjX_>*_n$6 zwCY<3XqX76?DpIAFu-@rh|Yb$7r<@#XkOp9HT>El8CDvjWZIaWJdM5vk|X}f0&wPh ztrl{l*o#Mb_O;FUkG?fVK{*S zIcqRS_W;C62Vk8ZuI!%JFp0b6z49J4lFbV4%XQ8TK1>E0sOogc*~a;kO{$%;+TAA@ z*OY_Q7y%`B$68r^UFWIn+4>E7X}@jmJtMro55f}&_WeJRPD$8P?H*WmD1fw&;{Uk1 zn}M^M6m6ebBhbip0T3$x+8N+1$!`cQ{&UZ#jm&f5nV3ctA@w3KH2f@*nl4O>#Nt-A;B6MtECG^}~ z0!X_B`tR=S0!PZVoWq@V)^0#5@ic@9iAdNe{NEAd*d#0UF_CO$iG(3*NB_vFgW zwD-Rh>u3FIuL3Yqs~{A(Vx9wHTLbu(qzPu3u}?bXu1<6?tpWxh+p#m&uT(WBl~_#j z%cT)8oSiTPwu_MaXMS{+Kg(?j0Br36;DEDBX+TZLIv=k8+#R<{Y-N4Uht79?)uD9( zY+&h|Q{UP{6D2%E}x=?aMFKh5O!G%c__5}D!AS7(H+I^wT zOd@H!jnP#N!2QA^X}0`UTkgxo<*E%hcpSz%psIG?opQQ(8=RTnHCQBB0qL9~ zf_PSW#`v>+a{1c1LA3?Oc_%T8!g>3k%#3mA8<<>67Z$gW%LMK(mKrST@Ezj^w|ICp&X3t%TN`md2|H3Q$?I}9;79lkx~JJad#E}I*0 zb$i?g(Z+ps8Q0KL(7p8^)$NBAVLouL8))|J+!aHUb_>qT> zgz@%1VPw`8#?)rFSBG3=tCozn!%6dH?qBk)Q8H<)bEEMbSYA(dfUnh60H0C0bx`f1F&Q2H06uT%J_RRa&}tq*&{B~I zkCto>QK@V4-<+(OhCU^r-xGitdxtEzqErTWfjybPbyw5r5SfcPLh3Q%%1ic+!_iG|97|{t`ZPtOMi)9$X7PwtNEB)QXtr2%RG_e4y{x+6njx7m%B9$}6=>9G%GC_?Cpe0XJFT9Kqjn@9t&hfWIC`{b5IclQfHa3t_TG{y}*^ zC0P=u))EkB_v7hxWDf3`Q`tO;nnyR2rUJ`gL6OV1HsyY<8V=lootI%eHv$BBstxn= zZP>I09=1-kw1$8$CXu7O-bLx)?qF~S&NxN6fem0|_cj!0ET&8tVFrXHL>_9NKX3f= zR5-(7@$?bXjZ5%&T;<&C-Z2hE)`7UExlT`0B@I*p>E_w!)5sRtyGin{6K>e&bBExa zyl==y-+U|Dd*hnjj)kb7X1c)6TLgp71uv^@iZTC(Usi0~L|kV_TlED$e)DDIp2+AF zvP=7|zxk2S`=tHVPk+h!gNAVJkbdhb<=xfoz*L?SNu7gl+!;TtLR`P6H&8vGRl3gK zB33I%eq*DNd8N(1kluFud9PyU{Lh$Z6hZ1l z^Yg|>D%k}zg$deA>IMlfyK>c62XB$$9!S-f85EwH?iKT#21YpSx~fXd7eAjs5E;aN zc1beVrg8mS?F}N}X?3OAc_e9}encD#`ffatpET4VHIOW|TKhP4v{0n=Ordn%J*~xP zMwjhGi$AIKt#6G-pY;>gwGoUB+fr4P{4Lj=u0tfRN5YZN@$neswi)iw zb1gXgSGSk7Us-n}UHsw|#w)K{v9T|b;}y-H6p<+(#Qn(sv-Nv4{>|D=vy0iflkKg2 zzr@>BMClkegO486FrqnIZ6GXOSe?IdAovfPkk!na zhPW)MP-xNf{uF=B6WM?St!&B4W8d+BzhnrKoI|(D#dHR;U?r(6i1*MA%?^zZZ%dBx zi^btYj$KD5M(%G%1L=Q}cW+w))ArdyC2#j8lK~eC5w`!Mf6)~LqTx7`RQ|P;aaa{y z_o)@(B#|FHMbGiySB@uRaTrcV#>fz)l$AD9YlZ2T@moMd5XZVsy z&p%bd`XtOk9mOdkTd1geEX_jC5@*eM(^pj1-x7_J-4D#M)}#NQ~BY*>bhvWyA- zBd_zTX(JI!OtHdrSGMr$MWBt$->%J~T^^Ms=K_rkR>L-cki2wwPx=iV~L0uFJ4!v@k*d{S3b7;gzsHz2D(x6zs2xh z^r0gjt0J@`oanqsMepuz63#7H(qAiTG#xx85uO2E8rhvy*ppq%w+;KZtxQS=#LQ1L z93el)Gu_g0{nU&ARYkSPqDTzaw#z+#(QZ}^W#?8-XehVo#+32O(+Ri!IYxI?RN}}E zc9Yi=*}=R~oCJSs3P<@ncYtD&gzqh5AG^jTf~yuOtM_3PS0QjtPcoFR_?kHsL2&Ew zNQc-I#oq%SH-cx1xtcwUgFr2&z8>@uCix9gobd+3aJq7C5f~DuQN0&qd%M&k2us3M zQZ$do`ycBEKs;`cBR|9lCgJocOcBg=;?vxi_kpe6b;Mp88A3|LVnZXO`EBp&atZ)V z029ywdUPu6O1Oo*Zfhd7d~VPH4;un+@rU%+vUUdk6V%P|g=G4GyM|SNyF$zpqKp*8 zV#wcazLx#zHj;QZgz1ULBAc8wTM(0mAZ6nPGC<9f{z+=jD+ztWW8442oL;J6MI|^k z;+mbrL_M7&h#_G#{03JGe@O8DdKy7lP_zJ4kNlS&q%qli0-j%Wbv4%<(~T*pc(T1x zFo_LceYfhg4LU=CXI|8AdlrK2cfQkJ0B}N=PaR(&d(LYu%JDQytF*c9c;5gc;Jj99 z82F!le}VuThD38hiLf>yx4my{&+$Y`S0nr=*bV6wViZr%X5=X-cnlIz{-H#?@AM23gZ&F&=rLnnenUqe)Mh zpZs?&1l|h|zthP8087{U&kC`w+X4IbVI6|zb(2HvFghV0Z6zW6`j@L?&{Pp_C*YvZ z&RtdMchwxu_g*JH_;jOR`oDQY+y|>0%cmu~RV_HGu zC&PLL>id?`>iH+*phlqlwvrzoGzl8L^~8xPSJrQ!7I~C_Xa&`Mfgy-vdi2q_D!~-| zL)Ls(PSqr63d~p%OanJ6cNWioaW?~gf<|g3FXEAl59=AQSgua6%id>=Wxe(I-um%E zVj>{AgnUMg>`wN4E zKN+3LVZ9RsO2#KvP#47*(r51qJncZq$$0+=giW*@g7Yv0-?;NF5#ayv%ZXtL=x9$J z1?BAcD+y15UN(#Bn|otXrj$~B7iinw7vrFFVX2>?Uzq9{o7pmcLBlHWWc5zbj+^7x zC$eilitS2ta>uNK&+1mI0F`mA?GPMj%jrSj*lK%-&^m1(coNRR4c}^)JzZ%wyt-s< zkv&J(59_eD%AQ!G#`GhdFj-`0`@>QXizTANDSfd>1iyCsg&rZa_W`mGrt z&1blL$q8QSf1Mthg@rK%u7C0XPg>WnN=E?Vn32D8TLiZz4TDXI`m7tC04!=Ljwff^ zfYA2i12g{u>C=@r9-x}R#M-ReeV{dQ3#(?;V)9P{?rY(tRp2_gB3I>H1pVouf1kuM z6W{%!dv(rabRtNz&)e#OS3VHDHRsJ(_2&HGi|_&g-{w)2Z>_0*g80}aNERh)umM%Sm*Z?U*&KNy?? zPlM-{E$@~fK@Aan?_S)5`~ovyT)laixRM}zJ++i==O@FQRn9+qDz=Wk&O$TTmPI~Ih#V8xeLzBQ;a0%i)QUebDs9&5OEDh_( zVd91+zlrUxDW-C3FM=iHIq2`&t~FEYNZ$o0(^_XZhsV4CX}Dwbp*{f-vJq8RwCLM6 z;tte{lRcC@2E>{#p|7J;BHaD_v89)0_hvymg9_!XJBpe_FkTi02BGM9Ga?4t`CE-p zxVkrKlzM#5USIjvzQ4)9n!q*PiyU8ftK)6T7WrYm_h&hD;=9O>XmQa`7r6nmk5J0_ zN!iyL%Lpvmx`~a1(oAy*9G{KarB=%2a{(h!mN(wIIU5)~qGH1@I>-lu zHs#LuT!xI28Tl_Js|J~bI8*i~rU>93%zc?~NoA1L+^B0EgP3`$fOZgZBKWM2p?|=hn~cjF{WVU0Q61kzH@TBvN{1R=h`)Rh@${2 zf9)SCO`Jy#(L`fmf8Sv@Kw<@~Vb@=qpZpNg)N+|#c-O~{^8TNq*+IpxtZIt;9CsTZ z<(=l%)~G~Q+k}-T;hV=y5O96rD9Zeqtz#Z=xW1}ryPMey#0EA)hF7^}pk-!p6|yTl z2M=}^iP+?9?o(d#x>}v)k%XF4K=|Z}4S(|{F?08LDDV`6K(wCBVp@jOy5O?_n*^yj z^Q+SgU%A;)HJYlv#+P$OoUuqMQrTk*SJLL7+#+Xh8H<`()#~%z?$(n@X?ec)WB_#g zEN3oqyiqj+rELeqQ>1K(NzITIsugQ3g75+`;T_n;58W$kLG;lsz^#s3!%iwy{Y#iK z&l<_aNOyb1X8e>VKRf7$zUm9Drqlc0M1KulN;%1VKFx2E?s5_7tL^13L@OY`pKe<{ ze(RIf6q(@@clkVYCTE(Uv4N|vtMYWpXFuFlH=g>x%iiYu`^AN0xEk=!vI&FaPqQ_! z26UXXT;epnwfxO9u2oOPL9#6mpJp*%$rVo?{j_6skB1Zh8~U_UD3FBCi10MA-@bMn zD>ZXht5ooYiSB83`RBT&Bsmae7-fAq}rz2$8^Y}`iB6RMp zaD)VM5n2oYa4$5~y%by;<`Qj-Gq9|`^;#XOdnh1S@}L^L>iNBIZR&Ylo__Y~;s2X- zXTiv!OSLcuR>a-Z>y`F<$8SQ^Q^Z+-!w{bfcTj&+d~DRaJcp%|2}r^|{^ z>kQ^dkjyVlvk!jxtG`Ufgn70#T$fs8oGSW-uV-_9_4V6TWPke)5GaX4eg)n2CRmDx zw8Ph`hvQp661Kb%9%PlQb9^5_MbRj`Ly(eexQ%@H>9pr2^OL^m)X)KIuA;?-NS z5^pc>dFL@z-IM=4<|8UUP)9Wqb1%60`=?teMKU>U4d3@BJ^PnF1ZZCG(2ryOPb`Cz zKD254S-JU^IyR*ev^ZQpaJu)Y5JFZ1Pux~NC2t9KpB0_^27h9|q~z1a6RddFgGWD0 znLoAtr|A2_5SBOFe2QZ-kOcXXHxoe=F5QxRCx~5U$DVU%QBf{ZviSjz=a;WB2J&re z7MyGgA);&OzoqmEJ8H=HbSgdtYn}<$%@|GRRjimo-<=zyyULj)9-_$Vm1tEPe$ho3qB*8X6~MgZXrzFo<=_bjnFR>P2-IpHWRBndH>dmha9o0H#tqk0_RfL z!Kms#e*ui!-xp(5h4G)c@i%f|lOfFFaL!ufsbIHqXa!dv#w7hVt4@2JX;^gwhHWt4 zmvy5(G?w4}`fnL*AuU;7Q&5Epo<6ag{+jh~;X!!4(gOW@l5gQ9MIrIj^gZ$naDyG+eC0rf-6CZwGfy;T zw+ut$5=yn*(ktl?kFNrYq8=C^%)KNtB+X}Zf19jos^KdQ_!?-4ujL=?`r=7EPmON>2`_XnRg9Sj3)4RR5~ zPig^md$|r8Gj7n)QVzvAPFA~5mRy2yK_}>9g6lx3aD0=r?HS{8S)lFe=eXULrR#uH z!=%OmW_>E-1au+=md(-S9!nZ>Z+J{9A3t9Qr9rvVPf<&sJ1+$ve%>CXm$% z0Mzf1Zaed>qBdPrKkagZgTCLe>)T%*03avOpW~jg%1xKeVZO?kFh*m;pf>IE<}L-J zKAdYL!8Y0WqE>ChuECAMMnHuzs&;$**>UU+DD{`l#=tcXavxW!NOuByR4Xxdw)N{t z@&uzmR3+AKURUl;f^;0bN-492yxlK3HI=eT$gdn39>=B&B4i}q=z_uOs@VO@ea29! zk}6Pa>eYBGRXakWVyW|i-53PbiCb^{sx-U%M*Qw5oX`a}$qFZhiZ*>E__O%?^#zCu z)Bw+G(B%{AYh9pwT^TdC4^>HI**NnBJ%Ooh83~MsDPtij>4G0WFE<1A)hzS-Nx^IOUH~;Tk)~mGQ8KCVqVb^ z{WM8qtezeeQln z&w_rV8(_&7s{#){cU-d=MWT~q#Hn}F1&oHS+0CPA;9>x94UL$axA5sBi9)i!$DeN? zdF#OR#*Hs=x6Hi0&TcP~iPAjDLU}f*@J{w0K{i8K!fUU{XyAR>t#SLfYq*RTOPQXW zIw2{9G3UDvF)2M%a?pDpZfx1HqtL9Jyg{&tLPZ#z+;cj#4l`_l**mE)>Sas&apJ^-9RiM2yml z+)+VpnQjI%JE9TQ$pfsa<{MgO%u-(Faq>5FcA!HRiK;YPGt&Xf@CJp3)zkMeEoY>+e}MFlBZ zA@FX(Qg`bYSY)XXxh~Hx?yrV@Lhn0yGa^%(l5B{+dHn)iLLO@m-5|Q7bFLDdopm{2L>_Rc3M%# zp*OB_*-(dW6402J!>C@9U_QCy?r@9qmdaU(T%Twtn{9=ajENvK+yJ=HzAijZkzG^mBo zcnAo)UYav3zZP@6NoFf8qP9u2yrmsfBj)#6%kq$qkr` i|+{gG5`LU!HBTmXQyPnP7qoRI;NOk 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 z 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%0DKG9XFO%JSbC4n)ncP4gJjyZ0~t|QhEbcDMn)a zF$%<|EN|D?`U`KVq(wWu!)_ixpo%QGj2HuNmmFDLhxb>bjG~?+CL@$=LE}yW4TS zlO1$8#;S8_+c{tMi_XCdOiWsuvW1pUut-gEtnyb%=9rjbh$7+Jv_IxRI4!j#*tv!D zP4yC#%rRO55o-I%cl0`&)@G4VIu50?UdeKe`{2mEiY;kP0@}Dec-LdvhPv_+*}grg zg>YnNMY{3Shyjrk_njgp7)2SkU2GXcr7a8-Ak&;}+q+Wm8g9ulbM1Dhg;w`3M>7c7d{jGDFdM-L;5d3!o&{&J57gk8+%z1xPk zHz`OQdnQ-%^Qc#7WmS@h<&TBD%ga+%Aq=oIenwB~@%LFIezqgfK@h-dU)V{plB&L_ z8P$O@62!nb0JLd-S#c_NmulsX{z5sHJXx1qvjQn2ba#lnu)S!ytE9;j;r*UU$rk%$ zX<($x!=kOqB(T2?ViK`X%~}q$Vyk?(fNtN)(6)n&#><)=LuJCPK(vFdfje=}Ze7|& ziT^k*O^%^~1!XYA+1Yd;CX^EwShoO^uF%I6@q73{ERuelGfN31}#KUN2w5N*#4eM$9++JQ5NC8IB^ITx~qPOWSB7 z_a%eskiu?xnGL_BK?Ba4tJ7kT!X5R>ayi#s6-72YpJUJp4*(zNQDjM7MgX8*0ycz&Qto?Vm`i-J;9{obzSRx|N(!QSb5W#}#amewM?ug-BdDO$bSn# z`5sY^_DZnDL`f$7NdJ|Z3THVkb@;~;;)%D1;Ro^}tN^XBLIn3`W~g=X()=ppPMRdX z)EBffiiYslh&nu{Ay7q|ymCD|k?e)7SsgB}IjRKo6II)hgyut9H)kG^`5^tR?2*)d zhT6pO<9__=t%6ZHbt)Sh5~8HcR9sxD6fslsUL-Y09)$an9fKWQf}NJ*5A)mqqSAD3 z*`vHqohX!=`{+AJ)*-tg6VfIDMXEv-ccBU6?K72xI%Pw3Hs?wGZ5qKuwYLoAJi|V9 zNbyT*tzt%msr@emJR%LcaA(|JS@qIz=iPFMt79|6_OfEpPZ`L3qnnhWT18g*vUwYY$VnW-#x-wj#&$O_ajHrP>F zb)1xga39IfiBssX1!CwL;t`fl;yhY*IHT~x@kl}%^f0{6u5J|?9%@)fqMfuC%7|M_ zrgkt$d|lMp3{oD78_?!5Wi$p33Z|4zG-ZAhb$Hk!R_j>|i9$+>fOXyY3byr(s|?f{ z{tijg)axwqg{q1s+7m)d4y_!T`?e;#u3)493| zGI?lfI^Pc@*o@Tl3wE#a{tF}#=>s}=@riJPek?tHEK3i8|xvxhC=ZYmeC&R zP!;qP{HErUOBGwHDY&@gr(#f>^M0z2s=|AU+!zv+f9NgZ&vEYTzlNc-u@{p;0CIIl z8c-CEE1Cj)U!?zFr7DpOEd5aA-JP|P43I4bXm%8&03bEP+%9H5g`O@JN9May3HP}O zM%+X##?)EXNL)t5;()aYt0<;gvUe^N#Nk@g=RpfD|6FWrk31>Q%D#m_S?Qe_0nAMI zD0=c_eJ$u+0~a^!190e*w{xk7$itZ*^OXNCI`n>xye?mOO0yyZ19p{ow0S7pIiClRrRn+C^XTjjXIJbih;r9Fuza96SV#Ur zK?z`q=nTouUnZGPG$a`1UbW};H!+#QkM zHAF8os7$B2=In{6ke0}Y^v@^M2Cz!gtPLGZfeg+8@ZIT{Wo(<4BH(Hl6;(v;39YyV1Y zm7Hg11_57)MGv`X(FbQ4BZF6^jHBtH3B<7>$e${1e)}bHXiZTKRdYdUJBj|{NTKSN zo{MmryFb-tvM#?Pf##BC1mBC2U6G&<6?TObiU?U59D}fkI~D%4NSE4`$HHmRt4KP8 zB_+gyJB3)_Cs$oUHq8H1M?rMZ&$5;zsoyP{lLK;4m)MM@|3N92W;I&CKNUK;p@wLX3cNoIliaFDf+B(QA&QI}=9 zq~9zT0~P0$5`-WR4a~i8ga4#5ChZxPc!R<1bKQ z9xoxRWTuusb{BF;-hW~k_F5)JuV#`poiGM2g6ZKmWJ*7bE7j0K5k!#)OyPUy1uXiL z2}R!p=@NEZBrB1gP*E~w|DoQ3GfZ~2Sq)U`g?x`R_Dj0)CTCmO%Qhs@e0lOW?uHl| zz?>`KKpl6RLE;U0$|90BNRF)-dCLKhEsXg!@{5a13L{7>8e%qSIn>dOUR+W`kqFaD z_Nv0vtXbAR;^~R#49WNiIjn(4f}$5uTrc#pSFSlf`9MxTnJWX_K!%IJu^Uva!=yns zT6-0P-AJ3nG*2U_2+@E{;oblOJkDh}#w6R-L?Nt**xsl#5|0|hDkh`ts5S4`R2s3O zufsyyO^Vy(YeSUZaj==q31j}O2uPOR!Yr>WWbolhx=|@arK}K{V+V;dn=%OQBnct3 z$1)Yl2A9I5*A%U>lp>N4)q3ah;B zmuy?}+8AF6*MVZR&jUC!W#N&bZWVfUyeP3{8Xj79=kg%+#BLreSky^)jy=)}-Vo>s74c%@m~eZZXF&g+ zvSuxn^l=iGA#T`$>21*!d}S|xM57VB7t|EeCj3SHYf|v6uhhcji(|}Q7QxjK<*FS~ zR=kT(qczNt=DkP(#abG&U4T$(w#8t28M-1h;gD}ga%tX?NV<52>h6o+W7?jEyU}9O z4FmWkXu+Z1Dk6g%VyAhpcC|}}ZpXk|jVe%x!`X*iC^ZD+_^$mBlChf!^Zm&bBH~rd9Vu(u7(xR<(clo2SX>Q2ovAMskscdibHWEzea*%m4Q5B$EY?*?}wa zs_IZFUtEoDCpk8}_xAne0$zMH0UNQ#Q*bALo0DDcSz27%=0U{pkt5BDC7&Jl=se0a z!~haJk~Pjr!jmGyQ$eJf5=^!TX`M=l3zhO@MKK}~8Vcw`*x@=(_QZ_vDyMZ_vzQZ%I4dSY)}UNyb*4k+ z{Ru@Uv>Snw8bG=)w>F|?1Ti!xo0*lh)Zt8+VFhapml-*d%%{fG!b4HwCL=%4p+i^a zk~L}sqXaj%RObvRq(%=!l8Jg@bOnxjU}EK5hWa*eT%SUk3l1hN=RHkH;07Y3lczJr zz(A17C>cP3!@al7urJD?HO&$I-^MQTO9!)zm=F-egp$KyrCI_(%Rb4^b2fgT&>Yf` z$VkhPs@L8ov3N>YX`*#SI_ZYdKgm)^0yDl)@=jr=Y9})@rucJ$(tGs++>&T{-C`li zq!Q_co@Y3mz2=^?5)d;;8#Gx(mBbYC6pi=mhyFrOQ8LfIM=@Z=m*UR_Q3)34kYX`|nj#&-*fF?<3szw= z8;`k?_?7h(nj-_4EBtO&xN7Xc&c7Q5=xbx`MC|GQjuZ)(sf^IL)*;LB3E>^%&hbPq zmohAFNhQ*18r9XyVn}^bOEQeF(hVTLzoQAOGEoRmemT zfKq)OduAt6h6j!QikekKot;R-qTFOcL^10+L_UIz)$}SRy9O$jEj-!lM%+WX(5H$u zUC^RUpzBX%Cbn5!O$K^|x*z>qmO`l?jNy|~0m+c@)v*UD=G%A_Vc#8CJ3pp0%v!AU zdvVdWu!L>vZ2`3+(u?1CQz2hOGR)+Bk(uyx)h;Wbq3mS8|%+Mq{3vHU1nNeK@QBckslNa<%8&@g{Eu|s}5sc1I^f?MtcW)7lv@^YfLPUDi zDVhWn3Ft!XZj1W#z(eg!k<>y}1UiK~W*~pEYnT1BSW)_^k)y5l*WAn=CG9|Q-yt&1 zf|v?PPU^m$b_JQtQHK&}!E<7oMy8l0jNI=als=*&y4d8#c`fq^MlsK9BDTB)A*LK% zQ)ET*nSQG3Z9N0DU{@?QmldLo^pcF9OC*pbfI||xpmm0PPNQK|E@O@6pDK5xNnXfr zj~z6S5+;IWI^Yo#7n@-o8w^xj99Uw7kUzf>03Pth(UmjTLkr%d7bVA-QDsF!4BUqH&T9!Q^`i#q%#+Z0TZcYNJR=| zseDK)ioYBP77`O?$zg)F+g~NpPC^hTQ8II2piv7})mru!k0DqH$AWO%Qde~PcU)g* z3&q9dTK}2R=`(hq;pwyEZ**et>cir=lbi=t)hMx$Ky5o`tvz>dlPi6!f!s@6H+cPfvB%R$@OPj2^Za7HB?&J>qMt} zdimshMj%+c;}UKJS_u+>1_2S*65@&cDTLAtfdK0N$Ru=SAy$1~9xfZzio{$ByqDcK zM(K+th8sHgkUnKF>vkV4R`t*-Wp>V&jnQP0!737EZh;@>X?!PWv$}ohl$Dv>bdCs^ zKDqQBjAkcKBB|>yd|o1LKIc1oF9=9K`ISdX5VlP`?C2EOONt69J&3^pgYy5+LK~w8 zvrL0&@gO(WzY)9U-#B(CCZEOLvT7B~krzi32)Gp+esRiqzWX)W2!4N4EDT@(FB^F# z69*h7{SdN#d58&Rm0cj9szoEW2FL|XBl$k`mu;{oZRmDP(X{63;lyf|S^nP(|3@2M zSTKLS=bU~*C*K5gva0blOXP?K=wSaD?*8OCEBLG6A@296sP^`AT!i|@sDw|=Pp`h< zv-F~~JcF%;h*;zQOPT-Ha2+NTi@sTmeAlOg!ho3uv#d$1Pk=PK7%U4P9kklII_q#~ zpIJvTj@WJAH@}01))UCS8 zZ6fu(-tPY)njMC%YY)r!s3NNi8ckr1)N5|&EJdE|$BSv;Wrgt5q2;>1ZNa|JrXPNS zh*`&-uX zqOEJZAN(-Vw{8+}${HKfbMuBNPf|1XdM_@)B1U)kh|0fyc()lqzJE~k{!;bLdiP+8 zeZY%8{{p#VQB}C-BdI)6Ty|^)pQwtz-r$JG;jwBEoj!)Q!w#G~@#ns38}n@b+~ynp{e%z zYdV{A#Mpf_^-oh=YBH)S85j?ag99^|-P3-L!nDM}EV(<8?adYJxs-pW*|Vv;f+T0e5j)%Jt9}1upcxTuq%N3ZJ>H zm;@yB998D6R}}>_@#J1fSGLZ+wKIqWSMN9WoORbaQNAUCd)IFNc6~B%f4Qj|>;6aB zp$~k$2H#fT;$UiNN&h!gLr0*Z=Az57-2d`^|NCv%!kn+uWpB>@sowx=Gm~FajY1-z zkPZ>hMJDRs>AMv)%c|eJ}nrcr1F`WZ)Oh``tKpp?V5B z)%@y-;g|2Zyh^@%gAP#dL`qp~xclSGxrsMpB%W=CmI=J;Xu^Lfrg*+6vR6*8P+QSs zq~mhZpIATL8cVZtG=HAsMEHCLcdAp9pRuq!Z?~kat=*-^vdo$BMMDS$lFTJcbdeOU z3)kwOYevEZA^l0z`1tA?iaDoqNd&+9MQU*he^DyaRKehJIsB%AZR^^IK@3TD>{>h8 zvc`|e`*D@S$TFdj=`iY?-KbLm7fGzKyE{)@dv$6BR`7e&)02>>vFG%VzsTRuBkSEK ziA&cXT8o9UtSP*PkCgN$5b~-HI4ptRKxXgVCJVaZ^xg1Y>47Kf6c^1gNn6hH{6=Wo z?cA}U^LylF=?Cl!3Ymz^IVu6ioO9>Sr>A;eK0dw_a%5U1sSfaautDM9GfeNGfcutx zG9>x27fHcT>@*EVhH6@Lcv48Q?J=npDTw_DMuu*kJOk&CyS&(u5_o*?RWs$Pfdp+cVj%%vcc~^|6r)0z& z<$ix$d${{w%h2|}6}@>iFme5vEoxfENl{n|dc9rAwY}f)#fFuRoLiS>5xGmc9v^y!jYJ(}^K96Nks2 z%KTRn9@P4>otfkguVzEVY4!8Ph)!GNLYOzsmQLdTVpA)mw!dP7DT8Tjs#_-uMFYlZ z+}4fVh91!<#SJCyRMCl@K8HR(&VtVp#os`fZ`dw##ge)e+QhA>6$A-@@6_xSUiYZ<()6FZDB4+Y(OP!~W*V$*WO3nAAX`o+t zFIk$av1wMWHM_SWYZcSlTZZuHcDFlup9)%ASNG(rU1iHv0yB*(YsTw$?%DA~LUHB3 zfYyppE>cr;mWqq>BPV;q*eVmV$N_lrvz~J?%uV8rov3#iQYSLs^~>)z7o+onf!+u8Fz_i~K^D7An>Q#{egD|FrFS_;`xF5G zPmt0jVBRQY(ZHl<3k_ycT~g9}ZDgg>9qisT@YbCt?Ay3-wAt6wA2N)dl}WiQq+~7n zV=xqYDb1;0F~x{HA~UzDzkhQF0nU>aE&%3%fWs_=n9s?s6~3F+;OKsB#Pqb@zHw(Y zz{t4ItZgjCB_vzuF{%(Bnhfmdc(PYzFQ%4{PnXheSJAtI?l)FAM}Fc$TN06+n49#!zdgt0fP(+*@5dtsy@#WV z0rBXSvx{vmo=-bW1zXptT;o#)9(Iv~g8dTJ*|_eEjG<6cfQ$o z%h#&qgnF}V=vvo>H-0Xd95uLShX=q=b%$W{+{{H^D^*(VY6AEwog?_TCK0oJpJ7U}SLsgD_ zfrjR#cXg((ljaukW~bze{9i1nii=mRvkErUz#s9|HQPRW@V~h7ICf~@=BS#;Wki46 z!?#3oaT9tdknUySa23w4p#ryIME~;-;_UTd*F9Q8oyGp{j~I%1{mSDb? zG&6bVF&necMzS*(34Nhe`}iJRrnxj*#II$uG-=&?#aPJP>tYDLLmxPq)e*Q@wL-nf zi-)5o{@V6DpA=l4ruY`{oq(+fh_cy|v8AD}Y}Tv^?L2xNHw#HuNI=hxtSXA>Vu;L| zF>kPWx6UrpC6c8F^*KL;oPfk_5c1Sq=^8Jr!zkMfML7?5(t$OLYjN?j)9*y#x03T< z7E~cai8Ep$9)8%wCe!bM>gm4RWqx}*HmGyfS;mdS$9@L|TU3jq8dhz3c88VcMkUot z_Dc5}F|lr8aL?S25-(;^vF9ctE@3vNO&WFOGXS;X2Mg?q(FK65+HdPSnFIE?2}~IOImS zjm(~&{wB@&TOGLWwWyM~&-?%oKI{DLbw@fDD1uzTI%g8k{yDqzVi-B^`&VwsZ(kBW z%tjp(K^$ixGkz~n=rZu>VnK=hNKfRi?$8$V7&Q_U&ZvkXOY2Ar)$8gBL%$NOe0xRk zc#~f7#p$ph{Z_3Jlp-ihPvfhm4Q`iJ8xLt51gf%xq@;ws`{gKp93870Q)xY-{2--b!BsGlbY)| zy2*3xpNG#vUybIh>TF*js}w;c@Bf0dJgU zr8)SgT^TAb`!XAdMQ&)YaOT4{74Ak7Qa-C#z9y52J#0%S41dRH6&$8c5@E_@^duG8 zEk=lv59Co3+_xI-)otQk-+J@OyMESpq_Wu7;W}pG4Lm1u<;IX!{(Cpj20`{`0dkdYnqI7{>j_iI_31bt~#Vl%fAVPCeKP zyA6wPR2=JVbFdX~F4_PqC4$7#A6~#2fr}F?Eb}d1p3JX&rk}g<&}nBB-&D&Qc{%&& zH*cYBK23|}2(fGLj?Yi?s2QEU{0D2s1X)5&k~(46vmg z|H$(cCP&E$%(6csUkOCo)Pok#BEt|{&v8Q@E2)-XlqgJmpa{cOOs}m~yp7qplmxw> z`3_JA2G)f2-sko#53?H$d>El`xdt6h$G*n?`yVTrc0W6q)l5}nnbcaB%oT49yxs|0^gm}X(6g<4 z+>)+uFMh|j1if!}9RnXOeGeTs-i1n!1z8+bwD~Tg?)M)J5v1{h`dzbPXQiU&)=3fB;mTc)G*f^<~ zVlNy(g>clZpBMavg!3~F)^1~@zSUu*vi<^Q+7qde@2sd>CoBg!I5;fxdjW}V*(WGY zT|cq_MSb_1Jvm{+*D-1kYuL=;jn(CYu4qceT(E^onGDU!&gBdQQ=%MVw%?~_rQ9(Q ztSC3acp9Y|w$92rM~Q9&F(nv7zhs0?J|47wr^a|w>MJj+@VC+gCRbGiu+BTp_7QU1 z9LH;cKI2zrktHG0(v^^wl$#AA((#shZHFrda2tksLj}|8`GkB5`Wo%+wQOZ_PRaJ= z4nr5e$phE15xY@Na)ywh_x%l?s#7=4C%{u3;yWJmrwIp@oeZ4*;xttub$GNDQ*l+l zuPX>Mzua~ssRj+nNqpC5+unD*;0I_0^hY%;XYvJ)VbalYc0%FFfTPgQ(!WVg%96x1 zU}4Cc;@G-@;#XNlSMN(y(AUPwX9x`J|9Fbpd@q0a2ef5j{QBA>=u*YU$O7V-$T(J> zR|X2_>@L1t?T%9?*>Ob=(!)bRhW3>RpA_pboBd;hi!~_+2gzh%Vv#a~iUTDuUX5Px zFZ-|1z5{LIiP{|o;~@$gI}f#RUFlm{PHxVfaW+0=*E5w>O%gqTUw)JOClLbkZEdgm zXCowk@f{kU-V(Y}uiF*EJC76wBSXPV@v&q-nRBX?oQuLGv4_u;e86?+rj2X~VdyDR! zVi$aK9JyJ>P3As3<2Ms@d77o@s8?v*S?k0G2$$*9z+zMQ@t&p}#EA3_SlAs)ZHrt<+ zTXlSd(?`M-s2z@>gBF7Wh&>c=zJw62BfPCueK=%EOE-M4)Fe7+B{&vGu+Z{iIyczM zpD~w>eXSfIzJAyc>E)A-0 zFMn;tHNn#5m$C7hYNFb{LBpx&*0*e>6q9YEd@`pi8+UKN8@#Ql6gq%U|1an`3tRYjZoZgvf4KH}U^q2h9Z8WfLslr%CN zMpw^qM!x#Uos|fhoU5BDbDu4`4E?u6T_!x=-TT;|`r`IFUsX$O`VFrpj~eAIDv8&7 zs_OpYBgou(du}W=xwt7+ik$hMd-cU>p-xlJ-%(W>X zNfLx+l<5kTgO^0V6kR;7%2Z`hhs?3QsNx(Pht>92URFKUTiirYQJQ8P7UNj?M{dNtJQ6%QdeNS{MW=z$oj6gfGwGbD6 z`qDwy(;bHkNgwu&zQWB6l{i$g0$tAs<7&e>;_m%<>zy*Ts`IIB&=z*!Bl0Ju5{}RI zA~!Ykd=ml*{o@#F6wh#_`D?^JIo`hr`5^)f5H8?EXW8-El39g?Mc|-sNn<-Giu}_L z+6z=$DteOPsfTE_0Xk8EM-C~vIUq_&w!l$&+WPDLR+A-MCP$|9;8S?BmM)U9v81Ho z4*gfdKTn)?ov4Ja7RIq^IgMDo-Z0n^U2r(O47@{rmvI@$|7f%4ANUw3)ETcnzQ_liDEv@!wGCUjx27g)G9KmN(n2p0-e570ptPDeI7fE8y^dZ>JIMdtpcm(9Vp)3Xh2Sv7(tten0I_I*$eqnjxj znGz3N(;&%V7?%f)aA7mAC+dA!!xPbghlTAl8@jF%e+9g9ZSzO)U4{lvd_}ON%8&Go z90bj}^5(h*=}~=eVabpAR5TrUr1vzF6rxKJmrA8^v9=_7?b=?fpbIQVN>yDqR30Ig zwW|*J!?@!79T%`8&($)}(qWZ8$`GL-{LZ zRVSXe-mJ8qaYfHH#Ot1oBMwxCTN&qRb@(dR>-*uxMWS!>RDIZ6BJUS~uN? zt23Y#sRSc#^7-%9hKAW^?~{g(J<(36o-Y^CnYqp^NrHc}(>Zbz#NoIDSrP^R9OlDA z7wQ;3UOx)QKRyH!&opgow* zjoj7?{`uXLHH3aFgTKC0GLk{6Q|?EC?UWyBPy|?;8#Ca1+`O9D(^GB=gk2<{8nVq~ zx9d5PueUBk@J?Ot(7mRqOH?w4Z!iqTCo79r7Grm7ckrkAY4Ya)09@e=nzpCEF0k!ufX+Q1nDwiMp--O>Ndu$BX^pJ~4 z8T@QE5+R~eeVK~eC#+;up#vunWGFn$xwR;pv4EH~8D+(y^_#at$ZB!^P97E^+esMmCA3vd^o%V1Y zHC>EImIoqty^~BvepofgeYE?=t*zd1gAX%#>#ThsL_>9ZjcYe4*H8$vptiA)6|WfB z-G=ciA3#2Q?&%DVRD-$^8m+2hOR!vPL{WDZFJ+3pgD5CuTYi66R~8UZmlM>jSQpUh zbo9}yW?y#9>J)b%>gA3$Ye(Ld0%%O)1`P1q98FG`?)$KPe zH#}bjGnI5YXrh?1Sl@415){(elNigas{g3?-LW6+8AqZM66idodmkXkFJHfW-w-TT zILM>x1g#obgQ5MzW`9*(Pji#!U@AVZGF!JIYOZKTH^{S(s~Q>m<+O!THhoNA4Kwp- zUdX5E@zzi~!l$P-r>(}={h=>*JZI$sBJA>Zx?~N(|I31DWpy-{TATua{iSG+v?{?c z$IFIBCtRgH9sc^LBQjsJ`djh2v0xcGYP!LTplt4AF0H&Ff?ehQKvllCKQT(5yC0t$xJ6R?P^5 zSe@6^ueFmySbuOIX!4MCi>kI93M5s z9>RxcPi|C*F4EGp6_u(-q11@16ly!nI+J%LTuwuAz9yYu+?ysC?dJ_NXw2c|L{$so zW$LS_pV{Y8fi7oVa!Sljr>cu%MH2v8vBBKx1en(M1_pk^zZWVrxjok^-3}B}SE#|( z!wic}{zUVxH{q-^%y#O5V3GK4e)PmnZce}IC0)}X%=7N6GI6|LpT*jv2wh96qt5bb zz*lzWWFC$quqFMfupx!9_N2QUWEIywjNpXT{?1Sb9WmTkFNuXr%VmYW99FZ9OeZ>h zwF;x{q+iF$j8&`z;x%F&U)Xja_d~V8N#E@F;dfP`(+&~B`ke-9(x2DVcyBSkQYO+Z zK~-1kLx=kS%$qrgdF#$N(Pv7{OFd3Y#_+4x7e5XC&bQ_~RtDQlT(!hiF0STuI+j~& zad!S}D^5d^6#Y37tFjCSc0nl=o0&{c{M|^@fz#`3;s>W$ZS?GYK!>Z7%M#6rrP&(L z;N3f4qa|oa7`GQz#*-7x-;d2-R9lzu6Q^rZPOKqm<1*`%uCa~y{g52#_`E!ghp_cU zA+u$K_U;PXJcKmZ4l_(Y2#(Sb4@1g)%>gY0B3Q_-k)o*C3g1KXno4>_@81_)ge$IZ4(v-L41cA1PgI z`LSk9{#J$48%(1PojZ@CNLgq*U=7#)DUmkH}am)#JQ z+MK1~u5I_zJXIxBUiNZYHJ7LN>BKU~^L#4$a2&pcOWx>24PBrA1!F(#!nZ3Q$}hX0 z_3b{H;=7f`sVD1MEAzhb7W1>{(yQLPeiMS7=j$g`Jfk3#)2@&$LB}Iq#sQ;1vRsz< zfDV{PrCk+}CSEp%pn9Q-N|ICNW*4WD2^f^0#*2iCRJPpbRYUW`+42US1pt*jR_b(l zdAg~knygj)PIOX+3sxZN(x%nPXI}uCIfg-~1qv3)@>yxd;^+8GF=UVgb$>-gy zu#vh6&>-gQU<&PuQf?cDlj+5eTI0}_m*<-)6pH00I(wg`=5I#wjH*b4B26xR6NYi2u%J*_cmRW_$pOlW(j-IU}sLp+%f$%{>Sg5w+p z)}9+rS`HKgY~*h@dwI8tBJ^f38CHcj%;s5!0fFQ?4=;yGx6qx1$Ajw4iN}j7Exs(r zdJ0#R_8L%cIsiFN0hO4N5F#A~Ogof`f4$8PEd8L}H|*0N7)s&xg~c`F_dI7^s0C8k zysmZUqxc7`tgQRkJU>bItVDmD;GEu_g?SXIV&&=tYct`AIcAvU;T$YEELw@t@-;8F zJ}jM7oTHgDxSq7Jr?%wNA9<3_fx+OWOD;3TT-CNdN#mVVcyN2AAXp+}9>afAw~KM! z`xR0S-kE@VB;@&R-j}5D=CJkUdAR2NkS~r~xZUF^i`~A$7N*QSM^W{^Gu8ka1_L5~ zbp*{#z+hXnR}&Pl1(cdm_&;@*qdyd;Iq&CFb&+VIA|IoGJgy2gIJt)m;D9!Hf^#nK z!(rtVHim@vrRUf{B>e74{Z1-Xm-bxSIl{6KrkbUfDMVwT5OyRbVfF^BtF+ZXus3+B zEN__^jT6ctN`)L2vVXW!7m62&y6+aiI}pMPl}_gPt!35LvI(l9$< zt%V*$iYBE%rMURXJR<9dGKdFCC=(vzeZJkedZzr9oaw0B!G;<-=EHaEt8v>iPu#pr zdzKAF{!*5#HxQlQz|}6}evaBb^RUscINcXPvgA+To`!-Nc<*}#MC>EZm}NP1qx#BGkD$c3dA zRbEOcUTot(_zeW#82Gw3vNiQo7AGJ9=b{;|pTh%yon73joYBSdI@jL-nDA|3X>Nd? zkWDKX1vs)&x#+6@X-E&+K?wVb>lY{?Zg-$%vn=tFV2~<)N5CIwb-U(&V9Mn`cLBfDN?Ttuq z^3?{%09!DtO-U6(Y5-k~bqJEU?V(L$oeJ^54&7H)b-|PY9%XsoGbxC8;4lbeV+r}Q z%HDh%=(6_4bY!EEqd=KOhaO_mlH{)QwbC_ud#f$djwAy8sG0JvggvOplv`j1<~$U? zxj0q^7mnooT}4dywFymsMoSc#^tf3c(~-GPjQ@$yYH)>r4K%?$@s&0u(or&g1;B#S zPogBdB-P-H{ye$#A948%jIR(CjSd#BSE-mX2~N*vRZ#y{HX8gRiP2TdrY69S-;%8u6qqFQSP zE1h@TJfSoMZ7-0qASFCkpmX$9fHfJ~E4d;AsueT{TI0~{l7FN3b{d=45tjlLp9gX5 z49vY8)Gp|=MWUo;iMO1VN{Xb_(oWX|#W=&8y+VS&3<7PAc{xPCKaE0=97ev6LRgS} z$1~hjNYAHcK@b=C%Tir#_O>R=^VF%PLKXu7pIeF6NLIc~jr2>OZ;}N`8vgeV*N0ov zIxS8wD5Riww`Kovz{^3mR@N*i24y%Wv*X1q!1>;-0ud5cM0dQ1208IeqYvG0IDo&r z$<|`y4wArDKV-6)RTs2Uk<5j2LN)Y1@P7UQ3zjgscSdRAzRe4^i$>~HJv?A z{-1k%;AFg1pll)7H7M=t2(bjOl>mT2v-Gql<6(XJ{CF`s_%8h0A|1B=QjBaYpAt*c z)wF5>nwB_hAJfu6GF0Y>@Nt&ZW)QiFD=dg6;mX z1DObCD1s^Cm^~9a{&a4J(==9nG#EImKSU7hen}hJj4xUb(k7A)VX`n^35;v<_{Ko% z{Rv(Di*mQC1o`OuO=_E!t45c47&yZp5x}2Cz&h71F5wt-hOLofy(~k=us)xRmOIy- zv^*@veEXj7O$Y~(%&(2-=>aN20Z~x7re0P6sJZ%Ae*O($I=;b!Xei1Y`P2CTCJqa{ zAk*1v6PXLRE~etTf!<}tptL(cO)4am#Fx59neE)lN%Jq|;TyUok$PD}@)&CSX8k$`Jm>vyHV1+0QZ()450Pt*x2MBljKHm3UL_|2T zi&@7UDZ);X2n)8jJk0q1VtXq9-_z`K? zxq)?j3Cg1PvKYwYXP0JH-RR#8HG~*{e0}ScBh1mN3$GY!O&&5f_3Zm)tbWdFMm3Y%o60KFt^kx`Qrf|Xln9ULx!aMo=EYKt zR{OPq$d86vcS`17Cy*y@`^qCnU0mK4s`pHz+N;V1*Xs-Y)`~r!FaQ>SAYnYkJB02& zMt`zpmt%~S;{CjiV%*n_od{xpAAPezAJ?ZS$y-OkJZ?|~gh`(hsNbe{fd+G41YKXq zB;G*3UE}BG(?EO%HBE@3QI2U|CzGO>AxuK?a?_7x3|ZpU>2LE*_@^p++@8jJfig}s+L4}H(9U-dEa zC?HWL`L;yKo`?LT;v;3Nz|+cMpCa@q)JV8fDy-5cEi*fyEYu&Azr3~D zc+LzOU3ogrR2-xte||ZSYaK9`_UhIEnz2sw=BtQ6FMX1oP*ty_)jj!OrL}cICv52} zQ7WxE-5KbGeaW`+A?>A}Fm4k{9JQpDyieFigK2-G%sa~h&v`dP`W`zpxjgy8J;U`r zls9v6&1HIQjAAAD_yD{yY~N3%$OA84 zt9CC*bWrv2_q=5kt@=-|q}K$40TRxOzl2~6B)XY!p(53>*h<{zx|ebAHj>W#K4<97|X|_ z&gMM!2`RzwzCkC%vlOwWl$0(i=hN!~terQ@ljH7;GE-uY8|hLd+4n`yOjPU4h`w1f z?C=dd{>8_m2(zVxvgEX*{?UX-e<(gvF}1?+dhQ6On{u$a?6G4Wj*lw`5kzB}(*&d) zyAN>WZ8>j;YUtH&L*V2oB$=CoJ04?jUJgOsHvwCLNIaJ^?bobJb5uh%x41d`k9QY~ z^d3&~(+=(&ZuO~^cpQqZyj7R@UdyzA1eWt#2Q|co2SEb|nh(d)_C3c_AO#e!56| zQPArIXkI3%5J=o*bBBy@JifTG5-65KE~{QJ;?MQYA$G_MNFD%PvY_jg5;ZwqKzfhF z_ZXn^-tBG+vw&jJsyAhl3DP^>s`a!Zc%RGQVwm0L;iR=SH-X)vg@)c`XgHNeEP1wM z5AowJVM;XtKPZGiqmp3pu3KaD!4ZG^dB>ZpgZIGr104yoh~MgnN8 z;Z>>c2?3;suM7Q9mZQtvR@|hZK~@OcB%2>rtj;CMeFwldw58N`iHo3!qJ0#gOciH5 z19HJ2@O6mdgVVLb8qS^i^t83Y-QQvaUk3g7p3lM>5F8u4oBg!morCr8X+(%FcYh1j z5b}wp;gv8~6DY#oF0S8g@s3^-`9CV9Q5V%PRg)}a_loc?=qD9_iB;=1rneL}8hzLg zAVGBSxEs{4og-_E)H1TV{4HigFgO|3H+bQ14WZ^pUNM0^NbAI2t`O7GG_4}E>1Ll! zH<~lj6jg?(T(zrOuDc|^LbCcwW*+qIxu3_}jZ(5}!vuTLO1O8(JFARdPF=Bx4;Qhi^am- z9Qk-4l_H=gM%tn7u#~@j08|_;R8r4(qyDVV02Om$0|4l=;?twsy}iaTmRWSTo;}xM zRn0T_k`W)qly86W{oaXh);CJV>^g3FpgW@8N%Ker+4?Ay;Kl9${GLG`8pvzuT#$J?np+vdeBf^3EiU~>&OIUqwPQBJE zx>4%*a_Bh@wuJ?hVK=QRi??SRU+ZrQHBt(|`BW7iRv)kjaPO&uI)UaX`vwzV+OJtL zSFtl!zS~tFV<$hs<%iP#N%vEqiQ^OZ8<%6C<_m#ayDcU@{R~@6a_b6Y_Q#m5w|=+d z_kJxFy9BGDb$}DeNDja zQknD$?iV_kK-6f<5s(9&-ViEHE*ef-Uqg1VM<-h=V>CWLi2x*xb3sq{$#1a)-N~kh zYX%MHnVNxrmmBSZgBXwvXu95T;>J^cNPY0Vnjwgh*G=bld_40odh7~Bozyx4$WZw+ z)QU7Rus%v=Yr=75{bV=?&MwWMCoMM@N#@SmiS`!=MI4fDmZX&`qX|7x2ij`5K~aJ& zkW)N5DMOwZg`n3f+O~((?m73#kVd10SWi2Qv(Z5lN4t8?NY%+il%f|D+mr6PH&s|W zGQ0lEbBmzri@|D|@v_GY1l8Eo^z?4*@?j7#6r2HIP9(X<2y z`#9~Iq%zYvd3K;gwwoS`Btk>yAnln!frCW@Gzm-c&+*7)0Bn(EDuPbal1WT9s^m9* z@r1`)yI?M5ELLV#i&re^1gB`|1$$JpP(ti#L5x8`aA3bju~(L>scLSSgOpoK5SnF0 zJUpV!?XWBeH{Eg6SLr(y`^`DoX**%SO{@m#b${p59|^t@Xz_RfBW@ctTt|ZTig!He{O~>`djJ*<%j?|xlhhW< z8`yZt4dn3RfX?lsa-|%&iA0J^{}hi|`5BAqAzI(hQh9UDKLl_pC3)M#xR>+dXn!M7 zt5Z?yd|bW&57S=qq-Bfm9OdnePXtsm1#$8K7vIyXN^vz_6$)vPrn;$ZGG5IA71C%~HM|jSm zk(aYDu4pDWY~Q!Ih`;;=&tpGxJ-sIi#ohzBUX)illn_n!(9aVGo#RBVf||#OFIAFu zcI-zsKF|mX7dMyO2_<_TRlm2_HFT+!H)LKi_|_|Z^msY6^=p4>b^h3Y7bV3af$skf z(Z)U2esyINprrTp!3E*AJ`(D9BL?UujA*<#``rJ?;3$csQ_qDPFg@yR)SfPytH8UX zLkz}F%`)XJm!)ZbICcqwa9nhMSh36h1fw8b#I;@60p)IGi-$OO|NG;?&oKuS$$-9_ z$uBZ{^7xPDV+2lgu(itNr9D<8v7v*djv`bscF@1}6pJ zEWs*b!@BiF>7ia{+}}H6FhEt(N-EXaxv2Zu=dwJBshiZEs=q%i5@K zg1i2QJ((Fbo8t8!U&k<1O*5XjQ_Sn6Cr;4!?*T~C1=R%8)l{>;^YDq_*)rz35+L}- zQqc{e^1@~QhI0T&?~N;u+a4-v_%Xz?tEe<3?w46UcJT7^{zu+>!88V*-%_(KuSrt% zz5q&s#un6$D@lW}9Q-PhBfm)4LHK2aglHcv)A7Ac8|ftEM~v)Vyqik>Ml~qaNVXF( zj=sk=q#Ff2I9^3)MBMbj@${YYwioHqRG!Pk+iCAoOfipTd0++IIWOa;_l<9uN!r*$ zk+B=Pp98}*n!jimCq$_f{XI4n!hjEfw8ul{Y6w1jv6+qzqaOk??=DCuiyW*MPA<;4F_hyjS}4JQ(Q7+ zrJtYJF~Itt0_8vdy`lvqcpBP>2#%g4ZfUtvGg0|G&j0w|{FKP2Tx-IphXTfbNCEye z{(nI=ulj&@MBx?Lnh^4p*%WfrO67ka)ZfEK__(C-2Ho*{95Zu3D* zDAFul>MTJ#e*d=ie{F%ken|N7ckLbH11d(RViDe=TReeB#EOsTa-3oUxYH-Om)S3CYrEQo!D}J zpjO;`3BSD#>!w-?ClVTHjOWkzG?Iectx z7p9(qB3C+TV45*VsEahrIz*qAVJiZL&1f5~FrY!e1d+~U=qKkNNW$Nr7HC|YN(55E zr!=lr*ClZb*2i4Y>Wnv!*PHosIt(CXnlC+%003&&a5ATQF?B&ffy&ULvfgP;U($C` zG*Xcd27n_qD36xdjC~Le3=I)LWS+w{&4dW}AL1lAZtjtURc8k?JoEAb>IUMAIwM(? zaD6WF3WK0#PTZKLmY)0}Y=}&Z{yw0;&K(6TxRR{vU5E`i538craBCqi=nzc-Y2~Q&stg zV3iIDO4p2MU_KS{qQHATD$lp64b17ff)T;nS#x=Ief-J)+e_-}uK0RQhnIDm#m_Ot z_r+U-BFmR7nXp!O5w z6gXqP<&AX^u3eGrqv5A?=*n@2ek(oiq}cO`~`0uPUd4sm~F81tdd6u3Ey zb1NbLA%dX22g|*|5f(33qap5+)`(h3P2zCqUY5H#Tl9VAAgANOljKVWE1uRZ3=MBT zbMgx702~I;-j|SFT1T*#vk~=e7imj@S#$bM^AC9mH%6A>K#{$G3IT481!l4JsMJ#) z`PC7Ho(R!GZA*q6I!Zw{GIdb=Z3f47I_=_>L+h_Gqn|1vstgv;Hwl7DdEPD7add} zv!1@(o6zfxsBd`C$z|~iGAX8`OhenXd_;uzqiPznZL(emG+m0PaMG>Gd%u;ND!_3+ zO2+dZ;Cx$>rlFMe=||d0m|3|h;j)a2I4-@Bj?^R2XlyYNUOIy*{S}MGQ&710=qFjJ zc(M`3XAd+@&4K>YaAJ@7-^2G`{S8@D$njzl=o{iu{&GnEqM;7B@r3xx*8D(qq-mY@y+L}6u2pE+1>=lb(_ zAy&9Z$hWs^*meLuVt1IYI-+$R?NlOGD`A&hzje>El=$RQx3iM4bNn*;_8Ur}HGCXP z!&1*%Yx)+}P7x6=ugt?r`keuJWTy^hNHo?Y^M-uKc6E|Y^ULi>)CbP`t748Pj0S<}4Y4Nq zaTQerd$VS6A#B9Bauxj*A00iW3W4)-wf@piabpZRs&DP&PH? z$Ff~-bU*a&WKNqz&Y`YE?I`K41W{OTjWv|4L+fgJ{wOBLQ%!cwwl~$p{DWUiOS4D~ zgB63jjI{wFvm%Y9=pL(7u|AEKcd5SXfoKtz?0u{$BbBQ#G2_jujW*!Mn;!(fbSIQ- zz(%G^8}PxsL>lErZ5ud+7@U7=1|8x`n6eWIO4>mF^X>Jl$pz_g)rQ!^U~*`PP3mAg zqJKWXaEzd{>yK|E{yUiSSIpgg0~zlrt#N!dE;f>~M0;Gq!?6GC{?q1U*t#H{!@mT#|;`Z@}h9+HdN55yBtLt#{Ev@l2)^H z)eR~b+I~V9l_~Ry$|b5-47E~KcAI($!AO_V(P)?&uH|7BS^sc-k_zy%k=d#SzFQBW z91iw4#M^06M=3gTbdtY#=nBVt4}6&fm1<1ZVqC(-dhdF0II?8jB1YdPRXRr6)mKv6 zDQH@eW^1=kvV=4$RiEM(i;M$v4Jg7}?)1Hq*e$+K;3$`TTA97g=gr=mCb69?ENK|f zQrG^6JlIQ~$P-;e3hnK$qjy#(!%}tVcEg zp3gZ)MV5bdcMS;xrVYyd!->S0V5|h9Tsrdr2w*2#qq^m^*0G5H&i=i?U0VtD95~Vh zV=r#ue7mU;Q}+fgi@Jc%xc09U`+?}i^?%5Ec4Z;Uyl1T)yPmelN7P@mJKVT?>*p1( zZ8e?xa@X@$FV#sBG2izo0H#c4WG~s@atr%b>-&;ILcqfJIhcdd-BDeU@oi9KlXNSB zKl|{PAi)Ot0ssiR(RelnPfMoSr`n)h7EP?I|B6+bAYFb!s>;WyOj{s>L8;9@TrPLa zv7tWDa}$h3p!~Gb%(Q-Q>rhf#^g~SRtiLx(A=lUlmPf>a6q_5!E$^_M5&FN*Q5!M^GI+!%1vd2E?fdJaLev%$pf|c)@y#HreSz2_GhEqV zlLAxOWTN?9)b~bm15&6XU2tPBXOqCbsvDv+)2vxzQ`5;ME$gq=cTM&z|9zop+6j2( zyro%bV_Kp&>HBs3T2d4?!SWu2%q!X7APX>SfT1G5ki8gs{y@Y_ba-}s-#Lx}<8{sZ z!4fK@hFh~cKSJ&w3dM92;;}j1*Bl-8N&qEdiAPwqoj#ziSwNb97>`=g=)WqdKej^^ zj8_Sr&o_mDD5SXXKufE2twx5bUxiBl(?!S-2^>oXIa5v<)kg#De;7smQQU%i{rKTb zt4JdX4uhYg*)i}BGx1kVN{FFT?{CA%Mx4Uq5_&wVRrU`_%wM_8*l$pFG}_@|`ERnM z?PCt+-_cXP95sftc~K+!ffYNFOX4XkgULS)Sp{l-z9%ShG-4E=PD*4K10RkgotgIy zWS2y3>35=#DKwh6FutzY9N?!Aiq_zYUW*k$hxKyBTfzto(bxUe`f22fhaa9ca`@3fK|$-<5x+zUM>o5-no}kl<<;k5{q!tgz*EkArm>yO z#ZZ+M|8IUYtHlV5igphNe5YC%5#9);`+|gni_L(B+^?k|bm~Pwo4@o*{OBmasM`&l z<_%!VU-W^^@v|UeI2x+6*I$NTNfiD4hugv-hyg!|(Q>(xCCx+YT0$tg21xLRD*i_(bI=@W@4Upa7X5 z;l`QB*H~rNbk-y7{z~90EG)DEaM}8Y{ld~kZz%XhKz1KaP$D7^i56(;Zg;RcNk(JO zuzEyOQb|qTF?BNFR!TiXyZFQ29N1djBCCM+jxAtAP>jQ6UxW_`&Gl(5&o}!&hQd+P z!Sx3=cftkg-;JMdT#6C6RbfZ@<2&aq0DZ`$?pidj(O|&YNj56`=C@8LXOG-SB&p;g zK(sh82ej$2pI93)bC(YFF@wqsO5s^^zvfVYx`-p-&cxgA`*1}ZB6FnoA7Bv7@-;qo zlvh-YHv?j*f!m*Z%t5kVZ->w_q8a*e<=_mIi%0eVx5C9zME-k&{KBcJdy#J@a)n{Q zjG)1J0Uh{hb*HVEW1w?k4@e!V9{@`gz)6Ro#CwBn!E~a!NERL{@pnHw7++1@Va4Dg zz>P{CcmSGV4Pm_ZeXl~3{5n^e4mY$yBSV1W;Zp)w9GFK*v-QWR74Dh+oTCzs1t>A^ zK*FeJb)Xo(Iq#~5hWR@JIJgc#;GIXNv1bT$PVLNr3*6e}xc(PFh<%W+{k{F&c`wKO z;lxdbZycx>CtX~-0LKNi6s=jnwq^+^%Sz6gK(8HAw>{vyN#_B>A+uLL!UWP2kw5Nw zlfO=E@@remd?=m~vAFzK64mTy0GK0gd((kLEYT+_7ks>bMNQ=>x(MvCfp=h#6+osY z1XWqX)W?wnxXTx}KHp1dPe`+WB`S3|SvDVtru?YC)^jzZQQGkVoOI(CFy^ll3%8J+C@FH13Y0ptLMi%x}_5+xF108_`8PVs~YFkdTssRS_M zIrhW+J{FhF?j)SgU_4220|b#*RGwY>yE8D`B|am7@6>)t!#-6lAk=IGZ1#GuPF6HD z!pHRHU~M%}TCvEJExoy}Cch*VJ$wl9>mbzZFm&g5|NU<5t9gF$(?GGvPXZyJlGLQ6 zJ~(%|+RqU~!!U!zF|W&5FfJ?x8ZSpX?k^87qsz)~rsYg69zWC@?F*_Kd95GcQyj}L zQmUvC&~+b$H8%2HfH_-E2XI=7 zHCo+?@>if|A}txZx%XpB2B%i*_Sb!tW=Zd8R{(-56o_U@uSlo`5t{q|2CPKd(m5B2=eg~aycq)*jT}^PK|%-QfJPUZKmu-FlX9huTE{jO@WO!c@$sr%fH=aw zTmgQ~77_i)WvwG>v2v021ggIr;0`-YurBf$6Q8ZQx&9*iMqP|-$!L(2ekEM7gNXPJ zSVv#}5@O3S0hl?!0ty!iErhPyA#_Fo6fOStH98Gy47>{s$KY|fE{a4ir&c08`hjC! zc73$aJDRbws;G+jM3$Oh|DF_FPCYHX=(XuxYxwzXd_Nqs49`{c%-6DyJ$CP@^=RmL z?>12_0*4wg)I^QJ6$@^vc+X43IinRpAg>=G{D!6HI_3IybVhwN3qKJ#R^M142yA?M zga7zjse|QHUzph}AK+1U1hh8KB;K4+Wxg914l5_%;nnR!_Sv1)^g-a}^mYM}nM8{C zdqQV^El0=ydS)oKa%qY)F`=OD%dZcasrdHyWPYgF#E0XoIAq=AwlxUow`Bl{VFZS7 z(@`O;ec0y~4HAXiQXflmTC`OzDdraK{f)zN)+wD?ML(H)Mc9^kRw zEIwp)Ecl>2Bjt+A{!l;eg4^N`l69v_+-}imsJl5}|$ zp)bBz$vdE)=HyGD=C(bDb#5$mBC1m$spD9y07En;i_)e|{9D4iLR;>m`=cX)P9Ymc z7VB?|NpjZ7+N=sSJ2&3`=j*kzixOwL~vc5oy|pEbJU-nacjgmixK;0dken zhC}wM^T`~#21U>$4ERx;bs=I5eP2@pjL$li0)I6`%o$lhc7LX?Z3pXKKte{Igsf%M z2S0He3vg=*Uw&!iJn`P|QLZsH<4+<{&#V22{>4BTS);s(EKU{RzUB9Apj;(eANh4gKU6yZ0UitN^KzyuEj?Xo8X z1hla0L3%Ify8GE=^sy>3hNEjG?FmGdFp5jlD!vz7vMC1}>1Ja0H7I5RfxQlx-x$(( z!#wdLdkPBp6v`NvA|5Ip3UE}}kwF`!u8TY$1o=UKzS9#3Tfz8V=1UE<_er~m((l2V zb)@gl3eN=zf1!YSQ18&4>N)7sCT0sy|LrsXdch9~Mnk#iF*sWJ_^}uRrTv7NYv=-2VHU{`dq9CFD9IrP2up%~g3eT-F2J9}o3k z@07;$l87W8)uuV*)avN^DJ)XmhkgcehWB7V4^;+_`WSVb){OQ|fhU=`{z5H3k#0@Z z4LhjoBJkwHBE_1?fbMMBhfh}|u&^C7elz+hylR+pKRiD~2nFjoh%eRF#K22^H!Gd7 zn&LI zT^hy_~Ds~OmBTfrPWNG%^jS=kj?rh zCQL>W#bdag>%pa#m$O*Qwd>Xu8{h8X(2{WIp9!Fp_LktXg}0CpsD%8#_N+ zu7hxz$ZCSYvvor*lX@tgM5o@M!1XN&qS9cr#%Ll}8F2oqY{5N<1+JL}cm@Vk52T9#X#K?(@ z2YNiy0?1fmHt*Rw=V$_R?+m9i^ZuaQe6kM6SJ9Id4?|tL7AGSr5G5?_3!_`6D`TggVk2&1m zl2DOJU5$y~f*%B@ueRhvFD6U+q3-OfGA&V0IW3PW?8wKI=k5vdiin74vG3K?+>s6b z+<8kGMKQ^)>g{d99K*@@GVd;k{yD3A|4pdl3~Iwt0>z}X>;R6y49W+a7c;n6}&Wp3Q0Az==DFn9}xk?9-{M^0`V z3l?*lnNLv*ew*tZ!~vX`ngR_)}EU>p2 z;qe!xWr3*V&hS4-<c#-x{F=Y$-oA zxB%HZ*L1NeyDFgcm{^XFQj+~?w!E}0ooa#(kE^`?$xq3t1>Ih`*PVK#^08hYYIrd* z8y%g_Su~ZF!cH=>?n!awSx=~jLDlVQs&ENneFNbCUfpQe&*>GWlpc7AqGwBbLv<5M%R1n$U&Y;(ZJ%Om*m^PSo~tRN zO8#TX^N|U)dGFm7Zt;ot#KKH8Ue7^UHZmw#xTvWk0)mcC#0_>6^1K6{{??2vQ+om7 zVSZeFUbWJjo7y28(jL!s^+RGK12(B^=_Yy6P<3(g!&7NK-H&dx+HdN)pHqwh7e4=2 zNa6Z?kbVKcE_8vm@67_>3qSPybmE~3#L`DUKpI$T;K%9F0ZTp$l*D?Y+!sGls5bx! z?X@|{hfVHdlGkk0fe7~QHC_U>4}nZy8y!%+Y}o@Y&JQNyVcbCacnttJbAVI(YU@GR z-xmZ36Q4lbPnQ!@w%dS)k*9>&zhVUNPlrarH+_XF@BmW+dw{(^2aNE>2?_R8s(mxb8xgxiu-j zu6w>e;NcX|fdy-~)6>&??sN|iCyyo2N~1LrzXAHz^MIkr_DN;Wdy`p{(q;_0E8#%b z+jUFBe~WbKUPQ>Y+kl8|6u^q?JDWLohcfa2Yu^i0E1;9{TAXzdqyi#&9-#6B?Dco% z0MyI~iTl(O*qjc}xKR!(t`{NXc%K1KCG7;TQ`CKWxTyt}bM#mHy%QkV{vinqSj?v> zrSZBwx;Herfj-mY-E#-rDdr6Qwaxs>TOhsk565vvlh^&r4hBVZQ8lfme4tOnT6A%!qPsBQ++x0C_fd+OwZ{Oj@= zr2^tjW#5Mt@|w0={R!o$ z7pnQ36dJzG5aTsq-u|HTP0dQAt}Aj2k1zlApTEZg_j+^1NZAp0pSR@;i+Tv4ftShx zvSUg)sO!>boS7Zi3JQ@Z$6RQ_UR*tFqh^CCI032|liKF3ZDuz~IGI?n*F*}2}NwvhL=;kxfih@hbeY>$xPL;YX|#oxT) ze(=z8n0s;3+d zOD^_aYpyltxW_%lxRtc!KKOgzoUhgEP>9+CyQ;0Q9HmVchVs~6V=V~SURo=k^iOSy zCAh6YMx?w~dMo>H_`*sADWz=y(GWJvUGcL_=RosZ3ijR+5O$haxFhHFIG|-oQbk;) zkZ~BxgQpFxts_q%aT{6ro=&}4ioQ0ByQ^)G8%x}jb%69-lJsdwHA65stF3iIFJ?Ts`)l)47tPYpjYJF~c5I2IbC}AheZ?K0H z58tJxza|Ds1mA_^QmM19bl9Nr9@3XrDH^3&njbx=lDn3QCwFGq*!*su9YQuluC zy~1l=EZ6~NtL@-bYn`VO+$_#Yaq0!HJC*+`F7Ds!c$dejLTPNy-x#ZIA@fw&z5!2v zFUi7rOIJ03`=wR@)}*d=(MpN}Hv2=KObGU?(TB&c7`k`V?nR=b`}?=3=XDQnr2hMa z($!MPIs@!>9(P}yzsaTpvj9nqAmvECO<~CzJY9l ziDbasGZ|;7TiM+moNcABP^2Uy3dp7dZ{=C+=&H{oQh@YZ` zlTEwo)H^=qw;W`9{d+U{53&yuZxx3_nhLF~<{1$x>GP5j{8HGg(12Sx6>jza z1z6#KqgTH>valcV+N`UOoai4KIP?T>#g8HG{r|yrsDBMy+)I%$Yej_V@6Y`g?DT_a zt3x4t@rs@iOq$qZ5;P(n-*M6fx=S`CIJM1kJx_OTS{tPQdrkkTQY@#TutZd<2qr~! z@hAGHH*Z+B8={;9K9{1dd8u<*6_a@Lv|t=rS^b%+a8*hSSrL6mCodu4U*>Ez*Wg`b zJ5@27NrYh7tvieX+mZQLp^i3bo-P;7KezV(L3TJADiA(Zf)aXCaH}wp{-f$&h0JEi z9nJ?~(hFLr1$weB)s#39Wj|}D>bjkZj3t6s$Vhbyh3Bwq3r!kH)^u+4zXh1b-q@Eny=z~Q?&Y9|KHThN19LfW#&K5Kk>wdV5AW&ZVjc$gqshVEtn zov+yd`*+myO8^^x03TmF=;Tw1CEKilEv6F4V}@t}bT$3tqKv#}Pwf9HH0z9UFF3!- zf7dRk6#Cc={Te#g0ZML}hNKkM(yIV<7G~B`?U$L{`|#{fI_Cf(TQ0PCCMQ#2_N+di zxXMwTm0?sF69mlEzgJEwdpM}(6?IKSu*n@1M&$omGD8R1t0fxs0!HwzwoF_Ik|{Po z9rNRYgpBOc1fY`=*BG=ZyNU7So#EMcB+EM0_n0`g=h5yD)io6c?Iv9XB~^1df$YBg z8gf#NX+!h#{Z6_+0Hu_JO|j!!Cz7s5P6@ebQ4>9HE3QA$y*yvbvIWt8ys1>v(nz3t z37U7?0XXcXAoXby*&IpHe;r;_@%vSpeZk#-KZ5X3*c;H2{R47s%K=ew$#$^^SX4Ve z(|=Kq1aZ(4^UZ1Z_W*LeFVwLlxh-#>|RVr5r~)qc}WP3@6|pp(80~c zWde(H$oUiqb2t7oRms;k3#Ldd9U>85y-+uplwk}~fQrF*CXxrcxy1kLUOgvF74fVX z4@~Q-1=EbYjV|wJzR6K^S^fFm0@>LGlQ{-r_!ptR_!$?V$MXXeumkKwb8xB1WKAm~J0NW(e2ak+b5&a4J&sIQJ_*h>NhJXQPXzBFV${*r&WH}U# z?{6eb==6bB_&o*wNPhlVWl{C&yAxzx*E<lY9T?mTq-|)i*D6`zMSOU z8jibFxklShmnA(VHDO|jY+K%M)z?{polmD%dU%T@o;uQ z^$qw>Pp0fUoiZL;(XCp`Y^-`s;;ZMi4_6(K+0t)=jp$i8nRTj%ZbME68ii{uL}PH;CjB- z$Jf<=L2#+lkU=A^{Z<08@1P!NxapdamyP+!G{GC_*9e zYICyE{>2i%#N%4mKa{cU%>u0K0Y;f2k)4S5Hj8WzRfYcWD9Kd>ZG9&}{jUe4fCd$q zq@v5-NylC8)DAq-@CC(gsFdN0RvK}2Zb+CCVN%K0Oy?68#t|<~ zd{Dz|K7Q}mgk)*Jbf4KxhV)icle4{ru`&}mJwRB9><2|+?Tl)Rg5<2Z8|@Jf0i9WT zFC-I`uoFfdn=rNPc=qA_{D zRT@gS7e%3)GR+Hs((G6%< zy)2(VJYEick&Y;erJuhn-|iLPatpkC)hdL%VgP*E$ z`j2N?I!u|#yUME{6MF8r-lhY~;d^gtEY^FHUX{N6T06nkVG_-l^+Ihwn((NVa3Q@o znH!*zTj_0+h8Is}2)Xe>6HJK?R9#g&k-IB3w6qi>fzEX^SJyukOw|$Bf}o$Wwp6xO zd%o#!BZU2&R>e8pw_}d^2*;Q47n+-93M_T_3z-Y02E*19vPD3=Rp^2><`({jUpRa< zkfpFRfX^DtL)+S(4J7v3Vs;y90-ev?(%V7=6Iqzf*>s{2@lzbAI`5#2*T zkeAr+?Jn5aW3$v!Dv^Zx;2T0HEv;SMi=7mvFC||jHO18#^)~KJiolhyr#pX`WkzvW zDEMYmqt-IXtu*$NbXub$Urp*J`{t!#+-j>|ICFeCAn4Go^_ls(Tqwq_`iJ zgLlEIE0_kmv#X9?JG#Ia%w9u z#*x}!^-&n>nf6T0>H8v=%o$*t?{)0GcAA{~DYtC#*!WbueTJ3|$s{B^-y|y`5AgKP z177z!U7Ga=G5iJ4H&46+*RDhrX-xhHp+B2`eD8e=F_ie*H@LQzxbS>Jz{V7CAKQX2 zQ3lqIW!A`8D@2XPH1vPLq-8EtZSq(uzJ5LIN9-&wjWzF*lJ-0lNO?h>WB?t3p-k5b zI{I)6h;&vcm%w}HucCda!;rMKDhU%;VHg%WV`+xiimG_l5a zz#6uO$q+*3rJq1}{=Ic{nL&WI>I>wXKDA48kM3WDauP|FH+aQpfeJx=-y1ainG zyj^?eT`(I?(V>=ieVQ(#OpzNPey#ui@HOb;HL*#&@=5E5Vx4$|^5+Y*@ z8+rWq)%**oiPytnS{Gq#&Fvzu3<$B+{C)z16AlShT5|&o@;0_m3iTn9_xsPw@Xt50 zJcG8C=5;-Oz{d6iASBO(fO29rv~q^FQNJc51Fd9!lBe<3YR^~xbr}3lp_2~+QN$f~ zXzi-i_?iZo{Ij$BU@%~`uDk`4yk_h>W9jTcBmXNvhMo-fU}TdcvBI6vRBI(l$v!|R z;%LmcFKo8>Tfc=%!yDQ4O1!V8TKFpPrl0!^3cnP_%FUD-3m@P) z@=CXZL&pdy^#L7wy9)5UPXRp(Q3*TVZ*Ux2>)DhA+k#^nk)Xw)q(VoDFMfzYJFHe&r%+;7#v^FT5v?BsaV>K$Km9)Hj@2imP(=b$}So7L55SM^c48;LLqvsN#)z z4W%I!A*%xeF2?v7B?e|dW>@`=+qi*S`@n}aLjYMTz#vw4k(9M~8!lwx%JIYtfFk#; zHU8w)zBqdKZaJ+O-0C`l_4W0G^&=SjBsMwq>n{2RpYBcC1A)_NCvVEx=Dh_P+42X- z(LIE|q18Shz_A?gSpufJzCv|V-9Bg|v8OK>Ag^is_k7lbq$1LZDI>+zzrPyo`CVym zk7PbUyHXc0Sw%qeGTReiqOB?ZDhT`jSJoYRWZjSf1aU~9_Z#5iWh#4CE?}k%Ijgg> z1kodQzB@p7c(^7TMg9^*wFiK%$H)uhc+~Two8=ZU-<$JKNci5cpS?W^#XAFJ`C{S? zK#7z32`=xHkL$s-THyvdpR*4o#9tfz{Qr9&ek?N&KC}W*qdLGS=&fAla1DT+4e;_+ zAX!J!Xk5PmpBjX7|iaX|$s{r5Rs$-mh zIH#%K1^Fu9xcm8Aw~~>8&mj~E-?m|A$} ze2QcBD#0TE0$H^fmVgOvH)~r@H0n=4mh&NTHfV7=DiIyILo2|rsmFIG_2`@)?GTH` z3CZ)C!PTZm-9wRcn1sN%hbXrTK&S7!gRWYuS`Tt^-i_xOw|O7=ZCwpOjrdk9kk_OD zwa3%BzAi%e=NVDSV+EKIh2}gjF>GkP1gbR~0QGo50mv zq2j_lz=TweIqeqIPsDHIK*Igxfa{<`ppd${x^Zc*wmH&X=n4j!wSD_ghtw7};;$?N zv>)qs2gH#Cf^TI=%eNQVUn~sfA>F(K3duRK_nPK8V47}X363^M7Ff7R>#)x>zHi{( z9HSa|#SB!HGs{As@9J!n{?D%EkBDso6#q5=M3ppPY!)`@I?30<@(7phi6Km3IW;(2 z0Dh>^vj|W7MxW~|o14P{vEA7FH}rUDwur*6M2bUwCmoeS4R3F?kEb6>Fhov4kr}g9 zz5eR)kQ0R;;Kp}!HmcKh$Tsy8g@294UJY7_enOn?VXAgQJ-x~>t3%tnR!zYvdyPwZ4fR6dOBbJBgG9l3cc3!a9`VCUo=R+1C z_19YoQ{$o=W1pJ54$<5YSAT+-a81?2NI7HeFyYkhMd^{G5viRr2U4Ec-djR%RMf<8ij8VCQ2EZ;! z-S{>QMR^4DDFt>DTHv?utcyAOreTy_$dI2C5Xvw`FuO!1>pDD|V#@QSst80 z$I;=;?2L-sERhMPeCx~p?g;bDI702hX`r5UTnw(WvPlyV0PR>|lPeH~dan24%|dVm zm_$sKYP?FJ4E@aV?Oxpds#!nGaRfHI`1~(WC?Ts`VIgk-78wy=Pecsd9}q8-oCY8H zE#RMN_R3@agPy5`-;}z!s{{pvLotl1tc=?g=VDeM0qg-g9d~%3t9y-C2TEtUW|74q zK22+2$+!{R9R4Y(m3)qm2@WPlV9q*AT&~0|{*wmy@qkz4b-ALe*fDk(MT8F*Jbo7^ z5ZRRbv_vhfxIO}>m-HaYjx!<&5C+=a5S*XLW>*%=nM176jRK|Mqeb6s5SHt8T+BR8 zR+oDKDs7K)^eg%=rEkv18*j`&Ii7OAEXOMM@^epQ5|l=WQF*nzyX?g}0E?rIQMNBTtZw`<=TQe5q%Tm)vJ2O+n%-fjFV)(}X z^P2Odd4S;U2&I5g+V=4Tmd4&%!MxA{{a8q0(Bsa!7_W^9X3S^~PQjd02C=XQ6XykS z_`w)_2?a)2{x58}6rLM)am=D^k_25u=0PnjS^lS*gL?u8r8s8O8r^|E`3u}PX;DTw zP!Wj8Dwqp-Ttl)3c)Xu^eB!qz3DD;RL0FiD+E^j9e<~9Vr={^_k3|vR<4ir+$G&$T z=`SW4fTQQxk-qb;rUyH*=2HGRL89$(v7|9;bPXsL5 za4nV0@rb2I2kFc7X2&D9Bd2Mu39hGI%cP7lDm{Mvu}?%1td5*9*rf8pnED^ytTl`2 z##rk9!SUCZf=5l7>^y&OZFahXCnoz)G8aP8bSDu-#F2sgyW~To<0e0$L~-oFv;{QM zY3!&wTW_1>1Yeuj?Y zwl`&pxZ}hL@#WW^E_e(jh57$5w_?ZW?Pe^U313qmO>s_DU#yUz#)qJW^k=Ek3KOB7 z#D#?1#R-PP@KWpJX&J&*BdTbiD|nam-sNnFkSY(qM`Ji`)lIL0guCxSFF$xKfLxRh zeH=rR*k&rv4EGQmEN}L_;$YJ}Q&&lEa(yES5p$b46@#^v80<)b;!K1wFS z2a}Q*V0z@NgD4|Hzb3919KC*(c>feWXL`Iu?ZNid2{OJ_VAy+ZO2iskMvKpK^Hgm5 zA)J4L=r)=yh`=NcsmKGUl_r*^c_N4tJHeJ>FxGKS{(jqMBL;$Thv|<2?_bwgJF7yM zu~9$N#|muzB*<*d7JL2>)}th2q+gcr7uB>DIq9U_ZAlFqHf4BtR<_g$7FQl6Na6vS zmOhR)YM5nbszGxEMhbqwPSAV|#0neDCDl0f)`&#hM_clVD*3dgq{%>(h(C9lj5u^N z934f%EkFh}gSVK`x#4YEOf4dzxS`NUQW__hwqIC`#O%~OSIlfM>9cuyX4F`PVuI7+Ck`~b&uR{ayN4+D(woBi>9zZVE?@oUy%L9-%KCMad!22x z4$ZBXY=lxAalzZZkR-Y~qhOS*8|En>*4>qLvxPo%a*87!P0KMQjeTCPu0q`3tghP1 z`NT<1;9-}#EIA-Uw?x6TSq)QuDv}~R=+w&ioNJn%d3dIT*Zp-?_Bi4z9m>?uWa^$I zLAzk6nf#D7)*yCsoTW>z^nI3788eW5zJGC_{|UjODue}pTKLV{8-lc|ws&OL!bb7M zxI><%-v;W#LqpN|?D}A8MD&B&FsO+unZ*5CCQd5db~FXThb?~OIM`lQmd@lsT!Uuw zl*4&n(6q4p{{+WDC0ixuWdgXk3OX>OuJ~yS?->bMO_#F!P2vWuNWt&6a0(jrr1ot3 zJJZXX!kPIo7Py*<)|;zgXYtJf>;!G|O?{ClLPQSxFVwHPHD3gT4L7wEB+>=C>az`F zadLzWG`Y+->;81sf(Cl@s7NUqtf!N2-wR(^5u!7HwvNleW@-kb^c93>vh}`@Alg%g zJHzj_)VCZjYng z#nJk=iDq?EU#x%*NYBG{|1te~QC&%t7!jLSx0nva=2AnC6qJVt(y}W=b50t@=ffwF>St(PO~Ohl zLaxetWc$6mukV*Xr;%A{zd#|gkxZ-GCb4*d(hN}`bd;&&qKa2%={enbh%nLQwuA5t zDG{7PqWSTU2ag8WC?q6&rdg;00>1knn~TXK${BUsvE~&lLRK(*LYP$^yZpd99sj2> zUhthI$07ZV40^z}hYBQ9?^8;6+E<2U^ud!#yG^4KY8-3bzYr{PAK zshRmsGdf%!e;NEsYFI9DCvw{+pxPoaWf%})djzO1WqIqBg&;A?q2aa~QH5*Npf*o8 z%|DFg!xl%3%S;t0-XE5&U9OgJ`Us+^Th25z^RGYnD$)-c@tfh(R!~!pgkM=LcU~nq z?S*t*yBWiHP%}f8a!cPSh%w}5`sMyNOY#rN1^B9Ld?=(c`kgr;F3cErzOp`l;wJN{ z;VJRAqH{w+mO=T;6(SpZeh5|NWIrL)d$k|MBVZ|8qmdbEWRo=jvUe_72e3-%FvD9NeOe$b7F_QjAyp!RPp6WsU~>=x-g1af#uL zNtZ6I6l{Ol$U9#>;bkqnxP7m`@)a;Ya$%=QGV2HkSdrJOu(A61vEL)7Y67A1&Q$2n z_l6mF%?28$0Zogi3lHBn=NRus>rEwLx*kDfst*zF+x0rG{U(XF{!9E9ZjZj##%>t1 zoYd$#de=S6PN-|GmxLlM}A+tE0l7u|luyBVef-omv#GI2x}LK#b4MZeF(6WtG4 zw)l;Y-8f})|JIJW*~RG-RuOFE1FO2>PH z!SgzR*3e$$DEZ5pB&BUIaEQUQsEhPz@?O_vNx6L9V?>vh0d3qu@5__1I(H}Qsfr?( zo$1L(N{a0j`nmNpu2oxm*fUK+(K6`LP0^t)t{K{8e;g+HYj6Lgx$dpn+I&mWJ?q$5 zy(cJCp4}8vw`A{mmXX#FIBgO*MqA=dQ_VT}=f&00-KmuxN8XEFuDK`8s~9>KX$)#l z20`)>sQ@7n<7DwUQE3LK$ zez^}e`<{D-(|8?9Us~&$We8RlQN2(9A}q-MKZT4ql*bU#|GPdgYj2;FNWoe4D4p2N z(w;zo#=7!r=TvXj&oT`+JA0PXFAaTOeR%vhr0;Y&vb`5a?6j7T-l5s2&);|EkELG4 za1GqOnhNpZ?9|hyT|z{>`@+L0k|LL)S|U5n__I1zrR<(v*1A~W?!^>o-oCQhr%GNo z$fVMmb0zWgCAv<0bW(e@C#%_4wwXR+;!8uZX0<0bbMzTkTY)a^zdpHryI1jLB<;4| z8q;%o*$(3~j8&6sV{$>{>gBeVS{=3HlyvR-=LebEwJTly6^gs&`)*#fkM(pb@t+;< z61x?8rL?vgcd6;o50b;6AyCeO+6W%Bvk=|MCnyy^-#tFuXNDurX1_jvL@KUIyRvj$wWBEv{q{w?;>EY5 z%A)gAsYKhBBlHGZd;ATn(w1qKq`@b<)lXTrHaBBP(8gmkH8&HpHtxRlr~1w%n58D0 zG%<-kAcjbBXEI%L(L3h~E)}eKJ5K7NnkO>v_sL%PoVuV z_RuR&D`vQ{Clep-_c2Rxa~#f@d`|V=#dzHfIh~SI-Q1j(GOif^vGnz*c^ykzjzQah z=a2J4R`$Oh%u2OSl1iVRhhmkjl~p)CLQUpKW6YS1xapH#%Dm;9Ef)HoVA=I{ZeVF` z>N57{w>8qux?L~6fs?uK(T!2v9WE)hcD@2z*rwMvGOq34eic4D6c#c)R9s|8%>47n z*>_bi@&mYv^LO8p#lcQKF<8l`Qx;sm999Fzv>WRvzT9=bC2?EL82=pA{XF@)l)?04 z5zKNA8bqFW?%wbGkSqlr90ip|XQ$OH$jfV6?a#12D?i$v`~~`$buR6sU#sby+z(V^ z?gzIw?Zi}vW{bn2abU{E1lP<%p&x3#pPgx%u9ps9DA`m8@8fXvV((CCt8F* z=$n+gmE}78nATKvyI@&0N}f|j=M1%HVj4EyuLC|Xa zs+8+LJlm~Qpt=?Q{iCm65}_;lw{OU@4>~yT!sUtFWvhzzv@lP#s^s;Y8~dj!J;{ru zV#gvXWiIHIspf$KIs%v0nV8pFNNKcnnw7^xUz1kC@O)}}$HGp~8Y(C5D%G`>W` zXc<(lzG}>C=fmNX_S@qMZ@$kXy&58o&K_I1a<6T?cCt9subman_QNAIqYKQg%a*{@JPA7QmqPn8i*7g;PTF2^2?PTwZQE0=shL z%U3Je$+l{d^hyiN0UMun^J6q8!O_Qx68TlvgJB^iHjjQ+<`z}zI|^*`La|J=3%&RgkOGugt6% z-DKPLUq~9GR*O!xT@!n{VV|-|Yx+I#o>;#l!j{KNESBX5XW~ODVRNPe6V0<2Gc=SU zxI}<>-JpY1UKBO=T>Fo+squ_{qdz`By~}MgK2vJp-scz7G?z#8Gav3e=D6%iPk1fV z^7tSQK{K^HMH|B}@w@V&(MO$uoEQ7knzh%*8=3t6+RfAW8me7)9h&X!d!On3roypM zt)g|KAz$mw%GfNFAf5O=x#Aia*;*FzZ9<%05dkCDwsZJtTbwBA;mTTSJ7&4zZL%-a zwz+Cb<_1|f*RLIf4AKqK{f(lV?m76q_clL3Nj!JnhoI_z637VGdDVrdFShzITmt4C zA7hs+oHp(5Oy-+f7q%tShaFz6bHVg=&Db_FZ}_WFMN#_E`JCF}_U~KLO9g(`ghoff zRUR@vHet5|sGy}_eUh^>$C&1YYxrbQ{|r?Cj{Dk_?@`BaSFJQ_jb?)40RBd86_%ua zOC!avevewLDuWC&&a&OG4@AogZWc9;-Rc!d-xfOrp>9XuCHTp|Kw1oHwq;7d-R@3{ zOv7i{Hqxw#Kt7%dmD-cNjQO-GFQaG8p(gYhIEwLQ5iHdd*Oy?rt3F&Yx=FQ*f34i# z$cn>JcBP3%g9oGjY4bZ2GD34~)G3b!YfWALUQCRk!mFYF>JU~3G{-)&m*QCZ6qI5I zf=%ZdTuy#l=&v_?AULJlH;vx?-Xe3ZbQ`cvl-+T;)tUVPh*ex&ip}XQANQ6;`IxGY_ z;Hw+Ge6~F$_OM8|MstwqW4(Ny7plwxJy|m7x2VTc^6iwE&6)(jRbSa ze--W#cSy4#^Z5kr(G@RJdcv^~!l_{j>9`A<1|^icGnQrj()T4|!`{`)?Q$%C{w!PC zW{tmL`6Bi~*&O2L7hNvZvGArF-Bfl-?XIny%ZWeixuCnUK3VwcsOAY(K<0ae5})&L z)x13$3su_iI5f!c^hi9*dStirptFayZ5A7Qop%hyAGS~7zg(9VGHj|?aEPtf_v;$d z!YVaAT$zc_;ZgL10p~?VNzHlm7l;6ogG$x=?JZ%RL?w%_ENHx1@KyLaA~0orDMe82 ztS~VSOOu~r&fwLr`g=7g8lP-Wj^)VUH1=Tb&;|zw&%O)De%JO9+Q7E4Ir8iA-B=+q z2<4rCM?+Bh55Mk}GNL`#=N#LetBZ(T7OyPF{OSgaMXd~gpS?8R*c%oQX`yet-kqGW zo#DPcihhwqyo1Ai+ibh=$DYM|qzjYl9*?%Zlm(quiT3ZZdS5|wc-mkS0{c9pT*I@` z1FH>Zx#cqE2NMR`LG9K$XHlyGYCEcvA}YZ(?}xt2pDtntr){jZeapjDIJoy6LpL^x zeaBt6;;@*pBw9o>R0Pk5+TTrFwKUef@AfGcE{s8y5cgpglj#0nQ@ZY}T>PqsB6H@# z;?^qlQo`HM9{xUIM(AyKisMVn?i)IsBIU3J6xC&^x;UEg;v*d8wGj76#|`>b zoIdq-KKqvJS13-_WR{{ps?Xis_&`x=$f=B6TzzA->MGj}1N^=rqWU01Qe`{D6uA-n z$RBtY{!qT?dHQ?KvUNBMtrO{xwnO1;W!iYWSba^U@1s~p6p=&)gou#-VbV7)+1)m5 zfehI9+b@BF0tUi!YCZKUtPiBs^Q4s5DA7>Muz|8al1Lt#^?qqKw3%CH!vv(>%#NZh zqSC7fHe+sg|Ef7(uYNAd_lsBO!$Hkc;#E)MmiMQ-6SL+&i%K6~KK}M`M)~R^;OBIV zdEG9Dl9JImZfZ-OZ+sC)ljJeR7?jxSWvq~LXoq&@PGykdd$>7g*zT3J87wb-^{71~ zEb@|5x`>=P&|Ci5ck9v5lVFrMiH#zFRWq4yW>EqaN6Z@^G~jfEIA`0}sBcI{EBm(SGqLkMRom7FOmM$p#T@bF8Mf)tsP9|Yc5qW#ss1930T9yk8zX?3CT$gg|xgRXnib_MVyVFd+sI}@=g)z(DN!( z86wRy|F1RMbTyA}fPg0A6h`>9Z`89-oRO;TR<-FwEn@cs;S&?C| z*;J40D;(NP6*%upar|J3pZly$JFJE%=;&qbPfE7BkK%ycj#;@gSE*BPmY$a#f4}su z9T6nZcnsyGQHFxH3&bs1>BMP_uAd~JW5gJB?Kh(hggA93q)c&UU8%U9D5D{)p*YB7J_+s`t5X855~qWbPz?-ZYIP z!I}2#;WBICsrm9WMPGBm-)(E<&H%HjXye zMBgpV#KpR`-RT_;=@!X+`LJ8dUS^!d@N6f0Zl_UatICJ$=jGeW`$DJL{f3=Ea0z?b zW#?8SvuJDQ9O>g-We?XXUJn(1(uxHUcBdMyT@GpV6|+U62QD6VHCs}mzp;_+!??Td zGbuV>b9$S|Y!_QbnO}ckSYi5QJ018{=&%GE8PWC=IEYJ@Q64;f@?^d{9O&9~I%B}_ zoD_CZgWDzFA6GdiE?;Q#^;~uu?QH z6~&c%AZWBfX~|vV4*U&luWQK3fa4XC(@IX9}>Nn+9Pe5w8T)kft=3qk7W zPx0pG*;}0)6TxRgCE_VuPeX_|j<#`AHowEVtdRU|FhT8|4Om!c8+Pzg)J7nzm`|!(MD!98#kXPjms{~maxg{#pICT$)nrv(;=!e+^F{u(W(MU-AHbsdyI@94?d0ELTB-zPUMT?c0Uhx?Hp|UGeJ|U4ODO<^iMY`0=5*72WDFHtDb4yVogtQ zyn0%z?sa2bR^-w_mt6d^#Gt?CAr(ZnHc8{grCECop}y{IfTjH|s;>+2=;OcaX4+R! zYL`xFvO6Nm*K9YJTQPu$WR!zzKLg<=*W&jOq}_>prMc+AuHA`C+lz8?0-o2nQJy~j zEA6^EhTnSplJN==kJ<6R;WIG5!quxcY*NFxmHW@D_tz0EzC-WV`yC)Q|Bz5|2bA!n zm87XH3sU!#@Q~+ynoJL0->1afi2D-qU*y<-sc5r5!(ny8#%#Jg---=buD9MRt~^7= zf&HVv`TK|L8^TnMmy$(Xc*%FqIVD+?{*T}Jt2o&dbG`Et~@VErd9!@A>n_u2#{1QxRyI6UW{5sIO@d)zxN^xbaK?? z3QPN#8PNlFu}x+6UVeBDVopk1S|kZclHxW>{?9*x5h>1*-nBc+eya7rFWc{Jllmes zikxHtqsQeRFxBi2@bdmxTr^fQg)B0>zb}!w)De9+&ZHy;W+?M>CcMeyao@;nzlo+DZutB2OUYrW{Ej)}bEK_B@0QsHpAIDs z=_D!$(!^O;Rfrx>gPxyOgG~%4yF61A2}lD;r3Qu>EtN-KlSPSdM%f2}s2@TIwN<{^ z^mek3HloDQCKc5LvAJoy_Orrs>-``Q0ZG-f=~a9;a*W4&x)0p06ClLP63ABH7uBEq zcI{=WY=8-WMtQv zjs;CENQq3q51D(jgjW(7q&#>F;s-2*mZG??==)2m79%P^ro<(I;3NnoOnv=?_P`2T z52#DDkMubjfD>tH6kl*2OvtkWD%dih@HNRZ?vZEbO&sTb@RogINFV){EP6DSQD&mTQ>tB9MU` zz1e5qkBOlc;4;;-eP2Aiv8UFzUXUAeuf{h-C45~{)?<_6wE0mYh zihlog-^CJi7lMS#2z>$nc_e zF4e=bzaQSgbwYlyGDsoex1E{V`=kC~kcl}`Ab8CP6`Vi@KHP#7k3T>8<_bgb1T_cO z2IFJIZr*HxY3WAZpTPE6I1hBXSBrKL9;kW(>y%l{RK)b1*zYbu9izJ4oEdyI) z1qgAU+FNMF8%7HVxrEnQ!^le-F23Am7Eh<`ol>w~Nli9UoC6^nDebjIqMcV0q(~aN zEQtC6ulte8%Y)HD7IJxPv^j10|6~DF_`ii~BOIAMjyG4R-XblQ$mA2CteHU_dq8d%>1z=xo8IvnSgQ6&sga&Bdmj7RKfFRf z1HNSS8FQPHpOIKT-Pr}w3jBpFZpz)oYQh+woBJ@vn0V%gE|P=;O=tbtvbOt zU^2|q^8~Zae*!|Xbchb7fUwJZjdJH4M5KD4qMuxVM2$V^r~G6yH(*}9D2+SNXfNDM z$`0J0di3DIK7Y$RcWoj+T96E0)$7du7z+ZezoG~K+RC$uP`bi_%WqcAnXxrU;+|vM z`uic5WF2z~Pq1KDQEuf&)c0n9yWa$4oty;PI+ww5M^e8VqehB)07>gH_s<0{jp_Vh zr=jP8_-{a(NawM>bEY`1Y3`aK5MWn;H^AcKnt2UfpmU}Hz+m<4{h|Zh8RClZt4(MG z-+{xL&1$Fl|OA z6l4bnX<+>7yCV!OMgtKZ^+RVCEF(A?-*2zh#P*epo_)R#QGl6aInw*-)s(Qn$vb! zr!Me#{{eZldp)p>XNcy)V5uG~U!akAiF1fym-Hi6?Xuum6D~ zPr~mA-q9-g9F(>RoT9%=tD2Y~Em;kuH0(*pne2vh#s}FhTVu}>IGg=}gg0;t#rqH_ z&()b!G%kTwmr3TyO<-m%&<@`pb-Fy=rOWCA`#=sG6m6|$y}H}EfBl+#oBR9?GTstI z#IEi}qe~0EJ9kABc`2AUYgzqmNU929;^r{En)@4A3DW zA;2SKMSR=mv5doVepPtUd?!OT!nri+LrYqZ;$AOsKuoC$ZZHm{8)M6fdIbzlFyaRZ zgbL83{TY1IL`qx|5JOLagWG&(9~LCxx^A;i(Z+QrzY^pkimC~QgS_dWjr+SS>|C4(_c!`bqO~XjM?3?$t75j9<;?qxJz%D-W zNT7D}%h!vV;k1_tWPf>k9Tnf;!?d&;<`d5VDstyy$y1tECo9yDl*713x7o=`kU=(p zRo$i28zgvtHFx))e)?<3dL;c_a<7*(gb1Njn6a$DQ#d{Fc8mI^lABg}GGZq(t@|jy z252 zVZJ<%pw!Mu2zHpH4vkn;vGY-gfYAWleX|+Z|28 zUk?LA>G1?r6={b&d^&3WcKMaD=`V!$661McT*)4WnxwPm5 z%DpgH;3)@lY`#U7xHONJgpujXL_*5v7|XaL4{!oaym)d^MC76=S7t<@i)a{c6Ft<| zfOLDv?SjXqsy^tBLibLZEsd1GplE7JpyRo5DqW4kcJ|TaO&pA0NFc;(YI}@p zY}J)2L%_XRnvNS1$T89W)2|APhgt&qrF;HeSDQRsu`9Bli(`o1d(jmslBD5q@v~{7 z=6VQY;F+lMd}6ow3eubsz220nI_v-lMFm&2&CJg+^mC={n<(fEPuDe5Nw5Nr(GU*I zct#Xv9+RP(irdmHKTsY~nrfS|J~Z0fVB9BUR5Mq|k+hJ1@~J=^?m$pTS5DIPNOZZ= z8`eX0vXM=n4_AtVEqD12{nLAavp@!^P@fXA8!a*=9iv@y2ojP87A}vD3r-PaDB|wC z#R;INl9*eY!M5XCAA^x86NPk3PpiYdhLhfVeryrb#qYp)OEE+9QsCLqte=j2@0p)P z{3|cmUrR-Z;$y#KVSmoVWLB;1BWA7I+72fpO~Jr@9UvRXW=Bjd7cePb6Jbm#-v=Sr zr9{X0jT^BszYYl(62C)(vC0!iEyW))DYhC^rR6|FM|pP|=5XsrxEk0Zi6wts1mZV>4bShRp3UD7DsEJ8sVS*Rc# z0@5JeA>G|w0+N!_A*FQZJJ){h?cVou{Nw$ww{jfnitD=OoZ~mnah^QBf@I=Qag9*~ z2{MyQQsS`#h{-;!G7X!K3h^Pbi55+y_r`pOn$HFfh3b;Bkoadxd$}Z%403Ipq~Y2#$r1U&)1ur=~X=uNge!s9Qp`clJ%CVyZ9W|LLyC zggn5^CA3FyLBK_M6XBMRCiJ?@Ye-{P<2>L>@-)3rG85~;<37(a63J)411emKr}d>< zo1;NNbSQ2C!z3wfgc&-rkC2v@-cQfz8LTx5HOkiv5l}{i&VHI$2{z}9&a9~GK&eEH zb!HqH=m(?=aXm5%M2@j^!jT}H=)VNPT)f%QUl7dQw`jQ1UT7nPp&>HrPu<&=>lM!$ zNEdn$-`#tO)IK~=-y0(vj}ha8i;}>ET!PTHd!885sJ#h~t@=A? zp6ZN!)X`h=wnLfR^xFKq6qFilM-C#z`bUysl*Z)TrotSZV1g`va+ z%uZswq8ex2op|ooFzVvMwCoOb#z&{k6n}Q4GN`!t zhY5LayK_b>Z^E#+wwxG)sl6}95GvVS8m=;!O@Fs_sn@s?UosMgxAO@ky%C?qv!KJ% z|5}m(af?6hXQ*a*mm}m_LCoJ`_uVvu4R_CarKRr4oz-iUK zs-i3ei|2Jb8RSh^g00Tzeu^Fn-nLq27mcLz*TR;PFGfMgD3l^>-grxdmF0r)_?bjNg`H7y@&)OYejMyfs`gXQ=RPJ?SXm+-5mpEdpX6Y@##uVV zts-*v^V1}^7+Lhk#K;}-BKEDtjatH@Hg3&WE2O0FyQtG?GilSkzaD#6r5`EsSsEFv z8yTD-;LfpH&RI*LLQ3BJymW6PClnXKD&lXfOT zJnS>>=zj8xWF-jaZp%E8)`&nEw@4RDR3|F;_k#H^BniiV zG6CYYhQQwlpZ*bas>G1g5F@7Y52g4oIyu6C*EXNUPhhIHmZbm4J3acJv(A4>mBrB^ z7|4j6_yg7?1NFoh=sJNc=m(Fc!|(sX#Lv3;J~_ycn0ETFujF4Z;@#~lUgUylp%7^% z`4D?W$uB*Diz9;A+r_(W6L_>4k4j0)gozjsYyUrpo)aG;I=&0f%*;&2OvI2tU_n4= zzfbL!qnfr`3&FSmrIj8?8DQo?bd3B)$fP={$aH7U^EZ98uHzrApyxJ}x?7mu?&H0H z&+j8YWtajcrZI;ic`sfmK>l#r?_>zatgr@ysX{A*1DW>-IzF#$Pv$N?sJ383vmI^m zG%;LX1+6EGG;*!ognt}bbTqdNXs&+RM5GJ)O+B|+kDnCiVkJw^cnLqZiss&C{`oL|Y*lAD5pfR2~q)kS36_2qt-dQ=ATqUJa&EaGUz= z?f*p?zbw; zL<56?zg$o5-e^|9Z%}1_yzPO8Nt}Z+_s1F&?FcaE{rwnDh=p_hW{Q|Cpn$Ff=Y$bL zqRlpNh-%ot2fOW9$C2D+8wr)tJ29qD@$cP$J;QI$yQ{RjCg41=RlzHVv``4QzQvuS zWdUvv5HZxH4iE^@1}u&&LBvif+*>TQ%m;md0dCm^w{o5YiO;N;9~us$Z-JxMv93kO z&A&jSNIoL%Gm$9ywk3G<&l{l-w#+UyIfsL8(f~sszaFB&dv|8Jih8k(GMq5h=z|*N zV+&`%eCX{wn3$NwVBG%}?G7;3X@FI2fqznJo}8u_gc}$qhz)Z@qkgPcPU1&BLT^WS z`T>}Nz26A|P;sCJjQeATqMZ58Ev0^b+2)1N1Ch|M90U>fmhiB=V~75meFqRQL!#Qr z>k8cPRu*S6@N>C;fV7P!lwQ6mgVnTkxP|c3<%oFKHV$7Yp8Rkjrk|MYk~7ev`ZMqZ z;;Vw`{*{4VL7}KePu&43ngx%6CETrTREJlJU||?g!gjcKO*s8~*_l_G}O~q{6l`h$3KmheP+a#ypV*+iB*nv;VC?~DH%!v^RQ^`s1BDu zoguJW!YMRhq;LL=Zhln`yH4r63Rjoschy{}#u5(~+J5u{OdkD)yD_E7rU96U z>xU9cjFn0Lou5(u%SL7?D&_uv=KEj4=lik#%=h^Dg$KdgTMjI8=9){P4fZXxq ziRajwyx_(zLW>5C2BI~F5G86WSJ~s|T<2Xs(nmWAe4O(AXp*@03u4VI^Gyqqm)QiPZW()y-onsF*`5G;6xDyXiozr_nQNjWZ4p!o7U3-|5 z4o3aU#0#2^#}q{=4D?c6ev+#?wE2J!adV)8`YJIDCB(55gULUB%n-PafrT^R;%bTa zYjw~e7)hr%qXP5$oKwKaPQTlknOkJhB`pk~%W&#R_9jB$pxyLB#g9h<@kJ|W0?fq; zBp+e?apo5%l=KpP3oKp=w9J@rTuVm1~v?KB<`epqdiWzDhfbF-0k=}D1u>4)>8>b6myvizk9nRntQ&E4z3yG*W zVx&UU*^kAB;9D<*d#mF;M91*07z$zR18yZoyE|GrHA=53u(9sWd&PvDc^>6)vffG1G*-1tSx+u8hz0$%VvN;L$4s*k~$F&;@H=8mPsl@ z7Nm`<-iVNN`<;Q+B-K=;_EuPOxO(Zk;&3PmuMWM;)ZDJb*Ho|1KqXY`iSGX#I9DU>CqT`l3W$oPR2$K17a4wcgBqDGP4{4 z7^lMv8#Exaw^j)6N_fG(B}T|Jxu$ z_c@JdU9+@Tw%tn=WeQyzt{p5Bs{jM;HfXg}-B&#GPu66=@p`WhBuR9j-cKM;oUCa- zV-?kGn59eIqQ7+o#x!wGj?ve6n&6b=5XXJ5&Hp>vkZZ$bc@sWo#$emquR&~FL-f5( zq=N`j@zG53_?By;_;Sbu-qJMqdHp^Ep!=x{OO!ZB*VctSIqai<>Z)1#VM|UcRM+Y| zI}7^)Jg02}0qx;)yXp}sRTF2E4AUZc!{L`V@(o*FOlR}Qb3c#LH^!PjY}J!wZ@ccw zGpBs76%N*iDK?O1=m&R-*B%P9GkhGWkI*!ZE75~(dPXPDJF?t;$^q0*6~cZ0O(KEgf_6R%4hKVi@7K$0M&+hnpfnfx&)(X?tH zuSVcK`cZsvCg4?qoZ92N1X(Gw?KNLd4|6XJt|K={gFLGm!cJh>CUX&fo%tZ>)lv!| zo|WC>lBk}gX1mjxQr3{tA=C*ajgZq=#v{46LeAAmhtSZ3HEGL+G-f7KuV9H(VG_g` z>(D@tj!#)LfpOB4`Vq`Vi>ZIMro08;iav)koBEI3s!&t8=|msO9<5#)-{}{qhbZOd zBV*nK3Q`XRj`Hs&acp>+suNV%NO6Yq>`Ye3bTz4y*N_NL3UD1xt{W)}NsXr(@}5RN zb;0&|`3jgvg=iIursL27l0ncWBAZBocgj!hylh6B) z9G;-fNGz}=B;Q`pbr;vIY|Js*^I01Dm=4eB+7TQc_rj{%Ev*7krx3xR{N&3- zYB4r~9^Z7aHcz86l?kyE+OVxNO&VZ;%`Bc^Nf!D5slZ8kghKS?_0Kx3y5Su46}q6;Q;d?7lqo)}vz>>(Cn|fq zwE4ujAeDRv?Y(Keb2e(M!`^00ns-2B@HFw9JTz-TTGvgvydM##oiraQso|0D3`MKx zB>D0udh8VheS2tO@Wy=$Z?Q-dvJd_0SXib3WWQ{c2ro#$67ts?2!3fhLO*}VBGM=6 z`z>DH*lEZ-gvAqiG)LQU=2wokNZRV!GZ@!dc{a3Me$$kM!=`7~f%avn;3UJb!TIA8 z10g;2VQk6#-!AdcsWj`&`trj?Y_kS^eV0HS5(=hE5^@pVOVdrm`NM29g&oSw#nGh5 zhZ3m{7a7s|Tuvz*0cDcU%lLEda9MA*huP~&#!ov8U5Y~LEk`6K6pOH2-vC?lNh*>p z9S@~=t_+)0;#!KmcZN-OMIR%TZeVwp?k>sbAq>bJbtbwVfi|gi4?Z zG?Tel)4>ks#A_q+E~H5SBP_<9dsuR_(#LlkVe2!~)v-at%gy>u7b+MNrvJ_HT+Jb} zEU8mmZ$8D<6AH=ZaMe#v>kZ_AVpJ+tf%JeLwK(hgas`?8Go zT&dufPXl?yJ@xet_J;duvf{I;+<2}vAxRrHCl2pO9W@$8nB^&%{4e2H4WW%$p*jhw z&+TD5{uQ#HER)(FQYmxGb$aj3r}Gs5$aC}clPF{<3Hq{}fX!- zoT1M8d-p|60}X%Xc=**Li9TlUx~g6p`+eU1?0-E8AiuiPNs^CDYn*MOY7*gUqOw@{ z@*&Sa=1BUU|GT~pGfq-d7rnuvok2MYM;b^0w)X6{SaQ?%0ogPqdE{3_$SZeQD%pHL zNc{XR3g2eh&Xg{Fv!RGN+(JyzCZR87On8EnxG->{ z5Zk#({4_D9&|lfQA)0+Lg;d@6+hx_!qYA8{zQZed6o`5C8SI7s*%INuLIrBW;Q zYkWu6)Zv#sB0gxfsBD)rTPk-Oziw7I=$>1P5%z8wCqZcc{Zi6UJY*g7vx+9NwOgfV zaDbY}k5`MztXt!3l;q=P>gJtyqH4F$eFoJG0&L8aMZ;7Umy9uzH15mKvgu{o1^7i*@-xj#}TFX&xj5lb=WgL z7^3TnBe5~zAeegd=VbZ6UydHv8(o6?7?hjgO|vKYk*YSIc=0886Z~n|I)tTH-R!=T zibUmYBE2$F`TI%#?~iI^j%>Osx|?v9v?Wv0zaRYUISu3E4pLDYusJ!*-0j`n+B*XQ zo+e01(xBz>sUyoKa#?U17Flnx+oFEINXhYpeJ6@p$O*qOI-s8lb+j%oZ?- zx}+`QXg(fG9fn19Ra3*GM%F7eSpMD|;9u7uI{L`!=2zIH-B=D%LvQoA+OREKss0VB zpoPl59hJgu+-sanLd7~5!vRi;Im-WBmj{T(SF=+E+AW7M(Y7Rr4PR?pPKu*yl5mK&j86)* zH9ao|j8`mVN@s!3<$(4aNBvrq704O*_4yg|)f%(djFZ~JS97d~BTido$8#Whp!srJ zyLI-p^QM=B0Z6beBvg5l;S`#B1wnZ}uE@#SPm96M)g`lc>>uqd5tyqCRg!>%XFGHQP(Mo7)g26?^*O2z4r_w<$wi zj*057VlaN z8iAm*kosox*#rnqf4(~p?DZ5b-yF1h!nx|0#O9;#?syXSA1CbYd7L$_1Bqyga|GmL zOipnq$X8Q5>E`q(zw8lcd2zF)>dA`SZy|b=VA{-6B+29WKhOMMH6JKq=7L8bK440h_J%)fiCZh5RlOY+wtFBAH^L32Y!1QWA$ANv8$QP zEP38o|J24sk1I_81feHC7H?~WfGu7y2Zie{z$<{S z+j}-b%mI%bOnH}Q{qau31(*bC6EZ2~kr={82{1XwY9`W#ex-ujwUj|SoJJXs!1H>Q zx)8kKQUi*r1p>vLnMeS4nt$zh&i=$Eu~P@Nh>y6=!_cJHbFKPlzLB%(G%UZc-^*dN z^K@st2RE+K%?fGjBf@RCXv!79`TH+M3)vyu03}{^a47nkq&f`=7Pj8}wqF-b=?@S+ z&M-~!MgfUa%7vR;F#&VWa~eP#U&|%9o}%(Egeq&Bf7?#578db*y)Y76lk&J6PkS3h z7U8+?OAYgQIuf+=8U8GhV1{wJEn|KeuYPkd8tzdQt@X5Qz+sa~F1d!EPUaEGtjdy< zx0im>=G@}tWG%@+FkEM>ehZ@947UTwryS|UB=NY>v%u*j>od}sLnD_1IaIf}Y?G_+ z;~en&efhktrFF+}kJaymLE)Y~Q2s`#P%NCaoW)oev@ZOvD{dL`v2 zUdFO$k)$A-?Wf13DjH)`Isoy=)@D7dav6TadVAB)OMdnXkdT(l;HRg;Kag1%zcnu2 z?Dn%lF!fx?*goRz5<%`mDiQ>+=nRruk5cwD>|F-*g}z=*EF$j!5iXl6&l^kNq*@4G zHjd|+F4P;P-_1K%h&+4Y#Xe9%>l~Z9o&XR@ojV}<6B`mFIY{Ag-bvjvJjaZf1-4+j zi+eqi!I0-nQ&~Ab?~3z0`_6OC*-gf5cwW;L`gXXQDmd$*V@Pu;HUg8I3}nEitTX#8ft&M#K>^n{>*8vy4S_g>S3yE|5;BePS?+ru7I)@+ zL?%>_<ksVRJ%_r`y{B+Rxv)8>q zwQC@UoMR7E!tX_rWW;iv-T(&0h4XH(r;UZX_|P_)PLn?{KUFre|)Hqba@ktlN1o4-8ic3K2m zO5}LwHV@+eb;MW_M20Xq2$s#xe_q~J(7Fh1ED~l{`QF`u zO6j-TY1{Y2?2?{I)vl{_Fr?Cmz$|^=&Bi3Z zPK&i8eHr>Emh!M=0%nKaNh@64G-P?&>>3XT*J%=^Q-`pymZuH#Al zOxTFeL~wxJE)Pvn)tJJUZ>W503Vk5#@%iAjFm4wyW<2Puv^IdH5Hp{6EAgu468>bq z)a*N=D|(gr?VH=-yT5kDaTJb?oyo@+|yY|O~tBWl$EyOOdBS7La)PaH6eTr-q^XK2$2XE1B&)J{;DE zrjcxZy9ygb!C~DphSzUX>w0fYDAiO2=2ksU_F}2EUo!-u3;|>0`mCL^!gp)_)9Iah zO{+guJSTD*{P{&bGs?R!K=G?Z?E|mDQ8EM^`NG7GOFeHIVQav|UAw`kHjlFwE2MBy z=~_t?8_K^ym(pI41{EsLL1af6Zyk}uB&KU;(CHP2Js+AvDdc=I9@ldGg>?`I1)t}& z!00X$B0f1pQUxf#?Gh#iW=e{9hnrO9j~4B%&!75I42p6aFu#eLJlnv3@X%% z9`U_+P~t~md>OZ@6x}`r-#)#wq>hcl4CuN%y&vY7s%9#cL*^E%XO&;45mvw9N24z} zM<^Y}gHO3n^g-I&L_!; zM}9%a>HCsvG_s|B5jZLbQ+(p5p-A-3!J`wh*`?ZMFOfx0<9p#{e3Ur#Ii7g=Zl+kt z*4~=_NQo@qYrMQ5kIWSwnhynE_fm%>t=|a}q3COD2JZpV-d^L1dbBv&LS>K;&TYpLsa!Le=UiPN% z&bgMng{lov2gzOW!`&LfUO6Loo7P24p&Muq9mFxhUKiQjpYI`M-^Qf<_SkG)z%V=* z%f0;eOZ|w`GGz&nAzoHyZX{}SHk53fet3(&-yG(+ncUpp2-Z_YNCgdxu)Wq;5x>st znZpG^HJHY7;C<7jO0@V;$IY>?^}+EHF&* zClHg~Qy*KrubF5xY7z9Ug1OSQpo%;x3#s~vo%*8GMJjvXuN4x#w#qSF`0!k=#A3K% ztIFnf3y?joHNT*u=CF1bI%P4F2bMfx87IT`KDInIUPoUU4^WXCxM`;(gq|f6B7YL3 zow|QE1A91!TjvS&vt_#2mEypnlf$=d`@H==vBM8XFst}lP*=l`>{kkDBZA2&)6Hz( zD+ zRQBTCbSI*>w^Dln#q%VOf-#qzc(?4Jw}Hjp!V*@{9c&xtEp6ix%GpO;kKS01Sm<-o zhZFu?CzBH+M9bVBOZ>F9a3B0aF%qexJ1wbQVY;X+dFK>rCs~K$M>fvx@d!!Kal4D= zhwY`poIuu|)bL4lP)_Oqc5eR0$0RP1xRP<@VanY~U+(7OVqs(-nMcN3WqpC0>74w| z4VOm*bq0Fg(_8P3UooH=PW!yvTs{aJ4d41am)FdRI8HBt8tHLT`(Eyu3{iY^U`&qD zvBnV+iOh1&sMcN{CSv&Rr?Mn4ML45lG=ArKl(Z;aQ6XUOkQ(e<>(a>(bo7jlOA?=J z>U!Aow)BDPaoSBWmaHiSmKsA51B`>IR0tv4FNjZeLd-gQYXZmdk$ z+jd-!GNtVG4L6-`~dgCFKn- z9x+>aO5c2J=5&J2Tu;(caKZXM6Cn{=WB7(6DD+Yx-pTbMbI;QHJSHW1<%o#O=WhCA zyAia6<2YT>P1jPgG$z>fGJk<%+J8!KGkkA*kE5h+#w;qY5lKW+Ei=!$K2&~FtI-YA z(U_3c9w)QfQjgJ5B{dKLVq6hTO8GT&RENY*S!YZZi~apbJ~CA<(in?!qKRBBmdKQk z`ewZWi6o?h50sK=hWaioOQ+xrTq~@8Nhva_E!aW#q`!1ecl3P^Ns^9Y+1vE+?oUPO ziO!Lnl#wmZjN?2-&^<(oSL26u&cc1cLYx6*zx!>kVYR-nE5)v+p56&YRJY5$_KHV^W4@0IxqS4{ zoG>&&lZZpyZ+A-ngZXAZCiI4|T4x8=kP9!35*@HE?XPos*1P0y?17@-1J{re$|}ls z!l)-_T>vJIOeV`VQ)-|E|3e93KVq39(W!<6H~#TJ zK?m`rTKJ5H8xyo||KJvI*uUwSD-Zb=JaNiT>EQZ3zgRff)W9VY!*^R9rh*x6%hC1i z?Z`~TE5vzRK>Zd6gEhJ5tA9K+RoI>%6!T<8q{sF?zvHs_#b+OK^s|!or{w^o)|Bsf zdi;)eU(9pv+H`Lxw3|uPg5+>6PQ;)x)0VE7KCq|P!)kj0i|#R>i*n(I>O%SFWvnJ0 zOl=kdomQ)2EI;slzNK#E-vPAL|Wd7D`F3PF)v%cwzvOB3B^WrAm{Mu;w zeEpPr(@U>Zo$8+(2*umOY*(k!!bX-|9T;p_@gGayS&qN*<%+l|Ad0JAE{rs}{u`2KhaaKWw zx{mJqeUtHeGh6i>PQ?9J3M@|u$9uUrlUu&L+Wj{=Vn9^)^*Vnz=dF7R?>MwoNkJ9Z zS#-KNn}6M(c+O{+^EIiW_vZuK`}+?91b_PmFJ5ozEW;`%PD3<~m)(?KsrA*Xq5u8>|NO)?hQGAS%}9{k zRafvp+f+zNp2VwsVJR|>G1MKNJYA`91KXY3Atzat6wpl zxE($Df8&igxQN`f)QM)3r)|;Wx##%<6U_YG34!SeE3Yk|cTI>x&%cLrx-z`rcGlUL z|K|<<`#rQ_`nT0pYZ-3)vsx#{_@;|1(9pOocbbPcAi3M=5m;h=o&A<>E4pbI{ zRKPn_>r3@70n|vB3VB>w82!Qb=Cu(ud+U$cCwjBbOPM>if$9723#FacJH4svfSsv} z#q|F3;`@j+;&EW?EWpSssz(do;S2M)Zlin>&L-8FilRtuag*H%#agmpJ0>Hixh|(h zQbn@#QnxJ4WxQkMH{tq$u3*D@4*-sqCQZii(&*iRl1(x93TT4jN@E83f7od17+^_i z7{JAWv(}}Cwm|7J0Vck*C_zSNiq)ocEztd0fnmrzI2YOme{at~{TBb(!xzQnJr5>G z^le_i<1P)EYb}x;WiKF`pcI>|ubpbY&sOxD63jA28=m?TOoa(;=Y1_v{vA}qKY2u@ z@^t&GS*Q2kNYHs-)NM=A_`wi+0{=f(kBLrPKnPA0r<#89O$f9cgyJxP!-ZTm82QtN zbAm!JVO{9d;^6>NGPU6qGoQ!xxfS5tMR2-vxjuAod$nim4gk#VHHa}SRCEDhoAQFs z?BOCrMcq=@iNXSb){Acw;U33XDwpMN#Y;0f$DBZP!^w7`@r@Ol&jWEsdjt}f6o(O{96s~ z(x0O50p7{m!%xDvf@={&Cq`(^3#&C1uIndft#{2!Eg*MZHOhRXMla+ebSqWs5>gFp<}xUk~9iIZc^Um{GNw4s#c0XFxFwds(Znj?LFcD zMGObh-?gKVe*Pfv!=^H-#o&668j0Iff;n^7H?Y0=E6nq(agn_iu;U_MbMB(YwzeT5 zIoXts_Fz}~(><`E*@qt$E>CM)4cUR*g|c}A46o<$gIKz4KrMFjqvydW_ylR|dAFnu zoYB5)|2ZOs%RX75ytb*H@dKXXGy&46HEB5(j&lTJvV$QNa@AmtT?-~aC`h;uzi6FC zRhF?&A9#*CodF`Z4F*$-Jir&F1p<|Xpv1cJXNE43;wv>~46`gjSJ*PNq ztFkX8Ruw@qoQ<7Za|q$keGeCs6~a# zTaJ^OyhIO z7pUO(r7_-52&~cGlH<&08&j;NF4wGrxyOQqtA#U?!G+t?+IOhJ7bfrExG;8tU>Z=P ztS@BJSRIz(BBzgr+pFQ2bUkrs?%sgaI=20LDRT1x{~%Ahrh^`<4nGWkch9ND1x@s< zI;}-|4``27&!;xP)Qnr_j_S1C=i4e!TjD)pnHCWC3>E%f|G`cqu5t~&`64_NTBX&{ z-=GLJPfoP4cl;XPkLauOGN){8-1RH4V9<77LZZ%FxEOk;1%isrn8^+MS7MY!bhP>g z7@UgaIYr`H9tbUoUi}&$by7YI$l6H6vWGLrt@@jOAQ%xH5?FMTA$|9Yyat0#ArVmZ z`H7K{=jG{N0&YOdfTOlt`V^-x*n>Ja$=0P|^0&yYHi<~I<~zd{P{@+TIY{dnejL}j z+y)5k;P4h6;BjKpe~pxX1QdhLLwDeiwT0)G672%?QHaQ@_`cS?8eRq&lEo|7~$Fkrr&=i;e@x(fP$X&zmk>NmMrU3XK z!}OLQUtSG7U=o_frPt9lm!?(4PiWNPN{-CWufsKi|MXp<5W4+@VYeL9Ej`jpf=n7%?Pc|o znx#(LH11*Szr6q^b?h^Gw#5bl;ZIeRQbjJWj`^FkD(4K|^0!||X_Z6|f>b|G95XVP zyb9;b*ysR7R?Fo?>2ARW2k2wS-1$UryaM3R{0}%Jd>0%J8d_4-pg$5$XdA)CR<1&UM^a>~qdxMi9-((dN55r$Vb$ZMZgOFx`J(`R0(bT1Z5~Vgtr+-C z&!z<-=}yG7G0@p;IXQy8yt6+T+*$wW2#1D&;YJ}J-sV`yGLDllpwy_LLG3I0SK742 zunfY?xE{jB9zp2{xkRIN3R}X{?WxnFRa6D1KN5oWBdv+JSEog?6`qCUY#8Ii#P5;vdA+MhR-Cn+~_O=M-~KD z;$|~GjC=ffF0$xYOhJPx+CVXAs-|;)^B}jl1s?NO{f++z5!=H$YMxOmrhkc+avpjE zwwk+%Tg0#v%=_&jyHR{wIT1P~-B=kFAWnCBB#sce5%O3a)1ZodqSrkuR7S80mIh2;Sd~JlhofyY;ohvPRB}zhIeDFzI1J0a|)bh1UYbFWx?-8eUU;D;j@^n1R z-bG;SqEl4eYy3s)AR_=a(7p}^h_P5JLpQ9u60qKHWs7;%ozG&?U%L+2~g_mw%# zz$7|oXhM2UyqM#f#d-3?D^~HF`#s4L-+z+RdAFJ3KZ(`*777zk(} zJFDYVkcEU8h({W8s;8YgnTu8t$}coBi@A}YYHPMk`@c`4iWV9Yn6W0B+ z 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

    GL5YHaLQ%)hC`^ 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 literal 0 HcmV?d00001 diff --git a/docs/logs.md b/docs/logs.md new file mode 100644 index 0000000000..817a57ad80 --- /dev/null +++ b/docs/logs.md @@ -0,0 +1,15 @@ +# Security Logs +As a security requirement the API logs are stored indefinitely on Openshift DELL ECS storage. In order to access logs you will need to download log files from Openshift with a tool of your choice, for example Cyberduck. +Log files are simple text files that follow the naming convention "[DATE]-console.log". + +## Instructions on how to download log files using the Cyberduck (using TEST environment) +1. Download and Install Cyberduck from the official website (at the time of writing [https://cyberduck.io](https://cyberduck.io)), +2. Run Cyberduck and click "Open connection", ![Cyberduck: open connection](imgs/cyberduck/cyberduck_1.png) +3. In opened modal select "Amazon S3" type connection, +4. Populate the server field with "nrs.objectstore.gov.bc.ca", +5. Populate Access Key ID and Secret Access Key with corresponding DELL ECS bucket credentials (credentials are stored in API configuration in Vault. Reach out to whoever has the necessary permissions to access the secrets in Vault), +![Cyberduck: open connection modal](imgs/cyberduck/cyberduck_2.png) +6. Hit the "Connect" button, +7. Once connected, navigate to the bucket (in the case of TEST env it is "ckbdwh") and locate the "logs" folder, +8. Once in the "logs" folder, simply drag and drop a log file that you are interested in on your local machine and open it with the text editor of your choice. +![Cyberduck: logs folder](imgs/cyberduck/cyberduck_3.png) \ No newline at end of file diff --git a/services/README.md b/services/README.md index 2b53a50758..db579419c4 100644 --- a/services/README.md +++ b/services/README.md @@ -95,12 +95,12 @@ using [ts-proto](https://github.com/stephenh/ts-proto/blob/main/NESTJS.markdown) - Install & add open shift to path - Login to with token from silver cluster -- Set preferred project ```oc project NAMESPACE``` +- Set preferred project `oc project NAMESPACE` - Forward port, usually 5432 ```bash oc port-forward service/alcs-patroni 5432:5432 - ``` +``` - Add new connection to app with preferred DB tool (DBeaver, TablePlus) - Backup DB & save dump file. ensure postgresql 12.x is selected @@ -112,4 +112,8 @@ using [ts-proto](https://github.com/stephenh/ts-proto/blob/main/NESTJS.markdown) - In DB tool select restore for app DB - Select file to restore from - Ensure postgresql 12.x being used -- If databse does not exist, example *app*, select create option \ No newline at end of file +- If databse does not exist, example _app_, select create option + +# Security Logs + +Navigate to this README on how to access [API Logs](../docs/logs.md) From 2706bfb9dfd41581267b17f1c8a064cd047ae085 Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Mon, 13 May 2024 12:32:53 -0700 Subject: [PATCH 053/103] Prevent close for dialogs using existing service A lot of dialogs already use confirmation dialog service. We can easily set these to not close when clicking outside. --- .../shared/confirmation-dialog/confirmation-dialog.service.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/portal-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.service.ts b/portal-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.service.ts index 52f415f100..5c7f36a452 100644 --- a/portal-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.service.ts +++ b/portal-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.service.ts @@ -13,6 +13,7 @@ export class ConfirmationDialogService { const dialogRef = this.dialog.open(ConfirmationDialogComponent, { data, autoFocus: false, + disableClose: true, }); dialogRef.afterClosed().subscribe((response) => { From 9a31a2da48b625717211aa8142dd7970f77c97b4 Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Mon, 13 May 2024 13:24:20 -0700 Subject: [PATCH 054/103] Disable close on click-outside globally for app --- portal-frontend/src/app/app.module.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/portal-frontend/src/app/app.module.ts b/portal-frontend/src/app/app.module.ts index ea4ca3fbdd..55d58b99f9 100644 --- a/portal-frontend/src/app/app.module.ts +++ b/portal-frontend/src/app/app.module.ts @@ -21,6 +21,7 @@ import { SharedModule } from './shared/shared.module'; import { WarningBannerComponent } from './shared/warning-banner/warning-banner.component'; import { MaintenanceComponent } from './features/maintenance/maintenance.component'; import { MaintenanceBannerComponent } from './shared/header/maintenance-banner/maintenance-banner.component'; +import { MAT_DIALOG_DEFAULT_OPTIONS, MatDialogConfig } from '@angular/material/dialog'; @NgModule({ declarations: [ @@ -47,6 +48,13 @@ import { MaintenanceBannerComponent } from './shared/header/maintenance-banner/m ConfirmationDialogService, { provide: HTTP_INTERCEPTORS, useClass: AuthInterceptorService, multi: true }, { provide: HTTP_INTERCEPTORS, useClass: MaintenanceInterceptorService, multi: true }, + { + provide: MAT_DIALOG_DEFAULT_OPTIONS, + useValue: { + ...new MatDialogConfig(), + disableClose: true, + } as MatDialogConfig, + }, { provide: APP_INITIALIZER, useFactory: (service: TokenRefreshService) => () => { From 4fad7621eabf0d72fb696b9dbeb467b54ea0a910 Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Mon, 13 May 2024 13:25:27 -0700 Subject: [PATCH 055/103] Disable close on click-outside globally for app No longer need to disable for confirmation dialog service, since this will cover all cases. --- .../edit-submission/edit-submission.component.ts | 5 ++--- .../confirmation-dialog/confirmation-dialog.service.ts | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts index c0863a6f81..24a0a642d3 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.ts @@ -95,7 +95,7 @@ export class EditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit private router: Router, private pdfGenerationService: PdfGenerationService, private applicationReviewService: ApplicationSubmissionReviewService, - private codeService: CodeService + private codeService: CodeService, ) {} ngOnInit(): void { @@ -106,7 +106,7 @@ export class EditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit if ( submission?.status.code && ![SUBMISSION_STATUS.IN_PROGRESS, SUBMISSION_STATUS.WRONG_GOV, SUBMISSION_STATUS.INCOMPLETE].includes( - submission?.status.code + submission?.status.code, ) ) { this.toastService.showErrorToast('Editing is not allowed. Please contact ALC for more details'); @@ -174,7 +174,6 @@ export class EditSubmissionComponent implements OnInit, OnDestroy, AfterViewInit this.dialog .open(ChangeApplicationTypeDialogComponent, { panelClass: 'no-padding', - disableClose: true, autoFocus: false, data: { submissionUuid: this.applicationSubmission.uuid, diff --git a/portal-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.service.ts b/portal-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.service.ts index 5c7f36a452..52f415f100 100644 --- a/portal-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.service.ts +++ b/portal-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.service.ts @@ -13,7 +13,6 @@ export class ConfirmationDialogService { const dialogRef = this.dialog.open(ConfirmationDialogComponent, { data, autoFocus: false, - disableClose: true, }); dialogRef.afterClosed().subscribe((response) => { From 6ca16c061c4cb6c1bd42dc7173e10fda742867bf Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Mon, 13 May 2024 13:29:35 -0700 Subject: [PATCH 056/103] Clean up unnecessary `disableClose` flags Since this is set globally, it is redundany to set for each dialog individually. --- .../parcel-details/parcel-details.component.ts | 1 - .../parcel-details/parcel-entry/parcel-entry.component.ts | 1 - .../primary-contact/primary-contact.component.ts | 7 +++---- .../review-submission/review-submission.component.ts | 3 +-- portal-frontend/src/app/features/home/home.component.ts | 3 +-- .../additional-information.component.ts | 2 -- .../edit-submission/edit-submission.component.ts | 3 +-- .../edit-submission/parcels/parcel-details.component.ts | 1 - .../parcels/parcel-entry/parcel-entry.component.ts | 1 - .../primary-contact/primary-contact.component.ts | 7 +++---- .../edit-submission/parcels/parcel-details.component.ts | 3 +-- .../parcels/parcel-entry/parcel-entry.component.ts | 1 - 12 files changed, 10 insertions(+), 23 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.ts index 964c822bc7..afa997fbf5 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-details.component.ts @@ -140,7 +140,6 @@ export class ParcelDetailsComponent extends StepComponent implements OnInit, Aft this.dialog .open(DeleteParcelDialogComponent, { panelClass: 'no-padding', - disableClose: true, data: { parcelUuid, parcelNumber, diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts index 53b92f4a8b..0d9f3fb5c6 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts @@ -279,7 +279,6 @@ export class ParcelEntryComponent implements OnInit { this.dialog .open(ParcelEntryConfirmationDialogComponent, { panelClass: 'no-padding', - disableClose: true, }) .beforeClosed() .subscribe(async (result) => { diff --git a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts index d1610de7e7..99a10a18bc 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts @@ -69,7 +69,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni private authenticationService: AuthenticationService, applicationDocumentService: ApplicationDocumentService, dialog: MatDialog, - toastService: ToastService + toastService: ToastService, ) { super(applicationDocumentService, dialog, toastService); } @@ -180,7 +180,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni protected async save() { if (this.isDirty || this.form.dirty || !this.selectedThirdPartyAgent) { let selectedOwner: ApplicationOwnerDto | undefined = this.owners.find( - (owner) => owner.uuid === this.selectedOwnerUuid + (owner) => owner.uuid === this.selectedOwnerUuid, ); if (this.selectedThirdPartyAgent || this.selectedLocalGovernment) { @@ -227,7 +227,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni return map.set(owner.uuid, owner); }, new Map()); const nonParcelOwners = allOwners.filter((owner) => - [OWNER_TYPE.AGENT, OWNER_TYPE.GOVERNMENT].includes(owner.type.code) + [OWNER_TYPE.AGENT, OWNER_TYPE.GOVERNMENT].includes(owner.type.code), ); const parcelOwners = [...uniqueParcelOwners.values()]; const owners = [...parcelOwners, ...nonParcelOwners]; @@ -273,7 +273,6 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni await this.dialog .open(PrimaryContactConfirmationDialogComponent, { panelClass: 'no-padding', - disableClose: true, data: { isGovernmentUser: this.isGovernmentUser, governmentName: this.governmentName, diff --git a/portal-frontend/src/app/features/applications/review-submission/review-submission.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-submission.component.ts index 4a890c3e1d..dfff408ff9 100644 --- a/portal-frontend/src/app/features/applications/review-submission/review-submission.component.ts +++ b/portal-frontend/src/app/features/applications/review-submission/review-submission.component.ts @@ -68,7 +68,7 @@ export class ReviewSubmissionComponent implements OnInit, OnDestroy { private dialog: MatDialog, private toastService: ToastService, private activatedRoute: ActivatedRoute, - private pdfGenerationService: PdfGenerationService + private pdfGenerationService: PdfGenerationService, ) {} ngOnInit(): void { @@ -130,7 +130,6 @@ export class ReviewSubmissionComponent implements OnInit, OnDestroy { this.dialog .open(ReturnApplicationDialogComponent, { panelClass: 'no-padding', - disableClose: true, data: { fileId: this.application?.fileNumber, }, diff --git a/portal-frontend/src/app/features/home/home.component.ts b/portal-frontend/src/app/features/home/home.component.ts index 719d83a874..3da1d2c7d9 100644 --- a/portal-frontend/src/app/features/home/home.component.ts +++ b/portal-frontend/src/app/features/home/home.component.ts @@ -27,7 +27,7 @@ export class HomeComponent implements OnInit, OnDestroy { constructor( private authenticationService: AuthenticationService, private dialog: MatDialog, - private route: ActivatedRoute + private route: ActivatedRoute, ) {} ngOnInit(): void { @@ -49,7 +49,6 @@ export class HomeComponent implements OnInit, OnDestroy { async onCreateSubmission() { this.dialog.open(CreateSubmissionDialogComponent, { panelClass: 'no-padding', - disableClose: true, autoFocus: false, }); } diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts index 5ee3bf2fcb..768608a93f 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts @@ -274,7 +274,6 @@ export class AdditionalInformationComponent extends FilesStepComponent implement this.dialog .open(SoilRemovalConfirmationDialogComponent, { panelClass: 'no-padding', - disableClose: true, }) .beforeClosed() .subscribe(async (result) => { @@ -357,7 +356,6 @@ export class AdditionalInformationComponent extends FilesStepComponent implement this.dialog .open(DeleteStructureConfirmationDialogComponent, { panelClass: 'no-padding', - disableClose: true, }) .beforeClosed() .subscribe(async (result) => { diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts index 6dd2f2ba85..e69d7b0520 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/edit-submission.component.ts @@ -75,7 +75,7 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { private dialog: MatDialog, private toastService: ToastService, private overlayService: OverlaySpinnerService, - private router: Router + private router: Router, ) { this.expandedParcelUuid = undefined; @@ -203,7 +203,6 @@ export class EditSubmissionComponent implements OnDestroy, AfterViewInit { this.dialog .open(ChangeNoiTypeDialogComponent, { panelClass: 'no-padding', - disableClose: true, autoFocus: false, data: { submissionUuid: this.noiSubmission.uuid, diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.ts index 019f223552..0b19e19a92 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-details.component.ts @@ -140,7 +140,6 @@ export class ParcelDetailsComponent extends StepComponent implements OnInit, Aft this.dialog .open(DeleteParcelDialogComponent, { panelClass: 'no-padding', - disableClose: true, data: { parcelUuid, parcelNumber, diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts index 8f2a1cf93d..44c2adc6a4 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts @@ -276,7 +276,6 @@ export class ParcelEntryComponent implements OnInit { this.dialog .open(ParcelEntryConfirmationDialogComponent, { panelClass: 'no-padding', - disableClose: true, }) .beforeClosed() .subscribe(async (result) => { diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts index 5f54cdc87f..152ff63c23 100644 --- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts +++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts @@ -71,7 +71,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni private authenticationService: AuthenticationService, private parcelService: NoticeOfIntentParcelService, dialog: MatDialog, - toastService: ToastService + toastService: ToastService, ) { super(noticeOfIntentDocumentService, dialog, toastService); } @@ -182,7 +182,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni protected async save() { if (this.isDirty || this.form.dirty || !this.selectedThirdPartyAgent) { let selectedOwner: NoticeOfIntentOwnerDto | undefined = this.owners.find( - (owner) => owner.uuid === this.selectedOwnerUuid + (owner) => owner.uuid === this.selectedOwnerUuid, ); if (this.selectedThirdPartyAgent || this.selectedLocalGovernment) { @@ -229,7 +229,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni return map.set(owner.uuid, owner); }, new Map()); const nonParcelOwners = allOwners.filter((owner) => - [OWNER_TYPE.AGENT, OWNER_TYPE.GOVERNMENT].includes(owner.type.code) + [OWNER_TYPE.AGENT, OWNER_TYPE.GOVERNMENT].includes(owner.type.code), ); const parcelOwners = [...uniqueParcelOwners.values()]; const owners = [...parcelOwners, ...nonParcelOwners]; @@ -275,7 +275,6 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni await this.dialog .open(PrimaryContactConfirmationDialogComponent, { panelClass: 'no-padding', - disableClose: true, data: { isGovernmentUser: this.isGovernmentUser, governmentName: this.governmentName, diff --git a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-details.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-details.component.ts index 6c634fd052..6c6551d7ac 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-details.component.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-details.component.ts @@ -33,7 +33,7 @@ export class ParcelDetailsComponent extends StepComponent implements OnInit, Aft private router: Router, private notificationParcelService: NotificationParcelService, private toastService: ToastService, - private dialog: MatDialog + private dialog: MatDialog, ) { super(); } @@ -122,7 +122,6 @@ export class ParcelDetailsComponent extends StepComponent implements OnInit, Aft this.dialog .open(DeleteParcelDialogComponent, { panelClass: 'no-padding', - disableClose: true, data: { parcelUuid, parcelNumber, diff --git a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.ts index c39b32de9a..ef20afd18d 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.ts @@ -173,7 +173,6 @@ export class ParcelEntryComponent implements OnInit { this.dialog .open(ParcelEntryConfirmationDialogComponent, { panelClass: 'no-padding', - disableClose: true, }) .beforeClosed() .subscribe(async (result) => { From a237d93dba03bd63d9b46fe10719658c5374e70d Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Mon, 13 May 2024 13:41:37 -0700 Subject: [PATCH 057/103] Update 'Last Update(d)' to 'Status Date' everywhere --- .../home/inbox/inbox-list/inbox-list.component.html | 6 ++++-- .../home/inbox/inbox-table/inbox-table.component.html | 2 +- .../application-search-table.component.html | 2 +- .../notice-of-intent-search-table.component.html | 2 +- .../notification-search-table.component.html | 2 +- .../public/search/search-list/search-list.component.html | 2 +- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/portal-frontend/src/app/features/home/inbox/inbox-list/inbox-list.component.html b/portal-frontend/src/app/features/home/inbox/inbox-list/inbox-list.component.html index 8dd761e24e..1f753b9739 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox-list/inbox-list.component.html +++ b/portal-frontend/src/app/features/home/inbox/inbox-list/inbox-list.component.html @@ -17,7 +17,7 @@ > {{ result.statusType.label }}

-
Last Updated: {{ result.lastUpdate | momentFormat }}
+
Status Date: {{ result.lastUpdate | momentFormat }}
@@ -28,6 +28,8 @@
-
No {{type}} Found
+
+ No {{ type }} Found +
Please adjust search criteria and try again.
diff --git a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html index 1c818bd65c..5fe12167eb 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html +++ b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html @@ -55,7 +55,7 @@ - Last Updated + Status Date {{ row.lastUpdate | momentFormat }} diff --git a/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.html b/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.html index b9bb0d5560..c5683619ec 100644 --- a/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.html +++ b/portal-frontend/src/app/features/public/search/application-search-table/application-search-table.component.html @@ -45,7 +45,7 @@ - Last Update + Status Date {{ element.lastUpdate | momentFormat | emptyColumn }} diff --git a/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html index 36c8186368..06ba055314 100644 --- a/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html +++ b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html @@ -45,7 +45,7 @@ - Last Update + Status Date {{ element.lastUpdate | momentFormat | emptyColumn }} diff --git a/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.html b/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.html index 0f3b27d564..3cc54d73f5 100644 --- a/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.html +++ b/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.html @@ -45,7 +45,7 @@ - Last Update + Status Date {{ element.lastUpdate | momentFormat | emptyColumn }} diff --git a/portal-frontend/src/app/features/public/search/search-list/search-list.component.html b/portal-frontend/src/app/features/public/search/search-list/search-list.component.html index a171d84ff5..2b19b1d05d 100644 --- a/portal-frontend/src/app/features/public/search/search-list/search-list.component.html +++ b/portal-frontend/src/app/features/public/search/search-list/search-list.component.html @@ -3,7 +3,7 @@
{{ result.fileNumber }} - {{ result.ownerName }}
{{ result.type }}
{{ result.localGovernmentName }}
-
Last Updated: {{ result.lastUpdate | momentFormat }}
+
Status Date: {{ result.lastUpdate | momentFormat }}
Date: Mon, 13 May 2024 15:47:17 -0700 Subject: [PATCH 058/103] Replace `any` with proper type --- .../parcel-details/parcel-entry/parcel-entry.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts index 5bafd533b2..2329ded914 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.ts @@ -406,7 +406,7 @@ export class ParcelEntryComponent implements OnInit { }); } - onOwnerEdited(updatedOwner: any) { + onOwnerEdited(updatedOwner: ApplicationOwnerDto) { this.parcelForm.patchValue( { isConfirmedByApplicant: false, From e3c0760576555716dabd3f647822e74f360c136e Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Mon, 13 May 2024 16:06:01 -0700 Subject: [PATCH 059/103] Add CC emails options * Add new UI form input to both NOI and Application Decision Release Modal * Save new CC emails to DB * Use CC emails when triggering the decision email --- .../decision-input-v2.component.ts | 17 +++--- .../release-dialog.component.html | 30 ++++++++++- .../release-dialog.component.scss | 6 +++ .../release-dialog.component.ts | 38 ++++++++++++- .../application/decision/decision.module.ts | 3 +- .../decision-input-v2.component.ts | 17 +++--- .../release-dialog.component.html | 31 ++++++++++- .../release-dialog.component.scss | 6 +++ .../release-dialog.component.ts | 38 ++++++++++++- .../decision/decision.module.ts | 3 +- .../application-decision-v2.dto.ts | 3 ++ .../application-decision-v2.service.ts | 11 ++-- .../notice-of-intent-decision.dto.ts | 2 + .../application-decision-v2.controller.ts | 4 +- .../application-decision-v2.service.ts | 5 ++ .../application-decision.dto.ts | 4 ++ .../application-decision.entity.ts | 8 +++ .../application-submission.controller.ts | 1 + .../application.controller.spec.ts | 41 +++++++------- .../application/application.controller.ts | 1 + .../notice-of-intent-decision-v2.service.ts | 1 + .../notice-of-intent-decision.dto.ts | 4 ++ .../notice-of-intent-decision.entity.ts | 8 +++ .../notice-of-intent.controller.ts | 1 + ...ation-submission-review.controller.spec.ts | 4 ++ ...pplication-submission-review.controller.ts | 6 ++- .../application-submission.controller.spec.ts | 5 ++ .../application-submission.controller.ts | 5 ++ ...tice-of-intent-submission-draft.service.ts | 1 + ...ce-of-intent-submission.controller.spec.ts | 7 +-- .../notice-of-intent-submission.controller.ts | 2 + .../email/status-email.service.spec.ts | 54 ++++++++++++++++--- .../providers/email/status-email.service.ts | 30 +++++++---- ...715624004938-add_cc_emails_to_decisions.ts | 29 ++++++++++ .../decision-emails.consumer.ts | 3 ++ .../status-emails.consumer.spec.ts | 37 +++++++------ .../status-emails/status-emails.consumer.ts | 1 + .../decision-emails.consumer.ts | 1 + 38 files changed, 387 insertions(+), 81 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1715624004938-add_cc_emails_to_decisions.ts diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts index 9a81c77f60..618edd71ee 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-input-v2.component.ts @@ -373,11 +373,11 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { this.form.controls['criterionModification'].updateValueAndValidity(); } - async onSubmit(isStayOnPage: boolean = false, isDraft: boolean = true) { + async onSubmit(isStayOnPage: boolean = false, isDraft: boolean = true, ccEmails: string[] = []) { this.isLoading = true; try { - await this.saveDecision(isDraft); + await this.saveDecision(isDraft, ccEmails); } finally { if (!isStayOnPage) { this.onCancel(); @@ -389,8 +389,8 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { } } - async saveDecision(isDraft: boolean = true) { - const data = this.mapDecisionDataForSave(isDraft); + async saveDecision(isDraft: boolean = true, ccEmails: string[] = []) { + const data = this.mapDecisionDataForSave(isDraft, ccEmails); if (this.uuid) { await this.decisionService.update(this.uuid, data); @@ -403,7 +403,7 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { } } - private mapDecisionDataForSave(isDraft: boolean) { + private mapDecisionDataForSave(isDraft: boolean, ccEmails: string[]) { const { date, outcome, @@ -448,6 +448,7 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { rescindedComment: rescindedComment, decisionComponents: this.components, conditions: this.conditionUpdates, + ccEmails, }; if (ceoCriterion && ceoCriterion === CeoCriterion.MODIFICATION) { data.isTimeExtension = criterionModification?.includes('isTimeExtension'); @@ -581,9 +582,9 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { }, }) .afterClosed() - .subscribe(async (didAccept) => { - if (didAccept) { - await this.onSubmit(false, false); + .subscribe(async (result: { confirmed: boolean; ccEmails: string[] }) => { + if (result.confirmed) { + await this.onSubmit(false, false, result.ccEmails); await this.applicationService.loadApplication(this.fileNumber); } }); diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.html index 19bc060ead..f5bc8de3dc 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.html @@ -22,11 +22,39 @@

Confirm Release Decision

No auto-emails will be sent
+
+
+ CC additional recipients on decision release email (optional): +
+ + + + {{ email }} + + + + + +
- +
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.scss b/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.scss index d3592c7a86..9ce4ef0975 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.scss +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.scss @@ -15,3 +15,9 @@ margin: 12px 0; } } + +:host::ng-deep { + .mat-mdc-form-field-infix { + display: flex; + } +} diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.ts index e05e890412..aaf2899b91 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/release-dialog/release-dialog.component.ts @@ -1,4 +1,6 @@ +import { COMMA, ENTER, SPACE } from '@angular/cdk/keycodes'; import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; +import { MatChipEditedEvent, MatChipInputEvent } from '@angular/material/chips'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { Subject, takeUntil } from 'rxjs'; import { ApplicationSubmissionStatusService } from '../../../../../services/application/application-submission-status/application-submission-status.service'; @@ -20,6 +22,9 @@ export class ReleaseDialogComponent implements OnInit, OnDestroy { releasedStatus: ApplicationSubmissionStatusPill | undefined; cancelledStatus: ApplicationSubmissionStatusPill | undefined; + readonly separatorKeysCodes = [ENTER, COMMA, SPACE] as const; + emails: string[] = []; + constructor( private decisionService: ApplicationDecisionV2Service, private applicationSubmissionStatusService: ApplicationSubmissionStatusService, @@ -46,7 +51,10 @@ export class ReleaseDialogComponent implements OnInit, OnDestroy { } onRelease() { - this.matDialogRef.close(true); + this.matDialogRef.close({ + confirmed: true, + ccEmails: this.emails, + }); } private async calculateStatus() { @@ -82,4 +90,32 @@ export class ReleaseDialogComponent implements OnInit, OnDestroy { }; } } + + onRemoveEmail(email: string) { + const index = this.emails.indexOf(email); + + if (index >= 0) { + this.emails.splice(index, 1); + } + } + + addEmail(event: MatChipInputEvent): void { + const value = (event.value || '').trim(); + if (value) { + this.emails.push(value); + } + event.chipInput!.clear(); + } + + editEmail(email: string, event: MatChipEditedEvent) { + const value = event.value.trim(); + if (!value) { + this.onRemoveEmail(email); + return; + } + const index = this.emails.indexOf(email); + if (index >= 0) { + this.emails[index] = value; + } + } } diff --git a/alcs-frontend/src/app/features/application/decision/decision.module.ts b/alcs-frontend/src/app/features/application/decision/decision.module.ts index 1fc001a847..b83eb46dbf 100644 --- a/alcs-frontend/src/app/features/application/decision/decision.module.ts +++ b/alcs-frontend/src/app/features/application/decision/decision.module.ts @@ -1,4 +1,5 @@ import { NgModule } from '@angular/core'; +import { MatChipsModule } from '@angular/material/chips'; import { MatOptionModule } from '@angular/material/core'; import { MatTabsModule } from '@angular/material/tabs'; import { RouterModule } from '@angular/router'; @@ -94,6 +95,6 @@ export const decisionChildRoutes = [ ConditionComponent, BasicComponent, ], - imports: [SharedModule, RouterModule.forChild(decisionChildRoutes), MatTabsModule, MatOptionModule], + imports: [SharedModule, RouterModule.forChild(decisionChildRoutes), MatTabsModule, MatOptionModule, MatChipsModule], }) export class DecisionModule {} diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.ts index caed97c383..d54b52484b 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-input-v2.component.ts @@ -268,11 +268,11 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { } } - async onSubmit(isStayOnPage: boolean = false, isDraft: boolean = true) { + async onSubmit(isStayOnPage: boolean = false, isDraft: boolean = true, ccEmails: string[] = []) { this.isLoading = true; try { - await this.saveDecision(isDraft); + await this.saveDecision(isDraft, ccEmails); } finally { if (!isStayOnPage) { this.onCancel(); @@ -284,8 +284,8 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { } } - async saveDecision(isDraft: boolean = true) { - const data = this.mapDecisionDataForSave(isDraft); + async saveDecision(isDraft: boolean = true, ccEmails: string[]) { + const data = this.mapDecisionDataForSave(isDraft, ccEmails); if (this.uuid) { await this.decisionService.update(this.uuid, data); @@ -298,7 +298,7 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { } } - private mapDecisionDataForSave(isDraft: boolean) { + private mapDecisionDataForSave(isDraft: boolean, ccEmails: string[]) { const { date, outcome, @@ -331,6 +331,7 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { decisionComponents: this.components, conditions: this.conditionUpdates, decisionMaker: decisionMaker ?? undefined, + ccEmails, }; return data; @@ -427,9 +428,9 @@ export class DecisionInputV2Component implements OnInit, OnDestroy { }, }) .afterClosed() - .subscribe(async (didAccept) => { - if (didAccept) { - await this.onSubmit(false, false); + .subscribe(async (res: { confirmed: boolean; ccEmails: string[] }) => { + if (res.confirmed) { + await this.onSubmit(false, false, res.ccEmails); await this.noticeOfIntentDetailService.load(this.fileNumber); } }); diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.html index 19bc060ead..5eca5da9d3 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.html @@ -22,11 +22,40 @@

Confirm Release Decision

No auto-emails will be sent
+
+
+ CC additional recipients on decision release email (optional): +
+ + + + {{ email }} + + + + + +
- +
diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.scss b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.scss index d3592c7a86..9ce4ef0975 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.scss +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.scss @@ -15,3 +15,9 @@ margin: 12px 0; } } + +:host::ng-deep { + .mat-mdc-form-field-infix { + display: flex; + } +} diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.ts index 5406ff278f..6752ae72c6 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/release-dialog/release-dialog.component.ts @@ -1,4 +1,6 @@ +import { COMMA, ENTER, SPACE } from '@angular/cdk/keycodes'; import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; +import { MatChipEditedEvent, MatChipInputEvent } from '@angular/material/chips'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { Subject, takeUntil } from 'rxjs'; import { NoticeOfIntentDecisionV2Service } from '../../../../../services/notice-of-intent/decision-v2/notice-of-intent-decision-v2.service'; @@ -19,6 +21,9 @@ export class ReleaseDialogComponent implements OnInit, OnDestroy { releasedStatus: ApplicationSubmissionStatusPill | undefined; cancelledStatus: ApplicationSubmissionStatusPill | undefined; + readonly separatorKeysCodes = [ENTER, COMMA, SPACE] as const; + emails: string[] = []; + constructor( private decisionService: NoticeOfIntentDecisionV2Service, private submissionStatusService: NoticeOfIntentSubmissionStatusService, @@ -45,7 +50,10 @@ export class ReleaseDialogComponent implements OnInit, OnDestroy { } onRelease() { - this.matDialogRef.close(true); + this.matDialogRef.close({ + confirmed: true, + ccEmails: this.emails, + }); } private async calculateStatus() { @@ -77,4 +85,32 @@ export class ReleaseDialogComponent implements OnInit, OnDestroy { }; } } + + onRemoveEmail(email: string) { + const index = this.emails.indexOf(email); + + if (index >= 0) { + this.emails.splice(index, 1); + } + } + + addEmail(event: MatChipInputEvent): void { + const value = (event.value || '').trim(); + if (value) { + this.emails.push(value); + } + event.chipInput!.clear(); + } + + editEmail(email: string, event: MatChipEditedEvent) { + const value = event.value.trim(); + if (!value) { + this.onRemoveEmail(email); + return; + } + const index = this.emails.indexOf(email); + if (index >= 0) { + this.emails[index] = value; + } + } } diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision.module.ts b/alcs-frontend/src/app/features/notice-of-intent/decision/decision.module.ts index 141d9cd512..505be59742 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision.module.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision.module.ts @@ -1,4 +1,5 @@ import { NgModule } from '@angular/core'; +import { MatChipsModule } from '@angular/material/chips'; import { RouterModule } from '@angular/router'; import { NgxMaskDirective } from 'ngx-mask'; import { SharedModule } from '../../../shared/shared.module'; @@ -73,6 +74,6 @@ export const decisionChildRoutes = [ ConditionComponent, BasicComponent, ], - imports: [SharedModule.forRoot(), RouterModule.forChild(decisionChildRoutes), NgxMaskDirective], + imports: [SharedModule.forRoot(), RouterModule.forChild(decisionChildRoutes), NgxMaskDirective, MatChipsModule], }) export class DecisionModule {} diff --git a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts index 3516c2cc01..3119fb2c33 100644 --- a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts +++ b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts @@ -27,6 +27,7 @@ export interface UpdateApplicationDecisionDto { rescindedComment?: string | null; conditions?: UpdateApplicationDecisionConditionDto[]; isDraft?: boolean; + ccEmails?: string[]; } export interface CreateApplicationDecisionDto extends UpdateApplicationDecisionDto { @@ -216,6 +217,7 @@ export enum APPLICATION_DECISION_COMPONENT_TYPE { } export interface ApplicationDecisionConditionTypeDto extends BaseCodeDto {} + export interface NaruSubtypesDto extends BaseCodeDto {} export interface ApplicationDecisionConditionDto { @@ -236,6 +238,7 @@ export interface ComponentToCondition { componentToConditionType?: string; tempId: string; } + export interface UpdateApplicationDecisionConditionDto { uuid?: string; componentsToCondition?: ComponentToCondition[] | null; diff --git a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.service.ts b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.service.ts index a11a8622c9..6f99fa2aae 100644 --- a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.service.ts +++ b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.service.ts @@ -6,10 +6,10 @@ import { downloadFileFromUrl, openFileInline } from '../../../../shared/utils/fi import { verifyFileSize } from '../../../../shared/utils/file-size-checker'; import { ToastService } from '../../../toast/toast.service'; import { + ApplicationDecisionCodesDto, ApplicationDecisionDto, ApplicationDecisionWithLinkedResolutionDto, CreateApplicationDecisionDto, - ApplicationDecisionCodesDto, UpdateApplicationDecisionDto, } from './application-decision-v2.dto'; @@ -23,13 +23,16 @@ export class ApplicationDecisionV2Service { $decision = new BehaviorSubject(undefined); $decisions = new BehaviorSubject([]); - constructor(private http: HttpClient, private toastService: ToastService) {} + constructor( + private http: HttpClient, + private toastService: ToastService, + ) {} async fetchByApplication(fileNumber: string) { let decisions: ApplicationDecisionDto[] = []; try { decisions = await firstValueFrom( - this.http.get(`${this.url}/application/${fileNumber}`) + this.http.get(`${this.url}/application/${fileNumber}`), ); } catch (err) { this.toastService.showErrorToast('Failed to fetch decisions'); @@ -121,7 +124,7 @@ export class ApplicationDecisionV2Service { await firstValueFrom( this.http.patch(`${this.url}/${decisionUuid}/file/${documentUuid}`, { fileName, - }) + }), ); this.toastService.showSuccessToast('File updated'); } catch (err) { diff --git a/alcs-frontend/src/app/services/notice-of-intent/decision-v2/notice-of-intent-decision.dto.ts b/alcs-frontend/src/app/services/notice-of-intent/decision-v2/notice-of-intent-decision.dto.ts index a09ff9d1d3..35acb6f3ec 100644 --- a/alcs-frontend/src/app/services/notice-of-intent/decision-v2/notice-of-intent-decision.dto.ts +++ b/alcs-frontend/src/app/services/notice-of-intent/decision-v2/notice-of-intent-decision.dto.ts @@ -16,6 +16,7 @@ export interface UpdateNoticeOfIntentDecisionDto { isDraft?: boolean; decisionComponents?: NoticeOfIntentDecisionComponentDto[]; conditions?: UpdateNoticeOfIntentDecisionConditionDto[]; + ccEmails?: string[]; } export interface CreateNoticeOfIntentDecisionDto extends UpdateNoticeOfIntentDecisionDto { @@ -67,6 +68,7 @@ export interface NoticeOfIntentDecisionDocumentDto { export interface NoticeOfIntentDecisionOutcomeCodeDto extends BaseCodeDto {} export interface NoticeOfIntentDecisionConditionTypeDto extends BaseCodeDto {} + export interface NoticeOfIntentDecisionConditionDto { uuid: string; approvalDependant: boolean | null; diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts index 63f9a90429..7091556838 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.controller.ts @@ -1,5 +1,3 @@ -import { Mapper } from 'automapper-core'; -import { InjectMapper } from 'automapper-nestjs'; import { BadRequestException, Body, @@ -13,6 +11,8 @@ import { UseGuards, } from '@nestjs/common'; import { ApiOAuth2 } from '@nestjs/swagger'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import * as config from 'config'; import { ANY_AUTH_ROLE } from '../../../../common/authorization/roles'; import { RolesGuard } from '../../../../common/authorization/roles-guard.service'; diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts index 9e4a1b6083..d416c55d1a 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts @@ -15,6 +15,7 @@ import { DocumentService } from '../../../../document/document.service'; import { NaruSubtype } from '../../../../portal/application-submission/naru-subtype/naru-subtype.entity'; import { User } from '../../../../user/user.entity'; import { formatIncomingDate } from '../../../../utils/incoming-date.formatter'; +import { filterUndefined } from '../../../../utils/undefined'; import { ApplicationSubmissionStatusService } from '../../../application/application-submission-status/application-submission-status.service'; import { SUBMISSION_STATUS } from '../../../application/application-submission-status/submission-status.dto'; import { Application } from '../../../application/application.entity'; @@ -291,6 +292,10 @@ export class ApplicationDecisionV2Service { existingDecision.linkedResolutionOutcomeCode = updateDto.linkedResolutionOutcomeCode; existingDecision.emailSent = updateDto.emailSent; + existingDecision.ccEmails = filterUndefined( + updateDto.ccEmails, + existingDecision.ccEmails, + ); if (updateDto.outcomeCode) { existingDecision.outcome = await this.getOutcomeByCode( diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision.dto.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision.dto.ts index cc9f176ca7..02b5b121d2 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision.dto.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision.dto.ts @@ -110,6 +110,10 @@ export class UpdateApplicationDecisionDto { @IsOptional() @IsDate() emailSent?: Date; + + @IsOptional() + @IsArray() + ccEmails?: string[]; } export class CreateApplicationDecisionDto extends UpdateApplicationDecisionDto { diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-decision.entity.ts index 6ac7d2011a..2e152fd409 100644 --- a/services/apps/alcs/src/alcs/application-decision/application-decision.entity.ts +++ b/services/apps/alcs/src/alcs/application-decision/application-decision.entity.ts @@ -180,6 +180,14 @@ export class ApplicationDecision extends Base { }) emailSent: Date | null; + @Column({ + default: [], + array: true, + type: 'text', + comment: 'Tracks extra emails to send the decision email to', + }) + ccEmails: string[]; + @AutoMap(() => [ApplicationDecisionDocument]) @OneToMany(() => ApplicationDecisionDocument, (document) => document.decision) documents: ApplicationDecisionDocument[]; diff --git a/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.ts b/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.ts index 6d73795091..0446e4a990 100644 --- a/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.ts +++ b/services/apps/alcs/src/alcs/application/application-submission/application-submission.controller.ts @@ -151,6 +151,7 @@ export class ApplicationSubmissionController { parentType: PARENT_TYPE.APPLICATION, primaryContact, ccGovernment: true, + ccEmails: [], }); } diff --git a/services/apps/alcs/src/alcs/application/application.controller.spec.ts b/services/apps/alcs/src/alcs/application/application.controller.spec.ts index 473a5fe842..f405cb677a 100644 --- a/services/apps/alcs/src/alcs/application/application.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application/application.controller.spec.ts @@ -261,7 +261,7 @@ describe('ApplicationController', () => { await controller.update(fileNumber, mockUpdate); - expect(applicationService.update).toBeCalledTimes(1); + expect(applicationService.update).toHaveBeenCalledTimes(1); const savedData = applicationService.update.mock.calls[0][1]; expect(savedData.regionCode).toEqual(mockRegion); }); @@ -306,8 +306,8 @@ describe('ApplicationController', () => { }), ).rejects.toMatchObject(new Error(`Card ${cardUuid} not found`)); - expect(cardService.update).toBeCalledTimes(0); - expect(notificationService.createForCard).toBeCalledTimes(0); + expect(cardService.update).toHaveBeenCalledTimes(0); + expect(notificationService.createForCard).toHaveBeenCalledTimes(0); }); it('should update card status if it changed', async () => { @@ -354,7 +354,7 @@ describe('ApplicationController', () => { }, ); - expect(cardService.update).toBeCalledTimes(1); + expect(cardService.update).toHaveBeenCalledTimes(1); expect(result.card!.status.code).toStrictEqual(updatedCard.status.code); }); @@ -365,8 +365,8 @@ describe('ApplicationController', () => { await controller.getByCardUuid(mockApplicationEntity.card!.uuid); - expect(applicationService.getByCard).toBeCalledTimes(1); - expect(applicationService.mapToDtos).toBeCalledTimes(1); + expect(applicationService.getByCard).toHaveBeenCalledTimes(1); + expect(applicationService.mapToDtos).toHaveBeenCalledTimes(1); }); it('should call through for searching applications', async () => { @@ -377,10 +377,10 @@ describe('ApplicationController', () => { const res = await controller.searchApplications('1231'); expect(res.length).toEqual(1); - expect(applicationService.searchApplicationsByFileNumber).toBeCalledTimes( - 1, - ); - expect(applicationService.mapToDtos).toBeCalledTimes(1); + expect( + applicationService.searchApplicationsByFileNumber, + ).toHaveBeenCalledTimes(1); + expect(applicationService.mapToDtos).toHaveBeenCalledTimes(1); }); it('should call through for get', async () => { @@ -392,8 +392,8 @@ describe('ApplicationController', () => { }, }); - expect(applicationService.getOrFail).toBeCalledTimes(1); - expect(applicationService.mapToDtos).toBeCalledTimes(1); + expect(applicationService.getOrFail).toHaveBeenCalledTimes(1); + expect(applicationService.mapToDtos).toHaveBeenCalledTimes(1); expect(mockTrackingService.trackView).toHaveBeenCalledTimes(1); }); @@ -421,9 +421,11 @@ describe('ApplicationController', () => { await controller.cancel(mockApplicationEntity.uuid); - expect(applicationService.cancel).toBeCalledTimes(1); - expect(statusEmailService.sendApplicationStatusEmail).toBeCalledTimes(1); - expect(statusEmailService.sendApplicationStatusEmail).toBeCalledWith({ + expect(applicationService.cancel).toHaveBeenCalledTimes(1); + expect(statusEmailService.sendApplicationStatusEmail).toHaveBeenCalledTimes( + 1, + ); + expect(statusEmailService.sendApplicationStatusEmail).toHaveBeenCalledWith({ generateStatusHtml: generateCANCApplicationHtml, status: SUBMISSION_STATUS.CANCELLED, applicationSubmission: mockApplicationSubmission, @@ -431,6 +433,7 @@ describe('ApplicationController', () => { parentType: 'application', primaryContact: mockOwner, ccGovernment: true, + ccEmails: [], }); }); @@ -458,14 +461,16 @@ describe('ApplicationController', () => { await controller.cancel(mockApplicationEntity.uuid); - expect(applicationService.cancel).toBeCalledTimes(1); - expect(statusEmailService.sendApplicationStatusEmail).toBeCalledTimes(0); + expect(applicationService.cancel).toHaveBeenCalledTimes(1); + expect(statusEmailService.sendApplicationStatusEmail).toHaveBeenCalledTimes( + 0, + ); }); it('should call through for uncancel', async () => { applicationService.uncancel.mockResolvedValue(); await controller.uncancel(mockApplicationEntity.uuid); - expect(applicationService.uncancel).toBeCalledTimes(1); + expect(applicationService.uncancel).toHaveBeenCalledTimes(1); }); }); diff --git a/services/apps/alcs/src/alcs/application/application.controller.ts b/services/apps/alcs/src/alcs/application/application.controller.ts index 8709ef7e6a..f66ee885ab 100644 --- a/services/apps/alcs/src/alcs/application/application.controller.ts +++ b/services/apps/alcs/src/alcs/application/application.controller.ts @@ -151,6 +151,7 @@ export class ApplicationController { parentType: PARENT_TYPE.APPLICATION, primaryContact, ccGovernment: !!submissionGovernment, + ccEmails: [], }); } diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts index 2d7134bb00..77b17d8b37 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts @@ -216,6 +216,7 @@ export class NoticeOfIntentDecisionV2Service { existingDecision.wasReleased = existingDecision.wasReleased || !updateDto.isDraft; existingDecision.emailSent = updateDto.emailSent; + existingDecision.ccEmails = updateDto.ccEmails; if (updateDto.outcomeCode) { existingDecision.outcome = await this.getOutcomeByCode( diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts index 53a039c5a8..cc432232ce 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts @@ -83,6 +83,10 @@ export class UpdateNoticeOfIntentDecisionDto { @IsDate() @IsOptional() emailSent?: Date | null; + + @IsOptional() + @IsArray() + ccEmails?: string[]; } export class CreateNoticeOfIntentDecisionDto extends UpdateNoticeOfIntentDecisionDto { diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.entity.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.entity.ts index 03ccd0cceb..cae8d3168e 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.entity.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.entity.ts @@ -142,6 +142,14 @@ export class NoticeOfIntentDecision extends Base { }) emailSent: Date | null; + @Column({ + default: [], + array: true, + type: 'text', + comment: 'Tracks extra emails to send the decision email to', + }) + ccEmails: string[]; + @ManyToMany( () => NoticeOfIntentModification, (modification) => modification.modifiesDecisions, diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.ts index 09efdcfc2b..4a58d4afcc 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.controller.ts @@ -118,6 +118,7 @@ export class NoticeOfIntentController { parentType: PARENT_TYPE.NOTICE_OF_INTENT, primaryContact, ccGovernment: !!submissionGovernment, + ccEmails: [], }); } } diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts index 4f66a9e73a..c478ea8e8b 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.spec.ts @@ -388,6 +388,7 @@ describe('ApplicationSubmissionReviewController', () => { parentType: 'application', primaryContact: mockOwner, ccGovernment: true, + ccEmails: [], }); }); @@ -462,6 +463,7 @@ describe('ApplicationSubmissionReviewController', () => { parentType: 'application', primaryContact: mockOwner, ccGovernment: true, + ccEmails: [], }); }); @@ -564,6 +566,7 @@ describe('ApplicationSubmissionReviewController', () => { parentType: 'application', primaryContact: mockOwner, ccGovernment: true, + ccEmails: [], }); }); @@ -641,6 +644,7 @@ describe('ApplicationSubmissionReviewController', () => { government: mockLG, parentType: 'application', primaryContact: mockOwner, + ccEmails: [], }); }); diff --git a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts index 586067c165..58d59eaf81 100644 --- a/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts +++ b/services/apps/alcs/src/portal/application-submission-review/application-submission-review.controller.ts @@ -20,7 +20,6 @@ import { generateWRNGHtml } from '../../../../../templates/emails/wrong-lfng.tem import { ApplicationDocumentService } from '../../alcs/application/application-document/application-document.service'; import { ApplicationSubmissionStatusService } from '../../alcs/application/application-submission-status/application-submission-status.service'; import { SUBMISSION_STATUS } from '../../alcs/application/application-submission-status/submission-status.dto'; -import { ApplicationService } from '../../alcs/application/application.service'; import { PARENT_TYPE } from '../../alcs/card/card-subtask/card-subtask.dto'; import { LocalGovernmentService } from '../../alcs/local-government/local-government.service'; import { PortalAuthGuard } from '../../common/authorization/portal-auth-guard.service'; @@ -200,6 +199,7 @@ export class ApplicationSubmissionReviewController { government: userLocalGovernment, parentType: PARENT_TYPE.APPLICATION, primaryContact, + ccEmails: [], }); } @@ -309,6 +309,7 @@ export class ApplicationSubmissionReviewController { parentType: PARENT_TYPE.APPLICATION, primaryContact, ccGovernment: true, + ccEmails: [], }); } } else { @@ -326,6 +327,7 @@ export class ApplicationSubmissionReviewController { parentType: PARENT_TYPE.APPLICATION, primaryContact, ccGovernment: true, + ccEmails: [], }); } } @@ -416,6 +418,7 @@ export class ApplicationSubmissionReviewController { government: userLocalGovernment, parentType: PARENT_TYPE.APPLICATION, primaryContact, + ccEmails: [], }); } @@ -428,6 +431,7 @@ export class ApplicationSubmissionReviewController { parentType: PARENT_TYPE.APPLICATION, primaryContact, ccGovernment: true, + ccEmails: [], }); } } diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts b/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts index 80a6465209..b38578711d 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.controller.spec.ts @@ -296,6 +296,7 @@ describe('ApplicationSubmissionController', () => { parentType: 'application', primaryContact: mockOwner, ccGovernment: true, + ccEmails: [], }); }); @@ -536,6 +537,7 @@ describe('ApplicationSubmissionController', () => { government: mockGovernment, parentType: 'application', primaryContact: mockOwner, + ccEmails: [], }); expect( mockStatusEmailService.sendApplicationStatusEmail, @@ -545,6 +547,7 @@ describe('ApplicationSubmissionController', () => { applicationSubmission: mockApplicationSubmission, government: mockGovernment, parentType: 'application', + ccEmails: [], }); }); @@ -598,6 +601,7 @@ describe('ApplicationSubmissionController', () => { government: mockGovernment, parentType: 'application', primaryContact: mockOwner, + ccEmails: [], }); expect( mockStatusEmailService.sendApplicationStatusEmail, @@ -607,6 +611,7 @@ describe('ApplicationSubmissionController', () => { applicationSubmission: mockApplicationSubmission, government: mockGovernment, parentType: 'application', + ccEmails: [], }); }); diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts b/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts index ecd7d0a4b4..72cb299ad6 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.controller.ts @@ -231,6 +231,7 @@ export class ApplicationSubmissionController { parentType: PARENT_TYPE.APPLICATION, primaryContact, ccGovernment: !!submissionGovernment, + ccEmails: [], }); } @@ -296,6 +297,7 @@ export class ApplicationSubmissionController { government: submissionGovernment, parentType: PARENT_TYPE.APPLICATION, primaryContact, + ccEmails: [], }); } @@ -306,6 +308,7 @@ export class ApplicationSubmissionController { applicationSubmission: validatedSubmission, government: submissionGovernment, parentType: PARENT_TYPE.APPLICATION, + ccEmails: [], }); } @@ -335,6 +338,7 @@ export class ApplicationSubmissionController { government: submissionGovernment, parentType: PARENT_TYPE.APPLICATION, primaryContact, + ccEmails: [], }); } @@ -345,6 +349,7 @@ export class ApplicationSubmissionController { applicationSubmission: validatedSubmission, government: submissionGovernment, parentType: PARENT_TYPE.APPLICATION, + ccEmails: [], }); } diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission-draft/notice-of-intent-submission-draft.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission-draft/notice-of-intent-submission-draft.service.ts index 53ddf6feb5..1c08aa6ba4 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission-draft/notice-of-intent-submission-draft.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission-draft/notice-of-intent-submission-draft.service.ts @@ -255,6 +255,7 @@ export class NoticeOfIntentSubmissionDraftService { noticeOfIntentSubmission: savedDraft, government: submissionGovernment, parentType: PARENT_TYPE.NOTICE_OF_INTENT, + ccEmails: [], }); } } diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts index 38833638e9..25872fffc6 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.spec.ts @@ -1,10 +1,9 @@ -import { classes } from 'automapper-classes'; -import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { BadRequestException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { ClsService } from 'nestjs-cls'; -import { generateCANCNoticeOfIntentHtml } from '../../../../../templates/emails/cancelled'; import { generateSUBMNoiApplicantHtml, generateSUBMNoiGovernmentHtml, @@ -398,6 +397,7 @@ describe('NoticeOfIntentSubmissionController', () => { government: mockGovernment, parentType: 'notice-of-intent', primaryContact: mockOwner, + ccEmails: [], }); expect( mockStatusEmailService.sendNoticeOfIntentStatusEmail, @@ -407,6 +407,7 @@ describe('NoticeOfIntentSubmissionController', () => { noticeOfIntentSubmission: mockSubmission, government: mockGovernment, parentType: 'notice-of-intent', + ccEmails: [], }); }); }); diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts index 0ddaed501d..74e4b68215 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.controller.ts @@ -197,6 +197,7 @@ export class NoticeOfIntentSubmissionController { government: submissionGovernment, parentType: PARENT_TYPE.NOTICE_OF_INTENT, primaryContact, + ccEmails: [], }); } @@ -207,6 +208,7 @@ export class NoticeOfIntentSubmissionController { noticeOfIntentSubmission, government: submissionGovernment, parentType: PARENT_TYPE.NOTICE_OF_INTENT, + ccEmails: [], }); } diff --git a/services/apps/alcs/src/providers/email/status-email.service.spec.ts b/services/apps/alcs/src/providers/email/status-email.service.spec.ts index 33ac4883b8..00238d5b5c 100644 --- a/services/apps/alcs/src/providers/email/status-email.service.spec.ts +++ b/services/apps/alcs/src/providers/email/status-email.service.spec.ts @@ -26,7 +26,11 @@ import { NoticeOfIntentOwner } from '../../portal/notice-of-intent-submission/no import { NoticeOfIntentSubmission } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; import { NoticeOfIntentSubmissionService } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.service'; import { EmailService } from './email.service'; -import { StatusEmailService } from './status-email.service'; +import { + ApplicationEmailData, + NoticeOfIntentEmailData, + StatusEmailService, +} from './status-email.service'; describe('StatusEmailService', () => { let service: StatusEmailService; @@ -220,13 +224,14 @@ describe('StatusEmailService', () => { }); it('should call through services to set application email template', async () => { - const mockData = { + const mockData: ApplicationEmailData = { generateStatusHtml: () => ({}) as MJMLParseResults, status: SUBMISSION_STATUS.IN_REVIEW_BY_LG, applicationSubmission: new ApplicationSubmission({ typeCode: 'TURP' }), parentType: 'application' as PARENT_TYPE, government: new LocalGovernment({ emails: [] }), primaryContact: new ApplicationOwner(), + ccEmails: [], }; mockApplicationSubmissionService.getStatus.mockResolvedValue( @@ -245,13 +250,14 @@ describe('StatusEmailService', () => { }); it('should call through services to set notice of intent email template', async () => { - const mockData = { + const mockData: NoticeOfIntentEmailData = { generateStatusHtml: () => ({}) as MJMLParseResults, status: NOI_SUBMISSION_STATUS.SUBMITTED_TO_ALC, noticeOfIntentSubmission: new NoticeOfIntentSubmission(), parentType: 'notice-of-intent' as PARENT_TYPE, government: new LocalGovernment({ emails: [] }), primaryContact: new NoticeOfIntentOwner(), + ccEmails: [], }; mockNoticeOfIntentSubmissionService.getStatus.mockResolvedValue( @@ -262,10 +268,46 @@ describe('StatusEmailService', () => { await service.sendNoticeOfIntentStatusEmail(mockData); - expect(mockNoticeOfIntentSubmissionService.getStatus).toBeCalledTimes(1); - expect(mockNoticeOfIntentSubmissionService.getStatus).toBeCalledWith( + expect(mockNoticeOfIntentSubmissionService.getStatus).toHaveBeenCalledTimes( + 1, + ); + expect(mockNoticeOfIntentSubmissionService.getStatus).toHaveBeenCalledWith( mockData.status, ); - expect(mockNoticeOfIntentService.listTypes).toBeCalledTimes(1); + expect(mockNoticeOfIntentService.listTypes).toHaveBeenCalledTimes(1); + }); + + it('should add CC emails to the send call', async () => { + const ccEmails = ['bruce.wayne@fakeemail.com', 'iam.batman@fakeemail.com']; + const mockData: NoticeOfIntentEmailData = { + generateStatusHtml: () => ({}) as MJMLParseResults, + status: NOI_SUBMISSION_STATUS.SUBMITTED_TO_ALC, + noticeOfIntentSubmission: new NoticeOfIntentSubmission(), + parentType: 'notice-of-intent' as PARENT_TYPE, + government: new LocalGovernment({ emails: [] }), + primaryContact: new NoticeOfIntentOwner({ + email: 'primary.contact@fakeemail.com', + }), + ccEmails, + }; + + mockNoticeOfIntentSubmissionService.getStatus.mockResolvedValue( + new NoticeOfIntentSubmissionStatusType(), + ); + mockNoticeOfIntentService.listTypes.mockResolvedValue([]); + mockNoticeOfIntentService.getUuid.mockResolvedValue('fake-uuid'); + + await service.sendNoticeOfIntentStatusEmail(mockData); + + expect(mockNoticeOfIntentSubmissionService.getStatus).toHaveBeenCalledTimes( + 1, + ); + expect(mockNoticeOfIntentService.listTypes).toHaveBeenCalledTimes(1); + expect(mockEmailService.sendEmail).toHaveBeenCalledTimes(1); + expect(mockEmailService.sendEmail).toHaveBeenCalledWith( + expect.objectContaining({ + cc: ccEmails, + }), + ); }); }); diff --git a/services/apps/alcs/src/providers/email/status-email.service.ts b/services/apps/alcs/src/providers/email/status-email.service.ts index 43598823a8..d87d90204e 100644 --- a/services/apps/alcs/src/providers/email/status-email.service.ts +++ b/services/apps/alcs/src/providers/email/status-email.service.ts @@ -40,16 +40,17 @@ type BaseStatusEmailData = { government: LocalGovernment | null; parentType: PARENT_TYPE; ccGovernment?: boolean; + ccEmails: string[]; documents?: DocumentEmailData[]; }; -type ApplicationEmailData = BaseStatusEmailData & { +export type ApplicationEmailData = BaseStatusEmailData & { applicationSubmission: ApplicationSubmission; status: SUBMISSION_STATUS; primaryContact?: ApplicationOwner; }; -type NoticeOfIntentEmailData = BaseStatusEmailData & { +export type NoticeOfIntentEmailData = BaseStatusEmailData & { noticeOfIntentSubmission: NoticeOfIntentSubmission; status: NOI_SUBMISSION_STATUS; primaryContact?: NoticeOfIntentOwner; @@ -248,7 +249,7 @@ export class StatusEmailService { async sendApplicationStatusEmail(data: ApplicationEmailData) { const email = await this.getApplicationEmailTemplate(data); - this.sendStatusEmail(data, email); + await this.sendStatusEmail(data, email); } async sendNoticeOfIntentStatusEmail(data: NoticeOfIntentEmailData) { @@ -261,16 +262,25 @@ export class StatusEmailService { data: ApplicationEmailData | NoticeOfIntentEmailData, email, ) { + const ccEmails: string[] = []; + const toEmails: string[] = []; if (data.primaryContact && data.primaryContact.email) { + toEmails.push(data.primaryContact.email); + if (data.ccGovernment && data.government?.emails) { + ccEmails.push(...data.government.emails); + } + } else { + if (data.ccGovernment && data.government?.emails) { + toEmails.push(...data.government.emails); + } + } + ccEmails.push(...data.ccEmails); + + if (toEmails.length > 0) { await this.emailService.sendEmail({ ...email, - to: [data.primaryContact.email], - cc: data.ccGovernment ? data.government?.emails : [], - }); - } else if (data.government && data.government.emails.length > 0) { - await this.emailService.sendEmail({ - ...email, - to: data.government.emails, + to: toEmails, + cc: ccEmails, }); } else { this.logger.warn( diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1715624004938-add_cc_emails_to_decisions.ts b/services/apps/alcs/src/providers/typeorm/migrations/1715624004938-add_cc_emails_to_decisions.ts new file mode 100644 index 0000000000..ba6ffbe8df --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1715624004938-add_cc_emails_to_decisions.ts @@ -0,0 +1,29 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class AddCcEmailsToDecisions1715624004938 implements MigrationInterface { + name = 'AddCcEmailsToDecisions1715624004938'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision" ADD "cc_emails" text array NOT NULL DEFAULT '{}'`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."application_decision"."cc_emails" IS 'Tracks extra emails to send the decision email to'`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision" ADD "cc_emails" text array NOT NULL DEFAULT '{}'`, + ); + await queryRunner.query( + `COMMENT ON COLUMN "alcs"."notice_of_intent_decision"."cc_emails" IS 'Tracks extra emails to send the decision email to'`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."notice_of_intent_decision" DROP COLUMN "cc_emails"`, + ); + await queryRunner.query( + `ALTER TABLE "alcs"."application_decision" DROP COLUMN "cc_emails"`, + ); + } +} diff --git a/services/apps/alcs/src/queues/scheduler/application/decision-emails/decision-emails.consumer.ts b/services/apps/alcs/src/queues/scheduler/application/decision-emails/decision-emails.consumer.ts index feb0e13bf6..c18abf7f7e 100644 --- a/services/apps/alcs/src/queues/scheduler/application/decision-emails/decision-emails.consumer.ts +++ b/services/apps/alcs/src/queues/scheduler/application/decision-emails/decision-emails.consumer.ts @@ -65,6 +65,7 @@ export class ApplicationDecisionEmailConsumer extends WorkerHost { primaryContact, submissionStatus, decision.uuid, + decision.ccEmails, ); await this.appDecisionService.update( @@ -99,6 +100,7 @@ export class ApplicationDecisionEmailConsumer extends WorkerHost { primaryContact: ApplicationOwner | undefined, submissionStatus: ApplicationSubmissionToSubmissionStatus, decisionUuid: string, + ccEmails: string[], ) { if ( primaryContact && @@ -124,6 +126,7 @@ export class ApplicationDecisionEmailConsumer extends WorkerHost { generateStatusHtml, status: submissionStatus.statusTypeCode, documents, + ccEmails, }); } } diff --git a/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.spec.ts b/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.spec.ts index 08eaf024d9..f0147cdb4d 100644 --- a/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.spec.ts +++ b/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.spec.ts @@ -80,19 +80,23 @@ describe('ApplicationSubmissionStatusEmailConsumer', () => { expect( mockApplicationSubmissionStatusService.getSubmissionToSubmissionStatusForSendingEmails, - ).toBeCalledTimes(1); + ).toHaveBeenCalledTimes(1); expect( mockApplicationSubmissionStatusService.saveSubmissionToSubmissionStatus, - ).toBeCalledTimes(1); + ).toHaveBeenCalledTimes(1); - expect(mockStatusEmailService.getApplicationEmailData).toBeCalledWith( + expect(mockStatusEmailService.getApplicationEmailData).toHaveBeenCalledWith( 'fake', ); - expect(mockStatusEmailService.getApplicationEmailData).toBeCalledTimes(1); - expect(mockStatusEmailService.sendApplicationStatusEmail).toBeCalledTimes( - 1, - ); - expect(mockStatusEmailService.sendApplicationStatusEmail).toBeCalledWith({ + expect( + mockStatusEmailService.getApplicationEmailData, + ).toHaveBeenCalledTimes(1); + expect( + mockStatusEmailService.sendApplicationStatusEmail, + ).toHaveBeenCalledTimes(1); + expect( + mockStatusEmailService.sendApplicationStatusEmail, + ).toHaveBeenCalledWith({ applicationSubmission: mockSubmission, government: mockLocalGovernment, parentType: PARENT_TYPE.APPLICATION, @@ -101,6 +105,7 @@ describe('ApplicationSubmissionStatusEmailConsumer', () => { generateStatusHtml: generateREVAHtml, status: SUBMISSION_STATUS.IN_REVIEW_BY_ALC, documents: [], + ccEmails: [], }); }); @@ -131,17 +136,19 @@ describe('ApplicationSubmissionStatusEmailConsumer', () => { expect( mockApplicationSubmissionStatusService.getSubmissionToSubmissionStatusForSendingEmails, - ).toBeCalledTimes(1); + ).toHaveBeenCalledTimes(1); expect( mockApplicationSubmissionStatusService.saveSubmissionToSubmissionStatus, - ).toBeCalledTimes(0); + ).toHaveBeenCalledTimes(0); - expect(mockStatusEmailService.getApplicationEmailData).toBeCalledWith( + expect(mockStatusEmailService.getApplicationEmailData).toHaveBeenCalledWith( 'fake', ); - expect(mockStatusEmailService.getApplicationEmailData).toBeCalledTimes(1); - expect(mockStatusEmailService.sendApplicationStatusEmail).toBeCalledTimes( - 0, - ); + expect( + mockStatusEmailService.getApplicationEmailData, + ).toHaveBeenCalledTimes(1); + expect( + mockStatusEmailService.sendApplicationStatusEmail, + ).toHaveBeenCalledTimes(0); }); }); diff --git a/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.ts b/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.ts index ed36107288..2a91c78931 100644 --- a/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.ts +++ b/services/apps/alcs/src/queues/scheduler/application/status-emails/status-emails.consumer.ts @@ -108,6 +108,7 @@ export class ApplicationSubmissionStatusEmailConsumer extends WorkerHost { generateStatusHtml, status: submissionStatus.statusTypeCode, documents, + ccEmails: [], }); await this.updateSubmissionStatus(submissionStatus); diff --git a/services/apps/alcs/src/queues/scheduler/notice-of-intent/decision-emails.consumer.ts b/services/apps/alcs/src/queues/scheduler/notice-of-intent/decision-emails.consumer.ts index d980c6dc6c..7fbfb8262f 100644 --- a/services/apps/alcs/src/queues/scheduler/notice-of-intent/decision-emails.consumer.ts +++ b/services/apps/alcs/src/queues/scheduler/notice-of-intent/decision-emails.consumer.ts @@ -63,6 +63,7 @@ export class NoticeOfIntentDecisionEmailsConsumer extends WorkerHost { primaryContact, ccGovernment: true, documents, + ccEmails: decision.ccEmails, }); await this.noiDecisionService.update( From 5f0a18d805f0f11161568b1e738ed094a6c1ca7b Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Mon, 13 May 2024 16:17:49 -0700 Subject: [PATCH 060/103] Emit correct DTO --- .../owner-dialogs/parcel-owners/parcel-owners.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts index 7e68fa397c..9bd8bedccc 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts +++ b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.ts @@ -22,7 +22,7 @@ import { NoticeOfIntentDocumentDto } from '../../../services/notice-of-intent-do }) export class ParcelOwnersComponent { @Output() saveParcel = new EventEmitter(); - @Output() onOwnersUpdated = new EventEmitter(); + @Output() onOwnersUpdated = new EventEmitter(); @Output() onOwnerRemoved = new EventEmitter(); @Output() onOwnersDeleted = new EventEmitter(); From f41bc6bda5c01d36414bea2c2e96eb5f9b3df52d Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 14 May 2024 10:20:30 -0700 Subject: [PATCH 061/103] Add clear buttons to Inbox --- .../features/home/inbox/inbox.component.html | 98 ++++++++++++++++--- .../features/home/inbox/inbox.component.scss | 25 +++++ 2 files changed, 112 insertions(+), 11 deletions(-) diff --git a/portal-frontend/src/app/features/home/inbox/inbox.component.html b/portal-frontend/src/app/features/home/inbox/inbox.component.html index af40dd5b49..6bc02a84df 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox.component.html +++ b/portal-frontend/src/app/features/home/inbox/inbox.component.html @@ -13,28 +13,58 @@ - {{ panel.expanded ? 'Less' : 'More' }} Search Options + {{ panel.expanded ? 'Less' : 'More' }} Search Options
Filter By - + Created By {{ profile.government }} Submitted To {{ profile.government }} +
- + +
- + +
warning @@ -44,7 +74,17 @@
- + +
warning @@ -58,7 +98,17 @@ > - + +
warning @@ -81,12 +131,32 @@ {{ status.label }} +
- + +
@@ -102,9 +172,15 @@
- + - Applications: {{ applicationTotal }} + Applications: {{ applicationTotal }} - Notice of Intent: {{ noticeOfIntentTotal }} + Notice of Intent: {{ noticeOfIntentTotal }} - Notification of SRW: {{ notificationTotal }} + Notification of SRW: {{ notificationTotal }} *[role=img] { + width: rem(16); + height: rem(16); + font-size: rem(16); + + svg { + width: rem(16); + height: rem(16); + } + } + + .mat-mdc-button-touch-target { + width: rem(24) !important; + height: rem(24) !important; + } + } + } .search-form { From 7300a1ca018eeb0cfd840972364d371aaa4b31f9 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 14 May 2024 13:04:29 -0700 Subject: [PATCH 062/103] ALCS Advanced Search UI Reorg * Re-organize components * Remove View more section * Change date picker to open on click and prevent typing --- .../file-type-filter-drop-down.component.html | 21 +- .../file-type-filter-drop-down.component.scss | 9 +- .../app/features/search/search.component.html | 215 ++++++++++-------- .../app/features/search/search.component.scss | 126 +++++----- .../app/features/search/search.component.ts | 3 +- 5 files changed, 207 insertions(+), 167 deletions(-) diff --git a/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html b/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html index e82a605822..faf9fdb64a 100644 --- a/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html +++ b/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html @@ -1,13 +1,21 @@ - + + File Type + + info Please select an item from below @@ -17,8 +25,8 @@ class="checklist-leaf-node" [checked]="checklistSelection.isSelected(node)" (change)="leafItemSelectionToggle(node)" - >{{ node.item?.label ?? node.item }} + >{{ node.item?.label ?? node.item }} + @@ -32,10 +40,9 @@ [indeterminate]="descendantsPartiallySelected(node)" (change)="itemSelectionToggle(node)" > - {{ node.item?.label ?? node.item }} + {{ node.item?.label ?? node.item }} + - diff --git a/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss b/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss index 6d1e74d882..3d29bad0ce 100644 --- a/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss +++ b/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss @@ -2,14 +2,19 @@ width: 100%; } +#type { + text-overflow: ellipsis; +} + .clear-button { background: transparent; padding: 0; - position: absolute; - right: 0; border: none; cursor: pointer; font-size: 20px !important; font-weight: 400 !important; color: #313132; + text-align: center; + vertical-align: bottom; + max-height: 24px; } diff --git a/alcs-frontend/src/app/features/search/search.component.html b/alcs-frontend/src/app/features/search/search.component.html index e8e8392c47..acd46f2805 100644 --- a/alcs-frontend/src/app/features/search/search.component.html +++ b/alcs-frontend/src/app/features/search/search.component.html @@ -2,12 +2,9 @@

Advanced Search

-
-
Provide one or more of the following criteria:
-
-
+

File Details

@@ -16,79 +13,39 @@
Provide one or more of the following criteria:
- + Name + info -
- Search by Primary Contact, Parcel Owner, Organization, Ministry or Department, Inquirer, SRW Transferee, PR Document - Name -
+
warning
Enter 3 or more characters to search by name
-
- -
- - PID - - -
- warning -
PID must be 9 digits including leading zeroes
-
-
-
- - Civic Address - - -
- warning -
Enter 3 or more characters to search
-
+ +
-
-
-
- info -
-
- Property details change over time. Use both ALCS and - iMap to confirm ALC history on a property +
+
-
-
-
- More Criteria - keyboard_arrow_down -
- -
- Less Criteria - keyboard_arrow_up -
-
- -
@@ -118,25 +75,41 @@
Provide one or more of the following criteria:
+
+ +
+

Location

- - + + PID + + +
+ warning +
PID must be 9 digits including leading zeroes
+
-
- -
Note: This field searches both proposal and decision component type
+ + Civic Address + + +
+ warning +
Enter 3 or more characters to search
+
+
+
+
+ info +
+
+ Property details change over time. Use both ALCS and + iMap to confirm ALC history on a property +
-
Provide one or more of the following criteria:
-
Date Submitted to ALC
-
+
+ +
+

Date Range

+
- - From + + Submitted to ALC - Start Date +
- - To + + Submitted to ALC - End Date +
-
Date Decided
-
+
- - From + + Decision - Start Date +
- - To + + Decision - End Date + @@ -249,7 +272,7 @@
Provide one or more of the following criteria:

Search Results:

- Applications: {{ applicationTotal }} + Applications: {{ applicationTotal }} Search Results: - Notice of Intent: {{ noticeOfIntentTotal }} + Notice of Intent: {{ noticeOfIntentTotal }} Search Results: - Planning Reviews: {{ planningReviewsTotal }} + Planning Reviews: {{ planningReviewsTotal }} Search Results: - Notifications: {{ notificationTotal }} + Notifications: {{ notificationTotal }} Search Results: - Inquiries: {{ inquiriesTotal }} + Inquiries: {{ inquiriesTotal }} *[role=img] { + width: 16px; + height: 16px; + font-size: 16px; + + svg { + width: 16px; + height: 16px; + } + } + + .mat-mdc-button-touch-target { + width: 24px !important; + height: 24px !important; + } + } } diff --git a/alcs-frontend/src/app/features/search/search.component.ts b/alcs-frontend/src/app/features/search/search.component.ts index 9ff767d60e..4aeb94437b 100644 --- a/alcs-frontend/src/app/features/search/search.component.ts +++ b/alcs-frontend/src/app/features/search/search.component.ts @@ -6,7 +6,7 @@ import { MatTabGroup } from '@angular/material/tabs'; import { Title } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; import moment from 'moment'; -import { Observable, Subject, combineLatestWith, map, startWith, takeUntil } from 'rxjs'; +import { combineLatestWith, map, Observable, startWith, Subject, takeUntil } from 'rxjs'; import { ApplicationRegionDto } from '../../services/application/application-code.dto'; import { ApplicationLocalGovernmentDto } from '../../services/application/application-local-government/application-local-government.dto'; import { ApplicationLocalGovernmentService } from '../../services/application/application-local-government/application-local-government.service'; @@ -105,6 +105,7 @@ export class SearchComponent implements OnInit, OnDestroy { notificationStatuses: NotificationSubmissionStatusDto[] = []; noiStatuses: NoticeOfIntentStatusDto[] = []; isLoading = false; + today = new Date(); constructor( private searchService: SearchService, From c860944117253e0dccc8f11544dc0501c358ad4a Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 14 May 2024 13:46:43 -0700 Subject: [PATCH 063/103] ALCS Search Fixes * Fix name queries being terribly wrong, must not have tested this myself * Change variable names for date_submitted so they do not conflict --- .../application-advanced-search.service.ts | 14 ++++-- .../inquiry-advanced-search.service.ts | 18 ++++---- ...otice-of-intent-advanced-search.service.ts | 46 ++++++++++++------- .../notification-advanced-search.service.ts | 12 ++--- ...planning-review-advanced-search.service.ts | 10 ++-- 5 files changed, 58 insertions(+), 42 deletions(-) diff --git a/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts index 5d830e8e3b..ae1527c787 100644 --- a/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts @@ -156,7 +156,7 @@ export class ApplicationAdvancedSearchService { this.addFileTypeResults(searchDto, promises); } - if (searchDto.dateSubmittedTo || searchDto.dateSubmittedFrom) { + if (searchDto.dateSubmittedFrom || searchDto.dateSubmittedTo) { this.addSubmittedDateResults(searchDto, promises); } @@ -400,14 +400,18 @@ export class ApplicationAdvancedSearchService { .select('app.fileNumber'); if (searchDto.dateSubmittedFrom !== undefined) { - query.andWhere('app.date_submitted_to_alc >= :date_submitted', { - date_submitted: new Date(searchDto.dateSubmittedFrom), + query.andWhere('app.date_submitted_to_alc >= :date_submitted_from', { + date_submitted_from: getStartOfDayToPacific( + searchDto.dateSubmittedFrom, + ).toISOString(), }); } if (searchDto.dateSubmittedTo !== undefined) { - query.andWhere('app.date_submitted_to_alc <= :date_submitted', { - date_submitted: new Date(searchDto.dateSubmittedTo), + query.andWhere('app.date_submitted_to_alc <= :date_submitted_to', { + date_submitted_to: getNextDayToPacific( + searchDto.dateSubmittedTo, + ).toISOString(), }); } promises.push(query.getMany()); diff --git a/services/apps/alcs/src/alcs/search/inquiry/inquiry-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/inquiry/inquiry-advanced-search.service.ts index 2c11ca75b4..aa9c5beed7 100644 --- a/services/apps/alcs/src/alcs/search/inquiry/inquiry-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/inquiry/inquiry-advanced-search.service.ts @@ -135,7 +135,7 @@ export class InquiryAdvancedSearchService { this.addParcelResults(searchDto, promises); } - if (searchDto.dateSubmittedTo || searchDto.dateSubmittedFrom) { + if (searchDto.dateSubmittedFrom || searchDto.dateSubmittedTo) { this.addSubmittedDateResults(searchDto, promises); } @@ -224,18 +224,18 @@ export class InquiryAdvancedSearchService { .createQueryBuilder('inquiry') .select('inquiry.fileNumber') .where( - "LOWER(inquirySearch.inquirer_first_name || ' ' || inquirySearch.inquirer_last_name) LIKE ANY (:names)", + "LOWER(inquiry.inquirer_first_name || ' ' || inquiry.inquirer_last_name) LIKE ANY (:names)", { names: formattedSearchString, }, ) - .orWhere('LOWER(inquirySearch.inquirer_first_name) LIKE ANY (:names)', { + .orWhere('LOWER(inquiry.inquirer_first_name) LIKE ANY (:names)', { names: formattedSearchString, }) - .orWhere('LOWER(inquirySearch.inquirer_last_name) LIKE ANY (:names)', { + .orWhere('LOWER(inquiry.inquirer_last_name) LIKE ANY (:names)', { names: formattedSearchString, }) - .orWhere('LOWER(inquirySearch.inquirer_organization) LIKE ANY (:names)', { + .orWhere('LOWER(inquiry.inquirer_organization) LIKE ANY (:names)', { names: formattedSearchString, }) .getMany(); @@ -291,18 +291,18 @@ export class InquiryAdvancedSearchService { if (searchDto.dateSubmittedFrom !== undefined) { query = query.andWhere( - 'inquiry.date_submitted_to_alc >= :date_submitted', + 'inquiry.date_submitted_to_alc >= :date_submitted_from', { - date_submitted: new Date(searchDto.dateSubmittedFrom), + date_submitted_from: new Date(searchDto.dateSubmittedFrom), }, ); } if (searchDto.dateSubmittedTo !== undefined) { query = query.andWhere( - 'inquiry.date_submitted_to_alc <= :date_submitted', + 'inquiry.date_submitted_to_alc <= :date_submitted_to', { - date_submitted: new Date(searchDto.dateSubmittedTo), + date_submitted_to: new Date(searchDto.dateSubmittedTo), }, ); } diff --git a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts index 4a32cfea44..8d7f9ecdf3 100644 --- a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts @@ -160,7 +160,7 @@ export class NoticeOfIntentAdvancedSearchService { this.addFileTypeResults(searchDto, promises); } - if (searchDto.dateSubmittedTo || searchDto.dateSubmittedFrom) { + if (searchDto.dateSubmittedFrom || searchDto.dateSubmittedTo) { this.addSubmittedDateResults(searchDto, promises); } @@ -312,26 +312,32 @@ export class NoticeOfIntentAdvancedSearchService { .select('noiSub.fileNumber') .leftJoin( NoticeOfIntentOwner, - 'application_owner', - 'application_owner.application_submission_uuid = appSub.uuid', + 'notice_of_intent_owner', + 'notice_of_intent_owner.notice_of_intent_submission_uuid = noiSub.uuid', ) .andWhere( new Brackets((qb) => qb .where( - "LOWER(application_owner.first_name || ' ' || application_owner.last_name) LIKE ANY (:names)", + "LOWER(notice_of_intent_owner.first_name || ' ' || notice_of_intent_owner.last_name) LIKE ANY (:names)", { names: formattedSearchString, }, ) - .orWhere('LOWER(application_owner.first_name) LIKE ANY (:names)', { - names: formattedSearchString, - }) - .orWhere('LOWER(application_owner.last_name) LIKE ANY (:names)', { - names: formattedSearchString, - }) .orWhere( - 'LOWER(application_owner.organization_name) LIKE ANY (:names)', + 'LOWER(notice_of_intent_owner.first_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(notice_of_intent_owner.last_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(notice_of_intent_owner.organization_name) LIKE ANY (:names)', { names: formattedSearchString, }, @@ -395,15 +401,21 @@ export class NoticeOfIntentAdvancedSearchService { .select('noi.fileNumber'); if (searchDto.dateSubmittedFrom !== undefined) { - query = query.andWhere('noi.date_submitted_to_alc >= :date_submitted', { - date_submitted: new Date(searchDto.dateSubmittedFrom), - }); + query = query.andWhere( + 'noi.date_submitted_to_alc >= :date_submitted_from', + { + date_submitted_from: new Date(searchDto.dateSubmittedFrom), + }, + ); } if (searchDto.dateSubmittedTo !== undefined) { - query = query.andWhere('noi.date_submitted_to_alc <= :date_submitted', { - date_submitted: new Date(searchDto.dateSubmittedTo), - }); + query = query.andWhere( + 'noi.date_submitted_to_alc <= :date_submitted_to', + { + date_submitted_to: new Date(searchDto.dateSubmittedTo), + }, + ); } promises.push(query.getMany()); } diff --git a/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.ts index 82ffb924ff..491e8541f4 100644 --- a/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.ts @@ -146,7 +146,7 @@ export class NotificationAdvancedSearchService { this.addFileTypeResults(searchDto, promises); } - if (searchDto.dateSubmittedTo || searchDto.dateSubmittedFrom) { + if (searchDto.dateSubmittedFrom || searchDto.dateSubmittedTo) { this.addSubmittedDateResults(searchDto, promises); } @@ -250,7 +250,7 @@ export class NotificationAdvancedSearchService { .leftJoin( NotificationTransferee, 'notification_transferee', - 'notification_transferee.notification_submission_uuid = notificationSearch.uuid', + 'notification_transferee.notification_submission_uuid = notiSub.uuid', ) .where( "LOWER(notification_transferee.first_name || ' ' || notification_transferee.last_name) LIKE ANY (:names)", @@ -326,18 +326,18 @@ export class NotificationAdvancedSearchService { if (searchDto.dateSubmittedFrom !== undefined) { query = query.andWhere( - 'notification.date_submitted_to_alc >= :date_submitted', + 'notification.date_submitted_to_alc >= :date_submitted_from', { - date_submitted: new Date(searchDto.dateSubmittedFrom), + date_submitted_from: new Date(searchDto.dateSubmittedFrom), }, ); } if (searchDto.dateSubmittedTo !== undefined) { query = query.andWhere( - 'notification.date_submitted_to_alc <= :date_submitted', + 'notification.date_submitted_to_alc <= :date_submitted_to', { - date_submitted: new Date(searchDto.dateSubmittedTo), + date_submitted_to: new Date(searchDto.dateSubmittedTo), }, ); } diff --git a/services/apps/alcs/src/alcs/search/planning-review/planning-review-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/planning-review/planning-review-advanced-search.service.ts index c9aea92f18..07a746803e 100644 --- a/services/apps/alcs/src/alcs/search/planning-review/planning-review-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/planning-review/planning-review-advanced-search.service.ts @@ -141,7 +141,7 @@ export class PlanningReviewAdvancedSearchService { this.addFileTypeResults(searchDto, promises); } - if (searchDto.dateSubmittedTo || searchDto.dateSubmittedFrom) { + if (searchDto.dateSubmittedFrom || searchDto.dateSubmittedTo) { this.addSubmittedDateResults(searchDto, promises); } @@ -292,14 +292,14 @@ export class PlanningReviewAdvancedSearchService { ); if (searchDto.dateSubmittedFrom !== undefined) { - query.andWhere('referral.submission_date >= :date_submitted', { - date_submitted: new Date(searchDto.dateSubmittedFrom), + query.andWhere('referral.submission_date >= :date_submitted_from', { + date_submitted_from: new Date(searchDto.dateSubmittedFrom), }); } if (searchDto.dateSubmittedTo !== undefined) { - query.andWhere('referral.submission_date <= :date_submitted', { - date_submitted: new Date(searchDto.dateSubmittedTo), + query.andWhere('referral.submission_date <= :date_submitted_to', { + date_submitted_to: new Date(searchDto.dateSubmittedTo), }); } promises.push(query.getMany()); From 6ded1fe3784509113f756dc94c180f5dd8f80046 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 14 May 2024 14:09:18 -0700 Subject: [PATCH 064/103] Change Admin Government Emails to use Chips * Copy chips from CC emails feature --- .../src/app/features/admin/admin.module.ts | 13 +++++- .../local-government-dialog.component.html | 27 ++++++++---- .../local-government-dialog.component.scss | 6 +++ .../local-government-dialog.component.ts | 42 ++++++++++++++++--- 4 files changed, 74 insertions(+), 14 deletions(-) diff --git a/alcs-frontend/src/app/features/admin/admin.module.ts b/alcs-frontend/src/app/features/admin/admin.module.ts index 992239e917..30a5b452e1 100644 --- a/alcs-frontend/src/app/features/admin/admin.module.ts +++ b/alcs-frontend/src/app/features/admin/admin.module.ts @@ -1,6 +1,7 @@ import { DragDropModule } from '@angular/cdk/drag-drop'; import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; +import { MatChipsModule } from '@angular/material/chips'; import { MatPaginatorModule } from '@angular/material/paginator'; import { RouterModule, Routes } from '@angular/router'; import { SharedModule } from '../../shared/shared.module'; @@ -12,6 +13,7 @@ import { CardStatusComponent } from './card-status/card-status.component'; import { CeoCriterionDialogComponent } from './ceo-criterion/ceo-criterion-dialog/ceo-criterion-dialog.component'; import { CeoCriterionComponent } from './ceo-criterion/ceo-criterion.component'; import { ConfigurationComponent } from './configuration/configuration.component'; +import { MaintenanceBannerConfirmationDialogComponent } from './configuration/maintenance-banner-confirmation-dialog/maintenance-banner-confirmation-dialog.component'; import { DecisionConditionTypesDialogComponent } from './decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component'; import { DecisionConditionTypesComponent } from './decision-condition-types/decision-condition-types.component'; import { DecisionMakerDialogComponent } from './decision-maker/decision-maker-dialog/decision-maker-dialog.component'; @@ -23,7 +25,6 @@ import { LocalGovernmentComponent } from './local-government/local-government.co import { NoiSubtypeDialogComponent } from './noi-subtype/noi-subtype-dialog/noi-subtype-dialog.component'; import { NoiSubtypeComponent } from './noi-subtype/noi-subtype.component'; import { UnarchiveComponent } from './unarchive/unarchive.component'; -import { MaintenanceBannerConfirmationDialogComponent } from './configuration/maintenance-banner-confirmation-dialog/maintenance-banner-confirmation-dialog.component'; const routes: Routes = [ { @@ -32,6 +33,7 @@ const routes: Routes = [ children: childRoutes, }, ]; + @NgModule({ declarations: [ AdminComponent, @@ -55,6 +57,13 @@ const routes: Routes = [ ConfigurationComponent, MaintenanceBannerConfirmationDialogComponent, ], - imports: [CommonModule, SharedModule.forRoot(), RouterModule.forChild(routes), MatPaginatorModule, DragDropModule], + imports: [ + CommonModule, + SharedModule.forRoot(), + RouterModule.forChild(routes), + MatPaginatorModule, + DragDropModule, + MatChipsModule, + ], }) export class AdminModule {} diff --git a/alcs-frontend/src/app/features/admin/local-government/dialog/local-government-dialog.component.html b/alcs-frontend/src/app/features/admin/local-government/dialog/local-government-dialog.component.html index 176ff48f4a..c994769009 100644 --- a/alcs-frontend/src/app/features/admin/local-government/dialog/local-government-dialog.component.html +++ b/alcs-frontend/src/app/features/admin/local-government/dialog/local-government-dialog.component.html @@ -39,14 +39,27 @@

{{ title }} Government

- - Contact Emails (comma separated) + + + + {{ email }} + + +
diff --git a/alcs-frontend/src/app/features/admin/local-government/dialog/local-government-dialog.component.scss b/alcs-frontend/src/app/features/admin/local-government/dialog/local-government-dialog.component.scss index f490b81263..445a5adcb7 100644 --- a/alcs-frontend/src/app/features/admin/local-government/dialog/local-government-dialog.component.scss +++ b/alcs-frontend/src/app/features/admin/local-government/dialog/local-government-dialog.component.scss @@ -13,3 +13,9 @@ width: 100%; } } + +:host::ng-deep { + .mat-mdc-form-field-infix { + display: flex; + } +} diff --git a/alcs-frontend/src/app/features/admin/local-government/dialog/local-government-dialog.component.ts b/alcs-frontend/src/app/features/admin/local-government/dialog/local-government-dialog.component.ts index c0aeea566c..bc187645e8 100644 --- a/alcs-frontend/src/app/features/admin/local-government/dialog/local-government-dialog.component.ts +++ b/alcs-frontend/src/app/features/admin/local-government/dialog/local-government-dialog.component.ts @@ -1,4 +1,6 @@ +import { COMMA, ENTER, SPACE } from '@angular/cdk/keycodes'; import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; +import { MatChipEditedEvent, MatChipInputEvent } from '@angular/material/chips'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { Subject, takeUntil } from 'rxjs'; import { LocalGovernmentDto } from '../../../../services/admin-local-government/admin-local-government.dto'; @@ -12,6 +14,8 @@ import { ApplicationService } from '../../../../services/application/application styleUrls: ['./local-government-dialog.component.scss'], }) export class LocalGovernmentDialogComponent implements OnInit, OnDestroy { + readonly separatorKeysCodes = [ENTER, COMMA, SPACE] as const; + $destroy = new Subject(); title: string = 'Create'; model: { @@ -21,7 +25,7 @@ export class LocalGovernmentDialogComponent implements OnInit, OnDestroy { name: string; bceidBusinessGuid: string | null; uuid?: string; - emails: string; + emails: string[]; }; regions: ApplicationRegionDto[] = []; @@ -31,10 +35,10 @@ export class LocalGovernmentDialogComponent implements OnInit, OnDestroy { @Inject(MAT_DIALOG_DATA) public data: LocalGovernmentDto, private dialogRef: MatDialogRef, private localGovernmentService: AdminLocalGovernmentService, - private applicationService: ApplicationService + private applicationService: ApplicationService, ) { this.model = { - emails: '', + emails: [], isActive: '', name: '', isFirstNation: 'false', @@ -49,7 +53,7 @@ export class LocalGovernmentDialogComponent implements OnInit, OnDestroy { ...this.data, isFirstNation: this.data.isFirstNation ? 'true' : 'false', isActive: this.data.isActive ? 'true' : 'false', - emails: this.data.emails ? this.data.emails.join(', ') : '', + emails: this.data.emails, }; this.title = this.model.uuid ? 'Edit' : 'Create'; } @@ -74,7 +78,7 @@ export class LocalGovernmentDialogComponent implements OnInit, OnDestroy { isFirstNation: this.model.isFirstNation === 'true', isActive: this.model.isActive === 'true', preferredRegionCode: this.model.preferredRegionCode, - emails: this.model.emails.split(', '), + emails: this.model.emails, }; if (this.model.uuid) { @@ -86,4 +90,32 @@ export class LocalGovernmentDialogComponent implements OnInit, OnDestroy { this.dialogRef.close(true); } } + + onRemoveEmail(email: string) { + const index = this.model.emails.indexOf(email); + + if (index >= 0) { + this.model.emails.splice(index, 1); + } + } + + addEmail(event: MatChipInputEvent): void { + const value = (event.value || '').trim(); + if (value) { + this.model.emails.push(value); + } + event.chipInput!.clear(); + } + + editEmail(email: string, event: MatChipEditedEvent) { + const value = event.value.trim(); + if (!value) { + this.onRemoveEmail(email); + return; + } + const index = this.model.emails.indexOf(email); + if (index >= 0) { + this.model.emails[index] = value; + } + } } From 4d51da9689b36ccf922cf1de5f7cfea3cf6005c9 Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Tue, 14 May 2024 15:20:09 -0700 Subject: [PATCH 065/103] Split datepicker --- .../search/public-search.component.html | 53 ++++++++++++++----- 1 file changed, 40 insertions(+), 13 deletions(-) diff --git a/portal-frontend/src/app/features/public/search/public-search.component.html b/portal-frontend/src/app/features/public/search/public-search.component.html index 13878c517d..f5ff5ed1b4 100644 --- a/portal-frontend/src/app/features/public/search/public-search.component.html +++ b/portal-frontend/src/app/features/public/search/public-search.component.html @@ -158,23 +158,50 @@

Search by one or more of the following fields:

-
- Decision Dates +
+ Decision Date Range - Start Date - - - - - - - + + +
+
+ Decision Date Range - End Date + + + + +
From 19c3c98ed8bc1f1f6bf724b5345aa2cd1895f6eb Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Tue, 14 May 2024 15:21:52 -0700 Subject: [PATCH 066/103] Limit dates --- .../app/features/public/search/public-search.component.html | 4 ++++ .../src/app/features/public/search/public-search.component.ts | 2 ++ 2 files changed, 6 insertions(+) diff --git a/portal-frontend/src/app/features/public/search/public-search.component.html b/portal-frontend/src/app/features/public/search/public-search.component.html index f5ff5ed1b4..070f925f32 100644 --- a/portal-frontend/src/app/features/public/search/public-search.component.html +++ b/portal-frontend/src/app/features/public/search/public-search.component.html @@ -166,6 +166,8 @@

Search by one or more of the following fields:

formControlName="dateDecidedFrom" [matDatepicker]="dateDecidedFromPicker" aria-label="date-decided-from" + [min]="minDate" + [max]="today" /> info diff --git a/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss b/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss index 3d29bad0ce..3af4eb06e7 100644 --- a/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss +++ b/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss @@ -5,16 +5,3 @@ #type { text-overflow: ellipsis; } - -.clear-button { - background: transparent; - padding: 0; - border: none; - cursor: pointer; - font-size: 20px !important; - font-weight: 400 !important; - color: #313132; - text-align: center; - vertical-align: bottom; - max-height: 24px; -} diff --git a/alcs-frontend/src/app/features/search/search.component.scss b/alcs-frontend/src/app/features/search/search.component.scss index 5d652a8095..b52d384c5a 100644 --- a/alcs-frontend/src/app/features/search/search.component.scss +++ b/alcs-frontend/src/app/features/search/search.component.scss @@ -173,7 +173,6 @@ h4 { .clear-button { padding: 0 !important; - margin-right: 6px !important; width: 24px !important; height: 24px !important; From 61ec34c7dc5b24ad165579fa8e7b551ff49863a9 Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Tue, 14 May 2024 16:03:07 -0700 Subject: [PATCH 068/103] Open picker by clicking anywhere on field --- .../public/search/public-search.component.html | 8 ++++---- .../public/search/public-search.component.ts | 12 ++++++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/portal-frontend/src/app/features/public/search/public-search.component.html b/portal-frontend/src/app/features/public/search/public-search.component.html index 070f925f32..0d33e78815 100644 --- a/portal-frontend/src/app/features/public/search/public-search.component.html +++ b/portal-frontend/src/app/features/public/search/public-search.component.html @@ -160,7 +160,7 @@

Search by one or more of the following fields:

Decision Date Range - Start Date - + Search by one or more of the following fields: matSuffix mat-icon-button aria-label="Clear" - (click)="searchForm.controls.dateDecidedFrom.reset()" + (click)="onClickFromClear($event)" > close @@ -185,7 +185,7 @@

Search by one or more of the following fields:

Decision Date Range - End Date - + Search by one or more of the following fields: matSuffix mat-icon-button aria-label="Clear" - (click)="searchForm.controls.dateDecidedTo.reset()" + (click)="onClickToClear($event)" > close diff --git a/portal-frontend/src/app/features/public/search/public-search.component.ts b/portal-frontend/src/app/features/public/search/public-search.component.ts index cec396be38..114fc7b6a6 100644 --- a/portal-frontend/src/app/features/public/search/public-search.component.ts +++ b/portal-frontend/src/app/features/public/search/public-search.component.ts @@ -464,4 +464,16 @@ export class PublicSearchComponent implements OnInit, OnDestroy { this.componentTypeControl.setValue(storedSearch.fileTypes); this.formEmpty = false; } + + onClickFromClear(event: MouseEvent) { + // Prevent opening picker on close + event.stopPropagation(); + this.searchForm.controls.dateDecidedFrom.reset(); + } + + onClickToClear(event: MouseEvent) { + // Prevent opening picker on close + event.stopPropagation(); + this.searchForm.controls.dateDecidedTo.reset(); + } } From ff8d696ad4ecdb2f6a3fe1aedd9a695d4e1852bf Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Tue, 14 May 2024 16:06:35 -0700 Subject: [PATCH 069/103] Prevent direct editing of date text input --- .../src/app/features/public/search/public-search.component.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/portal-frontend/src/app/features/public/search/public-search.component.html b/portal-frontend/src/app/features/public/search/public-search.component.html index 0d33e78815..656ec17ebe 100644 --- a/portal-frontend/src/app/features/public/search/public-search.component.html +++ b/portal-frontend/src/app/features/public/search/public-search.component.html @@ -162,6 +162,7 @@

Search by one or more of the following fields:

Decision Date Range - Start Date Search by one or more of the following fields: Decision Date Range - End Date Date: Tue, 14 May 2024 16:40:05 -0700 Subject: [PATCH 070/103] Change Portal Status to Multi Select * Generalize the file type filter dropdown to take in more inputs to be re-usable * Add a new data source for portal status types according to Ticket * Switch existing component to use a combo of the above --- .../file-type-filter-drop-down.component.html | 7 +- ...le-type-filter-drop-down.component.spec.ts | 3 + .../file-type-filter-drop-down.component.ts | 24 +++- .../app/features/search/search.component.html | 24 ++-- .../app/features/search/search.component.scss | 3 + .../app/features/search/search.component.ts | 22 ++-- .../portal-status-data-source.service.spec.ts | 33 +++++ .../portal-status-data-source.service.ts | 116 ++++++++++++++++++ .../src/app/services/search/search.dto.ts | 3 +- ...pplication-advanced-search.service.spec.ts | 2 +- .../application-advanced-search.service.ts | 6 +- ...-of-intent-advanced-search.service.spec.ts | 2 +- ...otice-of-intent-advanced-search.service.ts | 6 +- ...tification-advanced-search.service.spec.ts | 2 +- .../notification-advanced-search.service.ts | 6 +- ...ing-review-advanced-search.service.spec.ts | 2 +- .../alcs/src/alcs/search/search.controller.ts | 4 +- .../apps/alcs/src/alcs/search/search.dto.ts | 4 +- 18 files changed, 226 insertions(+), 43 deletions(-) create mode 100644 alcs-frontend/src/app/services/search/portal-status/portal-status-data-source.service.spec.ts create mode 100644 alcs-frontend/src/app/services/search/portal-status/portal-status-data-source.service.ts diff --git a/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html b/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html index 3a9f5181c4..4b325c8100 100644 --- a/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html +++ b/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html @@ -1,9 +1,10 @@ - File Type + {{ label }} close - info + info Please select an item from below diff --git a/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.spec.ts b/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.spec.ts index 98cd31ef11..16cdd4ce9b 100644 --- a/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.spec.ts +++ b/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.spec.ts @@ -1,6 +1,7 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { FileTypeDataSourceService } from '../../../services/search/file-type/file-type-data-source.service'; import { FileTypeFilterDropDownComponent } from './file-type-filter-drop-down.component'; @@ -17,6 +18,8 @@ describe('FileTypeFilterDropDownComponent', () => { fixture = TestBed.createComponent(FileTypeFilterDropDownComponent); component = fixture.componentInstance; + component.label = 'Label'; + component.fileTypeData = new FileTypeDataSourceService(); fixture.detectChanges(); }); diff --git a/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.ts b/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.ts index ba58148b79..d90626f7c3 100644 --- a/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.ts +++ b/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.ts @@ -1,6 +1,6 @@ import { SelectionModel } from '@angular/cdk/collections'; import { FlatTreeControl } from '@angular/cdk/tree'; -import { AfterViewInit, Component, EventEmitter, Output } from '@angular/core'; +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { FormControl } from '@angular/forms'; import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree'; import { @@ -10,11 +10,11 @@ import { } from '../../../services/search/file-type/file-type-data-source.service'; @Component({ - selector: 'app-file-type-filter-drop-down', + selector: 'app-file-type-filter-drop-down[fileTypeData]', templateUrl: './file-type-filter-drop-down.component.html', styleUrls: ['./file-type-filter-drop-down.component.scss'], }) -export class FileTypeFilterDropDownComponent { +export class FileTypeFilterDropDownComponent implements OnInit { hasItemsSelected = false; /** Map from flat node to nested node. This helps us finding the nested node to be modified */ flatNodeMap = new Map(); @@ -34,14 +34,28 @@ export class FileTypeFilterDropDownComponent { componentTypeControl = new FormControl(undefined); @Output() fileTypeChange = new EventEmitter(); - constructor(private fileTypeData: FileTypeDataSourceService) { + @Input() fileTypeData!: FileTypeDataSourceService; + @Input() label!: string; + @Input() tooltip = ''; + @Input() preExpanded: string[] = []; + + constructor() { this.treeFlattener = new MatTreeFlattener(this.transformer, this.getLevel, this.isExpandable, this.getChildren); this.treeControl = new FlatTreeControl(this.getLevel, this.isExpandable); this.dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener); + } - fileTypeData.dataChange.subscribe((data) => { + ngOnInit(): void { + this.fileTypeData.dataChange.subscribe((data) => { this.dataSource.data = data; }); + + if (this.preExpanded.length > 0) { + const nodes = this.treeControl.dataNodes.filter((node) => this.preExpanded.includes(node.item.label)); + for (const node of nodes) { + this.treeControl.expand(node); + } + } } getLevel = (node: FlatTreeNode) => node.level; diff --git a/alcs-frontend/src/app/features/search/search.component.html b/alcs-frontend/src/app/features/search/search.component.html index acd46f2805..74da3d680e 100644 --- a/alcs-frontend/src/app/features/search/search.component.html +++ b/alcs-frontend/src/app/features/search/search.component.html @@ -31,19 +31,23 @@

File Details

- - +
- +
diff --git a/alcs-frontend/src/app/features/search/search.component.scss b/alcs-frontend/src/app/features/search/search.component.scss index b52d384c5a..1627e79a2b 100644 --- a/alcs-frontend/src/app/features/search/search.component.scss +++ b/alcs-frontend/src/app/features/search/search.component.scss @@ -176,6 +176,9 @@ h4 { width: 24px !important; height: 24px !important; + &:last-child { + margin-right: 6px !important; + } & > *[role=img] { width: 16px; diff --git a/alcs-frontend/src/app/features/search/search.component.ts b/alcs-frontend/src/app/features/search/search.component.ts index 4aeb94437b..c5b5f4a2c1 100644 --- a/alcs-frontend/src/app/features/search/search.component.ts +++ b/alcs-frontend/src/app/features/search/search.component.ts @@ -16,6 +16,8 @@ import { NoticeOfIntentStatusDto } from '../../services/notice-of-intent/notice- import { NoticeOfIntentSubmissionStatusService } from '../../services/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.service'; import { NotificationSubmissionStatusService } from '../../services/notification/notification-submission-status/notification-submission-status.service'; import { NotificationSubmissionStatusDto } from '../../services/notification/notification.dto'; +import { FileTypeDataSourceService } from '../../services/search/file-type/file-type-data-source.service'; +import { PortalStatusDataSourceService } from '../../services/search/portal-status/portal-status-data-source.service'; import { AdvancedSearchResponseDto, ApplicationSearchResultDto, @@ -46,6 +48,7 @@ export class SearchComponent implements OnInit, OnDestroy { @ViewChild(MatSort) sort?: MatSort; @ViewChild('searchResultTabs') tabGroup!: MatTabGroup; @ViewChild('fileTypeDropDown') fileTypeFilterDropDownComponent!: FileTypeFilterDropDownComponent; + @ViewChild('statusTypeDropDown') portalStatusFilterDropDownComponent!: FileTypeFilterDropDownComponent; applications: ApplicationSearchResultDto[] = []; applicationTotal = 0; @@ -62,14 +65,13 @@ export class SearchComponent implements OnInit, OnDestroy { inquiries: InquirySearchResultDto[] = []; inquiriesTotal = 0; - isSearchExpanded = false; pageIndex = 0; itemsPerPage = 20; sortDirection: SortDirection = 'desc'; sortField = 'dateSubmitted'; localGovernmentControl = new FormControl(undefined); - portalStatusControl = new FormControl(undefined); + portalStatusControl = new FormControl([]); componentTypeControl = new FormControl(undefined); pidControl = new FormControl(undefined); nameControl = new FormControl(undefined); @@ -116,6 +118,8 @@ export class SearchComponent implements OnInit, OnDestroy { private applicationService: ApplicationService, private toastService: ToastService, private titleService: Title, + public fileTypeService: FileTypeDataSourceService, + public portalStatusDataService: PortalStatusDataSourceService, ) { this.titleService.setTitle('ALCS | Search'); } @@ -216,16 +220,16 @@ export class SearchComponent implements OnInit, OnDestroy { }); } - expandSearchClicked() { - this.isSearchExpanded = !this.isSearchExpanded; - } - onReset() { this.searchForm.reset(); if (this.fileTypeFilterDropDownComponent) { this.fileTypeFilterDropDownComponent.reset(); } + + if (this.portalStatusFilterDropDownComponent) { + this.portalStatusFilterDropDownComponent.reset(); + } } getSearchParams(): SearchRequestDto { @@ -245,7 +249,7 @@ export class SearchComponent implements OnInit, OnDestroy { pid: this.formatStringSearchParam(this.searchForm.controls.pid.value), resolutionNumber: resolutionNumberString ? parseInt(resolutionNumberString) : undefined, resolutionYear: this.searchForm.controls.resolutionYear.value ?? undefined, - portalStatusCode: this.searchForm.controls.portalStatus.value ?? undefined, + portalStatusCodes: this.portalStatusControl.value !== null ? this.portalStatusControl.value : undefined, governmentName: this.formatStringSearchParam(this.searchForm.controls.government.value), regionCode: this.searchForm.controls.region.value ?? undefined, dateSubmittedFrom: this.searchForm.controls.dateSubmittedFrom.value @@ -335,6 +339,10 @@ export class SearchComponent implements OnInit, OnDestroy { this.componentTypeControl.setValue(fileTypes); } + onPortalStatusChange(statusCodes: string[]) { + this.portalStatusControl.setValue(statusCodes); + } + private async loadGovernments() { const governments = await this.localGovernmentService.list(); this.localGovernments = governments.sort((a, b) => (a.name > b.name ? 1 : -1)); diff --git a/alcs-frontend/src/app/services/search/portal-status/portal-status-data-source.service.spec.ts b/alcs-frontend/src/app/services/search/portal-status/portal-status-data-source.service.spec.ts new file mode 100644 index 0000000000..7a1ce76a95 --- /dev/null +++ b/alcs-frontend/src/app/services/search/portal-status/portal-status-data-source.service.spec.ts @@ -0,0 +1,33 @@ +import { TestBed } from '@angular/core/testing'; +import { PortalStatusDataSourceService, TreeNode } from './portal-status-data-source.service'; + +describe('PortalStatusDataSourceService', () => { + let service: PortalStatusDataSourceService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(PortalStatusDataSourceService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should load initial data', () => { + expect(service.data).toBeTruthy(); + expect(service.data.length).toBeGreaterThan(0); + }); + + it('should filter data', () => { + service.filter('With ALC'); + expect(service.data.length).toBe(1); + + const node: TreeNode = service.data[0]; + expect(node.item.label).toEqual('With ALC'); + }); + + it('should reset data when filtering with empty text', () => { + service.filter(''); + expect(service.data.length).toBeGreaterThan(0); + }); +}); diff --git a/alcs-frontend/src/app/services/search/portal-status/portal-status-data-source.service.ts b/alcs-frontend/src/app/services/search/portal-status/portal-status-data-source.service.ts new file mode 100644 index 0000000000..8a046b9e08 --- /dev/null +++ b/alcs-frontend/src/app/services/search/portal-status/portal-status-data-source.service.ts @@ -0,0 +1,116 @@ +import { Injectable } from '@angular/core'; +import { BehaviorSubject } from 'rxjs'; + +export interface TreeNodeItem { + label: string; + value: string | null; +} + +/** + * Node for to-do item + */ +export interface TreeNode { + children?: TreeNode[]; + item: TreeNodeItem; +} + +const TREE_DATA: TreeNode[] = [ + { + item: { label: 'Pre-ALC', value: null }, + children: [ + { item: { label: 'In Progress', value: 'PROG' } }, + { item: { label: 'Submitted to L/FNG', value: 'SUBG' } }, + { + item: { label: 'Under Review by L/FNG', value: 'REVG' }, + }, + { + item: { label: 'Wrong L/FNG', value: 'WRNG' }, + }, + { + item: { label: 'Returned by L/FNG', value: 'INCM' }, + }, + { + item: { label: 'L/FNG Refused to Forward', value: 'RFFG' }, + }, + { + item: { label: 'Returned to L/FNG', value: 'INCG' }, + }, + { + item: { label: 'Cancelled', value: 'CANC' }, + }, + ], + }, + { + item: { label: 'With ALC', value: null }, + children: [ + { + item: { label: 'Submitted to ALC', value: 'SUBM' }, + }, + { + item: { label: 'Submitted to ALC - Incomplete', value: 'SUIN' }, + }, + { + item: { label: 'Received by ALC', value: 'RECA' }, + }, + { + item: { label: 'Under Review by ALC', value: 'REVA' }, + }, + { + item: { label: 'Decision Released', value: 'ALCD' }, + }, + { + item: { label: 'ALC Response Sent (SRW Only)', value: 'ALCR' }, + }, + { + item: { label: 'Cancelled', value: 'CANC' }, + }, + ], + }, +]; + +@Injectable({ providedIn: 'root' }) +export class PortalStatusDataSourceService { + dataChange = new BehaviorSubject([]); + treeData: TreeNode[] = []; + + get data(): TreeNode[] { + return this.dataChange.value; + } + + constructor() { + this.initialize(); + } + + initialize() { + this.treeData = TREE_DATA; + this.dataChange.next(TREE_DATA); + } + + public filter(filterText: string) { + let filteredTreeData; + if (filterText) { + // Filter the tree + const filter = (array: TreeNode[], text: string) => { + const getChildren = (result: any, object: any) => { + if (object.item.label.toLowerCase().includes(text.toLowerCase())) { + result.push(object); + return result; + } + if (Array.isArray(object.children)) { + const children = object.children.reduce(getChildren, []); + if (children.length) result.push({ ...object, children }); + } + return result; + }; + + return array.reduce(getChildren, []); + }; + + filteredTreeData = filter(this.treeData, filterText); + } else { + // Return the initial tree + filteredTreeData = this.treeData; + } + this.dataChange.next(filteredTreeData); + } +} diff --git a/alcs-frontend/src/app/services/search/search.dto.ts b/alcs-frontend/src/app/services/search/search.dto.ts index 19a73d1614..3c72c2c4c4 100644 --- a/alcs-frontend/src/app/services/search/search.dto.ts +++ b/alcs-frontend/src/app/services/search/search.dto.ts @@ -15,6 +15,7 @@ export interface ApplicationSearchResultDto { } export interface NoticeOfIntentSearchResultDto extends ApplicationSearchResultDto {} + export interface NotificationSearchResultDto extends ApplicationSearchResultDto {} export interface PlanningReviewSearchResultDto { @@ -71,7 +72,7 @@ export interface SearchRequestDto extends PagingRequestDto { civicAddress?: string; resolutionNumber?: number; resolutionYear?: number; - portalStatusCode?: string; + portalStatusCodes?: string[]; governmentName?: string; regionCode?: string; dateSubmittedFrom?: number; diff --git a/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.spec.ts b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.spec.ts index 2333a17123..e4ae53040c 100644 --- a/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.spec.ts +++ b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.spec.ts @@ -32,7 +32,7 @@ describe('ApplicationAdvancedSearchService', () => { const mockSearchRequestDto: SearchRequestDto = { fileNumber: '123', legacyId: '123', - portalStatusCode: 'A', + portalStatusCodes: ['A'], governmentName: 'B', regionCode: 'C', name: 'D', diff --git a/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts index ae1527c787..ec58e82e22 100644 --- a/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts @@ -128,7 +128,7 @@ export class ApplicationAdvancedSearchService { this.addLegacyIDResults(searchDto, promises); } - if (searchDto.portalStatusCode) { + if (searchDto.portalStatusCodes && searchDto.portalStatusCodes.length > 0) { this.addPortalStatusResults(searchDto, promises); } @@ -224,9 +224,9 @@ export class ApplicationAdvancedSearchService { .createQueryBuilder('appSubs') .select('appSubs.fileNumber') .where( - "alcs.get_current_status_for_application_submission_by_uuid(appSubs.uuid) ->> 'status_type_code' = :statusCode", + "alcs.get_current_status_for_application_submission_by_uuid(appSubs.uuid) ->> 'status_type_code' IN (:...statusCodes)", { - statusCode: searchDto.portalStatusCode, + statusCodes: searchDto.portalStatusCodes, }, ) .getMany(); diff --git a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.spec.ts b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.spec.ts index d72e772097..e6395e3b2b 100644 --- a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.spec.ts +++ b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.spec.ts @@ -34,7 +34,7 @@ describe('NoticeOfIntentService', () => { const mockSearchDto: SearchRequestDto = { fileNumber: '123', - portalStatusCode: 'A', + portalStatusCodes: ['A'], governmentName: 'B', regionCode: 'C', name: 'D', diff --git a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts index 8d7f9ecdf3..38435869bd 100644 --- a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts @@ -132,7 +132,7 @@ export class NoticeOfIntentAdvancedSearchService { this.addLegacyIDResults(searchDto, promises); } - if (searchDto.portalStatusCode) { + if (searchDto.portalStatusCodes && searchDto.portalStatusCodes.length > 0) { this.addPortalStatusResults(searchDto, promises); } @@ -258,9 +258,9 @@ export class NoticeOfIntentAdvancedSearchService { .createQueryBuilder('noiSubs') .select('noiSubs.fileNumber') .where( - "alcs.get_current_status_for_notice_of_intent_submission_by_uuid(noiSubs.uuid) ->> 'status_type_code' = :statusCode", + "alcs.get_current_status_for_notice_of_intent_submission_by_uuid(noiSubs.uuid) ->> 'status_type_code' IN(:...statusCodes)", { - statusCode: searchDto.portalStatusCode, + statusCodes: searchDto.portalStatusCodes, }, ) .getMany(); diff --git a/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.spec.ts b/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.spec.ts index 55cd57f3e3..439e4c8a89 100644 --- a/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.spec.ts +++ b/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.spec.ts @@ -34,7 +34,7 @@ describe('NotificationAdvancedSearchService', () => { const mockSearchDto: SearchRequestDto = { fileNumber: '123', - portalStatusCode: 'A', + portalStatusCodes: ['A'], governmentName: 'B', regionCode: 'C', name: 'D', diff --git a/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.ts index 491e8541f4..33cf1a5203 100644 --- a/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.ts @@ -123,7 +123,7 @@ export class NotificationAdvancedSearchService { this.addFileNumberResults(searchDto, promises); } - if (searchDto.portalStatusCode) { + if (searchDto.portalStatusCodes && searchDto.portalStatusCodes.length > 0) { this.addPortalStatusResults(searchDto, promises); } @@ -195,9 +195,9 @@ export class NotificationAdvancedSearchService { .createQueryBuilder('notiSub') .select('notiSub.fileNumber') .where( - "alcs.get_current_status_for_notification_submission_by_uuid(notiSub.uuid) ->> 'status_type_code' = :statusCode", + "alcs.get_current_status_for_notification_submission_by_uuid(notiSub.uuid) ->> 'status_type_code' IN(:...statusCodes)", { - statusCode: searchDto.portalStatusCode, + statusCodes: searchDto.portalStatusCodes, }, ) .getMany(); diff --git a/services/apps/alcs/src/alcs/search/planning-review/planning-review-advanced-search.service.spec.ts b/services/apps/alcs/src/alcs/search/planning-review/planning-review-advanced-search.service.spec.ts index fac5069ce3..8f6d9224d7 100644 --- a/services/apps/alcs/src/alcs/search/planning-review/planning-review-advanced-search.service.spec.ts +++ b/services/apps/alcs/src/alcs/search/planning-review/planning-review-advanced-search.service.spec.ts @@ -28,7 +28,7 @@ describe('PlanningReviewAdvancedSearchService', () => { const mockSearchDto: SearchRequestDto = { fileNumber: '123', - portalStatusCode: 'A', + portalStatusCodes: ['A'], governmentName: 'B', regionCode: 'C', name: 'D', diff --git a/services/apps/alcs/src/alcs/search/search.controller.ts b/services/apps/alcs/src/alcs/search/search.controller.ts index a955783872..89d4bc2f16 100644 --- a/services/apps/alcs/src/alcs/search/search.controller.ts +++ b/services/apps/alcs/src/alcs/search/search.controller.ts @@ -367,7 +367,7 @@ export class SearchController { const searchPlanningReviews = (searchDto.fileTypes.length > 0 ? planningReviewTypeSpecified : true) && - !searchDto.portalStatusCode && + !searchDto.portalStatusCodes && !searchDto.pid && !isStringSetAndNotEmpty(searchDto.civicAddress); @@ -385,7 +385,7 @@ export class SearchController { !searchDto.dateDecidedTo && !searchDto.resolutionNumber && !searchDto.resolutionYear && - !searchDto.portalStatusCode && + !searchDto.portalStatusCodes && !isStringSetAndNotEmpty(searchDto.legacyId); return { diff --git a/services/apps/alcs/src/alcs/search/search.dto.ts b/services/apps/alcs/src/alcs/search/search.dto.ts index b37361d719..62f7d3a817 100644 --- a/services/apps/alcs/src/alcs/search/search.dto.ts +++ b/services/apps/alcs/src/alcs/search/search.dto.ts @@ -151,9 +151,9 @@ export class SearchRequestDto extends PagingRequestDto { @IsOptional() resolutionYear?: number; - @IsString() + @IsArray() @IsOptional() - portalStatusCode?: string; + portalStatusCodes?: string[]; @IsString() @IsOptional() From fa7e466e2e8aa4a8a7dd1712e3ff8cdb5e884c11 Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Wed, 15 May 2024 12:55:19 -0700 Subject: [PATCH 071/103] Allow removal of subtypes from submission --- .../preparation/preparation.component.ts | 65 +++---------------- .../notice-of-intent.service.ts | 49 -------------- 2 files changed, 9 insertions(+), 105 deletions(-) diff --git a/alcs-frontend/src/app/features/notice-of-intent/proposal/preparation/preparation.component.ts b/alcs-frontend/src/app/features/notice-of-intent/proposal/preparation/preparation.component.ts index e07376217b..01949b0a8b 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/proposal/preparation/preparation.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/proposal/preparation/preparation.component.ts @@ -38,7 +38,7 @@ export class PreparationComponent implements OnInit { private noticeOfIntentDetailService: NoticeOfIntentDetailService, private noticeOfIntentService: NoticeOfIntentService, private noticeOfIntentSubmissionService: NoticeOfIntentSubmissionService, - private toastService: ToastService + private toastService: ToastService, ) {} ngOnInit(): void { @@ -65,69 +65,22 @@ export class PreparationComponent implements OnInit { this.subtypes = subtypes; this.selectableTypes = subtypes.map((subtype) => { - let disabled = false; - - disabled = this.isSubtypeDisabled(submission, subtype); - return { label: subtype.label, value: subtype.label, - disabled, + disabled: false, }; }); } } - private isSubtypeDisabled(submission: NoticeOfIntentSubmissionDto, subtype: NoticeOfIntentSubtypeDto) { - const isResidentialAccessory = - submission.soilProposedStructures?.some((struct) => struct.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE) && - subtype.code === 'RACS'; - if (isResidentialAccessory) { - return true; - } - - const isPrincipalResidence = - submission.soilProposedStructures?.some((struct) => struct.type === STRUCTURE_TYPES.PRINCIPAL_RESIDENCE) && - subtype.code === 'RPRI'; - if (isPrincipalResidence) { - return true; - } - - const isAdditionalResidence = - submission.soilProposedStructures?.some((struct) => struct.type === STRUCTURE_TYPES.ADDITIONAL_RESIDENCE) && - subtype.code === 'RADD'; - if (isAdditionalResidence) { - return true; - } - - const isFarmStructure = - submission.soilProposedStructures?.some((struct) => struct.type === STRUCTURE_TYPES.FARM_STRUCTURE) && - subtype.code === 'FRST'; - if (isFarmStructure) { - return true; - } - - const isOther = - submission.soilProposedStructures?.some((struct) => struct.type === STRUCTURE_TYPES.OTHER) && - subtype.code === 'OTHR'; - if (isOther) { - return true; - } - - if (submission.soilIsAreaWideFilling && subtype.code === 'ARWF') { - return true; - } - - if (submission.soilIsExtractionOrMining && subtype.code === 'AEPM') { - return true; - } - - return false; - } - - async saveSubtypes($event: string | string[] | null) { - if (this._noticeOfIntent && $event instanceof Array) { - const selectedCodes = $event.map((label) => this.subtypes.find((subtype) => subtype.label === label)!.code); + async saveSubtypes(selectedLabels: string | string[] | null) { + console.log(selectedLabels); + if (this._noticeOfIntent && selectedLabels instanceof Array) { + const selectedCodes = selectedLabels.map( + (selectedLabel) => this.subtypes.find((subtype) => subtype.label === selectedLabel)!.code, + ); + console.log(selectedCodes); await this.noticeOfIntentDetailService.update(this._noticeOfIntent?.fileNumber, { subtype: selectedCodes, }); diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts index 8a5addca9f..6e0b1a3879 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.ts @@ -235,11 +235,6 @@ export class NoticeOfIntentService { (code) => subtypes.find((subtype) => subtype.code === code)!, ); - await this.validatePrepopulatedSubtypes( - noticeOfIntent, - updateDto.subtype, - ); - noticeOfIntent.subtype = selectedSubtypes; } @@ -354,50 +349,6 @@ export class NoticeOfIntentService { return this.getByFileNumber(noticeOfIntent.fileNumber); } - private async validatePrepopulatedSubtypes( - noticeOfIntent: NoticeOfIntent, - subtypes: string[], - ) { - const errors: string[] = []; - const noticeOfIntentSubmission = - await this.noticeOfIntentSubmissionService.loadBarebonesSubmission( - noticeOfIntent.fileNumber, - ); - - const structureTypes = - noticeOfIntentSubmission.soilProposedStructures.reduce((map, value) => { - if (value.type) { - map.add(value.type); - } - return map; - }, new Set()); - - for (const requiredSubtype of structureTypes.values()) { - const mappedCode = PORTAL_TO_ALCS_STRUCTURE_MAP[requiredSubtype]; - if (!subtypes.includes(mappedCode)) { - errors.push(`"${requiredSubtype}" must be selected`); - } - } - - if ( - noticeOfIntentSubmission.soilIsAreaWideFilling && - !subtypes.some((subtype) => subtype === 'ARWF') - ) { - errors.push('"Area-Wide Filling" must be selected'); - } - - if ( - noticeOfIntentSubmission.soilIsExtractionOrMining && - !subtypes.some((subtype) => subtype === 'AEPM') - ) { - errors.push('"Aggregate Extraction or Placer Mining" must be selected'); - } - - if (errors.length > 0) { - throw new ServiceValidationException(errors.join('; ')); - } - } - private async updateStatus( updateDto: UpdateNoticeOfIntentDto, noticeOfIntent: NoticeOfIntent, From 73017ecb2576698759d6fb20ee872a5a14290274 Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Wed, 15 May 2024 13:04:12 -0700 Subject: [PATCH 072/103] Remove now unnecessary test --- .../notice-of-intent.service.spec.ts | 51 ------------------- 1 file changed, 51 deletions(-) diff --git a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.spec.ts b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.spec.ts index 7d4b1b4b01..e4d296b98c 100644 --- a/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.spec.ts +++ b/services/apps/alcs/src/alcs/notice-of-intent/notice-of-intent.service.spec.ts @@ -243,57 +243,6 @@ describe('NoticeOfIntentService', () => { expect(notice.summary).toEqual('new-summary'); }); - it('should fail update if the preselected subtypes missing', async () => { - const notice = new NoticeOfIntent({ - summary: 'old-summary', - }); - - const errors = [ - '"Residential - Accessory Structure" must be selected', - '"Residential - Additional Residence" must be selected', - '"Residential - Principal Residence" must be selected', - '"Farm Structure" must be selected', - '"Area-Wide Filling" must be selected', - '"Aggregate Extraction or Placer Mining" must be selected', - ]; - - mockSubtypeRepository.find.mockResolvedValue([]); - mockNoticeOfIntentSubmissionService.loadBarebonesSubmission.mockResolvedValue( - new NoticeOfIntentSubmission({ - soilProposedStructures: [ - { - type: 'Residential - Accessory Structure', - }, - { - type: 'Residential - Additional Residence', - }, - { - type: 'Residential - Principal Residence', - }, - { - type: 'Farm Structure', - }, - ], - soilIsAreaWideFilling: true, - soilIsExtractionOrMining: true, - }), - ); - - mockRepository.findOneOrFail.mockResolvedValue(notice); - mockRepository.save.mockResolvedValue(new NoticeOfIntent()); - const promise = service.update('file', { - summary: 'new-summary', - subtype: [], - }); - - await expect(promise).rejects.toMatchObject( - new ServiceValidationException(errors.join('; ')), - ); - - expect(mockRepository.findOneOrFail).toHaveBeenCalledTimes(1); - expect(mockRepository.save).toHaveBeenCalledTimes(0); - }); - it('should set the X status when setting Acknowledge Complete', async () => { const notice = new NoticeOfIntent({ summary: 'old-summary', From ff6cd338815bc968c55b12eac85a23108164672a Mon Sep 17 00:00:00 2001 From: mhuseinov <61513701+mhuseinov@users.noreply.github.com> Date: Wed, 15 May 2024 13:10:00 -0700 Subject: [PATCH 073/103] do not cut-off icon in mobile view (#1687) --- .../edit-submission/edit-submission.component.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.scss b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.scss index a3f996c533..95d02ae214 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.scss +++ b/portal-frontend/src/app/features/applications/edit-submission/edit-submission.component.scss @@ -276,6 +276,10 @@ display: flex; align-items: center; margin-top: rem(4); + + .mat-icon { + min-width: rem(24) + } } .form-row { From 46e1e41970b412488e75dd6e48d1dd53eec03be7 Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Wed, 15 May 2024 13:38:19 -0700 Subject: [PATCH 074/103] Clean up debugging logs --- .../proposal/preparation/preparation.component.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/alcs-frontend/src/app/features/notice-of-intent/proposal/preparation/preparation.component.ts b/alcs-frontend/src/app/features/notice-of-intent/proposal/preparation/preparation.component.ts index 01949b0a8b..f69e289185 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/proposal/preparation/preparation.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/proposal/preparation/preparation.component.ts @@ -75,12 +75,10 @@ export class PreparationComponent implements OnInit { } async saveSubtypes(selectedLabels: string | string[] | null) { - console.log(selectedLabels); if (this._noticeOfIntent && selectedLabels instanceof Array) { const selectedCodes = selectedLabels.map( (selectedLabel) => this.subtypes.find((subtype) => subtype.label === selectedLabel)!.code, ); - console.log(selectedCodes); await this.noticeOfIntentDetailService.update(this._noticeOfIntent?.fileNumber, { subtype: selectedCodes, }); From cc4facf7d3df0f479663bd6e494e0ffc4266d5c1 Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Wed, 15 May 2024 13:41:33 -0700 Subject: [PATCH 075/103] Remove unused submission --- .../proposal/preparation/preparation.component.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/alcs-frontend/src/app/features/notice-of-intent/proposal/preparation/preparation.component.ts b/alcs-frontend/src/app/features/notice-of-intent/proposal/preparation/preparation.component.ts index f69e289185..edad23d161 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/proposal/preparation/preparation.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/proposal/preparation/preparation.component.ts @@ -59,8 +59,6 @@ export class PreparationComponent implements OnInit { private async loadSubtypes() { if (this._noticeOfIntent) { - const submission = await this.noticeOfIntentSubmissionService.fetchSubmission(this._noticeOfIntent.fileNumber); - const subtypes = await this.noticeOfIntentService.listSubtypes(); this.subtypes = subtypes; From 17e35862ec4415e7211d57f5fd986b9d896e75d4 Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Wed, 15 May 2024 13:59:58 -0700 Subject: [PATCH 076/103] Remove ability to disable items completely --- .../proposal/preparation/preparation.component.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/alcs-frontend/src/app/features/notice-of-intent/proposal/preparation/preparation.component.ts b/alcs-frontend/src/app/features/notice-of-intent/proposal/preparation/preparation.component.ts index edad23d161..8fd1605706 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/proposal/preparation/preparation.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/proposal/preparation/preparation.component.ts @@ -20,7 +20,7 @@ import { ToastService } from '../../../../services/toast/toast.service'; }) export class PreparationComponent implements OnInit { dateSubmittedToAlc?: string; - selectableTypes: { label: string; value: string; disabled: boolean }[] = []; + selectableTypes: { label: string; value: string }[] = []; selectedSubtypes: string[] = []; private subtypes: NoticeOfIntentSubtypeDto[] = []; @@ -66,7 +66,6 @@ export class PreparationComponent implements OnInit { return { label: subtype.label, value: subtype.label, - disabled: false, }; }); } From 14f2d520ba660ab33c54cfbfaffcf72f234f970d Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Wed, 15 May 2024 14:05:34 -0700 Subject: [PATCH 077/103] Remove unused imports --- .../proposal/preparation/preparation.component.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/alcs-frontend/src/app/features/notice-of-intent/proposal/preparation/preparation.component.ts b/alcs-frontend/src/app/features/notice-of-intent/proposal/preparation/preparation.component.ts index 8fd1605706..98b9fed873 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/proposal/preparation/preparation.component.ts +++ b/alcs-frontend/src/app/features/notice-of-intent/proposal/preparation/preparation.component.ts @@ -5,9 +5,7 @@ import { NoticeOfIntentDetailService } from '../../../../services/notice-of-inte import { NoticeOfIntentSubmissionService } from '../../../../services/notice-of-intent/notice-of-intent-submission/notice-of-intent-submission.service'; import { NoticeOfIntentDto, - NoticeOfIntentSubmissionDto, NoticeOfIntentSubtypeDto, - STRUCTURE_TYPES, UpdateNoticeOfIntentDto, } from '../../../../services/notice-of-intent/notice-of-intent.dto'; import { NoticeOfIntentService } from '../../../../services/notice-of-intent/notice-of-intent.service'; From dfc0a4f4101f4c22a6201e252cbbe0bf51401ee2 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 15 May 2024 14:10:42 -0700 Subject: [PATCH 078/103] Fix alignment of close icons * Move close to be after date picker icon to be consistent with other fields --- .../app/features/search/search.component.scss | 17 +++++++- .../features/home/inbox/inbox.component.scss | 13 +++++- .../search/public-search.component.html | 8 ++-- .../search/public-search.component.scss | 42 ++++++++++++------- 4 files changed, 58 insertions(+), 22 deletions(-) diff --git a/alcs-frontend/src/app/features/search/search.component.scss b/alcs-frontend/src/app/features/search/search.component.scss index 1627e79a2b..aa2450c797 100644 --- a/alcs-frontend/src/app/features/search/search.component.scss +++ b/alcs-frontend/src/app/features/search/search.component.scss @@ -171,13 +171,28 @@ h4 { padding: 8px 12px; } + .mat-mdc-form-field-icon-suffix { + display: flex; + align-items: center; + justify-content: center; + } + + .mat-mdc-form-field-icon-suffix { + display: flex; + align-items: center; + justify-content: center; + } + .clear-button { padding: 0 !important; width: 24px !important; height: 24px !important; + display: flex; + align-items: center; + justify-content: center; &:last-child { - margin-right: 6px !important; + margin-right: 4px !important; } & > *[role=img] { diff --git a/portal-frontend/src/app/features/home/inbox/inbox.component.scss b/portal-frontend/src/app/features/home/inbox/inbox.component.scss index 8fca7463ef..09e2498492 100644 --- a/portal-frontend/src/app/features/home/inbox/inbox.component.scss +++ b/portal-frontend/src/app/features/home/inbox/inbox.component.scss @@ -46,12 +46,23 @@ a { } } + .mat-mdc-form-field-icon-suffix { + display: flex; + align-items: center; + justify-content: center; + } + .clear-button { padding: 0 !important; - margin-right: 6px !important; width: rem(24) !important; height: rem(24) !important; + display: flex; + align-items: center; + justify-content: center; + &:last-child { + margin-right: 4px !important; + } & > *[role=img] { width: rem(16); diff --git a/portal-frontend/src/app/features/public/search/public-search.component.html b/portal-frontend/src/app/features/public/search/public-search.component.html index 656ec17ebe..22686c3fc2 100644 --- a/portal-frontend/src/app/features/public/search/public-search.component.html +++ b/portal-frontend/src/app/features/public/search/public-search.component.html @@ -170,6 +170,8 @@

Search by one or more of the following fields:

[min]="minDate" [max]="today" /> + + - -
@@ -196,6 +196,8 @@

Search by one or more of the following fields:

[min]="searchForm.controls.dateDecidedFrom.value" [max]="today" /> + + - -
diff --git a/portal-frontend/src/app/features/public/search/public-search.component.scss b/portal-frontend/src/app/features/public/search/public-search.component.scss index 747e5a9324..d01ac1cf6e 100644 --- a/portal-frontend/src/app/features/public/search/public-search.component.scss +++ b/portal-frontend/src/app/features/public/search/public-search.component.scss @@ -12,30 +12,40 @@ .no-data { margin-top: rem(16); } -} - -:host::ng-deep .clear-button { - padding: 0 !important; - margin-right: 6px !important; - width: rem(24) !important; - height: rem(24) !important; + .mat-mdc-form-field-icon-suffix { + display: flex; + align-items: center; + justify-content: center; + } + .clear-button { + padding: 0 !important; + width: rem(24) !important; + height: rem(24) !important; + display: flex; + align-items: center; + justify-content: center; - & > *[role=img] { - width: rem(16); - height: rem(16); - font-size: rem(16); + &:last-child { + margin-right: 4px !important; + } - svg { + & > *[role=img] { width: rem(16); height: rem(16); + font-size: rem(16); + + svg { + width: rem(16); + height: rem(16); + } } - } - .mat-mdc-button-touch-target { - width: rem(24) !important; - height: rem(24) !important; + .mat-mdc-button-touch-target { + width: rem(24) !important; + height: rem(24) !important; + } } } From a4d2a1954008c144e792acbae5e40542966d0380 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 15 May 2024 14:38:21 -0700 Subject: [PATCH 079/103] Update ALCS Labels * Unify parcel labels to be like the portal * Add missing ha * Show ha/m on already filled/already placed table as 0 is valid --- .../application-details/parcel/parcel.component.html | 5 +++-- .../notice-of-intent-details/parcel/parcel.component.html | 5 +++-- .../pofo-details/pofo-details.component.html | 8 ++++---- .../roso-details/roso-details.component.html | 8 ++++---- .../notification-details.component.html | 1 + .../notification-details/parcel/parcel.component.html | 5 +++-- 6 files changed, 18 insertions(+), 14 deletions(-) diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html index 42018c50b0..ba60c3bf40 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html @@ -9,7 +9,7 @@

-

Parcel #{{ parcelInd + 1 }}: Parcel and Owner Information

+

Parcel #{{ parcelInd + 1 }}

Ownership Type
@@ -21,10 +21,11 @@

Parcel #{{ parcelInd + 1 }}: Parcel and Owner Information {{ parcel.legalDescription }}

-
Area (Hectares)
+
Approx. Map Area
{{ parcel.mapAreaHectares }} + ha
PID {{ parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.CROWN ? '(optional)' : '' }} diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.html b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.html index c27b8c2aae..4c4afa8078 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.html @@ -7,7 +7,7 @@

Notice of Intent Parcels

-

Parcel #{{ parcelInd + 1 }}: Parcel and Owner Information

+

Parcel #{{ parcelInd + 1 }}

Ownership Type
@@ -19,10 +19,11 @@

Parcel #{{ parcelInd + 1 }}: Parcel and Owner Information {{ parcel.legalDescription }}

-
Area (Hectares)
+
Approx. Map Area
{{ parcel.mapAreaHectares }} + ha
PID {{ parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN ? '(optional)' : '' }} diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pofo-details/pofo-details.component.html b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pofo-details/pofo-details.component.html index 306f2f8083..8b74eb4f48 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pofo-details/pofo-details.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pofo-details/pofo-details.component.html @@ -56,22 +56,22 @@
Volume
{{ _noiSubmission.soilAlreadyPlacedVolume }} - m3 + m3
Area
{{ _noiSubmission.soilAlreadyPlacedArea }} - m2 + m2
Maximum Depth
{{ _noiSubmission.soilAlreadyPlacedMaximumDepth }} - m + m
Average Depth
{{ _noiSubmission.soilAlreadyPlacedAverageDepth }} - m + m
Proposal Map / Site Plan
diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-details.component.html b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-details.component.html index 6337b33368..9155bda6be 100644 --- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-details.component.html +++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-details.component.html @@ -37,21 +37,21 @@
Volume
{{ _noiSubmission.soilToRemoveVolume }} - m3 + m3
Area
- {{ _noiSubmission.soilToRemoveArea }} m2 + {{ _noiSubmission.soilToRemoveArea }} m2
Maximum Depth
{{ _noiSubmission.soilToRemoveMaximumDepth }} - m + m
Average Depth
{{ _noiSubmission.soilToRemoveAverageDepth }} - m + m
diff --git a/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.html b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.html index a98da9588c..0d0677a346 100644 --- a/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.html +++ b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.html @@ -71,6 +71,7 @@

Purpose of SRW

Total area of the SRW
{{ submission.totalArea }} + ha
Upload Terms of the SRW
diff --git a/alcs-frontend/src/app/features/notification/applicant-info/notification-details/parcel/parcel.component.html b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/parcel/parcel.component.html index 376ffcc439..2b3c6fa853 100644 --- a/alcs-frontend/src/app/features/notification/applicant-info/notification-details/parcel/parcel.component.html +++ b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/parcel/parcel.component.html @@ -3,7 +3,7 @@

Notification Parcels

-

Parcel {{ parcelInd + 1 }} Information

+

Parcel #{{ parcelInd + 1 }}

Ownership Type
@@ -15,10 +15,11 @@

Parcel {{ parcelInd + 1 }} Information

{{ parcel.legalDescription }}
-
Area (Hectares)
+
Approx. Map Area
{{ parcel.mapAreaHectares }} + ha
PID {{ parcel.ownershipType?.code === PARCEL_OWNERSHIP_TYPES.CROWN ? '(optional)' : '' }} From bae4bd52991f122b14766d1c8b309d3a1a93b207 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 15 May 2024 14:55:49 -0700 Subject: [PATCH 080/103] Change referral to use text area for two fields * Update text area so it wraps text * Move edit button to after the text instead of to the right of it --- .../planning-review/referrals/referral.component.html | 4 ++-- .../inline-textarea/inline-textarea.component.html | 11 ++++++----- .../inline-textarea/inline-textarea.component.scss | 5 +++-- .../inline-textarea/inline-textarea.component.ts | 3 ++- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/alcs-frontend/src/app/features/planning-review/referrals/referral.component.html b/alcs-frontend/src/app/features/planning-review/referrals/referral.component.html index fe1570dfe2..4d361f8d8b 100644 --- a/alcs-frontend/src/app/features/planning-review/referrals/referral.component.html +++ b/alcs-frontend/src/app/features/planning-review/referrals/referral.component.html @@ -39,7 +39,7 @@
Referral #{{ planingReferrals.length - i }}
Referral Description
- Referral #{{ planingReferrals.length - i }}

Response Description
- - +
+ Add text {{ value }} + -
diff --git a/alcs-frontend/src/app/shared/inline-editors/inline-textarea/inline-textarea.component.scss b/alcs-frontend/src/app/shared/inline-editors/inline-textarea/inline-textarea.component.scss index 5775eff0d0..b318889538 100644 --- a/alcs-frontend/src/app/shared/inline-editors/inline-textarea/inline-textarea.component.scss +++ b/alcs-frontend/src/app/shared/inline-editors/inline-textarea/inline-textarea.component.scss @@ -1,7 +1,8 @@ @use '../../../../styles/colors'; -.inline-number-wrapper { +.inline-textarea-wrapper { padding-top: 4px; + white-space: pre-line; } .editing { @@ -16,7 +17,7 @@ .edit-button { height: 24px; width: 24px; - display: flex; + display: inline-flex; align-items: center; } diff --git a/alcs-frontend/src/app/shared/inline-editors/inline-textarea/inline-textarea.component.ts b/alcs-frontend/src/app/shared/inline-editors/inline-textarea/inline-textarea.component.ts index 34d879ecc0..3b28d9b341 100644 --- a/alcs-frontend/src/app/shared/inline-editors/inline-textarea/inline-textarea.component.ts +++ b/alcs-frontend/src/app/shared/inline-editors/inline-textarea/inline-textarea.component.ts @@ -1,4 +1,4 @@ -import { AfterContentChecked, Component, ElementRef, EventEmitter, Input, Output, ViewChild } from '@angular/core'; +import { Component, ElementRef, EventEmitter, Input, Output, ViewChild } from '@angular/core'; @Component({ selector: 'app-inline-textarea[value]', @@ -8,6 +8,7 @@ import { AfterContentChecked, Component, ElementRef, EventEmitter, Input, Output export class InlineTextareaComponent { @Input() value?: string | undefined; @Input() placeholder: string = 'Enter a value'; + @Input() required = false; @Output() save = new EventEmitter(); @ViewChild('editInput') textInput!: ElementRef; From 3b6767db2a0e64998408498702e78dba56da2f01 Mon Sep 17 00:00:00 2001 From: "to. sandra" <76515860+sandratoh@users.noreply.github.com> Date: Wed, 15 May 2024 14:59:30 -0700 Subject: [PATCH 081/103] Fix public and portal view discrepancies (#1691) --- .../pofo-details/pofo-details.component.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html index 3a11c73f05..db43f0d4b6 100644 --- a/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html +++ b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html @@ -93,6 +93,12 @@
+
Describe the type, origin and quality of fill proposed to be placed.
+
+ {{ applicationSubmission.soilFillTypeToPlace }} + +
+
What alternative measures have you considered or attempted before proposing to place fill?
@@ -101,12 +107,6 @@
-
Describe the type, origin and quality of fill proposed to be placed.
-
- {{ applicationSubmission.soilFillTypeToPlace }} - -
-
What steps will be taken to reduce impacts to surrounding agricultural land?
{{ applicationSubmission.soilReduceNegativeImpacts }} From 15162d3dba29769c535253a1f21796ec0324f768 Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Thu, 16 May 2024 11:10:02 -0700 Subject: [PATCH 082/103] Show 'not-allowed' cursor on backdrop hover --- portal-frontend/src/styles.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/portal-frontend/src/styles.scss b/portal-frontend/src/styles.scss index e6a86520d6..2a3e27a0a9 100644 --- a/portal-frontend/src/styles.scss +++ b/portal-frontend/src/styles.scss @@ -126,3 +126,7 @@ a { .mdc-checkbox { --mdc-checkbox-selected-checkmark-color: #fff; } + +.cdk-overlay-backdrop { + cursor: not-allowed; +} From 45650e7ab291136070e56caf166ca45d0f77c5bb Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 16 May 2024 11:52:09 -0700 Subject: [PATCH 083/103] Update Inbox Search to use New Patterns --- .../inbox-application-view.entity.ts | 25 +- .../application/inbox-application.service.ts | 408 +++++++++++------- .../alcs/src/portal/inbox/inbox.module.ts | 16 + .../inbox-notice-of-intent-view.entity.ts | 24 +- .../inbox-notice-of-intent.service.ts | 330 ++++++++------ .../inbox-notification-view.entity.ts | 6 - .../inbox-notification.service.ts | 324 +++++++++----- ...715884613918-refresh_inbox_search_views.ts | 127 ++++++ 8 files changed, 810 insertions(+), 450 deletions(-) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1715884613918-refresh_inbox_search_views.ts diff --git a/services/apps/alcs/src/portal/inbox/application/inbox-application-view.entity.ts b/services/apps/alcs/src/portal/inbox/application/inbox-application-view.entity.ts index 4e0594b768..82f059c89e 100644 --- a/services/apps/alcs/src/portal/inbox/application/inbox-application-view.entity.ts +++ b/services/apps/alcs/src/portal/inbox/application/inbox-application-view.entity.ts @@ -10,9 +10,7 @@ import { ApplicationDecision } from '../../../alcs/application-decision/applicat 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 { User } from '../../../user/user.entity'; -import { ApplicationSubmissionReview } from '../../application-submission-review/application-submission-review.entity'; import { ApplicationSubmission } from '../../application-submission/application-submission.entity'; import { LinkedStatusType } from '../inbox.dto'; @@ -26,15 +24,10 @@ import { LinkedStatusType } from '../inbox.dto'; .addSelect('app_sub.created_by_uuid', 'created_by_uuid') .addSelect('app_sub.local_government_uuid', 'local_government_uuid') .addSelect('app_sub.audit_created_at', 'created_at') - .addSelect('localGovernment.name', 'local_government_name') .addSelect('user.bceid_business_guid', 'bceid_business_guid') .addSelect('app_sub.type_code', 'application_type_code') - .addSelect('app.uuid', 'application_uuid') .addSelect('app.date_submitted_to_alc', 'date_submitted_to_alc') - .addSelect( - 'app_rev.local_government_file_number', - 'local_government_file_number', - ) + .addSelect('app.uuid', 'application_uuid') .addSelect( 'GREATEST(status_link.effective_date, decision_date.date)', 'last_update', @@ -50,21 +43,11 @@ import { LinkedStatusType } from '../inbox.dto'; 'app.file_number = app_sub.file_number AND app.hide_from_portal = FALSE', ) .leftJoin(User, 'user', 'user.uuid = app_sub.created_by_uuid') - .leftJoin( - ApplicationSubmissionReview, - 'app_rev', - 'app.file_number = app_rev.application_file_number', - ) .innerJoinAndSelect( ApplicationType, 'applicationType', 'app_sub.type_code = applicationType.code', ) - .leftJoin( - LocalGovernment, - 'localGovernment', - 'app_sub.local_government_uuid = localGovernment.uuid', - ) .leftJoin( (qb) => qb @@ -98,9 +81,6 @@ export class InboxApplicationSubmissionView { @ViewColumn() lastUpdate: Date; - @ViewColumn() - dateSubmittedToAlc: Date | null; - @ViewColumn() createdAt: Date; @@ -119,9 +99,6 @@ export class InboxApplicationSubmissionView { @ViewColumn() localGovernmentUuid?: string; - @ViewColumn() - localGovernmentFileNumber?: string; - @ViewColumn() applicationTypeCode: string; diff --git a/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts b/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts index 903d03f47c..b5bc0026b8 100644 --- a/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts +++ b/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts @@ -1,19 +1,35 @@ -import { Injectable } from '@nestjs/common'; +import { RedisService } from '@app/common/redis/redis.service'; +import { Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; +import * as hash from 'object-hash'; import { Brackets, Repository } from 'typeorm'; import { ApplicationDecisionComponent } from '../../../alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity'; import { ApplicationDecision } from '../../../alcs/application-decision/application-decision.entity'; +import { Application } from '../../../alcs/application/application.entity'; +import { SEARCH_CACHE_TIME } from '../../../alcs/search/search.config'; import { formatStringToPostgresSearchStringArrayWithWildCard } from '../../../utils/search-helper'; +import { intersectSets } from '../../../utils/set-helper'; +import { ApplicationSubmissionReview } from '../../application-submission-review/application-submission-review.entity'; import { ApplicationOwner } from '../../application-submission/application-owner/application-owner.entity'; import { ApplicationParcel } from '../../application-submission/application-parcel/application-parcel.entity'; +import { ApplicationSubmission } from '../../application-submission/application-submission.entity'; import { AdvancedSearchResultDto, InboxRequestDto } from '../inbox.dto'; import { InboxApplicationSubmissionView } from './inbox-application-view.entity'; @Injectable() export class InboxApplicationService { + private logger: Logger = new Logger(InboxApplicationService.name); + constructor( @InjectRepository(InboxApplicationSubmissionView) private applicationInboxRepository: Repository, + private redisService: RedisService, + @InjectRepository(Application) + private applicationRepository: Repository, + @InjectRepository(ApplicationSubmission) + private applicationSubmissionRepository: Repository, + @InjectRepository(ApplicationSubmissionReview) + private applicationReviewRepository: Repository, ) {} async searchApplications( @@ -22,92 +38,72 @@ export class InboxApplicationService { bceidBusinessGuid: string | null, governmentUuid: string | null, ): Promise> { - let query = await this.compileApplicationSearchQuery( - searchDto, - userUuid, - bceidBusinessGuid, - governmentUuid, - ); - query = this.compileApplicationGroupBySearchQuery(query); + const searchHash = hash(searchDto); + const searchKey = `search_inbox_application_${userUuid}_${searchHash}`; - query = query - .orderBy('"appSearch"."last_update"', 'DESC') - .offset((searchDto.page - 1) * searchDto.pageSize) - .limit(searchDto.pageSize); + const client = this.redisService.getClient(); + const cachedSearch = await client.get(searchKey); - const result = await query.getManyAndCount(); + let fileNumbers = new Set(); + let didSearch = false; - return { - data: result[0], - total: result[1], - }; - } + if (cachedSearch) { + const cachedNumbers = JSON.parse(cachedSearch) as string[]; + fileNumbers = new Set(cachedNumbers); + didSearch = true; + } else { + const res = await this.searchForFileNumbers(searchDto); + fileNumbers = res.finalResult; + didSearch = res.didSearch; + if (didSearch) { + await client.setEx( + searchKey, + SEARCH_CACHE_TIME, + JSON.stringify([...fileNumbers.values()]), + ); + } + } - private compileApplicationGroupBySearchQuery(query) { - query = query - .withDeleted() + if (didSearch && fileNumbers.size === 0) { + return { + data: [], + total: 0, + }; + } + + const query = this.applicationInboxRepository + .createQueryBuilder('appSearch') .innerJoinAndMapOne( 'appSearch.applicationType', 'appSearch.applicationType', 'applicationType', ) - .groupBy( - ` - "appSearch"."uuid" - , "appSearch"."application_uuid" - , "appSearch"."file_number" - , "appSearch"."applicant" - , "appSearch"."local_government_uuid" - , "appSearch"."application_type_code" - , "appSearch"."local_government_file_number" - , "appSearch"."status" - , "appSearch"."created_at" - , "appSearch"."date_submitted_to_alc" - , "appSearch"."last_update" - , "appSearch"."created_by_uuid" - , "appSearch"."bceid_business_guid" - , "applicationType"."audit_deleted_date_at" - , "applicationType"."audit_created_at" - , "applicationType"."audit_updated_by" - , "applicationType"."audit_updated_at" - , "applicationType"."audit_created_by" - , "applicationType"."short_label" - , "applicationType"."label" - , "applicationType"."code" - , "applicationType"."background_color" - , "applicationType"."text_color" - , "applicationType"."html_description" - , "applicationType"."portal_label" - `, - ); - return query; - } + .orderBy('appSearch.last_update', 'DESC') + .offset((searchDto.page - 1) * searchDto.pageSize) + .limit(searchDto.pageSize); - private async compileApplicationSearchQuery( - searchDto: InboxRequestDto, - userUuid: string, - bceidBusinessGuid: string | null, - governmentUuid: string | null, - ) { - const query = - this.applicationInboxRepository.createQueryBuilder('appSearch'); + if (fileNumbers.size > 0) { + query.andWhere('appSearch.fileNumber IN(:...fileNumbers)', { + fileNumbers: [...fileNumbers.values()], + }); + } //User Permissions - let where = 'appSearch.created_by_uuid = :userUuid'; + let where = '"appSearch".created_by_uuid = :userUuid'; if (!searchDto.filterBy) { if (bceidBusinessGuid) { - where += ' OR appSearch.bceid_business_guid = :bceidBusinessGuid'; + where += ' OR "appSearch".bceid_business_guid = :bceidBusinessGuid'; } if (governmentUuid) { - where += ` OR (appSearch.local_government_uuid = :governmentUuid AND (appSearch.date_submitted_to_alc IS NOT NULL OR appSearch.status ->> 'status_type_code' IN ('REVG', 'SUBG', 'INCG')))`; + where += ` OR ("appSearch".local_government_uuid = :governmentUuid AND ("appSearch".date_submitted_to_alc IS NOT NULL OR appSearch.status ->> 'status_type_code' IN ('REVG', 'SUBG', 'INCG')))`; } //Prevent someone without governmentUuid from using filterBy } else if (governmentUuid && bceidBusinessGuid) { if (searchDto.filterBy === 'submitted') { - where = `appSearch.local_government_uuid = :governmentUuid AND (appSearch.date_submitted_to_alc IS NOT NULL OR appSearch.status ->> 'status_type_code' IN ('REVG', 'SUBG', 'INCG'))`; + where = `"appSearch".local_government_uuid = :governmentUuid AND ("appSearch".date_submitted_to_alc IS NOT NULL OR appSearch.status ->> 'status_type_code' IN ('REVG', 'SUBG', 'INCG'))`; } else { where = - '(appSearch.created_by_uuid = :userUuid OR appSearch.bceid_business_guid = :bceidBusinessGuid)'; + '("appSearch".created_by_uuid = :userUuid OR "appSearch".bceid_business_guid = :bceidBusinessGuid)'; } } query.andWhere(`(${where})`, { @@ -116,136 +112,220 @@ export class InboxApplicationService { governmentUuid, }); + const t0 = performance.now(); + const results = await Promise.all([query.getMany(), query.getCount()]); + const t1 = performance.now(); + this.logger.debug(`Inbox Application search took ${t1 - t0} milliseconds.`); + + return { + data: results[0], + total: results[1], + }; + } + + private async searchForFileNumbers(searchDto: InboxRequestDto) { + const promises: Promise<{ fileNumber: string }[]>[] = []; + let didSearch = false; + if (searchDto.fileNumber) { - query - .andWhere('appSearch.file_number = :fileNumber') - .setParameters({ fileNumber: searchDto.fileNumber ?? null, userUuid }); + didSearch = true; + this.addFileNumberResults(searchDto, promises); } if (searchDto.portalStatusCodes && searchDto.portalStatusCodes.length > 0) { - query.andWhere( - "alcs.get_current_status_for_application_submission_by_uuid(appSearch.uuid) ->> 'status_type_code' IN(:...statuses)", - { - statuses: searchDto.portalStatusCodes, - }, - ); + didSearch = true; + this.addPortalStatusResults(searchDto, promises); } if (searchDto.governmentFileNumber) { - query - .andWhere( - 'appSearch.local_government_file_number = :governmentFileNumber', - ) - .setParameters({ - governmentFileNumber: searchDto.governmentFileNumber, - }); + didSearch = true; + this.addGovernmentFileNumberResults(searchDto, promises); } - this.compileSearchByNameQuery(searchDto, query); - this.compileParcelSearchQuery(searchDto, query); - this.compileFileTypeSearchQuery(searchDto, query); + if (searchDto.name) { + didSearch = true; + this.addNameResults(searchDto, promises); + } - return query; - } + if (searchDto.pid || searchDto.civicAddress) { + didSearch = true; + this.addParcelResults(searchDto, promises); + } - private joinApplicationDecision(query: any) { - query = query.leftJoin( - ApplicationDecision, - 'decision', - 'decision.application_uuid = "appSearch"."application_uuid"', - ); - return query; - } + if (searchDto.fileTypes.length > 0) { + didSearch = true; + this.addFileTypeResults(searchDto, promises); + } - private compileParcelSearchQuery(searchDto: InboxRequestDto, query) { - query = query.leftJoin( - ApplicationParcel, - 'parcel', - 'parcel.application_submission_uuid = appSearch.uuid', - ); + //Intersect Sets + const t0 = performance.now(); + const queryResults = await Promise.all(promises); - if (searchDto.pid) { - query = query.andWhere('parcel.pid = :pid', { pid: searchDto.pid }); + const allIds: Set[] = []; + for (const result of queryResults) { + const fileNumbers = new Set(); + result.forEach((currentValue) => { + fileNumbers.add(currentValue.fileNumber); + }); + allIds.push(fileNumbers); } - if (searchDto.civicAddress) { - query = query.andWhere( - 'LOWER(parcel.civic_address) like LOWER(:civic_address)', - { - civic_address: `%${searchDto.civicAddress}%`.toLowerCase(), - }, - ); - } - return query; + const finalResult = intersectSets(allIds); + + const t1 = performance.now(); + this.logger.debug( + `Inbox Application pre-search search took ${t1 - t0} milliseconds.`, + ); + return { didSearch, finalResult }; } - private compileSearchByNameQuery(searchDto: InboxRequestDto, query) { - if (searchDto.name) { - const formattedSearchString = - formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); - - query = query - .leftJoin( - ApplicationOwner, - 'application_owner', - 'application_owner.application_submission_uuid = appSearch.uuid', - ) - .andWhere( - new Brackets((qb) => - qb - .where( - "LOWER(application_owner.first_name || ' ' || application_owner.last_name) LIKE ANY (:names)", - { - names: formattedSearchString, - }, - ) - .orWhere( - 'LOWER(application_owner.first_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ) - .orWhere('LOWER(application_owner.last_name) LIKE ANY (:names)', { - names: formattedSearchString, - }) - .orWhere( - 'LOWER(application_owner.organization_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ), - ), - ); - } - return query; + private addFileNumberResults( + searchDto: InboxRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const promise = this.applicationRepository.find({ + where: { + fileNumber: searchDto.fileNumber, + }, + select: { + fileNumber: true, + }, + }); + promises.push(promise); } - private compileFileTypeSearchQuery(searchDto: InboxRequestDto, query) { - if (searchDto.fileTypes.length > 0) { - query = this.joinApplicationDecision(query); + private addPortalStatusResults( + searchDto: InboxRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const promise = this.applicationSubmissionRepository + .createQueryBuilder('appSubs') + .select('appSubs.fileNumber') + .where( + "alcs.get_current_status_for_application_submission_by_uuid(appSubs.uuid) ->> 'status_type_code' IN (:...statusCodes)", + { + statusCodes: searchDto.portalStatusCodes, + }, + ) + .getMany(); + promises.push(promise); + } - query = query.leftJoin( - ApplicationDecisionComponent, - 'decisionComponent', - 'decisionComponent.application_decision_uuid = decision.uuid', - ); + private addGovernmentFileNumberResults( + searchDto: InboxRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const promise = this.applicationReviewRepository + .find({ + where: { + localGovernmentFileNumber: searchDto.governmentFileNumber, + }, + select: { + applicationFileNumber: true, + }, + }) + .then((results) => { + return results.map((res) => ({ + fileNumber: res.applicationFileNumber, + })); + }); + promises.push(promise); + } - query = query.andWhere( + private addNameResults( + searchDto: InboxRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const formattedSearchString = + formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); + const promise = this.applicationSubmissionRepository + .createQueryBuilder('appSub') + .select('appSub.fileNumber') + .leftJoin( + ApplicationOwner, + 'application_owner', + 'application_owner.application_submission_uuid = appSub.uuid', + ) + .andWhere( new Brackets((qb) => qb - .where('appSearch.application_type_code IN (:...typeCodes)', { - typeCodes: searchDto.fileTypes, + .where( + "LOWER(application_owner.first_name || ' ' || application_owner.last_name) LIKE ANY (:names)", + { + names: formattedSearchString, + }, + ) + .orWhere('LOWER(application_owner.first_name) LIKE ANY (:names)', { + names: formattedSearchString, + }) + .orWhere('LOWER(application_owner.last_name) LIKE ANY (:names)', { + names: formattedSearchString, }) .orWhere( - 'decisionComponent.application_decision_component_type_code IN (:...typeCodes)', + 'LOWER(application_owner.organization_name) LIKE ANY (:names)', { - typeCodes: searchDto.fileTypes, + names: formattedSearchString, }, ), ), + ) + .getMany(); + promises.push(promise); + } + + private addParcelResults( + searchDto: InboxRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const query = this.applicationSubmissionRepository + .createQueryBuilder('appSub') + .select('appSub.fileNumber') + .leftJoin( + ApplicationParcel, + 'parcel', + 'parcel.application_submission_uuid = appSub.uuid', ); + + if (searchDto.pid) { + query.andWhere('parcel.pid = :pid', { pid: searchDto.pid }); + } + + if (searchDto.civicAddress) { + query.andWhere('LOWER(parcel.civic_address) like LOWER(:civic_address)', { + civic_address: `%${searchDto.civicAddress}%`.toLowerCase(), + }); } - return query; + promises.push(query.getMany()); + } + + private addFileTypeResults( + searchDto: InboxRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const query = this.applicationRepository + .createQueryBuilder('app') + .select('app.fileNumber') + .leftJoin( + ApplicationDecision, + 'decision', + 'decision.application_uuid = "app"."uuid" AND decision.is_draft = FALSE', + ) + .leftJoin( + ApplicationDecisionComponent, + 'decisionComponent', + 'decisionComponent.application_decision_uuid = decision.uuid', + ) + .where('app.type_code IN (:...typeCodes)', { + typeCodes: searchDto.fileTypes, + }) + .orWhere( + 'decisionComponent.application_decision_component_type_code IN (:...typeCodes)', + { + typeCodes: searchDto.fileTypes, + }, + ); + + promises.push(query.getMany()); } } diff --git a/services/apps/alcs/src/portal/inbox/inbox.module.ts b/services/apps/alcs/src/portal/inbox/inbox.module.ts index d65cff0304..27f8ab2f39 100644 --- a/services/apps/alcs/src/portal/inbox/inbox.module.ts +++ b/services/apps/alcs/src/portal/inbox/inbox.module.ts @@ -1,9 +1,17 @@ +import { RedisModule } from '@app/common/redis/redis.module'; import { Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; import { ApplicationSubmissionStatusModule } from '../../alcs/application/application-submission-status/application-submission-status.module'; +import { Application } from '../../alcs/application/application.entity'; import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; import { NoticeOfIntentSubmissionStatusModule } from '../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-submission-status.module'; +import { NoticeOfIntent } from '../../alcs/notice-of-intent/notice-of-intent.entity'; import { NotificationSubmissionStatusModule } from '../../alcs/notification/notification-submission-status/notification-submission-status.module'; +import { Notification } from '../../alcs/notification/notification.entity'; +import { ApplicationSubmissionReview } from '../application-submission-review/application-submission-review.entity'; +import { ApplicationSubmission } from '../application-submission/application-submission.entity'; +import { NoticeOfIntentSubmission } from '../notice-of-intent-submission/notice-of-intent-submission.entity'; +import { NotificationSubmission } from '../notification-submission/notification-submission.entity'; import { InboxApplicationSubmissionView } from './application/inbox-application-view.entity'; import { InboxApplicationService } from './application/inbox-application.service'; import { InboxController } from './inbox.controller'; @@ -19,7 +27,15 @@ import { InboxNotificationService } from './notification/inbox-notification.serv InboxNoticeOfIntentSubmissionView, InboxNotificationSubmissionView, LocalGovernment, + Application, + ApplicationSubmission, + ApplicationSubmissionReview, + NoticeOfIntent, + NoticeOfIntentSubmission, + Notification, + NotificationSubmission, ]), + RedisModule, ApplicationSubmissionStatusModule, NoticeOfIntentSubmissionStatusModule, NotificationSubmissionStatusModule, diff --git a/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent-view.entity.ts b/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent-view.entity.ts index 8ee31c781c..f00c0edcfb 100644 --- a/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent-view.entity.ts +++ b/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent-view.entity.ts @@ -6,7 +6,6 @@ import { ViewColumn, ViewEntity, } from 'typeorm'; -import { LocalGovernment } from '../../../alcs/local-government/local-government.entity'; import { NoticeOfIntentDecision } from '../../../alcs/notice-of-intent-decision/notice-of-intent-decision.entity'; import { NoticeOfIntentSubmissionToSubmissionStatus } from '../../../alcs/notice-of-intent/notice-of-intent-submission-status/notice-of-intent-status.entity'; import { NoticeOfIntentType } from '../../../alcs/notice-of-intent/notice-of-intent-type/notice-of-intent-type.entity'; @@ -49,11 +48,6 @@ import { LinkedStatusType } from '../inbox.dto'; 'noticeOfIntentType', 'noi_sub.type_code = noticeOfIntentType.code', ) - .leftJoin( - LocalGovernment, - 'localGovernment', - 'noi_sub.local_government_uuid = localGovernment.uuid', - ) .leftJoin( (qb) => qb @@ -82,34 +76,34 @@ export class InboxNoticeOfIntentSubmissionView { uuid: string; @ViewColumn() - noticeOfIntentUuid: string; + fileNumber: string; @ViewColumn() - dateSubmittedToAlc: Date | null; + applicant?: string; @ViewColumn() createdAt: Date; @ViewColumn() - lastUpdate: Date; + createdByUuid: string; @ViewColumn() - fileNumber: string; + localGovernmentUuid?: string; @ViewColumn() - applicant?: string; + bceidBusinessGuid?: string; @ViewColumn() - createdByUuid: string; + noticeOfIntentTypeCode: string; @ViewColumn() - bceidBusinessGuid?: string; + noticeOfIntentUuid: string; @ViewColumn() - localGovernmentUuid?: string; + dateSubmittedToAlc: Date | null; @ViewColumn() - noticeOfIntentTypeCode: string; + lastUpdate: Date; @ViewColumn() status: LinkedStatusType; diff --git a/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.ts b/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.ts index f5e7c2e9b9..61ad225977 100644 --- a/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.ts +++ b/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.ts @@ -1,18 +1,30 @@ -import { Injectable } from '@nestjs/common'; +import { RedisService } from '@app/common/redis/redis.service'; +import { Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; +import * as hash from 'object-hash'; import { Brackets, Repository } from 'typeorm'; -import { NoticeOfIntentDecision } from '../../../alcs/notice-of-intent-decision/notice-of-intent-decision.entity'; +import { NoticeOfIntent } from '../../../alcs/notice-of-intent/notice-of-intent.entity'; +import { SEARCH_CACHE_TIME } from '../../../alcs/search/search.config'; import { formatStringToPostgresSearchStringArrayWithWildCard } from '../../../utils/search-helper'; +import { intersectSets } from '../../../utils/set-helper'; import { NoticeOfIntentOwner } from '../../notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity'; import { NoticeOfIntentParcel } from '../../notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity'; +import { NoticeOfIntentSubmission } from '../../notice-of-intent-submission/notice-of-intent-submission.entity'; import { AdvancedSearchResultDto, InboxRequestDto } from '../inbox.dto'; import { InboxNoticeOfIntentSubmissionView } from './inbox-notice-of-intent-view.entity'; @Injectable() export class InboxNoticeOfIntentService { + private logger: Logger = new Logger(InboxNoticeOfIntentService.name); + constructor( @InjectRepository(InboxNoticeOfIntentSubmissionView) private noiSearchRepository: Repository, + @InjectRepository(NoticeOfIntent) + private noiRepository: Repository, + @InjectRepository(NoticeOfIntentSubmission) + private noiSubmissionRepository: Repository, + private redisService: RedisService, ) {} async searchNoticeOfIntents( @@ -21,72 +33,53 @@ export class InboxNoticeOfIntentService { bceidBusinessGuid: string | null, governmentUuid: string | null, ): Promise> { - const query = await this.compileNoticeOfIntentSearchQuery( - searchDto, - userUuid, - bceidBusinessGuid, - governmentUuid, - ); - - this.compileGroupBySearchQuery(query); - - query - .orderBy('"noiSearch"."last_update"', 'DESC') - .offset((searchDto.page - 1) * searchDto.pageSize) - .limit(searchDto.pageSize); + const searchHash = hash(searchDto); + const searchKey = `search_inbox_noi_${userUuid}_${searchHash}`; - const result = await query.getManyAndCount(); + const client = this.redisService.getClient(); + const cachedSearch = await client.get(searchKey); - return { - data: result[0], - total: result[1], - }; - } + let fileNumbers = new Set(); + let didSearch = false; + if (cachedSearch) { + const cachedNumbers = JSON.parse(cachedSearch) as string[]; + fileNumbers = new Set(cachedNumbers); + didSearch = true; + } else { + const res = await this.searchForFileNumbers(searchDto); + fileNumbers = res.finalResult; + didSearch = res.didSearch; + if (didSearch) { + await client.setEx( + searchKey, + SEARCH_CACHE_TIME, + JSON.stringify([...fileNumbers.values()]), + ); + } + } + if (didSearch && fileNumbers.size === 0) { + return { + data: [], + total: 0, + }; + } - private compileGroupBySearchQuery(query) { - query = query - .withDeleted() + const query = this.noiSearchRepository + .createQueryBuilder('noiSearch') .innerJoinAndMapOne( 'noiSearch.noticeOfIntentType', 'noiSearch.noticeOfIntentType', 'noticeOfIntentType', ) - .groupBy( - ` - "noiSearch"."uuid" - , "noiSearch"."notice_of_intent_uuid" - , "noiSearch"."file_number" - , "noiSearch"."applicant" - , "noiSearch"."local_government_uuid" - , "noiSearch"."notice_of_intent_type_code" - , "noiSearch"."status" - , "noiSearch"."created_at" - , "noiSearch"."last_update" - , "noiSearch"."date_submitted_to_alc" - , "noiSearch"."created_by_uuid" - , "noiSearch"."bceid_business_guid" - , "noticeOfIntentType"."audit_deleted_date_at" - , "noticeOfIntentType"."audit_created_at" - , "noticeOfIntentType"."audit_updated_by" - , "noticeOfIntentType"."audit_updated_at" - , "noticeOfIntentType"."audit_created_by" - , "noticeOfIntentType"."short_label" - , "noticeOfIntentType"."label" - , "noticeOfIntentType"."code" - , "noticeOfIntentType"."html_description" - , "noticeOfIntentType"."portal_label" - `, - ); - return query; - } + .orderBy('"noiSearch"."last_update"', 'DESC') + .offset((searchDto.page - 1) * searchDto.pageSize) + .limit(searchDto.pageSize); - private async compileNoticeOfIntentSearchQuery( - searchDto: InboxRequestDto, - userUuid: string, - bceidBusinessGuid: string | null, - governmentUuid: string | null, - ) { - const query = this.noiSearchRepository.createQueryBuilder('noiSearch'); + if (fileNumbers.size > 0) { + query.andWhere('"noiSearch"."file_number" IN(:...fileNumbers)', { + fileNumbers: [...fileNumbers.values()], + }); + } //User Permissions let where = 'noiSearch.created_by_uuid = :userUuid'; @@ -113,44 +106,159 @@ export class InboxNoticeOfIntentService { governmentUuid, }); + const t0 = performance.now(); + const results = await Promise.all([query.getMany(), query.getCount()]); + const t1 = performance.now(); + this.logger.debug(`Inbox NOI search took ${t1 - t0} milliseconds.`); + + return { + data: results[0], + total: results[1], + }; + } + + private async searchForFileNumbers(searchDto: InboxRequestDto) { + const promises: Promise<{ fileNumber: string }[]>[] = []; + let didSearch = false; + if (searchDto.fileNumber) { - query - .andWhere('noiSearch.file_number = :fileNumber') - .setParameters({ fileNumber: searchDto.fileNumber ?? null }); + didSearch = true; + this.addFileNumberResults(searchDto, promises); } if (searchDto.portalStatusCodes && searchDto.portalStatusCodes.length > 0) { - query.andWhere( - "alcs.get_current_status_for_notice_of_intent_submission_by_uuid(noiSearch.uuid) ->> 'status_type_code' IN(:...statuses)", - { - statuses: searchDto.portalStatusCodes, - }, - ); + didSearch = true; + this.addPortalStatusResults(searchDto, promises); + } + + if (searchDto.name) { + didSearch = true; + this.addNameResults(searchDto, promises); } - this.compileSearchByNameQuery(searchDto, query); - this.compileParcelSearchQuery(searchDto, query); + if (searchDto.pid || searchDto.civicAddress) { + didSearch = true; + this.addParcelResults(searchDto, promises); + } - return query; - } + if (searchDto.fileTypes.length > 0) { + didSearch = true; + this.addFileTypeResults(searchDto, promises); + } + + //Intersect Sets + const t0 = performance.now(); + const queryResults = await Promise.all(promises); + + const allIds: Set[] = []; + for (const result of queryResults) { + const fileNumbers = new Set(); + result.forEach((currentValue) => { + fileNumbers.add(currentValue.fileNumber); + }); + allIds.push(fileNumbers); + } + + const finalResult = intersectSets(allIds); - private joinDecision(query: any) { - query = query.leftJoin( - NoticeOfIntentDecision, - 'decision', - 'decision.notice_of_intent_uuid = "noiSearch"."notice_of_intent_uuid"', + const t1 = performance.now(); + this.logger.debug( + `Inbox NOI pre-search search took ${t1 - t0} milliseconds.`, ); - return query; + return { didSearch, finalResult }; } - private compileParcelSearchQuery(searchDto: InboxRequestDto, query) { - if (searchDto.pid || searchDto.civicAddress) { - query = query.leftJoin( + private addFileNumberResults( + searchDto: InboxRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const promise = this.noiRepository.find({ + where: { + fileNumber: searchDto.fileNumber, + }, + select: { + fileNumber: true, + }, + }); + promises.push(promise); + } + + private addPortalStatusResults( + searchDto: InboxRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const promise = this.noiSubmissionRepository + .createQueryBuilder('noiSubs') + .select('noiSubs.fileNumber') + .where( + "alcs.get_current_status_for_notice_of_intent_submission_by_uuid(noiSubs.uuid) ->> 'status_type_code' IN(:...statusCodes)", + { + statusCodes: searchDto.portalStatusCodes, + }, + ) + .getMany(); + promises.push(promise); + } + + private addNameResults( + searchDto: InboxRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const formattedSearchString = + formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); + const promise = this.noiSubmissionRepository + .createQueryBuilder('noiSub') + .select('noiSub.fileNumber') + .leftJoin( + NoticeOfIntentOwner, + 'notice_of_intent_owner', + 'notice_of_intent_owner.notice_of_intent_submission_uuid = noiSub.uuid', + ) + .andWhere( + new Brackets((qb) => + qb + .where( + "LOWER(notice_of_intent_owner.first_name || ' ' || notice_of_intent_owner.last_name) LIKE ANY (:names)", + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(notice_of_intent_owner.first_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(notice_of_intent_owner.last_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(notice_of_intent_owner.organization_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ), + ), + ) + .getMany(); + promises.push(promise); + } + + private addParcelResults( + searchDto: InboxRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + let query = this.noiSubmissionRepository + .createQueryBuilder('noiSub') + .select('noiSub.fileNumber') + .leftJoin( NoticeOfIntentParcel, 'parcel', - 'parcel.notice_of_intent_submission_uuid = noiSearch.uuid', + 'parcel.notice_of_intent_submission_uuid = noiSub.uuid', ); - } if (searchDto.pid) { query = query.andWhere('parcel.pid = :pid', { pid: searchDto.pid }); @@ -164,50 +272,22 @@ export class InboxNoticeOfIntentService { }, ); } - return query; + + promises.push(query.getMany()); } - private compileSearchByNameQuery(searchDto: InboxRequestDto, query) { - if (searchDto.name) { - const formattedSearchString = - formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); - - query = query - .leftJoin( - NoticeOfIntentOwner, - 'notice_of_intent_owner', - 'notice_of_intent_owner.notice_of_intent_submission_uuid = noiSearch.uuid', - ) - .andWhere( - new Brackets((qb) => - qb - .where( - "LOWER(notice_of_intent_owner.first_name || ' ' || notice_of_intent_owner.last_name) LIKE ANY (:names)", - { - names: formattedSearchString, - }, - ) - .orWhere( - 'LOWER(notice_of_intent_owner.first_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ) - .orWhere( - 'LOWER(notice_of_intent_owner.last_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ) - .orWhere( - 'LOWER(notice_of_intent_owner.organization_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ), - ), - ); + private addFileTypeResults( + searchDto: InboxRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + if (searchDto.fileTypes.includes('NOI')) { + const query = this.noiRepository.find({ + select: { + fileNumber: true, + }, + }); + + promises.push(query); } - return query; } } diff --git a/services/apps/alcs/src/portal/inbox/notification/inbox-notification-view.entity.ts b/services/apps/alcs/src/portal/inbox/notification/inbox-notification-view.entity.ts index 60df01cc8d..63f365170a 100644 --- a/services/apps/alcs/src/portal/inbox/notification/inbox-notification-view.entity.ts +++ b/services/apps/alcs/src/portal/inbox/notification/inbox-notification-view.entity.ts @@ -6,7 +6,6 @@ import { ViewColumn, ViewEntity, } from 'typeorm'; -import { LocalGovernment } from '../../../alcs/local-government/local-government.entity'; import { NotificationType } from '../../../alcs/notification/notification-type/notification-type.entity'; import { Notification } from '../../../alcs/notification/notification.entity'; import { User } from '../../../user/user.entity'; @@ -42,11 +41,6 @@ import { LinkedStatusType } from '../inbox.dto'; NotificationType, 'notificationType', 'noti_sub.type_code = notificationType.code', - ) - .leftJoin( - LocalGovernment, - 'localGovernment', - 'noti.local_government_uuid = localGovernment.uuid', ), }) export class InboxNotificationSubmissionView { diff --git a/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts b/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts index a085a9c59e..d6e91132fd 100644 --- a/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts +++ b/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts @@ -1,17 +1,30 @@ -import { Injectable } from '@nestjs/common'; +import { RedisService } from '@app/common/redis/redis.service'; +import { Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; +import * as hash from 'object-hash'; import { Brackets, Repository } from 'typeorm'; +import { Notification } from '../../../alcs/notification/notification.entity'; +import { SEARCH_CACHE_TIME } from '../../../alcs/search/search.config'; import { formatStringToPostgresSearchStringArrayWithWildCard } from '../../../utils/search-helper'; +import { intersectSets } from '../../../utils/set-helper'; import { NotificationParcel } from '../../notification-submission/notification-parcel/notification-parcel.entity'; +import { NotificationSubmission } from '../../notification-submission/notification-submission.entity'; import { NotificationTransferee } from '../../notification-submission/notification-transferee/notification-transferee.entity'; import { AdvancedSearchResultDto, InboxRequestDto } from '../inbox.dto'; import { InboxNotificationSubmissionView } from './inbox-notification-view.entity'; @Injectable() export class InboxNotificationService { + private logger: Logger = new Logger(InboxNotificationService.name); + constructor( @InjectRepository(InboxNotificationSubmissionView) private notificationSearchViewRepo: Repository, + @InjectRepository(Notification) + private notificationRepository: Repository, + @InjectRepository(NotificationSubmission) + private notificationSubRepository: Repository, + private redisService: RedisService, ) {} async search( @@ -20,72 +33,53 @@ export class InboxNotificationService { bceidBusinessGuid: string | null, governmentUuid: string | null, ): Promise> { - let query = await this.compileNotificationSearchQuery( - searchDto, - userUuid, - bceidBusinessGuid, - governmentUuid, - ); + const searchHash = hash(searchDto); + const searchKey = `search_inbox_notification_${userUuid}_${searchHash}`; - query = this.compileGroupBySearchQuery(query); + const client = this.redisService.getClient(); + const cachedSearch = await client.get(searchKey); - query = query - .orderBy(`("notificationSearch"."status" ->> 'effective_date')`, 'DESC') - .offset((searchDto.page - 1) * searchDto.pageSize) - .limit(searchDto.pageSize); - - const result = await query.getManyAndCount(); + let fileNumbers = new Set(); + let didSearch = false; + if (cachedSearch) { + const cachedNumbers = JSON.parse(cachedSearch) as string[]; + fileNumbers = new Set(cachedNumbers); + } else { + const res = await this.searchForFileNumbers(searchDto); + fileNumbers = res.finalResult; + didSearch = res.didSearch; + if (didSearch) { + await client.setEx( + searchKey, + SEARCH_CACHE_TIME, + JSON.stringify([...fileNumbers.values()]), + ); + } + } - return { - data: result[0], - total: result[1], - }; - } + if (didSearch && fileNumbers.size === 0) { + return { + data: [], + total: 0, + }; + } - private compileGroupBySearchQuery(query) { - query = query - .withDeleted() + const query = this.notificationSearchViewRepo + .createQueryBuilder('notificationSearch') .innerJoinAndMapOne( 'notificationSearch.notificationType', 'notificationSearch.notificationType', 'notificationType', ) - .groupBy( - ` - "notificationSearch"."uuid" - , "notificationSearch"."notification_uuid" - , "notificationSearch"."file_number" - , "notificationSearch"."applicant" - , "notificationSearch"."created_at" - , "notificationSearch"."local_government_uuid" - , "notificationSearch"."notification_type_code" - , "notificationSearch"."status" - , "notificationSearch"."created_by_uuid" - , "notificationSearch"."bceid_business_guid" - , "notificationSearch"."date_submitted_to_alc" - , "notificationType"."audit_deleted_date_at" - , "notificationType"."audit_created_at" - , "notificationType"."audit_updated_by" - , "notificationType"."audit_updated_at" - , "notificationType"."audit_created_by" - , "notificationType"."short_label" - , "notificationType"."label" - , "notificationType"."code" - , "notificationType"."html_description" - , "notificationType"."portal_label" - `, - ); - return query; - } + .orderBy(`("notificationSearch"."status" ->> 'effective_date')`, 'DESC') + .offset((searchDto.page - 1) * searchDto.pageSize) + .limit(searchDto.pageSize); - private async compileNotificationSearchQuery( - searchDto: InboxRequestDto, - userUuid: string, - bceidBusinessGuid: string | null, - governmentUuid: string | null, - ) { - let query = - this.notificationSearchViewRepo.createQueryBuilder('notificationSearch'); + if (fileNumbers.size > 0) { + query.andWhere('notificationSearch.fileNumber IN(:...fileNumbers)', { + fileNumbers: [...fileNumbers.values()], + }); + } //User Permissions let where = 'notificationSearch.created_by_uuid = :userUuid'; @@ -107,41 +101,168 @@ export class InboxNotificationService { '(notificationSearch.created_by_uuid = :userUuid OR notificationSearch.bceid_business_guid = :bceidBusinessGuid)'; } } + query.andWhere(`(${where})`, { userUuid, bceidBusinessGuid, governmentUuid, }); + const t0 = performance.now(); + const results = await Promise.all([query.getMany(), query.getCount()]); + const t1 = performance.now(); + this.logger.debug( + `Inbox Notification search took ${t1 - t0} milliseconds.`, + ); + + return { + data: results[0], + total: results[1], + }; + } + + private async searchForFileNumbers(searchDto: InboxRequestDto) { + const promises: Promise<{ fileNumber: string }[]>[] = []; + let didSearch = false; + if (searchDto.fileNumber) { - query = query - .andWhere('notificationSearch.file_number = :fileNumber') - .setParameters({ fileNumber: searchDto.fileNumber ?? null }); + didSearch = true; + this.addFileNumberResults(searchDto, promises); } if (searchDto.portalStatusCodes && searchDto.portalStatusCodes.length > 0) { - query = query.andWhere( - "alcs.get_current_status_for_notification_submission_by_uuid(notificationSearch.uuid) ->> 'status_type_code' IN(:...statuses)", - { - statuses: searchDto.portalStatusCodes, - }, - ); + didSearch = true; + this.addPortalStatusResults(searchDto, promises); } - query = this.compileSearchByNameQuery(searchDto, query); - query = this.compileParcelSearchQuery(searchDto, query); + if (searchDto.name) { + didSearch = true; + this.addNameResults(searchDto, promises); + } + + if (searchDto.pid || searchDto.civicAddress) { + didSearch = true; + this.addParcelResults(searchDto, promises); + } + + if (searchDto.fileTypes.length > 0) { + didSearch = true; + this.addFileTypeResults(searchDto, promises); + } + + //Intersect Sets + const t0 = performance.now(); + const queryResults = await Promise.all(promises); + + const allIds: Set[] = []; + for (const result of queryResults) { + const fileNumbers = new Set(); + result.forEach((currentValue) => { + fileNumbers.add(currentValue.fileNumber); + }); + allIds.push(fileNumbers); + } - return query; + const finalResult = intersectSets(allIds); + + const t1 = performance.now(); + this.logger.debug( + `Inbox Notification pre-search search took ${t1 - t0} milliseconds.`, + ); + return { didSearch, finalResult }; } - private compileParcelSearchQuery(searchDto: InboxRequestDto, query) { - if (searchDto.pid || searchDto.civicAddress) { - query = query.leftJoin( + private addFileNumberResults( + searchDto: InboxRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const promise = this.notificationRepository.find({ + where: { + fileNumber: searchDto.fileNumber, + }, + select: { + fileNumber: true, + }, + }); + promises.push(promise); + } + + private addPortalStatusResults( + searchDto: InboxRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const promise = this.notificationSubRepository + .createQueryBuilder('notiSub') + .select('notiSub.fileNumber') + .where( + "alcs.get_current_status_for_notification_submission_by_uuid(notiSub.uuid) ->> 'status_type_code' IN(:...statusCodes)", + { + statusCodes: searchDto.portalStatusCodes, + }, + ) + .getMany(); + promises.push(promise); + } + + private addNameResults( + searchDto: InboxRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const formattedSearchString = + formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); + const promise = this.notificationSubRepository + .createQueryBuilder('notiSub') + .select('notiSub.fileNumber') + .leftJoin( + NotificationTransferee, + 'notification_transferee', + 'notification_transferee.notification_submission_uuid = notiSub.uuid', + ) + .andWhere( + new Brackets((qb) => + qb + .where( + "LOWER(notification_transferee.first_name || ' ' || notification_transferee.last_name) LIKE ANY (:names)", + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(notification_transferee.first_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(notification_transferee.last_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(notification_transferee.organization_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ), + ), + ) + .getMany(); + promises.push(promise); + } + + private addParcelResults( + searchDto: InboxRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + let query = this.notificationSubRepository + .createQueryBuilder('notiSub') + .select('notiSub.fileNumber') + .leftJoin( NotificationParcel, 'parcel', - 'parcel.notification_submission_uuid = notificationSearch.uuid', + 'parcel.notification_submission_uuid = notiSub.uuid', ); - } if (searchDto.pid) { query = query.andWhere('parcel.pid = :pid', { pid: searchDto.pid }); @@ -155,50 +276,21 @@ export class InboxNotificationService { }, ); } - return query; + + promises.push(query.getMany()); } - private compileSearchByNameQuery(searchDto: InboxRequestDto, query) { - if (searchDto.name) { - const formattedSearchString = - formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); - - query = query - .leftJoin( - NotificationTransferee, - 'notification_transferee', - 'notification_transferee.notification_submission_uuid = notificationSearch.uuid', - ) - .andWhere( - new Brackets((qb) => - qb - .where( - "LOWER(notification_transferee.first_name || ' ' || notification_transferee.last_name) LIKE ANY (:names)", - { - names: formattedSearchString, - }, - ) - .orWhere( - 'LOWER(notification_transferee.first_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ) - .orWhere( - 'LOWER(notification_transferee.last_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ) - .orWhere( - 'LOWER(notification_transferee.organization_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ), - ), - ); + private addFileTypeResults( + searchDto: InboxRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + if (searchDto.fileTypes.includes('SRW')) { + const query = this.notificationRepository.find({ + select: { + fileNumber: true, + }, + }); + promises.push(query); } - return query; } } diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1715884613918-refresh_inbox_search_views.ts b/services/apps/alcs/src/providers/typeorm/migrations/1715884613918-refresh_inbox_search_views.ts new file mode 100644 index 0000000000..11a7839328 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1715884613918-refresh_inbox_search_views.ts @@ -0,0 +1,127 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class RefreshInboxSearchViews1715884613918 + implements MigrationInterface +{ + name = 'RefreshInboxSearchViews1715884613918'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'inbox_application_submission_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."inbox_application_submission_view"`, + ); + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'inbox_notice_of_intent_submission_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."inbox_notice_of_intent_submission_view"`, + ); + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'inbox_notification_submission_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."inbox_notification_submission_view"`, + ); + await queryRunner.query( + `CREATE VIEW "alcs"."inbox_notification_submission_view" AS SELECT "noti_sub"."uuid" AS "uuid", "noti_sub"."applicant" AS "applicant", "noti"."uuid" AS "notification_uuid", "notificationType"."audit_deleted_date_at" AS "notificationType_audit_deleted_date_at", "notificationType"."audit_created_at" AS "notificationType_audit_created_at", "notificationType"."audit_updated_at" AS "notificationType_audit_updated_at", "notificationType"."audit_created_by" AS "notificationType_audit_created_by", "notificationType"."audit_updated_by" AS "notificationType_audit_updated_by", "notificationType"."label" AS "notificationType_label", "notificationType"."code" AS "notificationType_code", "notificationType"."description" AS "notificationType_description", "notificationType"."short_label" AS "notificationType_short_label", "notificationType"."background_color" AS "notificationType_background_color", "notificationType"."text_color" AS "notificationType_text_color", "notificationType"."html_description" AS "notificationType_html_description", "notificationType"."portal_label" AS "notificationType_portal_label", "noti_sub"."file_number" AS "file_number", "noti_sub"."audit_created_at" AS "created_at", "noti_sub"."created_by_uuid" AS "created_by_uuid", "noti_sub"."local_government_uuid" AS "local_government_uuid", "user"."bceid_business_guid" AS "bceid_business_guid", "noti"."type_code" AS "notification_type_code", "noti"."date_submitted_to_alc" AS "date_submitted_to_alc", alcs.get_current_status_for_notification_submission_by_uuid("noti_sub"."uuid") AS "status" FROM "alcs"."notification_submission" "noti_sub" LEFT JOIN "alcs"."user" "user" ON "user"."uuid" = "noti_sub"."created_by_uuid" AND "user"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notification" "noti" ON "noti"."file_number" = "noti_sub"."file_number" AND "noti"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notification_type" "notificationType" ON "noti_sub"."type_code" = "notificationType"."code" AND "notificationType"."audit_deleted_date_at" IS NULL WHERE "noti_sub"."audit_deleted_date_at" IS NULL`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'inbox_notification_submission_view', + 'SELECT "noti_sub"."uuid" AS "uuid", "noti_sub"."applicant" AS "applicant", "noti"."uuid" AS "notification_uuid", "notificationType"."audit_deleted_date_at" AS "notificationType_audit_deleted_date_at", "notificationType"."audit_created_at" AS "notificationType_audit_created_at", "notificationType"."audit_updated_at" AS "notificationType_audit_updated_at", "notificationType"."audit_created_by" AS "notificationType_audit_created_by", "notificationType"."audit_updated_by" AS "notificationType_audit_updated_by", "notificationType"."label" AS "notificationType_label", "notificationType"."code" AS "notificationType_code", "notificationType"."description" AS "notificationType_description", "notificationType"."short_label" AS "notificationType_short_label", "notificationType"."background_color" AS "notificationType_background_color", "notificationType"."text_color" AS "notificationType_text_color", "notificationType"."html_description" AS "notificationType_html_description", "notificationType"."portal_label" AS "notificationType_portal_label", "noti_sub"."file_number" AS "file_number", "noti_sub"."audit_created_at" AS "created_at", "noti_sub"."created_by_uuid" AS "created_by_uuid", "noti_sub"."local_government_uuid" AS "local_government_uuid", "user"."bceid_business_guid" AS "bceid_business_guid", "noti"."type_code" AS "notification_type_code", "noti"."date_submitted_to_alc" AS "date_submitted_to_alc", alcs.get_current_status_for_notification_submission_by_uuid("noti_sub"."uuid") AS "status" FROM "alcs"."notification_submission" "noti_sub" LEFT JOIN "alcs"."user" "user" ON "user"."uuid" = "noti_sub"."created_by_uuid" AND "user"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notification" "noti" ON "noti"."file_number" = "noti_sub"."file_number" AND "noti"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notification_type" "notificationType" ON "noti_sub"."type_code" = "notificationType"."code" AND "notificationType"."audit_deleted_date_at" IS NULL WHERE "noti_sub"."audit_deleted_date_at" IS NULL', + ], + ); + await queryRunner.query( + `CREATE VIEW "alcs"."inbox_application_submission_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "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", "app_sub"."file_number" AS "file_number", "app_sub"."created_by_uuid" AS "created_by_uuid", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."audit_created_at" AS "created_at", "user"."bceid_business_guid" AS "bceid_business_guid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", 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" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."hide_from_portal" = FALSE AND "app"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."user" "user" ON "user"."uuid" = "app_sub"."created_by_uuid" AND "user"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'inbox_application_submission_view', + 'SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "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", "app_sub"."file_number" AS "file_number", "app_sub"."created_by_uuid" AS "created_by_uuid", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."audit_created_at" AS "created_at", "user"."bceid_business_guid" AS "bceid_business_guid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", 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" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."hide_from_portal" = FALSE AND "app"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."user" "user" ON "user"."uuid" = "app_sub"."created_by_uuid" AND "user"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + await queryRunner.query( + `CREATE VIEW "alcs"."inbox_notice_of_intent_submission_view" AS SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "noticeOfIntentType"."alc_fee_amount" AS "noticeOfIntentType_alc_fee_amount", "noticeOfIntentType"."government_fee_amount" AS "noticeOfIntentType_government_fee_amount", "noi_sub"."file_number" AS "file_number", "noi_sub"."audit_created_at" AS "created_at", "noi_sub"."created_by_uuid" AS "created_by_uuid", "noi_sub"."local_government_uuid" AS "local_government_uuid", "user"."bceid_business_guid" AS "bceid_business_guid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."hide_from_portal" = false AND "noi"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."user" "user" ON "user"."uuid" = "noi_sub"."created_by_uuid" AND "user"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'inbox_notice_of_intent_submission_view', + 'SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "noticeOfIntentType"."alc_fee_amount" AS "noticeOfIntentType_alc_fee_amount", "noticeOfIntentType"."government_fee_amount" AS "noticeOfIntentType_government_fee_amount", "noi_sub"."file_number" AS "file_number", "noi_sub"."audit_created_at" AS "created_at", "noi_sub"."created_by_uuid" AS "created_by_uuid", "noi_sub"."local_government_uuid" AS "local_government_uuid", "user"."bceid_business_guid" AS "bceid_business_guid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."hide_from_portal" = false AND "noi"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."user" "user" ON "user"."uuid" = "noi_sub"."created_by_uuid" AND "user"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'inbox_notice_of_intent_submission_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."inbox_notice_of_intent_submission_view"`, + ); + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'inbox_application_submission_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."inbox_application_submission_view"`, + ); + await queryRunner.query( + `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, + ['VIEW', 'inbox_notification_submission_view', 'alcs'], + ); + await queryRunner.query( + `DROP VIEW "alcs"."inbox_notification_submission_view"`, + ); + await queryRunner.query( + `CREATE VIEW "alcs"."inbox_notification_submission_view" AS SELECT "noti_sub"."uuid" AS "uuid", "noti_sub"."applicant" AS "applicant", "noti"."uuid" AS "notification_uuid", "notificationType"."audit_deleted_date_at" AS "notificationType_audit_deleted_date_at", "notificationType"."audit_created_at" AS "notificationType_audit_created_at", "notificationType"."audit_updated_at" AS "notificationType_audit_updated_at", "notificationType"."audit_created_by" AS "notificationType_audit_created_by", "notificationType"."audit_updated_by" AS "notificationType_audit_updated_by", "notificationType"."label" AS "notificationType_label", "notificationType"."code" AS "notificationType_code", "notificationType"."description" AS "notificationType_description", "notificationType"."short_label" AS "notificationType_short_label", "notificationType"."background_color" AS "notificationType_background_color", "notificationType"."text_color" AS "notificationType_text_color", "notificationType"."html_description" AS "notificationType_html_description", "notificationType"."portal_label" AS "notificationType_portal_label", "noti_sub"."file_number" AS "file_number", "noti_sub"."audit_created_at" AS "created_at", "noti_sub"."created_by_uuid" AS "created_by_uuid", "noti_sub"."local_government_uuid" AS "local_government_uuid", "user"."bceid_business_guid" AS "bceid_business_guid", "noti"."type_code" AS "notification_type_code", "noti"."date_submitted_to_alc" AS "date_submitted_to_alc", alcs.get_current_status_for_notification_submission_by_uuid("noti_sub"."uuid") AS "status" FROM "alcs"."notification_submission" "noti_sub" LEFT JOIN "alcs"."user" "user" ON "user"."uuid" = "noti_sub"."created_by_uuid" AND "user"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notification" "noti" ON "noti"."file_number" = "noti_sub"."file_number" AND "noti"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notification_type" "notificationType" ON "noti_sub"."type_code" = "notificationType"."code" AND "notificationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noti"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "noti_sub"."audit_deleted_date_at" IS NULL`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'inbox_notification_submission_view', + 'SELECT "noti_sub"."uuid" AS "uuid", "noti_sub"."applicant" AS "applicant", "noti"."uuid" AS "notification_uuid", "notificationType"."audit_deleted_date_at" AS "notificationType_audit_deleted_date_at", "notificationType"."audit_created_at" AS "notificationType_audit_created_at", "notificationType"."audit_updated_at" AS "notificationType_audit_updated_at", "notificationType"."audit_created_by" AS "notificationType_audit_created_by", "notificationType"."audit_updated_by" AS "notificationType_audit_updated_by", "notificationType"."label" AS "notificationType_label", "notificationType"."code" AS "notificationType_code", "notificationType"."description" AS "notificationType_description", "notificationType"."short_label" AS "notificationType_short_label", "notificationType"."background_color" AS "notificationType_background_color", "notificationType"."text_color" AS "notificationType_text_color", "notificationType"."html_description" AS "notificationType_html_description", "notificationType"."portal_label" AS "notificationType_portal_label", "noti_sub"."file_number" AS "file_number", "noti_sub"."audit_created_at" AS "created_at", "noti_sub"."created_by_uuid" AS "created_by_uuid", "noti_sub"."local_government_uuid" AS "local_government_uuid", "user"."bceid_business_guid" AS "bceid_business_guid", "noti"."type_code" AS "notification_type_code", "noti"."date_submitted_to_alc" AS "date_submitted_to_alc", alcs.get_current_status_for_notification_submission_by_uuid("noti_sub"."uuid") AS "status" FROM "alcs"."notification_submission" "noti_sub" LEFT JOIN "alcs"."user" "user" ON "user"."uuid" = "noti_sub"."created_by_uuid" AND "user"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notification" "noti" ON "noti"."file_number" = "noti_sub"."file_number" AND "noti"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notification_type" "notificationType" ON "noti_sub"."type_code" = "notificationType"."code" AND "notificationType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noti"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "noti_sub"."audit_deleted_date_at" IS NULL', + ], + ); + await queryRunner.query( + `CREATE VIEW "alcs"."inbox_notice_of_intent_submission_view" AS SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "noticeOfIntentType"."alc_fee_amount" AS "noticeOfIntentType_alc_fee_amount", "noticeOfIntentType"."government_fee_amount" AS "noticeOfIntentType_government_fee_amount", "noi_sub"."file_number" AS "file_number", "noi_sub"."audit_created_at" AS "created_at", "noi_sub"."created_by_uuid" AS "created_by_uuid", "noi_sub"."local_government_uuid" AS "local_government_uuid", "user"."bceid_business_guid" AS "bceid_business_guid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."hide_from_portal" = false AND "noi"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."user" "user" ON "user"."uuid" = "noi_sub"."created_by_uuid" AND "user"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'inbox_notice_of_intent_submission_view', + 'SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "noticeOfIntentType"."alc_fee_amount" AS "noticeOfIntentType_alc_fee_amount", "noticeOfIntentType"."government_fee_amount" AS "noticeOfIntentType_government_fee_amount", "noi_sub"."file_number" AS "file_number", "noi_sub"."audit_created_at" AS "created_at", "noi_sub"."created_by_uuid" AS "created_by_uuid", "noi_sub"."local_government_uuid" AS "local_government_uuid", "user"."bceid_business_guid" AS "bceid_business_guid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", GREATEST(status_link.effective_date, decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON "noi"."file_number" = "noi_sub"."file_number" AND "noi"."hide_from_portal" = false AND "noi"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."user" "user" ON "user"."uuid" = "noi_sub"."created_by_uuid" AND "user"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."local_government" "localGovernment" ON "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", notice_of_intent_uuid AS "notice_of_intent_uuid" FROM "alcs"."notice_of_intent_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY notice_of_intent_uuid) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + await queryRunner.query( + `CREATE VIEW "alcs"."inbox_application_submission_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "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" AS "file_number", "app_sub"."created_by_uuid" AS "created_by_uuid", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."audit_created_at" AS "created_at", "user"."bceid_business_guid" AS "bceid_business_guid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app_rev"."local_government_file_number" AS "local_government_file_number", 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" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."hide_from_portal" = FALSE AND "app"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."user" "user" ON "user"."uuid" = "app_sub"."created_by_uuid" AND "user"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."application_submission_review" "app_rev" ON "app"."file_number" = "app_rev"."application_file_number" AND "app_rev"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL 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("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`, + ); + await queryRunner.query( + `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, + [ + 'alcs', + 'VIEW', + 'inbox_application_submission_view', + 'SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "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" AS "file_number", "app_sub"."created_by_uuid" AS "created_by_uuid", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."audit_created_at" AS "created_at", "user"."bceid_business_guid" AS "bceid_business_guid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app_rev"."local_government_file_number" AS "local_government_file_number", 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" INNER JOIN "alcs"."application" "app" ON "app"."file_number" = "app_sub"."file_number" AND "app"."hide_from_portal" = FALSE AND "app"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."user" "user" ON "user"."uuid" = "app_sub"."created_by_uuid" AND "user"."audit_deleted_date_at" IS NULL LEFT JOIN "alcs"."application_submission_review" "app_rev" ON "app"."file_number" = "app_rev"."application_file_number" AND "app_rev"."audit_deleted_date_at" IS NULL INNER JOIN "alcs"."application_type" "applicationType" ON "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL 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("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid" LEFT JOIN (SELECT MAX("date") AS "date", application_uuid AS "application_uuid" FROM "alcs"."application_decision" "decision_date" WHERE "decision_date"."audit_deleted_date_at" IS NULL GROUP BY application_uuid) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )', + ], + ); + } +} From 7a67b8e81e43b8ea5bd91ca7ebac2601b044d37e Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 21 May 2024 11:03:03 -0700 Subject: [PATCH 084/103] DRY Up Search * Move common filters to a shared class --- ...pplication-advanced-search.service.spec.ts | 2 +- .../application-advanced-search.service.ts | 209 +++-------------- .../inquiry-advanced-search.service.spec.ts | 6 + .../inquiry-advanced-search.service.ts | 17 +- ...otice-of-intent-advanced-search.service.ts | 187 +++------------ ...tification-advanced-search.service.spec.ts | 4 +- .../notification-advanced-search.service.ts | 192 +++------------- ...planning-review-advanced-search.service.ts | 17 +- .../src/alcs/search/search.controller.spec.ts | 7 + .../alcs/src/alcs/search/search.controller.ts | 4 +- .../apps/alcs/src/alcs/search/search.dto.ts | 3 +- .../inbox-application.service.spec.ts | 92 +++++--- .../application/inbox-application.service.ts | 183 ++------------- .../apps/alcs/src/portal/inbox/inbox.dto.ts | 7 +- .../inbox-notice-of-intent.service.spec.ts | 74 +++--- .../inbox-notice-of-intent.service.ts | 177 ++------------ .../inbox-notification.service.spec.ts | 80 ++++--- .../inbox-notification.service.ts | 177 ++------------ .../public-application-search.service.spec.ts | 2 +- .../public-application-search.service.ts | 216 +++--------------- .../public-notice-of-intent-search.service.ts | 203 +++------------- ...public-notification-search.service.spec.ts | 4 +- .../public-notification-search.service.ts | 207 +++-------------- .../search/application-search-filters.ts | 154 +++++++++++++ .../search/notice-of-intent-search-filters.ts | 138 +++++++++++ .../search/notification-search-filters.ts | 142 ++++++++++++ .../src/utils/search/search-intersection.ts | 18 ++ 27 files changed, 931 insertions(+), 1591 deletions(-) create mode 100644 services/apps/alcs/src/utils/search/application-search-filters.ts create mode 100644 services/apps/alcs/src/utils/search/notice-of-intent-search-filters.ts create mode 100644 services/apps/alcs/src/utils/search/notification-search-filters.ts create mode 100644 services/apps/alcs/src/utils/search/search-intersection.ts diff --git a/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.spec.ts b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.spec.ts index e4ae53040c..2c65ecba92 100644 --- a/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.spec.ts +++ b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.spec.ts @@ -130,7 +130,7 @@ describe('ApplicationAdvancedSearchService', () => { expect(mockQuery.where).toHaveBeenCalledTimes(2); }); - it('should call compileApplicationSearchQuery method correctly', async () => { + it('should call searchForFileNumbers method correctly', async () => { const searchForFileNumbersSpy = jest .spyOn(service as any, 'searchForFileNumbers') .mockResolvedValue(new Set(['100000'])); diff --git a/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts index ec58e82e22..1c42792355 100644 --- a/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts @@ -2,17 +2,14 @@ import { RedisService } from '@app/common/redis/redis.service'; import { Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import * as hash from 'object-hash'; -import { Brackets, QueryRunner, Repository } from 'typeorm'; -import { ApplicationOwner } from '../../../portal/application-submission/application-owner/application-owner.entity'; -import { ApplicationParcel } from '../../../portal/application-submission/application-parcel/application-parcel.entity'; +import { QueryRunner, Repository } from 'typeorm'; import { ApplicationSubmission } from '../../../portal/application-submission/application-submission.entity'; import { getNextDayToPacific, getStartOfDayToPacific, } from '../../../utils/pacific-date-time-helper'; -import { formatStringToPostgresSearchStringArrayWithWildCard } from '../../../utils/search-helper'; -import { intersectSets } from '../../../utils/set-helper'; -import { ApplicationDecisionComponent } from '../../application-decision/application-decision-v2/application-decision/component/application-decision-component.entity'; +import { APP_SEARCH_FILTERS } from '../../../utils/search/application-search-filters'; +import { processSearchPromises } from '../../../utils/search/search-intersection'; import { ApplicationDecision } from '../../application-decision/application-decision.entity'; import { Application } from '../../application/application.entity'; import { LocalGovernment } from '../../local-government/local-government.entity'; @@ -121,7 +118,11 @@ export class ApplicationAdvancedSearchService { const promises: Promise<{ fileNumber: string }[]>[] = []; if (searchDto.fileNumber) { - this.addFileNumberResults(searchDto, promises); + const promise = APP_SEARCH_FILTERS.addFileNumberResults( + searchDto, + this.applicationRepository, + ); + promises.push(promise); } if (searchDto.legacyId) { @@ -129,11 +130,20 @@ export class ApplicationAdvancedSearchService { } if (searchDto.portalStatusCodes && searchDto.portalStatusCodes.length > 0) { - this.addPortalStatusResults(searchDto, promises); + const promise = APP_SEARCH_FILTERS.addPortalStatusResults( + searchDto, + this.applicationSubmissionRepository, + ); + promises.push(promise); } if (searchDto.governmentName) { - await this.addGovernmentResults(searchDto, promises); + const promise = APP_SEARCH_FILTERS.addGovernmentResults( + searchDto, + this.applicationRepository, + this.governmentRepository, + ); + promises.push(promise); } if (searchDto.regionCode) { @@ -141,11 +151,19 @@ export class ApplicationAdvancedSearchService { } if (searchDto.name) { - this.addNameResults(searchDto, promises); + const promise = APP_SEARCH_FILTERS.addNameResults( + searchDto, + this.applicationSubmissionRepository, + ); + promises.push(promise); } if (searchDto.pid || searchDto.civicAddress) { - this.addParcelResults(searchDto, promises); + const promise = APP_SEARCH_FILTERS.addParcelResults( + searchDto, + this.applicationSubmissionRepository, + ); + promises.push(promise); } if (searchDto.resolutionNumber || searchDto.resolutionYear) { @@ -153,7 +171,11 @@ export class ApplicationAdvancedSearchService { } if (searchDto.fileTypes.length > 0) { - this.addFileTypeResults(searchDto, promises); + const promise = APP_SEARCH_FILTERS.addFileTypeResults( + searchDto, + this.applicationRepository, + ); + promises.push(promise); } if (searchDto.dateSubmittedFrom || searchDto.dateSubmittedTo) { @@ -164,21 +186,8 @@ export class ApplicationAdvancedSearchService { this.addDecisionDateResults(searchDto, promises); } - //Intersect Sets const t0 = performance.now(); - const queryResults = await Promise.all(promises); - - const allIds: Set[] = []; - for (const result of queryResults) { - const fileNumbers = new Set(); - result.forEach((currentValue) => { - fileNumbers.add(currentValue.fileNumber); - }); - allIds.push(fileNumbers); - } - - const finalResult = intersectSets(allIds); - + const finalResult = await processSearchPromises(promises); const t1 = performance.now(); this.logger.debug( `ALCS Application pre-search search took ${t1 - t0} milliseconds.`, @@ -186,21 +195,6 @@ export class ApplicationAdvancedSearchService { return finalResult; } - private addFileNumberResults( - searchDto: SearchRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - const promise = this.applicationRepository.find({ - where: { - fileNumber: searchDto.fileNumber, - }, - select: { - fileNumber: true, - }, - }); - promises.push(promise); - } - private addLegacyIDResults( searchDto: SearchRequestDto, promises: Promise<{ fileNumber: string }[]>[], @@ -216,42 +210,6 @@ export class ApplicationAdvancedSearchService { promises.push(promise); } - private addPortalStatusResults( - searchDto: SearchRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - const promise = this.applicationSubmissionRepository - .createQueryBuilder('appSubs') - .select('appSubs.fileNumber') - .where( - "alcs.get_current_status_for_application_submission_by_uuid(appSubs.uuid) ->> 'status_type_code' IN (:...statusCodes)", - { - statusCodes: searchDto.portalStatusCodes, - }, - ) - .getMany(); - promises.push(promise); - } - - private async addGovernmentResults( - searchDto: SearchRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - const government = await this.governmentRepository.findOneByOrFail({ - name: searchDto.governmentName, - }); - - const promise = this.applicationRepository.find({ - where: { - localGovernmentUuid: government.uuid, - }, - select: { - fileNumber: true, - }, - }); - promises.push(promise); - } - private addRegionResults( searchDto: SearchRequestDto, promises: Promise<{ fileNumber: string }[]>[], @@ -267,73 +225,6 @@ export class ApplicationAdvancedSearchService { promises.push(promise); } - private addNameResults( - searchDto: SearchRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - const formattedSearchString = - formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); - const promise = this.applicationSubmissionRepository - .createQueryBuilder('appSub') - .select('appSub.fileNumber') - .leftJoin( - ApplicationOwner, - 'application_owner', - 'application_owner.application_submission_uuid = appSub.uuid', - ) - .andWhere( - new Brackets((qb) => - qb - .where( - "LOWER(application_owner.first_name || ' ' || application_owner.last_name) LIKE ANY (:names)", - { - names: formattedSearchString, - }, - ) - .orWhere('LOWER(application_owner.first_name) LIKE ANY (:names)', { - names: formattedSearchString, - }) - .orWhere('LOWER(application_owner.last_name) LIKE ANY (:names)', { - names: formattedSearchString, - }) - .orWhere( - 'LOWER(application_owner.organization_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ), - ), - ) - .getMany(); - promises.push(promise); - } - - private addParcelResults( - searchDto: SearchRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - const query = this.applicationSubmissionRepository - .createQueryBuilder('appSub') - .select('appSub.fileNumber') - .leftJoin( - ApplicationParcel, - 'parcel', - 'parcel.application_submission_uuid = appSub.uuid', - ); - - if (searchDto.pid) { - query.andWhere('parcel.pid = :pid', { pid: searchDto.pid }); - } - - if (searchDto.civicAddress) { - query.andWhere('LOWER(parcel.civic_address) like LOWER(:civic_address)', { - civic_address: `%${searchDto.civicAddress}%`.toLowerCase(), - }); - } - - promises.push(query.getMany()); - } - private addDecisionResolutionResults( searchDto: SearchRequestDto, promises: Promise<{ fileNumber: string }[]>[], @@ -361,36 +252,6 @@ export class ApplicationAdvancedSearchService { promises.push(query.getMany()); } - private addFileTypeResults( - searchDto: SearchRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - const query = this.applicationRepository - .createQueryBuilder('app') - .select('app.fileNumber') - .leftJoin( - ApplicationDecision, - 'decision', - 'decision.application_uuid = "app"."uuid" AND decision.is_draft = FALSE', - ) - .leftJoin( - ApplicationDecisionComponent, - 'decisionComponent', - 'decisionComponent.application_decision_uuid = decision.uuid', - ) - .where('app.type_code IN (:...typeCodes)', { - typeCodes: searchDto.fileTypes, - }) - .orWhere( - 'decisionComponent.application_decision_component_type_code IN (:...typeCodes)', - { - typeCodes: searchDto.fileTypes, - }, - ); - - promises.push(query.getMany()); - } - private addSubmittedDateResults( searchDto: SearchRequestDto, promises: Promise<{ fileNumber: string }[]>[], diff --git a/services/apps/alcs/src/alcs/search/inquiry/inquiry-advanced-search.service.spec.ts b/services/apps/alcs/src/alcs/search/inquiry/inquiry-advanced-search.service.spec.ts index 24910af44d..927a279f03 100644 --- a/services/apps/alcs/src/alcs/search/inquiry/inquiry-advanced-search.service.spec.ts +++ b/services/apps/alcs/src/alcs/search/inquiry/inquiry-advanced-search.service.spec.ts @@ -42,6 +42,7 @@ describe('InquiryAdvancedSearchService', () => { pageSize: 10, sortField: 'applicant', sortDirection: 'ASC', + portalStatusCodes: [], }; let mockQuery: any = {}; @@ -55,6 +56,11 @@ describe('InquiryAdvancedSearchService', () => { mockQuery = createMockQuery(); mockQueryRunner = createMock(); + mockRedisService.getClient.mockReturnValue({ + get: async () => null, + setEx: async () => null, + } as any); + const module: TestingModule = await Test.createTestingModule({ providers: [ InquiryAdvancedSearchService, diff --git a/services/apps/alcs/src/alcs/search/inquiry/inquiry-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/inquiry/inquiry-advanced-search.service.ts index aa9c5beed7..dc1c256e13 100644 --- a/services/apps/alcs/src/alcs/search/inquiry/inquiry-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/inquiry/inquiry-advanced-search.service.ts @@ -4,7 +4,7 @@ import { InjectRepository } from '@nestjs/typeorm'; import * as hash from 'object-hash'; import { QueryRunner, Repository } from 'typeorm'; import { formatStringToPostgresSearchStringArrayWithWildCard } from '../../../utils/search-helper'; -import { intersectSets } from '../../../utils/set-helper'; +import { processSearchPromises } from '../../../utils/search/search-intersection'; import { InquiryParcel } from '../../inquiry/inquiry-parcel/inquiry-parcel.entity'; import { Inquiry } from '../../inquiry/inquiry.entity'; import { LocalGovernment } from '../../local-government/local-government.entity'; @@ -143,21 +143,8 @@ export class InquiryAdvancedSearchService { this.addFileTypeResults(searchDto, promises); } - //Intersect Sets const t0 = performance.now(); - const queryResults = await Promise.all(promises); - - const allIds: Set[] = []; - for (const result of queryResults) { - const fileNumbers = new Set(); - result.forEach((currentValue) => { - fileNumbers.add(currentValue.fileNumber); - }); - allIds.push(fileNumbers); - } - - const finalResult = intersectSets(allIds); - + const finalResult = await processSearchPromises(promises); const t1 = performance.now(); this.logger.debug( `ALCS Inquiry pre-search search took ${t1 - t0} milliseconds.`, diff --git a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts index 38435869bd..9ce85ebdd5 100644 --- a/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/notice-of-intent/notice-of-intent-advanced-search.service.ts @@ -2,15 +2,13 @@ import { RedisService } from '@app/common/redis/redis.service'; import { Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import * as hash from 'object-hash'; -import { Brackets, QueryRunner, Repository } from 'typeorm'; -import { NoticeOfIntentOwner } from '../../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity'; -import { NoticeOfIntentParcel } from '../../../portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity'; +import { QueryRunner, Repository } from 'typeorm'; import { NoticeOfIntentSubmission } from '../../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; import { getNextDayToPacific, getStartOfDayToPacific, } from '../../../utils/pacific-date-time-helper'; -import { formatStringToPostgresSearchStringArrayWithWildCard } from '../../../utils/search-helper'; +import { NOI_SEARCH_FILTERS } from '../../../utils/search/notice-of-intent-search-filters'; import { intersectSets } from '../../../utils/set-helper'; import { LocalGovernment } from '../../local-government/local-government.entity'; import { NoticeOfIntentDecision } from '../../notice-of-intent-decision/notice-of-intent-decision.entity'; @@ -125,7 +123,11 @@ export class NoticeOfIntentAdvancedSearchService { const promises: Promise<{ fileNumber: string }[]>[] = []; if (searchDto.fileNumber) { - this.addFileNumberResults(searchDto, promises); + const promise = NOI_SEARCH_FILTERS.addFileNumberResults( + searchDto, + this.noiRepository, + ); + promises.push(promise); } if (searchDto.legacyId) { @@ -133,11 +135,20 @@ export class NoticeOfIntentAdvancedSearchService { } if (searchDto.portalStatusCodes && searchDto.portalStatusCodes.length > 0) { - this.addPortalStatusResults(searchDto, promises); + const promise = NOI_SEARCH_FILTERS.addPortalStatusResults( + searchDto, + this.noiSubmissionRepository, + ); + promises.push(promise); } if (searchDto.governmentName) { - await this.addGovernmentResults(searchDto, promises); + const promise = NOI_SEARCH_FILTERS.addGovernmentResults( + searchDto, + this.noiRepository, + this.governmentRepository, + ); + promises.push(promise); } if (searchDto.regionCode) { @@ -145,19 +156,31 @@ export class NoticeOfIntentAdvancedSearchService { } if (searchDto.name) { - this.addNameResults(searchDto, promises); + const promise = NOI_SEARCH_FILTERS.addNameResults( + searchDto, + this.noiSubmissionRepository, + ); + promises.push(promise); } if (searchDto.pid || searchDto.civicAddress) { - this.addParcelResults(searchDto, promises); + const promise = NOI_SEARCH_FILTERS.addParcelResults( + searchDto, + this.noiSubmissionRepository, + ); + promises.push(promise); } if (searchDto.resolutionNumber || searchDto.resolutionYear) { this.addDecisionResolutionResults(searchDto, promises); } - if (searchDto.fileTypes.length > 0) { - this.addFileTypeResults(searchDto, promises); + if (searchDto.fileTypes.includes('NOI')) { + const promise = NOI_SEARCH_FILTERS.addFileTypeResults( + searchDto, + this.noiRepository, + ); + promises.push(promise); } if (searchDto.dateSubmittedFrom || searchDto.dateSubmittedTo) { @@ -220,21 +243,6 @@ export class NoticeOfIntentAdvancedSearchService { promises.push(query.getMany()); } - private addFileNumberResults( - searchDto: SearchRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - const promise = this.noiRepository.find({ - where: { - fileNumber: searchDto.fileNumber, - }, - select: { - fileNumber: true, - }, - }); - promises.push(promise); - } - private addLegacyIDResults( searchDto: SearchRequestDto, promises: Promise<{ fileNumber: string }[]>[], @@ -250,42 +258,6 @@ export class NoticeOfIntentAdvancedSearchService { promises.push(promise); } - private addPortalStatusResults( - searchDto: SearchRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - const promise = this.noiSubmissionRepository - .createQueryBuilder('noiSubs') - .select('noiSubs.fileNumber') - .where( - "alcs.get_current_status_for_notice_of_intent_submission_by_uuid(noiSubs.uuid) ->> 'status_type_code' IN(:...statusCodes)", - { - statusCodes: searchDto.portalStatusCodes, - }, - ) - .getMany(); - promises.push(promise); - } - - private async addGovernmentResults( - searchDto: SearchRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - const government = await this.governmentRepository.findOneByOrFail({ - name: searchDto.governmentName, - }); - - const promise = this.noiRepository.find({ - where: { - localGovernmentUuid: government.uuid, - }, - select: { - fileNumber: true, - }, - }); - promises.push(promise); - } - private addRegionResults( searchDto: SearchRequestDto, promises: Promise<{ fileNumber: string }[]>[], @@ -301,97 +273,6 @@ export class NoticeOfIntentAdvancedSearchService { promises.push(promise); } - private addNameResults( - searchDto: SearchRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - const formattedSearchString = - formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); - const promise = this.noiSubmissionRepository - .createQueryBuilder('noiSub') - .select('noiSub.fileNumber') - .leftJoin( - NoticeOfIntentOwner, - 'notice_of_intent_owner', - 'notice_of_intent_owner.notice_of_intent_submission_uuid = noiSub.uuid', - ) - .andWhere( - new Brackets((qb) => - qb - .where( - "LOWER(notice_of_intent_owner.first_name || ' ' || notice_of_intent_owner.last_name) LIKE ANY (:names)", - { - names: formattedSearchString, - }, - ) - .orWhere( - 'LOWER(notice_of_intent_owner.first_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ) - .orWhere( - 'LOWER(notice_of_intent_owner.last_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ) - .orWhere( - 'LOWER(notice_of_intent_owner.organization_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ), - ), - ) - .getMany(); - promises.push(promise); - } - - private addParcelResults( - searchDto: SearchRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - let query = this.noiSubmissionRepository - .createQueryBuilder('noiSub') - .select('noiSub.fileNumber') - .leftJoin( - NoticeOfIntentParcel, - 'parcel', - 'parcel.notice_of_intent_submission_uuid = noiSub.uuid', - ); - - if (searchDto.pid) { - query = query.andWhere('parcel.pid = :pid', { pid: searchDto.pid }); - } - - if (searchDto.civicAddress) { - query = query.andWhere( - 'LOWER(parcel.civic_address) like LOWER(:civic_address)', - { - civic_address: `%${searchDto.civicAddress}%`.toLowerCase(), - }, - ); - } - - promises.push(query.getMany()); - } - - private addFileTypeResults( - searchDto: SearchRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - if (searchDto.fileTypes.includes('NOI')) { - const query = this.noiRepository.find({ - select: { - fileNumber: true, - }, - }); - - promises.push(query); - } - } - private addSubmittedDateResults( searchDto: SearchRequestDto, promises: Promise<{ fileNumber: string }[]>[], diff --git a/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.spec.ts b/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.spec.ts index 439e4c8a89..203eb84306 100644 --- a/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.spec.ts +++ b/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.spec.ts @@ -123,11 +123,11 @@ describe('NotificationAdvancedSearchService', () => { const result = await service.search(mockSearchDto, mockQueryRunner); expect(result).toEqual({ data: [], total: 0 }); - expect(mockQuery.andWhere).toHaveBeenCalledTimes(4); + expect(mockQuery.andWhere).toHaveBeenCalledTimes(5); expect( mockNotificationSubmissionRepo.createQueryBuilder, ).toHaveBeenCalledTimes(3); - expect(mockNotificationRepo.createQueryBuilder).toHaveBeenCalledTimes(2); + expect(mockNotificationRepo.createQueryBuilder).toHaveBeenCalledTimes(1); expect(mockNotificationRepo.find).toHaveBeenCalledTimes(3); }); diff --git a/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.ts index 33cf1a5203..3ea1d89976 100644 --- a/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.ts @@ -3,11 +3,9 @@ import { Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import * as hash from 'object-hash'; import { QueryRunner, Repository } from 'typeorm'; -import { NotificationParcel } from '../../../portal/notification-submission/notification-parcel/notification-parcel.entity'; import { NotificationSubmission } from '../../../portal/notification-submission/notification-submission.entity'; -import { NotificationTransferee } from '../../../portal/notification-submission/notification-transferee/notification-transferee.entity'; -import { formatStringToPostgresSearchStringArrayWithWildCard } from '../../../utils/search-helper'; -import { intersectSets } from '../../../utils/set-helper'; +import { NOTIFICATION_SEARCH_FILTERS } from '../../../utils/search/notification-search-filters'; +import { processSearchPromises } from '../../../utils/search/search-intersection'; import { LocalGovernment } from '../../local-government/local-government.entity'; import { Notification } from '../../notification/notification.entity'; import { SEARCH_CACHE_TIME } from '../search.config'; @@ -24,7 +22,7 @@ export class NotificationAdvancedSearchService { @InjectRepository(Notification) private notificationRepository: Repository, @InjectRepository(NotificationSubmission) - private notificationSubmissionRepository: Repository, + private notificationSubRepository: Repository, @InjectRepository(LocalGovernment) private governmentRepository: Repository, private redisService: RedisService, @@ -120,15 +118,28 @@ export class NotificationAdvancedSearchService { const promises: Promise<{ fileNumber: string }[]>[] = []; if (searchDto.fileNumber) { - this.addFileNumberResults(searchDto, promises); + const promise = NOTIFICATION_SEARCH_FILTERS.addFileNumberResults( + searchDto, + this.notificationRepository, + ); + promises.push(promise); } if (searchDto.portalStatusCodes && searchDto.portalStatusCodes.length > 0) { - this.addPortalStatusResults(searchDto, promises); + const promise = NOTIFICATION_SEARCH_FILTERS.addPortalStatusResults( + searchDto, + this.notificationSubRepository, + ); + promises.push(promise); } if (searchDto.governmentName) { - await this.addGovernmentResults(searchDto, promises); + const promise = NOTIFICATION_SEARCH_FILTERS.addGovernmentResults( + searchDto, + this.notificationRepository, + this.governmentRepository, + ); + promises.push(promise); } if (searchDto.regionCode) { @@ -136,35 +147,35 @@ export class NotificationAdvancedSearchService { } if (searchDto.name) { - this.addNameResults(searchDto, promises); + const promise = NOTIFICATION_SEARCH_FILTERS.addNameResults( + searchDto, + this.notificationSubRepository, + ); + promises.push(promise); } if (searchDto.pid || searchDto.civicAddress) { - this.addParcelResults(searchDto, promises); + const promise = NOTIFICATION_SEARCH_FILTERS.addParcelResults( + searchDto, + this.notificationSubRepository, + ); + promises.push(promise); } - if (searchDto.fileTypes.length > 0) { - this.addFileTypeResults(searchDto, promises); + + if (searchDto.fileTypes.includes('SRW')) { + const promise = NOTIFICATION_SEARCH_FILTERS.addFileTypeResults( + searchDto, + this.notificationRepository, + ); + promises.push(promise); } if (searchDto.dateSubmittedFrom || searchDto.dateSubmittedTo) { this.addSubmittedDateResults(searchDto, promises); } - //Intersect Sets const t0 = performance.now(); - const queryResults = await Promise.all(promises); - - const allIds: Set[] = []; - for (const result of queryResults) { - const fileNumbers = new Set(); - result.forEach((currentValue) => { - fileNumbers.add(currentValue.fileNumber); - }); - allIds.push(fileNumbers); - } - - const finalResult = intersectSets(allIds); - + const finalResult = await processSearchPromises(promises); const t1 = performance.now(); this.logger.debug( `ALCS Application pre-search search took ${t1 - t0} milliseconds.`, @@ -172,57 +183,6 @@ export class NotificationAdvancedSearchService { return finalResult; } - private addFileNumberResults( - searchDto: SearchRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - const promise = this.notificationRepository.find({ - where: { - fileNumber: searchDto.fileNumber, - }, - select: { - fileNumber: true, - }, - }); - promises.push(promise); - } - - private addPortalStatusResults( - searchDto: SearchRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - const promise = this.notificationSubmissionRepository - .createQueryBuilder('notiSub') - .select('notiSub.fileNumber') - .where( - "alcs.get_current_status_for_notification_submission_by_uuid(notiSub.uuid) ->> 'status_type_code' IN(:...statusCodes)", - { - statusCodes: searchDto.portalStatusCodes, - }, - ) - .getMany(); - promises.push(promise); - } - - private async addGovernmentResults( - searchDto: SearchRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - const government = await this.governmentRepository.findOneByOrFail({ - name: searchDto.governmentName, - }); - - const promise = this.notificationRepository.find({ - where: { - localGovernmentUuid: government.uuid, - }, - select: { - fileNumber: true, - }, - }); - promises.push(promise); - } - private addRegionResults( searchDto: SearchRequestDto, promises: Promise<{ fileNumber: string }[]>[], @@ -238,84 +198,6 @@ export class NotificationAdvancedSearchService { promises.push(promise); } - private addNameResults( - searchDto: SearchRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - const formattedSearchString = - formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); - const promise = this.notificationSubmissionRepository - .createQueryBuilder('notiSub') - .select('notiSub.fileNumber') - .leftJoin( - NotificationTransferee, - 'notification_transferee', - 'notification_transferee.notification_submission_uuid = notiSub.uuid', - ) - .where( - "LOWER(notification_transferee.first_name || ' ' || notification_transferee.last_name) LIKE ANY (:names)", - { - names: formattedSearchString, - }, - ) - .orWhere('LOWER(notification_transferee.first_name) LIKE ANY (:names)', { - names: formattedSearchString, - }) - .orWhere('LOWER(notification_transferee.last_name) LIKE ANY (:names)', { - names: formattedSearchString, - }) - .orWhere( - 'LOWER(notification_transferee.organization_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ) - .getMany(); - promises.push(promise); - } - - private addParcelResults( - searchDto: SearchRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - let query = this.notificationSubmissionRepository - .createQueryBuilder('notiSub') - .select('notiSub.fileNumber') - .leftJoin( - NotificationParcel, - 'parcel', - 'parcel.notification_submission_uuid = notiSub.uuid', - ); - - if (searchDto.pid) { - query = query.andWhere('parcel.pid = :pid', { pid: searchDto.pid }); - } - - if (searchDto.civicAddress) { - query = query.andWhere( - 'LOWER(parcel.civic_address) like LOWER(:civic_address)', - { - civic_address: `%${searchDto.civicAddress}%`.toLowerCase(), - }, - ); - } - - promises.push(query.getMany()); - } - - private addFileTypeResults( - searchDto: SearchRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - const query = this.notificationRepository - .createQueryBuilder('notification') - .select('notification.fileNumber') - .where('notification.type_code IN (:...typeCodes)', { - typeCodes: searchDto.fileTypes, - }); - promises.push(query.getMany()); - } - private addSubmittedDateResults( searchDto: SearchRequestDto, promises: Promise<{ fileNumber: string }[]>[], diff --git a/services/apps/alcs/src/alcs/search/planning-review/planning-review-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/planning-review/planning-review-advanced-search.service.ts index 07a746803e..bf808549c8 100644 --- a/services/apps/alcs/src/alcs/search/planning-review/planning-review-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/planning-review/planning-review-advanced-search.service.ts @@ -8,7 +8,7 @@ import { getStartOfDayToPacific, } from '../../../utils/pacific-date-time-helper'; import { formatStringToPostgresSearchStringArrayWithWildCard } from '../../../utils/search-helper'; -import { intersectSets } from '../../../utils/set-helper'; +import { processSearchPromises } from '../../../utils/search/search-intersection'; import { LocalGovernment } from '../../local-government/local-government.entity'; import { PlanningReferral } from '../../planning-review/planning-referral/planning-referral.entity'; import { PlanningReviewDecision } from '../../planning-review/planning-review-decision/planning-review-decision.entity'; @@ -149,21 +149,8 @@ export class PlanningReviewAdvancedSearchService { this.addDecisionDateResults(searchDto, promises); } - //Intersect Sets const t0 = performance.now(); - const queryResults = await Promise.all(promises); - - const allIds: Set[] = []; - for (const result of queryResults) { - const fileNumbers = new Set(); - result.forEach((currentValue) => { - fileNumbers.add(currentValue.fileNumber); - }); - allIds.push(fileNumbers); - } - - const finalResult = intersectSets(allIds); - + const finalResult = await processSearchPromises(promises); const t1 = performance.now(); this.logger.debug( `ALCS Planning Review pre-search search took ${t1 - t0} milliseconds.`, diff --git a/services/apps/alcs/src/alcs/search/search.controller.spec.ts b/services/apps/alcs/src/alcs/search/search.controller.spec.ts index dd9cb489de..c991110101 100644 --- a/services/apps/alcs/src/alcs/search/search.controller.spec.ts +++ b/services/apps/alcs/src/alcs/search/search.controller.spec.ts @@ -163,6 +163,7 @@ describe('SearchController', () => { sortDirection: 'ASC', name: 'test', fileTypes: [], + portalStatusCodes: [], }; const result = await controller.advancedSearch(mockSearchRequestDto); @@ -201,6 +202,7 @@ describe('SearchController', () => { sortField: '1', sortDirection: 'ASC', fileTypes: [], + portalStatusCodes: [], }; const result = @@ -225,6 +227,7 @@ describe('SearchController', () => { sortField: '1', sortDirection: 'ASC', fileTypes: [], + portalStatusCodes: [], }; const result = @@ -247,6 +250,7 @@ describe('SearchController', () => { sortField: '1', sortDirection: 'ASC', fileTypes: ['NFUP'], + portalStatusCodes: [], }; const result = await controller.advancedSearch(mockSearchRequestDto); @@ -270,6 +274,7 @@ describe('SearchController', () => { sortField: '1', sortDirection: 'ASC', fileTypes: ['NOI'], + portalStatusCodes: [], }; const result = await controller.advancedSearch(mockSearchRequestDto); @@ -291,6 +296,7 @@ describe('SearchController', () => { sortField: '1', sortDirection: 'ASC', fileTypes: ['GENC'], + portalStatusCodes: [], }; const result = await controller.advancedSearch(mockSearchRequestDto); @@ -311,6 +317,7 @@ describe('SearchController', () => { sortField: '1', sortDirection: 'ASC', fileTypes: ['MISC'], + portalStatusCodes: [], }; const result = await controller.advancedSearch(mockSearchRequestDto); diff --git a/services/apps/alcs/src/alcs/search/search.controller.ts b/services/apps/alcs/src/alcs/search/search.controller.ts index 89d4bc2f16..39fd5762e4 100644 --- a/services/apps/alcs/src/alcs/search/search.controller.ts +++ b/services/apps/alcs/src/alcs/search/search.controller.ts @@ -367,7 +367,7 @@ export class SearchController { const searchPlanningReviews = (searchDto.fileTypes.length > 0 ? planningReviewTypeSpecified : true) && - !searchDto.portalStatusCodes && + searchDto.portalStatusCodes.length === 0 && !searchDto.pid && !isStringSetAndNotEmpty(searchDto.civicAddress); @@ -385,7 +385,7 @@ export class SearchController { !searchDto.dateDecidedTo && !searchDto.resolutionNumber && !searchDto.resolutionYear && - !searchDto.portalStatusCodes && + searchDto.portalStatusCodes.length === 0 && !isStringSetAndNotEmpty(searchDto.legacyId); return { diff --git a/services/apps/alcs/src/alcs/search/search.dto.ts b/services/apps/alcs/src/alcs/search/search.dto.ts index 62f7d3a817..4dab17426b 100644 --- a/services/apps/alcs/src/alcs/search/search.dto.ts +++ b/services/apps/alcs/src/alcs/search/search.dto.ts @@ -152,8 +152,7 @@ export class SearchRequestDto extends PagingRequestDto { resolutionYear?: number; @IsArray() - @IsOptional() - portalStatusCodes?: string[]; + portalStatusCodes: string[]; @IsString() @IsOptional() diff --git a/services/apps/alcs/src/portal/inbox/application/inbox-application.service.spec.ts b/services/apps/alcs/src/portal/inbox/application/inbox-application.service.spec.ts index 4f52786f05..a180efcb00 100644 --- a/services/apps/alcs/src/portal/inbox/application/inbox-application.service.spec.ts +++ b/services/apps/alcs/src/portal/inbox/application/inbox-application.service.spec.ts @@ -1,7 +1,12 @@ +import { RedisService } from '@app/common/redis/redis.service'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; +import { createMockQuery } from '../../../../test/mocks/mockTypes'; +import { Application } from '../../../alcs/application/application.entity'; +import { ApplicationSubmissionReview } from '../../application-submission-review/application-submission-review.entity'; +import { ApplicationSubmission } from '../../application-submission/application-submission.entity'; import { InboxRequestDto } from '../inbox.dto'; import { InboxApplicationSubmissionView } from './inbox-application-view.entity'; import { InboxApplicationService } from './inbox-application.service'; @@ -11,9 +16,16 @@ describe('InboxApplicationService', () => { let mockApplicationSubmissionSearchViewRepository: DeepMocked< Repository >; + let mockApplicationRepository: DeepMocked>; + let mockApplicationSubmissionRepository: DeepMocked< + Repository + >; + let mockRedisService: DeepMocked; + let mockApplicationReviewRepository: DeepMocked< + Repository + >; const mockSearchRequestDto: InboxRequestDto = { - fileNumber: '123', portalStatusCodes: ['A'], name: 'D', pid: 'E', @@ -27,20 +39,17 @@ describe('InboxApplicationService', () => { beforeEach(async () => { mockApplicationSubmissionSearchViewRepository = createMock(); + mockApplicationRepository = createMock(); + mockApplicationSubmissionRepository = createMock(); + mockRedisService = createMock(); + mockApplicationReviewRepository = createMock(); + + mockQuery = createMockQuery(); - mockQuery = { - getManyAndCount: jest.fn().mockResolvedValue([[], 0]), - orderBy: jest.fn().mockReturnThis(), - offset: jest.fn().mockReturnThis(), - limit: jest.fn().mockReturnThis(), - innerJoinAndMapOne: jest.fn().mockReturnThis(), - groupBy: jest.fn().mockReturnThis(), - where: jest.fn().mockReturnThis(), - andWhere: jest.fn().mockReturnThis(), - setParameters: jest.fn().mockReturnThis(), - leftJoin: jest.fn().mockReturnThis(), - withDeleted: jest.fn().mockReturnThis(), - }; + mockRedisService.getClient.mockReturnValue({ + get: async () => null, + setEx: async () => null, + } as any); const module: TestingModule = await Test.createTestingModule({ providers: [ @@ -49,6 +58,22 @@ describe('InboxApplicationService', () => { provide: getRepositoryToken(InboxApplicationSubmissionView), useValue: mockApplicationSubmissionSearchViewRepository, }, + { + provide: getRepositoryToken(Application), + useValue: mockApplicationRepository, + }, + { + provide: getRepositoryToken(ApplicationSubmission), + useValue: mockApplicationSubmissionRepository, + }, + { + provide: getRepositoryToken(ApplicationSubmissionReview), + useValue: mockApplicationReviewRepository, + }, + { + provide: RedisService, + useValue: mockRedisService, + }, ], }).compile(); @@ -60,8 +85,9 @@ describe('InboxApplicationService', () => { }); it('should successfully build a query using all search parameters defined', async () => { - mockApplicationSubmissionSearchViewRepository.createQueryBuilder.mockReturnValue( - mockQuery as any, + mockApplicationRepository.createQueryBuilder.mockReturnValue(mockQuery); + mockApplicationSubmissionRepository.createQueryBuilder.mockReturnValue( + mockQuery, ); const result = await service.searchApplications( @@ -72,16 +98,26 @@ describe('InboxApplicationService', () => { ); expect(result).toEqual({ data: [], total: 0 }); + expect(mockApplicationRepository.createQueryBuilder).toHaveBeenCalledTimes( + 1, + ); expect( - mockApplicationSubmissionSearchViewRepository.createQueryBuilder, - ).toBeCalledTimes(1); - expect(mockQuery.andWhere).toBeCalledTimes(7); + mockApplicationSubmissionRepository.createQueryBuilder, + ).toHaveBeenCalledTimes(3); + expect(mockQuery.andWhere).toHaveBeenCalledTimes(3); }); - it('should call compileApplicationSearchQuery method correctly', async () => { - const compileApplicationSearchQuerySpy = jest - .spyOn(service as any, 'compileApplicationSearchQuery') - .mockResolvedValue(mockQuery); + it('should call searchForFileNumbers method correctly', async () => { + mockApplicationSubmissionSearchViewRepository.createQueryBuilder.mockReturnValue( + mockQuery, + ); + + const searchForFileNumbersSpy = jest + .spyOn(service as any, 'searchForFileNumbers') + .mockResolvedValue({ + didSearch: true, + finalResult: new Set(['100000']), + }); const result = await service.searchApplications( mockSearchRequestDto, @@ -91,14 +127,12 @@ describe('InboxApplicationService', () => { ); expect(result).toEqual({ data: [], total: 0 }); - expect(compileApplicationSearchQuerySpy).toBeCalledWith( - mockSearchRequestDto, - '', - '', - '', - ); + expect(searchForFileNumbersSpy).toHaveBeenCalledWith(mockSearchRequestDto); expect(mockQuery.orderBy).toHaveBeenCalledTimes(1); expect(mockQuery.offset).toHaveBeenCalledTimes(1); expect(mockQuery.limit).toHaveBeenCalledTimes(1); + expect( + mockApplicationSubmissionSearchViewRepository.createQueryBuilder, + ).toHaveBeenCalledTimes(1); }); }); diff --git a/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts b/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts index b5bc0026b8..297d141c6d 100644 --- a/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts +++ b/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts @@ -2,16 +2,12 @@ import { RedisService } from '@app/common/redis/redis.service'; import { Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import * as hash from 'object-hash'; -import { Brackets, Repository } from 'typeorm'; -import { ApplicationDecisionComponent } from '../../../alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity'; -import { ApplicationDecision } from '../../../alcs/application-decision/application-decision.entity'; +import { Repository } from 'typeorm'; import { Application } from '../../../alcs/application/application.entity'; import { SEARCH_CACHE_TIME } from '../../../alcs/search/search.config'; -import { formatStringToPostgresSearchStringArrayWithWildCard } from '../../../utils/search-helper'; -import { intersectSets } from '../../../utils/set-helper'; +import { APP_SEARCH_FILTERS } from '../../../utils/search/application-search-filters'; +import { processSearchPromises } from '../../../utils/search/search-intersection'; import { ApplicationSubmissionReview } from '../../application-submission-review/application-submission-review.entity'; -import { ApplicationOwner } from '../../application-submission/application-owner/application-owner.entity'; -import { ApplicationParcel } from '../../application-submission/application-parcel/application-parcel.entity'; import { ApplicationSubmission } from '../../application-submission/application-submission.entity'; import { AdvancedSearchResultDto, InboxRequestDto } from '../inbox.dto'; import { InboxApplicationSubmissionView } from './inbox-application-view.entity'; @@ -127,14 +123,13 @@ export class InboxApplicationService { const promises: Promise<{ fileNumber: string }[]>[] = []; let didSearch = false; - if (searchDto.fileNumber) { - didSearch = true; - this.addFileNumberResults(searchDto, promises); - } - if (searchDto.portalStatusCodes && searchDto.portalStatusCodes.length > 0) { didSearch = true; - this.addPortalStatusResults(searchDto, promises); + const promise = APP_SEARCH_FILTERS.addPortalStatusResults( + searchDto, + this.applicationSubmissionRepository, + ); + promises.push(promise); } if (searchDto.governmentFileNumber) { @@ -144,34 +139,33 @@ export class InboxApplicationService { if (searchDto.name) { didSearch = true; - this.addNameResults(searchDto, promises); + const promise = APP_SEARCH_FILTERS.addNameResults( + searchDto, + this.applicationSubmissionRepository, + ); + promises.push(promise); } if (searchDto.pid || searchDto.civicAddress) { didSearch = true; - this.addParcelResults(searchDto, promises); + const promise = APP_SEARCH_FILTERS.addParcelResults( + searchDto, + this.applicationSubmissionRepository, + ); + promises.push(promise); } if (searchDto.fileTypes.length > 0) { didSearch = true; - this.addFileTypeResults(searchDto, promises); + const promise = APP_SEARCH_FILTERS.addFileTypeResults( + searchDto, + this.applicationRepository, + ); + promises.push(promise); } - //Intersect Sets const t0 = performance.now(); - const queryResults = await Promise.all(promises); - - const allIds: Set[] = []; - for (const result of queryResults) { - const fileNumbers = new Set(); - result.forEach((currentValue) => { - fileNumbers.add(currentValue.fileNumber); - }); - allIds.push(fileNumbers); - } - - const finalResult = intersectSets(allIds); - + const finalResult = await processSearchPromises(promises); const t1 = performance.now(); this.logger.debug( `Inbox Application pre-search search took ${t1 - t0} milliseconds.`, @@ -179,38 +173,6 @@ export class InboxApplicationService { return { didSearch, finalResult }; } - private addFileNumberResults( - searchDto: InboxRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - const promise = this.applicationRepository.find({ - where: { - fileNumber: searchDto.fileNumber, - }, - select: { - fileNumber: true, - }, - }); - promises.push(promise); - } - - private addPortalStatusResults( - searchDto: InboxRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - const promise = this.applicationSubmissionRepository - .createQueryBuilder('appSubs') - .select('appSubs.fileNumber') - .where( - "alcs.get_current_status_for_application_submission_by_uuid(appSubs.uuid) ->> 'status_type_code' IN (:...statusCodes)", - { - statusCodes: searchDto.portalStatusCodes, - }, - ) - .getMany(); - promises.push(promise); - } - private addGovernmentFileNumberResults( searchDto: InboxRequestDto, promises: Promise<{ fileNumber: string }[]>[], @@ -231,101 +193,4 @@ export class InboxApplicationService { }); promises.push(promise); } - - private addNameResults( - searchDto: InboxRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - const formattedSearchString = - formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); - const promise = this.applicationSubmissionRepository - .createQueryBuilder('appSub') - .select('appSub.fileNumber') - .leftJoin( - ApplicationOwner, - 'application_owner', - 'application_owner.application_submission_uuid = appSub.uuid', - ) - .andWhere( - new Brackets((qb) => - qb - .where( - "LOWER(application_owner.first_name || ' ' || application_owner.last_name) LIKE ANY (:names)", - { - names: formattedSearchString, - }, - ) - .orWhere('LOWER(application_owner.first_name) LIKE ANY (:names)', { - names: formattedSearchString, - }) - .orWhere('LOWER(application_owner.last_name) LIKE ANY (:names)', { - names: formattedSearchString, - }) - .orWhere( - 'LOWER(application_owner.organization_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ), - ), - ) - .getMany(); - promises.push(promise); - } - - private addParcelResults( - searchDto: InboxRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - const query = this.applicationSubmissionRepository - .createQueryBuilder('appSub') - .select('appSub.fileNumber') - .leftJoin( - ApplicationParcel, - 'parcel', - 'parcel.application_submission_uuid = appSub.uuid', - ); - - if (searchDto.pid) { - query.andWhere('parcel.pid = :pid', { pid: searchDto.pid }); - } - - if (searchDto.civicAddress) { - query.andWhere('LOWER(parcel.civic_address) like LOWER(:civic_address)', { - civic_address: `%${searchDto.civicAddress}%`.toLowerCase(), - }); - } - - promises.push(query.getMany()); - } - - private addFileTypeResults( - searchDto: InboxRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - const query = this.applicationRepository - .createQueryBuilder('app') - .select('app.fileNumber') - .leftJoin( - ApplicationDecision, - 'decision', - 'decision.application_uuid = "app"."uuid" AND decision.is_draft = FALSE', - ) - .leftJoin( - ApplicationDecisionComponent, - 'decisionComponent', - 'decisionComponent.application_decision_uuid = decision.uuid', - ) - .where('app.type_code IN (:...typeCodes)', { - typeCodes: searchDto.fileTypes, - }) - .orWhere( - 'decisionComponent.application_decision_component_type_code IN (:...typeCodes)', - { - typeCodes: searchDto.fileTypes, - }, - ); - - promises.push(query.getMany()); - } } diff --git a/services/apps/alcs/src/portal/inbox/inbox.dto.ts b/services/apps/alcs/src/portal/inbox/inbox.dto.ts index 78c8ac6b95..4450e8e521 100644 --- a/services/apps/alcs/src/portal/inbox/inbox.dto.ts +++ b/services/apps/alcs/src/portal/inbox/inbox.dto.ts @@ -5,7 +5,6 @@ import { IsString, MinLength, } from 'class-validator'; -import { PagingRequestDto } from '../public/search/public-search.dto'; export type SearchEntityClass = 'APP' | 'NOI' | 'NOTI'; @@ -22,7 +21,9 @@ export class BaseInboxResultDto { } export class ApplicationInboxResultDto extends BaseInboxResultDto {} + export class NoticeOfIntentInboxResultDto extends BaseInboxResultDto {} + export class NotificationInboxResultDto extends BaseInboxResultDto {} export class InboxResponseDto { @@ -46,10 +47,6 @@ export class InboxRequestDto { @IsNumber() pageSize: number; - @IsString() - @IsOptional() - fileNumber?: string; - @IsString() @IsOptional() filterBy?: string; diff --git a/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.spec.ts b/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.spec.ts index 8f564f6d70..cb01149c85 100644 --- a/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.spec.ts +++ b/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.spec.ts @@ -1,7 +1,11 @@ +import { RedisService } from '@app/common/redis/redis.service'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; +import { createMockQuery } from '../../../../test/mocks/mockTypes'; +import { NoticeOfIntent } from '../../../alcs/notice-of-intent/notice-of-intent.entity'; +import { NoticeOfIntentSubmission } from '../../notice-of-intent-submission/notice-of-intent-submission.entity'; import { InboxRequestDto } from '../inbox.dto'; import { InboxNoticeOfIntentSubmissionView } from './inbox-notice-of-intent-view.entity'; import { InboxNoticeOfIntentService } from './inbox-notice-of-intent.service'; @@ -11,15 +15,17 @@ describe('InboxNoticeOfIntentService', () => { let mockNoticeOfIntentSubmissionSearchViewRepository: DeepMocked< Repository >; + let mockNOIRepository: DeepMocked>; + let mockNOISubRepository: DeepMocked>; + let mockRedisService: DeepMocked; const mockSearchDto: InboxRequestDto = { - fileNumber: '123', portalStatusCodes: ['A'], governmentFileNumber: 'B', name: 'D', pid: 'E', civicAddress: 'F', - fileTypes: ['type1', 'type2'], + fileTypes: ['NOI'], page: 1, pageSize: 10, }; @@ -28,20 +34,16 @@ describe('InboxNoticeOfIntentService', () => { beforeEach(async () => { mockNoticeOfIntentSubmissionSearchViewRepository = createMock(); + mockNOIRepository = createMock(); + mockNOISubRepository = createMock(); + mockRedisService = createMock(); - mockQuery = { - getManyAndCount: jest.fn().mockResolvedValue([[], 0]), - orderBy: jest.fn().mockReturnThis(), - offset: jest.fn().mockReturnThis(), - limit: jest.fn().mockReturnThis(), - innerJoinAndMapOne: jest.fn().mockReturnThis(), - groupBy: jest.fn().mockReturnThis(), - where: jest.fn().mockReturnThis(), - andWhere: jest.fn().mockReturnThis(), - setParameters: jest.fn().mockReturnThis(), - leftJoin: jest.fn().mockReturnThis(), - withDeleted: jest.fn().mockReturnThis(), - }; + mockQuery = createMockQuery(); + + mockRedisService.getClient.mockReturnValue({ + get: async () => null, + setEx: async () => null, + } as any); const module: TestingModule = await Test.createTestingModule({ providers: [ @@ -50,6 +52,18 @@ describe('InboxNoticeOfIntentService', () => { provide: getRepositoryToken(InboxNoticeOfIntentSubmissionView), useValue: mockNoticeOfIntentSubmissionSearchViewRepository, }, + { + provide: getRepositoryToken(NoticeOfIntent), + useValue: mockNOIRepository, + }, + { + provide: getRepositoryToken(NoticeOfIntentSubmission), + useValue: mockNOISubRepository, + }, + { + provide: RedisService, + useValue: mockRedisService, + }, ], }).compile(); @@ -63,9 +77,8 @@ describe('InboxNoticeOfIntentService', () => { }); it('should successfully build a query using all search parameters defined', async () => { - mockNoticeOfIntentSubmissionSearchViewRepository.createQueryBuilder.mockReturnValue( - mockQuery as any, - ); + mockNOIRepository.find.mockResolvedValue([]); + mockNOISubRepository.createQueryBuilder.mockReturnValue(mockQuery); const result = await service.searchNoticeOfIntents( mockSearchDto, @@ -75,16 +88,22 @@ describe('InboxNoticeOfIntentService', () => { ); expect(result).toEqual({ data: [], total: 0 }); - expect( - mockNoticeOfIntentSubmissionSearchViewRepository.createQueryBuilder, - ).toBeCalledTimes(1); - expect(mockQuery.andWhere).toBeCalledTimes(6); + expect(mockNOIRepository.find).toHaveBeenCalledTimes(1); + expect(mockNOISubRepository.createQueryBuilder).toHaveBeenCalledTimes(3); + expect(mockQuery.andWhere).toHaveBeenCalledTimes(3); }); - it('should call compileNoticeOfIntentSearchQuery method correctly', async () => { + it('should call searchForFileNumbers method correctly', async () => { + mockNoticeOfIntentSubmissionSearchViewRepository.createQueryBuilder.mockReturnValue( + mockQuery, + ); + const compileApplicationSearchQuerySpy = jest - .spyOn(service as any, 'compileNoticeOfIntentSearchQuery') - .mockResolvedValue(mockQuery); + .spyOn(service as any, 'searchForFileNumbers') + .mockResolvedValue({ + didSearch: true, + finalResult: new Set(['100000']), + }); const result = await service.searchNoticeOfIntents( mockSearchDto, @@ -94,11 +113,8 @@ describe('InboxNoticeOfIntentService', () => { ); expect(result).toEqual({ data: [], total: 0 }); - expect(compileApplicationSearchQuerySpy).toBeCalledWith( + expect(compileApplicationSearchQuerySpy).toHaveBeenCalledWith( mockSearchDto, - '', - '', - '', ); expect(mockQuery.orderBy).toHaveBeenCalledTimes(1); expect(mockQuery.offset).toHaveBeenCalledTimes(1); diff --git a/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.ts b/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.ts index 61ad225977..0c0b21227d 100644 --- a/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.ts +++ b/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.ts @@ -2,13 +2,11 @@ import { RedisService } from '@app/common/redis/redis.service'; import { Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import * as hash from 'object-hash'; -import { Brackets, Repository } from 'typeorm'; +import { Repository } from 'typeorm'; import { NoticeOfIntent } from '../../../alcs/notice-of-intent/notice-of-intent.entity'; import { SEARCH_CACHE_TIME } from '../../../alcs/search/search.config'; -import { formatStringToPostgresSearchStringArrayWithWildCard } from '../../../utils/search-helper'; -import { intersectSets } from '../../../utils/set-helper'; -import { NoticeOfIntentOwner } from '../../notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity'; -import { NoticeOfIntentParcel } from '../../notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity'; +import { NOI_SEARCH_FILTERS } from '../../../utils/search/notice-of-intent-search-filters'; +import { processSearchPromises } from '../../../utils/search/search-intersection'; import { NoticeOfIntentSubmission } from '../../notice-of-intent-submission/notice-of-intent-submission.entity'; import { AdvancedSearchResultDto, InboxRequestDto } from '../inbox.dto'; import { InboxNoticeOfIntentSubmissionView } from './inbox-notice-of-intent-view.entity'; @@ -121,173 +119,48 @@ export class InboxNoticeOfIntentService { const promises: Promise<{ fileNumber: string }[]>[] = []; let didSearch = false; - if (searchDto.fileNumber) { - didSearch = true; - this.addFileNumberResults(searchDto, promises); - } - if (searchDto.portalStatusCodes && searchDto.portalStatusCodes.length > 0) { didSearch = true; - this.addPortalStatusResults(searchDto, promises); + const promise = NOI_SEARCH_FILTERS.addPortalStatusResults( + searchDto, + this.noiSubmissionRepository, + ); + promises.push(promise); } if (searchDto.name) { didSearch = true; - this.addNameResults(searchDto, promises); + const promise = NOI_SEARCH_FILTERS.addNameResults( + searchDto, + this.noiSubmissionRepository, + ); + promises.push(promise); } if (searchDto.pid || searchDto.civicAddress) { didSearch = true; - this.addParcelResults(searchDto, promises); + const promise = NOI_SEARCH_FILTERS.addParcelResults( + searchDto, + this.noiSubmissionRepository, + ); + promises.push(promise); } - if (searchDto.fileTypes.length > 0) { + if (searchDto.fileTypes.includes('NOI')) { didSearch = true; - this.addFileTypeResults(searchDto, promises); + const promise = NOI_SEARCH_FILTERS.addFileTypeResults( + searchDto, + this.noiRepository, + ); + promises.push(promise); } - //Intersect Sets const t0 = performance.now(); - const queryResults = await Promise.all(promises); - - const allIds: Set[] = []; - for (const result of queryResults) { - const fileNumbers = new Set(); - result.forEach((currentValue) => { - fileNumbers.add(currentValue.fileNumber); - }); - allIds.push(fileNumbers); - } - - const finalResult = intersectSets(allIds); - + const finalResult = await processSearchPromises(promises); const t1 = performance.now(); this.logger.debug( `Inbox NOI pre-search search took ${t1 - t0} milliseconds.`, ); return { didSearch, finalResult }; } - - private addFileNumberResults( - searchDto: InboxRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - const promise = this.noiRepository.find({ - where: { - fileNumber: searchDto.fileNumber, - }, - select: { - fileNumber: true, - }, - }); - promises.push(promise); - } - - private addPortalStatusResults( - searchDto: InboxRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - const promise = this.noiSubmissionRepository - .createQueryBuilder('noiSubs') - .select('noiSubs.fileNumber') - .where( - "alcs.get_current_status_for_notice_of_intent_submission_by_uuid(noiSubs.uuid) ->> 'status_type_code' IN(:...statusCodes)", - { - statusCodes: searchDto.portalStatusCodes, - }, - ) - .getMany(); - promises.push(promise); - } - - private addNameResults( - searchDto: InboxRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - const formattedSearchString = - formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); - const promise = this.noiSubmissionRepository - .createQueryBuilder('noiSub') - .select('noiSub.fileNumber') - .leftJoin( - NoticeOfIntentOwner, - 'notice_of_intent_owner', - 'notice_of_intent_owner.notice_of_intent_submission_uuid = noiSub.uuid', - ) - .andWhere( - new Brackets((qb) => - qb - .where( - "LOWER(notice_of_intent_owner.first_name || ' ' || notice_of_intent_owner.last_name) LIKE ANY (:names)", - { - names: formattedSearchString, - }, - ) - .orWhere( - 'LOWER(notice_of_intent_owner.first_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ) - .orWhere( - 'LOWER(notice_of_intent_owner.last_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ) - .orWhere( - 'LOWER(notice_of_intent_owner.organization_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ), - ), - ) - .getMany(); - promises.push(promise); - } - - private addParcelResults( - searchDto: InboxRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - let query = this.noiSubmissionRepository - .createQueryBuilder('noiSub') - .select('noiSub.fileNumber') - .leftJoin( - NoticeOfIntentParcel, - 'parcel', - 'parcel.notice_of_intent_submission_uuid = noiSub.uuid', - ); - - if (searchDto.pid) { - query = query.andWhere('parcel.pid = :pid', { pid: searchDto.pid }); - } - - if (searchDto.civicAddress) { - query = query.andWhere( - 'LOWER(parcel.civic_address) like LOWER(:civic_address)', - { - civic_address: `%${searchDto.civicAddress}%`.toLowerCase(), - }, - ); - } - - promises.push(query.getMany()); - } - - private addFileTypeResults( - searchDto: InboxRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - if (searchDto.fileTypes.includes('NOI')) { - const query = this.noiRepository.find({ - select: { - fileNumber: true, - }, - }); - - promises.push(query); - } - } } diff --git a/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.spec.ts b/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.spec.ts index 1c97045f7d..4509bb385c 100644 --- a/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.spec.ts +++ b/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.spec.ts @@ -1,25 +1,33 @@ +import { RedisService } from '@app/common/redis/redis.service'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; +import { createMockQuery } from '../../../../test/mocks/mockTypes'; +import { Notification } from '../../../alcs/notification/notification.entity'; +import { NotificationSubmission } from '../../notification-submission/notification-submission.entity'; import { InboxRequestDto } from '../inbox.dto'; -import { InboxNotificationService } from './inbox-notification.service'; import { InboxNotificationSubmissionView } from './inbox-notification-view.entity'; +import { InboxNotificationService } from './inbox-notification.service'; describe('InboxNotificationService', () => { let service: InboxNotificationService; let mockNotificationSubmissionSearchViewRepository: DeepMocked< Repository >; + let mockNotificationRepository: DeepMocked>; + let mockNotificationSubmissionRepository: DeepMocked< + Repository + >; + let mockRedisService: DeepMocked; const mockSearchDto: InboxRequestDto = { - fileNumber: '123', portalStatusCodes: ['A'], governmentFileNumber: 'B', name: 'D', pid: 'E', civicAddress: 'F', - fileTypes: ['type1', 'type2'], + fileTypes: ['SRW'], page: 1, pageSize: 10, }; @@ -28,20 +36,16 @@ describe('InboxNotificationService', () => { beforeEach(async () => { mockNotificationSubmissionSearchViewRepository = createMock(); + mockNotificationRepository = createMock(); + mockNotificationSubmissionRepository = createMock(); + mockRedisService = createMock(); - mockQuery = { - getManyAndCount: jest.fn().mockResolvedValue([[], 0]), - orderBy: jest.fn().mockReturnThis(), - offset: jest.fn().mockReturnThis(), - limit: jest.fn().mockReturnThis(), - innerJoinAndMapOne: jest.fn().mockReturnThis(), - groupBy: jest.fn().mockReturnThis(), - where: jest.fn().mockReturnThis(), - andWhere: jest.fn().mockReturnThis(), - setParameters: jest.fn().mockReturnThis(), - leftJoin: jest.fn().mockReturnThis(), - withDeleted: jest.fn().mockReturnThis(), - }; + mockQuery = createMockQuery(); + + mockRedisService.getClient.mockReturnValue({ + get: async () => null, + setEx: async () => null, + } as any); const module: TestingModule = await Test.createTestingModule({ providers: [ @@ -50,6 +54,18 @@ describe('InboxNotificationService', () => { provide: getRepositoryToken(InboxNotificationSubmissionView), useValue: mockNotificationSubmissionSearchViewRepository, }, + { + provide: getRepositoryToken(Notification), + useValue: mockNotificationRepository, + }, + { + provide: getRepositoryToken(NotificationSubmission), + useValue: mockNotificationSubmissionRepository, + }, + { + provide: RedisService, + useValue: mockRedisService, + }, ], }).compile(); @@ -61,30 +77,42 @@ describe('InboxNotificationService', () => { }); it('should successfully build a query using all search parameters defined', async () => { - mockNotificationSubmissionSearchViewRepository.createQueryBuilder.mockReturnValue( - mockQuery as any, + mockNotificationRepository.find.mockResolvedValue([]); + mockNotificationSubmissionRepository.createQueryBuilder.mockReturnValue( + mockQuery, ); const result = await service.search(mockSearchDto, '', '', ''); expect(result).toEqual({ data: [], total: 0 }); + expect(mockNotificationRepository.find).toHaveBeenCalledTimes(1); expect( - mockNotificationSubmissionSearchViewRepository.createQueryBuilder, - ).toBeCalledTimes(1); - expect(mockQuery.andWhere).toBeCalledTimes(6); + mockNotificationSubmissionRepository.createQueryBuilder, + ).toHaveBeenCalledTimes(3); + expect(mockQuery.andWhere).toHaveBeenCalledTimes(3); }); - it('should call compileNotificationSearchQuery method correctly', async () => { - const compileSearchQuerySpy = jest - .spyOn(service as any, 'compileNotificationSearchQuery') - .mockResolvedValue(mockQuery); + it('should call searchForFileNumbers method correctly', async () => { + mockNotificationSubmissionSearchViewRepository.createQueryBuilder.mockReturnValue( + mockQuery, + ); + + const searchForFileNumbersSpy = jest + .spyOn(service as any, 'searchForFileNumbers') + .mockResolvedValue({ + didSearch: true, + finalResult: new Set(['100000']), + }); const result = await service.search(mockSearchDto, '', '', ''); expect(result).toEqual({ data: [], total: 0 }); - expect(compileSearchQuerySpy).toBeCalledWith(mockSearchDto, '', '', ''); + expect(searchForFileNumbersSpy).toHaveBeenCalledWith(mockSearchDto); expect(mockQuery.orderBy).toHaveBeenCalledTimes(1); expect(mockQuery.offset).toHaveBeenCalledTimes(1); expect(mockQuery.limit).toHaveBeenCalledTimes(1); + expect( + mockNotificationSubmissionSearchViewRepository.createQueryBuilder, + ).toHaveBeenCalledTimes(1); }); }); diff --git a/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts b/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts index d6e91132fd..16b8a64e0e 100644 --- a/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts +++ b/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts @@ -2,14 +2,12 @@ import { RedisService } from '@app/common/redis/redis.service'; import { Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import * as hash from 'object-hash'; -import { Brackets, Repository } from 'typeorm'; +import { Repository } from 'typeorm'; import { Notification } from '../../../alcs/notification/notification.entity'; import { SEARCH_CACHE_TIME } from '../../../alcs/search/search.config'; -import { formatStringToPostgresSearchStringArrayWithWildCard } from '../../../utils/search-helper'; -import { intersectSets } from '../../../utils/set-helper'; -import { NotificationParcel } from '../../notification-submission/notification-parcel/notification-parcel.entity'; +import { NOTIFICATION_SEARCH_FILTERS } from '../../../utils/search/notification-search-filters'; +import { processSearchPromises } from '../../../utils/search/search-intersection'; import { NotificationSubmission } from '../../notification-submission/notification-submission.entity'; -import { NotificationTransferee } from '../../notification-submission/notification-transferee/notification-transferee.entity'; import { AdvancedSearchResultDto, InboxRequestDto } from '../inbox.dto'; import { InboxNotificationSubmissionView } from './inbox-notification-view.entity'; @@ -125,172 +123,47 @@ export class InboxNotificationService { const promises: Promise<{ fileNumber: string }[]>[] = []; let didSearch = false; - if (searchDto.fileNumber) { - didSearch = true; - this.addFileNumberResults(searchDto, promises); - } - if (searchDto.portalStatusCodes && searchDto.portalStatusCodes.length > 0) { didSearch = true; - this.addPortalStatusResults(searchDto, promises); + const promise = NOTIFICATION_SEARCH_FILTERS.addPortalStatusResults( + searchDto, + this.notificationSubRepository, + ); + promises.push(promise); } if (searchDto.name) { didSearch = true; - this.addNameResults(searchDto, promises); + const promise = NOTIFICATION_SEARCH_FILTERS.addNameResults( + searchDto, + this.notificationSubRepository, + ); + promises.push(promise); } if (searchDto.pid || searchDto.civicAddress) { didSearch = true; - this.addParcelResults(searchDto, promises); + const promise = NOTIFICATION_SEARCH_FILTERS.addParcelResults( + searchDto, + this.notificationSubRepository, + ); + promises.push(promise); } - if (searchDto.fileTypes.length > 0) { - didSearch = true; - this.addFileTypeResults(searchDto, promises); + if (searchDto.fileTypes.includes('SRW')) { + const promise = NOTIFICATION_SEARCH_FILTERS.addFileTypeResults( + searchDto, + this.notificationRepository, + ); + promises.push(promise); } - //Intersect Sets const t0 = performance.now(); - const queryResults = await Promise.all(promises); - - const allIds: Set[] = []; - for (const result of queryResults) { - const fileNumbers = new Set(); - result.forEach((currentValue) => { - fileNumbers.add(currentValue.fileNumber); - }); - allIds.push(fileNumbers); - } - - const finalResult = intersectSets(allIds); - + const finalResult = await processSearchPromises(promises); const t1 = performance.now(); this.logger.debug( `Inbox Notification pre-search search took ${t1 - t0} milliseconds.`, ); return { didSearch, finalResult }; } - - private addFileNumberResults( - searchDto: InboxRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - const promise = this.notificationRepository.find({ - where: { - fileNumber: searchDto.fileNumber, - }, - select: { - fileNumber: true, - }, - }); - promises.push(promise); - } - - private addPortalStatusResults( - searchDto: InboxRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - const promise = this.notificationSubRepository - .createQueryBuilder('notiSub') - .select('notiSub.fileNumber') - .where( - "alcs.get_current_status_for_notification_submission_by_uuid(notiSub.uuid) ->> 'status_type_code' IN(:...statusCodes)", - { - statusCodes: searchDto.portalStatusCodes, - }, - ) - .getMany(); - promises.push(promise); - } - - private addNameResults( - searchDto: InboxRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - const formattedSearchString = - formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); - const promise = this.notificationSubRepository - .createQueryBuilder('notiSub') - .select('notiSub.fileNumber') - .leftJoin( - NotificationTransferee, - 'notification_transferee', - 'notification_transferee.notification_submission_uuid = notiSub.uuid', - ) - .andWhere( - new Brackets((qb) => - qb - .where( - "LOWER(notification_transferee.first_name || ' ' || notification_transferee.last_name) LIKE ANY (:names)", - { - names: formattedSearchString, - }, - ) - .orWhere( - 'LOWER(notification_transferee.first_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ) - .orWhere( - 'LOWER(notification_transferee.last_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ) - .orWhere( - 'LOWER(notification_transferee.organization_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ), - ), - ) - .getMany(); - promises.push(promise); - } - - private addParcelResults( - searchDto: InboxRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - let query = this.notificationSubRepository - .createQueryBuilder('notiSub') - .select('notiSub.fileNumber') - .leftJoin( - NotificationParcel, - 'parcel', - 'parcel.notification_submission_uuid = notiSub.uuid', - ); - - if (searchDto.pid) { - query = query.andWhere('parcel.pid = :pid', { pid: searchDto.pid }); - } - - if (searchDto.civicAddress) { - query = query.andWhere( - 'LOWER(parcel.civic_address) like LOWER(:civic_address)', - { - civic_address: `%${searchDto.civicAddress}%`.toLowerCase(), - }, - ); - } - - promises.push(query.getMany()); - } - - private addFileTypeResults( - searchDto: InboxRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - if (searchDto.fileTypes.includes('SRW')) { - const query = this.notificationRepository.find({ - select: { - fileNumber: true, - }, - }); - promises.push(query); - } - } } diff --git a/services/apps/alcs/src/portal/public/search/application/public-application-search.service.spec.ts b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.spec.ts index 627898ed5b..4e337cf818 100644 --- a/services/apps/alcs/src/portal/public/search/application/public-application-search.service.spec.ts +++ b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.spec.ts @@ -116,7 +116,7 @@ describe('PublicApplicationSearchService', () => { expect(mockQuery.orWhere).toHaveBeenCalledTimes(1); }); - it('should call compileApplicationSearchQuery method correctly', async () => { + it('should call searchForFileNumbers method correctly', async () => { const searchForFileNumbers = jest .spyOn(service as any, 'searchForFileNumbers') .mockResolvedValue(new Set('100000')); diff --git a/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts index 396fe7f945..bf06d65287 100644 --- a/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts +++ b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts @@ -2,15 +2,12 @@ import { RedisService } from '@app/common/redis/redis.service'; import { Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import * as hash from 'object-hash'; -import { Brackets, In, Repository } from 'typeorm'; -import { ApplicationDecisionComponent } from '../../../../alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity'; +import { In, Repository } from 'typeorm'; import { ApplicationDecision } from '../../../../alcs/application-decision/application-decision.entity'; import { Application } from '../../../../alcs/application/application.entity'; import { LocalGovernment } from '../../../../alcs/local-government/local-government.entity'; -import { formatStringToPostgresSearchStringArrayWithWildCard } from '../../../../utils/search-helper'; -import { intersectSets } from '../../../../utils/set-helper'; -import { ApplicationOwner } from '../../../application-submission/application-owner/application-owner.entity'; -import { ApplicationParcel } from '../../../application-submission/application-parcel/application-parcel.entity'; +import { APP_SEARCH_FILTERS } from '../../../../utils/search/application-search-filters'; +import { processSearchPromises } from '../../../../utils/search/search-intersection'; import { ApplicationSubmission } from '../../../application-submission/application-submission.entity'; import { AdvancedSearchResultDto, @@ -116,15 +113,28 @@ export class PublicApplicationSearchService { const promises: Promise<{ fileNumber: string }[]>[] = []; if (searchDto.fileNumber) { - this.addFileNumberResults(searchDto, promises); + const promise = APP_SEARCH_FILTERS.addFileNumberResults( + searchDto, + this.applicationRepository, + ); + promises.push(promise); } if (searchDto.portalStatusCodes && searchDto.portalStatusCodes.length > 0) { - this.addPortalStatusResults(searchDto, promises); + const promise = APP_SEARCH_FILTERS.addPortalStatusResults( + searchDto, + this.applicationSubmissionRepository, + ); + promises.push(promise); } if (searchDto.governmentName) { - await this.addGovernmentResults(searchDto, promises); + const promise = APP_SEARCH_FILTERS.addGovernmentResults( + searchDto, + this.applicationRepository, + this.governmentRepository, + ); + promises.push(promise); } if (searchDto.regionCodes && searchDto.regionCodes.length > 0) { @@ -132,11 +142,19 @@ export class PublicApplicationSearchService { } if (searchDto.name) { - this.addNameResults(searchDto, promises); + const promise = APP_SEARCH_FILTERS.addNameResults( + searchDto, + this.applicationSubmissionRepository, + ); + promises.push(promise); } if (searchDto.pid || searchDto.civicAddress) { - this.addParcelResults(searchDto, promises); + const promise = APP_SEARCH_FILTERS.addParcelResults( + searchDto, + this.applicationSubmissionRepository, + ); + promises.push(promise); } if ( @@ -152,24 +170,15 @@ export class PublicApplicationSearchService { } if (searchDto.fileTypes.length > 0) { - this.addFileTypeResults(searchDto, promises); + const promise = APP_SEARCH_FILTERS.addFileTypeResults( + searchDto, + this.applicationRepository, + ); + promises.push(promise); } - //Intersect Sets const t0 = performance.now(); - const queryResults = await Promise.all(promises); - - const allIds: Set[] = []; - for (const result of queryResults) { - const fileNumbers = new Set(); - result.forEach((currentValue) => { - fileNumbers.add(currentValue.fileNumber); - }); - allIds.push(fileNumbers); - } - - const finalResult = intersectSets(allIds); - + const finalResult = await processSearchPromises(promises); const t1 = performance.now(); this.logger.debug( `Public Application pre-search search took ${t1 - t0} milliseconds.`, @@ -177,36 +186,6 @@ export class PublicApplicationSearchService { return finalResult; } - private addFileNumberResults( - searchDto: SearchRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - const promise = this.applicationRepository.find({ - where: { - fileNumber: searchDto.fileNumber, - }, - select: { - fileNumber: true, - }, - }); - promises.push(promise); - } - - private addRegionResults( - searchDto: SearchRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - const promise = this.applicationRepository.find({ - where: { - regionCode: In(searchDto.regionCodes!), - }, - select: { - fileNumber: true, - }, - }); - promises.push(promise); - } - private addDecisionOutcomeResults( searchDto: SearchRequestDto, promises: Promise<{ fileNumber: string }[]>[], @@ -223,17 +202,13 @@ export class PublicApplicationSearchService { promises.push(promise); } - private async addGovernmentResults( + private addRegionResults( searchDto: SearchRequestDto, promises: Promise<{ fileNumber: string }[]>[], ) { - const government = await this.governmentRepository.findOneByOrFail({ - name: searchDto.governmentName, - }); - const promise = this.applicationRepository.find({ where: { - localGovernmentUuid: government.uuid, + regionCode: In(searchDto.regionCodes!), }, select: { fileNumber: true, @@ -242,64 +217,6 @@ export class PublicApplicationSearchService { promises.push(promise); } - private addPortalStatusResults( - searchDto: SearchRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - const promise = this.applicationSubmissionRepository - .createQueryBuilder('appSubs') - .select('appSubs.fileNumber') - .where( - "alcs.get_current_status_for_application_submission_by_uuid(appSubs.uuid) ->> 'status_type_code' IN(:...statusCodes)", - { - statusCodes: searchDto.portalStatusCodes, - }, - ) - .getMany(); - promises.push(promise); - } - - private addNameResults( - searchDto: SearchRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - const formattedSearchString = - formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); - const promise = this.applicationSubmissionRepository - .createQueryBuilder('appSub') - .select('appSub.fileNumber') - .leftJoin( - ApplicationOwner, - 'application_owner', - 'application_owner.application_submission_uuid = appSub.uuid', - ) - .andWhere( - new Brackets((qb) => - qb - .where( - "LOWER(application_owner.first_name || ' ' || application_owner.last_name) LIKE ANY (:names)", - { - names: formattedSearchString, - }, - ) - .orWhere('LOWER(application_owner.first_name) LIKE ANY (:names)', { - names: formattedSearchString, - }) - .orWhere('LOWER(application_owner.last_name) LIKE ANY (:names)', { - names: formattedSearchString, - }) - .orWhere( - 'LOWER(application_owner.organization_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ), - ), - ) - .getMany(); - promises.push(promise); - } - private addDecisionResults( searchDto: SearchRequestDto, promises: Promise<{ fileNumber: string }[]>[], @@ -335,63 +252,4 @@ export class PublicApplicationSearchService { } promises.push(query.getMany()); } - - private addParcelResults( - searchDto: SearchRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - let query = this.applicationSubmissionRepository - .createQueryBuilder('appSub') - .select('appSub.fileNumber') - .leftJoin( - ApplicationParcel, - 'parcel', - 'parcel.application_submission_uuid = appSub.uuid', - ); - - if (searchDto.pid) { - query = query.andWhere('parcel.pid = :pid', { pid: searchDto.pid }); - } - - if (searchDto.civicAddress) { - query = query.andWhere( - 'LOWER(parcel.civic_address) like LOWER(:civic_address)', - { - civic_address: `%${searchDto.civicAddress}%`.toLowerCase(), - }, - ); - } - - promises.push(query.getMany()); - } - - private addFileTypeResults( - searchDto: SearchRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - const query = this.applicationRepository - .createQueryBuilder('app') - .select('app.fileNumber') - .leftJoin( - ApplicationDecision, - 'decision', - 'decision.application_uuid = "app"."uuid" AND decision.is_draft = FALSE', - ) - .leftJoin( - ApplicationDecisionComponent, - 'decisionComponent', - 'decisionComponent.application_decision_uuid = decision.uuid', - ) - .where('app.type_code IN (:...typeCodes)', { - typeCodes: searchDto.fileTypes, - }) - .orWhere( - 'decisionComponent.application_decision_component_type_code IN (:...typeCodes)', - { - typeCodes: searchDto.fileTypes, - }, - ); - - promises.push(query.getMany()); - } } diff --git a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts index 5c13ac3af5..a20708afac 100644 --- a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts +++ b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts @@ -2,14 +2,12 @@ import { RedisService } from '@app/common/redis/redis.service'; import { Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import * as hash from 'object-hash'; -import { Brackets, In, Repository } from 'typeorm'; +import { In, Repository } from 'typeorm'; import { LocalGovernment } from '../../../../alcs/local-government/local-government.entity'; import { NoticeOfIntentDecision } from '../../../../alcs/notice-of-intent-decision/notice-of-intent-decision.entity'; import { NoticeOfIntent } from '../../../../alcs/notice-of-intent/notice-of-intent.entity'; -import { formatStringToPostgresSearchStringArrayWithWildCard } from '../../../../utils/search-helper'; -import { intersectSets } from '../../../../utils/set-helper'; -import { NoticeOfIntentOwner } from '../../../notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity'; -import { NoticeOfIntentParcel } from '../../../notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity'; +import { NOI_SEARCH_FILTERS } from '../../../../utils/search/notice-of-intent-search-filters'; +import { processSearchPromises } from '../../../../utils/search/search-intersection'; import { NoticeOfIntentSubmission } from '../../../notice-of-intent-submission/notice-of-intent-submission.entity'; import { AdvancedSearchResultDto, @@ -115,19 +113,36 @@ export class PublicNoticeOfIntentSearchService { const promises: Promise<{ fileNumber: string }[]>[] = []; if (searchDto.fileNumber) { - this.addFileNumberResults(searchDto, promises); + const promise = NOI_SEARCH_FILTERS.addFileNumberResults( + searchDto, + this.noiRepository, + ); + promises.push(promise); } - if (searchDto.fileTypes) { - this.addFileTypeResults(searchDto, promises); + if (searchDto.fileTypes.includes('NOI')) { + const promise = NOI_SEARCH_FILTERS.addFileTypeResults( + searchDto, + this.noiRepository, + ); + promises.push(promise); } if (searchDto.portalStatusCodes && searchDto.portalStatusCodes.length > 0) { - this.addPortalStatusResult(searchDto, promises); + const promise = NOI_SEARCH_FILTERS.addPortalStatusResults( + searchDto, + this.noiSubmissionRepository, + ); + promises.push(promise); } if (searchDto.governmentName) { - await this.addGovernmentResults(searchDto, promises); + const promise = NOI_SEARCH_FILTERS.addGovernmentResults( + searchDto, + this.noiRepository, + this.governmentRepository, + ); + promises.push(promise); } if (searchDto.decisionOutcome && searchDto.decisionOutcome.length > 0) { @@ -139,11 +154,19 @@ export class PublicNoticeOfIntentSearchService { } if (searchDto.name) { - this.addNameResults(searchDto, promises); + const promise = NOI_SEARCH_FILTERS.addNameResults( + searchDto, + this.noiSubmissionRepository, + ); + promises.push(promise); } if (searchDto.pid || searchDto.civicAddress) { - this.addParcelResults(searchDto, promises); + const promise = NOI_SEARCH_FILTERS.addParcelResults( + searchDto, + this.noiSubmissionRepository, + ); + promises.push(promise); } if ( @@ -154,21 +177,8 @@ export class PublicNoticeOfIntentSearchService { this.addDecisionResults(searchDto, promises); } - //Intersect Sets const t0 = performance.now(); - const queryResults = await Promise.all(promises); - - const allIds: Set[] = []; - for (const result of queryResults) { - const fileNumbers = new Set(); - result.forEach((currentValue) => { - fileNumbers.add(currentValue.fileNumber); - }); - allIds.push(fileNumbers); - } - - const finalResult = intersectSets(allIds); - + const finalResult = await processSearchPromises(promises); const t1 = performance.now(); this.logger.debug(`NOI pre-search search took ${t1 - t0} milliseconds.`); return finalResult; @@ -205,57 +215,6 @@ export class PublicNoticeOfIntentSearchService { promises.push(query.getMany()); } - private addFileNumberResults( - searchDto: SearchRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - const promise = this.noiRepository.find({ - where: { - fileNumber: searchDto.fileNumber, - }, - select: { - fileNumber: true, - }, - }); - promises.push(promise); - } - - private addPortalStatusResult( - searchDto: SearchRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - const promise = this.noiSubmissionRepository - .createQueryBuilder('noiSubs') - .select('noiSubs.fileNumber') - .where( - "alcs.get_current_status_for_notice_of_intent_submission_by_uuid(noiSubs.uuid) ->> 'status_type_code' IN(:...statusCodes)", - { - statusCodes: searchDto.portalStatusCodes, - }, - ) - .getMany(); - promises.push(promise); - } - - private async addGovernmentResults( - searchDto: SearchRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - const government = await this.governmentRepository.findOneByOrFail({ - name: searchDto.governmentName, - }); - - const promise = this.noiRepository.find({ - where: { - localGovernmentUuid: government.uuid, - }, - select: { - fileNumber: true, - }, - }); - promises.push(promise); - } - private addDecisionOutcomeResults( searchDto: SearchRequestDto, promises: Promise<{ fileNumber: string }[]>[], @@ -286,94 +245,4 @@ export class PublicNoticeOfIntentSearchService { }); promises.push(promise); } - - private addNameResults( - searchDto: SearchRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - const formattedSearchString = - formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); - const promise = this.noiSubmissionRepository - .createQueryBuilder('noiSub') - .select('noiSub.fileNumber') - .leftJoin( - NoticeOfIntentOwner, - 'notice_of_intent_owner', - 'notice_of_intent_owner.notice_of_intent_submission_uuid = noiSub.uuid', - ) - .andWhere( - new Brackets((qb) => - qb - .where( - "LOWER(notice_of_intent_owner.first_name || ' ' || notice_of_intent_owner.last_name) LIKE ANY (:names)", - { - names: formattedSearchString, - }, - ) - .orWhere( - 'LOWER(notice_of_intent_owner.first_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ) - .orWhere( - 'LOWER(notice_of_intent_owner.last_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ) - .orWhere( - 'LOWER(notice_of_intent_owner.organization_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ), - ), - ) - .getMany(); - promises.push(promise); - } - - private addParcelResults( - searchDto: SearchRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - let query = this.noiSubmissionRepository - .createQueryBuilder('noiSub') - .select('noiSub.fileNumber') - .leftJoin( - NoticeOfIntentParcel, - 'parcel', - 'parcel.notice_of_intent_submission_uuid = noiSub.uuid', - ); - - if (searchDto.pid) { - query = query.andWhere('parcel.pid = :pid', { pid: searchDto.pid }); - } - - if (searchDto.civicAddress) { - query = query.andWhere( - 'LOWER(parcel.civic_address) like LOWER(:civic_address)', - { - civic_address: `%${searchDto.civicAddress}%`.toLowerCase(), - }, - ); - } - - promises.push(query.getMany()); - } - - private addFileTypeResults( - searchDto: SearchRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - if (searchDto.fileTypes.includes('NOI')) { - const query = this.noiRepository.find({ - select: { - fileNumber: true, - }, - }); - promises.push(query); - } - } } diff --git a/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.spec.ts b/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.spec.ts index a9cbfcaea7..2d8b537aea 100644 --- a/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.spec.ts +++ b/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.spec.ts @@ -108,8 +108,8 @@ describe('PublicNotificationSearchService', () => { expect(mockNotificationRepository.find).toHaveBeenCalledTimes(3); expect( mockNotificationSubmissionRepository.createQueryBuilder, - ).toHaveBeenCalledTimes(4); - expect(mockQuery.andWhere).toHaveBeenCalledTimes(5); + ).toHaveBeenCalledTimes(3); + expect(mockQuery.andWhere).toHaveBeenCalledTimes(3); }); it('should call searchForFileNumbers method correctly', async () => { diff --git a/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.ts b/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.ts index a70ce98b44..abb4d5ed8a 100644 --- a/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.ts +++ b/services/apps/alcs/src/portal/public/search/notification/public-notification-search.service.ts @@ -2,14 +2,12 @@ import { RedisService } from '@app/common/redis/redis.service'; import { Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import * as hash from 'object-hash'; -import { Brackets, In, Repository } from 'typeorm'; +import { In, Repository } from 'typeorm'; import { LocalGovernment } from '../../../../alcs/local-government/local-government.entity'; import { Notification } from '../../../../alcs/notification/notification.entity'; -import { formatStringToPostgresSearchStringArrayWithWildCard } from '../../../../utils/search-helper'; -import { intersectSets } from '../../../../utils/set-helper'; -import { NotificationParcel } from '../../../notification-submission/notification-parcel/notification-parcel.entity'; +import { NOTIFICATION_SEARCH_FILTERS } from '../../../../utils/search/notification-search-filters'; +import { processSearchPromises } from '../../../../utils/search/search-intersection'; import { NotificationSubmission } from '../../../notification-submission/notification-submission.entity'; -import { NotificationTransferee } from '../../../notification-submission/notification-transferee/notification-transferee.entity'; import { AdvancedSearchResultDto, SearchRequestDto, @@ -116,19 +114,36 @@ export class PublicNotificationSearchService { const promises: Promise<{ fileNumber: string }[]>[] = []; if (searchDto.fileNumber) { - this.addFileNumberResults(searchDto, promises); + const promise = NOTIFICATION_SEARCH_FILTERS.addFileNumberResults( + searchDto, + this.notificationRepository, + ); + promises.push(promise); } if (searchDto.portalStatusCodes && searchDto.portalStatusCodes.length > 0) { - this.addPortalStatusResults(searchDto, promises); + const promise = NOTIFICATION_SEARCH_FILTERS.addPortalStatusResults( + searchDto, + this.notificationSubRepository, + ); + promises.push(promise); } if (searchDto.governmentName) { - await this.addGovernmentResults(searchDto, promises); + const promise = NOTIFICATION_SEARCH_FILTERS.addGovernmentResults( + searchDto, + this.notificationRepository, + this.governmentRepository, + ); + promises.push(promise); } - if (searchDto.fileTypes) { - this.addFileTypeResults(searchDto, promises); + if (searchDto.fileTypes.includes('SRW')) { + const promise = NOTIFICATION_SEARCH_FILTERS.addFileTypeResults( + searchDto, + this.notificationRepository, + ); + promises.push(promise); } if (searchDto.regionCodes && searchDto.regionCodes.length > 0) { @@ -136,32 +151,23 @@ export class PublicNotificationSearchService { } if (searchDto.name) { - this.addNameResults(searchDto, promises); - } - - if (searchDto.pid || searchDto.civicAddress) { - this.addParcelResults(searchDto, promises); + const promise = NOTIFICATION_SEARCH_FILTERS.addNameResults( + searchDto, + this.notificationSubRepository, + ); + promises.push(promise); } if (searchDto.pid || searchDto.civicAddress) { - this.addParcelResults(searchDto, promises); + const promise = NOTIFICATION_SEARCH_FILTERS.addParcelResults( + searchDto, + this.notificationSubRepository, + ); + promises.push(promise); } - //Intersect Sets const t0 = performance.now(); - const queryResults = await Promise.all(promises); - - const allIds: Set[] = []; - for (const result of queryResults) { - const fileNumbers = new Set(); - result.forEach((currentValue) => { - fileNumbers.add(currentValue.fileNumber); - }); - allIds.push(fileNumbers); - } - - const finalResult = intersectSets(allIds); - + const finalResult = await processSearchPromises(promises); const t1 = performance.now(); this.logger.debug( `Notification pre-search search took ${t1 - t0} milliseconds.`, @@ -169,57 +175,6 @@ export class PublicNotificationSearchService { return finalResult; } - private addFileNumberResults( - searchDto: SearchRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - const promise = this.notificationRepository.find({ - where: { - fileNumber: searchDto.fileNumber, - }, - select: { - fileNumber: true, - }, - }); - promises.push(promise); - } - - private addPortalStatusResults( - searchDto: SearchRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - const promise = this.notificationSubRepository - .createQueryBuilder('notiSub') - .select('notiSub.fileNumber') - .where( - "alcs.get_current_status_for_notification_submission_by_uuid(notiSub.uuid) ->> 'status_type_code' IN(:...statusCodes)", - { - statusCodes: searchDto.portalStatusCodes, - }, - ) - .getMany(); - promises.push(promise); - } - - private async addGovernmentResults( - searchDto: SearchRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - const government = await this.governmentRepository.findOneByOrFail({ - name: searchDto.governmentName, - }); - - const promise = this.notificationRepository.find({ - where: { - localGovernmentUuid: government.uuid, - }, - select: { - fileNumber: true, - }, - }); - promises.push(promise); - } - private addRegionResults( searchDto: SearchRequestDto, promises: Promise<{ fileNumber: string }[]>[], @@ -234,94 +189,4 @@ export class PublicNotificationSearchService { }); promises.push(promise); } - - private addNameResults( - searchDto: SearchRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - const formattedSearchString = - formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); - const promise = this.notificationSubRepository - .createQueryBuilder('notiSub') - .select('notiSub.fileNumber') - .leftJoin( - NotificationTransferee, - 'notification_transferee', - 'notification_transferee.notification_submission_uuid = notiSub.uuid', - ) - .andWhere( - new Brackets((qb) => - qb - .where( - "LOWER(notification_transferee.first_name || ' ' || notification_transferee.last_name) LIKE ANY (:names)", - { - names: formattedSearchString, - }, - ) - .orWhere( - 'LOWER(notification_transferee.first_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ) - .orWhere( - 'LOWER(notification_transferee.last_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ) - .orWhere( - 'LOWER(notification_transferee.organization_name) LIKE ANY (:names)', - { - names: formattedSearchString, - }, - ), - ), - ) - .getMany(); - promises.push(promise); - } - - private addParcelResults( - searchDto: SearchRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - let query = this.notificationSubRepository - .createQueryBuilder('notiSub') - .select('notiSub.fileNumber') - .leftJoin( - NotificationParcel, - 'parcel', - 'parcel.notification_submission_uuid = notiSub.uuid', - ); - - if (searchDto.pid) { - query = query.andWhere('parcel.pid = :pid', { pid: searchDto.pid }); - } - - if (searchDto.civicAddress) { - query = query.andWhere( - 'LOWER(parcel.civic_address) like LOWER(:civic_address)', - { - civic_address: `%${searchDto.civicAddress}%`.toLowerCase(), - }, - ); - } - - promises.push(query.getMany()); - } - - private addFileTypeResults( - searchDto: SearchRequestDto, - promises: Promise<{ fileNumber: string }[]>[], - ) { - if (searchDto.fileTypes.includes('SRW')) { - const query = this.notificationRepository.find({ - select: { - fileNumber: true, - }, - }); - promises.push(query); - } - } } diff --git a/services/apps/alcs/src/utils/search/application-search-filters.ts b/services/apps/alcs/src/utils/search/application-search-filters.ts new file mode 100644 index 0000000000..3b57807202 --- /dev/null +++ b/services/apps/alcs/src/utils/search/application-search-filters.ts @@ -0,0 +1,154 @@ +import { Brackets, Repository } from 'typeorm'; +import { ApplicationDecisionComponent } from '../../alcs/application-decision/application-decision-v2/application-decision/component/application-decision-component.entity'; +import { ApplicationDecision } from '../../alcs/application-decision/application-decision.entity'; +import { Application } from '../../alcs/application/application.entity'; +import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; +import { ApplicationOwner } from '../../portal/application-submission/application-owner/application-owner.entity'; +import { ApplicationParcel } from '../../portal/application-submission/application-parcel/application-parcel.entity'; +import { ApplicationSubmission } from '../../portal/application-submission/application-submission.entity'; +import { InboxRequestDto } from '../../portal/inbox/inbox.dto'; +import { SearchRequestDto } from '../../portal/public/search/public-search.dto'; +import { formatStringToPostgresSearchStringArrayWithWildCard } from '../search-helper'; + +export const APP_SEARCH_FILTERS = { + addFileNumberResults: ( + searchDto: SearchRequestDto, + applicationRepository: Repository, + ) => { + return applicationRepository.find({ + where: { + fileNumber: searchDto.fileNumber, + }, + select: { + fileNumber: true, + }, + }); + }, + + addPortalStatusResults: ( + searchDto: SearchRequestDto | InboxRequestDto, + applicationSubmissionRepository: Repository, + ) => { + return applicationSubmissionRepository + .createQueryBuilder('appSubs') + .select('appSubs.fileNumber') + .where( + "alcs.get_current_status_for_application_submission_by_uuid(appSubs.uuid) ->> 'status_type_code' IN (:...statusCodes)", + { + statusCodes: searchDto.portalStatusCodes, + }, + ) + .getMany(); + }, + addNameResults: ( + searchDto: SearchRequestDto | InboxRequestDto, + applicationSubmissionRepository: Repository, + ) => { + const formattedSearchString = + formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); + return applicationSubmissionRepository + .createQueryBuilder('appSub') + .select('appSub.fileNumber') + .leftJoin( + ApplicationOwner, + 'application_owner', + 'application_owner.application_submission_uuid = appSub.uuid', + ) + .andWhere( + new Brackets((qb) => + qb + .where( + "LOWER(application_owner.first_name || ' ' || application_owner.last_name) LIKE ANY (:names)", + { + names: formattedSearchString, + }, + ) + .orWhere('LOWER(application_owner.first_name) LIKE ANY (:names)', { + names: formattedSearchString, + }) + .orWhere('LOWER(application_owner.last_name) LIKE ANY (:names)', { + names: formattedSearchString, + }) + .orWhere( + 'LOWER(application_owner.organization_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ), + ), + ) + .getMany(); + }, + addGovernmentResults: async ( + searchDto: SearchRequestDto, + applicationRepository: Repository, + governmentRepository: Repository, + ) => { + const government = await governmentRepository.findOneByOrFail({ + name: searchDto.governmentName, + }); + + return applicationRepository.find({ + where: { + localGovernmentUuid: government.uuid, + }, + select: { + fileNumber: true, + }, + }); + }, + addParcelResults: ( + searchDto: SearchRequestDto | InboxRequestDto, + applicationSubmissionRepository: Repository, + ) => { + const query = applicationSubmissionRepository + .createQueryBuilder('appSub') + .select('appSub.fileNumber') + .leftJoin( + ApplicationParcel, + 'parcel', + 'parcel.application_submission_uuid = appSub.uuid', + ); + + if (searchDto.pid) { + query.andWhere('parcel.pid = :pid', { pid: searchDto.pid }); + } + + if (searchDto.civicAddress) { + query.andWhere('LOWER(parcel.civic_address) like LOWER(:civic_address)', { + civic_address: `%${searchDto.civicAddress}%`.toLowerCase(), + }); + } + + return query.getMany(); + }, + addFileTypeResults: ( + searchDto: InboxRequestDto, + applicationRepository: Repository, + ) => { + const query = applicationRepository + .createQueryBuilder('app') + .select('app.fileNumber') + .leftJoin( + ApplicationDecision, + 'decision', + 'decision.application_uuid = "app"."uuid" AND decision.is_draft = FALSE', + ) + .leftJoin( + ApplicationDecisionComponent, + 'decisionComponent', + 'decisionComponent.application_decision_uuid = decision.uuid', + ) + .where('app.type_code IN (:...typeCodes)', { + typeCodes: searchDto.fileTypes, + }) + .orWhere( + 'decisionComponent.application_decision_component_type_code IN (:...typeCodes)', + { + typeCodes: searchDto.fileTypes, + }, + ); + + return query.getMany(); + }, +}; diff --git a/services/apps/alcs/src/utils/search/notice-of-intent-search-filters.ts b/services/apps/alcs/src/utils/search/notice-of-intent-search-filters.ts new file mode 100644 index 0000000000..a64ccf48f3 --- /dev/null +++ b/services/apps/alcs/src/utils/search/notice-of-intent-search-filters.ts @@ -0,0 +1,138 @@ +import { Brackets, Repository } from 'typeorm'; +import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; +import { NoticeOfIntent } from '../../alcs/notice-of-intent/notice-of-intent.entity'; +import { InboxRequestDto } from '../../portal/inbox/inbox.dto'; +import { NoticeOfIntentOwner } from '../../portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.entity'; +import { NoticeOfIntentParcel } from '../../portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity'; +import { NoticeOfIntentSubmission } from '../../portal/notice-of-intent-submission/notice-of-intent-submission.entity'; +import { SearchRequestDto } from '../../portal/public/search/public-search.dto'; +import { formatStringToPostgresSearchStringArrayWithWildCard } from '../search-helper'; + +export const NOI_SEARCH_FILTERS = { + addFileNumberResults: ( + searchDto: SearchRequestDto, + noiRepository: Repository, + ) => { + return noiRepository.find({ + where: { + fileNumber: searchDto.fileNumber, + }, + select: { + fileNumber: true, + }, + }); + }, + addPortalStatusResults: ( + searchDto: SearchRequestDto | InboxRequestDto, + noiSubmissionRepository: Repository, + ) => { + return noiSubmissionRepository + .createQueryBuilder('noiSubs') + .select('noiSubs.fileNumber') + .where( + "alcs.get_current_status_for_notice_of_intent_submission_by_uuid(noiSubs.uuid) ->> 'status_type_code' IN(:...statusCodes)", + { + statusCodes: searchDto.portalStatusCodes, + }, + ) + .getMany(); + }, + addNameResults: ( + searchDto: SearchRequestDto | InboxRequestDto, + noiSubmissionRepository: Repository, + ) => { + const formattedSearchString = + formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); + return noiSubmissionRepository + .createQueryBuilder('noiSub') + .select('noiSub.fileNumber') + .leftJoin( + NoticeOfIntentOwner, + 'notice_of_intent_owner', + 'notice_of_intent_owner.notice_of_intent_submission_uuid = noiSub.uuid', + ) + .andWhere( + new Brackets((qb) => + qb + .where( + "LOWER(notice_of_intent_owner.first_name || ' ' || notice_of_intent_owner.last_name) LIKE ANY (:names)", + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(notice_of_intent_owner.first_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(notice_of_intent_owner.last_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(notice_of_intent_owner.organization_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ), + ), + ) + .getMany(); + }, + addGovernmentResults: async ( + searchDto: SearchRequestDto, + noiRepository: Repository, + governmentRepository: Repository, + ) => { + const government = await governmentRepository.findOneByOrFail({ + name: searchDto.governmentName, + }); + + return noiRepository.find({ + where: { + localGovernmentUuid: government.uuid, + }, + select: { + fileNumber: true, + }, + }); + }, + addParcelResults: ( + searchDto: SearchRequestDto | InboxRequestDto, + noiSubmissionRepository: Repository, + ) => { + const query = noiSubmissionRepository + .createQueryBuilder('noiSub') + .select('noiSub.fileNumber') + .leftJoin( + NoticeOfIntentParcel, + 'parcel', + 'parcel.notice_of_intent_submission_uuid = noiSub.uuid', + ); + + if (searchDto.pid) { + query.andWhere('parcel.pid = :pid', { pid: searchDto.pid }); + } + + if (searchDto.civicAddress) { + query.andWhere('LOWER(parcel.civic_address) like LOWER(:civic_address)', { + civic_address: `%${searchDto.civicAddress}%`.toLowerCase(), + }); + } + + return query.getMany(); + }, + addFileTypeResults: ( + searchDto: InboxRequestDto, + noiRepository: Repository, + ) => { + return noiRepository.find({ + select: { + fileNumber: true, + }, + }); + }, +}; diff --git a/services/apps/alcs/src/utils/search/notification-search-filters.ts b/services/apps/alcs/src/utils/search/notification-search-filters.ts new file mode 100644 index 0000000000..6978cece13 --- /dev/null +++ b/services/apps/alcs/src/utils/search/notification-search-filters.ts @@ -0,0 +1,142 @@ +import { Brackets, Repository } from 'typeorm'; +import { LocalGovernment } from '../../alcs/local-government/local-government.entity'; +import { Notification } from '../../alcs/notification/notification.entity'; +import { InboxRequestDto } from '../../portal/inbox/inbox.dto'; +import { NotificationParcel } from '../../portal/notification-submission/notification-parcel/notification-parcel.entity'; +import { NotificationSubmission } from '../../portal/notification-submission/notification-submission.entity'; +import { NotificationTransferee } from '../../portal/notification-submission/notification-transferee/notification-transferee.entity'; +import { SearchRequestDto } from '../../portal/public/search/public-search.dto'; +import { formatStringToPostgresSearchStringArrayWithWildCard } from '../search-helper'; + +export const NOTIFICATION_SEARCH_FILTERS = { + addFileNumberResults: ( + searchDto: SearchRequestDto, + notificationRepository: Repository, + ) => { + return notificationRepository.find({ + where: { + fileNumber: searchDto.fileNumber, + }, + select: { + fileNumber: true, + }, + }); + }, + + addPortalStatusResults: ( + searchDto: SearchRequestDto | InboxRequestDto, + notificationSubmissionRepository: Repository, + ) => { + return notificationSubmissionRepository + .createQueryBuilder('notiSub') + .select('notiSub.fileNumber') + .where( + "alcs.get_current_status_for_notification_submission_by_uuid(notiSub.uuid) ->> 'status_type_code' IN(:...statusCodes)", + { + statusCodes: searchDto.portalStatusCodes, + }, + ) + .getMany(); + }, + addNameResults: ( + searchDto: SearchRequestDto | InboxRequestDto, + notificationSubRepository: Repository, + ) => { + const formattedSearchString = + formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!); + return notificationSubRepository + .createQueryBuilder('notiSub') + .select('notiSub.fileNumber') + .leftJoin( + NotificationTransferee, + 'notification_transferee', + 'notification_transferee.notification_submission_uuid = notiSub.uuid', + ) + .andWhere( + new Brackets((qb) => + qb + .where( + "LOWER(notification_transferee.first_name || ' ' || notification_transferee.last_name) LIKE ANY (:names)", + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(notification_transferee.first_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(notification_transferee.last_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ) + .orWhere( + 'LOWER(notification_transferee.organization_name) LIKE ANY (:names)', + { + names: formattedSearchString, + }, + ), + ), + ) + .getMany(); + }, + addGovernmentResults: async ( + searchDto: SearchRequestDto, + notificationRepository: Repository, + governmentRepository: Repository, + ) => { + const government = await governmentRepository.findOneByOrFail({ + name: searchDto.governmentName, + }); + + return notificationRepository.find({ + where: { + localGovernmentUuid: government.uuid, + }, + select: { + fileNumber: true, + }, + }); + }, + addParcelResults: ( + searchDto: SearchRequestDto | InboxRequestDto, + notificationSubRepository: Repository, + ) => { + let query = notificationSubRepository + .createQueryBuilder('notiSub') + .select('notiSub.fileNumber') + .leftJoin( + NotificationParcel, + 'parcel', + 'parcel.notification_submission_uuid = notiSub.uuid', + ); + + if (searchDto.pid) { + query = query.andWhere('parcel.pid = :pid', { pid: searchDto.pid }); + } + + if (searchDto.civicAddress) { + query = query.andWhere( + 'LOWER(parcel.civic_address) like LOWER(:civic_address)', + { + civic_address: `%${searchDto.civicAddress}%`.toLowerCase(), + }, + ); + } + + return query.getMany(); + }, + addFileTypeResults: ( + searchDto: InboxRequestDto, + notificationRepository: Repository, + ) => { + return notificationRepository.find({ + select: { + fileNumber: true, + }, + }); + }, +}; diff --git a/services/apps/alcs/src/utils/search/search-intersection.ts b/services/apps/alcs/src/utils/search/search-intersection.ts new file mode 100644 index 0000000000..a406e9bbf3 --- /dev/null +++ b/services/apps/alcs/src/utils/search/search-intersection.ts @@ -0,0 +1,18 @@ +import { intersectSets } from '../set-helper'; + +export const processSearchPromises = async ( + promises: Promise<{ fileNumber: string }[]>[], +) => { + const queryResults = await Promise.all(promises); + + const allIds: Set[] = []; + for (const result of queryResults) { + const fileNumbers = new Set(); + result.forEach((currentValue) => { + fileNumbers.add(currentValue.fileNumber); + }); + allIds.push(fileNumbers); + } + + return intersectSets(allIds); +}; From 4c8c3f3be1dc85f46dbea6f64ddbd39b68cb15d3 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 21 May 2024 11:27:42 -0700 Subject: [PATCH 085/103] Remove # --- .../notification-details/parcel/parcel.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alcs-frontend/src/app/features/notification/applicant-info/notification-details/parcel/parcel.component.html b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/parcel/parcel.component.html index 2b3c6fa853..2c5b9c684e 100644 --- a/alcs-frontend/src/app/features/notification/applicant-info/notification-details/parcel/parcel.component.html +++ b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/parcel/parcel.component.html @@ -3,7 +3,7 @@

Notification Parcels

-

Parcel #{{ parcelInd + 1 }}

+

Parcel {{ parcelInd + 1 }}

Ownership Type
From 92cc28311fba488c96c8e1a80aee50eb11b70668 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 21 May 2024 11:35:26 -0700 Subject: [PATCH 086/103] Add Dropdown Arrow to File Selector * Add to ALCS file selector to match other dropdowns --- .../file-type-filter-drop-down.component.html | 1 + .../file-type-filter-drop-down.component.scss | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html b/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html index 4b325c8100..03e1cae2b3 100644 --- a/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html +++ b/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.html @@ -25,6 +25,7 @@ > close + arrow_drop_down info Please select an item from below diff --git a/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss b/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss index 3af4eb06e7..1f52f92032 100644 --- a/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss +++ b/alcs-frontend/src/app/features/search/file-type-filter-drop-down/file-type-filter-drop-down.component.scss @@ -5,3 +5,13 @@ #type { text-overflow: ellipsis; } + +.dropdown-arrow { + color: rgba(0, 0, 0, 0.54); + cursor: pointer; + padding: 0 !important; + + &:last-child { + padding-right: 8px !important; + } +} From 83ecb251ae3993791e7904a13fe3cf19837ccf3e Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 21 May 2024 11:52:03 -0700 Subject: [PATCH 087/103] Add Overflow Wrap for Inline TextArea --- .../inline-textarea/inline-textarea.component.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alcs-frontend/src/app/shared/inline-editors/inline-textarea/inline-textarea.component.scss b/alcs-frontend/src/app/shared/inline-editors/inline-textarea/inline-textarea.component.scss index b318889538..e0f8c34921 100644 --- a/alcs-frontend/src/app/shared/inline-editors/inline-textarea/inline-textarea.component.scss +++ b/alcs-frontend/src/app/shared/inline-editors/inline-textarea/inline-textarea.component.scss @@ -3,6 +3,7 @@ .inline-textarea-wrapper { padding-top: 4px; white-space: pre-line; + overflow-wrap: break-word; } .editing { @@ -65,7 +66,6 @@ padding: 8px; border-radius: 2px; font-size: 16px; - width: 100%; min-height: 96px; margin-left: -8px; margin-right: -8px; From d24c914f5d300400840b61ee49ec4c610c07976a Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 21 May 2024 16:42:26 -0700 Subject: [PATCH 088/103] PDF Updates * Remove first question on Step 3 * Add m2 to NOIs Floor Area * Rename Section 4 to match View --- .../noi-pfrs-submission-template.docx | Bin 50062 -> 37905 bytes .../noi-pofo-submission-template.docx | Bin 53475 -> 37388 bytes .../noi-roso-submission-template.docx | Bin 49605 -> 37598 bytes .../submissions/cove-submission-template.docx | Bin 32445 -> 32365 bytes .../submissions/excl-submission-template.docx | Bin 32349 -> 32261 bytes .../submissions/incl-submission-template.docx | Bin 32418 -> 32328 bytes .../submissions/naru-submission-template.docx | Bin 33304 -> 33213 bytes .../submissions/nfu-submission-template.docx | Bin 32346 -> 32268 bytes .../submissions/pfrs-submission-template.docx | Bin 33519 -> 33454 bytes .../submissions/pofo-submission-template.docx | Bin 32954 -> 32863 bytes .../submissions/roso-submission-template.docx | Bin 32847 -> 32758 bytes .../submissions/subd-submission-template.docx | Bin 36451 -> 36372 bytes .../submissions/tur-submission-template.docx | Bin 36169 -> 36092 bytes 13 files changed, 0 insertions(+), 0 deletions(-) diff --git a/services/templates/pdf/noi-submissions/noi-pfrs-submission-template.docx b/services/templates/pdf/noi-submissions/noi-pfrs-submission-template.docx index 984dcfcfa664cc1449415160490de2fe33f14df7..be7805654a4a6c6e46edcc66c9a52a3925ef364f 100644 GIT binary patch literal 37905 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 diff --git a/services/templates/pdf/noi-submissions/noi-pofo-submission-template.docx b/services/templates/pdf/noi-submissions/noi-pofo-submission-template.docx index 9e1679dfd8bb34d8f6853449fc73b75a3720a108..faed0bec0ae7023d3356c4e6666353e8188ddc04 100644 GIT binary patch literal 37388 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 E1CvM-&j0`b literal 53475 zcmeFYW0$Q_vn80eZQHh;CvDrdZQDL++qP}ncIHWUzW0vmuIjFTQ2oRh`^#SY!(Pvv zGiJnEAuk0Cf&u^r00961KnO5uB%YWI2mr7P4gi1*00E>WY-j6iV(YA@>|t->q(kR! zV@*&10z~l_0O)u9|Ns0SyaP=sla_-F2%@hc-$C;&YkxW@iigGv;!Lp3-vJ|8TSTkD z7ml7^aYrL4Nh5@j?O+zBx?d%jrpy~wRGL8WlUXUT$$-%U#;cS|B-U52Xnl)e%P)_rtxD70u+Epv$Zp~6vv|}tnY*xJ zKeYiPoTEOcvY^(aXguYgFhKK!%S~Pdx2WbO1hS=qSS2_2?mPrc0Pz91%H~E?W%#*@ zIY{#$m$0S9it_0av)YCP6nhz}bGs3t5R|wZyhLUhG3yqle~Y=td`l)jL46XeYrF{- zz#^FQrtgiYo-UWT$o9Mhf+hKhGrBz$uZ}(MgX5`K^wZ3eSV7N&znCWx#2Y)=yyyA; zrR>iSFo693LT0=Ktk&CKgv$PM75bOVdX6U6PV{vD`TYM${C_ZW|EIrRmDvAFVif*)2|6)Ny>?!C=JxeSuC)Gf8puVeaOdD zA}`0K&=y3Lvr9%KjfJ@mDyy&QzRZ6!7?)QpCA7T2D|khFLUB80Fnys+`Rmh|Y2)Jt zb{ceslrNInm|`p`pJ}kH8R$u~6AY`Mui@H!s^n?eU)2x3mFN;a;&xE{`&ni|4^gg00lznrg^yTE>;-*vU9ZUM zlCO^Ay%oX3{C;(1_*~p^1RQO{ibf;HoC=Vt*`khqW%KCmGK(YyRD8xF)DKo?-Q3ls z-X%ajhT9;sxjEGSmsVYPiQmz75-ho{{04A4?GHBTSWL-DH^r_ftaqx3ldU&=3(vju zN`t;Bt6Tn^&l>0_hl2D0b2Q2~{;Wnr9=|%EUS?Q#F1|RQM zg6@W8W5QS5_p3*~xjP{I>tB<0zv%h@3U#9o1xpAk0Dv(I2ms>mivI%Q{|vz^pH0U@ zj>MNQu`6x{@5P#Qo2z?px@aA8U27h$jb zIiIeF-(@-Wk{2OL^x;CEi{s3)vfmH)c|Yf~a_EcZ4e9#~#}bGJj`u8ipUw~QC67^$ zkH!!FX1b1SkK_)?B5vpFB$+wlZf@TodHkaHPuhEkvwYKs=7CAUJhKl2;`E&3QCZ%# zsv9gXxnpq_0Sj+O{ZUGvU&S!Wod|E*{Hw0eNLVN$mK1-t3x+mCDNmIvasrFQKoQGb z|0HImD9dveYe){*N?JB14s9nknUY?YEn2Jf7jnXlr@1NcJSskzdHeA_9@s^_#TD(f zr@goO?v>6KN$YB$9lq_if*~d7RsTtkSll2jJ8d+N1a|14A$>nLMhruLyYMq9BwWrUO97BhI*n^jveSZQK;I38?> zA6>=Tb3miH^~x-a6t13XTGwFjLQxm}?7B4-BzwCgCF&8fTOd;HEh8E@VNOe&3J2@u zX;WCNVx_Av_f7?c;0C2Y)<&dBH8JmeY*)8oOfu>=tntir?zn%CFxyo zR3xVH=C6r=B*|^i!{_c~NNJW7HTl61*}ds6ArcBM&XR4!E1(xqFvtFa=x4TSq35(T zlI=}Wb-|X&xA@BWCfkwjRqrO5tcZxBkwAJGtV5cfyijTR9jDz*0Au@pDM!w88!n;n zZEA8|HnHQ-T7P5ws2tf{Mx`7SA2e3vp(3ubR^b0ThD#}h%mCfJgyoe<}oUTXUk3XjM=9c zHBWDL1ig zzLyjD&10&9Pt9^alUC%f!l67z=ORcf#Uo@}p^Cux8pysS5q5_=Xhse zuWq06cjSblOFz1<^k~F~`_SZ{MajM4*K~yNE3^X}?NJ=oxuRoXJ29};kJbpybe@9lz#@jm@xV!@=ddbrYjtBo`>EuM+oXdrM{kb)lZ2 z`{fNEnP-+Xa*}%KC(%QWQKQh>T&tDv^Jjqb=oaFJ3f-RuBW^*n9q>Pp7c`^NKkvt( zOS4g@O?`z>^(fckh(DSeraeZ@X$^ERGfSA+Svf?DKts;@xd;pG(b3J zA6j~*{K{Q%QNkc{L-EmKqoc>Ha&_Y)BrF3u zR`dH}{h%&g#J+xax{^B=UvN@V6eH^hUebp%IJ{S_~3b4JR2uEq&AI7em3N@ zJlP3O2j;rDQJm^($b}JJq0TyVURK)14Bfn1{$t6X3wK{h@l2i`b<;K(|5lauBHF)a zmh%xQMnP5J-CiJ8mU+R&v>U79FV+Q%y6n8y%f^*0AwXW3osJb>#UJ5@1)`@!KZEUb z3U**Oz0!j(|8kCbZ*;#L$kE|YY{_8|%O8@W?!&E*`mMmXbEf6Gnzf=W82h(PGh=lE z>Uqevc*P|C;FIi!;Oh-QFNhKFik`T#d#Wl6d-74<1e|i#cstwPt~J_ zJiaCvN-g#s0*cn0OTINvqfiF`dT{E`F{pE(5EU6F>A?bM z9etnC(1E;y2=weu=jQlM!$zE~*?HnvVXWF+ekSS$qkD*W%=mU-W4JQ9UUT|AC**U0 zys$pA_tcPDYjE;0BE{;OAYL~Z>_jeBn@ut5$_LqFWvN7#_TA)2V&?Z zxn_)V^xqTnz5Ro);SS)kD%vPH^p^pK`6kBtGz(jsn^y`q%FN#n4VUnl^5gDG<^SrB zl;rjOSI7D2Ou&1$Cs!YF`*nAR)iY+~6NroEwPQf|K($HH>7ubb*8psFU55Z#q>(9q zQdln(N$!$CAX=@ClT?X?)}VC*?=^|umA{UA#zJ>5mnLn+I*G`jCM$pLD)Ta03!MoS zXoEKMRCr@ws0QcP!teB?fnnS4Z-)CGiH6W!=%c9sO|pZkyjmv!-LV>Yn7N9dMz5## zO{n3evmQ!(>OzX09JGpR8)iA^D2t65N4zD3=%LG4)c}K36;HR8W~muiTn@K)v$nQM z?)@u6F-ekFvleBd?Yb!!LcDM#SRH>eXpw9E=>Wii;a0M&`}(mU(dCUgOr-)s0bvVk zi~Q9r(v716Z_3`5zs=JL?pg>szQ8&GV6Fa2jAT>xvDc{o`L`Sl||xMu@EdcBfFV>4Zt5kNz-#gBur)e&R6v+5G7 z#kza>WRz;IhsmD4ZsT4O6RapWVykNgYkzWUkJo3Dc zZUmy2{Oshp^=vmyu@vSNntV*XzN6z{3llJh_piN)iGTOYeuKmnw7xJ0wZe4u*3TM{ zTXYY2r1u>i4}(_3|4jLIL3J@6O0Xyc@;KiNe{3jP58S@>@X;T_rYJb(e@C84mo>_^ zj!os8YNgRiwZ8kpg9kY2#D0W*MC=}ie?*ia!G8803dUO4iXCv2*TRe&3`;c`JaWmu z;*e66Ajg(53G7IP;CuRah90{(47~3;7!A~3VNAipA#quy7?xh@=}fSe zF?aY!g`02fO8R2@Q-j5Z%3^8I>eJ8urx~ly`JA+JMbv*#sbl5gahmdHe*n6)^o`vk z7CnTL3W@v~QtXO6@SE>L3QXKID?&LrG&T zwx}s5$5c&FQH@7dN!V)erMXoUcwH{g-*=hasnYy`b>r2OVo(uB%ISB~4BQ7B-0u9;_so<43+>dojA>gh zXfDsC4x~qToKqbEj`eW&*fvCXHhltFcfr}TaqHn_2!G%M0Rw~q!T@0iS76!9rlZiN zHErbpdjL4fzn(}q>qtF=s9S*zeo5R2B?Cos%hez>A*CRnq3u-T@YwEG#u)8fF|51&@(IZ?|LTtF8vG9 z`?K-@+|B}~rZAN>&eG1EGeWzONd4mlMd1a|+}o9|)Fe^dBn)B34ugICBvFML%Vid> za4b?=glt~IR=_VHSL1|hNhS}Ho+K;#&7V>aza@Hr%D^Nr%Lz779<$jVq@wc;uPC`g zsk#pvT_p?TYeo3QI;+WW1L>k=vQFa+AXOsOcvt!2Ar;s&{60X+Y8dCD9*(R-bm{62 zFPqVo&t&MysFheGMrw*2MpQ9QuVa%j$M_lww7r`)ca8UZc~4|59@>9BaF2wEwr3o10_ZVwsdO)d_X{HK;J;>d=SnQG+&L(~2~nics|9Kjiar znhC!z8L=x z3WPOo2!OpB1JjLJg>c+8>jxzb6$#}`KpTzwXKaFr&%@NmF2ZkjW-3`?iXEzR@?9sy zm2rJSEAHCdpp*wS3}VY0oaN$U;Z%y4m31FTMsBg<)L<-w!m0s8UI{J=Kn|TvLxACB z)zZ!nI$BX3J<8Y_W4t=gnsi{=+a%@aPEr;`&J4cs%y!*@mFQYtFh;z?B7o@c3V4l0 z{see!NwT#S_7~`{&J!Ee*`=2)4WML$QYwBX>H_GsqKE<$E9{GMbgXN;F3(|ApA^#1 zOkN#L+Hs~z1uScOT1jQW0Zi^ULYo@!4d|QAM0?WDXhz-~VpGm|sNpDh%j6qN3_8cp zfm^nB8^LqG-npKdg1DG=b9_O&YT+Qr1%`v}lE|QQzX?_jV(X{4-vH*KMRd~i{6g59 zsD}kdkaV2 zG$6KAuKszpZCuTsv^gS}x?GVE_KU@Hz?qTwaaz@2W2%7LA=$=K@{#HxQ*x00G{yNW z5g^6HT)kYUPAk9r+r!Fa8&VHW}cgmg^{r!EZTO>50!T1)m1A zdbR9XY|A>D{aRoyJ+rpZMHrB5n(4|K6LZ_ds*1wZak-uQVg zOErdMV{#wUhf{_wLyHIfs~OaSSHjjqJfPpfwUBK3R%nR;hDRu>UL#-pM?Q&_KytwyQk}RCOdr){T|d+jg|kn+DnJTy7a7RP^rFu%b>x1c-VICV^C zJem6@#<(N0Ef6Hu$efk{O@L+x1uGmBA&T7u+z@c+z@{C34IG>tr|!WfACMY+cmmwd zS6IZj^cnXr>Q4aZ?I%Es_u1Q0ibm0>K+jx_lIIOEAqa|Yx4mbkUy2px*TaOzc~eRn z45aI5y1ttHk~S_Iy;O&?bH-}ajaX(MUYiqU{ZV%Y&T``u(T*dFhE;rV+Hy%5b!6)T z(R8!2(_OYfvp8G#f`@DCuSfajQjO$=E}>roxK;_G|%A01EBnoQW%0VWVx#1W#|X_ zz0keD-K(_O8X{6T)h3Q7ANcMI)JuuK3!Q0vaG0iZ93Jl+guIiq7WM7MvBTlo`x=}T zQH$D~^0${VRP!jXfjfZdhWn8mgN_H?aYdFsyZad65lLYByw1ZQC!flzdE3XMyP$*0 zYM+_@pW=%L)h_;r3sUM1)7+HJThHB zzmGxoB~6KuX0l}Ole0$u&Bvih-c4;AzD#=9N$&omt~S=6eEmyOR`RT*WN#1P9*_y3e}E`K{L z=i26BpUhE)F7!Z;h`fU7nFGT3+F{@-O>3|0DC{B*I-NZPO~%QX6^ouQP_A>Z=8;)L zB#`Q|kqF%;xpd$aKm*xnV&%{`bVk^^xq8kxWu;2MN*uVthU~j>IIQd#q7sSZf^7novYt9L9nc3Hjm(Y%1vhB*EhUx9bym$XGVpP(-9NP{`0Y-txj4~Pc+iYF@=n6TSXfcd58O8toU5Psc zg{^n21MljZtFo4f8HUggFp3-4aOVaz0Sp08vOB6kdJk%`?H=s73Q2X2;8d?cF*@eZ zDtx(>>0XPBn(F!W1!Ul{W~wYZBPefPoqo6u0SXtC8yTMPs*-swZW^d#pw-yF2E+>iC{fNOIykRuP;zySNeoDvA6fktLoyC~W}N z-(!KvFr->gTJ-p6?V?mcat|`~wwRuPDy!N}5q=NGa6N~Pba)d~?n+>(68<&y+ncFS z7F~UgWjp=(N|KpG9pP4$;>-2`-=ydr)7r3hhi|Gs_rpKmuRpsBrM%-#*o|6>Hy<=@ zf03V@O$kRJWAX3DN3+2B_c4-qcJG{4kUrwE2Plq_vK^rdG=1Ou7Tz%OXl}S7l@3UX z5z!AJU+@{zXl%`V6XS^znHNB|2%GwE=L56c38kcu!l0!uokkb%XcbkLsR)=t|6eC{`|yrN0}C6!kNo zl4>I*0E+IMB4T0`386p5Hd@otj>)bB<~EqSDaRQYKP9XJZ!Dx-`R0J#Zi|{xQSh=DcVvq9}6# zCxsoZhi%@iJ0eW=)oQ-Cd6{UN@zkQjPAqxtGLE!RS>!FW%nZK?9i#WK<8GP7cR-r$d(&c2o(97z=3O}<}80~40N z#lO*N0Fh?JIaN3L3#s&GiZXD)3_R#+xBsJ=$TmJ>&b?$?2D?dPHSl4(IRP|h@jIj^ z^WSj~pfQ*bE~b}){k4igrN-^b`cuT(KQ*u;zFQ-FL@higXpj!8 zP~L4{?e<+K;Z#wC;MagjKPBV6kprxiKU$9NzM4K(a=Vd%WTX+R@sq8Sjdh)A<=8&E zD@Rp^+yLxW9ei$& zTW5EaYzLKb{DNq>k^w<-Vx=&8r|t*4Z@=A_qVK{yzO+lA-%R>kqLT)@vtpc2qyK=~ zU17FrqT>n*3ESg<{B%Lv-4S{4lpml|4$eg6$U1JXFZ6+6$}ZL|fUD?J{8xg(0USy1 zwF4{#CADC4!o5#wzF4&p4_mn9YAq3N38%_*RP_;oEUMohuNJV_Zrw(CZnd-o1d&sM zO3T$G#Q9(#yo3^p&KLnV2l^0UA6wsn7hcQ}Hg{E;LkqaBjTCKh1PmPP?iB(DLsCr! zcHKWipQV#EbFbI`%bWZ=%F-&fs=}mS>ep_5qIdY)oiX8vF?0PKTQyjOk-89E3(qw-(~>=EDTgQ%f_i2C<|)@9;q$=Dn8`S&2BgGr|Dk9lG?8;3YIfD~pt z^?|3$V&yez>MddNj^aFg~^g@E$>x-zd!EDYTVn>^Pb1-Du z#E|`?*XM`t^UJpj@ftzZs*f$#Vew3rVip|84x@I%ei0&lJqM*%}YS&mZ-7({p=9=IgJO|)u5!j%D zPfwfrqt+}bZtAlI<;fp+44D&Lb*1ylQ#Gp6Fr!Q=lNVVm5;XzJY81reA%;EBm)nq* zZewIzMu>$CFWag%9X6$!Q7fEbg%r(0Wm2886Sa)2Pkm?0)pw;qxlqgXcktgR@Lmm; zqo`}ay^L`4&CH(Z@XyDIolTR1ohas)?UFnTDm$uigboX)z1{fi7BsqZe0Rk$*iW8# ztE!GJqnWOmu9RHOV?~giTxtWUxXUGn-D;Y%)D7m4Tp&WvBdgfpLi5Q7zHIaCdP7c` z-E19`-#E52vI#ayNE2OB@^NSv4rAY%K0FgD?i4r`G5q#-N@`4a;zdlg*ons!F%LQ` zfaU?{G=lLWb$vd-&f+Ku)j~#|W7N62UaxD>^{+8sme>CfA`hB=enL1>`5X>3bl-op z-2?LYl#+WNg9ySrc#22GwogtYtf#G?1K%?Bp(N}D4gnrF4ftG=ZNpJ|4>X>_cX>u} z>hSA+257fm}dx(&Cjz7=IfJQeCT@hgMJvPh&ih2XvzMmmKf#Jd&JV zh-tX5JG8!11%Dxs^w?ZLG@1YQb6S6v(6FfO3SHwOhXOm}^ExlK76ACnv&jfj!zK{U zTBH2!wLtjq@|cdz-iR9%IqSWDD*>m%6}HzO_s$(D))I(Xk#DQ>EJ#&!XnA zC91|pY8+br2Ycj^`k~1hqPKLgRw8cI+)vaEcE{y$hdAE6f5UMplYq;8N+2;;15mmCT>6^1spWtD4k6OmxRz&=_%kTN|rJqGw z&IMoU57eSE(tfTeXGVP@nenZM(^+lcs%{E-jrJtu-RG zJr#GT58HCb#Y#*%7Zjoo71S+)>7A{%$L$~g< zTe)Basm5Dp5n`$4#C9Wr5RJ7&6Ny^0ZUY5CAVl0L3&dPGwNjni*JBqnlR8=msY^C) zoGBng)UAFzt;Ox*Pu3O~t#{jOw(hF`7JeH^>X`&U=pq=|y>FRN0M$-J9#h2x&R<4b z;oUPix;vS7a}7CkgFj%1a86b20}in$TiQb~(5E^) z0iH}bo&0%1I#8y{Dqg7Hp6$q`$V`;bj_rYr|2rOQ6cr?g1PoYF8IF@=op=n{P zY{v!gR0{ZoiQ37zSC*RNDPS#yO>;#*AS#kreQvsrNATOsm!PN!B+v@Fl>#TJDsmni z>7!`zCsFc8m=*RP8q7rGNSDv}GY$6$G|Uw1rR)E}2c2F`$TVe?z4s3>uZj#>Y^$m^ zwj|mwTGysCk~qm^SYEmEhZSjf4rkt?^#xLW?YOG%Z-S`=GVM`WybNZW{HpeuKG1>~ zJXK#vX5_1H+uXakr?_@_4=N}g6&#a{j#aBAd_b6e)wL8ND-gT~?E2XGm%5e$GmP$h zY=XB9e6cFnMQXR|OnAF(WzAy{W!vmdHuq`IJLO~taw>MsLQielqhdX+u>G*`L_U*y zZ_kQ@5!vLWqwMTSdn6*Pm()p*`CW&=M{(C>VsyYx&19n)RVUpa@kWWrzZi+d<37Nc zw-YU7tPp4wLwYuadzR_P+2BgX62i zZQgzi6bpA$PX3(~(;;IG+_4w*JIeu|@A?4VYaI-DD{Eoy+9{d~9-)dR(=bHnBgIXT zd~dqT9NcnXKFQx~Ade5}!+Tx0>Oe-(987==WM6P+D5eANDa5_dD;Q4ws)hWLD%;4CWcaXIrcb7oJFK4Yazyi~umQ zu3K^mkU9IK#Ky7j`>|Rn0`!~EjZ#WB#f3K;IGO}*w;O|k>@A`3VkOj9#`<^hl z{=;B`-LVJX^#HDes@sq*a|5jW&O`7A@gMrmszZ_>&`E?D#^KpL?++9)8?o)9JHnlK|H+f3fU#adYj3JN*^#5SXz?t{RNblw$a8H~s~ zs7)7(3`5o~GR?8sO2gGvgIT7kU;C|QOPp}mo3%eMVlz9pRU%%Qb0$;i?SD^y{~!IQ z`uazm3$hc9yTU7dRc)M+SPf~SLGGzk5mb!5mvpnI zcV*cCA<%>W_2Wj9UA=}9i~@^|*`4vE{>sQuRR4|5M)w~bW~y>I@a={9j5Qb?xVq-I zLF*fD!RtG$u3DkU^lG%Sy4J}~ zR#+b&T@xyxQh-(w`7)O-4suDrFntT<2)txU-!{=K3= zv;r9sXhJok#f|U-|DT(KS2{LMglM=@W_FG#e~y7u z#n@0`s03cP%0F(|nF%1r$ABOS>pb}-sQZNFAnbGILPC0k<7Z?pazKFcV?i%6tbUL{2nVnxA5Y&4N*%Z# zkV#ivdHlidlKKqGnv!cUBzRwWixVUn8c!z?LR&qL!jAFUNV+gUu{9IqK=US?PF$zR zB0bur-Zpj}=Wj%`EB;5bf%BENb94S6Ev#BCs`0qh_ zB=e|ajPp>O`GM9*y!l|)@TGAFh~Uahl6xy1_Ir0znl~qrfo6JBc;*uKgTZ$e;atg6 z2Ve>I>v(t^{lS@;{dtD$DORTqg6u}FIrJc1F}Jr<;`Xrg@l__~1foH#{?N?#R^|Q1 zFH11p=XkVXGd`*ps3y}Sy(H`!Fu)4c9!S}BEsPx~<>#DV`CDwk4IQ{o66_4E9lBtr zvI&Y3eNLh`^3ryYNI6AhdoR5esq%rE@55OziB?u7(5~nVo!4T~_xtEHW_YoScIw`_ zIzL`o9Xm^QcSHk?AEm)uC6T0m`|AYFaf@C`7&PvX{}c-eHHn=IGLfY-c3p=9?qj(2 zSdtsg3|`^<^An(#B+{?x%+mJ$a`iKf1}a*8;o!tbq#saP`Q3=b@`V zdVO8WP36ILteC3_)hMX-FveQ5;i$$==1saHs~n#e#+FXy_>b5kDymVMMV*q_2RY#) z{gdt6CqQmtPVx7umyp_920m00Ly62g*inxsaHg;#1ZLB_=)k&Rf|k2dh`_av4vEwM6K^pU&m6&rdL{ zxVfooPZUlpjrDr!R;Id8cssr2ne+PU%-Pa5v~yfh&{imJQ*@JZxaQm+|e`hk<;i$In`RC4*V z{>C#yKi5Cq3+v}-9@x#q7RWS^z9>9t+CJ#MsOg;X`+}@yf>al&7Gvx^px-d;vsbV) z8SJS*I;k&;$}Mi-R1XAH=r4(a&Bbo_2ON#h?wYf}1yh~XPJz3}enH3l%W@9kxR1D}+#ItLRG(|un>VWFO z9<(M!#dULe=moMZFfLM=$VQvdM>D4p&X0@A6&e|_LQS^R#ZMi^8hqanaj_6C`cJ`B z*jSX+Iq3W_<#<}{#@@K7g9YdS)=pdVUcKmK0gAGuFx(|oHO8U`V*3u)ZR_ zAq55eL!Y#-bP0{A+t21Nsoau^Su5kVRMm57AFd#?ob&s$Z>DOJbR}X)q>R!cjumSG zf{wxpjt6T&S*RZ@rg^)l5)`v4{V8g4RRhovZ8Eed+$g-nMd4+NxaNji+j&pNx_tP~K06f?MYKU6>&Wd6Qpq9$t z>j%x@GZULCB_@W#I|HZqrkzlfXbU{GGs3DX2Xm{!GlVy!O$}BI2H|A zDKv-0+w9Hh8p|vq%PuC{^OwowJs!f|+*?++FI5$(fG%9~dDWG}Gx9yx4YM_&M;fs; zH4X@o`{n9~#Uvk&2%o9Exy}L{0Q++@{~CJ$_v;*JI@1s#zzJ|XMLD`sVxTd{bH5Jm zy$Z^WzzuF1+@cnDb;lT1X%>zAjDpzZnH8CGjDigDfYaS1?T^WckunQu++iBbB!U21 zGoayZ8xuA`a`D{Xd+wfym_&!2*t;DH|2+=gJrx|RVMw~*K|Fz-&$Em7F+cdQNFi0I z^p}os77(*YeahcO`3r^@es*K?M6X@zU{6E1OR6eEI%xwzb9aTna>nn*1o>g2+FdTx z=T_SnX(o&~+#yG7-C`UW>A5i8Qkrxw6XXnUDkMzb3V zK){875Hg+fqVQtY5h{Tu4=wk}6`Wjqz}I4ugM9A)QG4L4WX};8AAbRLWL&GLwBHuv4LChfg4ZNdzBED(rb*VzFRCE0M>&b2+PsBmt1aK z#!G+5*bGqea1NtE?-kV!J{1$Q#Zuz|%e*2t#6`84e;*xEvcI zF(?ZXfuuRaTZ*zSv)mB&TnlZr{nnXvyxco$>>>mCKF7%iXq!d5!{T1({vrAfMqB~W z>tsu{qultodQK*@N)J{r^tE!e2!uyQW0qby$)MX6cT zt-5Xhu4O4T007fjp2=M1AMZ^!lNt@~X6H=GreS0qW+Gcuji<2s*Ul0JS2C@6$s!!- zhtW39M^Ovp@Gbo}Fd&qp9%h(?V2^!eOJH5ivd2Hzwq+eLz%5H(a{J0+zE3=F`hX+= zatCkJ6-OiqHD|S|;fjDH{j^pvSKL&FCbGwWKE&a+&_P;BKSU&mqN(~1Z!w?OBKwV=M4#g{MnOG4l)y@Y?Sr^j4vOk1)X5d+W#C?D zU-VD9$4(!5H{e7hRqbkm-a^CqR6;3`c>H)jgfaN!O-N3EIu7=2ff6fQk1Z^Bf4UKD z9sqa$YapN?5SWEZ`Y#r3Ew;ByUN`Zl0~ot*sQGI5&(9P#9f}gvVBOK3u0>@f<7AzB zMvb(roG$Y3bdptLAta=jbnlSe$qz>|5_G_8-v=bXu>ff|cI!KJoj~L8 zEvfCrA0r(~F-OnWq*)oV+=WAlS$vOKOQN+-Rg)KL`ux9UDnXT5D%y1&a4%Dz1<+UL zg2Goaxsn<*3?M=#IYWm8n0ksj(D4vu$OHZ~y%Mw=-KZ>c-3;zk{_2FaQ7u|6^v$+{D1x#F6no zQ-fV;dUhKO2z|Tc*W4l=^s++GEL6%m`8vBL^F9Epj6+tR;w^-A7P~&DpFwO|sEXwt z_5(S$r=5>)NHsNXJdZ8P*kr>?@ZbTr3WCN1L!K8u?p@qj|8ncqNjQ=MWxse?zn`xj zODlO~k*@=q860ZHmgK5c7==QMl8u=6qRlOiCg8%4Bx+Qn<&&jy{!%~$9Y|V8mNC{X z(V}Tte?p17ZktDpaAI)paS~Ckq~5?q-x-gAc8DagQCt89LKN1;VC6<*5uU0*JMTb) z=r&8Be@Xm6*e=DPG)o@(78zu*oQqqgAlsq0DJ%OslCqAX`ChOdsPo$`Vfv%CTt%2n z-2`ApTf&$gw1n=;>fZW4Uahp>c~i z`yK39Y3Y!<`SaLLf-M_D+Yrh!O%SJ;o?KqSeb>VxU&3nqp$gQ(Q+aw!b>+VFy}EI7 z%!cEyvsL>NYgT+}hdlUq(3VTYXnr^(&1xmrzHD!Bpj*)?d8^Lou^dnVnt`b4aI(Nu znhK04Z1I|->af0o^SFisj+=z-Y7JPA+X;jrLS`X}LLo=($hv-*l1(O`n}~P1JPNG! zRGd@s@)bAOioY+s&xRDPjfF-QJ}xa?!nlH&AAIc-Qs z(}J6#I`DfkB!H6jRg6Jfwvq30sDiwd?e-BdW`%s2LlKVdemx-!)!}4y>(D@3_yV>; zED1S%`lzd`9O&}e!qCU{QOgqA`kZ17nr2Y-HuV~7p?NATZP%xiz14uGk#EsYA4Ot+ zN30RtAn{?75({)f7ot?*SD(ap*WG4{2;%^L;im9EQ zv#p)8iPL|mGL^dNn8kn)ddt1&rtf?U;T<_RG*jfTFs@T-fiHmAFb{$&mKgK(qGKQn zYYUc?UDyvIaCXA3{4hS_+5fnYa|pxZqWQlC+W`4mV5mnc*1B?w%+*3myOv{HOvtYdZ$( z=uQQkITr+os*6OUK@s!JbXdZO&cZXpLXngv46)0Cq%*R%1(|_;VKf1p?lc;-;f|{( zh`tPt-!Z0}xPIs(lyI9jwmxE+Wnel9I&w|DJme&qq^N>a6EhRtbD`#~Oq|?%LpdtV zW$Q0hg4Tb04!ErPRjU-)D;cRo0k%lAlb>Aa469TyuUjxOcUR1~I;WdLT$>5z2O{@t?B412{uz z)#+$~Ax0B6qKURh>KDxei9gmkXSri^ z%$BN$u?48a-CtXR|7@3J*;&3hH=LA^oPOLK0V{druZ3;-&8DROuqgi#JUp#d4(&44 zN5qK(VB(>0?b{_(@K)k!5T3t%<+@`9tJdsQ5ya~(1PeCF#5hP6oI6H#MnOep4KJ<7 z_X?fyV967^v|}$j3yDj8>|Q-SF20LP`_wLA@b>l}>aOivu@-jCu!=!>!XIHTvCd6) zMnj=YV@N{0yrCtBsI_(Agk;C^tE{Fg%_c*6ofvG~QB)6~)KR$C+wsE7b>PVkjf-nE zf9U1#T?vQ_ob#-&odHc>iXC|AP13?;f3?+<`EW zu;gsHWWE5RXz0sS4N3qFZn~Lx|7D!UI4#ju7y55_f82Z%H0aMpAOE3~cSbJom#jdd zYlVLLSY6Z)1-cBEmM9_7`b*q+=KJ)DG%w7qX($0_2#;fwiFCM@Zy=&3 zOy(YIW;0g@4#9&XX0vo=xrE|XsrlD|9zlJXNaj7^*9lyUW3@=Oen}LvS**k@{UM*1 zwJ**H9*D@G%8dwPOjevr3CpmLlaJrG6t!{- zqq--SjbaZ;Qj84j)l$A^EjY+~1}PidrD8~yWlXB!8gq9)=Wl;2O+WTn5%xXuwQg5n7^&z%L@^rK(Q`K+pqKHKpcFB85#L;#jx55j|Eqm#NIe3*Tb1BQ}tt#20^FNP< z{|R3c&*KpKgY2`)ughs9osRnPE3`vK(brMM>W_?ig+&q__9%X$|H@YU1*#O^qh-t)q4`j!&5y^)RjLnwb#f2(~M^_CC!>_4dA-p3kL!wos z9_+z*_}=z1V}D+kU2OoW9obZ!$lwyw;_u2=X$%KPfHpp&+} zj>O)C_`V?4#S8kkttPu&gEszBr$jpEZN~h-x^~&iZt^fSEpUfCssDL#@no@idX}gz zZ``YfUgqv;@iY2MTSqjYZy%v@(BfFL6v+W!l4@Yef3n6s8Vp+1inZi645 zFI;KVjqUE;jr#K?OlT?JYj3lLB3^}Vc$CCBwpB=2lf^Ub_`FT}x@g0%jJ==szb9DnPt6Gw&Pj|WH zI|3e+N1VHTy?`;}PTz}U1&*CqrRWFox8w#@u$OT`x4z^gCO@YqxTjWSXf>ZA`qoh~ zQpoICH39Rrc&jJBe0oTCLmBgE1s?_ZFrhX=o8N?E*Q4mK7L~%pv4n6vs&6hL-)Q+n zRur&8%59GM0SSUwg-7|cP8vY_F1Z(GsTx9XKO!0BncJT(EQ!PpFkDC-dSyvn0rBx+WI?^_NI+lwk zD*CjfbtnDdIYlnjZrw>HFM~7dy{`==OO`E_>wbSbobB+0u3h-?vnLBFzMa)_`#qm; z*;QpwYx&m1ZLFs!U7)_wbiZE5&LfE7-DByCm@$Zw^vQlz@#VbuXJ6hmFoo6fltt*Q zMa;i>V$qf?wNaJIgbsg_`A7bjo{M}Rok^yZ4rc?~x8u7^WA#+i;c@9L73V%Uyw^0L z_htI+GjYM-kLg>IGM?f|R*_0tfqQ2-$4!b(d;X9TA?xiGJ8SlV;17BDoZ~**{bi53 zvFug;6GCcT^2dsCpXkl++@?Ng6=YQBJNijJ&AR%!?JvnFDfN@h$|@GZlw;>xq>qM( z)HYbF9rO1tZZl*}KlDg=mTedQD$iWmzGNqkVPEY=*~6{jOA7bBesOcXezy4!=e)P9 zPqjYLjc&%gRh?X5Vz{AId`a7s8IN;r&rb|zSX%yMC|LfqX1HVKe9@?`H%=?{V+B%; zYUCbP!*L_i$1(jTM@vcJ^~fUUPaD{xi72@Ht{e4nZRUPqQ0guHX}NeQCZ6@BqeC0! za-X@*@bp&|4|)7kK8|;71hb#NxOsSYE^Roj%Qmg{W_6CIjA=oy^u6Dw+(NtdJ(b}j z2`&FeeM&6R4jl&18|l0XK^H-bvqwF++1Wg?;XC_%7CWpNnM5*(AOiTdWnOrDN($`k zU6{N1L0HWrA$Br=4SypWE`u9o}h?X*7WS@E%lRgNF7Ej^oJ*&qH~iEnJx??&Ubmb*HMU#i4x_z`cr zJ{`Pl)hQ9-aG!QJ!CjvF3?qA4@FQbOESuFiUsv4MVbPlPls%{{n#(dwMF_Y(k9Qlx zbmp7aEN2Mgv)Pu@28Y<(%tg^C-UU>@3ob`zx>0+Y^t{$JllY947E@lj)SG@cJ3q}w zVI+1W)SU9n30{0}kCMPv4;I0k#gn*u>l3TY23#cqqHjKXs~Gvmal#>WFaD&X;>6Km zMue(~*e0fTQb@gFUdv)e2JL17W}qzl=_3%pSt6!XJeQbGY_gF9cv}B z^rNRxONpknpBl@PCzuyE;Cg)W1{^srN)01trMfvTV6rHP)X|0ocGN`|#x#f)EuMR; z%yh%JRFNr@73A^mxyDV_9SR1lOM8A;~wNbG-4ZdOF}#1osJp z8%eO0k?}sj*#`QZh7e8JZq!rCeBz&*Ar>d9v*)3+OM{rIQxZfYuJYd7PKa$Iym5uX zhliEG-|4K=U!fe-BW&}4{pu*LTNwZRw-iutVD!Kdl*8HI}m&Icn zN^5O}KX=ZLD=}AmAHF3@_igAJE8?Z?i>Dc1)!yA+F$=rxWHcFo(yt1C0Ox!B#b3$( zidb%>CE@&V_Z3d9D~B-iFXuvLE?v~WF#Pjc>CIy(LB(^r{fqPN*6t2dTId=qS0VZ9 zJN9!zyYmrWuf643ul}x7u_OhLVcIDwSSVall%ZF_sG(Y*M0uBK)$z~`Cpq2VrBVmve6z=Oe~RJunuCih`vgE z_|A=6o^qFt^^t^qRe_$PqvMZHRJih7&W^69H!!Caf8%iNLr%;lZ0kRbGSq}s!HJ42g`p(J7%)mv8MT6nG%Iw2zKIJC{nktS?Z@Bw%JrK=PD4MPHbFtYkqf$5XDC}{>gP3cE4>B(V7=sqx~KO& zvsO#h!^dRKsSHPSQ9g>O3NapZ(3a>7!U#@s2$uD|*pjAtm#5EkZnZ(X&cn=MXx{hs zU&Xh^_b;>x>Ft+=w9X!cJV+*UTNiKqNoUdJ-0wX@e7rP36Dm|k`_iFTVW`|aC?Ic? zCMZ;dTGCT+gGD9p1#&0o@t^RcDh>U86W_^}ttDx*lpiUDf)zUVNycj51Uy~eA94Bv zOHTHliD@pJ-VLjr{o*i^ep0NrTElSsW56lu=!2?Ux$@~N0(HUf3@;TDlxN0_?}R%v z9AidV1Vd}}Z6!B2r|QLA*+n%%cel3VCaj(eGzb1a+#osl8~^Vb)GM09eOniT@IU|S z2A|kGu(#y1e`0BC!_VvNXdAAnu1G~rkH3maS?R7e1Q8-32>zZF_)o|`h~+AHA#+wT zdI~{2_wYZk0;%K@@Fwi3wxS$V(Z~1;{D;t1R!tUys$wXPEQugUr&IZ^tgaXA_vC$7 z)8!=I6`T#nYnj{Xqogkzo<8pqmV~#mo%7QgWHmV-qY7N(ZTXk6AN9eHoZa1_xh6))*=^`$j#QuoWQKS16wibQ*YzS6M~lnX0j;oY`B37 z?!~ce>m$$ZFbOYQUZW~K$IAD23i;3%*FPS(H|?wSW;3kCD5u@7nOgW#+$aq})HD;} z75h6c2F-tUWSNNJh2!UKbTK>(;hoNQTzzsV&ja!?`vJdN+w`tDJ$Y&C)Gz$)YWZ@e zNG>%WAzkxT3}#C~Ci>(_pr_9(7ol`L|9}G%T<=2&a{Fp|jz5a=RFz9D<=ST&2Vb+g z4?nb=B-U)pXulFjiktx*FKN`{0i=Dlyw*}cLrJ{L?%Q7VeaDG?pAopQ!*DcrA7zP ztEnjnu0F8XoSK|=yvyuZXy|v&Oy`mYO4hSrafR-tLBUi^=^J|i2uk;0jrH1@*}RVY zvAf$+#%YLc`CzJU@YzqG=*WeXJK{P9Q~md9AXClM4-*H8>QkvhU`_7$LEcO?-^;C}PvdHxV( zy;_1nuRp$R;Ex#ZJ83(eq9~U1-}B;(R?}NRu-xsNpD_kavk^mWHll9NL9fp8&o5+l z4T6IY6%kme4qGfs87Btw)b$->b)>e6xj{=^1`Kj$#w|w4R}?vL_A^VT5oWe+-oNO6 zd`Gj&7)~y3d$aO4ahAZ*h_mNT<+yoi5wpS?gdUSHbxWiBEFXNR*}R zAFsK-@-}l_&mN}_9?s6LP=UVM3JmZdayEpkR1EWTo2%&f> z`-ev4-cx@^e#q=jd$4c@kH*e`Nm$Ei0tBhJS4v;GkqPyEA|xtLay<~g+F2K8B>Z^wF{{P45B-G^8Be*myv{YMXqnafQ?m1A7(v0Nmyn4Xp@G) zB!$XQ-Cv&xsjVCJfJ1hlnrCC$re%Eh9$bJ@fd0B`t4JI+_EZHJYHvYk2mKuCtRfj{ z-;D*G${utXD+c55DoHN-s=}KPa%SS_8G3cP|NSnva{(cuMrG2)@8BcdodA2IEu~p9 zYUp)$6$Miv2U_o(<^XTkWtk$AQAt-(TVjY?Q|3DT&CnLlR|JOaU=8C*#&OhUB|e*O zd=R?qo$2#mpC#Tr>U;T(zQ?Ciq|adUQCnST!g$L=-1T-*2;EacXUTghFyLULF$=0E z2HQh*@0@o+!&02rSoH{h7jFNSD`B!N4r(a+c-#;B_#w`Hq_jMGNjk&e$;Ei`c>&)r(MH-joQxMxdX^Y1cAr z;2fCjt(UXcXI{Im5kt-#d^>7K%hu*H&lJdzcERC3B+GcyV=K%Al&xtLt^(YO7Z>OJ zL1qpR;U@iN%BS1&N}@1?HA1s~R^!fmXr}r7Eu~Fm2x`&gYil~)+k%iU$jG~sx7bYb z-@j;B((-&n0C^c*R5uJIOH@M14r+xl zU1bOrGd%nG7R{;ip8Gk>MM4C^{(Ph_%;36W00J7I{X~W-2k#Y~&6zs(_>dK6 zdlBF4tze`K8JG#Jre=um+N*Y(>dw{m@x1@>*7L*kh~~mHwO%&GRZct z^MtSPgKjRL2>zr(%11j9K=k@K2r4u)t)}yDZ29nEw!&f#eV&!nAsUOUTC9*Wn2# zG}BPx0X1F4%os1qdNc>KmUu(Xlcv8RuQYU!L-i5sQE!4W>J^Zvdi4s>P!-i$ySWte z?WO}WmuV_&M*OGFe{BW2)y1^m+4Qn?3PKhk*b?o^NGL!V)rwQ%$0eeLi_HY5C?Lav z$NU^0?ZFfxYc>jFJT89_$^;wrMsBExh6UK47W_mg^L&O#ZfcH6YOC)QKyNPONgh~3 z&NpC0W0qDgOI(M zb(Z`RjKdPRH!0a?{=$GYdt1As_?K; zC!r)W937OT!vCGh?p4E*%lx16;~T}7Ngz`N>Je&sov?FTHSek}=i_9vPbnVm?y_qiBoHd5JmBtjFACC?LB;Qe_m%jjqQ)3TFBd)$~A z?%t_Ew|#?BWb^uZpa_+y0;=`KZ;3qlGNxfkRV`q^dw!8shShVdPagkP$e&%ZJg4O^ zQ$BX>^KDnd1-jNYt*b7*!pVV)-;GZ=OW;uqo=yfd!LApz^X)0O*oH2VA`R0LE zJBz}GE+yoBoEsO>;E=7vcP05Hney8s_ul!XtO;Me?iS!ifYQ}J5|M7Gy%KpN77)9U z<4gBW-)!HSTN93fNBVrqjWG5oJN0Fu3S?AQHE_!TOKKP(d$P279kb|K5%dm^QZiG1 zk@4D#v2XtI_k&SlBQ)4TD?o(mxC`8Y)hi4qLaX6i}ZSbIm$&D=4J<)E7>$m06Vz{!(HOzvY~eTHv^CZMT*OsD+` z12(oYPG<)bTF`c*bDD@Y#Arcd+5SYtK&G1=GjpTFbHM%)Gt|^)XIbJp-CSeMYQ=`^ zn+^YVfbEo-YCJS)Q4Be+>1;DBu_6x4ycv5z&AhBy;K;I^)6e(EbP^mt@~Cf=?(zlJ z<>c~!k-JYeie9ZUxuxUBo%`w&*zCDG%31BXd|IqwN?fk9UZi=5>_pCx>uOMW?0Tj+ zO<{&gV{nyad=EejBa`75c-m+`z>U+{HA?r_lZu#rozppF)+2RI>_e$s#BNyREM4KN zbZf9LaU{udgEVdCRGw@hx2Vx{!={I}VnY0>r&7aW;_ZU+Tfov8`)jY_H3B9DOj;>j zZn6#h%|eY`%dieD?!wo^`5x@#n&?U<-95qIg?7);K|S}x_qXri-i;#>X!EdgHOez&Gn^A-`p_df)S-?7eqAdZR=3m zy2E_>T)#RtZVs0BwyAU~4EXkRcS>xvl=;0*MhD%yvN)ImliJ2(!gLZ;3soRJd6`7% zhi~V%_A*pRI+^sPPXf03ewSOYgF82kD5+BL0hR<)cZQgCWZg+d4mpwy#An>*Zxrv9 zH6zNv96xgjYk@`0@HdgroS1PC){K85mU5^kr0A!SDH zeaeyc;>rILE1qe{+xB&QMcURN4B_c`Jo5Kz85?FM_i=gX4_4I+ux+&n<$)`>Z*4yN zmWH8S?T<%hlNZwr?x0#jz8h2Vslw4_UBPSanu&q)@ zq5<~4$amedcbE)lF(HJArnmx48zru0?CX`ieTn|MVAq8`R%nHCS$@JsIyLa&I$=!$ zI!NR#qSRYNx~X=*fv<+^8;LBxf>TT(uwYDaR@f#x-=9sszP{ey&f9^w4V*h=!$mI@ zv~m}5Mn5j~PRy(D&d+>FK;R}D?G&tUs4ww$(sbY)7m%L<<9RT%kfT4fep5B$&>g(itJg-|2MWvu zPAMWq3}ovS#Gd;>HD{1P6-uEk1Z>=a@HNJGqVo z*csJxljjRhR(tBeP0$XYaY5c?zfqsgxTL{%@2etA48V0YmCZk;(?=y%FH8i`-G3EjYcnP0xC zAR(LQ=;!6IrS0GS-bO1VjSwo2e@ns4E+7S)ypEa4?>cGwWj0VOSiiCTIgUyw#+9ei zo0JPOwn+_xN64jRqyJpc+=$28KhxU2ut34n={NqLfIP_i1l@eQ{!Hz?ss_pvEPWU7 zdl)T|^`BD>5l@Z&iN`B(q5;-IP8E-R5;4>(LIh*clop!NWgN^}4UENjG7bW%CmZIn zagI~X&Hfi@T+z2dSF+7{-tI+jBarXrBEC*#`O_ovd}MJ*2$@ZkM$~iZ*_{;7$Z~JU z8K?lzrI%%i^T(LW4o>C238D6$ye2xt@;8G%^c)$|P=)LF+PeB~u)<hLMl03x<`${eC z@5NDzXJB&0l~QX`{u_qPd6qz{I&UoO{S$~;S5i)LUB1rO0Zu%pq0u1zpOMs#So->)Ibmv=Aaljj|!5g>JOI4?eAx1PBe z0YC^V?;EBz@c|%4YwXSTuldc<(5f$Tlz~D&%TG40Tq8zm(u?yOr*pTs5+m-R2A^Kq zxyV}S7q{r;Vg2qr0`M^TnMdOUNKLZ`FjvcA35*OOLQ14Nk1tqZ5*Ub8V@IF<`D)B% zvE?iXBML;Zk5JwPG~**g`0M8k`iM?a&?m7~tQPKurYnm5r|KakW(-8~CA)4!0}Sv8 z=6jKDe0IY^eE#$@fy?_In$Ph*7kK)_&*6h}rfu20n5&=_1BeU-u?;EG1xn(X>|Iq1 z5Q2@JPEsX-ZQ>P?6f0(>GTcXT%e8OpSl2?QH;)ldqJr=!kxlWyR`cazzCAUJX!`{^ zw@6!Ep@+dkbKP(s7j3S&g?tG#ksrIYD$BoQ&zp(PKCii*2zq+RKM_q_?2S+W*7dSC zW=<<{p$WMih0cv}4alDwY)YgzIjGqOl(rA67Ae>m*9G~V{ramr8mLoJqz|&76_}cX z2l_a9PbvC%*7uxd@$&V>1e)ktmeHLc)|Yi69simh*q#EQt@>8QT)V|x(Ma9c)mP0 zyP&!Kh4m6Ik>F$LR3`=5Z>$-)NM#UjqZJmEPAMZcrUD<6a$<^rv}pa0%hK($A%cq) zm2ZxAh$26&{03+Ul1d2`s8l;^XX%sc?cSVs@KB)pc6N(I9Z&VSLy4X(j|6Du$NM=g zYC1_w3+S#Yc`TFe$@i`8rY~19H6_s>dg54!pfSGA0L|w&c#LTlq_jQpOKMhhml%&`CXlpogEq0}t$k{a$5JDS$D6pJnWW6POm|OkJX+vuJw4 zcWFBfojb9UBkk8jE66R+jiu#Exqs(Z7Na>KH1;si^9Bals&Ng2=P}$2Rl2tCwso*L zzFy9(%Ok>a#W1i;{-BKbAAZOwyPpU#U<;3+?g?J=QEXcZ-hWurCHW2{M}=Y%6Kv9; zZ58@HLd1YIJR({pZYSG+>%j%V8_Pf6{dk_PC|eqnlLc8UV#m~AsCh!f{UqR+N-I2d zrynacz8sP4-dwZ1c)JuZL~Qo4qXa8AVe*P4o`UP%K2zNdca3Wtv3V1&d)1T>o+lCq z%R?D_+3&*5#HT;#oy0cvUNR<6!l3~QFuU%!o1+fjqiCF-j2iIgW`Rg~Ioalt9AF;N zAI@pI4IpDaP|_z6my8I7U*g?e69!6_)XhZ^1S7wSSxH9>9fu7yV~pOr_wZ}{0J!Nz zI?2aJHVKa)c5tz(alS9`T2t?vN9KGwDf*|qKQQ5~ndmbT2sK8A6n}WRO?luo$kveP zI=ztC3{*5&Si235?oV=HR+51wsm8Cbfz$Q6JO<%TmXn84$oA_HX8tehI?;d$n7p!> z_op9kfJeW=berMjyI|ITK5wO7l4YC(4pIXvv4DV$+@>F`U8U1oSxi?{cJ*U`Oy48y zrI4R~41CgF5dbTfpXjmUStR{Rr1;+ohYj~gJNdae2p~VU$--)ck@kq zVC?3wZ<}#b(R>83qBTeTXANA>sN0^cU_mZV2eBpP|Iz3mu>K?14a5U(y%rW<*mgWR zcd<#!eyUfZuFhxU(?iKXPe-GN*MNSlyiH7qAlXg?4P3h=WUICP&Pl~qgLJ~#XM+;} z=;A-@)mCk3InC0Tp`v$kdRZp&XJU{h;}P?s64$sCfpbX5*{;YjeI659f_xNFgI4x& z07s{vmYLUvEw4*XQ%Bqa`LeMrFQ}oLoo0m-CLf7Ud(e;6{kVe@%%gKp7B-Z=-`zz` z4~gR&u)*Yg)pl6acY``!0uG?^!}!a9aY49A^o^^4Q?B^@SkRazLQ4vfMmQh=k4P@f z&cx=3tO2?2DZ5nNYA1pG1s}f=USHk*{LFj%?UZ(|ElrLpSTWwpIvQs3WNp_j0(?v9Lk$+`DYEn=-#W&v ze6#y}T-jh_78fs*$Qxx36Z^=c25;-duhF`<;k9Ft>mJZ)@?2oq?70?C&m(N!J8*?? zk*}PG$@eVC?&R0lcg25U7mBe0zSPvr>~jmzV%O#qsQDVkF3u-mv)ZXtgjMiiQ!{^` zm=j5DOs5G$hvmI0zyg14r}|bI{5SQ&bF=fBHOe5IEZ%QfDkKgN&Yn(nA}&ZJgy@o8 zFEr47NxZrpiO!Y3RJHNE#!}3-=UPnH*3WeZ4x$qCkMHSdoLzSAC6$rKWHN+gpVO?l zd)zU9csOlzVHmR+#;`gflF{mdmx^Mzpu{7H*YarAX*76F*L>OozCr|(zn7YAH?_5G z+B}c=X9O(qu5RX2HchD9E*ziE9FfGZ5F%~@zrsWM==)V-EM<{WoT(7kXFRI?E)R3I z43;#ciO|Vm(Az=>fElzcY($Yzd9TX|3%luqaRgOXwy_HcUf?-3)xZXiQ90 zNAm0j(N950G)10gH2AGiGFcWo2C4Ur#p%b^_D{i&`%$(c53?ncSUc$e@kptC#EVR~ zNgKEif{I01;fB#SvXngjO)tFtE+H)cQ991j>QV2WpJNtRMrmQrfUnJM)jLy%F;P)I z37*d9!Rp!+1Nxn_@iElL*6E`use>3$gGa!{a)z5)fBfA3+#Z$FvgId%l#mETg?%UjsswAkj|Zvz9OJBL=wO5uftq8|VbNLyArfEO!2^4Phwzs$iLs_n3cM zM!*~7QCg{Z{9)ZO!7!h><>BltHboNwGEvUbV6c}!MPF)Z#^XH|wv0rpUlTRPI4sE% zNF+*;B57QZom&rJpzV!@fdCF9xfLz{o7+IJmiYtL|2U~>)hPAtYrtx<(YaUKazdw2 z5VzKtq?;S8&+!}qu#!BhFV81H#%d_77m45cPX6dBG8(2~f5mg%L<^Kk+ma)Hbnuef zNx|f~K&}=&0>Urb1Rh_QD7J5F?yj+R5I@G z$$#8KX$37%5jd;iU1DbY-hN~MSg?Kx-`mA~)ChsG3Q7wtIY2>D(Rl_EKaMYar!-zZ zJY5b9Fp`2Yi3h~t5uqcvXxnL?&I*`*MZjAGxH;R~N}G+CtV^5A5MXZy0ns;;zW62i zFFaGW&z{?^pso4dF5K=SOuh|RnsC~B{eQ8ZEkASMUIq@6q~H`KU0IYwU`GX$55{Vw z;^S%=>Uw>A*CH&hpAeVVn5L#}<-pGxsA@oJT3e84S^J@^Lx~TbccHII9`hi;zbw{&i+K&Gq&w{y|6Jw{; z{c9Dn(^QeBfn~OD3A**>En-Q6y`}e9(Ya(u`r9Be4ABeX6>R7_T7)5g@BV<#^r_70 zR?nN5AYw+-1m%R8C_;qVm;E>&l7Sk0zWOZ>?F^NxItNlbS6b>33(?q(f@6956Mp$4 zJf9>_fG@cqjEH?YMFveh_!n8Mj?6asBTS2G43F>?1FybcAwyP7pWvk%j)C&(6m|H% zL46kIGh{h=IMe7hJJEXgHrt27rhgOKa$xEoa9Xaq_C7T%xeQ z%g+K8bkMLy9Po8hYiG=oddUak0JCO=T_~=MEwdg0Yj;=SCqrKV3AiRLoWf2p=4rOH zSJUseBnEP#F81&Uhx{oR;vTS=Ji^104ffk*gDlSxrV-9_Dx}B?kXF~c4Zx+qmHz20 zC!(yUZUHp`z0A()T+1L0ToH<%OJ8{414sU3{X+yfy>af%%foKvwMiZY#|8=9EBO$* zLsE3NG8#0~4PR4-5}#ZEsrWwod%by$&k>n=$NaaADFa(FD(hG7?pI(UJn!$Vgec$t}hR?)9e0QQ~TrrcOE%blrO^Cems%+ARvD_>m`MQgBSQbQ1 zHaGNDNwVD20t;;Mo^gPvCtY!em10JXr)NP)N^NuPBw>22k!x5wLa^k{^`bjH?4Vn0 z@RZd>48zMZcvGBBTBh!Lp{S%{DX&qeasTA>ET;t zq9xIzZoS(BF8B_3IA|p{b4wlCP|(9PGHsCK7#0txsxemb)RnG0DdwXR9ICZ-@#win zYDcnA!^8arJRsqb_Ha!U5o6XZ4loT5rtduNJk>W}d~@`6k`Q4~tkUZr1Z&_5>vw{j zmKKn<`Xm=SJ$363Ts(SCE3o$AEQ+Uv9fLRXX1a?#p{yk9Iv=48WoW}kOd6C_`u*bK zwRIPL)_gzkbSbQ^?rAq}{73JMO%J)^Nkf3z-|g9XYp%v0B|qHL0P5~Y*$+@C7kO<; zV8?r?A2Amqp{dUZq7=8inWvo5VHf>VUmKdud`ZY8nXXt2{QXB}Z@n2~0PfBD^ww{} z6<#2<)wktalf1cJfB$j0e>%-ce|owU9ywj>-(dCr9_vkxNXes0rLC^r-5k|mGg?j4 zXZVaUW(%9%3F4$(*99CjQ>(4cl94-8$`l~^oB8CT;xqY+`j2%j+Yd(=60j4d516W{ z*-B3{hp-^AQns!Uy1(ys`ihLq3>aUyckGio5}#{hJtf+Hmw*{!T1wBg7*Qv_R4ZPS z+AKBk#r{p4Rh8NCz;$GlkON7tQ!eR+-no$yP;y=CY3j zu4D&TTT%>wvH4&`AC11t%Mwt_OmTz-Hs@3GWw#vqN!|P=S|C^v966s5$Mv^T<4|bz z&20PbmPKH!YqO|ti;r`aOvJd^(e}=Vn5Pv%=()Gw_)cdC+(!PUcV>aF)j6S@;aSVY zAj7T&Nzou2&Y5~ZLegf}O$$*9B$6I9%xesy`-lgWUh&r#CX$&Byv z$y0opLquf8Kfg><-dy`m;BdOSh0rt@MA0p7ax{H&AR|1XmwKR=XcZ^Z3=(^aXZ{FM zFPL+Y1q2cSrU)N`S^QBI__#`n>Jg#?HcKnh{r4Qkr5#+3uA#zeV5$L@WCdCZ}!pH-VTH%MysfaJPb7~KCl#w$26p}>i#%r{+Z`8S3JPfq>$Ojl9iJ#3ps zfWD`^wVmXTKuwb(r!4k{2ENq=^^$D$Vnj-Bb=Rm;=(cDC-ACW+jvJ%d)q=JGf)D~p z+~mI(c~={DzZS-g{RO4hw2*1YqI3kbLI!JJUGPF6%FLpTWbTt5*f8f1%1iv55Fmqi zoq*JNFV}I9J~KO~*(5jlDga-Uq}U1yWy^2&-0m?534@!Vx#QXV?OBKhNZ=6$%GoDL zUtPZjfQ%6CVter(m!FBedXiu$*sBf%nS7D216@h!B|d zcMX19e6vh~PgbMfUC`9kRw?8p7iRe?b!AyKlkui0b&dn9B0Lsu2M|0v&D$a$_MSpc zQ8rG+NW6YEKS!V@wxuyjcxG3p*{)DYWPNI?qNSb~eBWeV0e&0x!2+qNY65j{f6JJ# zrNXtJ%9RFgy0+|21So?!ZfjtnFk23Mp7n%03L5`I&AQ3L7yFg9nnnV+i>Y0E<3Q zLiC<)v-lD!6WG9;DPjaD+YG{YpjQ&4lpq@NUx^Kht3yw7)4-PtU5FFHXs#pEzVA`3T5y(XQa~B%nKn{{qMYqdx^+XLxER9d{c8N)O$d^E8vK z-@-G@9waG)^pPsAEf@Q2YFbYky*k>6W-X|xZfW$>Qnlpie4tlKXEY&;k8Q{c|H4eG zPt-IQHmvG3L0*vLb!b9f2&fd*CXIr1*S_`}7WxSpR+$kY{)bH=Pl}JEcnzc<-^x{$ z0Btpr6qC7Spr^E%WKV99bRZ-f=azL(Z+hw-V?t8*rm|-Kjm(<*%NU~4SgQ#^qBknd z)cO}lqm!|AOOsVn^$jJ_EofS&*nZrNT;uM zV5Yi!@Q50v-5}P2XG6KB5}bKSXSUWz6EQ+Hm_ql#+ra?^1IR8JU zv|+Y*=UOo+xu$`&-)+uQO}74a6GVvGhhW^*4@1R1dGXS6c7i({1R-_RmDT~$@I{23kbQ&olr zyo1OaUS|(CyDX1RV`E$r=55Eu(X8@6e9uh(GhlbG0vodOW{IB)@|pG0)Z!a*!vzaV zkaJiu2bP_92#BWqQP;e#F%tolf!)QmMm5q40d02=-d0;ywr6YoJhJi_b(T7YgS&jz zAtKYzd=X)T=S4AfSaD}2-C?Ia$Ei*CbXPKt3Vlw3i2q3;izZuZ=Sub$BFU>yog3&p zv>?sq*)nFwW1O8vNC~;hwN%3>M|I6&PlP=n7=g^mfm_00iGV?c?kW1-h{m#fa2!Ik zetr~{8+@tCIky6}71$fKtW~k^O4oiJ+3|lL>-osvLt?h|{R3dJ%%ZggY<=g-%+CcQXL$Zv2 zRhb;ob8e4YH(d_-&Pv(n>h*u6jzw^fz9$1_$>z*Mu=WeX$vwPWx3@5t-Fx%MvqcCX zGbe%NCZmvxS|Jw`62FbLwL4qA4caPYF_a2)s>-?)Nn>SZAo}<3=~F3jI?dOMwUZdp z;M#r8ahAs_Df0=~$Zsj&tOMsR0tG5UDbDFTJN7hlY;Cvl^p-h)%D=1Aa7lCTvkt~b zY-!D0;E>ZUc=Kp-u_7@GLkcDk;BqBd6Xwj%7jn`2mKVZXT8pgc9VPpv&6EB{cGY`= z_CqmZ6Ga@=(+i8Mswhw& zFZS>m$XVJ-(}J_lI6C3^Y@)7Bd0cpa0Aw*jt*(5+X!!HJUZ6n9l#6N^=f*VkmNT~1 z&M5iWXNj#|?32zzT;g3E+UIE`~d-^Y($Mgb4Ql`^nT^#&kqC{ev{p-=*LsQ{Ui<8cT4sp#;0M2`{UzWeLpNqxd^r-+i0>^c;>>4g#o;g2o6c;;K zJve-KX_1kJt#k~=FcR3$5T?WHrfC2NXJ*lVGf8=gBb(}!BBhGd&EHY7e*4j36+24e zebShz!=&(@-(#rq6ml(+tZ(&>lQ&BtM<&2&s!>)~D}f3|M;U4A`w z?XK~Hx#9v2Vb4}{nS!+#96`dL3p!`D)_(hQF?X@IjN-xaUlzSr3Jc#W38D_xS2eBo z*FkJ{a-)ph{rfqm(;7;|!@NPC^dc7=%ftUI;uc@lJ>3#VU!FMMYIN48_~R=NGIPnP zchvXauNIw{>QI{o_hnuICwFI3%miBB1a$ZNkMO~{MM%K}(4lA7pgaCQ{St*g6bve8 zj}!l|_TDch{Zc z`+h!ee80bYpXdI2?|GiRpR@POT5D#_n%Oh6VoYzV0ut3`VzjO*g9CVWJMJyRZnQpX z-RgFH<1D?|y}ECCvo285yw8}kG5+29>YE|$fsb1(+?zOyi1BM+0<@)v?}~ADbXEB0 z{n6Wgd9ep4uKwp;PdKM8J8pL}XJ%$+-&V6z&C$bmMH{b2*uO@t2G8@eD&dL%uhPtu z#WD;@)g{B*gH_FD58@xNn?u9>O)Uw9V~NX!Svg=s{S7#|wvcH!R-HsQ8GiAe61r-= z-oTzZh`QcynKRRlB|#Mv!#%i}G`Vrbqq-YNPe=rTi1SfoJmJS6j8>*nSN6TFyZW@4 z-DVu_(I8GXc_m{iz8Sv4I~PWAmfT~ z9QLlh71SoXB*ty?Iz8q;jow48(4j!8xVNiX=DnicUsy&~{VaMT8UN}vJ=Fq4Pi z#GP(TV>2?6MO%#P!xm|zk|Q+ z_c7lynuKQY!z(t)n8WPW{es#H*et>cN(-d>rm`)z@ru=SKWW!Q9crMWW5S>;sIMT|6*dr9T=_+>^qfk>CA7;uwKx)XUbC z-0}8kIOBN2s>=UrcZ8-S^9t-28D420pYM)4M{Kw*Tv*>06~&$;QA;QRDeOoJLo0E+ z>y>#mzj6BU=F>>ikFC65wZWv;8U`>Z=*nVM~2RvoxLGJ9bWPx#p32vtMEpD-NC)W z^!7(qc#q)bHW2Y-~Z^cKUYh72gYd(RQQ7_R+S^0U=5Q17;neLR~bghzWnYRP`JAq7+(x{u(RW# z>;-xEqdi0$3q9frcUjuPLiV6@8X$epwaZfqxcL9a6J4rhK%Q~c+J4b}1h-4swoo6U z_Xe=WXJIM+>1Ql2KM4MVl4fl|>kFvSG8~-8orhLS;&FRGT6kbE#uEy07Iwp>vuPc~ z@NNXOz)iX=NMLmZEkd#ZOZJ=A&QBD0V>PHk)XBte7E{=f@F3D)h!V$y6U})PVY?lbv%;1d2Z6E65xTK+zI8thKfG`M2`mc3!i-K+3T8rd{=_(Eq%C3FC>c;lf`X_GFFD#+zCLG+m@q7dj zL5_jVR;7Y(j4QeVZB+<5=LS!EhDs2}I7Zg!xT%&oKnZ-liPkjK@Hg&3oSZ>&x*9UU zSVo=xB`wngeCE90tB;>c1DPuXbD3IR8BA7Mlv%b@8R2rVAQzbKQ20;&ZtATFFc<-E z?ea&>Xml)9AMqI5!n=d})E<(8o`SCeaWdZ!fA2GVW#w(W7&c!TlAM@@L%Xv3osT5A z>fN2lQ{`C_V`cyz^$7h{0(h6$q49Aof>ng-#`LS z0IfZnu6}>GRzlZCPHm=&>pcTV@PH>&3dVMOr z2$VZE*qyqVvc#oSMkt;5+hn(J&bSie+mE6wJ93@7P>3H*7Gy1rB!!noF;onPkW?b8)#$Gw#Ia#IoU1ye8;1nAOFr`8kAEz+1TR&nP-x@9KbpDD4nFAmGEZgYq zI9YE_jj6eM7%xS3Art~j0Y zqN5;J?!vf9TFE^d?)|1nd~1#|H5vjTrOJX>#RGz^k7B(%n>3bjnu~_R>PtWE4=dxz zLLkUsK+>xr8rhII{=h-s8Ud>plSF|+h`@+eZgbob1Fjy~5oM13O}AD0*=TFCVio0?9#w07DR{(=&H>+5!M9xXaor)85!f@}4EDS1M%V&PK9AS8X z-7rw~qjB~VIpI4`os9o*Mf7UE@G3-n-IqEp#tfLs{}75i`0&B7L8%n_C0*@DLzZgT zsxz3786#k1;U>$o9a8OzHr$$#IzjWc?-5cxiA5@#Z>w-eW8PS;n$D9cgG5Iy8y{ubvc2FSVz{o04 zBNdIFKjvbi(~jdp+Z_=CpD?#*q%GYQ*1dEtr%jw=Nxr0u)}Q8}hC&7%5isT+y&`~3 ztY6aU0S(ezU?2j2na|MjhiBhCPVV2F8noDsX1Bvzw*TDp5>&>H?qV}={RBgp;3Dq}I!*kLhU|0#gpyv-x zV3gPtmW1b%1NokyzM$WDNPfDNG^f!C43AcKS*u4(_FJEU43HcG74Zggb$)-9`8hZC zFoMdyDzHMeLWUwI?v#IxL-jrd)`g0QO8HW+!A@Nt`FR2m0kDoog+QvnOyTLrudVk+ zN%#vn78Z5B*A&L21gp?&0`VSHLcm~(#6T_kEQ~3reE)I8cIv8gX%k^G2vIW#W~Wx^ z56K%P^ygE7UgqP)j^=k$S{x-O2t+&&jS1{>hb&?e<0!ehOyr1zg-I!)O3QJ&rX%*lDfXi z8?1YU(5`&4E(7cZ%C^8FGub=+Am^^1(9!>+wOJ1oB`RTQMvTP@!QE<%Y!~12vc+7tqflLco~ZHPU@= z;Nv||g~WI*%!>b9gZ~p?sCXQR>@hwx+&U;T~F6k{e zZ@DY334q+nfG7ZpQNdceJ1KX+i;AK#Y{5$<3Y?sdqix7JCno}cgAf0F&NV@=f+Ppv z9uT#;4RT~cF`Vs`Idz%VS8y~fphuT}m55qwU6gA+=<%}ApBNT+YQL*g#u4Pot+e~ zi$Q;MB`x+Qg~+3QmVs*hB~TSM;IdxylfBiJqPaUR1WunGo#`y?ngI4vEgL*BqcNQc zq@Fo5rOqWGfiBYmW*Qgv@h%q^z!66XT1J%$kdy`ozRygKWCzu7|DDMlc)Z9ywPs{L z7!N`>SOsHR~}##EENMFjqmD%SZ2vr*M{n zuq;Cc4H_KI${ej3=X5?}^@5VmI6OBp;095#)(qy&W ztpaH9lJF9!Br0(H=YdcqQ5HP>Hi5~R(E3fY4~YmF@HaV6^1kp4x>vAZYAWtZX5WFG z5a5F@@GT5oE*JzcCX^9oj2b_4!aXd_?i?!9!awTpkSFhTdX2sosPr!^8_^UReeD4< zo+SkA9q|;L*mkGCXrK~i{^kkTuF+#}MOsxgT#-FI(&+crhgZ)nEpWjHbkmeYMyX08 zAQQl`?YF^LC~y_O#LasFwVX2p`xS#)2oc0y_zJ=REpIP!>h5>3jE=1lP=qyVXa_NY zf|G$#C;%tNQ_<6WdikmQ^odwh)34dLJE*WBctC+w?;D*Z?HUMZ@iif6hcpFTN|6a+ zy+a7!VTTp~Q8`dug94IN=>-a;-qNplKLjt~<`%_BgnF?e01)EHkmW_#ij=Z9GyUA1 zW8Zt}?i3fO#GVb%yyGi4q078rC{!>}gI8=17_%h+K*=wbCcytSdDR=vPkvx$fe#QE z4FJJtSw>@e-_J1I@5Fg!^1BIP8-iWFqPNU0#YL_lx1K^7VgyNRJ0f6PjWAidg<*#< z?{6;6sruYgL1U3tYM>mHMy+JN;0I#vray=y+3z0h*sRB2L#sVcdT65}t9-S)V_tsSEEf}-r zE0^;6Jv6ynlF1y4q8EP?l=~H+6MPCbF3Ip^^nw(H+u;;I= z@H>Fp9L8v#)av26)>zk=4@g$2T0x9x>m_f?)LWUeAs3@aAA>VPHyh~Vx<~-2Bm)IS zehRR8ILNGsOvL8ul%t>sGE_~uqr#t-|9G1Hj6?(^_VDa*AnQ``}ub&p>-K2)iZ(eD8O@G}MU7 zd7qrJzyQIu#z-ZVKf{8JSho<91=M~Lm9H$L>4FQ!Am%Ct(}oBkXN;KG^*~nxh~=TI z_}%2jn^@@$Xw$%%e8h;JG=Ga|5KRxe*^M_*!+ZDkN=#JIdtc(X)#4Eli!2%V&eW}# z9ppXHoii#)fE6Mqt@OB5(kMtp9uchTQ6OOE1%iw|OXZlj1oa66{#W2b`bVs7S93Qv zYX{5U2ai-~**i}0;@yZE-L~$n3fwuC?2#OiEVGR?qgcVZRFJPyd`y5G5wUsaa#u(- zew$7&u4;`Wqj7boZgJo1<4ohFo>nC)vtVb&ra*ng3fCl2qgmgM&&{cR6WU6pQhY8Q zvE$nDm2AU#LrwF|!3v&-`csun3-KX0V|~4WQ`PEumkHt*x(PcGHC0fjUTH--g$@TD zLg(3<$e?l7IJ-7xh8X#&iapmniYjOQHdX zH@`F&qT}kZB}yxJ-h?o_NWep!N-H13Mtf=?V^9>A{VZ@gq=Ra%$<=D?J zO&ju}M8|YBw_a0)d^DMkM-ZlKj0@6Au%q0b_rv{%+lF?f`!g62v+*tSj^pHp9H*ykn$X-gDLw&n?nwaRM zb4%B(VtgC;=m>umC%Vt?d(P5vN7{u%b8oLpD5K1TVsP`^l0so}k^tJ`r)Nw@Z?w~h zmtW%d_;vBoba(1-Bp(pAyK{|m(tO&j{TcpIX(?LAH^}Urt@IPR8U$E69^=8a(UxHh z{&J{+BtCe*IkJq4zsCn{^-r040ItP zpQA1lN>w)Mp3q4@gk{9uiqY#JIFg%=>MSrOb8fI4Yrb}rbeWR7{vKXSse4Z={nCSg z?38i9ZeYBjoSbS6>Yh(Iu+c>JWP>JcELd7{Bg)9kqv+kZe9kBQQ%+k3U#WR)DfT$` z=Cqa$6G(l!x&{ubJ%ZchM!A`O#&8LxR?XwB{>BfX98c%z5BA%040zSA*t}+O)+Ay* zYN;5At++qX+b&@jF?x?X{z%Y3EGxy#cl@S|E4jK3dnd(|J--oo61vt|;;xaB^D*IB zS2xF0IYIqV?CpC3+p)ZLR_m$kX-AJWAA?WR1~fUW#+qNl(%#v5oP%Vyuf zoLrn^sbri8dB@cQtNi}fY)5BB@e$ZfPQZFNLCNL?Wp95`>z$h&@93?ukH|Wkxo`QN z8l9f?E>Y`+wqyT5a}l&i8&%5~lU=%}D#UHD^Lp;D*!3s;fzG*YnDWLk^2 zm+h2(V9yNjwtTNK(y2j8Qu?j*LtgP~(O*|*ZI^8;vG%v!lRp9~bi5M_ClY(yt8AyP zExtI!>uYxQB~4i-HG6MvJaV|6x^U3%JkC75^nCsB)H%cPkj63dM|WyOG{>>6%CBwv zcV?M-E`}BwQxj#I#e3nUHXi3q0@)M>!5&WT^=10;JW-j-I!9jSFfGfwcsw1$PR&Mc$c?z8wNiGF~R{&=<^zGUnh6_fi-4MpohY(~ECH4r9=;TmPH+VV=sa zQZWVU`h95J3U1$iy`UXJ2f`q;g`MY%&EY)d>5{P8y-#;aq{?DKXDg;oMtl3eG_QI# z1gza`ov;gu)mOVO^IiMjy+0yYHCe`+6tmFXY<+`~i5cYwGwbqLz*r4tZ*tVfeWv%u zE_L~2B0O~BM+(<{llmr@+g_(~L!)f7GkQ%{iTe9P^iQ|dTbEvV-!VcW)-t1Sn!M}Z zUG2?&NimS@#3pT}TmRugBSS-?Yc;`0`2IF(By@$em{WXl16Qj7<|<24JT{X5Qs`5&(e$II&od_q6!etlm|9C#w!GfRZZ*6AFuId8 z82YUpef@sX^E=`bJYCprIj=;U0z{92Lq4py?bSsENsGUswolhM*fJM zD<*aCS1{30_>~Jy7o;+%$ooh0{3Tz9x8NE3$az}WxI8XajsH%_{K; zp?dQim3a~x*_!0UgOVgF);tk_g9N2+l*+1=hx*bq1oNJaIC}cijyk__9yb3U`zwzB z>-fTI?!z4hrjEy8#)%I>gPJ*-s<=2hxw4x&x|qX{fTMbk1ZB#CfGq#t{`so*Dz$Oo zHPY_m#tnS*h(Cx;%3T;EOv1xvUa;7r=b?)>Z(zNC0sE-*=KW_w!LAZLXUhj22F6l3Ii=Bv&lHpzIyuAp_Mt1JyFc z2@JI8>{l3xmHedAXWi~b%$Jr@kyl2V!`s|faw35um%ZQK)lNIeOnuC`IH$dO6rf#I z6spQ&;4H4g%%=A+ken-f@6aD+yhE;w>*H=cn75YLHB`OIm~gJ3kIC)*I3FLH2hNAX zlM6_k_jY;h1Rv-?l`bc1+d@UuGs`rKW%Kn)iapDXEoHZ!GzBnv455ZwQ4!P44~J6V zx1}F`j2SHC&aV2PuxMHo`_*f%$@)#`^Rmq6PTiK~b#r?`b2j;9Uzxg5I*!qAwW?0) z4^t?MT&YAJFk1y{pdCE-99FW4DVd{v$Q<)cGZ*>X*dRIap6MqwR9P45Ge~mh*z`$VvRG|E6c zY$^N9gj`3PK!oZM$ryE^6P?WX+YU~m7bPrq1(+4jcwf#nqdTJ(X6z}Y_0OY^GY+nq z#(h^#-+x0qs}WS{N#>zC#1v-7L>5Fj70dDMTNeE`=ME^GDObu!Q(%j^@%^~RSZr*l(oa@>CR^D}rpP*~^`RCb}IU_sN zam$trJpGA_?PTMVlmp!pFlvGd4hD4A`=3NI{r72*3(zC5O)65_X(q%Fu4VWjO?!vz z>^h`=dD1;z{-SALL{cAf$9R7|=sN5f4=du^Wq76&CrtfdVEue4DLKJV^y=DCOstu` zXgo1F4zjd-$s(FrTxfIcFUYz`+$VdUTxQMY!R8$o_wv);~XK+0;MQT7LNjI~b0Q_F%C z^HkhP%WIH5uEIQ?2VXYO^XYfq9V&++H6 zhSA^YD&x45rBG-V@}8X6|LxP~s&T{*w0PqdFx-b147k=mu=odDryd5es7eqN%1GAA zzFcm8e{&#q%;@)Q%AAB`x(`| zn;3PM76NzaL^8=Y6qhr%Ll-T2b6AFdR3|RQ^zo)Q*ERlRo5(EUOYw9W38H_m^6+Hk zLWxvKQStaz^Lo6YdGz(>aXlWV=QFLV-c29rLshO(|LXu-9%RZpLu@7irE0N1-frLwSYqr*W&N0zK^oyB{T(V@fAhmcCszW7}DfPn$Qte{3;p zRUN6)Aw!LmBW*oaouRWks!tIjI5ZR^IJ6J09&oLLYXV#i_uXki&L1kbA3Ub>aTgZG z&e~bze~;hij6{~c7*5aKh0kmiO-nFHE+Zx5O1^!!&zV~dDR1FZ5wUL6b@$NZW!>c^ zn%K?_TWd^1GwR;rj`ErRuj}*am$N9#aWVtPj!1(jywVS#VM8Tj?r{?q0J#MlJ{lFz89sZ%-MD7x`gwz*#@X zeXFF_l#4G%AdrTR%3`HKf)jIAwI0M~EpeC{YWH(K>p`z|;`juO_>^8kmk~=kJ?x>xNj!z_uBSgf&m;A#WctlK5lGM^OY(jOPuZVjqt4s*xUhv9KoN5!_5xt8^vDfgZk9aW=k~ zQ%Ehu55E~14@O}R2JJ36X@0v$b7=ompveeCJ1d{;dnyrW84G=yc5wDUf%N8}J~t#a zStN=8unV}x+&b9lQGZ`#_Z(QLb%$u+T5-GAjb|(e z%7H_%3)f*p3I-$?#Ok;bMnBBkDh#e97WWHwz;P<2Sl7B*8y6o)H<&k_YWLe-vHm)v z4pLQf!>zbR$=|x;;A>vvl+FAiExy96|9SpQqso}QSN5im|AD2K@N!3mQky_I6y?we z5o<;A-47ju(Be-E$i?LgA*GHj3?ICpY&{QVnlX}*2&GyjA7mS4o2itmkTPkjKs&{< zOBNr@R$rEu*b9=I*IjQ-idKdZ_jM|N*i|DKAyy{T<=#bm?6pdRbsHBD+f6nxX zUbXVI^ef5d*%7ukl(J!MNT1U&d^m}bv_=!XJdKdwU!Lkbg^Nj9Bf=2zi%5aL?m_V4 zx2QGD^4WDyh8G?R!|JQHneQOphS={>&HHCHighaBJ{hH-6E#?ocVtO?PXBeML zL?~C2a$-2qqTr(bLUYTKL=seyc|-IIO+5?2wM;yO=#N*_2o(8FkWfr@s~B+Y66VJ) zfGY?`JzN}>`EeE^G0osh4E#0mWAZ7XzAp&Gs((C&0E~tE3*q7+C$-=beTne^eyxea z6X2xac=2As(I7K(oMNcUO8ggHp&`!^?*9|LkpHEe8y55bF9=>t=G95B`+WBgZQfY- zH3>K?d8n2@yRB7cKRV>3uExw~d)9zfc%uldx}8eAo^0b-X8tQ+b+L}@oJ>$IcLLR z4d)5rM4Eb9qhBc&EQ@JvjqJ~#uMBqh2~0kEMY+@aJ(=3g$xyT!OPMAO=2@bQa{U$9^`WDwUWy%E4)p6AE76^h_x3#giIc<%BXh7Epgvw)vT4{5u7l zwCiIQw$=U@jFVGX5-CBssuY5zjqE>xIOLzmW20*qP(vT`(0R#WbKC$bHKTZAjGyZx zD(HEh8uya(p;clzQ&gCT%l9W|ciHt+oWNLhkOn3QMhl0?`JPuuyAp;Lt}dSv`HD6yL zpCOG3(@GPETpIi$Q7vVDbhG%%@GvM@_*yA}$xg#jA)i|+Z&GRsOl=20ZK4Vc5v9kD8Di2eU3dLjIBY0|4BiTXN zf_vJv5D@`e zhbt*%UWcD2ONQk%*(YH+gZ{H!59hCb`rh=%m3+4>o;u|ilPUJpaQ5AtoVOd%ds#UR z0^u`GsL77KK3UP29uQpSyKwY@YPsg$DbQ58a(>%u^@3L(Ya^b4{qcwP8~OCyn#cG1 z#&@LD>Jzaww%$_Y55Tsz4A z6f?hihO~IN>0;AT*%LFb#)G*3g%=lBTS7GHHGYk~#CO}rn%lz`+46`e{)`mCj$c?| zK?g;cJ};f;9@wVDBsaABpY^|CPTTltUc*xK;oXFWU-3-{Nn@VJ32MBMYpP#Mxt@iV zdw^#1a-FV=O~ROv$Jg&OTXB&_yACtfbb>RU1pWz#2s{Kl^=gLvgvYP&b4ou|HHb`p zim87xOSg;Z?ia6x*NA#!gT4AqPR(K2nh^@n9NK_?()Qz3~N1BBGg5V zfiGu&|J=FBbP>dMIq$`M%7`j!6+a(hZ1}trX@Mz{@T!W#U)Zh`!Bp~I3#Tj>7D?yB zkDVzQVz+0$utgD{SFe;|PAIvDrj)F2C``|Paa&gfqYc_7KBoIHk*qIs?@{G8@9Qk@ z@3MA+$@V?7F7eW_s{J}pU&ttv^H3xuD+7q~g6w4TL`eLuZ^1ne%W%t3i$Np-5plh2 zQ@&>omWhrLg``>5?098`5(gJ?;3Uw?I2eQVkC-K1ISDaUQ=#k?lmVA;Z>J1=q`Luf z?-Y=_4@H|7=E%#JIOPaWzNICXaZt4mh%hhc5JT&nEx&$$tb?V-rSABujzO+D*pDM_p_AsGjE}xYHm$6szR){1T!;g8bN0`rH;Rf zco_RW^Wfe`b|Qs{1*HeD5YaN-vrreC4oa{R)r?Rpj+mo!H?{BM+FLbIf^b{xmlAe7 z^W%|bGcrQ8`aFb;@A2?kkyF{)N15}HOUhTxa@7O2x(A|@`hIkjAwugd%=hz0!eC8h zsh1Sp=W?&#pHCC^qj@QKOJD7$?oo)wJ*4tKh@xRT&^n{(>d;kgzi0Z(={Yjx16nGR z+wGyHz9OL}zB-Y`DuI{367V^-`OC|mqx8g!@3G{fVdO4|9wN@6R)5xGee3jvR{>w* zGLe3E4w{QwCZO)RWX1d>QU`0fAfhifBWcyEh$f!$G1WYYJG)L~x*bVnt-!A=8;;Ot zLE^7h(r~YogCqP<>4Mgm%9PC+aBs;9j4*17@Afwn>X10fdTY3zm3V2bcz2FFu4tRo z>nJOfuLaK$J-abM-Ag#CDJ`=|aZ@$m1)Ouse1bmvzISYi(umo$`Jn#?t#q{lm-)Jw zXE$Y*R3>Z_s%!dO;<=+)ZH~a|vVc^#D{36y+v;zG^Zf_EsFxH`<4Cki4j$K5HZHVy z=LtKac}MGyy-<3G<(a&SO+9e`@w;&!wjL)-?;E@Wi{Nfd-IzP~c32#FUo{$`d6$m( zRCR;2R=k6+5=-YLGLcxe-CVPhu-k38-(F0x$@&azBP8hA2R>e#b*R^t?wYV>Ar znmL6Ub1I!q*^7MhSjhb38p+*)@tHM7FT-Av=`tA&v-s1on@G>ystwXaPOCBZho*yt zw)&k}8slAWB#KH4?geY=hjF2l)O)O&+H9}+!9-^)N!iBLdLMj|_uO@Ds77#HIn!t^ z{9Nai$y;(R@nLE}iU4H!YT3=aAg_T7OA1_2qba zkYY(ByV4;0dtIa95q_0{?-2jzziu}UO=$9Buarf}2xp1XyI!1&&N|91?6yPIK5m>mXxE+XHTw+i)9}nZ8>A^ zpkql~FX1Bs(~6h7oBY|ZHTkq>(BOv!{G5A*KSUWf#u*yI=?B7%F_Rxv9!kAwFo1qg zl87rJj$BvhBvT4;-UJ6!iziAlvW(DAo)A@)sP`)Lq}pIxu2@HRp%cDH&GLh^>lA-X ze&~uG_Ta7nlQyN%_~JUIc-}p6FUVljx+~Wk|CjS^-%eus=7YD=U5H0oBV*v^P>XKX1OCZ)a`}Tawhs z>^+z;4g+L48hR0QDkj)sL@Q7=_q{EzLG@X57e06!&e>2A`d=PbRwzwBw~G2 zb@cvlp4P0VTS)aQM;1TRD96ZG%#M;MnUKaTDR*8;`))CpZ4f^VuT0$B* zI55AhGL`wC-es@gtcc4{+AE)Z;Y@hytS+eG&c#IQ?oi#j7wQoGQZs@QIXE)veS>!t zO`gD*So&NZ|FLd-K8f^Ve)?RER%Lf}O?=fi*(kb_wE=?0Ty23d(dPvh&=j}F?e(H% zjJ#5XB@zaFp3ZijXhm!%og+-?(x~RlObNGd+flysyYDMucprU>BkRboaNnr(7U+L7 zYSrnM9Is!Jp_z(Xcb((-$jzaNS_qn+zi#doy=YJ;d25N`F|pyj3cet1yD+$ zFJb-z8pH#K7`m9-xw5mt@BaoYt)#`50hAx30Nc-h0B(afo{lbN?0-N5U8cJ|ChvYw?Fpm|4qGlf#+u#fR6<5a2vY6 zeq7Rj!kaso{U5>ix#s9-0HbvP>^}>S5B#8h*Bws&|4{hE0@ct_!0j%oKTZk%i@34; zpU`er=Jw|7zwdvmKd_wq{rjH>jsJzh3fQ{*F2KK!9sf5A{%uD17mB{zKT-VMsPNz5 z|F*693;eX`Pw;L_|DMDD1svJ_C-6UJ^#6wc_gC;Q_}4vu!vEu&s3MOH#04&?_z*F$ Lc8LBCfBL@w#5Zq3 diff --git a/services/templates/pdf/noi-submissions/noi-roso-submission-template.docx b/services/templates/pdf/noi-submissions/noi-roso-submission-template.docx index 80fdbea8ac447767eeacc56c28e86b5495577528..4a43d492c3ca978bafa952d80f3b8d5dcdb3d6ba 100644 GIT binary patch literal 37598 zcmafa1CXt~wr$(Cjor3w+xBkTwr$&X_il5yZQHi-`akF4+^YBPTU8^ql9@S@%<Hz=of&Tff=U`&xNJslmSv}V$3Cw^1w&R&=nC|J?q9SbE z*cCRDDemnTH*p1)DJ@>2xxFP1)h@5vhsX4Kd`w)liSya*QJRDc4qDmn9}!@1-k-PQ z{M^(TD${DFXI5J*e0O44GbTF%B^v+Ymo_P`dz?WW>@e?mr#Z#|i_z>p54_uMentOz z;b$|aVO<^2)J#?8k{kcE9GxSqMS}%Pt~sRKlE^+*tX=9a>~C_fJ@lGXCdIU4GV^v# zaOG)w5?QeDbsW86W@v`Tu8t5Py0Y+ZxF`*xEVL8QD6R(7IV$c`GW&_0uEx zJgZTA<6E=wTk8uma7!5OMGdvC;mU8em(aj`b!`rTQ8JtkY(9H`Uezp*TIn71!9^t( zXAp4``~n~yldgC~=_-o60RvsKPrmI`rWXOPGfUBy3Hn{Yd}AyLJ0wx(&!(6H$s>Y& z%sj9X0gJK$*D2`kppp^5m7Bq`r0sRfvJ)1^K-+s8#T8>YApab5VwN7hrD!X&g<%XN z1PA)dlmS=XYmSpXxXUfyU@9rt2^3qN!W$k0nLBX|(|4m6-eI>XHELFiV(&zc z-|g`MU~RK-m>J7xj3c)+hPyzO6F*4b|0kpEK|BWFh^TkC&`GgS}OPmdD3yIBgcx~>c!Ki3q=&ZYbu zx77mZXgeYk>Fr4za1|4Z&nr96^C?t?u!?BWMn^>fKm!X$PGkF7%r4P4x}%R5ly?Y5 z-QlvVO$-_~3K&UEV98O6Vo|&@wF8^VVMI$TVyl>AugDxT)t`Q`2bjpIyr{4mjQmRE z#qoN3#_}lzXS{v=vSmx?X%4C7IC}{B4%mol3)< z`BcQe4-0*C%N+n8u>si|A({n>J7%+9tF$JCs+qfi>XabXFj9r)Yw|}f-2h45>j(9Git zhjv0S$a)L{!@`v5B_#esBTQwq#wX(q`k&x>(n?$*|2#B#Apc!(;r~}~9i7~*OdS6S z>SVT->pCma@b>cPUPeU{s$(z-L1={-z*TyO?RQ|F*P-)8^;g#cE- zkzb;d9#Z7O2gD8^Q?GpI$H#ap30(IbGqPk(G#MXm6cDWtD&(sh>)VIj>yZX}7hr zuJOKV7c(O}9Oeau+pDQ=kKSsSah7>-ub+LpzDIHXsMjjdJh;bKR;E5ijLUG{HSMt2 z=>S^~V!*ggIMCj^AKH4*>1~zWgp1v4U$bN5MpZ=T)?O>+D^?$_o?Nbb>}QehNeUyT zE}?c1&s3U(O@xHix{guR|Z}@dI#{%?8b7=T!`VGoc!SB2M0fR z_`&5fZ(JPWw<@S1{F!AI1>$jB7!&ax4x)WbI6Jv;mJ*SyUaga(18V>2PFx7|5d;x! z8dBIFeK3N(fFQX+(AVrR=s6BVbYoj0TJa^24U2MA?Q{CXSN%1`a_x#NaE@=*tf8Xc zD(CJjliNxJwYWVy?T)nBMB-V*jtod`Rqi;D}Lo4@~+4pQ|fkWfalw|LDfT4no?9ik zc9oDX`w8wk02~!MT&CQ<;8YoSABZ8ax}@0Ptqo z@d*cgGe3OgoXVgmja00coO>aCIeOK zuY=tiW!F-m1SX*#)HaT9vy}D$seIgx8w&^En}Ncs>zlpWqjL4)aiS9JUNCXi0N6My2o-G-#=?vGT|}3ao3eMQ6UGoR zJISe=uk460X&B%_#s1zhV|sc@SePhfzg@Kx^}5~E)1PAbOqsrb)DN`qj%n^R_e2d3 zTJ+Eq>^~5S58SPNCPKf7VnkT(H6=JF!_0U*s##3!O(^IS@k&h0E}%JkrPNGqD=Od6 z9+qjyp+)U5_SYr25a|_KFOH?!SfM3yC+b(EQE}K*wKX}8QJW{jy5(?F-KhRCs)i zw}mqZa-FZn@>`rK*SXgLFQW~Q6* zpzHH$Z^=SRLC5Y3KXLcf55NE@Wz+Bv zo*|XRZ+{>FPAQxRj7l`)4~2Nb9}MA?=TUQ+eWdFTMe*;d;16TpW#kBd@YA0k@ctP7 z!T&M-Gu%JiVf>(!^v_WLh4Knq6zu;up5Xswo_2vejPm(BwDS2~a(RLgKlqPDgz^8+ zIm`P)O>_aFD*n&8htYml`4%|o{O0S+eRR^TkNq=UYO#R-RK3A#fZqw$+xzY_1e9~GwUIk&X+pdfUv%n)Taf@oWVG&!a(pV1~|PAYRUXVgU5 z0EDGDX!F4$2H{L4ZJNcGqYxf=d|e0KNXs8~q!i$g%F7UKS^Q=X)#)IW4T zPAnvD60r1NKU}Q~2#ci69Fco^G#W>LMAA&cGUI53v>jStcq&N8*BUh&AaWLw7RG8d z8$|9aQ>-38DoC|Ndn_PNPSt3dq0WB_$_q7`w&EcbDQm@d@Cv==1u~WzO$W*7$`sCj zTC)}RD@a=x{#caDSZMzkn|&RgDpRt4T8m}N?H3hGe@vq^KQ0!DSU+qMKYnXPc6?@A93Chq}09NmAkzfwbr54%K#+bc#A>?`%gOCWs?HpdqMUKhKT4>XmpogiDqSp9tD2t9s+(aIt+ZpNj<;{H8dmA|PWQ!p z14EQYAA_IZwH-fIf8cX719Dm)05CUY?DqD2-H zBdz3O28@1*HCykL$z~UFe$p1UXX3~M^O$3vjDGPCU}WR1C~&4Pc?gJ*v5S<@L`XxT za5zyqys%LM4LdWQbJWZ)*?+=G*mc$}pGyW&(TJ>Y57j9Y_yD{f!L1$L?&CVf?WZ5c zh@;;vMhvS6vq7aMJZ1DU9Vs}OT)t;b>H%L-gt?%s5_exUV7y^ZgpiTRY$H~ z_mJ}sF8U)^!Bgg(m9Mq&`kh^u%VMRiE~wej&FU!1VdK?dVc8cbQ=Vt|37766)8C%Q z5%9(55z$yx>y?e0Z!sG!sp}+zn)l6X1e?|_wnDLe|N+}HP-zU=`yf)MwU9pu5Y4wwhmQ<{BO|NkqSKV`4*69ehX34ol z)>>>{PK=jrS|W%eH%||QXwm^cAbD)QK? zev*Zg)q0|?Syvg=6>8hl-$!NE1P{VkF z34J_|l)`8N3FK-+@Ws2lS(JC%^vUPz)^o1icI@z{&}89qo9?mpv1abF^HgOin8%sZ zLe&BS$gH`AHd_FJA_+(zpL{|fd7pvy#!l#%&cGcZ2&5(QcP|vmoMf-iiV(3gYFR<1 zH|9s+f`o<|W`HjF49-fTK%9N%k+TUh-^%rEX3kP%d1@*|%tvif%^9r1&=QZ=1}z1= z?U4x#fM!uC}#0lz1*d{120UmOm=;U`bu)OUSl4@fk#CNVh?&NVZ zOi1lam}ctDh>OPQ>t`F{bndL?Vg4jG34sq;Fi8`gWW~dj z-b~`P4yFwZ4L$9T5SE)TLcOITZrTxRYc8;k<%!V}3ICG&wCxb&hwU1nnQK>nKdJg1 zV5vk~JlqW>r+<2X_8-NlkWS#wkNVGS3+3lSKqrpg&K3HN4p%%TjTEZ^K7Ub%wk}e2 zz^%0d(G^ldAlKbvzD>e=8v(lWlM%s-^t+BJWuz9M55xn$?L@M28^u! z8pj<|U}EqXP^o!SH^2`3tfjM?+L{<~3m_m8`7%^4kSJA|o=m@U1XIEj3 z8Xy;IY)03urIE?4zU`rg)CKVLuBh??ukjQKit%tZpUF9U5`R^gvJaVI__~A3=kKO7 z&jGUhc(qDF#h(#)Vr!rDBSL zyag&h^suUnF)dZ+@Wmo{0TO1cnqAW^yU?`#7+&F;R(D!j@kA-ThWs-ABj}f#!l-LT@ks69NKaz4Avz!zvx=sxuPVJAVS*s6>wu`k_53|HcZyuL z{x`}p*bQ;2;)OYAQuZDhyYu)%EFMWbzisNfMYpoj302PQxlBCGZ;iAgN*V3wbVi_l zwQE_7xXSlv9d;Er?0(t3rd6Rxl^od+Jh|WyFS7*Vs!(rS?GCV!+mNhK|AnFb2`}}k zG{kDVbqjV+aax%35F?fExv&Kblqo&rts)-`Hft(XK2dDi^m=B7Occ<`Ide=n$XFl&btLnCTo#VPp7>;3P zVpUo|xI8J}tP0JKC}ks5tF%#DXL9e+bkR!oX^x;E+KLjhMP6{`g$Di4w`;u(2x%BR zK|F)293<6$gX^?FO)024a7)?q{6fr%a+NaEFwTfRlmL@g2W`mOC)}wBK4>2 z2NhiG%;}w$SC3J7`O<#OJzrTUbii`-h~Fwa_iT!`%MQdkrJR^@N_)B)gR(cbn-tYj z;hPjecGKi8&pl>Dv$v~EZQ(v;5XjWzxe+$cC2R6W|UI*t$Y?$p0{TN zF?Uy^%t7ww-^`U59aG|YHf~$rBIgJb_@U0J3hj7*A9~E4H8dO>t8r>ADhJwNZB5}M zEF-=Z6aVNdKo*+vZ(xSG$H9G?GMk(tT{s;u*fEDtiPkbuE8yYXC{25K4y?)*R!Zv0 zGJC?1o>E5t00dgG3*Pg28YnzKeUgj8RJXDyLfV{cE)Q$H4)xlJyFVT}4N8$H?#*5= z%|Gt-?TT(Xcsl3O3suM1C2XqHp!If%PcYnh%d$5iZ;t|xgnddXP4Q9Km4j+?ym5W% zVc+_6|19tXq$m)z+#oi)M!s)GK$q$qVn*e8sMu$L6(i(ZOPbAlcHoLsoQ)=Qmoq1K zI4SU-16`7em+7Vxr+)E+$yJC#II)%lV(k_)T|o+dmOuadL9Rwi{O;o%Ff_+Aoto)PU?Ag{ z$?{4MR-}X?E~BNNj;GRTbgSmi?_Bf^+u?A3(x7FrE9Xb$bT|lIP5NSeJe9DoX&v&? zdS#WXs0F)6Csa3-Ok%VFsNxfXES9fG6>Ux2wXG&v}}yW zSkH8ehLwS^U_>-GXW!}*8X;F+z%_T zA`c9hBu+CX5-Ns2`vn_hU|fw$(%7*SyFxyiKPljO8a*&zVjqSz$P0Ttw2DYk7&mSc z_F)AvsbNux@7iLLAPVpqGu!Kz%ddB9{r1&D79@$0_T><~yW%~ZiRc-E;%~=+iVVTj zlZO}J=aJ5>SWwv6H89Yujwd&q4_V1TX-2_qLKOh%90(O2rB_mc!E^Sc2xMEy;xPfhtK~mWdnG85EDe22#MdShq#)S79 zR$bU8fEG;`j@8e~U^XyQXD6_pA7_+_!BSgbJthtvOWf#+zmQ=g>G8zoGJ0r`0nCg- z8e;!huB&usVO9dpWly49wO3KVt){J91s=lzw2}*luC-~jZ)~pO@0I|I>MV;Qff>4h z6hU5@1q@cgTa&|jI`!LYrnI6TxhM@G--hz%+{+##mYj~c?+#Q^}h(L=Ds6U$52 zcHgV+s7Z2>Ftwm8UA;*panV|C%U418Wb%Devl0nU+}(xrXTMmN05mPoW+h>1l^E5xtFZARbFz1OQkDh`DV=7;s4tq;spnwer0jNEn;mTmoOZ zfb1-lK`K@7-1n1-{20o4Ch&N=AW|g2Y=5LvMW6`dKv`Os#661vOzu{neAHCu4cs?? z*&vFeDi^HHbz=Qfrus(qro5f`HnoCZt6>J9hQsg=ps|dQ0hD5xn2Efo5uwB(?DLb| z9T?SOL9jt{?kA>`#mgk;U2X;l+OauWuDy4q3iPp3h;Q|r#24Mzkir(J(FH<}j2Z2| zqp9#$YOnc(D+gumz;XjU=pf4adr3B|Ur*{5Squ^^^lc44ig6IK+WQ?kxy@|PoB>2E zJ(1FpNv`4w@FZd5iK;4(K}d0`fpo5+`IVeWdF6rGT*fSPS4$bPN(b>B@LRuNUrq7` zv@7A=;Mx;d6zKd!7SB`w1aXz`*Q0}j@Kd!pK&$5slp1=Xz6(*$XA&7aj#vJ!lfkWu z>_|pY8s#C#C^HENCB+4#P`4oF=J``YU4`HIIsj4+E>xkDz0`Rn^#X{fls}*|*!jQA z3mXTq^5y03CG^#G#&4+tDm!!P`COwN(1H+Sx44GMBv_GyQJybT@a=`x3MGH2cf8IO z@M=Y5*e)u(3G+rnz-^b}x+v#6)37&V(t|d}+@p~w;W|>tBtX?Y`gt{(58EV+EMpbE z*k=vb0l;|J6x7mfLjXa)IabXHEaP>r>U?Rj1B&f!=IsW&p8M@`Y-wp`4Zu8pIMax) zJ{@SQT(ftpFL)W7y1BWT&=8W>*!66&w}ITF;HFfNz9mk*ifjf9U*z5iE~$vBIMn;uB~?E;c=YAW(yNzyy?mrr=Ab!FOwxpG;OQio=il>H$AC!g*jshm z9Kr17m`3Tg&+NIsPb(79Fe>KIC`F&S#OHC4@V& zGh3SlnS-!vU+YkeaJHTP3qk7RNrTMPkms%4>~8W~g%J=B`G$jTZLIWyJuZ?qNk?vY zg9<%tfk^n(%wQkLWvh|s0vEAZKZj09$0dGu{RP=+)_|C#d-dXdfGk(*{tgvx+IJsl z7(%yN=keOxUWEx@`MxK4UXW$mJ6-l{@yzP8{pO%~_1EMxHOtn2bUT#gP#E=)Yc z1CM0y-^(=Y3`e)8n|oJuHEFojN*C%{iO<*OR(K3I{2Eu0HjZZMRFUqlmp3MvZ4UV- zuZ+ClB8j(j`Vy#AVPNl8X2=k?)Xc=~mseV@gLzM$v==)wiL{SL@X@*_>;-D$!`6X* zT29a)l`KnVu&XyoG2iSg`Fqluug`d^y!oYiid1nMRY_|hx4wRx9+M-&9qWk{bp{6Y z^1=)yTc`FC*heT)NIY%7l9S%?hHMw6%|n^$JF(xd#IS8jYM#$w^D2B7nq2wXFC!xX)+ zG_*SqIekz9Cp*9krhAh|jF~@AjE8c6AsA65Mzz+(gVG3ECmKs5rZ~Pu(uye_N#c5~ zP~;!x;O$qThMdWRny8%@&Sf$JJSKg{EM{$VW+fBVFiIYTUk*}w%qNHG>jYu%+P zOIKNf#no1}e}CMK(}?k9&ebh*(js~Aw#lJaZ`(KPI{6C~szzqNnSKqJAKkq!1hm*4 zIsEr+>ELk4QUvUMg!KTWIh;3py5-uj71GMr94Nm*`hc~}AgLihF!o%>gAOUGm4+!$ z2DN}(@37@@-H9?Q^;NwBsS6jCX;S-z=pJoG3P~hG5??5iCY#Q75Y>bE-tVzHF)GOH zt-jwc%Bu1YC7v*6rG6o5fmkmJzc`i2l$2wT+T+qI&LXk*b-Rw)&=GnK<3$)F&!f zoYLAp$E45?{bz3?>@ofv;k4tUvdKHj^c z(7BRbYq=eg#EzM*l-M*IpK*4@qUSaMn%Z|cwRh@`9?V4mfUn*Mt z+wI1cZuhaH!PQEBlh{Lc9%~)@$6?wg$rRe`MJ@(P%&`8IjFfzbzC_PLEs>a%iYb!A z);P`^z*FrpX_lx&v-8K&lYUU}E@4z!y15Bea(#x`e6$p+810iM`rFOYc4bhq0}9}P z*X^Sv#x;(hIT@bj+^W|FKogF<*J`s;Wv0xg0IhzLZEIaDDCxKvp(JC9p~yW8n4)t; zjH|rd9DqA!k;H}8pqp-3jM53y{{@bwwtIf7bE@F5Z+wh}`cxw*m4Gzx`w@HokcV3~ zxve>23oGQU5_r^M5;IBMyk5&bW^ig`sp+qDX2VH}t>y#`AjViYhUvgW6;V0}DyD_d z%1w7!X)vrcCbo2TSlq(`jrD`O3>{Yynu5J(`<@Eba!`ajRY0Br%Nnsiwp-# zBVbNtI8QM9YB41os}3@EL*UA~Up@#FJ@67+gpg09?*LnTWJmbxZU0DCRLCJOD{gEg z7d(hgdeZivp=QNI4_FKdZ<4rzH4}Vg9{tqv+|k=i=_@*p*{s`#_;WT)fA}8y)k$FH*?+8OMw^gzt|b(NRSY#a3>|efv;n=A))@+$jVdN z`YN;0fK|TEZ=WTYHSd4FC|ap+w{>R{AMc!pJI~X)hYY5Iq6tKpNl-D^Eg)F;bZIUx z#vVK2pR?9?{Zq`)Rfcg;=Y_7T;+IGY2a2``BtMH$u(z(3!WSUE^5oG}9HoANAVv|7 z0xs|1yi^j>)6aYlQ<%!Ps_+iqBkiF>WzeBP4sKID%8l0E_=bm*65cAtxI(iv(kFT{ z*=%}(%UV0uKPDbO&pRq6wsS-~yzhy#^dI2@jMpm03YWJwt)!)&p4Gqv=f5TirQ z(wt^icPFxgCipr3)9Hx);%IA$K8~d&0CW*`)(lOXK{Vm=o>^x zN9pC-@57?*@D)hFr`D-pHw-Q|5C)@I_OXhMCCkeI zy7B^gu`vErm|~K-Wq7;xI7uhrganz>pZt{+5SMJ^fx@jxN(}ya+|>8Rlr>H~FgfqY z+;1&F{Eazs`7u3H%w`$u#CLL1=;eR1F0eI#C0YHMQ5NZA_Bze2JCg8thXQ5xdZ9Ry zryEDK5=jO#dx1ynXQ@+%_C5>otLUnBosyg<&CCjhcVH*H8>&RnX5#so)&n`(iw*hH zn}{n7H6A}tnqP1Prvav6sxh{P2VD4x>+?#Hych)o z=4?RB0cIp!#kzfkJlzaPMUl_7w`*qd#q;;b6{3F4A4LNdLbuHVhHX4ImCTuqDZaq8 zry`U*Rz!18)IBmU98CB#IY42?C84^HEuL64=#YorSW{kUOhX2m4qYjF3=O2e5QMx9 z+-7ZhyiaedsSB^*m?YxJKz(u`s|FTSLO=-pbD{0wu!ewPEI2i5+BusT5ni7%!K})A zYOk|zZTAP_z^WPwl@pONIR_Bd%G(2tTBdH4feA;SUN&7^!EORhe*zJaiu@<7(@H=6 za8$!l@(C8>>5ytz;eZAs76biqRxPL_Ck$DGlEF$=WGc=8M})-@`+m211J3O;SCx07 zQU$Nar=Kx?w|NMM!(yjfjJBX_&|!0DC~*x*4Z8CSlBB6nIN2``?=UbN2T14M9hz@P zIZI8MP_yM30w?FQ*Icz3`iD@5)PAyH2kjghr7TMx;d%;`^akowcwyzmJYV4PGS@R* zjhT|ODhRkI^;dQu8zXRi&jsU&w!DI5s~H!SE{z@;)%~uQ3TtKQB{uTk5wU+kHJJrX z9mjB*q6nNsp`XW{t#`XK^bNuatD*i{!5m0x13UPQ!%5f2bZ{uFCj@mK-IcK!eme?) zCnTANG0m}9y{UOc(jqHM`iep&BZ(;yv54+R~S(Jyyb1}3Uz%h!IKIvruU^Tx1`9?_9q@XSis z?VK(^Inrh;)Ox7!e!(7yga`k#R?#HGrE>S`&mG$anTr9zTdLg@sF^zaB6;5G{0ZYY z0gEyjJ>PF}+IWN^8zy06>B4N~MfsO?qs)1*%x$+RT{7gJ(zL6Rl8-=gD)@59GwY_c ztRV*Lhd1F99!Wqe#5%Nr?_%mi8!^T|(h9FbGiv4s$Hm(KumVui#D6KB@S) z@1L*2oV6#-6Flj(C;!kbhd)b%l!)?8V9YU%8)X8l{@lcYx&O?4nGCVrSjk9uiOrVK zHlC>y*9z-1A~c`^yKqz-+(pGampj`%DBwcpw2(xD*_X?RH(NedNclCeGKu<&A9+!X zNL?AS%FWdK1a8+Q4v1x!z|&s(73D_tir@7QkX^ReV2bM({1p@1Jxc-#MWG&b?*{y0 zg_sqL_%uCrc&~EkF+4NYeLj5i{VCA%zQ8NC{tbrm?KmY#*PGYd>J1~k1WiDZQqp87 z#05#9uJL@iKMQ}3$#qDgI{Kk(RS$LNz3uo ziyX5n}N|A|oFUBl=AnfIrU)B%bZ$dU4JjP+V z`FRq%!F*%4VlBR=l$}HMPZrc1PsZlFB#HXN|mv=N!Kgt&3ul{3;1V;&Js988touT zDs;D~diU^YCuJQrD)#`Xd`E3cGSG`x*!f&2V1*Mb3cMya zX*;J)6Rq|++Y9}yx&RDJzwfHzAGZJ|EXQ7a@v4C^KXHatT2@?lxxXE@6sx(HAwabO zClc7JeQACtI-guZHJ;9Sm9&?bB48VT0`3<0eQ>Y6ubN4~h+mmROsCk!??IRE`69(& zohUm&-#MTP`H&gvpByc5F?-2@FS?3`BvR87kPpiww^8w(uRL2{J9&kW1u1@a{qDax z*C6tegI)wDzF_@1O-Xr;*fxS$o*u`FEA<(Y8i3ZSkdP1^00scn;F{Op4WHbO^0@PB zhVg6LKD2ElWcEHT|3Yr{dnMn}c5KmqgqrwceR$Y@p5!dC=^~G(S;29_L3qP$zUi_z z@E6ou#{`Y}`*_xX|10p1^WbG?-K6PB=PQ^{YB+7%^EL1i-*!Cwqqn~M@rOhp z3n@p2ArmNqo687=8a5~cC5ftO1$0i-V>Do%6wU?XoVf+()KYH2&kgZNn#4DzrQtZ| zR7YJQJ7NDpp1t#MRb}>W7%6Igz_T)5@Kh4NLZ;Ypt8G!5no+qqF+C0pC;X|Wz%$Ml zj1&<43Wh-=_@%z*!exlP*NH9j1hfb?uC-GQLJcB7I%yVp*GMT_t_#bmIl9QPSmJs@ z;=LQ}TfvPy{n{4?xs3?IHF>~zfi)`dSXrvcz8!~RRsT)blM$Yh zvirm2NfIaBK0ob}g~Z?fyq_Ieh-j=Yw#Rz$OZ_?tA^o`2ie+$g`q}pk+P&_oSh2oe zA1TaPxjXLH%aA)!# zBra`tJiz468S$oEknxK4dbv{e0hCNEH#}Tl#gj6KeK>h(ukL72D&tvzcK|BN+bZ*> zmC{=@!q;i&3t+r5+2BN(kvku^6hZsoYJCs_XT?hNi&Gqj)u}ABm($(15+v+?+7{ME z_r>8>-QN4W3vPJlStxOx3YV&se~Eoc^A(!3hNAbZ1=nF)YM<6>b3yufo98~uV7@bb z-s&eQ0qqy#Ape_5e>{Z57je$ekP}pgV$#(SWyKlZph#XQ&oUL zPwjx#Y2izA!G_9ZsLy`zr;G1XZk~6{BEQL8if#<^73j@LJ1gNmrWdZT8VDaw54=;S zRU9OZQwyTF{yHEVo<%b!(U5}hAuL$St)O>(w{wRMG27Q>RpRCZv72FR#S;@a?kORm zI5n}VTuq+lSyAo3fMZzZHixDEL(o?z45(Dh;QqEY)Dyh%XuzjLTCa9!c=Mu%Rxk_l zc1&?AMxj7deIeUF!;=oW>@FWy_A9Ot&};Bx;v`IpgJRNUZhksFKnNgm0@NU@tR^5F zwz(=1j6kq0(s-=z-UMe!^Y^0*dv62;Ph12@F#hPUFa#Mk;$pE-+4%w$gc1Q>H)=xn z3AqS+j6H66DM3-zw^Evxrj%^w7-V%o+4#@^A}(d}v$D9pOyPdws_Fr-dR`;;WQsk( z6*d^Y4kVc)-=T{aVC2VX`Qp2%sRTyJ+Ew{&5Y6Roe3MfbUom>~uh~PhqS==!qHuna zM_ehNT56{p|DD)ypNJp<4%J)YXRT<0VJUKwL2sE%UGjHQI0-&AR6HnOqjb^a$xxAu zuN?>MzqVgU-%Z%ZB+lewyve1}m`|s`)w6vj#wA9g*D~_T6I4=5uqqVuP~dFbxA2^i zb>GW#_G$}}p3iCVN~*{vVLX7{F>1~=G8g27e?dv!+jD{DoT*(7QBcZyz@6_~Kru$J zi9MWmXYJBA{6mgr^)mG|_Z>2C1RTVZZF~X6ISq_TP3}-dEYlvmu0&ClT{??hVW1{>Gr!+fXa2!}UE&1zc1{!-~LS|5@7mAfJQ z0M%c}*P~o*gw}(h;ACaf`e@pWFSY)O6%sys^kIz;TdO33S%Q2!TwQBq)rip<+tD)t zBE+2XM~q&C+HO`|DA06JI+&`E{(^xYwh?{=Iy6CIo;$Uba%8j;lzv8{tcEQJU*fWt zMAI1+W2wMwWDTE9X8?ChTJ%on86@hGC?pW4$$`g8w!j((giT2D~Sr@D;FR+p|VEhq< zQuS(&=Cni-lM{KQpNxuQq*4{NB&mH#V0p;?!+f}NGm>{Tro9D4joS0*xMkHm(@onA zG7zq}_%Z^#L~8RDRYwX4!aHphi}?UAiMqP!@1zZ|gA~#DV(k)s?p0Q`UWYiMcE+%0 zvk`d`fY0id2A{Ev_m&0|d8Sk9_Eg*9RYE`Kr4w~s|18)h6iodz)y_X^YG2$jL>qec zq2SqK!Ny%!T;70&sN|gL-=Iw>>*Lv(U4V(hlEW`k6+!e4F6YLR2j%RFL07GtMF0_7 zSbOe|*ajsOoN_!qMOHZl{W`P_2KfO(Doex)i@=6_63IbshXKr-x4R&y%=YhkCiRT$ zn+Q>Lv=#O21X~zxxA!=x4Tg7NW}9}@N#DAg>IdKp)~=LN8vN=6f$oK{))if|Yxpd$ znG50gTApHYwYiX_l6t4M@uJOB@KLHRE=3{)ZT^S+LsLx)-oFpz2~rK?!R6n`S#tt7 zb95X_b$b$7wD68+J!={XgoZpUp~Oh-G{6rLL*I3L6wC4kz#bC$Yckb&%yCYVy-48e z&6U?f62{yZnjzFHTT_0azBz^SE$EBOuR{&jbs9fp1zOsAyM1Bak8K$MVj1G^`L=>DS-}+4)oL1l^IearO=r3Is zY$oe{WB4=hpmbS?V6O!!q+bI>Hg|EiPr}3}vv@(wBbe?&hTzibDWgyp|MhX>Tn{Pj+HLcI!_a}IHG*G(W8~>S0hp95roj{Z`=jhpAF%Oa7>nqpByLwJsNUBE97e znBIV!R&@8FpD&u5%9ZT^QXKr-52+qa+h;k3pxKILEM)|dd9$u*tEU{EQp2yz{umEY~Gy~JFndKQ3^ zn@2_R9F1H-42WTHo-v|3wf+Ss7<4_ET?{dqIqu`x1_|}dyX7yI>9TTO$9WIvEp9#z z(rD{4JY$!=2IpCK?ptv~1dh8BE9!EJkW8hV2vIV|=-k2M1eBKA04!R`4o{^bnJg^= z=j80A02LZB=qYD8=xH6+O`Vg6&x%;r+C2-)U0W~2bE9~YaoqQCXP{N4 z5UT~ZCh$n-$`coWx+{2J@Jq8o^N$B2`2!@qCwERpT*>L2Q;|GcdrBdKQ!-@+w&krj zE0G;lOdm2A-s<36=p$IV-k0TY6ySzPjn`|Jb=G+SyF+Jv&3iLRUw<`CkyLsReY&q@Rr~gY8Q|E|*W&lLk~z!Y$hV-2R8Kt1hkmmf z>N+d3UJKp{uUnFN#X|x7SaAX85=zj!MVuunA$Eb;L{vD^C?yY*%UpfXe6_-4LQ>%v zop?<(zay%T)l13hCa-5zjBu4tsd$2O*WpHQ&pW-pVR#(Xp7}8=IvTmeKuG!{cylNe z8MDa#5-!ONXspAn$4pusSHf*YB@#_UHn#^1=sO1}@Yuwy_v6fsM(s&w)=FIFgvuS; zgH9b%q`ukjE_X}4D&hX^mUlU;eg;H3&zSM>i`wI8eHR!HNX_mn#%I}r;n5BA`2I2g zH!yCp9IH>%{4Apte!f0>sQO(?#@&8_nUl&NOEUmTFY%fFt9n}16RuIiF(#+45I^OK zBvYmasn6R+D-L5o&%bXsyl}jwy}-T#INSN>QdW|e=dYyD3PhT){p<%<4(RxqL3EH+ z$J*@jP@r1{(|~zBjTLEcsUdl3)rrurufnFrr7#w7&kkp=L$=d76aD5zHI+=IPf)#2 z9Fx=Z2|K3DEb8E4>2BB>$CtcG$8bK;uRKNI?e4DZN@SY>WBt!CH^ZpE`;6=S*-e)m zVtyrCSf}yCwbpQ+ z%aT;Xrb>^t0D6zwEXQl`C|Sciid3+^bK;$&6%S`@ixJE>+TDFK#aVG$Pt0BV)`%FZ z>3LayXLOrp?8Ox={Fzm&@kxj!=nBAuH|Z;oM6yDx z2WfmSBz`gvMsi=p+;KOX-y_RGI_q|xBPSEURwAUkr>@v%mro2tg2c++M+jn=psqmq zlBLX!&hf{dwOQlIU~lVqN&O!S5qC z%ao>gwEFhxVYEg2%elSbArbSYE2MUD4;`IPsbDIR2uX0XI6@3x@DEHaURjjQ7fvR zU9;haqOmF{wz~1*Z~3dRv9Ww7)LN$69D-BkfhqaS;5Oj z{@A0+JCo9&hN2{ey#Ayo#aYXNya}OS?XitA2!9`t`e~Xk24)5pNyN;ouU!ji3;<0s zMolFmmHVQvsoSRokHu%`KIy{PWUs{D+4epWBM=zD@A@pD;XVy8^=lTlCJY92BGqou zbje6E=J=ogHh4%S&oq~DJ1iA4`Z*0FIj~J6a8}?zKW;;*0C{XjMca(e;l`bd6YJ&t zz48R(XnN6G_#ceDQ?Mw((x$y^+qP|c?Pc4xZQHhOTYK5IZQHZYnVCQSt1srJqx+^K zy0R*>vMcj_0*bh4PoG?h_6E@FefKHHL2Zpq0y3DQ`Wj${PL}fMr%+LUfMqdB%xz@8 zOf4CJSS2H}>o?DDzwh~~qkwipQmA?s6pDn67K-s*k!!XSSf=W2AZ&m@2n~u!(_UVu zj#E0XZ$l&p{SI*~(+MuaJ%-KABcN6~nNGt5lGlf{sJ4r@oQ|eQRZ>1#$;3c)T!B?j z``&W%9ui=S1cN5tq7V*BNS;miTbCcCa@4q|i3|7G&Z1`BgLK-*JSq3)Pck{hD|UJN z!i;lpf@5-V$b6Z2R~P;Ez~K99{!zzi9)hqc!J2ABr7Z3s9;COQrJ8=&b~Z8YIrrp6H~#+DeT_6I zs_KS&e7`vwvcW-$StYSC^E8w2A46-s{U(MPSltpfOq1>{dkmOx9xI}kw}jb~#hS&WM-^^yvi7+UCoD$-@ZV>?7?w(sf*Z5Qa?^iR zp4jeQ<2>YmZ{DU8SA&nnU>71zgjIlbi07+irqwB)swc`k?BU*z-j5d70 zCheoP`A!Qthk(XruD-3WA=9@KLNi4nEZP*)0Bk{N81ytTMKFEuHt+og!IqHzqWBhs zs(N+j>q+s;TC9Sx<_7cJ8U4*9(!?5E2Yu9R6a#goVAv-CfoDR2AS?Q?8GtVd&1#7d zS0yYY$w@Gob)Il;tq6n#WJ6wot4aa4>R;3Z&@{g&Z#jDv71DoIXeJZd)r@)tH)`1L zXtFjdGIdDQafPJtZsv!ID~LQz%JHU^24ROC5Eycph1f>b3XKJF+Xjl{urgLbds1mb2 z(7WwXUK+Z7`ZFl8abi{p6*eKl4_`Cwqk$q9|B|D*&-qp7(2HjU=2&GPp^}OzOM4O; zzX(C06?8G?jn~J6V)rh`$xl<5)FuTLO!VuAq+s)GAdp<54D>J1MNCnoUHxX-&Y4Tf z8h8$bF9hkuJR;%T1coI`5a-ww2AcU^SHq(M!G;Ii?H{i$Cl1D>UTv*`LY%)1qfKpy zfZ*vA0m2mQDfs2KWczozT26ABIcMJUIdkS=uKeKbe@ zDH9w-EwOxVf2JN9(2HIkCAGeq*w32kaBa$5?>1?`qEnF$XOqLF9n^mT7g1#`(EVk& z=v3nbj=_r(PHG23s5cK;#|L^#V?1y~x%h^b(D|>j6 zcWdpUopj(2OFC*F)UW9EHvvuEUv`QobzAGikzl)r%S3|kdqiT9wwn@>EU8~-86_xR zol>Efx5C*JDZEc2a<%nztLfCmup)XmpL`&L@p}^CyC;di6+T})?Dy(ux3%6EIFv|Z zBQn+v155|e216M~$@qh`H8*f}fA31P(Vz-!>zZaq7&z9_rGCG?zT^c{*Y}pcHXW*+ z-!^pu5No|O|D8xU{Og#$U3G)9CYIMBF~<^Peg)5o`Ffi+-LGYOou#kCUd>@$dpC@R zjn`0bLES{Rhuh`A$g7hWA5jDX6XKaE!R+4>6(yQ^)4LabqsCH1?I}9u?s8aCnk_4$ z)wP9@cJTnE-sa4sdt_=53+Y!X$55CJ9)o|k+EA8)UN-Esq`86JRv$<(ad8cuu+P4$hJRZN$9nDS{jpr@B%78TRm^L)cl>HRp~lD3%*CFgEYqPv}L4* z7C4E;zZ%-`hB)jKKT3X@)>|nCpL?b%M?OHPlff>b!7K!CnkT1l>lOJ^Kf1r&q3in< zTkit&Q01e>XLiX!YmB(sh!b{ z#Hhxn39;*^yHZ-eudV@mmV6KBJF;b3|TF=aJcO- zJ(Fq?*E_b~W&gVQ0!g_FXM7k^Pi_n+AUpcmx(e5kLhOI+u{NcEjW7Dou3YB*V%^p6)Dph(@b3?0> zm2&+ns$TUTh#s+cg;3>3*Otyh#t&k^uUA~7xmi4Z^6RYtBe;joz2b^zzl7>^a*j~Q zP|szz|2f3N6>Mk00Ao|%99}E=-h>|5iGvlS;Mb6XK53Mtdo^5vVxh@LeDcxgsY>_& zA>>zqcO+f-8Wr|7_hMW;DlVf;MQz!xaePkq-OGe_U)JT&V99})Ic$GJsjrCNy?`K9 zZSb^CYkIwM77>B2Ta<={XIObij=ZHC6IWHM&X=-R{i?3Gx9u%$@+o9vYxYlKdru2$ zkXDyfJ{va@)#2mM_?fG=a8!HJE_%Gik>FnEqaU5aBwZ%Xp~*arQCTLf+(~ke+YK98 zT&Ay--Rt0=`Ggk69v64^6C6ws8QwNTt6He@Ge|s?0KMcwkfF1&B)2)eU;b}o@h^OVz;{6x_wpgl%MOpJgmJB%9?g;ZKg5fkMoli7cRI5$vo0$WqVgb5-LEWWoz;hSqc} zf~)0*5ExYMSQ<+Rbhkgxt@&#_d7EZb%+=F4M!&-Z?Pj>E88_RcwOYAA$`xzsOWm^fst$cV)IKj8_o?64xKy+CR z;?1{*F?-RCnwUgrRh*_g`=hp&iYcUeHM||;NguZA;q~17ax`nA*luNQeC6V=H7)0D zhVg(N9QXcdcK>Q@`vUW}b3J`2i>ajK527kuot2&kJ;!}SYaWr<2S<;3eOVTci^16b z9l`C}fVMGQpS0m}=O1IE#5KazrpROPRvzt`Hx^y%A0vh z5%GLW*yciQ`bu+782W;GQS>H^(j~Dm`#elNhH!$?getN=xh*)QGx80odsHWh^!5a6 z&x$PRdpYtTeC?$dTL?f%nk3tW)7hB-5u6;&Hrpwol6(Cl}O z5^b2rZ~3q0A6vTgvHf$gM{prGqnHf3zCJi(`;_mp&j>qqQ>~zxVs=##7A|)^BOK<9 zr)Lp2|~Q9%ff#vVDgqYt!#>pu_zxeC?!tNQf+^_&{*D|o^ZX!X z=?uc^F9U()XjvI~7$uwEa0&J2_iaypX6tzyy#!y50m#pai{`OXW%TBUr!<2PN&r_z z?wcs_(|L`v1YWOxNXS4ZtPbt>z){_<{tn&`?Omw?@7~JFdfNvkH#R1CTT>dI6lkvE zmm&M7N&c}_98OtGOnixU1u7}|2b05(=pn?&Ky_Le7Gq{`$no5OuULW8rCX2RECM{F z+D4IP$7B{rP;rj~!@;Q~LGPNxT#q{#G9~3fgF+2);v4^ZJUkjX3>W1Sa$*T6AJ@$Z7XLxH8p40m!Jend@k+M4orBGLbs%exWlrJNJDHw!id-S$(}H`Z(Tl zgl>G-(pOhbh>BtosKFE{uqP?Vv`%pX7{@!=wTwlbYzrz!>{x&Q_=CbMm>5MpfAf`! z-?~d+zvyEgsN^2)8hgh?Ea_7pg}#LU>IBqIQJW#RZN%AG<@zMAls=UgWMpUpCxPdI zSJk!eK2n5}^-i^;8ITzWT2H73+h&Q&qot%cULkO|CZUOBgKLTPLq z8K0?eovx1Xt%7}Eu2V54AZ(;i0Q7BRmBpqXmlXB_LUt-_?QN=W@+YXB=~D>SpP9~z zRcuVYJhz@-(o9&dd&|La5nhop?6Ed9e2D=6HYb1a-6BIw3V5S5Nn1Qmj7XR2I$ve^ zEqmOp!Sd9OYnS5a{GsF~Pc;2#*)LxSO$66G0I2=^%m`9B9Q>|XiOwy*At-Wt2ekAo zO%6pYgXr2$-3@!P>BOiL?&<9Z-MOO2hXGeEzeg~ z%sD}#e?L05ae1dIVUUYf*-gq@*qx~p3(_Al22jzlDeNZDeoR!zKOS$pqdSbM?pKn< z6u61yP}c2_12*&fTrWS53~xrE;l2I4;YN9KmzmwfxcQMZ^&(_Xk%SK|^1AYDD;irf&6ZtK|l9ul)C-w)9>kMjekI;uumu|cWyF!HC{=L`B)jKmpLvgbA+!HmPQ>%qID(vpi&YsFV z0$nT=>!iM?t(%gen@j#<`H-2E1r&*Yh4sfRF|@Dzd`%fwEb&m366SAl;3&zx+d9~5 z*2pK4<{yv>s=sM~9SCbDXA4_&@-}DKRYE&{NHr0TCQUOFx5m7vO*K_;3k>!Mzy&i> z_-~N9df{nn=vm9v(s(+n6N-(voqqv|;DPss6~&t-l=MSdG`$}p{H!r8UH%a8;svUA zG{iqL*Xutni}3Hpl|DYnnD7@~Q0dxz&6zFv6EGpfSML&kI7|e8QF~9%r*n~_I${I^ zAl6*a6|ll7kqGB9p#1I4{IRZdzMDt?az5tX8r&LaO=uoeLWqRD>W|iPX=aX?bdH%( z(~0Pn2&p^(pAVPqSo#3(u_pncr}{f*s;{@Q{%DZ%uzTV4LtzrHMNZ1!Nk;=f6NXX= zytcbNx0&^N3%cyTIqiLtxy4}43<;Z;Shl+WLse(RmV(Rc$A=jB;w)eP%$>v0ve9|M z%tRR5G(#F2vx*~orUcM~p46dSgCLNcKe5FsrNYr(?O7L9*7ySpquB=)>|C*jfXMt) z{QjL<+Ev2dMq&S#{Kre((pHjuaPN>>AzEMyqyBl?Ac0oqy-D-t<(E(N$!g<~n$%+> zg|C_fB$&zvQEbIa;Vw*On6>g7x`o~*WY++V7l5ECOvwmyp_%@$V-@8x&aSC*Fw&P? z<(mgqW}hPAERy}7$9z?}ZL?PtJX78yX7^AmjRqqjq(IKEm`Ck;@wgA1Zp*P=(PPtI zziC8dP5^wuM&ONFU54o_j6wg)bKlPS=SWc-8&s;I_=FkhW#AD6ylXLwAWNJnS1_I# zGXr5Ajk{ z4YYxj04CoWVcB0Z>a6X{4#NJBQrFsv+qqPpYM zSu!j9S^s>Q%MreFbC~xM5i|*guD|lh@%M{P-_9U`@V34i6a$faO7o^U>n7Rw2)(_I zB>-DOonD)M@b34H!FuIw-TDR@~k8@Iv|Ju zULB|)69T3Cu645C`$D>|kQcLkeo5t#cPs>>7x>=x%)lO{g?r5dH%yL=m$X|+FM6Cv z$})134*;x4*{CCX(uFI?bJT4Y&9-*-ogF0e>hYbxib}am0@vsdOTJP0Bq!>&Qa@0H zBqpLo`t)<0GmDIzcAoqeMcf$Mlzm*AoL0LF33#BXVlc+;xN76B!ePvGu@9}|9UI0g8LOnoAh6g)VIT}f2a?=qWf9>TwGFO8`;)$dfZls@_r z-YM`uipq9mz?KLoqNuxUjR1O+BYv3&oH=L!>mE{_Z+62ZU}v#VN?x(ft9Wi|6hG|Y zRn^g)h5D6CH~GB#6Dwc%_eN~Iw6u?}Zv`7+D?lJhR%rWhwoJCUIYfxx)0fyD)D0cl zlxuA)YLw`w@mYP%AZ1|?eXV*R&c9iFhv;$9uDn=(cZOqKE;N4=J$U^2C11+kmhF~0 z{v@RYI!Vo(&C&lVC`P|47)VEd8bs3pzi-w!glxXGxG#loW%jZmU>RGi>$cij%?iS8 z0dkLb2TvRxJ$>4HWzd#-LPR&JnOlb>f=8C2?+uXRsZjW3jO!~hHQYWby7U&~t7?4C z|8l?~kPUOiGQ*(AZ!S(35N2Xx2y3j9TbCs(cM>jlrQpP(&S4>hAW|f~n{Frm}2_L)%d<8~WebF@58wvb)cz4#laxua#HQNK)Hhq9je@>gh%DYr# zUS*G97v4L)OW9QK09kKSMRCL1IB=y@0C;Y96JM5zYKflbJeF)!GCN*|gh4%P zxgm%4B~RClDe%kIF2NuHR4u#I?x#NG_Xt?{T;reMSh*2}6MA}NlHV^jd|rmR(kbq! z(;^DPV^SJKn|=kfzCMJW_BYjH`+&(lG+;s#qW$OYD;6qwV%2FBDFIWS9^&fq#qII- zy@dUp)h1a?o5g6ydPWwGb7DrdEJqStivm-w)P9lM>f)lTh4Psb$9$x~fNfNE-q~W0 znQwB3?e?ymk}ie{d^wXyoXE){J1Ddsg(OptMy^1s zZ*v7N^9O2@QU}|L9Zv=zKyeQjW{#i6%1 zu*gm5XX#h{524GOwE{nNJT}E^Msd9h^YNrh@JwOssDu@E;Q~|Af*3i#krF!fpi`@L zp3U){PhZU;o)(!22nhm}Slo9q<25DL!&NE>q2;I!8gFFqRErt^<(XX}Kr*p?e){Mf znM-!v1!^8(d=

02)WeicoJKHsJ8>g=)%NYXe;itXmQ2L7U(#7)WbfhEtj|SAK(VxGH4LM7ZYs{&4-{{=FY62o9$uP+P}c|3c*?3X7ZmW(nnefw?*~ zMXvPx1{(P@8eLL&Xtp4+r_Ny;8pgY{>wIDq3(8~U=7YzjW)FsDWq`M0fg6Cl0j-$S%T181&T0+E(&w5&XC*Y4}o5m9+0eJ6ypupHLhxCh9Q!y;o;q{7M*^3m2+YIocFhx zEAX$a1!sA@zL_cSL=CJlo;KWm9}>XtCf1>A#QT-IbrA_5^)Q?}P=Q(AM{zF!1M|PJa^5AL^;Y(1v}5hBUOXm5ybd~r zHR>7}3AkKeM^NcFQoqZZ!97|GO5r;Mh#$&@Qpyu#R+#oPV)*A(H8o?|y|~%l^g!VL zqe$+4f*s2(#rhZOs)t$Q2ji-%C?iO~;bm`|12+{+H+Zd`{#i)BjrOPEmI0e3XOY0h zB5c(OAN3he4D|Nu9@#@%@tYx7!~}if=A{f^!a7icB`&qs7PT$1i?TygG z9L{F&_GUidTDCto9GQ`#?PqZ1B&lDH8FS%NK=e=HoiplNaDQRZ~kM&-dtar#%-pSp=JK?`%jY{ z9AcUyj~Y%E0DwvP|4C5J+1$j&g#N!*#{YC-PR#EyFD97wFYs8d@VQ2 zY~(v|KS@kB52Yi4CjK!*0S$d=p7aOYt{;TDY8_;#?uV*gGx3x5N7H&0k523p$+Aph zqlKbjM2I@N<^6fvIXq-`dESr=ZXuSyByx~yt4;3&Gs=sW$7z1@3i2%}(A)eupjta1 zjLs*UW84IySR`2%`0o zbC2;Zk8Mo#d>!(DhxThY(+G#Z2+W_?K#^c1j!gY&sI)Sm%nj6D66GOw&lKL>SZyMNVFcl$>24F|;#MUHLWwrAe{^o-P4`Ysk}$62RoCudNNq6k5U`8_>t zSQ7*e@)}y;M!R33`rZO)v>%;=em~ekX9x+Vv@_K|onhW)Bb5}W&U9l^&eowGR8Y`! z<+v%PHac#^I}&MU!49g%6Y$~Ucye)+UKan?;p1rh{BXBf2PIgWunqVipW^l8)b7{k zCFN!ImcPg2BL{0X@@=)x_xoeEZ>Ka@s=3$i=VSO$joL+BqxdxGUq*{c+RdR)0G1IAw0&3*+{+7!L1Ax0v3bvjdM*Uoos0J;7+xsT zu^3nspfk? zMRpWBec(5vceHSH~9AdAc^b{YG}Oy4wc;W z#u4!E?(~u`#B&KWCL~w3f{;A;W*;#6Qyt^Q6r)@!6i3IpVo4PAKof$E>Vp)x-iAWS zAr+GOFr#RgfLB^OA&)g=wiu0x)Fh*_LyZ!VgTGoNFFr1abg1OFv#m;4t+N zqGls0h(yvD4MU3240QBjc5MM&C^Ywn2ugr<6bDB^b z_jFMT)vB}L3XYvS)mv~D#JUxBh}2ePNkg6fZ78JNoK16?GQoAy81-)CGF9os7`DpQ zmQwaSWfsH0zoQK8qM`RpU;8ZTJ)6Srn0tt%gd9Hf=7L0*kLR~azN1HkhZl+ux2X0G z^`BM&mzIJ+4oT9jr==(BBIsbfQJv4o93xH@8L+uyLY5IdY( z#U&I2pP0&r#-Bc9lnmiRGpP&!?jZI0zBPB7q=7Wyj$UsMHW_Am8HW(2JV=4mpz91A ztF}ecW$W8}lzDP$#%Z)YZqF0SM}MxtI=m(w;rIkRpb=CY_$0`|wGzrv;ugS=tklK? z9E)%$WfhA+3-USfZ%J(HeA#YV)p|ZR*F%t_-0|B+zLF(Eh z)$<-uHsHC071GIMXVbkxHYkkvuA@*>n%=a&ycR*x#~p>9*d!hQO4m3ExvChc`60Y` zZ;88kt~?dGShZBi+O%NbZ8_|eUAgQ;)3n)&4_S1_(3rix<#TU@FL!Ep{rD5Z{yJZ{ z)O(OLM&N;Kef0M|%WIO({kAS29mwsJjpyTZ9MRjXoMr){BJt>@3EYga3IV*KVS z-uZ?CT!K5tZr4UddyMYpjaHB5D$1S*6VHCsZHR}H?&j}*u|)L< zV%Ujb001on|5H%=59;Q>;1N?hJ7*Ke{~ga%*KIchP<(FHqEB$G<=HhD75@BL3R9Jc zhsPLMeQC}WbpykBc*d=ZFBXZH5KMVEIHo(z^|~VdJa~{rGX^#fQDwx175*dOkOPr2 z{N&1s?Oig&Rf?o)4$8P4Sdx|mk8YC8MbfLWE-~sHL)FLwK7J(t6}xe<1lyjPAgeS` zz&qaxY?R4uR!Cr;6}sX7(4kypJhN+v#zMQASw~8N9zA&H5)b4u!u@>u9PUmf8b%4fed@Y@UeURAc;RW;x0MS;1zMFvMFPX`_y~n6UyE52kX$ zep^V7n{F`P=xIaU+_Ch}u8gbE1sZoC-t2+9D+T@jJ zpaOVuOa)17h2dtE9RkfB*qO-;Grn?)b=Yo#k~Yy|CjLonvgZCuHQu9cHN@s?cPkdt z^#F|9R!AdEs+~I@J40{VyDsDsdRE}U-yaP|_#~g&S4r0P;W*><9LLfB4;-Zf+$3U7 zFZT^-?5E3T6Vvv=w##qcW#9)i_R?>4Qr~}eMz9)IVc`FWJdaTSPm{>p#K8FfOrnzH zP1{Wdn9$o-l)xM0^#L{*u^dCIIa@d21zvwD=2o^G0jm22gIm7$^k(2t=bi+8#oy7q z=Hsf%yp?)j0*l)}x%A94{giqZYH44a-`5AgW+)|9#rJT3d_fLYFWJ>>=9R}1*A(`p zdd1b^E&Kmys@KdV?GA@LwBB{)s501kE9;MEVF(irQD}Yu&>g$t)kL2oS}{tn>0Z;e zQ>bdZ=n`OHCaG9D=SR4{seK2rE_S>mR@RJC<*NxKo9a)?ul~6L|viC4Bog^l#&E-Ytc$U}Rg=`Pl-%@o%zFf z$^Rb%d;H2n7X2gW6#b6`9mN0ZC7ev0oh@w5{>#v5Q5yJ$)$?&`cmMH59%gs4Jz%&(f#BcYpQWbt~AF~?%CtT;Xp zc*?k$%#M!?!JbrC?4+2fxafN3>!)fy1gxWf6B$}EgipMyXFM?KH-yZLqq$=5m&beA zx4diXNE@65+l97|0u=JWIY{El`iJ^}c<|YfT|>d_EiXU);dUe$%>0LobBXwQJgSh) z?nucfP2Or<+B=)TkvPqZrPM=eXyr-}bvdvn4jM!SU!Mck1^?`s6w-8Hxd#KSgPcR7 ze5A*nb`5VAil;l5kP|k2C!d^9&{q1B-3wY}#EXg9LQ6(UfS`TZDu3X6^#~id49kyb zmv*l@V7B}<$R_xBN*z_tuQ|&8kUDxvoyk=@1&=`*T`$fflzJ)6u+FN2v;q#1EvDi+6FSezPijyOKrNP$t1 zWs+5}VcjkJP9`~B!EkAVO4|Tv+oPYdqpH>UqW9p4Jt~=H!>QVLSvg*#Uqwls;nA99 zH(7mfC7QFH>oc~Qz2yqWbU4Pxdb(%q&5y3QZvlx895M$|3o6&5ke-gu3LopcJ-g>? zBhf)KFswhWU`%U2IN@&-F-b;|U48o+dm9a8>u0m-qHtAX3i#UYD$pbT(LA|^*_TvP zQ5>R?RRz9G12)s9;YMl|yVsG}$%z9J_Q^nIx@TF*!so87&)D|6WOGznYnf`__m}bq zEY1g1&Kp$D2XxjOwC@Ggdyo2UPVFv%e{Vmb+C%M;1by0Ro~JiZk0s7-4}JO&`%U!m z>vxabGWRKubv7Dl#Npji4X>W48HP`H828C6y`5{x9o{P$PWKXt#!V4pn?(S5#PR9a z>JAy&#)%)=M<22aNxT+Lhx8jx6Iq;C&93_M`^32@JiFO~yjkO<*k&%r#JkpwM|9jaov+Rak&Kz8}9pxoo&Wi|Qk_Th^y_w?StocZuMl}B*x?d^n zPqf-sM%f#)fQObf1U1vpej0;#!no9?TtVg9LtH*XR#mh|SY*9Y7BEvjs`LS$Su3#$4`ZG|4 z{`@ER+h=SNgbE4+ z%bZNH@yQM|vo8sLopB1y09U~>1FrEm3*ayddL>S&-Qwwv4i}!z@nQ>LntrY0pz}>n z2l-F~r^E%5jetS%oT_46T`NgwqnsvC$N8%rNn0j`K}%Ys89<`SpNn*>|Rv z5zg^!z(dp>_TgJA;H`pvM9dQ<|8@lbe^lYM&ZXmFYvNCzT)={AP9rt>%5d8J*-+B+ z+99UOyQ?*M#ZtwWzl4NPC`mg2WlYkaWxk1@t3g8S zw+|~8te6paeqSeC79wr=lbn@I@E9zj++phrSXnE6UR~eaT0%tq*%7$MF^lVn@Qpb9 zpX)G(QB&13Bzl2H5IN^H3)&-HadqJX!}}g7+8K~b@LjE`>w4cjO_Cp_sJy+h76XL0 z98X@~GynIYq}7k;E{=Hq_k28FN5sCW9ZMG3i);>#_-9n%izrEpBGFs?j+vw0dnP+v zX4}tf4H1ZSgj(dD)!`+nNDH>qH+>b^hv2@cESuQT3bh&4Bce_YT7_;3rizh(YOyWP zP81E@ru*vdFv6Gd=4Qc$1wJRVkE8`{tBg7q#$T+D%3<#a^EfUR_XT{u8s*1w^_tu^ zjot^vheaM=Ex?*$fYl3UaJ<9zQwg&1OoC?*iB$DZ0?1{fm!yx&OTU};pGO29PLLRG z;;ZZxTjfR0md?(V) z5m@Vap19YVLZgfDFcoK0i+O7#eGHWldC0`^lZvX2&UEo1FFxQpjD&t2)1On;<_Ucb z4d$L_A`Z`x*BsW~R4r-2r4(7MC>9`yA428^7&vNLEIYX*BhIpXZzR99R@1!6$`=Ur z63ys2o#d?0oP<`ZWNtdHUqK=HaM)ruVBe?Dos#kt7@0$UzN+Q%op|=v@cHOpkM7(R zD)=uq$J+!dG^Bimo3<_4q@7m_a}EYJaa~_^lk zg=C#jj+Lk(I1@_7i(>PXrSMScrm?pbVuC*ivkW1h61mIZMMd>hiXdvzYIu2vIkDj( zTZch{*A*}5|NSN?_mjjG?-9f$-XXM=bI5kH8D8^r*404=BoAO!4)b{*>+$x|*^SpO zpGB+ig{)YTxAUI1ejnz5Ne8>p%ImtQQ=Xh%0#IGj9IN_xa>$F?V>X~u1aF*Z6zg>7 z=|pnaCTkl?LH1pMd+_rS{}aB@M+_O8T&7wRAzNdGs*~porE-CpeV(X0TA~y3+3&F9*N^Yj*z>O6C=o8?6w77q8 zW5Q1)&=wh8f>CKA_~ZEpz**CKEXUu~^vp3_N(Dj6TpCvL`jw*W1* z^h|gyO0KFf@Khaym;490ulV$fh?+qBd^AQ(ScS*^!Nl!GE5T;teLHh$mhk&6+q?X7 zecq_T?8=U#!?$DQ*iaFQ1dWI-t14_Iw5sblq$ zo{IQ#dTmwY=>YA1Z5H1oYIOIafxbcy4sDiGVW2d00&{qKUmMbB3( zyNk7|6uA1l=KD?$rt8$Cdkg?uAPjw$o}bDaz2?XF?0uk2$%-{;02UThUK|O2Ebzww zQ92-xC8B;=@q0g#EBaSy_b-b;Kry;3N|3M!j@UHzjcQ$Xs39)Z+-KF1;UIRKz zfpw!h)TaK*ek*eF%*C|U&Y7_hZ7CIy_MgZEWd%*g3bBM3@X3n9RSlOHZ|_E7_joAh zud|=+#rf>k4E6P7-+BQ}J^@}wsN^oR>nu4pz>!l+;cQ|q%Q4hZhjoZ% z^ESl!K9C&FKO%aRf`6%q!0m>Q?SCM0PMGHxsSrI}K(_>@TigoOwWbfg9m(Ktj-JMd z^>VF)_o5-)(|>4rEPENzD(^+C7+M;JAPc^QFY$eaz*yJuFT%R^kK|rSge|Ss(pFsm zcD%A*G2h2I(b0>BedZ9hjEfVI@<=_$8BA0JD#?b$xRKAlPG$S9+TzJXjj3FySSM-fb4M-@19<50(Oq@aUFsH&rS=z z#HgFbVVjNL8tN5%g{T9jwi!F&_qo;wOu$h*ah;@Ad$E>%*lFUjgK8%ss1V z0YEi!9<3li2a;SdM6yGy1a`+7w4he!n8zH5UWNDc_KKnViT6$XlHI7w1E!>=7*g#a zIicrpt3zzW31bN&rUTnDiVB1TvM24$A4&HMBk8@Rgn!3+$MTfxvBM|}xD*$sLvfT5 zTNW^HrV4Wd9RLz_yeOQ)kfBfj8XFFRLvAr?H>Of2ZosYkC(V47U%Q%)<31g8>%%wK!m5G7u`!{FSD% z;4%=RK~R|p{V4>(e#HLjsCSP?$KZ_6T@MzhbS8BOgLm{)JHi zltgTm0f?WsQcA*&I_KIXeH!124msi(t9JYBDci#B^Ubdc+gd zHsILPzhYdw6{VBvw^p{VN}kSwi@^%WdUB<)FB{O4_w{}Guncrj^w`Hb!J-Gd)Rkk9 zx^jI&UxKw}gwQQAphO`U<%OG9aE;3YUF!Pkyy#Vf@=7b_Rl|*av!(-lkp$M%h5vr_SO$bii>BTwt6M`JaAL^O72frCrfNEms|V6?(DHzx@#SLL#(-Hx?-hZLt@n4N!5f?KD+_$ZvdR>XOr z1nX#~M~=t0Yw#Xwk#obIJ3(u~P;a)#FmP8DE#&Z;4uvw_m<>fo9fQ3WHb?SLq|NNnDS4J;3o|5tfR=L^&qs5$o%NrlsiheZb6XCIh-ni_+A+?R{t|;b|(FB4!mV;L1>1;2+kV5>L z42&}D-TE;@U#&d`Tf;Mta5e75YQ7=*{(PMVfahPke&2Fisf`49lyO%$9&y4{@uk8( zVgazFl0QeVc+l|#fKVoFvO$DUp&&UrIYrzfz!l#>p&ShmxQHZwbEQJ!MZ%(Z)6_=nRs2b&P{{eM73U*e~)QfVz2w@R4!2gAM`7=t_3a@9YpeuIYb|(ll zku+MH+u{edloYsZ@?cOTY2T)=OJ)r>4O8)L2LzuTzp+-1GYxPwF_$GSp7)=#;_vVM zeTB=I1E@-UN|pS;o1L}BOFYKvxt-lHfWtF@^AsBX2pV`p6R^ytN~aNts6My`-|Qx5 zxhtt>!fA38J0M;&jqq`!Dwkix0_vmx)z*1HHL-1Bn9w0&=u)MqAku<#DG~{y0@4wrNS9#f zK{|wpC?)huF?6K_1Oq{u2%=PJBIQz~LkJ2A0zr!M!hNnQu#pow0lukl_*3@m1h$!NAJU*VzQvb&HFD5v2;=C6G)w%}6ZziCk5-pM zdezyHz(?irZQnSXqOy;j+UFs+ctjQTYx77GdSK!e%&0xFnKcqUJGH@oG5sc9N51s~8( z@xaa(Hirq>A~6xpC*9*2xTaMiy}UNde!;z}s3f3b)yxa#3z5$1Y)ax&ts~RZH0CiC zf`K#OpuAl#2H*rp&zwlEeU_&)o;D5S?6lX-NoH}%^UM~}x$YLB7Eu&~ALQBPKRp&;#;JuX4=WI2 zZoHv6@5qop+eoRm1Q^n3iPnfqqAD~J@|wM=kRadrHGILK?L)p!q zovunR-bfDF$W3|6f47NET;r5b->W`(7b<)eIB92U-^PC(5#1u$x7g6V*dY)>clRW}e=<;bqhN%{T)rp}Ts!$* za$s0-d}f!{y3XKMwigOw?2axp@sz@f4%C=Ib*f|glf34_<37>w2cVk_6%qY3Yd&Q` zR8FwM%2=-5xM}+!50lX&ZYVEmTa@^7f z9#89!E7%i^abR&f&gcSMa8zB?Hpm2ucMpve#xp=(xbvP_UouVa1he-Vbu`WgUybAd z4)9nCX(^*6(|>^3dc7r(3x$_2ro6?A+OblLKx|oCtbD6b*^WyOyLi1-<7drw9qe7tJ_zkF#@S&<$}6S_hjXKX_D0V^u4W!%kKW*X-DL_M^1No zD&((EKUMs+&{2>L_wI-^3@NP;S3gHF_5B|D%Y|F78ljB2{xs2HUw__c3H^L+CMj_r zDB*yM&C8h_3*E_-75YHczavEc2aQI&9xrVn4lK_981qs_$kkm7EMp1bh*h*sRL3gVKiTMV(Q@b(c4-3tGCh}K zQa3YnHjDm8@}>RGGr_AHe!g+^5o)~F6*8CF8$`9atot0Ey5K6dmUc>BfqWKeVL6#> z)pv0I>5s3S6<`jaigpf=c`_t6WJ>RoKc)MuEW8?9RG{&RbcenEpmtBDd5^3q*^pfja>HloHg{IrAddG~CP$j%uiDz3NTj}||rZ1b^ev597n{B=!_#jWoNT=Q`>@7`4S*XH34j-D( zv%;vhzVn?#yO@YE^~lGL>3_pv`HEcsO1vbb&2lo|btbVz-(!}|NISqm>y0M)ItoCs zq|V3~F1=P>8^16M@#yRE==fnr`D#f#rMkQ#rd-ukVeA{eUWu5CCg$>T^KXb3#cYg! zyDe(bgPmNTo;y2Zc26sM^i!}A#%#27i6}56H6~%86T@G~dCCXXpFKWy%UHmbM}E{) zW$EuN@+m~Nb(hG-@)wR|6c+bouE99>UN{e;HPE-UiE72~#F};#57LI|Lzf;ASkiRC zn4uu?^`P>*nno)$;+ws(EcXN>#}5rPOt9tj<&jzmREt|ii&!`yoGRQB^9Bpqx{+^sdi1u=0bnAQ0f-dl}>T<6(w$z^p{j3hFpUwI_FCH!+}*Ne}NP**Jl^;HmQKXg27Q)3xS)w^0j z70JP6CcA+G&~XwQBLMx&9mExI=OY=bfe=AN?F2ZKAzX!~^Wh2n|z(keQ(QOcC-!FS5M*ks%_#@`kP<=tbrfp2YIl;#ipEt{7y;1sh+rTZ`;z5(G%3xDq6& zflj=VDI7|*l)C(|%wUtc2c|J4dH``X&Dz)1S^@8-K9UNEt@ijeH9x&k6S@}nqL$vw ziA>#74Hs+PW`qkUgq3jJLkeOM3_m#>qVr2?dcGrh#hcTVpO2i&B1 zm2W$4JYg+D$n9rp`xF$@&W89&ihg@mOUz|AD|}Zz1jHC7ZYQ1lJtz>8_tL#=BUhsi^_+AO{y%XjJ&BeN}tL-+3QRmd}1FzxO$4Eap+~8g9 z$!qr>Z);W=*a~;B;XapqBqgik928d{?b96yBXauj5o25w6zQiZ$*y4lB|8N>1wB1I z1)<@k`GPkIN+io&AIL%^koWt!iTne2|!hmAN#>7Vz0(}&zu$LXF!E|8<$XwvOBeb~Bl96zj~A6P~HM2^RA z{D^VnIDc3VKFa5M|J(FKy8Chdu;zHQBeEm@Q$s$U;P7wrX!}=ve}90(UC=;>hTN+t QC_v;#6WKV!5PvZDKN%W+TL1t6 literal 49605 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 UNZ{p!Nh%IR984bUn_*Y~2asjr>;M1& diff --git a/services/templates/pdf/submissions/cove-submission-template.docx b/services/templates/pdf/submissions/cove-submission-template.docx index 4d6603fc8c41dfe6e316c1cfeca898402e5573c9..b31e0265f93c6dbd13bbd630895b1c4ab97ec527 100644 GIT binary patch delta 6632 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 diff --git a/services/templates/pdf/submissions/excl-submission-template.docx b/services/templates/pdf/submissions/excl-submission-template.docx index 926a3b530a40c449f24227d530595079c2b077ea..4d5a9063dd185354bdb5d0487cd606d7805a80ae 100644 GIT binary patch delta 6490 zcmY+JbyU^Qy2gP`N;ex6LApDnk&y20klIR@fbgY38a652oty5G4(aah20?`5&vWj* z=gvQ$_nkFsX4W(Ft~KkKl}GrXM|eyXc@QE294aa*+*NB`H6}Sc=ntW+@T@>FG&#|X zr#P#Kj*(IoanthH79#U<*v%M-hH~5Zy%-ExNx3+#n1dd)GyAiUFfk?Me8$O!Bd842 z@CY+XymE*@I7-GVDkXYa?eUW*Ry+w-V9$jKnw z&!EM`qhxJPFP$;fL`gI>D!?w0BfBRQ?^2|z<8&_A)*z+KQu%8%5};$3=jIc_at}K9 z=+bDvz|Qb{VdWl~7jmdcG}0Vo{2=GwDEc`XU1v_!qxb3cfj~sCDIVJvE=@yx#JKb! z#E?|3Bh-_8}Lr`(Jz%J1$~ z+$d!!Qhgu61|54*G?tM%rrp2(er0{^)yJt?t@R@Lo|ye9O(do+@kOm|=jSo;

B5 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 ec? delta 6559 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

QB+1Axw0QIN15_phgCx0!zmp+i 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 delta 7714 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 BrPcrd delta 6927 zcmZX31yCGa)9&K#iv*Vik^mu)#oZ-na1HJf2yO!ju7Sm}xVvj0XmAVe65QPaL4MwR z|Go8o_nxY$IX%@+cc1R*Q*)k)yhE73L%>mai-ZgYp`)XNx`Gp{aHtWGp6;+$2oOM3 zx$`x?-?bL2FU=vhsC7L-_X#8{j4aBrPAId8!3*8jI#Lq!bkI#tv$%LhaV6z<%iQ;)lyzKxBQcV81Q7STp2ZQ;G znP>C71uuFM9W%|`ei0AAN(SPGZYF`!DvLW<8A5Mhq!UIo#uiyQj>M8cc23@}mb_(n zHU~bX1Onr8ODAaPiQImB{MA}eFrQlDI2BYs-p#Dyp}Ly%==x8GuytU6lO zMA2Tsn*Z6wEczyDG7^CY(tP56a*~-_TWXFVlM^8!P@beJE)&SquNMw1RRA~(jhvpt z>4Y>`m5Z{6cer|IXur-s6{cjzS_LcjCpqdA5#fA9 zRe6hsu5XTL<$wSJEg^zHD%k%n3~U~e9*7-uc&doh^?msBy~J6$J|we9e2pn778SWH zfel`wxR+II3sNW7T$$sg`%{bG*1hj&&(&5uWk&N8OtwN0u7vRQHOqL1?qb$F|&*EO}R5;Zps`ma5tbg36hcfL3zvkW)w{mZ$e09C9WEw|)MT1qNF;kOa{u2b4KE zgJ*l_$V>9ocF7itO*qiuszDkk>Q;H(ur$Y!cr||SkE(!84>%Q6Eh@`6(V)`(uh`w=#h%=X5$-M1rt25lUb^u*@`8v_~k?Y9=lZCHeH*HJlQqDy3v$^TDk-PQdLw%hJSeG zzmKMO;*>w%Jmq}ZI5LpOLnm_BlEhdkBu{(6zkM$&JC7p@qh;;_$B2eU;bp2AtcoPB z%szaJz1r3kL5>8l1+JmIHu_(SvB(wwK(9UhS`rLzo0Hz7YbzJbn8Bk3iDETBq`Ztd z&*|wUa(>I8l5TAIfwCx!w@xNJ#HrmOu-Y=< z_ci`5GAa{w7(6`kT<<)nZuCTCh!PE(gIYH{ zJ(aC~+Z${6ka~8Tpgc4`?us!AEoNeAWiBOQkNwK&N|A#5Diizg$Kj8w2gA=ED)DZA z?pLpl3^i$i>3t4mKt4mUL~fyN{NXS-)2tjg>U?!O55ann zAq@3y%AKfm%C>kWF~#V2wdvDWzvJRfc#S5t_|PYcpc!T*6eqtU(E@Hh@iA5Z=qw*| z@;su5vd^Cx_RV9QSZ=4h`jt>|a+&XIpy6mzLnz}II?i!Lmg#7%H%2fr|+2)4AT=q#VfR1Xz-sN6cbt`$=Kd zj7^z)TL$CxFrE5$fc_ISVd+YYX+kaO8gKr%_r;du z9<)f`&n3Df>0$V%Uz%)F=Bt(%@mqyrXq1fQ*CU~lkbKyc>Tf)2U5TTJRgBP5Fay`Y zm}r%y+}rL+B%$CEgqYbGNFUqA0cPO=(9z1b%enKhQi0M+`OP==pd|;Psf>$xapL-v z2O(AVhwrK_3NI96Qd2YBFfXe35`)FRRyqf9uEr~TSI2zVbrjQzH((sKOnCG%M2DMp ziq01{gtA6+AAvL=(U)Js3A@C4vyC9D(z1#jwR_c|uno3Q1upt;Q|io^yQV^BKo+v^ za~6;u0%4CHL0phFb*%J=HlEXSM`wTRljVZJsNrbx(A6GI$k4_FQ+1yneu@pNGo2tg z^k<_wTt9Cq`R7`Ce;=e&uV}GYPFgMQ?ZC{M>5m zWV>qPBkN?!mQyUZ+7)#PO|6~;;D=XWJqe^P1V!AXQK9Jm2rY`TzM&5%ff|c@lIeyI z(Tk2K=S>h1>k5h~^Zf};WVcpN45YclyffW-Z1BT^XJm@}nl@)%bU<>eU>6ceQNc>e zTZu?bg&o=Q3uR=9{AiaT@oI3>0$aP2yDQt8yNF}Iqx?IPWCCSm@vW76z@yQ9+@|IG zCxz*|ve|)ew-k@QI$wQ_(<75oh$Y`pV2BTG2-*7lCUt6k^~k65RnLShK$Y`X71clx z_pu01qQ<9K5@qdI)KMB8<|v1zAKv*K--MG@b%M3NS9(2&n`S-SONw{rhKwLJ%{}{& z;cF&pA$8S{&pcJ4SbSWIiwlhB7QCXNtatBuk(i?1AjkfF-{|gA5eY}L6khW9`n_eA z(iKqm%EU%}Zmx{*UW|ndy_hJiNr!C-Q#wYaEp74`Yq|h|k1GPz<4!>fqwag6E;X4I z^A{E|=jEo%TX2D~qPvn-&s zo`kyP35jS5RhKGxyaV5KP`xghL*Tfs+O22+sZVZ6dLb2)Ag?&!Qb`ck-;u=I74WtBm;-qzsifOE^4d|I!onW|~=#6*72#D>}i z`{Zy@rb+Xi7Rc|_Ku z&v)v+%Jl9)Tt9~I=K~!4{rmypV{$6s*ZloW5)n@`a+16qva~J(GY)=?@OU*dr;mQ} z+=2F7Rw_MmBt@M##qFYu`%EAW;y;+g3v&7;FS+5@T%`Us;ZdtHsi>qsVlv}deK$eD zG)_dC0Jg}dxJrDK-V+9;oIfO;F{MPPFb&?C>il|{)Q`R2Ip^Nf&nSGGtvzUS78h8q zeZ7DiP4+b_Jw0xac>DVuwQh~cpx}Dq#dk~*%p*<)Ypuoh{4Xsfnxsr|I8E=_=I&qG z63{fiKa5smJ@l)Kkq-FC^uG1u2kr6E1u2EJHy1z;)~XlkQpwzY_JI4UO2*Q}HdgrF z0cCE)yKVn$?iuV`n|YsphVoh;S|jod&Mz4Dw^D`kN57g&J!lKp>IedCUK(ZF)K|0^3SY!kGzHbSmsG*k@nq8tty#6>nq$S89(KKG0!Ie|D6w~f43y4%} z?699)7S!S|)Yu{Xrk>Pyc>ftYcz3Y**gXPx)v!z|v?RRfKx*i498;q)QZc?&0m8@b z-1{}+AZ>+T!hdk^&wK1VkJ4HF(q!XesNQ}JKZomSJ6huRd7tatQ~WK;I)2;!*j0sE zuble(53{n$_Z#?ij~<~-7pYq*3sMg#v5SD!qv7JFSF3Q_>ph7A{sk6(`OXVE>O~-C zubQjL{YcrsR;krUz%;)m{<0Sp`ia^IxbQO15@9VY`4N%6xM zuu^5kJh;|0z-(+YAPe*L1`2GFrkL(;xjSw>`_$jiD4}GHArS~6l1n2_%qY&qsH~uw zM=&;T)2nuT{^pPfL5_SW9jMV4NerwS6w6uV#mWfLNi=rSg}J;XoS^s|7}y(sTNKD= z-Hj*Ji?Lmdpph8yhEO<0Ns^3-U3$78Mc z+KzG3@-F3EbuXvQ>p9XK=sh=3!gf)Uy(!_UvD}d&ajT-q^%_y+S`+EjCo+Hu`TE7G zWL23nP63w0&wXY_EHe{j$!q5K>?2#agMqV?wOPJv_G;78x|bfEHK~p8)lX*`JgzM@ zQVtLvq?{nSywORW_@Wv$yFE(Q_DN5ombSCR5TxLr6@uuYp|cyJ;@r_7@B)pD`}sR6 zRx-oB(tKXE>4T2AbrjyojZk1NN4s5c_^uftNw_xVcC`_YE7^-;VL;b7(Atdf`fKh1 zqQa!7rHgRR$mj!G)rAGA>BhojOGF%mD@b@C&qM>_+jsb=FM|nR8v;72$S9pMRkHEtD%fuj? zVgr6zy5jnrVtWFEEej>J*kQ_Z-S@O$BDpA=!MwTanfRe^7PIaReI9@E5yvRjHu$|Z zD?;!b>jF4e$J!M_w%1pu+5JlS)0~HEu%)4fjrSh9={l6O^(f(0t>G6;sV9V=(CD+mOyH1F^^Zc8tzx~T%p20OIM8C0*df!qbb4^TM_o;9xXTOl+~Plf7F%sp*HbMPh5tU1u6=8T98N!cDvsm58vTvN zxiPZBYLBBWiyH{g?ht3}T_?`r+Lt47&0+G2lWJi0jyvr1H-s7V7rcnym(R{{8>+Q~55<>`%*wY3iP`QDZbeKa;RzVFKN zv4X90+$Lydt|G_6K2?F!{mV)4Off7fIJ}54iX6Q~`T)H0@DB0ct3Hu@@49dM`w)xh z4K~wrOQtil!B#4b?AV(a>++IBsR#y5D9+u25?ipGDy|f%a`>ed4ULC&#iJQ5^2Lqf z%F53h29wdY!*EIRpz5ju>=<>jIQMtxi&Qm*g9q-$qnG!ev*k{gTCU4ZL*!%3jAr9! z9IOpZ$N_B~(RTeBBKD_K`R8+Ucg;G?sM)6AL;E4Y<@Kk}5op`C*Qs$qY)~39^$?rT z^Q_*!FT2e_yy@wMj&PH$Shp=LL9(%~i?G85*dTiSY zxJP!ymI0gC+mK!iX_1k4P_p|C8GS$-+n3mm89hJ`*7fuh@j0DoD7NdKGB=#f7;zsQp zd5qHY<6a;FLrN~0Wz?YbrthfXv$)XNZd;#Ws4V+UT-N(VyT@Zd z1n}Imxtj&0)BYTk+Kqm87WCQYw8Y71>*b|}Qm%2Bk3zLCRd(81&WU{R3S=DvLB6ou}Pe5Tp=DR%C=E`!^*q zu6v)L+)Acwl_;p*J$u;4GQgbV^dt71h)v3%i_cve=&NIV=VNco9_5}R9d z#_D;TY)Xf;tz9HGW+i`^$MCSDjVCmtR6{YEM+1r?IGe#@=BI zp<6k6m|?8ZVBj?R^*uxU)=sxE_z~!+Lm`_3$xvHH3&OWnqzBLr8#HgCz<^~sQ$d)| zD=*G!v9eiO2`Jh{+0g};gofsNkKXS2EJsgtmB5hJ0ykbt6&K<}t+wSHvi!_Qve%G| zz!h6~2m2F8;w+%lhQsK-qM3&1xSK)k7I*iFozQ>Z$xoVU7jaD2x_ijb4tPCc{IKZ% zhc#^w0us~zCi%2yqu_^mmWd>fLb{}QsQF3O6;zV*&@LJX!t;^7qor||rMC7VZ{CRsD z6(T3Aq@({bj*!q_4H@)-97wCT8kv5SQC2DhLgybb2X;WDl%MBh|6qSJ5^ALV{835x zxyNl#>g$;c%qC~lMuD@=I+OBbPBguZ`6hx<|5QwN4BMRs9hiZQ8>bxn+}ZmsYaFIY z_Hsz*bM^)|b7(%yN{QDb0jVx3lOOFR86;AFOovE$v)QMxJNg3k0O-l>)m3veDobxW zU1_+WH+7|-b@+Ukgf|-&X{a{DK;Ej|5xYO50`{|FSZL#DZ0o(2{cVfkjWUp7d*LQF za%zg)T*?d?MD2SzzI#qu9b1I4nrAwbd?31Jl13svce&m0SN(EOQQ8ZM5aiZGna+{R zq>yxL1SY?1KPbUFfOLGXR?_P3ZMS|~O?!gLE1W~icQn_Ij|x+jOMWZWFl!{hbV~<=~FzMF!q)s3Zc< z@2_(z3>a4p;0uO@im`&i;nTR8h?C-^Ru#eT(ws3|`B#s?iha!vUJIn@&k%id)ruTe zJ{*2EDaff@_8(Y)j@Z94< z@-p~e^ha|S7i$O0kN-cMDpA`p4FYsLvF#I#AQ0hy;X7e;zI1=rWVLiE3VpJF`V`@R x>->Nj|E~^}0ntt5lTIEQ2t@Q>c6eY}zVv_X{JS>)9V;?y%@=~&=k*Wpe*j~5+T8#E diff --git a/services/templates/pdf/submissions/pfrs-submission-template.docx b/services/templates/pdf/submissions/pfrs-submission-template.docx index 7caf24fe6bceb3243029ff319e930768b3ca503d..e2ac6921679d34e0e269137858ef79015367dd62 100644 GIT binary patch delta 7911 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 diff --git a/services/templates/pdf/submissions/pofo-submission-template.docx b/services/templates/pdf/submissions/pofo-submission-template.docx index 5906ed6192f0ca1e97b7ec196704f0300f65ec0a..db61340e43b5ffb39fec7d5fe475493bd81fa506 100644 GIT binary patch delta 7457 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 UUgLl3flZ1Jph1}Q{fGE}0FyP{aR2}S delta 7408 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 diff --git a/services/templates/pdf/submissions/roso-submission-template.docx b/services/templates/pdf/submissions/roso-submission-template.docx index 51678a4abe2c4cd73a560faa937889a678ab23a9..ae75ba10e211eb649382b84963f32455d40de583 100644 GIT binary patch delta 7031 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 delta 7094 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 REP?`Y7yAe&F6y7Q{U4kuVJ`px diff --git a/services/templates/pdf/submissions/tur-submission-template.docx b/services/templates/pdf/submissions/tur-submission-template.docx index 38a4e6872cc8377689cbd3368d0b2eab192b9d8a..3305427beb622eb92e642aaf510ce014757d5d52 100644 GIT binary patch delta 6259 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 LL}7~fbKL(2hJCtQ delta 6380 zcmZvgbyQSe_y1>TkZu`3K)R9c5JehkY3Y=qOBfoY1{u0Lq@_Cr327vTP==5Y1Y}^y zANqOLv!2g){m%X4?sM*Y@3Zf|=d82t>pBB%BomE5OBEf19Dsv^11OA4ttX%dqTk

iAS6ei>lf;SSinsIzkv#@K;H)io*C`QGG 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 Tzf%6ErNgG;Sg}0c{TcdyPmam2 From 991578a75ca94e409a5d3daa21dc3a854abc4a84 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 22 May 2024 10:25:11 -0700 Subject: [PATCH 089/103] Add Default Description to certain documents --- .../application-document.controller.spec.ts | 41 +++++++++++++++++-- .../application-document.controller.ts | 29 ++++++++++--- .../application-document.service.spec.ts | 12 +++--- .../application-document.service.ts | 16 ++++---- 4 files changed, 76 insertions(+), 22 deletions(-) diff --git a/services/apps/alcs/src/alcs/application/application-document/application-document.controller.spec.ts b/services/apps/alcs/src/alcs/application/application-document/application-document.controller.spec.ts index a57281d884..6300b556be 100644 --- a/services/apps/alcs/src/alcs/application/application-document/application-document.controller.spec.ts +++ b/services/apps/alcs/src/alcs/application/application-document/application-document.controller.spec.ts @@ -1,11 +1,12 @@ -import { classes } from 'automapper-classes'; -import { AutomapperModule } from 'automapper-nestjs'; import { createMock, DeepMocked } from '@golevelup/nestjs-testing'; import { BadRequestException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; +import { classes } from 'automapper-classes'; +import { AutomapperModule } from 'automapper-nestjs'; import { ClsService } from 'nestjs-cls'; import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes'; import { ApplicationProfile } from '../../../common/automapper/application.automapper.profile'; +import { DOCUMENT_TYPE } from '../../../document/document-code.entity'; import { DOCUMENT_SOURCE } from '../../../document/document.dto'; import { Document } from '../../../document/document.entity'; import { ApplicationOwner } from '../../../portal/application-submission/application-owner/application-owner.entity'; @@ -14,7 +15,6 @@ import { ApplicationParcel } from '../../../portal/application-submission/applic import { ApplicationParcelService } from '../../../portal/application-submission/application-parcel/application-parcel.service'; import { User } from '../../../user/user.entity'; import { CodeService } from '../../code/code.service'; -import { DOCUMENT_TYPE } from '../../../document/document-code.entity'; import { ApplicationDocumentController } from './application-document.controller'; import { ApplicationDocument } from './application-document.entity'; import { ApplicationDocumentService } from './application-document.service'; @@ -116,6 +116,41 @@ describe('ApplicationDocumentController', () => { expect(callData.user).toEqual(mockUser); }); + it('should set a default document description for OTHER when source is APPLICANT', async () => { + const mockFile = {}; + const mockUser = {}; + + appDocumentService.attachDocument.mockResolvedValue(mockDocument); + + const res = await controller.attachDocument('fileNumber', { + isMultipart: () => true, + body: { + documentType: { + value: DOCUMENT_TYPE.OTHER, + }, + fileName: { + value: 'file', + }, + source: { + value: DOCUMENT_SOURCE.APPLICANT, + }, + visibilityFlags: { + value: '', + }, + file: mockFile, + }, + user: { + entity: mockUser, + }, + }); + + expect(res.mimeType).toEqual(mockDocument.document.mimeType); + + expect(appDocumentService.attachDocument).toHaveBeenCalledTimes(1); + const callData = appDocumentService.attachDocument.mock.calls[0][0]; + expect(callData.description).toEqual('Added on behalf of applicant'); + }); + it('should throw an exception if request is not the right type', async () => { const mockFile = {}; const mockUser = {}; diff --git a/services/apps/alcs/src/alcs/application/application-document/application-document.controller.ts b/services/apps/alcs/src/alcs/application/application-document/application-document.controller.ts index d9f3ffc3d8..10f9e5c5a8 100644 --- a/services/apps/alcs/src/alcs/application/application-document/application-document.controller.ts +++ b/services/apps/alcs/src/alcs/application/application-document/application-document.controller.ts @@ -1,5 +1,3 @@ -import { Mapper } from 'automapper-core'; -import { InjectMapper } from 'automapper-nestjs'; import { BadRequestException, Body, @@ -12,11 +10,17 @@ import { UseGuards, } from '@nestjs/common'; import { ApiOAuth2 } from '@nestjs/swagger'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import * as config from 'config'; import * as path from 'path'; import { ANY_AUTH_ROLE } from '../../../common/authorization/roles'; import { RolesGuard } from '../../../common/authorization/roles-guard.service'; import { UserRoles } from '../../../common/authorization/roles.decorator'; +import { + DOCUMENT_TYPE, + DocumentCode, +} from '../../../document/document-code.entity'; import { DOCUMENT_SOURCE, DOCUMENT_SYSTEM, @@ -24,10 +28,6 @@ import { } from '../../../document/document.dto'; import { ApplicationOwnerService } from '../../../portal/application-submission/application-owner/application-owner.service'; import { ApplicationParcelService } from '../../../portal/application-submission/application-parcel/application-parcel.service'; -import { - DocumentCode, - DOCUMENT_TYPE, -} from '../../../document/document-code.entity'; import { ApplicationDocumentDto } from './application-document.dto'; import { ApplicationDocument, @@ -35,6 +35,12 @@ import { } from './application-document.entity'; import { ApplicationDocumentService } from './application-document.service'; +const TYPES_REQUIRING_DESCRIPTION = [ + DOCUMENT_TYPE.PHOTOGRAPH, + DOCUMENT_TYPE.OTHER, + DOCUMENT_TYPE.PROFESSIONAL_REPORT, +]; + @ApiOAuth2(config.get('KEYCLOAK.SCOPES')) @UseGuards(RolesGuard) @Controller('application-document') @@ -291,6 +297,16 @@ export class ApplicationDocumentController { const documentSource = req.body.source.value as DOCUMENT_SOURCE; const visibilityFlags = req.body.visibilityFlags.value.split(', '); + //Set Default description to prevent issues when returning to Government + let description: string | undefined; + if ( + documentSource === DOCUMENT_SOURCE.APPLICANT && + documentType && + TYPES_REQUIRING_DESCRIPTION.includes(documentType) + ) { + description = 'Added on behalf of applicant'; + } + return await this.applicationDocumentService.attachDocument({ fileNumber, fileName, @@ -300,6 +316,7 @@ export class ApplicationDocumentController { source: documentSource, visibilityFlags, system: DOCUMENT_SYSTEM.ALCS, + description, }); } } diff --git a/services/apps/alcs/src/alcs/application/application-document/application-document.service.spec.ts b/services/apps/alcs/src/alcs/application/application-document/application-document.service.spec.ts index c7b0ce051e..590e597272 100644 --- a/services/apps/alcs/src/alcs/application/application-document/application-document.service.spec.ts +++ b/services/apps/alcs/src/alcs/application/application-document/application-document.service.spec.ts @@ -5,6 +5,10 @@ import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { initApplicationMockEntity } from '../../../../test/mocks/mockEntities'; +import { + DOCUMENT_TYPE, + DocumentCode, +} from '../../../document/document-code.entity'; import { DOCUMENT_SOURCE, DOCUMENT_SYSTEM, @@ -14,10 +18,6 @@ import { DocumentService } from '../../../document/document.service'; import { User } from '../../../user/user.entity'; import { UserService } from '../../../user/user.service'; import { ApplicationService } from '../application.service'; -import { - DocumentCode, - DOCUMENT_TYPE, -} from '../../../document/document-code.entity'; import { ApplicationDocument } from './application-document.entity'; import { ApplicationDocumentService } from './application-document.service'; @@ -233,7 +233,7 @@ describe('ApplicationDocumentService', () => { mockDocumentService.softRemove.mockResolvedValue(); mockRepository.remove.mockResolvedValue({} as any); - const res = await service.deleteByType(DOCUMENT_TYPE.STAFF_REPORT, ''); + await service.deleteByType(DOCUMENT_TYPE.STAFF_REPORT, ''); expect(mockRepository.find).toHaveBeenCalledTimes(1); expect(mockDocumentService.softRemove).toHaveBeenCalledTimes(2); @@ -324,7 +324,7 @@ describe('ApplicationDocumentService', () => { mockDocumentService.create.mockResolvedValue(new Document()); mockDocumentService.softRemove.mockResolvedValue(); - const res = await service.update({ + await service.update({ source: DOCUMENT_SOURCE.APPLICANT, fileName: 'fileName', user: new User(), diff --git a/services/apps/alcs/src/alcs/application/application-document/application-document.service.ts b/services/apps/alcs/src/alcs/application/application-document/application-document.service.ts index f93e8d68c2..8674d59f98 100644 --- a/services/apps/alcs/src/alcs/application/application-document/application-document.service.ts +++ b/services/apps/alcs/src/alcs/application/application-document/application-document.service.ts @@ -12,6 +12,10 @@ import { In, Repository, } from 'typeorm'; +import { + DOCUMENT_TYPE, + DocumentCode, +} from '../../../document/document-code.entity'; import { DOCUMENT_SOURCE, DOCUMENT_SYSTEM, @@ -20,10 +24,6 @@ import { DocumentService } from '../../../document/document.service'; import { PortalApplicationDocumentUpdateDto } from '../../../portal/application-document/application-document.dto'; import { User } from '../../../user/user.entity'; import { ApplicationService } from '../application.service'; -import { - DocumentCode, - DOCUMENT_TYPE, -} from '../../../document/document-code.entity'; import { ApplicationDocument, VISIBILITY_FLAG, @@ -54,6 +54,7 @@ export class ApplicationDocumentService { system, source = DOCUMENT_SOURCE.ALC, visibilityFlags, + description, }: { fileNumber: string; fileName: string; @@ -63,6 +64,7 @@ export class ApplicationDocumentService { source?: DOCUMENT_SOURCE; system: DOCUMENT_SYSTEM; visibilityFlags: VISIBILITY_FLAG[]; + description?: string; }) { const application = await this.applicationService.getOrFail(fileNumber); const document = await this.documentService.create( @@ -78,6 +80,7 @@ export class ApplicationDocumentService { application, document, visibilityFlags, + description, }); return this.applicationDocumentRepository.save(appDocument); @@ -192,9 +195,8 @@ export class ApplicationDocumentService { visibilityFlags, }); - const savedDocument = await this.applicationDocumentRepository.save( - document, - ); + const savedDocument = + await this.applicationDocumentRepository.save(document); return this.get(savedDocument.uuid); } From 6f9340f911e4b857c37e03ff3a3d551b9d73b4f1 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 22 May 2024 10:41:10 -0700 Subject: [PATCH 090/103] Add Legacy ID to Inquiries --- .../inquiry/inquiry-dialog.component.html | 4 ++++ .../inquiry/inquiry-dialog.component.spec.ts | 1 + .../inquiry/header/header.component.html | 4 ++++ .../inquiry/header/header.component.spec.ts | 1 + .../src/app/services/inquiry/inquiry.dto.ts | 1 + .../apps/alcs/src/alcs/inquiry/inquiry.dto.ts | 3 +++ .../alcs/src/alcs/inquiry/inquiry.entity.ts | 9 +++++++++ .../1716399329382-add_legacy_id_to_inquries.ts | 17 +++++++++++++++++ 8 files changed, 40 insertions(+) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1716399329382-add_legacy_id_to_inquries.ts diff --git a/alcs-frontend/src/app/features/board/dialogs/inquiry/inquiry-dialog.component.html b/alcs-frontend/src/app/features/board/dialogs/inquiry/inquiry-dialog.component.html index fcbd7347f9..686c8d433e 100644 --- a/alcs-frontend/src/app/features/board/dialogs/inquiry/inquiry-dialog.component.html +++ b/alcs-frontend/src/app/features/board/dialogs/inquiry/inquiry-dialog.component.html @@ -9,6 +9,10 @@

Inquiry

{{ cardTitle }} +

diff --git a/alcs-frontend/src/app/features/board/dialogs/inquiry/inquiry-dialog.component.spec.ts b/alcs-frontend/src/app/features/board/dialogs/inquiry/inquiry-dialog.component.spec.ts index 4874724032..90a59ab58a 100644 --- a/alcs-frontend/src/app/features/board/dialogs/inquiry/inquiry-dialog.component.spec.ts +++ b/alcs-frontend/src/app/features/board/dialogs/inquiry/inquiry-dialog.component.spec.ts @@ -45,6 +45,7 @@ describe('InquiryDialogComponent', () => { isActive: true, }, fileNumber: 'file-number', + legacyId: null, dateSubmittedToAlc: 0, summary: '', localGovernmentUuid: '', diff --git a/alcs-frontend/src/app/features/inquiry/header/header.component.html b/alcs-frontend/src/app/features/inquiry/header/header.component.html index 4216460cdd..d689736e9e 100644 --- a/alcs-frontend/src/app/features/inquiry/header/header.component.html +++ b/alcs-frontend/src/app/features/inquiry/header/header.component.html @@ -5,6 +5,10 @@
{{ inquiry.fileNumber }} ({{ inquiry.inquirerLastName ?? 'Unknown' }})
+
diff --git a/alcs-frontend/src/app/features/inquiry/header/header.component.spec.ts b/alcs-frontend/src/app/features/inquiry/header/header.component.spec.ts index 1fbf84b75b..d6bc7a9e04 100644 --- a/alcs-frontend/src/app/features/inquiry/header/header.component.spec.ts +++ b/alcs-frontend/src/app/features/inquiry/header/header.component.spec.ts @@ -26,6 +26,7 @@ describe('HeaderComponent', () => { summary: '', typeCode: '', fileNumber: '', + legacyId: null, localGovernment: { uuid: '', name: '', diff --git a/alcs-frontend/src/app/services/inquiry/inquiry.dto.ts b/alcs-frontend/src/app/services/inquiry/inquiry.dto.ts index 8d16a679ce..7279cd6bb0 100644 --- a/alcs-frontend/src/app/services/inquiry/inquiry.dto.ts +++ b/alcs-frontend/src/app/services/inquiry/inquiry.dto.ts @@ -28,6 +28,7 @@ export interface CreateInquiryDto { export interface InquiryDto { uuid: string; fileNumber: string; + legacyId: string | null; summary: string; open: boolean; dateSubmittedToAlc: number; diff --git a/services/apps/alcs/src/alcs/inquiry/inquiry.dto.ts b/services/apps/alcs/src/alcs/inquiry/inquiry.dto.ts index c3baf375f9..e816397d8e 100644 --- a/services/apps/alcs/src/alcs/inquiry/inquiry.dto.ts +++ b/services/apps/alcs/src/alcs/inquiry/inquiry.dto.ts @@ -98,6 +98,9 @@ export class InquiryDto { @AutoMap() fileNumber: string; + @AutoMap(() => String) + legacyId: string | null; + @AutoMap() summary: string; diff --git a/services/apps/alcs/src/alcs/inquiry/inquiry.entity.ts b/services/apps/alcs/src/alcs/inquiry/inquiry.entity.ts index d7a62c0fd2..e1bd9baecc 100644 --- a/services/apps/alcs/src/alcs/inquiry/inquiry.entity.ts +++ b/services/apps/alcs/src/alcs/inquiry/inquiry.entity.ts @@ -37,6 +37,15 @@ export class Inquiry extends Base { }) fileNumber: string; + @AutoMap(() => String) + @Column({ + type: 'text', + comment: + 'Id that is applicable only to paper version applications from 70s - 80s', + nullable: true, + }) + legacyId?: string | null; + @Column({ type: 'text' }) summary: string; diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1716399329382-add_legacy_id_to_inquries.ts b/services/apps/alcs/src/providers/typeorm/migrations/1716399329382-add_legacy_id_to_inquries.ts new file mode 100644 index 0000000000..429c41b8ed --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1716399329382-add_legacy_id_to_inquries.ts @@ -0,0 +1,17 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class AddLegacyIdToInquries1716399329382 implements MigrationInterface { + name = 'AddLegacyIdToInquries1716399329382'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."inquiry" ADD "legacy_id" text`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "alcs"."inquiry" DROP COLUMN "legacy_id"`, + ); + } +} From c5bd8c4b07d93a20920ff6230fbfe940dccc01e2 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 22 May 2024 11:06:01 -0700 Subject: [PATCH 091/103] Add L/FNG reviews to Cancelled Applications that have REVG * After review anything that was submitted to ALC correctly has a review, so we can use the same query but apply to ones currently cancelled --- ...400640726-add_lfng_reviews_to_cancelled.ts | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1716400640726-add_lfng_reviews_to_cancelled.ts diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1716400640726-add_lfng_reviews_to_cancelled.ts b/services/apps/alcs/src/providers/typeorm/migrations/1716400640726-add_lfng_reviews_to_cancelled.ts new file mode 100644 index 0000000000..11b8006d74 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1716400640726-add_lfng_reviews_to_cancelled.ts @@ -0,0 +1,41 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class AddLfngReviewsToCancelled1716400640726 + implements MigrationInterface +{ + public async up(queryRunner: QueryRunner): Promise { + const results = (await queryRunner.query(` + SELECT + file_number + FROM ( + SELECT + file_number, + status_type_code, + application_submission.uuid, + alcs.get_current_status_for_application_submission_by_uuid (alcs.application_submission.uuid) ->> 'status_type_code' AS "current_status" + FROM + alcs.application_submission_to_submission_status + LEFT JOIN alcs.application_submission ON application_submission.uuid = application_submission_to_submission_status.submission_uuid + LEFT JOIN alcs.application_submission_review ON application_submission_review.application_file_number = application_submission.file_number + WHERE + status_type_code = 'REVG' + AND application_submission_review.uuid IS NULL + AND effective_date IS NOT NULL) a + WHERE + a.current_status = 'CANC'; + `)) as { file_number: string }[]; + + for (const result of results) { + await queryRunner.query(` + INSERT INTO "alcs"."application_submission_review" + ("audit_deleted_date_at", "audit_created_at", "audit_updated_at", "audit_created_by", "audit_updated_by", "uuid", "local_government_file_number", "first_name", "last_name", "position", "department", "phone_number", "email", "is_ocp_designation", "ocp_bylaw_name", "ocp_designation", "ocp_consistent", "is_subject_to_zoning", "zoning_bylaw_name", "zoning_designation", "zoning_minimum_lot_size", "is_zoning_consistent", "is_authorized", "application_file_number", "created_by_uuid") VALUES + (NULL, NOW(), NULL, 'seed-migration', NULL, DEFAULT, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ${result.file_number}, NULL); + `); + console.log(`Add Review for Application ${result.file_number}`); + } + } + + public async down(): Promise { + //Nope + } +} From 3e85693b3734230392840345c428eb17082a08d3 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Wed, 22 May 2024 13:26:15 -0700 Subject: [PATCH 092/103] Support searching LegacyID for PRs and INQs --- .../inquiry-advanced-search.service.spec.ts | 3 ++- .../inquiry-advanced-search.service.ts | 19 +++++++++++++++++++ ...ing-review-advanced-search.service.spec.ts | 3 ++- ...planning-review-advanced-search.service.ts | 19 +++++++++++++++++++ .../alcs/src/alcs/search/search.controller.ts | 3 +-- 5 files changed, 43 insertions(+), 4 deletions(-) diff --git a/services/apps/alcs/src/alcs/search/inquiry/inquiry-advanced-search.service.spec.ts b/services/apps/alcs/src/alcs/search/inquiry/inquiry-advanced-search.service.spec.ts index 927a279f03..e535eb237b 100644 --- a/services/apps/alcs/src/alcs/search/inquiry/inquiry-advanced-search.service.spec.ts +++ b/services/apps/alcs/src/alcs/search/inquiry/inquiry-advanced-search.service.spec.ts @@ -43,6 +43,7 @@ describe('InquiryAdvancedSearchService', () => { sortField: 'applicant', sortDirection: 'ASC', portalStatusCodes: [], + legacyId: 'legacyId', }; let mockQuery: any = {}; @@ -112,7 +113,7 @@ describe('InquiryAdvancedSearchService', () => { const result = await service.search(mockSearchDto, mockQueryRunner); expect(result).toEqual({ data: [], total: 0 }); - expect(mockInquiryRepository.find).toHaveBeenCalledTimes(3); + expect(mockInquiryRepository.find).toHaveBeenCalledTimes(4); expect(mockInquiryRepository.createQueryBuilder).toHaveBeenCalledTimes(4); expect(mockQuery.andWhere).toHaveBeenCalledTimes(4); }); diff --git a/services/apps/alcs/src/alcs/search/inquiry/inquiry-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/inquiry/inquiry-advanced-search.service.ts index dc1c256e13..9801808a68 100644 --- a/services/apps/alcs/src/alcs/search/inquiry/inquiry-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/inquiry/inquiry-advanced-search.service.ts @@ -143,6 +143,10 @@ export class InquiryAdvancedSearchService { this.addFileTypeResults(searchDto, promises); } + if (searchDto.legacyId) { + this.addLegacyIDResults(searchDto, promises); + } + const t0 = performance.now(); const finalResult = await processSearchPromises(promises); const t1 = performance.now(); @@ -295,4 +299,19 @@ export class InquiryAdvancedSearchService { } promises.push(query.getMany()); } + + private addLegacyIDResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const promise = this.inquiryRepository.find({ + where: { + legacyId: searchDto.legacyId, + }, + select: { + fileNumber: true, + }, + }); + promises.push(promise); + } } diff --git a/services/apps/alcs/src/alcs/search/planning-review/planning-review-advanced-search.service.spec.ts b/services/apps/alcs/src/alcs/search/planning-review/planning-review-advanced-search.service.spec.ts index 8f6d9224d7..fd38b72e77 100644 --- a/services/apps/alcs/src/alcs/search/planning-review/planning-review-advanced-search.service.spec.ts +++ b/services/apps/alcs/src/alcs/search/planning-review/planning-review-advanced-search.service.spec.ts @@ -45,6 +45,7 @@ describe('PlanningReviewAdvancedSearchService', () => { pageSize: 10, sortField: 'ownerName', sortDirection: 'ASC', + legacyId: 'legacyId', }; let mockQuery: any = {}; @@ -107,7 +108,7 @@ describe('PlanningReviewAdvancedSearchService', () => { const result = await service.search(mockSearchDto, mockQueryRunner); expect(result).toEqual({ data: [], total: 0 }); - expect(mockPlanningReviewRepository.find).toHaveBeenCalledTimes(3); + expect(mockPlanningReviewRepository.find).toHaveBeenCalledTimes(4); expect( mockPlanningReviewRepository.createQueryBuilder, ).toHaveBeenCalledTimes(5); diff --git a/services/apps/alcs/src/alcs/search/planning-review/planning-review-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/planning-review/planning-review-advanced-search.service.ts index bf808549c8..2acaf54d8c 100644 --- a/services/apps/alcs/src/alcs/search/planning-review/planning-review-advanced-search.service.ts +++ b/services/apps/alcs/src/alcs/search/planning-review/planning-review-advanced-search.service.ts @@ -149,6 +149,10 @@ export class PlanningReviewAdvancedSearchService { this.addDecisionDateResults(searchDto, promises); } + if (searchDto.legacyId) { + this.addLegacyIDResults(searchDto, promises); + } + const t0 = performance.now(); const finalResult = await processSearchPromises(promises); const t1 = performance.now(); @@ -322,4 +326,19 @@ export class PlanningReviewAdvancedSearchService { } promises.push(query.getMany()); } + + private addLegacyIDResults( + searchDto: SearchRequestDto, + promises: Promise<{ fileNumber: string }[]>[], + ) { + const promise = this.planningReviewRepository.find({ + where: { + legacyId: searchDto.legacyId, + }, + select: { + fileNumber: true, + }, + }); + promises.push(promise); + } } diff --git a/services/apps/alcs/src/alcs/search/search.controller.ts b/services/apps/alcs/src/alcs/search/search.controller.ts index 39fd5762e4..a6ae7f66b6 100644 --- a/services/apps/alcs/src/alcs/search/search.controller.ts +++ b/services/apps/alcs/src/alcs/search/search.controller.ts @@ -385,8 +385,7 @@ export class SearchController { !searchDto.dateDecidedTo && !searchDto.resolutionNumber && !searchDto.resolutionYear && - searchDto.portalStatusCodes.length === 0 && - !isStringSetAndNotEmpty(searchDto.legacyId); + searchDto.portalStatusCodes.length === 0; return { searchApplications, From f7faae1d3507840e7b21df752cb5b7113963c8f0 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 23 May 2024 11:53:25 -0700 Subject: [PATCH 093/103] Only allow vertical resizing of text area --- .../inline-textarea/inline-textarea.component.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/alcs-frontend/src/app/shared/inline-editors/inline-textarea/inline-textarea.component.scss b/alcs-frontend/src/app/shared/inline-editors/inline-textarea/inline-textarea.component.scss index e0f8c34921..d1962fae80 100644 --- a/alcs-frontend/src/app/shared/inline-editors/inline-textarea/inline-textarea.component.scss +++ b/alcs-frontend/src/app/shared/inline-editors/inline-textarea/inline-textarea.component.scss @@ -70,4 +70,5 @@ margin-left: -8px; margin-right: -8px; background: none; + resize: vertical; } From c49e85255f43712346194658be5060e4bd094915 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 23 May 2024 13:04:47 -0700 Subject: [PATCH 094/103] No Data -> Not Applicable for Owner/Transferee Organization Fields In 25 places --- .../application-details.component.scss | 2 -- .../parcel/parcel.component.html | 10 ++++++++-- .../notification-details.component.html | 2 +- .../notification-details.component.scss | 6 ------ .../application-details.component.scss | 2 +- .../parcel/parcel.component.html | 6 +++--- .../notice-of-intent-details.component.scss | 10 ---------- .../parcel/parcel.component.html | 14 ++++++++++---- .../parcel/parcel.component.scss | 5 +++++ .../transferees/transferees.component.html | 4 ++-- .../transferees/transferees.component.scss | 4 ++++ .../notification-details.component.html | 2 +- .../notification-details.component.scss | 8 +------- .../submission/parcel/parcel.component.html | 2 +- .../submission-details.component.scss | 3 +-- .../submission/parcel/parcel.component.html | 2 +- .../submission-details.component.scss | 3 +-- .../parcel-owners.component.html | 8 +++++--- .../parcel-owners.component.scss | 6 ------ .../noi-pfrs-submission-template.docx | Bin 37905 -> 37906 bytes .../noi-pofo-submission-template.docx | Bin 37405 -> 37387 bytes .../noi-roso-submission-template.docx | Bin 37598 -> 37596 bytes .../submissions/cove-submission-template.docx | Bin 32365 -> 32364 bytes .../submissions/excl-submission-template.docx | Bin 32261 -> 32263 bytes .../submissions/incl-submission-template.docx | Bin 32328 -> 32328 bytes .../submissions/naru-submission-template.docx | Bin 33213 -> 33213 bytes .../submissions/nfu-submission-template.docx | Bin 32268 -> 32268 bytes .../submissions/pfrs-submission-template.docx | Bin 33454 -> 33453 bytes .../submissions/pofo-submission-template.docx | Bin 32863 -> 32862 bytes .../submissions/roso-submission-template.docx | Bin 32758 -> 32756 bytes .../submissions/subd-submission-template.docx | Bin 36372 -> 36370 bytes .../submissions/tur-submission-template.docx | Bin 36092 -> 36093 bytes 32 files changed, 45 insertions(+), 54 deletions(-) diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.scss b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.scss index 8ac50e0594..21eb0d060c 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.scss +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.scss @@ -32,9 +32,7 @@ } .no-data-text { - text-align: center; color: colors.$grey; - padding-top: 12px; .error { justify-content: center; diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html index ba60c3bf40..20ac97e32c 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html +++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html @@ -118,7 +118,10 @@
Government Parcel Contact
{{ owner.organizationName }} - +
+
Not Applicable
+
No Data
+
diff --git a/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.html b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.html index 0d0677a346..8df597ccb3 100644 --- a/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.html +++ b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.html @@ -15,7 +15,7 @@

Transferee(s)

{{ transferee.displayName }}
{{ transferee.organizationName }} - +
Not Applicable
{{ transferee.phoneNumber | mask: '(000) 000-0000' }} diff --git a/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.scss b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.scss index eb20ba937e..be32732d4b 100644 --- a/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.scss +++ b/alcs-frontend/src/app/features/notification/applicant-info/notification-details/notification-details.component.scss @@ -26,13 +26,7 @@ } .no-data-text { - text-align: center; color: colors.$grey; - padding-top: 12px; - - .error { - justify-content: center; - } } .table-wrapper { diff --git a/portal-frontend/src/app/features/applications/application-details/application-details.component.scss b/portal-frontend/src/app/features/applications/application-details/application-details.component.scss index d737614260..24eb6244be 100644 --- a/portal-frontend/src/app/features/applications/application-details/application-details.component.scss +++ b/portal-frontend/src/app/features/applications/application-details/application-details.component.scss @@ -38,7 +38,7 @@ .no-data-text { text-align: center; - color: colors.$grey; + color: colors.$grey-dark; padding-top: rem(12); .error { diff --git a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html index 4a7d1ca754..066564974c 100644 --- a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html @@ -156,7 +156,7 @@
Government Parcel Contact
{{ owner.organizationName }} - +
Not Applicable
{{ owner.phoneNumber ?? '' | mask: '(000) 000-0000' }} @@ -166,8 +166,8 @@
Government Parcel Contact
{{ - owner.corporateSummary.fileName - }} + owner.corporateSummary.fileName + }}
Not Applicable
diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss index d737614260..7c0c5f2a7e 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss @@ -36,16 +36,6 @@ font-weight: 600; } - .no-data-text { - text-align: center; - color: colors.$grey; - padding-top: rem(12); - - .error { - justify-content: center; - } - } - .custom-mat-expansion-panel-header { height: fit-content; } diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html index 85c2f464a3..2de636cb52 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html @@ -150,15 +150,21 @@
Government Parcel Contact
{{ owner.displayName }}
{{ owner.organizationName }} - +
+
Not Applicable
+
No Data
+
{{ owner.phoneNumber ?? '' | mask : '(000) 000-0000' }}
{{ owner.email }}
{{ - owner.corporateSummary.fileName - }} - + owner.corporateSummary.fileName + }} +
+
Not Applicable
+
No Data
+
diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.scss b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.scss index ffe631e662..feea88d86c 100644 --- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.scss +++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.scss @@ -1,4 +1,5 @@ @use '../../../../../styles/functions' as *; +@use '../../../../../styles/colors'; .parcel-header { display: flex; @@ -41,3 +42,7 @@ .crown-land { text-transform: capitalize; } + +.no-data-text { + color: colors.$grey-dark; +} diff --git a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.html b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.html index d2a9e56643..eca6717342 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.html +++ b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.html @@ -40,14 +40,14 @@

All Transferees

{{ element.organizationName }} - No Data + Not Applicable Phone - {{ element.phoneNumber | mask : '(000) 000-0000' }} + {{ element.phoneNumber | mask: '(000) 000-0000' }} diff --git a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.scss b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.scss index ad4a6d8656..194093cd16 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.scss +++ b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.scss @@ -7,6 +7,10 @@ padding: rem(8); } +.no-data-text { + color: colors.$grey-dark; +} + .actions-cell { button:not(:last-child) { margin-right: rem(12) !important; diff --git a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html index c61e82670b..c74e908c73 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html +++ b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.html @@ -20,7 +20,7 @@

2. Identify Transferee(s)

{{ transferee.displayName }}
{{ transferee.organizationName }} - +
Not Applicable
{{ transferee.phoneNumber | mask : '(000) 000-0000' }} diff --git a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.scss b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.scss index 84d7af703e..c182e2e527 100644 --- a/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.scss +++ b/portal-frontend/src/app/features/notifications/notification-details/notification-details.component.scss @@ -31,13 +31,7 @@ } .no-data-text { - text-align: center; - color: colors.$grey; - padding-top: rem(12); - - .error { - justify-content: center; - } + color: colors.$grey-dark; } .custom-mat-expansion-panel-header { diff --git a/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.html b/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.html index 84708cafa6..213c073cd3 100644 --- a/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.html @@ -91,7 +91,7 @@
Government Parcel Contact
{{ owner.displayName }}
{{ owner.organizationName }} - +
Not Applicable
diff --git a/portal-frontend/src/app/features/public/application/submission/submission-details.component.scss b/portal-frontend/src/app/features/public/application/submission/submission-details.component.scss index 0185b46ccc..9796891103 100644 --- a/portal-frontend/src/app/features/public/application/submission/submission-details.component.scss +++ b/portal-frontend/src/app/features/public/application/submission/submission-details.component.scss @@ -28,8 +28,7 @@ .no-data-text { text-align: center; - color: colors.$grey; - padding-top: rem(12); + color: colors.$grey-dark; .error { justify-content: center; diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.html b/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.html index 8ff786caf1..28d1128c03 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.html +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.html @@ -91,7 +91,7 @@
Government Parcel Contact
{{ owner.displayName }}
{{ owner.organizationName }} - +
Not Applicable
diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.scss b/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.scss index 7999845e23..8e568b8c10 100644 --- a/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.scss +++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.scss @@ -28,8 +28,7 @@ .no-data-text { text-align: center; - color: colors.$grey; - padding-top: rem(12); + color: colors.$grey-dark; .error { justify-content: center; diff --git a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.html b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.html index 5efc61f9de..b651d7bc52 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.html +++ b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.html @@ -14,7 +14,9 @@ - +
+
Not Applicable
+
{{ element.organizationName }} @@ -39,8 +41,8 @@
{{ - element.corporateSummary.fileName - }} + element.corporateSummary.fileName + }}
Not Applicable
diff --git a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.scss b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.scss index 3450e216d4..0ebd845900 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.scss +++ b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.scss @@ -7,12 +7,6 @@ } } -.no-data-text { - text-align: center; - color: colors.$grey-dark; - padding-top: rem(12); -} - .no-data-text { color: colors.$grey-dark; text-align: left; diff --git a/services/templates/pdf/noi-submissions/noi-pfrs-submission-template.docx b/services/templates/pdf/noi-submissions/noi-pfrs-submission-template.docx index be7805654a4a6c6e46edcc66c9a52a3925ef364f..4b534b728ecb68ff762436647f635d4ef72b500a 100644 GIT binary patch delta 7908 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 M!RU}g6aV4<4<}CN82|tP delta 7939 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 delta 8190 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 delta 5311 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 HDEI#Yf-;a; delta 6802 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 diff --git a/services/templates/pdf/submissions/naru-submission-template.docx b/services/templates/pdf/submissions/naru-submission-template.docx index 89e5dce889f3b76e8e853a92ab97c47683479187..82bd806c4072219adf639ff464d03f10fa88912b 100644 GIT binary patch delta 7296 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 delta 7308 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 delta 4205 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 diff --git a/services/templates/pdf/submissions/pfrs-submission-template.docx b/services/templates/pdf/submissions/pfrs-submission-template.docx index e2ac6921679d34e0e269137858ef79015367dd62..a51d5a9c01d2352c2604be3d30f001bca5505573 100644 GIT binary patch delta 5592 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 K;n4$sv;PBAvp(Da delta 5673 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 diff --git a/services/templates/pdf/submissions/pofo-submission-template.docx b/services/templates/pdf/submissions/pofo-submission-template.docx index db61340e43b5ffb39fec7d5fe475493bd81fa506..29a6d35b5dc8bab45c476fbbd2cb21069b2b9cc1 100644 GIT binary patch delta 6725 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 diff --git a/services/templates/pdf/submissions/roso-submission-template.docx b/services/templates/pdf/submissions/roso-submission-template.docx index ae75ba10e211eb649382b84963f32455d40de583..1deb31525d93131df62df58006c1c83c448a2fe4 100644 GIT binary patch delta 7062 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 delta 7111 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 diff --git a/services/templates/pdf/submissions/subd-submission-template.docx b/services/templates/pdf/submissions/subd-submission-template.docx index 0abab60fbdac2e990b8a2d7eb196cdd3abf48a97..b41d81db03bf86a13e9cb72c145a45ed75dfe663 100644 GIT binary patch delta 3608 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 delta 3592 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 l{&}a)IjsY(iCh= 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 From 60b2bd995afe0b9208b36884ad6fdc4604916e9c Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 23 May 2024 13:58:32 -0700 Subject: [PATCH 095/103] Add sorting to lots of queries * Sort owners by first name * Sort transferees by first name * Sort card subtasks by created date --- .../apps/alcs/src/alcs/card/card.service.ts | 14 +++++++-- .../application-parcel.service.spec.ts | 7 ++++- .../application-parcel.service.ts | 14 +++++++-- .../application-submission.service.ts | 2 ++ .../covenant-transferee.service.ts | 11 ++++--- .../notice-of-intent-parcel.service.spec.ts | 7 ++++- .../notice-of-intent-parcel.service.ts | 14 +++++++-- .../notification-submission.service.ts | 29 ++++++++++++------- 8 files changed, 75 insertions(+), 23 deletions(-) diff --git a/services/apps/alcs/src/alcs/card/card.service.ts b/services/apps/alcs/src/alcs/card/card.service.ts index 8eb90d78c4..e9edac6480 100644 --- a/services/apps/alcs/src/alcs/card/card.service.ts +++ b/services/apps/alcs/src/alcs/card/card.service.ts @@ -1,9 +1,9 @@ import { CONFIG_TOKEN } from '@app/common/config/config.module'; import { ServiceValidationException } from '@app/common/exceptions/base.exception'; -import { Mapper } from 'automapper-core'; -import { InjectMapper } from 'automapper-nestjs'; import { Inject, Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import { IConfig } from 'config'; import { FindOptionsRelations, Not, Repository } from 'typeorm'; import { User } from '../../user/user.entity'; @@ -66,6 +66,11 @@ export class CardService { assignee: true, }, }, + order: { + subtasks: { + createdAt: 'ASC', + }, + }, }); } @@ -80,6 +85,11 @@ export class CardService { assignee: true, }, }, + order: { + subtasks: { + createdAt: 'ASC', + }, + }, }); } diff --git a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.service.spec.ts b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.service.spec.ts index 0f0eff298a..481feb377b 100644 --- a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.service.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.service.spec.ts @@ -69,7 +69,12 @@ describe('ApplicationParcelService', () => { isDraft: false, }, }, - order: { auditCreatedAt: 'ASC' }, + order: { + auditCreatedAt: 'ASC', + owners: { + firstName: 'ASC', + }, + }, relations: { certificateOfTitle: { document: true }, owners: { diff --git a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.service.ts b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.service.ts index 33a90181e8..ac134e576d 100644 --- a/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-parcel/application-parcel.service.ts @@ -21,7 +21,12 @@ export class ApplicationParcelService { async fetchByApplicationFileId(fileId: string) { return this.parcelRepository.find({ where: { applicationSubmission: { fileNumber: fileId, isDraft: false } }, - order: { auditCreatedAt: 'ASC' }, + order: { + auditCreatedAt: 'ASC', + owners: { + firstName: 'ASC', + }, + }, relations: { ownershipType: true, certificateOfTitle: { document: true }, @@ -38,7 +43,12 @@ export class ApplicationParcelService { async fetchByApplicationSubmissionUuid(uuid: string) { return this.parcelRepository.find({ where: { applicationSubmission: { uuid } }, - order: { auditCreatedAt: 'ASC' }, + order: { + auditCreatedAt: 'ASC', + owners: { + firstName: 'ASC', + }, + }, relations: { ownershipType: true, certificateOfTitle: { document: true }, diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts index a5519c5c5c..e6baa3ba92 100644 --- a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts @@ -404,6 +404,7 @@ export class ApplicationSubmissionService { order: { auditUpdatedAt: 'DESC', owners: { + firstName: 'ASC', parcels: { purchasedDate: 'ASC', }, @@ -478,6 +479,7 @@ export class ApplicationSubmissionService { order: { auditUpdatedAt: 'DESC', owners: { + firstName: 'ASC', parcels: { purchasedDate: 'ASC', }, diff --git a/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.service.ts b/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.service.ts index d71f6fda3a..cdd2273bf6 100644 --- a/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.service.ts +++ b/services/apps/alcs/src/portal/application-submission/covenant-transferee/covenant-transferee.service.ts @@ -1,10 +1,9 @@ -import { forwardRef, Inject, Injectable } from '@nestjs/common'; +import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Any, Repository } from 'typeorm'; import { OwnerType } from '../../../common/owner-type/owner-type.entity'; import { User } from '../../../user/user.entity'; import { ApplicationSubmission } from '../application-submission.entity'; -import { ApplicationSubmissionService } from '../application-submission.service'; import { CovenantTransfereeCreateDto, CovenantTransfereeUpdateDto, @@ -18,8 +17,6 @@ export class CovenantTransfereeService { private repository: Repository, @InjectRepository(OwnerType) private typeRepository: Repository, - @Inject(forwardRef(() => ApplicationSubmissionService)) - private applicationSubmissionService: ApplicationSubmissionService, ) {} async fetchBySubmissionUuid(uuid: string) { @@ -30,6 +27,9 @@ export class CovenantTransfereeService { relations: { type: true, }, + order: { + firstName: 'ASC', + }, }); } @@ -41,6 +41,9 @@ export class CovenantTransfereeService { isDraft: false, }, }, + order: { + firstName: 'ASC', + }, relations: { type: true, }, diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service.spec.ts index 19a4c0c40b..ba18ae40f9 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service.spec.ts @@ -70,7 +70,12 @@ describe('NoticeOfIntentParcelService', () => { isDraft: false, }, }, - order: { auditCreatedAt: 'ASC' }, + order: { + auditCreatedAt: 'ASC', + owners: { + firstName: 'ASC', + }, + }, relations: { certificateOfTitle: { document: true }, owners: { diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service.ts index 81f810378e..4603961f83 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service.ts @@ -24,7 +24,12 @@ export class NoticeOfIntentParcelService { where: { noticeOfIntentSubmission: { fileNumber: fileId, isDraft: false }, }, - order: { auditCreatedAt: 'ASC' }, + order: { + auditCreatedAt: 'ASC', + owners: { + firstName: 'ASC', + }, + }, relations: { ownershipType: true, certificateOfTitle: { document: true }, @@ -41,7 +46,12 @@ export class NoticeOfIntentParcelService { async fetchByApplicationSubmissionUuid(uuid: string) { return this.parcelRepository.find({ where: { noticeOfIntentSubmission: { uuid } }, - order: { auditCreatedAt: 'ASC' }, + order: { + auditCreatedAt: 'ASC', + owners: { + firstName: 'ASC', + }, + }, relations: { ownershipType: true, certificateOfTitle: { document: true }, diff --git a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts index 72c6777912..4929787c7c 100644 --- a/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts +++ b/services/apps/alcs/src/portal/notification-submission/notification-submission.service.ts @@ -1,8 +1,8 @@ import { BaseServiceException } from '@app/common/exceptions/base.exception'; -import { Mapper } from 'automapper-core'; -import { InjectMapper } from 'automapper-nestjs'; import { Injectable, Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; +import { Mapper } from 'automapper-core'; +import { InjectMapper } from 'automapper-nestjs'; import * as dayjs from 'dayjs'; import { FindOptionsRelations, @@ -69,6 +69,11 @@ export class NotificationSubmissionService { fileNumber, }, relations: this.DEFAULT_RELATIONS, + order: { + transferees: { + firstName: 'ASC', + }, + }, }); } @@ -212,6 +217,9 @@ export class NotificationSubmissionService { where: whereClauses, order: { auditUpdatedAt: 'DESC', + transferees: { + firstName: 'ASC', + }, }, relations: this.DEFAULT_RELATIONS, }); @@ -226,6 +234,11 @@ export class NotificationSubmissionService { where: { uuid, }, + order: { + transferees: { + firstName: 'ASC', + }, + }, relations: { ...this.DEFAULT_RELATIONS, }, @@ -245,6 +258,9 @@ export class NotificationSubmissionService { ...this.DEFAULT_RELATIONS, }, order: { + transferees: { + firstName: 'ASC', + }, auditUpdatedAt: 'DESC', }, }); @@ -393,15 +409,6 @@ export class NotificationSubmissionService { ); } - private loadBarebonesSubmission(uuid: string) { - //Load submission without relations to prevent save from crazy cascading - return this.notificationSubmissionRepository.findOneOrFail({ - where: { - uuid, - }, - }); - } - async sendAndRecordLTSAPackage( submission: NotificationSubmission, document: NotificationDocument, From 7c13bc775f7f48e22338be5384cab3a87fabd646 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 23 May 2024 15:17:06 -0700 Subject: [PATCH 096/103] Fix toast to say Planning Review --- .../features/planning-review/overview/overview.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alcs-frontend/src/app/features/planning-review/overview/overview.component.ts b/alcs-frontend/src/app/features/planning-review/overview/overview.component.ts index a5e1e7190d..c9eaf5fe39 100644 --- a/alcs-frontend/src/app/features/planning-review/overview/overview.component.ts +++ b/alcs-frontend/src/app/features/planning-review/overview/overview.component.ts @@ -105,7 +105,7 @@ export class OverviewComponent implements OnInit, OnDestroy { localGovernmentUuid: $event, }); if (update) { - this.toastService.showSuccessToast('Notice of Intent updated'); + this.toastService.showSuccessToast('Planning Review updated'); } } } @@ -116,7 +116,7 @@ export class OverviewComponent implements OnInit, OnDestroy { regionCode: $event, }); if (update) { - this.toastService.showSuccessToast('Notice of Intent updated'); + this.toastService.showSuccessToast('Planning Review updated'); } } } From 40ad829ab370b883d7daaaf6e52a10d5a9ac17d3 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Thu, 23 May 2024 16:33:02 -0700 Subject: [PATCH 097/103] Keep organization name when changing from indv -> organization * Also fixed a bug where the corporate summary was not getting deleted --- .../transferee-dialog.component.ts | 15 ++++++----- .../owner-dialog/owner-dialog.component.ts | 17 +++++++----- .../application-owner.service.spec.ts | 6 +++-- .../application-owner.service.ts | 26 ++++++++++++------- .../notice-of-intent-owner.dto.ts | 10 +++---- .../notice-of-intent-owner.service.spec.ts | 7 +++-- .../notice-of-intent-owner.service.ts | 26 ++++++++++++------- 7 files changed, 68 insertions(+), 39 deletions(-) diff --git a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.ts index d2335059d2..b96bb4516d 100644 --- a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.ts +++ b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferee-dialog/transferee-dialog.component.ts @@ -44,7 +44,7 @@ export class TransfereeDialogComponent { public data: { submissionUuid: string; existingTransferee?: NotificationTransfereeDto; - } + }, ) { if (data && data.existingTransferee) { this.onChangeType({ @@ -66,7 +66,7 @@ export class TransfereeDialogComponent { this.organizationName.setValidators([Validators.required]); } else { this.organizationName.setValidators([]); - this.organizationName.reset(); + this.organizationName.updateValueAndValidity(); } } @@ -78,8 +78,10 @@ export class TransfereeDialogComponent { } this.isLoading = true; + const orgName = this.type.value === OWNER_TYPE.ORGANIZATION ? this.organizationName.getRawValue() : null; + const createDto: NotificationTransfereeCreateDto = { - organizationName: this.organizationName.getRawValue() || undefined, + organizationName: orgName, firstName: this.firstName.getRawValue() || undefined, lastName: this.lastName.getRawValue() || undefined, email: this.email.getRawValue()!, @@ -91,7 +93,7 @@ export class TransfereeDialogComponent { await this.transfereeService.create(createDto); this.dialogRef.close(true); } else { - this.form.markAllAsTouched() + this.form.markAllAsTouched(); } } @@ -101,8 +103,9 @@ export class TransfereeDialogComponent { async onSave() { if (this.form.valid) { + const orgName = this.type.value === OWNER_TYPE.ORGANIZATION ? this.organizationName.getRawValue() : null; const updateDto: NotificationTransfereeUpdateDto = { - organizationName: this.organizationName.getRawValue(), + organizationName: orgName, firstName: this.firstName.getRawValue(), lastName: this.lastName.getRawValue(), email: this.email.getRawValue()!, @@ -115,7 +118,7 @@ export class TransfereeDialogComponent { this.dialogRef.close(true); } } else { - this.form.markAllAsTouched() + this.form.markAllAsTouched(); } } } diff --git a/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts index f4403ac5f7..58c228fd21 100644 --- a/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts +++ b/portal-frontend/src/app/shared/owner-dialogs/owner-dialog/owner-dialog.component.ts @@ -69,7 +69,7 @@ export class OwnerDialogComponent { existingOwner?: ApplicationOwnerDto; documentService: ApplicationDocumentService | NoticeOfIntentDocumentService; ownerService: ApplicationOwnerService | NoticeOfIntentOwnerService; - } + }, ) { if (data && data.existingOwner) { this.onChangeType({ @@ -98,9 +98,10 @@ export class OwnerDialogComponent { } else { this.organizationName.setValidators([]); this.corporateSummary.setValidators([]); - this.organizationName.reset(); this.corporateSummary.reset(); } + this.corporateSummary.updateValueAndValidity(); + this.organizationName.updateValueAndValidity(); } async onCreate() { @@ -118,11 +119,13 @@ export class OwnerDialogComponent { return; } } + + const orgName = this.type.value === OWNER_TYPE.ORGANIZATION ? this.organizationName.getRawValue() : null; const createDto: ApplicationOwnerCreateDto & NoticeOfIntentOwnerCreateDto = { - organizationName: this.organizationName.getRawValue() || undefined, + organizationName: orgName, firstName: this.firstName.getRawValue() || undefined, lastName: this.lastName.getRawValue() || undefined, - corporateSummaryUuid: documentUuid?.uuid, + corporateSummaryUuid: documentUuid?.uuid ?? null, email: this.email.getRawValue()!, phoneNumber: this.phoneNumber.getRawValue()!, typeCode: this.type.getRawValue()!, @@ -171,11 +174,12 @@ export class OwnerDialogComponent { document = await this.uploadPendingFile(this.pendingFile); } + const orgName = this.type.value === OWNER_TYPE.ORGANIZATION ? this.organizationName.getRawValue() : null; const updateDto: ApplicationOwnerUpdateDto = { - organizationName: this.organizationName.getRawValue(), + organizationName: orgName, firstName: this.firstName.getRawValue(), lastName: this.lastName.getRawValue(), - corporateSummaryUuid: document?.uuid, + corporateSummaryUuid: document?.uuid ?? null, email: this.email.getRawValue()!, phoneNumber: this.phoneNumber.getRawValue()!, typeCode: this.type.getRawValue()!, @@ -190,6 +194,7 @@ export class OwnerDialogComponent { this.isLoading = false; } else { this.form.markAllAsTouched(); + this.showFileErrors = true; } } diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.spec.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.spec.ts index 88afbeb092..a179e27c76 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.spec.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.spec.ts @@ -170,9 +170,11 @@ describe('ApplicationOwnerService', () => { corporateSummaryUuid: 'oldUuid', corporateSummary: new ApplicationDocument(), }); + const mockDocument = new ApplicationDocument(); mockRepo.findOneOrFail.mockResolvedValue(owner); mockRepo.save.mockResolvedValue(new ApplicationOwner()); mockAppDocumentService.delete.mockResolvedValue({} as any); + mockAppDocumentService.get.mockResolvedValue(mockDocument); await service.update('', { organizationName: '', @@ -182,10 +184,10 @@ describe('ApplicationOwnerService', () => { corporateSummaryUuid: 'newUuid', }); - expect(owner.corporateSummaryUuid).toEqual('newUuid'); + expect(owner.corporateSummary).toBe(mockDocument); expect(mockAppDocumentService.delete).toHaveBeenCalledTimes(1); expect(mockRepo.findOneOrFail).toHaveBeenCalledTimes(1); - expect(mockRepo.save).toHaveBeenCalledTimes(2); + expect(mockRepo.save).toHaveBeenCalledTimes(1); }); it('should call through for delete', async () => { diff --git a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts index f51f66f7bf..513d5c3418 100644 --- a/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts +++ b/services/apps/alcs/src/portal/application-submission/application-owner/application-owner.service.ts @@ -138,22 +138,30 @@ export class ApplicationOwnerService { }); } - //If attaching new document and old one was defined, delete it + //If null or new document, delete old one if ( - updateDto.corporateSummaryUuid && + updateDto.corporateSummaryUuid !== undefined && existingOwner.corporateSummaryUuid !== updateDto.corporateSummaryUuid && existingOwner.corporateSummary ) { - const oldSummary = existingOwner.corporateSummary; + await this.applicationDocumentService.delete( + existingOwner.corporateSummary, + ); existingOwner.corporateSummary = null; - await this.repository.save(existingOwner); - await this.applicationDocumentService.delete(oldSummary); + existingOwner.corporateSummaryUuid = null; } - existingOwner.corporateSummaryUuid = - updateDto.corporateSummaryUuid !== undefined - ? updateDto.corporateSummaryUuid - : existingOwner.corporateSummaryUuid; + //Attach new one + if ( + updateDto.corporateSummaryUuid && + updateDto.corporateSummaryUuid !== existingOwner.corporateSummaryUuid + ) { + const newSummary = await this.applicationDocumentService.get( + updateDto.corporateSummaryUuid, + ); + existingOwner.corporateSummary = newSummary; + existingOwner.corporateSummaryUuid = newSummary.uuid; + } existingOwner.organizationName = updateDto.organizationName !== undefined diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.dto.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.dto.ts index 5d67fa462d..80c52ac708 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.dto.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.dto.ts @@ -8,8 +8,8 @@ import { } from 'class-validator'; import { NoticeOfIntentDocumentDto } from '../../../alcs/notice-of-intent/notice-of-intent-document/notice-of-intent-document.dto'; import { - OwnerTypeDto, OWNER_TYPE, + OwnerTypeDto, } from '../../../common/owner-type/owner-type.entity'; import { emailRegex } from '../../../utils/email.helper'; import { NoticeOfIntentParcelDto } from '../notice-of-intent-parcel/notice-of-intent-parcel.dto'; @@ -66,7 +66,7 @@ export class NoticeOfIntentOwnerUpdateDto { @IsString() @IsOptional() - organizationName?: string; + organizationName?: string | null; @IsString() @IsOptional() @@ -75,7 +75,7 @@ export class NoticeOfIntentOwnerUpdateDto { @Matches(emailRegex) @IsOptional() email?: string; - + @IsString() @IsOptional() crownLandOwnerType?: string; @@ -86,7 +86,7 @@ export class NoticeOfIntentOwnerUpdateDto { @IsUUID() @IsOptional() - corporateSummaryUuid?: string; + corporateSummaryUuid?: string | null; } export class NoticeOfIntentOwnerCreateDto extends NoticeOfIntentOwnerUpdateDto { @@ -125,7 +125,7 @@ export class SetPrimaryContactDto { @IsString() noticeOfIntentSubmissionUuid: string; - + @IsString() @IsOptional() crownLandOwnerType?: string; diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.spec.ts index 487a09906d..336eb07536 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.spec.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.spec.ts @@ -181,6 +181,8 @@ describe('NoticeOfIntentOwnerService', () => { mockRepo.findOneOrFail.mockResolvedValue(owner); mockRepo.save.mockResolvedValue(new NoticeOfIntentOwner()); mockAppDocumentService.delete.mockResolvedValue({} as any); + const mockDocument = new NoticeOfIntentDocument(); + mockAppDocumentService.get.mockResolvedValue(mockDocument); await service.update( '', @@ -194,10 +196,11 @@ describe('NoticeOfIntentOwnerService', () => { new User(), ); - expect(owner.corporateSummaryUuid).toEqual('newUuid'); + expect(owner.corporateSummary).toBe(mockDocument); expect(mockAppDocumentService.delete).toHaveBeenCalledTimes(1); expect(mockRepo.findOneOrFail).toHaveBeenCalledTimes(1); - expect(mockRepo.save).toHaveBeenCalledTimes(2); + expect(mockRepo.save).toHaveBeenCalledTimes(1); + expect(mockAppDocumentService.get).toHaveBeenCalledTimes(1); }); it('should call through for delete', async () => { diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.ts index 80fd8246dd..a70ce05189 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.ts +++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service.ts @@ -153,22 +153,30 @@ export class NoticeOfIntentOwnerService { }); } - //If attaching new document and old one was defined, delete it + //If null or new document, delete old one if ( - updateDto.corporateSummaryUuid && + updateDto.corporateSummaryUuid !== undefined && existingOwner.corporateSummaryUuid !== updateDto.corporateSummaryUuid && existingOwner.corporateSummary ) { - const oldSummary = existingOwner.corporateSummary; + await this.noticeOfIntentDocumentService.delete( + existingOwner.corporateSummary, + ); existingOwner.corporateSummary = null; - await this.repository.save(existingOwner); - await this.noticeOfIntentDocumentService.delete(oldSummary); + existingOwner.corporateSummaryUuid = null; } - existingOwner.corporateSummaryUuid = - updateDto.corporateSummaryUuid !== undefined - ? updateDto.corporateSummaryUuid - : existingOwner.corporateSummaryUuid; + //Attach new one + if ( + updateDto.corporateSummaryUuid && + updateDto.corporateSummaryUuid !== existingOwner.corporateSummaryUuid + ) { + const newSummary = await this.noticeOfIntentDocumentService.get( + updateDto.corporateSummaryUuid, + ); + existingOwner.corporateSummary = newSummary; + existingOwner.corporateSummaryUuid = newSummary.uuid; + } existingOwner.organizationName = updateDto.organizationName !== undefined From 02051ad4d2dcbe9391292ac6fb85f424b21a7f38 Mon Sep 17 00:00:00 2001 From: abradat Date: Fri, 24 May 2024 11:29:54 -0700 Subject: [PATCH 098/103] add 'Estimated' to the parcel field sublabel for applications and NOI --- .../parcel-details/parcel-entry/parcel-entry.component.html | 2 +- .../parcels/parcel-entry/parcel-entry.component.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html index fc40f1a3df..9522623822 100644 --- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html +++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html @@ -153,7 +153,7 @@
-
Date of the original registered purchase of the parcel.
+
Estimated date of the original registered purchase of the parcel.
-
Date of the original registered purchase of the parcel.
+
Estimated date of the original registered purchase of the parcel.
Date: Fri, 24 May 2024 16:14:46 -0700 Subject: [PATCH 099/103] fix scroll to top of results in ACLS advanced search and portal public search --- alcs-frontend/src/app/features/search/search.component.ts | 2 +- .../src/app/features/public/search/public-search.component.ts | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/alcs-frontend/src/app/features/search/search.component.ts b/alcs-frontend/src/app/features/search/search.component.ts index c5b5f4a2c1..d810154f84 100644 --- a/alcs-frontend/src/app/features/search/search.component.ts +++ b/alcs-frontend/src/app/features/search/search.component.ts @@ -213,7 +213,7 @@ export class SearchComponent implements OnInit, OnDestroy { if (element) { element.scrollIntoView({ behavior: 'smooth', - block: 'center', + block: 'start', inline: 'center', }); } diff --git a/portal-frontend/src/app/features/public/search/public-search.component.ts b/portal-frontend/src/app/features/public/search/public-search.component.ts index 114fc7b6a6..14615fb9a1 100644 --- a/portal-frontend/src/app/features/public/search/public-search.component.ts +++ b/portal-frontend/src/app/features/public/search/public-search.component.ts @@ -209,6 +209,9 @@ export class PublicSearchComponent implements OnInit, OnDestroy { // push tab activation to next render cycle, after the tabGroup is rendered setTimeout(() => { this.setActiveTab(); + setTimeout(() => { + scrollToElement({ id: `results`, center: false }); + }); }); } From 4d55a42c990a6f6ac5000889e087202841d9d590 Mon Sep 17 00:00:00 2001 From: Liam Stoddard Date: Mon, 27 May 2024 14:15:30 -0700 Subject: [PATCH 100/103] add legacy_id to inquiries, only update if not null --- ...716834660249-map_legacy_id_to_inquiries.ts | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1716834660249-map_legacy_id_to_inquiries.ts diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1716834660249-map_legacy_id_to_inquiries.ts b/services/apps/alcs/src/providers/typeorm/migrations/1716834660249-map_legacy_id_to_inquiries.ts new file mode 100644 index 0000000000..c99e44bf79 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1716834660249-map_legacy_id_to_inquiries.ts @@ -0,0 +1,41 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class MapLegacyIdToInquiries1716834660249 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(` + DO $$ + BEGIN + IF EXISTS (SELECT schema_name FROM information_schema.schemata WHERE schema_name = 'oats') THEN + WITH alcs_legacy_id_to_update AS ( + SELECT + ai.file_number + FROM + alcs.inquiry ai + WHERE + audit_created_by = 'oats_etl' + AND legacy_id IS NULL + ), + issue_and_legacy_issue AS ( + SELECT + issue_id, + legacy_issue_nbr + FROM + oats.oats_issues oi + JOIN alcs_legacy_id_to_update AS alcs_leg ON + alcs_leg.file_number::bigint = oi.issue_id + WHERE + legacy_issue_nbr IS NOT NULL + ) + UPDATE alcs.inquiry + SET legacy_id = COALESCE(issue_and_legacy_issue.legacy_issue_nbr, alcs.inquiry.legacy_id) + FROM issue_and_legacy_issue + WHERE alcs.inquiry.file_number = issue_and_legacy_issue.issue_id::TEXT; + END IF; + END $$; + `); + } + + public async down(queryRunner: QueryRunner): Promise { + //NONE + } +} From 27476aae6fec7c3105dcb4219d7e5462c6eaa3ae Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Mon, 27 May 2024 14:21:09 -0700 Subject: [PATCH 101/103] Bug Fixes * Reset form was clearing the status codes instead of setting them back to [], so manually specify [] * Add search for file number back into inbox search, not sure why I thought inbox didn't have it --- .../src/app/features/search/search.component.ts | 4 +++- .../inbox/application/inbox-application.service.spec.ts | 3 +++ .../inbox/application/inbox-application.service.ts | 9 +++++++++ services/apps/alcs/src/portal/inbox/inbox.dto.ts | 4 ++++ .../inbox-notice-of-intent.service.spec.ts | 3 ++- .../notice-of-intent/inbox-notice-of-intent.service.ts | 9 +++++++++ .../notification/inbox-notification.service.spec.ts | 3 ++- .../inbox/notification/inbox-notification.service.ts | 9 +++++++++ .../alcs/src/utils/search/application-search-filters.ts | 2 +- .../src/utils/search/notice-of-intent-search-filters.ts | 2 +- .../alcs/src/utils/search/notification-search-filters.ts | 2 +- 11 files changed, 44 insertions(+), 6 deletions(-) diff --git a/alcs-frontend/src/app/features/search/search.component.ts b/alcs-frontend/src/app/features/search/search.component.ts index d810154f84..5b976bc9f0 100644 --- a/alcs-frontend/src/app/features/search/search.component.ts +++ b/alcs-frontend/src/app/features/search/search.component.ts @@ -221,7 +221,9 @@ export class SearchComponent implements OnInit, OnDestroy { } onReset() { - this.searchForm.reset(); + this.searchForm.reset({ + portalStatus: [], + }); if (this.fileTypeFilterDropDownComponent) { this.fileTypeFilterDropDownComponent.reset(); diff --git a/services/apps/alcs/src/portal/inbox/application/inbox-application.service.spec.ts b/services/apps/alcs/src/portal/inbox/application/inbox-application.service.spec.ts index a180efcb00..3496e6a70c 100644 --- a/services/apps/alcs/src/portal/inbox/application/inbox-application.service.spec.ts +++ b/services/apps/alcs/src/portal/inbox/application/inbox-application.service.spec.ts @@ -26,6 +26,7 @@ describe('InboxApplicationService', () => { >; const mockSearchRequestDto: InboxRequestDto = { + fileNumber: '100000', portalStatusCodes: ['A'], name: 'D', pid: 'E', @@ -85,6 +86,7 @@ describe('InboxApplicationService', () => { }); it('should successfully build a query using all search parameters defined', async () => { + mockApplicationRepository.find.mockResolvedValue([]); mockApplicationRepository.createQueryBuilder.mockReturnValue(mockQuery); mockApplicationSubmissionRepository.createQueryBuilder.mockReturnValue( mockQuery, @@ -98,6 +100,7 @@ describe('InboxApplicationService', () => { ); expect(result).toEqual({ data: [], total: 0 }); + expect(mockApplicationRepository.find).toHaveBeenCalledTimes(1); expect(mockApplicationRepository.createQueryBuilder).toHaveBeenCalledTimes( 1, ); diff --git a/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts b/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts index 297d141c6d..b3ca949803 100644 --- a/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts +++ b/services/apps/alcs/src/portal/inbox/application/inbox-application.service.ts @@ -123,6 +123,15 @@ export class InboxApplicationService { const promises: Promise<{ fileNumber: string }[]>[] = []; let didSearch = false; + if (searchDto.fileNumber) { + didSearch = true; + const promise = APP_SEARCH_FILTERS.addFileNumberResults( + searchDto, + this.applicationRepository, + ); + promises.push(promise); + } + if (searchDto.portalStatusCodes && searchDto.portalStatusCodes.length > 0) { didSearch = true; const promise = APP_SEARCH_FILTERS.addPortalStatusResults( diff --git a/services/apps/alcs/src/portal/inbox/inbox.dto.ts b/services/apps/alcs/src/portal/inbox/inbox.dto.ts index 4450e8e521..d8e44530e8 100644 --- a/services/apps/alcs/src/portal/inbox/inbox.dto.ts +++ b/services/apps/alcs/src/portal/inbox/inbox.dto.ts @@ -51,6 +51,10 @@ export class InboxRequestDto { @IsOptional() filterBy?: string; + @IsString() + @IsOptional() + fileNumber?: string; + @IsString() @IsOptional() governmentFileNumber?: string; diff --git a/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.spec.ts b/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.spec.ts index cb01149c85..69976b8d8f 100644 --- a/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.spec.ts +++ b/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.spec.ts @@ -20,6 +20,7 @@ describe('InboxNoticeOfIntentService', () => { let mockRedisService: DeepMocked; const mockSearchDto: InboxRequestDto = { + fileNumber: '100000', portalStatusCodes: ['A'], governmentFileNumber: 'B', name: 'D', @@ -88,7 +89,7 @@ describe('InboxNoticeOfIntentService', () => { ); expect(result).toEqual({ data: [], total: 0 }); - expect(mockNOIRepository.find).toHaveBeenCalledTimes(1); + expect(mockNOIRepository.find).toHaveBeenCalledTimes(2); expect(mockNOISubRepository.createQueryBuilder).toHaveBeenCalledTimes(3); expect(mockQuery.andWhere).toHaveBeenCalledTimes(3); }); diff --git a/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.ts b/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.ts index 0c0b21227d..fe71ab3fc6 100644 --- a/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.ts +++ b/services/apps/alcs/src/portal/inbox/notice-of-intent/inbox-notice-of-intent.service.ts @@ -119,6 +119,15 @@ export class InboxNoticeOfIntentService { const promises: Promise<{ fileNumber: string }[]>[] = []; let didSearch = false; + if (searchDto.fileNumber) { + didSearch = true; + const promise = NOI_SEARCH_FILTERS.addFileNumberResults( + searchDto, + this.noiRepository, + ); + promises.push(promise); + } + if (searchDto.portalStatusCodes && searchDto.portalStatusCodes.length > 0) { didSearch = true; const promise = NOI_SEARCH_FILTERS.addPortalStatusResults( diff --git a/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.spec.ts b/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.spec.ts index 4509bb385c..7c3f432bcd 100644 --- a/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.spec.ts +++ b/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.spec.ts @@ -22,6 +22,7 @@ describe('InboxNotificationService', () => { let mockRedisService: DeepMocked; const mockSearchDto: InboxRequestDto = { + fileNumber: '100000', portalStatusCodes: ['A'], governmentFileNumber: 'B', name: 'D', @@ -85,7 +86,7 @@ describe('InboxNotificationService', () => { const result = await service.search(mockSearchDto, '', '', ''); expect(result).toEqual({ data: [], total: 0 }); - expect(mockNotificationRepository.find).toHaveBeenCalledTimes(1); + expect(mockNotificationRepository.find).toHaveBeenCalledTimes(2); expect( mockNotificationSubmissionRepository.createQueryBuilder, ).toHaveBeenCalledTimes(3); diff --git a/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts b/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts index 16b8a64e0e..11d6e9498a 100644 --- a/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts +++ b/services/apps/alcs/src/portal/inbox/notification/inbox-notification.service.ts @@ -123,6 +123,15 @@ export class InboxNotificationService { const promises: Promise<{ fileNumber: string }[]>[] = []; let didSearch = false; + if (searchDto.fileNumber) { + didSearch = true; + const promise = NOTIFICATION_SEARCH_FILTERS.addFileNumberResults( + searchDto, + this.notificationRepository, + ); + promises.push(promise); + } + if (searchDto.portalStatusCodes && searchDto.portalStatusCodes.length > 0) { didSearch = true; const promise = NOTIFICATION_SEARCH_FILTERS.addPortalStatusResults( diff --git a/services/apps/alcs/src/utils/search/application-search-filters.ts b/services/apps/alcs/src/utils/search/application-search-filters.ts index 3b57807202..5dcfc93c9c 100644 --- a/services/apps/alcs/src/utils/search/application-search-filters.ts +++ b/services/apps/alcs/src/utils/search/application-search-filters.ts @@ -12,7 +12,7 @@ import { formatStringToPostgresSearchStringArrayWithWildCard } from '../search-h export const APP_SEARCH_FILTERS = { addFileNumberResults: ( - searchDto: SearchRequestDto, + searchDto: SearchRequestDto | InboxRequestDto, applicationRepository: Repository, ) => { return applicationRepository.find({ diff --git a/services/apps/alcs/src/utils/search/notice-of-intent-search-filters.ts b/services/apps/alcs/src/utils/search/notice-of-intent-search-filters.ts index a64ccf48f3..97f8e6feb2 100644 --- a/services/apps/alcs/src/utils/search/notice-of-intent-search-filters.ts +++ b/services/apps/alcs/src/utils/search/notice-of-intent-search-filters.ts @@ -10,7 +10,7 @@ import { formatStringToPostgresSearchStringArrayWithWildCard } from '../search-h export const NOI_SEARCH_FILTERS = { addFileNumberResults: ( - searchDto: SearchRequestDto, + searchDto: SearchRequestDto | InboxRequestDto, noiRepository: Repository, ) => { return noiRepository.find({ diff --git a/services/apps/alcs/src/utils/search/notification-search-filters.ts b/services/apps/alcs/src/utils/search/notification-search-filters.ts index 6978cece13..89de2ec9f8 100644 --- a/services/apps/alcs/src/utils/search/notification-search-filters.ts +++ b/services/apps/alcs/src/utils/search/notification-search-filters.ts @@ -10,7 +10,7 @@ import { formatStringToPostgresSearchStringArrayWithWildCard } from '../search-h export const NOTIFICATION_SEARCH_FILTERS = { addFileNumberResults: ( - searchDto: SearchRequestDto, + searchDto: SearchRequestDto | InboxRequestDto, notificationRepository: Repository, ) => { return notificationRepository.find({ From 123cd9bfe38255a2886074f3c75987eae9406d26 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Mon, 27 May 2024 16:17:07 -0700 Subject: [PATCH 102/103] Update Day Calculations to not count pauses AFTER decision_date --- .../1716848951501-update_day_calculations.ts | 116 ++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1716848951501-update_day_calculations.ts diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1716848951501-update_day_calculations.ts b/services/apps/alcs/src/providers/typeorm/migrations/1716848951501-update_day_calculations.ts new file mode 100644 index 0000000000..eac30d1901 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1716848951501-update_day_calculations.ts @@ -0,0 +1,116 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class UpdateDayCalculations1716848951501 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(` + CREATE OR REPLACE FUNCTION alcs.calculate_paused_time(p_ids uuid[]) + RETURNS TABLE(application_uuid uuid, paused_weekdays integer, paused_holidays integer) + LANGUAGE sql + AS $function$ + SELECT + application_uuid, + SUM(pause_weekdays)::INT AS paused_weekdays, + SUM(pause_holidays)::INT AS paused_holidays + FROM ( --Load each pause for application with each having its own count of weekdays and holidays + SELECT + application_uuid, + start_date, + end_date, + alcs.get_weekday_count (start_date::TIMESTAMPTZ, + COALESCE(end_date, override.now()::TIMESTAMPTZ)) AS pause_weekdays, + alcs.get_holiday_count (start_date::DATE, + COALESCE(end_date, override.now()::TIMESTAMPTZ)) AS pause_holidays + FROM ( + SELECT -- https://stackoverflow.com/questions/2561130/merge-overlapping-date-intervals + s1.application_uuid, + s1.start_date, + LEAST(MIN(t1.end_date), NOW()) AS end_date -- Use min to not count pause time in the future + FROM + alcs.application_paused s1 + INNER JOIN alcs.application_paused t1 ON s1.start_date <= COALESCE(t1.end_date, NOW()) + AND s1.application_uuid = t1.application_uuid + AND NOT EXISTS ( + SELECT + * + FROM + alcs.application_paused t2 + WHERE + COALESCE(t1.end_date, NOW()) >= t2.start_date + AND COALESCE(t1.end_date, NOW()) < COALESCE(t2.end_date, NOW()) --- use coalesce since end_date may be null + AND t1.application_uuid = t2.application_uuid) + LEFT JOIN alcs.application ON application.uuid = s1.application_uuid + WHERE + NOT EXISTS ( + SELECT + * + FROM + alcs.application_paused s2 + WHERE + s1.start_date > s2.start_date + AND s1.start_date <= COALESCE(s2.end_date, NOW()) + AND s1.application_uuid = s2.application_uuid) + AND s1.application_uuid = ANY (p_ids) + AND s1.start_date <= COALESCE(application.decision_date, NOW()) + GROUP BY + s1.application_uuid, s1.start_date) pauses) pauses2 + WHERE + application_uuid = ANY (p_ids) + GROUP BY + application_uuid; + $function$ + ; + `); + + await queryRunner.query(` + CREATE OR REPLACE FUNCTION alcs.calculate_noi_active_days(p_ids uuid[]) + RETURNS TABLE(noi_uuid uuid, active_days integer, paused_days integer) + LANGUAGE sql + AS $function$ + SELECT + "uuid", + CASE + WHEN "date_received_all_items" IS NULL THEN + NULL + WHEN "has_open" IS TRUE + AND "meeting_count" > 0 THEN + NULL + WHEN "end_date" IS NOT NULL THEN + COALESCE("decision_date", NOW())::date - "end_date"::date + WHEN "decision_date" IS NOT NULL THEN + "decision_date"::date - "date_received_all_items"::date + WHEN "meeting_count" = 0 THEN + NOW()::date - "date_received_all_items"::date + END AS active_days, + CASE + WHEN "date_received_all_items" IS NULL THEN + NULL + WHEN "has_open" IS TRUE + AND "meeting_count" > 0 THEN + NOW()::date - "start_date"::date + END AS paused_days + FROM ( + SELECT + "notice_of_intent".uuid, + MAX("decision_date") AS decision_date, + MAX("date_received_all_items") AS date_received_all_items, + max("end_date") AS end_date, + max("start_date") AS start_date, + bool_or("end_date" IS NULL) AS has_open, + count("notice_of_intent_meeting"."uuid") AS meeting_count + FROM + "alcs"."notice_of_intent" + LEFT JOIN "alcs"."notice_of_intent_meeting" ON + "notice_of_intent"."uuid" = "notice_of_intent_meeting"."notice_of_intent_uuid" + AND start_date <= COALESCE("decision_date", NOW()) + AND "alcs"."notice_of_intent_meeting"."audit_deleted_date_at" IS NULL + WHERE "notice_of_intent".uuid = ANY(p_ids) + GROUP BY + "notice_of_intent".uuid) meetings + $function$; + `); + } + + public async down(): Promise { + //Not supported + } +} From 373dbea0a3b5bbd0be27b630d9f8e2acaff3ca48 Mon Sep 17 00:00:00 2001 From: abradat Date: Mon, 27 May 2024 16:24:27 -0700 Subject: [PATCH 103/103] Add padding to bottom of Evidentiary Record table --- .../application/commissioner-application.component.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alcs-frontend/src/app/features/commissioner/application/commissioner-application.component.scss b/alcs-frontend/src/app/features/commissioner/application/commissioner-application.component.scss index f9c70863b8..8f301af243 100644 --- a/alcs-frontend/src/app/features/commissioner/application/commissioner-application.component.scss +++ b/alcs-frontend/src/app/features/commissioner/application/commissioner-application.component.scss @@ -14,5 +14,5 @@ .content { margin-top: 36px; - padding: 0 80px; + padding: 0 80px 64px; }