diff --git a/src/services/common/IdNotService/IdNotService.ts b/src/services/common/IdNotService/IdNotService.ts index 7eaa9b63..3b7cfaee 100644 --- a/src/services/common/IdNotService/IdNotService.ts +++ b/src/services/common/IdNotService/IdNotService.ts @@ -315,16 +315,12 @@ export default class IdNotService extends BaseService { } } - let updates = 0; - - console.log("user.office_membership.idNot", JSON.stringify(user.office_membership!.idNot)); - console.log("userData.entite.ou", JSON.stringify(userData.entite.ou)); + let update = false; if (user.office_membership!.idNot !== userData.entite.ou) { console.log("Updating user.office_membership"); - updates++; + update = true; let officeData = (await this.officeService.get({ where: { idNot: userData.entite.ou } }))[0]; - console.log("officeData", JSON.stringify(officeData)); if (!officeData) { let officeLocationData: IOfficeLocation; @@ -360,17 +356,17 @@ export default class IdNotService extends BaseService { console.log("Updated user.office_membership", JSON.stringify(user.office_membership)); } - if (user.contact!.email !== userData.mailRattachement) { - updates++; + if (userData.mailRattachement && (user.contact!.email === null || user.contact!.email === undefined || user.contact!.email !== userData.mailRattachement)) { + update = true; user.contact!.email = userData.mailRattachement; console.log("Updated user.contact.email", JSON.stringify(user.contact!.email)); } - if (user.contact!.cell_phone_number !== userData.numeroMobile) { - updates++; + if (userData.numeroMobile && (user.contact!.cell_phone_number === null || user.contact!.cell_phone_number === undefined || user.contact!.cell_phone_number !== userData.numeroMobile)) { + update = true; user.contact!.cell_phone_number = userData.numeroMobile; console.log("Updated user.contact.cell_phone_number", JSON.stringify(user.contact!.cell_phone_number)); } - if (updates != 0) { + if (update) { // Filter out null values before updating to prevent Prisma errors const convertedUser = this.convertNullToUndefined(user); await this.userService.update(user.uid!, convertedUser);