mirror of
https://github.com/brendan-ch/project-inter-server.git
synced 2026-04-17 07:50:31 +00:00
Add sorting to all data types
- Add name-based sorting for entities with names - Add order-based sorting for ordered stops - Add "seconds remaining" based sorting for ETAs - Add tests to check sorting
This commit is contained in:
@@ -67,6 +67,25 @@ describe("StopResolvers", () => {
|
||||
expect(response.body.singleResult.errors).toBeUndefined();
|
||||
expect((response.body.singleResult.data as any).system.stop.orderedStops).toHaveLength(0);
|
||||
});
|
||||
|
||||
it("returns ordered stops sorted by position", async () => {
|
||||
// Create three ordered stops with out-of-order positions and distinct routeIds
|
||||
const base = generateMockOrderedStops()[0];
|
||||
const o1 = { ...base, stopId: mockStop.id, routeId: "rA", position: 3 };
|
||||
const o2 = { ...base, stopId: mockStop.id, routeId: "rB", position: 1 };
|
||||
const o3 = { ...base, stopId: mockStop.id, routeId: "rC", position: 2 };
|
||||
await context.systems[0].shuttleRepository.addOrUpdateOrderedStop(o1);
|
||||
await context.systems[0].shuttleRepository.addOrUpdateOrderedStop(o2);
|
||||
await context.systems[0].shuttleRepository.addOrUpdateOrderedStop(o3);
|
||||
|
||||
const response = await getResponseForQuery(query);
|
||||
|
||||
assert(response.body.kind === "single");
|
||||
expect(response.body.singleResult.errors).toBeUndefined();
|
||||
const routeIds = (response.body.singleResult.data as any).system.stop.orderedStops.map((s: any) => s.routeId);
|
||||
const expectedOrder = [o2, o3, o1].map(s => s.routeId);
|
||||
expect(routeIds).toEqual(expectedOrder);
|
||||
});
|
||||
});
|
||||
|
||||
describe("etas", () => {
|
||||
@@ -104,5 +123,21 @@ describe("StopResolvers", () => {
|
||||
expect(response.body.singleResult.errors).toBeUndefined();
|
||||
expect((response.body.singleResult.data as any).system.stop.etas).toHaveLength(0);
|
||||
});
|
||||
|
||||
it("returns ETAs sorted by secondsRemaining", async () => {
|
||||
const e1 = { ...generateMockEtas()[0], stopId: mockStop.id, shuttleId: "shA", secondsRemaining: 240 };
|
||||
const e2 = { ...generateMockEtas()[0], stopId: mockStop.id, shuttleId: "shB", secondsRemaining: 60 };
|
||||
const e3 = { ...generateMockEtas()[0], stopId: mockStop.id, shuttleId: "shC", secondsRemaining: 120 };
|
||||
await context.systems[0].shuttleRepository.addOrUpdateEta(e1);
|
||||
await context.systems[0].shuttleRepository.addOrUpdateEta(e2);
|
||||
await context.systems[0].shuttleRepository.addOrUpdateEta(e3);
|
||||
|
||||
const response = await getResponseForQuery(query);
|
||||
|
||||
assert(response.body.kind === "single");
|
||||
expect(response.body.singleResult.errors).toBeUndefined();
|
||||
const seconds = (response.body.singleResult.data as any).system.stop.etas.map((e: any) => e.secondsRemaining);
|
||||
expect(seconds).toEqual([60, 120, 240]);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user