Merge branch 'main' of ssh://gitea.bchen.dev:2222/brendan/project-inter-server

claude/apollo-router-migration-research-y8oVn

.github/workflows/deploy-coolify.yml

@@ -0,0 +1,47 @@
+name: "Deploy to Coolify"
+
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Check out repository
+      uses: actions/checkout@v3
+      with:
+        submodules: recursive
+
+    - name: Login to Gitea Container Registry
+      uses: docker/login-action@v4
+      with:
+        registry: gitea.bchen.dev
+        username: ${{ github.actor }}
+        password: ${{ secrets.PAT }}
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v4
+
+    - name: Build and push
+      uses: docker/build-push-action@v7
+      with:
+        context: .
+        push: true
+        tags: gitea.bchen.dev/${{ github.actor }}/project-inter-server:latest
+
+    - name: Set up Tailscale
+      uses: tailscale/github-action@v4
+      with:
+        oauth-client-id: ${{ secrets.TS_OAUTH_CLIENT_ID }}
+        oauth-secret: ${{ secrets.TS_OAUTH_SECRET }}
+        tags: tag:ci
+        use-cache: false
+        tailscaled-args: --tun=userspace-networking --socks5-server=localhost:1055 --outbound-http-proxy-listen=localhost:1055
+
+    - name: Deploy to Coolify
+      run: |
+        curl --request POST '${{ secrets.COOLIFY_WEBHOOK }}' --header 'Authorization: Bearer ${{ secrets.COOLIFY_TOKEN }}'

.github/workflows/deploy.yml

