Merge branch 'fix_update_users' into legacy_dev

src/app/api/admin/OfficeFoldersController.ts

@@ -63,8 +63,10 @@ export default class OfficeFoldersController extends ApiController {
 			}
 
 			const userId: string = req.body.user.userId;
+			const officeId: string = req.body.user.office_Id;
 			if (query.where?.stakeholders) delete query.where.stakeholders;
-			const officeFoldersWhereInput: Prisma.OfficeFoldersWhereInput = { ...query.where, stakeholders: { some: { uid: userId } } };
+			if (query.where?.office_uid) delete query.where.office_uid;
+			const officeFoldersWhereInput: Prisma.OfficeFoldersWhereInput = { ...query.where, stakeholders: { some: { uid: userId } }, office_uid: officeId };
 			query.where = officeFoldersWhereInput;
 
 			//call service to get prisma entity

src/app/api/notary/OfficeFoldersController.ts

@@ -60,8 +60,10 @@ export default class OfficeFoldersController extends ApiController {
 			}
 
 			const userId: string = req.body.user.userId;
+			const officeId: string = req.body.user.office_Id;
 			if (query.where?.stakeholders) delete query.where.stakeholders;
-			const officeFoldersWhereInput: Prisma.OfficeFoldersWhereInput = { ...query.where, stakeholders: { some: { uid: userId } } };
+			if (query.where?.office_uid) delete query.where.office_uid;
+			const officeFoldersWhereInput: Prisma.OfficeFoldersWhereInput = { ...query.where, stakeholders: { some: { uid: userId } }, office_uid: officeId };
 			query.where = officeFoldersWhereInput;
 
 			//call service to get prisma entity
