Compare commits
32 Commits
v0.1.3
...
ab50ae0bdf
| Author | SHA1 | Date | |
|---|---|---|---|
| ab50ae0bdf | |||
| 90fb0f223e | |||
| a49c8e01ac | |||
| 19402be375 | |||
| 84afa88ca4 | |||
| df856c62df | |||
| 3d87f3e1dc | |||
| 04dfdfa378 | |||
| 2cf832eeac | |||
| 967bdc1b89 | |||
| a3cd46e39a | |||
| 42902106e6 | |||
| 1503420519 | |||
| f8f9c205be | |||
| d8a8931bc3 | |||
| e921f17d2c | |||
| c993852147 | |||
| 96a7454d2f | |||
| ed43399b24 | |||
| e8f0fd2538 | |||
| 2e98e9eb51 | |||
| 3a7a9b4b8e | |||
| 66ee38f456 | |||
| 4e3b25e2fc | |||
| e4c4333b40 | |||
| 09302fd911 | |||
| 0d9707ea27 | |||
| b90ec08966 | |||
| 1cd2cbd0a6 | |||
| 24db43eb7f | |||
| 1c9f70c3ed | |||
| 5caa284b3c |
@@ -0,0 +1,15 @@
|
|||||||
|
# Development environment configuration for EuchreCamp
|
||||||
|
# Copy this file to .env.development and fill in your values
|
||||||
|
|
||||||
|
# Database Configuration
|
||||||
|
DATABASE_PROVIDER=postgresql
|
||||||
|
# Development database URL - must contain "_dev" to pass safety checks
|
||||||
|
DATABASE_URL="postgresql://euchre_camp:password@localhost:5432/euchre_camp_dev"
|
||||||
|
|
||||||
|
# Authentication
|
||||||
|
BETTER_AUTH_SECRET="your-secret-key-change-this"
|
||||||
|
BETTER_AUTH_URL="http://localhost:3000"
|
||||||
|
|
||||||
|
# Application Configuration
|
||||||
|
NODE_ENV=development
|
||||||
|
TRUSTED_ORIGINS="http://localhost:3000,http://127.0.0.1:3000"
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
# EuchreCamp Environment Configuration
|
||||||
|
# Copy this file to .env and fill in your values
|
||||||
|
|
||||||
|
# ============================================
|
||||||
|
# Database Configuration
|
||||||
|
# ============================================
|
||||||
|
# PostgreSQL connection string
|
||||||
|
# Format: postgresql://username:password@host:port/database
|
||||||
|
DATABASE_URL=postgresql://euchre:euchrepassword@localhost:5432/euchre_camp
|
||||||
|
|
||||||
|
# Shadow database for Prisma migrations (optional for PostgreSQL)
|
||||||
|
DATABASE_SHADOW_URL=postgresql://euchre:euchrepassword@localhost:5432/euchre_camp_shadow
|
||||||
|
|
||||||
|
# Database provider (postgresql, mysql, sqlite, etc.)
|
||||||
|
DATABASE_PROVIDER=postgresql
|
||||||
|
|
||||||
|
# ============================================
|
||||||
|
# Better Auth Configuration
|
||||||
|
# ============================================
|
||||||
|
# Secret key for session encryption (generate a strong random string)
|
||||||
|
# Run: openssl rand -base64 32
|
||||||
|
BETTER_AUTH_SECRET=your-secret-key-change-in-production
|
||||||
|
|
||||||
|
# Base URL for authentication callbacks
|
||||||
|
# For production: https://your-domain.com
|
||||||
|
BETTER_AUTH_URL=http://localhost:3000
|
||||||
|
|
||||||
|
# ============================================
|
||||||
|
# Application Configuration
|
||||||
|
# ============================================
|
||||||
|
# Environment: development, production, test
|
||||||
|
NODE_ENV=production
|
||||||
|
|
||||||
|
# Trusted origins for CORS and authentication
|
||||||
|
# Add your domain(s) for production
|
||||||
|
TRUSTED_ORIGINS=http://localhost:3000,http://127.0.0.1:3000
|
||||||
|
|
||||||
|
# ============================================
|
||||||
|
# Optional: External Services
|
||||||
|
# ============================================
|
||||||
|
# If using external database (e.g., Supabase, Railway)
|
||||||
|
# DATABASE_URL=postgresql://user:pass@host:port/db
|
||||||
|
|
||||||
|
# If using external auth provider
|
||||||
|
# BETTER_AUTH_URL=https://your-app.com
|
||||||
|
|
||||||
|
# ============================================
|
||||||
|
# CasaOS Deployment Notes
|
||||||
|
# ============================================
|
||||||
|
# When deploying to CasaOS, set these via the UI:
|
||||||
|
# 1. DATABASE_URL: Your PostgreSQL connection string
|
||||||
|
# 2. BETTER_AUTH_SECRET: Generate with: openssl rand -base64 32
|
||||||
|
# 3. BETTER_AUTH_URL: Your app's public URL
|
||||||
|
# 4. TRUSTED_ORIGINS: Your app's public URL(s)
|
||||||
+11
-1
@@ -1,5 +1,15 @@
|
|||||||
{
|
{
|
||||||
"extends": ["next/core-web-vitals", "next/typescript"],
|
"env": {
|
||||||
|
"browser": true,
|
||||||
|
"es2021": true,
|
||||||
|
"node": true
|
||||||
|
},
|
||||||
|
"parser": "@typescript-eslint/parser",
|
||||||
|
"parserOptions": {
|
||||||
|
"ecmaVersion": "latest",
|
||||||
|
"sourceType": "module"
|
||||||
|
},
|
||||||
|
"plugins": ["@typescript-eslint"],
|
||||||
"ignorePatterns": [
|
"ignorePatterns": [
|
||||||
".next",
|
".next",
|
||||||
"out",
|
"out",
|
||||||
|
|||||||
@@ -0,0 +1,71 @@
|
|||||||
|
name: Build CI Images
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
paths:
|
||||||
|
- 'Dockerfile.ci-base'
|
||||||
|
- 'package.json'
|
||||||
|
- 'bun.lockb'
|
||||||
|
- '.gitea/workflows/build-ci-images.yml'
|
||||||
|
schedule:
|
||||||
|
# Weekly rebuild to get latest Playwright/Bun versions
|
||||||
|
- cron: '0 2 * * 0' # Every Sunday at 2 AM
|
||||||
|
workflow_dispatch: # Manual trigger
|
||||||
|
|
||||||
|
env:
|
||||||
|
REGISTRY: docker.notsosm.art
|
||||||
|
IMAGE_NAME: euchre-camp
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build-ci-base:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
packages: write
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout code
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Set up Docker Buildx
|
||||||
|
uses: docker/setup-buildx-action@v3
|
||||||
|
|
||||||
|
- name: Login to Registry
|
||||||
|
run: |
|
||||||
|
echo "${{ secrets.DOCKER_PASSWORD }}" | docker login ${{ env.REGISTRY }} -u ${{ secrets.DOCKER_LOGIN }} --password-stdin
|
||||||
|
|
||||||
|
- name: Extract metadata for CI base image
|
||||||
|
id: meta
|
||||||
|
run: |
|
||||||
|
# Get Playwright version from package.json
|
||||||
|
PLAYWRIGHT_VERSION=$(grep -o '"@playwright/test": "[^"]*"' package.json | cut -d'"' -f4)
|
||||||
|
echo "playwright_version=${PLAYWRIGHT_VERSION}" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
|
# Get Bun version (latest)
|
||||||
|
BUN_VERSION=$(bun --version 2>/dev/null || echo "latest")
|
||||||
|
echo "bun_version=${BUN_VERSION}" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
|
# Set tags
|
||||||
|
echo "tags=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/ci-base:latest,${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/ci-base:playwright-${PLAYWRIGHT_VERSION},${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/ci-base:${{ github.sha }}" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
|
- name: Build and push CI base image
|
||||||
|
run: |
|
||||||
|
# Build with multiple tags
|
||||||
|
docker build \
|
||||||
|
--file Dockerfile.ci-base \
|
||||||
|
--tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/ci-base:latest \
|
||||||
|
--tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/ci-base:playwright-${{ steps.meta.outputs.playwright_version }} \
|
||||||
|
--tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/ci-base:${{ github.sha }} \
|
||||||
|
.
|
||||||
|
|
||||||
|
# Push all tags
|
||||||
|
docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/ci-base:latest
|
||||||
|
docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/ci-base:playwright-${{ steps.meta.outputs.playwright_version }}
|
||||||
|
docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/ci-base:${{ github.sha }}
|
||||||
|
|
||||||
|
- name: Clean up
|
||||||
|
if: always()
|
||||||
|
run: |
|
||||||
|
docker logout ${{ env.REGISTRY }}
|
||||||
+6
-42
@@ -9,7 +9,7 @@ jobs:
|
|||||||
unit-tests:
|
unit-tests:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
container:
|
container:
|
||||||
image: node:20-alpine
|
image: docker.notsosm.art/euchre-camp/ci-base:latest
|
||||||
options: --user root
|
options: --user root
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
@@ -17,55 +17,19 @@ jobs:
|
|||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: npm ci
|
run: bun install
|
||||||
|
|
||||||
- name: Run unit tests
|
|
||||||
run: npm run test:run
|
|
||||||
|
|
||||||
acceptance-tests:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
needs: unit-tests
|
|
||||||
container:
|
|
||||||
image: mcr.microsoft.com/playwright:v1.58.0-jammy
|
|
||||||
options: --user root
|
|
||||||
env:
|
|
||||||
DATABASE_PROVIDER: sqlite
|
|
||||||
DATABASE_URL: file:./prisma/ci.db
|
|
||||||
BETTER_AUTH_SECRET: test-secret-key-for-ci-only
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout code
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Setup Node.js
|
|
||||||
uses: actions/setup-node@v4
|
|
||||||
with:
|
|
||||||
node-version: '20'
|
|
||||||
|
|
||||||
- name: Install dependencies
|
|
||||||
run: npm ci
|
|
||||||
|
|
||||||
- name: Generate Prisma client
|
- name: Generate Prisma client
|
||||||
run: npx prisma generate
|
run: bun x prisma generate
|
||||||
env:
|
env:
|
||||||
DATABASE_URL: postgresql://user:pass@localhost:5432/dummy
|
DATABASE_URL: postgresql://user:pass@localhost:5432/dummy
|
||||||
|
|
||||||
- name: Setup SQLite database
|
- name: Run unit tests
|
||||||
run: |
|
run: bun test src/__tests__/unit/ src/__tests__/*.test.tsx src/__tests__/auth-simple.test.ts
|
||||||
# Create SQLite database file
|
|
||||||
mkdir -p prisma
|
|
||||||
npx prisma migrate deploy
|
|
||||||
|
|
||||||
- name: Run acceptance tests
|
|
||||||
run: npm run test:acceptance
|
|
||||||
env:
|
|
||||||
DATABASE_PROVIDER: sqlite
|
|
||||||
DATABASE_URL: file:./prisma/ci.db
|
|
||||||
BETTER_AUTH_SECRET: test-secret-key-for-ci-only
|
|
||||||
|
|
||||||
analyze-bump-type:
|
analyze-bump-type:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: acceptance-tests
|
needs: unit-tests
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
|
|||||||
@@ -14,6 +14,9 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
# Skip if this is an auto-generated version bump commit
|
# Skip if this is an auto-generated version bump commit
|
||||||
if: "!contains(github.event.head_commit.message, 'chore: bump version')"
|
if: "!contains(github.event.head_commit.message, 'chore: bump version')"
|
||||||
|
container:
|
||||||
|
image: docker.notsosm.art/euchre-camp/ci-base:latest
|
||||||
|
options: --user root
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
@@ -70,10 +73,10 @@ jobs:
|
|||||||
echo "Bumping version: $BUMP"
|
echo "Bumping version: $BUMP"
|
||||||
|
|
||||||
# Run the bump script
|
# Run the bump script
|
||||||
node scripts/bump-version.js "$BUMP" --yes
|
bun run scripts/bump-version.js "$BUMP" --yes
|
||||||
|
|
||||||
# Get new version
|
# Get new version
|
||||||
NEW_VERSION=$(node -p "require('./package.json').version")
|
NEW_VERSION=$(bun -e "console.log(require('./package.json').version)")
|
||||||
echo "new_version=$NEW_VERSION" >> $GITHUB_OUTPUT
|
echo "new_version=$NEW_VERSION" >> $GITHUB_OUTPUT
|
||||||
echo "New version: $NEW_VERSION"
|
echo "New version: $NEW_VERSION"
|
||||||
|
|
||||||
@@ -104,10 +107,6 @@ jobs:
|
|||||||
git push origin "$TAG_NAME"
|
git push origin "$TAG_NAME"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
|
||||||
if: steps.commit.outputs.committed == 'true'
|
|
||||||
uses: docker/setup-buildx-action@v3
|
|
||||||
|
|
||||||
- name: Build test-capable image
|
- name: Build test-capable image
|
||||||
if: steps.commit.outputs.committed == 'true'
|
if: steps.commit.outputs.committed == 'true'
|
||||||
run: |
|
run: |
|
||||||
@@ -123,7 +122,7 @@ jobs:
|
|||||||
docker run --rm \
|
docker run --rm \
|
||||||
-e DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" \
|
-e DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" \
|
||||||
${{ env.IMAGE_NAME }}-test:${{ steps.version.outputs.new_version }} \
|
${{ env.IMAGE_NAME }}-test:${{ steps.version.outputs.new_version }} \
|
||||||
npm run test:run
|
bun test 'src/__tests__/unit/**' 'src/__tests__/*.test.tsx' 'src/__tests__/auth-simple.test.ts'
|
||||||
|
|
||||||
- name: Build production image
|
- name: Build production image
|
||||||
if: steps.commit.outputs.committed == 'true'
|
if: steps.commit.outputs.committed == 'true'
|
||||||
@@ -160,8 +159,36 @@ jobs:
|
|||||||
echo " docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest"
|
echo " docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Deploy to dev (placeholder)
|
- name: Deploy to dev environment
|
||||||
if: steps.commit.outputs.committed == 'true'
|
if: steps.commit.outputs.committed == 'true'
|
||||||
run: |
|
run: |
|
||||||
echo "Deploying version ${{ steps.version.outputs.new_version }} to dev environment..."
|
echo "Deploying version ${{ steps.version.outputs.new_version }} to dev environment..."
|
||||||
# TODO: Add actual deployment steps
|
|
||||||
|
# Update docker-compose.yml with new image tag using full registry path
|
||||||
|
# The registry is docker.notsosm.art and image is euchre-camp
|
||||||
|
IMAGE_TAG="${{ steps.version.outputs.new_version }}"
|
||||||
|
sed -i "s|image: docker.notsosm.art/euchre-camp:[0-9.]*|image: docker.notsosm.art/euchre-camp:${IMAGE_TAG}|" docker-compose.yml
|
||||||
|
|
||||||
|
# Copy the updated docker-compose.yml to the deployment location
|
||||||
|
# The runners are on the same Docker server where the container is running
|
||||||
|
sudo mkdir -p /home/euchre_camp
|
||||||
|
sudo cp docker-compose.yml /home/euchre_camp/
|
||||||
|
sudo chown -R euchre:euchre /home/euchre_camp
|
||||||
|
|
||||||
|
# Pull and restart the dev container
|
||||||
|
cd /home/euchre_camp
|
||||||
|
docker-compose pull app
|
||||||
|
docker-compose up -d app
|
||||||
|
|
||||||
|
# Wait for container to be healthy
|
||||||
|
echo "Waiting for container to start..."
|
||||||
|
sleep 10
|
||||||
|
|
||||||
|
# Check if container is running
|
||||||
|
if docker ps --filter "name=euchre-camp-app" --format "{{.Status}}" | grep -q "Up"; then
|
||||||
|
echo "✅ Dev environment successfully deployed with version ${{ steps.version.outputs.new_version }}"
|
||||||
|
else
|
||||||
|
echo "❌ Dev environment deployment failed"
|
||||||
|
docker-compose logs app
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|||||||
@@ -1,25 +0,0 @@
|
|||||||
name: Test
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- '**'
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
unit-tests:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
container:
|
|
||||||
image: node:20-alpine
|
|
||||||
options: --user root
|
|
||||||
# Skip if this is an auto-generated version bump commit (handled by release workflow)
|
|
||||||
if: "!contains(github.event.head_commit.message, 'chore: bump version')"
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout code
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Install dependencies
|
|
||||||
run: npm ci
|
|
||||||
|
|
||||||
- name: Run unit tests
|
|
||||||
run: npm run test:run
|
|
||||||
+8
-1
@@ -34,7 +34,14 @@ yarn-error.log*
|
|||||||
.pnpm-debug.log*
|
.pnpm-debug.log*
|
||||||
|
|
||||||
# env files (can opt-in for committing if needed)
|
# env files (can opt-in for committing if needed)
|
||||||
.env*
|
.env
|
||||||
|
.env.local
|
||||||
|
.env.development.local
|
||||||
|
.env.test.local
|
||||||
|
.env.production.local
|
||||||
|
# Allow example env files to be tracked
|
||||||
|
!.env.example
|
||||||
|
!.env.development.example
|
||||||
|
|
||||||
# vercel
|
# vercel
|
||||||
.vercel
|
.vercel
|
||||||
|
|||||||
@@ -9,11 +9,12 @@ EuchreCamp is a Next.js 14+ application for managing Euchre tournaments and trac
|
|||||||
### Key Technologies
|
### Key Technologies
|
||||||
- **Next.js 14+** (App Router)
|
- **Next.js 14+** (App Router)
|
||||||
- **TypeScript**
|
- **TypeScript**
|
||||||
- **Prisma ORM** (SQLite)
|
- **Prisma ORM** (SQLite/PostgreSQL)
|
||||||
- **Tailwind CSS**
|
- **Tailwind CSS**
|
||||||
- **Better Auth** (Authentication)
|
- **Better Auth** (Authentication)
|
||||||
- **Vitest** (Unit Testing)
|
- **Bun** (Package Manager & Test Runner)
|
||||||
- **Playwright** (Acceptance Testing)
|
- **Playwright** (Acceptance Testing)
|
||||||
|
- **Vitest** (Legacy - migrated to Bun test runner)
|
||||||
|
|
||||||
## Architecture Patterns
|
## Architecture Patterns
|
||||||
|
|
||||||
@@ -37,13 +38,55 @@ EuchreCamp is a Next.js 14+ application for managing Euchre tournaments and trac
|
|||||||
|
|
||||||
## Common Tasks
|
## Common Tasks
|
||||||
|
|
||||||
|
### Package Manager: Bun
|
||||||
|
|
||||||
|
This project uses **Bun** as the package manager and test runner:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Install dependencies
|
||||||
|
bun install
|
||||||
|
|
||||||
|
# Run development server
|
||||||
|
bun run dev
|
||||||
|
|
||||||
|
# Build the application
|
||||||
|
bun run build
|
||||||
|
|
||||||
|
# Run unit/component tests
|
||||||
|
bun test
|
||||||
|
|
||||||
|
# Run unit tests only
|
||||||
|
bun run test:unit
|
||||||
|
|
||||||
|
# Run component tests only
|
||||||
|
bun run test:component
|
||||||
|
|
||||||
|
# Run acceptance tests (Playwright)
|
||||||
|
bun run test:acceptance
|
||||||
|
|
||||||
|
# Run linting
|
||||||
|
bun run lint
|
||||||
|
```
|
||||||
|
|
||||||
|
**Note**: E2E tests still use Playwright, as Bun's test runner doesn't support browser automation. Unit and component tests have been migrated to Bun's native test runner for faster execution. E2E tests are located in the `e2e/` directory (not `src/__tests__/e2e/`).
|
||||||
|
|
||||||
|
### CI/CD with Bun
|
||||||
|
|
||||||
|
All CI/CD workflows have been updated to use Bun:
|
||||||
|
|
||||||
|
- **Dockerfile**: Uses `oven/bun:alpine` base image for all stages
|
||||||
|
- **PR Workflow**: Uses `oven/setup-bun` action and `bun install`, `bun test`
|
||||||
|
- **Release Workflow**: Uses Bun for version bumping and Docker builds
|
||||||
|
|
||||||
|
**Note**: The `test.yml` workflow has been removed as it's redundant with the PR workflow.
|
||||||
|
|
||||||
### Admin User Creation
|
### Admin User Creation
|
||||||
|
|
||||||
To create an admin user, use the provided scripts:
|
To create an admin user, use the provided scripts:
|
||||||
|
|
||||||
**Option 1: Using Better Auth API (Recommended)**
|
**Option 1: Using Better Auth API (Recommended)**
|
||||||
```bash
|
```bash
|
||||||
node scripts/create-admin-via-api.js
|
bun run scripts/create-admin-via-api.js
|
||||||
```
|
```
|
||||||
This creates the admin user `david@dhg.lol` with password `adminadmin` using Better Auth's internal API.
|
This creates the admin user `david@dhg.lol` with password `adminadmin` using Better Auth's internal API.
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,31 @@
|
|||||||
|
## [0.1.4] - 2026-04-02
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- ci: remove acceptance tests and add dev deployment
|
||||||
|
- fix(tests): resolve password validation, csv upload, and admin auth issues
|
||||||
|
- fix(ci): correct playwright config paths and add env example files
|
||||||
|
- fix(ci): use existing PostgreSQL server at dhg.lol
|
||||||
|
- fix(ci): use PostgreSQL in acceptance-tests with dev credentials
|
||||||
|
- feat(ci): build custom Docker images for Gitea Actions compatibility
|
||||||
|
- fix(tests): add @prisma/client mock for test isolation
|
||||||
|
- fix(ci): add prisma generate step to unit-tests job
|
||||||
|
- fix: downgrade ESLint to v8.57.1 for LSP compatibility
|
||||||
|
- fix: improve TypeScript types for better IDE code hinting
|
||||||
|
- feat: migrate to ESLint flat config (eslint.config.js)
|
||||||
|
- Revert "fix: downgrade ESLint to v8.x for .eslintrc.json compatibility"
|
||||||
|
- fix: downgrade ESLint to v8.x for .eslintrc.json compatibility
|
||||||
|
- fix: update PR workflow to exclude e2e tests from unit test phase
|
||||||
|
- fix: avoid global mock clearing in EditTournamentForm tests
|
||||||
|
- fix: avoid global mock clearing in Navigation tests
|
||||||
|
- fix: add DOM cleanup to bun-setup.ts
|
||||||
|
- fix: disable test isolation in bunfig.toml
|
||||||
|
- refactor: improve test structure for Bun compatibility
|
||||||
|
- feat: update CI/CD to use Bun
|
||||||
|
- feat: migrate from npm to Bun
|
||||||
|
- docs: update TODO list with recent fix
|
||||||
|
- fix: add defensive checks to prisma.ts to prevent build failures
|
||||||
|
|
||||||
## [0.1.3] - 2026-04-01
|
## [0.1.3] - 2026-04-01
|
||||||
|
|
||||||
### Patch Changes
|
### Patch Changes
|
||||||
|
|||||||
+13
-13
@@ -1,9 +1,9 @@
|
|||||||
# Multi-stage build for EuchreCamp Next.js application
|
# Multi-stage build for EuchreCamp Next.js application
|
||||||
|
|
||||||
# Stage 1: Builder
|
# Stage 1: Builder
|
||||||
FROM node:20-alpine AS builder
|
FROM oven/bun:alpine AS builder
|
||||||
|
|
||||||
# Install dependencies
|
# Install dependencies (needed for native modules)
|
||||||
RUN apk add --no-cache python3 make g++
|
RUN apk add --no-cache python3 make g++
|
||||||
|
|
||||||
# Set working directory
|
# Set working directory
|
||||||
@@ -13,21 +13,21 @@ WORKDIR /app
|
|||||||
COPY package*.json ./
|
COPY package*.json ./
|
||||||
|
|
||||||
# Install dependencies (including dev dependencies for building)
|
# Install dependencies (including dev dependencies for building)
|
||||||
RUN npm ci
|
RUN bun install
|
||||||
|
|
||||||
# Copy source code
|
# Copy source code
|
||||||
COPY . .
|
COPY . .
|
||||||
|
|
||||||
# Generate Prisma client (with dummy PostgreSQL DATABASE_URL for build-time generation)
|
# Generate Prisma client (with dummy PostgreSQL DATABASE_URL for build-time generation)
|
||||||
# Note: A dummy URL is used since the real database is not available during build
|
# Note: A dummy URL is used since the real database is not available during build
|
||||||
RUN DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" npx prisma generate
|
RUN DATABASE_PROVIDER=postgresql DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" bun x prisma generate
|
||||||
|
|
||||||
# Build the application (with dummy DATABASE_URL for static page generation and git commit)
|
# Build the application (with dummy DATABASE_URL for static page generation and git commit)
|
||||||
ARG GIT_COMMIT=unknown
|
ARG GIT_COMMIT=unknown
|
||||||
RUN DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" NEXT_PUBLIC_GIT_COMMIT=$GIT_COMMIT npm run build
|
RUN DATABASE_PROVIDER=postgresql DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" NEXT_PUBLIC_GIT_COMMIT=$GIT_COMMIT bun run build
|
||||||
|
|
||||||
# Stage 2: Test runner (includes dev dependencies for testing)
|
# Stage 2: Test runner (includes dev dependencies for testing)
|
||||||
FROM node:20-alpine AS test-runner
|
FROM oven/bun:alpine AS test-runner
|
||||||
|
|
||||||
# Install dependencies
|
# Install dependencies
|
||||||
RUN apk add --no-cache python3 make g++ git
|
RUN apk add --no-cache python3 make g++ git
|
||||||
@@ -39,16 +39,16 @@ WORKDIR /app
|
|||||||
COPY package*.json ./
|
COPY package*.json ./
|
||||||
|
|
||||||
# Install ALL dependencies (including dev dependencies for testing)
|
# Install ALL dependencies (including dev dependencies for testing)
|
||||||
RUN npm ci
|
RUN bun install
|
||||||
|
|
||||||
# Copy source code
|
# Copy source code
|
||||||
COPY . .
|
COPY . .
|
||||||
|
|
||||||
# Generate Prisma client
|
# Generate Prisma client
|
||||||
RUN DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" npx prisma generate
|
RUN DATABASE_PROVIDER=postgresql DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" bun x prisma generate
|
||||||
|
|
||||||
# Stage 3: Production runner
|
# Stage 3: Production runner
|
||||||
FROM node:20-alpine AS runner
|
FROM oven/bun:alpine AS runner
|
||||||
|
|
||||||
# Install dumb-init for proper signal handling
|
# Install dumb-init for proper signal handling
|
||||||
RUN apk add --no-cache dumb-init
|
RUN apk add --no-cache dumb-init
|
||||||
@@ -64,15 +64,15 @@ WORKDIR /app
|
|||||||
COPY --from=builder --chown=euchre:euchre /app/.next ./.next
|
COPY --from=builder --chown=euchre:euchre /app/.next ./.next
|
||||||
COPY --from=builder --chown=euchre:euchre /app/public ./public
|
COPY --from=builder --chown=euchre:euchre /app/public ./public
|
||||||
COPY --from=builder --chown=euchre:euchre /app/package.json ./package.json
|
COPY --from=builder --chown=euchre:euchre /app/package.json ./package.json
|
||||||
COPY --from=builder --chown=euchre:euchre /app/package-lock.json ./package-lock.json
|
COPY --from=builder --chown=euchre:euchre /app/bun.lock ./bun.lock
|
||||||
COPY --from=builder --chown=euchre:euchre /app/prisma ./prisma
|
COPY --from=builder --chown=euchre:euchre /app/prisma ./prisma
|
||||||
|
|
||||||
# Install only production dependencies
|
# Install only production dependencies
|
||||||
RUN npm ci --omit=dev
|
RUN bun install --production
|
||||||
|
|
||||||
# Generate Prisma client
|
# Generate Prisma client
|
||||||
# Note: We need to set DATABASE_URL even for generation because prisma.config.ts requires it
|
# Note: We need to set DATABASE_URL even for generation because prisma.config.ts requires it
|
||||||
RUN DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" npx prisma generate
|
RUN DATABASE_PROVIDER=postgresql DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" bun x prisma generate
|
||||||
|
|
||||||
# Switch to non-root user
|
# Switch to non-root user
|
||||||
USER euchre
|
USER euchre
|
||||||
@@ -86,4 +86,4 @@ HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
|
|||||||
|
|
||||||
# Start command
|
# Start command
|
||||||
ENTRYPOINT ["dumb-init", "--"]
|
ENTRYPOINT ["dumb-init", "--"]
|
||||||
CMD ["npm", "start"]
|
CMD ["bun", "run", "start"]
|
||||||
|
|||||||
@@ -0,0 +1,32 @@
|
|||||||
|
# Base CI image with Bun, Node.js, Playwright, and build tools
|
||||||
|
# Used for Gitea Actions CI workflows
|
||||||
|
# Uses Microsoft Playwright image as base (Ubuntu-based) with Bun added
|
||||||
|
|
||||||
|
FROM mcr.microsoft.com/playwright:v1.58.0-jammy AS base
|
||||||
|
|
||||||
|
# Install unzip (required for Bun installation) and other tools
|
||||||
|
RUN apt-get update && apt-get install -y unzip && rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
# Install Bun (latest version)
|
||||||
|
# Note: The playwright image already has Node.js pre-installed
|
||||||
|
RUN curl -fsSL https://bun.sh/install | bash
|
||||||
|
|
||||||
|
# Add Bun to PATH for subsequent commands
|
||||||
|
ENV PATH="/root/.bun/bin:$PATH"
|
||||||
|
|
||||||
|
# Verify installations
|
||||||
|
RUN echo "=== Bun Version ===" && bun --version && \
|
||||||
|
echo "=== Node.js Version ===" && node --version && \
|
||||||
|
echo "=== Playwright Version ===" && bun x playwright --version
|
||||||
|
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
# Set default environment variables
|
||||||
|
ENV DATABASE_PROVIDER=sqlite
|
||||||
|
ENV DATABASE_URL=file:./prisma/ci.db
|
||||||
|
ENV BETTER_AUTH_SECRET=test-secret-key-for-ci-only
|
||||||
|
ENV NODE_ENV=test
|
||||||
|
|
||||||
|
# Health check command (can be overridden)
|
||||||
|
HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
|
||||||
|
CMD bun --version
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
[test]
|
||||||
|
preload = ["./src/__tests__/bun-setup.ts"]
|
||||||
|
exclude = ["e2e/**", "**/e2e/**"]
|
||||||
|
# isolation = true
|
||||||
+1
-1
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: euchre-camp/euchre-camp:0.1.0.dev
|
image: docker.notsosm.art/euchre-camp:0.1.0.dev
|
||||||
container_name: euchre-camp-app
|
container_name: euchre-camp-app
|
||||||
ports:
|
ports:
|
||||||
- "3000:3000"
|
- "3000:3000"
|
||||||
|
|||||||
@@ -30,6 +30,23 @@
|
|||||||
- [ ] Update MatchEditor to use tournament-specific target score
|
- [ ] Update MatchEditor to use tournament-specific target score
|
||||||
- [ ] Run tests and verify variant scoring implementation
|
- [ ] Run tests and verify variant scoring implementation
|
||||||
|
|
||||||
|
### Recently Completed ✅
|
||||||
|
- [x] Update CI/CD workflows to use Bun (PR, release)
|
||||||
|
- [x] Update Dockerfile to use Bun Alpine image
|
||||||
|
- [x] Update PR workflow to use Bun
|
||||||
|
- [x] Update Release workflow to use Bun
|
||||||
|
- [x] Remove test.yml workflow (redundant)
|
||||||
|
- [x] Verify Docker build with Bun
|
||||||
|
|
||||||
|
### Recently Completed ✅
|
||||||
|
- [x] Fix Prisma build error in CI pipeline (Docker build failure due to missing DATABASE_URL validation)
|
||||||
|
- [x] Add defensive checks to src/lib/prisma.ts to prevent build failures
|
||||||
|
- [x] Migrate from npm to Bun package manager
|
||||||
|
- [x] Migrate unit tests (Vitest → Bun test runner)
|
||||||
|
- [x] Migrate component tests (Vitest → Bun test runner)
|
||||||
|
- [x] Configure Bun with DOM environment for React Testing Library
|
||||||
|
- [x] Keep Playwright for E2E tests (hybrid approach)
|
||||||
|
|
||||||
### Recently Completed ✅
|
### Recently Completed ✅
|
||||||
- [x] Add OpenSkill rating system support (src/lib/openskill-utils.ts)
|
- [x] Add OpenSkill rating system support (src/lib/openskill-utils.ts)
|
||||||
- [x] Add Glicko2 rating system support (src/lib/glicko2-utils.ts)
|
- [x] Add Glicko2 rating system support (src/lib/glicko2-utils.ts)
|
||||||
|
|||||||
+3
-3
@@ -79,7 +79,7 @@ test.describe('CSV Upload Player Deduplication', () => {
|
|||||||
formData.append('eventId', testTournamentId.toString());
|
formData.append('eventId', testTournamentId.toString());
|
||||||
|
|
||||||
const response = await request.post('http://localhost:3000/api/matches/upload', {
|
const response = await request.post('http://localhost:3000/api/matches/upload', {
|
||||||
data: formData,
|
multipart: formData,
|
||||||
});
|
});
|
||||||
|
|
||||||
expect(response.ok()).toBeTruthy();
|
expect(response.ok()).toBeTruthy();
|
||||||
@@ -133,7 +133,7 @@ test.describe('CSV Upload Player Deduplication', () => {
|
|||||||
formData.append('eventId', testTournamentId.toString());
|
formData.append('eventId', testTournamentId.toString());
|
||||||
|
|
||||||
const response = await request.post('http://localhost:3000/api/matches/upload', {
|
const response = await request.post('http://localhost:3000/api/matches/upload', {
|
||||||
data: formData,
|
multipart: formData,
|
||||||
});
|
});
|
||||||
|
|
||||||
expect(response.ok()).toBeTruthy();
|
expect(response.ok()).toBeTruthy();
|
||||||
@@ -190,7 +190,7 @@ test.describe('CSV Upload Player Deduplication', () => {
|
|||||||
formData.append('eventId', testTournamentId.toString());
|
formData.append('eventId', testTournamentId.toString());
|
||||||
|
|
||||||
const response = await request.post('http://localhost:3000/api/matches/upload', {
|
const response = await request.post('http://localhost:3000/api/matches/upload', {
|
||||||
data: formData,
|
multipart: formData,
|
||||||
});
|
});
|
||||||
|
|
||||||
expect(response.ok()).toBeTruthy();
|
expect(response.ok()).toBeTruthy();
|
||||||
@@ -0,0 +1,257 @@
|
|||||||
|
/**
|
||||||
|
* Issue #7: Schedule Tab
|
||||||
|
* Acceptance Test: Schedule Generation and Display
|
||||||
|
*
|
||||||
|
* User Story: As a tournament admin, I want a Schedule tab to view round matchups
|
||||||
|
*
|
||||||
|
* Acceptance Criteria:
|
||||||
|
* - Schedule tab added to tournament detail page
|
||||||
|
* - Displays round-robin schedule with round numbers
|
||||||
|
* - Round-robin schedule can be generated from teams
|
||||||
|
* - Matches are linkable to result entry
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { test, expect } from '@playwright/test';
|
||||||
|
import { prisma } from '@/lib/prisma';
|
||||||
|
|
||||||
|
function getTestCredentials() {
|
||||||
|
const timestamp = Date.now();
|
||||||
|
return {
|
||||||
|
email: `schedule-admin-${timestamp}@example.com`,
|
||||||
|
password: 'AdminPassword123!',
|
||||||
|
name: `Schedule Admin ${timestamp}`,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
test.describe.serial('Issue #7: Schedule Tab', () => {
|
||||||
|
let testEmail: string;
|
||||||
|
let testPassword: string;
|
||||||
|
let tournamentId: number;
|
||||||
|
let teamIds: number[] = [];
|
||||||
|
|
||||||
|
test.beforeAll(async () => {
|
||||||
|
const credentials = getTestCredentials();
|
||||||
|
testEmail = credentials.email;
|
||||||
|
testPassword = credentials.password;
|
||||||
|
|
||||||
|
// Create admin user via API
|
||||||
|
const response = await fetch('http://localhost:3000/api/auth/sign-up/email', {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
Origin: 'http://localhost:3000',
|
||||||
|
},
|
||||||
|
body: JSON.stringify({
|
||||||
|
email: testEmail,
|
||||||
|
password: testPassword,
|
||||||
|
name: credentials.name,
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
|
||||||
|
console.log('Schedule test user creation response:', response.status);
|
||||||
|
|
||||||
|
// Update user to club_admin role
|
||||||
|
const user = await prisma.user.findUnique({
|
||||||
|
where: { email: testEmail },
|
||||||
|
});
|
||||||
|
if (user) {
|
||||||
|
await prisma.user.update({
|
||||||
|
where: { id: user.id },
|
||||||
|
data: { role: 'club_admin' },
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create players for teams
|
||||||
|
const players = await Promise.all([
|
||||||
|
prisma.player.create({
|
||||||
|
data: { name: 'Alice', normalizedName: 'alice' },
|
||||||
|
}),
|
||||||
|
prisma.player.create({
|
||||||
|
data: { name: 'Bob', normalizedName: 'bob' },
|
||||||
|
}),
|
||||||
|
prisma.player.create({
|
||||||
|
data: { name: 'Charlie', normalizedName: 'charlie' },
|
||||||
|
}),
|
||||||
|
prisma.player.create({
|
||||||
|
data: { name: 'Diana', normalizedName: 'diana' },
|
||||||
|
}),
|
||||||
|
]);
|
||||||
|
|
||||||
|
// Create tournament
|
||||||
|
const tournament = await prisma.event.create({
|
||||||
|
data: {
|
||||||
|
name: `Schedule Test Tournament ${Date.now()}`,
|
||||||
|
format: 'round_robin',
|
||||||
|
ownerId: user?.id,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
tournamentId = tournament.id;
|
||||||
|
|
||||||
|
// Create teams
|
||||||
|
const teams = await Promise.all([
|
||||||
|
prisma.team.create({
|
||||||
|
data: {
|
||||||
|
eventId: tournamentId,
|
||||||
|
player1Id: players[0].id,
|
||||||
|
player2Id: players[1].id,
|
||||||
|
teamName: 'Team A',
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
prisma.team.create({
|
||||||
|
data: {
|
||||||
|
eventId: tournamentId,
|
||||||
|
player1Id: players[2].id,
|
||||||
|
player2Id: players[3].id,
|
||||||
|
teamName: 'Team B',
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
]);
|
||||||
|
teamIds = teams.map((t) => t.id);
|
||||||
|
|
||||||
|
// Register participants
|
||||||
|
await Promise.all(
|
||||||
|
players.map((player) =>
|
||||||
|
prisma.eventParticipant.create({
|
||||||
|
data: {
|
||||||
|
eventId: tournamentId,
|
||||||
|
playerId: player.id,
|
||||||
|
teamId: teams.find(
|
||||||
|
(t) => t.player1Id === player.id || t.player2Id === player.id
|
||||||
|
)?.id,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
)
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
test.afterAll(async () => {
|
||||||
|
try {
|
||||||
|
// Clean up schedule data
|
||||||
|
if (tournamentId) {
|
||||||
|
await prisma.bracketMatchup.deleteMany({ where: { eventId: tournamentId } });
|
||||||
|
await prisma.tournamentRound.deleteMany({ where: { eventId: tournamentId } });
|
||||||
|
await prisma.eventParticipant.deleteMany({ where: { eventId: tournamentId } });
|
||||||
|
await prisma.team.deleteMany({ where: { eventId: tournamentId } });
|
||||||
|
await prisma.event.delete({ where: { id: tournamentId } }).catch(() => {});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Clean up user
|
||||||
|
const user = await prisma.user.findUnique({ where: { email: testEmail } });
|
||||||
|
if (user) {
|
||||||
|
await prisma.user.delete({ where: { id: user.id } });
|
||||||
|
}
|
||||||
|
|
||||||
|
// Clean up players
|
||||||
|
await prisma.player.deleteMany({
|
||||||
|
where: { normalizedName: { in: ['alice', 'bob', 'charlie', 'diana'] } },
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Cleanup error:', error);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test('Schedule tab link exists on tournament detail page', async ({ page }) => {
|
||||||
|
// Login
|
||||||
|
await page.goto('http://localhost:3000/auth/login');
|
||||||
|
await page.fill('input[name="email"]', testEmail);
|
||||||
|
await page.fill('input[name="password"]', testPassword);
|
||||||
|
await page.click('button[type="submit"]');
|
||||||
|
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
||||||
|
|
||||||
|
// Navigate to tournament detail
|
||||||
|
await page.goto(`http://localhost:3000/admin/tournaments/${tournamentId}`);
|
||||||
|
|
||||||
|
// Check Schedule tab link exists
|
||||||
|
const scheduleLink = page.locator('a', { hasText: 'Schedule' });
|
||||||
|
await expect(scheduleLink).toBeVisible();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('Schedule page loads with no schedule message', async ({ page }) => {
|
||||||
|
// Login
|
||||||
|
await page.goto('http://localhost:3000/auth/login');
|
||||||
|
await page.fill('input[name="email"]', testEmail);
|
||||||
|
await page.fill('input[name="password"]', testPassword);
|
||||||
|
await page.click('button[type="submit"]');
|
||||||
|
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
||||||
|
|
||||||
|
// Navigate to schedule page
|
||||||
|
await page.goto(`http://localhost:3000/admin/tournaments/${tournamentId}/schedule`);
|
||||||
|
|
||||||
|
// Check page content
|
||||||
|
await expect(page.locator('h1')).toContainText('Tournament Schedule');
|
||||||
|
await expect(page.locator('text=No Schedule Generated')).toBeVisible();
|
||||||
|
await expect(page.locator('button', { hasText: 'Generate Schedule' })).toBeVisible();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('Generate schedule creates rounds and matchups', async ({ page }) => {
|
||||||
|
// Login
|
||||||
|
await page.goto('http://localhost:3000/auth/login');
|
||||||
|
await page.fill('input[name="email"]', testEmail);
|
||||||
|
await page.fill('input[name="password"]', testPassword);
|
||||||
|
await page.click('button[type="submit"]');
|
||||||
|
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
||||||
|
|
||||||
|
// Navigate to schedule page
|
||||||
|
await page.goto(`http://localhost:3000/admin/tournaments/${tournamentId}/schedule`);
|
||||||
|
|
||||||
|
// Click generate schedule
|
||||||
|
await page.click('button:has-text("Generate Schedule")');
|
||||||
|
|
||||||
|
// Wait for success message or page reload
|
||||||
|
await page.waitForTimeout(3000);
|
||||||
|
|
||||||
|
// Verify rounds were created in database
|
||||||
|
const rounds = await prisma.tournamentRound.findMany({
|
||||||
|
where: { eventId: tournamentId },
|
||||||
|
});
|
||||||
|
expect(rounds.length).toBeGreaterThan(0);
|
||||||
|
|
||||||
|
// Verify matchups were created
|
||||||
|
const matchups = await prisma.bracketMatchup.findMany({
|
||||||
|
where: { eventId: tournamentId },
|
||||||
|
});
|
||||||
|
expect(matchups.length).toBeGreaterThan(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('Schedule page displays generated rounds and matchups', async ({ page }) => {
|
||||||
|
// Login
|
||||||
|
await page.goto('http://localhost:3000/auth/login');
|
||||||
|
await page.fill('input[name="email"]', testEmail);
|
||||||
|
await page.fill('input[name="password"]', testPassword);
|
||||||
|
await page.click('button[type="submit"]');
|
||||||
|
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
||||||
|
|
||||||
|
// Navigate to schedule page
|
||||||
|
await page.goto(`http://localhost:3000/admin/tournaments/${tournamentId}/schedule`);
|
||||||
|
|
||||||
|
// Check that rounds are displayed
|
||||||
|
await expect(page.locator('text=Round 1')).toBeVisible();
|
||||||
|
|
||||||
|
// Check that team names are displayed
|
||||||
|
await expect(page.locator('text=Alice + Bob')).toBeVisible();
|
||||||
|
await expect(page.locator('text=Charlie + Diana')).toBeVisible();
|
||||||
|
|
||||||
|
// Check that "Enter Result" link exists for pending matchups
|
||||||
|
await expect(page.locator('a:has-text("Enter Result")')).toBeVisible();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('Schedule API returns rounds with matchups', async ({ page }) => {
|
||||||
|
// Login
|
||||||
|
await page.goto('http://localhost:3000/auth/login');
|
||||||
|
await page.fill('input[name="email"]', testEmail);
|
||||||
|
await page.fill('input[name="password"]', testPassword);
|
||||||
|
await page.click('button[type="submit"]');
|
||||||
|
await page.waitForURL(/\/(admin|players)/, { timeout: 10000 });
|
||||||
|
|
||||||
|
// Call the schedule API
|
||||||
|
const response = await page.request.get(
|
||||||
|
`http://localhost:3000/api/tournaments/${tournamentId}/schedule`
|
||||||
|
);
|
||||||
|
expect(response.ok()).toBe(true);
|
||||||
|
|
||||||
|
const data = await response.json();
|
||||||
|
expect(data.rounds).toBeDefined();
|
||||||
|
expect(data.rounds.length).toBeGreaterThan(0);
|
||||||
|
expect(data.rounds[0].bracketMatchups).toBeDefined();
|
||||||
|
});
|
||||||
|
});
|
||||||
+3
-3
@@ -41,7 +41,7 @@ test.describe('Tournament Edit - allowTies functionality', () => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
test('should display allowTies checkbox on edit form', async ({ page }) => {
|
test('should display allowTies checkbox on edit form @chromium-admin', async ({ page }) => {
|
||||||
// Navigate to tournament edit page
|
// Navigate to tournament edit page
|
||||||
await page.goto(`/admin/tournaments/${tournamentId}/edit`);
|
await page.goto(`/admin/tournaments/${tournamentId}/edit`);
|
||||||
|
|
||||||
@@ -54,7 +54,7 @@ test.describe('Tournament Edit - allowTies functionality', () => {
|
|||||||
await expect(allowTiesCheckbox).not.toBeChecked();
|
await expect(allowTiesCheckbox).not.toBeChecked();
|
||||||
});
|
});
|
||||||
|
|
||||||
test('should save allowTies when toggled to true', async ({ page }) => {
|
test('should save allowTies when toggled to true @chromium-admin', async ({ page }) => {
|
||||||
// Navigate to tournament edit page
|
// Navigate to tournament edit page
|
||||||
await page.goto(`/admin/tournaments/${tournamentId}/edit`);
|
await page.goto(`/admin/tournaments/${tournamentId}/edit`);
|
||||||
|
|
||||||
@@ -80,7 +80,7 @@ test.describe('Tournament Edit - allowTies functionality', () => {
|
|||||||
expect(updatedTournament?.allowTies).toBe(true);
|
expect(updatedTournament?.allowTies).toBe(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('should save allowTies when toggled to false', async ({ page }) => {
|
test('should save allowTies when toggled to false @chromium-admin', async ({ page }) => {
|
||||||
// First, set allowTies to true
|
// First, set allowTies to true
|
||||||
await prisma.event.update({
|
await prisma.event.update({
|
||||||
where: { id: tournamentId },
|
where: { id: tournamentId },
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
[tools]
|
[tools]
|
||||||
|
bun = "latest"
|
||||||
docker-compose = "latest"
|
docker-compose = "latest"
|
||||||
just = "latest"
|
just = "latest"
|
||||||
node = "latest"
|
node = "latest"
|
||||||
|
|||||||
+30
-24
@@ -1,38 +1,42 @@
|
|||||||
{
|
{
|
||||||
"name": "euchre_camp",
|
"name": "euchre_camp",
|
||||||
"version": "0.1.3",
|
"version": "0.1.4",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "NEXT_PUBLIC_GIT_COMMIT=$(git rev-parse --short HEAD) next dev",
|
"dev": "NEXT_PUBLIC_GIT_COMMIT=$(git rev-parse --short HEAD) next dev",
|
||||||
"build": "next build",
|
"build": "next build",
|
||||||
"start": "next start",
|
"start": "next start",
|
||||||
"lint": "eslint",
|
"lint": "bun run eslint",
|
||||||
"test": "vitest",
|
"test": "bun test 'src/__tests__/unit/**' 'src/__tests__/*.test.tsx' 'src/__tests__/auth-simple.test.ts'",
|
||||||
"test:run": "vitest run",
|
"test:unit": "bun test src/__tests__/unit/",
|
||||||
"test:acceptance": "playwright test src/__tests__/e2e/",
|
"test:component": "bun test src/__tests__/*.test.tsx",
|
||||||
"test:acceptance:headed": "playwright test src/__tests__/e2e/ --headed",
|
"test:run": "bun test 'src/__tests__/unit/**' 'src/__tests__/*.test.tsx' 'src/__tests__/auth-simple.test.ts'",
|
||||||
"db:switch": "node scripts/switch-database.js",
|
"test:randomize": "bun test src/__tests__/unit/ --randomize",
|
||||||
"db:setup-postgres": "node scripts/setup-postgres.js",
|
"test:unit:sequential": "bun test src/__tests__/unit/ --max-concurrency=1",
|
||||||
"db:setup-dev": "node scripts/setup-postgres.js",
|
"test:acceptance": "bun x playwright test e2e/",
|
||||||
"db:setup-dev:clean": "node scripts/setup-postgres.js --drop",
|
"test:acceptance:headed": "bun x playwright test e2e/ --headed",
|
||||||
"db:reset-dev": "node scripts/reset-dev-db.js",
|
"db:switch": "bun run scripts/switch-database.js",
|
||||||
"db:use-dev": "node scripts/use-dev-db.js",
|
"db:setup-postgres": "bun run scripts/setup-postgres.js",
|
||||||
"db:cleanup-prod": "node scripts/cleanup-prod-db.js",
|
"db:setup-dev": "bun run scripts/setup-postgres.js",
|
||||||
"db:check-prod": "node scripts/check-test-records.js",
|
"db:setup-dev:clean": "bun run scripts/setup-postgres.js --drop",
|
||||||
"db:seed": "node scripts/seed.js",
|
"db:reset-dev": "bun run scripts/reset-dev-db.js",
|
||||||
|
"db:use-dev": "bun run scripts/use-dev-db.js",
|
||||||
|
"db:cleanup-prod": "bun run scripts/cleanup-prod-db.js",
|
||||||
|
"db:check-prod": "bun run scripts/check-test-records.js",
|
||||||
|
"db:seed": "bun run scripts/seed.js",
|
||||||
"docker:up": "docker-compose up -d",
|
"docker:up": "docker-compose up -d",
|
||||||
"docker:down": "docker-compose down",
|
"docker:down": "docker-compose down",
|
||||||
"docker:logs": "docker-compose logs -f",
|
"docker:logs": "docker-compose logs -f",
|
||||||
"docker:build": "docker-compose build",
|
"docker:build": "docker-compose build",
|
||||||
"docker:shell": "docker exec -it euchre-camp-app sh",
|
"docker:shell": "docker exec -it euchre-camp-app sh",
|
||||||
"version": "node scripts/bump-version.js",
|
"version": "bun run scripts/bump-version.js",
|
||||||
"set-version": "node scripts/set-version.js",
|
"set-version": "bun run scripts/set-version.js",
|
||||||
"version:patch": "node scripts/bump-version.js patch",
|
"version:patch": "bun run scripts/bump-version.js patch",
|
||||||
"version:minor": "node scripts/bump-version.js minor",
|
"version:minor": "bun run scripts/bump-version.js minor",
|
||||||
"version:major": "node scripts/bump-version.js major",
|
"version:major": "bun run scripts/bump-version.js major",
|
||||||
"docker:build:push": "node scripts/build-and-push-docker.js",
|
"docker:build:push": "bun run scripts/build-and-push-docker.js",
|
||||||
"docker:compose:generate": "node scripts/generate-docker-compose.js",
|
"docker:compose:generate": "bun run scripts/generate-docker-compose.js",
|
||||||
"release": "npm run version:patch && npm run docker:compose:generate && npm run docker:build:push"
|
"release": "bun run version:patch && bun run docker:compose:generate && bun run docker:build:push"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@hookform/resolvers": "^5.2.2",
|
"@hookform/resolvers": "^5.2.2",
|
||||||
@@ -61,6 +65,8 @@
|
|||||||
"@testing-library/react": "^16.3.2",
|
"@testing-library/react": "^16.3.2",
|
||||||
"@testing-library/user-event": "^14.6.1",
|
"@testing-library/user-event": "^14.6.1",
|
||||||
"@types/bcrypt": "^6.0.0",
|
"@types/bcrypt": "^6.0.0",
|
||||||
|
"@types/bun": "^1.3.11",
|
||||||
|
"@types/jsdom": "^28.0.1",
|
||||||
"@types/node": "^20",
|
"@types/node": "^20",
|
||||||
"@types/papaparse": "^5.5.2",
|
"@types/papaparse": "^5.5.2",
|
||||||
"@types/pg": "^8.20.0",
|
"@types/pg": "^8.20.0",
|
||||||
@@ -68,7 +74,7 @@
|
|||||||
"@types/react-dom": "^19.2.3",
|
"@types/react-dom": "^19.2.3",
|
||||||
"@vitejs/plugin-react": "^6.0.1",
|
"@vitejs/plugin-react": "^6.0.1",
|
||||||
"argon2": "^0.44.0",
|
"argon2": "^0.44.0",
|
||||||
"eslint": "^10.1.0",
|
"eslint": "^8.57.0",
|
||||||
"eslint-config-next": "^16.2.1",
|
"eslint-config-next": "^16.2.1",
|
||||||
"jsdom": "^29.0.1",
|
"jsdom": "^29.0.1",
|
||||||
"tailwindcss": "^4",
|
"tailwindcss": "^4",
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { defineConfig, devices } from '@playwright/test';
|
import { defineConfig, devices } from '@playwright/test';
|
||||||
|
|
||||||
export default defineConfig({
|
export default defineConfig({
|
||||||
testDir: './src/__tests__/e2e',
|
testDir: './e2e',
|
||||||
timeout: 30000,
|
timeout: 30000,
|
||||||
expect: {
|
expect: {
|
||||||
timeout: 5000
|
timeout: 5000
|
||||||
@@ -17,7 +17,7 @@ export default defineConfig({
|
|||||||
// Reporter to use
|
// Reporter to use
|
||||||
reporter: 'html',
|
reporter: 'html',
|
||||||
// Global setup and teardown
|
// Global setup and teardown
|
||||||
globalSetup: require.resolve('./src/__tests__/e2e/global.setup'),
|
globalSetup: require.resolve('./e2e/global.setup'),
|
||||||
// Use base URL for relative navigation
|
// Use base URL for relative navigation
|
||||||
use: {
|
use: {
|
||||||
baseURL: 'http://localhost:3000',
|
baseURL: 'http://localhost:3000',
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ const path = require('path');
|
|||||||
const { execSync } = require('child_process');
|
const { execSync } = require('child_process');
|
||||||
|
|
||||||
// Configuration
|
// Configuration
|
||||||
const REGISTRY = 'euchre-camp';
|
const REGISTRY = 'docker.notsosm.art';
|
||||||
const IMAGE_NAME = 'euchre-camp';
|
const IMAGE_NAME = 'euchre-camp';
|
||||||
|
|
||||||
// Get current version from package.json
|
// Get current version from package.json
|
||||||
|
|||||||
@@ -1,25 +1,25 @@
|
|||||||
import { describe, it, expect, vi, beforeEach, MockedFunction } from 'vitest'
|
import { describe, it, expect, mock, beforeEach } from 'bun:test'
|
||||||
import { render, screen, waitFor } from '@testing-library/react'
|
import { render, screen, waitFor } from '@testing-library/react'
|
||||||
import userEvent from '@testing-library/user-event'
|
import userEvent from '@testing-library/user-event'
|
||||||
import EditTournamentForm from '@/components/EditTournamentForm'
|
import EditTournamentForm from '@/components/EditTournamentForm'
|
||||||
|
|
||||||
// Mock next/navigation
|
// Mock next/navigation
|
||||||
vi.mock('next/navigation', () => ({
|
mock.module('next/navigation', () => ({
|
||||||
useRouter: () => ({
|
useRouter: () => ({
|
||||||
push: vi.fn(),
|
push: mock(() => {}),
|
||||||
}),
|
}),
|
||||||
}))
|
}))
|
||||||
|
|
||||||
// Mock next/link
|
// Mock next/link
|
||||||
vi.mock('next/link', () => ({
|
mock.module('next/link', () => ({
|
||||||
default: ({ children, href }: { children: React.ReactNode; href: string }) => (
|
default: ({ children, href }: { children: React.ReactNode; href: string }) => (
|
||||||
<a href={href}>{children}</a>
|
<a href={href}>{children}</a>
|
||||||
),
|
),
|
||||||
}))
|
}))
|
||||||
|
|
||||||
// Mock fetch
|
// Mock fetch
|
||||||
const mockFetch = vi.fn()
|
const mockFetch = mock(async () => new Response())
|
||||||
global.fetch = mockFetch as MockedFunction<typeof global.fetch>
|
global.fetch = mockFetch as any
|
||||||
|
|
||||||
const mockTournament = {
|
const mockTournament = {
|
||||||
id: 1,
|
id: 1,
|
||||||
@@ -40,7 +40,8 @@ const mockTournament = {
|
|||||||
|
|
||||||
describe('EditTournamentForm', () => {
|
describe('EditTournamentForm', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
vi.clearAllMocks()
|
// Only clear the specific mocks we create, not global module mocks
|
||||||
|
mockFetch.mockClear()
|
||||||
})
|
})
|
||||||
|
|
||||||
it('renders form with initial values', () => {
|
it('renders form with initial values', () => {
|
||||||
|
|||||||
@@ -5,31 +5,40 @@
|
|||||||
* Tests the navigation component for proper display based on session state
|
* Tests the navigation component for proper display based on session state
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'
|
import { describe, it, expect, mock, beforeEach, afterEach } from 'bun:test'
|
||||||
import { render, screen, waitFor } from '@testing-library/react'
|
import { render, screen, waitFor } from '@testing-library/react'
|
||||||
import Navigation from '@/components/Navigation'
|
import Navigation from '@/components/Navigation'
|
||||||
|
|
||||||
|
// Mock next/link
|
||||||
|
mock.module('next/link', () => ({
|
||||||
|
default: ({ children, href }: { children: React.ReactNode; href: string }) => (
|
||||||
|
<a href={href}>{children}</a>
|
||||||
|
),
|
||||||
|
}))
|
||||||
|
|
||||||
// Mock the SessionProvider
|
// Mock the SessionProvider
|
||||||
vi.mock('@/components/SessionProvider', () => ({
|
mock.module('@/components/SessionProvider', () => ({
|
||||||
useSession: vi.fn(),
|
useSession: mock(() => ({ session: null, loading: false, refreshSession: mock(() => {}) })),
|
||||||
}))
|
}))
|
||||||
|
|
||||||
// Mock the auth-client
|
// Mock the auth-client
|
||||||
vi.mock('@/lib/auth-client', () => ({
|
mock.module('@/lib/auth-client', () => ({
|
||||||
authClient: {
|
authClient: {
|
||||||
signOut: vi.fn(),
|
signOut: mock(() => {}),
|
||||||
},
|
},
|
||||||
}))
|
}))
|
||||||
|
|
||||||
// Mock fetch for role API call
|
// Mock fetch for role API call
|
||||||
global.fetch = vi.fn()
|
global.fetch = mock(async () => new Response()) as any
|
||||||
|
|
||||||
import { useSession } from '@/components/SessionProvider'
|
import { useSession as useSessionOriginal } from '@/components/SessionProvider'
|
||||||
|
const useSession = useSessionOriginal as any
|
||||||
|
|
||||||
describe('Epic 1: Navigation Component', () => {
|
describe('Epic 1: Navigation Component', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
vi.clearAllMocks()
|
// Don't clear all mocks as it might affect bun-setup.ts
|
||||||
vi.mocked(global.fetch).mockImplementation(async (url) => {
|
// Set up default fetch mock
|
||||||
|
(global.fetch as any).mockImplementation?.(async (url: any) => {
|
||||||
if (url?.toString().includes('/api/users/')) {
|
if (url?.toString().includes('/api/users/')) {
|
||||||
return new Response(JSON.stringify({ role: 'player' }), {
|
return new Response(JSON.stringify({ role: 'player' }), {
|
||||||
status: 200,
|
status: 200,
|
||||||
@@ -41,14 +50,15 @@ describe('Epic 1: Navigation Component', () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
afterEach(() => {
|
afterEach(() => {
|
||||||
vi.restoreAllMocks()
|
// Don't clear mocks - let them persist for other test files
|
||||||
|
// Navigation relies on module mocks set up at file level
|
||||||
})
|
})
|
||||||
|
|
||||||
it('renders the logo and basic links when not logged in', () => {
|
it('renders the logo and basic links when not logged in', () => {
|
||||||
vi.mocked(useSession).mockReturnValue({
|
(useSession).mockReturnValue({
|
||||||
session: null,
|
session: null,
|
||||||
loading: false,
|
loading: false,
|
||||||
refreshSession: vi.fn(),
|
refreshSession: mock(() => {}),
|
||||||
})
|
})
|
||||||
|
|
||||||
render(<Navigation />)
|
render(<Navigation />)
|
||||||
@@ -60,7 +70,7 @@ describe('Epic 1: Navigation Component', () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
it('shows user menu when logged in', async () => {
|
it('shows user menu when logged in', async () => {
|
||||||
vi.mocked(useSession).mockReturnValue({
|
(useSession).mockReturnValue({
|
||||||
session: {
|
session: {
|
||||||
user: {
|
user: {
|
||||||
id: 'user-123',
|
id: 'user-123',
|
||||||
@@ -71,7 +81,7 @@ describe('Epic 1: Navigation Component', () => {
|
|||||||
session: { token: 'abc123' },
|
session: { token: 'abc123' },
|
||||||
},
|
},
|
||||||
loading: false,
|
loading: false,
|
||||||
refreshSession: vi.fn(),
|
refreshSession: mock(() => {}),
|
||||||
})
|
})
|
||||||
|
|
||||||
render(<Navigation />)
|
render(<Navigation />)
|
||||||
@@ -85,7 +95,7 @@ describe('Epic 1: Navigation Component', () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
it('shows Tournaments link when logged in', async () => {
|
it('shows Tournaments link when logged in', async () => {
|
||||||
vi.mocked(useSession).mockReturnValue({
|
(useSession).mockReturnValue({
|
||||||
session: {
|
session: {
|
||||||
user: {
|
user: {
|
||||||
id: 'user-123',
|
id: 'user-123',
|
||||||
@@ -96,7 +106,7 @@ describe('Epic 1: Navigation Component', () => {
|
|||||||
session: { token: 'abc123' },
|
session: { token: 'abc123' },
|
||||||
},
|
},
|
||||||
loading: false,
|
loading: false,
|
||||||
refreshSession: vi.fn(),
|
refreshSession: mock(() => {}),
|
||||||
})
|
})
|
||||||
|
|
||||||
render(<Navigation />)
|
render(<Navigation />)
|
||||||
@@ -107,7 +117,7 @@ describe('Epic 1: Navigation Component', () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
it('shows admin link for club_admin role', async () => {
|
it('shows admin link for club_admin role', async () => {
|
||||||
vi.mocked(useSession).mockReturnValue({
|
(useSession).mockReturnValue({
|
||||||
session: {
|
session: {
|
||||||
user: {
|
user: {
|
||||||
id: 'admin-123',
|
id: 'admin-123',
|
||||||
@@ -118,11 +128,11 @@ describe('Epic 1: Navigation Component', () => {
|
|||||||
session: { token: 'abc123' },
|
session: { token: 'abc123' },
|
||||||
},
|
},
|
||||||
loading: false,
|
loading: false,
|
||||||
refreshSession: vi.fn(),
|
refreshSession: mock(() => {}),
|
||||||
})
|
});
|
||||||
|
|
||||||
// Mock fetch to return club_admin role
|
// Mock fetch to return club_admin role
|
||||||
vi.mocked(global.fetch).mockImplementation(async (url) => {
|
(global.fetch as any).mockImplementation(async (url: any) => {
|
||||||
if (url?.toString().includes('/api/users/admin-123/role')) {
|
if (url?.toString().includes('/api/users/admin-123/role')) {
|
||||||
return new Response(JSON.stringify({ role: 'club_admin' }), {
|
return new Response(JSON.stringify({ role: 'club_admin' }), {
|
||||||
status: 200,
|
status: 200,
|
||||||
@@ -141,7 +151,7 @@ describe('Epic 1: Navigation Component', () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
it('hides admin link for non-admin users', async () => {
|
it('hides admin link for non-admin users', async () => {
|
||||||
vi.mocked(useSession).mockReturnValue({
|
(useSession).mockReturnValue({
|
||||||
session: {
|
session: {
|
||||||
user: {
|
user: {
|
||||||
id: 'player-123',
|
id: 'player-123',
|
||||||
@@ -152,11 +162,11 @@ describe('Epic 1: Navigation Component', () => {
|
|||||||
session: { token: 'abc123' },
|
session: { token: 'abc123' },
|
||||||
},
|
},
|
||||||
loading: false,
|
loading: false,
|
||||||
refreshSession: vi.fn(),
|
refreshSession: mock(() => {}),
|
||||||
})
|
});
|
||||||
|
|
||||||
// Mock fetch to return player role (already set in beforeEach, but explicit here)
|
// Mock fetch to return player role (already set in beforeEach, but explicit here)
|
||||||
vi.mocked(global.fetch).mockImplementation(async (url) => {
|
(global.fetch as any).mockImplementation(async (url: any) => {
|
||||||
if (url?.toString().includes('/api/users/')) {
|
if (url?.toString().includes('/api/users/')) {
|
||||||
return {
|
return {
|
||||||
json: () => Promise.resolve({ role: 'player' }),
|
json: () => Promise.resolve({ role: 'player' }),
|
||||||
@@ -176,10 +186,10 @@ describe('Epic 1: Navigation Component', () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
it('shows loading state', () => {
|
it('shows loading state', () => {
|
||||||
vi.mocked(useSession).mockReturnValue({
|
(useSession).mockReturnValue({
|
||||||
session: null,
|
session: null,
|
||||||
loading: true,
|
loading: true,
|
||||||
refreshSession: vi.fn(),
|
refreshSession: mock(() => {}),
|
||||||
})
|
})
|
||||||
|
|
||||||
render(<Navigation />)
|
render(<Navigation />)
|
||||||
|
|||||||
@@ -1,23 +1,23 @@
|
|||||||
import { describe, it, expect, vi, beforeEach, MockedFunction } from 'vitest'
|
import { describe, it, expect, mock, beforeEach } from 'bun:test'
|
||||||
import { getSession } from '@/lib/auth-simple'
|
import { getSession } from '@/lib/auth-simple'
|
||||||
|
|
||||||
// Mock next/headers
|
// Mock next/headers
|
||||||
vi.mock('next/headers', () => ({
|
mock.module('next/headers', () => ({
|
||||||
cookies: vi.fn().mockResolvedValue({
|
cookies: mock(() => Promise.resolve({
|
||||||
get: vi.fn().mockReturnValue({ name: 'better-auth.session_token', value: 'test-token' }),
|
get: mock(() => ({ name: 'better-auth.session_token', value: 'test-token' })),
|
||||||
}),
|
})),
|
||||||
headers: vi.fn().mockResolvedValue({
|
headers: mock(() => Promise.resolve({
|
||||||
get: vi.fn().mockReturnValue(null),
|
get: mock(() => null),
|
||||||
}),
|
})),
|
||||||
}))
|
}))
|
||||||
|
|
||||||
// Mock fetch
|
// Mock fetch
|
||||||
const mockFetch = vi.fn()
|
const mockFetch = mock(async () => new Response())
|
||||||
global.fetch = mockFetch as MockedFunction<typeof global.fetch>
|
global.fetch = mockFetch as any
|
||||||
|
|
||||||
describe('getSession', () => {
|
describe('getSession', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
vi.clearAllMocks()
|
mock.clearAllMocks()
|
||||||
})
|
})
|
||||||
|
|
||||||
it('returns session data when auth API returns 200', async () => {
|
it('returns session data when auth API returns 200', async () => {
|
||||||
@@ -26,7 +26,7 @@ describe('getSession', () => {
|
|||||||
user: { id: 'user-123', email: 'test@example.com' },
|
user: { id: 'user-123', email: 'test@example.com' },
|
||||||
}
|
}
|
||||||
|
|
||||||
mockFetch.mockResolvedValue(
|
mockFetch.mockImplementation(async () =>
|
||||||
new Response(JSON.stringify(mockSession), { status: 200 })
|
new Response(JSON.stringify(mockSession), { status: 200 })
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -37,7 +37,7 @@ describe('getSession', () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
it('returns null when auth API returns non-200 status', async () => {
|
it('returns null when auth API returns non-200 status', async () => {
|
||||||
mockFetch.mockResolvedValue(
|
mockFetch.mockImplementation(async () =>
|
||||||
new Response(null, { status: 401 })
|
new Response(null, { status: 401 })
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,40 @@
|
|||||||
|
// Setup file for Bun test runner to provide DOM environment
|
||||||
|
import { JSDOM } from 'jsdom';
|
||||||
|
import { mock } from 'bun:test';
|
||||||
|
|
||||||
|
console.log('Loading bun-setup.ts...');
|
||||||
|
|
||||||
|
// Mock @prisma/client to avoid dependency on generated Prisma client
|
||||||
|
// This allows unit tests to run without requiring `prisma generate`
|
||||||
|
mock.module('@prisma/client', () => {
|
||||||
|
return {
|
||||||
|
PrismaClient: class MockPrismaClient {
|
||||||
|
$connect() {}
|
||||||
|
$disconnect() {}
|
||||||
|
$transaction() {}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
const dom = new JSDOM('<!DOCTYPE html><html><body></body></html>', {
|
||||||
|
url: 'http://localhost',
|
||||||
|
pretendToBeVisual: true,
|
||||||
|
});
|
||||||
|
|
||||||
|
(global as any).window = dom.window;
|
||||||
|
(global as any).document = dom.window.document;
|
||||||
|
(global as any).navigator = dom.window.navigator;
|
||||||
|
|
||||||
|
console.log('bun-setup.ts loaded - document:', typeof (global as any).document);
|
||||||
|
console.log('document.body:', (global as any).document?.body);
|
||||||
|
|
||||||
|
// Import jest-dom matchers after setting up the DOM
|
||||||
|
import '@testing-library/jest-dom';
|
||||||
|
|
||||||
|
// Clear document body after each test
|
||||||
|
import { afterEach } from 'bun:test';
|
||||||
|
afterEach(() => {
|
||||||
|
if (global.document?.body) {
|
||||||
|
global.document.body.innerHTML = '';
|
||||||
|
}
|
||||||
|
});
|
||||||
Vendored
+12
@@ -0,0 +1,12 @@
|
|||||||
|
/// <reference types="@testing-library/jest-dom" />
|
||||||
|
|
||||||
|
import { type expect } from 'bun:test'
|
||||||
|
import { type TestingLibraryMatchers } from '@testing-library/jest-dom/matchers'
|
||||||
|
|
||||||
|
declare module 'bun:test' {
|
||||||
|
interface Matchers<T = any>
|
||||||
|
extends TestingLibraryMatchers<
|
||||||
|
ReturnType<typeof expect.stringContaining>,
|
||||||
|
T
|
||||||
|
> {}
|
||||||
|
}
|
||||||
@@ -4,7 +4,7 @@
|
|||||||
* Tests the mathematical correctness of Elo calculations and rating updates
|
* Tests the mathematical correctness of Elo calculations and rating updates
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { describe, test, expect } from 'vitest';
|
import { describe, test, expect } from 'bun:test';
|
||||||
import { calculateEloChange, calculateExpectedScore, calculateTeamElo } from '@/lib/elo-utils';
|
import { calculateEloChange, calculateExpectedScore, calculateTeamElo } from '@/lib/elo-utils';
|
||||||
|
|
||||||
describe('Elo Rating System', () => {
|
describe('Elo Rating System', () => {
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
* Tests for ID parsing and validation in API routes and pages
|
* Tests for ID parsing and validation in API routes and pages
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { describe, test, expect } from 'vitest';
|
import { describe, test, expect } from 'bun:test';
|
||||||
|
|
||||||
describe('ID Validation', () => {
|
describe('ID Validation', () => {
|
||||||
describe('parseInt with validation', () => {
|
describe('parseInt with validation', () => {
|
||||||
|
|||||||
@@ -4,12 +4,33 @@
|
|||||||
* Tests the permission system for tournament management
|
* Tests the permission system for tournament management
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { describe, test, expect, vi } from 'vitest';
|
import { describe, test, expect, mock, beforeEach } from 'bun:test';
|
||||||
import { hasRole, canManageTournament, canCreateTournaments } from '@/lib/permissions';
|
import { hasRole, canManageTournament, canCreateTournaments } from '@/lib/permissions';
|
||||||
import { getSession } from '@/lib/auth-simple';
|
import { getSession } from '@/lib/auth-simple';
|
||||||
import { prisma } from '@/lib/prisma';
|
import { prisma } from '@/lib/prisma';
|
||||||
import type { User } from '@prisma/client';
|
import type { User } from '@prisma/client';
|
||||||
|
|
||||||
|
// Create mock functions at module level
|
||||||
|
const getSessionMock = mock(() => {});
|
||||||
|
const userFindUniqueMock = mock(() => {});
|
||||||
|
const eventFindUniqueMock = mock(() => {});
|
||||||
|
|
||||||
|
// Mock the getSession and prisma functions
|
||||||
|
mock.module('@/lib/auth-simple', () => ({
|
||||||
|
getSession: getSessionMock,
|
||||||
|
}));
|
||||||
|
|
||||||
|
mock.module('@/lib/prisma', () => ({
|
||||||
|
prisma: {
|
||||||
|
user: {
|
||||||
|
findUnique: userFindUniqueMock,
|
||||||
|
},
|
||||||
|
event: {
|
||||||
|
findUnique: eventFindUniqueMock,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}));
|
||||||
|
|
||||||
// Helper to create mock user
|
// Helper to create mock user
|
||||||
const createMockUser = (id: string, email: string, role: string): User => ({
|
const createMockUser = (id: string, email: string, role: string): User => ({
|
||||||
id,
|
id,
|
||||||
@@ -23,30 +44,21 @@ const createMockUser = (id: string, email: string, role: string): User => ({
|
|||||||
updatedAt: new Date(),
|
updatedAt: new Date(),
|
||||||
});
|
});
|
||||||
|
|
||||||
// Mock the getSession and prisma functions
|
|
||||||
vi.mock('@/lib/auth-simple', () => ({
|
|
||||||
getSession: vi.fn(),
|
|
||||||
}));
|
|
||||||
|
|
||||||
vi.mock('@/lib/prisma', () => ({
|
|
||||||
prisma: {
|
|
||||||
user: {
|
|
||||||
findUnique: vi.fn(),
|
|
||||||
},
|
|
||||||
event: {
|
|
||||||
findUnique: vi.fn(),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}));
|
|
||||||
|
|
||||||
describe('Permissions', () => {
|
describe('Permissions', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
// Reset mock implementations to default (no-op) before each test
|
||||||
|
getSessionMock.mockImplementation(() => undefined);
|
||||||
|
userFindUniqueMock.mockImplementation(() => undefined);
|
||||||
|
eventFindUniqueMock.mockImplementation(() => undefined);
|
||||||
|
});
|
||||||
|
|
||||||
describe('hasRole', () => {
|
describe('hasRole', () => {
|
||||||
test('should allow club_admin to access tournament_admin resources', async () => {
|
test('should allow club_admin to access tournament_admin resources', async () => {
|
||||||
vi.mocked(getSession).mockResolvedValue({
|
getSessionMock.mockImplementation(async () => ({
|
||||||
user: { id: '1', email: 'test@example.com' },
|
user: { id: '1', email: 'test@example.com' },
|
||||||
session: { token: 'test', expiresAt: new Date() }
|
session: { token: 'test', expiresAt: new Date() }
|
||||||
});
|
}));
|
||||||
vi.mocked(prisma.user.findUnique).mockResolvedValue(
|
userFindUniqueMock.mockImplementation(async () =>
|
||||||
createMockUser('1', 'test@example.com', 'club_admin')
|
createMockUser('1', 'test@example.com', 'club_admin')
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -55,11 +67,11 @@ describe('Permissions', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
test('should deny player from accessing tournament_admin resources', async () => {
|
test('should deny player from accessing tournament_admin resources', async () => {
|
||||||
vi.mocked(getSession).mockResolvedValue({
|
getSessionMock.mockImplementation(async () => ({
|
||||||
user: { id: '1', email: 'test@example.com' },
|
user: { id: '1', email: 'test@example.com' },
|
||||||
session: { token: 'test', expiresAt: new Date() }
|
session: { token: 'test', expiresAt: new Date() }
|
||||||
});
|
}));
|
||||||
vi.mocked(prisma.user.findUnique).mockResolvedValue(
|
userFindUniqueMock.mockImplementation(async () =>
|
||||||
createMockUser('1', 'test@example.com', 'player')
|
createMockUser('1', 'test@example.com', 'player')
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -68,7 +80,7 @@ describe('Permissions', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
test('should deny unauthenticated user', async () => {
|
test('should deny unauthenticated user', async () => {
|
||||||
vi.mocked(getSession).mockResolvedValue(null);
|
getSessionMock.mockImplementation(async () => null);
|
||||||
|
|
||||||
const result = await hasRole('club_admin');
|
const result = await hasRole('club_admin');
|
||||||
expect(result.allowed).toBe(false);
|
expect(result.allowed).toBe(false);
|
||||||
@@ -78,11 +90,11 @@ describe('Permissions', () => {
|
|||||||
|
|
||||||
describe('canManageTournament', () => {
|
describe('canManageTournament', () => {
|
||||||
test('should allow club_admin to manage any tournament', async () => {
|
test('should allow club_admin to manage any tournament', async () => {
|
||||||
vi.mocked(getSession).mockResolvedValue({
|
getSessionMock.mockImplementation(async () => ({
|
||||||
user: { id: 'admin-1', email: 'admin@example.com' },
|
user: { id: 'admin-1', email: 'admin@example.com' },
|
||||||
session: { token: 'test', expiresAt: new Date() }
|
session: { token: 'test', expiresAt: new Date() }
|
||||||
});
|
}));
|
||||||
vi.mocked(prisma.user.findUnique).mockResolvedValue(
|
userFindUniqueMock.mockImplementation(async () =>
|
||||||
createMockUser('admin-1', 'admin@example.com', 'club_admin')
|
createMockUser('admin-1', 'admin@example.com', 'club_admin')
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -91,11 +103,11 @@ describe('Permissions', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
test('should deny player from managing tournaments', async () => {
|
test('should deny player from managing tournaments', async () => {
|
||||||
vi.mocked(getSession).mockResolvedValue({
|
getSessionMock.mockImplementation(async () => ({
|
||||||
user: { id: 'player-1', email: 'player@example.com' },
|
user: { id: 'player-1', email: 'player@example.com' },
|
||||||
session: { token: 'test', expiresAt: new Date() }
|
session: { token: 'test', expiresAt: new Date() }
|
||||||
});
|
}));
|
||||||
vi.mocked(prisma.user.findUnique).mockResolvedValue(
|
userFindUniqueMock.mockImplementation(async () =>
|
||||||
createMockUser('player-1', 'player@example.com', 'player')
|
createMockUser('player-1', 'player@example.com', 'player')
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -107,11 +119,11 @@ describe('Permissions', () => {
|
|||||||
|
|
||||||
describe('canCreateTournaments', () => {
|
describe('canCreateTournaments', () => {
|
||||||
test('should allow tournament_admin to create tournaments', async () => {
|
test('should allow tournament_admin to create tournaments', async () => {
|
||||||
vi.mocked(getSession).mockResolvedValue({
|
getSessionMock.mockImplementation(async () => ({
|
||||||
user: { id: 'admin-1', email: 'admin@example.com' },
|
user: { id: 'admin-1', email: 'admin@example.com' },
|
||||||
session: { token: 'test', expiresAt: new Date() }
|
session: { token: 'test', expiresAt: new Date() }
|
||||||
});
|
}));
|
||||||
vi.mocked(prisma.user.findUnique).mockResolvedValue(
|
userFindUniqueMock.mockImplementation(async () =>
|
||||||
createMockUser('admin-1', 'admin@example.com', 'tournament_admin')
|
createMockUser('admin-1', 'admin@example.com', 'tournament_admin')
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -120,11 +132,11 @@ describe('Permissions', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
test('should allow club_admin to create tournaments', async () => {
|
test('should allow club_admin to create tournaments', async () => {
|
||||||
vi.mocked(getSession).mockResolvedValue({
|
getSessionMock.mockImplementation(async () => ({
|
||||||
user: { id: 'admin-1', email: 'admin@example.com' },
|
user: { id: 'admin-1', email: 'admin@example.com' },
|
||||||
session: { token: 'test', expiresAt: new Date() }
|
session: { token: 'test', expiresAt: new Date() }
|
||||||
});
|
}));
|
||||||
vi.mocked(prisma.user.findUnique).mockResolvedValue(
|
userFindUniqueMock.mockImplementation(async () =>
|
||||||
createMockUser('admin-1', 'admin@example.com', 'club_admin')
|
createMockUser('admin-1', 'admin@example.com', 'club_admin')
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -133,11 +145,11 @@ describe('Permissions', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
test('should deny player from creating tournaments', async () => {
|
test('should deny player from creating tournaments', async () => {
|
||||||
vi.mocked(getSession).mockResolvedValue({
|
getSessionMock.mockImplementation(async () => ({
|
||||||
user: { id: 'player-1', email: 'player@example.com' },
|
user: { id: 'player-1', email: 'player@example.com' },
|
||||||
session: { token: 'test', expiresAt: new Date() }
|
session: { token: 'test', expiresAt: new Date() }
|
||||||
});
|
}));
|
||||||
vi.mocked(prisma.user.findUnique).mockResolvedValue(
|
userFindUniqueMock.mockImplementation(async () =>
|
||||||
createMockUser('player-1', 'player@example.com', 'player')
|
createMockUser('player-1', 'player@example.com', 'player')
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@@ -4,15 +4,19 @@
|
|||||||
* Tests the player deduplication logic for CSV uploads
|
* Tests the player deduplication logic for CSV uploads
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { describe, test, expect, vi, beforeEach } from 'vitest';
|
import { describe, test, expect, mock, beforeEach,} from 'bun:test';
|
||||||
import { prisma } from '@/lib/prisma';
|
import { prisma } from '@/lib/prisma';
|
||||||
|
|
||||||
|
// Create mock functions at module level
|
||||||
|
const playerFindFirstMock = mock(() => {});
|
||||||
|
const playerCreateMock = mock(() => {});
|
||||||
|
|
||||||
// Mock the prisma module
|
// Mock the prisma module
|
||||||
vi.mock('@/lib/prisma', () => ({
|
mock.module('@/lib/prisma', () => ({
|
||||||
prisma: {
|
prisma: {
|
||||||
player: {
|
player: {
|
||||||
findFirst: vi.fn(),
|
findFirst: playerFindFirstMock,
|
||||||
create: vi.fn(),
|
create: playerCreateMock,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}));
|
}));
|
||||||
@@ -46,7 +50,9 @@ async function findOrCreatePlayer(name: string) {
|
|||||||
|
|
||||||
describe('Player Deduplication', () => {
|
describe('Player Deduplication', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
vi.clearAllMocks();
|
// Clear all mock history before each test
|
||||||
|
playerFindFirstMock.mockClear();
|
||||||
|
playerCreateMock.mockClear();
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('findOrCreatePlayer', () => {
|
describe('findOrCreatePlayer', () => {
|
||||||
@@ -64,7 +70,7 @@ describe('Player Deduplication', () => {
|
|||||||
rating: 0,
|
rating: 0,
|
||||||
};
|
};
|
||||||
|
|
||||||
vi.mocked(prisma.player.findFirst).mockResolvedValue(mockPlayer);
|
playerFindFirstMock.mockImplementation(async () => mockPlayer);
|
||||||
|
|
||||||
const result = await findOrCreatePlayer('Emily');
|
const result = await findOrCreatePlayer('Emily');
|
||||||
|
|
||||||
@@ -89,7 +95,7 @@ describe('Player Deduplication', () => {
|
|||||||
rating: 0,
|
rating: 0,
|
||||||
};
|
};
|
||||||
|
|
||||||
vi.mocked(prisma.player.findFirst).mockResolvedValue(mockPlayer);
|
playerFindFirstMock.mockImplementation(async () => mockPlayer);
|
||||||
|
|
||||||
const result = await findOrCreatePlayer('EMILY');
|
const result = await findOrCreatePlayer('EMILY');
|
||||||
|
|
||||||
@@ -114,7 +120,7 @@ describe('Player Deduplication', () => {
|
|||||||
rating: 0,
|
rating: 0,
|
||||||
};
|
};
|
||||||
|
|
||||||
vi.mocked(prisma.player.findFirst).mockResolvedValue(mockPlayer);
|
playerFindFirstMock.mockImplementation(async () => mockPlayer);
|
||||||
|
|
||||||
const result = await findOrCreatePlayer(' Emily ');
|
const result = await findOrCreatePlayer(' Emily ');
|
||||||
|
|
||||||
@@ -126,7 +132,7 @@ describe('Player Deduplication', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
test('should create new player if not found', async () => {
|
test('should create new player if not found', async () => {
|
||||||
vi.mocked(prisma.player.findFirst).mockResolvedValue(null);
|
playerFindFirstMock.mockImplementation(async () => null);
|
||||||
|
|
||||||
const newPlayer = {
|
const newPlayer = {
|
||||||
id: 100,
|
id: 100,
|
||||||
@@ -141,7 +147,7 @@ describe('Player Deduplication', () => {
|
|||||||
updatedAt: new Date(),
|
updatedAt: new Date(),
|
||||||
};
|
};
|
||||||
|
|
||||||
vi.mocked(prisma.player.create).mockResolvedValue(newPlayer);
|
playerCreateMock.mockImplementation(async () => newPlayer);
|
||||||
|
|
||||||
const result = await findOrCreatePlayer('NewPlayer');
|
const result = await findOrCreatePlayer('NewPlayer');
|
||||||
|
|
||||||
@@ -162,7 +168,7 @@ describe('Player Deduplication', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
test('should handle names with special characters', async () => {
|
test('should handle names with special characters', async () => {
|
||||||
vi.mocked(prisma.player.findFirst).mockResolvedValue(null);
|
playerFindFirstMock.mockImplementation(async () => null);
|
||||||
|
|
||||||
const newPlayer = {
|
const newPlayer = {
|
||||||
id: 100,
|
id: 100,
|
||||||
@@ -177,7 +183,7 @@ describe('Player Deduplication', () => {
|
|||||||
updatedAt: new Date(),
|
updatedAt: new Date(),
|
||||||
};
|
};
|
||||||
|
|
||||||
vi.mocked(prisma.player.create).mockResolvedValue(newPlayer);
|
playerCreateMock.mockImplementation(async () => newPlayer);
|
||||||
|
|
||||||
const result = await findOrCreatePlayer('Test-Player_123');
|
const result = await findOrCreatePlayer('Test-Player_123');
|
||||||
|
|
||||||
@@ -195,7 +201,7 @@ describe('Player Deduplication', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
test('should handle names with spaces', async () => {
|
test('should handle names with spaces', async () => {
|
||||||
vi.mocked(prisma.player.findFirst).mockResolvedValue(null);
|
playerFindFirstMock.mockImplementation(async () => null);
|
||||||
|
|
||||||
const newPlayer = {
|
const newPlayer = {
|
||||||
id: 100,
|
id: 100,
|
||||||
@@ -210,7 +216,7 @@ describe('Player Deduplication', () => {
|
|||||||
updatedAt: new Date(),
|
updatedAt: new Date(),
|
||||||
};
|
};
|
||||||
|
|
||||||
vi.mocked(prisma.player.create).mockResolvedValue(newPlayer);
|
playerCreateMock.mockImplementation(async () => newPlayer);
|
||||||
|
|
||||||
const result = await findOrCreatePlayer('Dave B');
|
const result = await findOrCreatePlayer('Dave B');
|
||||||
|
|
||||||
@@ -242,7 +248,7 @@ describe('Player Deduplication', () => {
|
|||||||
rating: 0,
|
rating: 0,
|
||||||
};
|
};
|
||||||
|
|
||||||
vi.mocked(prisma.player.findFirst).mockResolvedValue(mockPlayer);
|
playerFindFirstMock.mockImplementation(async () => mockPlayer);
|
||||||
|
|
||||||
const result1 = await findOrCreatePlayer('EMILY');
|
const result1 = await findOrCreatePlayer('EMILY');
|
||||||
const result2 = await findOrCreatePlayer('Emily');
|
const result2 = await findOrCreatePlayer('Emily');
|
||||||
@@ -255,7 +261,7 @@ describe('Player Deduplication', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
test('should handle empty or whitespace-only names', async () => {
|
test('should handle empty or whitespace-only names', async () => {
|
||||||
vi.mocked(prisma.player.findFirst).mockResolvedValue(null);
|
playerFindFirstMock.mockImplementation(async () => null);
|
||||||
|
|
||||||
const newPlayer = {
|
const newPlayer = {
|
||||||
id: 100,
|
id: 100,
|
||||||
@@ -270,7 +276,7 @@ describe('Player Deduplication', () => {
|
|||||||
updatedAt: new Date(),
|
updatedAt: new Date(),
|
||||||
};
|
};
|
||||||
|
|
||||||
vi.mocked(prisma.player.create).mockResolvedValue(newPlayer);
|
playerCreateMock.mockImplementation(async () => newPlayer);
|
||||||
|
|
||||||
const result = await findOrCreatePlayer(' ');
|
const result = await findOrCreatePlayer(' ');
|
||||||
|
|
||||||
@@ -320,7 +326,7 @@ describe('Player Deduplication', () => {
|
|||||||
rating: 0,
|
rating: 0,
|
||||||
};
|
};
|
||||||
|
|
||||||
vi.mocked(prisma.player.findFirst)
|
playerFindFirstMock
|
||||||
.mockResolvedValueOnce(existingPlayer) // First call for "Emily"
|
.mockResolvedValueOnce(existingPlayer) // First call for "Emily"
|
||||||
.mockResolvedValueOnce(existingPlayer) // Second call for "EMILY"
|
.mockResolvedValueOnce(existingPlayer) // Second call for "EMILY"
|
||||||
.mockResolvedValueOnce(existingPlayer); // Third call for " Emily "
|
.mockResolvedValueOnce(existingPlayer); // Third call for " Emily "
|
||||||
|
|||||||
@@ -7,24 +7,30 @@
|
|||||||
* - Partnership performance
|
* - Partnership performance
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { describe, test, expect, vi, beforeEach } from 'vitest';
|
import { describe, test, expect, mock, beforeEach } from 'bun:test';
|
||||||
import { prisma } from '@/lib/prisma';
|
import { prisma } from '@/lib/prisma';
|
||||||
import type { Player, Event, Match, PartnershipStat } from '@prisma/client';
|
import type { Player, Event, Match, PartnershipStat } from '@prisma/client';
|
||||||
|
|
||||||
|
// Create mock functions at module level
|
||||||
|
const playerFindUniqueMock = mock(() => {});
|
||||||
|
const eventFindManyMock = mock(() => {});
|
||||||
|
const matchFindManyMock = mock(() => {});
|
||||||
|
const partnershipStatFindManyMock = mock(() => {});
|
||||||
|
|
||||||
// Mock the prisma module
|
// Mock the prisma module
|
||||||
vi.mock('@/lib/prisma', () => ({
|
mock.module('@/lib/prisma', () => ({
|
||||||
prisma: {
|
prisma: {
|
||||||
player: {
|
player: {
|
||||||
findUnique: vi.fn(),
|
findUnique: playerFindUniqueMock,
|
||||||
},
|
},
|
||||||
event: {
|
event: {
|
||||||
findMany: vi.fn(),
|
findMany: eventFindManyMock,
|
||||||
},
|
},
|
||||||
match: {
|
match: {
|
||||||
findMany: vi.fn(),
|
findMany: matchFindManyMock,
|
||||||
},
|
},
|
||||||
partnershipStat: {
|
partnershipStat: {
|
||||||
findMany: vi.fn(),
|
findMany: partnershipStatFindManyMock,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}));
|
}));
|
||||||
@@ -111,7 +117,11 @@ const createMockPartnershipStat = (
|
|||||||
|
|
||||||
describe('Player Profile Enhancements', () => {
|
describe('Player Profile Enhancements', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
vi.clearAllMocks();
|
// Reset mock implementations to default (no-op) before each test
|
||||||
|
playerFindUniqueMock.mockImplementation(() => undefined);
|
||||||
|
eventFindManyMock.mockImplementation(() => undefined);
|
||||||
|
matchFindManyMock.mockImplementation(() => undefined);
|
||||||
|
partnershipStatFindManyMock.mockImplementation(() => undefined);
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Tournaments Participated', () => {
|
describe('Tournaments Participated', () => {
|
||||||
@@ -122,8 +132,8 @@ describe('Player Profile Enhancements', () => {
|
|||||||
createMockTournament(2, 'Tournament B'),
|
createMockTournament(2, 'Tournament B'),
|
||||||
];
|
];
|
||||||
|
|
||||||
vi.mocked(prisma.player.findUnique).mockResolvedValue(mockPlayer);
|
playerFindUniqueMock.mockImplementation(async () => mockPlayer);
|
||||||
vi.mocked(prisma.event.findMany).mockResolvedValue(mockTournaments);
|
eventFindManyMock.mockImplementation(async () => mockTournaments);
|
||||||
|
|
||||||
// Simulate the query that would be run
|
// Simulate the query that would be run
|
||||||
const tournaments = await prisma.event.findMany({
|
const tournaments = await prisma.event.findMany({
|
||||||
@@ -145,8 +155,8 @@ describe('Player Profile Enhancements', () => {
|
|||||||
test('should return empty array if player has no tournaments', async () => {
|
test('should return empty array if player has no tournaments', async () => {
|
||||||
const mockPlayer = createMockPlayer(1, 'Test Player');
|
const mockPlayer = createMockPlayer(1, 'Test Player');
|
||||||
|
|
||||||
vi.mocked(prisma.player.findUnique).mockResolvedValue(mockPlayer);
|
playerFindUniqueMock.mockImplementation(async () => mockPlayer);
|
||||||
vi.mocked(prisma.event.findMany).mockResolvedValue([]);
|
eventFindManyMock.mockImplementation(async () => []);
|
||||||
|
|
||||||
const tournaments = await prisma.event.findMany({
|
const tournaments = await prisma.event.findMany({
|
||||||
where: {
|
where: {
|
||||||
@@ -173,8 +183,8 @@ describe('Player Profile Enhancements', () => {
|
|||||||
createMockMatch(2, 1, 3, 5, 6, 4, 4),
|
createMockMatch(2, 1, 3, 5, 6, 4, 4),
|
||||||
];
|
];
|
||||||
|
|
||||||
vi.mocked(prisma.player.findUnique).mockResolvedValue(mockPlayer);
|
playerFindUniqueMock.mockImplementation(async () => mockPlayer);
|
||||||
vi.mocked(prisma.match.findMany).mockResolvedValue(mockMatches);
|
matchFindManyMock.mockImplementation(async () => mockMatches);
|
||||||
|
|
||||||
// Simulate the query that would be run
|
// Simulate the query that would be run
|
||||||
const matches = await prisma.match.findMany({
|
const matches = await prisma.match.findMany({
|
||||||
@@ -204,8 +214,8 @@ describe('Player Profile Enhancements', () => {
|
|||||||
test('should return empty array if player has no matches', async () => {
|
test('should return empty array if player has no matches', async () => {
|
||||||
const mockPlayer = createMockPlayer(1, 'Test Player');
|
const mockPlayer = createMockPlayer(1, 'Test Player');
|
||||||
|
|
||||||
vi.mocked(prisma.player.findUnique).mockResolvedValue(mockPlayer);
|
playerFindUniqueMock.mockImplementation(async () => mockPlayer);
|
||||||
vi.mocked(prisma.match.findMany).mockResolvedValue([]);
|
matchFindManyMock.mockImplementation(async () => []);
|
||||||
|
|
||||||
const matches = await prisma.match.findMany({
|
const matches = await prisma.match.findMany({
|
||||||
where: {
|
where: {
|
||||||
@@ -240,8 +250,8 @@ describe('Player Profile Enhancements', () => {
|
|||||||
createMockPartnershipStat(2, 1, 3, 5, 2, 3),
|
createMockPartnershipStat(2, 1, 3, 5, 2, 3),
|
||||||
];
|
];
|
||||||
|
|
||||||
vi.mocked(prisma.player.findUnique).mockResolvedValue(mockPlayer);
|
playerFindUniqueMock.mockImplementation(async () => mockPlayer);
|
||||||
vi.mocked(prisma.partnershipStat.findMany).mockResolvedValue(mockPartnershipStats);
|
partnershipStatFindManyMock.mockImplementation(async () => mockPartnershipStats);
|
||||||
|
|
||||||
// Simulate the query that would be run
|
// Simulate the query that would be run
|
||||||
const partnershipStats = await prisma.partnershipStat.findMany({
|
const partnershipStats = await prisma.partnershipStat.findMany({
|
||||||
@@ -265,8 +275,8 @@ describe('Player Profile Enhancements', () => {
|
|||||||
test('should return empty array if player has no partnership data', async () => {
|
test('should return empty array if player has no partnership data', async () => {
|
||||||
const mockPlayer = createMockPlayer(1, 'Test Player');
|
const mockPlayer = createMockPlayer(1, 'Test Player');
|
||||||
|
|
||||||
vi.mocked(prisma.player.findUnique).mockResolvedValue(mockPlayer);
|
playerFindUniqueMock.mockImplementation(async () => mockPlayer);
|
||||||
vi.mocked(prisma.partnershipStat.findMany).mockResolvedValue([]);
|
partnershipStatFindManyMock.mockImplementation(async () => []);
|
||||||
|
|
||||||
const partnershipStats = await prisma.partnershipStat.findMany({
|
const partnershipStats = await prisma.partnershipStat.findMany({
|
||||||
where: {
|
where: {
|
||||||
|
|||||||
@@ -5,33 +5,33 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/* eslint-disable @typescript-eslint/no-explicit-any */
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
||||||
import { describe, test, expect, beforeEach, vi } from 'vitest';
|
import { describe, test, expect, beforeEach, mock } from 'bun:test';
|
||||||
import { recalculateAllElo } from '@/lib/elo-utils';
|
import { recalculateAllElo } from '@/lib/elo-utils';
|
||||||
|
|
||||||
// Mock Prisma client
|
// Mock Prisma client
|
||||||
const mockPrisma = {
|
const mockPrisma = {
|
||||||
player: {
|
player: {
|
||||||
updateMany: vi.fn().mockResolvedValue({ count: 0 }),
|
updateMany: mock(() => {}).mockResolvedValue({ count: 0 }),
|
||||||
update: vi.fn().mockResolvedValue({}),
|
update: mock(() => {}).mockResolvedValue({}),
|
||||||
},
|
},
|
||||||
eloSnapshot: {
|
eloSnapshot: {
|
||||||
deleteMany: vi.fn().mockResolvedValue({ count: 0 }),
|
deleteMany: mock(() => {}).mockResolvedValue({ count: 0 }),
|
||||||
create: vi.fn().mockResolvedValue({}),
|
create: mock(() => {}).mockResolvedValue({}),
|
||||||
},
|
},
|
||||||
partnershipStat: {
|
partnershipStat: {
|
||||||
deleteMany: vi.fn().mockResolvedValue({ count: 0 }),
|
deleteMany: mock(() => {}).mockResolvedValue({ count: 0 }),
|
||||||
findFirst: vi.fn().mockResolvedValue(null), // No existing stats initially
|
findFirst: mock(() => {}).mockResolvedValue(null), // No existing stats initially
|
||||||
update: vi.fn().mockResolvedValue({}),
|
update: mock(() => {}).mockResolvedValue({}),
|
||||||
create: vi.fn().mockResolvedValue({}),
|
create: mock(() => {}).mockResolvedValue({}),
|
||||||
},
|
},
|
||||||
match: {
|
match: {
|
||||||
findMany: vi.fn().mockResolvedValue([]),
|
findMany: mock(() => {}).mockResolvedValue([]),
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
describe('recalculateAllElo', () => {
|
describe('recalculateAllElo', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
vi.clearAllMocks();
|
mock.clearAllMocks();
|
||||||
});
|
});
|
||||||
|
|
||||||
test('should reset all player stats to zero', async () => {
|
test('should reset all player stats to zero', async () => {
|
||||||
|
|||||||
@@ -0,0 +1,181 @@
|
|||||||
|
/**
|
||||||
|
* Unit Tests: Round-Robin Schedule Generator
|
||||||
|
*
|
||||||
|
* Tests the correctness of the round-robin scheduling algorithm
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { describe, test, expect } from 'bun:test';
|
||||||
|
import {
|
||||||
|
generateRoundRobin,
|
||||||
|
validateScheduleInput,
|
||||||
|
expectedRounds,
|
||||||
|
expectedMatchups,
|
||||||
|
} from '@/lib/schedule-generator';
|
||||||
|
|
||||||
|
describe('Round-Robin Schedule Generator', () => {
|
||||||
|
describe('generateRoundRobin', () => {
|
||||||
|
test('should return empty array for fewer than 2 teams', () => {
|
||||||
|
expect(generateRoundRobin([])).toEqual([]);
|
||||||
|
expect(generateRoundRobin([1])).toEqual([]);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('should generate correct schedule for 2 teams', () => {
|
||||||
|
const rounds = generateRoundRobin([1, 2]);
|
||||||
|
expect(rounds).toHaveLength(1);
|
||||||
|
expect(rounds[0].roundNumber).toBe(1);
|
||||||
|
expect(rounds[0].matchups).toHaveLength(1);
|
||||||
|
expect(rounds[0].matchups[0]).toEqual({ team1Id: 1, team2Id: 2 });
|
||||||
|
});
|
||||||
|
|
||||||
|
test('should generate N-1 rounds for N even teams', () => {
|
||||||
|
const teams = [1, 2, 3, 4];
|
||||||
|
const rounds = generateRoundRobin(teams);
|
||||||
|
expect(rounds).toHaveLength(3);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('should generate N rounds for N odd teams (with bye)', () => {
|
||||||
|
const teams = [1, 2, 3];
|
||||||
|
const rounds = generateRoundRobin(teams);
|
||||||
|
expect(rounds).toHaveLength(3);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('each team plays every other team exactly once (even)', () => {
|
||||||
|
const teams = [1, 2, 3, 4];
|
||||||
|
const rounds = generateRoundRobin(teams);
|
||||||
|
|
||||||
|
// Collect all pairings as sorted tuples
|
||||||
|
const pairings = new Set<string>();
|
||||||
|
for (const round of rounds) {
|
||||||
|
for (const matchup of round.matchups) {
|
||||||
|
const key = [matchup.team1Id, matchup.team2Id].sort().join('-');
|
||||||
|
pairings.add(key);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 4 teams = 6 unique pairings
|
||||||
|
expect(pairings.size).toBe(6);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('each team plays every other team exactly once (odd)', () => {
|
||||||
|
const teams = [1, 2, 3, 4, 5];
|
||||||
|
const rounds = generateRoundRobin(teams);
|
||||||
|
|
||||||
|
const pairings = new Set<string>();
|
||||||
|
for (const round of rounds) {
|
||||||
|
for (const matchup of round.matchups) {
|
||||||
|
const key = [matchup.team1Id, matchup.team2Id].sort().join('-');
|
||||||
|
pairings.add(key);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 5 teams = 10 unique pairings
|
||||||
|
expect(pairings.size).toBe(10);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('each team plays exactly once per round (even teams)', () => {
|
||||||
|
const teams = [1, 2, 3, 4, 5, 6];
|
||||||
|
const rounds = generateRoundRobin(teams);
|
||||||
|
|
||||||
|
for (const round of rounds) {
|
||||||
|
const teamsInRound = new Set<number>();
|
||||||
|
for (const matchup of round.matchups) {
|
||||||
|
teamsInRound.add(matchup.team1Id);
|
||||||
|
teamsInRound.add(matchup.team2Id);
|
||||||
|
}
|
||||||
|
// Each team appears exactly once
|
||||||
|
expect(teamsInRound.size).toBe(6);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test('each team plays at most once per round (odd teams)', () => {
|
||||||
|
const teams = [1, 2, 3, 4, 5];
|
||||||
|
const rounds = generateRoundRobin(teams);
|
||||||
|
|
||||||
|
for (const round of rounds) {
|
||||||
|
const teamsInRound = new Set<number>();
|
||||||
|
for (const matchup of round.matchups) {
|
||||||
|
teamsInRound.add(matchup.team1Id);
|
||||||
|
teamsInRound.add(matchup.team2Id);
|
||||||
|
}
|
||||||
|
// 5 teams, one has bye each round, so 4 play
|
||||||
|
expect(teamsInRound.size).toBe(4);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test('should handle 8 teams (typical euchre tournament)', () => {
|
||||||
|
const teams = [1, 2, 3, 4, 5, 6, 7, 8];
|
||||||
|
const rounds = generateRoundRobin(teams);
|
||||||
|
|
||||||
|
expect(rounds).toHaveLength(7);
|
||||||
|
|
||||||
|
const totalMatchups = rounds.reduce((sum, r) => sum + r.matchups.length, 0);
|
||||||
|
expect(totalMatchups).toBe(28);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('round numbers should be sequential starting from 1', () => {
|
||||||
|
const teams = [1, 2, 3, 4, 5, 6];
|
||||||
|
const rounds = generateRoundRobin(teams);
|
||||||
|
|
||||||
|
rounds.forEach((round, idx) => {
|
||||||
|
expect(round.roundNumber).toBe(idx + 1);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('validateScheduleInput', () => {
|
||||||
|
test('should reject empty team list', () => {
|
||||||
|
const result = validateScheduleInput([]);
|
||||||
|
expect(result.valid).toBe(false);
|
||||||
|
expect(result.error).toContain('At least 2');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('should reject single team', () => {
|
||||||
|
const result = validateScheduleInput([1]);
|
||||||
|
expect(result.valid).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('should reject duplicate team IDs', () => {
|
||||||
|
const result = validateScheduleInput([1, 2, 2]);
|
||||||
|
expect(result.valid).toBe(false);
|
||||||
|
expect(result.error).toContain('Duplicate');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('should accept valid team list', () => {
|
||||||
|
const result = validateScheduleInput([1, 2, 3, 4]);
|
||||||
|
expect(result.valid).toBe(true);
|
||||||
|
expect(result.error).toBeUndefined();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('expectedRounds', () => {
|
||||||
|
test('should return 0 for fewer than 2 teams', () => {
|
||||||
|
expect(expectedRounds(0)).toBe(0);
|
||||||
|
expect(expectedRounds(1)).toBe(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('should return N-1 for even N', () => {
|
||||||
|
expect(expectedRounds(4)).toBe(3);
|
||||||
|
expect(expectedRounds(6)).toBe(5);
|
||||||
|
expect(expectedRounds(8)).toBe(7);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('should return N for odd N', () => {
|
||||||
|
expect(expectedRounds(3)).toBe(3);
|
||||||
|
expect(expectedRounds(5)).toBe(5);
|
||||||
|
expect(expectedRounds(7)).toBe(7);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('expectedMatchups', () => {
|
||||||
|
test('should return 0 for fewer than 2 teams', () => {
|
||||||
|
expect(expectedMatchups(0)).toBe(0);
|
||||||
|
expect(expectedMatchups(1)).toBe(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('should return N*(N-1)/2 for N teams', () => {
|
||||||
|
expect(expectedMatchups(4)).toBe(6);
|
||||||
|
expect(expectedMatchups(6)).toBe(15);
|
||||||
|
expect(expectedMatchups(8)).toBe(28);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -5,25 +5,31 @@
|
|||||||
* Regression tests for the issue where tournament_admin users were redirected to login
|
* Regression tests for the issue where tournament_admin users were redirected to login
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { describe, test, expect, vi, beforeEach } from 'vitest';
|
import { describe, test, expect, mock, beforeEach } from 'bun:test';
|
||||||
import { canManageTournament, ownsTournament, getManageableTournaments } from '@/lib/permissions';
|
import { canManageTournament, ownsTournament, getManageableTournaments } from '@/lib/permissions';
|
||||||
import { getSession } from '@/lib/auth-simple';
|
import { getSession } from '@/lib/auth-simple';
|
||||||
import { prisma } from '@/lib/prisma';
|
import { prisma } from '@/lib/prisma';
|
||||||
import type { User, Event } from '@prisma/client';
|
import type { User, Event } from '@prisma/client';
|
||||||
|
|
||||||
|
// Create mock functions first
|
||||||
|
const getSessionMock = mock(() => {});
|
||||||
|
const userFindUniqueMock = mock(() => {});
|
||||||
|
const eventFindUniqueMock = mock(() => {});
|
||||||
|
const eventFindManyMock = mock(() => {});
|
||||||
|
|
||||||
// Mock the getSession and prisma functions
|
// Mock the getSession and prisma functions
|
||||||
vi.mock('@/lib/auth-simple', () => ({
|
mock.module('@/lib/auth-simple', () => ({
|
||||||
getSession: vi.fn(),
|
getSession: getSessionMock,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
vi.mock('@/lib/prisma', () => ({
|
mock.module('@/lib/prisma', () => ({
|
||||||
prisma: {
|
prisma: {
|
||||||
user: {
|
user: {
|
||||||
findUnique: vi.fn(),
|
findUnique: userFindUniqueMock,
|
||||||
},
|
},
|
||||||
event: {
|
event: {
|
||||||
findUnique: vi.fn(),
|
findUnique: eventFindUniqueMock,
|
||||||
findMany: vi.fn(),
|
findMany: eventFindManyMock,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}));
|
}));
|
||||||
@@ -61,16 +67,21 @@ const createMockTournament = (id: number, ownerId: string | null): Event => ({
|
|||||||
|
|
||||||
describe('Tournament Permissions', () => {
|
describe('Tournament Permissions', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
vi.clearAllMocks();
|
// Reset mock implementations to default (no-op) before each test
|
||||||
|
// This prevents pollution from previous tests
|
||||||
|
getSessionMock.mockImplementation(() => undefined);
|
||||||
|
userFindUniqueMock.mockImplementation(() => undefined);
|
||||||
|
eventFindUniqueMock.mockImplementation(() => undefined);
|
||||||
|
eventFindManyMock.mockImplementation(() => undefined);
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('canManageTournament', () => {
|
describe('canManageTournament', () => {
|
||||||
test('should allow club_admin to manage any tournament', async () => {
|
test('should allow club_admin to manage any tournament', async () => {
|
||||||
vi.mocked(getSession).mockResolvedValue({
|
getSessionMock.mockImplementation(async () => ({
|
||||||
user: { id: 'admin-1', email: 'admin@example.com' },
|
user: { id: 'admin-1', email: 'admin@example.com' },
|
||||||
session: { token: 'test', expiresAt: new Date() }
|
session: { token: 'test', expiresAt: new Date() }
|
||||||
});
|
}));
|
||||||
vi.mocked(prisma.user.findUnique).mockResolvedValue(
|
userFindUniqueMock.mockImplementation(async () =>
|
||||||
createMockUser('admin-1', 'admin@example.com', 'club_admin')
|
createMockUser('admin-1', 'admin@example.com', 'club_admin')
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -79,14 +90,14 @@ describe('Tournament Permissions', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
test('should allow tournament_admin to manage their own tournament', async () => {
|
test('should allow tournament_admin to manage their own tournament', async () => {
|
||||||
vi.mocked(getSession).mockResolvedValue({
|
getSessionMock.mockImplementation(async () => ({
|
||||||
user: { id: 'tour-admin-1', email: 'tour@example.com' },
|
user: { id: 'tour-admin-1', email: 'tour@example.com' },
|
||||||
session: { token: 'test', expiresAt: new Date() }
|
session: { token: 'test', expiresAt: new Date() }
|
||||||
});
|
}));
|
||||||
vi.mocked(prisma.user.findUnique).mockResolvedValue(
|
userFindUniqueMock.mockImplementation(async () =>
|
||||||
createMockUser('tour-admin-1', 'tour@example.com', 'tournament_admin')
|
createMockUser('tour-admin-1', 'tour@example.com', 'tournament_admin')
|
||||||
);
|
);
|
||||||
vi.mocked(prisma.event.findUnique).mockResolvedValue(
|
eventFindUniqueMock.mockImplementation(async () =>
|
||||||
createMockTournament(1, 'tour-admin-1')
|
createMockTournament(1, 'tour-admin-1')
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -95,14 +106,14 @@ describe('Tournament Permissions', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
test('should deny tournament_admin from managing other users tournaments', async () => {
|
test('should deny tournament_admin from managing other users tournaments', async () => {
|
||||||
vi.mocked(getSession).mockResolvedValue({
|
getSessionMock.mockImplementation(async () => ({
|
||||||
user: { id: 'tour-admin-1', email: 'tour@example.com' },
|
user: { id: 'tour-admin-1', email: 'tour@example.com' },
|
||||||
session: { token: 'test', expiresAt: new Date() }
|
session: { token: 'test', expiresAt: new Date() }
|
||||||
});
|
}));
|
||||||
vi.mocked(prisma.user.findUnique).mockResolvedValue(
|
userFindUniqueMock.mockImplementation(async () =>
|
||||||
createMockUser('tour-admin-1', 'tour@example.com', 'tournament_admin')
|
createMockUser('tour-admin-1', 'tour@example.com', 'tournament_admin')
|
||||||
);
|
);
|
||||||
vi.mocked(prisma.event.findUnique).mockResolvedValue(
|
eventFindUniqueMock.mockImplementation(async () =>
|
||||||
createMockTournament(1, 'other-user-1')
|
createMockTournament(1, 'other-user-1')
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -112,11 +123,11 @@ describe('Tournament Permissions', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
test('should deny player from managing tournaments', async () => {
|
test('should deny player from managing tournaments', async () => {
|
||||||
vi.mocked(getSession).mockResolvedValue({
|
getSessionMock.mockImplementation(async () => ({
|
||||||
user: { id: 'player-1', email: 'player@example.com' },
|
user: { id: 'player-1', email: 'player@example.com' },
|
||||||
session: { token: 'test', expiresAt: new Date() }
|
session: { token: 'test', expiresAt: new Date() }
|
||||||
});
|
}));
|
||||||
vi.mocked(prisma.user.findUnique).mockResolvedValue(
|
userFindUniqueMock.mockImplementation(async () =>
|
||||||
createMockUser('player-1', 'player@example.com', 'player')
|
createMockUser('player-1', 'player@example.com', 'player')
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -126,7 +137,7 @@ describe('Tournament Permissions', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
test('should deny unauthenticated user', async () => {
|
test('should deny unauthenticated user', async () => {
|
||||||
vi.mocked(getSession).mockResolvedValue(null);
|
getSessionMock.mockImplementation(async () => null);
|
||||||
|
|
||||||
const result = await canManageTournament(999);
|
const result = await canManageTournament(999);
|
||||||
expect(result.allowed).toBe(false);
|
expect(result.allowed).toBe(false);
|
||||||
@@ -136,11 +147,11 @@ describe('Tournament Permissions', () => {
|
|||||||
|
|
||||||
describe('ownsTournament', () => {
|
describe('ownsTournament', () => {
|
||||||
test('should return true if user owns tournament', async () => {
|
test('should return true if user owns tournament', async () => {
|
||||||
vi.mocked(getSession).mockResolvedValue({
|
getSessionMock.mockImplementation(async () => ({
|
||||||
user: { id: 'owner-1', email: 'owner@example.com' },
|
user: { id: 'owner-1', email: 'owner@example.com' },
|
||||||
session: { token: 'test', expiresAt: new Date() }
|
session: { token: 'test', expiresAt: new Date() }
|
||||||
});
|
}));
|
||||||
vi.mocked(prisma.event.findUnique).mockResolvedValue(
|
eventFindUniqueMock.mockImplementation(async () =>
|
||||||
createMockTournament(1, 'owner-1')
|
createMockTournament(1, 'owner-1')
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -149,11 +160,11 @@ describe('Tournament Permissions', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
test('should return false if user does not own tournament', async () => {
|
test('should return false if user does not own tournament', async () => {
|
||||||
vi.mocked(getSession).mockResolvedValue({
|
getSessionMock.mockImplementation(async () => ({
|
||||||
user: { id: 'non-owner-1', email: 'nonowner@example.com' },
|
user: { id: 'non-owner-1', email: 'nonowner@example.com' },
|
||||||
session: { token: 'test', expiresAt: new Date() }
|
session: { token: 'test', expiresAt: new Date() }
|
||||||
});
|
}));
|
||||||
vi.mocked(prisma.event.findUnique).mockResolvedValue(
|
eventFindUniqueMock.mockImplementation(async () =>
|
||||||
createMockTournament(1, 'owner-1')
|
createMockTournament(1, 'owner-1')
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -165,11 +176,11 @@ describe('Tournament Permissions', () => {
|
|||||||
|
|
||||||
describe('getManageableTournaments', () => {
|
describe('getManageableTournaments', () => {
|
||||||
test('should return all tournaments for club_admin', async () => {
|
test('should return all tournaments for club_admin', async () => {
|
||||||
vi.mocked(getSession).mockResolvedValue({
|
getSessionMock.mockImplementation(async () => ({
|
||||||
user: { id: 'admin-1', email: 'admin@example.com' },
|
user: { id: 'admin-1', email: 'admin@example.com' },
|
||||||
session: { token: 'test', expiresAt: new Date() }
|
session: { token: 'test', expiresAt: new Date() }
|
||||||
});
|
}));
|
||||||
vi.mocked(prisma.user.findUnique).mockResolvedValue(
|
userFindUniqueMock.mockImplementation(async () =>
|
||||||
createMockUser('admin-1', 'admin@example.com', 'club_admin')
|
createMockUser('admin-1', 'admin@example.com', 'club_admin')
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -178,11 +189,11 @@ describe('Tournament Permissions', () => {
|
|||||||
createMockTournament(2, 'user-2'),
|
createMockTournament(2, 'user-2'),
|
||||||
createMockTournament(3, 'user-3'),
|
createMockTournament(3, 'user-3'),
|
||||||
];
|
];
|
||||||
vi.mocked(prisma.event.findMany).mockResolvedValue(mockTournaments);
|
eventFindManyMock.mockImplementation(async () => mockTournaments);
|
||||||
|
|
||||||
const result = await getManageableTournaments();
|
const result = await getManageableTournaments();
|
||||||
expect(result).toEqual(mockTournaments);
|
expect(result).toEqual(mockTournaments);
|
||||||
expect(prisma.event.findMany).toHaveBeenCalledWith({
|
expect(eventFindManyMock).toHaveBeenCalledWith({
|
||||||
where: { eventType: 'tournament' },
|
where: { eventType: 'tournament' },
|
||||||
include: { participants: true },
|
include: { participants: true },
|
||||||
orderBy: { createdAt: 'desc' }
|
orderBy: { createdAt: 'desc' }
|
||||||
@@ -190,11 +201,11 @@ describe('Tournament Permissions', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
test('should return only owned tournaments for tournament_admin', async () => {
|
test('should return only owned tournaments for tournament_admin', async () => {
|
||||||
vi.mocked(getSession).mockResolvedValue({
|
getSessionMock.mockImplementation(async () => ({
|
||||||
user: { id: 'tour-admin-1', email: 'tour@example.com' },
|
user: { id: 'tour-admin-1', email: 'tour@example.com' },
|
||||||
session: { token: 'test', expiresAt: new Date() }
|
session: { token: 'test', expiresAt: new Date() }
|
||||||
});
|
}));
|
||||||
vi.mocked(prisma.user.findUnique).mockResolvedValue(
|
userFindUniqueMock.mockImplementation(async () =>
|
||||||
createMockUser('tour-admin-1', 'tour@example.com', 'tournament_admin')
|
createMockUser('tour-admin-1', 'tour@example.com', 'tournament_admin')
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -202,11 +213,11 @@ describe('Tournament Permissions', () => {
|
|||||||
createMockTournament(1, 'tour-admin-1'),
|
createMockTournament(1, 'tour-admin-1'),
|
||||||
createMockTournament(2, 'tour-admin-1'),
|
createMockTournament(2, 'tour-admin-1'),
|
||||||
];
|
];
|
||||||
vi.mocked(prisma.event.findMany).mockResolvedValue(mockTournaments);
|
eventFindManyMock.mockImplementation(async () => mockTournaments);
|
||||||
|
|
||||||
const result = await getManageableTournaments();
|
const result = await getManageableTournaments();
|
||||||
expect(result).toEqual(mockTournaments);
|
expect(result).toEqual(mockTournaments);
|
||||||
expect(prisma.event.findMany).toHaveBeenCalledWith({
|
expect(eventFindManyMock).toHaveBeenCalledWith({
|
||||||
where: {
|
where: {
|
||||||
eventType: 'tournament',
|
eventType: 'tournament',
|
||||||
ownerId: 'tour-admin-1'
|
ownerId: 'tour-admin-1'
|
||||||
@@ -217,11 +228,11 @@ describe('Tournament Permissions', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
test('should return only non-draft tournaments for players', async () => {
|
test('should return only non-draft tournaments for players', async () => {
|
||||||
vi.mocked(getSession).mockResolvedValue({
|
getSessionMock.mockImplementation(async () => ({
|
||||||
user: { id: 'player-1', email: 'player@example.com' },
|
user: { id: 'player-1', email: 'player@example.com' },
|
||||||
session: { token: 'test', expiresAt: new Date() }
|
session: { token: 'test', expiresAt: new Date() }
|
||||||
});
|
}));
|
||||||
vi.mocked(prisma.user.findUnique).mockResolvedValue(
|
userFindUniqueMock.mockImplementation(async () =>
|
||||||
createMockUser('player-1', 'player@example.com', 'player')
|
createMockUser('player-1', 'player@example.com', 'player')
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -229,11 +240,11 @@ describe('Tournament Permissions', () => {
|
|||||||
createMockTournament(1, 'user-1'),
|
createMockTournament(1, 'user-1'),
|
||||||
createMockTournament(2, 'user-2'),
|
createMockTournament(2, 'user-2'),
|
||||||
];
|
];
|
||||||
vi.mocked(prisma.event.findMany).mockResolvedValue(mockTournaments);
|
eventFindManyMock.mockImplementation(async () => mockTournaments);
|
||||||
|
|
||||||
const result = await getManageableTournaments();
|
const result = await getManageableTournaments();
|
||||||
expect(result).toEqual(mockTournaments);
|
expect(result).toEqual(mockTournaments);
|
||||||
expect(prisma.event.findMany).toHaveBeenCalledWith({
|
expect(eventFindManyMock).toHaveBeenCalledWith({
|
||||||
where: {
|
where: {
|
||||||
eventType: 'tournament',
|
eventType: 'tournament',
|
||||||
status: { not: 'draft' }
|
status: { not: 'draft' }
|
||||||
@@ -249,14 +260,14 @@ describe('Tournament Permissions', () => {
|
|||||||
// This simulates the scenario where a tournament_admin user
|
// This simulates the scenario where a tournament_admin user
|
||||||
// clicks "Edit" on a tournament they own
|
// clicks "Edit" on a tournament they own
|
||||||
|
|
||||||
vi.mocked(getSession).mockResolvedValue({
|
getSessionMock.mockImplementation(async () => ({
|
||||||
user: { id: 'tour-admin-1', email: 'tour@example.com' },
|
user: { id: 'tour-admin-1', email: 'tour@example.com' },
|
||||||
session: { token: 'test', expiresAt: new Date() }
|
session: { token: 'test', expiresAt: new Date() }
|
||||||
});
|
}));
|
||||||
vi.mocked(prisma.user.findUnique).mockResolvedValue(
|
userFindUniqueMock.mockImplementation(async () =>
|
||||||
createMockUser('tour-admin-1', 'tour@example.com', 'tournament_admin')
|
createMockUser('tour-admin-1', 'tour@example.com', 'tournament_admin')
|
||||||
);
|
);
|
||||||
vi.mocked(prisma.event.findUnique).mockResolvedValue(
|
eventFindUniqueMock.mockImplementation(async () =>
|
||||||
createMockTournament(1, 'tour-admin-1')
|
createMockTournament(1, 'tour-admin-1')
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -271,11 +282,11 @@ describe('Tournament Permissions', () => {
|
|||||||
test('club_admin should still be able to manage any tournament', async () => {
|
test('club_admin should still be able to manage any tournament', async () => {
|
||||||
// This ensures we didn't break the existing club_admin functionality
|
// This ensures we didn't break the existing club_admin functionality
|
||||||
|
|
||||||
vi.mocked(getSession).mockResolvedValue({
|
getSessionMock.mockImplementation(async () => ({
|
||||||
user: { id: 'club-admin-1', email: 'club@example.com' },
|
user: { id: 'club-admin-1', email: 'club@example.com' },
|
||||||
session: { token: 'test', expiresAt: new Date() }
|
session: { token: 'test', expiresAt: new Date() }
|
||||||
});
|
}));
|
||||||
vi.mocked(prisma.user.findUnique).mockResolvedValue(
|
userFindUniqueMock.mockImplementation(async () =>
|
||||||
createMockUser('club-admin-1', 'club@example.com', 'club_admin')
|
createMockUser('club-admin-1', 'club@example.com', 'club_admin')
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -286,13 +297,16 @@ describe('Tournament Permissions', () => {
|
|||||||
test('players should still be denied from managing tournaments', async () => {
|
test('players should still be denied from managing tournaments', async () => {
|
||||||
// This ensures we didn't accidentally grant players access
|
// This ensures we didn't accidentally grant players access
|
||||||
|
|
||||||
vi.mocked(getSession).mockResolvedValue({
|
getSessionMock.mockImplementation(async () => ({
|
||||||
user: { id: 'player-1', email: 'player@example.com' },
|
user: { id: 'player-1', email: 'player@example.com' },
|
||||||
session: { token: 'test', expiresAt: new Date() }
|
session: { token: 'test', expiresAt: new Date() }
|
||||||
});
|
}));
|
||||||
vi.mocked(prisma.user.findUnique).mockResolvedValue(
|
userFindUniqueMock.mockImplementation(async () =>
|
||||||
createMockUser('player-1', 'player@example.com', 'player')
|
createMockUser('player-1', 'player@example.com', 'player')
|
||||||
);
|
);
|
||||||
|
eventFindUniqueMock.mockImplementation(async () =>
|
||||||
|
createMockTournament(1, 'other-user-1')
|
||||||
|
);
|
||||||
|
|
||||||
const result = await canManageTournament(1);
|
const result = await canManageTournament(1);
|
||||||
expect(result.allowed).toBe(false);
|
expect(result.allowed).toBe(false);
|
||||||
|
|||||||
@@ -3,23 +3,33 @@
|
|||||||
* Tests the allowTies field is properly saved when updating tournaments
|
* Tests the allowTies field is properly saved when updating tournaments
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { describe, it, expect, vi, beforeEach } from 'vitest';
|
import { describe, it, expect, mock, beforeEach,} from 'bun:test';
|
||||||
import { prisma } from '@/lib/prisma';
|
import { prisma } from '@/lib/prisma';
|
||||||
|
|
||||||
|
// Create mock functions at module level
|
||||||
|
const eventFindUniqueMock = mock(() => {});
|
||||||
|
const eventUpdateMock = mock(() => {});
|
||||||
|
const canManageTournamentMock = mock(() => {});
|
||||||
|
const canDeleteTournamentMock = mock(() => {});
|
||||||
|
|
||||||
|
// Store default implementations
|
||||||
|
const defaultCanManageTournament = canManageTournamentMock.mockResolvedValue({ allowed: true });
|
||||||
|
const defaultCanDeleteTournament = canDeleteTournamentMock.mockResolvedValue({ allowed: true });
|
||||||
|
|
||||||
// Mock the prisma client
|
// Mock the prisma client
|
||||||
vi.mock('@/lib/prisma', () => ({
|
mock.module('@/lib/prisma', () => ({
|
||||||
prisma: {
|
prisma: {
|
||||||
event: {
|
event: {
|
||||||
findUnique: vi.fn(),
|
findUnique: eventFindUniqueMock,
|
||||||
update: vi.fn(),
|
update: eventUpdateMock,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}));
|
}));
|
||||||
|
|
||||||
// Mock the permissions module
|
// Mock the permissions module
|
||||||
vi.mock('@/lib/permissions', () => ({
|
mock.module('@/lib/permissions', () => ({
|
||||||
canManageTournament: vi.fn().mockResolvedValue({ allowed: true }),
|
canManageTournament: defaultCanManageTournament,
|
||||||
canDeleteTournament: vi.fn().mockResolvedValue({ allowed: true }),
|
canDeleteTournament: defaultCanDeleteTournament,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
// Import the route handler after mocking
|
// Import the route handler after mocking
|
||||||
@@ -27,12 +37,16 @@ import { PUT } from '@/app/api/tournaments/[id]/route';
|
|||||||
|
|
||||||
describe('Tournament Update API', () => {
|
describe('Tournament Update API', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
vi.clearAllMocks();
|
// Clear all mock history before each test
|
||||||
|
eventFindUniqueMock.mockClear();
|
||||||
|
eventUpdateMock.mockClear();
|
||||||
|
canManageTournamentMock.mockClear();
|
||||||
|
canDeleteTournamentMock.mockClear();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should update allowTies field when provided', async () => {
|
it('should update allowTies field when provided', async () => {
|
||||||
// Mock existing tournament
|
// Mock existing tournament
|
||||||
vi.mocked(prisma.event.findUnique).mockResolvedValue({
|
eventFindUniqueMock.mockImplementation(async () => ({
|
||||||
id: 1,
|
id: 1,
|
||||||
name: 'Test Tournament',
|
name: 'Test Tournament',
|
||||||
allowTies: false,
|
allowTies: false,
|
||||||
@@ -46,10 +60,10 @@ describe('Tournament Update API', () => {
|
|||||||
ownerId: null,
|
ownerId: null,
|
||||||
createdAt: new Date(),
|
createdAt: new Date(),
|
||||||
updatedAt: new Date(),
|
updatedAt: new Date(),
|
||||||
} as any);
|
} as any));
|
||||||
|
|
||||||
// Mock successful update
|
// Mock successful update
|
||||||
vi.mocked(prisma.event.update).mockResolvedValue({
|
eventUpdateMock.mockImplementation(async () => ({
|
||||||
id: 1,
|
id: 1,
|
||||||
name: 'Test Tournament',
|
name: 'Test Tournament',
|
||||||
allowTies: true,
|
allowTies: true,
|
||||||
@@ -63,7 +77,7 @@ describe('Tournament Update API', () => {
|
|||||||
ownerId: null,
|
ownerId: null,
|
||||||
createdAt: new Date(),
|
createdAt: new Date(),
|
||||||
updatedAt: new Date(),
|
updatedAt: new Date(),
|
||||||
} as any);
|
} as any));
|
||||||
|
|
||||||
const request = new Request('http://localhost/api/tournaments/1', {
|
const request = new Request('http://localhost/api/tournaments/1', {
|
||||||
method: 'PUT',
|
method: 'PUT',
|
||||||
@@ -78,7 +92,7 @@ describe('Tournament Update API', () => {
|
|||||||
const response = await PUT(request, { params });
|
const response = await PUT(request, { params });
|
||||||
|
|
||||||
expect(response.status).toBe(200);
|
expect(response.status).toBe(200);
|
||||||
expect(vi.mocked(prisma.event.update)).toHaveBeenCalledWith(
|
expect(prisma.event.update).toHaveBeenCalledWith(
|
||||||
expect.objectContaining({
|
expect.objectContaining({
|
||||||
data: expect.objectContaining({
|
data: expect.objectContaining({
|
||||||
allowTies: true,
|
allowTies: true,
|
||||||
@@ -89,7 +103,7 @@ describe('Tournament Update API', () => {
|
|||||||
|
|
||||||
it('should default allowTies to false when not provided', async () => {
|
it('should default allowTies to false when not provided', async () => {
|
||||||
// Mock existing tournament
|
// Mock existing tournament
|
||||||
vi.mocked(prisma.event.findUnique).mockResolvedValue({
|
eventFindUniqueMock.mockImplementation(async () => ({
|
||||||
id: 1,
|
id: 1,
|
||||||
name: 'Test Tournament',
|
name: 'Test Tournament',
|
||||||
allowTies: true,
|
allowTies: true,
|
||||||
@@ -103,10 +117,10 @@ describe('Tournament Update API', () => {
|
|||||||
ownerId: null,
|
ownerId: null,
|
||||||
createdAt: new Date(),
|
createdAt: new Date(),
|
||||||
updatedAt: new Date(),
|
updatedAt: new Date(),
|
||||||
} as any);
|
} as any));
|
||||||
|
|
||||||
// Mock successful update
|
// Mock successful update
|
||||||
vi.mocked(prisma.event.update).mockResolvedValue({
|
eventUpdateMock.mockImplementation(async () => ({
|
||||||
id: 1,
|
id: 1,
|
||||||
name: 'Test Tournament',
|
name: 'Test Tournament',
|
||||||
allowTies: false,
|
allowTies: false,
|
||||||
@@ -120,7 +134,7 @@ describe('Tournament Update API', () => {
|
|||||||
ownerId: null,
|
ownerId: null,
|
||||||
createdAt: new Date(),
|
createdAt: new Date(),
|
||||||
updatedAt: new Date(),
|
updatedAt: new Date(),
|
||||||
} as any);
|
} as any));
|
||||||
|
|
||||||
const request = new Request('http://localhost/api/tournaments/1', {
|
const request = new Request('http://localhost/api/tournaments/1', {
|
||||||
method: 'PUT',
|
method: 'PUT',
|
||||||
@@ -135,7 +149,7 @@ describe('Tournament Update API', () => {
|
|||||||
const response = await PUT(request, { params });
|
const response = await PUT(request, { params });
|
||||||
|
|
||||||
expect(response.status).toBe(200);
|
expect(response.status).toBe(200);
|
||||||
expect(vi.mocked(prisma.event.update)).toHaveBeenCalledWith(
|
expect(prisma.event.update).toHaveBeenCalledWith(
|
||||||
expect.objectContaining({
|
expect.objectContaining({
|
||||||
data: expect.objectContaining({
|
data: expect.objectContaining({
|
||||||
allowTies: false, // Should default to false
|
allowTies: false, // Should default to false
|
||||||
@@ -146,7 +160,7 @@ describe('Tournament Update API', () => {
|
|||||||
|
|
||||||
it('should preserve allowTies value when updating other fields', async () => {
|
it('should preserve allowTies value when updating other fields', async () => {
|
||||||
// Mock existing tournament with allowTies = true
|
// Mock existing tournament with allowTies = true
|
||||||
vi.mocked(prisma.event.findUnique).mockResolvedValue({
|
eventFindUniqueMock.mockImplementation(async () => ({
|
||||||
id: 1,
|
id: 1,
|
||||||
name: 'Test Tournament',
|
name: 'Test Tournament',
|
||||||
allowTies: true,
|
allowTies: true,
|
||||||
@@ -160,10 +174,10 @@ describe('Tournament Update API', () => {
|
|||||||
ownerId: null,
|
ownerId: null,
|
||||||
createdAt: new Date(),
|
createdAt: new Date(),
|
||||||
updatedAt: new Date(),
|
updatedAt: new Date(),
|
||||||
} as any);
|
} as any));
|
||||||
|
|
||||||
// Mock successful update
|
// Mock successful update
|
||||||
vi.mocked(prisma.event.update).mockResolvedValue({
|
eventUpdateMock.mockImplementation(async () => ({
|
||||||
id: 1,
|
id: 1,
|
||||||
name: 'Updated Tournament Name',
|
name: 'Updated Tournament Name',
|
||||||
allowTies: true,
|
allowTies: true,
|
||||||
@@ -177,7 +191,7 @@ describe('Tournament Update API', () => {
|
|||||||
ownerId: null,
|
ownerId: null,
|
||||||
createdAt: new Date(),
|
createdAt: new Date(),
|
||||||
updatedAt: new Date(),
|
updatedAt: new Date(),
|
||||||
} as any);
|
} as any));
|
||||||
|
|
||||||
const request = new Request('http://localhost/api/tournaments/1', {
|
const request = new Request('http://localhost/api/tournaments/1', {
|
||||||
method: 'PUT',
|
method: 'PUT',
|
||||||
@@ -192,7 +206,7 @@ describe('Tournament Update API', () => {
|
|||||||
const response = await PUT(request, { params });
|
const response = await PUT(request, { params });
|
||||||
|
|
||||||
expect(response.status).toBe(200);
|
expect(response.status).toBe(200);
|
||||||
const updateCall = vi.mocked(prisma.event.update).mock.calls[0][0];
|
const updateCall = eventUpdateMock.mock.calls[0][0];
|
||||||
expect(updateCall.data.allowTies).toBe(true);
|
expect(updateCall.data.allowTies).toBe(true);
|
||||||
expect(updateCall.data.name).toBe('Updated Tournament Name');
|
expect(updateCall.data.name).toBe('Updated Tournament Name');
|
||||||
expect(updateCall.data.targetScore).toBe(10);
|
expect(updateCall.data.targetScore).toBe(10);
|
||||||
|
|||||||
@@ -4,25 +4,31 @@
|
|||||||
* Tests for user name editing and profile management
|
* Tests for user name editing and profile management
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { describe, test, expect, vi, beforeEach } from 'vitest';
|
import { describe, test, expect, mock, beforeEach,} from 'bun:test';
|
||||||
import { hasRole } from '@/lib/permissions';
|
import { hasRole } from '@/lib/permissions';
|
||||||
import { getSession } from '@/lib/auth-simple';
|
import { getSession } from '@/lib/auth-simple';
|
||||||
import { prisma } from '@/lib/prisma';
|
import { prisma } from '@/lib/prisma';
|
||||||
import type { User, Player } from '@prisma/client';
|
import type { User, Player } from '@prisma/client';
|
||||||
|
|
||||||
|
// Create mock functions at module level
|
||||||
|
const getSessionMock = mock(() => {});
|
||||||
|
const userFindUniqueMock = mock(() => {});
|
||||||
|
const userUpdateMock = mock(() => {});
|
||||||
|
const playerFindUniqueMock = mock(() => {});
|
||||||
|
|
||||||
// Mock the getSession and prisma functions
|
// Mock the getSession and prisma functions
|
||||||
vi.mock('@/lib/auth-simple', () => ({
|
mock.module('@/lib/auth-simple', () => ({
|
||||||
getSession: vi.fn(),
|
getSession: getSessionMock,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
vi.mock('@/lib/prisma', () => ({
|
mock.module('@/lib/prisma', () => ({
|
||||||
prisma: {
|
prisma: {
|
||||||
user: {
|
user: {
|
||||||
findUnique: vi.fn(),
|
findUnique: userFindUniqueMock,
|
||||||
update: vi.fn(),
|
update: userUpdateMock,
|
||||||
},
|
},
|
||||||
player: {
|
player: {
|
||||||
findUnique: vi.fn(),
|
findUnique: playerFindUniqueMock,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}));
|
}));
|
||||||
@@ -56,16 +62,20 @@ const createMockPlayer = (id: number, name: string): Player => ({
|
|||||||
|
|
||||||
describe('User Management', () => {
|
describe('User Management', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
vi.clearAllMocks();
|
// Reset mock implementations to default (no-op) before each test
|
||||||
|
getSessionMock.mockImplementation(() => undefined);
|
||||||
|
userFindUniqueMock.mockImplementation(() => undefined);
|
||||||
|
userUpdateMock.mockImplementation(() => undefined);
|
||||||
|
playerFindUniqueMock.mockImplementation(() => undefined);
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('User Name Editing', () => {
|
describe('User Name Editing', () => {
|
||||||
test('club_admin should be able to edit any user name', async () => {
|
test('club_admin should be able to edit any user name', async () => {
|
||||||
vi.mocked(getSession).mockResolvedValue({
|
getSessionMock.mockImplementation(async () => ({
|
||||||
user: { id: 'admin-1', email: 'admin@example.com' },
|
user: { id: 'admin-1', email: 'admin@example.com' },
|
||||||
session: { token: 'test', expiresAt: new Date() }
|
session: { token: 'test', expiresAt: new Date() }
|
||||||
});
|
}));
|
||||||
vi.mocked(prisma.user.findUnique).mockResolvedValue(
|
userFindUniqueMock.mockImplementation(async () =>
|
||||||
createMockUser('admin-1', 'admin@example.com', 'club_admin')
|
createMockUser('admin-1', 'admin@example.com', 'club_admin')
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -74,11 +84,11 @@ describe('User Management', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
test('tournament_admin should NOT be able to edit user names', async () => {
|
test('tournament_admin should NOT be able to edit user names', async () => {
|
||||||
vi.mocked(getSession).mockResolvedValue({
|
getSessionMock.mockImplementation(async () => ({
|
||||||
user: { id: 'tour-admin-1', email: 'tour@example.com' },
|
user: { id: 'admin-1', email: 'admin@example.com' },
|
||||||
session: { token: 'test', expiresAt: new Date() }
|
session: { token: 'test', expiresAt: new Date() }
|
||||||
});
|
}));
|
||||||
vi.mocked(prisma.user.findUnique).mockResolvedValue(
|
userFindUniqueMock.mockImplementation(async () =>
|
||||||
createMockUser('tour-admin-1', 'tour@example.com', 'tournament_admin')
|
createMockUser('tour-admin-1', 'tour@example.com', 'tournament_admin')
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -87,11 +97,11 @@ describe('User Management', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
test('player should NOT be able to edit user names', async () => {
|
test('player should NOT be able to edit user names', async () => {
|
||||||
vi.mocked(getSession).mockResolvedValue({
|
getSessionMock.mockImplementation(async () => ({
|
||||||
user: { id: 'player-1', email: 'player@example.com' },
|
user: { id: 'admin-1', email: 'admin@example.com' },
|
||||||
session: { token: 'test', expiresAt: new Date() }
|
session: { token: 'test', expiresAt: new Date() }
|
||||||
});
|
}));
|
||||||
vi.mocked(prisma.user.findUnique).mockResolvedValue(
|
userFindUniqueMock.mockImplementation(async () =>
|
||||||
createMockUser('player-1', 'player@example.com', 'player')
|
createMockUser('player-1', 'player@example.com', 'player')
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -100,7 +110,7 @@ describe('User Management', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
test('unauthenticated user should NOT be able to edit user names', async () => {
|
test('unauthenticated user should NOT be able to edit user names', async () => {
|
||||||
vi.mocked(getSession).mockResolvedValue(null);
|
getSessionMock.mockImplementation(async () => null);
|
||||||
|
|
||||||
const result = await hasRole('club_admin');
|
const result = await hasRole('club_admin');
|
||||||
expect(result.allowed).toBe(false);
|
expect(result.allowed).toBe(false);
|
||||||
@@ -111,11 +121,11 @@ describe('User Management', () => {
|
|||||||
test('user should be able to view their own profile', async () => {
|
test('user should be able to view their own profile', async () => {
|
||||||
const mockUser = createMockUser('user-1', 'user@example.com', 'player');
|
const mockUser = createMockUser('user-1', 'user@example.com', 'player');
|
||||||
|
|
||||||
vi.mocked(getSession).mockResolvedValue({
|
getSessionMock.mockImplementation(async () => ({
|
||||||
user: { id: 'user-1', email: 'user@example.com' },
|
user: { id: 'admin-1', email: 'admin@example.com' },
|
||||||
session: { token: 'test', expiresAt: new Date() }
|
session: { token: 'test', expiresAt: new Date() }
|
||||||
});
|
}));
|
||||||
vi.mocked(prisma.user.findUnique).mockResolvedValue(mockUser);
|
userFindUniqueMock.mockImplementation(async () => mockUser);
|
||||||
|
|
||||||
// In the actual implementation, this would check if session.user.id === params.id
|
// In the actual implementation, this would check if session.user.id === params.id
|
||||||
const canViewOwnProfile = true; // This logic is in the API route
|
const canViewOwnProfile = true; // This logic is in the API route
|
||||||
@@ -126,11 +136,11 @@ describe('User Management', () => {
|
|||||||
const mockAdmin = createMockUser('admin-1', 'admin@example.com', 'club_admin');
|
const mockAdmin = createMockUser('admin-1', 'admin@example.com', 'club_admin');
|
||||||
const mockUser = createMockUser('user-1', 'user@example.com', 'player');
|
const mockUser = createMockUser('user-1', 'user@example.com', 'player');
|
||||||
|
|
||||||
vi.mocked(getSession).mockResolvedValue({
|
getSessionMock.mockImplementation(async () => ({
|
||||||
user: { id: 'admin-1', email: 'admin@example.com' },
|
user: { id: 'admin-1', email: 'admin@example.com' },
|
||||||
session: { token: 'test', expiresAt: new Date() }
|
session: { token: 'test', expiresAt: new Date() }
|
||||||
});
|
}));
|
||||||
vi.mocked(prisma.user.findUnique)
|
(userFindUniqueMock)
|
||||||
.mockResolvedValueOnce(mockAdmin) // For the requesting user
|
.mockResolvedValueOnce(mockAdmin) // For the requesting user
|
||||||
.mockResolvedValueOnce(mockUser); // For the target user
|
.mockResolvedValueOnce(mockUser); // For the target user
|
||||||
|
|
||||||
@@ -142,11 +152,11 @@ describe('User Management', () => {
|
|||||||
test('non-admin should NOT be able to view other user profiles', async () => {
|
test('non-admin should NOT be able to view other user profiles', async () => {
|
||||||
const mockUser = createMockUser('user-1', 'user@example.com', 'player');
|
const mockUser = createMockUser('user-1', 'user@example.com', 'player');
|
||||||
|
|
||||||
vi.mocked(getSession).mockResolvedValue({
|
getSessionMock.mockImplementation(async () => ({
|
||||||
user: { id: 'user-1', email: 'user@example.com' },
|
user: { id: 'admin-1', email: 'admin@example.com' },
|
||||||
session: { token: 'test', expiresAt: new Date() }
|
session: { token: 'test', expiresAt: new Date() }
|
||||||
});
|
}));
|
||||||
vi.mocked(prisma.user.findUnique).mockResolvedValue(mockUser);
|
userFindUniqueMock.mockImplementation(async () => mockUser);
|
||||||
|
|
||||||
// In the actual implementation, this would check if session.user.id === params.id
|
// In the actual implementation, this would check if session.user.id === params.id
|
||||||
const canViewOtherProfile = false; // This logic is in the API route
|
const canViewOtherProfile = false; // This logic is in the API route
|
||||||
@@ -159,11 +169,11 @@ describe('User Management', () => {
|
|||||||
const mockUser = createMockUser('user-1', 'user@example.com', 'club_admin');
|
const mockUser = createMockUser('user-1', 'user@example.com', 'club_admin');
|
||||||
const mockPlayer = createMockPlayer(1, 'Old Name');
|
const mockPlayer = createMockPlayer(1, 'Old Name');
|
||||||
|
|
||||||
vi.mocked(getSession).mockResolvedValue({
|
getSessionMock.mockImplementation(async () => ({
|
||||||
user: { id: 'user-1', email: 'user@example.com' },
|
user: { id: 'admin-1', email: 'admin@example.com' },
|
||||||
session: { token: 'test', expiresAt: new Date() }
|
session: { token: 'test', expiresAt: new Date() }
|
||||||
});
|
}));
|
||||||
vi.mocked(prisma.user.findUnique).mockResolvedValue(mockUser);
|
userFindUniqueMock.mockImplementation(async () => mockUser);
|
||||||
|
|
||||||
const updatedUser = {
|
const updatedUser = {
|
||||||
...mockUser,
|
...mockUser,
|
||||||
@@ -171,7 +181,7 @@ describe('User Management', () => {
|
|||||||
player: { ...mockPlayer, name: 'New Name', normalizedName: 'new name' }
|
player: { ...mockPlayer, name: 'New Name', normalizedName: 'new name' }
|
||||||
};
|
};
|
||||||
|
|
||||||
vi.mocked(prisma.user.update).mockResolvedValue(updatedUser);
|
userUpdateMock.mockImplementation(async () => updatedUser);
|
||||||
|
|
||||||
// The API route should update both user.name and player.name
|
// The API route should update both user.name and player.name
|
||||||
expect(updatedUser.name).toBe('New Name');
|
expect(updatedUser.name).toBe('New Name');
|
||||||
|
|||||||
@@ -227,24 +227,30 @@ export default async function TournamentDetailPage({ params }: PageProps) {
|
|||||||
{/* Tabs */}
|
{/* Tabs */}
|
||||||
<div className="border-b border-gray-200">
|
<div className="border-b border-gray-200">
|
||||||
<nav className="-mb-px flex space-x-8">
|
<nav className="-mb-px flex space-x-8">
|
||||||
<button className="border-green-500 text-green-600 whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm">
|
<span className="border-green-500 text-green-600 whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm">
|
||||||
Overview
|
Overview
|
||||||
</button>
|
</span>
|
||||||
<button className="border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300 whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm">
|
<span className="border-transparent text-gray-400 whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm cursor-not-allowed">
|
||||||
Participants
|
Participants
|
||||||
</button>
|
</span>
|
||||||
<button className="border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300 whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm">
|
<span className="border-transparent text-gray-400 whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm cursor-not-allowed">
|
||||||
Teams
|
Teams
|
||||||
</button>
|
</span>
|
||||||
<button className="border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300 whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm">
|
<Link
|
||||||
|
href={`/admin/tournaments/${tournament.id}/schedule`}
|
||||||
|
className="border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300 whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
|
||||||
|
>
|
||||||
Schedule
|
Schedule
|
||||||
</button>
|
</Link>
|
||||||
<button className="border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300 whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm">
|
<Link
|
||||||
|
href={`/admin/tournaments/${tournament.id}/results`}
|
||||||
|
className="border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300 whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
|
||||||
|
>
|
||||||
Results
|
Results
|
||||||
</button>
|
</Link>
|
||||||
<button className="border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300 whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm">
|
<span className="border-transparent text-gray-400 whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm cursor-not-allowed">
|
||||||
Analytics
|
Analytics
|
||||||
</button>
|
</span>
|
||||||
</nav>
|
</nav>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,219 @@
|
|||||||
|
import { prisma } from "@/lib/prisma"
|
||||||
|
export const dynamic = "force-dynamic";
|
||||||
|
import Navigation from "@/components/Navigation"
|
||||||
|
import Link from "next/link"
|
||||||
|
import { notFound, redirect } from "next/navigation"
|
||||||
|
import { canManageTournament } from "@/lib/permissions"
|
||||||
|
import { ScheduleGenerator } from "@/components/ScheduleGenerator"
|
||||||
|
|
||||||
|
interface PageProps {
|
||||||
|
params: {
|
||||||
|
id: string
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const statusColors: Record<string, string> = {
|
||||||
|
pending: "bg-gray-100 text-gray-700",
|
||||||
|
in_progress: "bg-yellow-100 text-yellow-800",
|
||||||
|
completed: "bg-green-100 text-green-800",
|
||||||
|
}
|
||||||
|
|
||||||
|
export default async function TournamentSchedulePage({ params }: PageProps) {
|
||||||
|
const { id } = await params
|
||||||
|
const tournamentId = parseInt(id, 10)
|
||||||
|
|
||||||
|
if (isNaN(tournamentId)) {
|
||||||
|
notFound()
|
||||||
|
}
|
||||||
|
|
||||||
|
const permission = await canManageTournament(tournamentId)
|
||||||
|
if (!permission.allowed) {
|
||||||
|
redirect("/auth/login")
|
||||||
|
}
|
||||||
|
|
||||||
|
const tournament = await prisma.event.findUnique({
|
||||||
|
where: { id: tournamentId },
|
||||||
|
include: {
|
||||||
|
teams: {
|
||||||
|
include: {
|
||||||
|
player1: true,
|
||||||
|
player2: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
rounds: {
|
||||||
|
orderBy: { roundNumber: "asc" },
|
||||||
|
include: {
|
||||||
|
bracketMatchups: {
|
||||||
|
include: {
|
||||||
|
team1: {
|
||||||
|
include: { player1: true, player2: true },
|
||||||
|
},
|
||||||
|
team2: {
|
||||||
|
include: { player1: true, player2: true },
|
||||||
|
},
|
||||||
|
match: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
if (!tournament) {
|
||||||
|
notFound()
|
||||||
|
}
|
||||||
|
|
||||||
|
const hasSchedule = tournament.rounds.length > 0
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="min-h-screen bg-gray-50">
|
||||||
|
<Navigation />
|
||||||
|
|
||||||
|
<main className="max-w-7xl mx-auto py-6 sm:px-6 lg:px-8">
|
||||||
|
<div className="px-4 py-6 sm:px-0">
|
||||||
|
{/* Breadcrumb */}
|
||||||
|
<nav className="mb-4">
|
||||||
|
<ol className="flex items-center space-x-2">
|
||||||
|
<li>
|
||||||
|
<Link href="/admin/tournaments" className="text-green-600 hover:text-green-900">
|
||||||
|
Tournaments
|
||||||
|
</Link>
|
||||||
|
</li>
|
||||||
|
<li className="text-gray-400">/</li>
|
||||||
|
<li>
|
||||||
|
<Link href={`/admin/tournaments/${tournament.id}`} className="text-green-600 hover:text-green-900">
|
||||||
|
{tournament.name}
|
||||||
|
</Link>
|
||||||
|
</li>
|
||||||
|
<li className="text-gray-400">/</li>
|
||||||
|
<li className="text-gray-600">Schedule</li>
|
||||||
|
</ol>
|
||||||
|
</nav>
|
||||||
|
|
||||||
|
{/* Page Header */}
|
||||||
|
<div className="bg-white shadow rounded-lg p-6 mb-6">
|
||||||
|
<h1 className="text-2xl font-bold text-gray-900">Tournament Schedule</h1>
|
||||||
|
<p className="text-gray-500 mt-1">
|
||||||
|
{tournament.name} — {tournament.teams.length} teams
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Schedule Generator (when no schedule exists) */}
|
||||||
|
{!hasSchedule && (
|
||||||
|
<div className="bg-white shadow rounded-lg p-6 mb-6">
|
||||||
|
<h2 className="text-lg font-medium text-gray-900 mb-4">
|
||||||
|
No Schedule Generated
|
||||||
|
</h2>
|
||||||
|
<ScheduleGenerator
|
||||||
|
tournamentId={tournamentId}
|
||||||
|
teamCount={tournament.teams.length}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Schedule Rounds */}
|
||||||
|
{hasSchedule && tournament.rounds.map((round) => (
|
||||||
|
<div key={round.id} className="bg-white shadow rounded-lg p-6 mb-6">
|
||||||
|
<div className="flex justify-between items-center mb-4">
|
||||||
|
<h2 className="text-lg font-medium text-gray-900">
|
||||||
|
Round {round.roundNumber}
|
||||||
|
</h2>
|
||||||
|
<span className={`px-2 py-1 text-xs font-medium rounded-full ${statusColors[round.status] || statusColors.pending}`}>
|
||||||
|
{round.status.replace("_", " ")}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{round.bracketMatchups.length === 0 ? (
|
||||||
|
<p className="text-gray-500">No matchups in this round.</p>
|
||||||
|
) : (
|
||||||
|
<div className="space-y-3">
|
||||||
|
{round.bracketMatchups.map((matchup) => {
|
||||||
|
const team1Name = matchup.team1
|
||||||
|
? `${matchup.team1.player1.name} + ${matchup.team1.player2.name}`
|
||||||
|
: "TBD"
|
||||||
|
const team2Name = matchup.team2
|
||||||
|
? `${matchup.team2.player1.name} + ${matchup.team2.player2.name}`
|
||||||
|
: "TBD"
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
key={matchup.id}
|
||||||
|
className="border border-gray-200 rounded p-3"
|
||||||
|
>
|
||||||
|
<div className="flex justify-between items-center">
|
||||||
|
<div className="flex-1">
|
||||||
|
<div className="flex items-center space-x-2">
|
||||||
|
{matchup.tableNumber && (
|
||||||
|
<span className="text-xs text-gray-400 bg-gray-100 px-2 py-0.5 rounded">
|
||||||
|
Table {matchup.tableNumber}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
<span className={`px-2 py-0.5 text-xs font-medium rounded-full ${statusColors[matchup.status] || statusColors.pending}`}>
|
||||||
|
{matchup.status.replace("_", " ")}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<p className="font-medium mt-1">
|
||||||
|
{team1Name} <span className="text-gray-400">vs</span> {team2Name}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="flex items-center space-x-3">
|
||||||
|
{matchup.match ? (
|
||||||
|
<div className="flex items-center space-x-2">
|
||||||
|
<span className={`font-bold ${
|
||||||
|
matchup.match.team1Score > matchup.match.team2Score
|
||||||
|
? 'text-green-600'
|
||||||
|
: 'text-gray-900'
|
||||||
|
}`}>
|
||||||
|
{matchup.match.team1Score}
|
||||||
|
</span>
|
||||||
|
<span className="text-gray-400">-</span>
|
||||||
|
<span className={`font-bold ${
|
||||||
|
matchup.match.team2Score > matchup.match.team1Score
|
||||||
|
? 'text-green-600'
|
||||||
|
: 'text-gray-900'
|
||||||
|
}`}>
|
||||||
|
{matchup.match.team2Score}
|
||||||
|
</span>
|
||||||
|
<Link
|
||||||
|
href={`/matches/${matchup.match.id}`}
|
||||||
|
className="text-green-600 hover:text-green-900 text-sm"
|
||||||
|
>
|
||||||
|
View
|
||||||
|
</Link>
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<Link
|
||||||
|
href={`/admin/tournaments/${tournament.id}/results`}
|
||||||
|
className="px-3 py-1 border border-green-300 rounded text-sm font-medium text-green-700 hover:bg-green-50"
|
||||||
|
>
|
||||||
|
Enter Result
|
||||||
|
</Link>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
|
||||||
|
{/* Actions when schedule exists */}
|
||||||
|
{hasSchedule && (
|
||||||
|
<div className="bg-white shadow rounded-lg p-6">
|
||||||
|
<h2 className="text-lg font-medium text-gray-900 mb-4">
|
||||||
|
Schedule Actions
|
||||||
|
</h2>
|
||||||
|
<ScheduleGenerator
|
||||||
|
tournamentId={tournamentId}
|
||||||
|
teamCount={tournament.teams.length}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,239 @@
|
|||||||
|
import { NextResponse } from "next/server";
|
||||||
|
import { prisma } from "@/lib/prisma";
|
||||||
|
import { canManageTournament } from "@/lib/permissions";
|
||||||
|
import { generateRoundRobin, validateScheduleInput } from "@/lib/schedule-generator";
|
||||||
|
|
||||||
|
interface RouteParams {
|
||||||
|
params: Promise<{
|
||||||
|
id: string;
|
||||||
|
}>;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* GET /api/tournaments/[id]/schedule
|
||||||
|
*
|
||||||
|
* Fetch the tournament schedule (rounds with matchups).
|
||||||
|
*/
|
||||||
|
export async function GET(_request: Request, { params }: RouteParams) {
|
||||||
|
try {
|
||||||
|
const { id } = await params;
|
||||||
|
const tournamentId = parseInt(id);
|
||||||
|
|
||||||
|
if (isNaN(tournamentId)) {
|
||||||
|
return NextResponse.json(
|
||||||
|
{ error: "Invalid tournament ID" },
|
||||||
|
{ status: 400 }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const permission = await canManageTournament(tournamentId);
|
||||||
|
if (!permission.allowed) {
|
||||||
|
return NextResponse.json(
|
||||||
|
{ error: permission.reason || "Not authorized to view this tournament" },
|
||||||
|
{ status: 403 }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const tournament = await prisma.event.findUnique({
|
||||||
|
where: { id: tournamentId },
|
||||||
|
include: {
|
||||||
|
rounds: {
|
||||||
|
orderBy: { roundNumber: "asc" },
|
||||||
|
include: {
|
||||||
|
bracketMatchups: {
|
||||||
|
include: {
|
||||||
|
team1: {
|
||||||
|
include: { player1: true, player2: true },
|
||||||
|
},
|
||||||
|
team2: {
|
||||||
|
include: { player1: true, player2: true },
|
||||||
|
},
|
||||||
|
match: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!tournament) {
|
||||||
|
return NextResponse.json(
|
||||||
|
{ error: "Tournament not found" },
|
||||||
|
{ status: 404 }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return NextResponse.json({ rounds: tournament.rounds });
|
||||||
|
} catch (error: unknown) {
|
||||||
|
console.error("Error fetching schedule:", error);
|
||||||
|
const message =
|
||||||
|
error instanceof Error ? error.message : "Failed to fetch schedule";
|
||||||
|
return NextResponse.json({ error: message }, { status: 500 });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* POST /api/tournaments/[id]/schedule
|
||||||
|
*
|
||||||
|
* Generate a round-robin schedule for the tournament.
|
||||||
|
* Creates TournamentRound and BracketMatchup records.
|
||||||
|
*/
|
||||||
|
export async function POST(_request: Request, { params }: RouteParams) {
|
||||||
|
try {
|
||||||
|
const { id } = await params;
|
||||||
|
const tournamentId = parseInt(id);
|
||||||
|
|
||||||
|
if (isNaN(tournamentId)) {
|
||||||
|
return NextResponse.json(
|
||||||
|
{ error: "Invalid tournament ID" },
|
||||||
|
{ status: 400 }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const permission = await canManageTournament(tournamentId);
|
||||||
|
if (!permission.allowed) {
|
||||||
|
return NextResponse.json(
|
||||||
|
{ error: permission.reason || "Not authorized to manage this tournament" },
|
||||||
|
{ status: 403 }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check tournament exists
|
||||||
|
const tournament = await prisma.event.findUnique({
|
||||||
|
where: { id: tournamentId },
|
||||||
|
include: {
|
||||||
|
teams: true,
|
||||||
|
rounds: true,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!tournament) {
|
||||||
|
return NextResponse.json(
|
||||||
|
{ error: "Tournament not found" },
|
||||||
|
{ status: 404 }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if schedule already exists
|
||||||
|
if (tournament.rounds.length > 0) {
|
||||||
|
return NextResponse.json(
|
||||||
|
{
|
||||||
|
error: "Schedule already exists. Delete existing rounds before regenerating.",
|
||||||
|
existingRounds: tournament.rounds.length,
|
||||||
|
},
|
||||||
|
{ status: 409 }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get team IDs
|
||||||
|
const teamIds = tournament.teams.map((t) => t.id);
|
||||||
|
|
||||||
|
const validation = validateScheduleInput(teamIds);
|
||||||
|
if (!validation.valid) {
|
||||||
|
return NextResponse.json(
|
||||||
|
{ error: validation.error },
|
||||||
|
{ status: 400 }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Generate schedule
|
||||||
|
const schedule = generateRoundRobin(teamIds);
|
||||||
|
|
||||||
|
// Create rounds and matchups in a transaction
|
||||||
|
const created = await prisma.$transaction(
|
||||||
|
schedule.map((round) =>
|
||||||
|
prisma.tournamentRound.create({
|
||||||
|
data: {
|
||||||
|
eventId: tournamentId,
|
||||||
|
roundNumber: round.roundNumber,
|
||||||
|
status: "pending",
|
||||||
|
bracketMatchups: {
|
||||||
|
create: round.matchups.map((matchup, idx) => ({
|
||||||
|
eventId: tournamentId,
|
||||||
|
team1Id: matchup.team1Id,
|
||||||
|
team2Id: matchup.team2Id,
|
||||||
|
bracketPosition: idx + 1,
|
||||||
|
status: "pending",
|
||||||
|
})),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
include: {
|
||||||
|
bracketMatchups: {
|
||||||
|
include: {
|
||||||
|
team1: {
|
||||||
|
include: { player1: true, player2: true },
|
||||||
|
},
|
||||||
|
team2: {
|
||||||
|
include: { player1: true, player2: true },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
return NextResponse.json({
|
||||||
|
success: true,
|
||||||
|
roundsCreated: created.length,
|
||||||
|
matchupsCreated: created.reduce(
|
||||||
|
(sum, r) => sum + r.bracketMatchups.length,
|
||||||
|
0
|
||||||
|
),
|
||||||
|
rounds: created,
|
||||||
|
});
|
||||||
|
} catch (error: unknown) {
|
||||||
|
console.error("Error generating schedule:", error);
|
||||||
|
const message =
|
||||||
|
error instanceof Error ? error.message : "Failed to generate schedule";
|
||||||
|
return NextResponse.json({ error: message }, { status: 500 });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* DELETE /api/tournaments/[id]/schedule
|
||||||
|
*
|
||||||
|
* Delete all rounds and matchups for a tournament.
|
||||||
|
*/
|
||||||
|
export async function DELETE(_request: Request, { params }: RouteParams) {
|
||||||
|
try {
|
||||||
|
const { id } = await params;
|
||||||
|
const tournamentId = parseInt(id);
|
||||||
|
|
||||||
|
if (isNaN(tournamentId)) {
|
||||||
|
return NextResponse.json(
|
||||||
|
{ error: "Invalid tournament ID" },
|
||||||
|
{ status: 400 }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const permission = await canManageTournament(tournamentId);
|
||||||
|
if (!permission.allowed) {
|
||||||
|
return NextResponse.json(
|
||||||
|
{ error: permission.reason || "Not authorized to manage this tournament" },
|
||||||
|
{ status: 403 }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Delete bracket matchups first (FK constraint)
|
||||||
|
const deletedMatchups = await prisma.bracketMatchup.deleteMany({
|
||||||
|
where: { eventId: tournamentId },
|
||||||
|
});
|
||||||
|
|
||||||
|
// Delete rounds
|
||||||
|
const deletedRounds = await prisma.tournamentRound.deleteMany({
|
||||||
|
where: { eventId: tournamentId },
|
||||||
|
});
|
||||||
|
|
||||||
|
return NextResponse.json({
|
||||||
|
success: true,
|
||||||
|
deletedRounds: deletedRounds.count,
|
||||||
|
deletedMatchups: deletedMatchups.count,
|
||||||
|
});
|
||||||
|
} catch (error: unknown) {
|
||||||
|
console.error("Error deleting schedule:", error);
|
||||||
|
const message =
|
||||||
|
error instanceof Error ? error.message : "Failed to delete schedule";
|
||||||
|
return NextResponse.json({ error: message }, { status: 500 });
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,126 @@
|
|||||||
|
"use client"
|
||||||
|
|
||||||
|
import { useState } from "react"
|
||||||
|
|
||||||
|
interface ScheduleGeneratorProps {
|
||||||
|
tournamentId: number
|
||||||
|
teamCount: number
|
||||||
|
}
|
||||||
|
|
||||||
|
export function ScheduleGenerator({ tournamentId, teamCount }: ScheduleGeneratorProps) {
|
||||||
|
const [isGenerating, setIsGenerating] = useState(false)
|
||||||
|
const [error, setError] = useState("")
|
||||||
|
const [result, setResult] = useState<{
|
||||||
|
roundsCreated: number
|
||||||
|
matchupsCreated: number
|
||||||
|
} | null>(null)
|
||||||
|
|
||||||
|
const handleGenerate = async () => {
|
||||||
|
setError("")
|
||||||
|
setResult(null)
|
||||||
|
setIsGenerating(true)
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await fetch(`/api/tournaments/${tournamentId}/schedule`, {
|
||||||
|
method: "POST",
|
||||||
|
})
|
||||||
|
|
||||||
|
const data = await response.json()
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
setError(data.error || "Failed to generate schedule")
|
||||||
|
setIsGenerating(false)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
setResult({
|
||||||
|
roundsCreated: data.roundsCreated,
|
||||||
|
matchupsCreated: data.matchupsCreated,
|
||||||
|
})
|
||||||
|
setIsGenerating(false)
|
||||||
|
|
||||||
|
// Reload to show the schedule
|
||||||
|
setTimeout(() => {
|
||||||
|
window.location.reload()
|
||||||
|
}, 1500)
|
||||||
|
} catch {
|
||||||
|
setError("An error occurred. Please try again.")
|
||||||
|
setIsGenerating(false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const handleDelete = async () => {
|
||||||
|
setError("")
|
||||||
|
setIsGenerating(true)
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await fetch(`/api/tournaments/${tournamentId}/schedule`, {
|
||||||
|
method: "DELETE",
|
||||||
|
})
|
||||||
|
|
||||||
|
const data = await response.json()
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
setError(data.error || "Failed to delete schedule")
|
||||||
|
setIsGenerating(false)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
window.location.reload()
|
||||||
|
} catch {
|
||||||
|
setError("An error occurred. Please try again.")
|
||||||
|
setIsGenerating(false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const expectedRounds = teamCount % 2 === 0 ? teamCount - 1 : teamCount
|
||||||
|
const expectedMatchups = (teamCount * (teamCount - 1)) / 2
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="space-y-4">
|
||||||
|
{error && (
|
||||||
|
<div className="rounded-md bg-red-50 p-4">
|
||||||
|
<div className="text-sm text-red-700">{error}</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{result && (
|
||||||
|
<div className="rounded-md bg-green-50 p-4">
|
||||||
|
<div className="text-sm text-green-700">
|
||||||
|
Generated {result.roundsCreated} rounds with {result.matchupsCreated} matchups!
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<div className="bg-gray-50 rounded-lg p-4">
|
||||||
|
<p className="text-sm text-gray-600 mb-2">
|
||||||
|
Generate a round-robin schedule for <strong>{teamCount} teams</strong>.
|
||||||
|
</p>
|
||||||
|
<p className="text-sm text-gray-500">
|
||||||
|
This will create {expectedRounds} rounds with {expectedMatchups} total matchups.
|
||||||
|
Each team plays every other team exactly once.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="flex space-x-3">
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={handleGenerate}
|
||||||
|
disabled={isGenerating || teamCount < 2}
|
||||||
|
className="px-4 py-2 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-green-600 hover:bg-green-700 disabled:opacity-50"
|
||||||
|
>
|
||||||
|
{isGenerating ? "Generating..." : "Generate Schedule"}
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={handleDelete}
|
||||||
|
disabled={isGenerating}
|
||||||
|
className="px-4 py-2 border border-red-300 rounded-md shadow-sm text-sm font-medium text-red-700 bg-white hover:bg-red-50 disabled:opacity-50"
|
||||||
|
>
|
||||||
|
Delete Schedule
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -14,6 +14,8 @@ export const auth = betterAuth({
|
|||||||
enabled: true,
|
enabled: true,
|
||||||
autoSignIn: true, // Automatically sign in after registration
|
autoSignIn: true, // Automatically sign in after registration
|
||||||
requireEmailVerification: false, // Don't require email verification for tests
|
requireEmailVerification: false, // Don't require email verification for tests
|
||||||
|
minPasswordLength: 8, // Set minimum password length
|
||||||
|
maxPasswordLength: 128, // Set maximum password length
|
||||||
},
|
},
|
||||||
secret: process.env.BETTER_AUTH_SECRET || process.env.NEXTAUTH_SECRET,
|
secret: process.env.BETTER_AUTH_SECRET || process.env.NEXTAUTH_SECRET,
|
||||||
baseURL: process.env.BETTER_AUTH_URL || process.env.NEXTAUTH_URL || "http://localhost:3000",
|
baseURL: process.env.BETTER_AUTH_URL || process.env.NEXTAUTH_URL || "http://localhost:3000",
|
||||||
|
|||||||
+11
-4
@@ -1,8 +1,7 @@
|
|||||||
import { PrismaClient } from '@prisma/client'
|
import { PrismaClient } from '@prisma/client'
|
||||||
import dotenv from 'dotenv'
|
|
||||||
|
|
||||||
// Load .env file if it exists
|
// Load .env file if it exists
|
||||||
dotenv.config()
|
require('dotenv').config()
|
||||||
|
|
||||||
const globalForPrisma = globalThis as unknown as {
|
const globalForPrisma = globalThis as unknown as {
|
||||||
prisma: PrismaClient | undefined
|
prisma: PrismaClient | undefined
|
||||||
@@ -10,16 +9,24 @@ const globalForPrisma = globalThis as unknown as {
|
|||||||
|
|
||||||
// Detect database provider from environment (default to sqlite for local development)
|
// Detect database provider from environment (default to sqlite for local development)
|
||||||
const databaseProvider = process.env.DATABASE_PROVIDER || 'sqlite'
|
const databaseProvider = process.env.DATABASE_PROVIDER || 'sqlite'
|
||||||
|
const databaseUrl = process.env.DATABASE_URL
|
||||||
|
|
||||||
// Create PrismaClient with appropriate adapter
|
// Create PrismaClient with appropriate adapter
|
||||||
const createPrismaClient = () => {
|
const createPrismaClient = () => {
|
||||||
let client: PrismaClient
|
let client: PrismaClient
|
||||||
|
|
||||||
if (databaseProvider === 'postgresql') {
|
if (databaseProvider === 'postgresql') {
|
||||||
|
// Validate DATABASE_URL is present for PostgreSQL
|
||||||
|
if (!databaseUrl) {
|
||||||
|
throw new Error(
|
||||||
|
'DATABASE_URL environment variable is required when DATABASE_PROVIDER is set to postgresql. ' +
|
||||||
|
'Current DATABASE_PROVIDER: ' + databaseProvider
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
// Use PrismaPg adapter for PostgreSQL
|
// Use PrismaPg adapter for PostgreSQL
|
||||||
const { PrismaPg } = require('@prisma/adapter-pg')
|
const { PrismaPg } = require('@prisma/adapter-pg')
|
||||||
const pg = require('pg')
|
const adapter = new PrismaPg({ connectionString: databaseUrl })
|
||||||
const adapter = new PrismaPg({ connectionString: process.env.DATABASE_URL })
|
|
||||||
client = new PrismaClient({ adapter })
|
client = new PrismaClient({ adapter })
|
||||||
} else {
|
} else {
|
||||||
// No adapter needed for SQLite
|
// No adapter needed for SQLite
|
||||||
|
|||||||
@@ -0,0 +1,96 @@
|
|||||||
|
export interface MatchupPairing {
|
||||||
|
team1Id: number
|
||||||
|
team2Id: number
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface RoundSchedule {
|
||||||
|
roundNumber: number
|
||||||
|
matchups: MatchupPairing[]
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Generate a round-robin schedule using the circle method.
|
||||||
|
*
|
||||||
|
* For N teams, produces N-1 rounds where each team plays every other
|
||||||
|
* team exactly once. If N is odd, a "bye" is added internally so one
|
||||||
|
* team sits out each round (the bye matchup is excluded from output).
|
||||||
|
*
|
||||||
|
* @param teamIds - Array of team IDs to schedule
|
||||||
|
* @returns Array of rounds, each containing matchup pairings
|
||||||
|
*/
|
||||||
|
export function generateRoundRobin(teamIds: number[]): RoundSchedule[] {
|
||||||
|
if (teamIds.length < 2) {
|
||||||
|
return []
|
||||||
|
}
|
||||||
|
|
||||||
|
// Use circle method: fix first team, rotate the rest
|
||||||
|
// If odd number of teams, add a sentinel for byes
|
||||||
|
const hasOddTeams = teamIds.length % 2 !== 0
|
||||||
|
const workingTeams = hasOddTeams ? [...teamIds, -1] : [...teamIds]
|
||||||
|
const n = workingTeams.length
|
||||||
|
const numRounds = n - 1
|
||||||
|
const matchupsPerRound = n / 2
|
||||||
|
|
||||||
|
const rounds: RoundSchedule[] = []
|
||||||
|
|
||||||
|
for (let round = 0; round < numRounds; round++) {
|
||||||
|
const matchups: MatchupPairing[] = []
|
||||||
|
|
||||||
|
for (let i = 0; i < matchupsPerRound; i++) {
|
||||||
|
const team1Idx = i
|
||||||
|
const team2Idx = n - 1 - i
|
||||||
|
|
||||||
|
const team1Id = workingTeams[team1Idx]
|
||||||
|
const team2Id = workingTeams[team2Idx]
|
||||||
|
|
||||||
|
// Skip bye matchups (where either team is the sentinel -1)
|
||||||
|
if (team1Id !== -1 && team2Id !== -1) {
|
||||||
|
matchups.push({ team1Id, team2Id })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
rounds.push({ roundNumber: round + 1, matchups })
|
||||||
|
|
||||||
|
// Rotate all teams except the first one (clockwise)
|
||||||
|
// Move last element to position 1
|
||||||
|
const last = workingTeams.pop()!
|
||||||
|
workingTeams.splice(1, 0, last)
|
||||||
|
}
|
||||||
|
|
||||||
|
return rounds
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Validate that a set of team IDs can be scheduled.
|
||||||
|
*/
|
||||||
|
export function validateScheduleInput(teamIds: number[]): {
|
||||||
|
valid: boolean
|
||||||
|
error?: string
|
||||||
|
} {
|
||||||
|
if (teamIds.length < 2) {
|
||||||
|
return { valid: false, error: "At least 2 teams are required to generate a schedule" }
|
||||||
|
}
|
||||||
|
|
||||||
|
const uniqueIds = new Set(teamIds)
|
||||||
|
if (uniqueIds.size !== teamIds.length) {
|
||||||
|
return { valid: false, error: "Duplicate team IDs found" }
|
||||||
|
}
|
||||||
|
|
||||||
|
return { valid: true }
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Calculate the expected number of rounds for N teams.
|
||||||
|
*/
|
||||||
|
export function expectedRounds(teamCount: number): number {
|
||||||
|
if (teamCount < 2) return 0
|
||||||
|
return teamCount % 2 === 0 ? teamCount - 1 : teamCount
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Calculate the expected number of total matchups for N teams.
|
||||||
|
*/
|
||||||
|
export function expectedMatchups(teamCount: number): number {
|
||||||
|
if (teamCount < 2) return 0
|
||||||
|
return (teamCount * (teamCount - 1)) / 2
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user