[booking] added method to retrieve detailed info about hotel rooms (blockAvailability). GetMinPrice method is refactored.

2 files changed, 62 insertions, 26 deletions

diff --git a/tools/python/ResponseProvider.py b/tools/python/ResponseProvider.py
index 550bd820ac..0b8eb176c8 100644
--- a/tools/python/ResponseProvider.py
+++ b/tools/python/ResponseProvider.py
@@ -141,10 +141,9 @@ class ResponseProvider:
                 "/id": self.my_id,
                 "/partners/time": self.partners_time,
                 "/partners/price": self.partners_price,
-                "/booking/min_price": self.partners_minprice,
-                "/booking/min_price.getHotelAvailability": self.partners_minprice,
-                "/booking/min_price/hotelAvailability": self.partners_hotel_availability,
-                "/booking/min_price/deals": self.partners_hotels_with_deals,
+                "/booking/hotelAvailability": self.partners_hotel_availability,
+                "/booking/deals": self.partners_hotels_with_deals,
+                "/booking/blockAvailability": self.partners_block_availability,
                 "/partners/taxi_info": self.partners_yandex_taxi_info,
                 "/partners/get-offers-in-bbox/": self.partners_rent_nearby,
                 "/partners/CalculateByCoords": self.partners_calculate_by_coords,
@@ -222,16 +221,15 @@ class ResponseProvider:
     def partners_price(self):
         return Payload(jsons.PARTNERS_PRICE)
 
-
-    def partners_minprice(self):
-        return Payload(jsons.PARTNERS_MINPRICE)
-
     def partners_hotel_availability(self):
         return Payload(jsons.HOTEL_AVAILABILITY)
 
     def partners_hotels_with_deals(self):
         return Payload(jsons.HOTELS_WITH_DEALS)
 
+    def partners_block_availability(self):
+        return Payload(jsons.BLOCK_AVAILABILITY)
+
     def partners_yandex_taxi_info(self):
         return Payload(jsons.PARTNERS_TAXI_INFO)
 
diff --git a/tools/python/jsons.py b/tools/python/jsons.py
index 68f512b37c..a8c0913b55 100644
--- a/tools/python/jsons.py
+++ b/tools/python/jsons.py
@@ -230,29 +230,67 @@ HOTELS_WITH_DEALS = """
 }
 """
 
-PARTNERS_MINPRICE = """
-[
+BLOCK_AVAILABILITY = """
+{
+  "result": [
     {
-        "hotel_id":"0000000",
-        "currency_code":"USD",
-        "max_price":"5000.00",
-        "ranking":1,
-        "min_price":"250.00",
-        "available_rooms":37,
-        "other_currency": [
+      "direct_payment": true,
+      "checkin": "2018-06-16",
+      "hotel_id": 61394,
+      "block": [
+        {
+          "room_description": "Более просторные апартаменты-студио с кухней открытой планировки, телевизором с плоским экраном и бесплатным Wi-Fi.По запросу предоставляется DVD-плеер.",
+          "taxes": "НДС в размере 7 % , городской налог в размере 5 % ",
+          "rack_rate": {
+            "currency": "EUR",
+            "price": 0,
+            "other_currency": {
+              "currency": "RUB",
+              "price": 0
+            }
+          },
+          "block_id": "6139409_116589412_2_1_0",
+          "max_occupancy": 2,
+          "refundable": false,
+          "breakfast_included": true,
+          "is_smart_deal": false,
+          "incremental_price": [
             {
-                "currency_code":"RUB",
-                "max_price":"250000.00",
-                "min_price":"15000.00"
-            },
+              "other_currency": {
+                "currency": "RUB",
+                "price": 8405.46
+              },
+              "price": 116,
+              "currency": "EUR"
+            }
+          ],
+          "photos": [
             {
-                "currency_code":"ISK",
-                "max_price":"500000.00",
-                "min_price":"30000.00"
+              "url_original": "https://q-xx.bstatic.com/images/hotel/max500/437/43793388.jpg",
+              "photo_id": 43793388,
+              "url_max300": "https://q-xx.bstatic.com/images/hotel/max300/437/43793388.jpg",
+              "url_square60": "https://q-xx.bstatic.com/images/hotel/square60/437/43793388.jpg"
             }
-        ]
+          ],
+          "deposit_required": false,
+          "name": "Синьо Студио 1 - Стоимость не возвращается",
+          "is_last_minute_deal": false,
+          "min_price": {
+            "other_currency": {
+              "currency": "RUB",
+              "price": 8405.46
+            },
+            "price": 116,
+            "currency": "EUR"
+          },
+          "refundable_until": "",
+          "room_id": 6139409
+        }
+      ],
+      "checkout": "2018-06-17"
     }
-]
+  ]
+}
 """
 
 PARTNERS_TAXI_INFO = """