rename entities.ts to ShuttleRepositoryEntities.ts

src/loaders/ApiBasedShuttleRepositoryLoader.ts

@@ -1,5 +1,5 @@
 import { ShuttleGetterSetterRepository } from "../repositories/ShuttleGetterSetterRepository";
-import { IEntityWithId, IEta, IRoute, IShuttle, IStop } from "../entities/entities";
+import { IEntityWithId, IEta, IRoute, IShuttle, IStop } from "../entities/ShuttleRepositoryEntities";
 import { ShuttleRepositoryLoader } from "./ShuttleRepositoryLoader";
 
 export class ApiResponseError extends Error {

src/loaders/loadShuttleTestData.ts

@@ -1,5 +1,5 @@
 // Mock data
-import { IEta, IOrderedStop, IRoute, IShuttle, IStop, IPassioSystem } from "../entities/entities";
+import { IEta, IOrderedStop, IRoute, IShuttle, IStop } from "../entities/ShuttleRepositoryEntities";
 import { ShuttleGetterSetterRepository } from "../repositories/ShuttleGetterSetterRepository";
 import { InterchangeSystemBuilderArguments } from "../entities/InterchangeSystem";
 

src/notifications/schedulers/ETANotificationScheduler.ts

@@ -1,5 +1,5 @@
 import { ShuttleGetterRepository } from "../../repositories/ShuttleGetterRepository";
-import { IEta } from "../../entities/entities";
+import { IEta } from "../../entities/ShuttleRepositoryEntities";
 import { AppleNotificationSender, NotificationAlertArguments } from "../senders/AppleNotificationSender";
 import {
   NotificationRepository,

src/repositories/ShuttleGetterRepository.ts

@@ -1,4 +1,4 @@
-import { IEta, IOrderedStop, IRoute, IShuttle, IStop } from "../entities/entities";
+import { IEta, IOrderedStop, IRoute, IShuttle, IStop } from "../entities/ShuttleRepositoryEntities";
 
 /**
  * Shuttle getter repository to be linked to a system.

src/repositories/ShuttleGetterSetterRepository.ts

@@ -2,7 +2,7 @@
 // to convert from data repo to GraphQL schema
 
 import { ShuttleGetterRepository } from "./ShuttleGetterRepository";
-import { IEta, IOrderedStop, IRoute, IShuttle, IStop } from "../entities/entities";
+import { IEta, IOrderedStop, IRoute, IShuttle, IStop } from "../entities/ShuttleRepositoryEntities";
 
 /**
  * ShuttleGetterRepository interface for data derived from Passio API.

src/repositories/UnoptimizedInMemoryShuttleRepository.ts

@@ -1,5 +1,5 @@
 import { ShuttleGetterSetterRepository } from "./ShuttleGetterSetterRepository";
-import { IEntityWithId, IEta, IOrderedStop, IRoute, IShuttle, IStop } from "../entities/entities";
+import { IEntityWithId, IEta, IOrderedStop, IRoute, IShuttle, IStop } from "../entities/ShuttleRepositoryEntities";
 
 /**
  * An unoptimized in memory repository.

test/notifications/schedulers/ETANotificationSchedulerTests.test.ts

@@ -1,7 +1,7 @@
 import { beforeEach, describe, expect, it, jest } from "@jest/globals";
 import { ETANotificationScheduler } from "../../../src/notifications/schedulers/ETANotificationScheduler";
 import { UnoptimizedInMemoryShuttleRepository } from "../../../src/repositories/UnoptimizedInMemoryShuttleRepository";
-import { IEta, IShuttle, IStop } from "../../../src/entities/entities";
+import { IEta, IShuttle, IStop } from "../../../src/entities/ShuttleRepositoryEntities";
 import { addMockShuttleToRepository, addMockStopToRepository } from "../../testHelpers/repositorySetupHelpers";
 import { AppleNotificationSender } from "../../../src/notifications/senders/AppleNotificationSender";
 import { InMemoryNotificationRepository } from "../../../src/repositories/InMemoryNotificationRepository";

test/resolvers/EtaResolverTests.test.ts

@@ -1,8 +1,9 @@
 import { beforeEach, describe, expect, it } from "@jest/globals";
 import { setupTestServerContext, setupTestServerHolder } from "../testHelpers/apolloTestServerHelpers";
-import { IEta, IShuttle, IStop, IPassioSystem } from "../../src/entities/entities";
+import { IEta, IShuttle, IStop } from "../../src/entities/ShuttleRepositoryEntities";
 import {
-  addMockEtaToRepository, addMockShuttleToRepository,
+  addMockEtaToRepository,
+  addMockShuttleToRepository,
   addMockStopToRepository,
 } from "../testHelpers/repositorySetupHelpers";
 import assert = require("node:assert");
@@ -22,7 +23,7 @@ describe("EtaResolvers", () => {
   });
 
   async function getResponseForEtaQuery(query: string) {
-    const response = await holder.testServer.executeOperation({
+    return await holder.testServer.executeOperation({
       query,
       variables: {
         systemId: context.systems[0].id,
@@ -32,7 +33,6 @@ describe("EtaResolvers", () => {
       contextValue: context
 
     });
-    return response;
   }
 
   describe("stop", () => {

test/resolvers/OrderedStopResolverTests.test.ts

@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, it } from "@jest/globals";
 import { setupTestServerContext, setupTestServerHolder } from "../testHelpers/apolloTestServerHelpers";
-import { IRoute, IStop, IPassioSystem } from "../../src/entities/entities";
+import { IRoute, IStop } from "../../src/entities/ShuttleRepositoryEntities";
 import { generateMockOrderedStops, generateMockStops } from "../testHelpers/mockDataGenerators";
 import { addMockRouteToRepository } from "../testHelpers/repositorySetupHelpers";
 import assert = require("node:assert");

test/resolvers/QueryResolverTests.test.ts

@@ -1,5 +1,4 @@
 import { describe, expect, it } from "@jest/globals";
-import { generateMockPassioSystems } from "../testHelpers/mockDataGenerators";
 import {
   buildSystemForTesting,
   setupTestServerContext,

test/resolvers/RouteResolverTests.test.ts

@@ -5,7 +5,7 @@ import {
   addMockStopToRepository
 } from "../testHelpers/repositorySetupHelpers";
 import { generateMockOrderedStops, generateMockShuttles } from "../testHelpers/mockDataGenerators";
-import { IRoute, IStop, IPassioSystem } from "../../src/entities/entities";
+import { IRoute, IStop, IPassioSystem } from "../../src/entities/ShuttleRepositoryEntities";
 import assert = require("node:assert");
 
 describe("RouteResolvers", () => {

test/resolvers/ShuttleResolverTests.test.ts

@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, it } from "@jest/globals";
 import { generateMockEtas, generateMockRoutes } from "../testHelpers/mockDataGenerators";
-import { IShuttle, IPassioSystem } from "../../src/entities/entities";
+import { IShuttle, IPassioSystem } from "../../src/entities/ShuttleRepositoryEntities";
 import { setupTestServerContext, setupTestServerHolder } from "../testHelpers/apolloTestServerHelpers";
 import { addMockShuttleToRepository } from "../testHelpers/repositorySetupHelpers";
 import assert = require("node:assert");

test/resolvers/StopResolverTests.test.ts

@@ -4,7 +4,7 @@ import {
   setupTestServerHolder
 } from "../testHelpers/apolloTestServerHelpers";
 import { generateMockEtas, generateMockOrderedStops } from "../testHelpers/mockDataGenerators";
-import { IStop } from "../../src/entities/entities";
+import { IStop } from "../../src/entities/ShuttleRepositoryEntities";
 import { addMockStopToRepository } from "../testHelpers/repositorySetupHelpers";
 import assert = require("node:assert");
 

test/resolvers/SystemResolverTests.test.ts

@@ -6,7 +6,7 @@ import {
   addMockShuttleToRepository,
   addMockStopToRepository,
 } from "../testHelpers/repositorySetupHelpers";
-import { IPassioSystem } from "../../src/entities/entities";
+import { IPassioSystem } from "../../src/entities/ShuttleRepositoryEntities";
 import assert = require("node:assert");
 
 describe("SystemResolvers", () => {

test/testHelpers/mockDataGenerators.ts

@@ -1,4 +1,4 @@
-import { IEta, IOrderedStop, IRoute, IShuttle, IStop, IPassioSystem } from "../../src/entities/entities";
+import { IEta, IOrderedStop, IRoute, IShuttle, IStop, IPassioSystem } from "../../src/entities/ShuttleRepositoryEntities";
 
 // Use a single set of generators in case any of the
 // interfaces change in the future