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
4 changes: 3 additions & 1 deletion src/libs/TripReservationUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,9 @@ function isPnrCancelled(pnr: Pnr): boolean {
}
if (data.railPnr) {
const {outwardJourney, inwardJourney} = data.railPnr;
return isCancelledPnrStatus(outwardJourney.journeyStatus) && isCancelledPnrStatus(inwardJourney.journeyStatus);
const isOutwardCancelled = outwardJourney ? isCancelledPnrStatus(outwardJourney.journeyStatus) : true;
const isInwardCancelled = inwardJourney ? isCancelledPnrStatus(inwardJourney.journeyStatus) : true;
return isOutwardCancelled && isInwardCancelled;
}

return false;
Expand Down
4 changes: 2 additions & 2 deletions src/types/onyx/TripData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1712,8 +1712,8 @@ type CarPnr = {

/** Represents the structure of RailPnr. */
type RailPnr = {
/** Details of the inward journey. */
inwardJourney: {
/** Details of the inward journey (undefined for one-way trips). */
inwardJourney?: {
/** Status of the inward journey. */
journeyStatus: string;

Expand Down
37 changes: 35 additions & 2 deletions tests/unit/TripReservationUtilsTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2278,6 +2278,7 @@ const connectingAirPnrData = asDefined(airPnrConnecting.data.airPnr);
const hotelPnrData = asDefined(hotelPnr.data.hotelPnr);
const carPnrData = asDefined(carPnr.data.carPnr);
const railPnrData = asDefined(railPnr.data.railPnr);
const railInwardJourney = asDefined(railPnrData.inwardJourney);

describe('TripReservationUtils', () => {
describe('getAirReservations', () => {
Expand Down Expand Up @@ -2828,7 +2829,7 @@ describe('TripReservationUtils', () => {
journeyStatus: CONST.PNR_STATUS.CANCELLED,
},
inwardJourney: {
...railPnrData.inwardJourney,
...railInwardJourney,
journeyStatus: CONST.PNR_STATUS.CANCELLED,
},
},
Expand All @@ -2849,7 +2850,7 @@ describe('TripReservationUtils', () => {
journeyStatus: CONST.PNR_STATUS.CANCELLED,
},
inwardJourney: {
...railPnrData.inwardJourney,
...railInwardJourney,
journeyStatus: 'CONFIRMED',
},
},
Expand Down Expand Up @@ -2890,5 +2891,37 @@ describe('TripReservationUtils', () => {
expect(isPnrCancelled(airPnrDirect)).toBe(false);
expect(isPnrCancelled(railPnr)).toBe(false);
});

it('should not crash when rail PNR has undefined inwardJourney (one-way trip)', () => {
const oneWayRail: Pnr = {
...railPnr,
data: {
...railPnr.data,
railPnr: {
...railPnrData,
inwardJourney: undefined,
},
},
};
expect(isPnrCancelled(oneWayRail)).toBe(false);
});

it('should return true when rail PNR has undefined inwardJourney and outwardJourney is cancelled', () => {
const cancelledOneWayRail: Pnr = {
...railPnr,
data: {
...railPnr.data,
railPnr: {
...railPnrData,
inwardJourney: undefined,
outwardJourney: {
...railPnrData.outwardJourney,
journeyStatus: CONST.PNR_STATUS.CANCELLED,
},
},
},
};
expect(isPnrCancelled(cancelledOneWayRail)).toBe(true);
});
});
});
Loading