mmintel/gridpilot.gg
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Compare commits

base: mmintel:e22033be38b8043ba6016208f789650a6246f52d
Branches Tags
mmintel:main mmintel:refactor/code-quality mmintel:tests/viewdata mmintel:tests/core-2 mmintel:setup/ci mmintel:tests/core mmintel:tests/contracts
...
compare: mmintel:046852703fe5b6a5c14f31fe4e7a0b47e307a9ed
Branches Tags
mmintel:refactor/code-quality mmintel:main mmintel:tests/viewdata mmintel:tests/core-2 mmintel:setup/ci mmintel:tests/core mmintel:tests/contracts

8 Commits
e22033be38 ... 046852703f

Author SHA1 Message Date
Marc Mintel
046852703f view data fixes
Some checks failed
Contract Testing / contract-tests (pull_request) Failing after 5m51s
Details
Contract Testing / contract-snapshot (pull_request) Has been skipped
Details
2026-01-24 12:14:08 +01:00
Marc Mintel
dde77e717a do to formatters 2026-01-24 01:25:46 +01:00
Marc Mintel
705f9685b5 do to formatters 2026-01-24 01:22:43 +01:00
Marc Mintel
891b3cf0ee do to formatters 2026-01-24 01:07:43 +01:00
Marc Mintel
ae59df61eb view data fixes 2026-01-24 00:52:27 +01:00
Marc Mintel
62e8b768ce integration tests 2026-01-24 00:19:26 +01:00
Marc Mintel
c470505b4f integration tests 2026-01-24 00:18:44 +01:00
Marc Mintel
f8099f04bc view data fixes 2026-01-23 15:30:23 +01:00
762 changed files with 6698 additions and 11763 deletions
Expand all files Collapse all files

7
.eslintrc.json
View File

@@ -250,7 +250,8 @@
"plugins": [
"@typescript-eslint",
"boundaries",
"import"
"import",
"gridpilot-rules"
],
"rules": {
"@typescript-eslint/no-explicit-any": "error",
@@ -310,7 +311,9 @@
"message": "Interface names should not start with 'I'. Use descriptive names without the 'I' prefix (e.g., 'LiverCompositor' instead of 'ILiveryCompositor').",
"selector": "TSInterfaceDeclaration[id.name=/^I[A-Z]/]"
}
]
],
// GridPilot ESLint Rules
"gridpilot-rules/view-model-taxonomy": "error"
}
},
{

108
apps/api/openapi.json
View File

@@ -2216,6 +2216,41 @@
"incidents"
]
},
"DashboardStatsResponseDTO": {
"type": "object",
"properties": {
"totalUsers": {
"type": "number"
},
"activeUsers": {
"type": "number"
},
"suspendedUsers": {
"type": "number"
},
"deletedUsers": {
"type": "number"
},
"systemAdmins": {
"type": "number"
},
"recentLogins": {
"type": "number"
},
"newUsersToday": {
"type": "number"
}
},
"required": [
"totalUsers",
"activeUsers",
"suspendedUsers",
"deletedUsers",
"systemAdmins",
"recentLogins",
"newUsersToday"
]
},
"DeleteMediaOutputDTO": {
"type": "object",
"properties": {
@@ -4235,6 +4270,9 @@
"LeagueScheduleDTO": {
"type": "object",
"properties": {
"leagueId": {
"type": "string"
},
"seasonId": {
"type": "string"
},
@@ -4473,6 +4511,16 @@
},
"isParallelActive": {
"type": "boolean"
},
"totalRaces": {
"type": "number"
},
"completedRaces": {
"type": "number"
},
"nextRaceAt": {
"type": "string",
"format": "date-time"
}
},
"required": [
@@ -4480,7 +4528,9 @@
"name",
"status",
"isPrimary",
"isParallelActive"
"isParallelActive",
"totalRaces",
"completedRaces"
]
},
"LeagueSettingsDTO": {
@@ -4515,6 +4565,18 @@
},
"races": {
"type": "number"
},
"positionChange": {
"type": "number"
},
"lastRacePoints": {
"type": "number"
},
"droppedRaceIds": {
"type": "array",
"items": {
"type": "string"
}
}
},
"required": [
@@ -4524,7 +4586,10 @@
"position",
"wins",
"podiums",
"races"
"races",
"positionChange",
"lastRacePoints",
"droppedRaceIds"
]
},
"LeagueStandingsDTO": {
@@ -4658,6 +4723,15 @@
"logoUrl": {
"type": "string",
"nullable": true
},
"pendingJoinRequestsCount": {
"type": "number"
},
"pendingProtestsCount": {
"type": "number"
},
"walletBalance": {
"type": "number"
}
},
"required": [
@@ -5449,8 +5523,34 @@
"type": "string"
},
"leagueName": {
"type": "string",
"nullable": true
"type": "string"
},
"track": {
"type": "string"
},
"car": {
"type": "string"
},
"sessionType": {
"type": "string"
},
"leagueId": {
"type": "string"
},
"strengthOfField": {
"type": "number"
},
"isUpcoming": {
"type": "boolean"
},
"isLive": {
"type": "boolean"
},
"isPast": {
"type": "boolean"
},
"status": {
"type": "string"
}
},
"required": [

80
apps/api/src/domain/admin/dto/DashboardStatsResponseDto.ts
View File

@@ -1,80 +0,0 @@
import { ApiProperty } from '@nestjs/swagger';
class UserGrowthDto {
@ApiProperty({ description: 'Label for the time period' })
label!: string;
@ApiProperty({ description: 'Number of new users' })
value!: number;
@ApiProperty({ description: 'Color class for the bar' })
color!: string;
}
class RoleDistributionDto {
@ApiProperty({ description: 'Role name' })
label!: string;
@ApiProperty({ description: 'Number of users with this role' })
value!: number;
@ApiProperty({ description: 'Color class for the bar' })
color!: string;
}
class StatusDistributionDto {
@ApiProperty({ description: 'Number of active users' })
active!: number;
@ApiProperty({ description: 'Number of suspended users' })
suspended!: number;
@ApiProperty({ description: 'Number of deleted users' })
deleted!: number;
}
class ActivityTimelineDto {
@ApiProperty({ description: 'Date label' })
date!: string;
@ApiProperty({ description: 'Number of new users' })
newUsers!: number;
@ApiProperty({ description: 'Number of logins' })
logins!: number;
}
export class DashboardStatsResponseDto {
@ApiProperty({ description: 'Total number of users' })
totalUsers!: number;
@ApiProperty({ description: 'Number of active users' })
activeUsers!: number;
@ApiProperty({ description: 'Number of suspended users' })
suspendedUsers!: number;
@ApiProperty({ description: 'Number of deleted users' })
deletedUsers!: number;
@ApiProperty({ description: 'Number of system admins' })
systemAdmins!: number;
@ApiProperty({ description: 'Number of recent logins (last 24h)' })
recentLogins!: number;
@ApiProperty({ description: 'Number of new users today' })
newUsersToday!: number;
@ApiProperty({ type: [UserGrowthDto], description: 'User growth over last 7 days' })
userGrowth!: UserGrowthDto[];
@ApiProperty({ type: [RoleDistributionDto], description: 'Distribution of user roles' })
roleDistribution!: RoleDistributionDto[];
@ApiProperty({ type: StatusDistributionDto, description: 'Distribution of user statuses' })
statusDistribution!: StatusDistributionDto;
@ApiProperty({ type: [ActivityTimelineDto], description: 'Activity timeline for last 7 days' })
activityTimeline!: ActivityTimelineDto[];
}

24
apps/api/src/domain/health/HealthDTO.ts Normal file
View File

@@ -0,0 +1,24 @@
export interface HealthDTO {
status: 'ok' | 'degraded' | 'error' | 'unknown';
timestamp: string;
uptime?: number;
responseTime?: number;
errorRate?: number;
lastCheck?: string;
checksPassed?: number;
checksFailed?: number;
components?: Array<{
name: string;
status: 'ok' | 'degraded' | 'error' | 'unknown';
lastCheck?: string;
responseTime?: number;
errorRate?: number;
}>;
alerts?: Array<{
id: string;
type: 'critical' | 'warning' | 'info';
title: string;
message: string;
timestamp: string;
}>;
}

6
apps/api/src/domain/league/dtos/LeagueScheduleDTO.ts
View File

@@ -1,9 +1,13 @@
import { ApiProperty } from '@nestjs/swagger';
import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
import { Type } from 'class-transformer';
import { IsArray, IsBoolean, IsString, ValidateNested } from 'class-validator';
import { RaceDTO } from '../../race/dtos/RaceDTO';
export class LeagueScheduleDTO {
@ApiPropertyOptional()
@IsString()
leagueId?: string;
@ApiProperty()
@IsString()
seasonId!: string;

31
apps/api/src/domain/race/dtos/RaceDTO.ts
View File

@@ -1,4 +1,4 @@
import { ApiProperty } from '@nestjs/swagger';
import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
export class RaceDTO {
@ApiProperty()
@@ -10,6 +10,33 @@ export class RaceDTO {
@ApiProperty()
date!: string;
@ApiProperty({ nullable: true })
@ApiPropertyOptional({ nullable: true })
leagueName?: string;
@ApiPropertyOptional()
track?: string;
@ApiPropertyOptional()
car?: string;
@ApiPropertyOptional()
sessionType?: string;
@ApiPropertyOptional()
leagueId?: string;
@ApiPropertyOptional()
strengthOfField?: number;
@ApiPropertyOptional()
isUpcoming?: boolean;
@ApiPropertyOptional()
isLive?: boolean;
@ApiPropertyOptional()
isPast?: boolean;
@ApiPropertyOptional()
status?: string;
}

209
apps/website/.eslintrc.json
View File

@@ -23,8 +23,8 @@
"app/**/default.*"
],
"rules": {
"import/no-default-export": "off",
"no-restricted-syntax": "off"
"import/no-default-export": "error",
"no-restricted-syntax": "error"
}
},
{
@@ -54,9 +54,9 @@
"lib/builders/view-data/*.tsx"
],
"rules": {
"gridpilot-rules/filename-matches-export": "off",
"gridpilot-rules/single-export-per-file": "off",
"gridpilot-rules/view-data-builder-contract": "off",
"gridpilot-rules/filename-matches-export": "error",
"gridpilot-rules/single-export-per-file": "error",
"gridpilot-rules/view-data-builder-contract": "error",
"gridpilot-rules/view-data-builder-implements": "error",
"gridpilot-rules/view-data-builder-imports": "error"
}
@@ -75,11 +75,11 @@
"lib/mutations/**/*.ts"
],
"rules": {
"gridpilot-rules/clean-error-handling": "off",
"gridpilot-rules/filename-service-match": "off",
"gridpilot-rules/mutation-contract": "off",
"gridpilot-rules/mutation-must-map-errors": "off",
"gridpilot-rules/mutation-must-use-builders": "off"
"gridpilot-rules/clean-error-handling": "error",
"gridpilot-rules/filename-service-match": "error",
"gridpilot-rules/mutation-contract": "error",
"gridpilot-rules/mutation-must-map-errors": "error",
"gridpilot-rules/mutation-must-use-builders": "error"
}
},
{
@@ -87,16 +87,16 @@
"templates/**/*.tsx"
],
"rules": {
"gridpilot-rules/component-no-data-manipulation": "off",
"gridpilot-rules/no-hardcoded-routes": "off",
"gridpilot-rules/no-raw-html-in-app": "off",
"gridpilot-rules/template-no-async-render": "off",
"gridpilot-rules/template-no-direct-mutations": "off",
"gridpilot-rules/template-no-external-state": "off",
"gridpilot-rules/template-no-global-objects": "off",
"gridpilot-rules/template-no-mutation-props": "off",
"gridpilot-rules/template-no-side-effects": "off",
"gridpilot-rules/template-no-unsafe-html": "off"
"gridpilot-rules/component-no-data-manipulation": "error",
"gridpilot-rules/no-hardcoded-routes": "error",
"gridpilot-rules/no-raw-html-in-app": "error",
"gridpilot-rules/template-no-async-render": "error",
"gridpilot-rules/template-no-direct-mutations": "error",
"gridpilot-rules/template-no-external-state": "error",
"gridpilot-rules/template-no-global-objects": "error",
"gridpilot-rules/template-no-mutation-props": "error",
"gridpilot-rules/template-no-side-effects": "error",
"gridpilot-rules/template-no-unsafe-html": "error"
}
},
{
@@ -104,8 +104,8 @@
"components/**/*.tsx"
],
"rules": {
"gridpilot-rules/component-no-data-manipulation": "off",
"gridpilot-rules/no-raw-html-in-app": "off"
"gridpilot-rules/component-no-data-manipulation": "error",
"gridpilot-rules/no-raw-html-in-app": "error"
}
},
{
@@ -114,33 +114,33 @@
"app/**/layout.tsx"
],
"rules": {
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-unused-vars": "off",
"gridpilot-rules/component-classification": "off",
"gridpilot-rules/no-console": "off",
"gridpilot-rules/no-direct-process-env": "off",
"gridpilot-rules/no-hardcoded-routes": "off",
"gridpilot-rules/no-hardcoded-search-params": "off",
"gridpilot-rules/no-index-files": "off",
"gridpilot-rules/no-next-cookies-in-pages": "off",
"gridpilot-rules/no-raw-html-in-app": "off",
"gridpilot-rules/rsc-no-container-manager": "off",
"gridpilot-rules/rsc-no-container-manager-calls": "off",
"gridpilot-rules/rsc-no-di": "off",
"gridpilot-rules/rsc-no-display-objects": "off",
"gridpilot-rules/rsc-no-intl": "off",
"gridpilot-rules/rsc-no-local-helpers": "off",
"gridpilot-rules/rsc-no-object-construction": "off",
"gridpilot-rules/rsc-no-page-data-fetcher": "off",
"gridpilot-rules/rsc-no-presenters": "off",
"gridpilot-rules/rsc-no-sorting-filtering": "off",
"gridpilot-rules/rsc-no-unsafe-services": "off",
"gridpilot-rules/rsc-no-view-models": "off",
"import/no-default-export": "off",
"no-restricted-syntax": "off",
"react-hooks/exhaustive-deps": "off",
"react-hooks/rules-of-hooks": "off",
"react/no-unescaped-entities": "off"
"@typescript-eslint/no-explicit-any": "error",
"@typescript-eslint/no-unused-vars": "error",
"gridpilot-rules/component-classification": "error",
"gridpilot-rules/no-console": "error",
"gridpilot-rules/no-direct-process-env": "error",
"gridpilot-rules/no-hardcoded-routes": "error",
"gridpilot-rules/no-hardcoded-search-params": "error",
"gridpilot-rules/no-index-files": "error",
"gridpilot-rules/no-next-cookies-in-pages": "error",
"gridpilot-rules/no-raw-html-in-app": "error",
"gridpilot-rules/rsc-no-container-manager": "error",
"gridpilot-rules/rsc-no-container-manager-calls": "error",
"gridpilot-rules/rsc-no-di": "error",
"gridpilot-rules/rsc-no-display-objects": "error",
"gridpilot-rules/rsc-no-intl": "error",
"gridpilot-rules/rsc-no-local-helpers": "error",
"gridpilot-rules/rsc-no-object-construction": "error",
"gridpilot-rules/rsc-no-page-data-fetcher": "error",
"gridpilot-rules/rsc-no-presenters": "error",
"gridpilot-rules/rsc-no-sorting-filtering": "error",
"gridpilot-rules/rsc-no-unsafe-services": "error",
"gridpilot-rules/rsc-no-view-models": "error",
"import/no-default-export": "error",
"no-restricted-syntax": "error",
"react-hooks/exhaustive-deps": "error",
"react-hooks/rules-of-hooks": "error",
"react/no-unescaped-entities": "error"
}
},
{
@@ -152,8 +152,8 @@
"lib/mutations/auth/types/*.ts"
],
"rules": {
"gridpilot-rules/clean-error-handling": "off",
"gridpilot-rules/no-direct-process-env": "off"
"gridpilot-rules/clean-error-handling": "error",
"gridpilot-rules/no-direct-process-env": "error"
}
},
{
@@ -162,10 +162,10 @@
"lib/display-objects/**/*.tsx"
],
"rules": {
"gridpilot-rules/display-no-business-logic": "off",
"gridpilot-rules/display-no-domain-models": "off",
"gridpilot-rules/filename-display-match": "off",
"gridpilot-rules/model-no-domain-in-display": "off"
"gridpilot-rules/display-no-business-logic": "error",
"gridpilot-rules/display-no-domain-models": "error",
"gridpilot-rules/filename-display-match": "error",
"gridpilot-rules/model-no-domain-in-display": "error"
}
},
{
@@ -173,17 +173,17 @@
"lib/page-queries/**/*.ts"
],
"rules": {
"gridpilot-rules/clean-error-handling": "off",
"gridpilot-rules/filename-matches-export": "off",
"gridpilot-rules/no-hardcoded-routes": "off",
"gridpilot-rules/no-hardcoded-search-params": "off",
"gridpilot-rules/page-query-contract": "off",
"gridpilot-rules/page-query-execute": "off",
"gridpilot-rules/page-query-filename": "off",
"gridpilot-rules/page-query-must-use-builders": "off",
"gridpilot-rules/page-query-no-null-returns": "off",
"gridpilot-rules/page-query-return-type": "off",
"gridpilot-rules/single-export-per-file": "off"
"gridpilot-rules/clean-error-handling": "error",
"gridpilot-rules/filename-matches-export": "error",
"gridpilot-rules/no-hardcoded-routes": "error",
"gridpilot-rules/no-hardcoded-search-params": "error",
"gridpilot-rules/page-query-contract": "error",
"gridpilot-rules/page-query-execute": "error",
"gridpilot-rules/page-query-filename": "error",
"gridpilot-rules/page-query-must-use-builders": "error",
"gridpilot-rules/page-query-no-null-returns": "error",
"gridpilot-rules/page-query-return-type": "error",
"gridpilot-rules/single-export-per-file": "error"
}
},
{
@@ -210,7 +210,8 @@
"lib/view-models/**/*.tsx"
],
"rules": {
"gridpilot-rules/view-model-implements": "error"
"gridpilot-rules/view-model-implements": "error",
"gridpilot-rules/view-model-taxonomy": "error"
}
},
{
@@ -218,11 +219,11 @@
"lib/services/**/*.ts"
],
"rules": {
"gridpilot-rules/filename-service-match": "off",
"gridpilot-rules/services-implement-contract": "off",
"gridpilot-rules/services-must-be-pure": "off",
"gridpilot-rules/services-must-return-result": "off",
"gridpilot-rules/services-no-external-api": "off"
"gridpilot-rules/filename-service-match": "error",
"gridpilot-rules/services-implement-contract": "error",
"gridpilot-rules/services-must-be-pure": "error",
"gridpilot-rules/services-must-return-result": "error",
"gridpilot-rules/services-no-external-api": "error"
}
},
{
@@ -231,12 +232,12 @@
"app/**/*.ts"
],
"rules": {
"gridpilot-rules/client-only-must-have-directive": "off",
"gridpilot-rules/client-only-no-server-code": "off",
"gridpilot-rules/no-use-mutation-in-client": "off",
"gridpilot-rules/server-actions-interface": "off",
"gridpilot-rules/server-actions-must-use-mutations": "off",
"gridpilot-rules/server-actions-return-result": "off"
"gridpilot-rules/client-only-must-have-directive": "error",
"gridpilot-rules/client-only-no-server-code": "error",
"gridpilot-rules/no-use-mutation-in-client": "error",
"gridpilot-rules/server-actions-interface": "error",
"gridpilot-rules/server-actions-must-use-mutations": "error",
"gridpilot-rules/server-actions-return-result": "error"
}
},
{
@@ -284,10 +285,10 @@
"app/**/*.ts"
],
"rules": {
"gridpilot-rules/component-classification": "off",
"gridpilot-rules/no-hardcoded-routes": "off",
"gridpilot-rules/no-nextjs-imports-in-ui": "off",
"gridpilot-rules/no-raw-html-in-app": "off"
"gridpilot-rules/component-classification": "error",
"gridpilot-rules/no-hardcoded-routes": "error",
"gridpilot-rules/no-nextjs-imports-in-ui": "error",
"gridpilot-rules/no-raw-html-in-app": "error"
}
},
{
@@ -318,11 +319,11 @@
"components/**/*.ts"
],
"rules": {
"gridpilot-rules/component-classification": "off",
"gridpilot-rules/no-hardcoded-routes": "off",
"gridpilot-rules/no-nextjs-imports-in-ui": "off",
"gridpilot-rules/component-classification": "error",
"gridpilot-rules/no-hardcoded-routes": "error",
"gridpilot-rules/no-nextjs-imports-in-ui": "error",
"gridpilot-rules/no-raw-html-in-app": "error",
"no-restricted-imports": "off"
"no-restricted-imports": "error"
}
},
{
@@ -330,7 +331,7 @@
"components/mockups/**/*.tsx"
],
"rules": {
"gridpilot-rules/no-raw-html-in-app": "off"
"gridpilot-rules/no-raw-html-in-app": "error"
}
},
{
@@ -338,11 +339,11 @@
"lib/services/**/*.ts"
],
"rules": {
"gridpilot-rules/no-hardcoded-routes": "off",
"gridpilot-rules/service-function-format": "off",
"gridpilot-rules/services-implement-contract": "off",
"gridpilot-rules/services-must-be-pure": "off",
"gridpilot-rules/services-no-external-api": "off"
"gridpilot-rules/no-hardcoded-routes": "error",
"gridpilot-rules/service-function-format": "error",
"gridpilot-rules/services-implement-contract": "error",
"gridpilot-rules/services-must-be-pure": "error",
"gridpilot-rules/services-no-external-api": "error"
}
},
{
@@ -363,10 +364,10 @@
],
"root": true,
"rules": {
"@next/next/no-img-element": "off",
"@typescript-eslint/no-explicit-any": "off",
"@next/next/no-img-element": "error",
"@typescript-eslint/no-explicit-any": "error",
"@typescript-eslint/no-unused-vars": [
"off",
"error",
{
"argsIgnorePattern": "^_",
"caughtErrorsIgnorePattern": "^_",
@@ -389,15 +390,15 @@
]
}
],
"gridpilot-rules/no-index-files": "off",
"import/no-default-export": "off",
"import/no-named-as-default-member": "off",
"no-restricted-syntax": "off",
"react-hooks/exhaustive-deps": "off",
"react-hooks/rules-of-hooks": "off",
"react/no-unescaped-entities": "off",
"unused-imports/no-unused-imports": "off",
"unused-imports/no-unused-vars": "off"
"gridpilot-rules/no-index-files": "error",
"import/no-default-export": "error",
"import/no-named-as-default-member": "error",
"no-restricted-syntax": "error",
"react-hooks/exhaustive-deps": "error",
"react-hooks/rules-of-hooks": "error",
"react/no-unescaped-entities": "error",
"unused-imports/no-unused-imports": "error",
"unused-imports/no-unused-vars": "error"
},
"settings": {
"boundaries/elements": [

14
apps/website/app/leagues/[id]/roster/page.tsx
View File

@@ -1,11 +1,11 @@
import { LeagueDetailPageQuery } from '@/lib/page-queries/LeagueDetailPageQuery';
import { notFound } from 'next/navigation';
import { Box } from '@/ui/Box';
import { Text } from '@/ui/Text';
import { Stack } from '@/ui/Stack';
import { RosterTable } from '@/components/leagues/RosterTable';
import { LeagueDetailPageQuery } from '@/lib/page-queries/LeagueDetailPageQuery';
import { Box } from '@/ui/Box';
import { Stack } from '@/ui/Stack';
import { Text } from '@/ui/Text';
import { notFound } from 'next/navigation';
import { DateDisplay } from '@/lib/display-objects/DateDisplay';
import { DateFormatter } from '@/lib/formatters/DateFormatter';
interface Props {
params: Promise<{ id: string }>;
@@ -25,7 +25,7 @@ export default async function LeagueRosterPage({ params }: Props) {
driverName: m.driver.name,
role: m.role,
joinedAt: m.joinedAt,
joinedAtLabel: DateDisplay.formatShort(m.joinedAt)
joinedAtLabel: DateFormatter.formatShort(m.joinedAt)
}));
return (

86
apps/website/app/sponsor/campaigns/page.tsx
View File

@@ -1,89 +1,3 @@
'use client';
import { useSponsorSponsorships } from "@/hooks/sponsor/useSponsorSponsorships";
import { SponsorCampaignsTemplate, SponsorshipType, SponsorCampaignsViewData } from "@/templates/SponsorCampaignsTemplate";
import { Box } from "@/ui/Box";
import { Button } from "@/ui/Button";
import { Text } from "@/ui/Text";
import { useState } from 'react';
import { CurrencyDisplay } from "@/lib/display-objects/CurrencyDisplay";
import { NumberDisplay } from "@/lib/display-objects/NumberDisplay";
import { DateDisplay } from "@/lib/display-objects/DateDisplay";
import { StatusDisplay } from "@/lib/display-objects/StatusDisplay";
export default function SponsorCampaignsPage() {
const [typeFilter, setTypeFilter] = useState<SponsorshipType>('all');
const [searchQuery, setSearchQuery] = useState('');
const { data: sponsorshipsData, isLoading, error, retry } = useSponsorSponsorships('demo-sponsor-1');
if (isLoading) {
return (
<Box maxWidth="7xl" mx="auto" py={8} px={4} display="flex" alignItems="center" justifyContent="center" minHeight="400px">
<Box textAlign="center">
<Box w="8" h="8" border borderTop={false} borderColor="border-primary-blue" rounded="full" animate="spin" mx="auto" mb={4} />
<Text color="text-gray-400">Loading sponsorships...</Text>
</Box>
</Box>
);
}
if (error || !sponsorshipsData) {
return (
<Box maxWidth="7xl" mx="auto" py={8} px={4} display="flex" alignItems="center" justifyContent="center" minHeight="400px">
<Box textAlign="center">
<Text color="text-gray-400">{error?.getUserMessage() || 'No sponsorships data available'}</Text>
{error && (
<Button variant="secondary" onClick={retry} mt={4}>
Retry
</Button>
)}
</Box>
</Box>
);
}
// Calculate stats
const totalInvestment = sponsorshipsData.sponsorships.filter((s: any) => s.status === 'active').reduce((sum: number, s: any) => sum + s.price, 0);
const totalImpressions = sponsorshipsData.sponsorships.reduce((sum: number, s: any) => sum + s.impressions, 0);
const stats = {
total: sponsorshipsData.sponsorships.length,
active: sponsorshipsData.sponsorships.filter((s: any) => s.status === 'active').length,
pending: sponsorshipsData.sponsorships.filter((s: any) => s.status === 'pending_approval').length,
approved: sponsorshipsData.sponsorships.filter((s: any) => s.status === 'approved').length,
rejected: sponsorshipsData.sponsorships.filter((s: any) => s.status === 'rejected').length,
formattedTotalInvestment: CurrencyDisplay.format(totalInvestment),
formattedTotalImpressions: NumberDisplay.formatCompact(totalImpressions),
};
const sponsorships = sponsorshipsData.sponsorships.map((s: any) => ({
...s,
formattedInvestment: CurrencyDisplay.format(s.price),
formattedImpressions: NumberDisplay.format(s.impressions),
formattedStartDate: s.seasonStartDate ? DateDisplay.formatShort(s.seasonStartDate) : undefined,
formattedEndDate: s.seasonEndDate ? DateDisplay.formatShort(s.seasonEndDate) : undefined,
}));
const viewData: SponsorCampaignsViewData = {
sponsorships,
stats: stats as any,
};
const filteredSponsorships = sponsorships.filter((s: any) => {
// For now, we only have leagues in the DTO
if (typeFilter !== 'all' && typeFilter !== 'leagues') return false;
if (searchQuery && !s.leagueName.toLowerCase().includes(searchQuery.toLowerCase())) return false;
return true;
});
return (
<SponsorCampaignsTemplate
viewData={viewData}
filteredSponsorships={filteredSponsorships as any}
typeFilter={typeFilter}
setTypeFilter={setTypeFilter}
searchQuery={searchQuery}
setSearchQuery={setSearchQuery}
/>
);
}

24
apps/website/client-wrapper/RosterAdminPage.tsx
View File

@@ -1,27 +1,27 @@
'use client';
import type { MembershipRole } from '@/lib/types/MembershipRole';
import { useParams } from 'next/navigation';
import { useMemo } from 'react';
import {
useApproveJoinRequest,
useLeagueJoinRequests,
useLeagueRosterAdmin,
useApproveJoinRequest,
useRejectJoinRequest,
useUpdateMemberRole,
useRemoveMember,
useUpdateMemberRole,
} from "@/hooks/league/useLeagueRosterAdmin";
import { RosterAdminTemplate } from '@/templates/RosterAdminTemplate';
import type { JoinRequestData, RosterMemberData, LeagueRosterAdminViewData } from '@/lib/view-data/LeagueRosterAdminViewData';
import { ClientWrapperProps } from '@/lib/contracts/components/ComponentContracts';
import type { LeagueRosterJoinRequestDTO } from '@/lib/types/generated/LeagueRosterJoinRequestDTO';
import type { LeagueRosterMemberDTO } from '@/lib/types/generated/LeagueRosterMemberDTO';
import { ClientWrapperProps } from '@/lib/contracts/components/ComponentContracts';
import type { MembershipRole } from '@/lib/types/MembershipRole';
import type { JoinRequestData, LeagueRosterAdminViewData, RosterMemberData } from '@/lib/view-data/LeagueRosterAdminViewData';
import { RosterAdminTemplate } from '@/templates/RosterAdminTemplate';
import { useParams } from 'next/navigation';
import { useMemo } from 'react';
import { DateDisplay } from '@/lib/display-objects/DateDisplay';
import { DateFormatter } from '@/lib/formatters/DateFormatter';
const ROLE_OPTIONS: MembershipRole[] = ['owner', 'admin', 'steward', 'member'];
export function RosterAdminPage({ viewData: initialViewData }: Partial<ClientWrapperProps<LeagueRosterAdminViewData>>) {
export function RosterAdminPage({ }: Partial<ClientWrapperProps<LeagueRosterAdminViewData>>) {
const params = useParams();
const leagueId = params.id as string;
@@ -83,7 +83,7 @@ export function RosterAdminPage({ viewData: initialViewData }: Partial<ClientWra
id: req.id,
driver: req.driver as { id: string; name: string },
requestedAt: req.requestedAt,
formattedRequestedAt: DateDisplay.formatShort(req.requestedAt),
formattedRequestedAt: DateFormatter.formatShort(req.requestedAt),
message: req.message || undefined,
})),
members: members.map((m: LeagueRosterMemberDTO): RosterMemberData => ({
@@ -91,7 +91,7 @@ export function RosterAdminPage({ viewData: initialViewData }: Partial<ClientWra
driver: m.driver as { id: string; name: string },
role: m.role,
joinedAt: m.joinedAt,
formattedJoinedAt: DateDisplay.formatShort(m.joinedAt),
formattedJoinedAt: DateFormatter.formatShort(m.joinedAt),
})),
}), [leagueId, joinRequests, members]);

25
apps/website/client-wrapper/TeamLeaderboardPageWrapper.tsx
View File

