From 9600225645b2b6ccfeb5aa487e58a38c6e7cd93d Mon Sep 17 00:00:00 2001
From: gcarron <gcarron@grandlyon.com>
Date: Fri, 16 Sep 2022 12:39:51 +0200
Subject: [PATCH] fix(annuaire): Fix case one job an no employer for user
---
src/users/services/userRegistry.service.ts | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/users/services/userRegistry.service.ts b/src/users/services/userRegistry.service.ts
index 1a7f687b5..941dd2daa 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);
}
}
--
GitLab