From 56466964c1f2542a4281428c4761c8d344349df3 Mon Sep 17 00:00:00 2001 From: Brendan Chen Date: Sun, 6 Apr 2025 11:23:27 -0700 Subject: [PATCH] update method calls in TimedApiBasedShuttleRepositoryLoader --- src/loaders/TimedApiBasedShuttleRepositoryLoader.ts | 9 ++++----- .../TimedApiBasedShuttleRepositoryLoaderTests.test.ts | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/loaders/TimedApiBasedShuttleRepositoryLoader.ts b/src/loaders/TimedApiBasedShuttleRepositoryLoader.ts index 91847a5..151c218 100644 --- a/src/loaders/TimedApiBasedShuttleRepositoryLoader.ts +++ b/src/loaders/TimedApiBasedShuttleRepositoryLoader.ts @@ -47,15 +47,14 @@ export class TimedApiBasedShuttleRepositoryLoader extends ApiBasedShuttleReposit if (!this.shouldBeRunning) return; try { - await this.fetchAndUpdateSystemData(); - await this.fetchAndUpdateRouteDataForExistingSystemInRepository(); - await this.fetchAndUpdateStopAndPolylineDataForRoutesInExistingSystemInRepository(); - await this.fetchAndUpdateShuttleDataForExistingSystemInRepository(); + await this.fetchAndUpdateRouteDataForSystem(); + await this.fetchAndUpdateStopAndPolylineDataForRoutesInSystem(); + await this.fetchAndUpdateShuttleDataForSystem(); // Because ETA method doesn't support pruning yet, // add a call to the clear method here await this.repository.clearEtaData(); - await this.fetchAndUpdateEtaDataForExistingStopsForSystemInRepository(); + await this.fetchAndUpdateEtaDataForExistingStopsForSystem(); } catch (e) { console.error(e); } diff --git a/test/loaders/TimedApiBasedShuttleRepositoryLoaderTests.test.ts b/test/loaders/TimedApiBasedShuttleRepositoryLoaderTests.test.ts index f6c27f5..0ee8537 100644 --- a/test/loaders/TimedApiBasedShuttleRepositoryLoaderTests.test.ts +++ b/test/loaders/TimedApiBasedShuttleRepositoryLoaderTests.test.ts @@ -18,11 +18,10 @@ describe("TimedApiBasedRepositoryLoader", () => { loader = new TimedApiBasedShuttleRepositoryLoader("1", new UnoptimizedInMemoryShuttleRepository()); spies = { - fetchAndUpdateSystemData: jest.spyOn(loader, 'fetchAndUpdateSystemData'), - fetchAndUpdateRouteDataForExistingSystemsInRepository: jest.spyOn(loader, 'fetchAndUpdateRouteDataForExistingSystemInRepository'), - fetchAndUpdateStopAndPolylineDataForRoutesInExistingSystemsInRepository: jest.spyOn(loader, 'fetchAndUpdateStopAndPolylineDataForRoutesInExistingSystemInRepository'), - fetchAndUpdateShuttleDataForExistingSystemsInRepository: jest.spyOn(loader, 'fetchAndUpdateShuttleDataForExistingSystemInRepository'), - fetchAndUpdateEtaDataForExistingStopsForSystemsInRepository: jest.spyOn(loader, 'fetchAndUpdateEtaDataForExistingStopsForSystemInRepository') + fetchAndUpdateRouteDataForSystem: jest.spyOn(loader, 'fetchAndUpdateRouteDataForSystem'), + fetchAndUpdateStopAndPolylineDataForRoutesInSystem: jest.spyOn(loader, 'fetchAndUpdateStopAndPolylineDataForRoutesInSystem'), + fetchAndUpdateShuttleDataForSystem: jest.spyOn(loader, 'fetchAndUpdateShuttleDataForSystem'), + fetchAndUpdateEtaDataForExistingStopsForSystem: jest.spyOn(loader, 'fetchAndUpdateEtaDataForExistingStopsForSystem') }; Object.values(spies).forEach((spy: any) => {