hotel_price 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a22861f4708dba324ef8f028527961fefb087435821d853e95f88dbe9083ebd5
-  data.tar.gz: 28dbdcad4bef039222ca579cb4bb4a2cb8e111aad37653991666b65287ca6517
+  metadata.gz: 0f785c18b6a55388aa61ae8580d92e2ad24c5eee8edf6f996bb5b188b16af1d0
+  data.tar.gz: fc8915c693cde72347f71461deb09bd7ef54e89574d928b9220ca1a7f59ae1b2
 SHA512:
-  metadata.gz: 4c415172a89791a5ab6f469b0ef9c726333d065c411abae4a8490c2edfddd4356f4f38765f3024be89d9e3298d60de5117370503331c51b963176608cb941a77
-  data.tar.gz: 8f177c1d244c7557b0f64533d66a092b864394586388df5f00048b63ce60899c074e36ed11077f7ff5e15e968fb4bdb1496a7584424c8beba072dfb9bb4efb5a
+  metadata.gz: ce184e34ebc4394c1ff7f6f27d951afa5cc0f3b7bb1c78de35a029e14ebf01a50b16256cbae16c1579fc91f1ce3f36f077a9fc352be4f7ede01bde517f137710
+  data.tar.gz: 4b61029941a79252166d53ad2015e55ecddc0dc26396cae1616397a14de39544d685eaea17577634434ef339e60cde9d0b202cdb42743dd77569879579630b92

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hotel_price (0.3.7)
+    hotel_price (0.3.8)
       activesupport (~> 6.0.2.1)
       json (~> 2.3.0)
       nokogiri (~> 1.10.9)

data/lib/hotel_price/rakuten/rakuten_api.rb

@@ -15,10 +15,10 @@ module HotelPrice::Rakuten
       if result["error"] == "not_found"
         {
           date: DateTime.now.strftime("%Y-%m-%d"),
-          checkin_date: params[:checkin_date],
-          rakuten_hotel_id: params[:rakuten_hotel_id],
-          adult_num: params[:adult_num],
-          breakfast: params[:breakfast],
+          checkin_date: checkin_date,
+          rakuten_hotel_id: @config[:rakuten_hotel_id],
+          adult_num: num_adults,
+          breakfast: "",
           plan_num: 0,
           min_price: 0
         }
