4nk/lecoffre-back
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: 4nk:eb45cb3fb845e15f0f1a5054581d059648536753
Branches Tags
4nk:main
4nk:legacy_dev
4nk:preprod
4nk:staging
4nk:improve_log
4nk:fix_update_users
4nk:test
...
compare: 4nk:1e7ac2521cc2755e6470e00ae05ff31771ba9e15
Branches Tags
4nk:legacy_dev
4nk:preprod
4nk:staging
4nk:improve_log
4nk:fix_update_users
4nk:main
4nk:test

1 Commits
eb45cb3fb8 ... 1e7ac2521c

Author SHA1 Message Date
Sosthene
1e7ac2521c Log error message body
All checks were successful
Demo - Build & Deploy to Scaleway / build-and-push-images-lecoffre (push) Successful in 1m43s
Details
Demo - Build & Deploy to Scaleway / deploy-back-lecoffre (push) Successful in 3s
Details
Demo - Build & Deploy to Scaleway / deploy-cron-lecoffre (push) Successful in 3s
Details
2025-07-23 12:42:10 +02:00
2 changed files with 137 additions and 107 deletions
Show Stats Expand all files Collapse all files

4
src/common/notifications/NotificationBuilder.ts
View File

@ -95,7 +95,7 @@ export default class NotificationBuilder {
redirection_url: "", redirection_url: "",
created_at: new Date(), created_at: new Date(),
updated_at: new Date(), updated_at: new Date(),
user: [user] || [], user: user ? [user] : [],
}); });
} }
@ -105,7 +105,7 @@ export default class NotificationBuilder {
redirection_url: "", redirection_url: "",
created_at: new Date(), created_at: new Date(),
updated_at: new Date(), updated_at: new Date(),
user: [user] || [], user: user ? [user] : [],
}); });
} }

240
src/services/common/IdNotService/IdNotService.ts
View File

