uapi-json 1.17.2 → 1.17.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uapi-json",
-  "version": "1.17.2",
+  "version": "1.17.4",
   "description": "Travelport Universal API",
   "main": "src/",
   "files": [
@@ -15,7 +15,8 @@
     "coveralls": "nyc report --reporter=text-lcov > coverage.lcov",
     "fix": "eslint --fix src/ test/",
     "lint": "eslint src/ test/",
-    "prepublish": "npm run lint && npm run test"
+    "prepublish": "npm run lint && npm run test",
+    "cleanup": "find . -name 'node_modules' -type d -prune -exec rm -rf '{}' +"
   },
   "repository": {
     "type": "git",
@@ -36,27 +37,27 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "joi": "^17.6.2",
-    "axios": "^1.6.2",
+    "axios": "^1.7.7",
     "galileo-screen": "1.0.5",
-    "handlebars": "^4.7.7",
+    "handlebars": "^4.7.8",
     "handlebars-helper-equal": "^1.0.0",
-    "moment": "^2.29.4",
+    "joi": "^17.13.3",
+    "moment": "^2.30.1",
     "node-errors-helpers": "^1.0.0",
     "pretty-data": "^0.40.0",
-    "promise-retry": "^1.1.1",
-    "xml2js": "^0.5.0"
+    "promise-retry": "^2.0.1",
+    "xml2js": "^0.6.2"
   },
   "devDependencies": {
-    "chai": "^4.3.7",
+    "chai": "^4.5.0",
     "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",
+    "mocha": "^10.7.3",
+    "nyc": "^17.1.0",
     "proxyquire": "^2.1.3",
     "readline2": "^1.0.1",
-    "sinon": "^16.1.1",
+    "sinon": "^19.0.2",
     "sinon-chai": "^3.7.0"
   }
 }

package/src/Services/Air/AirParser.js

