From e31e9aa0d4b992739611ced1ad10d4b6ce453d17 Mon Sep 17 00:00:00 2001 From: RiteshHMCTS Date: Wed, 30 Nov 2022 12:21:08 +0000 Subject: [PATCH] fix for partial post code text search --- api/organisation/index.ts | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/api/organisation/index.ts b/api/organisation/index.ts index 83b8a27e3..c42e4d101 100644 --- a/api/organisation/index.ts +++ b/api/organisation/index.ts @@ -174,10 +174,8 @@ function filterOrganisations(orgs: any, searchFilter: string): any[] { return orgs.filter((org: any) => { if (org) { for (const field of TEXT_FIELDS_TO_CHECK) { - if (field === 'postCode') { - if (postCodeMatches(org, searchFilter)) { - return true; - } + if (field === 'postCode' && postCodeMatches(org, searchFilter)) { + return true; } else if (textFieldMatches(org, field, searchFilter)) { return true; } @@ -204,11 +202,8 @@ function filterOrganisations(orgs: any, searchFilter: string): any[] { function postCodeMatches(org: any, filter: string): boolean { return org['contactInformation'].map(({postCode}) => { - if(!postCode) { - return; - } - return postCode.split(' ').join('').toLowerCase() - }).includes(filter.split(' ').join('')); + return postCode && postCode.split(' ').join('').toLowerCase() + }).some(element => element && element.indexOf(filter.split(' ').join('')) >= 0); } function createPaginatedResponse(paginationParameters: any, filteredOrganisations: any) {