Merge pull request #212 from siddydutta/hotel-orders

Add Support for Hotel Booking V2

README.rst

@@ -275,7 +275,15 @@ List of supported endpoints
     # Hotel Name Autocomplete
     amadeus.reference_data.locations.hotel.get(keyword='PARI', subType=[Hotel.HOTEL_GDS, Hotel.HOTEL_LEISURE])
 
-    # Hotel Booking
+    # Hotel Booking v2
+    # The offerId comes from the hotel_offer above
+    amadeus.booking.hotel_orders.post(
+        guests=guests, 
+        travel_agent=travel_agent,
+        room_associations=room_associations,
+        payment=payment)
+
+    # Hotel Booking v1
     # The offerId comes from the hotel_offer above
     amadeus.booking.hotel_bookings.post(offerId, guests, payments)
 

amadeus/booking/__init__.py

@@ -1,5 +1,6 @@
 from ._flight_orders import FlightOrders
 from ._flight_order import FlightOrder
 from ._hotel_bookings import HotelBookings
+from ._hotel_orders import HotelOrders
 
-__all__ = ['FlightOrders', 'FlightOrder', 'HotelBookings']
+__all__ = ['FlightOrders', 'FlightOrder', 'HotelBookings', 'HotelOrders']

amadeus/booking/_hotel_orders.py

@@ -0,0 +1,45 @@
+from amadeus.client.decorator import Decorator
+
+
+class HotelOrders(Decorator, object):
+    def post(self,
+             guests,
+             travel_agent,
+             room_associations=[],
+             payment={},
+             arrival_information={}):
+        '''
+        Book hotel(s) via Hotel Booking API V2
+
+        .. code-block:: python
+
+            amadeus.booking.hotel_orders.post(guests,
+                                              travel_agent,
+                                              room_associations,
+                                              payment,
+                                              arrival_information)
+
+        The parameters guests and room_associations can be passed as dictionary
+        or list of dictionaries. If they are dictionary in this method they are
+        converted to a list of dictionaries.
+
+        :rtype: amadeus.Response
+        :raises amadeus.ResponseError: if the request could not be completed
+        '''
+        guests_info = []
+        room_associations_info = []
+        if not isinstance(guests, list):
+            guests_info.append(guests)
+        else:
+            guests_info.extend(guests)
+        if not isinstance(room_associations, list):
+            room_associations_info.append(room_associations)
+        else:
+            room_associations_info.extend(room_associations)
+        body = {'data': {'type': 'hotel-order',
+                         'guests': guests_info,
+                         'travelAgent': travel_agent,
+                         'roomAssociations': room_associations_info,
+                         'arrivalInformation': arrival_information,
+                         'payment': payment}}
+        return self.client.post('/v2/booking/hotel-orders', body)

amadeus/namespaces/_booking.py

@@ -1,6 +1,7 @@
 from amadeus.booking._flight_orders import FlightOrders
 from amadeus.booking._flight_order import FlightOrder
 from amadeus.booking._hotel_bookings import HotelBookings
+from amadeus.booking._hotel_orders import HotelOrders
 from amadeus.client.decorator import Decorator
 
 
@@ -9,9 +10,10 @@ def __init__(self, client):
         Decorator.__init__(self, client)
         self.flight_orders = FlightOrders(client)
         self.hotel_bookings = HotelBookings(client)
+        self.hotel_orders = HotelOrders(client)
 
     def flight_order(self, flight_order_id):
         return FlightOrder(self.client, flight_order_id)
 
 
-__all__ = ['FlightOrders', 'FlightOrder', 'HotelBookings']
+__all__ = ['FlightOrders', 'FlightOrder', 'HotelBookings', 'HotelOrders']

docs/index.rst

@@ -218,6 +218,10 @@ Booking
 .. autoclass:: amadeus.booking.HotelBookings
   :members: post
 
+.. autoclass:: amadeus.booking.HotelOrders
+  :members: post
+
+
 Schedule/Flights
 ================
 

specs/namespaces/test_namespaces.py

@@ -55,6 +55,7 @@ def test_expected_paths(client):
     assert client.travel.from_base64 is not None
     assert client.booking.flight_orders is not None
     assert client.booking.flight_order is not None
+    assert client.booking.hotel_orders is not None
     assert client.schedule is not None
     assert client.schedule.flights is not None
     assert client.analytics is not None
@@ -435,6 +436,35 @@ def test_shopping_booking_hotel_bookings_post_list(client_setup):
     )
 
 
+def test_booking_hotel_orders_post(client_setup):
+    client_setup.booking.hotel_orders.post({'foo': 'bar'},
+                                           {'bar': 'foo'})
+    client_setup.post.assert_called_with(
+        '/v2/booking/hotel-orders',
+        {'data': {'type': 'hotel-order',
+                  'guests': [{'foo': 'bar'}],
+                  'travelAgent': {'bar': 'foo'},
+                  'roomAssociations': [],
+                  'payment': {},
+                  'arrivalInformation': {}}}
+    )
+
+
+def test_booking_hotel_orders_post_list(client_setup):
+    client_setup.booking.hotel_orders.post([{'foo': 'bar'}],
+                                           {'bar': 'foo'},
+                                           [{'a': 'b'}],)
+    client_setup.post.assert_called_with(
+        '/v2/booking/hotel-orders',
+        {'data': {'type': 'hotel-order',
+                  'guests': [{'foo': 'bar'}],
+                  'travelAgent': {'bar': 'foo'},
+                  'roomAssociations': [{'a': 'b'}],
+                  'payment': {},
+                  'arrivalInformation': {}}}
+    )
+
+
 def test_schedule_flights_get(client_setup):
     client_setup.schedule.flights.get(a='b')
     client_setup.get.assert_called_with(