Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ fragment group_times_estimatedCallFields on EstimatedCall {
predictionInaccurate
realtime
cancellation
requestStop
notices {
...notice
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export type QuayIdInStopsQuery = { stopPlaces: Array<{ id: string, quays?: Array

export type Group_EstimatedCallFieldsFragment = { stopPositionInPattern: number, destinationDisplay?: { frontText?: string, via?: Array<string> }, notices: Array<NoticeFragment>, serviceJourney: Group_ServiceJourneyFieldsFragment };

export type Group_Times_EstimatedCallFieldsFragment = { date: any, expectedDepartureTime: any, actualDepartureTime?: any, aimedDepartureTime: any, predictionInaccurate: boolean, realtime: boolean, cancellation: boolean, stopPositionInPattern: number, destinationDisplay?: { frontText?: string, via?: Array<string> }, notices: Array<NoticeFragment>, situations: Array<SituationFragment>, serviceJourney: { id: string, line: { id: string } }, bookingArrangements?: BookingArrangementFragment };
export type Group_Times_EstimatedCallFieldsFragment = { date: any, expectedDepartureTime: any, actualDepartureTime?: any, aimedDepartureTime: any, predictionInaccurate: boolean, realtime: boolean, cancellation: boolean, requestStop: boolean, stopPositionInPattern: number, destinationDisplay?: { frontText?: string, via?: Array<string> }, notices: Array<NoticeFragment>, situations: Array<SituationFragment>, serviceJourney: { id: string, line: { id: string } }, bookingArrangements?: BookingArrangementFragment };

export type Group_NoticeFieldsFragment = { text?: string };

Expand Down Expand Up @@ -103,6 +103,7 @@ export const Group_Times_EstimatedCallFieldsFragmentDoc = gql`
predictionInaccurate
realtime
cancellation
requestStop
notices {
...notice
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ exports[`service stops -> departure group utils snapshot - should group data fro
"notices": [],
"predictionInaccurate": false,
"realtime": true,
"requestStop": undefined,
"serviceDate": undefined,
"serviceJourneyId": "ATB:ServiceJourney:24_200109141599832_78_200109141539610",
"situations": [],
Expand All @@ -51,6 +52,7 @@ exports[`service stops -> departure group utils snapshot - should group data fro
"notices": [],
"predictionInaccurate": false,
"realtime": true,
"requestStop": undefined,
"serviceDate": undefined,
"serviceJourneyId": "ATB:ServiceJourney:24_200109141599833_80_200109141539610",
"situations": [],
Expand All @@ -65,6 +67,7 @@ exports[`service stops -> departure group utils snapshot - should group data fro
"notices": [],
"predictionInaccurate": false,
"realtime": true,
"requestStop": undefined,
"serviceDate": undefined,
"serviceJourneyId": "ATB:ServiceJourney:24_200109141599834_82_200109141539610",
"situations": [],
Expand All @@ -79,6 +82,7 @@ exports[`service stops -> departure group utils snapshot - should group data fro
"notices": [],
"predictionInaccurate": false,
"realtime": true,
"requestStop": undefined,
"serviceDate": undefined,
"serviceJourneyId": "ATB:ServiceJourney:24_200109141599835_84_200109141539610",
"situations": [],
Expand All @@ -93,6 +97,7 @@ exports[`service stops -> departure group utils snapshot - should group data fro
"notices": [],
"predictionInaccurate": false,
"realtime": true,
"requestStop": undefined,
"serviceDate": undefined,
"serviceJourneyId": "ATB:ServiceJourney:24_200109141599836_86_200109141539610",
"situations": [],
Expand Down Expand Up @@ -184,6 +189,7 @@ exports[`service stops -> departure group utils snapshot - should group data fro
"notices": [],
"predictionInaccurate": false,
"realtime": true,
"requestStop": undefined,
"serviceDate": undefined,
"serviceJourneyId": "ATB:ServiceJourney:24_200109141599832_78_200109141539610",
"situations": [],
Expand All @@ -198,6 +204,7 @@ exports[`service stops -> departure group utils snapshot - should group data fro
"notices": [],
"predictionInaccurate": false,
"realtime": true,
"requestStop": undefined,
"serviceDate": undefined,
"serviceJourneyId": "ATB:ServiceJourney:24_200109141599833_80_200109141539610",
"situations": [],
Expand All @@ -212,6 +219,7 @@ exports[`service stops -> departure group utils snapshot - should group data fro
"notices": [],
"predictionInaccurate": false,
"realtime": true,
"requestStop": undefined,
"serviceDate": undefined,
"serviceJourneyId": "ATB:ServiceJourney:24_200109141599834_82_200109141539610",
"situations": [],
Expand All @@ -226,6 +234,7 @@ exports[`service stops -> departure group utils snapshot - should group data fro
"notices": [],
"predictionInaccurate": false,
"realtime": true,
"requestStop": undefined,
"serviceDate": undefined,
"serviceJourneyId": "ATB:ServiceJourney:24_200109141599835_84_200109141539610",
"situations": [],
Expand All @@ -240,6 +249,7 @@ exports[`service stops -> departure group utils snapshot - should group data fro
"notices": [],
"predictionInaccurate": false,
"realtime": true,
"requestStop": undefined,
"serviceDate": undefined,
"serviceJourneyId": "ATB:ServiceJourney:24_200109141599836_86_200109141539610",
"situations": [],
Expand Down
2 changes: 2 additions & 0 deletions src/service/impl/departures-grouped/utils/grouping.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ type DepartureTime = {
serviceJourneyId?: string;
serviceDate: string;
cancellation: boolean;
requestStop: boolean;
bookingArrangements?: BookingArrangementFragment;
notices?: NoticeFragment[];
stopPositionInPattern: number;
Expand Down Expand Up @@ -170,6 +171,7 @@ export default function mapQueryToGroups(
serviceJourneyId: time.serviceJourney?.id,
serviceDate: time.date,
cancellation: time.cancellation,
requestStop: time.requestStop,
notices: time.notices,
bookingArrangements: time.bookingArrangements,
stopPositionInPattern: time.stopPositionInPattern,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ fragment estimatedCallWithQuay on EstimatedCall {
expectedArrivalTime
forAlighting
forBoarding
requestStop
realtime
empiricalDelay {
p50
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { QuayFragmentDoc } from './quays.graphql-gen';
import { NoticeFragmentDoc } from './notices.graphql-gen';
import { SituationFragmentDoc } from './situations.graphql-gen';
import { BookingArrangementFragmentDoc } from './booking-arrangements.graphql-gen';
export type EstimatedCallWithQuayFragment = { actualArrivalTime?: any, actualDepartureTime?: any, aimedArrivalTime: any, aimedDepartureTime: any, cancellation: boolean, date: any, expectedDepartureTime: any, expectedArrivalTime: any, forAlighting: boolean, forBoarding: boolean, realtime: boolean, stopPositionInPattern: number, destinationDisplay?: { frontText?: string, via?: Array<string> }, empiricalDelay?: { p50?: any, p90?: any }, quay: QuayFragment, notices: Array<NoticeFragment>, situations: Array<SituationFragment>, bookingArrangements?: BookingArrangementFragment };
export type EstimatedCallWithQuayFragment = { actualArrivalTime?: any, actualDepartureTime?: any, aimedArrivalTime: any, aimedDepartureTime: any, cancellation: boolean, date: any, expectedDepartureTime: any, expectedArrivalTime: any, forAlighting: boolean, forBoarding: boolean, requestStop: boolean, realtime: boolean, stopPositionInPattern: number, destinationDisplay?: { frontText?: string, via?: Array<string> }, empiricalDelay?: { p50?: any, p90?: any }, quay: QuayFragment, notices: Array<NoticeFragment>, situations: Array<SituationFragment>, bookingArrangements?: BookingArrangementFragment };

export const EstimatedCallWithQuayFragmentDoc = gql`
fragment estimatedCallWithQuay on EstimatedCall {
Expand All @@ -28,6 +28,7 @@ export const EstimatedCallWithQuayFragmentDoc = gql`
expectedArrivalTime
forAlighting
forBoarding
requestStop
realtime
empiricalDelay {
p50
Expand Down
Loading