diff --git a/src/service/impl/departures-grouped/journey-gql/departure-group.graphql b/src/service/impl/departures-grouped/journey-gql/departure-group.graphql index cc599b3c..c01a84b2 100644 --- a/src/service/impl/departures-grouped/journey-gql/departure-group.graphql +++ b/src/service/impl/departures-grouped/journey-gql/departure-group.graphql @@ -64,6 +64,7 @@ fragment group_times_estimatedCallFields on EstimatedCall { predictionInaccurate realtime cancellation + requestStop notices { ...notice } diff --git a/src/service/impl/departures-grouped/journey-gql/departure-group.graphql-gen.ts b/src/service/impl/departures-grouped/journey-gql/departure-group.graphql-gen.ts index cf2f6aea..fde8cf01 100644 --- a/src/service/impl/departures-grouped/journey-gql/departure-group.graphql-gen.ts +++ b/src/service/impl/departures-grouped/journey-gql/departure-group.graphql-gen.ts @@ -35,7 +35,7 @@ export type QuayIdInStopsQuery = { stopPlaces: Array<{ id: string, quays?: Array export type Group_EstimatedCallFieldsFragment = { stopPositionInPattern: number, destinationDisplay?: { frontText?: string, via?: Array }, notices: Array, 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 }, notices: Array, situations: Array, 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 }, notices: Array, situations: Array, serviceJourney: { id: string, line: { id: string } }, bookingArrangements?: BookingArrangementFragment }; export type Group_NoticeFieldsFragment = { text?: string }; @@ -103,6 +103,7 @@ export const Group_Times_EstimatedCallFieldsFragmentDoc = gql` predictionInaccurate realtime cancellation + requestStop notices { ...notice } diff --git a/src/service/impl/departures-grouped/utils/__tests__/__snapshots__/grouping.test.ts.snap b/src/service/impl/departures-grouped/utils/__tests__/__snapshots__/grouping.test.ts.snap index 812b74f0..107cb765 100644 --- a/src/service/impl/departures-grouped/utils/__tests__/__snapshots__/grouping.test.ts.snap +++ b/src/service/impl/departures-grouped/utils/__tests__/__snapshots__/grouping.test.ts.snap @@ -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": [], @@ -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": [], @@ -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": [], @@ -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": [], @@ -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": [], @@ -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": [], @@ -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": [], @@ -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": [], @@ -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": [], @@ -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": [], diff --git a/src/service/impl/departures-grouped/utils/grouping.ts b/src/service/impl/departures-grouped/utils/grouping.ts index fd7a31bc..6136fbd7 100644 --- a/src/service/impl/departures-grouped/utils/grouping.ts +++ b/src/service/impl/departures-grouped/utils/grouping.ts @@ -58,6 +58,7 @@ type DepartureTime = { serviceJourneyId?: string; serviceDate: string; cancellation: boolean; + requestStop: boolean; bookingArrangements?: BookingArrangementFragment; notices?: NoticeFragment[]; stopPositionInPattern: number; @@ -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, diff --git a/src/service/impl/fragments/journey-gql/estimated-calls.graphql b/src/service/impl/fragments/journey-gql/estimated-calls.graphql index 11f0f44b..45e0ff00 100644 --- a/src/service/impl/fragments/journey-gql/estimated-calls.graphql +++ b/src/service/impl/fragments/journey-gql/estimated-calls.graphql @@ -13,6 +13,7 @@ fragment estimatedCallWithQuay on EstimatedCall { expectedArrivalTime forAlighting forBoarding + requestStop realtime empiricalDelay { p50 diff --git a/src/service/impl/fragments/journey-gql/estimated-calls.graphql-gen.ts b/src/service/impl/fragments/journey-gql/estimated-calls.graphql-gen.ts index f2d8abdc..51234299 100644 --- a/src/service/impl/fragments/journey-gql/estimated-calls.graphql-gen.ts +++ b/src/service/impl/fragments/journey-gql/estimated-calls.graphql-gen.ts @@ -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 }, empiricalDelay?: { p50?: any, p90?: any }, quay: QuayFragment, notices: Array, situations: Array, 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 }, empiricalDelay?: { p50?: any, p90?: any }, quay: QuayFragment, notices: Array, situations: Array, bookingArrangements?: BookingArrangementFragment }; export const EstimatedCallWithQuayFragmentDoc = gql` fragment estimatedCallWithQuay on EstimatedCall { @@ -28,6 +28,7 @@ export const EstimatedCallWithQuayFragmentDoc = gql` expectedArrivalTime forAlighting forBoarding + requestStop realtime empiricalDelay { p50