@@ -1,60 +0,0 @@
-name: "Deploy to birb co."
-
-on:
-  push:
-    branches:
-      - main
-  workflow_dispatch:
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Check out repository
-      uses: actions/checkout@v3
-
-    # See documentation: https://github.com/tailscale/github-action?tab=readme-ov-file
-    - name: Connect to Tailscale
-      uses: tailscale/github-action@v4
-      with:
-        oauth-client-id: ${{ secrets.TS_OAUTH_CLIENT_ID }}
-        oauth-secret: ${{ secrets.TS_OAUTH_CLIENT_SECRET }}
-        tags: tag:ci
-
-    - name: Set up SSH key
-      run: |
-        mkdir -p ~/.ssh
-        echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_ed25519
-        chmod 600 ~/.ssh/id_ed25519
-        ssh-keyscan ${{ vars.HOST }} >> ~/.ssh/known_hosts
-
-    - name: Remove directory from server
-      run: |
-        ssh -i ~/.ssh/id_ed25519 ${{ vars.USERNAME }}@${{ vars.HOST }} << 'EOF'
-          rm -rf ~/${{ vars.DIRECTORY_NAME }}
-        EOF
-
-    # Avoid needing to set up SSH access to GitHub for this user
-    - name: Transfer repository files to server
-      run: |
-        scp -i ~/.ssh/id_ed25519 -r ./* ${{ vars.USERNAME }}@${{ vars.HOST }}:~/${{ vars.DIRECTORY_NAME }}
-
-    - name: Deploy on server with Docker
-      run: |
-        ssh -i ~/.ssh/id_ed25519 ${{ vars.USERNAME }}@${{ vars.HOST }} << 'EOF'
-          cd ~/${{ vars.DIRECTORY_NAME }}
-          export APNS_IS_PRODUCTION=${{ secrets.APNS_IS_PRODUCTION }}
-          export APNS_BUNDLE_ID=${{ secrets.APNS_BUNDLE_ID }}
-          export APNS_TEAM_ID=${{ secrets.APNS_TEAM_ID }}
-          export APNS_KEY_ID=${{ secrets.APNS_KEY_ID }}
-          export APNS_PRIVATE_KEY=${{ secrets.APNS_PRIVATE_KEY }}
-          export PARKING_LOGGING_INTERVAL_MS=${{ secrets.PARKING_LOGGING_INTERVAL_MS }}
-          export RATE_LIMITS_DISABLED=${{ secrets.RATE_LIMITS_DISABLED }}
-          export RATE_LIMIT_WINDOW_MS=${{ secrets.RATE_LIMIT_WINDOW_MS }}
-          export RATE_LIMIT_DELAY_AFTER_REQUESTS=${{ secrets.RATE_LIMIT_DELAY_AFTER_REQUESTS }}
-          export RATE_LIMIT_DELAY_MULTIPLIER_MS=${{ secrets.RATE_LIMIT_DELAY_MULTIPLIER_MS }}
-          export DOCKER_HOST=unix://$XDG_RUNTIME_DIR/docker.sock
-          docker compose -f docker-compose.prod.yml down --remove-orphans
-          docker compose -f docker-compose.prod.yml up -d --build
-        EOF

AGENTS.md

@@ -0,0 +1,103 @@
+# CLAUDE.md
+
+This file provides guidance to all agents when working with code in this repository.
+
+## Development Commands
+
+### Core Development
+
+```bash
+# Start development server with hot reloading
+docker compose run dev
+
+# Run comprehensive test suite
+docker compose run test
+
+# Generate GraphQL TypeScript types
+npm run generate
+
+# Build for development (install, codegen, tsc)
+npm run build:dev
+```
+
+Only use Docker Compose for running tests, and only use `docker compose run test`
+to run tests; don't try to run tests for individual files.
+
+## Architecture Overview
+
+Project Inter Server is a GraphQL-based backend for college transit tracking with real-time shuttle data, parking availability, and push notifications.
+
+- InterchangeSystem: Central orchestrator for shuttles, parking, and notifications
+    - Use `InterchangeSystem.build()` in production
+    - Use `InterchangeSystem.buildForTesting()` in tests
+
+- Repository Pattern (data access abstraction)
+    - Shuttle: `UnoptimizedInMemoryShuttleRepository`
+    - Parking: `InMemoryParkingRepository`
+    - Notifications: `RedisNotificationRepository` (prod) / `InMemoryNotificationRepository` (test)
+
+- Data Loaders (external API integration)
+    - `ApiBasedShuttleRepositoryLoader` – Passio GO! API
+    - `ChapmanApiBasedParkingRepositoryLoader` – Parking data
+    - `TimedApiBasedRepositoryLoader` – Periodic refresh wrapper
+
+- Notification System
+    - `ETANotificationScheduler` – Shuttle arrival notifications
+    - `AppleNotificationSender` – APNS integration
+
+## GraphQL
+
+- Schema definition: `schema.graphqls`
+- Generated types: `src/generated/`
+- Resolvers: `src/resolvers/`
+- Resolver merge: `src/MergedResolvers.ts`
+
+## Directory Structure
+
+- `src/entities/` – Core business logic
+- `src/repositories/` – Data access layer
+- `src/loaders/` – External API integrations
+- `src/notifications/` – Push notification system
+- `src/resolvers/` – GraphQL resolvers and tests
+- `testHelpers/` – Test utilities and mock data
+
+## Docker Services
+
+- `dev` – Development server with hot reload
+- `test` – Unit/integration tests
+- `redis` – Persistent Redis
+- `redis-no-persistence` – Ephemeral Redis for tests
+
+## Testing Patterns
+
+- Prefer `buildForTesting()` to construct systems in tests.
+- Mock external APIs using JSON snapshots under `testHelpers/jsonSnapshots`.
+- Use in-memory repositories for speed where possible.
+- When adding features that affect API output, add focused resolver tests in the corresponding `src/resolvers/__tests__` file.
+    - Separate unit tests from integration tests where practical to keep feedback fast and failures well-scoped.
+
+## Development Guidelines
+
+### General Guidelines
+
+- Use test-driven development where possible. Write tests before implementation and run them before and after changes.
+- Use Docker Compose for tests. Run `docker compose run test` so you can see full output.
+
+### Git Workflow
+
+- Name pull requests after their branch name.
+
+### Code Style
+
+- Prefer arrow functions, especially within classes.
+- Keep changes minimal and focused; avoid unrelated refactors. Mention incidental issues separately.
+- Respect existing interfaces and types; use non-destructive edits.
+
+### Agent Tips
+
+- Write or update tests alongside changes; validate with `docker compose run test`.
+- When touching GraphQL resolvers, co-locate new tests in `src/resolvers/__tests__`.
+
+## Multi-tenant Support
+
+Currently supports Chapman University (Passio System ID: `263`). Each university system uses isolated repositories and configuration. New systems should be added via `InterchangeSystem` configuration and appropriate loaders.

CLAUDE.md

@@ -1,93 +1 @@
-# CLAUDE.md
-
-This file provides guidance to Claude Code when working with code in this repository.
-
-## Development Commands
-
-### Core Development
-```bash
-# Start development server with hot reloading
-docker compose run dev
-
-# Run comprehensive test suite
-docker compose run test
-
-# Generate GraphQL TypeScript types
-npm run generate
-
-# Build for development (install, codegen, tsc)
-npm run build:dev
-```
-
-Only use Docker Compose for running tests, and only use `docker compose run test`
-to run tests; don't try to run tests for individual files.
-
-## Architecture Overview
-
-Project Inter Server is a GraphQL-based backend for college transit tracking with real-time shuttle data, parking availability, and push notifications.
-
-- InterchangeSystem: Central orchestrator for shuttles, parking, and notifications
-  - Use `InterchangeSystem.build()` in production
-  - Use `InterchangeSystem.buildForTesting()` in tests
-
-- Repository Pattern (data access abstraction)
-  - Shuttle: `UnoptimizedInMemoryShuttleRepository`
-  - Parking: `InMemoryParkingRepository`
-  - Notifications: `RedisNotificationRepository` (prod) / `InMemoryNotificationRepository` (test)
-
-- Data Loaders (external API integration)
-  - `ApiBasedShuttleRepositoryLoader` – Passio GO! API
-  - `ChapmanApiBasedParkingRepositoryLoader` – Parking data
-  - `TimedApiBasedRepositoryLoader` – Periodic refresh wrapper
-
-- Notification System
-  - `ETANotificationScheduler` – Shuttle arrival notifications
-  - `AppleNotificationSender` – APNS integration
-
-## GraphQL
-- Schema definition: `schema.graphqls`
-- Generated types: `src/generated/`
-- Resolvers: `src/resolvers/`
-- Resolver merge: `src/MergedResolvers.ts`
-
-## Directory Structure
-- `src/entities/` – Core business logic
-- `src/repositories/` – Data access layer
-- `src/loaders/` – External API integrations
-- `src/notifications/` – Push notification system
-- `src/resolvers/` – GraphQL resolvers and tests
-- `testHelpers/` – Test utilities and mock data
-
-## Docker Services
-- `dev` – Development server with hot reload
-- `test` – Unit/integration tests
-- `redis` – Persistent Redis
-- `redis-no-persistence` – Ephemeral Redis for tests
-
-## Testing Patterns
-- Prefer `buildForTesting()` to construct systems in tests.
-- Mock external APIs using JSON snapshots under `testHelpers/jsonSnapshots`.
-- Use in-memory repositories for speed where possible.
-- When adding features that affect API output, add focused resolver tests in the corresponding `src/resolvers/__tests__` file.
- - Separate unit tests from integration tests where practical to keep feedback fast and failures well-scoped.
-
-## Development Guidelines
-
-### General Guidelines
-- Use test-driven development where possible. Write tests before implementation and run them before and after changes.
-- Use Docker Compose for tests. Run `docker compose run test` so you can see full output.
-
-### Git Workflow
-- Name pull requests after their branch name.
-
-### Code Style
-- Prefer arrow functions, especially within classes.
-- Keep changes minimal and focused; avoid unrelated refactors. Mention incidental issues separately.
-- Respect existing interfaces and types; use non-destructive edits.
-
-### Agent Tips
-- Write or update tests alongside changes; validate with `docker compose run test`.
-- When touching GraphQL resolvers, co-locate new tests in `src/resolvers/__tests__`.
-
-## Multi-tenant Support
-Currently supports Chapman University (Passio System ID: `263`). Each university system uses isolated repositories and configuration. New systems should be added via `InterchangeSystem` configuration and appropriate loaders.
+See AGENTS.md

Dockerfile

@@ -1,4 +1,7 @@
 FROM node:22-alpine
 WORKDIR /usr/src/app
 COPY . .
+RUN npm run build
 EXPOSE 4000
+
+CMD ["npm", "run", "start"]

package.json

@@ -7,7 +7,7 @@
     "build:dev": "npm install --include=dev && npm run generate && tsc --project tsconfig.build.json",
     "build": "npm install --include=dev && npm run generate && tsc --project tsconfig.build.json && npm prune --omit=dev",
     "start:dev": "npm run build:dev && node ./dist/index.js",
-    "start": "npm run build && node ./dist/index.js",
+    "start": "node ./dist/index.js",
     "generate": "graphql-codegen --config codegen.ts",
     "test": "npm run build:dev && jest --runInBand"
   },
@@ -26,12 +26,12 @@
   },
   "private": true,
   "dependencies": {
-    "@apollo/server": "^4.11.2",
+    "@apollo/server": "^5.0.0",
     "@as-integrations/express5": "^1.1.2",
     "express": "^5.1.0",
     "express-rate-limit": "^8.0.1",
     "express-slow-down": "^3.0.0",
-    "graphql": "^16.10.0",
+    "graphql": "^16.11.0",
     "jsonwebtoken": "^9.0.2",
     "redis": "^4.7.0"
   },

src/entities/InterchangeSystem.ts

@@ -91,7 +91,7 @@ export class InterchangeSystem {
     );
     notificationScheduler.startListeningForUpdates();
 
-    let { parkingRepository, timedParkingLoader } = await InterchangeSystem.buildRedisParkingLoaderAndRepository(args.parkingSystemId, args.id);
+    let { parkingRepository, timedParkingLoader } = await InterchangeSystem.buildRedisParkingLoaderAndRepository(args.parkingSystemId);
     timedParkingLoader?.start();
 
     return new InterchangeSystem(
@@ -145,7 +145,7 @@ export class InterchangeSystem {
     shuttleRepository: ShuttleGetterRepository,
     args: InterchangeSystemBuilderArguments
   ) {
-    const notificationRepository = new RedisNotificationRepository(undefined, args.id);
+    const notificationRepository = new RedisNotificationRepository();
     await notificationRepository.connect();
     const notificationScheduler = new ETANotificationScheduler(
       etaRepository,
@@ -157,12 +157,12 @@ export class InterchangeSystem {
     return { notificationScheduler, notificationRepository };
   }
 
-  private static async buildRedisParkingLoaderAndRepository(id?: string, systemId: string = '') {
+  private static async buildRedisParkingLoaderAndRepository(id?: string) {
     if (id === undefined) {
       return { parkingRepository: null, timedParkingLoader: null };
     }
 
-    let parkingRepository: RedisParkingRepository | null = new RedisParkingRepository(undefined, systemId);
+    let parkingRepository: RedisParkingRepository | null = new RedisParkingRepository();
     await parkingRepository.connect();
 
     const loaderBuilderArguments: ParkingRepositoryLoaderBuilderArguments = {

src/repositories/BaseRedisRepository.ts

@@ -4,23 +4,17 @@ import createRedisClientForRepository from '../helpers/createRedisClientForRepos
 
 export abstract class BaseRedisRepository extends EventEmitter {
   protected redisClient;
-  protected readonly systemId: string;
 
   constructor(
     redisClient: RedisClientType = createRedisClientForRepository(),
-    systemId: string = '',
   ) {
     super();
     this.redisClient = redisClient;
-    this.systemId = systemId;
     this.redisClient.on('error', (err) => {
       console.error(err.stack);
     });
   }
 
-  protected prefixKey = (key: string): string =>
-    this.systemId ? `${this.systemId}:${key}` : key;
-
   get isReady() {
     return this.redisClient.isReady;
   }

src/repositories/notifications/RedisNotificationRepository.ts

@@ -1,4 +1,3 @@
-import { RedisClientType } from 'redis';
 import { TupleKey } from '../../types/TupleKey';
 import {
   Listener,
@@ -8,22 +7,14 @@ import {
   ScheduledNotification
 } from "./NotificationRepository";
 import { BaseRedisRepository } from "../BaseRedisRepository";
-import createRedisClientForRepository from '../../helpers/createRedisClientForRepository';
 
 export class RedisNotificationRepository extends BaseRedisRepository implements NotificationRepository {
   private notificationListeners: Listener[] = [];
   private readonly NOTIFICATION_KEY_PREFIX = 'notification:';
 
-  constructor(
-    redisClient: RedisClientType = createRedisClientForRepository(),
-    systemId: string = '',
-  ) {
-    super(redisClient, systemId);
-  }
-
   private getNotificationKey = (shuttleId: string, stopId: string): string => {
     const tuple = new TupleKey(shuttleId, stopId);
-    return this.prefixKey(`${this.NOTIFICATION_KEY_PREFIX}${tuple.toString()}`);
+    return `${this.NOTIFICATION_KEY_PREFIX}${tuple.toString()}`;
   };
 
   public addOrUpdateNotification = async (notification: ScheduledNotification): Promise<void> => {

src/repositories/notifications/__tests__/NotificationRepositorySharedTests.test.ts

@@ -28,7 +28,7 @@ class RedisNotificationRepositoryHolder implements RepositoryHolder {
       url: process.env.REDIS_URL,
     });
     await this.redisClient.connect();
-    this.repo = new RedisNotificationRepository(this.redisClient, 'test-system');
+    this.repo = new RedisNotificationRepository(this.redisClient);
     return this.repo;
   }
   teardown = async () => {

src/repositories/parking/RedisParkingRepository.ts

@@ -3,8 +3,6 @@ import { IParkingStructure } from "../../entities/ParkingRepositoryEntities";
 import { HistoricalParkingAverageQueryResult, HistoricalParkingAverageFilterArguments } from "./ParkingGetterRepository";
 import { BaseRedisRepository } from "../BaseRedisRepository";
 import { PARKING_LOGGING_INTERVAL_MS } from "../../environment";
-import { RedisClientType } from "redis";
-import createRedisClientForRepository from "../../helpers/createRedisClientForRepository";
 
 export type ParkingStructureID = string;
 
@@ -12,13 +10,6 @@ export class RedisParkingRepository extends BaseRedisRepository implements Parki
   private dataLastAdded: Map<ParkingStructureID, Date> = new Map();
   private loggingIntervalMs = PARKING_LOGGING_INTERVAL_MS;
 
-  constructor(
-    redisClient: RedisClientType = createRedisClientForRepository(),
-    systemId: string = '',
-  ) {
-    super(redisClient, systemId);
-  }
-
   addOrUpdateParkingStructure = async (structure: IParkingStructure): Promise<void> => {
     const keys = this.createRedisKeys(structure.id);
     await this.redisClient.hSet(keys.structure, this.createRedisHashFromStructure(structure));
@@ -37,8 +28,8 @@ export class RedisParkingRepository extends BaseRedisRepository implements Parki
   };
 
   clearParkingStructureData = async (): Promise<void> => {
-    const structureKeys = await this.redisClient.keys(this.prefixKey('parking:structure:*'));
-    const timeSeriesKeys = await this.redisClient.keys(this.prefixKey('parking:timeseries:*'));
+    const structureKeys = await this.redisClient.keys('parking:structure:*');
+    const timeSeriesKeys = await this.redisClient.keys('parking:timeseries:*');
 
     const allKeys = [...structureKeys, ...timeSeriesKeys];
     if (allKeys.length > 0) {
@@ -60,7 +51,7 @@ export class RedisParkingRepository extends BaseRedisRepository implements Parki
   };
 
   getParkingStructures = async (): Promise<IParkingStructure[]> => {
-    const keys = await this.redisClient.keys(this.prefixKey('parking:structure:*'));
+    const keys = await this.redisClient.keys('parking:structure:*');
     const structures: IParkingStructure[] = [];
 
     for (const key of keys) {
@@ -89,8 +80,8 @@ export class RedisParkingRepository extends BaseRedisRepository implements Parki
   };
 
   private createRedisKeys = (structureId: string) => ({
-    structure: this.prefixKey(`parking:structure:${structureId}`),
-    timeSeries: this.prefixKey(`parking:timeseries:${structureId}`),
+    structure: `parking:structure:${structureId}`,
+    timeSeries: `parking:timeseries:${structureId}`
   });
 
   private createRedisHashFromStructure = (structure: IParkingStructure): Record<string, string> => ({

src/repositories/parking/__tests__/ParkingRepositorySharedTests.test.ts

@@ -25,7 +25,7 @@ class RedisParkingRepositoryHolder implements RepositoryHolder<ParkingGetterSett
       url: process.env.REDIS_URL,
     });
     await this.redisClient.connect();
-    this.repo = new RedisParkingRepository(this.redisClient, 'test-system');
+    this.repo = new RedisParkingRepository(this.redisClient);
     return this.repo;
   };
   teardown = async () => {

src/repositories/shuttle/RedisShuttleRepository.ts

@@ -17,9 +17,8 @@ export class RedisShuttleRepository extends BaseRedisRepository implements Shutt
   constructor(
     redisClient: RedisClientType = createRedisClientForRepository(),
     readonly shuttleStopArrivalDegreeDelta: number = 0.001,
-    systemId: string = '',
   ) {
-    super(redisClient, systemId);
+    super(redisClient);
   }
 
   get isReady() {
@@ -84,24 +83,24 @@ export class RedisShuttleRepository extends BaseRedisRepository implements Shutt
   }
 
   // Key prefixes for individual entity keys
-  private get stopKeyPrefix() { return this.prefixKey('shuttle:stop:'); }
-  private get routeKeyPrefix() { return this.prefixKey('shuttle:route:'); }
-  private get shuttleKeyPrefix() { return this.prefixKey('shuttle:shuttle:'); }
-  private get orderedStopKeyPrefix() { return this.prefixKey('shuttle:orderedstop:'); }
-  private get lastStopKeyPrefix() { return this.prefixKey('shuttle:laststop:'); }
-  private get historicalEtaKeyPrefix() { return this.prefixKey('shuttle:eta:historical:'); }
+  private readonly stopKeyPrefix = 'shuttle:stop:';
+  private readonly routeKeyPrefix = 'shuttle:route:';
+  private readonly shuttleKeyPrefix = 'shuttle:shuttle:';
+  private readonly orderedStopKeyPrefix = 'shuttle:orderedstop:';
+  private readonly lastStopKeyPrefix = 'shuttle:laststop:';
+  private readonly historicalEtaKeyPrefix = 'shuttle:eta:historical:';
 
   // Key patterns for bulk operations (e.g., getting all keys, clearing data)
-  private get stopKeyPattern() { return this.prefixKey('shuttle:stop:*'); }
-  private get routeKeyPattern() { return this.prefixKey('shuttle:route:*'); }
-  private get shuttleKeyPattern() { return this.prefixKey('shuttle:shuttle:*'); }
-  private get orderedStopKeyPattern() { return this.prefixKey('shuttle:orderedstop:*'); }
-  private get lastStopKeyPattern() { return this.prefixKey('shuttle:laststop:*'); }
+  private readonly stopKeyPattern = 'shuttle:stop:*';
+  private readonly routeKeyPattern = 'shuttle:route:*';
+  private readonly shuttleKeyPattern = 'shuttle:shuttle:*';
+  private readonly orderedStopKeyPattern = 'shuttle:orderedstop:*';
+  private readonly lastStopKeyPattern = 'shuttle:laststop:*';
 
   /**
    * Represents a set storing the shuttles that are currently at a stop.
    */
