refactor(prod): unify currentDay exclusively in Enrollment model to fix scheduler sync

apps/api/src/services/whatsapp.ts

@@ -95,17 +95,26 @@ export class WhatsAppService {
             // CONTINUE → fall through to SUITE logic below
         }
 
-        // 1.5. Check Pending Pedagogy Exercise
+        // 2. Check Pending Exercise (User Progress)
         const pendingProgress = await prisma.userProgress.findFirst({
             where: { userId: user.id, exerciseStatus: 'PENDING' },
             include: { track: true }
         });
 
         if (pendingProgress) {
-            console.log(`User ${user.id} responding to exercise for Track ${pendingProgress.trackId} Day ${pendingProgress.currentDay}`);
+            const enrollment = await prisma.enrollment.findFirst({
+                where: { userId: user.id, trackId: pendingProgress.trackId, status: 'ACTIVE' }
+            });
+
+            if (!enrollment) {
+                console.warn(`[WHATSAPP] User ${user.id} has PENDING exercise but no ACTIVE enrollment on Track ${pendingProgress.trackId}`);
+                return;
+            }
+
+            console.log(`User ${user.id} responding to exercise for Track ${pendingProgress.trackId} Day ${enrollment.currentDay}`);
 
             const trackDay = await prisma.trackDay.findFirst({
-                where: { trackId: pendingProgress.trackId, dayNumber: pendingProgress.currentDay }
+                where: { trackId: pendingProgress.trackId, dayNumber: enrollment.currentDay }
             });
 
             if (trackDay) {
@@ -157,12 +166,13 @@ export class WhatsAppService {
 
                 // Advance to next day or mark complete
                 const totalDays = pendingProgress.track.duration;
-                if (pendingProgress.currentDay >= totalDays) {
+                if (enrollment.currentDay >= totalDays) {
                     await scheduleMessage(user.id, user.language === 'WOLOF'
                         ? "🎉 Baraka Allahu fik ! Jeex nga module bi. Dokumaan yi dinañu leen yónnee ci kanam !"
                         : "🎉 Félicitations ! Vous avez terminé ce module. Vos documents intelligents arrivent bientôt !"
                     );
-                    await scheduleTrackDay(user.id, pendingProgress.trackId, pendingProgress.currentDay + 1);
+                    // Technically it's complete, so passing currentDay + 1 triggers the scheduleTrackDay mark completion logic
+                    await scheduleTrackDay(user.id, pendingProgress.trackId, enrollment.currentDay + 1);
                 } else {
                     await scheduleMessage(user.id, user.language === 'WOLOF'
                         ? "Baax na ! Yónnee *SUITE* ngir dem ci kanam."

apps/whatsapp-worker/src/pedagogy.ts

@@ -124,17 +124,21 @@ export async function sendLessonDay(userId: string, trackId: string, dayNumber:
     await prisma.userProgress.upsert({
         where: { userId_trackId: { userId, trackId } },
         update: {
-            currentDay: dayNumber,
             exerciseStatus: 'PENDING',
             lastInteraction: new Date()
         },
         create: {
             userId,
             trackId,
-            currentDay: dayNumber,
             exerciseStatus: 'PENDING'
         }
     });
 
+    // 🌟 5. Correctly update Enrollment.currentDay (Fixes Scheduler Bug) 🌟
+    await prisma.enrollment.updateMany({
+        where: { userId, trackId, status: 'ACTIVE' },
+        data: { currentDay: dayNumber }
+    });
+
     console.log(`[PEDAGOGY] Lesson Day ${dayNumber} sent. UserProgress set to PENDING.`);
 }

packages/database/prisma/schema.prisma

@@ -68,7 +68,6 @@ model UserProgress {
   id              String         @id @default(uuid())
   userId          String
   trackId         String
-  currentDay      Int            @default(1)
   score           Int            @default(0)
   lastInteraction DateTime       @default(now())
   exerciseStatus  ExerciseStatus @default(PENDING)

packages/database/sync-days.ts

@@ -0,0 +1,41 @@
+import { PrismaClient } from '@prisma/client';
+
+const prisma = new PrismaClient();
+
+async function syncDays() {
+    console.log('🔄 Démarrage de la synchronisation des jours (UserProgress -> Enrollment)...');
+
+    const enrollments = await prisma.enrollment.findMany({
+        where: { status: 'ACTIVE' },
+        include: { user: { include: { progress: true } } }
+    });
+
+    let updatedCount = 0;
+
+    for (const enrollment of enrollments) {
+        // Find the corresponding UserProgress for this active track
+        const progress = enrollment.user.progress.find(p => p.trackId === enrollment.trackId);
+
+        if (progress) {
+            // If UserProgress has a higher internal currentDay than Enrollment, 
+            // the scheduler bug affected this user. We need to align Enrollment.
+            // (Note: Since we haven't removed currentDay from UserProgress yet, we can access it via 'any')
+            const progressAny = progress as any;
+            if (progressAny.currentDay && progressAny.currentDay > enrollment.currentDay) {
+                console.log(`➡️  Mise à jour: User ${enrollment.userId} Track ${enrollment.trackId}: Jour ${enrollment.currentDay} -> ${progressAny.currentDay}`);
+
+                await prisma.enrollment.update({
+                    where: { id: enrollment.id },
+                    data: { currentDay: progressAny.currentDay }
+                });
+                updatedCount++;
+            }
+        }
+    }
+
+    console.log(`✅ Synchronisation terminée. ${updatedCount} inscriptions synchronisées.`);
+}
+
+syncDays()
+    .catch(console.error)
+    .finally(() => prisma.$disconnect());