website refactor

apps/website/hooks/driver/index.ts

@@ -1,6 +0,0 @@
-export { useCurrentDriver } from './useCurrentDriver';
-export { useDriverLeaderboard } from '@/lib/hooks/useDriverLeaderboard';
-export { useDriverProfile } from './useDriverProfile';
-export { useUpdateDriverProfile } from './useUpdateDriverProfile';
-export { useCreateDriver } from './useCreateDriver';
-export { useFindDriverById } from './useFindDriverById';

apps/website/hooks/driver/useCurrentDriver.ts

@@ -3,17 +3,22 @@ import { useInject } from '@/lib/di/hooks/useInject';
 import { DRIVER_SERVICE_TOKEN } from '@/lib/di/tokens';
 import { enhanceQueryResult } from '@/lib/di/hooks/useReactQueryWithApiError';
 import { ApiError } from '@/lib/api/base/ApiError';
-
-type DriverData = any; // Replace with actual type
+import type { DriverDTO } from '@/lib/types/generated/DriverDTO';
 
 export function useCurrentDriver(
-  options?: Omit<UseQueryOptions<DriverData, ApiError>, 'queryKey' | 'queryFn'>
+  options?: Omit<UseQueryOptions<DriverDTO | null, ApiError>, 'queryKey' | 'queryFn'>
 ) {
   const driverService = useInject(DRIVER_SERVICE_TOKEN);
 
   const queryResult = useQuery({
     queryKey: ['currentDriver'],
-    queryFn: () => driverService.getCurrentDriver(),
+    queryFn: async () => {
+      const result = await driverService.getCurrentDriver();
+      if (result.isErr()) {
+        throw result.getError();
+      }
+      return result.unwrap();
+    },
     ...options,
   });
 

apps/website/hooks/driver/useDriverProfile.ts

@@ -3,7 +3,7 @@ import { useInject } from '@/lib/di/hooks/useInject';
 import { DRIVER_SERVICE_TOKEN } from '@/lib/di/tokens';
 import { enhanceQueryResult } from '@/lib/di/hooks/useReactQueryWithApiError';
 import { ApiError } from '@/lib/api/base/ApiError';
-import { DriverProfileViewModel } from '@/lib/view-models/DriverProfileViewModel';
+import { DriverProfileViewModel, type DriverProfileViewModelData } from '@/lib/view-models/DriverProfileViewModel';
 
 export function useDriverProfile(
   driverId: string,
@@ -13,10 +13,17 @@ export function useDriverProfile(
 
   const queryResult = useQuery({
     queryKey: ['driverProfile', driverId],
-    queryFn: () => driverService.getDriverProfile(driverId),
+    queryFn: async () => {
+      const result = await driverService.getDriverProfile(driverId);
+      if (result.isErr()) {
+        const error = result.getError();
+        throw new ApiError(error.message, 'SERVER_ERROR', { timestamp: new globalThis.Date().toISOString() });
+      }
+      return new DriverProfileViewModel(result.unwrap() as unknown as DriverProfileViewModelData);
+    },
     enabled: !!driverId,
     ...options,
   });
 
   return enhanceQueryResult(queryResult);
-}
+}

apps/website/hooks/driver/useFindDriverById.ts

@@ -13,10 +13,17 @@ export function useFindDriverById(
 
   const queryResult = useQuery({
     queryKey: ['driver', driverId],
-    queryFn: () => driverService.findById(driverId),
+    queryFn: async () => {
+      const result = await driverService.findById(driverId);
+      if (result.isErr()) {
+        const error = result.getError();
+        throw new ApiError(error.message, 'SERVER_ERROR', { timestamp: new Date().toISOString() });
+      }
+      return result.unwrap();
+    },
     enabled: !!driverId,
     ...options,
   });
 
   return enhanceQueryResult(queryResult);
-}
+}