mirror of
https://github.com/brendan-ch/project-inter-server.git
synced 2026-04-17 07:50:31 +00:00
Add updated test cases and update call to stop arrival helper
This commit is contained in:
@@ -41,11 +41,15 @@ export interface IOrderedStop extends IEntityWithTimestamp {
|
|||||||
* Checks if a shuttle has arrived at a stop based on coordinate proximity.
|
* Checks if a shuttle has arrived at a stop based on coordinate proximity.
|
||||||
* Uses a threshold of 0.001 degrees (~111 meters at the equator).
|
* Uses a threshold of 0.001 degrees (~111 meters at the equator).
|
||||||
*/
|
*/
|
||||||
export function shuttleHasArrivedAtStop(shuttle: IShuttle, stop: IStop) {
|
export function shuttleHasArrivedAtStop(
|
||||||
const isWithinLatitudeRange = shuttle.coordinates.latitude > stop.coordinates.latitude - 0.001
|
shuttle: IShuttle,
|
||||||
&& shuttle.coordinates.latitude < stop.coordinates.latitude + 0.001;
|
stop: IStop,
|
||||||
const isWithinLongitudeRange = shuttle.coordinates.longitude > stop.coordinates.longitude - 0.001
|
delta = 0.001
|
||||||
&& shuttle.coordinates.longitude < stop.coordinates.longitude + 0.001
|
) {
|
||||||
|
const isWithinLatitudeRange = shuttle.coordinates.latitude > stop.coordinates.latitude - delta
|
||||||
|
&& shuttle.coordinates.latitude < stop.coordinates.latitude + delta;
|
||||||
|
const isWithinLongitudeRange = shuttle.coordinates.longitude > stop.coordinates.longitude - delta
|
||||||
|
&& shuttle.coordinates.longitude < stop.coordinates.longitude + delta
|
||||||
return isWithinLatitudeRange && isWithinLongitudeRange;
|
return isWithinLatitudeRange && isWithinLongitudeRange;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -437,12 +437,15 @@ export class RedisShuttleRepository extends EventEmitter implements ShuttleGette
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public async getArrivedStopIfExists(shuttle: IShuttle): Promise<IStop | undefined> {
|
public async getArrivedStopIfExists(
|
||||||
|
shuttle: IShuttle,
|
||||||
|
delta = 0.001,
|
||||||
|
): Promise<IStop | undefined> {
|
||||||
const orderedStops = await this.getOrderedStopsByRouteId(shuttle.routeId);
|
const orderedStops = await this.getOrderedStopsByRouteId(shuttle.routeId);
|
||||||
|
|
||||||
for (const orderedStop of orderedStops) {
|
for (const orderedStop of orderedStops) {
|
||||||
const stop = await this.getStopById(orderedStop.stopId);
|
const stop = await this.getStopById(orderedStop.stopId);
|
||||||
if (stop != null && shuttleHasArrivedAtStop(shuttle, stop)) {
|
if (stop != null && shuttleHasArrivedAtStop(shuttle, stop, delta)) {
|
||||||
return stop;
|
return stop;
|
||||||
}
|
}
|
||||||
return undefined;
|
return undefined;
|
||||||
@@ -454,7 +457,7 @@ export class RedisShuttleRepository extends EventEmitter implements ShuttleGette
|
|||||||
throw Error("not implemented");
|
throw Error("not implemented");
|
||||||
}
|
}
|
||||||
|
|
||||||
private async updateShuttleLastStopArrival(shuttle: IShuttle, lastStopArrival: ShuttleStopArrival) {
|
public async updateShuttleLastStopArrival(shuttle: IShuttle, lastStopArrival: ShuttleStopArrival) {
|
||||||
// Key: shuttleId:stopId:
|
// Key: shuttleId:stopId:
|
||||||
// Value: just a marker (no numerical value)
|
// Value: just a marker (no numerical value)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
import { beforeEach, describe, it } from "@jest/globals";
|
||||||
|
import { RedisShuttleRepository } from "../RedisShuttleRepository";
|
||||||
|
import { afterEach } from "node:test";
|
||||||
|
|
||||||
|
describe("RedisShuttleRepository", () => {
|
||||||
|
let repository: RedisShuttleRepository;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
repository = new RedisShuttleRepository();
|
||||||
|
await repository.connect();
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(async () => {
|
||||||
|
await repository.clearAllData();
|
||||||
|
await repository.disconnect();
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("getArrivedStopIfExists", () => {
|
||||||
|
it("gets the stop that the shuttle is currently at, if exists", async () => {
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
it("returns undefined if shuttle is not currently at a stop", async () => {
|
||||||
|
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("getShuttleLastStopArrival", () => {
|
||||||
|
it("gets the shuttle's last stop if existing in the data", async () => {
|
||||||
|
// Use updateShuttleLastStopArrival to populate data
|
||||||
|
});
|
||||||
|
|
||||||
|
it("returns undefined if the data has never been initialized", async () => {
|
||||||
|
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
Reference in New Issue
Block a user