uapi-json 1.15.1 → 1.16.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uapi-json",
-  "version": "1.15.1",
+  "version": "1.16.1",
   "description": "Travelport Universal API",
   "main": "src/",
   "files": [
@@ -49,14 +49,14 @@
   },
   "devDependencies": {
     "chai": "^4.3.7",
-    "eslint": "^8.29.0",
-    "eslint-config-airbnb-base": "^13.2.0",
-    "eslint-plugin-import": "^2.25.3",
+    "eslint": "^8.39.0",
+    "eslint-config-airbnb-base": "^15.0.0",
+    "eslint-plugin-import": "^2.29.0",
     "mocha": "^10.2.0",
     "nyc": "^15.1.0",
     "proxyquire": "^2.1.3",
     "readline2": "^1.0.1",
-    "sinon": "^15.0.1",
+    "sinon": "^16.1.1",
     "sinon-chai": "^3.7.0"
   }
 }

package/src/Request/default-config.js

@@ -51,7 +51,6 @@ module.exports = function defaultConfig(ver) {
   // air:AirSegment
   // universal:ProviderReservationInfo
 
-
   // Some single-object arrays with one key can be safely collapsed into an object or a scalar,
   // because they would never have a second item or any more fields in objects
   // NOTE: if such array name ends in list, e.g. FlightOptionsList (with FlightOption item),

package/src/Request/uapi-parser.js

@@ -7,7 +7,7 @@ const {
   RequestRuntimeError,
 } = require('./RequestErrors');
 
-const parseString = xml => new Promise((resolve, reject) => {
+const parseString = (xml) => new Promise((resolve, reject) => {
   xml2js.parseString(xml, (err, json) => {
     if (err) {
       reject(err);
@@ -33,7 +33,7 @@ function mergeLeaf(item) {
   delete (item.$);
   // item.renameProperty('_', 'text'); //TODO decide if _ is the best name
 
-  return Object.assign({}, item, leaf);
+  return { ...item, ...leaf };
 }
 
 function Parser(root, uapiVersion, env, debug, config, provider) {
@@ -71,7 +71,7 @@ Parser.prototype.mapArrayKeys = function mapArrayKeys(array, name) {
   }
 
   if (!hasAllKeys) {
-    return array.map(value => self.mergeLeafRecursive(value, name /* + ':' + key */));
+    return array.map((value) => self.mergeLeafRecursive(value, name /* + ':' + key */));
   }
 
   const object = array
@@ -155,18 +155,18 @@ Parser.prototype.parseVersion = function (obj) {
   const detail = obj['SOAP:Fault'][0].detail[0];
   const parsedVersions = Object.keys(detail)
     .filter(
-      key => key.match(/ErrorInfo$/i)
+      (key) => key.match(/ErrorInfo$/i)
     )
     .reduce(
       (acc, key) => acc.concat(
         Object.keys(detail[key][0].$)
-          .filter(detailKey => detailKey.match(/^xmlns/i))
-          .map(detailKey => detail[key][0].$[detailKey])
+          .filter((detailKey) => detailKey.match(/^xmlns/i))
+          .map((detailKey) => detail[key][0].$[detailKey])
       ),
       []
     )
-    .map(xmlns => xmlns.match(/_(v\d+_\d+)$/))
-    .filter(version => version !== null);
+    .map((xmlns) => xmlns.match(/_(v\d+_\d+)$/))
+    .filter((version) => version !== null);
   return parsedVersions[0][1];
 };
 

package/src/Request/uapi-request.js

@@ -182,14 +182,13 @@ module.exports = function uapiRequest(
       return result;
     };
 
-
     return validateInput()
       .then(handlebars.compile)
-      .then(template => prepareRequest(template, auth, params))
+      .then((template) => prepareRequest(template, auth, params))
       .then(sendRequest)
       .then(parseResponse)
       .then(validateSOAP)
-      .then(res => parseFunction.call(uParser, res, params))
+      .then((res) => parseFunction.call(uParser, res, params))
       .then(handleSuccess);
   };
 };

package/src/Services/Air/Air.js

@@ -63,7 +63,7 @@ module.exports = (settings) => {
               ),
             };
 
-            return service.addSegments(Object.assign({}, options, missedOptions));
+            return service.addSegments({ ...options, ...missedOptions });
           });
       }
 
@@ -74,10 +74,12 @@ module.exports = (settings) => {
       return service.airPricePricingSolutionXML(options).then((data) => {
         const tauDate = moment(options.tau || null);
         const tau = tauDate.isValid() ? tauDate.format() : moment().add(3, 'hours').format();
-        const bookingParams = Object.assign({}, {
+        const bookingParams = {
           ticketDate: tau,
           ActionStatusType: 'TAU',
-        }, data, options);
+          ...data,
+          ...options
+        };
         return service.createReservation(bookingParams).catch((err) => {
           if (err instanceof AirRuntimeError.SegmentBookingFailed
               || err instanceof AirRuntimeError.NoValidFare) {
@@ -97,7 +99,7 @@ module.exports = (settings) => {
     getBooking(options) {
       return this.getUniversalRecordByPNR(options)
         .then(
-          ur => getBookingFromUr(ur, options.pnr)
+          (ur) => getBookingFromUr(ur, options.pnr)
             || Promise.reject(new AirRuntimeError.NoPNRFoundInUR(ur))
         )
         .then((data) => {
@@ -186,7 +188,7 @@ module.exports = (settings) => {
             .catch((err) => {
               if (err instanceof AirRuntimeError.TicketingFoidRequired) {
                 return this.getBooking(options)
-                  .then(updatedBooking => service.foid(updatedBooking))
+                  .then((updatedBooking) => service.foid(updatedBooking))
                   .then(() => again(err));
               }
               if (err instanceof AirRuntimeError.TicketingPNRBusy) {
@@ -206,7 +208,7 @@ module.exports = (settings) => {
 
     async getTicketFromTicketsList(pnr, ticketNumber) {
       const tickets = await this.getTickets({ pnr });
-      return tickets.find(t => t.ticketNumber === ticketNumber);
+      return tickets.find((t) => t.ticketNumber === ticketNumber);
     },
 
     retryableTicketErrorHandlers: {
@@ -250,7 +252,7 @@ module.exports = (settings) => {
             }
           }));
 
-          const [ticket = null] = results.filter(result => result);
+          const [ticket = null] = results.filter((result) => result);
           return ticket;
         }
       },
@@ -331,7 +333,7 @@ module.exports = (settings) => {
                       .then(() => ({ ...line, pnr }));
                   });
               }))
-              .then(data => ({ type: 'list', data }));
+              .then((data) => ({ type: 'list', data }));
           }
 
           const pnr = parsers.bookingPnr(firstScreen);
@@ -346,7 +348,7 @@ module.exports = (settings) => {
             new AirRuntimeError.MissingPaxListAndBooking(firstScreen)
           );
         })
-        .then(results => terminal.closeSession()
+        .then((results) => terminal.closeSession()
           .then(() => results)
           .catch(() => results));
     },
@@ -354,13 +356,13 @@ module.exports = (settings) => {
     cancelTicket(options) {
       return this.getTicket(options)
         .then(
-          ticketData => service.cancelTicket({
+          (ticketData) => service.cancelTicket({
             pnr: ticketData.pnr,
             ticketNumber: options.ticketNumber,
           })
         )
         .catch(
-          err => Promise.reject(new AirRuntimeError.FailedToCancelTicket(options, err))
+          (err) => Promise.reject(new AirRuntimeError.FailedToCancelTicket(options, err))
         );
     },
 
@@ -371,12 +373,12 @@ module.exports = (settings) => {
         pnr,
       } = options;
 
-      const checkTickets = tickets => Promise.all(tickets.map(
+      const checkTickets = (tickets) => Promise.all(tickets.map(
         (ticketData) => {
           // Check for VOID or REFUND
           const allTicketsVoidOrRefund = ticketData.tickets.every(
-            ticket => ticket.coupons.every(
-              coupon => coupon.status === 'V' || coupon.status === 'R'
+            (ticket) => ticket.coupons.every(
+              (coupon) => coupon.status === 'V' || coupon.status === 'R'
             )
           );
 
@@ -389,8 +391,8 @@ module.exports = (settings) => {
           }
           // Check for not OPEN/VOID segments
           const hasNotOpenSegment = ticketData.tickets.some(
-            ticket => ticket.coupons.some(
-              coupon => 'OV'.indexOf(coupon.status) === -1
+            (ticket) => ticket.coupons.some(
+              (coupon) => 'OV'.indexOf(coupon.status) === -1
             )
           );
 
@@ -400,7 +402,7 @@ module.exports = (settings) => {
 
           return Promise.all(
             ticketData.tickets.map(
-              ticket => (
+              (ticket) => (
                 ticket.coupons[0].status !== 'V'
                   ? service.cancelTicket({ pnr, ticketNumber: ticket.ticketNumber })
                   : Promise.resolve(true)
@@ -431,7 +433,7 @@ module.exports = (settings) => {
 
     getExchangeInformation(options) {
       return this.getBooking(options)
-        .then(booking => service.exchangeQuote({
+        .then((booking) => service.exchangeQuote({
           ...options,
           bookingDate: moment(booking.createdAt).format('YYYY-MM-DD'),
         }));
@@ -439,7 +441,7 @@ module.exports = (settings) => {
 
     exchangeBooking(options) {
       return this.getBooking(options)
-        .then(booking => service.exchangeBooking({
+        .then((booking) => service.exchangeBooking({
           ...options,
           uapi_reservation_locator: booking.uapi_reservation_locator,
         }));

package/src/Services/Air/AirErrors.js

@@ -90,6 +90,7 @@ Object.assign(AirParsingError, createErrorsList({
   CancelResponseNotFound: 'Cancel response not found',
   InvalidServiceSegmentFormat: 'Service segment format is invalid',
   NoProviderSegmentOrder: 'Segment is missing ProviderSegmentOrder field',
+  NoTravelOrder: 'Segment is missing TravelOrder field',
 }, AirParsingError));
 
 // Runtime errors

package/src/Services/Air/AirFormat.js

@@ -134,16 +134,15 @@ function formatPrices(prices) {
   };
 }
 
-
 function formatTrip(segment, flightDetails) {
   const flightInfo = flightDetails
     ? Object.keys(flightDetails).map(
-      detailsKey => flightDetails[detailsKey]
+      (detailsKey) => flightDetails[detailsKey]
     )
     : [];
-  const plane = flightInfo.map(details => details.Equipment || 'Unknown');
-  const duration = flightInfo.map(details => details.FlightTime || 0);
-  const techStops = flightInfo.slice(1).map(details => details.Origin);
+  const plane = flightInfo.map((details) => details.Equipment || 'Unknown');
+  const duration = flightInfo.map((details) => details.FlightTime || 0);
+  const techStops = flightInfo.slice(1).map((details) => details.Origin);
 
   segment['air:FlightDetails'] = flightInfo;
 
@@ -208,17 +207,15 @@ function formatPassengerCategories(pricingInfo) {
     }, {});
 
   const passengerFares = Object.keys(passengerCategories)
-    .reduce(
-      (memo, ptc) => Object.assign(memo, {
-        [ptc]: {
-          totalPrice: passengerCategories[ptc].TotalPrice,
-          basePrice: passengerCategories[ptc].BasePrice,
-          equivalentBasePrice: passengerCategories[ptc].EquivalentBasePrice,
-          taxes: passengerCategories[ptc].Taxes,
-          fareCalc: passengerCategories[ptc].FareCalc,
-        },
-      }), {}
-    );
+    .reduce((memo, ptc) => Object.assign(memo, {
+      [ptc]: {
+        totalPrice: passengerCategories[ptc].TotalPrice,
+        basePrice: passengerCategories[ptc].BasePrice,
+        equivalentBasePrice: passengerCategories[ptc].EquivalentBasePrice,
+        taxes: passengerCategories[ptc].Taxes,
+        fareCalc: passengerCategories[ptc].FareCalc,
+      },
+    }), {});
 
   return {
     passengerCounts,
@@ -325,9 +322,9 @@ function formatLowFaresSearch(searchRequest, searchResult) {
         const trips = leg['air:AirSegmentRef'].map((segmentRef) => {
           const segment = segments[segmentRef];
 
-          const tripFlightDetails = segment['air:FlightDetailsRef'].map(flightDetailsRef => flightDetails[flightDetailsRef]);
+          const tripFlightDetails = segment['air:FlightDetailsRef'].map((flightDetailsRef) => flightDetails[flightDetailsRef]);
 
-          const [bookingInfo] = thisFare['air:BookingInfo'].filter(info => info.SegmentRef === segmentRef);
+          const [bookingInfo] = thisFare['air:BookingInfo'].filter((info) => info.SegmentRef === segmentRef);
           const fareInfo = fareInfos[bookingInfo.FareInfoRef];
 
           const seatsAvailable = Number(bookingInfo.BookingCount);
@@ -354,13 +351,13 @@ function formatLowFaresSearch(searchRequest, searchResult) {
         }];
       });
     } else {
-      directions = thisFare['air:FlightOptionsList'].map(direction => Object.values(direction['air:Option']).map((option) => {
+      directions = thisFare['air:FlightOptionsList'].map((direction) => Object.values(direction['air:Option']).map((option) => {
         const trips = option['air:BookingInfo'].map(
           (segmentInfo) => {
             const fareInfo = fareInfos[segmentInfo.FareInfoRef];
             const segment = segments[segmentInfo.SegmentRef];
             const tripFlightDetails = segment['air:FlightDetailsRef'].map(
-              flightDetailsRef => flightDetails[flightDetailsRef]
+              (flightDetailsRef) => flightDetails[flightDetailsRef]
             );
             const seatsAvailable = (
               segment['air:AirAvailInfo']
@@ -438,23 +435,54 @@ function formatLowFaresSearch(searchRequest, searchResult) {
   return fares;
 }
 
-const getSegmentsData = segmentsObject => (segmentsObject
+const getSegmentsData = (segmentsObject) => (segmentsObject
   ? Object.values(segmentsObject)
   : null);
 
-const setIndexes = segments => segments.map(
-  (segment) => {
-    const { ProviderSegmentOrder: index } = segment;
-    if (index === undefined) {
-      throw new AirParsingError.NoProviderSegmentOrder({
-        segment,
-      });
-    }
+const setIndexes = (segments) => {
+  return segments
+    // Adding index and travelOrder fields
+    .map((segment) => {
+      const { ProviderSegmentOrder: index, TravelOrder: travelOrder } = segment;
+      if (index === undefined) {
+        throw new AirParsingError.NoProviderSegmentOrder({
+          segment,
+        });
+      }
+      if (travelOrder === undefined) {
+        throw new AirParsingError.NoTravelOrder({
+          segment,
+        });
+      }
+      return { ...segment, index: parseInt(index, 10), travelOrder: parseInt(travelOrder, 10) };
+    })
+    // Sorting segments in order to remove possible duplicates effectively
+    .sort((a, b) => {
+      // Get segments data required for comparison
+      const { index: aIndex, travelOrder: aTravelOrder } = a;
+      const { index: bIndex, travelOrder: bTravelOrder } = b;
+      const travelOrderDiff = aTravelOrder - bTravelOrder;
+      const indexDiff = aIndex - bIndex;
+
+      // Comparing provider order (index)
+      if (indexDiff !== 0) {
+        return indexDiff;
+      }
 
-    return { ...segment, index: parseInt(index, 10) };
-  }
-);
+      // Provider order is the same, possible duplicates, comparing travel order
+      // Travel order could be some high number, regardless of low provirder order (index)
+      if (travelOrderDiff !== 0) {
+        return travelOrderDiff;
+      }
 
+      // Travel order is the same, most probably duplicates, first in list goes first
+      return 0;
+    })
+    // Removing duplicates
+    .filter((segment, i, arr) => {
+      return arr.findIndex((el) => el.index === segment.index) === i;
+    });
+};
 
 /**
  * This function used to transform segments and service segments objects
@@ -487,22 +515,20 @@ function setIndexesForSegments(
 }
 
 function buildPassenger(name, traveler) {
-  return Object.assign(
-    {
-      lastName: name.Last,
-      firstName: name.First,
-      uapi_passenger_ref: traveler.Key,
-    },
-    traveler.DOB ? {
+  return {
+    lastName: name.Last,
+    firstName: name.First,
+    uapi_passenger_ref: traveler.Key,
+    ...(traveler.DOB ? {
       birthDate: moment(traveler.DOB).format('YYYY-MM-DD'),
-    } : null,
-    traveler.TravelerType ? {
+    } : null),
+    ...(traveler.TravelerType ? {
       ageCategory: traveler.TravelerType,
-    } : null,
-    traveler.Gender ? {
+    } : null),
+    ...(traveler.Gender ? {
       gender: traveler.Gender,
-    } : null
-  );
+    } : null)
+  };
 }
 
 /**