From 2741d229f98a01d342ff655e11d16feaced166db Mon Sep 17 00:00:00 2001 From: Brendan Chen Date: Tue, 8 Apr 2025 16:07:48 -0700 Subject: [PATCH] rename entities.ts to ShuttleRepositoryEntities.ts --- .../{entities.ts => ShuttleRepositoryEntities.ts} | 0 src/loaders/ApiBasedShuttleRepositoryLoader.ts | 2 +- src/loaders/loadShuttleTestData.ts | 2 +- src/notifications/schedulers/ETANotificationScheduler.ts | 2 +- src/repositories/ShuttleGetterRepository.ts | 2 +- src/repositories/ShuttleGetterSetterRepository.ts | 2 +- src/repositories/UnoptimizedInMemoryShuttleRepository.ts | 2 +- .../schedulers/ETANotificationSchedulerTests.test.ts | 2 +- test/resolvers/EtaResolverTests.test.ts | 8 ++++---- test/resolvers/OrderedStopResolverTests.test.ts | 2 +- test/resolvers/QueryResolverTests.test.ts | 1 - test/resolvers/RouteResolverTests.test.ts | 2 +- test/resolvers/ShuttleResolverTests.test.ts | 2 +- test/resolvers/StopResolverTests.test.ts | 2 +- test/resolvers/SystemResolverTests.test.ts | 2 +- test/testHelpers/mockDataGenerators.ts | 2 +- 16 files changed, 17 insertions(+), 18 deletions(-) rename src/entities/{entities.ts => ShuttleRepositoryEntities.ts} (100%) diff --git a/src/entities/entities.ts b/src/entities/ShuttleRepositoryEntities.ts similarity index 100% rename from src/entities/entities.ts rename to src/entities/ShuttleRepositoryEntities.ts diff --git a/src/loaders/ApiBasedShuttleRepositoryLoader.ts b/src/loaders/ApiBasedShuttleRepositoryLoader.ts index 49031ef..631eef2 100644 --- a/src/loaders/ApiBasedShuttleRepositoryLoader.ts +++ b/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 { diff --git a/src/loaders/loadShuttleTestData.ts b/src/loaders/loadShuttleTestData.ts index c59b4bf..b97c99d 100644 --- a/src/loaders/loadShuttleTestData.ts +++ b/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"; diff --git a/src/notifications/schedulers/ETANotificationScheduler.ts b/src/notifications/schedulers/ETANotificationScheduler.ts index 98a16a2..97a2d4d 100644 --- a/src/notifications/schedulers/ETANotificationScheduler.ts +++ b/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, diff --git a/src/repositories/ShuttleGetterRepository.ts b/src/repositories/ShuttleGetterRepository.ts index 8f59578..f705e15 100644 --- a/src/repositories/ShuttleGetterRepository.ts +++ b/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. diff --git a/src/repositories/ShuttleGetterSetterRepository.ts b/src/repositories/ShuttleGetterSetterRepository.ts index 5e5a925..6f23bc1 100644 --- a/src/repositories/ShuttleGetterSetterRepository.ts +++ b/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. diff --git a/src/repositories/UnoptimizedInMemoryShuttleRepository.ts b/src/repositories/UnoptimizedInMemoryShuttleRepository.ts index b8dda6f..7bc00cc 100644 --- a/src/repositories/UnoptimizedInMemoryShuttleRepository.ts +++ b/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. diff --git a/test/notifications/schedulers/ETANotificationSchedulerTests.test.ts b/test/notifications/schedulers/ETANotificationSchedulerTests.test.ts index 58ee0b3..b9f1790 100644 --- a/test/notifications/schedulers/ETANotificationSchedulerTests.test.ts +++ b/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"; diff --git a/test/resolvers/EtaResolverTests.test.ts b/test/resolvers/EtaResolverTests.test.ts index 1238f22..5611f9a 100644 --- a/test/resolvers/EtaResolverTests.test.ts +++ b/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", () => { diff --git a/test/resolvers/OrderedStopResolverTests.test.ts b/test/resolvers/OrderedStopResolverTests.test.ts index 855fbd4..5484b3a 100644 --- a/test/resolvers/OrderedStopResolverTests.test.ts +++ b/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"); diff --git a/test/resolvers/QueryResolverTests.test.ts b/test/resolvers/QueryResolverTests.test.ts index c471549..3bc3dae 100644 --- a/test/resolvers/QueryResolverTests.test.ts +++ b/test/resolvers/QueryResolverTests.test.ts @@ -1,5 +1,4 @@ import { describe, expect, it } from "@jest/globals"; -import { generateMockPassioSystems } from "../testHelpers/mockDataGenerators"; import { buildSystemForTesting, setupTestServerContext, diff --git a/test/resolvers/RouteResolverTests.test.ts b/test/resolvers/RouteResolverTests.test.ts index 71c7815..48022de 100644 --- a/test/resolvers/RouteResolverTests.test.ts +++ b/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", () => { diff --git a/test/resolvers/ShuttleResolverTests.test.ts b/test/resolvers/ShuttleResolverTests.test.ts index 31ba7a5..52a040a 100644 --- a/test/resolvers/ShuttleResolverTests.test.ts +++ b/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"); diff --git a/test/resolvers/StopResolverTests.test.ts b/test/resolvers/StopResolverTests.test.ts index ac732e8..6bf31cd 100644 --- a/test/resolvers/StopResolverTests.test.ts +++ b/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"); diff --git a/test/resolvers/SystemResolverTests.test.ts b/test/resolvers/SystemResolverTests.test.ts index bf86d8e..e185553 100644 --- a/test/resolvers/SystemResolverTests.test.ts +++ b/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", () => { diff --git a/test/testHelpers/mockDataGenerators.ts b/test/testHelpers/mockDataGenerators.ts index 8f2afa4..f146514 100644 --- a/test/testHelpers/mockDataGenerators.ts +++ b/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