7 Commits

Author SHA1 Message Date
Gitea Actions ec3297befe chore: bump version to v0.1.3 2026-04-01 06:31:42 +00:00
david f4aca275de fix: skip release steps if no version bump commit was made
Pull Request / unit-tests (pull_request) Successful in 2m4s
Pull Request / acceptance-tests (pull_request) Failing after 2m17s
Pull Request / analyze-bump-type (pull_request) Has been skipped
Test / unit-tests (push) Successful in 2m38s
Release / release (push) Failing after 7m25s
- Set output variable 'committed' in commit step
- Add conditional execution to all subsequent steps
- Only create tag, build Docker images, and deploy if commit was successful
2026-03-31 23:23:01 -07:00
david fe133eab99 fix: improve error handling in getCommitsSinceLastTag
- Add nested try-catch to handle git log failures
- Return empty array if all git attempts fail
- Add warning message when commit history cannot be retrieved
2026-03-31 23:22:38 -07:00
david 89d0d08162 fix: add tag existence check in release workflow
Test / unit-tests (push) Successful in 2m22s
- Check if tag already exists before creating it
- Skip tag creation if tag already exists
2026-03-31 23:19:31 -07:00
david fe18a8b9fe fix: resolve release workflow version bump issues
- Fixed bump-version.js to properly handle --yes flag in CI environments
- Added check to skip commit if no changes to package.json or CHANGELOG.md
- Ensured script exits cleanly after version bump with --yes flag
2026-03-31 23:19:31 -07:00
david 6b9b690947 ci-image-improvements (#18)
Release / release (push) Failing after 1m7s
Test / unit-tests (push) Successful in 2m22s
Reviewed-on: #18
Co-authored-by: David Gwilliam <dhgwilliam@gmail.com>
Co-committed-by: David Gwilliam <dhgwilliam@gmail.com>
2026-04-01 06:14:25 +00:00
david 501e1b7e23 fix: version bumping and Docker registry authentication (#17)
Release / release (push) Failing after 1m9s
Test / unit-tests (push) Successful in 2m5s
## Summary

This PR fixes the release workflow to properly handle version bumping on PR merge and uses the new Docker registry authentication secrets.

## Changes

### Release Workflow (release.yml)
- **Version Bumping**: Now automatically bumps version on PR merge
  - Determines bump type from commit messages (major/minor/patch)
  - Commits version bump to `package.json` and `CHANGELOG.md`
  - Creates git tag for the release
- **Docker Registry Auth**: Uses `DOCKER_LOGIN` and `DOCKER_PASSWORD` secrets
  - Falls back gracefully if secrets are not configured
- **Tag Handling**: Checks if tag exists before creating (prevents failures)

### PR Workflow (pr.yml) - NEW
- Runs unit tests on every PR
- Analyzes commits to suggest bump type
- Comments the suggested bump type on the PR

### Documentation
- Added `WORKFLOW_ARCHITECTURE.md` explaining the workflow design

## Workflow Architecture

**Two-step process:**
1. **PR Workflow** (on PR): Analyzes commits and suggests bump type
2. **Release Workflow** (on merge): Bumps version, creates tag, builds Docker image

## Benefits

1. **No CI Loops**: Version bump commits are detected and skipped
2. **Clear Communication**: PR comments inform developers of version impact
3. **Semantic Versioning**: Automated adherence to semver rules
4. **Traceability**: Git tags and changelog reflect all changes

## Testing

The new workflows will be tested when this PR is merged.

Closes #13 (Add database test safety configuration)

Reviewed-on: #17
Co-authored-by: David Gwilliam <dhgwilliam@gmail.com>
Co-committed-by: David Gwilliam <dhgwilliam@gmail.com>
2026-04-01 05:03:14 +00:00
18 changed files with 504 additions and 276 deletions
+8 -7
View File
@@ -8,17 +8,14 @@ on:
jobs: jobs:
unit-tests: unit-tests:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container:
image: node:20-alpine
options: --user root
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '20'
cache: 'npm'
- name: Install dependencies - name: Install dependencies
run: npm ci run: npm ci
@@ -28,6 +25,9 @@ jobs:
acceptance-tests: acceptance-tests:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: unit-tests needs: unit-tests
container:
image: mcr.microsoft.com/playwright:v1.58.0-jammy
options: --user root
env: env:
DATABASE_PROVIDER: sqlite DATABASE_PROVIDER: sqlite
DATABASE_URL: file:./prisma/ci.db DATABASE_URL: file:./prisma/ci.db
@@ -41,13 +41,14 @@ jobs:
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: '20' node-version: '20'
cache: 'npm'
- name: Install dependencies - name: Install dependencies
run: npm ci run: npm ci
- name: Generate Prisma client - name: Generate Prisma client
run: npx prisma generate run: npx prisma generate
env:
DATABASE_URL: postgresql://user:pass@localhost:5432/dummy
- name: Setup SQLite database - name: Setup SQLite database
run: | run: |
+20
View File
@@ -78,22 +78,38 @@ jobs:
echo "New version: $NEW_VERSION" echo "New version: $NEW_VERSION"
- name: Commit version bump - name: Commit version bump
id: commit
run: | run: |
git add package.json CHANGELOG.md git add package.json CHANGELOG.md
if git diff --cached --quiet; then
echo "No changes to commit (version may already be at target version)"
echo "committed=false" >> $GITHUB_OUTPUT
else
git commit -m "chore: bump version to v${{ steps.version.outputs.new_version }}" git commit -m "chore: bump version to v${{ steps.version.outputs.new_version }}"
git push origin main git push origin main
echo "committed=true" >> $GITHUB_OUTPUT
fi
- name: Create git tag for release - name: Create git tag for release
if: steps.commit.outputs.committed == 'true'
run: | run: |
TAG_NAME="v${{ steps.version.outputs.new_version }}" TAG_NAME="v${{ steps.version.outputs.new_version }}"
echo "Creating tag $TAG_NAME" echo "Creating tag $TAG_NAME"
# Check if tag already exists
if git rev-parse "$TAG_NAME" >/dev/null 2>&1; then
echo "Tag $TAG_NAME already exists, skipping tag creation"
else
git tag -a "$TAG_NAME" -m "Release $TAG_NAME" git tag -a "$TAG_NAME" -m "Release $TAG_NAME"
git push origin "$TAG_NAME" git push origin "$TAG_NAME"
fi
- name: Set up Docker Buildx - name: Set up Docker Buildx
if: steps.commit.outputs.committed == 'true'
uses: docker/setup-buildx-action@v3 uses: docker/setup-buildx-action@v3
- name: Build test-capable image - name: Build test-capable image
if: steps.commit.outputs.committed == 'true'
run: | run: |
docker build \ docker build \
--target test-runner \ --target test-runner \
@@ -102,6 +118,7 @@ jobs:
. .
- name: Run tests inside test-capable container - name: Run tests inside test-capable container
if: steps.commit.outputs.committed == 'true'
run: | run: |
docker run --rm \ docker run --rm \
-e DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" \ -e DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" \
@@ -109,6 +126,7 @@ jobs:
npm run test:run npm run test:run
- name: Build production image - name: Build production image
if: steps.commit.outputs.committed == 'true'
run: | run: |
docker build \ docker build \
--target runner \ --target runner \
@@ -118,6 +136,7 @@ jobs:
. .
- name: Push Docker images - name: Push Docker images
if: steps.commit.outputs.committed == 'true'
run: | run: |
echo "Pushing to ${{ env.REGISTRY }}..." echo "Pushing to ${{ env.REGISTRY }}..."
# Check if we can authenticate to the registry using DOCKER_LOGIN and DOCKER_PASSWORD secrets # Check if we can authenticate to the registry using DOCKER_LOGIN and DOCKER_PASSWORD secrets
@@ -142,6 +161,7 @@ jobs:
fi fi
- name: Deploy to dev (placeholder) - name: Deploy to dev (placeholder)
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 # TODO: Add actual deployment steps
+3 -6
View File
@@ -8,6 +8,9 @@ on:
jobs: jobs:
unit-tests: unit-tests:
runs-on: ubuntu-latest 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) # Skip if this is an auto-generated version bump commit (handled by release workflow)
if: "!contains(github.event.head_commit.message, 'chore: bump version')" if: "!contains(github.event.head_commit.message, 'chore: bump version')"
@@ -15,12 +18,6 @@ jobs:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '20'
cache: 'npm'
- name: Install dependencies - name: Install dependencies
run: npm ci run: npm ci
+67
View File
@@ -109,10 +109,73 @@ npm run db:setup-postgres
**Note:** The database provider is automatically detected by Better Auth and Prisma. **Note:** The database provider is automatically detected by Better Auth and Prisma.
### Running Tests ### Running Tests
**Using just (recommended):**
- **All tests**: `just test` (unit + acceptance with SQLite)
- **Unit tests**: `just test-unit`
- **Acceptance tests (SQLite)**: `just test-acceptance-sqlite`
- **Acceptance tests (PostgreSQL)**: `just test-acceptance-postgres`
- **PR validation**: `just pr-validate` (what runs on pull requests)
**Using npm scripts:**
- **Unit tests**: `npm run test` - **Unit tests**: `npm run test`
- **Acceptance tests**: `npm run test:acceptance` - **Acceptance tests**: `npm run test:acceptance`
- **Specific test**: `npm run test:acceptance -- --grep "test name"` - **Specific test**: `npm run test:acceptance -- --grep "test name"`
**CI-style acceptance tests with SQLite:**
```bash
DATABASE_PROVIDER=sqlite DATABASE_URL=file:./prisma/ci.db npm run test:acceptance
```
### CI Runner Image
**Note:** The CI runner image approach has been deprecated for Gitea Actions workflows.
The original attempt to use a pre-built CI runner image with pre-installed dependencies encountered fundamental issues with how Gitea Actions handles workspace mounting. When Gitea Actions runs a container job, it mounts the workspace at a specific path (e.g., `/workspace/david/euchre_camp`), which hides the container's `/app` directory where dependencies were installed.
**Current Approach:**
- Workflows use standard `node:20-alpine` or `mcr.microsoft.com/playwright` containers
- Dependencies are installed via `npm ci` in each workflow run
- This is the recommended approach for Gitea Actions
**Why the CI image approach doesn't work:**
1. Dockerfile.ci installs dependencies in `/app`
2. Gitea Actions mounts workspace at `/workspace/david/euchre_camp`
3. Workspace mount hides the `/app` directory
4. Symlinks from `/app/node_modules` don't work because `/app` is hidden
**Alternative for performance:**
If CI performance becomes an issue, consider:
- Using GitHub Actions cache for node_modules
- Using a self-hosted runner with persistent workspace
- Using the main Dockerfile's `test-runner` target for release workflows (which works because it builds a complete image)
### CI/CD Pipeline
The project uses Gitea Actions for continuous integration:
**PR Workflow** (`.gitea/workflows/pr.yml`):
- Runs on pull requests to main
- Executes unit tests and acceptance tests with SQLite
- Analyzes commits for semantic versioning
- Comments suggested bump type on PRs
**Test Workflow** (`.gitea/workflows/test.yml`):
- Runs on all branch pushes
- Executes unit tests for quick feedback
- Skips auto-generated version bump commits
**Release Workflow** (`.gitea/workflows/release.yml`):
- Runs on main branch pushes
- Determines version bump type
- Bumps version and creates git tags
- Builds Docker images and runs tests
- Pushes to registry and deploys
**Database Strategy**:
- CI tests use SQLite (fast, no server required)
- Production uses PostgreSQL
- Switch with `DATABASE_PROVIDER` environment variable
## Key Files ## Key Files
### Configuration ### Configuration
@@ -170,6 +233,10 @@ npm run db:setup-postgres
- Utilities: camelCase (e.g., `elo-utils.ts`) - Utilities: camelCase (e.g., `elo-utils.ts`)
- Tests: `.test.ts` or `.test.tsx` suffix - Tests: `.test.ts` or `.test.tsx` suffix
## File Organization
See [docs/FILE_ORGANIZATION.md](docs/FILE_ORGANIZATION.md) for detailed file organization and structure.
## Resources ## Resources
- **Better Auth Docs**: https://better-auth.com/docs - **Better Auth Docs**: https://better-auth.com/docs
+25
View File
@@ -1,3 +1,28 @@
## [0.1.3] - 2026-04-01
### Patch Changes
- fix: skip release steps if no version bump commit was made
- fix: improve error handling in getCommitsSinceLastTag
- fix: add tag existence check in release workflow
- fix: resolve release workflow version bump issues
- ci-image-improvements (#18)
- fix: version bumping and Docker registry authentication (#17)
- fix: handle Docker registry authentication gracefully in release workflow
- fix: run unit tests on branch commits, skip main branch
- feat: add test workflow for every commit
- trigger: release with test-capable image
- feat: build test-capable image, run tests, then build production image
- trigger: release workflow
- fix: release workflow should not commit, only tag
- trigger: manual workflow trigger for docker.notsosm.art
- fix: update Docker build script to use docker.notsosm.art registry
- fix: update workflow to use docker.notsosm.art registry
- trigger: manual workflow trigger
- fix: update workflow to use correct Docker registries
- feat: add Gitea Actions release workflow
- feat: add view match link to admin matches page
## [0.1.2] - 2026-04-01 ## [0.1.2] - 2026-04-01
### Patch Changes ### Patch Changes
+99 -8
View File
@@ -17,20 +17,29 @@ EuchreCamp is a full-stack web application built with Next.js 14+ and TypeScript
- **Framework**: Next.js 14+ (App Router) - **Framework**: Next.js 14+ (App Router)
- **Language**: TypeScript - **Language**: TypeScript
- **Database**: Prisma ORM with SQLite - **Database**: Prisma ORM with SQLite (default) or PostgreSQL
- **Styling**: Tailwind CSS - **Styling**: Tailwind CSS
- **Authentication**: Better Auth - **Authentication**: Better Auth
- **Form Handling**: React Hook Form + Zod validation - **Form Handling**: React Hook Form + Zod validation
- **CSV Parsing**: PapaParse - **CSV Parsing**: PapaParse
- **Unit Testing**: Vitest - **Unit Testing**: Vitest
- **Acceptance Testing**: Playwright - **Acceptance Testing**: Playwright
- **CI/CD**: Gitea Actions with SQLite for CI tests
## Project Structure ## Project Structure
``` ```
euchre_camp/ euchre_camp/
├── src/ ├── .gitea/workflows/ # CI/CD workflows (Gitea Actions)
│ ├── app/ ├── docs/ # Documentation
│ ├── deployment/ # Deployment guides
│ └── planning/ # Planning documents
├── prisma/ # Prisma schema and migrations
├── public/ # Static assets
├── scripts/ # Utility scripts
│ └── python/ # Python scripts (legacy)
├── src/ # Source code
│ ├── app/ # Next.js app directory
│ │ ├── api/ # API routes │ │ ├── api/ # API routes
│ │ ├── auth/ # Authentication pages │ │ ├── auth/ # Authentication pages
│ │ ├── admin/ # Admin pages │ │ ├── admin/ # Admin pages
@@ -39,16 +48,15 @@ euchre_camp/
│ │ └── components/ # Shared components │ │ └── components/ # Shared components
│ ├── lib/ # Utilities and configuration │ ├── lib/ # Utilities and configuration
│ │ ├── auth.ts # Better Auth configuration │ │ ├── auth.ts # Better Auth configuration
│ │ ├── prisma.ts # Prisma client │ │ ├── prisma.ts # Prisma client (SQLite/PostgreSQL)
│ │ ├── permissions.ts # Authorization functions │ │ ├── permissions.ts # Authorization functions
│ │ └── elo-utils.ts # Elo calculation utilities │ │ └── elo-utils.ts # Elo calculation utilities
│ └── __tests__/ # Vitest and Playwright tests │ └── __tests__/ # Vitest and Playwright tests
── prisma/ # Prisma schema and migrations ── ... # Configuration files in root
├── docs/ # Documentation
├── scripts/ # Utility scripts
└── public/ # Static assets
``` ```
See [docs/FILE_ORGANIZATION.md](docs/FILE_ORGANIZATION.md) for detailed file organization.
## Features Implemented ## Features Implemented
### Epic 1: Authentication & User Management ### Epic 1: Authentication & User Management
@@ -242,6 +250,36 @@ Visit `/` to see:
## Development ## Development
### Using just (recommended)
The project includes a `justfile` with common development tasks:
```bash
# Show all available tasks
just help
# Development mode
just dev
# Run all tests (unit + acceptance with SQLite)
just test
# Run PR validation (what runs on pull requests)
just pr-validate
# Run CI pipeline locally
just ci
# Switch database provider
just db-switch-sqlite
just db-switch-postgres
# Docker shortcuts
just docker-up
just docker-down
just docker-logs
```
### Using npm scripts directly
```bash ```bash
# Development mode # Development mode
npm run dev npm run dev
@@ -255,6 +293,9 @@ npm run test
# Run acceptance tests # Run acceptance tests
npm run test:acceptance npm run test:acceptance
# Run acceptance tests with SQLite (CI-style)
DATABASE_PROVIDER=sqlite DATABASE_URL=file:./prisma/ci.db npm run test:acceptance
``` ```
### Database Commands ### Database Commands
@@ -313,6 +354,56 @@ User stories are organized into epics in `docs/USER_STORIES.md`:
7. Mobile Responsiveness 7. Mobile Responsiveness
8. Data Management & Export 8. Data Management & Export
## CI/CD Pipeline
The application uses Gitea Actions for continuous integration and deployment:
### Workflow Architecture
1. **PR Workflow** (`.gitea/workflows/pr.yml`): Runs on pull requests
- Unit tests (fast feedback)
- Acceptance tests with SQLite database
- Semantic version bump analysis
2. **Test Workflow** (`.gitea/workflows/test.yml`): Runs on all branch pushes
- Unit tests for quick feedback
- Skips auto-generated version bumps
3. **Release Workflow** (`.gitea/workflows/release.yml`): Runs on main branch pushes
- Version bumping and tagging
- Docker image building and testing
- Registry push and deployment
### CI Runner Image
**Note:** The CI runner image approach has been deprecated for Gitea Actions workflows.
The original attempt to use a pre-built CI runner image with pre-installed dependencies encountered fundamental issues with how Gitea Actions handles workspace mounting. When Gitea Actions runs a container job, it mounts the workspace at a specific path (e.g., `/workspace/david/euchre_camp`), which hides the container's `/app` directory where dependencies were installed.
**Current Approach:**
- Workflows use standard `node:20-alpine` or `mcr.microsoft.com/playwright` containers
- Dependencies are installed via `npm ci` in each workflow run
- This is the recommended approach for Gitea Actions
**Why the CI image approach doesn't work:**
1. Dockerfile.ci installs dependencies in `/app`
2. Gitea Actions mounts workspace at `/workspace/david/euchre_camp`
3. Workspace mount hides the `/app` directory
4. Symlinks from `/app/node_modules` don't work because `/app` is hidden
### Database Strategy for CI
- **CI Tests**: SQLite database (fast, no server required)
- **Production**: PostgreSQL (production-like environment)
- **Configuration**: `DATABASE_PROVIDER` environment variable
### Running CI Locally
```bash
# Run unit tests (same as CI)
npm run test:run
# Run acceptance tests with SQLite
DATABASE_PROVIDER=sqlite DATABASE_URL=file:./prisma/ci.db npm run test:acceptance
```
## Docker Deployment ## Docker Deployment
This application can be run using Docker and Docker Compose. See [DOCKER.md](DOCKER.md) for detailed instructions. This application can be run using Docker and Docker Compose. See [DOCKER.md](DOCKER.md) for detailed instructions.
-102
View File
@@ -1,102 +0,0 @@
# EuchreCamp - Todo List
## Current Tasks
### Completed ✅
- [x] Add `site_admin` role to database schema and permissions system
- [x] Add `isCasual` boolean field to Match model (already existed)
- [x] Update match upload API to support casual matches
- [x] Update match upload UI to include casual checkbox
- [x] Add tournament deletion API endpoint with delete/orphan options
- [x] Add delete tournament button and modal to tournament detail page
- [x] Run tests and verify implementation (84 tests passing)
- [x] Fix session issues with tournament admin access
- [x] Fix Elo recalculation error for player merge (delete elo snapshots before deleting players)
- [x] Add admin player management page
- [x] Add player name editing functionality in admin UI
- [x] Add admin panel links to navigation header
- [x] Add tournament update API endpoint (PUT /api/tournaments/[id])
- [x] Consolidate delete endpoint from admin API to main tournaments API
- [x] Update database schema to add variant scoring fields (targetScore, allowTies)
- [x] Fix tie handling logic in partnership stats (ties now correctly tracked)
- [x] Fix test files for normalizedName field in Player model
- [x] Fix auth.ts to include normalizedName in Player creation
- [x] Write TODO list to repository file
- [x] Auto-create tournament when uploading matches without selecting one
### In Progress 🔄
- [ ] Update API routes to handle new variant scoring fields
- [ ] Update EditTournamentForm to add variant scoring controls
- [ ] Update MatchEditor to use tournament-specific target score
- [ ] Run tests and verify variant scoring implementation
### Recently Completed ✅
- [x] Add OpenSkill rating system support (src/lib/openskill-utils.ts)
- [x] Add Glicko2 rating system support (src/lib/glicko2-utils.ts)
- [x] Reset database and run all migrations from scratch
- [x] Regenerate Prisma client with new rating models
- [x] Update match upload page to auto-create tournament if none selected
- [x] Update all admin scripts to use PrismaPg adapter and dotenv
- [x] Fix match diagram player positioning
- [x] Add CasaOS deployment configuration and documentation
- [x] Create migration to add rating system tables (elo_ratings, glicko2_ratings, open_skill_ratings)
- [x] Add tabbed rankings page to display Elo, OpenSkill, and Glicko2 ratings
### Backlog 📋
- [ ] Add UI controls for variant scoring in tournament creation/edit
- [ ] Test variant tournament functionality end-to-end
- [ ] Add validation for tie scores based on tournament configuration
- [ ] Document variant tournament features
## Recently Completed (Detailed)
### Variant Euchre Scoring Support
- Added `targetScore` and `allowTies` fields to Event model
- Created database migration for new fields
- Fixed partnership stats tie handling (ties now increment neither wins nor losses)
- Updated Elo calculation functions to handle ties correctly (0.5 points for draw)
### Tournament Deletion
- Consolidated delete endpoint to `/api/tournaments/[id]`
- Added options to delete matches or orphan them
- Updated DeleteTournamentButton to use consolidated endpoint
### Player Management
- Added admin players page at `/admin/players`
- Added player name editing functionality via PATCH endpoint
- Added player merge functionality with automatic Elo recalculation
- Fixed foreign key constraint issues with elo_snapshots
### Permissions
- Added `site_admin` role as highest privilege level
- Updated all permission functions to include site_admin support
- Fixed session cache issues by reading roles from database
## Notes
- All 84 unit tests passing
- Database migrations applied successfully
- TypeScript compilation has pre-existing errors unrelated to our changes
### Completed After Commit 1729dac
#### Next.js 16 Breaking Change Fixes
- [x] Fixed `params.id` usage in all page components (must use `await params`)
- [x] Fixed `params.id` usage in all API routes (must use `await params`)
- [x] Updated client components to use `Promise<{ id: string }>` type
- [x] Added regression tests for Next.js 16 params Promise handling
- [x] Verified all 100 unit tests pass
#### Files Updated:
- Player pages: `profile.tsx`, `schedule.tsx`
- Tournament pages: `page.tsx`, `results.tsx`, `edit.tsx`, `entry.tsx`
- API routes: `admin/players/[id]/route.ts`, `users/[id]/route.ts`, `users/[id]/role/route.ts`
- Tournament API routes: `[id]/route.ts`, `[id]/participants/route.ts`, `[id]/games/bulk/route.ts`
#### Root Cause
Next.js 16 requires `params` to be awaited in both server components and API routes:
- Before: `const { id } = params`
- After: `const { id } = await params`
This was not caught by the unit test suite because:
- Unit tests test individual functions in isolation
- E2E tests (Playwright) would catch this but weren't run after the upgrade
+125
View File
@@ -0,0 +1,125 @@
# File Organization
This document describes the organization of files in the EuchreCamp project.
## Root Directory
### Essential Files (Keep in Root)
- `README.md` - Main project documentation
- `AGENTS.md` - AI agent guide
- `CHANGELOG.md` - Version changelog
- `package.json` - Node.js dependencies and scripts
- `package-lock.json` - Dependency lock file
- `tsconfig.json` - TypeScript configuration
- `next.config.js` - Next.js configuration
- `.gitignore` - Git ignore file
- `Dockerfile` - Docker build configuration
- `justfile` - Development task automation
### Configuration Files (Keep in Root)
- `.eslintrc.json` - ESLint configuration
- `postcss.config.mjs` - PostCSS configuration
- `playwright.config.ts` - Playwright test configuration
- `vitest.config.mts` - Vitest configuration
- `vitest.setup.ts` - Vitest setup
- `.dockerignore` - Docker ignore file
- `mise.toml` - Mise version manager config
### Docker Files (Keep in Root)
- `docker-compose.yml` - Main Docker Compose
- `docker-compose.dev.yml` - Development Docker Compose
- `docker-compose.override.yml` - Override for dev
- `docker-compose.casaos.yml` - CasaOS specific
### Environment Files (Keep in Root, Gitignored)
- `.env` - Environment variables
- `.env.development` - Development environment
## Organized Directories
### `.gitea/` - Gitea Actions Workflows
- `workflows/pr.yml` - Pull request workflow (unit + acceptance tests)
- `workflows/test.yml` - Test workflow (unit tests on branch pushes)
- `workflows/release.yml` - Release workflow (version bump + Docker build)
- `WORKFLOW_ARCHITECTURE.md` - Workflow architecture documentation
### `docs/` - Documentation
- `deployment/` - Deployment documentation
- `CASAOS_DEPLOYMENT.md` - CasaOS deployment guide
- `DOCKER.md` - Docker deployment instructions
- `TODO.md` - Project TODO list (in docs root for visibility)
- `USER_STORIES.md` - User stories organized by epic
- Other documentation files (design, implementation, testing, etc.)
### `scripts/` - Utility Scripts
- `python/` - Python scripts (legacy/old functionality)
- `generate_games.py` - Generate sample games
- `update_partnership_stats.py` - Update partnership stats
- `update_player_stats.py` - Update player stats
- `bump-version.js` - Version bumping script
- `build-and-push-docker.js` - Docker build and push script
- `switch-database.js` - Database provider switching
- `create-admin-via-api.js` - Admin user creation via API
- `create-admin-better-auth.js` - Admin user creation via database
- `list-users.js` - List all users
- `update-admin-password.js` - Update admin password
- `seed.js` - Database seeding
- And other Node.js scripts...
### `src/` - Source Code
- `app/` - Next.js app directory
- `api/` - API routes
- `auth/` - Authentication pages
- `admin/` - Admin pages
- `players/` - Player pages
- `rankings/` - Rankings page
- `components/` - Shared components
- `lib/` - Utilities and configuration
- `auth.ts` - Better Auth configuration
- `prisma.ts` - Prisma client (supports SQLite and PostgreSQL)
- `permissions.ts` - Authorization functions
- `elo-utils.ts` - Elo calculation utilities
- `__tests__/` - Vitest and Playwright tests
- `unit/` - Unit tests
- `e2e/` - End-to-end acceptance tests
### `prisma/` - Database
- `schema.prisma` - Prisma schema
- `migrations/` - Database migrations
- `dev.db` - SQLite development database (if using SQLite)
### `public/` - Static Assets
- Images, fonts, and other static files
### `playwright/` - Playwright Test Data
- Authentication state files
## Generated Directories (Gitignored)
- `.next/` - Next.js build output
- `node_modules/` - Node.js dependencies
- `playwright-report/` - Playwright test reports
- `test-results/` - Test results
## File Organization Principles
1. **Keep standard files in root**: package.json, tsconfig.json, etc.
2. **Organize by function**: Group related files in directories
3. **Separate generated from source**: Keep build outputs and dependencies separate
4. **Document organization**: Use this file to explain structure
5. **Follow conventions**: Use standard naming and organization patterns
## CI/CD File Organization
### Workflows
- `.gitea/workflows/pr.yml` - Pull request validation
- `.gitea/workflows/test.yml` - Branch testing
- `.gitea/workflows/release.yml` - Main branch release
### Database Strategy
- **CI/Testing**: SQLite (fast, no server)
- **Production**: PostgreSQL (production-like)
### Testing
- Unit tests: `npm run test:run`
- Acceptance tests (SQLite): `DATABASE_PROVIDER=sqlite npm run test:acceptance`
- Acceptance tests (PostgreSQL): `npm run test:acceptance` (with Docker)
+86 -118
View File
@@ -1,134 +1,102 @@
# EuchreCamp - Project Todo List # EuchreCamp - Todo List
## Completed Features ## Current Tasks
### Backend ### Completed ✅
- [x] Database schema for matches, players, teams, events - [x] Add `site_admin` role to database schema and permissions system
- [x] Elo rating calculator and job - [x] Add `isCasual` boolean field to Match model (already existed)
- [x] Partnership tracking and analytics - [x] Update match upload API to support casual matches
- [x] Tournament generator (round-robin, single elim, double elim, Swiss) - [x] Update match upload UI to include casual checkbox
- [x] ROM relations and repositories - [x] Add tournament deletion API endpoint with delete/orphan options
- [x] Acceptance test suite (8 tests passing) - [x] Add delete tournament button and modal to tournament detail page
- [x] Run tests and verify implementation (84 tests passing)
- [x] Fix session issues with tournament admin access
- [x] Fix Elo recalculation error for player merge (delete elo snapshots before deleting players)
- [x] Add admin player management page
- [x] Add player name editing functionality in admin UI
- [x] Add admin panel links to navigation header
- [x] Add tournament update API endpoint (PUT /api/tournaments/[id])
- [x] Consolidate delete endpoint from admin API to main tournaments API
- [x] Update database schema to add variant scoring fields (targetScore, allowTies)
- [x] Fix tie handling logic in partnership stats (ties now correctly tracked)
- [x] Fix test files for normalizedName field in Player model
- [x] Fix auth.ts to include normalizedName in Player creation
- [x] Write TODO list to repository file
- [x] Auto-create tournament when uploading matches without selecting one
### Frontend ### In Progress 🔄
- [x] Basic player rankings page - [ ] Update API routes to handle new variant scoring fields
- [x] Match entry form - [ ] Update EditTournamentForm to add variant scoring controls
- [ ] Update MatchEditor to use tournament-specific target score
- [ ] Run tests and verify variant scoring implementation
## In Progress - UI Development ### Recently Completed ✅
- [x] Add OpenSkill rating system support (src/lib/openskill-utils.ts)
- [x] Add Glicko2 rating system support (src/lib/glicko2-utils.ts)
- [x] Reset database and run all migrations from scratch
- [x] Regenerate Prisma client with new rating models
- [x] Update match upload page to auto-create tournament if none selected
- [x] Update all admin scripts to use PrismaPg adapter and dotenv
- [x] Fix match diagram player positioning
- [x] Add CasaOS deployment configuration and documentation
- [x] Create migration to add rating system tables (elo_ratings, glicko2_ratings, open_skill_ratings)
- [x] Add tabbed rankings page to display Elo, OpenSkill, and Glicko2 ratings
### Completed ### Backlog 📋
- [x] Navigation layout (Next.js components) - [ ] Add UI controls for variant scoring in tournament creation/edit
- [x] UI Design document (UI_DESIGN.md) - [ ] Test variant tournament functionality end-to-end
- [x] Player Profile page (Next.js) - [ ] Add validation for tie scores based on tournament configuration
- [x] Basic CSS styling (Tailwind CSS) - [ ] Document variant tournament features
- [x] Player Schedule page (Next.js)
- [x] Route for player schedule
### View Types to Implement ## Recently Completed (Detailed)
- [ ] Tournament Admin View (Phase 2-3)
- Create/manage tournaments
- Set up brackets and matchups
- Record match results
- View tournament standings
- [ ] Club Admin View (Superuser) (Phase 3-4) ### Variant Euchre Scoring Support
- Manage all players - Added `targetScore` and `allowTies` fields to Event model
- View club-wide statistics - Created database migration for new fields
- Configure club settings - Fixed partnership stats tie handling (ties now increment neither wins nor losses)
- Manage tournaments - Updated Elo calculation functions to handle ties correctly (0.5 points for draw)
- [ ] Player Profile View (Phase 1-2) ### Tournament Deletion
- Display player info and Elo rating - Consolidated delete endpoint to `/api/tournaments/[id]`
- Show partnership analytics - Added options to delete matches or orphan them
- Display match history - Updated DeleteTournamentButton to use consolidated endpoint
- Tournament participation
- Enhance existing template
- [ ] Player Tournament Schedule View (Phase 4) ### Player Management
- Show upcoming matches - Added admin players page at `/admin/players`
- Display tournament brackets - Added player name editing functionality via PATCH endpoint
- Record personal match results - Added player merge functionality with automatic Elo recalculation
- Fixed foreign key constraint issues with elo_snapshots
### UI Components Needed ### Permissions
- [x] Navigation system (role-based) - Started - Added `site_admin` role as highest privilege level
- [ ] Dashboard layouts - Updated all permission functions to include site_admin support
- [ ] Forms for data entry - Fixed session cache issues by reading roles from database
- [ ] Tables for displaying data
- [ ] Charts for statistics
- [ ] Bracket visualization
### Implementation Phases ## Notes
- [x] Phase 1: Navigation & Layout - All 84 unit tests passing
- [x] Phase 2: Player Profile Enhancements - Database migrations applied successfully
- [x] Phase 3: Tournament Admin View - TypeScript compilation has pre-existing errors unrelated to our changes
- [x] Phase 4: Club Admin View
- [x] Phase 5: Player Schedule View
- [ ] Phase 6: Authentication & Authorization
- [x] Phase 7: Polish & Testing
## Future Enhancements ### Completed After Commit 1729dac
### Features #### Next.js 16 Breaking Change Fixes
- [ ] Real-time match updates (WebSockets) - [x] Fixed `params.id` usage in all page components (must use `await params`)
- [ ] Mobile-responsive design improvements - [x] Fixed `params.id` usage in all API routes (must use `await params`)
- [ ] Email notifications - [x] Updated client components to use `Promise<{ id: string }>` type
- [ ] Import/Export functionality - [x] Added regression tests for Next.js 16 params Promise handling
- [ ] API for third-party integrations - [x] Verified all 100 unit tests pass
- [ ] Advanced analytics charts
### Technical #### Files Updated:
- [ ] Performance optimization - Player pages: `profile.tsx`, `schedule.tsx`
- [ ] Caching strategy - Tournament pages: `page.tsx`, `results.tsx`, `edit.tsx`, `entry.tsx`
- [ ] Security hardening - API routes: `admin/players/[id]/route.ts`, `users/[id]/route.ts`, `users/[id]/role/route.ts`
- [ ] Deployment pipeline - Tournament API routes: `[id]/route.ts`, `[id]/participants/route.ts`, `[id]/games/bulk/route.ts`
- [ ] CI/CD setup
## AAA System (Authentication, Authorization, Accounting) - Next.js Implementation #### Root Cause
Next.js 16 requires `params` to be awaited in both server components and API routes:
- Before: `const { id } = params`
- After: `const { id } = await params`
### Authentication (Better Auth + Prisma) This was not caught by the unit test suite because:
- [x] Set up Better Auth with Prisma - Unit tests test individual functions in isolation
- [x] Create users table schema - E2E tests (Playwright) would catch this but weren't run after the upgrade
- [x] Build login page (`/auth/login`)
- [x] Build registration page (`/auth/register`)
- [x] Implement session management with Better Auth
- [x] Add authentication middleware
- [ ] Password reset functionality
- [ ] Email confirmation system
- [ ] OAuth providers (optional)
### Authorization (RBAC)
- [x] Define roles in Prisma schema (PLAYER, TOURNAMENT_ADMIN, CLUB_ADMIN)
- [x] Implement authorization helpers
- [x] Add authorization to admin dashboard
- [x] Add authorization to player management
- [x] Add authorization to tournament management
- [x] Add 5-minute match edit window (player role)
- [ ] Add role assignment UI for club admins
- [ ] Add permission checks to all API routes
### Accounting (Activity Logging)
- [ ] Create activity logging system (Prisma model)
- [ ] Track authentication events
- [ ] Track tournament management events
- [ ] Track match recording events
- [ ] Build audit reports UI
### Security
- [x] Rate limiting (Better Auth built-in)
- [ ] IP-based lockout
- [x] Secure cookie settings (Better Auth)
- [x] CSRF protection (Next.js built-in)
- [ ] Security headers
- [ ] Session fixation prevention
## Known Issues
- [ ] Database IDs not resetting between tests (workaround: query by round_number)
- [ ] Need to clean up debug output from acceptance tests
- [ ] Password reset flow not yet implemented
## Next Steps
1. Design UI mockups for each view type
2. Implement navigation system
3. Build out Tournament Admin view
4. Add role-based access control
5. Create reusable UI components
+3
View File
@@ -57,6 +57,7 @@ format:
# --- Testing --- # --- Testing ---
# Run all tests (unit + acceptance with SQLite) # Run all tests (unit + acceptance with SQLite)
# Note: Uses Docker containers for consistent environment
test: test-unit test-acceptance-sqlite test: test-unit test-acceptance-sqlite
# Run all tests with PostgreSQL (Docker) # Run all tests with PostgreSQL (Docker)
@@ -245,6 +246,8 @@ workflow-status:
@echo "PR Workflow: Runs unit + acceptance tests on pull requests" @echo "PR Workflow: Runs unit + acceptance tests on pull requests"
@echo "Test Workflow: Runs unit tests on all branch pushes" @echo "Test Workflow: Runs unit tests on all branch pushes"
@echo "Release Workflow: Runs on main branch pushes (version bump + Docker build)" @echo "Release Workflow: Runs on main branch pushes (version bump + Docker build)"
@echo ""
@echo "Note: CI image approach deprecated due to Gitea Actions workspace mounting"
# Check current database provider # Check current database provider
db-status: db-status:
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "euchre_camp", "name": "euchre_camp",
"version": "0.1.2", "version": "0.1.3",
"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",
+27 -9
View File
@@ -48,14 +48,22 @@ function getCommitsSinceLastTag() {
if (!latestTag) { if (!latestTag) {
// No tags yet, get all commits // No tags yet, get all commits
return execSync('git log --oneline --format=%s', { encoding: 'utf8' }).trim().split('\n'); const commits = execSync('git log --oneline --format=%s', { encoding: 'utf8' }).trim();
return commits ? commits.split('\n') : [];
} }
const commits = execSync(`git log ${latestTag}..HEAD --oneline --format=%s`, { encoding: 'utf8' }).trim(); const commits = execSync(`git log ${latestTag}..HEAD --oneline --format=%s`, { encoding: 'utf8' }).trim();
return commits ? commits.split('\n') : []; return commits ? commits.split('\n') : [];
} catch (error) { } catch (error) {
// If no commits since tag or other error, get recent commits // If no commits since tag or other error, get recent commits
return execSync('git log --oneline --format=%s -n 20', { encoding: 'utf8' }).trim().split('\n'); try {
const commits = execSync('git log --oneline --format=%s -n 20', { encoding: 'utf8' }).trim();
return commits ? commits.split('\n') : [];
} catch (innerError) {
// If all git log attempts fail, return empty array
console.warn('Warning: Could not retrieve commit history, defaulting to patch version');
return [];
}
} }
} }
@@ -175,7 +183,20 @@ function main() {
console.log(`New version: ${currentVersion}${newVersion}`); console.log(`New version: ${currentVersion}${newVersion}`);
} }
// Confirm with user // Confirm with user (or skip if --yes flag is set)
if (skipConfirm) {
// Update package.json
updatePackageJson(newVersion);
// Update changelog
if (bumpType !== 'custom') {
const commits = getCommitsSinceLastTag();
updateChangelog(newVersion, commits, bumpType);
}
console.log(`\n✅ Version bumped to ${newVersion}`);
process.exit(0);
} else {
const readline = require('readline'); const readline = require('readline');
const rl = readline.createInterface({ const rl = readline.createInterface({
input: process.stdin, input: process.stdin,
@@ -194,19 +215,16 @@ function main() {
} }
console.log(`\n✅ Version bumped to ${newVersion}`); console.log(`\n✅ Version bumped to ${newVersion}`);
console.log(`\nNext steps:`); process.exit(0);
console.log(` 1. Review changes: git diff`);
console.log(` 2. Commit changes: git commit -am "chore: bump version to v${newVersion}"`);
console.log(` 3. Create tag: git tag -a v${newVersion} -m "Release v${newVersion}"`);
console.log(` 4. Push changes: git push origin main`);
console.log(` 5. Push tag: git push origin v${newVersion}`);
} else { } else {
console.log('❌ Version bump cancelled'); console.log('❌ Version bump cancelled');
process.exit(1);
} }
rl.close(); rl.close();
}); });
} }
}
// Run main function // Run main function
main(); main();
+15
View File
@@ -0,0 +1,15 @@
#!/bin/bash
# Run tests in a Node.js container (for consistent environment)
set -e
echo "Running tests in node:20-alpine container..."
echo "This avoids Node.js setup time and ensures consistent environment."
echo ""
# Run unit tests in container
docker run --rm \
-v "$(pwd):/app" \
-w /app \
node:20-alpine \
sh -c "apk add --no-cache bash git && npm ci && npm run test:run"