From df68d26f033ddf2f8a3188b9cb6e18bbf3897947 Mon Sep 17 00:00:00 2001 From: kkatusic Date: Tue, 28 Jan 2025 14:36:35 +0100 Subject: [PATCH] Fix/Vouche/DeVauche project(s) --- src/server/adminJs/tabs/projectsTab.ts | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/server/adminJs/tabs/projectsTab.ts b/src/server/adminJs/tabs/projectsTab.ts index 01db3cb45..347e8703e 100644 --- a/src/server/adminJs/tabs/projectsTab.ts +++ b/src/server/adminJs/tabs/projectsTab.ts @@ -264,15 +264,20 @@ export const verifyProjects = async ( const updateParams = { verified: vouchedStatus }; - const projects = await Project.createQueryBuilder('project') + // Perform the update + await Project.createQueryBuilder('project') .update(Project, updateParams) .where('project.id IN (:...ids)') .setParameter('ids', projectIds) - .returning('*') - .updateEntity(true) .execute(); - for (const project of projects.raw) { + // Fetch the updated projects with adminUser included + const projects = await Project.createQueryBuilder('project') + .leftJoinAndSelect('project.adminUser', 'adminUser') + .where('project.id IN (:...ids)', { ids: projectIds }) + .getMany(); + + for (const project of projects) { if ( projectsBeforeUpdating.find(p => p.id === project.id)?.verified === vouchedStatus @@ -284,6 +289,7 @@ export const verifyProjects = async ( // if project.verified have not changed, so we should not execute rest of the codes continue; } + await Project.addProjectStatusHistoryRecord({ project, status: project.status,