Rollback to 9c6a5028

server/presenceDb.ts

@@ -115,24 +115,27 @@ export async function getSignaturesFormateursBySequence(sequenceId: number) {
   const db = await getDb();
   if (!db) throw new Error("Database not available");
 
-  const { presencesFormateur } = await import("../drizzle/schema");
-
   const result = await db
     .select({
-      presenceId: presencesFormateur.id,
-      formateurId: presencesFormateur.formateurId,
-      dateFormationId: presencesFormateur.dateFormationId,
-      periode: presencesFormateur.periode,
-      heurePresence: presencesFormateur.heurePresence,
-      modeValidation: presencesFormateur.modeValidation,
-      signatureUrl: presencesFormateur.signatureUrl,
-      signatureS3Key: presencesFormateur.signatureS3Key,
+      presenceId: presences.id,
+      formateurId: presences.formateurId,
+      dateFormationId: presences.dateFormationId,
+      periode: presences.periode,
+      heurePresence: presences.heurePresence,
+      modeValidation: presences.modeValidation,
+      signatureUrl: sql<string | null>`${presences}.signatureUrl`,
+      signatureS3Key: sql<string | null>`${presences}.signatureS3Key`,
       dateDebut: datesFormation.dateDebut,
       dateFin: datesFormation.dateFin,
     })
-    .from(presencesFormateur)
-    .innerJoin(datesFormation, eq(presencesFormateur.dateFormationId, datesFormation.id))
-    .where(eq(datesFormation.sequenceId, sequenceId));
+    .from(presences)
+    .innerJoin(datesFormation, eq(presences.dateFormationId, datesFormation.id))
+    .where(
+      and(
+        eq(datesFormation.sequenceId, sequenceId),
+        eq(presences.typeUtilisateur, "formateur")
+      )
+    );
 
   return result;
 }