[Onboarding Flow] Added database checks to the onboarding flow

.github/workflows/cd-android-live-update.yml

@@ -1,7 +1,7 @@
 name: CD Android Live Update
 on:
   push:
-    branches: [ main, master ]
+    branches: [main, master]
     paths:
       - 'android/capawesome.json'
       - '.github/workflows/cd-android-live-update.yml'
@@ -73,4 +73,4 @@ jobs:
           CAPAWESOME_TOKEN: ${{ secrets.CAPAWESOME_TOKEN }}
           commitRef: ${{ github.head_ref || github.ref_name }}
           commitSha: ${{ github.sha }}
-        run: yarn android-live-update
+        run: yarn android-live-update

.github/workflows/cd-android.yml

@@ -94,4 +94,4 @@ jobs:
           serviceAccountJsonPlainText: ${{ secrets.PLAY_SERVICE_ACCOUNT_JSON }}
           packageName: com.compassconnections.app
           releaseFiles: android/app/build/outputs/bundle/release/app-release.aab
-          track: internal
+          track: internal

.github/workflows/cd-api.yml

@@ -1,7 +1,7 @@
 name: API Release
 on:
   push:
-    branches: [ main, master ]
+    branches: [main, master]
     paths:
       - 'backend/api/package.json'
       - '.github/workflows/cd-api.yml'
@@ -92,4 +92,4 @@ jobs:
       - name: Run deploy script
         run: |
           chmod +x backend/api/deploy-api.sh
-          backend/api/deploy-api.sh
+          backend/api/deploy-api.sh

.github/workflows/cd.yml

@@ -4,7 +4,7 @@ name: GitHub Release
 
 on:
   push:
-    branches: [ main, master ]
+    branches: [main, master]
     paths:
       - 'package.json'
       - '.github/workflows/cd.yml'

.github/workflows/ci-e2e.yml

@@ -16,6 +16,31 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Cache Firebase emulators
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/firebase/emulators
+          key: firebase-emulators-${{ hashFiles('firebase.json') }}
+          restore-keys: firebase-emulators-
+
+      #      - name: Cache Docker layers
+      #        uses: ScribeMD/docker-cache@0.5.0
+      #        with:
+      #          key: docker-${{ runner.os }}-${{ hashFiles('supabase/config.toml') }}
+
+      - name: Cache node_modules
+        id: cache-node-modules
+        uses: actions/cache@v4
+        with:
+          path: node_modules
+          key: node-modules-${{ hashFiles('yarn.lock') }}
+
+      - name: Cache Playwright browsers
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/ms-playwright
+          key: playwright-${{ hashFiles('package.json') }}
+
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
@@ -28,22 +53,40 @@ jobs:
           distribution: 'temurin'
           java-version: '21' # Required for firebase-tools@15+
 
-      - name: Setup Supabase CLI
-        uses: supabase/setup-cli@v1
-        with:
-          version: latest
-
       - name: Install dependencies
         run: yarn install --frozen-lockfile
+        env:
+          HUSKY: 0
 
       - name: Install Playwright browsers
         run: npx playwright install chromium --with-deps
 
-      - name: Start Supabase # optional step, as if supabase is stopped, it would be started in test:e2e, but done here to avoid cluttering the logs of the E2E tests
-        run: |
-          echo "::group::Supabase start (docker pull logs)"
-          npx supabase start
-          echo "::endgroup::"
+      # Docker load from cache is actually slower than pulling the images every time with supabase start
+      #      - name: Cache Supabase Docker images
+      #        uses: actions/cache@v4
+      #        with:
+      #          path: /tmp/supabase-docker
+      #          key: supabase-docker-${{ hashFiles('supabase/config.toml') }}
+      #
+      #      - name: Load cached Docker images
+      #        run: |
+      #          if [ -d /tmp/supabase-docker ]; then
+      #            for tar in /tmp/supabase-docker/*.tar; do
+      #              [ -f "$tar" ] && docker load -i "$tar"
+      #            done
+      #          fi
+
+      - name: Start Supabase
+        run: ./scripts/supabase_start.sh
+
+      #      - name: Save Supabase Docker images
+      #        run: |
+      #          mkdir -p /tmp/supabase-docker
+      #          docker images --format '{{.Repository}}:{{.Tag}}' \
+      #            | grep -E 'supabase|postgrest|gotrue|realtime|storage' \
+      #            | grep -v '<none>' \
+      #            | xargs -I{} sh -c \
+      #              'docker save {} -o /tmp/supabase-docker/$(echo {} | tr "/:" "--").tar'
 
       - name: Run E2E tests
         env:
