resolve merge conflict

2026-08-29 23:28:11 +00:00 · 2026-07-09 03:39:06 +00:00
parent ddddcfb71f 1b9ac42ed3
commit 305d35b2de
174 changed files with 8297 additions and 3001 deletions
--- a/apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.service.spec.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.service.spec.ts
@@ -156,6 +156,7 @@ describe('TrainSchedulingService', () => {
      {
        autoArriveAtFinalYard: jest.fn().mockResolvedValue([]),
      } as never, // bookingJourneyService
+      { dispatched: jest.fn(), arrived: jest.fn() } as never, // bookingNotifier
    );

    const defaultFleetWagons = [