From 8a600565dcb099a480749bbee1c9db2184e013ce Mon Sep 17 00:00:00 2001
From: Brendan Chen <me@bchen.dev>
Date: Sun, 6 Apr 2025 11:36:25 -0700
Subject: [PATCH] update shuttle resolvers

---
 src/resolvers/ShuttleResolvers.ts | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/resolvers/ShuttleResolvers.ts b/src/resolvers/ShuttleResolvers.ts
index b264306..3034ca8 100644
--- a/src/resolvers/ShuttleResolvers.ts
+++ b/src/resolvers/ShuttleResolvers.ts
@@ -5,7 +5,11 @@ export const ShuttleResolvers: Resolvers<ServerContext> = {
   Shuttle: {
     eta: async (parent, args, contextValue, info) => {
       if (!args.forStopId) return null;
-      const etaForStopId = await contextValue.shuttleRepository.getEtaForShuttleAndStopId(parent.id, args.forStopId);
+
+      const system = contextValue.findSystemById(parent.systemId);
+      if (!system) return null;
+
+      const etaForStopId = await system.shuttleRepository.getEtaForShuttleAndStopId(parent.id, args.forStopId);
       if (etaForStopId === null) return null;
 
       return {
@@ -16,7 +20,10 @@ export const ShuttleResolvers: Resolvers<ServerContext> = {
       };
     },
     etas: async (parent, args, contextValue, info) => {
-      const etasForShuttle = await contextValue.shuttleRepository.getEtasForShuttleId(parent.id);
+      const system = contextValue.findSystemById(parent.systemId);
+      if (!system) return null;
+
+      const etasForShuttle = await system.shuttleRepository.getEtasForShuttleId(parent.id);
       if (!etasForShuttle) return null;
 
       const computedEtas = await Promise.all(etasForShuttle.map(async ({
@@ -38,7 +45,10 @@ export const ShuttleResolvers: Resolvers<ServerContext> = {
       return [];
     },
     route: async (parent, args, contextValue, info) => {
-      const route = await contextValue.shuttleRepository.getRouteById(parent.routeId);
+      const system = contextValue.findSystemById(parent.systemId);
+      if (!system) return null;
+
+      const route = await system.shuttleRepository.getRouteById(parent.routeId);
       if (route === null) return null;
 
       return {
@@ -46,6 +56,7 @@ export const ShuttleResolvers: Resolvers<ServerContext> = {
         id: route.id,
         name: route.name,
         polylineCoordinates: route.polylineCoordinates,
+        systemId: parent.systemId,
       }
     }
   },