@@ -58,7 +101,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: playwright-report
-          path: playwright-report/
+          path: tests/reports/playwright-report/
           retention-days: 7
 
       - name: Upload test results
@@ -68,3 +111,4 @@ jobs:
           name: test-results
           path: test-results/
           retention-days: 7
+          if-no-files-found: ignore

backend/shared/src/firebase-utils.ts

@@ -21,7 +21,8 @@ export const getServiceAccountCredentials = () => {
   try {
     return JSON.parse(readFileSync(keyPath, {encoding: 'utf8'}))
   } catch (e) {
-    throw new Error(`Failed to load service account key from ${keyPath}: ${e}`)
+    if (!process.env.NEXT_PUBLIC_ISOLATED_ENV && !process.env.FIREBASE_AUTH_EMULATOR_HOST)
+      throw new Error(`Failed to load service account key from ${keyPath}: ${e}`)
   }
 }
 

backend/shared/src/supabase/init.ts

@@ -60,6 +60,14 @@ const newClient = (
     console.log('Creating Supabase direct client')
   }
 
+  if (!databaseUrl && process.env.NEXT_PUBLIC_ISOLATED_ENV) {
+    throw new Error(
+      `You are running isolated tests (NEXT_PUBLIC_ISOLATED_ENV=true), so you do not want to call the remote supabase. ${{
+        databaseUrl,
+      }}`,
+    )
+  }
+
   const config: any = databaseUrl
     ? {
         // Use connection string for local/dev Postgres

common/src/choices.ts

@@ -247,3 +247,15 @@ export const INVERTED_RACE_CHOICES = invert(RACE_CHOICES)
 export const INVERTED_MBTI_CHOICES = invert(MBTI_CHOICES)
 export const INVERTED_GENDERS = invert(GENDERS)
 export const INVERTED_LAST_ONLINE_CHOICES = invert(LAST_ONLINE_CHOICES)
+
+//Exported types for test files to use when referencing the keys of the choices objects
+export type ConnectionTypeKey = keyof typeof RELATIONSHIP_CHOICES
+export type RelationshipStatusKey = keyof typeof RELATIONSHIP_STATUS_CHOICES
+export type RelationshipStyleKey = keyof typeof ROMANTIC_CHOICES
+export type PoliticalBeliefsKey = keyof typeof POLITICAL_CHOICES
+export type DietKey = keyof typeof DIET_CHOICES
+export type EducationKey = keyof typeof EDUCATION_CHOICES
+export type ReligionKey = keyof typeof RELIGION_CHOICES
+export type LanguageKey = keyof typeof LANGUAGE_CHOICES
+export type EthnicityKey = keyof typeof RACE_CHOICES
+export type PersonalityKey = keyof typeof MBTI_CHOICES

common/src/supabase/utils.ts

@@ -29,6 +29,7 @@ export function createClient(
   key: string,
   opts?: SupabaseClientOptionsGeneric<'public'>,
 ) {
+  if (key === 'null') throw new Error(`Invalid supabase anon key: ${key}`)
   // Allow passing a full Supabase URL directly (e.g., http://localhost:54321)
   const url = /:\/\//.test(instanceIdOrUrl)
     ? instanceIdOrUrl

package.json

@@ -34,7 +34,7 @@
     "test:e2e:ui": "./scripts/e2e.sh --ui",
     "test:e2e:debug": "./scripts/e2e.sh --debug",
     "test:e2e:services": "./scripts/e2e_services.sh",
-    "test:db:reset": "npx supabase start && ./scripts/combine-migrations.sh && npx supabase db reset && yarn test:db:seed",
+    "test:db:reset": "./scripts/test_db_reset.sh",
     "test:db:reset-postgres": "docker compose -f scripts/docker-compose.test.yml down -v && docker compose -f scripts/docker-compose.test.yml up -d",
     "test:db:migrate": "./scripts/test_db_migration.sh",
     "test:db:seed": "./scripts/seed.sh",

playwright.config.ts

@@ -1,15 +1,47 @@
 import {defineConfig, devices} from '@playwright/test'
+import {execSync} from 'child_process'
+import {config} from 'dotenv'
+
+// Load static env vars from .env.test
+config({path: '.env.test', quiet: true})
+
+// Dynamically pull Supabase vars
+function getSupabaseEnv() {
+  try {
+    const raw = execSync('npx supabase status --output json 2>/dev/null', {encoding: 'utf-8'})
+    const status = JSON.parse(raw)
+    if (!status.API_URL) throw new Error('No supabase API URL')
+    if (!status.ANON_KEY) throw new Error('No supabase ANON_KEY')
+    if (!status.DB_URL) throw new Error('No supabase DB_URL')
+    return {
+      NEXT_PUBLIC_SUPABASE_URL: status.API_URL,
+      NEXT_PUBLIC_SUPABASE_ANON_KEY: status.ANON_KEY,
+      DATABASE_URL: status.DB_URL,
+    }
+  } catch (e) {
+    console.error(e)
+    throw new Error('Failed to get Supabase status. Is it running?')
+  }
+}
+
+const supabaseEnv = getSupabaseEnv()
+
+// Inject into process.env so Playwright and your app code can read them
+Object.assign(process.env, supabaseEnv)
 
 export default defineConfig({
   testDir: './tests/e2e',
   fullyParallel: true,
   forbidOnly: !!process.env.CI,
-  retries: process.env.CI ? 2 : 0,
+  // No retries by default (even in CI) because it slows the CI pipeline and masks real bugs
+  // If there is a known intermittent browser timing issue for some tests, it's fine to give 1 retry to those flaky tests
+  retries: process.env.CI ? 0 : 0,
   workers: process.env.CI ? 1 : undefined,
   reporter: [['html', {outputFolder: `tests/reports/playwright-report`, open: 'on-failure'}]],
   use: {
     baseURL: 'http://localhost:3000',
     trace: 'on-first-retry',
+    // headless: false,
   },
   projects: [
     {
@@ -27,7 +59,7 @@ export default defineConfig({
     //   use: { ...devices['Desktop Safari'] },
     // },
   ],
-  timeout: 60000,
+  timeout: 120000,
   expect: {
     timeout: 120000,
   },

scripts/combine-migrations.sh

@@ -72,7 +72,7 @@ while IFS= read -r file; do
     cat "$file"
   } > "$OUTPUT"
 
-  echo "✅ $file -> $OUTPUT"
+#  echo "✅ $file -> $OUTPUT"
 
   COUNTER=$((COUNTER + 100))
 done <<< "$FILES"

scripts/e2e-dev.sh

@@ -4,29 +4,19 @@ set -euo pipefail
 
 cd "$(dirname "$0")"/..
 
+export NEXT_PUBLIC_ISOLATED_ENV=true
+
 # Colors
 GREEN='\033[0;32m'
 RED='\033[0;31m'
 NC='\033[0m'
 print_status() { echo -e "${GREEN}[E2E-DEV]${NC} $1"; }
 print_error()  { echo -e "${RED}[ERROR]${NC} $1"; }
 
-get_supabase_status() {
-  SUPABASE_STATUS=$(supabase status --output json 2>/dev/null)
-}
-
-get_supabase_status
-
 # Check services are running (fail fast with helpful message)
 check_services() {
   local missing=0
 
-  if [ -z "$(echo "$SUPABASE_STATUS" | jq -r '.API_URL')" ]; then
-    print_error "Supabase is not running. Starting..."
-    yarn test:db:reset
-    get_supabase_status
-  fi
-
   if ! curl -s http://127.0.0.1:9099 > /dev/null 2>&1; then
     print_error "Firebase emulator is not running. Run: yarn emulate"
     missing=1
@@ -54,11 +44,6 @@ print_status "Checking services..."
 check_services
 print_status "All services running ✅"
 
-export $(cat .env.test | grep -v '^#' | xargs)
-export NEXT_PUBLIC_SUPABASE_URL=$(echo "$SUPABASE_STATUS" | jq -r '.API_URL')
-export NEXT_PUBLIC_SUPABASE_ANON_KEY=$(echo "$SUPABASE_STATUS" | jq -r '.ANON_KEY')
-export DATABASE_URL=$(echo "$SUPABASE_STATUS" | jq -r '.DB_URL')
-
 # Run tests - pass all args through to playwright
 # Examples:
 #   yarn test:e2e:dev                          → all e2e tests

scripts/e2e.sh

@@ -5,6 +5,9 @@ set -euo pipefail
 # Change to project root
 cd "$(dirname "$0")"/..
 
+export NEXT_PUBLIC_ISOLATED_ENV=true
+export CI=true
+
 # Colors for output
 RED='\033[0;31m'
 GREEN='\033[0;32m'
@@ -60,18 +63,7 @@ supabase stop --no-backup 2>/dev/null || true
 sleep 2  # Give ports time to free up
 
 # Build backend (required?)
-./scripts/build_api.sh
-
-# Get connection details
-export NEXT_PUBLIC_SUPABASE_URL=$(supabase status --output json | jq -r '.API_URL')
-export NEXT_PUBLIC_SUPABASE_ANON_KEY=$(supabase status --output json | jq -r '.ANON_KEY')
-export DATABASE_URL=$(supabase status --output json | jq -r '.DB_URL')
-
-echo $NEXT_PUBLIC_SUPABASE_URL
-echo $NEXT_PUBLIC_SUPABASE_ANON_KEY
-echo $DATABASE_URL
-
-print_status "Supabase started at: $DATABASE_URL"
+#./scripts/build_api.sh
 
 # Install Playwright browsers
 print_status "Installing Playwright browsers..."
@@ -90,6 +82,26 @@ npx wait-on \
 # Start Supabase (includes Postgres, Auth, Storage, etc.) and Apply migrations and seed (needs firebase emulator running)
 yarn test:db:reset
 
+# Get connection details
+STATUS_JSON=$(supabase status --output json)
+export NEXT_PUBLIC_SUPABASE_URL=$(echo "$STATUS_JSON" | jq -r '.API_URL')
+export NEXT_PUBLIC_SUPABASE_ANON_KEY=$(echo "$STATUS_JSON" | jq -r '.ANON_KEY')
+export DATABASE_URL=$(echo "$STATUS_JSON" | jq -r '.DB_URL')
+
+print_status "Supabase started at: $DATABASE_URL"
+
+echo "Supabase env vars:"
+echo $NEXT_PUBLIC_SUPABASE_URL
+echo $NEXT_PUBLIC_SUPABASE_ANON_KEY
+echo $DATABASE_URL
+
+for var in NEXT_PUBLIC_SUPABASE_URL NEXT_PUBLIC_SUPABASE_ANON_KEY DATABASE_URL; do
+  if [ -z "${!var}" ] || [ "${!var}" = "null" ]; then
+    echo "Error: $var is not set or null" >&2
+    exit 1
+  fi
+done
+
 # Start backend API
 print_status "Starting backend API..."
 yarn --cwd=backend/api dev & PIDS+=($!)

scripts/e2e_services.sh

@@ -8,6 +8,8 @@ set -euo pipefail
 # Change to project root
 cd "$(dirname "$0")"/..
 
+export NEXT_PUBLIC_ISOLATED_ENV=true
+
 export $(cat .env.test | grep -v '^#' | xargs)
 
 # Ensure Supabase local stack is running; if not, reset/start it
@@ -24,6 +26,13 @@ export NEXT_PUBLIC_SUPABASE_URL=$(echo "$STATUS_JSON" | jq -r '.API_URL')
 export NEXT_PUBLIC_SUPABASE_ANON_KEY=$(echo "$STATUS_JSON" | jq -r '.ANON_KEY')
 export DATABASE_URL=$(echo "$STATUS_JSON" | jq -r '.DB_URL')
 
+for var in NEXT_PUBLIC_SUPABASE_URL NEXT_PUBLIC_SUPABASE_ANON_KEY DATABASE_URL; do
+  if [ -z "${!var}" ] || [ "${!var}" = "null" ]; then
+    echo "Error: $var is not set or null" >&2
+    exit 1
+  fi
+done
+
 # Build backend (required?)
 ./scripts/build_api.sh