brendan/project-inter-server
1
0
Fork 0
mirror of https://github.com/brendan-ch/project-inter-server.git synced 2026-04-19 08:50:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modify getShuttleLastStopArrival to use shuttle ID

Browse Source
This commit is contained in:
Brendan Chen
2025-11-10 18:21:55 -08:00
parent 91517669f0
commit ef20117f3c
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/repositories/shuttle/RedisShuttleRepository.ts
View File

@@ -440,7 +440,7 @@ export class RedisShuttleRepository extends EventEmitter implements ShuttleGette
) { ) {
const oneWeekAgo = new Date(referenceCurrentTime.getTime() - (60 * 60 * 24 * 7 * 1000)) const oneWeekAgo = new Date(referenceCurrentTime.getTime() - (60 * 60 * 24 * 7 * 1000))
const lastStopArrival = await this.getShuttleLastStopArrival(shuttle) const lastStopArrival = await this.getShuttleLastStopArrival(shuttle.id)
if (lastStopArrival == undefined) return; if (lastStopArrival == undefined) return;
const lastOrderedStop = await this.getOrderedStopByRouteAndStopId(shuttle.routeId, lastStopArrival.stopId); const lastOrderedStop = await this.getOrderedStopByRouteAndStopId(shuttle.routeId, lastStopArrival.stopId);
@@ -476,7 +476,7 @@ export class RedisShuttleRepository extends EventEmitter implements ShuttleGette
const arrivedStop = await this.getArrivedStopIfExists(shuttle); const arrivedStop = await this.getArrivedStopIfExists(shuttle);
if (arrivedStop != undefined) { if (arrivedStop != undefined) {
const lastStopTimestamp = await this.getShuttleLastStopArrival(shuttle) const lastStopTimestamp = await this.getShuttleLastStopArrival(shuttle.id)
if (lastStopTimestamp != undefined) { if (lastStopTimestamp != undefined) {
const routeId = shuttle.routeId; const routeId = shuttle.routeId;
const fromStopId = lastStopTimestamp.stopId; const fromStopId = lastStopTimestamp.stopId;
@@ -612,8 +612,8 @@ export class RedisShuttleRepository extends EventEmitter implements ShuttleGette
return undefined; return undefined;
} }
public async getShuttleLastStopArrival(shuttle: IShuttle): Promise<ShuttleStopArrival | undefined> { public async getShuttleLastStopArrival(shuttleId: string): Promise<ShuttleStopArrival | undefined> {
const key = this.createShuttleLastStopKey(shuttle.id); const key = this.createShuttleLastStopKey(shuttleId);
const data = await this.redisClient.hGetAll(key); const data = await this.redisClient.hGetAll(key);
if (Object.keys(data).length === 0) { if (Object.keys(data).length === 0) {

8
src/repositories/shuttle/__tests__/RedisShuttleRepository.test.ts
View File

@@ -90,7 +90,7 @@ describe("RedisShuttleRepository", () => {
}; };
await repository.addOrUpdateShuttle(shuttle); await repository.addOrUpdateShuttle(shuttle);
const lastStop = await repository.getShuttleLastStopArrival(shuttle); const lastStop = await repository.getShuttleLastStopArrival(shuttle.id);
expect(lastStop?.stopId).toEqual(stop2.id) expect(lastStop?.stopId).toEqual(stop2.id)
}); });
@@ -213,7 +213,7 @@ describe("RedisShuttleRepository", () => {
}; };
await repository.updateShuttleLastStopArrival(shuttle, stopArrival); await repository.updateShuttleLastStopArrival(shuttle, stopArrival);
const result = await repository.getShuttleLastStopArrival(shuttle); const result = await repository.getShuttleLastStopArrival(shuttle.id);
expect(result).toBeDefined(); expect(result).toBeDefined();
expect(result?.stopId).toBe(stopArrival.stopId); expect(result?.stopId).toBe(stopArrival.stopId);
@@ -224,7 +224,7 @@ describe("RedisShuttleRepository", () => {
const mockShuttles = generateMockShuttles(); const mockShuttles = generateMockShuttles();
const shuttle = mockShuttles[0]; const shuttle = mockShuttles[0];
const result = await repository.getShuttleLastStopArrival(shuttle); const result = await repository.getShuttleLastStopArrival(shuttle.id);
expect(result).toBeUndefined(); expect(result).toBeUndefined();
}); });
@@ -246,7 +246,7 @@ describe("RedisShuttleRepository", () => {
await repository.updateShuttleLastStopArrival(shuttle, firstArrival); await repository.updateShuttleLastStopArrival(shuttle, firstArrival);
await repository.updateShuttleLastStopArrival(shuttle, secondArrival); await repository.updateShuttleLastStopArrival(shuttle, secondArrival);
const result = await repository.getShuttleLastStopArrival(shuttle); const result = await repository.getShuttleLastStopArrival(shuttle.id);
expect(result).toBeDefined(); expect(result).toBeDefined();
expect(result?.stopId).toBe(secondArrival.stopId); expect(result?.stopId).toBe(secondArrival.stopId);