@ -227,133 +227,157 @@ export default class IdNotService extends BaseService {
key: this.variables.IDNOT_API_KEY, key: this.variables.IDNOT_API_KEY,
}); });
let userRawData: Response; let rattachmentRawData: Response;
try { try {
userRawData = await fetch( const url = `${this.variables.IDNOT_API_BASE_URL}/api/pp/v2/personnes/${user.idNot}/rattachements?` + searchParams;
`${this.variables.IDNOT_API_BASE_URL}/api/pp/v2/rattachements/${user.idNot}_${user.office_membership!.idNot}?` + console.log("Fetching rattachements data for", url);
searchParams, rattachmentRawData = await fetch(
url,
{ {
method: "GET", method: "GET",
}, }
) );
} catch (error) { } catch (error) {
console.error(`Error fetching user data for ${user.uid}: ${error}`); console.error(`Error fetching rattachments data for ${user.uid}: ${error}`);
return; return;
} }
if (userRawData.status === 404) { if (rattachmentRawData.status === 404) {
console.error(`User ${user.uid} not found in idnot`); console.error(`User ${user.uid} not found in idnot`);
return; return;
} else if (userRawData.status !== 200) { } else if (rattachmentRawData.status !== 200) {
console.error(`Error fetching user data for ${user.uid}: ${userRawData.status} - ${userRawData.statusText}`); console.error(`Error fetching rattachements data for ${user.uid}: ${rattachmentRawData.status}`);
console.error(await userRawData.text());
return; return;
} }
let userData = (await userRawData.json()) as IRattachementData; let rattachements = (await rattachmentRawData.json()) as IRattachementData[];
console.log("Got userData from idnot", JSON.stringify(userData)); console.log("Got rattachements from idnot", JSON.stringify(rattachements));
// if (!rattachements) return;
// rattachements.forEach(async (rattachement) => {
// if (rattachement.statutDuRattachement && !rattachement.deleted) {
// let officeData: IOfficeData;
if (userData.deleted) { // try {
let rattachements: any; // officeData = (await (
// await fetch(`${this.variables.IDNOT_API_BASE_URL + rattachement.entiteUrl}?` + searchParams, {
// method: "GET",
// })
// ).json()) as IOfficeData;
// } catch (error) {
// console.error("Error fetching office data", error);
// return;
// }
console.log("Fetching rattachements for user", user.uid); // if (officeData.typeEntite.name === "office") {
console.log(searchParams.toString()); // // userData = rattachement;
try { // console.log("Updated userData", JSON.stringify(rattachement));
rattachements = await fetch(`${this.variables.IDNOT_API_BASE_URL}/api/pp/v2/personnes/${user.idNot}/rattachements?deleted=false` + searchParams, { // }
method: "GET", // }
}); // });
} catch (error) {
console.error("Error fetching rattachements", error);
return;
}
if (rattachements.status === 404) { // if (rattachements.deleted) {
console.error(`User ${user.uid} not found in idnot`); // let rattachements: any;
return;
} else if (rattachements.status !== 200) {
console.error(`Error fetching rattachements for ${user.uid}: ${rattachements.status} - ${rattachements.statusText}`);
return;
}
if (rattachements.totalResultCount === 0) { // console.log("Fetching rattachements for user", user.uid);
console.warn("User has no valid rattachements", user.uid); // try {
await this.userService.updateCheckedAt(user.uid!); // rattachements = await fetch(`${this.variables.IDNOT_API_BASE_URL}/api/pp/v2/personnes/${user.idNot}/rattachements?deleted=false` + searchParams, {
return; // method: "GET",
} // });
const rattachementsResults = rattachements.result as IRattachementData[]; // } catch (error) {
if (!rattachementsResults) return; // console.error("Error fetching rattachements", error);
rattachementsResults.forEach(async (rattachement) => { // return;
if (rattachement.statutDuRattachement && !rattachement.deleted) { // }
let officeData: IOfficeData;
try { // if (rattachements.status === 404) {
officeData = (await ( // console.error(`User ${user.uid} not found in idnot`);
await fetch(`${this.variables.IDNOT_API_BASE_URL + rattachement.entiteUrl}?` + searchParams, { // return;
method: "GET", // } else if (rattachements.status !== 200) {
}) // console.error(`Error fetching rattachements for ${user.uid}: ${rattachements.status} - ${await rattachements.text()}`);
).json()) as IOfficeData; // return;
} catch (error) { // }
console.error("Error fetching office data", error);
return;
}
if (officeData.typeEntite.name === "office") { // if (rattachements.totalResultCount === 0) {
userData = rattachement; // console.warn("User has no valid rattachements", user.uid);
console.log("Updated userData", JSON.stringify(userData)); // await this.userService.updateCheckedAt(user.uid!);
} // return;
} // }
}); // const rattachementsResults = rattachements.result as IRattachementData[];
}
// console.log("rattachementsResults", JSON.stringify(rattachementsResults));
// if (!rattachementsResults) return;
// rattachementsResults.forEach(async (rattachement) => {
// if (rattachement.statutDuRattachement && !rattachement.deleted) {
// let officeData: IOfficeData;
// try {
// officeData = (await (
// await fetch(`${this.variables.IDNOT_API_BASE_URL + rattachement.entiteUrl}?` + searchParams, {
// method: "GET",
// })
// ).json()) as IOfficeData;
// } catch (error) {
// console.error("Error fetching office data", error);
// return;
// }
// if (officeData.typeEntite.name === "office") {
// userData = rattachement;
// console.log("Updated userData", JSON.stringify(userData));
// }
// }
// });
// }
let updates = 0; let updates = 0;
if (user.office_membership!.idNot !== userData.entite.ou) { // if (user.office_membership!.idNot !== userData.entite.ou) {
updates++; // updates++;
let officeData = (await this.officeService.get({ where: { idNot: userData.entite.ou } }))[0]; // let officeData = (await this.officeService.get({ where: { idNot: userData.entite.ou } }))[0];
if (!officeData) { // if (!officeData) {
let officeLocationData: IOfficeLocation; // let officeLocationData: IOfficeLocation;
try { // try {
officeLocationData = (await ( // officeLocationData = (await (
await fetch(`${this.variables.IDNOT_API_BASE_URL + userData.entite.locationsUrl}?` + searchParams, { // await fetch(`${this.variables.IDNOT_API_BASE_URL + userData.entite.locationsUrl}?` + searchParams, {
method: "GET", // method: "GET",
}) // })
).json()) as IOfficeLocation; // ).json()) as IOfficeLocation;
} catch (error) { // } catch (error) {
console.error("Error fetching office location data", error); // console.error("Error fetching office location data", error);
return; // return;
} // }
const office = { // const office = {
idNot: userData.entite.ou, // idNot: userData.entite.ou,
name: userData.entite.denominationSociale ?? userData.entite.codeCrpcen, // name: userData.entite.denominationSociale ?? userData.entite.codeCrpcen,
crpcen: userData.entite.codeCrpcen, // crpcen: userData.entite.codeCrpcen,
office_status: this.getOfficeStatus(userData.entite.statutEntite.name), // office_status: this.getOfficeStatus(userData.entite.statutEntite.name),
address: { // address: {
address: officeLocationData.result[0]!.adrGeo4, // address: officeLocationData.result[0]!.adrGeo4,
city: officeLocationData.result[0]!.adrGeoVille.split(" ")[0] ?? officeLocationData.result[0]!.adrGeoVille, // city: officeLocationData.result[0]!.adrGeoVille.split(" ")[0] ?? officeLocationData.result[0]!.adrGeoVille,
zip_code: Number(officeLocationData.result[0]!.adrGeoCodePostal), // zip_code: Number(officeLocationData.result[0]!.adrGeoCodePostal),
created_at: null, // created_at: null,
updated_at: null, // updated_at: null,
}, // },
created_at: null, // created_at: null,
updated_at: null, // updated_at: null,
}; // };
officeData = await this.officeService.create(office); // officeData = await this.officeService.create(office);
} // }
user.office_membership = officeData; // user.office_membership = officeData;
} // }
if (user.contact!.email !== userData.mailRattachement) { // if (user.contact!.email !== userData.mailRattachement) {
updates++; // updates++;
user.contact!.email = userData.mailRattachement; // user.contact!.email = userData.mailRattachement;
} // }
if (user.contact!.cell_phone_number !== userData.numeroMobile) { // if (user.contact!.cell_phone_number !== userData.numeroMobile) {
updates++; // updates++;
user.contact!.cell_phone_number = userData.numeroMobile; // user.contact!.cell_phone_number = userData.numeroMobile;
} // }
if (updates != 0) await this.userService.update(user.uid!, user); if (updates != 0) await this.userService.update(user.uid!, user);
await this.userService.updateCheckedAt(user.uid!); await this.userService.updateCheckedAt(user.uid!);
} }
@ -565,17 +589,23 @@ export default class IdNotService extends BaseService {
public async updateUsers() { public async updateUsers() {
const usersReq = await this.userService.getUsersToBeChecked(); const usersReq = await this.userService.getUsersToBeChecked();
const users = User.hydrateArray<User>(usersReq); const users = User.hydrateArray<User>(usersReq);
users.forEach(async (user) => { for (const user of users) {
await this.updateUser(user.uid!); await this.updateUser(user.uid!);
}); await this.delay(500);
};
} }
public async updateOffices() { public async updateOffices() {
const officesReq = await this.officeService.getOfficesToBeChecked(); const officesReq = await this.officeService.getOfficesToBeChecked();
const offices = Office.hydrateArray<Office>(officesReq); const offices = Office.hydrateArray<Office>(officesReq);
console.log(`Updating ${offices.length} offices`); console.log(`Updating ${offices.length} offices`);
offices.forEach(async (office) => { for (const office of offices) {
await this.updateOffice(office.uid!); await this.updateOffice(office.uid!);
}); await this.delay(500);
};
}
private async delay(ms: number) {
return new Promise((resolve) => setTimeout(resolve, ms));
} }
} }