Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

EUI-7256-organisation search with postcode #696

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

EUI-7256-organisation search with postcode #696

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2bcdb41
org search with postcode
RiteshHMCTS Nov 28, 2022
e31e9aa
fix for partial post code text search
RiteshHMCTS Nov 30, 2022
c5459b9
code
RiteshHMCTS Nov 30, 2022
6679d66
Merge branch 'master' into EUI-7256-search-with-postcode-not-working
RiteshHMCTS Nov 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion api/organisation/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,9 @@ function filterOrganisations(orgs: any, searchFilter: string): any[] {
return orgs.filter((org: any) => {
if (org) {
for (const field of TEXT_FIELDS_TO_CHECK) {
if (textFieldMatches(org, field, searchFilter)) {
if (field === 'postCode' && postCodeMatches(org, searchFilter)) {
return true;
} else if (textFieldMatches(org, field, searchFilter)) {
return true;
}
}
Expand All @@ -198,6 +200,12 @@ function filterOrganisations(orgs: any, searchFilter: string): any[] {
});
}

function postCodeMatches(org: any, filter: string): boolean {
return org['contactInformation'].map(({postCode}) => {
return postCode && postCode.split(' ').join('').toLowerCase()
}).some(element => element && element.indexOf(filter.split(' ').join('')) >= 0);
}

function createPaginatedResponse(paginationParameters: any, filteredOrganisations: any) {
const startIndex = (paginationParameters.page_number - 1) * paginationParameters.page_size;
let endIndex = startIndex + paginationParameters.page_size;
Expand Down