view data fixes

apps/website/lib/page-queries/races/RaceDetailPageQuery.test.ts

@@ -0,0 +1,111 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { RaceDetailPageQuery } from './RaceDetailPageQuery';
+import { RacesService } from '@/lib/services/races/RacesService';
+import { Result } from '@/lib/contracts/Result';
+import { RaceDetailViewDataBuilder } from '@/lib/builders/view-data/RaceDetailViewDataBuilder';
+import { mapToPresentationError } from '@/lib/contracts/page-queries/PresentationError';
+
+// Mock dependencies
+vi.mock('@/lib/services/races/RacesService', () => ({
+  RacesService: vi.fn(class {
+    getRaceDetail = vi.fn();
+  }),
+}));
+
+vi.mock('@/lib/builders/view-data/RaceDetailViewDataBuilder', () => ({
+  RaceDetailViewDataBuilder: {
+    build: vi.fn(),
+  },
+}));
+
+vi.mock('@/lib/contracts/page-queries/PresentationError', () => ({
+  mapToPresentationError: vi.fn(),
+}));
+
+describe('RaceDetailPageQuery', () => {
+  let query: RaceDetailPageQuery;
+  let mockServiceInstance: any;
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    query = new RaceDetailPageQuery();
+    mockServiceInstance = {
+      getRaceDetail: vi.fn(),
+    };
+    (RacesService as any).mockImplementation(function () {
+      return mockServiceInstance;
+    });
+  });
+
+  it('should return view data when service succeeds', async () => {
+    const params = { raceId: 'race-123', driverId: 'driver-456' };
+    const apiDto = { race: { id: 'race-123' }, driver: { id: 'driver-456' } };
+    const viewData = { race: { id: 'race-123' }, driver: { id: 'driver-456' } };
+
+    mockServiceInstance.getRaceDetail.mockResolvedValue(Result.ok(apiDto));
+    (RaceDetailViewDataBuilder.build as any).mockReturnValue(viewData);
+
+    const result = await query.execute(params);
+
+    expect(result.isOk()).toBe(true);
+    expect(result.unwrap()).toEqual(viewData);
+    expect(RacesService).toHaveBeenCalled();
+    expect(mockServiceInstance.getRaceDetail).toHaveBeenCalledWith('race-123', 'driver-456');
+    expect(RaceDetailViewDataBuilder.build).toHaveBeenCalledWith(apiDto);
+  });
+
+  it('should return view data when driverId is optional', async () => {
+    const params = { raceId: 'race-123' };
+    const apiDto = { race: { id: 'race-123' } };
+    const viewData = { race: { id: 'race-123' } };
+
+    mockServiceInstance.getRaceDetail.mockResolvedValue(Result.ok(apiDto));
+    (RaceDetailViewDataBuilder.build as any).mockReturnValue(viewData);
+
+    const result = await query.execute(params);
+
+    expect(result.isOk()).toBe(true);
+    expect(result.unwrap()).toEqual(viewData);
+    expect(mockServiceInstance.getRaceDetail).toHaveBeenCalledWith('race-123', '');
+  });
+
+  it('should return mapped presentation error when service fails', async () => {
+    const params = { raceId: 'race-123', driverId: 'driver-456' };
+    const serviceError = { type: 'notFound' };
+    const presentationError = 'notFound';
+
+    mockServiceInstance.getRaceDetail.mockResolvedValue(Result.err(serviceError));
+    (mapToPresentationError as any).mockReturnValue(presentationError);
+
+    const result = await query.execute(params);
+
+    expect(result.isErr()).toBe(true);
+    expect(result.getError()).toBe(presentationError);
+    expect(mapToPresentationError).toHaveBeenCalledWith(serviceError);
+  });
+
+  it('should return serverError on exception', async () => {
+    const params = { raceId: 'race-123', driverId: 'driver-456' };
+
+    mockServiceInstance.getRaceDetail.mockRejectedValue(new Error('Network error'));
+
+    const result = await query.execute(params);
+
+    expect(result.isErr()).toBe(true);
+    expect(result.getError()).toBe('Network error');
+  });
+
+  it('should provide a static execute method', async () => {
+    const params = { raceId: 'race-123', driverId: 'driver-456' };
+    const apiDto = { race: { id: 'race-123' }, driver: { id: 'driver-456' } };
+    const viewData = { race: { id: 'race-123' }, driver: { id: 'driver-456' } };
+
+    mockServiceInstance.getRaceDetail.mockResolvedValue(Result.ok(apiDto));
+    (RaceDetailViewDataBuilder.build as any).mockReturnValue(viewData);
+
+    const result = await RaceDetailPageQuery.execute(params);
+
+    expect(result.isOk()).toBe(true);
+    expect(result.unwrap()).toEqual(viewData);
+  });
+});