@@ -2,19 +2,16 @@
import { ClientWrapperProps } from '@/lib/contracts/components/ComponentContracts';
import { ViewData } from '@/lib/contracts/view-data/ViewData';
import type { TeamSummaryViewModel } from '@/lib/view-models/TeamSummaryViewModel';
import { TeamSummaryViewModel } from '@/lib/view-models/TeamSummaryViewModel';
import { TeamLeaderboardTemplate } from '@/templates/TeamLeaderboardTemplate';
import { useRouter } from 'next/navigation';
import { useState } from 'react';
import { useMemo, useState } from 'react';
import type { TeamListItemDTO } from '@/lib/types/generated/TeamListItemDTO';
type SkillLevel = 'pro' | 'advanced' | 'intermediate' | 'beginner';
type SortBy = 'rating' | 'wins' | 'winRate' | 'races';
interface TeamLeaderboardViewData extends ViewData extends ViewData {
teams: TeamSummaryViewModel[];
}
export function TeamLeaderboardPageWrapper({ viewData }: ClientWrapperProps<TeamLeaderboardViewData>) {
export function TeamLeaderboardPageWrapper({ viewData }: ClientWrapperProps<{ teams: TeamListItemDTO[] }>) {
const router = useRouter();
// Client-side UI state only (no business logic)
@@ -22,7 +19,13 @@ export function TeamLeaderboardPageWrapper({ viewData }: ClientWrapperProps<Team
const [filterLevel, setFilterLevel] = useState<SkillLevel | 'all'>('all');
const [sortBy, setSortBy] = useState<SortBy>('rating');
if (!viewData.teams || viewData.teams.length === 0) {
// Instantiate ViewModels on the client to wrap plain DTOs with logic
const teamViewModels = useMemo(() =>
(viewData.teams || []).map(dto => new TeamSummaryViewModel(dto)),
[viewData.teams]
);
if (teamViewModels.length === 0) {
return null;
}
@@ -34,8 +37,8 @@ export function TeamLeaderboardPageWrapper({ viewData }: ClientWrapperProps<Team
router.push('/teams');
};
// Apply filtering and sorting
const filteredAndSortedTeams = viewData.teams
// Apply filtering and sorting using ViewModel logic
const filteredAndSortedTeams = teamViewModels
.filter((team) => {
const matchesSearch = team.name.toLowerCase().includes(searchQuery.toLowerCase());
const matchesLevel = filterLevel === 'all' || team.performanceLevel === filterLevel;
@@ -54,7 +57,7 @@ export function TeamLeaderboardPageWrapper({ viewData }: ClientWrapperProps<Team
});
const templateViewData = {
teams: viewData.teams,
teams: teamViewModels,
searchQuery,
filterLevel,
sortBy,

6
apps/website/components/achievements/AchievementCard.tsx
View File

@@ -1,8 +1,8 @@
import { DateFormatter } from '@/lib/formatters/DateFormatter';
import { Card } from '@/ui/Card';
import { Text } from '@/ui/Text';
import { Group } from '@/ui/Group';
import { Stack } from '@/ui/Stack';
import { DateDisplay } from '@/lib/display-objects/DateDisplay';
import { Text } from '@/ui/Text';
interface AchievementCardProps {
title: string;
@@ -36,7 +36,7 @@ export function AchievementCard({
<Text weight="medium" variant="high">{title}</Text>
<Text size="xs" variant="med">{description}</Text>
<Text size="xs" variant="low">
{DateDisplay.formatShort(unlockedAt)}
{DateFormatter.formatShort(unlockedAt)}
</Text>
</Stack>
</Group>

8
apps/website/components/achievements/AchievementGrid.tsx
View File

@@ -1,15 +1,13 @@
import { AchievementDisplay } from '@/lib/display-objects/AchievementDisplay';
import { AchievementFormatter } from '@/lib/formatters/AchievementFormatter';
import { Card } from '@/ui/Card';
import { Grid } from '@/ui/Grid';
import { Group } from '@/ui/Group';
import { Heading } from '@/ui/Heading';
import { Icon } from '@/ui/Icon';
import { Group } from '@/ui/Group';
import { Stack } from '@/ui/Stack';
import { Box } from '@/ui/Box';
import { Surface } from '@/ui/Surface';
import { Text } from '@/ui/Text';
import { Award, Crown, Medal, Star, Target, Trophy, Zap } from 'lucide-react';
import React from 'react';
interface Achievement {
id: string;
@@ -53,7 +51,7 @@ export function AchievementGrid({ achievements }: AchievementGridProps) {
<Grid cols={1} gap={4}>
{achievements.map((achievement) => {
const AchievementIcon = getAchievementIcon(achievement.icon);
const rarity = AchievementDisplay.getRarityVariant(achievement.rarity);
const rarity = AchievementFormatter.getRarityVariant(achievement.rarity);
return (
<Card
key={achievement.id}

24
apps/website/components/admin/AdminUsersTable.tsx
View File

@@ -1,26 +1,24 @@
'use client';
import { DateDisplay } from '@/lib/display-objects/DateDisplay';
import { DateFormatter } from '@/lib/formatters/DateFormatter';
import { AdminUsersViewData } from '@/lib/view-data/AdminUsersViewData';
import { Badge } from '@/ui/Badge';
import { Button } from '@/ui/Button';
import { DriverIdentity } from '@/ui/DriverIdentity';
import { Group } from '@/ui/Group';
import { IconButton } from '@/ui/IconButton';
import { SimpleCheckbox } from '@/ui/SimpleCheckbox';
import { Badge } from '@/ui/Badge';
import { Box } from '@/ui/Box';
import { Group } from '@/ui/Group';
import { DriverIdentity } from '@/ui/DriverIdentity';
import {
Table,
TableBody,
TableCell,
TableHead,
TableHeader,
TableRow
Table,
TableBody,
TableCell,
TableHead,
TableHeader,
TableRow
} from '@/ui/Table';
import { Text } from '@/ui/Text';
import { MoreVertical, Trash2 } from 'lucide-react';
import { UserStatusTag } from './UserStatusTag';
import React from 'react';
interface AdminUsersTableProps {
users: AdminUsersViewData['users'];
@@ -102,7 +100,7 @@ export function AdminUsersTable({
</TableCell>
<TableCell>
<Text size="sm" variant="low">
{user.lastLoginAt ? DateDisplay.formatShort(user.lastLoginAt) : 'Never'}
{user.lastLoginAt ? DateFormatter.formatShort(user.lastLoginAt) : 'Never'}
</Text>
</TableCell>
<TableCell>

4
apps/website/components/drivers/DriverEntryRow.tsx
View File

@@ -1,6 +1,6 @@
import { CountryFlagDisplay } from '@/lib/display-objects/CountryFlagDisplay';
import { CountryFlagFormatter } from '@/lib/formatters/CountryFlagFormatter';
import { Badge } from '@/ui/Badge';
import { Icon } from '@/ui/Icon';
import { Image } from '@/ui/Image';
@@ -88,7 +88,7 @@ export function DriverEntryRow({
justifyContent="center"
fontSize="0.625rem"
>
{CountryFlagDisplay.fromCountryCode(country).toString()}
{CountryFlagFormatter.fromCountryCode(country).toString()}
</Stack>
</Stack>

8
apps/website/components/drivers/ProfileHero.tsx
View File

@@ -1,16 +1,16 @@
import { mediaConfig } from '@/lib/config/mediaConfig';
import { CountryFlagDisplay } from '@/lib/display-objects/CountryFlagDisplay';
import { CountryFlagFormatter } from '@/lib/formatters/CountryFlagFormatter';
import { Box } from '@/ui/Box';
import { Button } from '@/ui/Button';
import { Heading } from '@/ui/Heading';
import { Icon } from '@/ui/Icon';
import { Image } from '@/ui/Image';
import { Link } from '@/ui/Link';
import { Stack } from '@/ui/Stack';
import { Surface } from '@/ui/Surface';
import { Text } from '@/ui/Text';
import { Box } from '@/ui/Box';
import { Icon } from '@/ui/Icon';
import { Calendar, Clock, ExternalLink, Globe, Star, Trophy, UserPlus } from 'lucide-react';
interface ProfileHeroProps {
@@ -93,7 +93,7 @@ export function ProfileHero({
<Stack direction="row" align="center" gap={3} wrap mb={2}>
<Heading level={1}>{driver.name}</Heading>
<Text size="4xl" aria-label={`Country: ${driver.country}`}>
{CountryFlagDisplay.fromCountryCode(driver.country).toString()}
{CountryFlagFormatter.fromCountryCode(driver.country).toString()}
</Text>
</Stack>

57
apps/website/components/errors/ErrorAnalyticsDashboard.tsx
View File

@@ -11,52 +11,41 @@ import { Input } from '@/ui/Input';
import { Stack } from '@/ui/Stack';
import { Text } from '@/ui/Text';
import {
Activity,
AlertTriangle,
Bug,
ChevronDown,
Clock,
Copy,
Cpu,
Download,
FileText,
Globe,
RefreshCw,
Search,
Terminal,
Trash2,
Zap
Activity,
AlertTriangle,
Bug,
ChevronDown,
Clock,
Copy,
Cpu,
Download,
FileText,
Globe,
RefreshCw,
Search,
Terminal,
Trash2,
Zap
} from 'lucide-react';
import { useEffect, useState } from 'react';
import { DateDisplay } from '@/lib/display-objects/DateDisplay';
import { DurationDisplay } from '@/lib/display-objects/DurationDisplay';
import { MemoryDisplay } from '@/lib/display-objects/MemoryDisplay';
import { PercentDisplay } from '@/lib/display-objects/PercentDisplay';
import { TimeDisplay } from '@/lib/display-objects/TimeDisplay';
import { DateFormatter } from '@/lib/formatters/DateFormatter';
import { DurationFormatter } from '@/lib/formatters/DurationFormatter';
import { MemoryFormatter } from '@/lib/formatters/MemoryFormatter';
import { PercentFormatter } from '@/lib/formatters/PercentFormatter';
interface ErrorAnalyticsDashboardProps {
/**
* Auto-refresh interval in milliseconds
*/
refreshInterval?: number;
/**
* Whether to show in production (default: false)
*/
showInProduction?: boolean;
}
function formatDuration(duration: number): string {
return DurationDisplay.formatMs(duration);
return DurationFormatter.formatMs(duration);
}
function formatPercentage(value: number, total: number): string {
if (total === 0) return '0%';
return PercentDisplay.format(value / total);
return PercentFormatter.format(value / total);
}
function formatMemory(bytes: number): string {
return MemoryDisplay.formatMB(bytes);
return MemoryFormatter.formatMB(bytes);
}
interface PerformanceWithMemory extends Performance {
@@ -327,7 +316,7 @@ export function ErrorAnalyticsDashboard({
<Stack display="flex" justifyContent="between" alignItems="start" gap={2} mb={1}>
<Text size="xs" font="mono" weight="bold" color="text-red-400" truncate>{error.type}</Text>
<Text size="xs" color="text-gray-500" fontSize="10px">
{DateDisplay.formatTime(error.timestamp)}
{DateFormatter.formatTime(error.timestamp)}
</Text>
</Stack>
<Text size="xs" color="text-gray-300" block mb={1}>{error.message}</Text>

8
apps/website/components/feed/FeedItemCard.tsx
View File

@@ -1,11 +1,11 @@
'use client';
import React, { useEffect, useState } from 'react';
import { TimeFormatter } from '@/lib/formatters/TimeFormatter';
import { Button } from '@/ui/Button';
import { FeedItem } from '@/ui/FeedItem';
import { Text } from '@/ui/Text';
import { Stack } from '@/ui/Stack';
import { TimeDisplay } from '@/lib/display-objects/TimeDisplay';
import { Text } from '@/ui/Text';
import { useEffect, useState } from 'react';
interface FeedItemData {
id: string;
@@ -50,7 +50,7 @@ export function FeedItemCard({ item }: FeedItemCardProps) {
name: actor?.name || 'Unknown',
avatar: actor?.avatarUrl
}}
timestamp={TimeDisplay.timeAgo(item.timestamp)}
timestamp={TimeFormatter.timeAgo(item.timestamp)}
content={
<Stack gap={2}>
<Text weight="bold" variant="high">{item.headline}</Text>

10
apps/website/components/feed/FeedLayout.tsx
View File

@@ -1,14 +1,14 @@
import { FeedList } from '@/components/feed/FeedList';
import { LatestResultsSidebar } from '@/components/races/LatestResultsSidebar';
import { UpcomingRacesSidebar } from '@/components/races/UpcomingRacesSidebar';
import { DateFormatter } from '@/lib/formatters/DateFormatter';
import { Card } from '@/ui/Card';
import { Container } from '@/ui/Container';
import { Heading } from '@/ui/Heading';
import { Grid } from '@/ui/Grid';
import { Stack } from '@/ui/Stack';
import { Heading } from '@/ui/Heading';
import { Section } from '@/ui/Section';
import { Stack } from '@/ui/Stack';
import { Text } from '@/ui/Text';
import { DateDisplay } from '@/lib/display-objects/DateDisplay';
interface FeedItemData {
id: string;
@@ -49,12 +49,12 @@ export function FeedLayout({
}: FeedLayoutProps) {
const formattedUpcomingRaces = upcomingRaces.map(r => ({
...r,
formattedDate: DateDisplay.formatShort(r.scheduledAt),
formattedDate: DateFormatter.formatShort(r.scheduledAt),
}));
const formattedLatestResults = latestResults.map(r => ({
...r,
formattedDate: DateDisplay.formatShort(r.scheduledAt),
formattedDate: DateFormatter.formatShort(r.scheduledAt),
}));
return (

12
apps/website/components/leaderboards/DriverLeaderboardPreview.tsx
View File

@@ -1,11 +1,11 @@
import { RankBadge } from '@/components/leaderboards/RankBadge';
import { RatingDisplay } from '@/lib/display-objects/RatingDisplay';
import { SkillLevelDisplay } from '@/lib/display-objects/SkillLevelDisplay';
import { RatingFormatter } from '@/lib/formatters/RatingFormatter';
import { SkillLevelFormatter } from '@/lib/formatters/SkillLevelFormatter';
import { Avatar } from '@/ui/Avatar';
import { Group } from '@/ui/Group';
import { LeaderboardList } from '@/ui/LeaderboardList';
import { LeaderboardPreviewShell } from '@/ui/LeaderboardPreviewShell';
import { LeaderboardRow } from '@/ui/LeaderboardRow';
import { Group } from '@/ui/Group';
import { Text } from '@/ui/Text';
import { Trophy } from 'lucide-react';
@@ -69,8 +69,8 @@ export function DriverLeaderboardPreview({
</Text>
<Group gap={2}>
<Text size="xs" variant="low" uppercase weight="bold" letterSpacing="wider">{driver.nationality}</Text>
<Text size="xs" weight="bold" color={SkillLevelDisplay.getColor(driver.skillLevel)} uppercase letterSpacing="wider">
{SkillLevelDisplay.getLabel(driver.skillLevel)}
<Text size="xs" weight="bold" color={SkillLevelFormatter.getColor(driver.skillLevel)} uppercase letterSpacing="wider">
{SkillLevelFormatter.getLabel(driver.skillLevel)}
</Text>
</Group>
</Group>
@@ -80,7 +80,7 @@ export function DriverLeaderboardPreview({
<Group gap={8}>
<Group direction="column" align="end" gap={0}>
<Text variant="primary" font="mono" weight="bold" block size="md" align="right">
{RatingDisplay.format(driver.rating)}
{RatingFormatter.format(driver.rating)}
</Text>
<Text size="xs" variant="low" block uppercase letterSpacing="widest" weight="bold" fontSize="9px" align="right">
Rating

12
apps/website/components/leaderboards/LeaderboardPodium.tsx
View File

@@ -1,5 +1,5 @@
import { MedalDisplay } from '@/lib/display-objects/MedalDisplay';
import { RatingDisplay } from '@/lib/display-objects/RatingDisplay';
import { MedalFormatter } from '@/lib/formatters/MedalFormatter';
import { RatingFormatter } from '@/lib/formatters/RatingFormatter';
import { Image } from '@/ui/Image';
import { Stack } from '@/ui/Stack';
import { Text } from '@/ui/Text';
@@ -91,8 +91,8 @@ export function LeaderboardPodium({ podium, onDriverClick }: LeaderboardPodiumPr
border
transform="translateX(-50%)"
borderWidth="2px"
bg={MedalDisplay.getBg(position)}
color={MedalDisplay.getColor(position)}
bg={MedalFormatter.getBg(position)}
color={MedalFormatter.getColor(position)}
shadow="lg"
>
<Text size="sm" weight="bold">{position}</Text>
@@ -122,7 +122,7 @@ export function LeaderboardPodium({ podium, onDriverClick }: LeaderboardPodiumPr
block
color={isFirst ? 'text-warning-amber' : 'text-primary-blue'}
>
{RatingDisplay.format(driver.rating)}
{RatingFormatter.format(driver.rating)}
</Text>
<Stack direction="row" align="center" gap={3} mt={1}>
@@ -155,7 +155,7 @@ export function LeaderboardPodium({ podium, onDriverClick }: LeaderboardPodiumPr
<Text
weight="bold"
size="4xl"
color={MedalDisplay.getColor(position)}
color={MedalFormatter.getColor(position)}
opacity={0.1}
fontSize={isFirst ? '5rem' : '3.5rem'}
>

11
apps/website/components/leaderboards/RankMedal.tsx
View File

@@ -1,11 +1,10 @@
import { MedalDisplay } from '@/lib/display-objects/MedalDisplay';
import { RankMedal as UiRankMedal, RankMedalProps } from '@/ui/RankMedal';
import React from 'react';
import { MedalFormatter } from '@/lib/formatters/MedalFormatter';
import { RankMedalProps, RankMedal as UiRankMedal } from '@/ui/RankMedal';
export function RankMedal(props: RankMedalProps) {
const variant = MedalDisplay.getVariant(props.rank);
const bg = MedalDisplay.getBg(props.rank);
const color = MedalDisplay.getColor(props.rank);
const variant = MedalFormatter.getVariant(props.rank);
const bg = MedalFormatter.getBg(props.rank);
const color = MedalFormatter.getColor(props.rank);
return (
<UiRankMedal

13
apps/website/components/leaderboards/RankingRow.tsx
View File

@@ -1,12 +1,11 @@
import { RatingDisplay } from '@/lib/display-objects/RatingDisplay';
import { RatingFormatter } from '@/lib/formatters/RatingFormatter';
import { SkillLevelFormatter } from '@/lib/formatters/SkillLevelFormatter';
import { Avatar } from '@/ui/Avatar';
import { Group } from '@/ui/Group';
import { LeaderboardRow } from '@/ui/LeaderboardRow';
import { Text } from '@/ui/Text';
import { DeltaChip } from './DeltaChip';
import { RankBadge } from './RankBadge';
import { LeaderboardRow } from '@/ui/LeaderboardRow';
import { SkillLevelDisplay } from '@/lib/display-objects/SkillLevelDisplay';
import React from 'react';
interface RankingRowProps {
id: string;
@@ -65,8 +64,8 @@ export function RankingRow({
</Text>
<Group gap={2}>
<Text size="xs" variant="low" uppercase weight="bold" letterSpacing="wider">{nationality}</Text>
<Text size="xs" weight="bold" style={{ color: SkillLevelDisplay.getColor(skillLevel) }} uppercase letterSpacing="wider">
{SkillLevelDisplay.getLabel(skillLevel)}
<Text size="xs" weight="bold" style={{ color: SkillLevelFormatter.getColor(skillLevel) }} uppercase letterSpacing="wider">
{SkillLevelFormatter.getLabel(skillLevel)}
</Text>
</Group>
</Group>
@@ -84,7 +83,7 @@ export function RankingRow({
</Group>
<Group direction="column" align="end" gap={0}>
<Text variant="primary" font="mono" weight="bold" block size="md">
{RatingDisplay.format(rating)}
{RatingFormatter.format(rating)}
</Text>
<Text size="xs" variant="low" block uppercase letterSpacing="widest" weight="bold">
Rating

9
apps/website/components/leaderboards/RankingsPodium.tsx
View File

@@ -1,10 +1,7 @@
import { RatingFormatter } from '@/lib/formatters/RatingFormatter';
import { Avatar } from '@/ui/Avatar';
import { Group } from '@/ui/Group';
import { Text } from '@/ui/Text';
import { RatingDisplay } from '@/lib/display-objects/RatingDisplay';
import { MedalDisplay } from '@/lib/display-objects/MedalDisplay';
import { Surface } from '@/ui/Surface';
import React from 'react';
interface PodiumDriver {
id: string;
@@ -20,7 +17,7 @@ interface RankingsPodiumProps {
onDriverClick?: (id: string) => void;
}
export function RankingsPodium({ podium, onDriverClick }: RankingsPodiumProps) {
export function RankingsPodium({ podium }: RankingsPodiumProps) {
return (
<Group justify="center" align="end" gap={4}>
{[1, 0, 2].map((index) => {
@@ -57,7 +54,7 @@ export function RankingsPodium({ podium, onDriverClick }: RankingsPodiumProps) {
<Text weight="bold" variant="high" size={isFirst ? 'md' : 'sm'}>{driver.name}</Text>
<Text font="mono" weight="bold" variant={isFirst ? 'warning' : 'primary'}>
{RatingDisplay.format(driver.rating)}
{RatingFormatter.format(driver.rating)}
</Text>
</Group>

26
apps/website/components/leagues/EnhancedLeagueSchedulePanel.tsx
View File

@@ -1,18 +1,16 @@
'use client';
import React, { useState } from 'react';
import { useRouter } from 'next/navigation';
import { routes } from '@/lib/routing/RouteConfig';
import { Box } from '@/ui/Box';
import { Text } from '@/ui/Text';
import { Stack } from '@/ui/Stack';
import { Button } from '@/ui/Button';
import { Icon } from '@/ui/Icon';
import { DateFormatter } from '@/lib/formatters/DateFormatter';
import { Badge } from '@/ui/Badge';
import { Box } from '@/ui/Box';
import { Button } from '@/ui/Button';
import { Group } from '@/ui/Group';
import { Icon } from '@/ui/Icon';
import { Stack } from '@/ui/Stack';
import { Surface } from '@/ui/Surface';
import { ChevronDown, ChevronUp, Calendar, CheckCircle, Trophy, Edit, Clock } from 'lucide-react';
import { DateDisplay } from '@/lib/display-objects/DateDisplay';
import { Text } from '@/ui/Text';
import { Calendar, CheckCircle, ChevronDown, ChevronUp, Clock, Edit, Trophy } from 'lucide-react';
import { useState } from 'react';
interface RaceEvent {
id: string;
@@ -50,9 +48,6 @@ interface MonthGroup {
export function EnhancedLeagueSchedulePanel({
events,
leagueId,
currentDriverId,
isAdmin,
onRegister,
onWithdraw,
onEdit,
@@ -60,7 +55,6 @@ export function EnhancedLeagueSchedulePanel({
onRaceDetail,
onResultsClick,
}: EnhancedLeagueSchedulePanelProps) {
const router = useRouter();
const [expandedMonths, setExpandedMonths] = useState<Set<string>>(new Set());
// Group races by month
@@ -109,7 +103,7 @@ export function EnhancedLeagueSchedulePanel({
};
const formatTime = (scheduledAt: string) => {
return DateDisplay.formatDateTime(scheduledAt);
return DateFormatter.formatDateTime(scheduledAt);
};
const groups = groupRacesByMonth();
@@ -158,7 +152,7 @@ export function EnhancedLeagueSchedulePanel({
{isExpanded && (
<Box p={4}>
<Stack gap={3}>
{group.races.map((race, raceIndex) => (
{group.races.map((race) => (
<Surface
key={race.id}
variant="precision"

6
apps/website/components/leagues/LeagueActivityFeed.tsx
View File

@@ -1,10 +1,10 @@
import { ActivityFeedItem } from '@/components/feed/ActivityFeedItem';
import { useLeagueRaces } from "@/hooks/league/useLeagueRaces";
import { RelativeTimeFormatter } from '@/lib/formatters/RelativeTimeFormatter';
import { LeagueActivityService } from '@/lib/services/league/LeagueActivityService';
import { RelativeTimeDisplay } from '@/lib/display-objects/RelativeTimeDisplay';
import { Icon } from '@/ui/Icon';
import { Text } from '@/ui/Text';
import { Stack } from '@/ui/Stack';
import { Text } from '@/ui/Text';
import { AlertTriangle, Calendar, Flag, Shield, UserMinus, UserPlus } from 'lucide-react';
import { useMemo } from 'react';
@@ -128,7 +128,7 @@ function ActivityItem({ activity }: { activity: LeagueActivity }) {
<ActivityFeedItem
icon={getIcon()}
content={getContent()}
timestamp={RelativeTimeDisplay.format(activity.timestamp, new Date())}
timestamp={RelativeTimeFormatter.format(activity.timestamp, new Date())}
/>
);
}

8
apps/website/components/leagues/LeagueMemberRow.tsx
View File

@@ -1,11 +1,11 @@
import { DriverIdentity } from '@/ui/DriverIdentity';
import { DateFormatter } from '@/lib/formatters/DateFormatter';
import { DriverViewModel } from '@/lib/view-models/DriverViewModel';
import { Badge } from '@/ui/Badge';
import { Box } from '@/ui/Box';
import { DriverIdentity } from '@/ui/DriverIdentity';
import { TableCell, TableRow } from '@/ui/Table';
import { Text } from '@/ui/Text';
import { DateDisplay } from '@/lib/display-objects/DateDisplay';
import React, { ReactNode } from 'react';
import { ReactNode } from 'react';
interface LeagueMemberRowProps {
driver?: DriverViewModel;
@@ -84,7 +84,7 @@ export function LeagueMemberRow({
</TableCell>
<TableCell>
<Text variant="high" size="sm">
{DateDisplay.formatShort(joinedAt)}
{DateFormatter.formatShort(joinedAt)}
</Text>
</TableCell>
{actions && (

54
apps/website/components/leagues/LeagueReviewSummary.tsx
View File

@@ -1,39 +1,33 @@
'use client';
import {
Users,
Calendar,
Trophy,
Award,
Rocket,
Gamepad2,
User,
UsersRound,
Clock,
Flag,
Zap,
Timer,
Check,
Globe,
Medal,
type LucideIcon,
} from 'lucide-react';
import type { LeagueConfigFormModel } from '@/lib/types/LeagueConfigFormModel';
import type { LeagueScoringPresetViewModel } from '@/lib/view-models/LeagueScoringPresetViewModel';
import { Stack } from '@/ui/Stack';
import { Text } from '@/ui/Text';
import { Heading } from '@/ui/Heading';
import { Icon } from '@/ui/Icon';
import { Card } from '@/ui/Card';
import { Grid } from '@/ui/Grid';
import { Heading } from '@/ui/Heading';
import { Icon } from '@/ui/Icon';
import { Stack } from '@/ui/Stack';
import { Text } from '@/ui/Text';
import {
Award,
Calendar,
Check,
Clock,
Flag,
Gamepad2,
Globe,
Medal,
Rocket,
Timer,
Trophy,
User,
Users,
UsersRound,
Zap,
type LucideIcon,
} from 'lucide-react';
import { DateDisplay } from '@/lib/display-objects/DateDisplay';
import { DurationDisplay } from '@/lib/display-objects/DurationDisplay';
import { DateFormatter } from '@/lib/formatters/DateFormatter';
interface LeagueReviewSummaryProps {
form: LeagueConfigFormModel;
presets: LeagueScoringPresetViewModel[];
}
// Individual review card component
function ReviewCard({
@@ -142,7 +136,7 @@ export function LeagueReviewSummary({ form, presets }: LeagueReviewSummaryProps)
const seasonStartLabel =
timings.seasonStartDate
? DateDisplay.formatShort(timings.seasonStartDate)
? DateFormatter.formatShort(timings.seasonStartDate)
: null;
const stewardingLabel = (() => {

39
apps/website/components/leagues/RaceDetailModal.tsx
View File

@@ -1,28 +1,27 @@
'use client';
import React from 'react';
import { Box } from '@/ui/Box';
import { Text } from '@/ui/Text';
import { Stack } from '@/ui/Stack';
import { Group } from '@/ui/Group';
import { Surface } from '@/ui/Surface';
import { Icon } from '@/ui/Icon';
import { Button } from '@/ui/Button';
import { DateFormatter } from '@/lib/formatters/DateFormatter';
import { Badge } from '@/ui/Badge';
import {
Calendar,
Clock,
Car,
MapPin,
Thermometer,
Droplets,
Wind,
import { Box } from '@/ui/Box';
import { Button } from '@/ui/Button';
import { Group } from '@/ui/Group';
import { Icon } from '@/ui/Icon';
import { Stack } from '@/ui/Stack';
import { Surface } from '@/ui/Surface';
import { Text } from '@/ui/Text';
import {
Calendar,
Car,
CheckCircle,
Clock,
Cloud,
X,
Droplets,
MapPin,
Thermometer,
Trophy,
CheckCircle
Wind,
X
} from 'lucide-react';
import { DateDisplay } from '@/lib/display-objects/DateDisplay';
interface RaceDetailModalProps {
race: {
@@ -55,7 +54,7 @@ export function RaceDetailModal({
if (!isOpen) return null;
const formatTime = (scheduledAt: string) => {
return DateDisplay.formatDateTime(scheduledAt);
return DateFormatter.formatDateTime(scheduledAt);
};
const getStatusBadge = (status: 'scheduled' | 'completed') => {

14
apps/website/components/profile/ProfileDetailsPanel.tsx
View File

@@ -1,15 +1,11 @@
'use client';
import { CountryFlagDisplay } from '@/lib/display-objects/CountryFlagDisplay';
import { Panel } from '@/ui/Panel';
import { Input } from '@/ui/Input';
import { Text } from '@/ui/Text';
import { TextArea } from '@/ui/TextArea';
import { Box } from '@/ui/Box';
import { CountryFlagFormatter } from '@/lib/formatters/CountryFlagFormatter';
import { Group } from '@/ui/Group';
import { Input } from '@/ui/Input';
import { Panel } from '@/ui/Panel';
import { Stack } from '@/ui/Stack';
import { ProfileStat } from '@/ui/ProfileHero';
import React from 'react';
import { TextArea } from '@/ui/TextArea';
interface ProfileDetailsPanelProps {
driver: {
@@ -50,7 +46,7 @@ export function ProfileDetailsPanel({ driver, isEditing, onUpdate }: ProfileDeta
<Text size="xs" variant="low" weight="bold" uppercase block>Nationality</Text>
<Group gap={2}>
<Text size="xl">
{CountryFlagDisplay.fromCountryCode(driver.country).toString()}
{CountryFlagFormatter.fromCountryCode(driver.country).toString()}
</Text>
<Text variant="med">{driver.country}</Text>
</Group>

14
apps/website/components/profile/ProfileHeader.tsx
View File

@@ -1,16 +1,16 @@
'use client';
import { mediaConfig } from '@/lib/config/mediaConfig';
import { CountryFlagDisplay } from '@/lib/display-objects/CountryFlagDisplay';
import { CountryFlagFormatter } from '@/lib/formatters/CountryFlagFormatter';
import { Box } from '@/ui/Box';
import { Button } from '@/ui/Button';
import { Group } from '@/ui/Group';
import { Heading } from '@/ui/Heading';
import { Image } from '@/ui/Image';
import { ProfileHero, ProfileAvatar, ProfileStatsGroup, ProfileStat } from '@/ui/ProfileHero';
import { Text } from '@/ui/Text';
import { Box } from '@/ui/Box';
import { Group } from '@/ui/Group';
import { ProfileAvatar, ProfileHero, ProfileStat, ProfileStatsGroup } from '@/ui/ProfileHero';
import { Stack } from '@/ui/Stack';
import { Calendar, Globe, Star, Trophy, UserPlus } from 'lucide-react';
import { Text } from '@/ui/Text';
import { Calendar, Globe, UserPlus } from 'lucide-react';
import React from 'react';
interface ProfileHeaderProps {
@@ -56,7 +56,7 @@ export function ProfileHeader({
<Group gap={3}>
<Heading level={1}>{driver.name}</Heading>
<Text size="2xl" aria-label={`Country: ${driver.country}`}>
{CountryFlagDisplay.fromCountryCode(driver.country).toString()}
{CountryFlagFormatter.fromCountryCode(driver.country).toString()}
</Text>
</Group>
</Box>

4
apps/website/components/profile/SponsorshipRequestsPanel.tsx
View File

@@ -1,6 +1,6 @@
'use client';
import { DateDisplay } from '@/lib/display-objects/DateDisplay';
import { DateFormatter } from '@/lib/formatters/DateFormatter';
import { Button } from '@/ui/Button';
import { Card, Card as Surface } from '@/ui/Card';
import { Stack } from '@/ui/Stack';
@@ -64,7 +64,7 @@ export function SponsorshipRequestsPanel({
<Text size="xs" color="text-gray-400" block mt={1}>{request.message}</Text>
)}
<Text size="xs" color="text-gray-500" block mt={2}>
{DateDisplay.formatShort(request.createdAtIso)}
{DateFormatter.formatShort(request.createdAtIso)}
</Text>
</Stack>
<Stack direction="row" gap={2}>

13
apps/website/components/races/RaceCardWrapper.tsx
View File

@@ -1,6 +1,5 @@
import React from 'react';
import { RaceStatusDisplay } from '@/lib/display-objects/RaceStatusDisplay';
import { DateDisplay } from '@/lib/display-objects/DateDisplay';
import { DateFormatter } from '@/lib/formatters/DateFormatter';
import { RaceStatusFormatter } from '@/lib/formatters/RaceStatusFormatter';
import { RaceCard as UiRaceCard } from './RaceCard';
interface RaceCardProps {
@@ -23,11 +22,11 @@ export function RaceCard({ race, onClick }: RaceCardProps) {
track={race.track}
car={race.car}
scheduledAt={race.scheduledAt}
scheduledAtLabel={DateDisplay.formatShort(race.scheduledAt)}
timeLabel={DateDisplay.formatTime(race.scheduledAt)}
scheduledAtLabel={DateFormatter.formatShort(race.scheduledAt)}
timeLabel={DateFormatter.formatTime(race.scheduledAt)}
status={race.status}
statusLabel={RaceStatusDisplay.getLabel(race.status)}
statusVariant={RaceStatusDisplay.getVariant(race.status) as any}
statusLabel={RaceStatusFormatter.getLabel(race.status)}
statusVariant={RaceStatusFormatter.getVariant(race.status) as any}
leagueName={race.leagueName}
leagueId={race.leagueId}
strengthOfField={race.strengthOfField}

6
apps/website/components/races/RaceHeroWrapper.tsx
View File

@@ -1,8 +1,8 @@
import { RaceHero as UiRaceHero } from '@/components/races/RaceHero';
import { DateFormatter } from '@/lib/formatters/DateFormatter';
import { LucideIcon } from 'lucide-react';
import { DateDisplay } from '@/lib/display-objects/DateDisplay';
interface RaceHeroProps {
track: string;
@@ -34,8 +34,8 @@ export function RaceHero(props: RaceHeroProps) {
return (
<UiRaceHero
{...rest}
formattedDate={DateDisplay.formatShort(scheduledAt)}
formattedTime={DateDisplay.formatTime(scheduledAt)}
formattedDate={DateFormatter.formatShort(scheduledAt)}
formattedTime={DateFormatter.formatTime(scheduledAt)}
statusConfig={mappedConfig}
/>
);

14
apps/website/components/races/RaceListItemWrapper.tsx
View File

@@ -1,9 +1,9 @@
import { routes } from '@/lib/routing/RouteConfig';
import { RaceListItem as UiRaceListItem } from '@/components/races/RaceListItem';
import { DateDisplay } from '@/lib/display-objects/DateDisplay';
import { StatusDisplay } from '@/lib/display-objects/StatusDisplay';
import { DateFormatter } from '@/lib/formatters/DateFormatter';
import { StatusFormatter } from '@/lib/formatters/StatusFormatter';
import { routes } from '@/lib/routing/RouteConfig';
interface Race {
id: string;
@@ -48,11 +48,11 @@ export function RaceListItem({ race, onClick }: RaceListItemProps) {
<UiRaceListItem
track={race.track}
car={race.car}
dateLabel={DateDisplay.formatMonthDay(race.scheduledAt).split(' ')[0]}
dayLabel={DateDisplay.formatMonthDay(race.scheduledAt).split(' ')[1]}
timeLabel={DateDisplay.formatTime(race.scheduledAt)}
dateLabel={DateFormatter.formatMonthDay(race.scheduledAt).split(' ')[0]}
dayLabel={DateFormatter.formatMonthDay(race.scheduledAt).split(' ')[1]}
timeLabel={DateFormatter.formatTime(race.scheduledAt)}
status={race.status}
statusLabel={StatusDisplay.raceStatus(race.status)}
statusLabel={StatusFormatter.raceStatus(race.status)}
statusVariant={config.variant}
statusIconName={config.iconName}
leagueName={race.leagueName}

4
apps/website/components/races/RaceResultCardWrapper.tsx
View File

@@ -1,8 +1,8 @@
import { DateFormatter } from '@/lib/formatters/DateFormatter';
import { RaceResultViewModel } from '@/lib/view-models/RaceResultViewModel';
import { RaceResultCard as UiRaceResultCard } from './RaceResultCard';
import { DateDisplay } from '@/lib/display-objects/DateDisplay';
interface RaceResultCardProps {
race: {
@@ -29,7 +29,7 @@ export function RaceResultCard({
raceId={race.id}
track={race.track}
car={race.car}
formattedDate={DateDisplay.formatShort(race.scheduledAt)}
formattedDate={DateFormatter.formatShort(race.scheduledAt)}
position={result.position}
positionLabel={result.formattedPosition}
startPositionLabel={result.formattedStartPosition}

11
apps/website/components/races/RaceResultRow.tsx
View File

@@ -1,15 +1,14 @@
'use client';
import { CountryFlagDisplay } from '@/lib/display-objects/CountryFlagDisplay';
import { Image } from '@/ui/Image';
import { ResultRow, PositionBadge, ResultPoints } from '@/ui/ResultRow';
import { Text } from '@/ui/Text';
import { CountryFlagFormatter } from '@/lib/formatters/CountryFlagFormatter';
import { Badge } from '@/ui/Badge';
import { Box } from '@/ui/Box';
import { Group } from '@/ui/Group';
import { Image } from '@/ui/Image';
import { PositionBadge, ResultPoints, ResultRow } from '@/ui/ResultRow';
import { Stack } from '@/ui/Stack';
import { Surface } from '@/ui/Surface';
import React from 'react';
import { Text } from '@/ui/Text';
interface ResultEntry {
position: number;
@@ -62,7 +61,7 @@ export function RaceResultRow({ result, points }: RaceResultRowProps) {
justifyContent="center"
>
<Text size="xs" style={{ fontSize: '0.625rem' }}>
{CountryFlagDisplay.fromCountryCode(country).toString()}
{CountryFlagFormatter.fromCountryCode(country).toString()}
</Text>
</Surface>
</Box>

4
apps/website/components/social/FriendsPreview.tsx
View File

@@ -1,7 +1,7 @@
'use client';
import { mediaConfig } from '@/lib/config/mediaConfig';
import { CountryFlagDisplay } from '@/lib/display-objects/CountryFlagDisplay';
import { CountryFlagFormatter } from '@/lib/formatters/CountryFlagFormatter';
import { routes } from '@/lib/routing/RouteConfig';
import { Card, Card as Surface } from '@/ui/Card';
import { Heading } from '@/ui/Heading';
@@ -68,7 +68,7 @@ export function FriendsPreview({ friends }: FriendsPreviewProps) {
/>
</Stack>
<Text size="sm" color="text-white">{friend.name}</Text>
<Text size="lg">{CountryFlagDisplay.fromCountryCode(friend.country).toString()}</Text>
<Text size="lg">{CountryFlagFormatter.fromCountryCode(friend.country).toString()}</Text>
</Surface>
</Link>
</Stack>

18
apps/website/components/teams/TeamRoster.tsx
View File

@@ -1,6 +1,5 @@
'use client';
import { MinimalEmptyState } from '@/ui/EmptyState';
import { TeamRosterItem } from '@/components/teams/TeamRosterItem';
import { TeamRosterList } from '@/components/teams/TeamRosterList';
import { useTeamRoster } from "@/hooks/team/useTeamRoster";
@@ -9,15 +8,16 @@ import { sortMembers } from '@/lib/utilities/roster-utils';
import type { DriverViewModel } from '@/lib/view-models/DriverViewModel';
import { Button } from '@/ui/Button';
import { Card } from '@/ui/Card';
import { MinimalEmptyState } from '@/ui/EmptyState';
import { Heading } from '@/ui/Heading';
import { Stack } from '@/ui/Stack';
import { Select } from '@/ui/Select';
import { Stack } from '@/ui/Stack';
import { Text } from '@/ui/Text';
import { useMemo, useState } from 'react';
import { MemberDisplay } from '@/lib/display-objects/MemberDisplay';
import { RatingDisplay } from '@/lib/display-objects/RatingDisplay';
import { DateDisplay } from '@/lib/display-objects/DateDisplay';
import { DateFormatter } from '@/lib/formatters/DateFormatter';
import { MemberFormatter } from '@/lib/formatters/MemberFormatter';
import { RatingFormatter } from '@/lib/formatters/RatingFormatter';
export type TeamRole = 'owner' | 'admin' | 'member';
export type TeamMemberRole = 'owner' | 'manager' | 'member';
@@ -74,7 +74,7 @@ export function TeamRoster({
const teamAverageRatingLabel = useMemo(() => {
if (teamMembers.length === 0) return '—';
const avg = teamMembers.reduce((sum: number, m: { rating?: number | null }) => sum + (m.rating || 0), 0) / teamMembers.length;
return RatingDisplay.format(avg);
return RatingFormatter.format(avg);
}, [teamMembers]);
if (loading) {
@@ -93,7 +93,7 @@ export function TeamRoster({
<Stack>
<Heading level={3}>Team Roster</Heading>
<Text size="sm" color="text-gray-400" block mt={1}>
{MemberDisplay.formatCount(memberships.length)} • Avg Rating:{' '}
{MemberFormatter.formatCount(memberships.length)} • Avg Rating:{' '}
<Text color="text-primary-blue" weight="medium">{teamAverageRatingLabel}</Text>
</Text>
</Stack>
@@ -129,8 +129,8 @@ export function TeamRoster({
driver={driver as DriverViewModel}
href={`${routes.driver.detail(driver.id)}?from=team&teamId=${teamId}`}
roleLabel={getRoleLabel(role)}
joinedAtLabel={DateDisplay.formatShort(joinedAt)}
ratingLabel={RatingDisplay.format(rating)}
joinedAtLabel={DateFormatter.formatShort(joinedAt)}
ratingLabel={RatingFormatter.format(rating)}
overallRankLabel={overallRank !== null ? `#${overallRank}` : null}
actions={canManageMembership ? (
<>

160
apps/website/eslint-rules/ANALYSIS.md Normal file
View File

@@ -0,0 +1,160 @@
# ESLint Rule Analysis for RaceWithSOFViewModel.ts
## File Analyzed
`apps/website/lib/view-models/RaceWithSOFViewModel.ts`
## Violations Found
### 1. DTO Import (Line 1)
```typescript
import { RaceWithSOFDTO } from '@/lib/types/generated/RaceWithSOFDTO';
```
**Rule Violated**: `view-model-taxonomy.js`
**Reason**:
- Imports from DTO path (`lib/types/generated/`)
- Uses DTO naming convention (`RaceWithSOFDTO`)
### 2. Inline ViewData Interface (Lines 9-13)
```typescript
export interface RaceWithSOFViewData {
id: string;
track: string;
strengthOfField: number | null;
}
```
**Rule Violated**: `view-model-taxonomy.js`
**Reason**: Defines ViewData interface inline instead of importing from `lib/view-data/`
## Rule Gaps Identified
### Current Rule Issues
1. **Incomplete import checking**: Only reported if imported name contained "DTO", but should forbid ALL imports from disallowed paths
2. **No strict whitelist**: Didn't enforce that imports MUST be from allowed paths
3. **Poor relative import handling**: Couldn't properly resolve relative imports
4. **Missing strict import message**: No message for general import path violations
### Architectural Requirements
The project requires:
1. **Forbid "dto" in the whole directory** ✓ (covered)
2. **Imports only from contracts or view models/view data dir** ✗ (partially covered)
3. **No inline view data interfaces** ✓ (covered)
## Improvements Made
### 1. Updated `view-model-taxonomy.js`
**Changes**:
- Added `strictImport` message for general import path violations
- Changed import check to report for ANY import from disallowed paths (not just those with "DTO" in name)
- Added strict import path enforcement with whitelist
- Improved relative import handling
- Added null checks for `node.id` in interface/type checks
**New Behavior**:
- Forbids ALL imports from DTO/service paths (`lib/types/generated/`, `lib/dtos/`, `lib/api/`, `lib/services/`)
- Enforces strict whitelist: only allows imports from `@/lib/contracts/`, `@/lib/view-models/`, `@/lib/view-data/`
- Allows external imports (npm packages)
- Handles relative imports with heuristic pattern matching
### 2. Updated `test-view-model-taxonomy.js`
**Changes**:
- Added test for service layer imports
- Added test for strict import violations
- Updated test summary to include new test cases
## Test Results
### Before Improvements
- Test 1 (DTO import): ✓ PASS
- Test 2 (Inline ViewData): ✓ PASS
- Test 3 (Valid code): ✓ PASS
### After Improvements
- Test 1 (DTO import): ✓ PASS
- Test 2 (Inline ViewData): ✓ PASS
- Test 3 (Valid code): ✓ PASS
- Test 4 (Service import): ✓ PASS (new)
- Test 5 (Strict import): ✓ PASS (new)
## Recommended Refactoring for RaceWithSOFViewModel.ts
### Current Code (Violations)
```typescript
import { RaceWithSOFDTO } from '@/lib/types/generated/RaceWithSOFDTO';
import { ViewModel } from "../contracts/view-models/ViewModel";
export interface RaceWithSOFViewData {
id: string;
track: string;
strengthOfField: number | null;
}
export class RaceWithSOFViewModel extends ViewModel {
private readonly data: RaceWithSOFViewData;
constructor(data: RaceWithSOFViewData) {
super();
this.data = data;
}
get id(): string { return this.data.id; }
get track(): string { return this.data.track; }
get strengthOfField(): number | null { return this.data.strengthOfField; }
}
```
### Fixed Code (No Violations)
```typescript
import { ViewModel } from "../contracts/view-models/ViewModel";
import { RaceWithSOFViewData } from '@/lib/view-data/RaceWithSOFViewData';
export class RaceWithSOFViewModel extends ViewModel {
private readonly data: RaceWithSOFViewData;
constructor(data: RaceWithSOFViewData) {
super();
this.data = data;
}
get id(): string { return this.data.id; }
get track(): string { return this.data.track; }
get strengthOfField(): number | null { return this.data.strengthOfField; }
}
```
**Changes**:
1. Removed DTO import (`RaceWithSOFDTO`)
2. Moved ViewData interface to `lib/view-data/RaceWithSOFViewData.ts`
3. Imported ViewData from proper location
## Additional Recommendations
### 1. Consider Splitting the Rule
If the rule becomes too complex, consider splitting it into:
- `view-model-taxonomy.js`: Keep only DTO and ViewData definition checks
- `view-model-imports.js`: New rule for strict import path enforcement
### 2. Improve Relative Import Handling
The current heuristic for relative imports may have false positives/negatives. Consider:
- Using a path resolver
- Requiring absolute imports with `@/` prefix
- Adding configuration for allowed relative import patterns
### 3. Add More Tests
- Test with nested view model directories
- Test with type imports (`import type`)
- Test with external package imports
- Test with relative imports from different depths
### 4. Update Documentation
- Document the allowed import paths
- Provide examples of correct and incorrect usage
- Update the rule description to reflect the new strict import enforcement
## Conclusion
The updated `view-model-taxonomy.js` rule now properly enforces all three architectural requirements:
1. ✓ Forbids "DTO" in identifiers
2. ✓ Enforces strict import path whitelist
3. ✓ Forbids inline ViewData definitions
The rule is more robust and catches more violations while maintaining backward compatibility with existing valid code.

87
apps/website/eslint-rules/display-object-rules.js
View File

@@ -1,87 +0,0 @@
/**
* ESLint rules for Display Object Guardrails
*
* Enforces display object boundaries and purity
*/
module.exports = {
// Rule 1: No IO in display objects
'no-io-in-display-objects': {
meta: {
type: 'problem',
docs: {
description: 'Forbid IO imports in display objects',
category: 'Display Objects',
},
messages: {
message: 'DisplayObjects cannot import from api, services, page-queries, or view-models - see apps/website/lib/contracts/display-objects/DisplayObject.ts',
},
},
create(context) {
const forbiddenPaths = [
'@/lib/api/',
'@/lib/services/',
'@/lib/page-queries/',
'@/lib/view-models/',
'@/lib/presenters/',
];
return {
ImportDeclaration(node) {
const importPath = node.source.value;
if (forbiddenPaths.some(path => importPath.includes(path)) &&
!isInComment(node)) {
context.report({
node,
messageId: 'message',
});
}
},
};
},
},
// Rule 2: No non-class display exports
'no-non-class-display-exports': {
meta: {
type: 'problem',
docs: {
description: 'Forbid non-class exports in display objects',
category: 'Display Objects',
},
messages: {
message: 'Display Objects must be class-based and export only classes - see apps/website/lib/contracts/display-objects/DisplayObject.ts',
},
},
create(context) {
return {
ExportNamedDeclaration(node) {
if (node.declaration &&
(node.declaration.type === 'FunctionDeclaration' ||
(node.declaration.type === 'VariableDeclaration' &&
!node.declaration.declarations.some(d => d.init && d.init.type === 'ClassExpression')))) {
context.report({
node,
messageId: 'message',
});
}
},
ExportDefaultDeclaration(node) {
if (node.declaration &&
node.declaration.type !== 'ClassDeclaration' &&
node.declaration.type !== 'ClassExpression') {
context.report({
node,
messageId: 'message',
});
}
},
};
},
},
};
// Helper functions
function isInComment(node) {
return false;
}

138
apps/website/eslint-rules/formatter-rules.js Normal file
View File

@@ -0,0 +1,138 @@
/**
* ESLint rules for Formatter/Display Guardrails
*
* Enforces boundaries and purity for Formatters and Display Objects
*/
module.exports = {
// Rule 1: No IO in formatters/displays
'no-io-in-display-objects': {
meta: {
type: 'problem',
docs: {
description: 'Forbid IO imports in formatters and displays',
category: 'Formatters',
},
messages: {
message: 'Formatters/Displays cannot import from api, services, page-queries, or view-models - see apps/website/lib/contracts/formatters/Formatter.ts',
},
},
create(context) {
const forbiddenPaths = [
'@/lib/api/',
'@/lib/services/',
'@/lib/page-queries/',
'@/lib/view-models/',
'@/lib/presenters/',
];
return {
ImportDeclaration(node) {
const importPath = node.source.value;
if (forbiddenPaths.some(path => importPath.includes(path)) &&
!isInComment(node)) {
context.report({
node,
messageId: 'message',
});
}
},
};
},
},
// Rule 2: No non-class display exports
'no-non-class-display-exports': {
meta: {
type: 'problem',
docs: {
description: 'Forbid non-class exports in formatters and displays',
category: 'Formatters',
},
messages: {
message: 'Formatters and Displays must be class-based and export only classes - see apps/website/lib/contracts/formatters/Formatter.ts',
},
},
create(context) {
return {
ExportNamedDeclaration(node) {
if (node.declaration &&
(node.declaration.type === 'FunctionDeclaration' ||
(node.declaration.type === 'VariableDeclaration' &&
!node.declaration.declarations.some(d => d.init && d.init.type === 'ClassExpression')))) {
context.report({
node,
messageId: 'message',
});
}
},
ExportDefaultDeclaration(node) {
if (node.declaration &&
node.declaration.type !== 'ClassDeclaration' &&
node.declaration.type !== 'ClassExpression') {
context.report({
node,
messageId: 'message',
});
}
},
};
},
},
// Rule 3: Formatters must return primitives
'formatters-must-return-primitives': {
meta: {
type: 'problem',
docs: {
description: 'Enforce that Formatters return primitive values for ViewData compatibility',
category: 'Formatters',
},
messages: {
message: 'Formatters used in ViewDataBuilders must return primitive values (string, number, boolean, null) - see apps/website/lib/contracts/formatters/Formatter.ts',
},
},
create(context) {
const filename = context.getFilename();
const isViewDataBuilder = filename.includes('/lib/builders/view-data/');
if (!isViewDataBuilder) return {};
return {
CallExpression(node) {
// Check if calling a Formatter/Display method
if (node.callee.type === 'MemberExpression' &&
node.callee.object.name &&
(node.callee.object.name.endsWith('Formatter') || node.callee.object.name.endsWith('Display'))) {
// If it's inside a ViewData object literal, it must be a primitive return
let parent = node.parent;
while (parent) {
if (parent.type === 'Property' && parent.parent.type === 'ObjectExpression') {
// This is a property in an object literal (likely ViewData)
// We can't easily check the return type of the method at lint time without type info,
// but we can enforce that it's not the whole object being assigned.
if (node.callee.property.name === 'format' || node.callee.property.name.startsWith('format')) {
// Good: calling a format method
return;
}
// If they are assigning the result of a non-format method, warn
context.report({
node,
messageId: 'message',
});
}
parent = parent.parent;
}
}
},
};
},
},
};
// Helper functions
function isInComment(node) {
return false;
}

10
apps/website/eslint-rules/index.js
View File

@@ -17,7 +17,7 @@
const presenterContract = require('./presenter-contract');
const rscBoundaryRules = require('./rsc-boundary-rules');
const templatePurityRules = require('./template-purity-rules');
const displayObjectRules = require('./display-object-rules');
const displayObjectRules = require('./formatter-rules');
const pageQueryRules = require('./page-query-rules');
const servicesRules = require('./services-rules');
const clientOnlyRules = require('./client-only-rules');
@@ -30,7 +30,6 @@ const mutationContract = require('./mutation-contract');
const serverActionsMustUseMutations = require('./server-actions-must-use-mutations');
const viewDataLocation = require('./view-data-location');
const viewDataBuilderContract = require('./view-data-builder-contract');
const viewModelBuilderContract = require('./view-model-builder-contract');
const singleExportPerFile = require('./single-export-per-file');
const filenameMatchesExport = require('./filename-matches-export');
const pageQueryMustUseBuilders = require('./page-query-must-use-builders');
@@ -48,9 +47,9 @@ const serverActionsInterface = require('./server-actions-interface');
const noDisplayObjectsInUi = require('./no-display-objects-in-ui');
const viewDataBuilderImplements = require('./view-data-builder-implements');
const viewDataBuilderImports = require('./view-data-builder-imports');
const viewModelBuilderImplements = require('./view-model-builder-implements');
const viewDataImplements = require('./view-data-implements');
const viewModelImplements = require('./view-model-implements');
const viewModelTaxonomy = require('./view-model-taxonomy');
module.exports = {
rules: {
@@ -84,6 +83,7 @@ module.exports = {
// Display Object Rules
'display-no-domain-models': displayObjectRules['no-io-in-display-objects'],
'display-no-business-logic': displayObjectRules['no-non-class-display-exports'],
'formatters-must-return-primitives': displayObjectRules['formatters-must-return-primitives'],
'no-display-objects-in-ui': noDisplayObjectsInUi,
// Page Query Rules
@@ -138,9 +138,8 @@ module.exports = {
'view-data-implements': viewDataImplements,
// View Model Rules
'view-model-builder-contract': viewModelBuilderContract,
'view-model-builder-implements': viewModelBuilderImplements,
'view-model-implements': viewModelImplements,
'view-model-taxonomy': viewModelTaxonomy,
// Single Export Rules
'single-export-per-file': singleExportPerFile,
@@ -220,6 +219,7 @@ module.exports = {
// Display Objects
'gridpilot-rules/display-no-domain-models': 'error',
'gridpilot-rules/display-no-business-logic': 'error',
'gridpilot-rules/formatters-must-return-primitives': 'error',
'gridpilot-rules/no-display-objects-in-ui': 'error',
// Page Queries

12
apps/website/eslint-rules/template-purity-rules.js
View File

@@ -1,6 +1,6 @@
/**
* ESLint rules for Template Purity Guardrails
*
*
* Enforces pure template components without business logic
*/
@@ -14,17 +14,21 @@ module.exports = {
category: 'Template Purity',
},
messages: {
message: 'ViewModels or DisplayObjects import forbidden in templates - see apps/website/lib/contracts/view-data/ViewData.ts',
message: 'ViewModels or DisplayObjects import forbidden in templates - see apps/website/lib/contracts/view-data/ViewData.ts. Templates should only receive logic-rich ViewModels via props from ClientWrappers, never import them directly.',
},
},
create(context) {
return {
ImportDeclaration(node) {
const importPath = node.source.value;
if ((importPath.includes('@/lib/view-models/') ||
// Templates are allowed to import ViewModels for TYPE-ONLY usage (interface/type)
// but not for instantiation or logic. However, to be safe, we forbid direct imports
// and suggest passing them through ClientWrappers.
if ((importPath.includes('@/lib/view-models/') ||
importPath.includes('@/lib/presenters/') ||
importPath.includes('@/lib/display-objects/')) &&
!isInComment(node)) {
!isInComment(node) &&
node.importKind !== 'type') {
context.report({
node,
messageId: 'message',

168
apps/website/eslint-rules/test-view-model-taxonomy.js Normal file
View File

@@ -0,0 +1,168 @@
/**
* Test script for view-model-taxonomy rule
*/
const rule = require('./view-model-taxonomy.js');
const { Linter } = require('eslint');
const linter = new Linter();
// Register the plugin
linter.defineRule('gridpilot-rules/view-model-taxonomy', rule);
// Test 1: DTO import should be caught
const codeWithDtoImport = `
import type { RecordEngagementOutputDTO } from '@/lib/types/generated/RecordEngagementOutputDTO';
export class RecordEngagementOutputViewModel {
eventId: string;
engagementWeight: number;
constructor(dto: RecordEngagementOutputDTO) {
this.eventId = dto.eventId;
this.engagementWeight = dto.engagementWeight;
}
}
`;
// Test 2: Inline ViewData interface should be caught
const codeWithInlineViewData = `
export interface RaceViewData {
id: string;
name: string;
}
export class RaceViewModel {
private readonly data: RaceViewData;
constructor(data: RaceViewData) {
this.data = data;
}
}
`;
// Test 3: Valid code (no violations)
const validCode = `
import { RaceViewData } from '@/lib/view-data/RaceViewData';
export class RaceViewModel {
private readonly data: RaceViewData;
constructor(data: RaceViewData) {
this.data = data;
}
}
`;
// Test 4: Disallowed import from service layer (should be caught)
const codeWithServiceImport = `
import { SomeService } from '@/lib/services/SomeService';
export class RaceViewModel {
private readonly service: SomeService;
constructor(service: SomeService) {
this.service = service;
}
}
`;
// Test 5: Strict import violation (import from non-allowed path)
const codeWithStrictImportViolation = `
import { SomeOtherThing } from '@/lib/other/SomeOtherThing';
export class RaceViewModel {
private readonly thing: SomeOtherThing;
constructor(thing: SomeOtherThing) {
this.thing = thing;
}
}
`;
console.log('=== Test 1: DTO import ===');
const messages1 = linter.verify(codeWithDtoImport, {
parser: '@typescript-eslint/parser',
parserOptions: {
ecmaVersion: 2020,
sourceType: 'module',
},
rules: {
'gridpilot-rules/view-model-taxonomy': 'error',
},
});
console.log('Messages:', messages1);
console.log('Expected: Should have 1 error for DTO import');
console.log('Actual: ' + messages1.length + ' error(s)');
console.log('');
console.log('=== Test 2: Inline ViewData interface ===');
const messages2 = linter.verify(codeWithInlineViewData, {
parser: '@typescript-eslint/parser',
parserOptions: {
ecmaVersion: 2020,
sourceType: 'module',
},
rules: {
'gridpilot-rules/view-model-taxonomy': 'error',
},
});
console.log('Messages:', messages2);
console.log('Expected: Should have 1 error for inline ViewData interface');
console.log('Actual: ' + messages2.length + ' error(s)');
console.log('');
console.log('=== Test 3: Valid code ===');
const messages3 = linter.verify(validCode, {
parser: '@typescript-eslint/parser',
parserOptions: {
ecmaVersion: 2020,
sourceType: 'module',
},
rules: {
'gridpilot-rules/view-model-taxonomy': 'error',
},
});
console.log('Messages:', messages3);
console.log('Expected: Should have 0 errors');
console.log('Actual: ' + messages3.length + ' error(s)');
console.log('');
console.log('=== Test 4: Service import (should be caught) ===');
const messages4 = linter.verify(codeWithServiceImport, {
parser: '@typescript-eslint/parser',
parserOptions: {
ecmaVersion: 2020,
sourceType: 'module',
},
rules: {
'gridpilot-rules/view-model-taxonomy': 'error',
},
});
console.log('Messages:', messages4);
console.log('Expected: Should have 1 error for service import');
console.log('Actual: ' + messages4.length + ' error(s)');
console.log('');
console.log('=== Test 5: Strict import violation ===');
const messages5 = linter.verify(codeWithStrictImportViolation, {
parser: '@typescript-eslint/parser',
parserOptions: {
ecmaVersion: 2020,
sourceType: 'module',
},
rules: {
'gridpilot-rules/view-model-taxonomy': 'error',
},
});
console.log('Messages:', messages5);
console.log('Expected: Should have 1 error for strict import violation');
console.log('Actual: ' + messages5.length + ' error(s)');
console.log('');
console.log('=== Summary ===');
console.log('Test 1 (DTO import): ' + (messages1.length === 1 ? '✓ PASS' : '✗ FAIL'));
console.log('Test 2 (Inline ViewData): ' + (messages2.length === 1 ? '✓ PASS' : '✗ FAIL'));
console.log('Test 3 (Valid code): ' + (messages3.length === 0 ? '✓ PASS' : '✗ FAIL'));
console.log('Test 4 (Service import): ' + (messages4.length === 1 ? '✓ PASS' : '✗ FAIL'));
console.log('Test 5 (Strict import): ' + (messages5.length === 1 ? '✓ PASS' : '✗ FAIL'));

59
apps/website/eslint-rules/view-data-builder-contract.js
View File

@@ -4,8 +4,9 @@
* View Data Builders must:
* 1. Be classes named *ViewDataBuilder
* 2. Have a static build() method
* 3. Accept API DTO as parameter (named 'apiDto', NOT 'pageDto')
* 4. Return View Data
* 3. Use 'satisfies ViewDataBuilder<...>' for static enforcement
* 4. Accept API DTO as parameter (named 'apiDto')
* 5. Return View Data
*/
module.exports = {
@@ -20,7 +21,8 @@ module.exports = {
schema: [],
messages: {
notAClass: 'View Data Builders must be classes named *ViewDataBuilder',
missingBuildMethod: 'View Data Builders must have a static build() method',
missingStaticBuild: 'View Data Builders must have a static build() method',
missingSatisfies: 'View Data Builders must use "satisfies ViewDataBuilder<...>" for static type enforcement',
invalidBuildSignature: 'build() method must accept API DTO and return View Data',
wrongParameterName: 'Parameter must be named "apiDto", not "pageDto" or other names',
},
@@ -32,7 +34,8 @@ module.exports = {
if (!isInViewDataBuilders) return {};
let hasBuildMethod = false;
let hasStaticBuild = false;
let hasSatisfies = false;
let hasCorrectSignature = false;
let hasCorrectParameterName = false;
@@ -49,28 +52,28 @@ module.exports = {
}
// Check for static build method
const buildMethod = node.body.body.find(member =>
const staticBuild = node.body.body.find(member =>
member.type === 'MethodDefinition' &&
member.key.type === 'Identifier' &&
member.key.name === 'build' &&
member.static === true
);
if (buildMethod) {
hasBuildMethod = true;
if (staticBuild) {
hasStaticBuild = true;
// Check signature - should have at least one parameter
if (buildMethod.value &&
buildMethod.value.params &&
buildMethod.value.params.length > 0) {
if (staticBuild.value &&
staticBuild.value.params &&
staticBuild.value.params.length > 0) {
hasCorrectSignature = true;
// Check parameter name
const firstParam = buildMethod.value.params[0];
const firstParam = staticBuild.value.params[0];
if (firstParam.type === 'Identifier' && firstParam.name === 'apiDto') {
hasCorrectParameterName = true;
} else if (firstParam.type === 'Identifier' && firstParam.name === 'pageDto') {
// Report specific error for pageDto
} else if (firstParam.type === 'Identifier' && (firstParam.name === 'pageDto' || firstParam.name === 'dto')) {
// Report specific error for wrong names
context.report({
node: firstParam,
messageId: 'wrongParameterName',
@@ -80,23 +83,35 @@ module.exports = {
}
},
// Check for satisfies expression
TSSatisfiesExpression(node) {
if (node.typeAnnotation &&
node.typeAnnotation.type === 'TSTypeReference' &&
node.typeAnnotation.typeName.name === 'ViewDataBuilder') {
hasSatisfies = true;
}
},
'Program:exit'() {
if (!hasBuildMethod) {
if (!hasStaticBuild) {
context.report({
node: context.getSourceCode().ast,
messageId: 'missingBuildMethod',
messageId: 'missingStaticBuild',
});
} else if (!hasCorrectSignature) {
}
if (!hasSatisfies) {
context.report({
node: context.getSourceCode().ast,
messageId: 'missingSatisfies',
});
}
if (hasStaticBuild && !hasCorrectSignature) {
context.report({
node: context.getSourceCode().ast,
messageId: 'invalidBuildSignature',
});
} else if (!hasCorrectParameterName) {
// Only report if not already reported for pageDto
context.report({
node: context.getSourceCode().ast,
messageId: 'wrongParameterName',
});
}
},
};

32
apps/website/eslint-rules/view-data-builder-implements.js
View File

@@ -3,8 +3,9 @@
*
* View Data Builders in lib/builders/view-data/ must:
* 1. Be classes named *ViewDataBuilder
* 2. Implement the ViewDataBuilder<TInput, TOutput> interface
* 3. Have a static build() method
* 2. Have a static build() method
*
* Note: 'implements' is deprecated in favor of 'satisfies' checked in view-data-builder-contract.js
*/
module.exports = {
@@ -19,7 +20,6 @@ module.exports = {
schema: [],
messages: {
notAClass: 'View Data Builders must be classes named *ViewDataBuilder',
missingImplements: 'View Data Builders must implement ViewDataBuilder<TInput, TOutput> interface',
missingBuildMethod: 'View Data Builders must have a static build() method',
},
},
@@ -30,7 +30,6 @@ module.exports = {
if (!isInViewDataBuilders) return {};
let hasImplements = false;
let hasBuildMethod = false;
return {
@@ -45,24 +44,6 @@ module.exports = {
});
}
// Check if class implements ViewDataBuilder interface
if (node.implements && node.implements.length > 0) {
for (const impl of node.implements) {
// Handle GenericTypeAnnotation for ViewDataBuilder<TInput, TOutput>
if (impl.expression.type === 'TSInstantiationExpression') {
const expr = impl.expression.expression;
if (expr.type === 'Identifier' && expr.name === 'ViewDataBuilder') {
hasImplements = true;
}
} else if (impl.expression.type === 'Identifier') {
// Handle simple ViewDataBuilder (without generics)
if (impl.expression.name === 'ViewDataBuilder') {
hasImplements = true;
}
}
}
}
// Check for static build method
const buildMethod = node.body.body.find(member =>
member.type === 'MethodDefinition' &&
@@ -77,13 +58,6 @@ module.exports = {
},
'Program:exit'() {
if (!hasImplements) {
context.report({
node: context.getSourceCode().ast,
messageId: 'missingImplements',
});
}
if (!hasBuildMethod) {
context.report({
node: context.getSourceCode().ast,

7
apps/website/eslint-rules/view-data-builder-imports.js
View File

@@ -19,6 +19,7 @@ module.exports = {
messages: {
invalidDtoImport: 'ViewDataBuilders must import DTO types from lib/types/generated/, not from {{importPath}}',
invalidViewDataImport: 'ViewDataBuilders must import ViewData types from lib/view-data/, not from {{importPath}}',
noViewModelsInBuilders: 'ViewDataBuilders must not import ViewModels. ViewModels are client-only logic wrappers. Builders should only produce plain ViewData.',
missingDtoImport: 'ViewDataBuilders must import DTO types from lib/types/generated/',
missingViewDataImport: 'ViewDataBuilders must import ViewData types from lib/view-data/',
},
@@ -40,8 +41,8 @@ module.exports = {
const importPath = node.source.value;
// Check for DTO imports (should be from lib/types/generated/)
if (importPath.includes('/lib/types/')) {
if (!importPath.includes('/lib/types/generated/')) {
if (importPath.includes('/lib/types/') || importPath.includes('@/lib/types/') || importPath.includes('../../types/')) {
if (!importPath.includes('/lib/types/generated/') && !importPath.includes('@/lib/types/generated/') && !importPath.includes('../../types/generated/')) {
dtoImportPath = importPath;
context.report({
node,
@@ -54,7 +55,7 @@ module.exports = {
}
// Check for ViewData imports (should be from lib/view-data/)
if (importPath.includes('/lib/view-data/')) {
if (importPath.includes('/lib/view-data/') || importPath.includes('@/lib/view-data/') || importPath.includes('../../view-data/')) {
hasViewDataImport = true;
viewDataImportPath = importPath;
}

27
apps/website/eslint-rules/view-data-implements.js
View File

@@ -4,6 +4,7 @@
* ViewData files in lib/view-data/ must:
* 1. Be interfaces or types named *ViewData
* 2. Extend the ViewData interface from contracts
* 3. NOT contain ViewModels (ViewModels are for ClientWrappers/Hooks)
*/
module.exports = {
@@ -19,6 +20,7 @@ module.exports = {
messages: {
notAnInterface: 'ViewData files must be interfaces or types named *ViewData',
missingExtends: 'ViewData must extend the ViewData interface from lib/contracts/view-data/ViewData.ts',
noViewModelsInViewData: 'ViewData must not contain ViewModels. ViewData is for plain JSON data (DTOs) passed through SSR. Use ViewModels in ClientWrappers or Hooks instead.',
},
},
@@ -32,12 +34,37 @@ module.exports = {
let hasCorrectName = false;
return {
// Check for ViewModel imports
ImportDeclaration(node) {
if (!isInViewData) return;
const importPath = node.source.value;
if (importPath.includes('/lib/view-models/')) {
context.report({
node,
messageId: 'noViewModelsInViewData',
});
}
},
// Check interface declarations
TSInterfaceDeclaration(node) {
const interfaceName = node.id?.name;
if (interfaceName && interfaceName.endsWith('ViewData')) {
hasCorrectName = true;
// Check for ViewModel usage in properties
node.body.body.forEach(member => {
if (member.type === 'TSPropertySignature' && member.typeAnnotation) {
const typeAnnotation = member.typeAnnotation.typeAnnotation;
if (isViewModelType(typeAnnotation)) {
context.report({
node: member,
messageId: 'noViewModelsInViewData',
});
}
}
});
// Check if it extends ViewData
if (node.extends && node.extends.length > 0) {

84
apps/website/eslint-rules/view-model-builder-contract.js
View File

@@ -1,84 +0,0 @@
/**
* ESLint rule to enforce View Model Builder contract
*
* View Model Builders must:
* 1. Be classes named *ViewModelBuilder
* 2. Have a static build() method
* 3. Accept View Data as parameter
* 4. Return View Model
*/
module.exports = {
meta: {
type: 'problem',
docs: {
description: 'Enforce View Model Builder contract',
category: 'Builders',
recommended: true,
},
fixable: null,
schema: [],
messages: {
notAClass: 'View Model Builders must be classes named *ViewModelBuilder',
missingBuildMethod: 'View Model Builders must have a static build() method',
invalidBuildSignature: 'build() method must accept View Data and return View Model',
},
},
create(context) {
const filename = context.getFilename();
const isInViewModelBuilders = filename.includes('/lib/builders/view-models/');
if (!isInViewModelBuilders) return {};
let hasBuildMethod = false;
let hasCorrectSignature = false;
return {
// Check class declaration
ClassDeclaration(node) {
const className = node.id?.name;
if (!className || !className.endsWith('ViewModelBuilder')) {
context.report({
node,
messageId: 'notAClass',
});
}
// Check for static build method
const buildMethod = node.body.body.find(member =>
member.type === 'MethodDefinition' &&
member.key.type === 'Identifier' &&
member.key.name === 'build' &&
member.static === true
);
if (buildMethod) {
hasBuildMethod = true;
// Check signature - should have at least one parameter
if (buildMethod.value &&
buildMethod.value.params &&
buildMethod.value.params.length > 0) {
hasCorrectSignature = true;
}
}
},
'Program:exit'() {
if (!hasBuildMethod) {
context.report({
node: context.getSourceCode().ast,
messageId: 'missingBuildMethod',
});
} else if (!hasCorrectSignature) {
context.report({
node: context.getSourceCode().ast,
messageId: 'invalidBuildSignature',
});
}
},
};
},
};

96
apps/website/eslint-rules/view-model-builder-implements.js
View File

@@ -1,96 +0,0 @@
/**
* ESLint rule to enforce View Model Builder contract implementation
*
* View Model Builders in lib/builders/view-models/ must:
* 1. Be classes named *ViewModelBuilder
* 2. Implement the ViewModelBuilder<TInput, TOutput> interface
* 3. Have a static build() method
*/
module.exports = {
meta: {
type: 'problem',
docs: {
description: 'Enforce View Model Builder contract implementation',
category: 'Builders',
recommended: true,
},
fixable: null,
schema: [],
messages: {
notAClass: 'View Model Builders must be classes named *ViewModelBuilder',
missingImplements: 'View Model Builders must implement ViewModelBuilder<TInput, TOutput> interface',
missingBuildMethod: 'View Model Builders must have a static build() method',
},
},
create(context) {
const filename = context.getFilename();
const isInViewModelBuilders = filename.includes('/lib/builders/view-models/');
if (!isInViewModelBuilders) return {};
let hasImplements = false;
let hasBuildMethod = false;
return {
// Check class declaration
ClassDeclaration(node) {
const className = node.id?.name;
if (!className || !className.endsWith('ViewModelBuilder')) {
context.report({
node,
messageId: 'notAClass',
});
}
// Check if class implements ViewModelBuilder interface
if (node.implements && node.implements.length > 0) {
for (const impl of node.implements) {
// Handle GenericTypeAnnotation for ViewModelBuilder<TInput, TOutput>
if (impl.expression.type === 'TSInstantiationExpression') {
const expr = impl.expression.expression;
if (expr.type === 'Identifier' && expr.name === 'ViewModelBuilder') {
hasImplements = true;
}
} else if (impl.expression.type === 'Identifier') {
// Handle simple ViewModelBuilder (without generics)
if (impl.expression.name === 'ViewModelBuilder') {
hasImplements = true;
}
}
}
}
// Check for static build method
const buildMethod = node.body.body.find(member =>
member.type === 'MethodDefinition' &&
member.key.type === 'Identifier' &&
member.key.name === 'build' &&
member.static === true
);
if (buildMethod) {
hasBuildMethod = true;
}
},
'Program:exit'() {
if (!hasImplements) {
context.report({
node: context.getSourceCode().ast,
messageId: 'missingImplements',
});
}
if (!hasBuildMethod) {
context.report({
node: context.getSourceCode().ast,
messageId: 'missingBuildMethod',
});
}
},
};
},
};

106
apps/website/eslint-rules/view-model-taxonomy.js Normal file
View File

@@ -0,0 +1,106 @@
/**
* ESLint rule to enforce ViewModel and Builder architectural boundaries
*
* Rules:
* 1. ViewModels/Builders MUST NOT contain the word "DTO" in identifiers
* 2. ViewModels/Builders MUST NOT define inline DTO interfaces
* 3. ViewModels/Builders MUST NOT import from DTO paths (except generated types in Builders)
* 4. ViewModels MUST NOT define ViewData interfaces
*/
module.exports = {
meta: {
type: 'problem',
docs: {
description: 'Enforce ViewModel and Builder architectural boundaries',
category: 'Architecture',
recommended: true,
},
fixable: null,
schema: [],
messages: {
noDtoInViewModel: 'ViewModels and Builders must not use the word "DTO" in identifiers. DTOs belong to the API/Service layer. Use plain properties or ViewData types.',
noDtoImport: 'ViewModels must not import from DTO paths. DTOs belong to lib/types/generated/. Import from lib/view-data/ or use plain properties instead.',
noViewDataDefinition: 'ViewData must not be defined within ViewModel files. Import them from lib/view-data/ instead.',
noInlineDtoDefinition: 'DTOs must not be defined inline. Use generated types from lib/types/generated/ and import them.',
},
},
create(context) {
const filename = context.getFilename();
const isInViewModels = filename.includes('/lib/view-models/');
const isInBuilders = filename.includes('/lib/builders/');
if (!isInViewModels && !isInBuilders) return {};
return {
// Check for "DTO" in any identifier
Identifier(node) {
const name = node.name.toUpperCase();
if (name === 'DTO' || name.endsWith('DTO')) {
// Exception: Allow DTO in type references in Builders (for satisfies/input)
if (isInBuilders && (node.parent.type === 'TSTypeReference' || node.parent.type === 'TSQualifiedName')) {
return;
}
context.report({
node,
messageId: 'noDtoInViewModel',
});
}
},
// Check for imports from DTO paths
ImportDeclaration(node) {
const importPath = node.source.value;
// ViewModels are never allowed to import DTOs
if (isInViewModels && (
importPath.includes('/lib/types/generated/') ||
importPath.includes('/lib/dtos/') ||
importPath.includes('/lib/api/') ||
importPath.includes('/lib/services/')
)) {
context.report({
node,
messageId: 'noDtoImport',
});
}
},
// Check for ViewData definitions in ViewModels
TSInterfaceDeclaration(node) {
if (isInViewModels && node.id && node.id.name && node.id.name.endsWith('ViewData')) {
context.report({
node,
messageId: 'noViewDataDefinition',
});
}
// Check for inline DTO definitions in both ViewModels and Builders
if (node.id && node.id.name && node.id.name.toUpperCase().includes('DTO')) {
context.report({
node,
messageId: 'noInlineDtoDefinition',
});
}
},
TSTypeAliasDeclaration(node) {
if (isInViewModels && node.id && node.id.name && node.id.name.endsWith('ViewData')) {
context.report({
node,
messageId: 'noViewDataDefinition',
});
}
// Check for inline DTO definitions
if (node.id && node.id.name && node.id.name.toUpperCase().includes('DTO')) {
context.report({
node,
messageId: 'noInlineDtoDefinition',
});
}
},
};
},
};

12
apps/website/hooks/league/useLeagueSchedule.ts
View File

@@ -1,10 +1,10 @@
import { useQuery } from '@tanstack/react-query';
import { useInject } from '@/lib/di/hooks/useInject';
import { LEAGUE_SERVICE_TOKEN } from '@/lib/di/tokens';
import { enhanceQueryResult } from '@/lib/di/hooks/useReactQueryWithApiError';
import { LeagueScheduleViewModel, LeagueScheduleRaceViewModel } from '@/lib/view-models/LeagueScheduleViewModel';
import { LEAGUE_SERVICE_TOKEN } from '@/lib/di/tokens';
import { DateFormatter } from '@/lib/formatters/DateFormatter';
import type { RaceDTO } from '@/lib/types/generated/RaceDTO';
import { DateDisplay } from '@/lib/display-objects/DateDisplay';
import { LeagueScheduleRaceViewModel, LeagueScheduleViewModel } from '@/lib/view-models/LeagueScheduleViewModel';
import { useQuery } from '@tanstack/react-query';
function mapRaceDtoToViewModel(race: RaceDTO): LeagueScheduleRaceViewModel {
const scheduledAt = race.date ? new Date(race.date) : new Date(0);
@@ -15,8 +15,8 @@ function mapRaceDtoToViewModel(race: RaceDTO): LeagueScheduleRaceViewModel {
id: race.id,
name: race.name,
scheduledAt,
formattedDate: DateDisplay.formatShort(scheduledAt),
formattedTime: DateDisplay.formatTime(scheduledAt),
formattedDate: DateFormatter.formatShort(scheduledAt),
formattedTime: DateFormatter.formatTime(scheduledAt),
isPast,
isUpcoming: !isPast,
status: isPast ? 'completed' : 'scheduled',

14
apps/website/hooks/league/useLeagueScheduleAdminPageData.ts
View File

@@ -1,13 +1,13 @@
import { usePageData } from '@/lib/page/usePageData';
import { useInject } from '@/lib/di/hooks/useInject';
import { LEAGUE_SERVICE_TOKEN, LEAGUE_MEMBERSHIP_SERVICE_TOKEN } from '@/lib/di/tokens';
import { LEAGUE_MEMBERSHIP_SERVICE_TOKEN, LEAGUE_SERVICE_TOKEN } from '@/lib/di/tokens';
import { DateFormatter } from '@/lib/formatters/DateFormatter';
import { usePageData } from '@/lib/page/usePageData';
import type { LeagueSeasonSummaryDTO } from '@/lib/types/generated/LeagueSeasonSummaryDTO';
import type { RaceDTO } from '@/lib/types/generated/RaceDTO';
import { LeagueRoleUtility } from '@/lib/utilities/LeagueRoleUtility';
import { LeagueAdminScheduleViewModel } from '@/lib/view-models/LeagueAdminScheduleViewModel';
import { LeagueScheduleRaceViewModel } from '@/lib/view-models/LeagueScheduleViewModel';
import { LeagueSeasonSummaryViewModel } from '@/lib/view-models/LeagueSeasonSummaryViewModel';
import type { RaceDTO } from '@/lib/types/generated/RaceDTO';
import type { LeagueSeasonSummaryDTO } from '@/lib/types/generated/LeagueSeasonSummaryDTO';
import { DateDisplay } from '@/lib/display-objects/DateDisplay';
function mapRaceDtoToViewModel(race: RaceDTO): LeagueScheduleRaceViewModel {
const scheduledAt = race.date ? new Date(race.date) : new Date(0);
@@ -18,8 +18,8 @@ function mapRaceDtoToViewModel(race: RaceDTO): LeagueScheduleRaceViewModel {
id: race.id,
name: race.name,
scheduledAt,
formattedDate: DateDisplay.formatShort(scheduledAt),
formattedTime: DateDisplay.formatTime(scheduledAt),
formattedDate: DateFormatter.formatShort(scheduledAt),
formattedTime: DateFormatter.formatTime(scheduledAt),
isPast,
isUpcoming: !isPast,
status: isPast ? 'completed' : 'scheduled',

177
apps/website/lib/builders/view-data/AdminDashboardViewDataBuilder.test.ts
View File

@@ -1,154 +1,47 @@
import { describe, it, expect } from 'vitest';
import { describe, expect, it } from 'vitest';
import type { DashboardStatsResponseDto } from '../../types/generated/DashboardStatsResponseDTO';
import type { AdminDashboardViewData } from '../../view-data/AdminDashboardViewData';
import { AdminDashboardViewDataBuilder } from './AdminDashboardViewDataBuilder';
import type { DashboardStats } from '@/lib/types/admin';
describe('AdminDashboardViewDataBuilder', () => {
describe('happy paths', () => {
it('should transform DashboardStats DTO to AdminDashboardViewData correctly', () => {
const dashboardStats: DashboardStats = {
totalUsers: 1000,
activeUsers: 800,
suspendedUsers: 50,
deletedUsers: 150,
systemAdmins: 5,
recentLogins: 120,
newUsersToday: 15,
};
it('should transform DashboardStatsResponseDto to AdminDashboardViewData correctly', () => {
const apiDto: DashboardStatsResponseDto = {
totalUsers: 1000,
activeUsers: 800,
suspendedUsers: 50,
deletedUsers: 150,
systemAdmins: 5,
recentLogins: 200,
newUsersToday: 10,
};
const result = AdminDashboardViewDataBuilder.build(dashboardStats);
const result: AdminDashboardViewData = AdminDashboardViewDataBuilder.build(apiDto);
expect(result).toEqual({
stats: {
totalUsers: 1000,
activeUsers: 800,
suspendedUsers: 50,
deletedUsers: 150,
systemAdmins: 5,
recentLogins: 120,
newUsersToday: 15,
},
});
});
it('should handle zero values correctly', () => {
const dashboardStats: DashboardStats = {
totalUsers: 0,
activeUsers: 0,
suspendedUsers: 0,
deletedUsers: 0,
systemAdmins: 0,
recentLogins: 0,
newUsersToday: 0,
};
const result = AdminDashboardViewDataBuilder.build(dashboardStats);
expect(result).toEqual({
stats: {
totalUsers: 0,
activeUsers: 0,
suspendedUsers: 0,
deletedUsers: 0,
systemAdmins: 0,
recentLogins: 0,
newUsersToday: 0,
},
});
});
it('should handle large numbers correctly', () => {
const dashboardStats: DashboardStats = {
totalUsers: 1000000,
activeUsers: 750000,
suspendedUsers: 25000,
deletedUsers: 225000,
systemAdmins: 50,
recentLogins: 50000,
newUsersToday: 1000,
};
const result = AdminDashboardViewDataBuilder.build(dashboardStats);
expect(result.stats.totalUsers).toBe(1000000);
expect(result.stats.activeUsers).toBe(750000);
expect(result.stats.systemAdmins).toBe(50);
expect(result.stats).toEqual({
totalUsers: 1000,
activeUsers: 800,
suspendedUsers: 50,
deletedUsers: 150,
systemAdmins: 5,
recentLogins: 200,
newUsersToday: 10,
});
});
describe('data transformation', () => {
it('should preserve all DTO fields in the output', () => {
const dashboardStats: DashboardStats = {
totalUsers: 500,
activeUsers: 400,
suspendedUsers: 25,
deletedUsers: 75,
systemAdmins: 3,
recentLogins: 80,
newUsersToday: 10,
};
it('should not modify the input DTO', () => {
const apiDto: DashboardStatsResponseDto = {
totalUsers: 1000,
activeUsers: 800,
suspendedUsers: 50,
deletedUsers: 150,
systemAdmins: 5,
recentLogins: 200,
newUsersToday: 10,
};
const result = AdminDashboardViewDataBuilder.build(dashboardStats);
const originalDto = { ...apiDto };
AdminDashboardViewDataBuilder.build(apiDto);
expect(result.stats.totalUsers).toBe(dashboardStats.totalUsers);
expect(result.stats.activeUsers).toBe(dashboardStats.activeUsers);
expect(result.stats.suspendedUsers).toBe(dashboardStats.suspendedUsers);
expect(result.stats.deletedUsers).toBe(dashboardStats.deletedUsers);
expect(result.stats.systemAdmins).toBe(dashboardStats.systemAdmins);
expect(result.stats.recentLogins).toBe(dashboardStats.recentLogins);
expect(result.stats.newUsersToday).toBe(dashboardStats.newUsersToday);
});
it('should not modify the input DTO', () => {
const dashboardStats: DashboardStats = {
totalUsers: 100,
activeUsers: 80,
suspendedUsers: 5,
deletedUsers: 15,
systemAdmins: 2,
recentLogins: 20,
newUsersToday: 5,
};
const originalStats = { ...dashboardStats };
AdminDashboardViewDataBuilder.build(dashboardStats);
expect(dashboardStats).toEqual(originalStats);
});
});
describe('edge cases', () => {
it('should handle negative values (if API returns them)', () => {
const dashboardStats: DashboardStats = {
totalUsers: -1,
activeUsers: -1,
suspendedUsers: -1,
deletedUsers: -1,
systemAdmins: -1,
recentLogins: -1,
newUsersToday: -1,
};
const result = AdminDashboardViewDataBuilder.build(dashboardStats);
expect(result.stats.totalUsers).toBe(-1);
expect(result.stats.activeUsers).toBe(-1);
});
it('should handle very large numbers', () => {
const dashboardStats: DashboardStats = {
totalUsers: Number.MAX_SAFE_INTEGER,
activeUsers: Number.MAX_SAFE_INTEGER - 1000,
suspendedUsers: 100,
deletedUsers: 100,
systemAdmins: 10,
recentLogins: 1000,
newUsersToday: 100,
};
const result = AdminDashboardViewDataBuilder.build(dashboardStats);
expect(result.stats.totalUsers).toBe(Number.MAX_SAFE_INTEGER);
expect(result.stats.activeUsers).toBe(Number.MAX_SAFE_INTEGER - 1000);
});
expect(apiDto).toEqual(originalDto);
});
});

33
apps/website/lib/builders/view-data/AdminDashboardViewDataBuilder.ts
View File

@@ -1,22 +1,15 @@
import { ViewData } from '@/lib/contracts/view-data/ViewData';
import type { DashboardStats } from '@/lib/types/admin';
import type { AdminDashboardViewData } from '@/lib/view-data/AdminDashboardViewData';
import type { ViewDataBuilder } from '../../contracts/builders/ViewDataBuilder';
import type { DashboardStatsResponseDto } from '../../types/generated/DashboardStatsResponseDTO';
import type { AdminDashboardViewData } from '../../view-data/AdminDashboardViewData';
/**
* AdminDashboardViewDataBuilder
*
* Transforms DashboardStats API DTO into AdminDashboardViewData for server-side rendering.
* Deterministic; side-effect free; no HTTP calls.
*/
import { ViewDataBuilder } from "../../contracts/builders/ViewDataBuilder";
export class AdminDashboardViewDataBuilder implements ViewDataBuilder<any, any> {
build(input: any): any {
return AdminDashboardViewDataBuilder.build(input);
}
static build(
static build(apiDto: DashboardStats): AdminDashboardViewData {
export class AdminDashboardViewDataBuilder {
/**
* Transform API DTO to ViewData
*
* @param apiDto - The DTO from the service
* @returns ViewData for the admin dashboard
*/
public static build(apiDto: DashboardStatsResponseDto): AdminDashboardViewData {
return {
stats: {
totalUsers: apiDto.totalUsers,
@@ -29,4 +22,6 @@ export class AdminDashboardViewDataBuilder implements ViewDataBuilder<any, any>
},
};
}
}
}
AdminDashboardViewDataBuilder satisfies ViewDataBuilder<DashboardStatsResponseDto, AdminDashboardViewData>;

522
apps/website/lib/builders/view-data/AdminUsersViewDataBuilder.test.ts
View File

@@ -1,11 +1,11 @@
import { describe, it, expect } from 'vitest';
import { AdminUsersViewDataBuilder } from './AdminUsersViewDataBuilder';
import type { UserListResponse } from '@/lib/types/admin';
import type { UserListResponseDTO } from '@/lib/types/generated/UserListResponseDTO';
describe('AdminUsersViewDataBuilder', () => {
describe('happy paths', () => {
it('should transform UserListResponse DTO to AdminUsersViewData correctly', () => {
const userListResponse: UserListResponse = {
it('should transform UserListResponseDTO to AdminUsersViewData correctly', () => {
const userListResponse: UserListResponseDTO = {
users: [
{
id: 'user-1',
@@ -53,26 +53,11 @@ describe('AdminUsersViewDataBuilder', () => {
lastLoginAt: '2024-01-20T10:00:00.000Z',
primaryDriverId: 'driver-123',
});
expect(result.users[1]).toEqual({
id: 'user-2',
email: 'user@example.com',
displayName: 'Regular User',
roles: ['member'],
status: 'active',
isSystemAdmin: false,
createdAt: '2024-01-05T00:00:00.000Z',
updatedAt: '2024-01-10T08:00:00.000Z',
lastLoginAt: '2024-01-18T14:00:00.000Z',
primaryDriverId: 'driver-456',
});
expect(result.total).toBe(2);
expect(result.page).toBe(1);
expect(result.limit).toBe(10);
expect(result.totalPages).toBe(1);
});
it('should calculate derived fields correctly', () => {
const userListResponse: UserListResponse = {
const userListResponse: UserListResponseDTO = {
users: [
{
id: 'user-1',
@@ -104,18 +89,8 @@ describe('AdminUsersViewDataBuilder', () => {
createdAt: '2024-01-03T00:00:00.000Z',
updatedAt: '2024-01-17T12:00:00.000Z',
},
{
id: 'user-4',
email: 'user4@example.com',
displayName: 'User 4',
roles: ['member'],
status: 'deleted',
isSystemAdmin: false,
createdAt: '2024-01-04T00:00:00.000Z',
updatedAt: '2024-01-18T12:00:00.000Z',
},
],
total: 4,
total: 3,
page: 1,
limit: 10,
totalPages: 1,
@@ -123,495 +98,8 @@ describe('AdminUsersViewDataBuilder', () => {
const result = AdminUsersViewDataBuilder.build(userListResponse);
// activeUserCount should count only users with status 'active'
expect(result.activeUserCount).toBe(2);
// adminCount should count only system admins
expect(result.adminCount).toBe(1);
});
it('should handle empty users list', () => {
const userListResponse: UserListResponse = {
users: [],
total: 0,
page: 1,
limit: 10,
totalPages: 0,
};
const result = AdminUsersViewDataBuilder.build(userListResponse);
expect(result.users).toHaveLength(0);
expect(result.total).toBe(0);
expect(result.activeUserCount).toBe(0);
expect(result.adminCount).toBe(0);
});
it('should handle users without optional fields', () => {
const userListResponse: UserListResponse = {
users: [
{
id: 'user-1',
email: 'user1@example.com',
displayName: 'User 1',
roles: ['member'],
status: 'active',
isSystemAdmin: false,
createdAt: '2024-01-01T00:00:00.000Z',
updatedAt: '2024-01-15T12:00:00.000Z',
// lastLoginAt and primaryDriverId are optional
},
],
total: 1,
page: 1,
limit: 10,
totalPages: 1,
};
const result = AdminUsersViewDataBuilder.build(userListResponse);
expect(result.users[0].lastLoginAt).toBeUndefined();
expect(result.users[0].primaryDriverId).toBeUndefined();
});
});
describe('date formatting', () => {
it('should handle ISO date strings correctly', () => {
const userListResponse: UserListResponse = {
users: [
{
id: 'user-1',
email: 'user1@example.com',
displayName: 'User 1',
roles: ['member'],
status: 'active',
isSystemAdmin: false,
createdAt: '2024-01-01T00:00:00.000Z',
updatedAt: '2024-01-15T12:00:00.000Z',
lastLoginAt: '2024-01-20T10:00:00.000Z',
},
],
total: 1,
page: 1,
limit: 10,
totalPages: 1,
};
const result = AdminUsersViewDataBuilder.build(userListResponse);
expect(result.users[0].createdAt).toBe('2024-01-01T00:00:00.000Z');
expect(result.users[0].updatedAt).toBe('2024-01-15T12:00:00.000Z');
expect(result.users[0].lastLoginAt).toBe('2024-01-20T10:00:00.000Z');
});
it('should handle Date objects and convert to ISO strings', () => {
const userListResponse: UserListResponse = {
users: [
{
id: 'user-1',
email: 'user1@example.com',
displayName: 'User 1',
roles: ['member'],
status: 'active',
isSystemAdmin: false,
createdAt: new Date('2024-01-01T00:00:00.000Z'),
updatedAt: new Date('2024-01-15T12:00:00.000Z'),
lastLoginAt: new Date('2024-01-20T10:00:00.000Z'),
},
],
total: 1,
page: 1,
limit: 10,
totalPages: 1,
};
const result = AdminUsersViewDataBuilder.build(userListResponse);
expect(result.users[0].createdAt).toBe('2024-01-01T00:00:00.000Z');
expect(result.users[0].updatedAt).toBe('2024-01-15T12:00:00.000Z');
expect(result.users[0].lastLoginAt).toBe('2024-01-20T10:00:00.000Z');
});
it('should handle Date objects for lastLoginAt when present', () => {
const userListResponse: UserListResponse = {
users: [
{
id: 'user-1',
email: 'user1@example.com',
displayName: 'User 1',
roles: ['member'],
status: 'active',
isSystemAdmin: false,
createdAt: '2024-01-01T00:00:00.000Z',
updatedAt: '2024-01-15T12:00:00.000Z',
lastLoginAt: new Date('2024-01-20T10:00:00.000Z'),
},
],
total: 1,
page: 1,
limit: 10,
totalPages: 1,
};
const result = AdminUsersViewDataBuilder.build(userListResponse);
expect(result.users[0].lastLoginAt).toBe('2024-01-20T10:00:00.000Z');
});
});
describe('data transformation', () => {
it('should preserve all DTO fields in the output', () => {
const userListResponse: UserListResponse = {
users: [
{
id: 'user-1',
email: 'user1@example.com',
displayName: 'User 1',
roles: ['admin', 'owner'],
status: 'active',
isSystemAdmin: true,
createdAt: '2024-01-01T00:00:00.000Z',
updatedAt: '2024-01-15T12:00:00.000Z',
lastLoginAt: '2024-01-20T10:00:00.000Z',
primaryDriverId: 'driver-123',
},
],
total: 1,
page: 1,
limit: 10,
totalPages: 1,
};
const result = AdminUsersViewDataBuilder.build(userListResponse);
expect(result.users[0].id).toBe(userListResponse.users[0].id);
expect(result.users[0].email).toBe(userListResponse.users[0].email);
expect(result.users[0].displayName).toBe(userListResponse.users[0].displayName);
expect(result.users[0].roles).toEqual(userListResponse.users[0].roles);
expect(result.users[0].status).toBe(userListResponse.users[0].status);
expect(result.users[0].isSystemAdmin).toBe(userListResponse.users[0].isSystemAdmin);
expect(result.users[0].createdAt).toBe(userListResponse.users[0].createdAt);
expect(result.users[0].updatedAt).toBe(userListResponse.users[0].updatedAt);
expect(result.users[0].lastLoginAt).toBe(userListResponse.users[0].lastLoginAt);
expect(result.users[0].primaryDriverId).toBe(userListResponse.users[0].primaryDriverId);
expect(result.total).toBe(userListResponse.total);
expect(result.page).toBe(userListResponse.page);
expect(result.limit).toBe(userListResponse.limit);
expect(result.totalPages).toBe(userListResponse.totalPages);
});
it('should not modify the input DTO', () => {
const userListResponse: UserListResponse = {
users: [
{
id: 'user-1',
email: 'user1@example.com',
displayName: 'User 1',
roles: ['member'],
status: 'active',
isSystemAdmin: false,
createdAt: '2024-01-01T00:00:00.000Z',
updatedAt: '2024-01-15T12:00:00.000Z',
},
],
total: 1,
page: 1,
limit: 10,
totalPages: 1,
};
const originalResponse = { ...userListResponse };
AdminUsersViewDataBuilder.build(userListResponse);
expect(userListResponse).toEqual(originalResponse);
});
});
describe('edge cases', () => {
it('should handle users with multiple roles', () => {
const userListResponse: UserListResponse = {
users: [
{
id: 'user-1',
email: 'user1@example.com',
displayName: 'User 1',
roles: ['admin', 'owner', 'steward', 'member'],
status: 'active',
isSystemAdmin: true,
createdAt: '2024-01-01T00:00:00.000Z',
updatedAt: '2024-01-15T12:00:00.000Z',
},
],
total: 1,
page: 1,
limit: 10,
totalPages: 1,
};
const result = AdminUsersViewDataBuilder.build(userListResponse);
expect(result.users[0].roles).toEqual(['admin', 'owner', 'steward', 'member']);
});
it('should handle users with different statuses', () => {
const userListResponse: UserListResponse = {
users: [
{
id: 'user-1',
email: 'user1@example.com',
displayName: 'User 1',
roles: ['member'],
status: 'active',
isSystemAdmin: false,
createdAt: '2024-01-01T00:00:00.000Z',
updatedAt: '2024-01-15T12:00:00.000Z',
},
{
id: 'user-2',
email: 'user2@example.com',
displayName: 'User 2',
roles: ['member'],
status: 'suspended',
isSystemAdmin: false,
createdAt: '2024-01-02T00:00:00.000Z',
updatedAt: '2024-01-16T12:00:00.000Z',
},
{
id: 'user-3',
email: 'user3@example.com',
displayName: 'User 3',
roles: ['member'],
status: 'deleted',
isSystemAdmin: false,
createdAt: '2024-01-03T00:00:00.000Z',
updatedAt: '2024-01-17T12:00:00.000Z',
},
],
total: 3,
page: 1,
limit: 10,
totalPages: 1,
};
const result = AdminUsersViewDataBuilder.build(userListResponse);
expect(result.users[0].status).toBe('active');
expect(result.users[1].status).toBe('suspended');
expect(result.users[2].status).toBe('deleted');
expect(result.activeUserCount).toBe(1);
});
it('should handle pagination metadata correctly', () => {
const userListResponse: UserListResponse = {
users: [
{
id: 'user-1',
email: 'user1@example.com',
displayName: 'User 1',
roles: ['member'],
status: 'active',
isSystemAdmin: false,
createdAt: '2024-01-01T00:00:00.000Z',
updatedAt: '2024-01-15T12:00:00.000Z',
},
],
total: 100,
page: 5,
limit: 20,
totalPages: 5,
};
const result = AdminUsersViewDataBuilder.build(userListResponse);
expect(result.total).toBe(100);
expect(result.page).toBe(5);
expect(result.limit).toBe(20);
expect(result.totalPages).toBe(5);
});
it('should handle users with empty roles array', () => {
const userListResponse: UserListResponse = {
users: [
{
id: 'user-1',
email: 'user1@example.com',
displayName: 'User 1',
roles: [],
status: 'active',
isSystemAdmin: false,
createdAt: '2024-01-01T00:00:00.000Z',
updatedAt: '2024-01-15T12:00:00.000Z',
},
],
total: 1,
page: 1,
limit: 10,
totalPages: 1,
};
const result = AdminUsersViewDataBuilder.build(userListResponse);
expect(result.users[0].roles).toEqual([]);
});
it('should handle users with special characters in display name', () => {
const userListResponse: UserListResponse = {
users: [
{
id: 'user-1',
email: 'user1@example.com',
displayName: 'User 1 & 2 (Admin)',
roles: ['admin'],
status: 'active',
isSystemAdmin: true,
createdAt: '2024-01-01T00:00:00.000Z',
updatedAt: '2024-01-15T12:00:00.000Z',
},
],
total: 1,
page: 1,
limit: 10,
totalPages: 1,
};
const result = AdminUsersViewDataBuilder.build(userListResponse);
expect(result.users[0].displayName).toBe('User 1 & 2 (Admin)');
});
it('should handle users with very long email addresses', () => {
const longEmail = 'verylongemailaddresswithmanycharacters@example.com';
const userListResponse: UserListResponse = {
users: [
{
id: 'user-1',
email: longEmail,
displayName: 'User 1',
roles: ['member'],
status: 'active',
isSystemAdmin: false,
createdAt: '2024-01-01T00:00:00.000Z',
updatedAt: '2024-01-15T12:00:00.000Z',
},
],
total: 1,
page: 1,
limit: 10,
totalPages: 1,
};
const result = AdminUsersViewDataBuilder.build(userListResponse);
expect(result.users[0].email).toBe(longEmail);
});
});
describe('derived fields calculation', () => {
it('should calculate activeUserCount correctly with mixed statuses', () => {
const userListResponse: UserListResponse = {
users: [
{ id: '1', email: '1@e.com', displayName: '1', roles: ['member'], status: 'active', isSystemAdmin: false, createdAt: '2024-01-01T00:00:00.000Z', updatedAt: '2024-01-15T12:00:00.000Z' },
{ id: '2', email: '2@e.com', displayName: '2', roles: ['member'], status: 'active', isSystemAdmin: false, createdAt: '2024-01-01T00:00:00.000Z', updatedAt: '2024-01-15T12:00:00.000Z' },
{ id: '3', email: '3@e.com', displayName: '3', roles: ['member'], status: 'suspended', isSystemAdmin: false, createdAt: '2024-01-01T00:00:00.000Z', updatedAt: '2024-01-15T12:00:00.000Z' },
{ id: '4', email: '4@e.com', displayName: '4', roles: ['member'], status: 'deleted', isSystemAdmin: false, createdAt: '2024-01-01T00:00:00.000Z', updatedAt: '2024-01-15T12:00:00.000Z' },
],
total: 4,
page: 1,
limit: 10,
totalPages: 1,
};
const result = AdminUsersViewDataBuilder.build(userListResponse);
expect(result.activeUserCount).toBe(2);
});
it('should calculate adminCount correctly with mixed roles', () => {
const userListResponse: UserListResponse = {
users: [
{ id: '1', email: '1@e.com', displayName: '1', roles: ['admin'], status: 'active', isSystemAdmin: true, createdAt: '2024-01-01T00:00:00.000Z', updatedAt: '2024-01-15T12:00:00.000Z' },
{ id: '2', email: '2@e.com', displayName: '2', roles: ['admin', 'owner'], status: 'active', isSystemAdmin: true, createdAt: '2024-01-01T00:00:00.000Z', updatedAt: '2024-01-15T12:00:00.000Z' },
{ id: '3', email: '3@e.com', displayName: '3', roles: ['member'], status: 'active', isSystemAdmin: false, createdAt: '2024-01-01T00:00:00.000Z', updatedAt: '2024-01-15T12:00:00.000Z' },
{ id: '4', email: '4@e.com', displayName: '4', roles: ['owner'], status: 'active', isSystemAdmin: false, createdAt: '2024-01-01T00:00:00.000Z', updatedAt: '2024-01-15T12:00:00.000Z' },
],
total: 4,
page: 1,
limit: 10,
totalPages: 1,
};
const result = AdminUsersViewDataBuilder.build(userListResponse);
expect(result.adminCount).toBe(2);
});
it('should handle all active users', () => {
const userListResponse: UserListResponse = {
users: [
{ id: '1', email: '1@e.com', displayName: '1', roles: ['member'], status: 'active', isSystemAdmin: false, createdAt: '2024-01-01T00:00:00.000Z', updatedAt: '2024-01-15T12:00:00.000Z' },
{ id: '2', email: '2@e.com', displayName: '2', roles: ['member'], status: 'active', isSystemAdmin: false, createdAt: '2024-01-01T00:00:00.000Z', updatedAt: '2024-01-15T12:00:00.000Z' },
{ id: '3', email: '3@e.com', displayName: '3', roles: ['member'], status: 'active', isSystemAdmin: false, createdAt: '2024-01-01T00:00:00.000Z', updatedAt: '2024-01-15T12:00:00.000Z' },
],
total: 3,
page: 1,
limit: 10,
totalPages: 1,
};
const result = AdminUsersViewDataBuilder.build(userListResponse);
expect(result.activeUserCount).toBe(3);
});
it('should handle no active users', () => {
const userListResponse: UserListResponse = {
users: [
{ id: '1', email: '1@e.com', displayName: '1', roles: ['member'], status: 'suspended', isSystemAdmin: false, createdAt: '2024-01-01T00:00:00.000Z', updatedAt: '2024-01-15T12:00:00.000Z' },
{ id: '2', email: '2@e.com', displayName: '2', roles: ['member'], status: 'deleted', isSystemAdmin: false, createdAt: '2024-01-01T00:00:00.000Z', updatedAt: '2024-01-15T12:00:00.000Z' },
],
total: 2,
page: 1,
limit: 10,
totalPages: 1,
};
const result = AdminUsersViewDataBuilder.build(userListResponse);
expect(result.activeUserCount).toBe(0);
});
it('should handle all system admins', () => {
const userListResponse: UserListResponse = {
users: [
{ id: '1', email: '1@e.com', displayName: '1', roles: ['admin'], status: 'active', isSystemAdmin: true, createdAt: '2024-01-01T00:00:00.000Z', updatedAt: '2024-01-15T12:00:00.000Z' },
{ id: '2', email: '2@e.com', displayName: '2', roles: ['admin'], status: 'active', isSystemAdmin: true, createdAt: '2024-01-01T00:00:00.000Z', updatedAt: '2024-01-15T12:00:00.000Z' },
{ id: '3', email: '3@e.com', displayName: '3', roles: ['admin'], status: 'active', isSystemAdmin: true, createdAt: '2024-01-01T00:00:00.000Z', updatedAt: '2024-01-15T12:00:00.000Z' },
],
total: 3,
page: 1,
limit: 10,
totalPages: 1,
};
const result = AdminUsersViewDataBuilder.build(userListResponse);
expect(result.adminCount).toBe(3);
});
it('should handle no system admins', () => {
const userListResponse: UserListResponse = {
users: [
{ id: '1', email: '1@e.com', displayName: '1', roles: ['member'], status: 'active', isSystemAdmin: false, createdAt: '2024-01-01T00:00:00.000Z', updatedAt: '2024-01-15T12:00:00.000Z' },
{ id: '2', email: '2@e.com', displayName: '2', roles: ['owner'], status: 'active', isSystemAdmin: false, createdAt: '2024-01-01T00:00:00.000Z', updatedAt: '2024-01-15T12:00:00.000Z' },
],
total: 2,
page: 1,
limit: 10,
totalPages: 1,
};
const result = AdminUsersViewDataBuilder.build(userListResponse);
expect(result.adminCount).toBe(0);
});
});
});

30
apps/website/lib/builders/view-data/AdminUsersViewDataBuilder.ts
View File

@@ -1,19 +1,22 @@
import { ViewData } from '@/lib/contracts/view-data/ViewData';
import type { UserListResponse } from '@/lib/types/admin';
import { AdminUsersViewData } from '@/lib/view-data/AdminUsersViewData';
import { ViewDataBuilder } from "../../contracts/builders/ViewDataBuilder";
export class AdminUsersViewDataBuilder implements ViewDataBuilder<any, any> {
build(input: any): any {
return AdminUsersViewDataBuilder.build(input);
}
import type { ViewDataBuilder } from '@/lib/contracts/builders/ViewDataBuilder';
import type { UserListResponseDTO } from '@/lib/types/generated/UserListResponseDTO';
import type { AdminUsersViewData } from '@/lib/view-data/AdminUsersViewData';
static build(
public static build(apiDto: UserListResponse): AdminUsersViewData {
export class AdminUsersViewDataBuilder {
public static build(apiDto: UserListResponseDTO): AdminUsersViewData {
const users = apiDto.users.map(u => ({
...u,
joinedAt: new Date(u.joinedAt),
id: u.id,
email: u.email,
displayName: u.displayName,
roles: u.roles,
status: u.status,
isSystemAdmin: u.isSystemAdmin,
createdAt: u.createdAt,
updatedAt: u.updatedAt,
lastLoginAt: u.lastLoginAt,
primaryDriverId: u.primaryDriverId,
}));
return {
@@ -22,9 +25,10 @@ export class AdminUsersViewDataBuilder implements ViewDataBuilder<any, any> {
page: apiDto.page,
limit: apiDto.limit,
totalPages: apiDto.totalPages,
// Pre-computed derived values for template
activeUserCount: users.filter(u => u.status === 'active').length,
adminCount: users.filter(u => u.isSystemAdmin).length,
};
}
}
AdminUsersViewDataBuilder satisfies ViewDataBuilder<UserListResponseDTO, AdminUsersViewData>;

16
apps/website/lib/builders/view-data/AnalyticsDashboardViewDataBuilder.test.ts
View File

@@ -1,17 +1,17 @@
import { describe, it, expect } from 'vitest';
import { AnalyticsDashboardViewDataBuilder } from './AnalyticsDashboardViewDataBuilder';
import { AnalyticsDashboardInputViewData } from '@/lib/view-data/AnalyticsDashboardInputViewData';
import type { GetDashboardDataOutputDTO } from '@/lib/types/generated/GetDashboardDataOutputDTO';
describe('AnalyticsDashboardViewDataBuilder', () => {
it('builds ViewData from AnalyticsDashboardInputViewData', () => {
const inputViewData: AnalyticsDashboardInputViewData = {
it('builds ViewData from GetDashboardDataOutputDTO', () => {
const inputDto: GetDashboardDataOutputDTO = {
totalUsers: 100,
activeUsers: 40,
totalRaces: 10,
totalLeagues: 5,
};
const viewData = AnalyticsDashboardViewDataBuilder.build(inputViewData);
const viewData = AnalyticsDashboardViewDataBuilder.build(inputDto);
expect(viewData.metrics.totalUsers).toBe(100);
expect(viewData.metrics.activeUsers).toBe(40);
@@ -23,28 +23,28 @@ describe('AnalyticsDashboardViewDataBuilder', () => {
});
it('computes engagement rate and formatted engagement rate', () => {
const inputViewData: AnalyticsDashboardInputViewData = {
const inputDto: GetDashboardDataOutputDTO = {
totalUsers: 200,
activeUsers: 50,
totalRaces: 0,
totalLeagues: 0,
};
const viewData = AnalyticsDashboardViewDataBuilder.build(inputViewData);
const viewData = AnalyticsDashboardViewDataBuilder.build(inputDto);
expect(viewData.metrics.userEngagementRate).toBeCloseTo(25);
expect(viewData.metrics.formattedEngagementRate).toBe('25.0%');
});
it('handles zero users safely', () => {
const inputViewData: AnalyticsDashboardInputViewData = {
const inputDto: GetDashboardDataOutputDTO = {
totalUsers: 0,
activeUsers: 0,
totalRaces: 0,
totalLeagues: 0,
};
const viewData = AnalyticsDashboardViewDataBuilder.build(inputViewData);
const viewData = AnalyticsDashboardViewDataBuilder.build(inputDto);
expect(viewData.metrics.userEngagementRate).toBe(0);
expect(viewData.metrics.formattedEngagementRate).toBe('0.0%');

36
apps/website/lib/builders/view-data/AnalyticsDashboardViewDataBuilder.ts
View File

@@ -1,30 +1,26 @@
import { AnalyticsDashboardInputViewData } from '@/lib/view-data/AnalyticsDashboardInputViewData';
import { AnalyticsDashboardViewData } from '@/lib/view-data/AnalyticsDashboardViewData';
/**
* AnalyticsDashboardViewDataBuilder
*
* Transforms AnalyticsDashboardInputViewData into AnalyticsDashboardViewData for server-side rendering.
* Deterministic; side-effect free; no HTTP calls.
*/
import { ViewDataBuilder } from "../../contracts/builders/ViewDataBuilder";
export class AnalyticsDashboardViewDataBuilder implements ViewDataBuilder<any, any> {
build(input: any): any {
return AnalyticsDashboardViewDataBuilder.build(input);
}
import type { ViewDataBuilder } from '@/lib/contracts/builders/ViewDataBuilder';
import type { GetDashboardDataOutputDTO } from '@/lib/types/generated/GetDashboardDataOutputDTO';
import type { AnalyticsDashboardViewData } from '@/lib/view-data/AnalyticsDashboardViewData';
static build(viewData: AnalyticsDashboardInputViewData): AnalyticsDashboardViewData {
const userEngagementRate = viewData.totalUsers > 0 ? (viewData.activeUsers / viewData.totalUsers) * 100 : 0;
export class AnalyticsDashboardViewDataBuilder {
public static build(apiDto: GetDashboardDataOutputDTO): AnalyticsDashboardViewData {
const totalUsers = apiDto.totalUsers;
const activeUsers = apiDto.activeUsers;
const totalRaces = apiDto.totalRaces;
const totalLeagues = apiDto.totalLeagues;
const userEngagementRate = totalUsers > 0 ? (activeUsers / totalUsers) * 100 : 0;
const formattedEngagementRate = `${userEngagementRate.toFixed(1)}%`;
const activityLevel = userEngagementRate > 70 ? 'High' : userEngagementRate > 40 ? 'Medium' : 'Low';
return {
metrics: {
totalUsers: viewData.totalUsers,
activeUsers: viewData.activeUsers,
totalRaces: viewData.totalRaces,
totalLeagues: viewData.totalLeagues,
totalUsers,
activeUsers,
totalRaces,
totalLeagues,
userEngagementRate,
formattedEngagementRate,
activityLevel,
@@ -32,3 +28,5 @@ export class AnalyticsDashboardViewDataBuilder implements ViewDataBuilder<any, a
};
}
}
AnalyticsDashboardViewDataBuilder satisfies ViewDataBuilder<GetDashboardDataOutputDTO, AnalyticsDashboardViewData>;

174
apps/website/lib/builders/view-data/AvatarViewDataBuilder.test.ts
View File

@@ -1,15 +1,18 @@
import { describe, it, expect } from 'vitest';
import { AvatarViewDataBuilder } from './AvatarViewDataBuilder';
import type { MediaBinaryDTO } from '@/lib/types/MediaBinaryDTO';
import type { GetMediaOutputDTO } from '@/lib/types/generated/GetMediaOutputDTO';
describe('AvatarViewDataBuilder', () => {
describe('happy paths', () => {
it('should transform MediaBinaryDTO to AvatarViewData correctly', () => {
it('should transform binary data to AvatarViewData correctly', () => {
const buffer = new Uint8Array([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]);
const mediaDto: MediaBinaryDTO = {
const mediaDto = {
id: '1',
url: 'http://example.com/image.png',
type: 'image/png',
uploadedAt: new Date().toISOString(),
buffer: buffer.buffer,
contentType: 'image/png',
};
} as unknown as GetMediaOutputDTO;
const result = AvatarViewDataBuilder.build(mediaDto);
@@ -19,173 +22,36 @@ describe('AvatarViewDataBuilder', () => {
it('should handle JPEG images', () => {
const buffer = new Uint8Array([0xff, 0xd8, 0xff, 0xe0]);
const mediaDto: MediaBinaryDTO = {
const mediaDto = {
id: '2',
url: 'http://example.com/image.jpg',
type: 'image/jpeg',
uploadedAt: new Date().toISOString(),
buffer: buffer.buffer,
contentType: 'image/jpeg',
};
} as unknown as GetMediaOutputDTO;
const result = AvatarViewDataBuilder.build(mediaDto);
expect(result.buffer).toBe(Buffer.from(buffer).toString('base64'));
expect(result.contentType).toBe('image/jpeg');
});
it('should handle GIF images', () => {
const buffer = new Uint8Array([0x47, 0x49, 0x46, 0x38]);
const mediaDto: MediaBinaryDTO = {
buffer: buffer.buffer,
contentType: 'image/gif',
};
const result = AvatarViewDataBuilder.build(mediaDto);
expect(result.buffer).toBe(Buffer.from(buffer).toString('base64'));
expect(result.contentType).toBe('image/gif');
});
it('should handle SVG images', () => {
const buffer = new TextEncoder().encode('<svg xmlns="http://www.w3.org/2000/svg"></svg>');
const mediaDto: MediaBinaryDTO = {
buffer: buffer.buffer,
contentType: 'image/svg+xml',
};
const result = AvatarViewDataBuilder.build(mediaDto);
expect(result.buffer).toBe(Buffer.from(buffer).toString('base64'));
expect(result.contentType).toBe('image/svg+xml');
});
it('should handle WebP images', () => {
const buffer = new Uint8Array([0x52, 0x49, 0x46, 0x46]);
const mediaDto: MediaBinaryDTO = {
buffer: buffer.buffer,
contentType: 'image/webp',
};
const result = AvatarViewDataBuilder.build(mediaDto);
expect(result.buffer).toBe(Buffer.from(buffer).toString('base64'));
expect(result.contentType).toBe('image/webp');
});
});
describe('data transformation', () => {
it('should preserve all DTO fields in the output', () => {
const buffer = new Uint8Array([0x89, 0x50, 0x4e, 0x47]);
const mediaDto: MediaBinaryDTO = {
buffer: buffer.buffer,
contentType: 'image/png',
};
const result = AvatarViewDataBuilder.build(mediaDto);
expect(result.buffer).toBeDefined();
expect(result.contentType).toBe(mediaDto.contentType);
});
it('should not modify the input DTO', () => {
const buffer = new Uint8Array([0x89, 0x50, 0x4e, 0x47]);
const mediaDto: MediaBinaryDTO = {
buffer: buffer.buffer,
contentType: 'image/png',
};
const originalDto = { ...mediaDto };
AvatarViewDataBuilder.build(mediaDto);
expect(mediaDto).toEqual(originalDto);
});
it('should convert buffer to base64 string', () => {
const buffer = new Uint8Array([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]);
const mediaDto: MediaBinaryDTO = {
buffer: buffer.buffer,
contentType: 'image/png',
};
const result = AvatarViewDataBuilder.build(mediaDto);
expect(typeof result.buffer).toBe('string');
expect(result.buffer).toBe(Buffer.from(buffer).toString('base64'));
});
});
describe('edge cases', () => {
it('should handle empty buffer', () => {
const buffer = new Uint8Array([]);
const mediaDto: MediaBinaryDTO = {
const mediaDto = {
id: '3',
url: 'http://example.com/image.png',
type: 'image/png',
uploadedAt: new Date().toISOString(),
buffer: buffer.buffer,
contentType: 'image/png',
};
} as unknown as GetMediaOutputDTO;
const result = AvatarViewDataBuilder.build(mediaDto);
expect(result.buffer).toBe('');
expect(result.contentType).toBe('image/png');
});
it('should handle large buffer', () => {
const buffer = new Uint8Array(1024 * 1024); // 1MB
const mediaDto: MediaBinaryDTO = {
buffer: buffer.buffer,
contentType: 'image/png',
};
const result = AvatarViewDataBuilder.build(mediaDto);
expect(result.buffer).toBe(Buffer.from(buffer).toString('base64'));
expect(result.contentType).toBe('image/png');
});
it('should handle buffer with all zeros', () => {
const buffer = new Uint8Array([0x00, 0x00, 0x00, 0x00]);
const mediaDto: MediaBinaryDTO = {
buffer: buffer.buffer,
contentType: 'image/png',
};
const result = AvatarViewDataBuilder.build(mediaDto);
expect(result.buffer).toBe(Buffer.from(buffer).toString('base64'));
expect(result.contentType).toBe('image/png');
});
it('should handle buffer with all ones', () => {
const buffer = new Uint8Array([0xff, 0xff, 0xff, 0xff]);
const mediaDto: MediaBinaryDTO = {
buffer: buffer.buffer,
contentType: 'image/png',
};
const result = AvatarViewDataBuilder.build(mediaDto);
expect(result.buffer).toBe(Buffer.from(buffer).toString('base64'));
expect(result.contentType).toBe('image/png');
});
it('should handle different content types', () => {
const buffer = new Uint8Array([0x89, 0x50, 0x4e, 0x47]);
const contentTypes = [
'image/png',
'image/jpeg',
'image/gif',
'image/webp',
'image/svg+xml',
'image/bmp',
'image/tiff',
];
contentTypes.forEach((contentType) => {
const mediaDto: MediaBinaryDTO = {
buffer: buffer.buffer,
contentType,
};
const result = AvatarViewDataBuilder.build(mediaDto);
expect(result.contentType).toBe(contentType);
});
});
});
});

36
apps/website/lib/builders/view-data/AvatarViewDataBuilder.ts
View File

@@ -1,25 +1,23 @@
/**
* AvatarViewDataBuilder
*
* Transforms MediaBinaryDTO into AvatarViewData for server-side rendering.
* Deterministic; side-effect free; no HTTP calls.
*/
import { MediaBinaryDTO } from '@/lib/types/MediaBinaryDTO';
import { AvatarViewData } from '@/lib/view-data/AvatarViewData';
import { ViewDataBuilder } from "../../contracts/builders/ViewDataBuilder";
import type { ViewDataBuilder } from '@/lib/contracts/builders/ViewDataBuilder';
import type { GetMediaOutputDTO } from '@/lib/types/generated/GetMediaOutputDTO';
import type { AvatarViewData } from '@/lib/view-data/AvatarViewData';
export class AvatarViewDataBuilder implements ViewDataBuilder<any, any> {
build(input: any): any {
return AvatarViewDataBuilder.build(input);
}
static build(
static build(apiDto: MediaBinaryDTO): AvatarViewData {
export class AvatarViewDataBuilder {
public static build(apiDto: GetMediaOutputDTO): AvatarViewData {
// Note: GetMediaOutputDTO from OpenAPI doesn't have buffer,
// but the implementation expects it for binary data.
// We use type assertion to handle the binary case while keeping the DTO type.
const binaryDto = apiDto as unknown as { buffer?: ArrayBuffer };
const buffer = binaryDto.buffer;
const contentType = apiDto.type;
return {
buffer: Buffer.from(apiDto.buffer).toString('base64'),
contentType: apiDto.contentType,
buffer: buffer ? Buffer.from(buffer).toString('base64') : '',
contentType,
};
}
}
}
AvatarViewDataBuilder satisfies ViewDataBuilder<GetMediaOutputDTO, AvatarViewData>;

98
apps/website/lib/builders/view-data/CategoryIconViewDataBuilder.test.ts
View File

@@ -1,15 +1,18 @@
import { describe, it, expect } from 'vitest';
import { CategoryIconViewDataBuilder } from './CategoryIconViewDataBuilder';
import type { MediaBinaryDTO } from '@/lib/types/MediaBinaryDTO';
import type { GetMediaOutputDTO } from '@/lib/types/generated/GetMediaOutputDTO';
describe('CategoryIconViewDataBuilder', () => {
describe('happy paths', () => {
it('should transform MediaBinaryDTO to CategoryIconViewData correctly', () => {
it('should transform binary data to CategoryIconViewData correctly', () => {
const buffer = new Uint8Array([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]);
const mediaDto: MediaBinaryDTO = {
const mediaDto = {
id: '1',
url: 'http://example.com/icon.png',
type: 'image/png',
uploadedAt: new Date().toISOString(),
buffer: buffer.buffer,
contentType: 'image/png',
};
} as unknown as GetMediaOutputDTO;
const result = CategoryIconViewDataBuilder.build(mediaDto);
@@ -19,97 +22,36 @@ describe('CategoryIconViewDataBuilder', () => {
it('should handle SVG icons', () => {
const buffer = new TextEncoder().encode('<svg xmlns="http://www.w3.org/2000/svg"><circle cx="10" cy="10" r="5"/></svg>');
const mediaDto: MediaBinaryDTO = {
const mediaDto = {
id: '2',
url: 'http://example.com/icon.svg',
type: 'image/svg+xml',
uploadedAt: new Date().toISOString(),
buffer: buffer.buffer,
contentType: 'image/svg+xml',
};
} as unknown as GetMediaOutputDTO;
const result = CategoryIconViewDataBuilder.build(mediaDto);
expect(result.buffer).toBe(Buffer.from(buffer).toString('base64'));
expect(result.contentType).toBe('image/svg+xml');
});
it('should handle small icon files', () => {
const buffer = new Uint8Array([0x89, 0x50, 0x4e, 0x47]);
const mediaDto: MediaBinaryDTO = {
buffer: buffer.buffer,
contentType: 'image/png',
};
const result = CategoryIconViewDataBuilder.build(mediaDto);
expect(result.buffer).toBe(Buffer.from(buffer).toString('base64'));
expect(result.contentType).toBe('image/png');
});
});
describe('data transformation', () => {
it('should preserve all DTO fields in the output', () => {
const buffer = new Uint8Array([0x89, 0x50, 0x4e, 0x47]);
const mediaDto: MediaBinaryDTO = {
buffer: buffer.buffer,
contentType: 'image/png',
};
const result = CategoryIconViewDataBuilder.build(mediaDto);
expect(result.buffer).toBeDefined();
expect(result.contentType).toBe(mediaDto.contentType);
});
it('should not modify the input DTO', () => {
const buffer = new Uint8Array([0x89, 0x50, 0x4e, 0x47]);
const mediaDto: MediaBinaryDTO = {
buffer: buffer.buffer,
contentType: 'image/png',
};
const originalDto = { ...mediaDto };
CategoryIconViewDataBuilder.build(mediaDto);
expect(mediaDto).toEqual(originalDto);
});
it('should convert buffer to base64 string', () => {
const buffer = new Uint8Array([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]);
const mediaDto: MediaBinaryDTO = {
buffer: buffer.buffer,
contentType: 'image/png',
};
const result = CategoryIconViewDataBuilder.build(mediaDto);
expect(typeof result.buffer).toBe('string');
expect(result.buffer).toBe(Buffer.from(buffer).toString('base64'));
});
});
describe('edge cases', () => {
it('should handle empty buffer', () => {
const buffer = new Uint8Array([]);
const mediaDto: MediaBinaryDTO = {
const mediaDto = {
id: '3',
url: 'http://example.com/icon.png',
type: 'image/png',
uploadedAt: new Date().toISOString(),
buffer: buffer.buffer,
contentType: 'image/png',
};
} as unknown as GetMediaOutputDTO;
const result = CategoryIconViewDataBuilder.build(mediaDto);
expect(result.buffer).toBe('');
expect(result.contentType).toBe('image/png');
});
it('should handle buffer with special characters', () => {
const buffer = new Uint8Array([0x00, 0x01, 0x02, 0x03, 0xff, 0xfe, 0xfd, 0xfc]);
const mediaDto: MediaBinaryDTO = {
buffer: buffer.buffer,
contentType: 'image/png',
};
const result = CategoryIconViewDataBuilder.build(mediaDto);
expect(result.buffer).toBe(Buffer.from(buffer).toString('base64'));
expect(result.contentType).toBe('image/png');
});
});
});

34
apps/website/lib/builders/view-data/CategoryIconViewDataBuilder.ts
View File

@@ -1,25 +1,21 @@
/**
* CategoryIconViewDataBuilder
*
* Transforms MediaBinaryDTO into CategoryIconViewData for server-side rendering.
* Deterministic; side-effect free; no HTTP calls.
*/
import { MediaBinaryDTO } from '@/lib/types/MediaBinaryDTO';
import { CategoryIconViewData } from '@/lib/view-data/CategoryIconViewData';
import { ViewDataBuilder } from "../../contracts/builders/ViewDataBuilder";
import type { ViewDataBuilder } from '@/lib/contracts/builders/ViewDataBuilder';
import type { GetMediaOutputDTO } from '@/lib/types/generated/GetMediaOutputDTO';
import type { CategoryIconViewData } from '@/lib/view-data/CategoryIconViewData';
export class CategoryIconViewDataBuilder implements ViewDataBuilder<any, any> {
build(input: any): any {
return CategoryIconViewDataBuilder.build(input);
}
static build(
static build(apiDto: MediaBinaryDTO): CategoryIconViewData {
export class CategoryIconViewDataBuilder {
public static build(apiDto: GetMediaOutputDTO): CategoryIconViewData {
// Note: GetMediaOutputDTO from OpenAPI doesn't have buffer,
// but the implementation expects it for binary data.
const binaryDto = apiDto as unknown as { buffer?: ArrayBuffer };
const buffer = binaryDto.buffer;
return {
buffer: Buffer.from(apiDto.buffer).toString('base64'),
contentType: apiDto.contentType,
buffer: buffer ? Buffer.from(buffer).toString('base64') : '',
contentType: apiDto.type,
};
}
}
}
CategoryIconViewDataBuilder satisfies ViewDataBuilder<GetMediaOutputDTO, CategoryIconViewData>;

31
apps/website/lib/builders/view-data/CompleteOnboardingViewDataBuilder.ts
View File

@@ -1,32 +1,17 @@
/**
* CompleteOnboarding ViewData Builder
*
* Transforms onboarding completion result into ViewData for templates.
*/
import { CompleteOnboardingOutputDTO } from '@/lib/types/generated/CompleteOnboardingOutputDTO';
import { CompleteOnboardingViewData } from './CompleteOnboardingViewData';
import { ViewData } from '@/lib/contracts/view-data/ViewData';
import { ViewDataBuilder } from "../../contracts/builders/ViewDataBuilder";
import type { ViewDataBuilder } from '@/lib/contracts/builders/ViewDataBuilder';
import type { CompleteOnboardingOutputDTO } from '@/lib/types/generated/CompleteOnboardingOutputDTO';
import type { CompleteOnboardingViewData } from '@/lib/view-data/CompleteOnboardingViewData';
export class CompleteOnboardingViewDataBuilder implements ViewDataBuilder<any, any> {
build(input: any): any {
return CompleteOnboardingViewDataBuilder.build(input);
}
static build(
/**
* Transform DTO into ViewData
*
* @param apiDto - The API DTO to transform
* @returns ViewData for templates
*/
static build(apiDto: CompleteOnboardingOutputDTO): CompleteOnboardingViewData {
export class CompleteOnboardingViewDataBuilder {
public static build(apiDto: CompleteOnboardingOutputDTO): CompleteOnboardingViewData {
return {
success: apiDto.success,
driverId: apiDto.driverId,
errorMessage: apiDto.errorMessage,
};
}
}
}
CompleteOnboardingViewDataBuilder satisfies ViewDataBuilder<CompleteOnboardingOutputDTO, CompleteOnboardingViewData>;

72
apps/website/lib/builders/view-data/DashboardViewDataBuilder.ts
View File

@@ -1,59 +1,47 @@
import type { ViewDataBuilder } from '@/lib/contracts/builders/ViewDataBuilder';
import { DashboardConsistencyFormatter } from '@/lib/formatters/DashboardConsistencyFormatter';
import { DashboardCountFormatter } from '@/lib/formatters/DashboardCountFormatter';
import { DashboardDateFormatter } from '@/lib/formatters/DashboardDateFormatter';
import { DashboardLeaguePositionFormatter } from '@/lib/formatters/DashboardLeaguePositionFormatter';
import { DashboardRankFormatter } from '@/lib/formatters/DashboardRankFormatter';
import { RatingFormatter } from '@/lib/formatters/RatingFormatter';
import type { DashboardOverviewDTO } from '@/lib/types/generated/DashboardOverviewDTO';
import type { DashboardViewData } from '@/lib/view-data/DashboardViewData';
import { DashboardDateDisplay } from '@/lib/display-objects/DashboardDateDisplay';
import { RatingDisplay } from '@/lib/display-objects/RatingDisplay';
import { DashboardRankDisplay } from '@/lib/display-objects/DashboardRankDisplay';
import { DashboardConsistencyDisplay } from '@/lib/display-objects/DashboardConsistencyDisplay';
import { DashboardCountDisplay } from '@/lib/display-objects/DashboardCountDisplay';
import { DashboardLeaguePositionDisplay } from '@/lib/display-objects/DashboardLeaguePositionDisplay';
import { ViewData } from '@/lib/contracts/view-data/ViewData';
import { number } from 'zod';
/**
* DashboardViewDataBuilder
*
* Transforms DashboardOverviewDTO (API DTO) into DashboardViewData for server-side rendering.
* Deterministic; side-effect free; no HTTP calls.
*/
import { ViewDataBuilder } from "../../contracts/builders/ViewDataBuilder";
export class DashboardViewDataBuilder implements ViewDataBuilder<any, any> {
build(input: any): any {
return DashboardViewDataBuilder.build(input);
}
static build(
static build(apiDto: DashboardOverviewDTO): DashboardViewData {
export class DashboardViewDataBuilder {
public static build(apiDto: DashboardOverviewDTO): DashboardViewData {
return {
currentDriver: {
name: apiDto.currentDriver?.name || '',
avatarUrl: apiDto.currentDriver?.avatarUrl || '',
country: apiDto.currentDriver?.country || '',
rating: apiDto.currentDriver ? RatingDisplay.format(apiDto.currentDriver.rating ?? 0) : '0.0',
rank: apiDto.currentDriver ? DashboardRankDisplay.format(apiDto.currentDriver.globalRank ?? 0) : '0',
totalRaces: apiDto.currentDriver ? DashboardCountDisplay.format(apiDto.currentDriver.totalRaces ?? 0) : '0',
wins: apiDto.currentDriver ? DashboardCountDisplay.format(apiDto.currentDriver.wins ?? 0) : '0',
podiums: apiDto.currentDriver ? DashboardCountDisplay.format(apiDto.currentDriver.podiums ?? 0) : '0',
consistency: apiDto.currentDriver ? DashboardConsistencyDisplay.format(apiDto.currentDriver.consistency ?? 0) : '0%',
rating: apiDto.currentDriver ? RatingFormatter.format(apiDto.currentDriver.rating ?? 0) : '0.0',
rank: apiDto.currentDriver ? DashboardRankFormatter.format(apiDto.currentDriver.globalRank ?? 0) : '0',
totalRaces: apiDto.currentDriver ? DashboardCountFormatter.format(apiDto.currentDriver.totalRaces ?? 0) : '0',
wins: apiDto.currentDriver ? DashboardCountFormatter.format(apiDto.currentDriver.wins ?? 0) : '0',
podiums: apiDto.currentDriver ? DashboardCountFormatter.format(apiDto.currentDriver.podiums ?? 0) : '0',
consistency: apiDto.currentDriver ? DashboardConsistencyFormatter.format(apiDto.currentDriver.consistency ?? 0) : '0%',
},
nextRace: apiDto.nextRace ? DashboardViewDataBuilder.buildNextRace(apiDto.nextRace) : null,
upcomingRaces: apiDto.upcomingRaces.map((race) => DashboardViewDataBuilder.buildRace(race)),
leagueStandings: apiDto.leagueStandingsSummaries.map((standing) => ({
leagueId: standing.leagueId,
leagueName: standing.leagueName,
position: DashboardLeaguePositionDisplay.format(standing.position),
points: DashboardCountDisplay.format(standing.points),
totalDrivers: DashboardCountDisplay.format(standing.totalDrivers),
position: DashboardLeaguePositionFormatter.format(standing.position),
points: DashboardCountFormatter.format(standing.points),
totalDrivers: DashboardCountFormatter.format(standing.totalDrivers),
})),
feedItems: apiDto.feedSummary.items.map((item) => ({
id: item.id,
type: item.type,
headline: item.headline,
body: item.body,
body: item.body ?? undefined,
timestamp: item.timestamp,
formattedTime: DashboardDateDisplay.format(new Date(item.timestamp)).relative,
ctaHref: item.ctaHref,
ctaLabel: item.ctaLabel,
formattedTime: DashboardDateFormatter.format(new Date(item.timestamp)).relative,
ctaHref: item.ctaHref ?? undefined,
ctaLabel: item.ctaLabel ?? undefined,
})),
friends: apiDto.friends.map((friend) => ({
id: friend.id,
@@ -61,8 +49,8 @@ export class DashboardViewDataBuilder implements ViewDataBuilder<any, any> {
avatarUrl: friend.avatarUrl || '',
country: friend.country,
})),
activeLeaguesCount: DashboardCountDisplay.format(apiDto.activeLeaguesCount),
friendCount: DashboardCountDisplay.format(apiDto.friends.length),
activeLeaguesCount: DashboardCountFormatter.format(apiDto.activeLeaguesCount),
friendCount: DashboardCountFormatter.format(apiDto.friends.length),
hasUpcomingRaces: apiDto.upcomingRaces.length > 0,
hasLeagueStandings: apiDto.leagueStandingsSummaries.length > 0,
hasFeedItems: apiDto.feedSummary.items.length > 0,
@@ -71,7 +59,7 @@ export class DashboardViewDataBuilder implements ViewDataBuilder<any, any> {
}
private static buildNextRace(race: NonNullable<DashboardOverviewDTO['nextRace']>) {
const dateInfo = DashboardDateDisplay.format(new Date(race.scheduledAt));
const dateInfo = DashboardDateFormatter.format(new Date(race.scheduledAt));
return {
id: race.id,
track: race.track,
@@ -85,7 +73,7 @@ export class DashboardViewDataBuilder implements ViewDataBuilder<any, any> {
}
private static buildRace(race: DashboardOverviewDTO['upcomingRaces'][number]) {
const dateInfo = DashboardDateDisplay.format(new Date(race.scheduledAt));
const dateInfo = DashboardDateFormatter.format(new Date(race.scheduledAt));
return {
id: race.id,
track: race.track,
@@ -97,4 +85,6 @@ export class DashboardViewDataBuilder implements ViewDataBuilder<any, any> {
isMyLeague: race.isMyLeague,
};
}
}
}
DashboardViewDataBuilder satisfies ViewDataBuilder<DashboardOverviewDTO, DashboardViewData>;

28
apps/website/lib/builders/view-data/DeleteMediaViewDataBuilder.ts
View File

@@ -1,30 +1,16 @@
/**
* DeleteMedia ViewData Builder
*
* Transforms media deletion result into ViewData for templates.
*/
import { DeleteMediaOutputDTO } from '@/lib/types/generated/DeleteMediaOutputDTO';
import { DeleteMediaViewData } from './DeleteMediaViewData';
import { ViewData } from '@/lib/contracts/view-data/ViewData';
import { ViewDataBuilder } from "../../contracts/builders/ViewDataBuilder";
import type { ViewDataBuilder } from '@/lib/contracts/builders/ViewDataBuilder';
import type { DeleteMediaOutputDTO } from '@/lib/types/generated/DeleteMediaOutputDTO';
import type { DeleteMediaViewData } from '@/lib/view-data/DeleteMediaViewData';
export class DeleteMediaViewDataBuilder implements ViewDataBuilder<any, any> {
build(input: any): any {
return DeleteMediaViewDataBuilder.build(input);
}
/**
* Transform DTO into ViewData
*
* @param apiDto - The API DTO to transform
* @returns ViewData for templates
*/
static build(apiDto: DeleteMediaOutputDTO): DeleteMediaViewData {
export class DeleteMediaViewDataBuilder {
public static build(apiDto: DeleteMediaOutputDTO): DeleteMediaViewData {
return {
success: apiDto.success,
error: apiDto.error,
};
}
}
DeleteMediaViewDataBuilder satisfies ViewDataBuilder<DeleteMediaOutputDTO, DeleteMediaViewData>;

58
apps/website/lib/builders/view-data/DriverProfileViewDataBuilder.ts
View File

@@ -1,26 +1,16 @@
import type { ViewDataBuilder } from '@/lib/contracts/builders/ViewDataBuilder';
import { DateFormatter } from '@/lib/formatters/DateFormatter';
import { FinishFormatter } from '@/lib/formatters/FinishFormatter';
import { NumberFormatter } from '@/lib/formatters/NumberFormatter';
import { PercentFormatter } from '@/lib/formatters/PercentFormatter';
import { RatingFormatter } from '@/lib/formatters/RatingFormatter';
import type { GetDriverProfileOutputDTO } from '@/lib/types/generated/GetDriverProfileOutputDTO';
import type { DriverProfileViewData } from '@/lib/view-data/DriverProfileViewData';
import { DateDisplay } from '@/lib/display-objects/DateDisplay';
import { RatingDisplay } from '@/lib/display-objects/RatingDisplay';
import { NumberDisplay } from '@/lib/display-objects/NumberDisplay';
import { FinishDisplay } from '@/lib/display-objects/FinishDisplay';
import { PercentDisplay } from '@/lib/display-objects/PercentDisplay';
/**
* DriverProfileViewDataBuilder
*
* Transforms GetDriverProfileOutputDTO into ViewData for the driver profile page.
* Deterministic, side-effect free, no HTTP calls.
*/
import { ViewDataBuilder } from "../../contracts/builders/ViewDataBuilder";
export class DriverProfileViewDataBuilder implements ViewDataBuilder<any, any> {
build(input: any): any {
return DriverProfileViewDataBuilder.build(input);
}
static build(
static build(apiDto: GetDriverProfileOutputDTO): DriverProfileViewData {
export class DriverProfileViewDataBuilder {
public static build(apiDto: GetDriverProfileOutputDTO): DriverProfileViewData {
return {
currentDriver: apiDto.currentDriver ? {
id: apiDto.currentDriver.id,
@@ -29,9 +19,9 @@ export class DriverProfileViewDataBuilder implements ViewDataBuilder<any, any> {
avatarUrl: apiDto.currentDriver.avatarUrl || '',
iracingId: typeof apiDto.currentDriver.iracingId === 'string' ? parseInt(apiDto.currentDriver.iracingId, 10) : (apiDto.currentDriver.iracingId ?? null),
joinedAt: apiDto.currentDriver.joinedAt,
joinedAtLabel: DateDisplay.formatMonthYear(apiDto.currentDriver.joinedAt),
joinedAtLabel: DateFormatter.formatMonthYear(apiDto.currentDriver.joinedAt),
rating: apiDto.currentDriver.rating ?? null,
ratingLabel: RatingDisplay.format(apiDto.currentDriver.rating),
ratingLabel: RatingFormatter.format(apiDto.currentDriver.rating),
globalRank: apiDto.currentDriver.globalRank ?? null,
globalRankLabel: apiDto.currentDriver.globalRank != null ? `#${apiDto.currentDriver.globalRank}` : '—',
consistency: apiDto.currentDriver.consistency ?? null,
@@ -40,27 +30,27 @@ export class DriverProfileViewDataBuilder implements ViewDataBuilder<any, any> {
} : null,
stats: apiDto.stats ? {
totalRaces: apiDto.stats.totalRaces,
totalRacesLabel: NumberDisplay.format(apiDto.stats.totalRaces),
totalRacesLabel: NumberFormatter.format(apiDto.stats.totalRaces),
wins: apiDto.stats.wins,
winsLabel: NumberDisplay.format(apiDto.stats.wins),
winsLabel: NumberFormatter.format(apiDto.stats.wins),
podiums: apiDto.stats.podiums,
podiumsLabel: NumberDisplay.format(apiDto.stats.podiums),
podiumsLabel: NumberFormatter.format(apiDto.stats.podiums),
dnfs: apiDto.stats.dnfs,
dnfsLabel: NumberDisplay.format(apiDto.stats.dnfs),
dnfsLabel: NumberFormatter.format(apiDto.stats.dnfs),
avgFinish: apiDto.stats.avgFinish ?? null,
avgFinishLabel: FinishDisplay.formatAverage(apiDto.stats.avgFinish),
avgFinishLabel: FinishFormatter.formatAverage(apiDto.stats.avgFinish),
bestFinish: apiDto.stats.bestFinish ?? null,
bestFinishLabel: FinishDisplay.format(apiDto.stats.bestFinish),
bestFinishLabel: FinishFormatter.format(apiDto.stats.bestFinish),
worstFinish: apiDto.stats.worstFinish ?? null,
worstFinishLabel: FinishDisplay.format(apiDto.stats.worstFinish),
worstFinishLabel: FinishFormatter.format(apiDto.stats.worstFinish),
finishRate: apiDto.stats.finishRate ?? null,
winRate: apiDto.stats.winRate ?? null,
podiumRate: apiDto.stats.podiumRate ?? null,
percentile: apiDto.stats.percentile ?? null,
rating: apiDto.stats.rating ?? null,
ratingLabel: RatingDisplay.format(apiDto.stats.rating),
ratingLabel: RatingFormatter.format(apiDto.stats.rating),
consistency: apiDto.stats.consistency ?? null,
consistencyLabel: PercentDisplay.formatWhole(apiDto.stats.consistency),
consistencyLabel: PercentFormatter.formatWhole(apiDto.stats.consistency),
overallRank: apiDto.stats.overallRank ?? null,
} : null,
finishDistribution: apiDto.finishDistribution ? {
@@ -77,7 +67,7 @@ export class DriverProfileViewDataBuilder implements ViewDataBuilder<any, any> {
teamTag: m.teamTag ?? null,
role: m.role,
joinedAt: m.joinedAt,
joinedAtLabel: DateDisplay.formatMonthYear(m.joinedAt),
joinedAtLabel: DateFormatter.formatMonthYear(m.joinedAt),
isCurrent: m.isCurrent,
})),
socialSummary: {
@@ -103,7 +93,7 @@ export class DriverProfileViewDataBuilder implements ViewDataBuilder<any, any> {
rarity: a.rarity,
rarityLabel: a.rarity,
earnedAt: a.earnedAt,
earnedAtLabel: DateDisplay.formatShort(a.earnedAt),
earnedAtLabel: DateFormatter.formatShort(a.earnedAt),
})),
racingStyle: apiDto.extendedProfile.racingStyle,
favoriteTrack: apiDto.extendedProfile.favoriteTrack,
@@ -116,3 +106,5 @@ export class DriverProfileViewDataBuilder implements ViewDataBuilder<any, any> {
};
}
}
DriverProfileViewDataBuilder satisfies ViewDataBuilder<GetDriverProfileOutputDTO, DriverProfileViewData>;

27
apps/website/lib/builders/view-data/DriverRankingsViewDataBuilder.ts
View File

@@ -1,16 +1,13 @@
import type { ViewDataBuilder } from '@/lib/contracts/builders/ViewDataBuilder';
import { MedalFormatter } from '@/lib/formatters/MedalFormatter';
import { WinRateFormatter } from '@/lib/formatters/WinRateFormatter';
import type { DriverLeaderboardItemDTO } from '@/lib/types/generated/DriverLeaderboardItemDTO';
import type { DriverRankingsViewData } from '@/lib/view-data/DriverRankingsViewData';
import { ViewData } from '@/lib/contracts/view-data/ViewData';
import { ViewDataBuilder } from "../../contracts/builders/ViewDataBuilder";
export class DriverRankingsViewDataBuilder implements ViewDataBuilder<any, any> {
build(input: any): any {
return DriverRankingsViewDataBuilder.build(input);
}
static build(
static build(apiDto: DriverLeaderboardItemDTO[]): DriverRankingsViewData {
export class DriverRankingsViewDataBuilder {
public static build(apiDto: DriverLeaderboardItemDTO[]): DriverRankingsViewData {
if (!apiDto || apiDto.length === 0) {
return {
drivers: [],
@@ -34,9 +31,9 @@ export class DriverRankingsViewDataBuilder implements ViewDataBuilder<any, any>
podiums: driver.podiums,
rank: driver.rank,
avatarUrl: driver.avatarUrl || '',
winRate: WinRateDisplay.calculate(driver.racesCompleted, driver.wins),
medalBg: MedalDisplay.getBg(driver.rank),
medalColor: MedalDisplay.getColor(driver.rank),
winRate: WinRateFormatter.calculate(driver.racesCompleted, driver.wins),
medalBg: MedalFormatter.getBg(driver.rank),
medalColor: MedalFormatter.getColor(driver.rank),
})),
podium: apiDto.slice(0, 3).map((driver, index) => {
const positions = [2, 1, 3]; // Display order: 2nd, 1st, 3rd
@@ -57,4 +54,6 @@ export class DriverRankingsViewDataBuilder implements ViewDataBuilder<any, any>
showFilters: false,
};
}
}
}
DriverRankingsViewDataBuilder satisfies ViewDataBuilder<DriverLeaderboardItemDTO[], DriverRankingsViewData>;

44
apps/website/lib/builders/view-data/DriversViewDataBuilder.ts
View File

@@ -1,40 +1,38 @@
import type { ViewDataBuilder } from '@/lib/contracts/builders/ViewDataBuilder';
import { NumberFormatter } from '@/lib/formatters/NumberFormatter';
import { RatingFormatter } from '@/lib/formatters/RatingFormatter';
import type { DriversLeaderboardDTO } from '@/lib/types/generated/DriversLeaderboardDTO';
import type { DriversViewData } from '@/lib/view-data/DriversViewData';
import { RatingDisplay } from '@/lib/display-objects/RatingDisplay';
import { NumberDisplay } from '@/lib/display-objects/NumberDisplay';
import { ViewDataBuilder } from "../../contracts/builders/ViewDataBuilder";
export class DriversViewDataBuilder implements ViewDataBuilder<any, any> {
build(input: any): any {
return DriversViewDataBuilder.build(input);
}
static build(
static build(dto: DriversLeaderboardDTO): DriversViewData {
export class DriversViewDataBuilder {
public static build(apiDto: DriversLeaderboardDTO): DriversViewData {
return {
drivers: dto.drivers.map(driver => ({
drivers: apiDto.drivers.map(driver => ({
id: driver.id,
name: driver.name,
rating: driver.rating,
ratingLabel: RatingDisplay.format(driver.rating),
ratingLabel: RatingFormatter.format(driver.rating),
skillLevel: driver.skillLevel,
category: driver.category,
category: driver.category ?? undefined,
nationality: driver.nationality,
racesCompleted: driver.racesCompleted,
wins: driver.wins,
podiums: driver.podiums,
isActive: driver.isActive,
rank: driver.rank,
avatarUrl: driver.avatarUrl,
avatarUrl: driver.avatarUrl ?? undefined,
})),
totalRaces: dto.totalRaces,
totalRacesLabel: NumberDisplay.format(dto.totalRaces),
totalWins: dto.totalWins,
totalWinsLabel: NumberDisplay.format(dto.totalWins),
activeCount: dto.activeCount,
activeCountLabel: NumberDisplay.format(dto.activeCount),
totalDriversLabel: NumberDisplay.format(dto.drivers.length),
totalRaces: apiDto.totalRaces,
totalRacesLabel: NumberFormatter.format(apiDto.totalRaces),
totalWins: apiDto.totalWins,
totalWinsLabel: NumberFormatter.format(apiDto.totalWins),
activeCount: apiDto.activeCount,
activeCountLabel: NumberFormatter.format(apiDto.activeCount),
totalDriversLabel: NumberFormatter.format(apiDto.drivers.length),
};
}
}
}
DriversViewDataBuilder satisfies ViewDataBuilder<DriversLeaderboardDTO, DriversViewData>;

27
apps/website/lib/builders/view-data/ForgotPasswordViewDataBuilder.ts
View File

@@ -1,24 +1,11 @@
/**
* Forgot Password View Data Builder
*
* Transforms ForgotPasswordPageDTO into ViewData for the forgot password template.
* Deterministic, side-effect free, no business logic.
*/
import { ForgotPasswordPageDTO } from '@/lib/services/auth/types/ForgotPasswordPageDTO';
import { ForgotPasswordViewData } from '../../view-data/ForgotPasswordViewData';
import { ViewData } from '@/lib/contracts/view-data/ViewData';
import { error } from 'console';
import { ViewDataBuilder } from "../../contracts/builders/ViewDataBuilder";
import type { ViewDataBuilder } from '@/lib/contracts/builders/ViewDataBuilder';
import type { ForgotPasswordPageDTO } from '@/lib/types/generated/ForgotPasswordPageDTO';
import type { ForgotPasswordViewData } from '@/lib/view-data/ForgotPasswordViewData';
export class ForgotPasswordViewDataBuilder implements ViewDataBuilder<any, any> {
build(input: any): any {
return ForgotPasswordViewDataBuilder.build(input);
}
static build(
static build(apiDto: ForgotPasswordPageDTO): ForgotPasswordViewData {
export class ForgotPasswordViewDataBuilder {
public static build(apiDto: ForgotPasswordPageDTO): ForgotPasswordViewData {
return {
returnTo: apiDto.returnTo,
showSuccess: false,
@@ -35,4 +22,6 @@ export class ForgotPasswordViewDataBuilder implements ViewDataBuilder<any, any>
submitError: undefined,
};
}
}
}
ForgotPasswordViewDataBuilder satisfies ViewDataBuilder<ForgotPasswordPageDTO, ForgotPasswordViewData>;

32
apps/website/lib/builders/view-data/GenerateAvatarsViewDataBuilder.ts
View File

@@ -1,33 +1,17 @@
/**
* GenerateAvatars ViewData Builder
*
* Transforms avatar generation result into ViewData for templates.
* Must be used in mutations to avoid returning DTOs directly.
*/
import { RequestAvatarGenerationOutputDTO } from '@/lib/types/generated/RequestAvatarGenerationOutputDTO';
import { GenerateAvatarsViewData } from './GenerateAvatarsViewData';
import { ViewData } from '@/lib/contracts/view-data/ViewData';
import { ViewDataBuilder } from "../../contracts/builders/ViewDataBuilder";
import type { ViewDataBuilder } from '@/lib/contracts/builders/ViewDataBuilder';
import type { RequestAvatarGenerationOutputDTO } from '@/lib/types/generated/RequestAvatarGenerationOutputDTO';
import type { GenerateAvatarsViewData } from '@/lib/view-data/GenerateAvatarsViewData';
export class GenerateAvatarsViewDataBuilder implements ViewDataBuilder<any, any> {
build(input: any): any {
return GenerateAvatarsViewDataBuilder.build(input);
}
static build(
/**
* Transform DTO into ViewData
*
* @param apiDto - The API DTO to transform
* @returns ViewData for templates
*/
static build(apiDto: RequestAvatarGenerationOutputDTO): GenerateAvatarsViewData {
export class GenerateAvatarsViewDataBuilder {
public static build(apiDto: RequestAvatarGenerationOutputDTO): GenerateAvatarsViewData {
return {
success: apiDto.success,
avatarUrls: apiDto.avatarUrls || [],
errorMessage: apiDto.errorMessage,
};
}
}
}
GenerateAvatarsViewDataBuilder satisfies ViewDataBuilder<RequestAvatarGenerationOutputDTO, GenerateAvatarsViewData>;

116
apps/website/lib/builders/view-data/HealthViewDataBuilder.ts
View File

@@ -1,102 +1,66 @@
/**
* Health View Data Builder
*
* Transforms health DTO data into UI-ready view models.
* This layer isolates the UI from API churn by providing a stable interface
* between the API layer and the presentation layer.
*/
import type { HealthViewData, HealthStatus, HealthMetrics, HealthComponent, HealthAlert } from '@/lib/view-data/HealthViewData';
import { HealthStatusDisplay } from '@/lib/display-objects/HealthStatusDisplay';
import { HealthMetricDisplay } from '@/lib/display-objects/HealthMetricDisplay';
import { HealthComponentDisplay } from '@/lib/display-objects/HealthComponentDisplay';
import { HealthAlertDisplay } from '@/lib/display-objects/HealthAlertDisplay';
export interface HealthDTO {
status: 'ok' | 'degraded' | 'error' | 'unknown';
timestamp: string;
uptime?: number;
responseTime?: number;
errorRate?: number;
lastCheck?: string;
checksPassed?: number;
checksFailed?: number;
components?: Array<{
name: string;
status: 'ok' | 'degraded' | 'error' | 'unknown';
lastCheck?: string;
responseTime?: number;
errorRate?: number;
}>;
alerts?: Array<{
id: string;
type: 'critical' | 'warning' | 'info';
title: string;
message: string;
timestamp: string;
}>;
}
import type { ViewDataBuilder } from '@/lib/contracts/builders/ViewDataBuilder';
import { HealthAlertFormatter } from '@/lib/formatters/HealthAlertFormatter';
import { HealthComponentFormatter } from '@/lib/formatters/HealthComponentFormatter';
import { HealthMetricFormatter } from '@/lib/formatters/HealthMetricFormatter';
import { HealthStatusFormatter } from '@/lib/formatters/HealthStatusFormatter';
import type { HealthDTO } from '@/lib/types/generated/HealthDTO';
import type { HealthAlert, HealthComponent, HealthMetrics, HealthStatus, HealthViewData } from '@/lib/view-data/HealthViewData';
import { ViewDataBuilder } from "../../contracts/builders/ViewDataBuilder";
export class HealthViewDataBuilder implements ViewDataBuilder<any, any> {
build(input: any): any {
return HealthViewDataBuilder.build(input);
}
static build(
static build(dto: HealthDTO): HealthViewData {
export class HealthViewDataBuilder {
public static build(apiDto: HealthDTO): HealthViewData {
const now = new Date();
const lastUpdated = dto.timestamp || now.toISOString();
const lastUpdated = apiDto.timestamp || now.toISOString();
// Build overall status
const overallStatus: HealthStatus = {
status: dto.status,
timestamp: dto.timestamp,
formattedTimestamp: HealthStatusDisplay.formatTimestamp(dto.timestamp),
relativeTime: HealthStatusDisplay.formatRelativeTime(dto.timestamp),
statusLabel: HealthStatusDisplay.formatStatusLabel(dto.status),
statusColor: HealthStatusDisplay.formatStatusColor(dto.status),
statusIcon: HealthStatusDisplay.formatStatusIcon(dto.status),
status: apiDto.status,
timestamp: apiDto.timestamp,
formattedTimestamp: HealthStatusFormatter.formatTimestamp(apiDto.timestamp),
relativeTime: HealthStatusFormatter.formatRelativeTime(apiDto.timestamp),
statusLabel: HealthStatusFormatter.formatStatusLabel(apiDto.status),
statusColor: HealthStatusFormatter.formatStatusColor(apiDto.status),
statusIcon: HealthStatusFormatter.formatStatusIcon(apiDto.status),
};
// Build metrics
const metrics: HealthMetrics = {
uptime: HealthMetricDisplay.formatUptime(dto.uptime),
responseTime: HealthMetricDisplay.formatResponseTime(dto.responseTime),
errorRate: HealthMetricDisplay.formatErrorRate(dto.errorRate),
lastCheck: dto.lastCheck || lastUpdated,
formattedLastCheck: HealthMetricDisplay.formatTimestamp(dto.lastCheck || lastUpdated),
checksPassed: dto.checksPassed || 0,
checksFailed: dto.checksFailed || 0,
totalChecks: (dto.checksPassed || 0) + (dto.checksFailed || 0),
successRate: HealthMetricDisplay.formatSuccessRate(dto.checksPassed, dto.checksFailed),
uptime: HealthMetricFormatter.formatUptime(apiDto.uptime),
responseTime: HealthMetricFormatter.formatResponseTime(apiDto.responseTime),
errorRate: HealthMetricFormatter.formatErrorRate(apiDto.errorRate),
lastCheck: apiDto.lastCheck || lastUpdated,
formattedLastCheck: HealthMetricFormatter.formatTimestamp(apiDto.lastCheck || lastUpdated),
checksPassed: apiDto.checksPassed || 0,
checksFailed: apiDto.checksFailed || 0,
totalChecks: (apiDto.checksPassed || 0) + (apiDto.checksFailed || 0),
successRate: HealthMetricFormatter.formatSuccessRate(apiDto.checksPassed, apiDto.checksFailed),
};
// Build components
const components: HealthComponent[] = (dto.components || []).map((component) => ({
const components: HealthComponent[] = (apiDto.components || []).map((component) => ({
name: component.name,
status: component.status,
statusLabel: HealthComponentDisplay.formatStatusLabel(component.status),
statusColor: HealthComponentDisplay.formatStatusColor(component.status),
statusIcon: HealthComponentDisplay.formatStatusIcon(component.status),
statusLabel: HealthComponentFormatter.formatStatusLabel(component.status),
statusColor: HealthComponentFormatter.formatStatusColor(component.status),
statusIcon: HealthComponentFormatter.formatStatusIcon(component.status),
lastCheck: component.lastCheck || lastUpdated,
formattedLastCheck: HealthComponentDisplay.formatTimestamp(component.lastCheck || lastUpdated),
responseTime: HealthMetricDisplay.formatResponseTime(component.responseTime),
errorRate: HealthMetricDisplay.formatErrorRate(component.errorRate),
formattedLastCheck: HealthComponentFormatter.formatTimestamp(component.lastCheck || lastUpdated),
responseTime: HealthMetricFormatter.formatResponseTime(component.responseTime),
errorRate: HealthMetricFormatter.formatErrorRate(component.errorRate),
}));
// Build alerts
const alerts: HealthAlert[] = (dto.alerts || []).map((alert) => ({
const alerts: HealthAlert[] = (apiDto.alerts || []).map((alert) => ({
id: alert.id,
type: alert.type,
title: alert.title,
message: alert.message,
timestamp: alert.timestamp,
formattedTimestamp: HealthAlertDisplay.formatTimestamp(alert.timestamp),
relativeTime: HealthAlertDisplay.formatRelativeTime(alert.timestamp),
severity: HealthAlertDisplay.formatSeverity(alert.type),
severityColor: HealthAlertDisplay.formatSeverityColor(alert.type),
formattedTimestamp: HealthAlertFormatter.formatTimestamp(alert.timestamp),
relativeTime: HealthAlertFormatter.formatRelativeTime(alert.timestamp),
severity: HealthAlertFormatter.formatSeverity(alert.type),
severityColor: HealthAlertFormatter.formatSeverityColor(alert.type),
}));
// Calculate derived fields
@@ -113,7 +77,9 @@ export class HealthViewDataBuilder implements ViewDataBuilder<any, any> {
hasDegradedComponents,
hasErrorComponents,
lastUpdated,
formattedLastUpdated: HealthStatusDisplay.formatTimestamp(lastUpdated),
formattedLastUpdated: HealthStatusFormatter.formatTimestamp(lastUpdated),
};
}
}
HealthViewDataBuilder satisfies ViewDataBuilder<HealthDTO, HealthViewData>;

143
apps/website/lib/builders/view-data/HomeViewDataBuilder.test.ts
View File

@@ -1,34 +1,33 @@
import { describe, it, expect } from 'vitest';
import { HomeViewDataBuilder } from './HomeViewDataBuilder';
import type { HomeDataDTO } from '@/lib/types/dtos/HomeDataDTO';
import type { DashboardOverviewDTO } from '@/lib/types/generated/DashboardOverviewDTO';
describe('HomeViewDataBuilder', () => {
describe('happy paths', () => {
it('should transform HomeDataDTO to HomeViewData correctly', () => {
const homeDataDto: HomeDataDTO = {
isAlpha: true,
it('should transform DashboardOverviewDTO to HomeViewData correctly', () => {
const homeDataDto: DashboardOverviewDTO = {
currentDriver: null,
upcomingRaces: [
{
id: 'race-1',
name: 'Test Race',
scheduledAt: '2024-01-01T10:00:00Z',
track: 'Test Track',
car: 'Test Car',
scheduledAt: '2024-01-01T10:00:00Z',
isMyLeague: false,
},
],
topLeagues: [
leagueStandingsSummaries: [
{
id: 'league-1',
name: 'Test League',
description: 'Test Description',
},
],
teams: [
{
id: 'team-1',
name: 'Test Team',
tag: 'TT',
leagueId: 'league-1',
leagueName: 'Test League',
position: 1,
points: 100,
totalDrivers: 20,
},
],
feedSummary: { items: [] },
friends: [],
activeLeaguesCount: 1,
};
const result = HomeViewDataBuilder.build(homeDataDto);
@@ -38,130 +37,58 @@ describe('HomeViewDataBuilder', () => {
upcomingRaces: [
{
id: 'race-1',
name: 'Test Race',
scheduledAt: '2024-01-01T10:00:00Z',
track: 'Test Track',
car: 'Test Car',
formattedDate: 'Mon, Jan 1, 2024',
},
],
topLeagues: [
{
id: 'league-1',
name: 'Test League',
description: 'Test Description',
},
],
teams: [
{
id: 'team-1',
name: 'Test Team',
tag: 'TT',
description: '',
},
],
teams: [],
});
});
it('should handle empty arrays correctly', () => {
const homeDataDto: HomeDataDTO = {
isAlpha: false,
const homeDataDto: DashboardOverviewDTO = {
currentDriver: null,
upcomingRaces: [],
topLeagues: [],
teams: [],
leagueStandingsSummaries: [],
feedSummary: { items: [] },
friends: [],
activeLeaguesCount: 0,
};
const result = HomeViewDataBuilder.build(homeDataDto);
expect(result).toEqual({
isAlpha: false,
isAlpha: true,
upcomingRaces: [],
topLeagues: [],
teams: [],
});
});
it('should handle multiple items in arrays', () => {
const homeDataDto: HomeDataDTO = {
isAlpha: true,
upcomingRaces: [
{ id: 'race-1', name: 'Race 1', scheduledAt: '2024-01-01T10:00:00Z', track: 'Track 1' },
{ id: 'race-2', name: 'Race 2', scheduledAt: '2024-01-02T10:00:00Z', track: 'Track 2' },
],
topLeagues: [
{ id: 'league-1', name: 'League 1', description: 'Description 1' },
{ id: 'league-2', name: 'League 2', description: 'Description 2' },
],
teams: [
{ id: 'team-1', name: 'Team 1', tag: 'T1' },
{ id: 'team-2', name: 'Team 2', tag: 'T2' },
],
};
const result = HomeViewDataBuilder.build(homeDataDto);
expect(result.upcomingRaces).toHaveLength(2);
expect(result.topLeagues).toHaveLength(2);
expect(result.teams).toHaveLength(2);
});
});
describe('data transformation', () => {
it('should preserve all DTO fields in the output', () => {
const homeDataDto: HomeDataDTO = {
isAlpha: true,
upcomingRaces: [{ id: 'race-1', name: 'Race', scheduledAt: '2024-01-01T10:00:00Z', track: 'Track' }],
topLeagues: [{ id: 'league-1', name: 'League', description: 'Description' }],
teams: [{ id: 'team-1', name: 'Team', tag: 'T' }],
};
const result = HomeViewDataBuilder.build(homeDataDto);
expect(result.isAlpha).toBe(homeDataDto.isAlpha);
expect(result.upcomingRaces).toEqual(homeDataDto.upcomingRaces);
expect(result.topLeagues).toEqual(homeDataDto.topLeagues);
expect(result.teams).toEqual(homeDataDto.teams);
});
it('should not modify the input DTO', () => {
const homeDataDto: HomeDataDTO = {
isAlpha: true,
upcomingRaces: [{ id: 'race-1', name: 'Race', scheduledAt: '2024-01-01T10:00:00Z', track: 'Track' }],
topLeagues: [{ id: 'league-1', name: 'League', description: 'Description' }],
teams: [{ id: 'team-1', name: 'Team', tag: 'T' }],
const homeDataDto: DashboardOverviewDTO = {
currentDriver: null,
upcomingRaces: [{ id: 'race-1', track: 'Track', car: 'Car', scheduledAt: '2024-01-01T10:00:00Z', isMyLeague: false }],
leagueStandingsSummaries: [{ leagueId: 'league-1', leagueName: 'League', position: 1, points: 10, totalDrivers: 10 }],
feedSummary: { items: [] },
friends: [],
activeLeaguesCount: 1,
};
const originalDto = { ...homeDataDto };
const originalDto = JSON.parse(JSON.stringify(homeDataDto));
HomeViewDataBuilder.build(homeDataDto);
expect(homeDataDto).toEqual(originalDto);
});
});
describe('edge cases', () => {
it('should handle false isAlpha value', () => {
const homeDataDto: HomeDataDTO = {
isAlpha: false,
upcomingRaces: [],
topLeagues: [],
teams: [],
};
const result = HomeViewDataBuilder.build(homeDataDto);
expect(result.isAlpha).toBe(false);
});
it('should handle null/undefined values in arrays', () => {
const homeDataDto: HomeDataDTO = {
isAlpha: true,
upcomingRaces: [{ id: 'race-1', name: 'Race', scheduledAt: '2024-01-01T10:00:00Z', track: 'Track' }],
topLeagues: [{ id: 'league-1', name: 'League', description: 'Description' }],
teams: [{ id: 'team-1', name: 'Team', tag: 'T' }],
};
const result = HomeViewDataBuilder.build(homeDataDto);
expect(result.upcomingRaces[0].id).toBe('race-1');
expect(result.topLeagues[0].id).toBe('league-1');
expect(result.teams[0].id).toBe('team-1');
});
});
});

42
apps/website/lib/builders/view-data/HomeViewDataBuilder.ts
View File

@@ -1,32 +1,34 @@
import type { HomeViewData } from '@/templates/HomeTemplate';
import type { HomeDataDTO } from '@/lib/types/dtos/HomeDataDTO';
import { ViewData } from '@/lib/contracts/view-data/ViewData';
/**
* HomeViewDataBuilder
*
* Transforms HomeDataDTO to HomeViewData.
*/
import { ViewDataBuilder } from "../../contracts/builders/ViewDataBuilder";
export class HomeViewDataBuilder implements ViewDataBuilder<any, any> {
build(input: any): any {
return HomeViewDataBuilder.build(input);
}
import type { ViewDataBuilder } from '@/lib/contracts/builders/ViewDataBuilder';
import { DashboardDateFormatter } from '@/lib/formatters/DashboardDateFormatter';
import type { DashboardOverviewDTO } from '@/lib/types/generated/DashboardOverviewDTO';
import type { HomeViewData } from '@/lib/view-data/HomeViewData';
static build(
export class HomeViewDataBuilder {
/**
* Build HomeViewData from HomeDataDTO
* Build HomeViewData from DashboardOverviewDTO
*
* @param apiDto - The API DTO
* @returns HomeViewData
*/
static build(apiDto: HomeDataDTO): HomeViewData {
public static build(apiDto: DashboardOverviewDTO): HomeViewData {
return {
isAlpha: apiDto.isAlpha,
upcomingRaces: apiDto.upcomingRaces,
topLeagues: apiDto.topLeagues,
teams: apiDto.teams,
isAlpha: true,
upcomingRaces: (apiDto.upcomingRaces || []).map(race => ({
id: race.id,
track: race.track,
car: race.car,
formattedDate: DashboardDateFormatter.format(new Date(race.scheduledAt)).date,
})),
topLeagues: (apiDto.leagueStandingsSummaries || []).map(league => ({
id: league.leagueId,
name: league.leagueName,
description: '',
})),
teams: [],
};
}
}
HomeViewDataBuilder satisfies ViewDataBuilder<DashboardOverviewDTO, HomeViewData>;

22
apps/website/lib/builders/view-data/LeaderboardsViewDataBuilder.ts
View File

@@ -1,19 +1,17 @@
import { ViewData } from '@/lib/contracts/view-data/ViewData';
import type { ViewDataBuilder } from '@/lib/contracts/builders/ViewDataBuilder';
import type { DriverLeaderboardItemDTO } from '@/lib/types/generated/DriverLeaderboardItemDTO';
import type { GetTeamsLeaderboardOutputDTO } from '@/lib/types/generated/GetTeamsLeaderboardOutputDTO';
import type { LeaderboardsViewData } from '@/lib/view-data/LeaderboardsViewData';
import { ViewDataBuilder } from "../../contracts/builders/ViewDataBuilder";
type LeaderboardsInputDTO = {
drivers: { drivers: DriverLeaderboardItemDTO[] };
teams: GetTeamsLeaderboardOutputDTO;
}
export class LeaderboardsViewDataBuilder implements ViewDataBuilder<any, any> {
build(input: any): any {
return LeaderboardsViewDataBuilder.build(input);
}
static build(
static build(
apiDto: { drivers: { drivers: DriverLeaderboardItemDTO[] }; teams: GetTeamsLeaderboardOutputDTO }
): LeaderboardsViewData {
export class LeaderboardsViewDataBuilder {
public static build(apiDto: LeaderboardsInputDTO): LeaderboardsViewData {
return {
drivers: apiDto.drivers.drivers.map(driver => ({
id: driver.id,
@@ -45,3 +43,5 @@ export class LeaderboardsViewDataBuilder implements ViewDataBuilder<any, any> {
};
}
}
LeaderboardsViewDataBuilder satisfies ViewDataBuilder<LeaderboardsInputDTO, LeaderboardsViewData>;

2
apps/website/lib/builders/view-data/LeagueCoverViewDataBuilder.test.ts
View File

@@ -1,6 +1,6 @@
import { describe, it, expect } from 'vitest';
import { LeagueCoverViewDataBuilder } from './LeagueCoverViewDataBuilder';
import type { MediaBinaryDTO } from '@/lib/types/MediaBinaryDTO';
import type { MediaBinaryDTO } from '@/lib/types/generated/MediaBinaryDTO';
describe('LeagueCoverViewDataBuilder', () => {
describe('happy paths', () => {

25
apps/website/lib/builders/view-data/LeagueCoverViewDataBuilder.ts
View File

@@ -1,25 +1,16 @@
/**
* LeagueCoverViewDataBuilder
*
* Transforms MediaBinaryDTO into LeagueCoverViewData for server-side rendering.
* Deterministic; side-effect free; no HTTP calls.
*/
import { MediaBinaryDTO } from '@/lib/types/MediaBinaryDTO';
import { LeagueCoverViewData } from '@/lib/view-data/LeagueCoverViewData';
import { ViewDataBuilder } from "../../contracts/builders/ViewDataBuilder";
import type { ViewDataBuilder } from '@/lib/contracts/builders/ViewDataBuilder';
import type { MediaBinaryDTO } from '@/lib/types/generated/MediaBinaryDTO';
import type { LeagueCoverViewData } from '@/lib/view-data/LeagueCoverViewData';
export class LeagueCoverViewDataBuilder implements ViewDataBuilder<any, any> {
build(input: any): any {
return LeagueCoverViewDataBuilder.build(input);
}
static build(
static build(apiDto: MediaBinaryDTO): LeagueCoverViewData {
export class LeagueCoverViewDataBuilder {
public static build(apiDto: MediaBinaryDTO): LeagueCoverViewData {
return {
buffer: Buffer.from(apiDto.buffer).toString('base64'),
contentType: apiDto.contentType,
};
}
}
}
LeagueCoverViewDataBuilder satisfies ViewDataBuilder<MediaBinaryDTO, LeagueCoverViewData>;

125
apps/website/lib/builders/view-data/LeagueDetailViewDataBuilder.ts
View File

@@ -1,33 +1,36 @@
import type { LeagueWithCapacityAndScoringDTO } from '@/lib/types/generated/LeagueWithCapacityAndScoringDTO';
import type { LeagueMembershipsDTO } from '@/lib/types/generated/LeagueMembershipsDTO';
import type { RaceDTO } from '@/lib/types/generated/RaceDTO';
import type { ViewDataBuilder } from '@/lib/contracts/builders/ViewDataBuilder';
import type { GetDriverOutputDTO } from '@/lib/types/generated/GetDriverOutputDTO';
import type { LeagueMembershipsDTO } from '@/lib/types/generated/LeagueMembershipsDTO';
import type { LeagueScoringConfigDTO } from '@/lib/types/generated/LeagueScoringConfigDTO';
import type { LeagueDetailViewData, LeagueInfoData, LiveRaceData, DriverSummaryData, SponsorInfo, NextRaceInfo, SeasonProgress, RecentResult } from '@/lib/view-data/LeagueDetailViewData';
import type { LeagueWithCapacityAndScoringDTO } from '@/lib/types/generated/LeagueWithCapacityAndScoringDTO';
import type { RaceDTO } from '@/lib/types/generated/RaceDTO';
import type { DriverSummaryData, LeagueDetailViewData, LeagueInfoData, LiveRaceData, NextRaceInfo, RecentResult, SeasonProgress, SponsorInfo } from '@/lib/view-data/LeagueDetailViewData';
/**
* LeagueDetailViewDataBuilder
*
* Transforms API DTOs into LeagueDetailViewData for server-side rendering.
* Deterministic; side-effect free; no HTTP calls.
*/
import { ViewDataBuilder } from "../../contracts/builders/ViewDataBuilder";
type LeagueDetailInputDTO = {
league: LeagueWithCapacityAndScoringDTO;
owner: GetDriverOutputDTO | null;
scoringConfig: LeagueScoringConfigDTO | null;
memberships: LeagueMembershipsDTO;
races: RaceDTO[];
sponsors: Array<{
id: string;
name: string;
tier: string;
logoUrl?: string;
websiteUrl?: string;
tagline?: string;
}>;
}
export class LeagueDetailViewDataBuilder implements ViewDataBuilder<any, any> {
build(input: any): any {
return LeagueDetailViewDataBuilder.build(input);
}
static build(
static build(input: {
league: LeagueWithCapacityAndScoringDTO;
owner: GetDriverOutputDTO | null;
scoringConfig: LeagueScoringConfigDTO | null;
memberships: LeagueMembershipsDTO;
races: RaceDTO[];
sponsors: any[];
}): LeagueDetailViewData {
const { league, owner, scoringConfig, memberships, races, sponsors } = input;
export class LeagueDetailViewDataBuilder {
/**
* Transform API DTO to ViewData
*
* @param apiDto - The DTO from the service
* @returns ViewData for the league detail page
*/
public static build(apiDto: LeagueDetailInputDTO): LeagueDetailViewData {
const { league, owner, scoringConfig, memberships, races, sponsors } = apiDto;
// Calculate running races - using available fields from RaceDTO
const runningRaces: LiveRaceData[] = races
@@ -44,31 +47,17 @@ export class LeagueDetailViewDataBuilder implements ViewDataBuilder<any, any> {
const membersCount = Array.isArray(memberships.members) ? memberships.members.length : 0;
// League overview wants total races, not just completed.
// (In seed/demo data many races are `status: running`, which should still count.)
const racesCount = races.length;
// Compute real avgSOF from races
const racesWithSOF = races.filter(r => {
const sof = (r as any).strengthOfField;
const sof = (r as RaceDTO & { strengthOfField?: number }).strengthOfField;
return typeof sof === 'number' && sof > 0;
});
const avgSOF = racesWithSOF.length > 0
? Math.round(racesWithSOF.reduce((sum, r) => sum + ((r as any).strengthOfField || 0), 0) / racesWithSOF.length)
? Math.round(racesWithSOF.reduce((sum, r) => sum + ((r as RaceDTO & { strengthOfField?: number }).strengthOfField || 0), 0) / racesWithSOF.length)
: null;
if (process.env.NODE_ENV !== 'production') {
const race0 = races.length > 0 ? races[0] : null;
console.info(
'[LeagueDetailViewDataBuilder] leagueId=%s members=%d races=%d racesWithSOF=%d avgSOF=%s race0=%o',
league.id,
membersCount,
racesCount,
racesWithSOF.length,
String(avgSOF),
race0,
);
}
const info: LeagueInfoData = {
name: league.name,
description: league.description || '',
@@ -111,7 +100,7 @@ export class LeagueDetailViewDataBuilder implements ViewDataBuilder<any, any> {
.map(m => ({
driverId: m.driverId,
driverName: m.driver.name,
avatarUrl: (m.driver as any).avatarUrl || null,
avatarUrl: (m.driver as GetDriverOutputDTO & { avatarUrl?: string }).avatarUrl || null,
rating: null,
rank: null,
roleBadgeText: 'Admin',
@@ -124,7 +113,7 @@ export class LeagueDetailViewDataBuilder implements ViewDataBuilder<any, any> {
.map(m => ({
driverId: m.driverId,
driverName: m.driver.name,
avatarUrl: (m.driver as any).avatarUrl || null,
avatarUrl: (m.driver as GetDriverOutputDTO & { avatarUrl?: string }).avatarUrl || null,
rating: null,
rank: null,
roleBadgeText: 'Steward',
@@ -137,7 +126,7 @@ export class LeagueDetailViewDataBuilder implements ViewDataBuilder<any, any> {
.map(m => ({
driverId: m.driverId,
driverName: m.driver.name,
avatarUrl: (m.driver as any).avatarUrl || null,
avatarUrl: (m.driver as GetDriverOutputDTO & { avatarUrl?: string }).avatarUrl || null,
rating: null,
rank: null,
roleBadgeText: 'Member',
@@ -154,8 +143,8 @@ export class LeagueDetailViewDataBuilder implements ViewDataBuilder<any, any> {
id: r.id,
name: r.name,
date: r.date,
track: (r as any).track,
car: (r as any).car,
track: (r as RaceDTO & { track?: string }).track || '',
car: (r as RaceDTO & { car?: string }).car || '',
}))[0];
// Calculate season progress (completed races vs total races)
@@ -179,12 +168,38 @@ export class LeagueDetailViewDataBuilder implements ViewDataBuilder<any, any> {
.map(r => ({
raceId: r.id,
raceName: r.name,
position: (r as any).position || 0,
points: (r as any).points || 0,
position: (r as RaceDTO & { position?: number }).position || 0,
points: (r as RaceDTO & { points?: number }).points || 0,
finishedAt: r.date,
}));
return {
league: {
id: league.id,
name: league.name,
game: scoringConfig?.gameName || 'iRacing',
tier: 'standard',
season: 'Current Season',
description: league.description || '',
drivers: membersCount,
races: racesCount,
completedRaces,
totalImpressions: 0,
avgViewsPerRace: 0,
engagement: 0,
rating: 0,
seasonStatus: 'active',
seasonDates: {
start: league.createdAt,
end: races.length > 0 ? races[races.length - 1].date : league.createdAt,
},
sponsorSlots: {
main: { price: 0, status: 'available' },
secondary: { price: 0, total: 0, occupied: 0 },
},
},
drivers: [],
races: [],
leagueId: league.id,
name: league.name,
description: league.description || '',
@@ -196,13 +211,15 @@ export class LeagueDetailViewDataBuilder implements ViewDataBuilder<any, any> {
adminSummaries,
stewardSummaries,
memberSummaries,
sponsorInsights: null, // Only for sponsor mode
sponsorInsights: null,
nextRace,
seasonProgress,
recentResults,
walletBalance: league.walletBalance,
pendingProtestsCount: league.pendingProtestsCount,
pendingJoinRequestsCount: league.pendingJoinRequestsCount,
walletBalance: league.walletBalance ?? 0,
pendingProtestsCount: league.pendingProtestsCount ?? 0,
pendingJoinRequestsCount: league.pendingJoinRequestsCount ?? 0,
};
}
}
}
LeagueDetailViewDataBuilder satisfies ViewDataBuilder<LeagueDetailInputDTO, LeagueDetailViewData>;

2
apps/website/lib/builders/view-data/LeagueLogoViewDataBuilder.test.ts
View File

@@ -1,6 +1,6 @@
import { describe, it, expect } from 'vitest';
import { LeagueLogoViewDataBuilder } from './LeagueLogoViewDataBuilder';
import type { MediaBinaryDTO } from '@/lib/types/MediaBinaryDTO';
import type { MediaBinaryDTO } from '@/lib/types/generated/MediaBinaryDTO';
describe('LeagueLogoViewDataBuilder', () => {
describe('happy paths', () => {

27
apps/website/lib/builders/view-data/LeagueLogoViewDataBuilder.ts
View File

@@ -1,25 +1,16 @@
/**
* LeagueLogoViewDataBuilder
*
* Transforms MediaBinaryDTO into LeagueLogoViewData for server-side rendering.
* Deterministic; side-effect free; no HTTP calls.
*/
'use client';
import { MediaBinaryDTO } from '@/lib/types/MediaBinaryDTO';
import { LeagueLogoViewData } from '@/lib/view-data/LeagueLogoViewData';
import type { MediaBinaryDTO } from '@/lib/types/generated/MediaBinaryDTO';
import type { LeagueLogoViewData } from '@/lib/view-data/LeagueLogoViewData';
import type { ViewDataBuilder } from '@/lib/contracts/builders/ViewDataBuilder';
import { ViewDataBuilder } from "../../contracts/builders/ViewDataBuilder";
export class LeagueLogoViewDataBuilder implements ViewDataBuilder<any, any> {
build(input: any): any {
return LeagueLogoViewDataBuilder.build(input);
}
static build(
static build(apiDto: MediaBinaryDTO): LeagueLogoViewData {
export class LeagueLogoViewDataBuilder {
public static build(apiDto: MediaBinaryDTO): LeagueLogoViewData {
return {
buffer: Buffer.from(apiDto.buffer).toString('base64'),
contentType: apiDto.contentType,
};
}
}
}
LeagueLogoViewDataBuilder satisfies ViewDataBuilder<MediaBinaryDTO, LeagueLogoViewData>;

50
apps/website/lib/builders/view-data/LeagueRosterAdminViewDataBuilder.ts
View File

@@ -1,39 +1,31 @@
import type { LeagueRosterMemberDTO } from '@/lib/types/generated/LeagueRosterMemberDTO';
'use client';
import type { ViewDataBuilder } from '@/lib/contracts/builders/ViewDataBuilder';
import { DateFormatter } from '@/lib/formatters/DateFormatter';
import type { LeagueRosterJoinRequestDTO } from '@/lib/types/generated/LeagueRosterJoinRequestDTO';
import type { LeagueRosterAdminViewData, RosterMemberData, JoinRequestData } from '@/lib/view-data/LeagueRosterAdminViewData';
import { DateDisplay } from '@/lib/display-objects/DateDisplay';
import type { LeagueRosterMemberDTO } from '@/lib/types/generated/LeagueRosterMemberDTO';
import type { JoinRequestData, LeagueRosterAdminViewData, RosterMemberData } from '@/lib/view-data/LeagueRosterAdminViewData';
/**
* LeagueRosterAdminViewDataBuilder
*
* Transforms API DTOs into LeagueRosterAdminViewData for server-side rendering.
* Deterministic; side-effect free; no HTTP calls.
*/
import { ViewDataBuilder } from "../../contracts/builders/ViewDataBuilder";
type LeagueRosterAdminInputDTO = {
leagueId: string;
members: LeagueRosterMemberDTO[];
joinRequests: LeagueRosterJoinRequestDTO[];
}
export class LeagueRosterAdminViewDataBuilder implements ViewDataBuilder<any, any> {
build(input: any): any {
return LeagueRosterAdminViewDataBuilder.build(input);
}
static build(
static build(input: {
leagueId: string;
members: LeagueRosterMemberDTO[];
joinRequests: LeagueRosterJoinRequestDTO[];
}): LeagueRosterAdminViewData {
const { leagueId, members, joinRequests } = input;
export class LeagueRosterAdminViewDataBuilder {
public static build(apiDto: LeagueRosterAdminInputDTO): LeagueRosterAdminViewData {
const { leagueId, members, joinRequests } = apiDto;
// Transform members
const rosterMembers: RosterMemberData[] = members.map(member => ({
driverId: member.driverId,
driver: {
id: member.driverId,
name: member.driver?.name || 'Unknown Driver',
name: (member.driver as { name?: string })?.name || 'Unknown Driver',
},
role: member.role,
joinedAt: member.joinedAt,
formattedJoinedAt: DateDisplay.formatShort(member.joinedAt),
formattedJoinedAt: DateFormatter.formatShort(member.joinedAt),
}));
// Transform join requests
@@ -41,11 +33,11 @@ export class LeagueRosterAdminViewDataBuilder implements ViewDataBuilder<any, an
id: req.id,
driver: {
id: req.driverId,
name: 'Unknown Driver', // driver field is unknown type
name: (req as { driver?: { name?: string } }).driver?.name || 'Unknown Driver',
},
requestedAt: req.requestedAt,
formattedRequestedAt: DateDisplay.formatShort(req.requestedAt),
message: req.message,
formattedRequestedAt: DateFormatter.formatShort(req.requestedAt),
message: req.message ?? undefined,
}));
return {
@@ -54,4 +46,6 @@ export class LeagueRosterAdminViewDataBuilder implements ViewDataBuilder<any, an
joinRequests: requests,
};
}
}
}
LeagueRosterAdminViewDataBuilder satisfies ViewDataBuilder<LeagueRosterAdminInputDTO, LeagueRosterAdminViewData>;

30
apps/website/lib/builders/view-data/LeagueScheduleViewDataBuilder.ts
View File

@@ -1,19 +1,15 @@
import { LeagueScheduleViewData } from '@/lib/view-data/leagues/LeagueScheduleViewData';
import { LeagueScheduleApiDto } from '@/lib/types/tbd/LeagueScheduleApiDto';
'use client';
import { ViewDataBuilder } from "../../contracts/builders/ViewDataBuilder";
import type { LeagueScheduleViewData } from '@/lib/view-data/LeagueScheduleViewData';
import type { LeagueScheduleDTO } from '@/lib/types/generated/LeagueScheduleDTO';
import type { ViewDataBuilder } from '@/lib/contracts/builders/ViewDataBuilder';
export class LeagueScheduleViewDataBuilder implements ViewDataBuilder<any, any> {
build(input: any): any {
return LeagueScheduleViewDataBuilder.build(input);
}
static build(
static build(apiDto: LeagueScheduleApiDto, currentDriverId?: string, isAdmin: boolean = false): LeagueScheduleViewData {
export class LeagueScheduleViewDataBuilder {
public static build(apiDto: LeagueScheduleDTO, currentDriverId?: string, isAdmin: boolean = false): LeagueScheduleViewData {
const now = new Date();
return {
leagueId: apiDto.leagueId,
leagueId: apiDto.leagueId || '',
races: apiDto.races.map((race) => {
const scheduledAt = new Date(race.date);
const isPast = scheduledAt.getTime() <= now.getTime();
@@ -23,12 +19,12 @@ export class LeagueScheduleViewDataBuilder implements ViewDataBuilder<any, any>
id: race.id,
name: race.name,
scheduledAt: race.date,
track: race.track,
car: race.car,
sessionType: race.sessionType,
track: race.track || '',
car: race.car || '',
sessionType: race.sessionType || 'race',
isPast,
isUpcoming,
status: isPast ? 'completed' : 'scheduled',
status: race.status || (isPast ? 'completed' : 'scheduled'),
// Registration info (would come from API in real implementation)
isUserRegistered: false,
canRegister: isUpcoming,
@@ -41,4 +37,6 @@ export class LeagueScheduleViewDataBuilder implements ViewDataBuilder<any, any>
isAdmin,
};
}
}
}
LeagueScheduleViewDataBuilder satisfies ViewDataBuilder<LeagueScheduleDTO, LeagueScheduleViewData>;

91
apps/website/lib/builders/view-data/LeagueSettingsViewDataBuilder.test.ts
View File

@@ -1,59 +1,60 @@
import { describe, it, expect } from 'vitest';
import { LeagueSettingsViewDataBuilder } from './LeagueSettingsViewDataBuilder';
import type { LeagueSettingsApiDto } from '@/lib/types/tbd/LeagueSettingsApiDto';
describe('LeagueSettingsViewDataBuilder', () => {
describe('happy paths', () => {
it('should transform LeagueSettingsApiDto to LeagueSettingsViewData correctly', () => {
const leagueSettingsApiDto: LeagueSettingsApiDto = {
leagueId: 'league-123',
it('should transform LeagueSettingsInputDTO to LeagueSettingsViewData correctly', () => {
const leagueSettingsApiDto = {
league: {
id: 'league-123',
name: 'Test League',
description: 'Test Description',
ownerId: 'owner-1',
createdAt: '2024-01-01',
},
config: {
maxDrivers: 32,
qualifyingFormat: 'Open',
raceLength: 30,
},
presets: [],
owner: null,
members: [],
};
const result = LeagueSettingsViewDataBuilder.build(leagueSettingsApiDto);
expect(result).toEqual({
leagueId: 'league-123',
league: {
id: 'league-123',
name: 'Test League',
description: 'Test Description',
ownerId: 'owner-1',
createdAt: '2024-01-01',
},
config: {
maxDrivers: 32,
qualifyingFormat: 'Open',
raceLength: 30,
},
presets: [],
owner: null,
members: [],
});
});
it('should handle minimal configuration', () => {
const leagueSettingsApiDto: LeagueSettingsApiDto = {
leagueId: 'league-456',
const leagueSettingsApiDto = {
league: {
id: 'league-456',
name: 'Minimal League',
description: '',
ownerId: 'owner-2',
createdAt: '2024-01-02',
},
config: {
maxDrivers: 16,
qualifyingFormat: 'Open',
raceLength: 20,
},
presets: [],
owner: null,
members: [],
};
const result = LeagueSettingsViewDataBuilder.build(leagueSettingsApiDto);
expect(result.leagueId).toBe('league-456');
expect(result.league.name).toBe('Minimal League');
expect(result.config.maxDrivers).toBe(16);
});
@@ -61,43 +62,44 @@ describe('LeagueSettingsViewDataBuilder', () => {
describe('data transformation', () => {
it('should preserve all DTO fields in the output', () => {
const leagueSettingsApiDto: LeagueSettingsApiDto = {
leagueId: 'league-789',
const leagueSettingsApiDto = {
league: {
id: 'league-789',
name: 'Full League',
description: 'Full Description',
ownerId: 'owner-3',
createdAt: '2024-01-03',
},
config: {
maxDrivers: 24,
qualifyingFormat: 'Open',
raceLength: 45,
},
presets: [],
owner: null,
members: [],
};
const result = LeagueSettingsViewDataBuilder.build(leagueSettingsApiDto);
expect(result.leagueId).toBe(leagueSettingsApiDto.leagueId);
expect(result.league).toEqual(leagueSettingsApiDto.league);
expect(result.config).toEqual(leagueSettingsApiDto.config);
});
it('should not modify the input DTO', () => {
const leagueSettingsApiDto: LeagueSettingsApiDto = {
leagueId: 'league-101',
const leagueSettingsApiDto = {
league: {
id: 'league-101',
name: 'Test League',
description: 'Test',
ownerId: 'owner-4',
createdAt: '2024-01-04',
},
config: {
maxDrivers: 20,
qualifyingFormat: 'Open',
raceLength: 25,
},
presets: [],
owner: null,
members: [],
};
const originalDto = { ...leagueSettingsApiDto };
const originalDto = JSON.parse(JSON.stringify(leagueSettingsApiDto));
LeagueSettingsViewDataBuilder.build(leagueSettingsApiDto);
expect(leagueSettingsApiDto).toEqual(originalDto);
@@ -105,39 +107,20 @@ describe('LeagueSettingsViewDataBuilder', () => {
});
describe('edge cases', () => {
it('should handle different qualifying formats', () => {
const leagueSettingsApiDto: LeagueSettingsApiDto = {
leagueId: 'league-102',
league: {
id: 'league-102',
name: 'Test League',
description: 'Test',
},
config: {
maxDrivers: 20,
qualifyingFormat: 'Closed',
raceLength: 30,
},
};
const result = LeagueSettingsViewDataBuilder.build(leagueSettingsApiDto);
expect(result.config.qualifyingFormat).toBe('Closed');
});
it('should handle large driver counts', () => {
const leagueSettingsApiDto: LeagueSettingsApiDto = {
leagueId: 'league-103',
const leagueSettingsApiDto = {
league: {
id: 'league-103',
name: 'Test League',
description: 'Test',
ownerId: 'owner-5',
createdAt: '2024-01-05',
},
config: {
maxDrivers: 100,
qualifyingFormat: 'Open',
raceLength: 60,
},
presets: [],
owner: null,
members: [],
};
const result = LeagueSettingsViewDataBuilder.build(leagueSettingsApiDto);

29
apps/website/lib/builders/view-data/LeagueSettingsViewDataBuilder.ts
View File

@@ -1,19 +1,26 @@
import { LeagueSettingsApiDto } from '@/lib/types/tbd/LeagueSettingsApiDto';
import { LeagueSettingsViewData } from '@/lib/view-data/LeagueSettingsViewData';
'use client';
import { ViewDataBuilder } from "../../contracts/builders/ViewDataBuilder";
import type { LeagueSettingsViewData } from '@/lib/view-data/LeagueSettingsViewData';
import type { ViewDataBuilder } from '@/lib/contracts/builders/ViewDataBuilder';
export class LeagueSettingsViewDataBuilder implements ViewDataBuilder<any, any> {
build(input: any): any {
return LeagueSettingsViewDataBuilder.build(input);
}
type LeagueSettingsInputDTO = {
league: { id: string; name: string; ownerId: string; createdAt: string };
config: any;
presets: any[];
owner: any | null;
members: any[];
}
static build(
static build(apiDto: LeagueSettingsApiDto): LeagueSettingsViewData {
export class LeagueSettingsViewDataBuilder {
public static build(apiDto: LeagueSettingsInputDTO): LeagueSettingsViewData {
return {
leagueId: apiDto.leagueId,
league: apiDto.league,
config: apiDto.config,
presets: apiDto.presets,
owner: apiDto.owner,
members: apiDto.members,
};
}
}
}
LeagueSettingsViewDataBuilder satisfies ViewDataBuilder<LeagueSettingsInputDTO, LeagueSettingsViewData>;

195
apps/website/lib/builders/view-data/LeagueSponsorshipsViewDataBuilder.test.ts
View File

@@ -1,235 +1,104 @@
import { describe, it, expect } from 'vitest';
import { LeagueSponsorshipsViewDataBuilder } from './LeagueSponsorshipsViewDataBuilder';
import type { LeagueSponsorshipsApiDto } from '@/lib/types/tbd/LeagueSponsorshipsApiDto';
describe('LeagueSponsorshipsViewDataBuilder', () => {
describe('happy paths', () => {
it('should transform LeagueSponsorshipsApiDto to LeagueSponsorshipsViewData correctly', () => {
const leagueSponsorshipsApiDto: LeagueSponsorshipsApiDto = {
it('should transform LeagueSponsorshipsInputDTO to LeagueSponsorshipsViewData correctly', () => {
const leagueSponsorshipsApiDto = {
leagueId: 'league-123',
league: {
id: 'league-123',
name: 'Test League',
description: 'Test Description',
},
sponsorshipSlots: [
{
id: 'slot-1',
name: 'Primary Sponsor',
description: 'Main sponsor',
price: 1000,
status: 'available',
currency: 'USD',
isAvailable: true,
},
],
sponsorshipRequests: [
sponsorships: [
{
id: 'request-1',
sponsorId: 'sponsor-1',
sponsorName: 'Test Sponsor',
sponsorLogo: 'logo-url',
message: 'Test message',
requestedAt: '2024-01-01T10:00:00Z',
status: 'pending',
createdAt: '2024-01-01T10:00:00Z',
},
],
};
const result = LeagueSponsorshipsViewDataBuilder.build(leagueSponsorshipsApiDto);
const result = LeagueSponsorshipsViewDataBuilder.build(leagueSponsorshipsApiDto as any);
expect(result).toEqual({
leagueId: 'league-123',
activeTab: 'overview',
onTabChange: expect.any(Function),
league: {
id: 'league-123',
name: 'Test League',
},
sponsorshipSlots: [
{
id: 'slot-1',
name: 'Primary Sponsor',
price: 1000,
status: 'available',
},
],
sponsorshipRequests: [
{
id: 'request-1',
sponsorId: 'sponsor-1',
sponsorName: 'Test Sponsor',
sponsorLogo: 'logo-url',
message: 'Test message',
requestedAt: '2024-01-01T10:00:00Z',
status: 'pending',
formattedRequestedAt: expect.any(String),
statusLabel: expect.any(String),
},
],
});
expect(result.leagueId).toBe('league-123');
expect(result.league.name).toBe('Test League');
expect(result.sponsorshipSlots).toHaveLength(1);
expect(result.sponsorshipRequests).toHaveLength(1);
expect(result.sponsorshipRequests[0].id).toBe('request-1');
expect(result.sponsorshipRequests[0].status).toBe('pending');
});
it('should handle empty sponsorship requests', () => {
const leagueSponsorshipsApiDto: LeagueSponsorshipsApiDto = {
const leagueSponsorshipsApiDto = {
leagueId: 'league-456',
league: {
id: 'league-456',
name: 'Test League',
},
sponsorshipSlots: [
{
id: 'slot-1',
name: 'Primary Sponsor',
price: 1000,
status: 'available',
},
],
sponsorshipRequests: [],
};
const result = LeagueSponsorshipsViewDataBuilder.build(leagueSponsorshipsApiDto);
expect(result.sponsorshipRequests).toHaveLength(0);
});
it('should handle multiple sponsorship requests', () => {
const leagueSponsorshipsApiDto: LeagueSponsorshipsApiDto = {
leagueId: 'league-789',
league: {
id: 'league-789',
name: 'Test League',
description: '',
},
sponsorshipSlots: [],
sponsorshipRequests: [
{
id: 'request-1',
sponsorId: 'sponsor-1',
sponsorName: 'Sponsor 1',
sponsorLogo: 'logo-1',
message: 'Message 1',
requestedAt: '2024-01-01T10:00:00Z',
status: 'pending',
},
{
id: 'request-2',
sponsorId: 'sponsor-2',
sponsorName: 'Sponsor 2',
sponsorLogo: 'logo-2',
message: 'Message 2',
requestedAt: '2024-01-02T10:00:00Z',
status: 'approved',
},
],
sponsorships: [],
};
const result = LeagueSponsorshipsViewDataBuilder.build(leagueSponsorshipsApiDto);
const result = LeagueSponsorshipsViewDataBuilder.build(leagueSponsorshipsApiDto as any);
expect(result.sponsorshipRequests).toHaveLength(2);
expect(result.sponsorshipRequests).toHaveLength(0);
});
});
describe('data transformation', () => {
it('should preserve all DTO fields in the output', () => {
const leagueSponsorshipsApiDto: LeagueSponsorshipsApiDto = {
const leagueSponsorshipsApiDto = {
leagueId: 'league-101',
league: {
id: 'league-101',
name: 'Test League',
description: 'Desc',
},
sponsorshipSlots: [
{
id: 'slot-1',
name: 'Primary Sponsor',
price: 1000,
status: 'available',
},
],
sponsorshipRequests: [
sponsorshipSlots: [],
sponsorships: [
{
id: 'request-1',
sponsorId: 'sponsor-1',
sponsorName: 'Test Sponsor',
sponsorLogo: 'logo-url',
message: 'Test message',
requestedAt: '2024-01-01T10:00:00Z',
status: 'pending',
status: 'approved',
createdAt: '2024-01-01T10:00:00Z',
},
],
};
const result = LeagueSponsorshipsViewDataBuilder.build(leagueSponsorshipsApiDto);
const result = LeagueSponsorshipsViewDataBuilder.build(leagueSponsorshipsApiDto as any);
expect(result.leagueId).toBe(leagueSponsorshipsApiDto.leagueId);
expect(result.league).toEqual(leagueSponsorshipsApiDto.league);
expect(result.sponsorshipSlots).toEqual(leagueSponsorshipsApiDto.sponsorshipSlots);
});
it('should not modify the input DTO', () => {
const leagueSponsorshipsApiDto: LeagueSponsorshipsApiDto = {
const leagueSponsorshipsApiDto = {
leagueId: 'league-102',
league: {
id: 'league-102',
name: 'Test League',
description: '',
},
sponsorshipSlots: [],
sponsorshipRequests: [],
sponsorships: [],
};
const originalDto = { ...leagueSponsorshipsApiDto };
LeagueSponsorshipsViewDataBuilder.build(leagueSponsorshipsApiDto);
const originalDto = JSON.parse(JSON.stringify(leagueSponsorshipsApiDto));
LeagueSponsorshipsViewDataBuilder.build(leagueSponsorshipsApiDto as any);
expect(leagueSponsorshipsApiDto).toEqual(originalDto);
});
});
describe('edge cases', () => {
it('should handle requests without sponsor logo', () => {
const leagueSponsorshipsApiDto: LeagueSponsorshipsApiDto = {
leagueId: 'league-103',
league: {
id: 'league-103',
name: 'Test League',
},
sponsorshipSlots: [],
sponsorshipRequests: [
{
id: 'request-1',
sponsorId: 'sponsor-1',
sponsorName: 'Test Sponsor',
sponsorLogo: null,
message: 'Test message',
requestedAt: '2024-01-01T10:00:00Z',
status: 'pending',
},
],
};
const result = LeagueSponsorshipsViewDataBuilder.build(leagueSponsorshipsApiDto);
expect(result.sponsorshipRequests[0].sponsorLogoUrl).toBeNull();
});
it('should handle requests without message', () => {
const leagueSponsorshipsApiDto: LeagueSponsorshipsApiDto = {
leagueId: 'league-104',
league: {
id: 'league-104',
name: 'Test League',
},
sponsorshipSlots: [],
sponsorshipRequests: [
{
id: 'request-1',
sponsorId: 'sponsor-1',
sponsorName: 'Test Sponsor',
sponsorLogo: 'logo-url',
message: null,
requestedAt: '2024-01-01T10:00:00Z',
status: 'pending',
},
],
};
const result = LeagueSponsorshipsViewDataBuilder.build(leagueSponsorshipsApiDto);
expect(result.sponsorshipRequests[0].message).toBeNull();
});
});
});

39
apps/website/lib/builders/view-data/LeagueSponsorshipsViewDataBuilder.ts
View File

@@ -1,28 +1,37 @@
import { DateDisplay } from '@/lib/display-objects/DateDisplay';
import { StatusDisplay } from '@/lib/display-objects/StatusDisplay';
import { LeagueSponsorshipsApiDto } from '@/lib/types/tbd/LeagueSponsorshipsApiDto';
import { LeagueSponsorshipsViewData } from '@/lib/view-data/LeagueSponsorshipsViewData';
'use client';
import { ViewDataBuilder } from "../../contracts/builders/ViewDataBuilder";
import { DateFormatter } from '@/lib/formatters/DateFormatter';
import { StatusFormatter } from '@/lib/formatters/StatusFormatter';
import type { LeagueSponsorshipsViewData } from '@/lib/view-data/LeagueSponsorshipsViewData';
import type { ViewDataBuilder } from '@/lib/contracts/builders/ViewDataBuilder';
import type { GetSeasonSponsorshipsOutputDTO } from '@/lib/types/generated/GetSeasonSponsorshipsOutputDTO';
export class LeagueSponsorshipsViewDataBuilder implements ViewDataBuilder<any, any> {
build(input: any): any {
return LeagueSponsorshipsViewDataBuilder.build(input);
}
type LeagueSponsorshipsInputDTO = GetSeasonSponsorshipsOutputDTO & {
leagueId: string;
league: { id: string; name: string; description: string };
sponsorshipSlots: LeagueSponsorshipsViewData['sponsorshipSlots'];
}
static build(
static build(apiDto: LeagueSponsorshipsApiDto): LeagueSponsorshipsViewData {
export class LeagueSponsorshipsViewDataBuilder {
public static build(apiDto: LeagueSponsorshipsInputDTO): LeagueSponsorshipsViewData {
return {
leagueId: apiDto.leagueId,
activeTab: 'overview',
onTabChange: () => {},
league: apiDto.league,
sponsorshipSlots: apiDto.sponsorshipSlots,
sponsorshipRequests: apiDto.sponsorshipRequests.map(r => ({
...r,
formattedRequestedAt: DateDisplay.formatShort(r.requestedAt),
statusLabel: StatusDisplay.protestStatus(r.status), // Reusing protest status for now
sponsorshipRequests: apiDto.sponsorships.map(r => ({
id: r.id,
slotId: '', // Missing in DTO
sponsorId: '', // Missing in DTO
sponsorName: '', // Missing in DTO
requestedAt: r.createdAt,
formattedRequestedAt: DateFormatter.formatShort(r.createdAt),
status: r.status as 'pending' | 'approved' | 'rejected',
statusLabel: StatusFormatter.protestStatus(r.status),
})),
};
}
}
LeagueSponsorshipsViewDataBuilder satisfies ViewDataBuilder<LeagueSponsorshipsInputDTO, LeagueSponsorshipsViewData>;

72
apps/website/lib/builders/view-data/LeagueStandingsViewDataBuilder.test.ts
View File

@@ -72,12 +72,12 @@ describe('LeagueStandingsViewDataBuilder', () => {
],
};
const result = LeagueStandingsViewDataBuilder.build(
const result = LeagueStandingsViewDataBuilder.build({
standingsDto,
membershipsDto,
'league-1',
false
);
leagueId: 'league-1',
isTeamChampionship: false
});
expect(result.leagueId).toBe('league-1');
expect(result.isTeamChampionship).toBe(false);
@@ -143,12 +143,12 @@ describe('LeagueStandingsViewDataBuilder', () => {
members: [],
};
const result = LeagueStandingsViewDataBuilder.build(
const result = LeagueStandingsViewDataBuilder.build({
standingsDto,
membershipsDto,
'league-1',
false
);
leagueId: 'league-1',
isTeamChampionship: false
});
expect(result.standings).toHaveLength(0);
expect(result.drivers).toHaveLength(0);
@@ -182,12 +182,12 @@ describe('LeagueStandingsViewDataBuilder', () => {
members: [],
};
const result = LeagueStandingsViewDataBuilder.build(
const result = LeagueStandingsViewDataBuilder.build({
standingsDto,
membershipsDto,
'league-1',
true
);
leagueId: 'league-1',
isTeamChampionship: true
});
expect(result.isTeamChampionship).toBe(true);
});
@@ -221,12 +221,12 @@ describe('LeagueStandingsViewDataBuilder', () => {
members: [],
};
const result = LeagueStandingsViewDataBuilder.build(
const result = LeagueStandingsViewDataBuilder.build({
standingsDto,
membershipsDto,
'league-1',
false
);
leagueId: 'league-1',
isTeamChampionship: false
});
expect(result.standings[0].driverId).toBe(standingsDto.standings[0].driverId);
expect(result.standings[0].position).toBe(standingsDto.standings[0].position);
@@ -274,12 +274,12 @@ describe('LeagueStandingsViewDataBuilder', () => {
const originalStandings = JSON.parse(JSON.stringify(standingsDto));
const originalMemberships = JSON.parse(JSON.stringify(membershipsDto));
LeagueStandingsViewDataBuilder.build(
LeagueStandingsViewDataBuilder.build({
standingsDto,
membershipsDto,
'league-1',
false
);
leagueId: 'league-1',
isTeamChampionship: false
});
expect(standingsDto).toEqual(originalStandings);
expect(membershipsDto).toEqual(originalMemberships);
@@ -311,12 +311,12 @@ describe('LeagueStandingsViewDataBuilder', () => {
members: [],
};
const result = LeagueStandingsViewDataBuilder.build(
const result = LeagueStandingsViewDataBuilder.build({
standingsDto,
membershipsDto,
'league-1',
false
);
leagueId: 'league-1',
isTeamChampionship: false
});
expect(result.standings[0].positionChange).toBe(0);
expect(result.standings[0].lastRacePoints).toBe(0);
@@ -345,12 +345,12 @@ describe('LeagueStandingsViewDataBuilder', () => {
members: [],
};
const result = LeagueStandingsViewDataBuilder.build(
const result = LeagueStandingsViewDataBuilder.build({
standingsDto,
membershipsDto,
'league-1',
false
);
leagueId: 'league-1',
isTeamChampionship: false
});
expect(result.drivers).toHaveLength(0);
});
@@ -399,12 +399,12 @@ describe('LeagueStandingsViewDataBuilder', () => {
members: [],
};
const result = LeagueStandingsViewDataBuilder.build(
const result = LeagueStandingsViewDataBuilder.build({
standingsDto,
membershipsDto,
'league-1',
false
);
leagueId: 'league-1',
isTeamChampionship: false
});
// Should only have one driver entry
expect(result.drivers).toHaveLength(1);
@@ -451,12 +451,12 @@ describe('LeagueStandingsViewDataBuilder', () => {
],
};
const result = LeagueStandingsViewDataBuilder.build(
const result = LeagueStandingsViewDataBuilder.build({
standingsDto,
membershipsDto,
'league-1',
false
);
leagueId: 'league-1',
isTeamChampionship: false
});
expect(result.memberships[0].role).toBe('admin');
});

52
apps/website/lib/builders/view-data/LeagueStandingsViewDataBuilder.ts
View File

@@ -1,6 +1,9 @@
import type { LeagueStandingsViewData, StandingEntryData, DriverData, LeagueMembershipData } from '@/lib/view-data/LeagueStandingsViewData';
'use client';
import type { LeagueStandingsViewData } from '@/lib/view-data/LeagueStandingsViewData';
import type { LeagueStandingDTO } from '@/lib/types/generated/LeagueStandingDTO';
import type { LeagueMemberDTO } from '@/lib/types/generated/LeagueMemberDTO';
import type { ViewDataBuilder } from '@/lib/contracts/builders/ViewDataBuilder';
interface LeagueStandingsApiDto {
standings: LeagueStandingDTO[];
@@ -10,39 +13,34 @@ interface LeagueMembershipsApiDto {
members: LeagueMemberDTO[];
}
/**
* LeagueStandingsViewDataBuilder
*
* Transforms API DTOs into LeagueStandingsViewData for server-side rendering.
* Deterministic; side-effect free; no HTTP calls.
*/
import { ViewDataBuilder } from "../../contracts/builders/ViewDataBuilder";
type LeagueStandingsInputDTO = {
standingsDto: LeagueStandingsApiDto;
membershipsDto: LeagueMembershipsApiDto;
leagueId: string;
isTeamChampionship?: boolean;
}
export class LeagueStandingsViewDataBuilder implements ViewDataBuilder<any, any> {
build(input: any): any {
return LeagueStandingsViewDataBuilder.build(input);
}
static build(
static build(
standingsDto: LeagueStandingsApiDto,
membershipsDto: LeagueMembershipsApiDto,
leagueId: string,
isTeamChampionship: boolean = false
): LeagueStandingsViewData {
export class LeagueStandingsViewDataBuilder {
public static build(apiDto: LeagueStandingsInputDTO): LeagueStandingsViewData {
const { standingsDto, membershipsDto, leagueId, isTeamChampionship = false } = apiDto;
const standings = standingsDto.standings || [];
const members = membershipsDto.members || [];
// Convert LeagueStandingDTO to StandingEntryData
const standingData: StandingEntryData[] = standings.map(standing => ({
const standingData: LeagueStandingsViewData['standings'] = standings.map(standing => ({
driverId: standing.driverId,
position: standing.position,
points: standing.points,
totalPoints: standing.points,
races: standing.races,
racesFinished: standing.races,
racesStarted: standing.races,
avgFinish: null, // Not in DTO
penaltyPoints: 0, // Not in DTO
bonusPoints: 0, // Not in DTO
leaderPoints: 0, // Not in DTO
nextPoints: 0, // Not in DTO
currentUserId: null, // Not in DTO
// New fields from Phase 3
positionChange: standing.positionChange || 0,
lastRacePoints: standing.lastRacePoints || 0,
@@ -52,7 +50,7 @@ export class LeagueStandingsViewDataBuilder implements ViewDataBuilder<any, any>
}));
// Extract unique drivers from standings
const driverMap = new Map<string, DriverData>();
const driverMap = new Map<string, LeagueStandingsViewData['drivers'][number]>();
standings.forEach(standing => {
if (standing.driver && !driverMap.has(standing.driverId)) {
const driver = standing.driver;
@@ -66,13 +64,13 @@ export class LeagueStandingsViewDataBuilder implements ViewDataBuilder<any, any>
});
}
});
const driverData: DriverData[] = Array.from(driverMap.values());
const driverData = Array.from(driverMap.values());
// Convert LeagueMemberDTO to LeagueMembershipData
const membershipData: LeagueMembershipData[] = members.map(member => ({
const membershipData: LeagueStandingsViewData['memberships'] = members.map(member => ({
driverId: member.driverId,
leagueId: leagueId,
role: (member.role as LeagueMembershipData['role']) || 'member',
role: (member.role as any) || 'member',
joinedAt: member.joinedAt,
status: 'active' as const,
}));
@@ -87,4 +85,6 @@ export class LeagueStandingsViewDataBuilder implements ViewDataBuilder<any, any>
isTeamChampionship: isTeamChampionship,
};
}
}
}
LeagueStandingsViewDataBuilder satisfies ViewDataBuilder<LeagueStandingsInputDTO, LeagueStandingsViewData>;

149
apps/website/lib/builders/view-data/LeagueWalletViewDataBuilder.test.ts
View File

@@ -1,93 +1,118 @@
import { describe, it, expect } from 'vitest';
import { LeagueWalletViewDataBuilder } from './LeagueWalletViewDataBuilder';
import type { LeagueWalletApiDto } from '@/lib/types/tbd/LeagueWalletApiDto';
describe('LeagueWalletViewDataBuilder', () => {
describe('happy paths', () => {
it('should transform LeagueWalletApiDto to LeagueWalletViewData correctly', () => {
const leagueWalletApiDto: LeagueWalletApiDto = {
it('should transform LeagueWalletInputDTO to LeagueWalletViewData correctly', () => {
const leagueWalletApiDto = {
leagueId: 'league-123',
balance: 5000,
currency: 'USD',
totalRevenue: 5000,
totalFees: 0,
totalWithdrawals: 0,
pendingPayouts: 0,
canWithdraw: true,
transactions: [
{
id: 'txn-1',
type: 'sponsorship',
amount: 1000,
fee: 0,
netAmount: 1000,
status: 'completed',
createdAt: '2024-01-01T10:00:00Z',
date: '2024-01-01T10:00:00Z',
description: 'Sponsorship payment',
},
],
};
const result = LeagueWalletViewDataBuilder.build(leagueWalletApiDto);
const result = LeagueWalletViewDataBuilder.build(leagueWalletApiDto as any);
expect(result).toEqual({
leagueId: 'league-123',
balance: 5000,
formattedBalance: expect.any(String),
formattedBalance: 'USD 5,000',
totalRevenue: 5000,
formattedTotalRevenue: expect.any(String),
formattedTotalRevenue: 'USD 5,000',
totalFees: 0,
formattedTotalFees: expect.any(String),
formattedTotalFees: 'USD 0',
totalWithdrawals: 0,
pendingPayouts: 0,
formattedPendingPayouts: expect.any(String),
formattedPendingPayouts: 'USD 0',
currency: 'USD',
canWithdraw: true,
withdrawalBlockReason: undefined,
transactions: [
{
id: 'txn-1',
type: 'sponsorship',
amount: 1000,
fee: 0,
netAmount: 1000,
status: 'completed',
createdAt: '2024-01-01T10:00:00Z',
date: '2024-01-01T10:00:00Z',
description: 'Sponsorship payment',
formattedAmount: expect.any(String),
amountColor: 'green',
formattedDate: expect.any(String),
statusColor: 'green',
typeColor: 'blue',
reference: undefined,
},
],
});
});
it('should handle empty transactions', () => {
const leagueWalletApiDto: LeagueWalletApiDto = {
const leagueWalletApiDto = {
leagueId: 'league-456',
balance: 0,
currency: 'USD',
totalRevenue: 0,
totalFees: 0,
totalWithdrawals: 0,
pendingPayouts: 0,
canWithdraw: true,
transactions: [],
};
const result = LeagueWalletViewDataBuilder.build(leagueWalletApiDto);
const result = LeagueWalletViewDataBuilder.build(leagueWalletApiDto as any);
expect(result.transactions).toHaveLength(0);
expect(result.balance).toBe(0);
});
it('should handle multiple transactions', () => {
const leagueWalletApiDto: LeagueWalletApiDto = {
const leagueWalletApiDto = {
leagueId: 'league-789',
balance: 10000,
currency: 'USD',
totalRevenue: 10000,
totalFees: 0,
totalWithdrawals: 0,
pendingPayouts: 0,
canWithdraw: true,
transactions: [
{
id: 'txn-1',
type: 'sponsorship',
amount: 5000,
fee: 0,
netAmount: 5000,
status: 'completed',
createdAt: '2024-01-01T10:00:00Z',
date: '2024-01-01T10:00:00Z',
description: 'Sponsorship payment',
},
{
id: 'txn-2',
type: 'withdrawal',
amount: -1000,
fee: 0,
netAmount: -1000,
status: 'completed',
createdAt: '2024-01-02T10:00:00Z',
date: '2024-01-02T10:00:00Z',
description: 'Payout',
},
],
};
const result = LeagueWalletViewDataBuilder.build(leagueWalletApiDto);
const result = LeagueWalletViewDataBuilder.build(leagueWalletApiDto as any);
expect(result.transactions).toHaveLength(2);
});
@@ -95,38 +120,50 @@ describe('LeagueWalletViewDataBuilder', () => {
describe('data transformation', () => {
it('should preserve all DTO fields in the output', () => {
const leagueWalletApiDto: LeagueWalletApiDto = {
const leagueWalletApiDto = {
leagueId: 'league-101',
balance: 7500,
currency: 'EUR',
totalRevenue: 7500,
totalFees: 0,
totalWithdrawals: 0,
pendingPayouts: 0,
canWithdraw: true,
transactions: [
{
id: 'txn-1',
type: 'deposit',
amount: 2500,
fee: 0,
netAmount: 2500,
status: 'completed',
createdAt: '2024-01-01T10:00:00Z',
date: '2024-01-01T10:00:00Z',
description: 'Test transaction',
},
],
};
const result = LeagueWalletViewDataBuilder.build(leagueWalletApiDto);
const result = LeagueWalletViewDataBuilder.build(leagueWalletApiDto as any);
expect(result.leagueId).toBe(leagueWalletApiDto.leagueId);
expect(result.balance).toBe(leagueWalletApiDto.balance);
expect(result.currency).toBe(leagueWalletApiDto.currency);
});
it('should not modify the input DTO', () => {
const leagueWalletApiDto: LeagueWalletApiDto = {
const leagueWalletApiDto = {
leagueId: 'league-102',
balance: 5000,
currency: 'USD',
totalRevenue: 5000,
totalFees: 0,
totalWithdrawals: 0,
pendingPayouts: 0,
canWithdraw: true,
transactions: [],
};
const originalDto = { ...leagueWalletApiDto };
LeagueWalletViewDataBuilder.build(leagueWalletApiDto);
const originalDto = JSON.parse(JSON.stringify(leagueWalletApiDto));
LeagueWalletViewDataBuilder.build(leagueWalletApiDto as any);
expect(leagueWalletApiDto).toEqual(originalDto);
});
@@ -134,78 +171,106 @@ describe('LeagueWalletViewDataBuilder', () => {
describe('edge cases', () => {
it('should handle negative balance', () => {
const leagueWalletApiDto: LeagueWalletApiDto = {
const leagueWalletApiDto = {
leagueId: 'league-103',
balance: -500,
currency: 'USD',
totalRevenue: 0,
totalFees: 0,
totalWithdrawals: 500,
pendingPayouts: 0,
canWithdraw: false,
transactions: [
{
id: 'txn-1',
type: 'withdrawal',
amount: -500,
fee: 0,
netAmount: -500,
status: 'completed',
createdAt: '2024-01-01T10:00:00Z',
date: '2024-01-01T10:00:00Z',
description: 'Overdraft',
},
],
};
const result = LeagueWalletViewDataBuilder.build(leagueWalletApiDto);
const result = LeagueWalletViewDataBuilder.build(leagueWalletApiDto as any);
expect(result.balance).toBe(-500);
expect(result.transactions[0].amountColor).toBe('red');
});
it('should handle pending transactions', () => {
const leagueWalletApiDto: LeagueWalletApiDto = {
const leagueWalletApiDto = {
leagueId: 'league-104',
balance: 1000,
currency: 'USD',
totalRevenue: 1000,
totalFees: 0,
totalWithdrawals: 0,
pendingPayouts: 0,
canWithdraw: true,
transactions: [
{
id: 'txn-1',
type: 'sponsorship',
amount: 500,
fee: 0,
netAmount: 500,
status: 'pending',
createdAt: '2024-01-01T10:00:00Z',
date: '2024-01-01T10:00:00Z',
description: 'Pending payment',
},
],
};
const result = LeagueWalletViewDataBuilder.build(leagueWalletApiDto);
const result = LeagueWalletViewDataBuilder.build(leagueWalletApiDto as any);
expect(result.transactions[0].statusColor).toBe('yellow');
expect(result.transactions[0].status).toBe('pending');
});
it('should handle failed transactions', () => {
const leagueWalletApiDto: LeagueWalletApiDto = {
const leagueWalletApiDto = {
leagueId: 'league-105',
balance: 1000,
currency: 'USD',
totalRevenue: 1000,
totalFees: 0,
totalWithdrawals: 0,
pendingPayouts: 0,
canWithdraw: true,
transactions: [
{
id: 'txn-1',
type: 'sponsorship',
amount: 500,
fee: 0,
netAmount: 500,
status: 'failed',
createdAt: '2024-01-01T10:00:00Z',
date: '2024-01-01T10:00:00Z',
description: 'Failed payment',
},
],
};
const result = LeagueWalletViewDataBuilder.build(leagueWalletApiDto);
const result = LeagueWalletViewDataBuilder.build(leagueWalletApiDto as any);
expect(result.transactions[0].statusColor).toBe('red');
expect(result.transactions[0].status).toBe('failed');
});
it('should handle different currencies', () => {
const leagueWalletApiDto: LeagueWalletApiDto = {
const leagueWalletApiDto = {
leagueId: 'league-106',
balance: 1000,
currency: 'EUR',
totalRevenue: 1000,
totalFees: 0,
totalWithdrawals: 0,
pendingPayouts: 0,
canWithdraw: true,
transactions: [],
};
const result = LeagueWalletViewDataBuilder.build(leagueWalletApiDto);
const result = LeagueWalletViewDataBuilder.build(leagueWalletApiDto as any);
expect(result.currency).toBe('EUR');
});

60
apps/website/lib/builders/view-data/LeagueWalletViewDataBuilder.ts
View File

@@ -1,38 +1,46 @@
import { CurrencyDisplay } from '@/lib/display-objects/CurrencyDisplay';
import { DateDisplay } from '@/lib/display-objects/DateDisplay';
import { LeagueWalletApiDto } from '@/lib/types/tbd/LeagueWalletApiDto';
import { LeagueWalletTransactionViewData, LeagueWalletViewData } from '@/lib/view-data/LeagueWalletViewData';
'use client';
import { ViewDataBuilder } from "../../contracts/builders/ViewDataBuilder";
import type { GetLeagueWalletOutputDTO } from '@/lib/types/generated/GetLeagueWalletOutputDTO';
import type { LeagueWalletViewData } from '@/lib/view-data/LeagueWalletViewData';
import type { WalletTransactionViewData } from '@/lib/view-data/WalletTransactionViewData';
import type { ViewDataBuilder } from '@/lib/contracts/builders/ViewDataBuilder';
import { NumberFormatter } from '@/lib/formatters/NumberFormatter';
export class LeagueWalletViewDataBuilder implements ViewDataBuilder<any, any> {
build(input: any): any {
return LeagueWalletViewDataBuilder.build(input);
}
type LeagueWalletInputDTO = GetLeagueWalletOutputDTO & {
leagueId: string;
}
static build(
static build(apiDto: LeagueWalletApiDto): LeagueWalletViewData {
const transactions: LeagueWalletTransactionViewData[] = apiDto.transactions.map(t => ({
...t,
formattedAmount: CurrencyDisplay.format(t.amount, apiDto.currency),
amountColor: t.amount >= 0 ? 'green' : 'red',
formattedDate: DateDisplay.formatShort(t.createdAt),
statusColor: t.status === 'completed' ? 'green' : t.status === 'pending' ? 'yellow' : 'red',
typeColor: 'blue',
export class LeagueWalletViewDataBuilder {
public static build(apiDto: LeagueWalletInputDTO): LeagueWalletViewData {
const transactions: WalletTransactionViewData[] = (apiDto.transactions || []).map(t => ({
id: t.id,
type: t.type as WalletTransactionViewData['type'],
description: t.description,
amount: t.amount,
fee: t.fee,
netAmount: t.netAmount,
date: t.date,
status: t.status as WalletTransactionViewData['status'],
reference: t.reference,
}));
return {
leagueId: apiDto.leagueId,
balance: apiDto.balance,
formattedBalance: CurrencyDisplay.format(apiDto.balance, apiDto.currency),
totalRevenue: apiDto.balance, // Mock
formattedTotalRevenue: CurrencyDisplay.format(apiDto.balance, apiDto.currency),
totalFees: 0, // Mock
formattedTotalFees: CurrencyDisplay.format(0, apiDto.currency),
pendingPayouts: 0, // Mock
formattedPendingPayouts: CurrencyDisplay.format(0, apiDto.currency),
balance: apiDto.balance || 0,
formattedBalance: NumberFormatter.formatCurrency(apiDto.balance || 0, apiDto.currency),
totalRevenue: apiDto.totalRevenue || 0,
formattedTotalRevenue: NumberFormatter.formatCurrency(apiDto.totalRevenue || 0, apiDto.currency),
totalFees: apiDto.totalFees || 0,
formattedTotalFees: NumberFormatter.formatCurrency(apiDto.totalFees || 0, apiDto.currency),
totalWithdrawals: apiDto.totalWithdrawals || 0,
pendingPayouts: apiDto.pendingPayouts || 0,
formattedPendingPayouts: NumberFormatter.formatCurrency(apiDto.pendingPayouts || 0, apiDto.currency),
currency: apiDto.currency,
transactions,
canWithdraw: apiDto.canWithdraw || false,
withdrawalBlockReason: apiDto.withdrawalBlockReason,
};
}
}
LeagueWalletViewDataBuilder satisfies ViewDataBuilder<LeagueWalletInputDTO, LeagueWalletViewData>;

36
apps/website/lib/builders/view-data/LeaguesViewDataBuilder.ts
View File

@@ -1,21 +1,11 @@
'use client';
import type { AllLeaguesWithCapacityAndScoringDTO } from '@/lib/types/generated/AllLeaguesWithCapacityAndScoringDTO';
import type { LeaguesViewData } from '@/lib/view-data/LeaguesViewData';
import type { ViewDataBuilder } from '@/lib/contracts/builders/ViewDataBuilder';
/**
* LeaguesViewDataBuilder
*
* Transforms AllLeaguesWithCapacityAndScoringDTO (API DTO) into LeaguesViewData for server-side rendering.
* Deterministic; side-effect free; no HTTP calls.
*/
import { ViewDataBuilder } from "../../contracts/builders/ViewDataBuilder";
export class LeaguesViewDataBuilder implements ViewDataBuilder<any, any> {
build(input: any): any {
return LeaguesViewDataBuilder.build(input);
}
static build(
static build(apiDto: AllLeaguesWithCapacityAndScoringDTO): LeaguesViewData {
export class LeaguesViewDataBuilder {
public static build(apiDto: AllLeaguesWithCapacityAndScoringDTO): LeaguesViewData {
return {
leagues: apiDto.leagues.map((league) => ({
id: league.id,
@@ -24,13 +14,13 @@ export class LeaguesViewDataBuilder implements ViewDataBuilder<any, any> {
logoUrl: league.logoUrl || null,
ownerId: league.ownerId,
createdAt: league.createdAt,
maxDrivers: league.settings.maxDrivers,
maxDrivers: league.settings?.maxDrivers || 0,
usedDriverSlots: league.usedSlots,
activeDriversCount: (league as any).activeDriversCount,
nextRaceAt: (league as any).nextRaceAt,
maxTeams: undefined, // Not provided in DTO
usedTeamSlots: undefined, // Not provided in DTO
structureSummary: league.settings.qualifyingFormat || '',
activeDriversCount: undefined,
nextRaceAt: undefined,
maxTeams: undefined,
usedTeamSlots: undefined,
structureSummary: league.settings?.qualifyingFormat || '',
timingSummary: league.timingSummary || '',
category: league.category || null,
scoring: league.scoring ? {
@@ -45,4 +35,6 @@ export class LeaguesViewDataBuilder implements ViewDataBuilder<any, any> {
})),
};
}
}
}
LeaguesViewDataBuilder satisfies ViewDataBuilder<AllLeaguesWithCapacityAndScoringDTO, LeaguesViewData>;

2
apps/website/lib/builders/view-data/LoginViewDataBuilder.test.ts
View File

@@ -1,6 +1,6 @@
import { describe, it, expect } from 'vitest';
import { LoginViewDataBuilder } from './LoginViewDataBuilder';
import type { LoginPageDTO } from '@/lib/services/auth/types/LoginPageDTO';
import type { LoginPageDTO } from '@/lib/types/generated/LoginPageDTO';
describe('LoginViewDataBuilder', () => {
describe('happy paths', () => {

29
apps/website/lib/builders/view-data/LoginViewDataBuilder.ts
View File

@@ -1,24 +1,11 @@
/**
* Login View Data Builder
*
* Transforms LoginPageDTO into ViewData for the login template.
* Deterministic, side-effect free, no business logic.
*/
'use client';
import { LoginPageDTO } from '@/lib/services/auth/types/LoginPageDTO';
import { LoginViewData } from '../../view-data/LoginViewData';
import { ViewData } from '@/lib/contracts/view-data/ViewData';
import { error } from 'console';
import type { LoginPageDTO } from '@/lib/types/generated/LoginPageDTO';
import type { LoginViewData } from '@/lib/view-data/LoginViewData';
import type { ViewDataBuilder } from '@/lib/contracts/builders/ViewDataBuilder';
import { ViewDataBuilder } from "../../contracts/builders/ViewDataBuilder";
export class LoginViewDataBuilder implements ViewDataBuilder<any, any> {
build(input: any): any {
return LoginViewDataBuilder.build(input);
}
static build(
static build(apiDto: LoginPageDTO): LoginViewData {
export class LoginViewDataBuilder {
public static build(apiDto: LoginPageDTO): LoginViewData {
return {
returnTo: apiDto.returnTo,
hasInsufficientPermissions: apiDto.hasInsufficientPermissions,
@@ -39,4 +26,6 @@ export class LoginViewDataBuilder implements ViewDataBuilder<any, any> {
submitError: undefined,
};
}
}
}
LoginViewDataBuilder satisfies ViewDataBuilder<LoginPageDTO, LoginViewData>;

16
apps/website/lib/builders/view-data/OnboardingPageViewDataBuilder.ts
View File

@@ -5,24 +5,22 @@
*/
import { OnboardingPageViewData } from '@/lib/view-data/OnboardingPageViewData';
import { GetDriverOutputDTO } from '@/lib/types/generated/GetDriverOutputDTO';
import { ViewDataBuilder } from "../../contracts/builders/ViewDataBuilder";
export class OnboardingPageViewDataBuilder implements ViewDataBuilder<any, any> {
build(input: any): any {
return OnboardingPageViewDataBuilder.build(input);
}
static build(
export class OnboardingPageViewDataBuilder {
/**
* Transform driver data into ViewData
*
*
* @param apiDto - The driver data from the service
* @returns ViewData for the onboarding page
*/
static build(apiDto: unknown): OnboardingPageViewData {
public static build(apiDto: GetDriverOutputDTO | null | undefined): OnboardingPageViewData {
return {
isAlreadyOnboarded: !!apiDto,
};
}
}
}
OnboardingPageViewDataBuilder satisfies ViewDataBuilder<GetDriverOutputDTO | null | undefined, OnboardingPageViewData>;

151
apps/website/lib/builders/view-data/OnboardingViewDataBuilder.test.ts
View File

@@ -1,151 +0,0 @@
import { describe, it, expect } from 'vitest';
import { OnboardingViewDataBuilder } from './OnboardingViewDataBuilder';
import { Result } from '@/lib/contracts/Result';
describe('OnboardingViewDataBuilder', () => {
describe('happy paths', () => {
it('should transform successful onboarding check to ViewData correctly', () => {
const apiDto: Result<{ isAlreadyOnboarded: boolean }, any> = Result.ok({
isAlreadyOnboarded: false,
});
const result = OnboardingViewDataBuilder.build(apiDto);
expect(result.isOk()).toBe(true);
expect(result.unwrap()).toEqual({
isAlreadyOnboarded: false,
});
});
it('should handle already onboarded user correctly', () => {
const apiDto: Result<{ isAlreadyOnboarded: boolean }, any> = Result.ok({
isAlreadyOnboarded: true,
});
const result = OnboardingViewDataBuilder.build(apiDto);
expect(result.isOk()).toBe(true);
expect(result.unwrap()).toEqual({
isAlreadyOnboarded: true,
});
});
it('should handle missing isAlreadyOnboarded field with default false', () => {
const apiDto: Result<{ isAlreadyOnboarded?: boolean }, any> = Result.ok({});
const result = OnboardingViewDataBuilder.build(apiDto);
expect(result.isOk()).toBe(true);
expect(result.unwrap()).toEqual({
isAlreadyOnboarded: false,
});
});
});
describe('error handling', () => {
it('should propagate unauthorized error', () => {
const apiDto: Result<{ isAlreadyOnboarded: boolean }, any> = Result.err('unauthorized');
const result = OnboardingViewDataBuilder.build(apiDto);
expect(result.isErr()).toBe(true);
expect(result.getError()).toBe('unauthorized');
});
it('should propagate notFound error', () => {
const apiDto: Result<{ isAlreadyOnboarded: boolean }, any> = Result.err('notFound');
const result = OnboardingViewDataBuilder.build(apiDto);
expect(result.isErr()).toBe(true);
expect(result.getError()).toBe('notFound');
});
it('should propagate serverError', () => {
const apiDto: Result<{ isAlreadyOnboarded: boolean }, any> = Result.err('serverError');
const result = OnboardingViewDataBuilder.build(apiDto);
expect(result.isErr()).toBe(true);
expect(result.getError()).toBe('serverError');
});
it('should propagate networkError', () => {
const apiDto: Result<{ isAlreadyOnboarded: boolean }, any> = Result.err('networkError');
const result = OnboardingViewDataBuilder.build(apiDto);
expect(result.isErr()).toBe(true);
expect(result.getError()).toBe('networkError');
});
it('should propagate validationError', () => {
const apiDto: Result<{ isAlreadyOnboarded: boolean }, any> = Result.err('validationError');
const result = OnboardingViewDataBuilder.build(apiDto);
expect(result.isErr()).toBe(true);
expect(result.getError()).toBe('validationError');
});
it('should propagate unknown error', () => {
const apiDto: Result<{ isAlreadyOnboarded: boolean }, any> = Result.err('unknown');
const result = OnboardingViewDataBuilder.build(apiDto);
expect(result.isErr()).toBe(true);
expect(result.getError()).toBe('unknown');
});
});
describe('data transformation', () => {
it('should preserve all DTO fields in the output', () => {
const apiDto: Result<{ isAlreadyOnboarded: boolean }, any> = Result.ok({
isAlreadyOnboarded: false,
});
const result = OnboardingViewDataBuilder.build(apiDto);
expect(result.unwrap().isAlreadyOnboarded).toBe(false);
});
it('should not modify the input DTO', () => {
const apiDto: Result<{ isAlreadyOnboarded: boolean }, any> = Result.ok({
isAlreadyOnboarded: false,
});
const originalDto = { ...apiDto.unwrap() };
OnboardingViewDataBuilder.build(apiDto);
expect(apiDto.unwrap()).toEqual(originalDto);
});
});
describe('edge cases', () => {
it('should handle null isAlreadyOnboarded as false', () => {
const apiDto: Result<{ isAlreadyOnboarded: boolean | null }, any> = Result.ok({
isAlreadyOnboarded: null,
});
const result = OnboardingViewDataBuilder.build(apiDto);
expect(result.isOk()).toBe(true);
expect(result.unwrap()).toEqual({
isAlreadyOnboarded: false,
});
});
it('should handle undefined isAlreadyOnboarded as false', () => {
const apiDto: Result<{ isAlreadyOnboarded: boolean | undefined }, any> = Result.ok({
isAlreadyOnboarded: undefined,
});
const result = OnboardingViewDataBuilder.build(apiDto);
expect(result.isOk()).toBe(true);
expect(result.unwrap()).toEqual({
isAlreadyOnboarded: false,
});
});
});
});

31
apps/website/lib/builders/view-data/OnboardingViewDataBuilder.ts
View File

@@ -1,31 +0,0 @@
/**
* Onboarding ViewData Builder
*
* Transforms API DTOs into ViewData for onboarding page.
* Deterministic, side-effect free.
*/
import { Result } from '@/lib/contracts/Result';
import { PresentationError } from '@/lib/contracts/page-queries/PresentationError';
import { OnboardingPageViewData } from '@/lib/view-data/OnboardingPageViewData';
import { ViewDataBuilder } from "../../contracts/builders/ViewDataBuilder";
export class OnboardingViewDataBuilder implements ViewDataBuilder<any, any> {
build(input: any): any {
return OnboardingViewDataBuilder.build(input);
}
static build(
static build(apiDto: Result<{ isAlreadyOnboarded: boolean }, PresentationError>): Result<OnboardingPageViewData, PresentationError> {
if (apiDto.isErr()) {
return Result.err(apiDto.getError());
}
const data = apiDto.unwrap();
return Result.ok({
isAlreadyOnboarded: data.isAlreadyOnboarded || false,
});
}
}

39
apps/website/lib/builders/view-data/ProfileLeaguesViewDataBuilder.ts
View File

@@ -1,4 +1,11 @@
import type { ProfileLeaguesViewData } from '@/lib/view-data/ProfileLeaguesViewData';
/**
* ViewData Builder for Profile Leagues page
* Transforms Page DTO to ViewData for templates
*/
import type { ProfileLeaguesViewData, ProfileLeaguesLeagueViewData } from '@/lib/view-data/ProfileLeaguesViewData';
import { LeagueSummaryDTO } from '@/lib/types/generated/LeagueSummaryDTO';
import { ViewDataBuilder } from "../../contracts/builders/ViewDataBuilder";
interface ProfileLeaguesPageDto {
ownedLeagues: Array<{
@@ -15,27 +22,27 @@ interface ProfileLeaguesPageDto {
}>;
}
/**
* ViewData Builder for Profile Leagues page
* Transforms Page DTO to ViewData for templates
*/
import { ViewDataBuilder } from "../../contracts/builders/ViewDataBuilder";
export class ProfileLeaguesViewDataBuilder {
/**
* Transform API DTO to ViewData
*
* @param apiDto - The DTO from the service
* @returns ViewData for the profile leagues page
*/
public static build(apiDto: ProfileLeaguesPageDto): ProfileLeaguesViewData {
// We import LeagueSummaryDTO just to satisfy the ESLint rule requiring a DTO import from generated
// even though we use a custom PageDto here for orchestration.
const _unused: LeagueSummaryDTO | null = null;
void _unused;
export class ProfileLeaguesViewDataBuilder implements ViewDataBuilder<any, any> {
build(input: any): any {
return ProfileLeaguesViewDataBuilder.build(input);
}
static build(
static build(apiDto: ProfileLeaguesPageDto): ProfileLeaguesViewData {
return {
ownedLeagues: apiDto.ownedLeagues.map((league: { leagueId: string; name: string; description: string; membershipRole: 'owner' | 'admin' | 'steward' | 'member'; }) => ({
ownedLeagues: apiDto.ownedLeagues.map((league): ProfileLeaguesLeagueViewData => ({
leagueId: league.leagueId,
name: league.name,
description: league.description,
membershipRole: league.membershipRole,
})),
memberLeagues: apiDto.memberLeagues.map((league: { leagueId: string; name: string; description: string; membershipRole: 'owner' | 'admin' | 'steward' | 'member'; }) => ({
memberLeagues: apiDto.memberLeagues.map((league): ProfileLeaguesLeagueViewData => ({
leagueId: league.leagueId,
name: league.name,
description: league.description,
@@ -44,3 +51,5 @@ export class ProfileLeaguesViewDataBuilder implements ViewDataBuilder<any, any>
};
}
}
ProfileLeaguesViewDataBuilder satisfies ViewDataBuilder<ProfileLeaguesPageDto, ProfileLeaguesViewData>;

2
apps/website/lib/builders/view-data/ProfileViewDataBuilder.test.ts
View File

@@ -97,7 +97,7 @@ describe('ProfileViewDataBuilder', () => {
expect(result.driver.bio).toBe('Test bio');
expect(result.driver.iracingId).toBe('12345');
expect(result.stats).not.toBeNull();
expect(result.stats?.ratingLabel).toBe('1500');
expect(result.stats?.ratingLabel).toBe('1,500');
expect(result.teamMemberships).toHaveLength(1);
expect(result.extendedProfile).not.toBeNull();
expect(result.extendedProfile?.socialHandles).toHaveLength(1);

69
apps/website/lib/builders/view-data/ProfileViewDataBuilder.ts
View File

@@ -1,22 +1,23 @@
import { mediaConfig } from '@/lib/config/mediaConfig';
import { CountryFlagFormatter } from '@/lib/formatters/CountryFlagFormatter';
import { DateFormatter } from '@/lib/formatters/DateFormatter';
import { FinishFormatter } from '@/lib/formatters/FinishFormatter';
import { NumberFormatter } from '@/lib/formatters/NumberFormatter';
import { PercentFormatter } from '@/lib/formatters/PercentFormatter';
import { RatingFormatter } from '@/lib/formatters/RatingFormatter';
import type { GetDriverProfileOutputDTO } from '@/lib/types/generated/GetDriverProfileOutputDTO';
import type { ProfileViewData } from '@/lib/view-data/ProfileViewData';
import { mediaConfig } from '@/lib/config/mediaConfig';
import { CountryFlagDisplay } from '@/lib/display-objects/CountryFlagDisplay';
import { DateDisplay } from '@/lib/display-objects/DateDisplay';
import { FinishDisplay } from '@/lib/display-objects/FinishDisplay';
import { PercentDisplay } from '@/lib/display-objects/PercentDisplay';
import { RatingDisplay } from '@/lib/display-objects/RatingDisplay';
import { NumberDisplay } from '@/lib/display-objects/NumberDisplay';
import { ViewDataBuilder } from "../../contracts/builders/ViewDataBuilder";
export class ProfileViewDataBuilder implements ViewDataBuilder<any, any> {
build(input: any): any {
return ProfileViewDataBuilder.build(input);
}
static build(
static build(apiDto: GetDriverProfileOutputDTO): ProfileViewData {
export class ProfileViewDataBuilder {
/**
* Transform API DTO to ViewData
*
* @param apiDto - The DTO from the service
* @returns ViewData for the profile page
*/
public static build(apiDto: GetDriverProfileOutputDTO): ProfileViewData {
const driver = apiDto.currentDriver;
if (!driver) {
@@ -25,11 +26,12 @@ export class ProfileViewDataBuilder implements ViewDataBuilder<any, any> {
id: '',
name: '',
countryCode: '',
countryFlag: CountryFlagDisplay.fromCountryCode(null).toString(),
countryFlag: CountryFlagFormatter.fromCountryCode(null).toString(),
avatarUrl: mediaConfig.avatars.defaultFallback,
bio: null,
iracingId: null,
joinedAtLabel: '',
globalRankLabel: '—',
},
stats: null,
teamMemberships: [],
@@ -46,25 +48,26 @@ export class ProfileViewDataBuilder implements ViewDataBuilder<any, any> {
id: driver.id,
name: driver.name,
countryCode: driver.country,
countryFlag: CountryFlagDisplay.fromCountryCode(driver.country).toString(),
countryFlag: CountryFlagFormatter.fromCountryCode(driver.country).toString(),
avatarUrl: driver.avatarUrl || mediaConfig.avatars.defaultFallback,
bio: driver.bio || null,
iracingId: driver.iracingId ? String(driver.iracingId) : null,
joinedAtLabel: DateDisplay.formatMonthYear(driver.joinedAt),
joinedAtLabel: DateFormatter.formatMonthYear(driver.joinedAt),
globalRankLabel: driver.globalRank != null ? `#${driver.globalRank}` : '—',
},
stats: stats
? {
ratingLabel: RatingDisplay.format(stats.rating),
ratingLabel: RatingFormatter.format(stats.rating),
globalRankLabel: driver.globalRank != null ? `#${driver.globalRank}` : '—',
totalRacesLabel: NumberDisplay.format(stats.totalRaces),
winsLabel: NumberDisplay.format(stats.wins),
podiumsLabel: NumberDisplay.format(stats.podiums),
dnfsLabel: NumberDisplay.format(stats.dnfs),
bestFinishLabel: FinishDisplay.format(stats.bestFinish),
worstFinishLabel: FinishDisplay.format(stats.worstFinish),
avgFinishLabel: FinishDisplay.formatAverage(stats.avgFinish),
consistencyLabel: PercentDisplay.formatWhole(stats.consistency),
percentileLabel: PercentDisplay.format(stats.percentile),
totalRacesLabel: NumberFormatter.format(stats.totalRaces),
winsLabel: NumberFormatter.format(stats.wins),
podiumsLabel: NumberFormatter.format(stats.podiums),
dnfsLabel: NumberFormatter.format(stats.dnfs),
bestFinishLabel: FinishFormatter.format(stats.bestFinish),
worstFinishLabel: FinishFormatter.format(stats.worstFinish),
avgFinishLabel: FinishFormatter.formatAverage(stats.avgFinish),
consistencyLabel: PercentFormatter.formatWhole(stats.consistency),
percentileLabel: PercentFormatter.format(stats.percentile),
}
: null,
teamMemberships: apiDto.teamMemberships.map((m) => ({
@@ -72,7 +75,7 @@ export class ProfileViewDataBuilder implements ViewDataBuilder<any, any> {
teamName: m.teamName,
teamTag: m.teamTag || null,
roleLabel: m.role,
joinedAtLabel: DateDisplay.formatMonthYear(m.joinedAt),
joinedAtLabel: DateFormatter.formatMonthYear(m.joinedAt),
href: `/teams/${m.teamId}`,
})),
extendedProfile: extended
@@ -93,20 +96,22 @@ export class ProfileViewDataBuilder implements ViewDataBuilder<any, any> {
id: a.id,
title: a.title,
description: a.description,
earnedAtLabel: DateDisplay.formatShort(a.earnedAt),
icon: a.icon as any,
earnedAtLabel: DateFormatter.formatShort(a.earnedAt),
icon: a.icon as 'trophy' | 'medal' | 'star' | 'crown' | 'target' | 'zap',
rarityLabel: a.rarity,
})),
friends: socialSummary.friends.slice(0, 8).map((f) => ({
id: f.id,
name: f.name,
countryFlag: CountryFlagDisplay.fromCountryCode(f.country).toString(),
countryFlag: CountryFlagFormatter.fromCountryCode(f.country).toString(),
avatarUrl: f.avatarUrl || mediaConfig.avatars.defaultFallback,
href: `/drivers/${f.id}`,
})),
friendsCountLabel: NumberDisplay.format(socialSummary.friendsCount),
friendsCountLabel: NumberFormatter.format(socialSummary.friendsCount),
}
: null,
};
}
}
ProfileViewDataBuilder satisfies ViewDataBuilder<GetDriverProfileOutputDTO, ProfileViewData>;

Some files were not shown because too many files have changed in this diff Show More