di usage in website

apps/website/app/leagues/[id]/schedule/admin/page.test.tsx

@@ -1,8 +1,14 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { render, screen, fireEvent, waitFor, cleanup } from '@testing-library/react';
+import '@testing-library/jest-dom';
 
 import LeagueAdminSchedulePage from './page';
 
+// Mock useEffectiveDriverId
+vi.mock('@/hooks/useEffectiveDriverId', () => ({
+  useEffectiveDriverId: () => 'driver-1',
+}));
+
 type SeasonSummaryViewModel = {
   seasonId: string;
   name: string;
@@ -82,8 +88,42 @@ const mockServices = {
   },
 };
 
-vi.mock('@/lib/services/ServiceProvider', () => ({
-  useServices: () => mockServices,
+// Mock useInject to return mocked services
+vi.mock('@/lib/di/hooks/useInject', () => ({
+  useInject: (token: symbol) => {
+    const tokenStr = token.toString();
+    if (tokenStr.includes('LEAGUE_SERVICE_TOKEN')) {
+      return {
+        getLeagueSeasonSummaries: mockGetLeagueSeasonSummaries,
+        getAdminSchedule: mockGetAdminSchedule,
+        publishAdminSchedule: mockPublishAdminSchedule,
+        unpublishAdminSchedule: mockUnpublishAdminSchedule,
+        createAdminScheduleRace: mockCreateAdminScheduleRace,
+        updateAdminScheduleRace: mockUpdateAdminScheduleRace,
+        deleteAdminScheduleRace: mockDeleteAdminScheduleRace,
+      };
+    }
+    if (tokenStr.includes('LEAGUE_MEMBERSHIP_SERVICE_TOKEN')) {
+      return {
+        fetchLeagueMemberships: mockFetchLeagueMemberships,
+        getMembership: mockGetMembership,
+      };
+    }
+    return {};
+  },
+}));
+
+// Mock the static LeagueMembershipService for LeagueMembershipUtility
+vi.mock('@/lib/services/leagues/LeagueMembershipService', () => ({
+  LeagueMembershipService: {
+    getMembership: mockGetMembership,
+    fetchLeagueMemberships: mockFetchLeagueMemberships,
+    setLeagueMemberships: vi.fn(),
+    clearLeagueMemberships: vi.fn(),
+    getCachedMembershipsIterator: vi.fn(() => [][Symbol.iterator]()),
+    getAllMembershipsForDriver: vi.fn(() => []),
+    getLeagueMembers: vi.fn(() => []),
+  },
 }));
 
 function createAdminScheduleViewModel(overrides: Partial<AdminScheduleViewModel> = {}): AdminScheduleViewModel {
@@ -114,6 +154,7 @@ describe('LeagueAdminSchedulePage', () => {
     mockFetchLeagueMemberships.mockReset();
     mockGetMembership.mockReset();
 
+    // Set up default mock implementations
     mockFetchLeagueMemberships.mockResolvedValue([]);
     mockGetMembership.mockReturnValue({ role: 'admin' });
   });

apps/website/app/leagues/[id]/schedule/admin/page.tsx

@@ -4,7 +4,8 @@ import Card from '@/components/ui/Card';
 import { useEffectiveDriverId } from '@/hooks/useEffectiveDriverId';
 import type { LeagueAdminScheduleViewModel } from '@/lib/view-models/LeagueAdminScheduleViewModel';
 import type { LeagueSeasonSummaryViewModel } from '@/lib/view-models/LeagueSeasonSummaryViewModel';
-import { useServices } from '@/lib/services/ServiceProvider';
+import { useInject } from '@/lib/di/hooks/useInject';
+import { LEAGUE_SERVICE_TOKEN, LEAGUE_MEMBERSHIP_SERVICE_TOKEN } from '@/lib/di/tokens';
 import { LeagueRoleUtility } from '@/lib/utilities/LeagueRoleUtility';
 import { useParams } from 'next/navigation';
 import { useEffect, useMemo, useState } from 'react';
@@ -14,7 +15,8 @@ export default function LeagueAdminSchedulePage() {
   const leagueId = params.id as string;
 
   const currentDriverId = useEffectiveDriverId();
-  const { leagueService, leagueMembershipService } = useServices();
+  const leagueService = useInject(LEAGUE_SERVICE_TOKEN);
+  const leagueMembershipService = useInject(LEAGUE_MEMBERSHIP_SERVICE_TOKEN);
 
   const [isAdmin, setIsAdmin] = useState(false);
   const [membershipLoading, setMembershipLoading] = useState(true);