From 3f267be15453dc144466d1d64b92419ecc80f9ff Mon Sep 17 00:00:00 2001 From: Brendan Chen Date: Thu, 13 Nov 2025 16:41:51 -0800 Subject: [PATCH] Add test for previous day fallback calculation --- ...lfUpdatingETARepositorySharedTests.test.ts | 62 ++++++++++++++++--- 1 file changed, 55 insertions(+), 7 deletions(-) diff --git a/src/repositories/shuttle/eta/__tests__/SelfUpdatingETARepositorySharedTests.test.ts b/src/repositories/shuttle/eta/__tests__/SelfUpdatingETARepositorySharedTests.test.ts index 539b35b..df1dfc7 100644 --- a/src/repositories/shuttle/eta/__tests__/SelfUpdatingETARepositorySharedTests.test.ts +++ b/src/repositories/shuttle/eta/__tests__/SelfUpdatingETARepositorySharedTests.test.ts @@ -8,6 +8,7 @@ import { RedisShuttleRepository } from "../../RedisShuttleRepository"; import { UnoptimizedInMemoryShuttleRepository } from "../../UnoptimizedInMemoryShuttleRepository"; import { setupRouteAndOrderedStopsForShuttleRepository } from "../../../../../testHelpers/setupRouteAndOrderedStopsForShuttleRepository"; import { ShuttleGetterSetterRepository } from "../../ShuttleGetterSetterRepository"; +import { IRoute, IStop } from "../../../../entities/ShuttleRepositoryEntities"; class RedisSelfUpdatingETARepositoryHolder implements RepositoryHolder { repo: RedisSelfUpdatingETARepository | undefined; @@ -20,6 +21,7 @@ class RedisSelfUpdatingETARepositoryHolder implements RepositoryHolder { }); expect(travelTime).toEqual(15 * 60); }); + }); - describe("handleShuttleUpdate", () =>{ + describe("handleShuttleUpdate", () => { test("adds an ETA entry based on historical data", async () => { const { route, systemId, stop1, stop2 } = await setupRouteAndOrderedStops(); + const firstStopLastWeekArrivalTime = new Date(2025, 0, 1, 12, 0, 0); + const secondStopLastWeekArrivalTime = new Date(2025, 0, 1, 12, 15, 0); const shuttleSecondArrivalTimeAtFirstStop = new Date(2025, 0, 8, 12, 0, 0); const currentTime = new Date(shuttleSecondArrivalTimeAtFirstStop.getTime() + 7 * 60 * 1000); - // "current time" is 7 minutes past arrival, expected eta = 8 minutes - repository.setReferenceTime(currentTime); + + repository.setReferenceTime(currentTime); repository.startListeningForUpdates(); const shuttle = { @@ -131,23 +136,66 @@ describe.each(repositoryImplementations)('$name', (holder) => { updatedTime: new Date(), }; - const firstStopLastWeekArrivalTime = new Date(2025, 0, 1, 12, 0, 0); await shuttleRepository.addOrUpdateShuttle(shuttle, firstStopLastWeekArrivalTime.getTime()); shuttle.coordinates = stop2.coordinates; - const secondStopLastWeekArrivalTime = new Date(2025, 0, 1, 12, 15, 0); await shuttleRepository.addOrUpdateShuttle(shuttle, secondStopLastWeekArrivalTime.getTime()); shuttle.coordinates = stop1.coordinates; await shuttleRepository.addOrUpdateShuttle( shuttle, - shuttleSecondArrivalTimeAtFirstStop.getTime(), + shuttleSecondArrivalTimeAtFirstStop.getTime() ); shuttle.coordinates = { latitude: 12.5, longitude: 22.5 }; await shuttleRepository.addOrUpdateShuttle( shuttle, - currentTime.getTime(), + currentTime.getTime() + ); + + await new Promise((resolve) => setTimeout(resolve, 1000)); + + const eta = await repository.getEtaForShuttleAndStopId(shuttle.id, stop2.id); + expect(eta?.secondsRemaining).toEqual(8 * 60); + + }, 60000); + + test("uses previous day fallback calculation when no data available from one week ago", async () => { + const { route, systemId, stop1, stop2 } = await setupRouteAndOrderedStops(); + + const firstStopLastWeekArrivalTime = new Date(2025, 0, 1, 12, 0, 0); + const secondStopLastWeekArrivalTime = new Date(2025, 0, 1, 12, 15, 0); + const shuttleSecondArrivalTimeAtFirstStop = new Date(2025, 0, 2, 12, 0, 0); + const currentTime = new Date(shuttleSecondArrivalTimeAtFirstStop.getTime() + 7 * 60 * 1000); + + repository.setReferenceTime(currentTime); + repository.startListeningForUpdates(); + + const shuttle = { + id: "sh1", + name: "Shuttle 1", + routeId: route.id, + systemId: systemId, + coordinates: stop1.coordinates, + orientationInDegrees: 0, + updatedTime: new Date(), + }; + + await shuttleRepository.addOrUpdateShuttle(shuttle, firstStopLastWeekArrivalTime.getTime()); + + shuttle.coordinates = stop2.coordinates; + await shuttleRepository.addOrUpdateShuttle(shuttle, secondStopLastWeekArrivalTime.getTime()); + + shuttle.coordinates = stop1.coordinates; + await shuttleRepository.addOrUpdateShuttle( + shuttle, + shuttleSecondArrivalTimeAtFirstStop.getTime() + ); + + shuttle.coordinates = { latitude: 12.5, longitude: 22.5 }; + await shuttleRepository.addOrUpdateShuttle( + shuttle, + currentTime.getTime() ); await new Promise((resolve) => setTimeout(resolve, 1000));