Resolve merge conflicts

Author: AI Assistant

.github/workflows/ci.yml

@@ -55,13 +55,22 @@ jobs:
         run: |
           npx prisma generate
           npx prisma migrate deploy || true
+      - name: Test Migration Rollbacks
+        working-directory: ./backend
+        env:
+          DATABASE_URL: postgresql://test:test@localhost:5432/test_db
+        run: npm run test:migrations
       - name: Run tests
         working-directory: ./backend
         env:
           NODE_ENV: test
           DATABASE_URL: postgresql://test:test@localhost:5432/test_db
           REDIS_URL: redis://localhost:6379
           JWT_SECRET: test-jwt-secret
+          GITHUB_CLIENT_ID: test-github-client-id
+          GITHUB_CLIENT_SECRET: test-github-client-secret
+          GITHUB_REDIRECT_URI: http://localhost:8080/api/v1/oauth/github/callback
+          FRONTEND_URL: http://localhost:3000
         run: npm run test:coverage || true
 
   frontend:

.github/workflows/mentor-booking.yml

@@ -0,0 +1,34 @@
+name: Mentor Booking Feature Checks
+
+on:
+  pull_request:
+    paths:
+      - 'frontend/src/lib/mentor-booking.ts'
+      - 'frontend/src/lib/__tests__/mentor-booking.test.ts'
+      - '.github/workflows/mentor-booking.yml'
+  push:
+    branches: [main, master]
+    paths:
+      - 'frontend/src/lib/mentor-booking.ts'
+      - 'frontend/src/lib/__tests__/mentor-booking.test.ts'
+      - '.github/workflows/mentor-booking.yml'
+
+jobs:
+  mentor-booking:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
+        with:
+          version: 10.33.0
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: pnpm
+          cache-dependency-path: frontend/pnpm-lock.yaml
+      - name: Install frontend dependencies
+        working-directory: frontend
+        run: pnpm install --frozen-lockfile
+      - name: Run mentor booking tests
+        working-directory: frontend
+        run: pnpm exec vitest run src/lib/__tests__/mentor-booking.test.ts