@@ -585,9 +585,8 @@ function getTicketFromEtr(etr, obj, allowNoProviderLocatorCodeRetrieval = false)
   const exchangedTickets = [];
 
   const allCoupons = ticketsList.map((ticket) => {
-    return Object.entries(ticket['air:Coupon']).map(([couponKey, coupon]) => {
+    return Object.values(ticket['air:Coupon']).map((coupon) => {
       return {
-        key: couponKey,
         ticketNumber: ticket.TicketNumber,
         couponNumber: coupon.CouponNumber,
         from: coupon.Origin,
@@ -607,59 +606,54 @@ function getTicketFromEtr(etr, obj, allowNoProviderLocatorCodeRetrieval = false)
     return all.concat(nextChunk);
   }, []);
 
-  const tickets = ticketsList.map(
-    (ticket) => {
-      if (ticket['air:ExchangedTicketInfo']) {
-        ticket['air:ExchangedTicketInfo'].forEach(
-          (t) => exchangedTickets.push(t.Number)
-        );
-      }
+  // Filling exchanged tickets array
+  ticketsList.forEach((ticket) => {
+    if (ticket['air:ExchangedTicketInfo']) {
+      ticket['air:ExchangedTicketInfo'].forEach(
+        (t) => exchangedTickets.push(t.Number)
+      );
+    }
+  });
 
-      const coupons = Object.keys(ticket['air:Coupon']).map(
-        (couponKey) => {
-          const allCouponsIndex = allCoupons.findIndex((ac) => ac.key === couponKey);
-          const coupon = allCoupons[allCouponsIndex];
-          const nextCoupon = allCoupons[allCouponsIndex + 1];
-
-          let bookingInfo = null;
-          // looking for fareInfo by it's fareBasis
-          // and for bookingInfo by correct FareInfoRef
-          if (airPricingInfo && airPricingInfo['air:FareInfo']) {
-            Object.keys(airPricingInfo['air:FareInfo']).forEach(
-              (fareKey) => {
-                const fare = airPricingInfo['air:FareInfo'][fareKey];
-                if (fare.FareBasis === coupon.FareBasis
-                  && airPricingInfo['air:BookingInfo']) {
-                  const bInfo = airPricingInfo['air:BookingInfo'].find(
-                    (info) => info.FareInfoRef === fareKey
-                  );
-
-                  if (bInfo) {
-                    bookingInfo = bInfo;
-                  }
-                }
-              }
+  // Getting ticket coupons
+  const ticketsObject = allCoupons.reduce((acc, coupon, index) => {
+    const { ticketNumber } = coupon;
+    const ticket = acc[ticketNumber] || { ticketNumber, coupons: [] };
+    const { coupons } = ticket;
+    const nextCoupon = allCoupons[index + 1];
+
+    let bookingInfo = null;
+    // looking for fareInfo by it's fareBasis
+    // and for bookingInfo by correct FareInfoRef
+    if (airPricingInfo && airPricingInfo['air:FareInfo']) {
+      Object.keys(airPricingInfo['air:FareInfo']).forEach(
+        (fareKey) => {
+          const fare = airPricingInfo['air:FareInfo'][fareKey];
+          if (fare.FareBasis === coupon.FareBasis && airPricingInfo['air:BookingInfo']) {
+            const bInfo = airPricingInfo['air:BookingInfo'].find(
+              (info) => info.FareInfoRef === fareKey
             );
-          }
 
-          return {
-            ...coupon,
-            stopover: (
-              nextCoupon
-                ? nextCoupon.stopover
-                : true
-            ),
-            ...(bookingInfo !== null ? { serviceClass: bookingInfo.CabinClass } : null)
-          };
+            if (bInfo) {
+              bookingInfo = bInfo;
+            }
+          }
         }
       );
-
-      return {
-        ticketNumber: ticket.TicketNumber,
-        coupons,
-      };
     }
-  );
+    const couponData = {
+      ...coupon,
+      stopover: (
+        nextCoupon
+          ? nextCoupon.stopover
+          : true
+      ),
+      ...(bookingInfo !== null ? { serviceClass: bookingInfo.CabinClass } : null)
+    };
+    return { ...acc, [ticketNumber]: { ...ticket, coupons: [...coupons, couponData] } };
+  }, {});
+
+  const tickets = Object.values(ticketsObject);
 
   const taxes = (airPricingInfo && airPricingInfo['air:TaxInfo'])
     ? Object.keys(airPricingInfo['air:TaxInfo']).map(

package/src/Services/Air/templates/AIR_EMD_RETRIEVE.handlebars.js

@@ -1,5 +1,5 @@
 module.exports = `
-<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:air="http://www.travelport.com/schema/air_v51_0" xmlns:com="http://www.travelport.com/schema/common_v51_0">  
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:air="http://www.travelport.com/schema/air_v52_0" xmlns:com="http://www.travelport.com/schema/common_v52_0">  
 <soapenv:Header/>
    <soapenv:Body>
       <air:EMDRetrieveReq TraceId="{{requestId}}" TargetBranch="{{TargetBranch}}" RetrieveProviderReservationDetails="false">

package/src/Services/Air/templates/GDS_QUEUE_PLACE.handlebars.js

@@ -2,7 +2,7 @@ module.exports = `
 <soapenv:Envelope
   xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
   xmlns:univ="http://www.travelport.com/schema/universal_v52_0"
-  xmlns:gds="http://www.travelport.com/schema/gdsQueue_v47_0"
+  xmlns:gds="http://www.travelport.com/schema/gdsQueue_v52_0"
   xmlns:com="http://www.travelport.com/schema/common_v52_0"
   >
   <soapenv:Header />

package/src/Services/Hotels/templates/HOTELS_BOOK_REQUEST.handlebars.js

@@ -5,7 +5,7 @@ module.exports = `
         <univ:HotelCreateReservationReq
             xmlns:com="http://www.travelport.com/schema/common_v52_0"
             xmlns:common_v52_0="http://www.travelport.com/schema/common_v52_0"
-            xmlns:hotel="http://www.travelport.com/schema/hotel_v47_0"
+            xmlns:hotel="http://www.travelport.com/schema/hotel_v52_0"
             xmlns:univ="http://www.travelport.com/schema/universal_v52_0"
             ProviderCode="TRM"
             TargetBranch="{{{TargetBranch}}}"
@@ -41,12 +41,12 @@ module.exports = `
 
 
             {{#rates}}
-            <hotel:HotelRateDetail xmlns:hotel="http://www.travelport.com/schema/hotel_v47_0"  RatePlanType="{{& RatePlanType}}" RateSupplier="{{& RateSupplier}}" RateOfferId="{{& RateOfferId}}" Base="{{& Base.currency}}{{& Base.value}}" Tax="{{& Tax.currency}}{{& Tax.value}}" Total="{{& Total.currency}}{{& Total.value}}" Surcharge="{{& Surcharge.currency}}{{& Surcharge.value}}" />
+            <hotel:HotelRateDetail xmlns:hotel="http://www.travelport.com/schema/hotel_v52_0"  RatePlanType="{{& RatePlanType}}" RateSupplier="{{& RateSupplier}}" RateOfferId="{{& RateOfferId}}" Base="{{& Base.currency}}{{& Base.value}}" Tax="{{& Tax.currency}}{{& Tax.value}}" Total="{{& Total.currency}}{{& Total.value}}" Surcharge="{{& Surcharge.currency}}{{& Surcharge.value}}" />
             {{/rates}}
 
-            <hotel:HotelProperty xmlns:hotel="http://www.travelport.com/schema/hotel_v47_0" HotelChain="{{& HotelChain}}" HotelCode="{{& HotelCode}}" {{#if Name}} Name="{{Name}}" {{/if}}>
+            <hotel:HotelProperty xmlns:hotel="http://www.travelport.com/schema/hotel_v52_0" HotelChain="{{& HotelChain}}" HotelCode="{{& HotelCode}}" {{#if Name}} Name="{{Name}}" {{/if}}>
             </hotel:HotelProperty>
-            <hotel:HotelStay xmlns:hot="http://www.travelport.com/schema/hotel_v47_0">
+            <hotel:HotelStay xmlns:hot="http://www.travelport.com/schema/hotel_v52_0">
                 <hotel:CheckinDate>{{{startDate}}}</hotel:CheckinDate>
                 <hotel:CheckoutDate>{{{endDate}}}</hotel:CheckoutDate>
             </hotel:HotelStay>
@@ -59,7 +59,7 @@ module.exports = `
             <common_v52_0:HostToken Host="TRM">
                 {{& HostToken}}
             </common_v52_0:HostToken>
-           <hot:BookingGuestInformation xmlns:hot="http://www.travelport.com/schema/hotel_v47_0">
+           <hot:BookingGuestInformation xmlns:hot="http://www.travelport.com/schema/hotel_v52_0">
                 {{#roomsRefs}}
                <hot:Room>
                    <hot:Adults>{{& adults}}</hot:Adults>

package/src/Services/Hotels/templates/HOTELS_RATE_REQUEST.handlebars.js

@@ -3,7 +3,7 @@ module.exports = `
     xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
     <soapenv:Header/>
     <soapenv:Body>
-        <hot:HotelDetailsReq xmlns:com="http://www.travelport.com/schema/common_v52_0" xmlns:hot="http://www.travelport.com/schema/hotel_v47_0" ReturnGuestReviews="true" ReturnMediaLinks="true" TargetBranch="{{TargetBranch}}">
+        <hot:HotelDetailsReq xmlns:com="http://www.travelport.com/schema/common_v52_0" xmlns:hot="http://www.travelport.com/schema/hotel_v52_0" ReturnGuestReviews="true" ReturnMediaLinks="true" TargetBranch="{{TargetBranch}}">
             <com:BillingPointOfSaleInfo OriginApplication="UAPI"/>
             <hot:HotelProperty HotelChain="{{HotelChain}}" HotelCode="{{HotelCode}}" {{#if Name}} Name="{{Name}}" {{/if}}/>
             <hot:HotelDetailsModifiers MaxWait="11000" RateRuleDetail="Complete"  {{#if currency}} PreferredCurrency="{{currency}}" {{/if}}>

package/src/Services/Hotels/templates/HOTELS_SEARCH_GALILEO_REQUEST.handlebars.js

@@ -1,5 +1,5 @@
 module.exports = `
-<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:hot="http://www.travelport.com/schema/hotel_v47_0" xmlns:com="http://www.travelport.com/schema/common_v52_0">
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:hot="http://www.travelport.com/schema/hotel_v52_0" xmlns:com="http://www.travelport.com/schema/common_v52_0">
   <soapenv:Header/>
   <soapenv:Body>
     <hot:HotelSearchAvailabilityReq TargetBranch="{{TargetBranch}}" >

package/src/Services/Hotels/templates/HOTELS_SEARCH_REQUEST.handlebars.js

@@ -1,5 +1,5 @@
 module.exports = `
-<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:hot="http://www.travelport.com/schema/hotel_v47_0" xmlns:com="http://www.travelport.com/schema/common_v52_0">
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:hot="http://www.travelport.com/schema/hotel_v52_0" xmlns:com="http://www.travelport.com/schema/common_v52_0">
   <soapenv:Header/>
   <soapenv:Body>
     <hot:HotelSearchAvailabilityReq TargetBranch="{{TargetBranch}}" >