Merge pull request #253 from guillermoscript/test

Test

Author: guillermoscript

.dockerignore

@@ -1,6 +1,7 @@
 node_modules
 .next
 .git
+.env*
 supabase
 tests
 mcp-server

.github/workflows/deploy-mcp.yml

@@ -0,0 +1,50 @@
+name: Build and deploy MCP server to Dokploy
+
+on:
+  push:
+    branches: ["master"]
+    paths:
+      - "mcp-server/**"
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}-mcp
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=raw,value=latest
+            type=sha,prefix=
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: ./mcp-server
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+      - name: Trigger Dokploy deployment
+        run: |
+          curl -sSf -X POST "${{ secrets.DOKPLOY_MCP_DEPLOY_WEBHOOK_URL }}"

.github/workflows/deploy.yml

@@ -0,0 +1,54 @@
+name: Build and deploy to Dokploy
+
+on:
+  push:
+    branches: ["master"]
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=raw,value=latest
+            type=sha,prefix=
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            NEXT_PUBLIC_SUPABASE_URL=${{ vars.NEXT_PUBLIC_SUPABASE_URL }}
+            NEXT_PUBLIC_SUPABASE_PUBLISHABLE_OR_ANON_KEY=${{ vars.NEXT_PUBLIC_SUPABASE_PUBLISHABLE_OR_ANON_KEY }}
+            NEXT_PUBLIC_PLATFORM_DOMAIN=${{ vars.NEXT_PUBLIC_PLATFORM_DOMAIN }}
+            NEXT_PUBLIC_APP_URL=${{ vars.NEXT_PUBLIC_APP_URL }}
+            NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY=${{ vars.NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY }}
+
+      - name: Trigger Dokploy deployment
+        run: |
+          curl -sSf -X POST "${{ secrets.DOKPLOY_DEPLOY_WEBHOOK_URL }}"

Dockerfile

@@ -13,6 +13,20 @@ WORKDIR /app
 COPY --from=deps /app/node_modules ./node_modules
 COPY . .
 ENV NEXT_TELEMETRY_DISABLED=1
+
+# Next.js inlines NEXT_PUBLIC_* at build time — pass as build args
+ARG NEXT_PUBLIC_SUPABASE_URL
+ARG NEXT_PUBLIC_SUPABASE_PUBLISHABLE_OR_ANON_KEY
+ARG NEXT_PUBLIC_PLATFORM_DOMAIN
+ARG NEXT_PUBLIC_APP_URL
+ARG NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY
+
+ENV NEXT_PUBLIC_SUPABASE_URL=$NEXT_PUBLIC_SUPABASE_URL
+ENV NEXT_PUBLIC_SUPABASE_PUBLISHABLE_OR_ANON_KEY=$NEXT_PUBLIC_SUPABASE_PUBLISHABLE_OR_ANON_KEY
+ENV NEXT_PUBLIC_PLATFORM_DOMAIN=$NEXT_PUBLIC_PLATFORM_DOMAIN
+ENV NEXT_PUBLIC_APP_URL=$NEXT_PUBLIC_APP_URL
+ENV NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY=$NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY
+
 RUN npm run build
 
 # Production

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) {

mcp-server/Dockerfile

@@ -1,23 +1,28 @@
-FROM node:20-alpine
+FROM node:20-alpine AS builder
 
-# Set working directory
 WORKDIR /app
 
-# Copy package files
 COPY package*.json ./
+RUN npm ci
 
-# Install production dependencies only
+COPY tsconfig.json ./
+COPY src ./src
+RUN npm run build
+
+FROM node:20-alpine AS runner
+
+WORKDIR /app
+
+COPY package*.json ./
 RUN npm ci --production --ignore-scripts
 
-# Copy built files
-COPY build ./build
+COPY --from=builder /app/build ./build
 
-# Expose MCP server port
 EXPOSE 3001
 
-# Health check
+ENV MCP_HTTP_HOST=0.0.0.0
+
 HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
   CMD node -e "require('http').get('http://localhost:3001', (res) => process.exit(res.statusCode === 404 ? 0 : 1))"
 
-# Run HTTP server
 CMD ["node", "build/http-server.js"]

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';