Merge pull request #11 from mtahon/fix/flightSearches

Fixed issue #5 on nested itineraries

Author: mtahon

api/v1/searchOffers.js

@@ -4,7 +4,6 @@ const { searchFlight } = require('../../helpers/resolvers/searchFlight');
 
 module.exports = basicDecorator(async (req, res) => {
   const { body } = req;
-
   let resolver = () => {throw new Error('accommodation or itinerary missing in body');};
 
   if(body.accommodation) resolver = searchHotel;

helpers/camaroTemplates/hotelAvail.js

@@ -56,7 +56,6 @@ const hotelAvailTransformTemplate = {
       }],
     }],
     ratePlans: ['/soap:Envelope/soap:Body/OTA_HotelAvailRS/RoomStays/RoomStay/RatePlans/RatePlan', {
-      _provider_: '#ervmax',
       _id_: '@RatePlanCode',
       name: '@RatePlanName',
       penalties: {

helpers/camaroTemplates/provideAirShopping.js

@@ -19,12 +19,12 @@ const provideAirShoppingTransformTemplate = {
     itineraryCombinationReference: 'FlightsOverview/FlightRef',
     serviceClassReference: 'FlightsOverview/FlightRef/@PriceClassRef',
   }],
-  itineraries: ['/S:Envelope/S:Body/AirShoppingRS/DataLists', {
-    combinations: ['FlightList/Flight', {
+  itineraries: {
+    combinations: ['/S:Envelope/S:Body/AirShoppingRS/DataLists/FlightList/Flight', {
       _id_: '@FlightKey',
       _items_: 'SegmentReferences',
     }],
-    segments: ['FlightSegmentList/FlightSegment', {
+    segments: ['/S:Envelope/S:Body/AirShoppingRS/DataLists/FlightSegmentList/FlightSegment', {
       _id_: '@SegmentKey',
       operator: {
         operatorType: '#airline',
@@ -43,7 +43,7 @@ const provideAirShoppingTransformTemplate = {
       splittedArrivalTime: 'Arrival/Time',
       splittedArrivalDate: 'Arrival/Date',
     }],
-  }],
+  },
   serviceClasses: ['/S:Envelope/S:Body/AirShoppingRS/DataLists/PriceClassList/PriceClass', {
     _id_: '@PriceClassID',
     name: 'ClassOfService/MarketingName',

helpers/parsers/index.js

@@ -50,12 +50,14 @@ const splitSegments = (combinations) => combinations.map(({_items_, ...others})=
   _items_ : _items_.split(' '),
 }));
 
+
 const reduceToObjectByKey = (array) => array
   .reduce((segments, { _id_, ...others }) => ({
     ...segments,
     [_id_]: others,
   }), {});
 
+
 const roundCommissionDecimals = (offers) => offers
   .map(({price, ...others}) => ({
     ...others,
@@ -79,7 +81,7 @@ const reduceRoomStays = (_roomStays_ => {
   var offers = {}
   _roomStays_.forEach(roomStay => {
 
-    // Create the accomodation key
+    // Create the accommodation key
     var hotelkey = `${roomStay._provider_}.${roomStay._hotelCode_}`;
 
     // Build the offers by parsing the room rates
@@ -91,7 +93,7 @@ const reduceRoomStays = (_roomStays_ => {
         // Reference from other elements
         ratePlanReference: roomRate.ratePlanReference,
         roomTypeReference: roomRate.roomTypeReference,
-        accomodationReference: hotelkey,
+        accommodationReference: hotelkey,
 
         // Build price
         price: {

helpers/resolvers/searchFlight.js

@@ -32,15 +32,18 @@ const searchFlight = async (body) => {
   if (errors.length) throw new Error(`${errors[0].message}`);
 
   const searchResults = await transform(response.data, provideAirShoppingTransformTemplate);
-  searchResults.itineraries[0].segments = 
-    mergeHourAndDate(searchResults.itineraries[0].segments, 'splittedDepartureDate', 'splittedDepartureTime', 'departureTime');
-  searchResults.itineraries[0].segments = 
-    mergeHourAndDate(searchResults.itineraries[0].segments, 'splittedArrivalDate', 'splittedArrivalTime', 'arrivalTime');
-  searchResults.itineraries[0].segments = reduceToObjectByKey(searchResults.itineraries[0].segments);
+  searchResults.itineraries.segments = 
+    mergeHourAndDate(searchResults.itineraries.segments, 'splittedDepartureDate', 'splittedDepartureTime', 'departureTime');
+  searchResults.itineraries.segments = 
+    mergeHourAndDate(searchResults.itineraries.segments, 'splittedArrivalDate', 'splittedArrivalTime', 'arrivalTime');
+  searchResults.itineraries.segments = reduceToObjectByKey(searchResults.itineraries.segments);
 
-  searchResults.itineraries[0].combinations = splitSegments(searchResults.itineraries[0].combinations);
-  searchResults.itineraries[0].combinations = reduceToObjectByKey(searchResults.itineraries[0].combinations);
-  searchResults.itineraries[0].combinations = reduceToProperty(searchResults.itineraries[0].combinations, '_items_');
+  // Walk through the flight list 
+  var combinations = {};
+  searchResults.itineraries.combinations.forEach(flight => {
+    combinations[flight._id_] = flight._items_.split(' ');
+  });
+  searchResults.itineraries.combinations = combinations;
 
   for (const offer of Object.values(searchResults.offers)) {
     offer.offerItems = reduceToObjectByKey(offer.offerItems);

public/wt-aggregator.yaml

@@ -61,7 +61,7 @@ paths:
                 summary: A search for hotels
                 value: 
                   {
-                    "accomodation": {
+                    "accommodation": {
                       "location" : {
                         "rectangle": {
                           "south": "50.0929802",
@@ -635,27 +635,27 @@ components:
       - train
       example: 'flight'
 
-    # Defines the list of accomodation types
-    AccomodationType:
-      description: Type of accomodation service
+    # Defines the list of accommodation types
+    AccommodationType:
+      description: Type of accommodation service
       type: string
       maxLength: 24
       enum:
       - hotel
       example: 'hotel'
 
-    Accomodation:
-      description: An accomodation object
+    Accommodation:
+      description: An accommodation object
       type: object
       properties:
 
         name:
-          description: The name of the property or accomodation
+          description: The name of the property or accommodation
           type: string
           example: Comfort Hotel Xpress Stockholm Central
 
         type:
-          $ref: '#/components/schemas/AccomodationType'
+          $ref: '#/components/schemas/AccommodationType'
 
         description:
           description: The description of the property
@@ -852,7 +852,7 @@ components:
           type: string
           enum:
           - transportation
-          - accomodation
+          - accommodation
           - lounge
           - fasttrack
           - parking
@@ -863,7 +863,7 @@ components:
           description: The sub-type of service
           oneOf:
           - $ref: '#/components/schemas/TransportationType'
-          - $ref: '#/components/schemas/AccomodationType'
+          - $ref: '#/components/schemas/AccommodationType'
           example: 'flight'
 
         # The price of the service
@@ -897,20 +897,20 @@ components:
         itinerary:
           $ref: '#/components/schemas/Itinerary'
 
-        # The option of the accomodation being searched
-        accomodation:
-          description: Criteria for the accomodation search
+        # The option of the accommodation being searched
+        accommodation:
+          description: Criteria for the accommodation search
           type: object
           properties:
             location:
               $ref: '#/components/schemas/Location'
             arrival:
               type: string
-              description: arrival day in the accomodation
+              description: arrival day in the accommodation
               format: datetime
             departure:
               type: string
-              description: departure day from the accomodation
+              description: departure day from the accommodation
               format: datetime
 
 
@@ -961,11 +961,11 @@ components:
               additionalProperties:
                 $ref: '#/components/schemas/Segment'
 
-        accomodations:
+        accommodations:
           description: The acomodations matching an search request
           type: object
           additionalProperties:
-            $ref: '#/components/schemas/Accomodation'
+            $ref: '#/components/schemas/Accommodation'
 
         # The service classes involved in the offer
         serviceClasses: