Merge pull request #27 from anthonyroux/hotel_v2

Migration from the hotel v1 to hotel v2

Author: anthonyroux

.gitignore

@@ -11,3 +11,5 @@ htmlcov
 _docs
 dist
 build
+.vscode
+env

README.rst

@@ -109,11 +109,11 @@ would be:
 Similarly, to select a resource by ID, you can pass in the ID to the
 singular path.
 
-For example, ``GET /v1/shopping/hotels/123/hotel-offers`` would be:
+For example, ``GET /v2/shopping/hotel-offers/XZY`` would be:
 
 .. code:: py
 
-    amadeus.hotel(123).hotel_offers.get(...)
+    amadeus.shopping.hotel_offer('4BA070CE929E135B3268A9F2D0C51E9D4A6CF318BA10485322FA2C7E78C7852E').get()
 
 You can make any arbitrary API call as well directly with the ``.get``
 method:
@@ -227,7 +227,7 @@ List of supported endpoints
     # Which were the most searched flight destinations from Madrid in August 2017?
     amadeus.travel.analytics.air_traffic.searched.get(originCityCode='MAD', marketCountryCode='ES', searchPeriod='2017-08')
     # How many people in Spain searched for a trip from Madrid to New-York in September 2017?
-   amadeus.travel.analytics.air_traffic.searched_by_destination.get(originCityCode='MAD', destinationCityCode='NYC', marketCountryCode='ES', searchPeriod='2017-08')
+    amadeus.travel.analytics.air_traffic.searched_by_destination.get(originCityCode='MAD', destinationCityCode='NYC', marketCountryCode='ES', searchPeriod='2017-08')
     
     # Flight Most Booked Destinations
     amadeus.travel.analytics.air_traffic.booked.get(originCityCode='MAD', period='2017-08')
@@ -240,13 +240,13 @@ List of supported endpoints
 
     # Hotel Search
     # Get list of Hotels by city code
-    amadeus.shopping.hotel_offers.get(cityCode = 'MAD')
-    # Get list of offers for a specific Hotel
-    amadeus.shopping.hotel('SMPARCOL').hotel_offers.get()
-    # Confirm the availability of a specific offer for a specific Hotel
-    amadeus.shopping.hotel('SMPARCOL').offer('4BA070BA10485322FA2C7E78C7852E').get()
+    amadeus.shopping.hotel_offers.get(cityCode = 'LON')
+    # Get list of offers for a specific hotel
+    amadeus.shopping.hotel_offers_by_hotel.get(hotelId = 'IALONCHO')
+    # Confirm the availability of a specific offer
+    amadeus.shopping.hotel_offer('D5BEE9D0D08B6678C2F5FAD910DC110BCDA187D21D4FCE68ED423426D0A246BB').get()
+
 
- 
 Development & Contributing
 --------------------------
 

amadeus/namespaces/_shopping.py

@@ -3,7 +3,8 @@
 from amadeus.shopping._flight_destinations import FlightDestinations
 from amadeus.shopping._flight_offers import FlightOffers
 from amadeus.shopping._hotel_offers import HotelOffers
-from amadeus.shopping._hotel import Hotel
+from amadeus.shopping._hotel_offers_by_hotel import HotelOffersByHotel
+from amadeus.shopping._hotel_offer import HotelOffer
 
 
 class Shopping(Decorator, object):
@@ -13,9 +14,10 @@ def __init__(self, client):
         self.flight_destinations = FlightDestinations(client)
         self.flight_offers = FlightOffers(client)
         self.hotel_offers = HotelOffers(client)
+        self.hotel_offers_by_hotel = HotelOffersByHotel(client)
 
-    def hotel(self, hotel_id):
-        return Hotel(self.client, hotel_id)
+    def hotel_offer(self, offer_id):
+        return HotelOffer(self.client, offer_id)
 
 
 __all__ = ['FlightDates', 'FlightDestinations', 'FlightOffers']

amadeus/shopping/__init__.py

@@ -2,5 +2,8 @@
 from ._flight_dates import FlightDates
 from ._flight_destinations import FlightDestinations
 from ._hotel_offers import HotelOffers
+from ._hotel_offers_by_hotel import HotelOffersByHotel
+from ._hotel_offer import HotelOffer
 
-__all__ = ['FlightOffers', 'FlightDates', 'FlightDestinations', 'HotelOffers']
+__all__ = ['FlightOffers', 'FlightDates', 'FlightDestinations',
+           'HotelOffers', 'HotelOffersByHotel', 'HotelOffer']

amadeus/shopping/_hotel.py

@@ -0,0 +1,21 @@
+from amadeus.client.decorator import Decorator
+
+
+class HotelOffer(Decorator, object):
+    def __init__(self, client, offer_id):
+        Decorator.__init__(self, client)
+        self.offer_id = offer_id
+
+    def get(self, **params):
+        '''
+        Returns details for a specific offer.
+
+        .. code-block:: python
+
+            amadeus.shopping.hotel_offer('XXX').get
+
+        :rtype: amadeus.Response
+        :raises amadeus.ResponseError: if the request could not be completed
+        '''
+        return self.client.get('/v2/shopping/hotel-offers/{0}'
+                               .format(self.offer_id), **params)

amadeus/shopping/_hotel_offer.py

@@ -6,25 +6,25 @@ def get(self, **params):
         '''
         Search for hotels and retrieve availability and rates information.
 
-        Use either `cityCode`, `longitude` and `latitude` or `hotels` to
+        Use either `cityCode`, `longitude` and `latitude` or `hotelIds` to
         make a search.
 
         .. code-block:: python
 
             amadeus.shopping.hotel_offers.get(cityCode='PAR')
             amadeus.shopping.hotel_offers.get(longitude=49.0, latitude=2.0)
-            amadeus.shopping.hotel_offers.get(hotels='RTPAR001, RTPAR002')
+            amadeus.shopping.hotel_offers.get(hotelIds='RTPAR001, RTPAR002')
 
         :param cityCode: the City IATA code for which to find a hotel, for
             example ``"BOS"`` for Boston.
         :param latitude: latitude of geographic location to search around.
             For example: ``52.5238``
         :param longitude: longitude of geographic location to search around.
             For example: ``13.3835``
-        :param hotels: Comma separated list of Amadeus hotel codes to request.
+        :param hotelIds: Comma separated list of Amadeus hotel codes to request.
             Example: ``RTPAR001``
 
         :rtype: amadeus.Response
         :raises amadeus.ResponseError: if the request could not be completed
         '''
-        return self.client.get('/v1/shopping/hotel-offers', **params)
+        return self.client.get('/v2/shopping/hotel-offers', **params)

amadeus/shopping/_hotel_offers.py

@@ -0,0 +1,19 @@
+from amadeus.client.decorator import Decorator
+
+
+class HotelOffersByHotel(Decorator, object):
+    def get(self, **params):
+        '''
+        Get all offers for Holiday Inn Paris Notre Dame.
+
+        .. code-block:: python
+
+            amadeus.shopping.hotel_offers_by_hotel.get(hotelId='XKPARC12')
+
+        :param hotelId: Amadeus Property Code (8 chars), for
+            example ``XKPARC12``.
+
+        :rtype: amadeus.Response
+        :raises amadeus.ResponseError: if the request could not be completed
+        '''
+        return self.client.get('/v2/shopping/hotel-offers/by-hotel', **params)