fix issues in core
This commit is contained in:
@@ -1,93 +0,0 @@
|
||||
export interface LeagueConfigFormModel {
|
||||
basics?: {
|
||||
name?: string;
|
||||
description?: string;
|
||||
visibility?: string;
|
||||
gameId?: string;
|
||||
};
|
||||
structure?: {
|
||||
mode?: string;
|
||||
maxDrivers?: number;
|
||||
};
|
||||
championships?: {
|
||||
enableDriverChampionship?: boolean;
|
||||
enableTeamChampionship?: boolean;
|
||||
enableNationsChampionship?: boolean;
|
||||
enableTrophyChampionship?: boolean;
|
||||
};
|
||||
scoring?: {
|
||||
patternId?: string;
|
||||
customScoringEnabled?: boolean;
|
||||
};
|
||||
dropPolicy?: {
|
||||
strategy?: string;
|
||||
n?: number;
|
||||
};
|
||||
timings?: {
|
||||
qualifyingMinutes?: number;
|
||||
mainRaceMinutes?: number;
|
||||
sessionCount?: number;
|
||||
roundsPlanned?: number;
|
||||
seasonStartDate?: string;
|
||||
raceStartTime?: string;
|
||||
timezoneId?: string;
|
||||
recurrenceStrategy?: string;
|
||||
weekdays?: string[];
|
||||
intervalWeeks?: number;
|
||||
monthlyOrdinal?: number;
|
||||
monthlyWeekday?: string;
|
||||
};
|
||||
stewarding?: {
|
||||
decisionMode?: string;
|
||||
requiredVotes?: number;
|
||||
requireDefense?: boolean;
|
||||
defenseTimeLimit?: number;
|
||||
voteTimeLimit?: number;
|
||||
protestDeadlineHours?: number;
|
||||
stewardingClosesHours?: number;
|
||||
notifyAccusedOnProtest?: boolean;
|
||||
notifyOnVoteRequired?: boolean;
|
||||
};
|
||||
}
|
||||
|
||||
export interface LeagueStructureFormDTO {
|
||||
name: string;
|
||||
description: string;
|
||||
ownerId: string;
|
||||
}
|
||||
|
||||
export interface LeagueChampionshipsFormDTO {
|
||||
pointsSystem: string;
|
||||
customPoints?: Record<number, number>;
|
||||
}
|
||||
|
||||
export interface LeagueScoringFormDTO {
|
||||
pointsSystem: string;
|
||||
customPoints?: Record<number, number>;
|
||||
}
|
||||
|
||||
export interface LeagueDropPolicyFormDTO {
|
||||
dropWeeks?: number;
|
||||
bestResults?: number;
|
||||
}
|
||||
|
||||
export interface LeagueStructureMode {
|
||||
mode: 'simple' | 'advanced';
|
||||
}
|
||||
|
||||
export interface LeagueTimingsFormDTO {
|
||||
sessionDuration?: number;
|
||||
qualifyingFormat?: string;
|
||||
}
|
||||
|
||||
export interface LeagueStewardingFormDTO {
|
||||
decisionMode: string;
|
||||
requiredVotes?: number;
|
||||
requireDefense?: boolean;
|
||||
defenseTimeLimit?: number;
|
||||
voteTimeLimit?: number;
|
||||
protestDeadlineHours?: number;
|
||||
stewardingClosesHours?: number;
|
||||
notifyAccusedOnProtest?: boolean;
|
||||
notifyOnVoteRequired?: boolean;
|
||||
}
|
||||
@@ -1,30 +0,0 @@
|
||||
export interface LeagueDTO {
|
||||
id: string;
|
||||
name: string;
|
||||
description: string;
|
||||
ownerId: string;
|
||||
settings: {
|
||||
pointsSystem: string;
|
||||
sessionDuration?: number;
|
||||
qualifyingFormat?: string;
|
||||
customPoints?: Record<number, number>;
|
||||
maxDrivers?: number;
|
||||
stewarding?: {
|
||||
decisionMode: string;
|
||||
requiredVotes?: number;
|
||||
requireDefense?: boolean;
|
||||
defenseTimeLimit?: number;
|
||||
voteTimeLimit?: number;
|
||||
protestDeadlineHours?: number;
|
||||
stewardingClosesHours?: number;
|
||||
notifyAccusedOnProtest?: boolean;
|
||||
notifyOnVoteRequired?: boolean;
|
||||
};
|
||||
};
|
||||
createdAt: Date;
|
||||
socialLinks?: {
|
||||
discordUrl?: string;
|
||||
youtubeUrl?: string;
|
||||
websiteUrl?: string;
|
||||
};
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
export interface LeagueDriverSeasonStatsDTO {
|
||||
driverId: string;
|
||||
leagueId: string;
|
||||
seasonId: string;
|
||||
totalPoints: number;
|
||||
averagePoints: number;
|
||||
bestFinish: number;
|
||||
podiums: number;
|
||||
races: number;
|
||||
wins: number;
|
||||
}
|
||||
@@ -1,83 +0,0 @@
|
||||
export interface LeagueScheduleDTO {
|
||||
leagueId: string;
|
||||
seasonId: string;
|
||||
races: Array<{
|
||||
id: string;
|
||||
name: string;
|
||||
scheduledTime: Date;
|
||||
trackId: string;
|
||||
status: string;
|
||||
}>;
|
||||
}
|
||||
|
||||
export interface LeagueSchedulePreviewDTO {
|
||||
leagueId: string;
|
||||
preview: Array<{
|
||||
id: string;
|
||||
name: string;
|
||||
scheduledTime: Date;
|
||||
trackId: string;
|
||||
}>;
|
||||
}
|
||||
|
||||
export type SeasonScheduleConfigDTO = {
|
||||
seasonStartDate: string;
|
||||
recurrenceStrategy: 'weekly' | 'everyNWeeks' | 'monthlyNthWeekday';
|
||||
weekdays?: string[];
|
||||
raceStartTime: string;
|
||||
timezoneId: string;
|
||||
plannedRounds: number;
|
||||
intervalWeeks?: number;
|
||||
monthlyOrdinal?: 1 | 2 | 3 | 4;
|
||||
monthlyWeekday?: string;
|
||||
};
|
||||
|
||||
import { SeasonSchedule } from '../../domain/value-objects/SeasonSchedule';
|
||||
import { RaceTimeOfDay } from '../../domain/value-objects/RaceTimeOfDay';
|
||||
import { LeagueTimezone } from '../../domain/value-objects/LeagueTimezone';
|
||||
import { RecurrenceStrategyFactory } from '../../domain/value-objects/RecurrenceStrategy';
|
||||
import { WeekdaySet } from '../../domain/value-objects/WeekdaySet';
|
||||
import { MonthlyRecurrencePattern } from '../../domain/value-objects/MonthlyRecurrencePattern';
|
||||
import { ALL_WEEKDAYS, type Weekday } from '../../domain/types/Weekday';
|
||||
|
||||
function toWeekdaySet(values: string[] | undefined): WeekdaySet {
|
||||
const weekdays = (values ?? []).filter((v): v is Weekday =>
|
||||
ALL_WEEKDAYS.includes(v as Weekday),
|
||||
);
|
||||
|
||||
return WeekdaySet.fromArray(weekdays.length > 0 ? weekdays : ['Mon']);
|
||||
}
|
||||
|
||||
export function scheduleDTOToSeasonSchedule(dto: SeasonScheduleConfigDTO): SeasonSchedule {
|
||||
const startDate = new Date(dto.seasonStartDate);
|
||||
const timeOfDay = RaceTimeOfDay.fromString(dto.raceStartTime);
|
||||
const timezone = LeagueTimezone.create(dto.timezoneId);
|
||||
|
||||
const recurrence = (() => {
|
||||
switch (dto.recurrenceStrategy) {
|
||||
case 'everyNWeeks':
|
||||
return RecurrenceStrategyFactory.everyNWeeks(
|
||||
dto.intervalWeeks ?? 2,
|
||||
toWeekdaySet(dto.weekdays),
|
||||
);
|
||||
case 'monthlyNthWeekday': {
|
||||
const pattern = MonthlyRecurrencePattern.create(
|
||||
dto.monthlyOrdinal ?? 1,
|
||||
((dto.monthlyWeekday ?? 'Mon') as Weekday),
|
||||
);
|
||||
return RecurrenceStrategyFactory.monthlyNthWeekday(pattern);
|
||||
}
|
||||
case 'weekly':
|
||||
default:
|
||||
return RecurrenceStrategyFactory.weekly(toWeekdaySet(dto.weekdays));
|
||||
}
|
||||
})();
|
||||
|
||||
return new SeasonSchedule({
|
||||
startDate,
|
||||
timeOfDay,
|
||||
timezone,
|
||||
recurrence,
|
||||
plannedRounds: dto.plannedRounds,
|
||||
});
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
export interface RaceDTO {
|
||||
id: string;
|
||||
leagueId: string;
|
||||
name: string;
|
||||
scheduledTime: Date;
|
||||
trackId: string;
|
||||
status: 'scheduled' | 'in_progress' | 'completed' | 'cancelled';
|
||||
results?: string[];
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
export interface ResultDTO {
|
||||
id: string;
|
||||
raceId: string;
|
||||
driverId: string;
|
||||
position: number;
|
||||
points: number;
|
||||
time?: string;
|
||||
incidents?: number;
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
export interface StandingDTO {
|
||||
id: string;
|
||||
leagueId: string;
|
||||
driverId: string;
|
||||
position: number;
|
||||
points: number;
|
||||
races: number;
|
||||
wins: number;
|
||||
podiums: number;
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
export * from './LeagueConfigFormDTO';
|
||||
export * from './LeagueDriverSeasonStatsDTO';
|
||||
export * from './LeagueDTO';
|
||||
export * from './LeagueScheduleDTO';
|
||||
export * from './RaceDTO';
|
||||
export * from './ResultDTO';
|
||||
export * from './StandingDTO';
|
||||
|
||||
// TODO DTOs dont belong into core. We use Results in UseCases and DTOs in apps/api.
|
||||
@@ -64,27 +64,3 @@ export type {
|
||||
TeamRole,
|
||||
TeamMembershipStatus,
|
||||
} from '../domain/types/TeamMembership';
|
||||
|
||||
export type { LeagueDTO } from './dto/LeagueDTO';
|
||||
export type { RaceDTO } from './dto/RaceDTO';
|
||||
export type { ResultDTO } from './dto/ResultDTO';
|
||||
export type { StandingDTO } from './dto/StandingDTO';
|
||||
export type { LeagueDriverSeasonStatsDTO } from './dto/LeagueDriverSeasonStatsDTO';
|
||||
export type {
|
||||
LeagueScheduleDTO,
|
||||
LeagueSchedulePreviewDTO,
|
||||
} from './dto/LeagueScheduleDTO';
|
||||
export type { ChampionshipStandingsOutputPort } from './ports/output/ChampionshipStandingsOutputPort';
|
||||
export type { ChampionshipStandingsRowOutputPort } from './ports/output/ChampionshipStandingsRowOutputPort';
|
||||
export type { AllRacesPageOutputPort } from './ports/output/AllRacesPageOutputPort';
|
||||
export type { DriverRegistrationStatusOutputPort } from './ports/output/DriverRegistrationStatusOutputPort';
|
||||
export type {
|
||||
LeagueConfigFormModel,
|
||||
LeagueStructureFormDTO,
|
||||
LeagueChampionshipsFormDTO,
|
||||
LeagueScoringFormDTO,
|
||||
LeagueDropPolicyFormDTO,
|
||||
LeagueStructureMode,
|
||||
LeagueTimingsFormDTO,
|
||||
LeagueStewardingFormDTO,
|
||||
} from './dto/LeagueConfigFormDTO';
|
||||
@@ -1,17 +0,0 @@
|
||||
export interface AllRacesPageOutputPort {
|
||||
races: Array<{
|
||||
id: string;
|
||||
name: string;
|
||||
leagueId: string;
|
||||
leagueName: string;
|
||||
scheduledTime: Date;
|
||||
trackId: string;
|
||||
status: string;
|
||||
participants: number;
|
||||
}>;
|
||||
total: number;
|
||||
page: number;
|
||||
limit: number;
|
||||
}
|
||||
|
||||
// TODO this code must be resolved into a Result within UseCase, thats not an OutputPort
|
||||
@@ -1,14 +0,0 @@
|
||||
export interface ChampionshipStandingsOutputPort {
|
||||
leagueId: string;
|
||||
seasonId: string;
|
||||
standings: Array<{
|
||||
driverId: string;
|
||||
position: number;
|
||||
points: number;
|
||||
driverName: string;
|
||||
teamId?: string;
|
||||
teamName?: string;
|
||||
}>;
|
||||
}
|
||||
|
||||
// TODO this code must be resolved into a Result within UseCase, thats not an OutputPort
|
||||
@@ -1,10 +0,0 @@
|
||||
export interface ChampionshipStandingsRowOutputPort {
|
||||
driverId: string;
|
||||
position: number;
|
||||
points: number;
|
||||
driverName: string;
|
||||
teamId?: string;
|
||||
teamName?: string;
|
||||
}
|
||||
|
||||
// TODO this code must be resolved into a Result within UseCase, thats not an OutputPort
|
||||
@@ -1,9 +0,0 @@
|
||||
export interface DriverRegistrationStatusOutputPort {
|
||||
driverId: string;
|
||||
raceId: string;
|
||||
leagueId: string;
|
||||
registered: boolean;
|
||||
status: 'registered' | 'withdrawn' | 'pending' | 'not_registered';
|
||||
}
|
||||
|
||||
// TODO this code must be resolved into a Result within UseCase, thats not an OutputPort
|
||||
@@ -1,407 +0,0 @@
|
||||
import { v4 as uuidv4 } from 'uuid';
|
||||
import { Season } from '../../domain/entities/season/Season';
|
||||
import type { ILeagueRepository } from '../../domain/repositories/ILeagueRepository';
|
||||
import type { ISeasonRepository } from '../../domain/repositories/ISeasonRepository';
|
||||
import type { Weekday } from '../../domain/types/Weekday';
|
||||
import { LeagueTimezone } from '../../domain/value-objects/LeagueTimezone';
|
||||
import { MonthlyRecurrencePattern } from '../../domain/value-objects/MonthlyRecurrencePattern';
|
||||
import { RaceTimeOfDay } from '../../domain/value-objects/RaceTimeOfDay';
|
||||
import { RecurrenceStrategyFactory } from '../../domain/value-objects/RecurrenceStrategy';
|
||||
import { SeasonDropPolicy, type SeasonDropStrategy } from '../../domain/value-objects/SeasonDropPolicy';
|
||||
import { SeasonSchedule } from '../../domain/value-objects/SeasonSchedule';
|
||||
import { SeasonScoringConfig } from '../../domain/value-objects/SeasonScoringConfig';
|
||||
import { SeasonStewardingConfig } from '../../domain/value-objects/SeasonStewardingConfig';
|
||||
import { WeekdaySet } from '../../domain/value-objects/WeekdaySet';
|
||||
import type { LeagueConfigFormModel } from '../dto/LeagueConfigFormDTO';
|
||||
import type { StewardingDecisionMode } from '../../domain/entities/League';
|
||||
|
||||
// TODO The whole file mixes a lot of concerns...should be resolved into use cases or is it obsolet?
|
||||
|
||||
export interface CreateSeasonForLeagueCommand {
|
||||
leagueId: string;
|
||||
name: string;
|
||||
gameId: string;
|
||||
sourceSeasonId?: string;
|
||||
config?: LeagueConfigFormModel;
|
||||
}
|
||||
|
||||
export interface CreateSeasonForLeagueResultDTO {
|
||||
seasonId: string;
|
||||
}
|
||||
|
||||
export interface SeasonSummaryDTO {
|
||||
seasonId: string;
|
||||
leagueId: string;
|
||||
name: string;
|
||||
status: 'planned' | 'active' | 'completed' | 'archived' | 'cancelled';
|
||||
startDate?: Date;
|
||||
endDate?: Date;
|
||||
isPrimary: boolean;
|
||||
}
|
||||
|
||||
export interface ListSeasonsForLeagueQuery {
|
||||
leagueId: string;
|
||||
}
|
||||
|
||||
export interface ListSeasonsForLeagueResultDTO {
|
||||
items: SeasonSummaryDTO[];
|
||||
}
|
||||
|
||||
export interface GetSeasonDetailsQuery {
|
||||
leagueId: string;
|
||||
seasonId: string;
|
||||
}
|
||||
|
||||
export interface SeasonDetailsDTO {
|
||||
seasonId: string;
|
||||
leagueId: string;
|
||||
gameId: string;
|
||||
name: string;
|
||||
status: 'planned' | 'active' | 'completed' | 'archived' | 'cancelled';
|
||||
startDate?: Date;
|
||||
endDate?: Date;
|
||||
maxDrivers?: number;
|
||||
schedule?: {
|
||||
startDate: Date;
|
||||
plannedRounds: number;
|
||||
};
|
||||
scoring?: {
|
||||
scoringPresetId: string;
|
||||
customScoringEnabled: boolean;
|
||||
};
|
||||
dropPolicy?: {
|
||||
strategy: string;
|
||||
n?: number;
|
||||
};
|
||||
stewarding?: {
|
||||
decisionMode: string;
|
||||
requiredVotes?: number;
|
||||
requireDefense: boolean;
|
||||
defenseTimeLimit: number;
|
||||
voteTimeLimit: number;
|
||||
protestDeadlineHours: number;
|
||||
stewardingClosesHours: number;
|
||||
notifyAccusedOnProtest: boolean;
|
||||
notifyOnVoteRequired: boolean;
|
||||
};
|
||||
}
|
||||
|
||||
export type SeasonLifecycleTransition = 'activate' | 'complete' | 'archive' | 'cancel';
|
||||
|
||||
export interface ManageSeasonLifecycleCommand {
|
||||
leagueId: string;
|
||||
seasonId: string;
|
||||
transition: SeasonLifecycleTransition;
|
||||
}
|
||||
|
||||
export interface ManageSeasonLifecycleResultDTO {
|
||||
seasonId: string;
|
||||
status: 'planned' | 'active' | 'completed' | 'archived' | 'cancelled';
|
||||
startDate?: Date;
|
||||
endDate?: Date;
|
||||
}
|
||||
|
||||
export class SeasonApplicationService {
|
||||
constructor(
|
||||
private readonly leagueRepository: ILeagueRepository,
|
||||
private readonly seasonRepository: ISeasonRepository,
|
||||
) {}
|
||||
|
||||
async createSeasonForLeague(command: CreateSeasonForLeagueCommand): Promise<CreateSeasonForLeagueResultDTO> {
|
||||
const league = await this.leagueRepository.findById(command.leagueId);
|
||||
if (!league) {
|
||||
throw new Error(`League not found: ${command.leagueId}`);
|
||||
}
|
||||
|
||||
let baseSeasonProps: {
|
||||
schedule?: SeasonSchedule;
|
||||
scoringConfig?: SeasonScoringConfig;
|
||||
dropPolicy?: SeasonDropPolicy;
|
||||
stewardingConfig?: SeasonStewardingConfig;
|
||||
maxDrivers?: number;
|
||||
} = {};
|
||||
|
||||
if (command.sourceSeasonId) {
|
||||
const source = await this.seasonRepository.findById(command.sourceSeasonId);
|
||||
if (!source) {
|
||||
throw new Error(`Source Season not found: ${command.sourceSeasonId}`);
|
||||
}
|
||||
baseSeasonProps = {
|
||||
...(source.schedule !== undefined ? { schedule: source.schedule } : {}),
|
||||
...(source.scoringConfig !== undefined ? { scoringConfig: source.scoringConfig } : {}),
|
||||
...(source.dropPolicy !== undefined ? { dropPolicy: source.dropPolicy } : {}),
|
||||
...(source.stewardingConfig !== undefined ? { stewardingConfig: source.stewardingConfig } : {}),
|
||||
...(source.maxDrivers !== undefined ? { maxDrivers: source.maxDrivers } : {}),
|
||||
};
|
||||
} else if (command.config) {
|
||||
baseSeasonProps = this.deriveSeasonPropsFromConfig(command.config);
|
||||
}
|
||||
|
||||
const seasonId = uuidv4();
|
||||
|
||||
const season = Season.create({
|
||||
id: seasonId,
|
||||
leagueId: league.id.toString(),
|
||||
gameId: command.gameId,
|
||||
name: command.name,
|
||||
year: new Date().getFullYear(),
|
||||
status: 'planned',
|
||||
...(baseSeasonProps?.schedule ? { schedule: baseSeasonProps.schedule } : {}),
|
||||
...(baseSeasonProps?.scoringConfig ? { scoringConfig: baseSeasonProps.scoringConfig } : {}),
|
||||
...(baseSeasonProps?.dropPolicy ? { dropPolicy: baseSeasonProps.dropPolicy } : {}),
|
||||
...(baseSeasonProps?.stewardingConfig ? { stewardingConfig: baseSeasonProps.stewardingConfig } : {}),
|
||||
...(baseSeasonProps?.maxDrivers !== undefined ? { maxDrivers: baseSeasonProps.maxDrivers } : {}),
|
||||
});
|
||||
|
||||
await this.seasonRepository.add(season);
|
||||
|
||||
return { seasonId };
|
||||
}
|
||||
|
||||
async listSeasonsForLeague(query: ListSeasonsForLeagueQuery): Promise<ListSeasonsForLeagueResultDTO> {
|
||||
const league = await this.leagueRepository.findById(query.leagueId);
|
||||
if (!league) {
|
||||
throw new Error(`League not found: ${query.leagueId}`);
|
||||
}
|
||||
|
||||
const seasons = await this.seasonRepository.listByLeague(league.id.toString());
|
||||
const items: SeasonSummaryDTO[] = seasons.map((s) => ({
|
||||
seasonId: s.id,
|
||||
leagueId: s.leagueId,
|
||||
name: s.name,
|
||||
status: s.status,
|
||||
...(s.startDate !== undefined ? { startDate: s.startDate } : {}),
|
||||
...(s.endDate !== undefined ? { endDate: s.endDate } : {}),
|
||||
isPrimary: false,
|
||||
}));
|
||||
|
||||
return { items };
|
||||
}
|
||||
|
||||
async getSeasonDetails(query: GetSeasonDetailsQuery): Promise<SeasonDetailsDTO> {
|
||||
const league = await this.leagueRepository.findById(query.leagueId);
|
||||
if (!league) {
|
||||
throw new Error(`League not found: ${query.leagueId}`);
|
||||
}
|
||||
|
||||
const season = await this.seasonRepository.findById(query.seasonId);
|
||||
if (!season || season.leagueId !== league.id.toString()) {
|
||||
throw new Error(`Season ${query.seasonId} does not belong to league ${league.id}`);
|
||||
}
|
||||
|
||||
return {
|
||||
seasonId: season.id,
|
||||
leagueId: season.leagueId,
|
||||
gameId: season.gameId,
|
||||
name: season.name,
|
||||
status: season.status,
|
||||
...(season.startDate !== undefined ? { startDate: season.startDate } : {}),
|
||||
...(season.endDate !== undefined ? { endDate: season.endDate } : {}),
|
||||
...(season.maxDrivers !== undefined ? { maxDrivers: season.maxDrivers } : {}),
|
||||
...(season.schedule
|
||||
? {
|
||||
schedule: {
|
||||
startDate: season.schedule.startDate,
|
||||
plannedRounds: season.schedule.plannedRounds,
|
||||
},
|
||||
}
|
||||
: {}),
|
||||
...(season.scoringConfig
|
||||
? {
|
||||
scoring: {
|
||||
scoringPresetId: season.scoringConfig.scoringPresetId,
|
||||
customScoringEnabled: season.scoringConfig.customScoringEnabled ?? false,
|
||||
},
|
||||
}
|
||||
: {}),
|
||||
...(season.dropPolicy
|
||||
? {
|
||||
dropPolicy: {
|
||||
strategy: season.dropPolicy.strategy,
|
||||
...(season.dropPolicy.n !== undefined ? { n: season.dropPolicy.n } : {}),
|
||||
},
|
||||
}
|
||||
: {}),
|
||||
...(season.stewardingConfig
|
||||
? {
|
||||
stewarding: {
|
||||
decisionMode: season.stewardingConfig.decisionMode,
|
||||
...(season.stewardingConfig.requiredVotes !== undefined
|
||||
? { requiredVotes: season.stewardingConfig.requiredVotes }
|
||||
: {}),
|
||||
requireDefense: season.stewardingConfig.requireDefense,
|
||||
defenseTimeLimit: season.stewardingConfig.defenseTimeLimit,
|
||||
voteTimeLimit: season.stewardingConfig.voteTimeLimit,
|
||||
protestDeadlineHours: season.stewardingConfig.protestDeadlineHours,
|
||||
stewardingClosesHours: season.stewardingConfig.stewardingClosesHours,
|
||||
notifyAccusedOnProtest: season.stewardingConfig.notifyAccusedOnProtest,
|
||||
notifyOnVoteRequired: season.stewardingConfig.notifyOnVoteRequired,
|
||||
},
|
||||
}
|
||||
: {}),
|
||||
};
|
||||
}
|
||||
|
||||
async manageSeasonLifecycle(command: ManageSeasonLifecycleCommand): Promise<ManageSeasonLifecycleResultDTO> {
|
||||
const league = await this.leagueRepository.findById(command.leagueId);
|
||||
if (!league) {
|
||||
throw new Error(`League not found: ${command.leagueId}`);
|
||||
}
|
||||
|
||||
const season = await this.seasonRepository.findById(command.seasonId);
|
||||
if (!season || season.leagueId !== league.id.toString()) {
|
||||
throw new Error(`Season ${command.seasonId} does not belong to league ${league.id}`);
|
||||
}
|
||||
|
||||
let updated: Season;
|
||||
switch (command.transition) {
|
||||
case 'activate':
|
||||
updated = season.activate();
|
||||
break;
|
||||
case 'complete':
|
||||
updated = season.complete();
|
||||
break;
|
||||
case 'archive':
|
||||
updated = season.archive();
|
||||
break;
|
||||
case 'cancel':
|
||||
updated = season.cancel();
|
||||
break;
|
||||
default:
|
||||
throw new Error('Unsupported Season lifecycle transition');
|
||||
}
|
||||
|
||||
await this.seasonRepository.update(updated);
|
||||
|
||||
return {
|
||||
seasonId: updated.id,
|
||||
status: updated.status,
|
||||
...(updated.startDate !== undefined ? { startDate: updated.startDate } : {}),
|
||||
...(updated.endDate !== undefined ? { endDate: updated.endDate } : {}),
|
||||
};
|
||||
}
|
||||
|
||||
private parseDropStrategy(value: unknown): SeasonDropStrategy {
|
||||
if (value === 'none' || value === 'bestNResults' || value === 'dropWorstN') {
|
||||
return value;
|
||||
}
|
||||
return 'none';
|
||||
}
|
||||
|
||||
private parseDecisionMode(value: unknown): StewardingDecisionMode {
|
||||
if (
|
||||
value === 'admin_only' ||
|
||||
value === 'steward_decides' ||
|
||||
value === 'steward_vote' ||
|
||||
value === 'member_vote' ||
|
||||
value === 'steward_veto' ||
|
||||
value === 'member_veto'
|
||||
) {
|
||||
return value;
|
||||
}
|
||||
return 'admin_only';
|
||||
}
|
||||
|
||||
private deriveSeasonPropsFromConfig(config: LeagueConfigFormModel): {
|
||||
schedule?: SeasonSchedule;
|
||||
scoringConfig?: SeasonScoringConfig;
|
||||
dropPolicy?: SeasonDropPolicy;
|
||||
stewardingConfig?: SeasonStewardingConfig;
|
||||
maxDrivers?: number;
|
||||
} {
|
||||
const schedule = this.buildScheduleFromTimings(config);
|
||||
|
||||
const scoringConfig = config.scoring
|
||||
? new SeasonScoringConfig({
|
||||
scoringPresetId: config.scoring.patternId ?? 'custom',
|
||||
customScoringEnabled: config.scoring.customScoringEnabled ?? false,
|
||||
})
|
||||
: undefined;
|
||||
|
||||
const dropPolicy = config.dropPolicy
|
||||
? new SeasonDropPolicy({
|
||||
strategy: this.parseDropStrategy(config.dropPolicy.strategy),
|
||||
...(config.dropPolicy.n !== undefined ? { n: config.dropPolicy.n } : {}),
|
||||
})
|
||||
: undefined;
|
||||
|
||||
const stewardingConfig = config.stewarding
|
||||
? new SeasonStewardingConfig({
|
||||
decisionMode: this.parseDecisionMode(config.stewarding.decisionMode),
|
||||
...(config.stewarding.requiredVotes !== undefined
|
||||
? { requiredVotes: config.stewarding.requiredVotes }
|
||||
: {}),
|
||||
requireDefense: config.stewarding.requireDefense ?? false,
|
||||
defenseTimeLimit: config.stewarding.defenseTimeLimit ?? 48,
|
||||
voteTimeLimit: config.stewarding.voteTimeLimit ?? 72,
|
||||
protestDeadlineHours: config.stewarding.protestDeadlineHours ?? 48,
|
||||
stewardingClosesHours: config.stewarding.stewardingClosesHours ?? 168,
|
||||
notifyAccusedOnProtest: config.stewarding.notifyAccusedOnProtest ?? true,
|
||||
notifyOnVoteRequired: config.stewarding.notifyOnVoteRequired ?? true,
|
||||
})
|
||||
: undefined;
|
||||
|
||||
const structure = config.structure ?? {};
|
||||
const maxDrivers =
|
||||
typeof structure.maxDrivers === 'number' && structure.maxDrivers > 0
|
||||
? structure.maxDrivers
|
||||
: undefined;
|
||||
|
||||
return {
|
||||
...(schedule !== undefined ? { schedule } : {}),
|
||||
...(scoringConfig !== undefined ? { scoringConfig } : {}),
|
||||
...(dropPolicy !== undefined ? { dropPolicy } : {}),
|
||||
...(stewardingConfig !== undefined ? { stewardingConfig } : {}),
|
||||
...(maxDrivers !== undefined ? { maxDrivers } : {}),
|
||||
};
|
||||
}
|
||||
|
||||
private buildScheduleFromTimings(config: LeagueConfigFormModel): SeasonSchedule | undefined {
|
||||
const { timings } = config;
|
||||
if (!timings || !timings.seasonStartDate || !timings.raceStartTime) {
|
||||
return undefined;
|
||||
}
|
||||
|
||||
const startDate = new Date(timings.seasonStartDate);
|
||||
const timeOfDay = RaceTimeOfDay.fromString(timings.raceStartTime);
|
||||
const timezoneId = timings.timezoneId ?? 'UTC';
|
||||
const timezone = LeagueTimezone.create(timezoneId);
|
||||
|
||||
const plannedRounds =
|
||||
typeof timings.roundsPlanned === 'number' && timings.roundsPlanned > 0
|
||||
? timings.roundsPlanned
|
||||
: timings.sessionCount ?? 0;
|
||||
|
||||
const recurrence = (() => {
|
||||
const weekdays: WeekdaySet =
|
||||
timings.weekdays && timings.weekdays.length > 0
|
||||
? WeekdaySet.fromArray(timings.weekdays as unknown as Weekday[])
|
||||
: WeekdaySet.fromArray(['Mon']);
|
||||
switch (timings.recurrenceStrategy) {
|
||||
case 'everyNWeeks':
|
||||
return RecurrenceStrategyFactory.everyNWeeks(
|
||||
timings.intervalWeeks ?? 2,
|
||||
weekdays,
|
||||
);
|
||||
case 'monthlyNthWeekday': {
|
||||
const pattern = MonthlyRecurrencePattern.create(
|
||||
(timings.monthlyOrdinal ?? 1) as 1 | 2 | 3 | 4,
|
||||
(timings.monthlyWeekday ?? 'Mon') as Weekday,
|
||||
);
|
||||
return RecurrenceStrategyFactory.monthlyNthWeekday(pattern);
|
||||
}
|
||||
case 'weekly':
|
||||
default:
|
||||
return RecurrenceStrategyFactory.weekly(weekdays);
|
||||
}
|
||||
})();
|
||||
|
||||
return new SeasonSchedule({
|
||||
startDate,
|
||||
timeOfDay,
|
||||
timezone,
|
||||
recurrence,
|
||||
plannedRounds,
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -7,8 +7,8 @@ import {
|
||||
CreateSeasonForLeagueUseCase,
|
||||
type CreateSeasonForLeagueInput,
|
||||
type CreateSeasonForLeagueResult,
|
||||
type LeagueConfigFormModel,
|
||||
} from '@core/racing/application/use-cases/CreateSeasonForLeagueUseCase';
|
||||
import type { LeagueConfigFormModel } from '@core/racing/application/dto/LeagueConfigFormDTO';
|
||||
import type { UseCaseOutputPort } from '@core/shared/application';
|
||||
import type { ApplicationErrorCode } from '@core/shared/errors/ApplicationErrorCode';
|
||||
import { Result } from '@core/shared/application/Result';
|
||||
|
||||
@@ -2,7 +2,6 @@ import { Season } from '../../domain/entities/season/Season';
|
||||
import { League } from '../../domain/entities/League';
|
||||
import type { ISeasonRepository } from '../../domain/repositories/ISeasonRepository';
|
||||
import type { ILeagueRepository } from '../../domain/repositories/ILeagueRepository';
|
||||
import type { LeagueConfigFormModel } from '@core/racing/application/dto/LeagueConfigFormDTO';
|
||||
import { SeasonSchedule } from '../../domain/value-objects/SeasonSchedule';
|
||||
import { SeasonScoringConfig } from '../../domain/value-objects/SeasonScoringConfig';
|
||||
import { SeasonDropPolicy, type SeasonDropStrategy } from '../../domain/value-objects/SeasonDropPolicy';
|
||||
@@ -19,6 +18,58 @@ import type { UseCaseOutputPort } from '@core/shared/application';
|
||||
import { Result } from '@core/shared/application/Result';
|
||||
import type { ApplicationErrorCode } from '@core/shared/errors/ApplicationErrorCode';
|
||||
|
||||
export type LeagueConfigFormModel = {
|
||||
basics?: {
|
||||
name?: string;
|
||||
description?: string;
|
||||
visibility?: string;
|
||||
gameId?: string;
|
||||
};
|
||||
structure?: {
|
||||
mode?: string;
|
||||
maxDrivers?: number;
|
||||
};
|
||||
championships?: {
|
||||
enableDriverChampionship?: boolean;
|
||||
enableTeamChampionship?: boolean;
|
||||
enableNationsChampionship?: boolean;
|
||||
enableTrophyChampionship?: boolean;
|
||||
};
|
||||
scoring?: {
|
||||
patternId?: string;
|
||||
customScoringEnabled?: boolean;
|
||||
};
|
||||
dropPolicy?: {
|
||||
strategy?: string;
|
||||
n?: number;
|
||||
};
|
||||
timings?: {
|
||||
qualifyingMinutes?: number;
|
||||
mainRaceMinutes?: number;
|
||||
sessionCount?: number;
|
||||
roundsPlanned?: number;
|
||||
seasonStartDate?: string;
|
||||
raceStartTime?: string;
|
||||
timezoneId?: string;
|
||||
recurrenceStrategy?: string;
|
||||
weekdays?: string[];
|
||||
intervalWeeks?: number;
|
||||
monthlyOrdinal?: number;
|
||||
monthlyWeekday?: string;
|
||||
};
|
||||
stewarding?: {
|
||||
decisionMode?: string;
|
||||
requiredVotes?: number;
|
||||
requireDefense?: boolean;
|
||||
defenseTimeLimit?: number;
|
||||
voteTimeLimit?: number;
|
||||
protestDeadlineHours?: number;
|
||||
stewardingClosesHours?: number;
|
||||
notifyAccusedOnProtest?: boolean;
|
||||
notifyOnVoteRequired?: boolean;
|
||||
};
|
||||
};
|
||||
|
||||
export type CreateSeasonForLeagueInput = {
|
||||
leagueId: string;
|
||||
name: string;
|
||||
|
||||
@@ -71,10 +71,8 @@ export class GetDriversLeaderboardUseCase implements UseCase<GetDriversLeaderboa
|
||||
avatarUrls[driver.id] = await this.getDriverAvatar(driver.id);
|
||||
}
|
||||
|
||||
// TODO maps way too much data, should just create Domain Objects
|
||||
|
||||
const items: DriverLeaderboardItem[] = drivers.map(driver => {
|
||||
const ranking = rankings.find(r => r.driverId === driver.id);
|
||||
const items: DriverLeaderboardItem[] = drivers.map((driver) => {
|
||||
const ranking = rankings.find((r) => r.driverId === driver.id);
|
||||
const stats = this.driverStatsService.getDriverStats(driver.id);
|
||||
const rating = ranking?.rating ?? 0;
|
||||
const racesCompleted = stats?.totalRaces ?? 0;
|
||||
|
||||
@@ -1,15 +1,71 @@
|
||||
import { SeasonScheduleGenerator } from '../../domain/services/SeasonScheduleGenerator';
|
||||
import {
|
||||
scheduleDTOToSeasonSchedule,
|
||||
type SeasonScheduleConfigDTO,
|
||||
} from '../dto/LeagueScheduleDTO';
|
||||
import { Result } from '@core/shared/application/Result';
|
||||
import type { ApplicationErrorCode } from '@core/shared/errors/ApplicationErrorCode';
|
||||
import type { Logger } from '@core/shared/application';
|
||||
import type { SeasonSchedule } from '../../domain/value-objects/SeasonSchedule';
|
||||
import { SeasonSchedule } from '../../domain/value-objects/SeasonSchedule';
|
||||
import { RaceTimeOfDay } from '../../domain/value-objects/RaceTimeOfDay';
|
||||
import { LeagueTimezone } from '../../domain/value-objects/LeagueTimezone';
|
||||
import { RecurrenceStrategyFactory } from '../../domain/value-objects/RecurrenceStrategy';
|
||||
import { WeekdaySet } from '../../domain/value-objects/WeekdaySet';
|
||||
import { MonthlyRecurrencePattern } from '../../domain/value-objects/MonthlyRecurrencePattern';
|
||||
import { ALL_WEEKDAYS, type Weekday } from '../../domain/types/Weekday';
|
||||
import type { UseCaseOutputPort } from '@core/shared/application/UseCaseOutputPort';
|
||||
|
||||
export type PreviewLeagueScheduleSeasonConfig = SeasonScheduleConfigDTO;
|
||||
export type SeasonScheduleConfig = {
|
||||
seasonStartDate: string;
|
||||
recurrenceStrategy: 'weekly' | 'everyNWeeks' | 'monthlyNthWeekday';
|
||||
weekdays?: string[];
|
||||
raceStartTime: string;
|
||||
timezoneId: string;
|
||||
plannedRounds: number;
|
||||
intervalWeeks?: number;
|
||||
monthlyOrdinal?: 1 | 2 | 3 | 4;
|
||||
monthlyWeekday?: string;
|
||||
};
|
||||
|
||||
function toWeekdaySet(values: string[] | undefined): WeekdaySet {
|
||||
const weekdays = (values ?? []).filter((v): v is Weekday =>
|
||||
ALL_WEEKDAYS.includes(v as Weekday),
|
||||
);
|
||||
|
||||
return WeekdaySet.fromArray(weekdays.length > 0 ? weekdays : ['Mon']);
|
||||
}
|
||||
|
||||
function scheduleConfigToSeasonSchedule(dto: SeasonScheduleConfig): SeasonSchedule {
|
||||
const startDate = new Date(dto.seasonStartDate);
|
||||
const timeOfDay = RaceTimeOfDay.fromString(dto.raceStartTime);
|
||||
const timezone = LeagueTimezone.create(dto.timezoneId);
|
||||
|
||||
const recurrence = (() => {
|
||||
switch (dto.recurrenceStrategy) {
|
||||
case 'everyNWeeks':
|
||||
return RecurrenceStrategyFactory.everyNWeeks(
|
||||
dto.intervalWeeks ?? 2,
|
||||
toWeekdaySet(dto.weekdays),
|
||||
);
|
||||
case 'monthlyNthWeekday': {
|
||||
const pattern = MonthlyRecurrencePattern.create(
|
||||
dto.monthlyOrdinal ?? 1,
|
||||
((dto.monthlyWeekday ?? 'Mon') as Weekday),
|
||||
);
|
||||
return RecurrenceStrategyFactory.monthlyNthWeekday(pattern);
|
||||
}
|
||||
case 'weekly':
|
||||
default:
|
||||
return RecurrenceStrategyFactory.weekly(toWeekdaySet(dto.weekdays));
|
||||
}
|
||||
})();
|
||||
|
||||
return new SeasonSchedule({
|
||||
startDate,
|
||||
timeOfDay,
|
||||
timezone,
|
||||
recurrence,
|
||||
plannedRounds: dto.plannedRounds,
|
||||
});
|
||||
}
|
||||
|
||||
export type PreviewLeagueScheduleSeasonConfig = SeasonScheduleConfig;
|
||||
|
||||
export type PreviewLeagueScheduleInput = {
|
||||
schedule: PreviewLeagueScheduleSeasonConfig;
|
||||
@@ -54,7 +110,7 @@ export class PreviewLeagueScheduleUseCase {
|
||||
try {
|
||||
let seasonSchedule: SeasonSchedule;
|
||||
try {
|
||||
seasonSchedule = scheduleDTOToSeasonSchedule(params.schedule);
|
||||
seasonSchedule = scheduleConfigToSeasonSchedule(params.schedule);
|
||||
} catch (error) {
|
||||
this.logger.warn('Invalid schedule data provided', {
|
||||
schedule: params.schedule,
|
||||
|
||||
@@ -19,8 +19,8 @@ import {
|
||||
type ListSeasonsForLeagueErrorCode,
|
||||
type GetSeasonDetailsErrorCode,
|
||||
type ManageSeasonLifecycleErrorCode,
|
||||
type LeagueConfigFormModel,
|
||||
} from '@core/racing/application/use-cases/SeasonUseCases';
|
||||
import type { LeagueConfigFormModel } from '@core/racing/application/dto/LeagueConfigFormDTO';
|
||||
import type { UseCaseOutputPort } from '@core/shared/application/UseCaseOutputPort';
|
||||
import type { ApplicationErrorCode } from '@core/shared/errors/ApplicationErrorCode';
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
import { Season } from '../../domain/entities/season/Season';
|
||||
import type { ISeasonRepository } from '../../domain/repositories/ISeasonRepository';
|
||||
import type { ILeagueRepository } from '../../domain/repositories/ILeagueRepository';
|
||||
import type { LeagueConfigFormModel } from '../dto/LeagueConfigFormDTO';
|
||||
import { SeasonSchedule } from '../../domain/value-objects/SeasonSchedule';
|
||||
import { SeasonScoringConfig } from '../../domain/value-objects/SeasonScoringConfig';
|
||||
import { SeasonDropPolicy } from '../../domain/value-objects/SeasonDropPolicy';
|
||||
@@ -21,6 +20,58 @@ import type { UseCaseOutputPort } from '@core/shared/application/UseCaseOutputPo
|
||||
* Input, result and error models shared across Season-focused use cases.
|
||||
*/
|
||||
|
||||
export type LeagueConfigFormModel = {
|
||||
basics?: {
|
||||
name?: string;
|
||||
description?: string;
|
||||
visibility?: string;
|
||||
gameId?: string;
|
||||
};
|
||||
structure?: {
|
||||
mode?: string;
|
||||
maxDrivers?: number;
|
||||
};
|
||||
championships?: {
|
||||
enableDriverChampionship?: boolean;
|
||||
enableTeamChampionship?: boolean;
|
||||
enableNationsChampionship?: boolean;
|
||||
enableTrophyChampionship?: boolean;
|
||||
};
|
||||
scoring?: {
|
||||
patternId?: string;
|
||||
customScoringEnabled?: boolean;
|
||||
};
|
||||
dropPolicy?: {
|
||||
strategy?: string;
|
||||
n?: number;
|
||||
};
|
||||
timings?: {
|
||||
qualifyingMinutes?: number;
|
||||
mainRaceMinutes?: number;
|
||||
sessionCount?: number;
|
||||
roundsPlanned?: number;
|
||||
seasonStartDate?: string;
|
||||
raceStartTime?: string;
|
||||
timezoneId?: string;
|
||||
recurrenceStrategy?: string;
|
||||
weekdays?: string[];
|
||||
intervalWeeks?: number;
|
||||
monthlyOrdinal?: number;
|
||||
monthlyWeekday?: string;
|
||||
};
|
||||
stewarding?: {
|
||||
decisionMode?: string;
|
||||
requiredVotes?: number;
|
||||
requireDefense?: boolean;
|
||||
defenseTimeLimit?: number;
|
||||
voteTimeLimit?: number;
|
||||
protestDeadlineHours?: number;
|
||||
stewardingClosesHours?: number;
|
||||
notifyAccusedOnProtest?: boolean;
|
||||
notifyOnVoteRequired?: boolean;
|
||||
};
|
||||
};
|
||||
|
||||
export interface CreateSeasonForLeagueInput {
|
||||
leagueId: string;
|
||||
name: string;
|
||||
|
||||
Reference in New Issue
Block a user