refactor page to use services

This commit is contained in:
2025-12-18 15:58:09 +01:00
parent f54fa5de5b
commit fc386db06a
45 changed files with 2254 additions and 1292 deletions

View File

@@ -198,171 +198,6 @@
"contactEmail" "contactEmail"
] ]
}, },
"UpdatePaymentStatusInputDTO": {
"type": "object",
"properties": {
"paymentId": {
"type": "string"
}
},
"required": [
"paymentId"
]
},
"PaymentDto": {
"type": "object",
"properties": {
"id": {
"type": "string"
}
},
"required": [
"id"
]
},
"MembershipFeeDto": {
"type": "object",
"properties": {
"id": {
"type": "string"
},
"leagueId": {
"type": "string"
}
},
"required": [
"id",
"leagueId"
]
},
"MemberPaymentDto": {
"type": "object",
"properties": {
"id": {
"type": "string"
},
"feeId": {
"type": "string"
},
"driverId": {
"type": "string"
},
"amount": {
"type": "number"
},
"platformFee": {
"type": "number"
},
"netAmount": {
"type": "number"
}
},
"required": [
"id",
"feeId",
"driverId",
"amount",
"platformFee",
"netAmount"
]
},
"PrizeDto": {
"type": "object",
"properties": {
"id": {
"type": "string"
},
"leagueId": {
"type": "string"
},
"seasonId": {
"type": "string"
},
"position": {
"type": "number"
},
"name": {
"type": "string"
},
"amount": {
"type": "number"
}
},
"required": [
"id",
"leagueId",
"seasonId",
"position",
"name",
"amount"
]
},
"WalletDto": {
"type": "object",
"properties": {
"id": {
"type": "string"
},
"leagueId": {
"type": "string"
},
"balance": {
"type": "number"
},
"totalRevenue": {
"type": "number"
},
"totalPlatformFees": {
"type": "number"
},
"totalWithdrawn": {
"type": "number"
},
"createdAt": {
"type": "string",
"format": "date-time"
},
"currency": {
"type": "string"
}
},
"required": [
"id",
"leagueId",
"balance",
"totalRevenue",
"totalPlatformFees",
"totalWithdrawn",
"createdAt",
"currency"
]
},
"TransactionDto": {
"type": "object",
"properties": {
"id": {
"type": "string"
},
"walletId": {
"type": "string"
}
},
"required": [
"id",
"walletId"
]
},
"PaymentDTO": {
"type": "object",
"properties": {
"id": {
"type": "string"
}
},
"required": [
"id"
]
},
"WithdrawFromRaceParamsDTO": { "WithdrawFromRaceParamsDTO": {
"type": "object", "type": "object",
"properties": { "properties": {
@@ -1058,6 +893,297 @@
"suitColor" "suitColor"
] ]
}, },
"UpdatePaymentStatusInputDTO": {
"type": "object",
"properties": {
"paymentId": {
"type": "string"
}
},
"required": [
"paymentId"
]
},
"PaymentDto": {
"type": "object",
"properties": {
"id": {
"type": "string"
}
},
"required": [
"id"
]
},
"MembershipFeeDto": {
"type": "object",
"properties": {
"id": {
"type": "string"
},
"leagueId": {
"type": "string"
}
},
"required": [
"id",
"leagueId"
]
},
"MemberPaymentDto": {
"type": "object",
"properties": {
"id": {
"type": "string"
},
"feeId": {
"type": "string"
},
"driverId": {
"type": "string"
},
"amount": {
"type": "number"
},
"platformFee": {
"type": "number"
},
"netAmount": {
"type": "number"
}
},
"required": [
"id",
"feeId",
"driverId",
"amount",
"platformFee",
"netAmount"
]
},
"PrizeDto": {
"type": "object",
"properties": {
"id": {
"type": "string"
},
"leagueId": {
"type": "string"
},
"seasonId": {
"type": "string"
},
"position": {
"type": "number"
},
"name": {
"type": "string"
},
"amount": {
"type": "number"
}
},
"required": [
"id",
"leagueId",
"seasonId",
"position",
"name",
"amount"
]
},
"WalletDto": {
"type": "object",
"properties": {
"id": {
"type": "string"
},
"leagueId": {
"type": "string"
},
"balance": {
"type": "number"
},
"totalRevenue": {
"type": "number"
},
"totalPlatformFees": {
"type": "number"
},
"totalWithdrawn": {
"type": "number"
},
"createdAt": {
"type": "string",
"format": "date-time"
},
"currency": {
"type": "string"
}
},
"required": [
"id",
"leagueId",
"balance",
"totalRevenue",
"totalPlatformFees",
"totalWithdrawn",
"createdAt",
"currency"
]
},
"TransactionDto": {
"type": "object",
"properties": {
"id": {
"type": "string"
},
"walletId": {
"type": "string"
}
},
"required": [
"id",
"walletId"
]
},
"PaymentDTO": {
"type": "object",
"properties": {
"id": {
"type": "string"
}
},
"required": [
"id"
]
},
"GetDriverRegistrationStatusQueryDTO": {
"type": "object",
"properties": {
"raceId": {
"type": "string"
},
"driverId": {
"type": "string"
}
},
"required": [
"raceId",
"driverId"
]
},
"DriverStatsDTO": {
"type": "object",
"properties": {
"totalDrivers": {
"type": "number"
}
},
"required": [
"totalDrivers"
]
},
"DriverRegistrationStatusDTO": {
"type": "object",
"properties": {
"isRegistered": {
"type": "boolean"
},
"raceId": {
"type": "string"
},
"driverId": {
"type": "string"
}
},
"required": [
"isRegistered",
"raceId",
"driverId"
]
},
"DriverLeaderboardItemDTO": {
"type": "object",
"properties": {
"id": {
"type": "string"
},
"name": {
"type": "string"
},
"rating": {
"type": "number"
},
"skillLevel": {
"type": "string"
},
"nationality": {
"type": "string"
},
"racesCompleted": {
"type": "number"
},
"wins": {
"type": "number"
},
"podiums": {
"type": "number"
},
"isActive": {
"type": "boolean"
},
"rank": {
"type": "number"
}
},
"required": [
"id",
"name",
"rating",
"skillLevel",
"nationality",
"racesCompleted",
"wins",
"podiums",
"isActive",
"rank"
]
},
"CompleteOnboardingOutputDTO": {
"type": "object",
"properties": {
"success": {
"type": "boolean"
}
},
"required": [
"success"
]
},
"CompleteOnboardingInputDTO": {
"type": "object",
"properties": {
"firstName": {
"type": "string"
},
"lastName": {
"type": "string"
},
"displayName": {
"type": "string"
},
"country": {
"type": "string"
}
},
"required": [
"firstName",
"lastName",
"displayName",
"country"
]
},
"UpdateLeagueMemberRoleOutputDTO": { "UpdateLeagueMemberRoleOutputDTO": {
"type": "object", "type": "object",
"properties": { "properties": {
@@ -1525,132 +1651,6 @@
"leagueId" "leagueId"
] ]
}, },
"GetDriverRegistrationStatusQueryDTO": {
"type": "object",
"properties": {
"raceId": {
"type": "string"
},
"driverId": {
"type": "string"
}
},
"required": [
"raceId",
"driverId"
]
},
"DriverStatsDTO": {
"type": "object",
"properties": {
"totalDrivers": {
"type": "number"
}
},
"required": [
"totalDrivers"
]
},
"DriverRegistrationStatusDTO": {
"type": "object",
"properties": {
"isRegistered": {
"type": "boolean"
},
"raceId": {
"type": "string"
},
"driverId": {
"type": "string"
}
},
"required": [
"isRegistered",
"raceId",
"driverId"
]
},
"DriverLeaderboardItemDTO": {
"type": "object",
"properties": {
"id": {
"type": "string"
},
"name": {
"type": "string"
},
"rating": {
"type": "number"
},
"skillLevel": {
"type": "string"
},
"nationality": {
"type": "string"
},
"racesCompleted": {
"type": "number"
},
"wins": {
"type": "number"
},
"podiums": {
"type": "number"
},
"isActive": {
"type": "boolean"
},
"rank": {
"type": "number"
}
},
"required": [
"id",
"name",
"rating",
"skillLevel",
"nationality",
"racesCompleted",
"wins",
"podiums",
"isActive",
"rank"
]
},
"CompleteOnboardingOutputDTO": {
"type": "object",
"properties": {
"success": {
"type": "boolean"
}
},
"required": [
"success"
]
},
"CompleteOnboardingInputDTO": {
"type": "object",
"properties": {
"firstName": {
"type": "string"
},
"lastName": {
"type": "string"
},
"displayName": {
"type": "string"
},
"country": {
"type": "string"
}
},
"required": [
"firstName",
"lastName",
"displayName",
"country"
]
},
"AuthenticatedUserDTO": { "AuthenticatedUserDTO": {
"type": "object", "type": "object",
"properties": { "properties": {

View File

@@ -153,6 +153,37 @@ export class LeagueController {
return this.leagueService.getLeagueProtests(query); return this.leagueService.getLeagueProtests(query);
} }
@Get(':leagueId/protests/:protestId')
@ApiOperation({ summary: 'Get a specific protest for a league' })
@ApiResponse({ status: 200, description: 'Protest details', type: LeagueAdminProtestsDTO })
async getLeagueProtest(
@Param('leagueId') leagueId: string,
@Param('protestId') protestId: string,
): Promise<LeagueAdminProtestsDTO> {
const query: GetLeagueProtestsQuery = { leagueId };
const allProtests = await this.leagueService.getLeagueProtests(query);
// Filter to only include the specific protest
const protest = allProtests.protests.find(p => p.id === protestId);
if (!protest) {
throw new Error('Protest not found');
}
// Find the race for this protest
const race = allProtests.racesById[protest.raceId];
const protestingDriver = allProtests.driversById[protest.protestingDriverId];
const accusedDriver = allProtests.driversById[protest.accusedDriverId];
return {
protests: [protest],
racesById: race ? { [race.id]: race } : {},
driversById: {
...(protestingDriver ? { [protestingDriver.id]: protestingDriver } : {}),
...(accusedDriver ? { [accusedDriver.id]: accusedDriver } : {}),
},
};
}
@Get(':leagueId/seasons') @Get(':leagueId/seasons')
@ApiOperation({ summary: 'Get seasons for a league' }) @ApiOperation({ summary: 'Get seasons for a league' })
@ApiResponse({ status: 200, description: 'List of seasons for the league', type: [LeagueSeasonSummaryDTO] }) @ApiResponse({ status: 200, description: 'List of seasons for the league', type: [LeagueSeasonSummaryDTO] })

View File

@@ -1,5 +1,6 @@
'use client'; 'use client';
import { useState, useEffect } from 'react';
import Image from 'next/image'; import Image from 'next/image';
import Link from 'next/link'; import Link from 'next/link';
import { import {
@@ -9,144 +10,24 @@ import {
Star, Star,
Clock, Clock,
Flag, Flag,
TrendingUp,
ChevronRight, ChevronRight,
Zap,
Target, Target,
Award, Award,
Activity, Activity,
Play, Play,
Bell,
Medal, Medal,
Crown, Crown,
Heart, Heart,
MessageCircle,
UserPlus, UserPlus,
} from 'lucide-react'; } from 'lucide-react';
import Card from '@/components/ui/Card'; import Card from '@/components/ui/Card';
import Button from '@/components/ui/Button'; import Button from '@/components/ui/Button';
// TODO: Re-enable API integration once backend is ready // Dashboard service imports
// import type { import { ServiceFactory } from '@/lib/services/ServiceFactory';
// DashboardOverviewViewModel, import { DashboardOverviewViewModel } from '@/lib/view-models/DashboardOverviewViewModel';
// DashboardFeedItemSummaryViewModel,
// } from '@core/racing/application/presenters/IDashboardOverviewPresenter';
// Mock data for prototype
const MOCK_CURRENT_DRIVER = {
id: 'driver-1',
name: 'Max Verstappen',
avatarUrl: 'https://api.dicebear.com/7.x/avataaars/svg?seed=MaxV',
country: 'NL',
totalRaces: 142,
wins: 28,
podiums: 67,
rating: 2847,
globalRank: 15,
consistency: 94,
};
const MOCK_NEXT_RACE = {
id: 'race-1',
track: 'Spa-Francorchamps',
car: 'Porsche 911 GT3 R',
scheduledAt: new Date(Date.now() + 2 * 24 * 60 * 60 * 1000), // 2 days from now
isMyLeague: true,
leagueName: 'GT3 Masters Series',
};
const MOCK_UPCOMING_RACES = [
{
id: 'race-1',
track: 'Spa-Francorchamps',
car: 'Porsche 911 GT3 R',
scheduledAt: new Date(Date.now() + 2 * 24 * 60 * 60 * 1000),
isMyLeague: true,
},
{
id: 'race-2',
track: 'Nürburgring GP',
car: 'BMW M4 GT3',
scheduledAt: new Date(Date.now() + 5 * 24 * 60 * 60 * 1000),
isMyLeague: true,
},
{
id: 'race-3',
track: 'Monza',
car: 'Ferrari 296 GT3',
scheduledAt: new Date(Date.now() + 8 * 24 * 60 * 60 * 1000),
isMyLeague: false,
},
{
id: 'race-4',
track: 'Silverstone',
car: 'Aston Martin Vantage GT3',
scheduledAt: new Date(Date.now() + 12 * 24 * 60 * 60 * 1000),
isMyLeague: true,
},
];
const MOCK_LEAGUE_STANDINGS = [
{
leagueId: 'league-1',
leagueName: 'GT3 Masters Series',
position: 2,
points: 186,
totalDrivers: 24,
},
{
leagueId: 'league-2',
leagueName: 'Endurance Pro League',
position: 5,
points: 142,
totalDrivers: 32,
},
{
leagueId: 'league-3',
leagueName: 'F1 Weekend Warriors',
position: 1,
points: 225,
totalDrivers: 18,
},
];
const MOCK_FEED_ITEMS = [
{
id: 'feed-1',
type: 'win',
headline: 'You won the race at Spa-Francorchamps!',
body: 'Great driving! You finished P1 with a 3.2s gap to second place.',
timestamp: new Date(Date.now() - 2 * 60 * 60 * 1000),
ctaHref: '/races/race-prev-1',
ctaLabel: 'View Results',
},
{
id: 'feed-2',
type: 'friend_join',
headline: 'Lewis Hamilton joined GT3 Masters Series',
body: null,
timestamp: new Date(Date.now() - 8 * 60 * 60 * 1000),
ctaHref: '/leagues/league-1',
ctaLabel: 'View League',
},
{
id: 'feed-3',
type: 'podium',
headline: 'Charles Leclerc finished P2 at Monza',
body: 'Your friend had a great race!',
timestamp: new Date(Date.now() - 24 * 60 * 60 * 1000),
ctaHref: '/drivers/driver-2',
ctaLabel: 'View Profile',
},
];
const MOCK_FRIENDS = [
{ id: 'friend-1', name: 'Lewis Hamilton', avatarUrl: 'https://api.dicebear.com/7.x/avataaars/svg?seed=Lewis', country: 'GB' },
{ id: 'friend-2', name: 'Charles Leclerc', avatarUrl: 'https://api.dicebear.com/7.x/avataaars/svg?seed=Charles', country: 'MC' },
{ id: 'friend-3', name: 'Lando Norris', avatarUrl: 'https://api.dicebear.com/7.x/avataaars/svg?seed=Lando', country: 'GB' },
{ id: 'friend-4', name: 'Oscar Piastri', avatarUrl: 'https://api.dicebear.com/7.x/avataaars/svg?seed=Oscar', country: 'AU' },
];
// Helper functions // Helper functions
function getCountryFlag(countryCode: string): string { function getCountryFlag(countryCode: string): string {
@@ -197,29 +78,56 @@ function getGreeting(): string {
return 'Good evening'; return 'Good evening';
} }
interface FeedItem { import { DashboardFeedItemSummaryViewModel } from '@/lib/view-models/DashboardOverviewViewModel';
id: string;
type: string;
headline: string;
body: string | null;
timestamp: Date;
ctaHref?: string;
ctaLabel?: string;
}
export default function DashboardPage() { export default function DashboardPage() {
// TODO: Re-enable API integration once backend is ready const [dashboardData, setDashboardData] = useState<DashboardOverviewViewModel | null>(null);
// Currently using mock data for prototype const [isLoading, setIsLoading] = useState(true);
const [error, setError] = useState<string | null>(null);
const currentDriver = MOCK_CURRENT_DRIVER;
const nextRace = MOCK_NEXT_RACE;
const upcomingRaces = MOCK_UPCOMING_RACES;
const leagueStandingsSummaries = MOCK_LEAGUE_STANDINGS;
const feedSummary = { items: MOCK_FEED_ITEMS };
const friends = MOCK_FRIENDS;
const activeLeaguesCount = 3;
const { totalRaces, wins, podiums, rating, globalRank, consistency } = currentDriver; useEffect(() => {
const fetchDashboardData = async () => {
try {
const serviceFactory = new ServiceFactory(process.env.NEXT_PUBLIC_API_BASE_URL || 'http://localhost:3001');
const dashboardService = serviceFactory.createDashboardService();
const data = await dashboardService.getDashboardOverview();
setDashboardData(data);
} catch (err) {
console.error('Failed to fetch dashboard data:', err);
setError('Failed to load dashboard data');
} finally {
setIsLoading(false);
}
};
fetchDashboardData();
}, []);
if (isLoading) {
return (
<main className="min-h-screen bg-deep-graphite flex items-center justify-center">
<div className="text-white">Loading dashboard...</div>
</main>
);
}
if (error || !dashboardData) {
return (
<main className="min-h-screen bg-deep-graphite flex items-center justify-center">
<div className="text-red-400">{error || 'Failed to load dashboard'}</div>
</main>
);
}
const currentDriver = dashboardData.currentDriver;
const nextRace = dashboardData.nextRace;
const upcomingRaces = dashboardData.upcomingRaces;
const leagueStandingsSummaries = dashboardData.leagueStandings;
const feedSummary = { items: dashboardData.feedItems };
const friends = dashboardData.friends;
const activeLeaguesCount = dashboardData.activeLeaguesCount;
const { totalRaces, wins, podiums, rating, globalRank, consistency } = currentDriver;
return ( return (
<main className="min-h-screen bg-deep-graphite"> <main className="min-h-screen bg-deep-graphite">
@@ -581,7 +489,7 @@ export default function DashboardPage() {
} }
// Feed Item Row Component // Feed Item Row Component
function FeedItemRow({ item }: { item: FeedItem }) { function FeedItemRow({ item }: { item: DashboardFeedItemSummaryViewModel }) {
const getActivityIcon = (type: string) => { const getActivityIcon = (type: string) => {
if (type.includes('win')) return { icon: Trophy, color: 'text-yellow-400 bg-yellow-400/10' }; if (type.includes('win')) return { icon: Trophy, color: 'text-yellow-400 bg-yellow-400/10' };
if (type.includes('podium')) return { icon: Medal, color: 'text-warning-amber bg-warning-amber/10' }; if (type.includes('podium')) return { icon: Medal, color: 'text-warning-amber bg-warning-amber/10' };

View File

@@ -29,23 +29,15 @@ import {
MessageCircle, MessageCircle,
ArrowLeft, ArrowLeft,
BarChart3, BarChart3,
History,
Shield, Shield,
Percent, Percent,
Activity, Activity,
Megaphone,
DollarSign,
} from 'lucide-react'; } from 'lucide-react';
import { AllTeamsPresenter } from '@/lib/presenters/AllTeamsPresenter';
import { TeamMembersPresenter } from '@/lib/presenters/TeamMembersPresenter';
import { Driver, EntityMappers, type Team } from '@core/racing';
import type { DriverDTO } from '@core/racing';
import type { ProfileOverviewViewModel } from '@core/racing/application/presenters/IProfileOverviewPresenter';
import Button from '@/components/ui/Button'; import Button from '@/components/ui/Button';
import Card from '@/components/ui/Card'; import Card from '@/components/ui/Card';
import Breadcrumbs from '@/components/layout/Breadcrumbs'; import Breadcrumbs from '@/components/layout/Breadcrumbs';
import type { GetDriverTeamQueryResultDTO } from '@core/racing/application/dtos/GetDriverTeamQueryResultDTO'; import { ServiceFactory } from '@/lib/services/ServiceFactory';
import type { TeamMemberViewModel } from '@core/racing/application/presenters/ITeamMembersPresenter'; import { DriverProfileViewModel } from '@/lib/view-models/DriverProfileViewModel';
// ============================================================================ // ============================================================================
// TYPES // TYPES
@@ -53,6 +45,16 @@ import type { TeamMemberViewModel } from '@core/racing/application/presenters/IT
type ProfileTab = 'overview' | 'stats'; type ProfileTab = 'overview' | 'stats';
interface Team {
id: string;
name: string;
tag: string;
description: string;
ownerId: string;
leagues: unknown[]; // TODO: define proper type
createdAt: Date;
}
interface SocialHandle { interface SocialHandle {
platform: 'twitter' | 'youtube' | 'twitch' | 'discord'; platform: 'twitter' | 'youtube' | 'twitch' | 'discord';
handle: string; handle: string;
@@ -306,59 +308,19 @@ function HorizontalBarChart({ data, maxValue }: BarChartProps) {
// MAIN PAGE // MAIN PAGE
// ============================================================================ // ============================================================================
interface DriverProfileStatsViewModel {
rating: number;
wins: number;
podiums: number;
dnfs: number;
totalRaces: number;
avgFinish: number;
bestFinish: number;
worstFinish: number;
consistency: number;
percentile: number;
}
interface DriverProfileFriendViewModel {
id: string;
name: string;
country: string;
}
interface DriverProfileExtendedViewModel extends DriverExtendedProfile {}
interface DriverProfileViewModel {
currentDriver?: {
id: string;
name: string;
iracingId?: string | null;
country: string;
bio?: string | null;
joinedAt: string | Date;
globalRank?: number;
totalDrivers?: number;
};
stats?: DriverProfileStatsViewModel;
extendedProfile?: DriverProfileExtendedViewModel;
socialSummary?: {
friends: DriverProfileFriendViewModel[];
};
}
export default function DriverDetailPage() { export default function DriverDetailPage() {
const router = useRouter(); const router = useRouter();
const params = useParams(); const params = useParams();
const driverId = params.id as string; const driverId = params.id as string;
const [driver, setDriver] = useState<DriverDTO | null>(null); const [driverProfile, setDriverProfile] = useState<DriverProfileViewModel | null>(null);
const [loading, setLoading] = useState(true); const [loading, setLoading] = useState(true);
const [error, setError] = useState<string | null>(null); const [error, setError] = useState<string | null>(null);
const [activeTab, setActiveTab] = useState<ProfileTab>('overview'); const [activeTab, setActiveTab] = useState<ProfileTab>('overview');
const [teamData, setTeamData] = useState<GetDriverTeamQueryResultDTO | null>(null);
const [allTeamMemberships, setAllTeamMemberships] = useState<TeamMembershipInfo[]>([]); const [allTeamMemberships, setAllTeamMemberships] = useState<TeamMembershipInfo[]>([]);
const [friends, setFriends] = useState<Driver[]>([]);
const [friendRequestSent, setFriendRequestSent] = useState(false); const [friendRequestSent, setFriendRequestSent] = useState(false);
const [profileData, setProfileData] = useState<ProfileOverviewViewModel | null>(null);
const search = const search =
typeof window !== 'undefined' typeof window !== 'undefined'
@@ -392,56 +354,39 @@ export default function DriverDetailPage() {
const loadDriver = async () => { const loadDriver = async () => {
try { try {
// Use GetProfileOverviewUseCase to load all profile data // Initialize service factory
const profileUseCase = getGetProfileOverviewUseCase(); const serviceFactory = new ServiceFactory(process.env.NEXT_PUBLIC_API_BASE_URL || '');
const profileViewModel = await profileUseCase.execute({ driverId }); const driverService = serviceFactory.createDriverService();
const teamService = serviceFactory.createTeamService();
if (!profileViewModel || !profileViewModel.currentDriver) { // Get driver profile
const profileViewModel = await driverService.getDriverProfile(driverId);
if (!profileViewModel.currentDriver) {
setError('Driver not found'); setError('Driver not found');
setLoading(false); setLoading(false);
return; return;
} }
// Set driver from ViewModel setDriverProfile(profileViewModel);
const driverData: DriverDTO = {
id: profileViewModel.currentDriver.id,
name: profileViewModel.currentDriver.name,
iracingId: profileViewModel.currentDriver.iracingId ?? '',
country: profileViewModel.currentDriver.country,
bio: profileViewModel.currentDriver.bio || '',
joinedAt: profileViewModel.currentDriver.joinedAt,
};
setDriver(driverData);
setProfileData(profileViewModel);
// Load ALL team memberships using caller-owned presenters // Load team memberships - get all teams and check memberships
const allTeamsUseCase = getGetAllTeamsUseCase(); const allTeams = await teamService.getAllTeams();
const allTeamsPresenter = new AllTeamsPresenter();
await allTeamsUseCase.execute(undefined as void, allTeamsPresenter);
const allTeamsViewModel = allTeamsPresenter.getViewModel();
const allTeams = allTeamsViewModel?.teams ?? [];
const membershipsUseCase = getGetTeamMembersUseCase();
const memberships: TeamMembershipInfo[] = []; const memberships: TeamMembershipInfo[] = [];
for (const team of allTeams) { for (const team of allTeams) {
const teamMembersPresenter = new TeamMembersPresenter(); const teamMembers = await teamService.getTeamMembers(team.id, driverId, ''); // ownerId not available in summary
await membershipsUseCase.execute({ teamId: team.id }, teamMembersPresenter); const membership = teamMembers.find(member => member.driverId === driverId);
const membersResult = teamMembersPresenter.getViewModel();
const members = membersResult?.members ?? [];
const membership = members.find(
(member: TeamMemberViewModel) => member.driverId === driverId,
);
if (membership) { if (membership) {
memberships.push({ memberships.push({
team: { team: {
id: team.id, id: team.id,
name: team.name, name: team.name,
tag: team.tag, tag: '', // Not available in summary
description: team.description, description: '', // Not available in summary
ownerId: '', ownerId: '', // Not available in summary
leagues: team.leagues, leagues: [], // TODO: populate if needed
createdAt: new Date(), createdAt: new Date(), // TODO: add to API
} as Team, } as Team,
role: membership.role, role: membership.role,
joinedAt: new Date(membership.joinedAt), joinedAt: new Date(membership.joinedAt),
@@ -449,16 +394,6 @@ export default function DriverDetailPage() {
} }
} }
setAllTeamMemberships(memberships); setAllTeamMemberships(memberships);
// Set friends from ViewModel
const friendsList = profileViewModel.socialSummary?.friends.map(f => {
return {
id: f.id,
name: f.name,
country: f.country,
} as Driver;
}) || [];
setFriends(friendsList);
} catch (err) { } catch (err) {
setError(err instanceof Error ? err.message : 'Failed to load driver'); setError(err instanceof Error ? err.message : 'Failed to load driver');
} finally { } finally {
@@ -483,7 +418,7 @@ export default function DriverDetailPage() {
); );
} }
if (error || !driver) { if (error || !driverProfile?.currentDriver) {
return ( return (
<div className="max-w-4xl mx-auto px-4"> <div className="max-w-4xl mx-auto px-4">
<Card className="text-center py-12"> <Card className="text-center py-12">
@@ -497,12 +432,12 @@ export default function DriverDetailPage() {
); );
} }
const demoExtended = getDemoExtendedProfile(driver.id); const demoExtended = getDemoExtendedProfile(driverProfile.currentDriver.id);
const extendedProfile: DriverExtendedProfile = { const extendedProfile: DriverExtendedProfile = {
socialHandles: profileData?.extendedProfile?.socialHandles ?? demoExtended.socialHandles, socialHandles: driverProfile?.extendedProfile?.socialHandles ?? demoExtended.socialHandles,
achievements: achievements:
profileData?.extendedProfile?.achievements driverProfile?.extendedProfile?.achievements
? profileData.extendedProfile.achievements.map((achievement) => ({ ? driverProfile.extendedProfile.achievements.map((achievement) => ({
id: achievement.id, id: achievement.id,
title: achievement.title, title: achievement.title,
description: achievement.description, description: achievement.description,
@@ -511,25 +446,27 @@ export default function DriverDetailPage() {
earnedAt: new Date(achievement.earnedAt), earnedAt: new Date(achievement.earnedAt),
})) }))
: demoExtended.achievements, : demoExtended.achievements,
racingStyle: profileData?.extendedProfile?.racingStyle ?? demoExtended.racingStyle, racingStyle: driverProfile?.extendedProfile?.racingStyle ?? demoExtended.racingStyle,
favoriteTrack: profileData?.extendedProfile?.favoriteTrack ?? demoExtended.favoriteTrack, favoriteTrack: driverProfile?.extendedProfile?.favoriteTrack ?? demoExtended.favoriteTrack,
favoriteCar: profileData?.extendedProfile?.favoriteCar ?? demoExtended.favoriteCar, favoriteCar: driverProfile?.extendedProfile?.favoriteCar ?? demoExtended.favoriteCar,
timezone: profileData?.extendedProfile?.timezone ?? demoExtended.timezone, timezone: driverProfile?.extendedProfile?.timezone ?? demoExtended.timezone,
availableHours: profileData?.extendedProfile?.availableHours ?? demoExtended.availableHours, availableHours: driverProfile?.extendedProfile?.availableHours ?? demoExtended.availableHours,
lookingForTeam: lookingForTeam:
profileData?.extendedProfile?.lookingForTeam ?? demoExtended.lookingForTeam, driverProfile?.extendedProfile?.lookingForTeam ?? demoExtended.lookingForTeam,
openToRequests: openToRequests:
profileData?.extendedProfile?.openToRequests ?? demoExtended.openToRequests, driverProfile?.extendedProfile?.openToRequests ?? demoExtended.openToRequests,
}; };
const stats = profileData?.stats || null; const stats = driverProfile?.stats || null;
const globalRank = profileData?.currentDriver?.globalRank || 1; const globalRank = driverProfile?.currentDriver?.globalRank || 1;
const driver = driverProfile.currentDriver;
// Build sponsor insights for driver // Build sponsor insights for driver
const friendsCount = driverProfile?.socialSummary?.friends?.length ?? 0;
const driverMetrics = [ const driverMetrics = [
MetricBuilders.rating(stats?.rating ?? 0, 'Driver Rating'), MetricBuilders.rating(stats?.rating ?? 0, 'Driver Rating'),
MetricBuilders.views((friends.length * 8) + 50), MetricBuilders.views((friendsCount * 8) + 50),
MetricBuilders.engagement(stats?.consistency ?? 75), MetricBuilders.engagement(stats?.consistency ?? 75),
MetricBuilders.reach((friends.length * 12) + 100), MetricBuilders.reach((friendsCount * 12) + 100),
]; ];
return ( return (
@@ -596,7 +533,7 @@ export default function DriverDetailPage() {
<div className="w-28 h-28 md:w-36 md:h-36 rounded-2xl bg-gradient-to-br from-primary-blue to-purple-600 p-1 shadow-xl shadow-primary-blue/20"> <div className="w-28 h-28 md:w-36 md:h-36 rounded-2xl bg-gradient-to-br from-primary-blue to-purple-600 p-1 shadow-xl shadow-primary-blue/20">
<div className="w-full h-full rounded-xl overflow-hidden bg-iron-gray"> <div className="w-full h-full rounded-xl overflow-hidden bg-iron-gray">
<Image <Image
src={getImageService().getDriverAvatar(driver.id)} src={driver.avatarUrl}
alt={driver.name} alt={driver.name}
width={144} width={144}
height={144} height={144}
@@ -613,11 +550,6 @@ export default function DriverDetailPage() {
<span className="text-4xl" aria-label={`Country: ${driver.country}`}> <span className="text-4xl" aria-label={`Country: ${driver.country}`}>
{getCountryFlag(driver.country)} {getCountryFlag(driver.country)}
</span> </span>
{teamData?.team.tag && (
<span className="px-3 py-1 bg-purple-600/20 text-purple-400 rounded-full text-sm font-semibold border border-purple-600/30">
[{teamData.team.tag}]
</span>
)}
</div> </div>
{/* Rating and Rank */} {/* Rating and Rank */}
@@ -636,16 +568,6 @@ export default function DriverDetailPage() {
</div> </div>
</> </>
)} )}
{teamData && (
<Link
href={`/teams/${teamData.team.id}`}
className="flex items-center gap-2 px-3 py-1.5 rounded-lg bg-purple-600/10 border border-purple-600/30 hover:bg-purple-600/20 transition-colors"
>
<Users className="w-4 h-4 text-purple-400" />
<span className="text-purple-400 font-medium">{teamData.team.name}</span>
<ChevronRight className="w-3 h-3 text-purple-400" />
</Link>
)}
</div> </div>
{/* Meta info */} {/* Meta info */}
@@ -982,37 +904,37 @@ export default function DriverDetailPage() {
</Card> </Card>
{/* Friends Preview */} {/* Friends Preview */}
{friends.length > 0 && ( {driverProfile.socialSummary.friends.length > 0 && (
<Card> <Card>
<div className="flex items-center justify-between mb-4"> <div className="flex items-center justify-between mb-4">
<h2 className="text-lg font-semibold text-white flex items-center gap-2"> <h2 className="text-lg font-semibold text-white flex items-center gap-2">
<Users className="w-5 h-5 text-purple-400" /> <Users className="w-5 h-5 text-purple-400" />
Friends Friends
<span className="text-sm text-gray-500 font-normal">({friends.length})</span> <span className="text-sm text-gray-500 font-normal">({driverProfile.socialSummary.friends.length})</span>
</h2> </h2>
</div> </div>
<div className="flex flex-wrap gap-3"> <div className="flex flex-wrap gap-3">
{friends.slice(0, 8).map((friend) => ( {driverProfile.socialSummary.friends.slice(0, 8).map((friend) => (
<Link <Link
key={friend.id} key={friend.id}
href={`/drivers/${friend.id}`} href={`/drivers/${friend.id}`}
className="flex items-center gap-2 px-3 py-2 rounded-lg bg-iron-gray/50 border border-charcoal-outline hover:border-purple-400/30 hover:bg-iron-gray transition-all" className="flex items-center gap-2 px-3 py-2 rounded-lg bg-iron-gray/50 border border-charcoal-outline hover:border-purple-400/30 hover:bg-iron-gray transition-all"
> >
<div className="w-8 h-8 rounded-full overflow-hidden bg-gradient-to-br from-primary-blue to-purple-600"> <div className="w-8 h-8 rounded-full overflow-hidden bg-gradient-to-br from-primary-blue to-purple-600">
<Image <Image
src={getImageService().getDriverAvatar(friend.id)} src={friend.avatarUrl || '/default-avatar.png'}
alt={friend.name} alt={friend.name}
width={32} width={32}
height={32} height={32}
className="w-full h-full object-cover" className="w-full h-full object-cover"
/> />
</div> </div>
<span className="text-sm text-white">{friend.name}</span> <span className="text-sm text-white">{friend.name}</span>
<span className="text-lg">{getCountryFlag(friend.country)}</span> <span className="text-lg">{getCountryFlag(friend.country)}</span>
</Link> </Link>
))} ))}
{friends.length > 8 && ( {driverProfile.socialSummary.friends.length > 8 && (
<div className="flex items-center px-3 py-2 text-sm text-gray-400">+{friends.length - 8} more</div> <div className="flex items-center px-3 py-2 text-sm text-gray-400">+{driverProfile.socialSummary.friends.length - 8} more</div>
)} )}
</div> </div>
</Card> </Card>

View File

@@ -3,18 +3,11 @@
import Breadcrumbs from '@/components/layout/Breadcrumbs'; import Breadcrumbs from '@/components/layout/Breadcrumbs';
import LeagueHeader from '@/components/leagues/LeagueHeader'; import LeagueHeader from '@/components/leagues/LeagueHeader';
import { useEffectiveDriverId } from '@/hooks/useEffectiveDriverId'; import { useEffectiveDriverId } from '@/hooks/useEffectiveDriverId';
import { isLeagueAdminOrHigherRole } from '@/lib/leagueRoles'; import { ServiceFactory } from '@/lib/services/ServiceFactory';
import type { League } from '@core/racing/domain/entities/League'; import { LeagueDetailViewModel } from '@/lib/view-models/LeagueDetailViewModel';
import { useParams, usePathname, useRouter } from 'next/navigation'; import { useParams, usePathname, useRouter } from 'next/navigation';
import React, { useEffect, useState } from 'react'; import React, { useEffect, useState } from 'react';
// Main sponsor info for "by XYZ" display
interface MainSponsorInfo {
name: string;
logoUrl: string;
websiteUrl: string;
}
export default function LeagueLayout({ export default function LeagueLayout({
children, children,
}: { }: {
@@ -26,61 +19,18 @@ export default function LeagueLayout({
const leagueId = params.id as string; const leagueId = params.id as string;
const currentDriverId = useEffectiveDriverId(); const currentDriverId = useEffectiveDriverId();
const [league, setLeague] = useState<League | null>(null); const [leagueDetail, setLeagueDetail] = useState<LeagueDetailViewModel | null>(null);
const [ownerName, setOwnerName] = useState<string>('');
const [mainSponsor, setMainSponsor] = useState<MainSponsorInfo | null>(null);
const [isAdmin, setIsAdmin] = useState(false);
const [loading, setLoading] = useState(true); const [loading, setLoading] = useState(true);
useEffect(() => { useEffect(() => {
async function loadLeague() { async function loadLeague() {
try { try {
const leagueRepo = getLeagueRepository(); const serviceFactory = new ServiceFactory(process.env.NEXT_PUBLIC_API_BASE_URL || '');
const driverRepo = getDriverRepository(); const leagueService = serviceFactory.createLeagueService();
const membershipRepo = getLeagueMembershipRepository();
const seasonRepo = getSeasonRepository();
const sponsorRepo = getSponsorRepository();
const sponsorshipRepo = getSeasonSponsorshipRepository();
const leagueData = await leagueRepo.findById(leagueId);
if (!leagueData) {
setLoading(false);
return;
}
setLeague(leagueData); const leagueDetailData = await leagueService.getLeagueDetail(leagueId, currentDriverId);
const owner = await driverRepo.findById(leagueData.ownerId); setLeagueDetail(leagueDetailData);
setOwnerName(owner ? owner.name : `${leagueData.ownerId.slice(0, 8)}...`);
// Check if current user is admin
const membership = await membershipRepo.getMembership(leagueId, currentDriverId);
setIsAdmin(membership ? isLeagueAdminOrHigherRole(membership.role) : false);
// Load main sponsor for "by XYZ" display
try {
const seasons = await seasonRepo.findByLeagueId(leagueId);
const activeSeason = seasons.find((s: { status: string }) => s.status === 'active') ?? seasons[0];
if (activeSeason) {
const sponsorships = await sponsorshipRepo.findBySeasonId(activeSeason.id);
const mainSponsorship = sponsorships.find(s => s.tier === 'main' && s.status === 'active');
if (mainSponsorship) {
const sponsor = await sponsorRepo.findById(mainSponsorship.sponsorId);
if (sponsor) {
setMainSponsor({
name: sponsor.name,
logoUrl: sponsor.logoUrl ?? '',
websiteUrl: sponsor.websiteUrl ?? '',
});
}
}
}
} catch (sponsorError) {
console.warn('Failed to load main sponsor:', sponsorError);
}
} catch (error) { } catch (error) {
console.error('Failed to load league:', error); console.error('Failed to load league:', error);
} finally { } finally {
@@ -101,7 +51,7 @@ export default function LeagueLayout({
); );
} }
if (!league) { if (!leagueDetail) {
return ( return (
<div className="min-h-screen bg-deep-graphite py-12 px-4 sm:px-6 lg:px-8"> <div className="min-h-screen bg-deep-graphite py-12 px-4 sm:px-6 lg:px-8">
<div className="max-w-6xl mx-auto"> <div className="max-w-6xl mx-auto">
@@ -126,12 +76,8 @@ export default function LeagueLayout({
{ label: 'Settings', href: `/leagues/${leagueId}/settings`, exact: false }, { label: 'Settings', href: `/leagues/${leagueId}/settings`, exact: false },
]; ];
const tabs = isAdmin ? [...baseTabs, ...adminTabs] : baseTabs; const tabs = leagueDetail.isAdmin ? [...baseTabs, ...adminTabs] : baseTabs;
// Determine active tab
const activeTab = tabs.find(tab =>
tab.exact ? pathname === tab.href : pathname.startsWith(tab.href)
);
return ( return (
<div className="min-h-screen bg-deep-graphite py-12 px-4 sm:px-6 lg:px-8"> <div className="min-h-screen bg-deep-graphite py-12 px-4 sm:px-6 lg:px-8">
@@ -140,17 +86,17 @@ export default function LeagueLayout({
items={[ items={[
{ label: 'Home', href: '/' }, { label: 'Home', href: '/' },
{ label: 'Leagues', href: '/leagues' }, { label: 'Leagues', href: '/leagues' },
{ label: league.name }, { label: leagueDetail.name },
]} ]}
/> />
<LeagueHeader <LeagueHeader
leagueId={league.id} leagueId={leagueDetail.id}
leagueName={league.name} leagueName={leagueDetail.name}
description={league.description} description={leagueDetail.description}
ownerId={league.ownerId} ownerId={leagueDetail.ownerId}
ownerName={ownerName} ownerName={leagueDetail.ownerName}
mainSponsor={mainSponsor} mainSponsor={leagueDetail.mainSponsor}
/> />
{/* Tab Navigation */} {/* Tab Navigation */}

View File

@@ -13,180 +13,54 @@ import SponsorInsightsCard, {
import Button from '@/components/ui/Button'; import Button from '@/components/ui/Button';
import Card from '@/components/ui/Card'; import Card from '@/components/ui/Card';
import { useEffectiveDriverId } from '@/hooks/useEffectiveDriverId'; import { useEffectiveDriverId } from '@/hooks/useEffectiveDriverId';
import { getLeagueMembers, getMembership } from '@/lib/leagueMembership'; import { LeagueMembershipService } from '@/lib/services/leagues/LeagueMembershipService';
import { getLeagueRoleDisplay } from '@/lib/leagueRoles'; import { LeagueRoleDisplay } from '@/lib/display-objects/LeagueRoleDisplay';
import { LeagueScoringConfigPresenter } from '@/lib/presenters/LeagueScoringConfigPresenter'; import { ServiceFactory } from '@/lib/services/ServiceFactory';
import { import { LeagueDetailPageViewModel } from '@/lib/view-models/LeagueDetailPageViewModel';
Driver,
EntityMappers,
League,
Race,
type DriverDTO,
type LeagueScoringConfigDTO,
} from '@core/racing';
import { Calendar, ExternalLink, Star, Trophy, Users } from 'lucide-react'; import { Calendar, ExternalLink, Star, Trophy, Users } from 'lucide-react';
import { useParams, useRouter } from 'next/navigation'; import { useParams, useRouter } from 'next/navigation';
import { useEffect, useMemo, useState } from 'react'; import { useEffect, useMemo, useState } from 'react';
// Sponsor info type
interface SponsorInfo {
id: string;
name: string;
logoUrl?: string;
websiteUrl?: string;
tier: 'main' | 'secondary';
tagline?: string;
}
export default function LeagueDetailPage() { export default function LeagueDetailPage() {
const router = useRouter(); const router = useRouter();
const params = useParams(); const params = useParams();
const leagueId = params.id as string; const leagueId = params.id as string;
const isSponsor = useSponsorMode(); const isSponsor = useSponsorMode();
const [league, setLeague] = useState<League | null>(null); const [viewModel, setViewModel] = useState<LeagueDetailPageViewModel | null>(null);
const [owner, setOwner] = useState<Driver | null>(null);
const [drivers, setDrivers] = useState<DriverDTO[]>([]);
const [scoringConfig, setScoringConfig] = useState<LeagueScoringConfigDTO | null>(null);
const [averageSOF, setAverageSOF] = useState<number | null>(null);
const [completedRacesCount, setCompletedRacesCount] = useState<number>(0);
const [sponsors, setSponsors] = useState<SponsorInfo[]>([]);
const [runningRaces, setRunningRaces] = useState<Race[]>([]);
const [loading, setLoading] = useState(true); const [loading, setLoading] = useState(true);
const [error, setError] = useState<string | null>(null); const [error, setError] = useState<string | null>(null);
const [refreshKey, setRefreshKey] = useState(0);
const [endRaceModalRaceId, setEndRaceModalRaceId] = useState<string | null>(null); const [endRaceModalRaceId, setEndRaceModalRaceId] = useState<string | null>(null);
const currentDriverId = useEffectiveDriverId(); const currentDriverId = useEffectiveDriverId();
const membership = getMembership(leagueId, currentDriverId); const membership = LeagueMembershipService.getMembership(leagueId, currentDriverId);
const leagueMemberships = getLeagueMembers(leagueId); const leagueMemberships = LeagueMembershipService.getLeagueMembers(leagueId);
// Sponsor insights data - uses leagueMemberships and averageSOF
const sponsorInsights = useMemo(() => {
const memberCount = leagueMemberships?.length || 20;
const mainSponsorTaken = sponsors.some(s => s.tier === 'main');
const secondaryTaken = sponsors.filter(s => s.tier === 'secondary').length;
return {
avgViewsPerRace: 5400 + memberCount * 50,
totalImpressions: 45000 + memberCount * 500,
engagementRate: (3.5 + (memberCount / 50)).toFixed(1),
estimatedReach: memberCount * 150,
mainSponsorAvailable: !mainSponsorTaken,
secondarySlotsAvailable: Math.max(0, 2 - secondaryTaken),
mainSponsorPrice: 800 + Math.floor(memberCount * 10),
secondaryPrice: 250 + Math.floor(memberCount * 3),
tier: (averageSOF && averageSOF > 3000 ? 'premium' : averageSOF && averageSOF > 2000 ? 'standard' : 'starter') as 'premium' | 'standard' | 'starter',
trustScore: Math.min(100, 60 + memberCount + completedRacesCount),
discordMembers: memberCount * 3,
monthlyActivity: Math.min(100, 40 + completedRacesCount * 2),
};
}, [averageSOF, leagueMemberships?.length, sponsors, completedRacesCount]);
// Build metrics for SponsorInsightsCard // Build metrics for SponsorInsightsCard
const leagueMetrics: SponsorMetric[] = useMemo(() => [ const leagueMetrics: SponsorMetric[] = useMemo(() => {
MetricBuilders.views(sponsorInsights.avgViewsPerRace, 'Avg Views/Race'), if (!viewModel) return [];
MetricBuilders.engagement(sponsorInsights.engagementRate), return [
MetricBuilders.reach(sponsorInsights.estimatedReach), MetricBuilders.views(viewModel.sponsorInsights.avgViewsPerRace, 'Avg Views/Race'),
MetricBuilders.sof(averageSOF ?? '—'), MetricBuilders.engagement(viewModel.sponsorInsights.engagementRate),
], [sponsorInsights, averageSOF]); MetricBuilders.reach(viewModel.sponsorInsights.estimatedReach),
MetricBuilders.sof(viewModel.averageSOF ?? '—'),
];
}, [viewModel]);
const loadLeagueData = async () => { const loadLeagueData = async () => {
try { try {
const leagueRepo = getLeagueRepository(); const serviceFactory = new ServiceFactory(process.env.NEXT_PUBLIC_API_URL || '');
const raceRepo = getRaceRepository(); const leagueService = serviceFactory.createLeagueService();
const driverRepo = getDriverRepository();
const leagueStatsUseCase = getGetLeagueStatsUseCase();
const seasonRepo = getSeasonRepository();
const sponsorRepo = getSponsorRepository();
const sponsorshipRepo = getSeasonSponsorshipRepository();
const leagueData = await leagueRepo.findById(leagueId); const viewModelData = await leagueService.getLeagueDetailPageData(leagueId);
if (!leagueData) { if (!viewModelData) {
setError('League not found'); setError('League not found');
setLoading(false); setLoading(false);
return; return;
} }
setLeague(leagueData); setViewModel(viewModelData);
// Load owner data
const ownerData = await driverRepo.findById(leagueData.ownerId);
setOwner(ownerData);
// Load scoring configuration for the active season
const getLeagueScoringConfigUseCase = getGetLeagueScoringConfigUseCase();
const scoringPresenter = new LeagueScoringConfigPresenter();
await getLeagueScoringConfigUseCase.execute({ leagueId }, scoringPresenter);
const scoringViewModel = scoringPresenter.getViewModel();
setScoringConfig(scoringViewModel as unknown as LeagueScoringConfigDTO);
// Load all drivers for standings and map to DTOs for UI components
const allDrivers = await driverRepo.findAll();
const driverDtos: DriverDTO[] = allDrivers
.map((driver) => EntityMappers.toDriverDTO(driver))
.filter((dto): dto is DriverDTO => dto !== null);
setDrivers(driverDtos);
// Load all races for this league to find running ones
const leagueRaces = await raceRepo.findByLeagueId(leagueId);
const runningRaces = leagueRaces.filter(r => r.status === 'running');
setRunningRaces(runningRaces);
// Load league stats including average SOF from application use case
await leagueStatsUseCase.execute({ leagueId });
const leagueStatsViewModel = leagueStatsUseCase.presenter.getViewModel();
if (leagueStatsViewModel) {
setAverageSOF(leagueStatsViewModel.averageSOF);
setCompletedRacesCount(leagueStatsViewModel.completedRaces);
} else {
// Fallback: count completed races manually
const completedRaces = leagueRaces.filter(r => r.status === 'completed');
setCompletedRacesCount(completedRaces.length);
}
// Load sponsors for this league
try {
const seasons = await seasonRepo.findByLeagueId(leagueId);
const activeSeason = seasons.find((s: { status: string }) => s.status === 'active') ?? seasons[0];
if (activeSeason) {
const sponsorships = await sponsorshipRepo.findBySeasonId(activeSeason.id);
const activeSponsorships = sponsorships.filter((s) => s.status === 'active');
const sponsorInfos: SponsorInfo[] = [];
for (const sponsorship of activeSponsorships) {
const sponsor = await sponsorRepo.findById(sponsorship.sponsorId);
if (sponsor) {
const testingSupportModule = await import('@gridpilot/testing-support');
const demoSponsors = testingSupportModule.sponsors as Array<{ id: string; tagline?: string }>;
const demoSponsor = demoSponsors.find((demo) => demo.id === sponsor.id);
sponsorInfos.push({
id: sponsor.id,
name: sponsor.name,
logoUrl: sponsor.logoUrl ?? '',
websiteUrl: sponsor.websiteUrl ?? '',
tier: sponsorship.tier,
tagline: demoSponsor?.tagline ?? '',
});
}
}
// Sort: main sponsors first, then secondary
sponsorInfos.sort((a, b) => {
if (a.tier === 'main' && b.tier !== 'main') return -1;
if (a.tier !== 'main' && b.tier === 'main') return 1;
return 0;
});
setSponsors(sponsorInfos);
}
} catch (sponsorError) {
console.warn('Failed to load sponsors:', sponsorError);
}
} catch (err) { } catch (err) {
setError(err instanceof Error ? err.message : 'Failed to load league'); setError(err instanceof Error ? err.message : 'Failed to load league');
} finally { } finally {
@@ -200,66 +74,14 @@ export default function LeagueDetailPage() {
}, [leagueId]); }, [leagueId]);
const handleMembershipChange = () => { const handleMembershipChange = () => {
setRefreshKey(prev => prev + 1);
loadLeagueData(); loadLeagueData();
}; };
const driversById = useMemo(() => { // Note: driver summaries are now handled by the ViewModel
const map: Record<string, DriverDTO> = {};
for (const d of drivers) {
map[d.id] = d;
}
return map;
}, [drivers]);
const ownerMembership = leagueMemberships.find((m) => m.role === 'owner') ?? null;
const adminMemberships = leagueMemberships.filter((m) => m.role === 'admin');
const stewardMemberships = leagueMemberships.filter((m) => m.role === 'steward');
const buildDriverSummary = (driverId: string) => {
const driverDto = driversById[driverId];
if (!driverDto) {
return null;
}
const stats = getDriverStats(driverDto.id);
const allRankings = getAllDriverRankings();
let rating: number | null = stats?.rating ?? null;
let rank: number | null = null;
if (stats) {
if (typeof stats.overallRank === 'number' && stats.overallRank > 0) {
rank = stats.overallRank;
} else {
const indexInGlobal = allRankings.findIndex(
(stat) => stat.driverId === stats.driverId,
);
if (indexInGlobal !== -1) {
rank = indexInGlobal + 1;
}
}
if (rating === null) {
const globalEntry = allRankings.find(
(stat) => stat.driverId === stats.driverId,
);
if (globalEntry) {
rating = globalEntry.rating;
}
}
}
return {
driver: driverDto,
rating,
rank,
};
};
return loading ? ( return loading ? (
<div className="text-center text-gray-400">Loading league...</div> <div className="text-center text-gray-400">Loading league...</div>
) : error || !league ? ( ) : error || !viewModel ? (
<Card className="text-center py-12"> <Card className="text-center py-12">
<div className="text-warning-amber mb-4"> <div className="text-warning-amber mb-4">
{error || 'League not found'} {error || 'League not found'}
@@ -274,35 +96,35 @@ export default function LeagueDetailPage() {
) : ( ) : (
<> <>
{/* Sponsor Insights Card - Only shown to sponsors, at top of page */} {/* Sponsor Insights Card - Only shown to sponsors, at top of page */}
{isSponsor && league && ( {isSponsor && viewModel && (
<SponsorInsightsCard <SponsorInsightsCard
entityType="league" entityType="league"
entityId={leagueId} entityId={leagueId}
entityName={league.name} entityName={viewModel.name}
tier={sponsorInsights.tier} tier={viewModel.sponsorInsights.tier}
metrics={leagueMetrics} metrics={leagueMetrics}
slots={SlotTemplates.league( slots={SlotTemplates.league(
sponsorInsights.mainSponsorAvailable, viewModel.sponsorInsights.mainSponsorAvailable,
sponsorInsights.secondarySlotsAvailable, viewModel.sponsorInsights.secondarySlotsAvailable,
sponsorInsights.mainSponsorPrice, viewModel.sponsorInsights.mainSponsorPrice,
sponsorInsights.secondaryPrice viewModel.sponsorInsights.secondaryPrice
)} )}
trustScore={sponsorInsights.trustScore} trustScore={viewModel.sponsorInsights.trustScore}
discordMembers={sponsorInsights.discordMembers} discordMembers={viewModel.sponsorInsights.discordMembers}
monthlyActivity={sponsorInsights.monthlyActivity} monthlyActivity={viewModel.sponsorInsights.monthlyActivity}
additionalStats={{ additionalStats={{
label: 'League Stats', label: 'League Stats',
items: [ items: [
{ label: 'Total Races', value: completedRacesCount }, { label: 'Total Races', value: viewModel.completedRacesCount },
{ label: 'Active Members', value: leagueMemberships.length }, { label: 'Active Members', value: viewModel.memberships.length },
{ label: 'Total Impressions', value: sponsorInsights.totalImpressions }, { label: 'Total Impressions', value: viewModel.sponsorInsights.totalImpressions },
], ],
}} }}
/> />
)} )}
{/* Live Race Card - Prominently show running races */} {/* Live Race Card - Prominently show running races */}
{runningRaces.length > 0 && ( {viewModel && viewModel.runningRaces.length > 0 && (
<Card className="border-2 border-performance-green/50 bg-gradient-to-r from-performance-green/10 to-performance-green/5 mb-6"> <Card className="border-2 border-performance-green/50 bg-gradient-to-r from-performance-green/10 to-performance-green/5 mb-6">
<div className="flex items-center gap-3 mb-4"> <div className="flex items-center gap-3 mb-4">
<div className="w-3 h-3 bg-performance-green rounded-full animate-pulse"></div> <div className="w-3 h-3 bg-performance-green rounded-full animate-pulse"></div>
@@ -310,7 +132,7 @@ export default function LeagueDetailPage() {
</div> </div>
<div className="space-y-3"> <div className="space-y-3">
{runningRaces.map((race) => ( {viewModel.runningRaces.map((race) => (
<div <div
key={race.id} key={race.id}
className="p-4 rounded-lg bg-deep-graphite border border-performance-green/30" className="p-4 rounded-lg bg-deep-graphite border border-performance-green/30"
@@ -321,7 +143,7 @@ export default function LeagueDetailPage() {
<span className="text-sm font-semibold text-performance-green">LIVE</span> <span className="text-sm font-semibold text-performance-green">LIVE</span>
</div> </div>
<h3 className="text-lg font-semibold text-white"> <h3 className="text-lg font-semibold text-white">
{race.track} - {race.car} {race.name}
</h3> </h3>
</div> </div>
<div className="flex flex-col sm:flex-row gap-2"> <div className="flex flex-col sm:flex-row gap-2">
@@ -347,9 +169,10 @@ export default function LeagueDetailPage() {
<div className="grid grid-cols-1 sm:grid-cols-3 gap-4 text-sm text-gray-400"> <div className="grid grid-cols-1 sm:grid-cols-3 gap-4 text-sm text-gray-400">
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
<Calendar className="w-4 h-4" /> <Calendar className="w-4 h-4" />
<span>Started {new Date(race.scheduledAt).toLocaleDateString()}</span> <span>Started {new Date(race.date).toLocaleDateString()}</span>
</div> </div>
{race.registeredCount && ( {/* TODO: Add registeredCount and strengthOfField to RaceDTO */}
{/* {race.registeredCount && (
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
<Users className="w-4 h-4" /> <Users className="w-4 h-4" />
<span>{race.registeredCount} drivers registered</span> <span>{race.registeredCount} drivers registered</span>
@@ -360,7 +183,7 @@ export default function LeagueDetailPage() {
<Trophy className="w-4 h-4" /> <Trophy className="w-4 h-4" />
<span>SOF: {race.strengthOfField}</span> <span>SOF: {race.strengthOfField}</span>
</div> </div>
)} )} */}
</div> </div>
</div> </div>
))} ))}
@@ -405,15 +228,15 @@ export default function LeagueDetailPage() {
{/* Stats Grid */} {/* Stats Grid */}
<div className="grid grid-cols-3 gap-3 mb-4"> <div className="grid grid-cols-3 gap-3 mb-4">
<div className="bg-deep-graphite rounded-lg p-3 text-center border border-charcoal-outline"> <div className="bg-deep-graphite rounded-lg p-3 text-center border border-charcoal-outline">
<div className="text-xl font-bold text-white">{leagueMemberships.length}</div> <div className="text-xl font-bold text-white">{viewModel.memberships.length}</div>
<div className="text-xs text-gray-500">Members</div> <div className="text-xs text-gray-500">Members</div>
</div> </div>
<div className="bg-deep-graphite rounded-lg p-3 text-center border border-charcoal-outline"> <div className="bg-deep-graphite rounded-lg p-3 text-center border border-charcoal-outline">
<div className="text-xl font-bold text-white">{completedRacesCount}</div> <div className="text-xl font-bold text-white">{viewModel.completedRacesCount}</div>
<div className="text-xs text-gray-500">Races</div> <div className="text-xs text-gray-500">Races</div>
</div> </div>
<div className="bg-deep-graphite rounded-lg p-3 text-center border border-charcoal-outline"> <div className="bg-deep-graphite rounded-lg p-3 text-center border border-charcoal-outline">
<div className="text-xl font-bold text-warning-amber">{averageSOF ?? '—'}</div> <div className="text-xl font-bold text-warning-amber">{viewModel.averageSOF ?? '—'}</div>
<div className="text-xs text-gray-500">Avg SOF</div> <div className="text-xs text-gray-500">Avg SOF</div>
</div> </div>
</div> </div>
@@ -422,16 +245,16 @@ export default function LeagueDetailPage() {
<div className="space-y-2 text-sm"> <div className="space-y-2 text-sm">
<div className="flex items-center justify-between py-1.5 border-b border-charcoal-outline/50"> <div className="flex items-center justify-between py-1.5 border-b border-charcoal-outline/50">
<span className="text-gray-500">Structure</span> <span className="text-gray-500">Structure</span>
<span className="text-white">Solo {league.settings.maxDrivers ?? 32} max</span> <span className="text-white">Solo {viewModel.settings.maxDrivers ?? 32} max</span>
</div> </div>
<div className="flex items-center justify-between py-1.5 border-b border-charcoal-outline/50"> <div className="flex items-center justify-between py-1.5 border-b border-charcoal-outline/50">
<span className="text-gray-500">Scoring</span> <span className="text-gray-500">Scoring</span>
<span className="text-white">{scoringConfig?.scoringPresetName ?? 'Standard'}</span> <span className="text-white">{viewModel.scoringConfig?.scoringPresetName ?? 'Standard'}</span>
</div> </div>
<div className="flex items-center justify-between py-1.5"> <div className="flex items-center justify-between py-1.5">
<span className="text-gray-500">Created</span> <span className="text-gray-500">Created</span>
<span className="text-white"> <span className="text-white">
{new Date(league.createdAt).toLocaleDateString('en-US', { {new Date(viewModel.createdAt).toLocaleDateString('en-US', {
month: 'short', month: 'short',
year: 'numeric' year: 'numeric'
})} })}
@@ -439,7 +262,7 @@ export default function LeagueDetailPage() {
</div> </div>
</div> </div>
{league.socialLinks && ( {viewModel.socialLinks && (
<div className="mt-4 pt-4 border-t border-charcoal-outline"> <div className="mt-4 pt-4 border-t border-charcoal-outline">
<div className="flex flex-wrap gap-2"> <div className="flex flex-wrap gap-2">
{league.socialLinks.discordUrl && ( {league.socialLinks.discordUrl && (
@@ -478,14 +301,14 @@ export default function LeagueDetailPage() {
</Card> </Card>
{/* Sponsors Section - Show sponsor logos */} {/* Sponsors Section - Show sponsor logos */}
{sponsors.length > 0 && ( {viewModel.sponsors.length > 0 && (
<Card> <Card>
<h3 className="text-lg font-semibold text-white mb-4"> <h3 className="text-lg font-semibold text-white mb-4">
{sponsors.find(s => s.tier === 'main') ? 'Presented by' : 'Sponsors'} {viewModel.sponsors.find(s => s.tier === 'main') ? 'Presented by' : 'Sponsors'}
</h3> </h3>
<div className="space-y-3"> <div className="space-y-3">
{/* Main Sponsor - Featured prominently */} {/* Main Sponsor - Featured prominently */}
{sponsors.filter(s => s.tier === 'main').map(sponsor => ( {viewModel.sponsors.filter(s => s.tier === 'main').map(sponsor => (
<div <div
key={sponsor.id} key={sponsor.id}
className="p-3 rounded-lg bg-gradient-to-r from-yellow-500/10 to-transparent border border-yellow-500/30" className="p-3 rounded-lg bg-gradient-to-r from-yellow-500/10 to-transparent border border-yellow-500/30"
@@ -530,9 +353,9 @@ export default function LeagueDetailPage() {
))} ))}
{/* Secondary Sponsors - Smaller display */} {/* Secondary Sponsors - Smaller display */}
{sponsors.filter(s => s.tier === 'secondary').length > 0 && ( {viewModel.sponsors.filter(s => s.tier === 'secondary').length > 0 && (
<div className="grid grid-cols-2 gap-2"> <div className="grid grid-cols-2 gap-2">
{sponsors.filter(s => s.tier === 'secondary').map(sponsor => ( {viewModel.sponsors.filter(s => s.tier === 'secondary').map(sponsor => (
<div <div
key={sponsor.id} key={sponsor.id}
className="p-2 rounded-lg bg-iron-gray/50 border border-charcoal-outline" className="p-2 rounded-lg bg-iron-gray/50 border border-charcoal-outline"
@@ -574,24 +397,23 @@ export default function LeagueDetailPage() {
)} )}
{/* Management */} {/* Management */}
{(ownerMembership || adminMemberships.length > 0 || stewardMemberships.length > 0) && ( {viewModel && (viewModel.ownerSummary || viewModel.adminSummaries.length > 0 || viewModel.stewardSummaries.length > 0) && (
<Card> <Card>
<h3 className="text-lg font-semibold text-white mb-4">Management</h3> <h3 className="text-lg font-semibold text-white mb-4">Management</h3>
<div className="space-y-2"> <div className="space-y-2">
{ownerMembership && (() => { {viewModel.ownerSummary && (() => {
const driverDto = driversById[ownerMembership.driverId]; const summary = viewModel.ownerSummary;
const summary = buildDriverSummary(ownerMembership.driverId); const roleDisplay = LeagueRoleDisplay.getLeagueRoleDisplay('owner');
const roleDisplay = getLeagueRoleDisplay('owner'); const meta = summary.rating !== null
const meta = summary && summary.rating !== null
? `Rating ${summary.rating}${summary.rank ? ` • Rank ${summary.rank}` : ''}` ? `Rating ${summary.rating}${summary.rank ? ` • Rank ${summary.rank}` : ''}`
: null; : null;
return driverDto ? ( return (
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
<div className="flex-1"> <div className="flex-1">
<DriverIdentity <DriverIdentity
driver={driverDto} driver={summary.driver}
href={`/drivers/${ownerMembership.driverId}?from=league-management&leagueId=${leagueId}`} href={`/drivers/${summary.driver.id}?from=league-management&leagueId=${leagueId}`}
meta={meta} meta={meta}
size="sm" size="sm"
/> />
@@ -600,23 +422,21 @@ export default function LeagueDetailPage() {
{roleDisplay.text} {roleDisplay.text}
</span> </span>
</div> </div>
) : null; );
})()} })()}
{adminMemberships.slice(0, 3).map((membership) => { {viewModel.adminSummaries.map((summary) => {
const driverDto = driversById[membership.driverId]; const roleDisplay = LeagueRoleDisplay.getLeagueRoleDisplay('admin');
const summary = buildDriverSummary(membership.driverId); const meta = summary.rating !== null
const roleDisplay = getLeagueRoleDisplay('admin');
const meta = summary && summary.rating !== null
? `Rating ${summary.rating}${summary.rank ? ` • Rank ${summary.rank}` : ''}` ? `Rating ${summary.rating}${summary.rank ? ` • Rank ${summary.rank}` : ''}`
: null; : null;
return driverDto ? ( return (
<div key={membership.driverId} className="flex items-center gap-2"> <div key={summary.driver.id} className="flex items-center gap-2">
<div className="flex-1"> <div className="flex-1">
<DriverIdentity <DriverIdentity
driver={driverDto} driver={summary.driver}
href={`/drivers/${membership.driverId}?from=league-management&leagueId=${leagueId}`} href={`/drivers/${summary.driver.id}?from=league-management&leagueId=${leagueId}`}
meta={meta} meta={meta}
size="sm" size="sm"
/> />
@@ -625,23 +445,21 @@ export default function LeagueDetailPage() {
{roleDisplay.text} {roleDisplay.text}
</span> </span>
</div> </div>
) : null; );
})} })}
{stewardMemberships.slice(0, 3).map((membership) => { {viewModel.stewardSummaries.map((summary) => {
const driverDto = driversById[membership.driverId]; const roleDisplay = LeagueRoleDisplay.getLeagueRoleDisplay('steward');
const summary = buildDriverSummary(membership.driverId); const meta = summary.rating !== null
const roleDisplay = getLeagueRoleDisplay('steward');
const meta = summary && summary.rating !== null
? `Rating ${summary.rating}${summary.rank ? ` • Rank ${summary.rank}` : ''}` ? `Rating ${summary.rating}${summary.rank ? ` • Rank ${summary.rank}` : ''}`
: null; : null;
return driverDto ? ( return (
<div key={membership.driverId} className="flex items-center gap-2"> <div key={summary.driver.id} className="flex items-center gap-2">
<div className="flex-1"> <div className="flex-1">
<DriverIdentity <DriverIdentity
driver={driverDto} driver={summary.driver}
href={`/drivers/${membership.driverId}?from=league-management&leagueId=${leagueId}`} href={`/drivers/${summary.driver.id}?from=league-management&leagueId=${leagueId}`}
meta={meta} meta={meta}
size="sm" size="sm"
/> />
@@ -650,7 +468,7 @@ export default function LeagueDetailPage() {
{roleDisplay.text} {roleDisplay.text}
</span> </span>
</div> </div>
) : null; );
})} })}
</div> </div>
</Card> </Card>
@@ -659,16 +477,18 @@ export default function LeagueDetailPage() {
</div> </div>
{/* End Race Modal */} {/* End Race Modal */}
{endRaceModalRaceId && (() => { {endRaceModalRaceId && viewModel && (() => {
const race = runningRaces.find(r => r.id === endRaceModalRaceId); const race = viewModel.runningRaces.find(r => r.id === endRaceModalRaceId);
return race ? ( return race ? (
<EndRaceModal <EndRaceModal
raceId={race.id} raceId={race.id}
raceName={race.track} raceName={race.name}
onConfirm={async () => { onConfirm={async () => {
try { try {
const completeRace = getCompleteRaceUseCase(); // TODO: Use service to complete race
await completeRace.execute({ raceId: race.id }); // const serviceFactory = new ServiceFactory(process.env.NEXT_PUBLIC_API_URL || '');
// const raceService = serviceFactory.createRaceService();
// await raceService.completeRace(race.id);
await loadLeagueData(); await loadLeagueData();
setEndRaceModalRaceId(null); setEndRaceModalRaceId(null);
} catch (err) { } catch (err) {

View File

@@ -6,13 +6,10 @@ import Button from '@/components/ui/Button';
import Card from '@/components/ui/Card'; import Card from '@/components/ui/Card';
import { useEffectiveDriverId } from '@/hooks/useEffectiveDriverId'; import { useEffectiveDriverId } from '@/hooks/useEffectiveDriverId';
import { isLeagueAdminOrHigherRole } from '@/lib/leagueRoles'; import { isLeagueAdminOrHigherRole } from '@/lib/leagueRoles';
import { LeagueFullConfigPresenter } from '@/lib/presenters/LeagueFullConfigPresenter'; import { ServiceFactory } from '@/lib/services/ServiceFactory';
import { LeagueScoringPresetsPresenter } from '@/lib/presenters/LeagueScoringPresetsPresenter'; import type { LeagueConfigFormModel } from '@/lib/types/LeagueConfigFormModel';
import type { LeagueConfigFormModel } from '@core/racing/application'; import type { DriverDTO } from '@/lib/types/DriverDTO';
import type { DriverDTO } from '@core/racing/application/dto/DriverDTO'; import { LeagueSettingsViewModel } from '@/lib/view-models/LeagueSettingsViewModel';
import { EntityMappers } from '@core/racing/application/mappers/EntityMappers';
import type { LeagueScoringPresetDTO } from '@core/racing/application/ports/LeagueScoringPresetProvider';
import type { League } from '@core/racing/domain/entities/League';
import { AlertTriangle, Settings, UserCog } from 'lucide-react'; import { AlertTriangle, Settings, UserCog } from 'lucide-react';
import { useParams, useRouter } from 'next/navigation'; import { useParams, useRouter } from 'next/navigation';
import { useEffect, useMemo, useState } from 'react'; import { useEffect, useMemo, useState } from 'react';
@@ -22,76 +19,35 @@ export default function LeagueSettingsPage() {
const leagueId = params.id as string; const leagueId = params.id as string;
const currentDriverId = useEffectiveDriverId(); const currentDriverId = useEffectiveDriverId();
const [league, setLeague] = useState<League | null>(null); const [settings, setSettings] = useState<LeagueSettingsViewModel | null>(null);
const [configForm, setConfigForm] = useState<LeagueConfigFormModel | null>(null);
const [presets, setPresets] = useState<LeagueScoringPresetDTO[]>([]);
const [ownerDriver, setOwnerDriver] = useState<DriverDTO | null>(null);
const [loading, setLoading] = useState(true); const [loading, setLoading] = useState(true);
const [isAdmin, setIsAdmin] = useState(false); const [isAdmin, setIsAdmin] = useState(false);
const [showTransferDialog, setShowTransferDialog] = useState(false); const [showTransferDialog, setShowTransferDialog] = useState(false);
const [selectedNewOwner, setSelectedNewOwner] = useState<string>(''); const [selectedNewOwner, setSelectedNewOwner] = useState<string>('');
const [transferring, setTransferring] = useState(false); const [transferring, setTransferring] = useState(false);
const [allMembers, setAllMembers] = useState<DriverDTO[]>([]);
const router = useRouter(); const router = useRouter();
const serviceFactory = useMemo(() => new ServiceFactory(process.env.NEXT_PUBLIC_API_BASE_URL || ''), []);
const leagueMembershipService = useMemo(() => serviceFactory.createLeagueMembershipService(), [serviceFactory]);
const leagueSettingsService = useMemo(() => serviceFactory.createLeagueSettingsService(), [serviceFactory]);
useEffect(() => { useEffect(() => {
async function checkAdmin() { async function checkAdmin() {
const membershipRepo = getLeagueMembershipRepository(); const memberships = await leagueMembershipService.fetchLeagueMemberships(leagueId);
const membership = await membershipRepo.getMembership(leagueId, currentDriverId); const membership = leagueMembershipService.getMembership(leagueId, currentDriverId);
setIsAdmin(membership ? isLeagueAdminOrHigherRole(membership.role) : false); setIsAdmin(membership ? isLeagueAdminOrHigherRole(membership.role) : false);
} }
checkAdmin(); checkAdmin();
}, [leagueId, currentDriverId]); }, [leagueId, currentDriverId, leagueMembershipService]);
useEffect(() => { useEffect(() => {
async function loadSettings() { async function loadSettings() {
setLoading(true); setLoading(true);
try { try {
const leagueRepo = getLeagueRepository(); const settingsData = await leagueSettingsService.getLeagueSettings(leagueId);
const driverRepo = getDriverRepository(); if (settingsData) {
const useCase = getGetLeagueFullConfigUseCase(); setSettings(settingsData);
const presetsUseCase = getListLeagueScoringPresetsUseCase();
const leagueData = await leagueRepo.findById(leagueId);
if (!leagueData) {
setLoading(false);
return;
} }
setLeague(leagueData);
const configPresenter = new LeagueFullConfigPresenter();
await useCase.execute({ leagueId }, configPresenter);
const configViewModel = configPresenter.getViewModel();
if (configViewModel) {
setConfigForm(configViewModel as LeagueConfigFormModel);
}
const presetsPresenter = new LeagueScoringPresetsPresenter();
await presetsUseCase.execute(undefined as void, presetsPresenter);
const presetsViewModel = presetsPresenter.getViewModel();
setPresets(presetsViewModel.presets);
const entity = await driverRepo.findById(leagueData.ownerId);
if (entity) {
setOwnerDriver(EntityMappers.toDriverDTO(entity));
}
const membershipRepo = getLeagueMembershipRepository();
const memberships = await membershipRepo.getLeagueMembers(leagueId);
const memberDrivers: DriverDTO[] = [];
for (const m of memberships) {
if (m.driverId !== leagueData.ownerId && m.status === 'active') {
const d = await driverRepo.findById(m.driverId);
if (d) {
const dto = EntityMappers.toDriverDTO(d);
if (dto) {
memberDrivers.push(dto);
}
}
}
}
setAllMembers(memberDrivers);
} catch (err) { } catch (err) {
console.error('Failed to load league settings:', err); console.error('Failed to load league settings:', err);
} finally { } finally {
@@ -102,60 +58,17 @@ export default function LeagueSettingsPage() {
if (isAdmin) { if (isAdmin) {
loadSettings(); loadSettings();
} }
}, [leagueId, isAdmin]); }, [leagueId, isAdmin, leagueSettingsService]);
const ownerSummary = useMemo(() => { const ownerSummary = settings?.owner || null;
if (!ownerDriver) {
return null;
}
const stats = getDriverStats(ownerDriver.id);
const allRankings = getAllDriverRankings();
let rating: number | null = stats?.rating ?? null;
let rank: number | null = null;
if (stats) {
if (typeof stats.overallRank === 'number' && stats.overallRank > 0) {
rank = stats.overallRank;
} else {
const indexInGlobal = allRankings.findIndex(
(stat) => stat.driverId === stats.driverId,
);
if (indexInGlobal !== -1) {
rank = indexInGlobal + 1;
}
}
if (rating === null) {
const globalEntry = allRankings.find(
(stat) => stat.driverId === stats.driverId,
);
if (globalEntry) {
rating = globalEntry.rating;
}
}
}
return {
driver: ownerDriver,
rating,
rank,
};
}, [ownerDriver]);
const handleTransferOwnership = async () => { const handleTransferOwnership = async () => {
if (!selectedNewOwner || !league) return; if (!selectedNewOwner || !settings) return;
setTransferring(true); setTransferring(true);
try { try {
const useCase = getTransferLeagueOwnershipUseCase(); await leagueSettingsService.transferOwnership(leagueId, currentDriverId, selectedNewOwner);
await useCase.execute({
leagueId,
currentOwnerId: currentDriverId,
newOwnerId: selectedNewOwner,
});
setShowTransferDialog(false); setShowTransferDialog(false);
router.refresh(); router.refresh();
} catch (err) { } catch (err) {
@@ -190,7 +103,7 @@ export default function LeagueSettingsPage() {
); );
} }
if (!configForm || !league) { if (!settings) {
return ( return (
<Card> <Card>
<div className="py-6 text-sm text-gray-500"> <div className="py-6 text-sm text-gray-500">
@@ -217,7 +130,7 @@ export default function LeagueSettingsPage() {
{/* READONLY INFORMATION SECTION - Compact */} {/* READONLY INFORMATION SECTION - Compact */}
<div className="space-y-4"> <div className="space-y-4">
<ReadonlyLeagueInfo league={league} configForm={configForm} /> <ReadonlyLeagueInfo league={settings.league} configForm={settings.config} />
{/* League Owner - Compact */} {/* League Owner - Compact */}
<div className="rounded-xl border border-charcoal-outline bg-gradient-to-br from-iron-gray/40 to-iron-gray/20 p-5"> <div className="rounded-xl border border-charcoal-outline bg-gradient-to-br from-iron-gray/40 to-iron-gray/20 p-5">
@@ -234,7 +147,7 @@ export default function LeagueSettingsPage() {
</div> </div>
{/* Transfer Ownership - Owner Only */} {/* Transfer Ownership - Owner Only */}
{league.ownerId === currentDriverId && allMembers.length > 0 && ( {settings.league.ownerId === currentDriverId && settings.members.length > 0 && (
<div className="rounded-xl border border-charcoal-outline bg-gradient-to-br from-iron-gray/40 to-iron-gray/20 p-5"> <div className="rounded-xl border border-charcoal-outline bg-gradient-to-br from-iron-gray/40 to-iron-gray/20 p-5">
<div className="flex items-center gap-2 mb-3"> <div className="flex items-center gap-2 mb-3">
<UserCog className="w-4 h-4 text-gray-400" /> <UserCog className="w-4 h-4 text-gray-400" />
@@ -243,7 +156,7 @@ export default function LeagueSettingsPage() {
<p className="text-xs text-gray-500 mb-4"> <p className="text-xs text-gray-500 mb-4">
Transfer league ownership to another active member. You will become an admin. Transfer league ownership to another active member. You will become an admin.
</p> </p>
{!showTransferDialog ? ( {!showTransferDialog ? (
<Button <Button
variant="secondary" variant="secondary"
@@ -259,13 +172,13 @@ export default function LeagueSettingsPage() {
className="w-full rounded-lg border border-charcoal-outline bg-charcoal-card px-3 py-2 text-sm text-white focus:border-primary-blue focus:outline-none" className="w-full rounded-lg border border-charcoal-outline bg-charcoal-card px-3 py-2 text-sm text-white focus:border-primary-blue focus:outline-none"
> >
<option value="">Select new owner...</option> <option value="">Select new owner...</option>
{allMembers.map((member) => ( {settings.members.map((member) => (
<option key={member.id} value={member.id}> <option key={member.id} value={member.id}>
{member.name} {member.name}
</option> </option>
))} ))}
</select> </select>
<div className="flex gap-2"> <div className="flex gap-2">
<Button <Button
variant="primary" variant="primary"

View File

@@ -4,11 +4,11 @@ import Button from '@/components/ui/Button';
import Card from '@/components/ui/Card'; import Card from '@/components/ui/Card';
import { useEffectiveDriverId } from '@/hooks/useEffectiveDriverId'; import { useEffectiveDriverId } from '@/hooks/useEffectiveDriverId';
import { isLeagueAdminOrHigherRole } from '@/lib/leagueRoles'; import { isLeagueAdminOrHigherRole } from '@/lib/leagueRoles';
import type { DriverDTO } from '@core/racing/application/dto/DriverDTO'; import { ServiceFactory } from '@/lib/services/ServiceFactory';
import { EntityMappers } from '@core/racing/application/mappers/EntityMappers'; import { ProtestViewModel } from '@/lib/view-models/ProtestViewModel';
import type { PenaltyType } from '@core/racing/domain/entities/Penalty'; import { ProtestDecisionCommandModel, type PenaltyType } from '@/lib/command-models/protests/ProtestDecisionCommandModel';
import type { Protest } from '@core/racing/domain/entities/Protest'; import type { DriverSummaryDTO } from '@/lib/types/generated/LeagueAdminProtestsDTO';
import type { Race } from '@core/racing/domain/entities/Race'; import type { RaceDTO } from '@/lib/types/generated/RaceDTO';
import { import {
AlertCircle, AlertCircle,
AlertTriangle, AlertTriangle,
@@ -115,10 +115,10 @@ export default function ProtestReviewPage() {
const protestId = params.protestId as string; const protestId = params.protestId as string;
const currentDriverId = useEffectiveDriverId(); const currentDriverId = useEffectiveDriverId();
const [protest, setProtest] = useState<Protest | null>(null); const [protest, setProtest] = useState<ProtestViewModel | null>(null);
const [race, setRace] = useState<Race | null>(null); const [race, setRace] = useState<RaceDTO | null>(null);
const [protestingDriver, setProtestingDriver] = useState<DriverDTO | null>(null); const [protestingDriver, setProtestingDriver] = useState<DriverSummaryDTO | null>(null);
const [accusedDriver, setAccusedDriver] = useState<DriverDTO | null>(null); const [accusedDriver, setAccusedDriver] = useState<DriverSummaryDTO | null>(null);
const [loading, setLoading] = useState(true); const [loading, setLoading] = useState(true);
const [isAdmin, setIsAdmin] = useState(false); const [isAdmin, setIsAdmin] = useState(false);
@@ -146,27 +146,18 @@ export default function ProtestReviewPage() {
async function loadProtest() { async function loadProtest() {
setLoading(true); setLoading(true);
try { try {
const protestRepo = getProtestRepository(); const serviceFactory = new ServiceFactory(process.env.NEXT_PUBLIC_API_URL || '');
const raceRepo = getRaceRepository(); const protestService = serviceFactory.createProtestService();
const driverRepo = getDriverRepository();
const protestEntity = await protestRepo.findById(protestId); const protestData = await protestService.getProtestById(leagueId, protestId);
if (!protestEntity) { if (!protestData) {
throw new Error('Protest not found'); throw new Error('Protest not found');
} }
setProtest(protestEntity);
const raceEntity = await raceRepo.findById(protestEntity.raceId); setProtest(protestData.protest);
if (!raceEntity) { setRace(protestData.race);
throw new Error('Race not found'); setProtestingDriver(protestData.protestingDriver);
} setAccusedDriver(protestData.accusedDriver);
setRace(raceEntity);
const protestingDriverEntity = await driverRepo.findById(protestEntity.protestingDriverId);
const accusedDriverEntity = await driverRepo.findById(protestEntity.accusedDriverId);
setProtestingDriver(protestingDriverEntity ? EntityMappers.toDriverDTO(protestingDriverEntity) : null);
setAccusedDriver(accusedDriverEntity ? EntityMappers.toDriverDTO(accusedDriverEntity) : null);
} catch (err) { } catch (err) {
console.error('Failed to load protest:', err); console.error('Failed to load protest:', err);
alert('Failed to load protest details'); alert('Failed to load protest details');
@@ -179,39 +170,39 @@ export default function ProtestReviewPage() {
if (isAdmin) { if (isAdmin) {
loadProtest(); loadProtest();
} }
}, [protestId, leagueId, isAdmin, currentDriverId, router]); }, [protestId, leagueId, isAdmin, router]);
// Build timeline from protest data // Build timeline from protest data
const timeline = useMemo((): TimelineEvent[] => { const timeline = useMemo((): TimelineEvent[] => {
if (!protest) return []; if (!protest) return [];
const events: TimelineEvent[] = [ const events: TimelineEvent[] = [
{ {
id: 'filed', id: 'filed',
type: 'protest_filed', type: 'protest_filed',
timestamp: new Date(protest.filedAt), timestamp: new Date(protest.submittedAt),
actor: protestingDriver, actor: protestingDriver,
content: protest.incident.description, content: protest.description, // TODO: Add incident description when available
metadata: { metadata: {
lap: protest.incident.lap, // lap: protest.incident?.lap,
comment: protest.comment // comment: protest.comment
} }
} }
]; ];
// Add decision event if resolved // TODO: Add decision event when status/decisions are available in DTO
if (protest.status === 'upheld' || protest.status === 'dismissed') { // if (protest.status === 'upheld' || protest.status === 'dismissed') {
events.push({ // events.push({
id: 'decision', // id: 'decision',
type: 'decision', // type: 'decision',
timestamp: protest.reviewedAt ? new Date(protest.reviewedAt) : new Date(), // timestamp: protest.reviewedAt ? new Date(protest.reviewedAt) : new Date(),
actor: null, // Would need to load steward driver // actor: null, // Would need to load steward driver
content: protest.decisionNotes || (protest.status === 'upheld' ? 'Protest upheld' : 'Protest dismissed'), // content: protest.decisionNotes || (protest.status === 'upheld' ? 'Protest upheld' : 'Protest dismissed'),
metadata: { // metadata: {
decision: protest.status // decision: protest.status
} // }
}); // });
} // }
return events.sort((a, b) => a.timestamp.getTime() - b.timestamp.getTime()); return events.sort((a, b) => a.timestamp.getTime() - b.timestamp.getTime());
}, [protest, protestingDriver]); }, [protest, protestingDriver]);
@@ -221,38 +212,44 @@ export default function ProtestReviewPage() {
setSubmitting(true); setSubmitting(true);
try { try {
const reviewUseCase = getReviewProtestUseCase(); const serviceFactory = new ServiceFactory(process.env.NEXT_PUBLIC_API_URL || '');
const penaltyUseCase = getApplyPenaltyUseCase(); const protestService = serviceFactory.createProtestService();
if (decision === 'uphold') { if (decision === 'uphold') {
await reviewUseCase.execute({ const commandModel = new ProtestDecisionCommandModel({
protestId: protest.id, decision,
stewardId: currentDriverId, penaltyType,
decision: 'uphold', penaltyValue,
decisionNotes: stewardNotes, stewardNotes,
}); });
const selectedPenalty = PENALTY_TYPES.find(p => p.type === penaltyType); const penaltyCommand = commandModel.toApplyPenaltyCommand(
const penaltyValueToUse = protest.raceId,
selectedPenalty && selectedPenalty.requiresValue ? penaltyValue : 0; protest.accusedDriverId,
currentDriverId,
protest.id
);
await penaltyUseCase.execute({ await protestService.applyPenalty(penaltyCommand);
raceId: protest.raceId,
driverId: protest.accusedDriverId,
stewardId: currentDriverId,
type: penaltyType,
value: penaltyValueToUse,
reason: protest.incident.description,
protestId: protest.id,
notes: stewardNotes,
});
} else { } else {
await reviewUseCase.execute({ // For dismiss, we might need a separate endpoint
protestId: protest.id, // For now, just apply a warning penalty with 0 value or create a separate endpoint
stewardId: currentDriverId, const commandModel = new ProtestDecisionCommandModel({
decision: 'dismiss', decision,
decisionNotes: stewardNotes, penaltyType: 'warning',
penaltyValue: 0,
stewardNotes,
}); });
const penaltyCommand = commandModel.toApplyPenaltyCommand(
protest.raceId,
protest.accusedDriverId,
currentDriverId,
protest.id
);
penaltyCommand.reason = 'Protest upheld'; // TODO: Make this configurable
await protestService.applyPenalty(penaltyCommand);
} }
router.push(`/leagues/${leagueId}/stewarding`); router.push(`/leagues/${leagueId}/stewarding`);
@@ -265,31 +262,17 @@ export default function ProtestReviewPage() {
const handleRequestDefense = async () => { const handleRequestDefense = async () => {
if (!protest) return; if (!protest) return;
try { try {
const requestDefenseUseCase = getRequestProtestDefenseUseCase(); const serviceFactory = new ServiceFactory(process.env.NEXT_PUBLIC_API_URL || '');
const sendNotificationUseCase = getSendNotificationUseCase(); const protestService = serviceFactory.createProtestService();
// Request defense // Request defense
const result = await requestDefenseUseCase.execute({ await protestService.requestDefense({
protestId: protest.id, protestId: protest.id,
stewardId: currentDriverId, stewardId: currentDriverId,
}); });
// Send notification to accused driver
await sendNotificationUseCase.execute({
recipientId: result.accusedDriverId,
type: 'protest_filed',
title: 'Defense Requested',
body: `A steward has requested your defense for a protest filed against you.`,
actionUrl: `/leagues/${leagueId}/stewarding/protests/${protest.id}`,
data: {
protestId: protest.id,
raceId: protest.raceId,
leagueId,
},
});
// Reload page to show updated status // Reload page to show updated status
window.location.reload(); window.location.reload();
} catch (err) { } catch (err) {
@@ -340,10 +323,10 @@ export default function ProtestReviewPage() {
); );
} }
const statusConfig = getStatusConfig(protest.status); const statusConfig = getStatusConfig('pending'); // TODO: Update when status is available
const StatusIcon = statusConfig.icon; const StatusIcon = statusConfig.icon;
const isPending = protest.status === 'pending' || protest.status === 'under_review' || protest.status === 'awaiting_defense'; const isPending = true; // TODO: Update when status is available
const daysSinceFiled = Math.floor((Date.now() - new Date(protest.filedAt).getTime()) / (1000 * 60 * 60 * 24)); const daysSinceFiled = Math.floor((Date.now() - new Date(protest.submittedAt).getTime()) / (1000 * 60 * 60 * 24));
return ( return (
<div className="min-h-screen"> <div className="min-h-screen">
@@ -417,29 +400,30 @@ export default function ProtestReviewPage() {
className="block mb-3 p-3 rounded-lg bg-deep-graphite border border-charcoal-outline hover:border-primary-blue/50 hover:bg-primary-blue/5 transition-colors" className="block mb-3 p-3 rounded-lg bg-deep-graphite border border-charcoal-outline hover:border-primary-blue/50 hover:bg-primary-blue/5 transition-colors"
> >
<div className="flex items-center justify-between"> <div className="flex items-center justify-between">
<span className="text-sm font-medium text-white">{race.track}</span> <span className="text-sm font-medium text-white">{race.name}</span>
<ExternalLink className="w-3 h-3 text-gray-500" /> <ExternalLink className="w-3 h-3 text-gray-500" />
</div> </div>
</Link> </Link>
<div className="space-y-2"> <div className="space-y-2">
<div className="flex items-center gap-2 text-sm"> <div className="flex items-center gap-2 text-sm">
<MapPin className="w-4 h-4 text-gray-500" /> <MapPin className="w-4 h-4 text-gray-500" />
<span className="text-gray-300">{race.track}</span> <span className="text-gray-300">{race.name}</span>
</div> </div>
<div className="flex items-center gap-2 text-sm"> <div className="flex items-center gap-2 text-sm">
<Calendar className="w-4 h-4 text-gray-500" /> <Calendar className="w-4 h-4 text-gray-500" />
<span className="text-gray-300">{race.scheduledAt.toLocaleDateString()}</span> <span className="text-gray-300">{new Date(race.date).toLocaleDateString()}</span>
</div> </div>
<div className="flex items-center gap-2 text-sm"> {/* TODO: Add lap info when available */}
{/* <div className="flex items-center gap-2 text-sm">
<Flag className="w-4 h-4 text-gray-500" /> <Flag className="w-4 h-4 text-gray-500" />
<span className="text-gray-300">Lap {protest.incident.lap}</span> <span className="text-gray-300">Lap {protest.incident.lap}</span>
</div> </div> */}
</div> </div>
</Card> </Card>
{/* Evidence */} {/* TODO: Add evidence when available */}
{protest.proofVideoUrl && ( {/* {protest.proofVideoUrl && (
<Card className="p-4"> <Card className="p-4">
<h3 className="text-xs font-semibold text-gray-500 uppercase tracking-wider mb-3">Evidence</h3> <h3 className="text-xs font-semibold text-gray-500 uppercase tracking-wider mb-3">Evidence</h3>
<a <a
@@ -453,7 +437,7 @@ export default function ProtestReviewPage() {
<ExternalLink className="w-3 h-3" /> <ExternalLink className="w-3 h-3" />
</a> </a>
</Card> </Card>
)} )} */}
{/* Quick Stats */} {/* Quick Stats */}
<Card className="p-4"> <Card className="p-4">
@@ -461,7 +445,7 @@ export default function ProtestReviewPage() {
<div className="space-y-2 text-sm"> <div className="space-y-2 text-sm">
<div className="flex justify-between"> <div className="flex justify-between">
<span className="text-gray-500">Filed</span> <span className="text-gray-500">Filed</span>
<span className="text-gray-300">{new Date(protest.filedAt).toLocaleDateString()}</span> <span className="text-gray-300">{new Date(protest.submittedAt).toLocaleDateString()}</span>
</div> </div>
<div className="flex justify-between"> <div className="flex justify-between">
<span className="text-gray-500">Age</span> <span className="text-gray-500">Age</span>
@@ -497,18 +481,19 @@ export default function ProtestReviewPage() {
<span className="font-semibold text-white text-sm">{protestingDriver?.name || 'Unknown'}</span> <span className="font-semibold text-white text-sm">{protestingDriver?.name || 'Unknown'}</span>
<span className="text-xs text-blue-400 font-medium">filed protest</span> <span className="text-xs text-blue-400 font-medium">filed protest</span>
<span className="text-xs text-gray-500"></span> <span className="text-xs text-gray-500"></span>
<span className="text-xs text-gray-500">{new Date(protest.filedAt).toLocaleString()}</span> <span className="text-xs text-gray-500">{new Date(protest.submittedAt).toLocaleString()}</span>
</div> </div>
<div className="bg-deep-graphite rounded-lg p-4 border border-charcoal-outline"> <div className="bg-deep-graphite rounded-lg p-4 border border-charcoal-outline">
<p className="text-sm text-gray-300 mb-3">{protest.incident.description}</p> <p className="text-sm text-gray-300 mb-3">{protest.description}</p>
{protest.comment && ( {/* TODO: Add comment when available */}
{/* {protest.comment && (
<div className="mt-3 pt-3 border-t border-charcoal-outline/50"> <div className="mt-3 pt-3 border-t border-charcoal-outline/50">
<p className="text-xs text-gray-500 mb-1">Additional details:</p> <p className="text-xs text-gray-500 mb-1">Additional details:</p>
<p className="text-sm text-gray-400">{protest.comment}</p> <p className="text-sm text-gray-400">{protest.comment}</p>
</div> </div>
)} )} */}
</div> </div>
</div> </div>
</div> </div>

View File

@@ -8,13 +8,10 @@ import Button from '@/components/ui/Button';
import Card from '@/components/ui/Card'; import Card from '@/components/ui/Card';
import Heading from '@/components/ui/Heading'; import Heading from '@/components/ui/Heading';
import { useEffectiveDriverId } from '@/hooks/useEffectiveDriverId'; import { useEffectiveDriverId } from '@/hooks/useEffectiveDriverId';
import { apiClient } from '@/lib/apiClient'; import { ServiceFactory } from '@/lib/services/ServiceFactory';
import { getMembership, isOwnerOrAdmin } from '@/lib/leagueMembership'; import { LeagueMembershipService } from '@/lib/services/leagues/LeagueMembershipService';
import type { import { LeagueMembershipUtility } from '@/lib/utilities/LeagueMembershipUtility';
RaceDetailEntryViewModel, import type { RaceDetailViewModel } from '@/lib/view-models/RaceDetailViewModel';
RaceDetailUserResultViewModel,
RaceDetailViewModel,
} from '@core/racing/application/presenters/IRaceDetailPresenter';
import { import {
AlertTriangle, AlertTriangle,
ArrowLeft, ArrowLeft,
@@ -60,15 +57,15 @@ export default function RaceDetailPage() {
setLoading(true); setLoading(true);
setError(null); setError(null);
try { try {
const vm = await apiClient.races.getDetail(raceId, currentDriverId); const serviceFactory = new ServiceFactory(process.env.NEXT_PUBLIC_API_BASE_URL || 'http://localhost:3001');
if (!vm) { const raceService = serviceFactory.createRaceService();
throw new Error('Race detail not available'); const vm = await raceService.getRaceDetail(raceId, currentDriverId);
}
setViewModel(vm); setViewModel(vm);
// Fetch league membership for admin controls // Fetch league membership for admin controls
if (vm.league) { if (vm.league) {
const leagueMembership = getMembership(vm.league.id, currentDriverId); await LeagueMembershipService.fetchLeagueMemberships(vm.league.id);
const leagueMembership = LeagueMembershipService.getMembership(vm.league.id, currentDriverId);
setMembership(leagueMembership); setMembership(leagueMembership);
} }
@@ -126,7 +123,9 @@ export default function RaceDetailPage() {
setCancelling(true); setCancelling(true);
try { try {
await apiClient.races.cancel(race.id); const serviceFactory = new ServiceFactory(process.env.NEXT_PUBLIC_API_BASE_URL || 'http://localhost:3001');
const raceService = serviceFactory.createRaceService();
await raceService.cancelRace(race.id);
await loadRaceData(); await loadRaceData();
} catch (err) { } catch (err) {
alert(err instanceof Error ? err.message : 'Failed to cancel race'); alert(err instanceof Error ? err.message : 'Failed to cancel race');
@@ -148,10 +147,9 @@ export default function RaceDetailPage() {
setRegistering(true); setRegistering(true);
try { try {
await apiClient.races.register(race.id, { const serviceFactory = new ServiceFactory(process.env.NEXT_PUBLIC_API_BASE_URL || 'http://localhost:3001');
leagueId: league.id, const raceService = serviceFactory.createRaceService();
driverId: currentDriverId, await raceService.registerForRace(race.id, league.id, currentDriverId);
});
await loadRaceData(); await loadRaceData();
} catch (err) { } catch (err) {
alert(err instanceof Error ? err.message : 'Failed to register for race'); alert(err instanceof Error ? err.message : 'Failed to register for race');
@@ -173,9 +171,9 @@ export default function RaceDetailPage() {
setRegistering(true); setRegistering(true);
try { try {
await apiClient.races.withdraw(race.id, { const serviceFactory = new ServiceFactory(process.env.NEXT_PUBLIC_API_BASE_URL || 'http://localhost:3001');
driverId: currentDriverId, const raceService = serviceFactory.createRaceService();
}); await raceService.withdrawFromRace(race.id, currentDriverId);
await loadRaceData(); await loadRaceData();
} catch (err) { } catch (err) {
alert(err instanceof Error ? err.message : 'Failed to withdraw from race'); alert(err instanceof Error ? err.message : 'Failed to withdraw from race');
@@ -894,7 +892,7 @@ export default function RaceDetailPage() {
<Scale className="w-4 h-4" /> <Scale className="w-4 h-4" />
Stewarding Stewarding
</Button> </Button>
{membership && isOwnerOrAdmin(viewModel.league?.id || '', currentDriverId) && ( {LeagueMembershipUtility.isOwnerOrAdmin(viewModel.league?.id || '', currentDriverId) && (
<> <>
<Button <Button
variant="outline" variant="outline"
@@ -917,7 +915,7 @@ export default function RaceDetailPage() {
</> </>
)} )}
{race.status === 'running' && membership && isOwnerOrAdmin(viewModel.league?.id || '', currentDriverId) && ( {race.status === 'running' && LeagueMembershipUtility.isOwnerOrAdmin(viewModel.league?.id || '', currentDriverId) && (
<Button <Button
variant="primary" variant="primary"
className="w-full flex items-center justify-center gap-2" className="w-full flex items-center justify-center gap-2"
@@ -975,7 +973,9 @@ export default function RaceDetailPage() {
raceName={race.track} raceName={race.track}
onConfirm={async () => { onConfirm={async () => {
try { try {
await apiClient.races.complete(race.id); const serviceFactory = new ServiceFactory(process.env.NEXT_PUBLIC_API_BASE_URL || 'http://localhost:3001');
const raceService = serviceFactory.createRaceService();
await raceService.completeRace(race.id);
await loadRaceData(); await loadRaceData();
setShowEndRaceModal(false); setShowEndRaceModal(false);
} catch (err) { } catch (err) {

View File

@@ -6,15 +6,15 @@ import Button from '@/components/ui/Button';
import Card from '@/components/ui/Card'; import Card from '@/components/ui/Card';
import Image from 'next/image'; import Image from 'next/image';
import { useParams } from 'next/navigation'; import { useParams } from 'next/navigation';
import { useCallback, useEffect, useState } from 'react'; import { useCallback, useEffect, useState, useMemo } from 'react';
import JoinTeamButton from '@/components/teams/JoinTeamButton'; import JoinTeamButton from '@/components/teams/JoinTeamButton';
import TeamAdmin from '@/components/teams/TeamAdmin'; import TeamAdmin from '@/components/teams/TeamAdmin';
import TeamRoster from '@/components/teams/TeamRoster'; import TeamRoster from '@/components/teams/TeamRoster';
import TeamStandings from '@/components/teams/TeamStandings'; import TeamStandings from '@/components/teams/TeamStandings';
import { TeamDetailsPresenter } from '@/lib/presenters/TeamDetailsPresenter'; import { ServiceFactory } from '@/lib/services/ServiceFactory';
import { TeamMembersPresenter } from '@/lib/presenters/TeamMembersPresenter'; import { TeamDetailsViewModel } from '@/lib/view-models/TeamDetailsViewModel';
import type { TeamDetailsViewModel } from '@core/racing/application/presenters/ITeamDetailsPresenter'; import { TeamMemberViewModel } from '@/lib/view-models/TeamMemberViewModel';
import { useEffectiveDriverId } from '@/hooks/useEffectiveDriverId'; import { useEffectiveDriverId } from '@/hooks/useEffectiveDriverId';
@@ -29,60 +29,46 @@ interface TeamMembership {
type Tab = 'overview' | 'roster' | 'standings' | 'admin'; type Tab = 'overview' | 'roster' | 'standings' | 'admin';
export default function TeamDetailPage() { export default function TeamDetailPage() {
const params = useParams(); const params = useParams();
const teamId = params.id as string; const teamId = params.id as string;
type TeamViewModel = TeamDetailsViewModel['team']; const [team, setTeam] = useState<TeamDetailsViewModel | null>(null);
const [memberships, setMemberships] = useState<TeamMemberViewModel[]>([]);
const [activeTab, setActiveTab] = useState<Tab>('overview');
const [loading, setLoading] = useState(true);
const [isAdmin, setIsAdmin] = useState(false);
const currentDriverId = useEffectiveDriverId();
const isSponsorMode = useSponsorMode();
const [team, setTeam] = useState<TeamViewModel | null>(null); // Initialize services
const [memberships, setMemberships] = useState<TeamMembership[]>([]); const serviceFactory = useMemo(() => new ServiceFactory(process.env.NEXT_PUBLIC_API_BASE_URL || ''), []);
const [activeTab, setActiveTab] = useState<Tab>('overview'); const teamService = useMemo(() => serviceFactory.createTeamService(), [serviceFactory]);
const [loading, setLoading] = useState(true); const mediaService = useMemo(() => serviceFactory.createMediaService(), [serviceFactory]);
const [isAdmin, setIsAdmin] = useState(false);
const currentDriverId = useEffectiveDriverId();
const isSponsorMode = useSponsorMode();
const loadTeamData = useCallback(async () => { const loadTeamData = useCallback(async () => {
setLoading(true); setLoading(true);
try { try {
const detailsUseCase = getGetTeamDetailsUseCase(); const teamDetails = await teamService.getTeamDetails(teamId, currentDriverId);
const membersUseCase = getGetTeamMembersUseCase();
const detailsPresenter = new TeamDetailsPresenter(); if (!teamDetails) {
await detailsUseCase.execute({ teamId, driverId: currentDriverId }, detailsPresenter);
const detailsViewModel = detailsPresenter.getViewModel();
if (!detailsViewModel) {
setTeam(null); setTeam(null);
setMemberships([]); setMemberships([]);
setIsAdmin(false); setIsAdmin(false);
return; return;
} }
const teamMembersPresenter = new TeamMembersPresenter(); const teamMembers = await teamService.getTeamMembers(teamId, currentDriverId, teamDetails.ownerId);
await membersUseCase.execute({ teamId }, teamMembersPresenter);
const membersViewModel = teamMembersPresenter.getViewModel();
const teamMemberships: TeamMembership[] = (membersViewModel?.members ?? []).map((m) => ({ const adminStatus = teamDetails.isOwner ||
driverId: m.driverId, teamMembers.some(m => m.driverId === currentDriverId && (m.role === 'manager' || m.role === 'owner'));
role: m.role as TeamRole,
joinedAt: new Date(m.joinedAt),
}));
const adminStatus = setTeam(teamDetails);
teamMemberships.some( setMemberships(teamMembers);
(m: TeamMembership) =>
m.driverId === currentDriverId &&
(m.role === 'owner' || m.role === 'manager'),
) ?? false;
setTeam(detailsViewModel.team);
setMemberships(teamMemberships);
setIsAdmin(adminStatus); setIsAdmin(adminStatus);
} finally { } finally {
setLoading(false); setLoading(false);
} }
}, [teamId, currentDriverId]); }, [teamId, currentDriverId, teamService]);
useEffect(() => { useEffect(() => {
void loadTeamData(); void loadTeamData();
@@ -98,13 +84,12 @@ export default function TeamDetailPage() {
} }
try { try {
const membershipRepo = getTeamMembershipRepository(); const performer = await teamService.getMembership(teamId, currentDriverId);
const performer = await membershipRepo.getMembership(teamId, currentDriverId);
if (!performer || (performer.role !== 'owner' && performer.role !== 'manager')) { if (!performer || (performer.role !== 'owner' && performer.role !== 'manager')) {
throw new Error('Only owners or managers can remove members'); throw new Error('Only owners or managers can remove members');
} }
const membership = await membershipRepo.getMembership(teamId, driverId); const membership = await teamService.getMembership(teamId, driverId);
if (!membership) { if (!membership) {
throw new Error('Member not found'); throw new Error('Member not found');
} }
@@ -112,7 +97,7 @@ export default function TeamDetailPage() {
throw new Error('Cannot remove the team owner'); throw new Error('Cannot remove the team owner');
} }
await membershipRepo.removeMembership(teamId, driverId); await teamService.removeMembership(teamId, driverId);
handleUpdate(); handleUpdate();
} catch (error) { } catch (error) {
alert(error instanceof Error ? error.message : 'Failed to remove member'); alert(error instanceof Error ? error.message : 'Failed to remove member');
@@ -121,13 +106,12 @@ export default function TeamDetailPage() {
const handleChangeRole = async (driverId: string, newRole: TeamRole) => { const handleChangeRole = async (driverId: string, newRole: TeamRole) => {
try { try {
const membershipRepo = getTeamMembershipRepository(); const performer = await teamService.getMembership(teamId, currentDriverId);
const performer = await membershipRepo.getMembership(teamId, currentDriverId);
if (!performer || (performer.role !== 'owner' && performer.role !== 'manager')) { if (!performer || (performer.role !== 'owner' && performer.role !== 'manager')) {
throw new Error('Only owners or managers can update roles'); throw new Error('Only owners or managers can update roles');
} }
const membership = await membershipRepo.getMembership(teamId, driverId); const membership = await teamService.getMembership(teamId, driverId);
if (!membership) { if (!membership) {
throw new Error('Member not found'); throw new Error('Member not found');
} }
@@ -135,10 +119,7 @@ export default function TeamDetailPage() {
throw new Error('Cannot change the owner role'); throw new Error('Cannot change the owner role');
} }
await membershipRepo.saveMembership({ await teamService.updateMembership(teamId, driverId, newRole);
...membership,
role: newRole,
});
handleUpdate(); handleUpdate();
} catch (error) { } catch (error) {
alert(error instanceof Error ? error.message : 'Failed to change role'); alert(error instanceof Error ? error.message : 'Failed to change role');
@@ -184,7 +165,7 @@ export default function TeamDetailPage() {
const teamMetrics = [ const teamMetrics = [
MetricBuilders.members(memberships.length), MetricBuilders.members(memberships.length),
MetricBuilders.reach(memberships.length * 15), MetricBuilders.reach(memberships.length * 15),
MetricBuilders.races(team.leagues.length * 8), MetricBuilders.races(0), // TODO: Get league count from team data
MetricBuilders.engagement(82), MetricBuilders.engagement(82),
]; ];
@@ -218,7 +199,7 @@ export default function TeamDetailPage() {
<div className="flex items-start gap-6"> <div className="flex items-start gap-6">
<div className="w-24 h-24 bg-charcoal-outline rounded-lg flex items-center justify-center flex-shrink-0 overflow-hidden"> <div className="w-24 h-24 bg-charcoal-outline rounded-lg flex items-center justify-center flex-shrink-0 overflow-hidden">
<Image <Image
src={getImageService().getTeamLogo(team.id)} src={mediaService.getTeamLogo(team.id)}
alt={team.name} alt={team.name}
width={96} width={96}
height={96} height={96}
@@ -229,23 +210,15 @@ export default function TeamDetailPage() {
<div> <div>
<div className="flex items-center gap-3 mb-2"> <div className="flex items-center gap-3 mb-2">
<h1 className="text-3xl font-bold text-white">{team.name}</h1> <h1 className="text-3xl font-bold text-white">{team.name}</h1>
<span className="px-3 py-1 bg-charcoal-outline text-gray-300 rounded-full text-sm font-medium"> {/* TODO: Add team tag when available */}
{team.tag}
</span>
</div> </div>
<p className="text-gray-300 mb-4 max-w-2xl">{team.description}</p> <p className="text-gray-300 mb-4 max-w-2xl">{team.description}</p>
<div className="flex items-center gap-4 text-sm text-gray-400"> <div className="flex items-center gap-4 text-sm text-gray-400">
<span>{memberships.length} {memberships.length === 1 ? 'member' : 'members'}</span> <span>{memberships.length} {memberships.length === 1 ? 'member' : 'members'}</span>
<span></span> {/* TODO: Add created date when available */}
<span>Created {new Date(team.createdAt).toLocaleDateString()}</span> {/* TODO: Add league count when available */}
{team.leagues.length > 0 && (
<>
<span></span>
<span>{team.leagues.length} {team.leagues.length === 1 ? 'league' : 'leagues'}</span>
</>
)}
</div> </div>
</div> </div>
</div> </div>
@@ -290,8 +263,8 @@ export default function TeamDetailPage() {
<h3 className="text-xl font-semibold text-white mb-4">Quick Stats</h3> <h3 className="text-xl font-semibold text-white mb-4">Quick Stats</h3>
<div className="space-y-3"> <div className="space-y-3">
<StatItem label="Members" value={memberships.length.toString()} color="text-primary-blue" /> <StatItem label="Members" value={memberships.length.toString()} color="text-primary-blue" />
<StatItem label="Leagues" value={team.leagues.length.toString()} color="text-green-400" /> <StatItem label="Leagues" value="0" color="text-green-400" /> {/* TODO: Get league count */}
<StatItem label="Founded" value={new Date(team.createdAt).toLocaleDateString('en-US', { month: 'short', year: 'numeric' })} color="text-gray-300" /> <StatItem label="Founded" value="Unknown" color="text-gray-300" /> {/* TODO: Get founded date */}
</div> </div>
</Card> </Card>
</div> </div>
@@ -316,7 +289,7 @@ export default function TeamDetailPage() {
)} )}
{activeTab === 'standings' && ( {activeTab === 'standings' && (
<TeamStandings teamId={teamId} leagues={team.leagues} /> <TeamStandings teamId={teamId} leagues={[]} />
)} )}
{activeTab === 'admin' && isAdmin && ( {activeTab === 'admin' && isAdmin && (

View File

@@ -0,0 +1,71 @@
import { BaseApiClient } from '../base/BaseApiClient';
// DTOs
export type DriverDto = {
id: string;
name: string;
avatarUrl: string;
country: string;
totalRaces: number;
wins: number;
podiums: number;
rating: number;
globalRank: number;
consistency: number;
};
export type RaceDto = {
id: string;
track: string;
car: string;
scheduledAt: string; // ISO date string
isMyLeague: boolean;
leagueName?: string;
};
export type LeagueStandingDto = {
leagueId: string;
leagueName: string;
position: number;
points: number;
totalDrivers: number;
};
export type FeedItemDto = {
id: string;
type: string;
headline: string;
body: string | null;
timestamp: string; // ISO date string
ctaHref?: string;
ctaLabel?: string;
};
export type FriendDto = {
id: string;
name: string;
avatarUrl: string;
country: string;
};
export type DashboardOverviewDto = {
currentDriver: DriverDto;
nextRace: RaceDto | null;
upcomingRaces: RaceDto[];
leagueStandings: LeagueStandingDto[];
feedItems: FeedItemDto[];
friends: FriendDto[];
activeLeaguesCount: number;
};
/**
* Dashboard API Client
*
* Handles dashboard overview data aggregation.
*/
export class DashboardApiClient extends BaseApiClient {
/** Get dashboard overview data */
getDashboardOverview(): Promise<DashboardOverviewDto> {
return this.get<DashboardOverviewDto>('/dashboard/overview');
}
}

View File

@@ -1,6 +1,6 @@
import { BaseApiClient } from '../base/BaseApiClient'; import { BaseApiClient } from '../base/BaseApiClient';
// Import generated types // Import generated types
import type { CompleteOnboardingInputDTO, CompleteOnboardingOutputDTO, DriverRegistrationStatusDTO, DriverLeaderboardItemDTO } from '../../types/generated'; import type { CompleteOnboardingInputDTO, CompleteOnboardingOutputDTO, DriverRegistrationStatusDTO, DriverLeaderboardItemDTO, DriverProfileDTO } from '../../types/generated';
// TODO: Create proper DriverDTO in generated types // TODO: Create proper DriverDTO in generated types
type DriverDTO = { type DriverDTO = {
@@ -40,4 +40,14 @@ export class DriversApiClient extends BaseApiClient {
getRegistrationStatus(driverId: string, raceId: string): Promise<DriverRegistrationStatusDTO> { getRegistrationStatus(driverId: string, raceId: string): Promise<DriverRegistrationStatusDTO> {
return this.get<DriverRegistrationStatusDTO>(`/drivers/${driverId}/races/${raceId}/registration-status`); return this.get<DriverRegistrationStatusDTO>(`/drivers/${driverId}/races/${raceId}/registration-status`);
} }
/** Get driver by ID */
getDriver(driverId: string): Promise<DriverDTO | null> {
return this.get<DriverDTO | null>(`/drivers/${driverId}`);
}
/** Get driver profile with full details */
getDriverProfile(driverId: string): Promise<DriverProfileDTO> {
return this.get<DriverProfileDTO>(`/drivers/${driverId}/profile`);
}
} }

View File

@@ -7,6 +7,7 @@ import { MediaApiClient } from './media/MediaApiClient';
import { AnalyticsApiClient } from './analytics/AnalyticsApiClient'; import { AnalyticsApiClient } from './analytics/AnalyticsApiClient';
import { AuthApiClient } from './auth/AuthApiClient'; import { AuthApiClient } from './auth/AuthApiClient';
import { PaymentsApiClient } from './payments/PaymentsApiClient'; import { PaymentsApiClient } from './payments/PaymentsApiClient';
import { DashboardApiClient } from './dashboard/DashboardApiClient';
/** /**
* Main API Client * Main API Client
@@ -23,6 +24,7 @@ export class ApiClient {
public readonly analytics: AnalyticsApiClient; public readonly analytics: AnalyticsApiClient;
public readonly auth: AuthApiClient; public readonly auth: AuthApiClient;
public readonly payments: PaymentsApiClient; public readonly payments: PaymentsApiClient;
public readonly dashboard: DashboardApiClient;
constructor(baseUrl: string) { constructor(baseUrl: string) {
this.leagues = new LeaguesApiClient(baseUrl); this.leagues = new LeaguesApiClient(baseUrl);
@@ -34,6 +36,7 @@ export class ApiClient {
this.analytics = new AnalyticsApiClient(baseUrl); this.analytics = new AnalyticsApiClient(baseUrl);
this.auth = new AuthApiClient(baseUrl); this.auth = new AuthApiClient(baseUrl);
this.payments = new PaymentsApiClient(baseUrl); this.payments = new PaymentsApiClient(baseUrl);
this.dashboard = new DashboardApiClient(baseUrl);
} }
} }

View File

@@ -49,4 +49,32 @@ export class LeaguesApiClient extends BaseApiClient {
removeMember(leagueId: string, performerDriverId: string, targetDriverId: string): Promise<{ success: boolean }> { removeMember(leagueId: string, performerDriverId: string, targetDriverId: string): Promise<{ success: boolean }> {
return this.patch<{ success: boolean }>(`/leagues/${leagueId}/members/${targetDriverId}/remove`, { performerDriverId }); return this.patch<{ success: boolean }>(`/leagues/${leagueId}/members/${targetDriverId}/remove`, { performerDriverId });
} }
/** Get league seasons */
getSeasons(leagueId: string): Promise<{ seasons: Array<{ id: string; status: string }> }> {
return this.get<{ seasons: Array<{ id: string; status: string }> }>(`/leagues/${leagueId}/seasons`);
}
/** Get season sponsorships */
getSeasonSponsorships(seasonId: string): Promise<{ sponsorships: Array<{ sponsorId: string; tier: string; status: string }> }> {
return this.get<{ sponsorships: Array<{ sponsorId: string; tier: string; status: string }> }>(`/seasons/${seasonId}/sponsorships`);
}
/** Get league config */
getLeagueConfig(leagueId: string): Promise<{ config: any }> {
return this.get<{ config: any }>(`/leagues/${leagueId}/config`);
}
/** Get league scoring presets */
getScoringPresets(): Promise<{ presets: any[] }> {
return this.get<{ presets: any[] }>(`/leagues/scoring-presets`);
}
/** Transfer league ownership */
transferOwnership(leagueId: string, currentOwnerId: string, newOwnerId: string): Promise<{ success: boolean }> {
return this.post<{ success: boolean }>(`/leagues/${leagueId}/transfer-ownership`, {
currentOwnerId,
newOwnerId,
});
}
} }

View File

@@ -1,15 +1,15 @@
import { BaseApiClient } from '../base/BaseApiClient';
import type { import type {
RequestAvatarGenerationInputDto, DeleteMediaOutputDto,
RequestAvatarGenerationOutputDto, GetMediaOutputDto,
UploadMediaInputDto, RequestAvatarGenerationInputDto,
UploadMediaOutputDto, RequestAvatarGenerationOutputDto,
GetMediaOutputDto, UpdateAvatarInputDto,
DeleteMediaOutputDto, UpdateAvatarOutputDto,
GetAvatarOutputDto, UploadMediaInputDto,
UpdateAvatarInputDto, UploadMediaOutputDto,
UpdateAvatarOutputDto,
} from '../../dtos'; } from '../../dtos';
import type { GetAvatarOutputDto } from '../../types/GetAvatarOutputDto';
import { BaseApiClient } from '../base/BaseApiClient';
/** /**
* Media API Client * Media API Client

View File

@@ -0,0 +1,33 @@
import { BaseApiClient } from '../base/BaseApiClient';
import type {
LeagueAdminProtestsDTO,
ApplyPenaltyCommandDTO,
RequestProtestDefenseCommandDTO,
} from '../../types';
/**
* Protests API Client
*
* Handles all protest-related API operations.
*/
export class ProtestsApiClient extends BaseApiClient {
/** Get protests for a league */
getLeagueProtests(leagueId: string): Promise<LeagueAdminProtestsDTO> {
return this.get<LeagueAdminProtestsDTO>(`/leagues/${leagueId}/protests`);
}
/** Get a specific protest for a league */
getLeagueProtest(leagueId: string, protestId: string): Promise<LeagueAdminProtestsDTO> {
return this.get<LeagueAdminProtestsDTO>(`/leagues/${leagueId}/protests/${protestId}`);
}
/** Apply a penalty */
applyPenalty(input: ApplyPenaltyCommandDTO): Promise<void> {
return this.post<void>('/races/penalties/apply', input);
}
/** Request protest defense */
requestDefense(input: RequestProtestDefenseCommandDTO): Promise<void> {
return this.post<void>('/races/protests/defense/request', input);
}
}

View File

@@ -39,4 +39,9 @@ export class SponsorsApiClient extends BaseApiClient {
getSponsorships(sponsorId: string): Promise<SponsorSponsorshipsDTO | null> { getSponsorships(sponsorId: string): Promise<SponsorSponsorshipsDTO | null> {
return this.get<SponsorSponsorshipsDTO | null>(`/sponsors/${sponsorId}/sponsorships`); return this.get<SponsorSponsorshipsDTO | null>(`/sponsors/${sponsorId}/sponsorships`);
} }
/** Get sponsor by ID */
getSponsor(sponsorId: string): Promise<SponsorDTO | null> {
return this.get<SponsorDTO | null>(`/sponsors/${sponsorId}`);
}
} }

View File

@@ -1,15 +1,16 @@
import { BaseApiClient } from '../base/BaseApiClient'; import { LeagueMemberDTO } from '@/lib/types/generated/LeagueMemberDTO';
import type { import type {
AllTeamsDto, AllTeamsDto,
TeamDetailsDto,
TeamMembersDto,
TeamJoinRequestsDto,
CreateTeamInputDto, CreateTeamInputDto,
CreateTeamOutputDto, CreateTeamOutputDto,
DriverTeamDto,
TeamDetailsDto,
TeamJoinRequestsDto,
TeamMembersDto,
UpdateTeamInputDto, UpdateTeamInputDto,
UpdateTeamOutputDto, UpdateTeamOutputDto,
DriverTeamDto,
} from '../../dtos'; } from '../../dtos';
import { BaseApiClient } from '../base/BaseApiClient';
/** /**
* Teams API Client * Teams API Client
@@ -51,4 +52,9 @@ export class TeamsApiClient extends BaseApiClient {
getDriverTeam(driverId: string): Promise<DriverTeamDto | null> { getDriverTeam(driverId: string): Promise<DriverTeamDto | null> {
return this.get<DriverTeamDto | null>(`/teams/driver/${driverId}`); return this.get<DriverTeamDto | null>(`/teams/driver/${driverId}`);
} }
/** Get membership for a driver in a team */
getMembership(teamId: string, driverId: string): Promise<LeagueMemberDTO | null> {
return this.get<LeagueMemberDTO | null>(`/teams/${teamId}/members/${driverId}`);
}
} }

View File

@@ -0,0 +1,58 @@
import { ApplyPenaltyCommandDTO } from '../../types';
export type PenaltyType = 'time_penalty' | 'grid_penalty' | 'points_deduction' | 'disqualification' | 'warning' | 'license_points';
export interface ProtestDecisionData {
decision: 'uphold' | 'dismiss' | null;
penaltyType: PenaltyType;
penaltyValue: number;
stewardNotes: string;
}
export class ProtestDecisionCommandModel {
decision: 'uphold' | 'dismiss' | null = null;
penaltyType: PenaltyType = 'time_penalty';
penaltyValue: number = 5;
stewardNotes: string = '';
constructor(initial: Partial<ProtestDecisionData> = {}) {
this.decision = initial.decision ?? null;
this.penaltyType = initial.penaltyType ?? 'time_penalty';
this.penaltyValue = initial.penaltyValue ?? 5;
this.stewardNotes = initial.stewardNotes ?? '';
}
get isValid(): boolean {
return this.decision !== null && this.stewardNotes.trim().length > 0;
}
get canSubmit(): boolean {
return this.isValid;
}
reset(): void {
this.decision = null;
this.penaltyType = 'time_penalty';
this.penaltyValue = 5;
this.stewardNotes = '';
}
toApplyPenaltyCommand(raceId: string, driverId: string, stewardId: string, protestId: string): ApplyPenaltyCommandDTO {
return {
raceId,
driverId,
stewardId,
type: this.penaltyType,
value: this.getPenaltyValue(),
reason: 'Protest upheld', // TODO: Make this configurable
protestId,
notes: this.stewardNotes,
};
}
private getPenaltyValue(): number {
// Some penalties don't require a value
const penaltiesWithoutValue: PenaltyType[] = ['disqualification', 'warning'];
return penaltiesWithoutValue.includes(this.penaltyType) ? 0 : this.penaltyValue;
}
}

View File

@@ -7,6 +7,8 @@ import { PaymentsApiClient } from '../api/payments/PaymentsApiClient';
import { AuthApiClient } from '../api/auth/AuthApiClient'; import { AuthApiClient } from '../api/auth/AuthApiClient';
import { AnalyticsApiClient } from '../api/analytics/AnalyticsApiClient'; import { AnalyticsApiClient } from '../api/analytics/AnalyticsApiClient';
import { MediaApiClient } from '../api/media/MediaApiClient'; import { MediaApiClient } from '../api/media/MediaApiClient';
import { DashboardApiClient } from '../api/dashboard/DashboardApiClient';
import { ProtestsApiClient } from '../api/protests/ProtestsApiClient';
import { ConsoleErrorReporter } from '../infrastructure/logging/ConsoleErrorReporter'; import { ConsoleErrorReporter } from '../infrastructure/logging/ConsoleErrorReporter';
import { ConsoleLogger } from '../infrastructure/logging/ConsoleLogger'; import { ConsoleLogger } from '../infrastructure/logging/ConsoleLogger';
@@ -19,17 +21,20 @@ import { TeamService } from './teams/TeamService';
import { TeamJoinService } from './teams/TeamJoinService'; import { TeamJoinService } from './teams/TeamJoinService';
import { LeagueService } from './leagues/LeagueService'; import { LeagueService } from './leagues/LeagueService';
import { LeagueMembershipService } from './leagues/LeagueMembershipService'; import { LeagueMembershipService } from './leagues/LeagueMembershipService';
import { LeagueSettingsService } from './leagues/LeagueSettingsService';
import { SponsorService } from './sponsors/SponsorService'; import { SponsorService } from './sponsors/SponsorService';
import { SponsorshipService } from './sponsors/SponsorshipService'; import { SponsorshipService } from './sponsors/SponsorshipService';
import { PaymentService } from './payments/PaymentService'; import { PaymentService } from './payments/PaymentService';
import { AnalyticsService } from './analytics/AnalyticsService'; import { AnalyticsService } from './analytics/AnalyticsService';
import { DashboardService } from './analytics/DashboardService'; import { DashboardService as AnalyticsDashboardService } from './analytics/DashboardService';
import { DashboardService } from './dashboard/DashboardService';
import { MediaService } from './media/MediaService'; import { MediaService } from './media/MediaService';
import { AvatarService } from './media/AvatarService'; import { AvatarService } from './media/AvatarService';
import { WalletService } from './payments/WalletService'; import { WalletService } from './payments/WalletService';
import { MembershipFeeService } from './payments/MembershipFeeService'; import { MembershipFeeService } from './payments/MembershipFeeService';
import { AuthService } from './auth/AuthService'; import { AuthService } from './auth/AuthService';
import { SessionService } from './auth/SessionService'; import { SessionService } from './auth/SessionService';
import { ProtestService } from './protests/ProtestService';
/** /**
* ServiceFactory - Composition root for all services * ServiceFactory - Composition root for all services
@@ -52,6 +57,8 @@ export class ServiceFactory {
auth: AuthApiClient; auth: AuthApiClient;
analytics: AnalyticsApiClient; analytics: AnalyticsApiClient;
media: MediaApiClient; media: MediaApiClient;
dashboard: DashboardApiClient;
protests: ProtestsApiClient;
}; };
constructor(baseUrl: string) { constructor(baseUrl: string) {
@@ -66,6 +73,8 @@ export class ServiceFactory {
auth: new AuthApiClient(baseUrl, this.errorReporter, this.logger), auth: new AuthApiClient(baseUrl, this.errorReporter, this.logger),
analytics: new AnalyticsApiClient(baseUrl, this.errorReporter, this.logger), analytics: new AnalyticsApiClient(baseUrl, this.errorReporter, this.logger),
media: new MediaApiClient(baseUrl, this.errorReporter, this.logger), media: new MediaApiClient(baseUrl, this.errorReporter, this.logger),
dashboard: new DashboardApiClient(baseUrl, this.errorReporter, this.logger),
protests: new ProtestsApiClient(baseUrl, this.errorReporter, this.logger),
}; };
} }
@@ -115,15 +124,22 @@ export class ServiceFactory {
* Create LeagueService instance * Create LeagueService instance
*/ */
createLeagueService(): LeagueService { createLeagueService(): LeagueService {
return new LeagueService(this.apiClients.leagues); return new LeagueService(this.apiClients.leagues, this.apiClients.drivers, this.apiClients.sponsors, this.apiClients.races);
} }
/** /**
* Create LeagueMembershipService instance * Create LeagueMembershipService instance
*/ */
createLeagueMembershipService(): LeagueMembershipService { createLeagueMembershipService(): LeagueMembershipService {
return new LeagueMembershipService(this.apiClients.leagues); return new LeagueMembershipService(this.apiClients.leagues);
} }
/**
* Create LeagueSettingsService instance
*/
createLeagueSettingsService(): LeagueSettingsService {
return new LeagueSettingsService(this.apiClients.leagues, this.apiClients.drivers);
}
/** /**
* Create SponsorService instance * Create SponsorService instance
@@ -154,11 +170,18 @@ export class ServiceFactory {
} }
/** /**
* Create DashboardService instance * Create Analytics DashboardService instance
*/ */
createDashboardService(): DashboardService { createAnalyticsDashboardService(): AnalyticsDashboardService {
return new DashboardService(this.apiClients.analytics); return new AnalyticsDashboardService(this.apiClients.analytics);
} }
/**
* Create DashboardService instance
*/
createDashboardService(): DashboardService {
return new DashboardService(this.apiClients.dashboard);
}
/** /**
* Create MediaService instance * Create MediaService instance
@@ -201,4 +224,11 @@ export class ServiceFactory {
createSessionService(): SessionService { createSessionService(): SessionService {
return new SessionService(this.apiClients.auth); return new SessionService(this.apiClients.auth);
} }
/**
* Create ProtestService instance
*/
createProtestService(): ProtestService {
return new ProtestService(this.apiClients.protests);
}
} }

View File

@@ -0,0 +1,22 @@
import { DashboardOverviewViewModel } from '../../view-models/DashboardOverviewViewModel';
import { DashboardApiClient } from '../../api/dashboard/DashboardApiClient';
/**
* Dashboard Service
*
* Orchestrates dashboard operations by coordinating API calls and view model creation.
* All dependencies are injected via constructor.
*/
export class DashboardService {
constructor(
private readonly apiClient: DashboardApiClient
) {}
/**
* Get dashboard overview data with view model transformation
*/
async getDashboardOverview(): Promise<DashboardOverviewViewModel> {
const dto = await this.apiClient.getDashboardOverview();
return new DashboardOverviewViewModel(dto);
}
}

View File

@@ -1,8 +1,10 @@
import { DriversApiClient } from "@/lib/api/drivers/DriversApiClient"; import { DriversApiClient } from "@/lib/api/drivers/DriversApiClient";
import { CompleteOnboardingInputDTO } from "@/lib/types/generated/CompleteOnboardingInputDTO"; import { CompleteOnboardingInputDTO } from "@/lib/types/generated/CompleteOnboardingInputDTO";
import { DriverProfileDTO } from "@/lib/types/generated/DriverProfileDTO";
import { CompleteOnboardingViewModel } from "@/lib/view-models/CompleteOnboardingViewModel"; import { CompleteOnboardingViewModel } from "@/lib/view-models/CompleteOnboardingViewModel";
import { DriverLeaderboardViewModel } from "@/lib/view-models/DriverLeaderboardViewModel"; import { DriverLeaderboardViewModel } from "@/lib/view-models/DriverLeaderboardViewModel";
import { DriverViewModel } from "@/lib/view-models/DriverViewModel"; import { DriverViewModel } from "@/lib/view-models/DriverViewModel";
import { DriverProfileViewModel } from "@/lib/view-models/DriverProfileViewModel";
// TODO: Create proper DriverDTO in generated types // TODO: Create proper DriverDTO in generated types
type DriverDTO = { type DriverDTO = {
@@ -41,8 +43,8 @@ export class DriverService {
} }
/** /**
* Get current driver with view model transformation * Get current driver with view model transformation
*/ */
async getCurrentDriver(): Promise<DriverViewModel | null> { async getCurrentDriver(): Promise<DriverViewModel | null> {
const dto = await this.apiClient.getCurrent(); const dto = await this.apiClient.getCurrent();
if (!dto) { if (!dto) {
@@ -50,4 +52,12 @@ export class DriverService {
} }
return new DriverViewModel(dto); return new DriverViewModel(dto);
} }
/**
* Get driver profile with full details and view model transformation
*/
async getDriverProfile(driverId: string): Promise<DriverProfileViewModel> {
const dto = await this.apiClient.getDriverProfile(driverId);
return new DriverProfileViewModel(dto);
}
} }

View File

@@ -1,4 +1,7 @@
import { LeaguesApiClient } from "@/lib/api/leagues/LeaguesApiClient"; import { LeaguesApiClient } from "@/lib/api/leagues/LeaguesApiClient";
import { DriversApiClient } from "@/lib/api/drivers/DriversApiClient";
import { SponsorsApiClient } from "@/lib/api/sponsors/SponsorsApiClient";
import { RacesApiClient } from "@/lib/api/races/RacesApiClient";
import { CreateLeagueInputDTO } from "@/lib/types/generated/CreateLeagueInputDTO"; import { CreateLeagueInputDTO } from "@/lib/types/generated/CreateLeagueInputDTO";
import { LeagueWithCapacityDTO } from "@/lib/types/generated/LeagueWithCapacityDTO"; import { LeagueWithCapacityDTO } from "@/lib/types/generated/LeagueWithCapacityDTO";
import { CreateLeagueViewModel } from "@/lib/view-models/CreateLeagueViewModel"; import { CreateLeagueViewModel } from "@/lib/view-models/CreateLeagueViewModel";
@@ -8,7 +11,14 @@ import { LeagueStandingsViewModel } from "@/lib/view-models/LeagueStandingsViewM
import { LeagueStatsViewModel } from "@/lib/view-models/LeagueStatsViewModel"; import { LeagueStatsViewModel } from "@/lib/view-models/LeagueStatsViewModel";
import { LeagueSummaryViewModel } from "@/lib/view-models/LeagueSummaryViewModel"; import { LeagueSummaryViewModel } from "@/lib/view-models/LeagueSummaryViewModel";
import { RemoveMemberViewModel } from "@/lib/view-models/RemoveMemberViewModel"; import { RemoveMemberViewModel } from "@/lib/view-models/RemoveMemberViewModel";
import { LeagueDetailViewModel } from "@/lib/view-models/LeagueDetailViewModel";
import { LeagueDetailPageViewModel, SponsorInfo } from "@/lib/view-models/LeagueDetailPageViewModel";
import { SubmitBlocker, ThrottleBlocker } from "@/lib/blockers"; import { SubmitBlocker, ThrottleBlocker } from "@/lib/blockers";
import { DriverDTO } from "@/lib/types/DriverDTO";
import { RaceDTO } from "@/lib/types/generated/RaceDTO";
import { LeagueScoringConfigDTO } from "@/lib/types/LeagueScoringConfigDTO";
import { LeagueStatsDTO } from "@/lib/types/generated/LeagueStatsDTO";
import { LeagueMembershipsDTO } from "@/lib/types/generated/LeagueMembershipsDTO";
/** /**
@@ -22,7 +32,10 @@ export class LeagueService {
private readonly throttle = new ThrottleBlocker(500); private readonly throttle = new ThrottleBlocker(500);
constructor( constructor(
private readonly apiClient: LeaguesApiClient private readonly apiClient: LeaguesApiClient,
private readonly driversApiClient: DriversApiClient,
private readonly sponsorsApiClient: SponsorsApiClient,
private readonly racesApiClient: RacesApiClient
) {} ) {}
/** /**
@@ -93,4 +106,156 @@ export class LeagueService {
const dto = await this.apiClient.removeMember(leagueId, performerDriverId, targetDriverId); const dto = await this.apiClient.removeMember(leagueId, performerDriverId, targetDriverId);
return new RemoveMemberViewModel(dto); return new RemoveMemberViewModel(dto);
} }
/**
* Get league detail with owner, membership, and sponsor info
*/
async getLeagueDetail(leagueId: string, currentDriverId: string): Promise<LeagueDetailViewModel | null> {
// For now, assume league data comes from getAllWithCapacity or a new endpoint
// Since API may not have detailed league, we'll mock or assume
// In real implementation, add getLeagueDetail to API
const allLeagues = await this.apiClient.getAllWithCapacity();
const leagueDto = allLeagues.leagues.find(l => l.id === leagueId);
if (!leagueDto) return null;
// Assume league has description, ownerId - need to update DTO
const league = {
id: leagueDto.id,
name: leagueDto.name,
description: 'Description not available', // TODO: add to API
ownerId: 'owner-id', // TODO: add to API
};
// Get owner
const owner = await this.driversApiClient.getDriver(league.ownerId);
const ownerName = owner ? owner.name : `${league.ownerId.slice(0, 8)}...`;
// Get membership
const membershipsDto = await this.apiClient.getMemberships(leagueId);
const membership = membershipsDto.members.find(m => m.driverId === currentDriverId);
const isAdmin = membership ? ['admin', 'owner'].includes(membership.role) : false;
// Get main sponsor
let mainSponsor = null;
try {
const seasonsDto = await this.apiClient.getSeasons(leagueId);
const activeSeason = seasonsDto.seasons.find((s: any) => s.status === 'active') ?? seasonsDto.seasons[0];
if (activeSeason) {
const sponsorshipsDto = await this.apiClient.getSeasonSponsorships(activeSeason.id);
const mainSponsorship = sponsorshipsDto.sponsorships.find((s: any) => s.tier === 'main' && s.status === 'active');
if (mainSponsorship) {
const sponsor = await this.sponsorsApiClient.getSponsor(mainSponsorship.sponsorId);
if (sponsor) {
mainSponsor = {
name: sponsor.name,
logoUrl: sponsor.logoUrl ?? '',
websiteUrl: sponsor.websiteUrl ?? '',
};
}
}
}
} catch (error) {
console.warn('Failed to load main sponsor:', error);
}
return new LeagueDetailViewModel(
league.id,
league.name,
league.description,
league.ownerId,
ownerName,
mainSponsor,
isAdmin
);
}
/**
* Get comprehensive league detail page data
*/
async getLeagueDetailPageData(leagueId: string): Promise<LeagueDetailPageViewModel | null> {
try {
// Get league basic info
const allLeagues = await this.apiClient.getAllWithCapacity();
const league = allLeagues.leagues.find(l => l.id === leagueId);
if (!league) return null;
// Get owner
const owner = await this.driversApiClient.getDriver(league.ownerId);
// Get scoring config - TODO: implement API endpoint
const scoringConfig: LeagueScoringConfigDTO | null = null; // TODO: fetch from API
// Get all drivers - TODO: implement API endpoint for all drivers
const drivers: DriverDTO[] = []; // TODO: fetch from API
// Get memberships
const memberships = await this.apiClient.getMemberships(leagueId);
// Get all races for this league - TODO: implement API endpoint
const allRaces: RaceDTO[] = []; // TODO: fetch from API
// Get league stats
const leagueStats = await this.apiClient.getTotal(); // TODO: get stats for specific league
// Get sponsors
const sponsors = await this.getLeagueSponsors(leagueId);
return new LeagueDetailPageViewModel(
league,
owner,
scoringConfig,
drivers,
memberships,
allRaces,
leagueStats,
sponsors
);
} catch (error) {
console.error('Failed to load league detail page data:', error);
return null;
}
}
/**
* Get sponsors for a league
*/
private async getLeagueSponsors(leagueId: string): Promise<SponsorInfo[]> {
try {
const seasons = await this.apiClient.getSeasons(leagueId);
const activeSeason = seasons.seasons.find((s: any) => s.status === 'active') ?? seasons.seasons[0];
if (!activeSeason) return [];
const sponsorships = await this.apiClient.getSeasonSponsorships(activeSeason.id);
const activeSponsorships = sponsorships.sponsorships.filter((s: any) => s.status === 'active');
const sponsorInfos: SponsorInfo[] = [];
for (const sponsorship of activeSponsorships) {
const sponsor = await this.sponsorsApiClient.getSponsor(sponsorship.sponsorId);
if (sponsor) {
// TODO: Get tagline from testing support or API
sponsorInfos.push({
id: sponsor.id,
name: sponsor.name,
logoUrl: sponsor.logoUrl ?? '',
websiteUrl: sponsor.websiteUrl ?? '',
tier: sponsorship.tier,
tagline: '', // TODO: fetch tagline
});
}
}
// Sort: main sponsors first, then secondary
sponsorInfos.sort((a, b) => {
if (a.tier === 'main' && b.tier !== 'main') return -1;
if (a.tier !== 'main' && b.tier === 'main') return 1;
return 0;
});
return sponsorInfos;
} catch (error) {
console.warn('Failed to load sponsors:', error);
return [];
}
}
} }

View File

@@ -0,0 +1,95 @@
import { LeaguesApiClient } from "@/lib/api/leagues/LeaguesApiClient";
import { DriversApiClient } from "@/lib/api/drivers/DriversApiClient";
import type { LeagueConfigFormModel } from "@/lib/types/LeagueConfigFormModel";
import type { LeagueScoringPresetDTO } from "@/lib/types/LeagueScoringPresetDTO";
import type { DriverDTO } from "@/lib/types/DriverDTO";
import { LeagueSettingsViewModel } from "@/lib/view-models/LeagueSettingsViewModel";
import { DriverSummaryViewModel } from "@/lib/view-models/DriverSummaryViewModel";
/**
* League Settings Service
*
* Orchestrates league settings operations by coordinating API calls and view model creation.
* All dependencies are injected via constructor.
*/
export class LeagueSettingsService {
constructor(
private readonly leaguesApiClient: LeaguesApiClient,
private readonly driversApiClient: DriversApiClient
) {}
/**
* Get league settings with view model transformation
*/
async getLeagueSettings(leagueId: string): Promise<LeagueSettingsViewModel | null> {
try {
// Get league basic info
const allLeagues = await this.leaguesApiClient.getAllWithCapacity();
const leagueDto = allLeagues.leagues.find(l => l.id === leagueId);
if (!leagueDto) return null;
// Assume league has ownerId - need to update API
const league = {
id: leagueDto.id,
name: leagueDto.name,
ownerId: 'owner-id', // TODO: add to API
};
// Get config
const configDto = await this.leaguesApiClient.getLeagueConfig(leagueId);
const config: LeagueConfigFormModel = configDto.config;
// Get presets
const presetsDto = await this.leaguesApiClient.getScoringPresets();
const presets: LeagueScoringPresetDTO[] = presetsDto.presets;
// Get owner
const ownerDriver = await this.driversApiClient.getDriver(league.ownerId);
let owner: DriverSummaryViewModel | null = null;
if (ownerDriver) {
// TODO: get rating and rank from API
owner = new DriverSummaryViewModel({
driver: ownerDriver,
rating: ownerDriver.rating ?? null,
rank: null, // TODO: get from API
});
}
// Get members
const membershipsDto = await this.leaguesApiClient.getMemberships(leagueId);
const members: DriverDTO[] = [];
for (const member of membershipsDto.members) {
if (member.driverId !== league.ownerId && member.role !== 'owner') {
const driver = await this.driversApiClient.getDriver(member.driverId);
if (driver) {
members.push(driver);
}
}
}
return new LeagueSettingsViewModel({
league,
config,
presets,
owner,
members,
});
} catch (error) {
console.error('Failed to load league settings:', error);
return null;
}
}
/**
* Transfer league ownership
*/
async transferOwnership(leagueId: string, currentOwnerId: string, newOwnerId: string): Promise<boolean> {
try {
const result = await this.leaguesApiClient.transferOwnership(leagueId, currentOwnerId, newOwnerId);
return result.success;
} catch (error) {
console.error('Failed to transfer ownership:', error);
throw error;
}
}
}

View File

@@ -34,10 +34,17 @@ export class MediaService {
} }
/** /**
* Delete media by ID with view model transformation * Delete media by ID with view model transformation
*/ */
async deleteMedia(mediaId: string): Promise<DeleteMediaViewModel> { async deleteMedia(mediaId: string): Promise<DeleteMediaViewModel> {
const dto = await this.apiClient.deleteMedia(mediaId); const dto = await this.apiClient.deleteMedia(mediaId);
return new DeleteMediaViewModel(dto); return new DeleteMediaViewModel(dto);
} }
}
/**
* Get team logo URL
*/
getTeamLogo(teamId: string): string {
return `/api/media/teams/${teamId}/logo`;
}
}

View File

@@ -0,0 +1,70 @@
import { ProtestsApiClient } from '../../api/protests/ProtestsApiClient';
import { ProtestViewModel } from '../../view-models/ProtestViewModel';
import type { LeagueAdminProtestsDTO, ApplyPenaltyCommandDTO, RequestProtestDefenseCommandDTO, DriverSummaryDTO } from '../../types';
/**
* Protest Service
*
* Orchestrates protest operations by coordinating API calls and view model creation.
* All dependencies are injected via constructor.
*/
export class ProtestService {
constructor(
private readonly apiClient: ProtestsApiClient
) {}
/**
* Get protests for a league with view model transformation
*/
async getLeagueProtests(leagueId: string): Promise<{
protests: ProtestViewModel[];
racesById: LeagueAdminProtestsDTO['racesById'];
driversById: LeagueAdminProtestsDTO['driversById'];
}> {
const dto = await this.apiClient.getLeagueProtests(leagueId);
return {
protests: dto.protests.map(protest => new ProtestViewModel(protest)),
racesById: dto.racesById,
driversById: dto.driversById,
};
}
/**
* Get a single protest by ID from league protests
*/
async getProtestById(leagueId: string, protestId: string): Promise<{
protest: ProtestViewModel;
race: LeagueAdminProtestsDTO['racesById'][string];
protestingDriver: DriverSummaryDTO;
accusedDriver: DriverSummaryDTO;
} | null> {
const dto = await this.apiClient.getLeagueProtest(leagueId, protestId);
const protest = dto.protests[0];
if (!protest) return null;
const race = Object.values(dto.racesById)[0];
const protestingDriver = dto.driversById[protest.protestingDriverId];
const accusedDriver = dto.driversById[protest.accusedDriverId];
return {
protest: new ProtestViewModel(protest),
race,
protestingDriver,
accusedDriver,
};
}
/**
* Apply a penalty
*/
async applyPenalty(input: ApplyPenaltyCommandDTO): Promise<void> {
await this.apiClient.applyPenalty(input);
}
/**
* Request protest defense
*/
async requestDefense(input: RequestProtestDefenseCommandDTO): Promise<void> {
await this.apiClient.requestDefense(input);
}
}

View File

@@ -54,6 +54,34 @@ export class RaceService {
return new RaceStatsViewModel(dto); return new RaceStatsViewModel(dto);
} }
/**
* Register for a race
*/
async registerForRace(raceId: string, leagueId: string, driverId: string): Promise<void> {
await this.apiClient.register(raceId, { leagueId, driverId });
}
/**
* Withdraw from a race
*/
async withdrawFromRace(raceId: string, driverId: string): Promise<void> {
await this.apiClient.withdraw(raceId, { driverId });
}
/**
* Cancel a race
*/
async cancelRace(raceId: string): Promise<void> {
await this.apiClient.cancel(raceId);
}
/**
* Complete a race
*/
async completeRace(raceId: string): Promise<void> {
await this.apiClient.complete(raceId);
}
/** /**
* Transform API races page data to view model format * Transform API races page data to view model format
*/ */

View File

@@ -4,6 +4,7 @@ import { TeamSummaryViewModel } from '@/lib/view-models/TeamSummaryViewModel';
import { CreateTeamViewModel } from '@/lib/view-models/CreateTeamViewModel'; import { CreateTeamViewModel } from '@/lib/view-models/CreateTeamViewModel';
import { UpdateTeamViewModel } from '@/lib/view-models/UpdateTeamViewModel'; import { UpdateTeamViewModel } from '@/lib/view-models/UpdateTeamViewModel';
import { DriverTeamViewModel } from '@/lib/view-models/DriverTeamViewModel'; import { DriverTeamViewModel } from '@/lib/view-models/DriverTeamViewModel';
import { LeagueMemberDTO } from '@/lib/types/generated/LeagueMemberDTO';
import type { TeamsApiClient } from '../../api/teams/TeamsApiClient'; import type { TeamsApiClient } from '../../api/teams/TeamsApiClient';
// TODO: Move these types to apps/website/lib/types/generated when available // TODO: Move these types to apps/website/lib/types/generated when available
@@ -71,10 +72,33 @@ export class TeamService {
} }
/** /**
* Get driver's team with view model transformation * Get driver's team with view model transformation
*/ */
async getDriverTeam(driverId: string): Promise<DriverTeamViewModel | null> { async getDriverTeam(driverId: string): Promise<DriverTeamViewModel | null> {
const dto = await this.apiClient.getDriverTeam(driverId); const dto = await this.apiClient.getDriverTeam(driverId);
return dto ? new DriverTeamViewModel(dto) : null; return dto ? new DriverTeamViewModel(dto) : null;
} }
}
/**
* Get team membership for a driver
*/
async getMembership(teamId: string, driverId: string): Promise<LeagueMemberDTO | null> {
return this.apiClient.getMembership(teamId, driverId);
}
/**
* Remove a driver from the team
*/
async removeMembership(teamId: string, driverId: string): Promise<void> {
// TODO: Implement when API endpoint is available
throw new Error('Not implemented: API endpoint for removing team membership');
}
/**
* Update team membership role
*/
async updateMembership(teamId: string, driverId: string, role: string): Promise<void> {
// TODO: Implement when API endpoint is available
throw new Error('Not implemented: API endpoint for updating team membership role');
}
}

View File

@@ -0,0 +1,13 @@
/**
* Auto-generated DTO from OpenAPI spec
* This file is generated by scripts/generate-api-types.ts
* Do not edit manually - regenerate using: npm run api:sync-types
*/
export interface DriverDTO {
id: string;
name: string;
avatarUrl?: string;
iracingId?: string;
rating?: number;
}

View File

@@ -0,0 +1,9 @@
/**
* Auto-generated DTO from OpenAPI spec
* This file is generated by scripts/generate-api-types.ts
* Do not edit manually - regenerate using: npm run api:sync-types
*/
export interface GetAvatarOutputDto {
avatarUrl: string;
}

View File

@@ -0,0 +1,15 @@
export type LeagueScoringPresetPrimaryChampionshipType =
| 'driver'
| 'team'
| 'nations'
| 'trophy';
export interface LeagueScoringPresetDTO {
id: string;
name: string;
description: string;
primaryChampionshipType: LeagueScoringPresetPrimaryChampionshipType;
sessionSummary: string;
bonusSummary: string;
dropPolicySummary: string;
}

View File

@@ -0,0 +1,14 @@
/**
* Auto-generated DTO from OpenAPI spec
* This file is generated by scripts/generate-api-types.ts
* Do not edit manually - regenerate using: npm run api:sync-types
*/
export interface RaceDetailEntryDTO {
id: string;
name: string;
country: string;
avatarUrl: string;
rating: number | null;
isCurrentUser: boolean;
}

View File

@@ -8,5 +8,9 @@ export interface ApplyPenaltyCommandDTO {
raceId: string; raceId: string;
driverId: string; driverId: string;
stewardId: string; stewardId: string;
enum: string; type: string;
value?: number;
reason: string;
protestId?: string;
notes?: string;
} }

View File

@@ -0,0 +1,100 @@
export interface DriverProfileDriverSummaryDTO {
id: string;
name: string;
country: string;
avatarUrl: string;
iracingId: string | null;
joinedAt: string;
rating: number | null;
globalRank: number | null;
consistency: number | null;
bio: string | null;
totalDrivers: number | null;
}
export interface DriverProfileStatsDTO {
totalRaces: number;
wins: number;
podiums: number;
dnfs: number;
avgFinish: number | null;
bestFinish: number | null;
worstFinish: number | null;
finishRate: number | null;
winRate: number | null;
podiumRate: number | null;
percentile: number | null;
rating: number | null;
consistency: number | null;
overallRank: number | null;
}
export interface DriverProfileFinishDistributionDTO {
totalRaces: number;
wins: number;
podiums: number;
topTen: number;
dnfs: number;
other: number;
}
export interface DriverProfileTeamMembershipDTO {
teamId: string;
teamName: string;
teamTag: string | null;
role: string;
joinedAt: string;
isCurrent: boolean;
}
export interface DriverProfileSocialFriendSummaryDTO {
id: string;
name: string;
country: string;
avatarUrl: string;
}
export interface DriverProfileSocialSummaryDTO {
friendsCount: number;
friends: DriverProfileSocialFriendSummaryDTO[];
}
export type DriverProfileSocialPlatform = 'twitter' | 'youtube' | 'twitch' | 'discord';
export type DriverProfileAchievementRarity = 'common' | 'rare' | 'epic' | 'legendary';
export interface DriverProfileAchievementDTO {
id: string;
title: string;
description: string;
icon: 'trophy' | 'medal' | 'star' | 'crown' | 'target' | 'zap';
rarity: DriverProfileAchievementRarity;
earnedAt: string;
}
export interface DriverProfileSocialHandleDTO {
platform: DriverProfileSocialPlatform;
handle: string;
url: string;
}
export interface DriverProfileExtendedProfileDTO {
socialHandles: DriverProfileSocialHandleDTO[];
achievements: DriverProfileAchievementDTO[];
racingStyle: string;
favoriteTrack: string;
favoriteCar: string;
timezone: string;
availableHours: string;
lookingForTeam: boolean;
openToRequests: boolean;
}
export interface DriverProfileDTO {
currentDriver: DriverProfileDriverSummaryDTO | null;
stats: DriverProfileStatsDTO | null;
finishDistribution: DriverProfileFinishDistributionDTO | null;
teamMemberships: DriverProfileTeamMembershipDTO[];
socialSummary: DriverProfileSocialSummaryDTO;
extendedProfile: DriverProfileExtendedProfileDTO | null;
}

View File

@@ -0,0 +1,19 @@
/**
* Auto-generated DTO from OpenAPI spec
* This file is generated by scripts/generate-api-types.ts
* Do not edit manually - regenerate using: npm run api:sync-types
*/
import { ProtestDTO } from './ProtestDTO';
import { RaceDTO } from './RaceDTO';
export interface DriverSummaryDTO {
id: string;
name: string;
}
export interface LeagueAdminProtestsDTO {
protests: ProtestDTO[];
racesById: { [raceId: string]: RaceDTO };
driversById: { [driverId: string]: DriverSummaryDTO };
}

View File

@@ -0,0 +1,181 @@
import { DashboardOverviewDto, DriverDto, RaceDto, LeagueStandingDto, FeedItemDto, FriendDto } from '../api/dashboard/DashboardApiClient';
export class DriverViewModel {
constructor(private readonly dto: DriverDto) {}
get id(): string {
return this.dto.id;
}
get name(): string {
return this.dto.name;
}
get avatarUrl(): string {
return this.dto.avatarUrl;
}
get country(): string {
return this.dto.country;
}
get totalRaces(): number {
return this.dto.totalRaces;
}
get wins(): number {
return this.dto.wins;
}
get podiums(): number {
return this.dto.podiums;
}
get rating(): number {
return this.dto.rating;
}
get globalRank(): number {
return this.dto.globalRank;
}
get consistency(): number {
return this.dto.consistency;
}
}
export class RaceViewModel {
constructor(private readonly dto: RaceDto) {}
get id(): string {
return this.dto.id;
}
get track(): string {
return this.dto.track;
}
get car(): string {
return this.dto.car;
}
get scheduledAt(): Date {
return new Date(this.dto.scheduledAt);
}
get isMyLeague(): boolean {
return this.dto.isMyLeague;
}
get leagueName(): string | undefined {
return this.dto.leagueName;
}
}
export class LeagueStandingViewModel {
constructor(private readonly dto: LeagueStandingDto) {}
get leagueId(): string {
return this.dto.leagueId;
}
get leagueName(): string {
return this.dto.leagueName;
}
get position(): number {
return this.dto.position;
}
get points(): number {
return this.dto.points;
}
get totalDrivers(): number {
return this.dto.totalDrivers;
}
}
export class DashboardFeedItemSummaryViewModel {
constructor(private readonly dto: FeedItemDto) {}
get id(): string {
return this.dto.id;
}
get type(): string {
return this.dto.type;
}
get headline(): string {
return this.dto.headline;
}
get body(): string | null {
return this.dto.body;
}
get timestamp(): Date {
return new Date(this.dto.timestamp);
}
get ctaHref(): string | undefined {
return this.dto.ctaHref;
}
get ctaLabel(): string | undefined {
return this.dto.ctaLabel;
}
}
export class FriendViewModel {
constructor(private readonly dto: FriendDto) {}
get id(): string {
return this.dto.id;
}
get name(): string {
return this.dto.name;
}
get avatarUrl(): string {
return this.dto.avatarUrl;
}
get country(): string {
return this.dto.country;
}
}
export class DashboardOverviewViewModel {
constructor(private readonly dto: DashboardOverviewDto) {}
get currentDriver(): DriverViewModel {
return new DriverViewModel(this.dto.currentDriver);
}
get nextRace(): RaceViewModel | null {
return this.dto.nextRace ? new RaceViewModel(this.dto.nextRace) : null;
}
get upcomingRaces(): RaceViewModel[] {
return this.dto.upcomingRaces.map(dto => new RaceViewModel(dto));
}
get leagueStandings(): LeagueStandingViewModel[] {
return this.dto.leagueStandings.map(dto => new LeagueStandingViewModel(dto));
}
get feedItems(): DashboardFeedItemSummaryViewModel[] {
return this.dto.feedItems.map(dto => new DashboardFeedItemSummaryViewModel(dto));
}
get friends(): FriendViewModel[] {
return this.dto.friends.map(dto => new FriendViewModel(dto));
}
get activeLeaguesCount(): number {
return this.dto.activeLeaguesCount;
}
}

View File

@@ -0,0 +1,141 @@
export interface DriverProfileDriverSummaryViewModel {
id: string;
name: string;
country: string;
avatarUrl: string;
iracingId: string | null;
joinedAt: string;
rating: number | null;
globalRank: number | null;
consistency: number | null;
bio: string | null;
totalDrivers: number | null;
}
export interface DriverProfileStatsViewModel {
totalRaces: number;
wins: number;
podiums: number;
dnfs: number;
avgFinish: number | null;
bestFinish: number | null;
worstFinish: number | null;
finishRate: number | null;
winRate: number | null;
podiumRate: number | null;
percentile: number | null;
rating: number | null;
consistency: number | null;
overallRank: number | null;
}
export interface DriverProfileFinishDistributionViewModel {
totalRaces: number;
wins: number;
podiums: number;
topTen: number;
dnfs: number;
other: number;
}
export interface DriverProfileTeamMembershipViewModel {
teamId: string;
teamName: string;
teamTag: string | null;
role: string;
joinedAt: string;
isCurrent: boolean;
}
export interface DriverProfileSocialFriendSummaryViewModel {
id: string;
name: string;
country: string;
avatarUrl: string;
}
export interface DriverProfileSocialSummaryViewModel {
friendsCount: number;
friends: DriverProfileSocialFriendSummaryViewModel[];
}
export type DriverProfileSocialPlatform = 'twitter' | 'youtube' | 'twitch' | 'discord';
export type DriverProfileAchievementRarity = 'common' | 'rare' | 'epic' | 'legendary';
export interface DriverProfileAchievementViewModel {
id: string;
title: string;
description: string;
icon: 'trophy' | 'medal' | 'star' | 'crown' | 'target' | 'zap';
rarity: DriverProfileAchievementRarity;
earnedAt: string;
}
export interface DriverProfileSocialHandleViewModel {
platform: DriverProfileSocialPlatform;
handle: string;
url: string;
}
export interface DriverProfileExtendedProfileViewModel {
socialHandles: DriverProfileSocialHandleViewModel[];
achievements: DriverProfileAchievementViewModel[];
racingStyle: string;
favoriteTrack: string;
favoriteCar: string;
timezone: string;
availableHours: string;
lookingForTeam: boolean;
openToRequests: boolean;
}
export interface DriverProfileViewModel {
currentDriver: DriverProfileDriverSummaryViewModel | null;
stats: DriverProfileStatsViewModel | null;
finishDistribution: DriverProfileFinishDistributionViewModel | null;
teamMemberships: DriverProfileTeamMembershipViewModel[];
socialSummary: DriverProfileSocialSummaryViewModel;
extendedProfile: DriverProfileExtendedProfileViewModel | null;
}
/**
* Driver Profile View Model
*
* Represents a fully prepared UI state for driver profile display.
* Transforms API DTOs into UI-ready data structures.
*/
export class DriverProfileViewModel {
constructor(private readonly dto: DriverProfileViewModel) {}
get currentDriver(): DriverProfileDriverSummaryViewModel | null {
return this.dto.currentDriver;
}
get stats(): DriverProfileStatsViewModel | null {
return this.dto.stats;
}
get finishDistribution(): DriverProfileFinishDistributionViewModel | null {
return this.dto.finishDistribution;
}
get teamMemberships(): DriverProfileTeamMembershipViewModel[] {
return this.dto.teamMemberships;
}
get socialSummary(): DriverProfileSocialSummaryViewModel {
return this.dto.socialSummary;
}
get extendedProfile(): DriverProfileExtendedProfileViewModel | null {
return this.dto.extendedProfile;
}
/**
* Get the raw DTO for serialization or further processing
*/
toDTO(): DriverProfileViewModel {
return this.dto;
}
}

View File

@@ -0,0 +1,21 @@
import type { DriverDTO } from '../types/DriverDTO';
/**
* View Model for driver summary with rating and rank
* Transform from DTO to ViewModel with UI fields
*/
export class DriverSummaryViewModel {
driver: DriverDTO;
rating: number | null;
rank: number | null;
constructor(dto: {
driver: DriverDTO;
rating?: number | null;
rank?: number | null;
}) {
this.driver = dto.driver;
this.rating = dto.rating ?? null;
this.rank = dto.rank ?? null;
}
}

View File

@@ -0,0 +1,192 @@
import { LeagueWithCapacityDTO } from '../types/generated/LeagueWithCapacityDTO';
import { LeagueStatsDTO } from '../types/generated/LeagueStatsDTO';
import { LeagueMembershipsDTO } from '../types/generated/LeagueMembershipsDTO';
import { LeagueScheduleDTO } from '../types/generated/LeagueScheduleDTO';
import { LeagueStandingsDTO } from '../types/generated/LeagueStandingsDTO';
import { DriverDTO } from '../types/DriverDTO';
import { RaceDTO } from '../types/generated/RaceDTO';
import { LeagueScoringConfigDTO } from '../types/LeagueScoringConfigDTO';
// Sponsor info type
export interface SponsorInfo {
id: string;
name: string;
logoUrl?: string;
websiteUrl?: string;
tier: 'main' | 'secondary';
tagline?: string;
}
// Driver summary for management section
export interface DriverSummary {
driver: DriverDTO;
rating: number | null;
rank: number | null;
}
// League membership with role
export interface LeagueMembershipWithRole {
driverId: string;
role: 'owner' | 'admin' | 'steward' | 'member';
status: 'active' | 'inactive';
joinedAt: string;
}
export class LeagueDetailPageViewModel {
// League basic info
id: string;
name: string;
description?: string;
ownerId: string;
createdAt: string;
settings: {
maxDrivers?: number;
};
socialLinks?: {
discordUrl?: string;
youtubeUrl?: string;
websiteUrl?: string;
};
// Owner info
owner: DriverDTO | null;
// Scoring configuration
scoringConfig: LeagueScoringConfigDTO | null;
// Drivers and memberships
drivers: DriverDTO[];
memberships: LeagueMembershipWithRole[];
// Races
allRaces: RaceDTO[];
runningRaces: RaceDTO[];
// Stats
averageSOF: number | null;
completedRacesCount: number;
// Sponsors
sponsors: SponsorInfo[];
// Sponsor insights data
sponsorInsights: {
avgViewsPerRace: number;
totalImpressions: number;
engagementRate: string;
estimatedReach: number;
mainSponsorAvailable: boolean;
secondarySlotsAvailable: number;
mainSponsorPrice: number;
secondaryPrice: number;
tier: 'premium' | 'standard' | 'starter';
trustScore: number;
discordMembers: number;
monthlyActivity: number;
};
// Driver summaries for management
ownerSummary: DriverSummary | null;
adminSummaries: DriverSummary[];
stewardSummaries: DriverSummary[];
constructor(
league: LeagueWithCapacityDTO,
owner: DriverDTO | null,
scoringConfig: LeagueScoringConfigDTO | null,
drivers: DriverDTO[],
memberships: LeagueMembershipsDTO,
allRaces: RaceDTO[],
leagueStats: LeagueStatsDTO,
sponsors: SponsorInfo[]
) {
this.id = league.id;
this.name = league.name;
this.description = league.description;
this.ownerId = league.ownerId;
this.createdAt = league.createdAt;
this.settings = {
maxDrivers: league.maxDrivers,
};
this.socialLinks = league.socialLinks;
this.owner = owner;
this.scoringConfig = scoringConfig;
this.drivers = drivers;
this.memberships = memberships.memberships.map(m => ({
driverId: m.driverId,
role: m.role,
status: m.status,
joinedAt: m.joinedAt,
}));
this.allRaces = allRaces;
this.runningRaces = allRaces.filter(r => r.status === 'running');
this.averageSOF = leagueStats.averageSOF ?? null;
this.completedRacesCount = leagueStats.completedRaces ?? 0;
this.sponsors = sponsors;
// Calculate sponsor insights
const memberCount = this.memberships.length;
const mainSponsorTaken = this.sponsors.some(s => s.tier === 'main');
const secondaryTaken = this.sponsors.filter(s => s.tier === 'secondary').length;
this.sponsorInsights = {
avgViewsPerRace: 5400 + memberCount * 50,
totalImpressions: 45000 + memberCount * 500,
engagementRate: (3.5 + (memberCount / 50)).toFixed(1),
estimatedReach: memberCount * 150,
mainSponsorAvailable: !mainSponsorTaken,
secondarySlotsAvailable: Math.max(0, 2 - secondaryTaken),
mainSponsorPrice: 800 + Math.floor(memberCount * 10),
secondaryPrice: 250 + Math.floor(memberCount * 3),
tier: (this.averageSOF && this.averageSOF > 3000 ? 'premium' : this.averageSOF && this.averageSOF > 2000 ? 'standard' : 'starter') as 'premium' | 'standard' | 'starter',
trustScore: Math.min(100, 60 + memberCount + this.completedRacesCount),
discordMembers: memberCount * 3,
monthlyActivity: Math.min(100, 40 + this.completedRacesCount * 2),
};
// Build driver summaries
this.ownerSummary = this.buildDriverSummary(this.ownerId);
this.adminSummaries = this.memberships
.filter(m => m.role === 'admin')
.slice(0, 3)
.map(m => this.buildDriverSummary(m.driverId))
.filter((s): s is DriverSummary => s !== null);
this.stewardSummaries = this.memberships
.filter(m => m.role === 'steward')
.slice(0, 3)
.map(m => this.buildDriverSummary(m.driverId))
.filter((s): s is DriverSummary => s !== null);
}
private buildDriverSummary(driverId: string): DriverSummary | null {
const driver = this.drivers.find(d => d.id === driverId);
if (!driver) return null;
// TODO: Get driver stats and rankings from service
// For now, return basic info
return {
driver,
rating: null, // TODO: fetch from service
rank: null, // TODO: fetch from service
};
}
// UI helper methods
get isSponsorMode(): boolean {
// TODO: implement sponsor mode check
return false;
}
get currentUserMembership(): LeagueMembershipWithRole | null {
// TODO: get current user ID and find membership
return null;
}
get canEndRaces(): boolean {
return this.currentUserMembership?.role === 'admin' || this.currentUserMembership?.role === 'owner';
}
}

View File

@@ -0,0 +1,35 @@
export interface MainSponsorInfo {
name: string;
logoUrl: string;
websiteUrl: string;
}
export class LeagueDetailViewModel {
id: string;
name: string;
description: string;
ownerId: string;
ownerName: string;
mainSponsor: MainSponsorInfo | null;
isAdmin: boolean;
constructor(
id: string,
name: string,
description: string,
ownerId: string,
ownerName: string,
mainSponsor: MainSponsorInfo | null,
isAdmin: boolean
) {
this.id = id;
this.name = name;
this.description = description;
this.ownerId = ownerId;
this.ownerName = ownerName;
this.mainSponsor = mainSponsor;
this.isAdmin = isAdmin;
}
// UI-specific getters can be added here if needed
}

View File

@@ -0,0 +1,18 @@
import type { LeagueScoringPresetDTO } from '../types/LeagueScoringPresetDTO';
/**
* View Model for league scoring presets
* Transform from DTO to ViewModel with UI fields
*/
export class LeagueScoringPresetsViewModel {
presets: LeagueScoringPresetDTO[];
totalCount: number;
constructor(dto: {
presets: LeagueScoringPresetDTO[];
totalCount?: number;
}) {
this.presets = dto.presets;
this.totalCount = dto.totalCount ?? dto.presets.length;
}
}

View File

@@ -0,0 +1,39 @@
import type { LeagueConfigFormModel } from '../types/LeagueConfigFormModel';
import type { LeagueScoringPresetDTO } from '../types/LeagueScoringPresetDTO';
import type { DriverDTO } from '../types/DriverDTO';
import { LeagueScoringPresetsViewModel } from './LeagueScoringPresetsViewModel';
import { DriverSummaryViewModel } from './DriverSummaryViewModel';
/**
* View Model for league settings page
* Combines league config, presets, owner, and members
*/
export class LeagueSettingsViewModel {
league: {
id: string;
name: string;
ownerId: string;
};
config: LeagueConfigFormModel;
presets: LeagueScoringPresetDTO[];
owner: DriverSummaryViewModel | null;
members: DriverDTO[];
constructor(dto: {
league: {
id: string;
name: string;
ownerId: string;
};
config: LeagueConfigFormModel;
presets: LeagueScoringPresetDTO[];
owner: DriverSummaryViewModel | null;
members: DriverDTO[];
}) {
this.league = dto.league;
this.config = dto.config;
this.presets = dto.presets;
this.owner = dto.owner;
this.members = dto.members;
}
}

View File

@@ -7,29 +7,27 @@ import { ProtestDTO } from '../types/generated/ProtestDTO';
export class ProtestViewModel { export class ProtestViewModel {
id: string; id: string;
raceId: string; raceId: string;
complainantId: string; protestingDriverId: string;
defendantId: string; accusedDriverId: string;
description: string; description: string;
status: string; submittedAt: string;
createdAt: string;
constructor(dto: ProtestDTO) { constructor(dto: ProtestDTO) {
this.id = dto.id; this.id = dto.id;
this.raceId = dto.raceId; this.raceId = dto.raceId;
this.complainantId = dto.complainantId; this.protestingDriverId = dto.protestingDriverId;
this.defendantId = dto.defendantId; this.accusedDriverId = dto.accusedDriverId;
this.description = dto.description; this.description = dto.description;
this.status = dto.status; this.submittedAt = dto.submittedAt;
this.createdAt = dto.createdAt;
} }
/** UI-specific: Formatted created date */ /** UI-specific: Formatted submitted date */
get formattedCreatedAt(): string { get formattedSubmittedAt(): string {
return new Date(this.createdAt).toLocaleString(); return new Date(this.submittedAt).toLocaleString();
} }
/** UI-specific: Status display */ /** UI-specific: Status display - placeholder since status not in current DTO */
get statusDisplay(): string { get statusDisplay(): string {
return this.status.charAt(0).toUpperCase() + this.status.slice(1); return 'Pending'; // TODO: Update when status is added to DTO
} }
} }

View File

@@ -1,10 +1,10 @@
import { describe, it, expect } from 'vitest'; import { describe, expect, it } from 'vitest';
import { RaceDetailViewModel } from './RaceDetailViewModel';
import type { RaceDetailRaceDTO } from '../types/generated/RaceDetailRaceDTO';
import type { RaceDetailLeagueDTO } from '../types/generated/RaceDetailLeagueDTO'; import type { RaceDetailLeagueDTO } from '../types/generated/RaceDetailLeagueDTO';
import type { RaceDetailEntryDTO } from '../types/generated/RaceDetailEntryDTO'; import type { RaceDetailRaceDTO } from '../types/generated/RaceDetailRaceDTO';
import type { RaceDetailRegistrationDTO } from '../types/generated/RaceDetailRegistrationDTO'; import type { RaceDetailRegistrationDTO } from '../types/generated/RaceDetailRegistrationDTO';
import type { RaceDetailUserResultDTO } from '../types/generated/RaceDetailUserResultDTO'; import type { RaceDetailUserResultDTO } from '../types/generated/RaceDetailUserResultDTO';
import type { RaceDetailEntryDTO } from '../types/RaceDetailEntryDTO';
import { RaceDetailViewModel } from './RaceDetailViewModel';
describe('RaceDetailViewModel', () => { describe('RaceDetailViewModel', () => {
const createMockRace = (overrides?: Partial<RaceDetailRaceDTO>): RaceDetailRaceDTO => ({ const createMockRace = (overrides?: Partial<RaceDetailRaceDTO>): RaceDetailRaceDTO => ({

View File

@@ -1,8 +1,8 @@
import { RaceDetailRaceDTO } from '../types/generated/RaceDetailRaceDTO';
import { RaceDetailLeagueDTO } from '../types/generated/RaceDetailLeagueDTO'; import { RaceDetailLeagueDTO } from '../types/generated/RaceDetailLeagueDTO';
import { RaceDetailEntryDTO } from '../types/generated/RaceDetailEntryDTO'; import { RaceDetailRaceDTO } from '../types/generated/RaceDetailRaceDTO';
import { RaceDetailRegistrationDTO } from '../types/generated/RaceDetailRegistrationDTO'; import { RaceDetailRegistrationDTO } from '../types/generated/RaceDetailRegistrationDTO';
import { RaceDetailUserResultDTO } from '../types/generated/RaceDetailUserResultDTO'; import { RaceDetailUserResultDTO } from '../types/generated/RaceDetailUserResultDTO';
import { RaceDetailEntryDTO } from '../types/RaceDetailEntryDTO';
export class RaceDetailViewModel { export class RaceDetailViewModel {
race: RaceDetailRaceDTO | null; race: RaceDetailRaceDTO | null;