@@ -27,11 +27,11 @@ module HotelPrice::Rakuten
       else
         {
           date: DateTime.now.strftime("%Y-%m-%d"),
-          checkin_date: result["hotels"][0]["hotel"][1]["roomInfo"][1]["dailyCharge"]["stayDate"],
-          rakuten_hotel_id: params[:rakuten_hotel_id],
+          checkin_date: checkin_date,
+          rakuten_hotel_id: rakuten_hotel_id,
           hotel_name: result["hotels"][0]["hotel"][0]["hotelBasicInfo"]["hotelName"],
-          adult_num: params[:adult_num],
-          breakfast: params[:breakfast],
+          adult_num: num_adults,
+          breakfast: "",
           plan_num: result["pagingInfo"]["recordCount"],
           room_name: result["hotels"][0]["hotel"][1]["roomInfo"][0]["roomBasicInfo"]["roomName"],
           plan_name: result["hotels"][0]["hotel"][1]["roomInfo"][0]["roomBasicInfo"]["planName"],
@@ -41,8 +41,8 @@ module HotelPrice::Rakuten
     end
 
     def make_query_string(rakuten_hotel_id, checkin_date, num_adults)
-      checkout_date = (Date.parse(checkin_date) + 2).strftime("%Y-%m-%d")
-      "format=json&sort=%2BroomCharge&searchPattern=1&applicationId=#{@config[:rakuten_api_key]}&adultNum=#{num_adults}&checkinDate=#{checkin_date}&checkoutDate=#{checkout_date}&squeezeCondition="
+      checkout_date = (Date.parse(checkin_date) + 1).strftime("%Y-%m-%d")
+      "format=json&sort=%2BroomCharge&searchPattern=1&applicationId=#{@config[:rakuten_api_key]}&hotelNo=#{rakuten_hotel_id}&adultNum=#{num_adults}&checkinDate=#{checkin_date}&checkoutDate=#{checkout_date}&squeezeCondition="
     end
 
     def get_min_price params
@@ -103,7 +103,7 @@ module HotelPrice::Rakuten
       return result["error_description"] if result["error"] == "wrong_parameter"
       result["hotels"][0].each do |_key, field|
         field[0].each do |_, value|
-          data_hash = {
+          @data_hash = {
             rakuten_hotel_id: value["hotelNo"],
             hotel_name: value["hotelName"],
             room_price_min: value["hotelMinCharge"],
@@ -125,42 +125,67 @@ module HotelPrice::Rakuten
       end
       result["hotels"][0].each do |_key, field|
         field[1].each do |_, value|
-          data_hash["rakuten_service_review"] = value["serviceAverage"].to_f
-          data_hash["rakuten_location_review"] = value["locationAverage"].to_f
-          data_hash["rakuten_room_review"] = value["roomAverage"].to_f
-          data_hash["rakuten_equipment_review"] = value["equipmentAverage"].to_f
-          data_hash["rakuten_bath_review"] = value["bathAverage"].to_f
-          data_hash["rakuten_meal_review"] = value["mealAverage"].to_f
+          @data_hash["rakuten_service_review"] = value["serviceAverage"].to_f
+          @data_hash["rakuten_location_review"] = value["locationAverage"].to_f
+          @data_hash["rakuten_room_review"] = value["roomAverage"].to_f
+          @data_hash["rakuten_equipment_review"] = value["equipmentAverage"].to_f
+          @data_hash["rakuten_bath_review"] = value["bathAverage"].to_f
+          @data_hash["rakuten_meal_review"] = value["mealAverage"].to_f
         end
       end
       result["hotels"][0].each do |_key, field|
         field[2].each do |_, value|
-          data_hash["middle_class_code"] = value["middleClassCode"].to_s
-          data_hash["small_class_code"] = value["smallClassCode"].to_s
-          data_hash["area_name"] = value["areaName"].to_s
-          data_hash["hotel_class_code"] = value["hotelClassCode"].to_s
-          data_hash["checkin_time"] = value["checkinTime"].to_s
-          data_hash["checkout_time"] = value["checkoutTime"].to_s
-          data_hash["last_checkin_time"] = value["lastCheckinTime"].to_s
+          @data_hash["middle_class_code"] = value["middleClassCode"].to_s
+          @data_hash["small_class_code"] = value["smallClassCode"].to_s
+          @data_hash["area_name"] = value["areaName"].to_s
+          @data_hash["hotel_class_code"] = value["hotelClassCode"].to_s
+          @data_hash["checkin_time"] = value["checkinTime"].to_s
+          @data_hash["checkout_time"] = value["checkoutTime"].to_s
+          @data_hash["last_checkin_time"] = value["lastCheckinTime"].to_s
         end
       end
       result["hotels"][0].each do |_key, field|
         field[3].each do |_, value|
-          data_hash["total_room_num"] = value["hotelRoomNum"].to_s
+          @data_hash["total_room_num"] = value["hotelRoomNum"].to_s
           room_facilities = []
           value["roomFacilities"].each_with_index do |f, i|
             room_facilities[i] = f["item"]
           end
-          data_hash["room_facilities"] = room_facilities
+          @data_hash["room_facilities"] = room_facilities
         end
       end
       result["hotels"][0].each do |_key, field|
         field[4].each do |_, value|
-          data_hash["hotel_policy_note"] = value["note"].to_s
-          data_hash["cancel_policy"] = value["cancelPolicy"].to_s
+          @data_hash["hotel_policy_note"] = value["note"].to_s
+          @data_hash["cancel_policy"] = value["cancelPolicy"].to_s
         end
       end
-      data_hash
+      @data_hash
+    end
+
+    def search_ranking(params = {})
+      body = {
+        middle_class_code: params[:middle_class_code],
+        small_class_code: params[:small_class_code],
+        detail_class_code: params[:detail_class_code],
+        page_num: params[:page_num]
+      }
+      url = "https://app.rakuten.co.jp/services/api/Travel/SimpleHotelSearch/20170426?applicationId=#{@config[:rakuten_api_key]}&largeClassCode=japan&middleClassCode=#{body[:middle_class_code]}&smallClassCode=#{body[:small_class_code]}&detailClassCode=#{body[:detail_class_code]}&page=#{body[:page_num]}"
+      uri = URI.parse(url)
+      json = Net::HTTP.get(uri)
+      result = JSON.parse(json)
+      @i = 1
+      result["hotels"].each do |key, _value|
+        if @config[:rakuten_hotel_id] == key["hotel"][0]["hotelBasicInfo"]["hotelNo"].to_s
+          return {
+            area_rank: @i.to_i + ((body[:page_num].to_i - 1) * 30),
+            hotel_name: key["hotel"][0]["hotelBasicInfo"]["hotelName"],
+            status: "found"
+          }
+        end
+        @i += 1
+      end
+      { status: "no" }
     end
   end
 end

data/lib/hotel_price/rakuten/rakuten_console.rb

@@ -10,7 +10,7 @@ module HotelPrice::Rakuten
       options = Selenium::WebDriver::Firefox::Options.new
       options.add_argument("-headless")
       @wait = Selenium::WebDriver::Wait.new(:timeout => 100)
-      @driver = Selenium::WebDriver.for :firefox, options: options
+      @driver = Selenium::WebDriver.for :firefox#, options: options
       if @config[:chain]
         go_to_management_page_chain
       else

data/lib/hotel_price/version.rb

@@ -1,3 +1,3 @@
 module HotelPrice
-  VERSION = "0.3.8"
+  VERSION = "0.3.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hotel_price
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Fumitake Kawasaki