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

Merge branch 'legacy_dev' into staging
All checks were successful
Staging - Build & Deploy to Scaleway / build-and-push-images-lecoffre (push) Successful in 19s
Details
Staging - Build & Deploy to Scaleway / deploy-back-lecoffre (push) Successful in 3s
Details
Staging - Build & Deploy to Scaleway / deploy-cron-lecoffre (push) Successful in 3s
Details

Browse Source
This commit is contained in:
Sosthene 2025-07-24 00:11:28 +02:00
commit 5f9742f8b2
2 changed files with 97 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/repositories/UsersRepository.ts
View File

@ -90,6 +90,7 @@ export default class UsersRepository extends BaseRepository {
*/
public async update(uid: string, user: User): Promise<Users> {
console.log("Updating user", JSON.stringify(user));
const updateArgs: Prisma.UsersUpdateArgs = {
where: {
uid: uid,
@ -100,9 +101,9 @@ export default class UsersRepository extends BaseRepository {
update: {
first_name: user.contact?.first_name,
last_name: user.contact?.last_name,
email: user.contact?.email,
phone_number: user.contact?.phone_number,
cell_phone_number: user.contact?.cell_phone_number,
email: user.contact?.email === null ? undefined : user.contact?.email,
phone_number: user.contact?.phone_number === null ? undefined : user.contact?.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],
},
},
@ -141,6 +142,8 @@ export default class UsersRepository extends BaseRepository {
};
}
console.log("updateArgs", JSON.stringify(updateArgs));
return this.model.update({ ...updateArgs, include: { contact: true, office_membership: { include: { address: true } } } });
}

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

@ -50,6 +50,7 @@ interface IRattachementData {
numeroTelephone: string;
statutDuRattachement: boolean;
mailRattachement: string;
deleted: boolean;
}
interface IOfficeData {
@ -221,49 +222,74 @@ export default class IdNotService extends BaseService {
public async updateUser(userId: string) {
const userInfos = await this.userService.getByUid(userId, { contact: true, role: true, office_membership: true });
const user = User.hydrate<User>(userInfos!);
console.log("Got user from db:", JSON.stringify(user));
const searchParams = new URLSearchParams({
key: this.variables.IDNOT_API_KEY,
});
let userData: IRattachementData;
let userRawData: Response;
try {
userData = (await (
await fetch(
userRawData = 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;
console.log("Got userData from idnot", JSON.stringify(userData));
if (userData.deleted) {
let rattachements: any;
console.log("Fetching rattachements for user", user.uid);
try {
rattachements = (await (
await fetch(`${this.variables.IDNOT_API_BASE_URL}/api/pp/v2/personnes/${user.idNot}/rattachements?` + searchParams, {
method: "GET",
})
).json()) as any;
const res = await fetch(`${this.variables.IDNOT_API_BASE_URL}/api/pp/v2/personnes/${user.idNot}/rattachements?` + searchParams, {
method: "GET",
});
if (res.status === 404) {
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) {
console.log("rattachements", JSON.stringify(rattachements));
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) {
console.log("rattachementsResults", JSON.stringify(rattachementsResults));
let officeData: IOfficeData;
try {
@ -274,20 +300,26 @@ export default class IdNotService extends BaseService {
).json()) as IOfficeData;
} catch (error) {
console.error("Error fetching office data", error);
return;
continue;
}
console.log("officeData", JSON.stringify(officeData));
if (officeData.typeEntite.name === "office") {
userData = rattachement;
userData.entite = officeData;
console.log("Updated userData", JSON.stringify(userData));
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++;
console.log("Updating user.office_membership");
update = true;
let officeData = (await this.officeService.get({ where: { idNot: userData.entite.ou } }))[0];
if (!officeData) {
let officeLocationData: IOfficeLocation;
@ -321,17 +353,24 @@ export default class IdNotService extends BaseService {
officeData = await this.officeService.create(office);
}
user.office_membership = officeData;
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 (update) {
// 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 +398,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 +581,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;
}
}