refactor use cases

core/notifications/application/use-cases/NotificationPreferencesUseCases.test.ts

@@ -1,7 +1,7 @@
-import type { Logger, UseCaseOutputPort } from '@core/shared/application';
+import type { Logger } from '@core/shared/application';
 import { Result } from '@core/shared/application/Result';
 import type { ApplicationErrorCode } from '@core/shared/errors/ApplicationErrorCode';
-import { describe, expect, it, vi, type Mock } from 'vitest';
+import { describe, expect, it, vi, type Mock, beforeEach } from 'vitest';
 import type { ChannelPreference, NotificationPreference, TypePreference } from '../../domain/entities/NotificationPreference';
 import type { INotificationPreferenceRepository } from '../../domain/repositories/INotificationPreferenceRepository';
 import type { NotificationChannel, NotificationType } from '../../domain/types/NotificationTypes';
@@ -12,15 +12,10 @@ import {
   UpdateQuietHoursUseCase,
   UpdateTypePreferenceUseCase,
   type GetNotificationPreferencesInput,
-  type GetNotificationPreferencesResult,
   type SetDigestModeCommand,
-  type SetDigestModeResult,
   type UpdateChannelPreferenceCommand,
-  type UpdateChannelPreferenceResult,
   type UpdateQuietHoursCommand,
-  type UpdateQuietHoursResult,
   type UpdateTypePreferenceCommand,
-  type UpdateTypePreferenceResult,
 } from './NotificationPreferencesUseCases';
 
 describe('NotificationPreferencesUseCases', () => {
@@ -30,46 +25,43 @@ describe('NotificationPreferencesUseCases', () => {
   };
   let logger: Logger;
 
-  
-    beforeEach(() => {
-      preferenceRepository = {
-        getOrCreateDefault: vi.fn(),
-        save: vi.fn(),
-      };
-  
-      logger = {
-        debug: vi.fn(),
-        info: vi.fn(),
-        warn: vi.fn(),
-        error: vi.fn(),
-      } as unknown as Logger;
-    });
-  
-    it('GetNotificationPreferencesQuery returns preferences from repository', async () => {
-      const preference = {
-        id: 'pref-1',
-      } as unknown as NotificationPreference;
-  
-      preferenceRepository.getOrCreateDefault.mockResolvedValue(preference);
-  
-      const output: UseCaseOutputPort<GetNotificationPreferencesResult> & { present: Mock } = {
-        present: vi.fn(),
-      } as unknown as UseCaseOutputPort<GetNotificationPreferencesResult> & { present: Mock };
-  
-      const useCase = new GetNotificationPreferencesQuery(
-        preferenceRepository as unknown as INotificationPreferenceRepository,
-        output,
-        logger,
-      );
-  
-      const input: GetNotificationPreferencesInput = { driverId: 'driver-1' };
-      const result = await useCase.execute(input);
-  
-      expect(preferenceRepository.getOrCreateDefault).toHaveBeenCalledWith('driver-1');
-      expect(result).toBeInstanceOf(Result);
-      expect(result.isOk()).toBe(true);
-      expect(output.present).toHaveBeenCalledWith({ preference });
-    });
+  beforeEach(() => {
+    preferenceRepository = {
+      getOrCreateDefault: vi.fn(),
+      save: vi.fn(),
+    };
+
+    logger = {
+      debug: vi.fn(),
+      info: vi.fn(),
+      warn: vi.fn(),
+      error: vi.fn(),
+    } as unknown as Logger;
+  });
+
+  it('GetNotificationPreferencesQuery returns preferences from repository', async () => {
+    const preference = {
+      id: 'pref-1',
+    } as unknown as NotificationPreference;
+
+    preferenceRepository.getOrCreateDefault.mockResolvedValue(preference);
+
+    const useCase = new GetNotificationPreferencesQuery(
+      preferenceRepository as unknown as INotificationPreferenceRepository,
+      logger,
+    );
+
+    const input: GetNotificationPreferencesInput = { driverId: 'driver-1' };
+    const result = await useCase.execute(input);
+
+    expect(preferenceRepository.getOrCreateDefault).toHaveBeenCalledWith('driver-1');
+    expect(result).toBeInstanceOf(Result);
+    expect(result.isOk()).toBe(true);
+    
+    const successResult = result.unwrap();
+    expect(successResult.preference).toEqual(preference);
+  });
+
   it('UpdateChannelPreferenceUseCase updates channel preference', async () => {
     const preference = {
       updateChannel: vi.fn().mockReturnThis(),
@@ -77,13 +69,8 @@ describe('NotificationPreferencesUseCases', () => {
 
     preferenceRepository.getOrCreateDefault.mockResolvedValue(preference);
 
-    const output: UseCaseOutputPort<UpdateChannelPreferenceResult> & { present: Mock } = {
-      present: vi.fn(),
-    } as unknown as UseCaseOutputPort<UpdateChannelPreferenceResult> & { present: Mock };
-
     const useCase = new UpdateChannelPreferenceUseCase(
       preferenceRepository as unknown as INotificationPreferenceRepository,
-      output,
       logger,
     );
 
@@ -98,7 +85,10 @@ describe('NotificationPreferencesUseCases', () => {
     expect(result.isOk()).toBe(true);
     expect(preference.updateChannel).toHaveBeenCalled();
     expect(preferenceRepository.save).toHaveBeenCalledWith(preference);
-    expect(output.present).toHaveBeenCalledWith({ driverId: 'driver-1', channel: 'email' });
+    
+    const successResult = result.unwrap();
+    expect(successResult.driverId).toBe('driver-1');
+    expect(successResult.channel).toBe('email');
   });
 
   it('UpdateTypePreferenceUseCase updates type preference', async () => {
@@ -108,13 +98,8 @@ describe('NotificationPreferencesUseCases', () => {
 
     preferenceRepository.getOrCreateDefault.mockResolvedValue(preference);
 
-    const output: UseCaseOutputPort<UpdateTypePreferenceResult> & { present: Mock } = {
-      present: vi.fn(),
-    } as unknown as UseCaseOutputPort<UpdateTypePreferenceResult> & { present: Mock };
-
     const useCase = new UpdateTypePreferenceUseCase(
       preferenceRepository as unknown as INotificationPreferenceRepository,
-      output,
       logger,
     );
 
@@ -129,7 +114,10 @@ describe('NotificationPreferencesUseCases', () => {
     expect(result.isOk()).toBe(true);
     expect(preference.updateTypePreference).toHaveBeenCalled();
     expect(preferenceRepository.save).toHaveBeenCalledWith(preference);
-    expect(output.present).toHaveBeenCalledWith({ driverId: 'driver-1', type: 'system_announcement' });
+    
+    const successResult = result.unwrap();
+    expect(successResult.driverId).toBe('driver-1');
+    expect(successResult.type).toBe('system_announcement');
   });
 
   it('UpdateQuietHoursUseCase validates hours and updates preferences', async () => {
@@ -139,13 +127,8 @@ describe('NotificationPreferencesUseCases', () => {
 
     preferenceRepository.getOrCreateDefault.mockResolvedValue(preference);
 
-    const output: UseCaseOutputPort<UpdateQuietHoursResult> & { present: Mock } = {
-      present: vi.fn(),
-    } as unknown as UseCaseOutputPort<UpdateQuietHoursResult> & { present: Mock };
-
     const useCase = new UpdateQuietHoursUseCase(
       preferenceRepository as unknown as INotificationPreferenceRepository,
-      output,
       logger,
     );
 
@@ -160,21 +143,16 @@ describe('NotificationPreferencesUseCases', () => {
     expect(result.isOk()).toBe(true);
     expect(preference.updateQuietHours).toHaveBeenCalledWith(22, 7);
     expect(preferenceRepository.save).toHaveBeenCalledWith(preference);
-    expect(output.present).toHaveBeenCalledWith({
-      driverId: 'driver-1',
-      startHour: 22,
-      endHour: 7,
-    });
+    
+    const successResult = result.unwrap();
+    expect(successResult.driverId).toBe('driver-1');
+    expect(successResult.startHour).toBe(22);
+    expect(successResult.endHour).toBe(7);
   });
 
   it('UpdateQuietHoursUseCase returns error on invalid hours', async () => {
-    const output: UseCaseOutputPort<UpdateQuietHoursResult> & { present: Mock } = {
-      present: vi.fn(),
-    } as unknown as UseCaseOutputPort<UpdateQuietHoursResult> & { present: Mock };
-
     const useCase = new UpdateQuietHoursUseCase(
       preferenceRepository as unknown as INotificationPreferenceRepository,
-      output,
       logger,
     );
 
@@ -198,13 +176,8 @@ describe('NotificationPreferencesUseCases', () => {
 
     preferenceRepository.getOrCreateDefault.mockResolvedValue(preference);
 
-    const output: UseCaseOutputPort<SetDigestModeResult> & { present: Mock } = {
-      present: vi.fn(),
-    } as unknown as UseCaseOutputPort<SetDigestModeResult> & { present: Mock };
-
     const useCase = new SetDigestModeUseCase(
       preferenceRepository as unknown as INotificationPreferenceRepository,
-      output,
     );
 
     const command: SetDigestModeCommand = {
@@ -218,21 +191,16 @@ describe('NotificationPreferencesUseCases', () => {
     expect(result.isOk()).toBe(true);
     expect(preference.setDigestMode).toHaveBeenCalledWith(true, 4);
     expect(preferenceRepository.save).toHaveBeenCalledWith(preference);
-    expect(output.present).toHaveBeenCalledWith({
-      driverId: 'driver-1',
-      enabled: true,
-      frequencyHours: 4,
-    });
+    
+    const successResult = result.unwrap();
+    expect(successResult.driverId).toBe('driver-1');
+    expect(successResult.enabled).toBe(true);
+    expect(successResult.frequencyHours).toBe(4);
   });
 
   it('SetDigestModeUseCase returns error on invalid frequency', async () => {
-    const output: UseCaseOutputPort<SetDigestModeResult> & { present: Mock } = {
-      present: vi.fn(),
-    } as unknown as UseCaseOutputPort<SetDigestModeResult> & { present: Mock };
-
     const useCase = new SetDigestModeUseCase(
       preferenceRepository as unknown as INotificationPreferenceRepository,
-      output,
     );
 
     const command: SetDigestModeCommand = {