Compare commits

..

4 Commits

Author SHA1 Message Date
Sosthene
892dfb65c4 Merge branch 'staging' into preprod
All checks were successful
Preprod - Build & Deploy to Scaleway / build-and-push-images-lecoffre (push) Successful in 17s
Preprod - Build & Deploy to Scaleway / deploy-back-lecoffre (push) Successful in 3s
Preprod - Build & Deploy to Scaleway / deploy-cron-lecoffre (push) Successful in 3s
2025-07-24 00:23:39 +02:00
Sosthene
b82ba08f72 Merge branch 'legacy_dev' into staging
All checks were successful
Staging - Build & Deploy to Scaleway / build-and-push-images-lecoffre (push) Successful in 21s
Staging - Build & Deploy to Scaleway / deploy-back-lecoffre (push) Successful in 3s
Staging - Build & Deploy to Scaleway / deploy-cron-lecoffre (push) Successful in 3s
2025-07-24 00:22:41 +02:00
Sosthene
f01141896a Merge branch 'improve_log' into legacy_dev
All checks were successful
Demo - Build & Deploy to Scaleway / build-and-push-images-lecoffre (push) Successful in 1m50s
Demo - Build & Deploy to Scaleway / deploy-back-lecoffre (push) Successful in 4s
Demo - Build & Deploy to Scaleway / deploy-cron-lecoffre (push) Successful in 3s
2025-07-24 00:22:17 +02:00
Sosthene
8a50939f95 cleanup logs 2025-07-24 00:20:59 +02:00
2 changed files with 4 additions and 17 deletions

View File

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

View File

@ -222,7 +222,6 @@ 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,
}); });
@ -251,12 +250,9 @@ export default class IdNotService extends BaseService {
let userData = (await userRawData.json()) as IRattachementData; let userData = (await userRawData.json()) as IRattachementData;
console.log("Got userData from idnot", JSON.stringify(userData));
if (userData.deleted) { if (userData.deleted) {
let rattachements: any; let rattachements: any;
console.log("Fetching rattachements for user", user.uid);
try { try {
const res = await fetch(`${this.variables.IDNOT_API_BASE_URL}/api/pp/v2/personnes/${user.idNot}/rattachements?` + searchParams, { const res = await fetch(`${this.variables.IDNOT_API_BASE_URL}/api/pp/v2/personnes/${user.idNot}/rattachements?` + searchParams, {
method: "GET", method: "GET",
@ -275,8 +271,6 @@ export default class IdNotService extends BaseService {
return; return;
} }
console.log("rattachements", JSON.stringify(rattachements));
if (rattachements && rattachements.totalResultCount === 0 && rattachements.result.length === 0) { if (rattachements && rattachements.totalResultCount === 0 && rattachements.result.length === 0) {
console.warn("User has no valid rattachements", user.uid); console.warn("User has no valid rattachements", user.uid);
await this.userService.updateCheckedAt(user.uid!); await this.userService.updateCheckedAt(user.uid!);
@ -289,7 +283,6 @@ export default class IdNotService extends BaseService {
for (const rattachement of rattachementsResults) { for (const rattachement of rattachementsResults) {
if (rattachement.statutDuRattachement && !rattachement.deleted) { if (rattachement.statutDuRattachement && !rattachement.deleted) {
console.log("rattachementsResults", JSON.stringify(rattachementsResults));
let officeData: IOfficeData; let officeData: IOfficeData;
try { try {
@ -303,12 +296,9 @@ export default class IdNotService extends BaseService {
continue; continue;
} }
console.log("officeData", JSON.stringify(officeData));
if (officeData.typeEntite.name === "office") { if (officeData.typeEntite.name === "office") {
userData = rattachement; userData = rattachement;
userData.entite = officeData; userData.entite = officeData;
console.log("Updated userData", JSON.stringify(userData));
break; // Found the first valid office, no need to continue break; // Found the first valid office, no need to continue
} }
} }
@ -318,7 +308,6 @@ export default class IdNotService extends BaseService {
let update = false; let update = false;
if (user.office_membership!.idNot !== userData.entite.ou) { if (user.office_membership!.idNot !== userData.entite.ou) {
console.log("Updating user.office_membership");
update = true; update = true;
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) {
@ -353,20 +342,21 @@ export default class IdNotService extends BaseService {
officeData = await this.officeService.create(office); officeData = await this.officeService.create(office);
} }
user.office_membership = officeData; user.office_membership = officeData;
console.log("Updated user.office_membership", JSON.stringify(user.office_membership)); console.log("New office_membership found", JSON.stringify(user.office_membership));
} }
if (userData.mailRattachement && (user.contact!.email === null || user.contact!.email === undefined || user.contact!.email !== userData.mailRattachement)) { if (userData.mailRattachement && (user.contact!.email === null || user.contact!.email === undefined || user.contact!.email !== userData.mailRattachement)) {
update = true; update = true;
user.contact!.email = userData.mailRattachement; user.contact!.email = userData.mailRattachement;
console.log("Updated user.contact.email", JSON.stringify(user.contact!.email)); console.log("New email found", JSON.stringify(user.contact!.email));
} }
if (userData.numeroMobile && (user.contact!.cell_phone_number === null || user.contact!.cell_phone_number === undefined || 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)) {
update = true; update = true;
user.contact!.cell_phone_number = userData.numeroMobile; user.contact!.cell_phone_number = userData.numeroMobile;
console.log("Updated user.contact.cell_phone_number", JSON.stringify(user.contact!.cell_phone_number)); console.log("New cell phone number found", JSON.stringify(user.contact!.cell_phone_number));
} }
if (update) { if (update) {
console.log("Found updates for user", user.uid!);
// Filter out null values before updating to prevent Prisma errors // Filter out null values before updating to prevent Prisma errors
const convertedUser = this.convertNullToUndefined(user); const convertedUser = this.convertNullToUndefined(user);
await this.userService.update(user.uid!, convertedUser); await this.userService.update(user.uid!, convertedUser);