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
9 changes: 9 additions & 0 deletions src/CONST/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6994,6 +6994,15 @@ const CONST = {
TRAIN: 'train',
},

PNR_STATUS: {
CANCELLED: 'CANCELLED',
VOIDED: 'VOIDED',
},

LEG_STATUS: {
CANCELLED: 'CANCELLED_STATUS',
},

UPCOMING_TRAVEL_WINDOW_DAYS: 7,

RESERVATION_ADDRESS_TEST_ID: 'ReservationAddress',
Expand Down
37 changes: 36 additions & 1 deletion src/libs/TripReservationUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,12 @@ function getAirReservations(pnr: Pnr, travelers: PnrTraveler[]): Array<{reservat
for (const [index, flightDetails] of flightCoupons.sort((a, b) => a.legIdx - b.legIdx).entries()) {
const legIdx = flightDetails.legIdx;
const flightIdx = flightDetails.flightIdx;
const flightObject = pnrData.legs?.at(legIdx)?.flights.at(flightIdx);
const leg = pnrData.legs?.at(legIdx);
const flightObject = leg?.flights.at(flightIdx);

if (leg?.legStatus === CONST.LEG_STATUS.CANCELLED || isCancelledPnrStatus(flightObject?.flightStatus ?? '')) {
continue;
}
Comment thread
adamgrzybowski marked this conversation as resolved.

const airlineCode = flightObject?.marketing.airlineCode;
const longAirlineName = airlineInfo.find((info) => info.airlineCode === airlineCode)?.airlineName ?? airlineCode;
Expand Down Expand Up @@ -394,12 +399,41 @@ function getRailReservations(pnr: Pnr, travelers: PnrTraveler[]): Array<{reserva
return reservationList;
}

function isCancelledPnrStatus(status: string): boolean {
return status === CONST.PNR_STATUS.CANCELLED || status === CONST.PNR_STATUS.VOIDED;
}
Comment thread
adamgrzybowski marked this conversation as resolved.

function isPnrCancelled(pnr: Pnr): boolean {
const {data} = pnr;

if (data.bookingStatus && isCancelledPnrStatus(data.bookingStatus)) {
return true;
}

if (data.hotelPnr) {
return isCancelledPnrStatus(data.hotelPnr.pnrStatus);
}
if (data.carPnr) {
return isCancelledPnrStatus(data.carPnr.pnrStatus);
}
if (data.airPnr) {
return data.airPnr.legs.length > 0 && data.airPnr.legs.every((leg) => leg.legStatus === CONST.LEG_STATUS.CANCELLED);
}
if (data.railPnr) {
const {outwardJourney, inwardJourney} = data.railPnr;
return isCancelledPnrStatus(outwardJourney.journeyStatus) && isCancelledPnrStatus(inwardJourney.journeyStatus);
}

return false;
}

Comment thread
adamgrzybowski marked this conversation as resolved.
function getReservationsFromSpotnanaPayload(reportID: string, tripData?: TripData): ReservationData[] {
if (!tripData?.pnrs) {
return [];
}

const reservations: ReservationData[] = tripData.pnrs
.filter((pnr) => !isPnrCancelled(pnr))
Comment thread
adamgrzybowski marked this conversation as resolved.
.flatMap((pnr) => {
const travelers = pnr.data.pnrTravelers ?? [];

Expand Down Expand Up @@ -517,5 +551,6 @@ export {
formatAirportInfo,
getPNRReservationDataFromTripReport,
getAirReservations,
isPnrCancelled,
};
export type {ReservationData};
3 changes: 3 additions & 0 deletions src/types/onyx/TripData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,9 @@ type PnrData = {
/** Reason for suspending the booking. */
suspendReason: string;

/** Overall booking status of the PNR. */
bookingStatus?: string;

/**
* Fare Amount details for the PNR.
*/
Expand Down
Loading
Loading