diff --git a/src/resolvers/OrderedStopResolvers.ts b/src/resolvers/OrderedStopResolvers.ts index 0410e46..c29de5f 100644 --- a/src/resolvers/OrderedStopResolvers.ts +++ b/src/resolvers/OrderedStopResolvers.ts @@ -24,6 +24,7 @@ export const OrderedStopResolvers: Resolvers = { routeId: parent.routeId, stopId: nextOrderedStopObject.id, systemId: system.id, + updatedTimeMs: nextOrderedStopObject.updatedTimeMs } }, previousStop: async (parent, args, contextValue, _info): Promise => { @@ -47,6 +48,7 @@ export const OrderedStopResolvers: Resolvers = { routeId: parent.routeId, stopId: previousOrderedStopObject.id, systemId: system.id, + updatedTimeMs: previousOrderedStopObject.updatedTimeMs, } }, stop: async (parent, args, contextValue, _info) => { diff --git a/src/resolvers/RouteResolvers.ts b/src/resolvers/RouteResolvers.ts index aa29fdc..732c70e 100644 --- a/src/resolvers/RouteResolvers.ts +++ b/src/resolvers/RouteResolvers.ts @@ -13,7 +13,8 @@ export const RouteResolvers: Resolvers = { coordinates, name, id, - orientationInDegrees + orientationInDegrees, + updatedTimeMs }) => ({ coordinates: coordinates as Coordinates, name, @@ -22,6 +23,7 @@ export const RouteResolvers: Resolvers = { id, orientationInDegrees, systemId: parent.systemId, + updatedTimeMs, })); }, orderedStop: async (parent, args, contextValue, info) => { @@ -41,6 +43,7 @@ export const RouteResolvers: Resolvers = { routeId: parent.id, route: parent, systemId: system.id, + updatedTimeMs: orderedStop.updatedTimeMs, } }, }, diff --git a/src/resolvers/ShuttleResolvers.ts b/src/resolvers/ShuttleResolvers.ts index 103e40f..92cb62c 100644 --- a/src/resolvers/ShuttleResolvers.ts +++ b/src/resolvers/ShuttleResolvers.ts @@ -18,6 +18,7 @@ export const ShuttleResolvers: Resolvers = { shuttleId: parent.id, shuttle: parent, systemId: system.id, + updatedTimeMs: etaForStopId.updatedTimeMs, }; }, etas: async (parent, args, contextValue, info) => { @@ -27,17 +28,20 @@ export const ShuttleResolvers: Resolvers = { const etasForShuttle = await system.shuttleRepository.getEtasForShuttleId(parent.id); if (!etasForShuttle) return null; - const computedEtas = await Promise.all(etasForShuttle.map(async ({ - secondsRemaining, - stopId, - }): Promise => { - return { + const computedEtas = await Promise.all( + etasForShuttle.map(async ({ secondsRemaining, stopId, - shuttle: parent, - shuttleId: parent.id, - systemId: system.id, - } + updatedTimeMs + }): Promise => { + return { + secondsRemaining, + stopId, + shuttle: parent, + shuttleId: parent.id, + systemId: system.id, + updatedTimeMs, + } })); if (computedEtas.every((eta) => eta !== null)) { @@ -59,6 +63,7 @@ export const ShuttleResolvers: Resolvers = { name: route.name, polylineCoordinates: route.polylineCoordinates, systemId: system.id, + updatedTimeMs: route.updatedTimeMs } } }, diff --git a/src/resolvers/SystemResolvers.ts b/src/resolvers/SystemResolvers.ts index dc10fe9..e48e45f 100644 --- a/src/resolvers/SystemResolvers.ts +++ b/src/resolvers/SystemResolvers.ts @@ -36,6 +36,7 @@ export const SystemResolvers: Resolvers = { name: stop.name, coordinates: stop.coordinates as Coordinates, systemId: parent.id, + updatedTimeMs: stop.updatedTimeMs, }; }, route: async (parent, args, contextValue, _info) => { @@ -55,6 +56,7 @@ export const SystemResolvers: Resolvers = { name: route.name, polylineCoordinates: route.polylineCoordinates as Coordinates[], systemId: parent.id, + updatedTimeMs: route.updatedTimeMs, }; }, shuttle: async (parent, args, contextValue, _info) => {