Refactor: Migrate lesson_completions table and related queries from student_id to user_id.

Author: guillermoscript

app/[locale]/dashboard/admin/analytics/page.tsx

@@ -24,9 +24,10 @@ export default async function AnalyticsPage({
   searchParams,
 }: {
   params: Promise<{ locale: string }>
-  searchParams: SearchParams
+  searchParams: Promise<SearchParams>
 }) {
   const { locale } = await params
+  const resolvedSearchParams = await searchParams
   const t = await getTranslations('dashboard.admin.analytics')
   const tBreadcrumbs = await getTranslations('dashboard.admin.breadcrumbs')
   const dateLocale = locale === 'es' ? es : enUS
@@ -48,7 +49,7 @@ export default async function AnalyticsPage({
   const tenantId = await getCurrentTenantId()
 
   // Get period from query params (default: 30 days)
-  const period = searchParams.period || '30'
+  const period = resolvedSearchParams.period || '30'
   const daysAgo = parseInt(period)
   const startDate = new Date()
   startDate.setDate(startDate.getDate() - daysAgo)
@@ -130,11 +131,11 @@ export default async function AnalyticsPage({
 
   const { data: activeStudentIds } = await supabase
     .from('lesson_completions')
-    .select('student_id')
+    .select('user_id')
     .eq('tenant_id', tenantId)
     .gte('completed_at', thirtyDaysAgo.toISOString())
 
-  const activeStudents = new Set(activeStudentIds?.map((s) => s.student_id)).size
+  const activeStudents = new Set(activeStudentIds?.map((s) => s.user_id)).size
 
   const { count: totalLessonCompletions } = await supabase
     .from('lesson_completions')
@@ -174,7 +175,7 @@ export default async function AnalyticsPage({
       const { count: completedLessons } = await supabase
         .from('lesson_completions')
         .select('*', { count: 'exact', head: true })
-        .eq('student_id', (enrollment as any).student_id)
+        .eq('user_id', (enrollment as any).user_id)
         .in(
           'lesson_id',
           (
@@ -245,7 +246,7 @@ export default async function AnalyticsPage({
         const { count: completedCount } = await supabase
           .from('lesson_completions')
           .select('*', { count: 'exact', head: true })
-          .eq('student_id', enrollment.user_id)
+          .eq('user_id', enrollment.user_id)
           .in('lesson_id', lessonIds)
 
         totalCompletions += (completedCount || 0) / lessonIds.length

app/[locale]/dashboard/admin/users/[userId]/page.tsx

@@ -105,7 +105,7 @@ export default async function UserDetailPage({ params }: PageProps) {
         )
       )
     `)
-    .eq('student_id', userId)
+    .eq('user_id', userId)
     .eq('tenant_id', tenantId)
     .order('completed_at', { ascending: false })
     .limit(10)

app/api/seed-test-data/route.ts

@@ -104,18 +104,18 @@ export async function POST() {
     const lessonCompletions = [
       // Course 1: 2 out of 3 lessons
       {
-        student_id: studentUserId,
+        user_id: studentUserId,
         lesson_id: 1,
         completed_at: new Date(Date.now() - 6 * 24 * 60 * 60 * 1000).toISOString()
       },
       {
-        student_id: studentUserId,
+        user_id: studentUserId,
         lesson_id: 2,
         completed_at: new Date(Date.now() - 5 * 24 * 60 * 60 * 1000).toISOString()
       },
       // Course 3: 1 out of 24 lessons
       {
-        student_id: studentUserId,
+        user_id: studentUserId,
         lesson_id: 8,
         completed_at: new Date(Date.now() - 2 * 24 * 60 * 60 * 1000).toISOString()
       }
@@ -125,7 +125,7 @@ export async function POST() {
       const { error: completionError } = await supabase
         .from('lesson_completions')
         .upsert(completion, {
-          onConflict: 'student_id,lesson_id'
+          onConflict: 'user_id,lesson_id'
         })
 
       if (completionError) {

scripts/seed-playwright.ts

@@ -426,8 +426,7 @@ async function main() {
         const { error: delComErr } = await supabase
           .from('lesson_completions')
           .delete()
-          .eq('student_id', userId)
-          .eq('course_id', courseId)
+          .eq('user_id', userId)
 
         if (delComErr) console.warn('Warning deleting lesson_completions:', delComErr.message)
 

scripts/seed-test-enrollments.sql

@@ -65,23 +65,23 @@ BEGIN
 
   -- Add lesson completions for Course 1 (2 out of 3 lessons completed)
   -- Lesson 1: Completed
-  INSERT INTO lesson_completions (student_id, lesson_id, completed_at)
+  INSERT INTO lesson_completions (user_id, lesson_id, completed_at)
   VALUES (student_user_id, 1, NOW() - INTERVAL '6 days')
-  ON CONFLICT (student_id, lesson_id) DO NOTHING;
+  ON CONFLICT (user_id, lesson_id) DO NOTHING;
 
   -- Lesson 2: Completed
-  INSERT INTO lesson_completions (student_id, lesson_id, completed_at)
+  INSERT INTO lesson_completions (user_id, lesson_id, completed_at)
   VALUES (student_user_id, 2, NOW() - INTERVAL '5 days')
-  ON CONFLICT (student_id, lesson_id) DO NOTHING;
+  ON CONFLICT (user_id, lesson_id) DO NOTHING;
 
   -- Lesson 3: Not completed (to show "In Progress" status)
 
   RAISE NOTICE 'Created 2/3 lesson completions for Course 1';
 
   -- Add lesson completion for Course 3 (1 out of 24 lessons completed)
-  INSERT INTO lesson_completions (student_id, lesson_id, completed_at)
+  INSERT INTO lesson_completions (user_id, lesson_id, completed_at)
   VALUES (student_user_id, 8, NOW() - INTERVAL '2 days')
-  ON CONFLICT (student_id, lesson_id) DO NOTHING;
+  ON CONFLICT (user_id, lesson_id) DO NOTHING;
 
   RAISE NOTICE 'Created 1/24 lesson completion for Course 3';