E-Revmax Certification (#14)

* Small fixes during certification erevmax

* Fixes after the live tests with erevmax

* Parsing proper response from server during reservation

* library cleanup

* Implemented simulator for erevmax availability

Author: mtahon

api/v1/orders/createWithOffer.js

@@ -24,6 +24,7 @@ function returnCleanError(err, res) {
 
   // Default Error
   else {
+    console.log(err);
     res.status(500).json({message: 'A server error occured ', details: err});
   }
 }

config.js

@@ -37,6 +37,7 @@ const JWT = process.env.JWT;
 const redisUrl = process.env.REDIS_URL;
 
 const erevmax = {
+  availabilityUrl: process.env.EREVMAX_AVAILABILITY_URL,
   reservationUrl: process.env.EREVMAX_RESERVATION_URL,
 };
 

helpers/camaroTemplates/hotelAvail.js

@@ -29,7 +29,7 @@ const hotelAvailTransformTemplate = {
       type: '#photo',
       width: '@width',
       height: '@height',
-      url: '@url',      
+      url: '@url',
     }],
   }],
   _roomStays_: ['/soap:Envelope/soap:Body/OTA_HotelAvailRS/RoomStays/RoomStay', {
@@ -72,7 +72,7 @@ const hotelAvailTransformTemplate = {
         type: '#photo',
         width: '@width',
         height: '@height',
-        url: '@url',      
+        url: '@url',
       }],
       policies: ['TPA_Extensions/RoomPolicy/policy', {
         _id_: '@Policy_Type',

helpers/camaroTemplates/hotelResNotifRS.js

@@ -4,8 +4,8 @@ const template = {
     reservationNumber: '/SOAP-ENV:Envelope/SOAP-ENV:Body/OTA_HotelResNotifRS/HotelReservations/HotelReservation/ResGlobalInfo/HotelReservationIDs/HotelReservationID/@ResID_Value',
     success: '/SOAP-ENV:Envelope/SOAP-ENV:Body/OTA_HotelResNotifRS/Success',
     errors: ['/SOAP-ENV:Envelope/SOAP-ENV:Body/OTA_HotelResNotifRS/Errors/Error', {
-        message: '@ShortText',
-        code: '@Code',
+        message: '.',
+        type: '@Type',
     }],
 };
 

helpers/resolvers/hotel/orderCreateWithOffer.js

@@ -16,28 +16,33 @@ module.exports = async (offer, passengers) => {
     const otaHotelResNotifRQData = hotelResNotif.mapFromOffer(offer, passengers);
     const otaRequestBody = mapOTAHotelResNotifSoap(otaHotelResNotifRQData);
 
-    // Send the request
-    axios.post(
-      config.erevmax.reservationUrl,
-      otaRequestBody,
-      {
-        headers: {
-          'Content-Type': 'application/xml',
-          SOAPAction: 'http://www.opentravel.org/OTA/2003/05/getOTAHotelAvailability',
-        },
-      }
-    )
+    //console.log(otaRequestBody);
+    axios({
+      method: 'post',
+      url: config.erevmax.reservationUrl,
+      headers: {
+        'Content-Type': 'text/xml;charset=UTF-8',
+        'Accept': '*/*',
+        'Accept-Encoding': 'gzip, deflate, br',
+        'SOAPAction': 'http://www.opentravel.org/OTA/2003/05/getOTAHotelAvailability',
+      },
+      data: otaRequestBody,
+      //responseType: 'stream'
+    })
 
     // Handle the response
     .then(response => {
+
       // Transform the XML answer
       transform(response.data, responseTemplate)
 
       // Build the answer according to API doc
       .then(responseData => {
+        console.log(responseData);
         // If any error, send it
         if(responseData.errors.length >0 ) {
-          reject({code:502, message: responseData.errors.join(', ')});
+          const errors = responseData.errors.map(({type, message}) => `[${type}] ${message}`);
+          reject({code:502, message: errors.join(' ,')});
         }
 
         // if no error
@@ -52,6 +57,7 @@ module.exports = async (offer, passengers) => {
         console.log(err);
         reject({code:502, message: 'Error parsing answer from reservation partner'});
       });
+      
     })
 
     // Handle an error

helpers/resolvers/searchHotel.js

@@ -12,6 +12,7 @@ const {
 } = require('../parsers');
 
 const offer = require('../models/offer');
+const config = require('../../config');
 
 const searchHotel = async (body) => {
   // Select the Hotels matching the rectangle
@@ -49,8 +50,9 @@ const searchHotel = async (body) => {
   const requestBody = hotelAvailRequestTemplate(requestData);
 
   // Fire the request
-  const response = await axios.post('https://searchnbook.ratetiger.com/ARIShopService-WS/services/ARIShopService',
-  requestBody,
+  const response = await axios.post(
+    config.erevmax.availabilityUrl,
+    requestBody,
     {
       headers: {
         'Content-Type': 'application/xml',

helpers/soapTemplates/ota/otaHotelResNotifRQ.js

@@ -3,10 +3,10 @@ const { v4: uuidv4 } = require('uuid');
 
 /* Mapping for Guest Counts */
 const mapGuestCount = OTA_GuestCount => {
-    if(OTA_GuestCount.Count = 0) return '';
+    if(OTA_GuestCount.Count == 0) return '';
     let guestCount = '';
-    guestCount += ` AgeQualifyingCode="${OTA_GuestCount.AgeQualifyingCode}`;
-    guestCount += ` Count="${OTA_GuestCount.Count}`;
+    guestCount += ` AgeQualifyingCode="${OTA_GuestCount.AgeQualifyingCode}"`;
+    guestCount += ` Count="${OTA_GuestCount.Count}"`;
     return `<GuestCount${guestCount}/>`;
 }
 
@@ -49,7 +49,9 @@ const mapRoomRate = OTA_RoomRate => `
 
 /* Mapping for Guarantee */
 const mapPaymentCard = OTA_PaymentCard => {
-    let paymentCard = '';
+    let paymentCard = '<PaymentCard';
+
+    // Add Payment Card attributes
     paymentCard += ` CardCode="${OTA_PaymentCard.CardCode}"`;
     paymentCard += ` CardNumber="${OTA_PaymentCard.CardNumber}"`;
     paymentCard += ` CardType="${OTA_PaymentCard.CardType}"`;
@@ -58,8 +60,19 @@ const mapPaymentCard = OTA_PaymentCard => {
     if(OTA_PaymentCard.SeriesCode !== undefined) {
         paymentCard += ` SeriesCode="${OTA_PaymentCard.SeriesCode}"`;
     }
+    paymentCard += '>'
+
+    // Cardholder name is mandatory
+    if(OTA_PaymentCard.CardHolderName !== undefined) {
+        paymentCard += `<CardHolderName>${OTA_PaymentCard.CardHolderName}</CardHolderName>`;
+    } else {
+        paymentCard +=  '<CardHolderName/>';
+    }
+
+    // Finish the object
+    paymentCard += '</PaymentCard>'
 
-    return `<PaymentCard${paymentCard}/>`;
+    return paymentCard;
 }
 
 const mapGuarantee = OTA_Guarantee => `
@@ -97,13 +110,24 @@ const mapRoomStay = OTA_RoomStay => `
     <Total
         AmountAfterTax="${OTA_RoomStay.Total.AmountAfterTax}"
         CurrencyCode="${OTA_RoomStay.Total.CurrencyCode}">
+        <Taxes Amount="00.00" CurrencyCode="EUR">
+            <Tax Type="Exclusive" Amount="00.00" CurrencyCode="EUR"/>
+        </Taxes>
     </Total>
     <BasicPropertyInfo
         HotelCode="${OTA_RoomStay.BasicPropertyInfo.HotelCode}"/>
     <ResGuestRPHs>
         <ResGuestRPH
             RPH="${OTA_RoomStay.ResGuestRPHs.ResGuestRPH.RPH}"/>
     </ResGuestRPHs>
+    <Comments>
+        <Comment GuestViewable="0">
+            <Text>Booked via Winding Tree</Text>
+        </Comment>
+    </Comments>
+    <SpecialRequests>
+        <SpecialRequest RequestCode="" CodeContext=""/>
+    </SpecialRequests>
 </RoomStay>
 `.trim();
 
@@ -125,7 +149,7 @@ const mapPOS = OTA_POS => `
 `.trim();
 
 const mapAddress = OTA_Address => {
-    if(OTA_Address == undefined) return '';
+    if(OTA_Address == undefined) return '<Address Type="1"><AddressLine/><CityName/><PostalCode/><StateProv StateCode=""/><CountryName Code=""/></Address>';
     return `
 <Address Type="${OTA_Address.Type}">
     <AddressLine>${OTA_Address.AddressLines[0]}</AddressLine>
@@ -251,15 +275,14 @@ const mapSoapHeader = uuid => `
 </soap:Header>
 `.trim();
 
-const mapHotelResNotifSoap = ({OTA_HotelResNotifRQ}) => `
-<?xml version="1.0" ?>
+const mapHotelResNotifSoap = ({OTA_HotelResNotifRQ}) => 
+`<?xml version="1.0" ?>
 <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
     ${mapSoapHeader(uuidv4())}
     <soap:Body>
         ${mapHotelResNotif(OTA_HotelResNotifRQ)}
     </soap:Body>
-</soap:Envelope>
-`
+</soap:Envelope>`
 .replace(/>\n/g,'>')
 .replace(/\n/g,' ')
 .replace(/(\s{4})/g,'')

helpers/transformInputData/hotelResNotif.js

@@ -7,6 +7,9 @@ var emailValidator = require("email-validator");
   Maps an offer and passengers to an OTA HotelResNotifRQ structure
 */
 function mapFromOffer(offer, passengers ) {
+
+  const orderId = uuidv4();
+  const resId = orderId.substr(24);
 
   // Build the POS
   const pos = {
@@ -33,7 +36,7 @@ function mapFromOffer(offer, passengers ) {
     PaymentCard: {
       CardType: '1', // 1-Credit as per erevmax doc,
       CardCode: 'VI',
-      CardNumber: '123456789',
+      CardNumber: '4444333322221111',
       ExpireDate: '0420', // MMYY format,
       //CardHolderName: OPTIONAL
     },
@@ -55,7 +58,7 @@ function mapFromOffer(offer, passengers ) {
   ));
 
   // Build the Guest counts
-  const guestCounts = Object.values(offer.guestCounts).map(({type, count}) => ({
+  const guestCounts = offer.guestCounts.map(({type, count}) => ({
     AgeQualifyingCode: type === 'ADT' ? 10 : 8,
     Count: count === undefined ? 1 : count,
   }));
@@ -73,6 +76,10 @@ function mapFromOffer(offer, passengers ) {
         NumberOfUnits: '1',
         RatePlanCode: offer.rateCode,
         Rates: rates,
+        Total: {
+          CurrencyCode: offer.currency,
+          AmountAfterTax: offer.amountAfterTax,
+        },
       },
     },
     GuestCounts: guestCounts,
@@ -147,7 +154,7 @@ function mapFromOffer(offer, passengers ) {
           CreatorID: 'WindingTree',
           ResStatus: 'Commit',
           UniqueID: {
-            ID: 'WTTest123',
+            ID: resId,
             Type: '14',
           },
           RoomStays: {
@@ -175,7 +182,7 @@ function mapFromOffer(offer, passengers ) {
               HotelReservationID: {
                 ResID_Source: 'Windingtree',
                 ResID_Type: '22',
-                ResID_Value: 'WTTest123'
+                ResID_Value: resId
               },
             },
           },

now.json

@@ -60,6 +60,7 @@
         "AF_PARTICIPANT_RECIPENT_NAME": "@af_participant_recipent_name",
         "JWT": "@staging.wt-aggregator.jwt",
         "REDIS_URL": "@staging.wt-aggregator.redis_url",
-        "EREVMAX_RESERVATION_URL": "@staging.wt-aggregator.erevmax_reservation_url"
+        "EREVMAX_RESERVATION_URL": "@staging.wt-aggregator.erevmax_reservation_url",
+        "EREVMAX_AVAILABILITY_URL": "@staging.wt-aggregator.erevmax_availability_url"
     }
 }

public/wt-aggregator.yaml

@@ -54,7 +54,7 @@ paths:
                     },
                     "passengers": [
                       {"type": "ADT", "count": 2},
-                      {"type": "CHD"},
+                      {"type": "CHD"}
                     ]
                   }
               hotelSearch:
@@ -75,7 +75,7 @@ paths:
                     },
                     "passengers": [
                       {"type": "ADT", "count": 2},
-                      {"type": "CHD", "count": 1},
+                      {"type": "CHD", "count": 1}
                     ]
                   }
         required: true