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

Compare commits

base: 4nk:fb98db0b0204316a5d421cdb33c8e0c016babe07
Branches Tags
4nk:main
4nk:legacy_dev
4nk:preprod
4nk:staging
4nk:improve_log
4nk:fix_update_users
4nk:test
..
compare: 4nk:86725b53fe1d181495349c6b9319b67f39b70b63
Branches Tags
4nk:legacy_dev
4nk:preprod
4nk:staging
4nk:improve_log
4nk:fix_update_users
4nk:main
4nk:test

No commits in common. "fb98db0b0204316a5d421cdb33c8e0c016babe07" and "86725b53fe1d181495349c6b9319b67f39b70b63" have entirely different histories.
fb98db0b02 ... 86725b53fe

3 changed files with 96 additions and 150 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] || [],
}); });
} }

2
src/services/common/CronService/CronService.ts
View File

@ -68,7 +68,7 @@ export default class CronService {
} }
} }
public async updateUsers() { public async updateUsers() {
const cronJob = new CronJob("*/5 * * * *", async () => { const cronJob = new CronJob("0 0 * * *", async () => {
// Once a day at midnight // Once a day at midnight
try { try {
await this.idNotService.updateOffices(); await this.idNotService.updateOffices();

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

@ -50,7 +50,6 @@ interface IRattachementData {
numeroTelephone: string; numeroTelephone: string;
statutDuRattachement: boolean; statutDuRattachement: boolean;
mailRattachement: string; mailRattachement: string;
deleted: boolean;
} }
interface IOfficeData { interface IOfficeData {
@ -222,161 +221,116 @@ export default class IdNotService extends BaseService {
public async updateUser(userId: string) { public async updateUser(userId: string) {
const userInfos = await this.userService.getByUid(userId, { contact: true, role: true, office_membership: true }); const userInfos = await this.userService.getByUid(userId, { contact: true, role: true, office_membership: true });
const user = User.hydrate<User>(userInfos!); const user = User.hydrate<User>(userInfos!);
console.log("Got user from db:", JSON.stringify(user));
const searchParams = new URLSearchParams({ const searchParams = new URLSearchParams({
key: this.variables.IDNOT_API_KEY, key: this.variables.IDNOT_API_KEY,
}); });
let rattachmentRawData: Response; let userData: IRattachementData;
try { try {
rattachmentRawData = await fetch( userData = (await (
`${this.variables.IDNOT_API_BASE_URL}/api/pp/v2/personnes/${user.idNot}/entites?deleted=false` + await fetch(
searchParams, `${this.variables.IDNOT_API_BASE_URL}/api/pp/v2/rattachements/${user.idNot}_${user.office_membership!.idNot}?` +
searchParams,
{ {
method: "GET", method: "GET",
}, },
) )
).json()) as IRattachementData;
} catch (error) { } catch (error) {
console.error(`Error fetching rattachments data for ${user.uid}: ${error}`); console.error("Error fetching user data", error);
return;
}
if (rattachmentRawData.status === 404) {
console.error(`User ${user.uid} not found in idnot`);
return;
} else if (rattachmentRawData.status !== 200) {
console.error(`Error fetching rattachements data for ${user.uid}: ${rattachmentRawData.status}`);
return; return;
} }
let rattachements = (await rattachmentRawData.json()) as IRattachementData[]; if (!userData.statutDuRattachement) {
let rattachements: any;
console.log("Got rattachements from idnot", JSON.stringify(rattachements)); try {
if (!rattachements) return; rattachements = (await (
rattachements.forEach(async (rattachement) => { await fetch(`${this.variables.IDNOT_API_BASE_URL}/api/pp/v2/personnes/${user.idNot}/rattachements?` + searchParams, {
if (rattachement.statutDuRattachement && !rattachement.deleted) { method: "GET",
let officeData: IOfficeData; })
).json()) as any;
try { } catch (error) {
officeData = (await ( console.error("Error fetching rattachements", error);
await fetch(`${this.variables.IDNOT_API_BASE_URL + rattachement.entiteUrl}?` + searchParams, { return;
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(rattachement));
}
} }
});
// if (rattachements.deleted) { if (rattachements.totalResultCount === 0) {
// let rattachements: any; await this.userService.updateCheckedAt(user.uid!);
//await this.userService.delete(user.uid!);
return;
}
const rattachementsResults = rattachements.result as IRattachementData[];
if (!rattachementsResults) return;
rattachementsResults.forEach(async (rattachement) => {
if (rattachement.statutDuRattachement) {
let officeData: IOfficeData;
// console.log("Fetching rattachements for user", user.uid); try {
// try { officeData = (await (
// rattachements = await fetch(`${this.variables.IDNOT_API_BASE_URL}/api/pp/v2/personnes/${user.idNot}/rattachements?deleted=false` + searchParams, { await fetch(`${this.variables.IDNOT_API_BASE_URL + rattachement.entiteUrl}?` + searchParams, {
// method: "GET", method: "GET",
// }); })
// } catch (error) { ).json()) as IOfficeData;
// console.error("Error fetching rattachements", error); } catch (error) {
// return; console.error("Error fetching office data", error);
// } return;
}
// if (rattachements.status === 404) { if (officeData.typeEntite.name === "office") {
// console.error(`User ${user.uid} not found in idnot`); userData = rattachement;
// return; }
// } else if (rattachements.status !== 200) { }
// console.error(`Error fetching rattachements for ${user.uid}: ${rattachements.status} - ${await rattachements.text()}`); });
// return; }
// }
// if (rattachements.totalResultCount === 0) {
// console.warn("User has no valid rattachements", user.uid);
// 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) {
updates++;
let officeData = (await this.officeService.get({ where: { idNot: userData.entite.ou } }))[0];
if (!officeData) {
let officeLocationData: IOfficeLocation;
// if (user.office_membership!.idNot !== userData.entite.ou) { try {
// updates++; officeLocationData = (await (
// let officeData = (await this.officeService.get({ where: { idNot: userData.entite.ou } }))[0]; await fetch(`${this.variables.IDNOT_API_BASE_URL + userData.entite.locationsUrl}?` + searchParams, {
// if (!officeData) { method: "GET",
// let officeLocationData: IOfficeLocation; })
).json()) as IOfficeLocation;
} catch (error) {
console.error("Error fetching office location data", error);
return;
}
// try { const office = {
// officeLocationData = (await ( idNot: userData.entite.ou,
// await fetch(`${this.variables.IDNOT_API_BASE_URL + userData.entite.locationsUrl}?` + searchParams, { name: userData.entite.denominationSociale ?? userData.entite.codeCrpcen,
// method: "GET", crpcen: userData.entite.codeCrpcen,
// }) office_status: this.getOfficeStatus(userData.entite.statutEntite.name),
// ).json()) as IOfficeLocation; address: {
// } catch (error) { address: officeLocationData.result[0]!.adrGeo4,
// console.error("Error fetching office location data", error); city: officeLocationData.result[0]!.adrGeoVille.split(" ")[0] ?? officeLocationData.result[0]!.adrGeoVille,
// return; zip_code: Number(officeLocationData.result[0]!.adrGeoCodePostal),
// } created_at: null,
updated_at: null,
},
created_at: null,
updated_at: null,
};
officeData = await this.officeService.create(office);
}
user.office_membership = officeData;
}
// const office = { if (user.contact!.email !== userData.mailRattachement) {
// idNot: userData.entite.ou, updates++;
// name: userData.entite.denominationSociale ?? userData.entite.codeCrpcen, user.contact!.email = userData.mailRattachement;
// crpcen: userData.entite.codeCrpcen, }
// office_status: this.getOfficeStatus(userData.entite.statutEntite.name), if (user.contact!.cell_phone_number !== userData.numeroMobile) {
// address: { updates++;
// address: officeLocationData.result[0]!.adrGeo4, user.contact!.cell_phone_number = userData.numeroMobile;
// city: officeLocationData.result[0]!.adrGeoVille.split(" ")[0] ?? officeLocationData.result[0]!.adrGeoVille, }
// zip_code: Number(officeLocationData.result[0]!.adrGeoCodePostal),
// created_at: null,
// updated_at: null,
// },
// created_at: null,
// updated_at: null,
// };
// officeData = await this.officeService.create(office);
// }
// user.office_membership = officeData;
// }
// if (user.contact!.email !== userData.mailRattachement) {
// updates++;
// user.contact!.email = userData.mailRattachement;
// }
// if (user.contact!.cell_phone_number !== userData.numeroMobile) {
// updates++;
// 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!);
} }
@ -405,20 +359,19 @@ export default class IdNotService extends BaseService {
return; return;
} }
const officeData = (await officeRawData.json()) as IOfficeData; const officeData = (await officeRawData.json()) as IOfficeData;
console.log("office", office);
console.log("officeData", officeData);
let updates = 0; let updates = 0;
//093051 = demo //093051 = demo
if (office.name !== officeData.denominationSociale && office.name !== officeData.codeCrpcen && office.crpcen !== "029178" && office.crpcen !== "035010" && office.crpcen !== "093051") { 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++; updates++;
office.name = officeData.denominationSociale ?? officeData.codeCrpcen; office.name = officeData.denominationSociale ?? officeData.codeCrpcen;
console.log(`New name: ${office.name}`);
} }
if (office.office_status !== this.getOfficeStatus(officeData.statutEntite.name)) { if (office.office_status !== this.getOfficeStatus(officeData.statutEntite.name)) {
console.log(`Updating office status: ${office.uid} - ${office.name} - ${office.crpcen}`);
updates++; updates++;
office.office_status = this.getOfficeStatus(officeData.statutEntite.name); 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); if (updates != 0) await this.officeService.update(office.uid!, office);
await this.officeService.updateCheckedAt(office.uid!); await this.officeService.updateCheckedAt(office.uid!);
@ -588,23 +541,16 @@ 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);
for (const user of users) { users.forEach(async (user) => {
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`); 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));
} }
} }