-  private get shuttleIsAtStopKey() { return this.prefixKey('shuttle:atstop'); }
+  private readonly shuttleIsAtStopKey = 'shuttle:atstop';
 
   // Helper methods for Redis key generation
   private readonly createStopKey = (stopId: string) => `${this.stopKeyPrefix}${stopId}`;

src/repositories/shuttle/__tests__/ShuttleRepositorySharedTests.test.ts

@@ -31,7 +31,7 @@ class RedisShuttleRepositoryHolder implements RepositoryHolder<ShuttleGetterSett
       url: process.env.REDIS_URL,
     });
     await this.redisClient.connect();
-    this.repo = new RedisShuttleRepository(this.redisClient, 0.001, 'test-system');
+    this.repo = new RedisShuttleRepository(this.redisClient);
     return this.repo;
   };
   teardown = async () => {

src/repositories/shuttle/eta/BaseRedisETARepository.ts

@@ -3,11 +3,11 @@ import { BaseRedisRepository } from "../../BaseRedisRepository";
 import { ETAGetterRepository, ETARepositoryEvent, ETARepositoryEventListener, ETARepositoryEventName } from "./ETAGetterRepository";
 
 export abstract class BaseRedisETARepository extends BaseRedisRepository implements ETAGetterRepository {
-  private get etaKeyPrefix() { return this.prefixKey('shuttle:eta:'); }
+  private static readonly ETA_KEY_PREFIX = 'shuttle:eta:';
 
   // Helper methods
   protected createEtaKey = (shuttleId: string, stopId: string) =>
-    `${this.etaKeyPrefix}${shuttleId}:${stopId}`;
+    `${BaseRedisETARepository.ETA_KEY_PREFIX}${shuttleId}:${stopId}`;
 
   createRedisHashFromEta = (eta: IEta): Record<string, string> => ({
     secondsRemaining: eta.secondsRemaining.toString(),
@@ -27,7 +27,7 @@ export abstract class BaseRedisETARepository extends BaseRedisRepository impleme
 
   // Getter implementations
   async getEtasForShuttleId(shuttleId: string): Promise<IEta[]> {
-    const keys = await this.redisClient.keys(`${this.etaKeyPrefix}${shuttleId}:*`);
+    const keys = await this.redisClient.keys(`${BaseRedisETARepository.ETA_KEY_PREFIX}${shuttleId}:*`);
     const etas: IEta[] = [];
 
     for (const key of keys) {
@@ -41,7 +41,7 @@ export abstract class BaseRedisETARepository extends BaseRedisRepository impleme
   }
 
   async getEtasForStopId(stopId: string): Promise<IEta[]> {
-    const keys = await this.redisClient.keys(`${this.etaKeyPrefix}*`);
+    const keys = await this.redisClient.keys(`${BaseRedisETARepository.ETA_KEY_PREFIX}*`);
     const etas: IEta[] = [];
 
     for (const key of keys) {

src/repositories/shuttle/eta/RedisExternalSourceETARepository.ts

@@ -2,17 +2,8 @@ import { IEta } from "../../../entities/ShuttleRepositoryEntities";
 import { BaseRedisETARepository } from "./BaseRedisETARepository";
 import { ExternalSourceETARepository } from "./ExternalSourceETARepository";
 import { ETARepositoryEvent } from "./ETAGetterRepository";
-import { RedisClientType } from "redis";
-import createRedisClientForRepository from "../../../helpers/createRedisClientForRepository";
 
 export class RedisExternalSourceETARepository extends BaseRedisETARepository implements ExternalSourceETARepository {
-  constructor(
-    redisClient: RedisClientType = createRedisClientForRepository(),
-    systemId: string = '',
-  ) {
-    super(redisClient, systemId);
-  }
-
   async addOrUpdateEtaFromExternalSource(eta: IEta): Promise<void> {
     await this.addOrUpdateEta(eta);
   }

src/repositories/shuttle/eta/RedisSelfUpdatingETARepository.ts

@@ -13,9 +13,8 @@ export class RedisSelfUpdatingETARepository extends BaseRedisETARepository imple
     readonly shuttleRepository: ShuttleGetterRepository,
     redisClient: RedisClientType = createRedisClientForRepository(),
     private referenceTime: Date | null = null,
-    systemId: string = '',
   ) {
-    super(redisClient, systemId);
+    super(redisClient);
 
     this.setReferenceTime = this.setReferenceTime.bind(this);
     this.getAverageTravelTimeSeconds = this.getAverageTravelTimeSeconds.bind(this);
@@ -29,7 +28,7 @@ export class RedisSelfUpdatingETARepository extends BaseRedisETARepository imple
   }
 
   private createHistoricalEtaTimeSeriesKey = (routeId: string, fromStopId: string, toStopId: string) => {
-    return this.prefixKey(`shuttle:eta:historical:${routeId}:${fromStopId}:${toStopId}`);
+    return `shuttle:eta:historical:${routeId}:${fromStopId}:${toStopId}`;
   }
 
   setReferenceTime(referenceTime: Date) {

src/repositories/shuttle/eta/__tests__/ExternalSourceETARepositorySharedTests.test.ts

@@ -16,7 +16,7 @@ class RedisExternalSourceETARepositoryHolder implements RepositoryHolder<Externa
       url: process.env.REDIS_URL,
     });
     await this.redisClient.connect();
-    this.repo = new RedisExternalSourceETARepository(this.redisClient, 'test-system');
+    this.repo = new RedisExternalSourceETARepository(this.redisClient);
     return this.repo;
   }
   teardown = async () => {

src/repositories/shuttle/eta/__tests__/SelfUpdatingETARepositorySharedTests.test.ts

@@ -22,12 +22,10 @@ class RedisSelfUpdatingETARepositoryHolder implements RepositoryHolder<SelfUpdat
     });
     await this.redisClient.connect();
     await this.redisClient.flushAll();
-    this.shuttleRepo = new RedisShuttleRepository(this.redisClient, 0.001, 'test-system');
+    this.shuttleRepo = new RedisShuttleRepository(this.redisClient);
     this.repo = new RedisSelfUpdatingETARepository(
       this.shuttleRepo,
       this.redisClient,
-      null,
-      'test-system',
     );
     return this.repo;
   }