bb6be245b7
## Summary This PR implements the tournament schedule tab functionality and fixes all remaining E2E test failures. ### Changes Included 1. **Tournament Schedule Feature** - Added tournament schedule page at `/admin/tournaments/[id]/schedule` - Implemented "Generate Schedule" button functionality - Added schedule generation logic for round-robin tournaments 2. **E2E Test Fixes** - Fixed database connection issues in production builds - Improved test reliability with better error handling and debugging - Updated test infrastructure to use environment variables instead of hardcoded values 3. **CI/CD Updates** - Added E2E test job to PR workflow - Configured tests to run against development database - Moved database password to Gitea secrets 4. **Code Quality** - Removed hardcoded passwords from codebase - Improved Prisma client configuration - Enhanced authentication and navigation components ### Test Results All 16 E2E test scenarios are now passing: - Authentication tests: ✅ - Registration tests: ✅ - Tournament schedule tests: ✅ - Player schedule tests: ✅ - Admin navigation tests: ✅ ### Database Configuration - Tests run against `euchre_camp_dev` database - Production builds use environment variables for database configuration - Database password stored in Gitea secrets as `DB_PASSWORD` ### CI Pipeline The PR workflow now includes: 1. Unit tests 2. E2E tests (using production build) 3. Version bump analysis E2E tests must pass before PR can be merged. Reviewed-on: #27 Co-authored-by: David Gwilliam <dhgwilliam@gmail.com> Co-committed-by: David Gwilliam <dhgwilliam@gmail.com>
212 lines
6.7 KiB
TypeScript
212 lines
6.7 KiB
TypeScript
import { prisma } from "@/lib/prisma"
|
|
export const dynamic = "force-dynamic";
|
|
import Navigation from "@/components/Navigation"
|
|
import Link from "next/link"
|
|
import { notFound } from "next/navigation"
|
|
|
|
interface PageProps {
|
|
params: {
|
|
id: string
|
|
}
|
|
}
|
|
|
|
export default async function PlayerSchedulePage({ params }: PageProps) {
|
|
// Next.js 16 requires awaiting params
|
|
const { id } = await params
|
|
const playerId = parseInt(id, 10)
|
|
|
|
if (isNaN(playerId)) {
|
|
notFound()
|
|
}
|
|
|
|
const player = await prisma.player.findUnique({
|
|
where: { id: playerId },
|
|
include: {
|
|
// Get upcoming matches
|
|
matchesAsP1: {
|
|
where: { playedAt: { gte: new Date() } },
|
|
include: {
|
|
event: true,
|
|
player1P1: true,
|
|
player1P2: true,
|
|
player2P1: true,
|
|
player2P2: true,
|
|
},
|
|
orderBy: { playedAt: "asc" },
|
|
},
|
|
matchesAsP2: {
|
|
where: { playedAt: { gte: new Date() } },
|
|
include: {
|
|
event: true,
|
|
player1P1: true,
|
|
player1P2: true,
|
|
player2P1: true,
|
|
player2P2: true,
|
|
},
|
|
orderBy: { playedAt: "asc" },
|
|
},
|
|
matchesAsP3: {
|
|
where: { playedAt: { gte: new Date() } },
|
|
include: {
|
|
event: true,
|
|
player1P1: true,
|
|
player1P2: true,
|
|
player2P1: true,
|
|
player2P2: true,
|
|
},
|
|
orderBy: { playedAt: "asc" },
|
|
},
|
|
matchesAsP4: {
|
|
where: { playedAt: { gte: new Date() } },
|
|
include: {
|
|
event: true,
|
|
player1P1: true,
|
|
player1P2: true,
|
|
player2P1: true,
|
|
player2P2: true,
|
|
},
|
|
orderBy: { playedAt: "asc" },
|
|
},
|
|
},
|
|
})
|
|
|
|
if (!player) {
|
|
notFound()
|
|
}
|
|
|
|
// Combine all upcoming matches
|
|
const upcomingMatches = [
|
|
...player.matchesAsP1,
|
|
...player.matchesAsP2,
|
|
...player.matchesAsP3,
|
|
...player.matchesAsP4,
|
|
].sort((a, b) => new Date(a.playedAt!).getTime() - new Date(b.playedAt!).getTime())
|
|
|
|
// Get active tournaments (events with status 'active' or 'in_progress')
|
|
const activeTournaments = await prisma.event.findMany({
|
|
where: {
|
|
status: { in: ['active', 'in_progress', 'started'] },
|
|
participants: {
|
|
some: {
|
|
playerId: playerId,
|
|
},
|
|
},
|
|
},
|
|
include: {
|
|
participants: true,
|
|
},
|
|
})
|
|
|
|
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">
|
|
<h1 className="text-3xl font-bold text-gray-900 mb-6">
|
|
My Schedule
|
|
</h1>
|
|
|
|
{/* Upcoming Matches */}
|
|
<div className="bg-white shadow rounded-lg p-6 mb-6">
|
|
<h2 className="text-xl font-bold text-gray-900 mb-4">
|
|
Upcoming Matches
|
|
</h2>
|
|
|
|
{upcomingMatches.length === 0 ? (
|
|
<p className="text-gray-500">No upcoming matches</p>
|
|
) : (
|
|
<div className="space-y-4">
|
|
{upcomingMatches.map((match) => {
|
|
const team1Players = [
|
|
match.player1P1?.name,
|
|
match.player1P2?.name,
|
|
].filter(Boolean).join(" + ")
|
|
const team2Players = [
|
|
match.player2P1?.name,
|
|
match.player2P2?.name,
|
|
].filter(Boolean).join(" + ")
|
|
|
|
return (
|
|
<div
|
|
key={match.id}
|
|
className="border border-gray-200 rounded-lg p-4 hover:bg-gray-50"
|
|
>
|
|
<div className="flex justify-between items-center">
|
|
<div className="flex-1">
|
|
<p className="text-sm text-gray-500">
|
|
{match.event?.name || "Tournament"} - {match.playedAt?.toLocaleDateString()}
|
|
</p>
|
|
<p className="font-medium">
|
|
{team1Players} vs {team2Players}
|
|
</p>
|
|
</div>
|
|
<div className="flex items-center space-x-4">
|
|
<span className="text-gray-400">
|
|
{match.playedAt?.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })}
|
|
</span>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
)
|
|
})}
|
|
</div>
|
|
)}
|
|
</div>
|
|
|
|
{/* Active Tournaments */}
|
|
<div className="bg-white shadow rounded-lg p-6">
|
|
<h2 className="text-xl font-bold text-gray-900 mb-4">
|
|
Active Tournaments
|
|
</h2>
|
|
|
|
{activeTournaments.length === 0 ? (
|
|
<p className="text-gray-500">No active tournaments.</p>
|
|
) : (
|
|
<div className="space-y-4">
|
|
{activeTournaments.map((tournament) => {
|
|
// Since teams are now ephemeral, just check if player is a participant
|
|
const isParticipant = tournament.participants.some(
|
|
(p) => p.playerId === playerId
|
|
)
|
|
|
|
return (
|
|
<div
|
|
key={tournament.id}
|
|
className="border border-gray-200 rounded-lg p-4 hover:bg-gray-50"
|
|
>
|
|
<div className="flex justify-between items-center">
|
|
<div>
|
|
<Link
|
|
href={`/tournaments/${tournament.id}`}
|
|
className="font-medium text-green-600 hover:text-green-900"
|
|
>
|
|
{tournament.name}
|
|
</Link>
|
|
<p className="text-sm text-gray-500">
|
|
{tournament.format} - {tournament.status}
|
|
</p>
|
|
{isParticipant && (
|
|
<p className="text-sm text-gray-600">
|
|
Participant in tournament
|
|
</p>
|
|
)}
|
|
</div>
|
|
<div className="text-right">
|
|
<p className="text-sm text-gray-500">
|
|
{new Date(tournament.eventDate || tournament.createdAt).toLocaleDateString()}
|
|
</p>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
)
|
|
})}
|
|
</div>
|
|
)}
|
|
</div>
|
|
</div>
|
|
</main>
|
|
</div>
|
|
)
|
|
}
|