diff --git a/src/users/services/userRegistry.service.ts b/src/users/services/userRegistry.service.ts index 1a7f687b5404405f9107d4b60fc6a901b1e085a2..941dd2daabb00a59bbbf110e8d1953807cff6b33 100644 --- a/src/users/services/userRegistry.service.ts +++ b/src/users/services/userRegistry.service.ts @@ -60,19 +60,20 @@ export class UserRegistryService { const employersNames: string[] = employersList.map((e) => e.name); // For each filter list (job or employer), we'll filter the main user list in order to get only the user that have a job or employer contained in the filters array // For this, we une findexIndex method on job/employer name + if (employersList?.length && jobList?.length) { return users.filter( (user) => - jobNames.findIndex((n) => user.job.name === n) > -1 && - employersNames.findIndex((n) => user.employer.name === n) > -1 + jobNames.findIndex((n) => user.job?.name === n) > -1 && + employersNames.findIndex((n) => user.employer?.name === n) > -1 ); } if (employersList?.length) { - return users.filter((user) => employersNames.findIndex((n) => user.employer.name === n) > -1); + return users.filter((user) => employersNames.findIndex((n) => user.employer?.name === n) > -1); } if (jobList?.length) { - return users.filter((user) => jobNames.findIndex((n) => user.job.name === n) > -1); + return users.filter((user) => jobNames.findIndex((n) => user.job?.name === n) > -1); } }