@@ -253,6 +255,7 @@ export default class OfficeFoldersController extends ApiController {
 	protected async getOneByUid(req: Request, response: Response) {
 		try {
 			const uid = req.params["uid"];
+			const officeId: string = req.body.user.office_Id;
 			if (!uid) {
 				this.httpBadRequest(response, "No uid provided");
 				return;
@@ -270,6 +273,12 @@ export default class OfficeFoldersController extends ApiController {
 				return;
 			}
 
+			// Add office-level validation
+			if (officeFolderEntity.office_uid !== officeId) {
+				this.httpUnauthorized(response, "Not authorized to access this folder");
+				return;
+			}
+
 			//Hydrate ressource with prisma entity
 			const officeFolder = OfficeFolder.hydrate<OfficeFolder>(officeFolderEntity);
 						

src/app/api/super-admin/OfficeFoldersController.ts

@@ -61,8 +61,10 @@ export default class OfficeFoldersController extends ApiController {
 			}
 
 			const userId: string = req.body.user.userId;
+			const officeId: string = req.body.user.office_Id;
 			if (query.where?.stakeholders) delete query.where.stakeholders;
-			const officeFoldersWhereInput: Prisma.OfficeFoldersWhereInput = { ...query.where, stakeholders: { some: { uid: userId } } };
+			if (query.where?.office_uid) delete query.where.office_uid;
+			const officeFoldersWhereInput: Prisma.OfficeFoldersWhereInput = { ...query.where, stakeholders: { some: { uid: userId } }, office_uid: officeId };
 			query.where = officeFoldersWhereInput;
 
 			//call service to get prisma entity

src/common/repositories/UsersRepository.ts

@@ -100,9 +100,9 @@ export default class UsersRepository extends BaseRepository {
 					update: {
 						first_name: user.contact?.first_name,
 						last_name: user.contact?.last_name,
-						email: user.contact?.email,
+						email: user.contact?.email === null ? undefined : user.contact?.email,
-						phone_number: user.contact?.phone_number,
+						phone_number: user.contact?.phone_number === null ? undefined : user.contact?.phone_number,
-						cell_phone_number: user.contact?.cell_phone_number,
+						cell_phone_number: user.contact?.cell_phone_number === null ? undefined : user.contact?.cell_phone_number,
 						civility: ECivility[user.contact?.civility as keyof typeof ECivility],
 					},
 				},

src/services/common/IdNotService/IdNotService.ts

@@ -50,6 +50,7 @@ interface IRattachementData {
 	numeroTelephone: string;
 	statutDuRattachement: boolean;
 	mailRattachement: string;
+	deleted: boolean;
 }
 
 interface IOfficeData {
@@ -225,45 +226,63 @@ export default class IdNotService extends BaseService {
 			key: this.variables.IDNOT_API_KEY,
 		});
 
-		let userData: IRattachementData;
+		let userRawData: Response;
 		try {
-			userData = (await (
+			userRawData = await fetch(
-				await fetch(
 					`${this.variables.IDNOT_API_BASE_URL}/api/pp/v2/rattachements/${user.idNot}_${user.office_membership!.idNot}?` +
 						searchParams,
 					{
 						method: "GET",
 					},
 				)
-			).json()) as IRattachementData;
 		} catch (error) {
-			console.error("Error fetching user data", error);
+			console.error(`Error fetching user data for ${user.uid}: ${error}`);
+			return;
+		}
+		
+		if (userRawData.status === 404) {
+			console.error(`User ${user.uid} not found in idnot`);
+			return;
+		} else if (userRawData.status !== 200) {
+			console.error(`Error fetching user data for ${user.uid}: ${userRawData.status} - ${userRawData.statusText}`);
 			return;
 		}
 
-		if (!userData.statutDuRattachement) {
+		let userData = (await userRawData.json()) as IRattachementData;
+
+		if (userData.deleted) {
 			let rattachements: any;
 
 			try {
-				rattachements = (await (
+				const res = await fetch(`${this.variables.IDNOT_API_BASE_URL}/api/pp/v2/personnes/${user.idNot}/rattachements?` + searchParams, {
-					await fetch(`${this.variables.IDNOT_API_BASE_URL}/api/pp/v2/personnes/${user.idNot}/rattachements?` + searchParams, {
+					method: "GET",
-						method: "GET",
+				});
-					})
+				if (res.status === 404) {
-				).json()) as any;
+					console.error(`User ${user.uid} not found in idnot`);
+					return;
+				} else if (res.status !== 200) {
+					console.error(`Error fetching rattachements for ${user.uid}: ${rattachements.status} - ${rattachements.statusText}`);
+					return;
+				}
+
+				rattachements = await res.json();
 			} catch (error) {
 				console.error("Error fetching rattachements", error);
 				return;
 			}
 
-			if (rattachements.totalResultCount === 0) {
+			if (rattachements && rattachements.totalResultCount === 0 && rattachements.result.length === 0) {
+				console.warn("User has no valid rattachements", user.uid);
 				await this.userService.updateCheckedAt(user.uid!);
-				//await this.userService.delete(user.uid!);
 				return;
+			} else {
+				console.log(`Found ${rattachements.totalResultCount} rattachements for ${user.uid}`);
 			}
 			const rattachementsResults = rattachements.result as IRattachementData[];
 			if (!rattachementsResults) return;
-			rattachementsResults.forEach(async (rattachement) => {
+			
-				if (rattachement.statutDuRattachement) {
+			for (const rattachement of rattachementsResults) {
+				if (rattachement.statutDuRattachement && !rattachement.deleted) {
 					let officeData: IOfficeData;
 
 					try {
@@ -274,20 +293,22 @@ export default class IdNotService extends BaseService {
 						).json()) as IOfficeData;
 					} catch (error) {
 						console.error("Error fetching office data", error);
-						return;
+						continue;
 					}
 
 					if (officeData.typeEntite.name === "office") {
 						userData = rattachement;
+						userData.entite = officeData;
+						break; // Found the first valid office, no need to continue
 					}
 				}
-			});
+			}
 		}
 
-		let updates = 0;
+		let update = false;
 
 		if (user.office_membership!.idNot !== userData.entite.ou) {
-			updates++;
+			update = true;
 			let officeData = (await this.officeService.get({ where: { idNot: userData.entite.ou } }))[0];
 			if (!officeData) {
 				let officeLocationData: IOfficeLocation;
@@ -321,17 +342,25 @@ export default class IdNotService extends BaseService {
 				officeData = await this.officeService.create(office);
 			}
 			user.office_membership = officeData;
+			console.log("New office_membership found", JSON.stringify(user.office_membership));
 		}
 
-		if (user.contact!.email !== userData.mailRattachement) {
+		if (userData.mailRattachement && (user.contact!.email === null || user.contact!.email === undefined || user.contact!.email !== userData.mailRattachement)) {
-			updates++;
+			update = true;
 			user.contact!.email = userData.mailRattachement;
+			console.log("New email found", JSON.stringify(user.contact!.email));
 		}
-		if (user.contact!.cell_phone_number !== userData.numeroMobile) {
+		if (userData.numeroMobile && (user.contact!.cell_phone_number === null || user.contact!.cell_phone_number === undefined || user.contact!.cell_phone_number !== userData.numeroMobile)) {
-			updates++;
+			update = true;
 			user.contact!.cell_phone_number = userData.numeroMobile;
+			console.log("New cell phone number found", JSON.stringify(user.contact!.cell_phone_number));
+		}
+		if (update) {
+			console.log("Found updates for user", user.uid!);
+			// Filter out null values before updating to prevent Prisma errors
+			const convertedUser = this.convertNullToUndefined(user);
+			await this.userService.update(user.uid!, convertedUser);
 		}
-		if (updates != 0) await this.userService.update(user.uid!, user);
 		await this.userService.updateCheckedAt(user.uid!);
 	}
 
@@ -359,19 +388,20 @@ export default class IdNotService extends BaseService {
 			return;
 		}
 		const officeData = (await officeRawData.json()) as IOfficeData;
-		console.log("office", office);
-		
-		console.log("officeData", officeData);
 		
 		let updates = 0;
 		//093051 = demo
 		if (office.name !== officeData.denominationSociale && office.name !== officeData.codeCrpcen && office.crpcen !== "029178" && office.crpcen !== "035010" && office.crpcen !== "093051") {
+			console.log(`Updating office name: ${office.uid} - ${office.name} - ${office.crpcen}`);
 			updates++;
 			office.name = officeData.denominationSociale ?? officeData.codeCrpcen;
+			console.log(`New name: ${office.name}`);
 		}
 		if (office.office_status !== this.getOfficeStatus(officeData.statutEntite.name)) {
+			console.log(`Updating office status: ${office.uid} - ${office.name} - ${office.crpcen}`);
 			updates++;
 			office.office_status = this.getOfficeStatus(officeData.statutEntite.name);
+			console.log(`New status: ${office.office_status}`);
 		}
 		if (updates != 0) await this.officeService.update(office.uid!, office);
 		await this.officeService.updateCheckedAt(office.uid!);
@@ -541,16 +571,36 @@ export default class IdNotService extends BaseService {
 	public async updateUsers() {
 		const usersReq = await this.userService.getUsersToBeChecked();
 		const users = User.hydrateArray<User>(usersReq);
-		users.forEach(async (user) => {
+		for (const user of users) {
 			await this.updateUser(user.uid!);
-		});
+		}
 	}
 
 	public async updateOffices() {
 		const officesReq = await this.officeService.getOfficesToBeChecked();
 		const offices = Office.hydrateArray<Office>(officesReq);
-		offices.forEach(async (office) => {
+		console.log(`Updating ${offices.length} offices`);
+		for (const office of offices) {
 			await this.updateOffice(office.uid!);
-		});
+		}
+	}
+
+	/**
+	 * Utility function to convert null values to undefined
+	 * This prevents Prisma from throwing errors about null values
+	 */
+	private convertNullToUndefined<T extends Record<string, any>>(obj: T): T {
+		const converted = { ...obj };
+		
+		for (const [key, value] of Object.entries(converted)) {
+			if (value === null) {
+				console.log(`Converting null to undefined for key: ${key}`);
+				(converted as any)[key] = undefined;
+			} else if (typeof value === 'object' && !Array.isArray(value)) {
+				(converted as any)[key] = this.convertNullToUndefined(value);
+			}
+		}
+		
+		return converted;
 	}
 }