Skip to content

Commit

Permalink
Merge pull request #1984 from bcgov/hotfix/ALCS-2384-exclude-results-…
Browse files Browse the repository at this point in the history 
…with-no-tags

ALCS-2384 Prevent results when tags filters are on
  • Loading branch information
@fbarreta
fbarreta authored Nov 15, 2024
2 parents 0aa9c9d + d9d9635 commit 7e8e893
Show file tree
Hide file tree
Showing 4 changed files with 118 additions and 189 deletions.
129 changes: 46 additions & 83 deletions services/apps/alcs/src/alcs/search/inquiry/inquiry-advanced-search.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,7 @@ export class InquiryAdvancedSearchService {
fileNumbers = new Set<string>(cachedNumbers);
} else {
fileNumbers = await this.searchForFileNumbers(searchDto);
await client.setEx(
searchKey,
SEARCH_CACHE_TIME,
JSON.stringify([...fileNumbers.values()]),
);
await client.setEx(searchKey, SEARCH_CACHE_TIME, JSON.stringify([...fileNumbers.values()]));
}

if (fileNumbers.size === 0) {
Expand All @@ -59,23 +55,15 @@ export class InquiryAdvancedSearchService {

let query = this.inquirySearchViewRepository
.createQueryBuilder('inquirySearch', queryRunner)
.innerJoinAndMapOne(
'inquirySearch.inquiryType',
'inquirySearch.inquiryType',
'inquiryType',
)
.innerJoinAndMapOne('inquirySearch.inquiryType', 'inquirySearch.inquiryType', 'inquiryType')
.andWhere('inquirySearch.fileNumber IN(:...fileNumbers)', {
fileNumbers: [...fileNumbers.values()],
});

const sortQuery = this.compileSortQuery(searchDto);

query = query
.orderBy(
sortQuery,
searchDto.sortDirection,
searchDto.sortDirection === 'ASC' ? 'NULLS FIRST' : 'NULLS LAST',
)
.orderBy(sortQuery, searchDto.sortDirection, searchDto.sortDirection === 'ASC' ? 'NULLS FIRST' : 'NULLS LAST')
.offset((searchDto.page - 1) * searchDto.pageSize)
.limit(searchDto.pageSize);

Expand Down Expand Up @@ -148,19 +136,22 @@ export class InquiryAdvancedSearchService {
this.addLegacyIDResults(searchDto, promises);
}

if (searchDto.tagIds && searchDto.tagIds.length > 0) {
this.addTagsResults(promises);
}

if (searchDto.tagCategoryId) {
this.addTagCategoryResults(promises);
}

const t0 = performance.now();
const finalResult = await processSearchPromises(promises);
const t1 = performance.now();
this.logger.debug(
`ALCS Inquiry pre-search search took ${t1 - t0} milliseconds.`,
);
this.logger.debug(`ALCS Inquiry pre-search search took ${t1 - t0} milliseconds.`);
return finalResult;
}

private addFileNumberResults(
searchDto: SearchRequestDto,
promises: Promise<{ fileNumber: string }[]>[],
) {
private addFileNumberResults(searchDto: SearchRequestDto, promises: Promise<{ fileNumber: string }[]>[]) {
const promise = this.inquiryRepository.find({
where: {
fileNumber: searchDto.fileNumber,
Expand All @@ -172,10 +163,7 @@ export class InquiryAdvancedSearchService {
promises.push(promise);
}

private async addGovernmentResults(
searchDto: SearchRequestDto,
promises: Promise<{ fileNumber: string }[]>[],
) {
private async addGovernmentResults(searchDto: SearchRequestDto, promises: Promise<{ fileNumber: string }[]>[]) {
const government = await this.governmentRepository.findOneByOrFail({
name: searchDto.governmentName,
});
Expand All @@ -191,10 +179,7 @@ export class InquiryAdvancedSearchService {
promises.push(promise);
}

private addRegionResults(
searchDto: SearchRequestDto,
promises: Promise<{ fileNumber: string }[]>[],
) {
private addRegionResults(searchDto: SearchRequestDto, promises: Promise<{ fileNumber: string }[]>[]) {
const promise = this.inquiryRepository.find({
where: {
regionCode: searchDto.regionCode,
Expand All @@ -206,21 +191,14 @@ export class InquiryAdvancedSearchService {
promises.push(promise);
}

private addNameResults(
searchDto: SearchRequestDto,
promises: Promise<{ fileNumber: string }[]>[],
) {
const formattedSearchString =
formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!);
private addNameResults(searchDto: SearchRequestDto, promises: Promise<{ fileNumber: string }[]>[]) {
const formattedSearchString = formatStringToPostgresSearchStringArrayWithWildCard(searchDto.name!);
const promise = this.inquiryRepository
.createQueryBuilder('inquiry')
.select('inquiry.fileNumber')
.where(
"LOWER(inquiry.inquirer_first_name || ' ' || inquiry.inquirer_last_name) LIKE ANY (:names)",
{
names: formattedSearchString,
},
)
.where("LOWER(inquiry.inquirer_first_name || ' ' || inquiry.inquirer_last_name) LIKE ANY (:names)", {
names: formattedSearchString,
})
.orWhere('LOWER(inquiry.inquirer_first_name) LIKE ANY (:names)', {
names: formattedSearchString,
})
Expand All @@ -234,10 +212,7 @@ export class InquiryAdvancedSearchService {
promises.push(promise);
}

private addParcelResults(
searchDto: SearchRequestDto,
promises: Promise<{ fileNumber: string }[]>[],
) {
private addParcelResults(searchDto: SearchRequestDto, promises: Promise<{ fileNumber: string }[]>[]) {
let query = this.inquiryRepository
.createQueryBuilder('inquiry')
.select('inquiry.fileNumber')
Expand All @@ -248,21 +223,15 @@ export class InquiryAdvancedSearchService {
}

if (searchDto.civicAddress) {
query = query.andWhere(
'LOWER(parcel.civic_address) like LOWER(:civic_address)',
{
civic_address: `%${searchDto.civicAddress}%`.toLowerCase(),
},
);
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 }[]>[],
) {
private addFileTypeResults(searchDto: SearchRequestDto, promises: Promise<{ fileNumber: string }[]>[]) {
const query = this.inquiryRepository
.createQueryBuilder('inquiry')
.select('inquiry.fileNumber')
Expand All @@ -273,42 +242,24 @@ export class InquiryAdvancedSearchService {
promises.push(query.getMany());
}

private addSubmittedDateResults(
searchDto: SearchRequestDto,
promises: Promise<{ fileNumber: string }[]>[],
) {
let query = this.inquiryRepository
.createQueryBuilder('inquiry')
.select('inquiry.fileNumber');
private addSubmittedDateResults(searchDto: SearchRequestDto, promises: Promise<{ fileNumber: string }[]>[]) {
let query = this.inquiryRepository.createQueryBuilder('inquiry').select('inquiry.fileNumber');

if (searchDto.dateSubmittedFrom !== undefined) {
query = query.andWhere(
'inquiry.date_submitted_to_alc >= :date_submitted_from',
{
date_submitted_from: getStartOfDayToPacific(
searchDto.dateSubmittedFrom
).toISOString(),
},
);
query = query.andWhere('inquiry.date_submitted_to_alc >= :date_submitted_from', {
date_submitted_from: getStartOfDayToPacific(searchDto.dateSubmittedFrom).toISOString(),
});
}

if (searchDto.dateSubmittedTo !== undefined) {
query = query.andWhere(
'inquiry.date_submitted_to_alc < :date_submitted_to',
{
date_submitted_to: getNextDayToPacific(
searchDto.dateSubmittedTo
).toISOString(),
},
);
query = query.andWhere('inquiry.date_submitted_to_alc < :date_submitted_to', {
date_submitted_to: getNextDayToPacific(searchDto.dateSubmittedTo).toISOString(),
});
}
promises.push(query.getMany());
}

private addLegacyIDResults(
searchDto: SearchRequestDto,
promises: Promise<{ fileNumber: string }[]>[],
) {
private addLegacyIDResults(searchDto: SearchRequestDto, promises: Promise<{ fileNumber: string }[]>[]) {
const promise = this.inquiryRepository.find({
where: {
legacyId: searchDto.legacyId,
Expand All @@ -319,4 +270,16 @@ export class InquiryAdvancedSearchService {
});
promises.push(promise);
}

private addTagsResults(promises: Promise<{ fileNumber: string }[]>[]) {
// add tags filter when it's implemented
const emptyPromise = Promise.all([]);
promises.push(emptyPromise);
}

private addTagCategoryResults(promises: Promise<{ fileNumber: string }[]>[]) {
// add tag category filter when it's implemented
const emptyPromise = Promise.all([]);
promises.push(emptyPromise);
}
}
10 changes: 10 additions & 0 deletions services/apps/alcs/src/alcs/search/notification/notification-advanced-search.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,16 @@ export class NotificationAdvancedSearchService {
this.addSubmittedDateResults(searchDto, promises);
}

if (searchDto.tagIds && searchDto.tagIds.length > 0) {
const promise = NOTIFICATION_SEARCH_FILTERS.addTagsResults();
promises.push(promise);
}

if (searchDto.tagCategoryId) {
const promise = NOTIFICATION_SEARCH_FILTERS.addTagCategoryResults();
promises.push(promise);
}

const t0 = performance.now();
const finalResult = await processSearchPromises(promises);
const t1 = performance.now();
Expand Down
Loading

0 comments on commit 7e8e893

Please sign in to comment.