apps/website/lib/page-queries/races/RaceDetailPageQuery.ts

@@ -18,19 +18,24 @@ interface RaceDetailPageQueryParams {
  */
 export class RaceDetailPageQuery implements PageQuery<RaceDetailViewData, RaceDetailPageQueryParams> {
   async execute(params: RaceDetailPageQueryParams): Promise<Result<RaceDetailViewData, PresentationError>> {
-    // Manual wiring: Service creates its own dependencies
-    const service = new RacesService();
-    
-    // Get race detail data
-    const result = await service.getRaceDetail(params.raceId, params.driverId || '');
-    
-    if (result.isErr()) {
-      return Result.err(mapToPresentationError(result.getError()));
+    try {
+      // Manual wiring: Service creates its own dependencies
+      const service = new RacesService();
+      
+      // Get race detail data
+      const result = await service.getRaceDetail(params.raceId, params.driverId || '');
+      
+      if (result.isErr()) {
+        return Result.err(mapToPresentationError(result.getError()));
+      }
+      
+      // Transform to ViewData using builder
+      const viewData = RaceDetailViewDataBuilder.build(result.unwrap());
+      return Result.ok(viewData);
+    } catch (error: unknown) {
+      const message = error instanceof Error ? error.message : 'Failed to execute race detail page query';
+      return Result.err(message as PresentationError);
     }
-    
-    // Transform to ViewData using builder
-    const viewData = RaceDetailViewDataBuilder.build(result.unwrap());
-    return Result.ok(viewData);
   }
 
   // Static method to avoid object construction in server code

apps/website/lib/page-queries/races/RaceResultsPageQuery.test.ts

@@ -0,0 +1,96 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { RaceResultsPageQuery } from './RaceResultsPageQuery';
+import { RaceResultsService } from '@/lib/services/races/RaceResultsService';
+import { Result } from '@/lib/contracts/Result';
+import { RaceResultsViewDataBuilder } from '@/lib/builders/view-data/RaceResultsViewDataBuilder';
+import { mapToPresentationError } from '@/lib/contracts/page-queries/PresentationError';
+
+// Mock dependencies
+vi.mock('@/lib/services/races/RaceResultsService', () => ({
+  RaceResultsService: vi.fn(class {
+    getRaceResultsDetail = vi.fn();
+  }),
+}));
+
+vi.mock('@/lib/builders/view-data/RaceResultsViewDataBuilder', () => ({
+  RaceResultsViewDataBuilder: {
+    build: vi.fn(),
+  },
+}));
+
+vi.mock('@/lib/contracts/page-queries/PresentationError', () => ({
+  mapToPresentationError: vi.fn(),
+}));
+
+describe('RaceResultsPageQuery', () => {
+  let query: RaceResultsPageQuery;
+  let mockServiceInstance: any;
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    query = new RaceResultsPageQuery();
+    mockServiceInstance = {
+      getRaceResultsDetail: vi.fn(),
+    };
+    (RaceResultsService as any).mockImplementation(function () {
+      return mockServiceInstance;
+    });
+  });
+
+  it('should return view data when service succeeds', async () => {
+    const params = { raceId: 'race-123', driverId: 'driver-456' };
+    const apiDto = { race: { id: 'race-123' }, results: [{ position: 1 }] };
+    const viewData = { race: { id: 'race-123' }, results: [{ position: 1 }] };
+
+    mockServiceInstance.getRaceResultsDetail.mockResolvedValue(Result.ok(apiDto));
+    (RaceResultsViewDataBuilder.build as any).mockReturnValue(viewData);
+
+    const result = await query.execute(params);
+
+    expect(result.isOk()).toBe(true);
+    expect(result.unwrap()).toEqual(viewData);
+    expect(RaceResultsService).toHaveBeenCalled();
+    expect(mockServiceInstance.getRaceResultsDetail).toHaveBeenCalledWith('race-123');
+    expect(RaceResultsViewDataBuilder.build).toHaveBeenCalledWith(apiDto);
+  });
+
+  it('should return mapped presentation error when service fails', async () => {
+    const params = { raceId: 'race-123', driverId: 'driver-456' };
+    const serviceError = { type: 'notFound' };
+    const presentationError = 'notFound';
+
+    mockServiceInstance.getRaceResultsDetail.mockResolvedValue(Result.err(serviceError));
+    (mapToPresentationError as any).mockReturnValue(presentationError);
+
+    const result = await query.execute(params);
+
+    expect(result.isErr()).toBe(true);
+    expect(result.getError()).toBe(presentationError);
+    expect(mapToPresentationError).toHaveBeenCalledWith(serviceError);
+  });
+
+  it('should return serverError on exception', async () => {
+    const params = { raceId: 'race-123', driverId: 'driver-456' };
+
+    mockServiceInstance.getRaceResultsDetail.mockRejectedValue(new Error('Network error'));
+
+    const result = await query.execute(params);
+
+    expect(result.isErr()).toBe(true);
+    expect(result.getError()).toBe('Network error');
+  });
+
+  it('should provide a static execute method', async () => {
+    const params = { raceId: 'race-123', driverId: 'driver-456' };
+    const apiDto = { race: { id: 'race-123' }, results: [{ position: 1 }] };
+    const viewData = { race: { id: 'race-123' }, results: [{ position: 1 }] };
+
+    mockServiceInstance.getRaceResultsDetail.mockResolvedValue(Result.ok(apiDto));
+    (RaceResultsViewDataBuilder.build as any).mockReturnValue(viewData);
+
+    const result = await RaceResultsPageQuery.execute(params);
+
+    expect(result.isOk()).toBe(true);
+    expect(result.unwrap()).toEqual(viewData);
+  });
+});

apps/website/lib/page-queries/races/RaceResultsPageQuery.ts

@@ -18,19 +18,24 @@ interface RaceResultsPageQueryParams {
  */
 export class RaceResultsPageQuery implements PageQuery<RaceResultsViewData, RaceResultsPageQueryParams> {
   async execute(params: RaceResultsPageQueryParams): Promise<Result<RaceResultsViewData, PresentationError>> {
-    // Manual wiring: Service creates its own dependencies
-    const service = new RaceResultsService();
-    
-    // Get race results data
-    const result = await service.getRaceResultsDetail(params.raceId);
-    
-    if (result.isErr()) {
-      return Result.err(mapToPresentationError(result.getError()));
+    try {
+      // Manual wiring: Service creates its own dependencies
+      const service = new RaceResultsService();
+      
+      // Get race results data
+      const result = await service.getRaceResultsDetail(params.raceId);
+      
+      if (result.isErr()) {
+        return Result.err(mapToPresentationError(result.getError()));
+      }
+      
+      // Transform to ViewData using builder
+      const viewData = RaceResultsViewDataBuilder.build(result.unwrap());
+      return Result.ok(viewData);
+    } catch (error: unknown) {
+      const message = error instanceof Error ? error.message : 'Failed to execute race results page query';
+      return Result.err(message as PresentationError);
     }
-    
-    // Transform to ViewData using builder
-    const viewData = RaceResultsViewDataBuilder.build(result.unwrap());
-    return Result.ok(viewData);
   }
 
   // Static method to avoid object construction in server code

apps/website/lib/page-queries/races/RaceStewardingPageQuery.test.ts

@@ -0,0 +1,96 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { RaceStewardingPageQuery } from './RaceStewardingPageQuery';
+import { RaceStewardingService } from '@/lib/services/races/RaceStewardingService';
+import { Result } from '@/lib/contracts/Result';
+import { RaceStewardingViewDataBuilder } from '@/lib/builders/view-data/RaceStewardingViewDataBuilder';
+import { mapToPresentationError } from '@/lib/contracts/page-queries/PresentationError';
+
+// Mock dependencies
+vi.mock('@/lib/services/races/RaceStewardingService', () => ({
+  RaceStewardingService: vi.fn(class {
+    getRaceStewarding = vi.fn();
+  }),
+}));
+
+vi.mock('@/lib/builders/view-data/RaceStewardingViewDataBuilder', () => ({
+  RaceStewardingViewDataBuilder: {
+    build: vi.fn(),
+  },
+}));
+
+vi.mock('@/lib/contracts/page-queries/PresentationError', () => ({
+  mapToPresentationError: vi.fn(),
+}));
+
+describe('RaceStewardingPageQuery', () => {
+  let query: RaceStewardingPageQuery;
+  let mockServiceInstance: any;
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    query = new RaceStewardingPageQuery();
+    mockServiceInstance = {
+      getRaceStewarding: vi.fn(),
+    };
+    (RaceStewardingService as any).mockImplementation(function () {
+      return mockServiceInstance;
+    });
+  });
+
+  it('should return view data when service succeeds', async () => {
+    const params = { raceId: 'race-123', driverId: 'driver-456' };
+    const apiDto = { race: { id: 'race-123' }, stewarding: [{ incident: 'incident-1' }] };
+    const viewData = { race: { id: 'race-123' }, stewarding: [{ incident: 'incident-1' }] };
+
+    mockServiceInstance.getRaceStewarding.mockResolvedValue(Result.ok(apiDto));
+    (RaceStewardingViewDataBuilder.build as any).mockReturnValue(viewData);
+
+    const result = await query.execute(params);
+
+    expect(result.isOk()).toBe(true);
+    expect(result.unwrap()).toEqual(viewData);
+    expect(RaceStewardingService).toHaveBeenCalled();
+    expect(mockServiceInstance.getRaceStewarding).toHaveBeenCalledWith('race-123');
+    expect(RaceStewardingViewDataBuilder.build).toHaveBeenCalledWith(apiDto);
+  });
+
+  it('should return mapped presentation error when service fails', async () => {
+    const params = { raceId: 'race-123', driverId: 'driver-456' };
+    const serviceError = { type: 'notFound' };
+    const presentationError = 'notFound';
+
+    mockServiceInstance.getRaceStewarding.mockResolvedValue(Result.err(serviceError));
+    (mapToPresentationError as any).mockReturnValue(presentationError);
+
+    const result = await query.execute(params);
+
+    expect(result.isErr()).toBe(true);
+    expect(result.getError()).toBe(presentationError);
+    expect(mapToPresentationError).toHaveBeenCalledWith(serviceError);
+  });
+
+  it('should return serverError on exception', async () => {
+    const params = { raceId: 'race-123', driverId: 'driver-456' };
+
+    mockServiceInstance.getRaceStewarding.mockRejectedValue(new Error('Network error'));
+
+    const result = await query.execute(params);
+
+    expect(result.isErr()).toBe(true);
+    expect(result.getError()).toBe('Network error');
+  });
+
+  it('should provide a static execute method', async () => {
+    const params = { raceId: 'race-123', driverId: 'driver-456' };
+    const apiDto = { race: { id: 'race-123' }, stewarding: [{ incident: 'incident-1' }] };
+    const viewData = { race: { id: 'race-123' }, stewarding: [{ incident: 'incident-1' }] };
+
+    mockServiceInstance.getRaceStewarding.mockResolvedValue(Result.ok(apiDto));
+    (RaceStewardingViewDataBuilder.build as any).mockReturnValue(viewData);
+
+    const result = await RaceStewardingPageQuery.execute(params);
+
+    expect(result.isOk()).toBe(true);
+    expect(result.unwrap()).toEqual(viewData);
+  });
+});

apps/website/lib/page-queries/races/RaceStewardingPageQuery.ts

@@ -18,19 +18,24 @@ interface RaceStewardingPageQueryParams {
  */
 export class RaceStewardingPageQuery implements PageQuery<RaceStewardingViewData, RaceStewardingPageQueryParams> {
   async execute(params: RaceStewardingPageQueryParams): Promise<Result<RaceStewardingViewData, PresentationError>> {
-    // Manual wiring: Service creates its own dependencies
-    const service = new RaceStewardingService();
-    
-    // Get race stewarding data
-    const result = await service.getRaceStewarding(params.raceId);
-    
-    if (result.isErr()) {
-      return Result.err(mapToPresentationError(result.getError()));
+    try {
+      // Manual wiring: Service creates its own dependencies
+      const service = new RaceStewardingService();
+      
+      // Get race stewarding data
+      const result = await service.getRaceStewarding(params.raceId);
+      
+      if (result.isErr()) {
+        return Result.err(mapToPresentationError(result.getError()));
+      }
+      
+      // Transform to ViewData using builder
+      const viewData = RaceStewardingViewDataBuilder.build(result.unwrap());
+      return Result.ok(viewData);
+    } catch (error: unknown) {
+      const message = error instanceof Error ? error.message : 'Failed to execute race stewarding page query';
+      return Result.err(message as PresentationError);
     }
-    
-    // Transform to ViewData using builder
-    const viewData = RaceStewardingViewDataBuilder.build(result.unwrap());
-    return Result.ok(viewData);
   }
 
   // Static method to avoid object construction in server code

apps/website/lib/page-queries/races/RacesAllPageQuery.test.ts

@@ -0,0 +1,91 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { RacesAllPageQuery } from './RacesAllPageQuery';
+import { RacesService } from '@/lib/services/races/RacesService';
+import { Result } from '@/lib/contracts/Result';
+import { RacesViewDataBuilder } from '@/lib/builders/view-data/RacesViewDataBuilder';
+import { mapToPresentationError } from '@/lib/contracts/page-queries/PresentationError';
+
+// Mock dependencies
+vi.mock('@/lib/services/races/RacesService', () => ({
+  RacesService: vi.fn(class {
+    getAllRacesPageData = vi.fn();
+  }),
+}));
+
+vi.mock('@/lib/builders/view-data/RacesViewDataBuilder', () => ({
+  RacesViewDataBuilder: {
+    build: vi.fn(),
+  },
+}));
+
+vi.mock('@/lib/contracts/page-queries/PresentationError', () => ({
+  mapToPresentationError: vi.fn(),
+}));
+
+describe('RacesAllPageQuery', () => {
+  let query: RacesAllPageQuery;
+  let mockServiceInstance: any;
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    query = new RacesAllPageQuery();
+    mockServiceInstance = {
+      getAllRacesPageData: vi.fn(),
+    };
+    (RacesService as any).mockImplementation(function () {
+      return mockServiceInstance;
+    });
+  });
+
+  it('should return view data when service succeeds', async () => {
+    const apiDto = { races: [{ id: 'race-123' }], categories: [{ id: 'cat-1' }] };
+    const viewData = { races: [{ id: 'race-123' }], categories: [{ id: 'cat-1' }] };
+
+    mockServiceInstance.getAllRacesPageData.mockResolvedValue(Result.ok(apiDto));
+    (RacesViewDataBuilder.build as any).mockReturnValue(viewData);
+
+    const result = await query.execute();
+
+    expect(result.isOk()).toBe(true);
+    expect(result.unwrap()).toEqual(viewData);
+    expect(RacesService).toHaveBeenCalled();
+    expect(mockServiceInstance.getAllRacesPageData).toHaveBeenCalled();
+    expect(RacesViewDataBuilder.build).toHaveBeenCalledWith(apiDto);
+  });
+
+  it('should return mapped presentation error when service fails', async () => {
+    const serviceError = { type: 'notFound' };
+    const presentationError = 'notFound';
+
+    mockServiceInstance.getAllRacesPageData.mockResolvedValue(Result.err(serviceError));
+    (mapToPresentationError as any).mockReturnValue(presentationError);
+
+    const result = await query.execute();
+
+    expect(result.isErr()).toBe(true);
+    expect(result.getError()).toBe(presentationError);
+    expect(mapToPresentationError).toHaveBeenCalledWith(serviceError);
+  });
+
+  it('should return serverError on exception', async () => {
+    mockServiceInstance.getAllRacesPageData.mockRejectedValue(new Error('Network error'));
+
+    const result = await query.execute();
+
+    expect(result.isErr()).toBe(true);
+    expect(result.getError()).toBe('Network error');
+  });
+
+  it('should provide a static execute method', async () => {
+    const apiDto = { races: [{ id: 'race-123' }], categories: [{ id: 'cat-1' }] };
+    const viewData = { races: [{ id: 'race-123' }], categories: [{ id: 'cat-1' }] };
+
+    mockServiceInstance.getAllRacesPageData.mockResolvedValue(Result.ok(apiDto));
+    (RacesViewDataBuilder.build as any).mockReturnValue(viewData);
+
+    const result = await RacesAllPageQuery.execute();
+
+    expect(result.isOk()).toBe(true);
+    expect(result.unwrap()).toEqual(viewData);
+  });
+});

apps/website/lib/page-queries/races/RacesAllPageQuery.ts

@@ -13,19 +13,24 @@ import { RacesViewDataBuilder } from '@/lib/builders/view-data/RacesViewDataBuil
  */
 export class RacesAllPageQuery implements PageQuery<RacesViewData, void> {
   async execute(): Promise<Result<RacesViewData, PresentationError>> {
-    // Manual wiring: Service creates its own dependencies
-    const service = new RacesService();
-    
-    // Get all races data
-    const result = await service.getAllRacesPageData();
-    
-    if (result.isErr()) {
-      return Result.err(mapToPresentationError(result.getError()));
+    try {
+      // Manual wiring: Service creates its own dependencies
+      const service = new RacesService();
+      
+      // Get all races data
+      const result = await service.getAllRacesPageData();
+      
+      if (result.isErr()) {
+        return Result.err(mapToPresentationError(result.getError()));
+      }
+      
+      // Transform to ViewData using builder
+      const viewData = RacesViewDataBuilder.build(result.unwrap());
+      return Result.ok(viewData);
+    } catch (error: unknown) {
+      const message = error instanceof Error ? error.message : 'Failed to execute races all page query';
+      return Result.err(message as PresentationError);
     }
-    
-    // Transform to ViewData using builder
-    const viewData = RacesViewDataBuilder.build(result.unwrap());
-    return Result.ok(viewData);
   }
 
   // Static method to avoid object construction in server code

apps/website/lib/page-queries/races/RacesPageQuery.test.ts

@@ -0,0 +1,79 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { RacesPageQuery } from './RacesPageQuery';
+import { RacesService } from '@/lib/services/races/RacesService';
+import { Result } from '@/lib/contracts/Result';
+import { RacesViewDataBuilder } from '@/lib/builders/view-data/RacesViewDataBuilder';
+import { mapToPresentationError } from '@/lib/contracts/page-queries/PresentationError';
+
+// Mock dependencies
+vi.mock('@/lib/services/races/RacesService', () => ({
+  RacesService: vi.fn(class {
+    getRacesPageData = vi.fn();
+  }),
+}));
+
+vi.mock('@/lib/builders/view-data/RacesViewDataBuilder', () => ({
+  RacesViewDataBuilder: {
+    build: vi.fn(),
+  },
+}));
+
+vi.mock('@/lib/contracts/page-queries/PresentationError', () => ({
+  mapToPresentationError: vi.fn(),
+}));
+
+describe('RacesPageQuery', () => {
+  let query: RacesPageQuery;
+  let mockServiceInstance: any;
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    query = new RacesPageQuery();
+    mockServiceInstance = {
+      getRacesPageData: vi.fn(),
+    };
+    (RacesService as any).mockImplementation(function () {
+      return mockServiceInstance;
+    });
+  });
+
+  it('should return view data when service succeeds', async () => {
+    const apiDto = { races: [{ id: 'race-123' }], featured: [{ id: 'race-456' }] };
+    const viewData = { races: [{ id: 'race-123' }], featured: [{ id: 'race-456' }] };
+
+    mockServiceInstance.getRacesPageData.mockResolvedValue(Result.ok(apiDto));
+    (RacesViewDataBuilder.build as any).mockReturnValue(viewData);
+
+    const result = await query.execute();
+
+    expect(result.isOk()).toBe(true);
+    expect(result.unwrap()).toEqual(viewData);
+    expect(RacesService).toHaveBeenCalled();
+    expect(mockServiceInstance.getRacesPageData).toHaveBeenCalled();
+    expect(RacesViewDataBuilder.build).toHaveBeenCalledWith(apiDto);
+  });
+
+  it('should return mapped presentation error when service fails', async () => {
+    const serviceError = { type: 'notFound' };
+    const presentationError = 'notFound';
+
+    mockServiceInstance.getRacesPageData.mockResolvedValue(Result.err(serviceError));
+    (mapToPresentationError as any).mockReturnValue(presentationError);
+
+    const result = await query.execute();
+
+    expect(result.isErr()).toBe(true);
+    expect(result.getError()).toBe(presentationError);
+    expect(mapToPresentationError).toHaveBeenCalledWith(serviceError);
+  });
+
+  it('should return serverError on exception', async () => {
+    mockServiceInstance.getRacesPageData.mockRejectedValue(new Error('Network error'));
+
+    const result = await query.execute();
+
+    expect(result.isErr()).toBe(true);
+    expect(result.getError()).toBe('Network error');
+  });
+
+});

apps/website/lib/page-queries/races/RacesPageQuery.ts

@@ -13,18 +13,23 @@ import { RacesViewDataBuilder } from '@/lib/builders/view-data/RacesViewDataBuil
  */
 export class RacesPageQuery implements PageQuery<RacesViewData, void> {
   async execute(): Promise<Result<RacesViewData, PresentationError>> {
-    // Manual wiring: Service creates its own dependencies
-    const service = new RacesService();
-    
-    // Get races data
-    const result = await service.getRacesPageData();
-    
-    if (result.isErr()) {
-      return Result.err(mapToPresentationError(result.getError()));
+    try {
+      // Manual wiring: Service creates its own dependencies
+      const service = new RacesService();
+      
+      // Get races data
+      const result = await service.getRacesPageData();
+      
+      if (result.isErr()) {
+        return Result.err(mapToPresentationError(result.getError()));
+      }
+      
+      // Transform to ViewData using builder
+      const viewData = RacesViewDataBuilder.build(result.unwrap());
+      return Result.ok(viewData);
+    } catch (error: unknown) {
+      const message = error instanceof Error ? error.message : 'Failed to execute races page query';
+      return Result.err(message as PresentationError);
     }
-    
-    // Transform to ViewData using builder
-    const viewData = RacesViewDataBuilder.build(result.unwrap());
-    return Result.ok(viewData);
   }
 }