quicktravel_client 1.1.2 → 2.0.0

data/lib/quick_travel/price_changes/price_change.rb

@@ -0,0 +1,23 @@
+module QuickTravel
+  module PriceChanges
+    class PriceChange
+      attr_reader :target
+      attr_reader :original_price, :changed_price, :price_change, :reason
+
+      delegate :positive?, :negative?, to: :price_change
+
+      def initialize(attrs = {})
+        @target = OpenStruct.new(attrs.fetch('target').slice('id', 'type'))
+
+        @original_price = Money.new(attrs.fetch('original_price_in_cents'))
+        @changed_price  = Money.new(attrs.fetch('changed_price_in_cents'))
+        @price_change   = Money.new(attrs.fetch('price_change_in_cents'))
+        @reason         = attrs.fetch('reason')
+      end
+
+      def applied_on?(id, type = 'Reservation')
+        @target.type == type && @target.id == id
+      end
+    end
+  end
+end

data/lib/quick_travel/{discounts/discount_tree.rb → price_changes/price_change_tree.rb}

@@ -1,24 +1,28 @@
 module QuickTravel
-  module Discounts
-    class DiscountTree < Discount
+  module PriceChanges
+    class PriceChangeTree < PriceChange
       attr_reader :root, :children
 
       def initialize(attrs = {})
         super(attrs)
-        @root     = Discount.new(attrs['root'])
+        @root     = PriceChange.new(attrs['root'])
         @children = attrs.fetch('children', []).map do |child_attrs|
-          DiscountTree.new(child_attrs)
+          PriceChangeTree.new(child_attrs)
         end
       end
 
-      def discount_on(id, type = 'Reservation')
+      def price_change_on(id, type = 'Reservation')
         return @root if applied_on?(id, type)
-        find_and_return_on_children { |child| child.discount_on(id, type) }
+        find_and_return_on_children { |child| child.price_change_on(id, type) }
       end
 
-      def total_discount_on(id, type = 'Reservation')
+      def total_price_change_on(id, type = 'Reservation')
         return self if applied_on?(id, type)
-        find_and_return_on_children { |child| child.total_discount_on(id, type) }
+        find_and_return_on_children { |child| child.total_price_change_on(id, type) }
+      end
+
+      def roots
+        [@root] + @children.flat_map(&:roots)
       end
 
       private

data/lib/quick_travel/product.rb

@@ -2,23 +2,7 @@ require 'quick_travel/adapter'
 
 module QuickTravel
   class Product < Adapter
-    attr_accessor :selection_name,
-                  :description,
-                  :capacity,
-                  :available_capacity,
-                  :available,
-                  :error_message
-
-    attr_accessor :price # money_json(bookable_product.price)
-
-    attr_accessor :reservation_attributes
-    attr_accessor :image # is it url?  dunno  =>  json.image bookable_product.image
-    # {url: image_url, desc: image_desc}
-
-    attr_accessor :is_assigned # is it an assigned product -- i.e. reserved...
-    # useful only for extras when going through reservations api
-
-    attr_accessor :extras # more products
+    attr_reader :error_message
 
     self.api_base = '/api/products'
 
@@ -28,8 +12,12 @@ module QuickTravel
     #   passenger_types: {<passenger_type_id> => <num_pax>, ...},
     #   date_range: {start_date: <date>, end_date: <date>}
     def self.find(id, params = {})
-      fail 'Product#find requires passenger_type_numbers' if params[:passenger_type_numbers].blank?
-      fail 'Product#find requires date_range' if params[:date_range].blank?
+      if params[:passenger_type_numbers].blank?
+        fail ArgumentError, 'Product#find requires passenger_type_numbers'
+      end
+      if params[:date_range].blank?
+        fail ArgumentError, 'Product#find requires date_range'
+      end
       super
     end
 
@@ -93,10 +81,9 @@ module QuickTravel
       products_by_resource_id_and_date
     end
 
-    attr_accessor :availability_details
-    attr_accessor :pricing_details,
-                  :pricing_details_for_rack_rate,
-                  :pricing_details_without_rules
+    # needed as captain cook grid cell exepcts them to be defined
+    attr_reader :pricing_details_for_rack_rate,
+                :pricing_details_without_rules
 
     def id
       @reservation_attributes['resource_id']
@@ -142,10 +129,11 @@ module QuickTravel
   end
 
   class PricingDetails < Adapter
-    attr_accessor :minimum_price_in_cents, :minimum_price_with_adjustments_in_cents, :total_adjustments_in_cents
-    attr_accessor :price_per_pax_type, :adjustments_to_apply, :applied_rules
-
-    money :minimum_price, :minimum_price_with_adjustments, :total_adjustments
+    # define to avoid auto definition as money getter
+    # due to _in_cents postfix
+    def adjustments_to_apply_in_cents
+      @adjustments_to_apply_in_cents
+    end
 
     def price_per_pax_type=(pax_type_hash)
       @price_per_pax_type = convert_pax_type_hash(pax_type_hash)
@@ -160,6 +148,5 @@ module QuickTravel
   end
 
   class PricePerPaxType < Adapter
-    attr_accessor :amount_in_cents
   end
 end

data/lib/quick_travel/product_type.rb

@@ -1,21 +1,9 @@
+require 'quick_travel/adapter'
+
 module QuickTravel
   class ProductType < Adapter
-    attr_accessor :book_before_level, :book_before_units, :bookable_online, :can_find_by_location, :confirmation_request_fields, :default_passenger_ticket_format_id, :default_reservation_ticket_format_id
-    attr_accessor :default_vehicle_ticket_format_id, :detailed_template_fields, :disclaimer_id, :durational, :id, :individual_tickets
-    attr_accessor :individual_tickets, :mark_up_cents, :mark_up_definition_id, :mark_up_percent, :mark_up_rack_from_cost, :mark_up_rounding_cents
-    attr_accessor :mark_up_rounding_direction, :maximum_passengers_online, :measure_units_by_pax_count, :multi_leg, :name, :no_ticket
-    attr_accessor :only_bookable_with_accommodation, :overview_template_fields, :prompt_for_pick_up_drop_off, :resource_class_name, :rule_set_id,
-                  :can_have_dates,
-                  :can_have_quantity,
-                  :needs_passengers
-
-    self.api_base = '/product_types'
-
-    def self.all
-      QuickTravel::Cache.cache 'all_product_types' do
-        super
-      end
-    end
+    self.api_base = '/api/product_types'
+    self.lookup = true
 
     def route
       Route.first(id)

data/lib/quick_travel/property.rb

@@ -3,29 +3,12 @@ require 'quick_travel/property_facility'
 
 module QuickTravel
   class Property < Adapter
-    attr_accessor :id, :name,  :check_in, :check_in_instructions, :check_out, :contact_id, :contact_person, :description
-    attr_accessor :location_id, :notes, :star_rating, :tourism_accredited, :availability, :on_request
-    attr_accessor :minimum_available_price_in_cents
-    attr_accessor :graphic # required in property search object
-    attr_accessor :boundary_start, :boundary_end, :season_id # added in API 3.8.*
-    attr_accessor :minimum_bookable_duration
-    attr_accessor :maximum_occupancy
-    attr_accessor :location_name, :region_names, :error
-
-    attr_reader :accommodations
-
-    money :minimum_available_price
+    attr_reader :error
 
     def accommodations=(hash_array)
       @accommodations = hash_array.map { |accommodation_hash| Accommodation.new(accommodation_hash) }
     end
 
-    # This method returns first object of Property based on property id from QuickTravel
-    def self.first(id, options = {})
-      fail ArgumentError.new('Must Specify valid property id') if id.blank? || id.class != Fixnum
-      generic_first("/api/properties/#{id}.json", options)
-    end
-
     # This method returns all objects of property from QuickTravel that match
     #
     # location_id is compulsory param
@@ -41,8 +24,9 @@ module QuickTravel
 
     def self.load_with_pricing(id, options)
       # Find property 'standard' way -- finds price for whole duration
-      property = Property.first(id, options)
-      first_travel_date = options[:product][:first_travel_date]
+      fail ArgumentError.new('Must Specify valid property id') if id.blank? || id.class != Fixnum
+      property = find_all!("/api/properties/#{id}.json", options).first
+      first_travel_date = options.fetch(:product).fetch(:first_travel_date)
       property.accommodations.each do |accommodation|
         accommodation.minimum_nightly_price      = accommodation.nightly_price_on first_travel_date
         accommodation.minimum_price_for_duration = accommodation.minimum_price_on first_travel_date

data/lib/quick_travel/property_facility.rb

@@ -2,6 +2,5 @@ require 'quick_travel/adapter'
 
 module QuickTravel
   class PropertyFacility < Adapter
-    attr_accessor :id, :property_id, :category_id, :created_at, :name, :position, :property_facility_id, :updated_at
   end
 end

data/lib/quick_travel/property_type.rb

@@ -1,20 +1,8 @@
 require 'quick_travel/adapter'
-require 'quick_travel/cache'
 
 module QuickTravel
   class PropertyType < Adapter
-    include Cache
-
-    attr_accessor :id, :name, :position
-
-    def self.first(_id = nil)
-      generic_first('/property_types.json')
-    end
-
-    def self.all
-      QuickTravel::Cache.cache 'all_property_types' do
-        self.find_all!('/property_types.json')
-      end
-    end
+    self.api_base = '/property_types'
+    self.lookup = true
   end
 end

data/lib/quick_travel/region.rb

@@ -1,19 +1,10 @@
 require 'quick_travel/adapter'
-require 'quick_travel/cache'
 
 module QuickTravel
   class Region < Adapter
-    include Cache
-
-    attr_accessor :id, :name, :location_ids
-
     self.api_base = '/regions'
     self.lookup = true
 
-    def self.first
-      generic_first '/regions.json'
-    end
-
     def locations
       Location.all.select { |l| location_ids.include?(l.id) }
     end

data/lib/quick_travel/reservation.rb

@@ -4,23 +4,6 @@ require 'quick_travel/resource'
 
 module QuickTravel
   class Reservation < Adapter
-    attr_accessor :id, :booking_id,
-                  :gross_in_cents, :commission_in_cents, :cost_in_cents, :pre_adjusted_gross_in_cents,
-                  :pre_adjusted_gross_including_packaged_item_in_cents, :gross_including_packaged_item_in_cents, :price_rules,
-                  :first_travel_date, :last_travel_date, :checkout_date, :created_at, :start_time, :end_time,
-                  :resource_id, :resource_class_name, :product_type_id, :product_type_name,
-                  :bed_configuration_id, :inventory_type, :quantity,
-                  :comment, :selection_name,
-                  :service_ids,
-                  :vehicle_splits, :passenger_splits,
-                  :adjustments_attributes,
-                  :inverse_reservation_id,
-                  :from_route_stop_attributes, :to_route_stop_attributes,
-                  :route_id, :trip_id, :route_path, :pick_up_information, :drop_off_information,
-                  :complete, :enough_time_before_travel_to_edit
-
-    money :gross, :commission, :cost, :pre_adjusted_gross, :gross_including_packaged_item, :pre_adjusted_gross_including_packaged_item
-
     def self.create(options)
       json = post_and_validate('/api/reservations.json', options, expect: :json)
       new(json)
@@ -99,10 +82,6 @@ module QuickTravel
       end
     end
 
-    def duration
-      (last_travel_date - first_travel_date + 1).to_i
-    end
-
     def adjusted?
       pre_adjusted_gross_including_packaged_item != gross_including_packaged_item
     end

data/lib/quick_travel/resource.rb

@@ -2,43 +2,22 @@ require 'quick_travel/adapter'
 require 'quick_travel/bed_requirement'
 require 'quick_travel/passenger_price_break'
 require 'quick_travel/product_type'
-require 'quick_travel/cache'
 
 module QuickTravel
   class Resource < Adapter
-    include QuickTravel::Cache
-    attr_accessor :id,
-                  :code,
-                  :name,
-                  :current_description,
-                  :images,
-                  :category,
-                  :property_name,
-                  :product_type_id,
-                  :package_options,
-                  :bed_requirements,
-                  :client_type_ids,
-                  :restrict_to_client_types,
-                  :type
-    self.api_base = '/api/resources'
+    self.api_base = '/resources'
 
     def sub_resources
-      Resource.find_all!('/api/resources.json', parent_resource_id: @id)
+      Resource.find_all!('/resources.json', parent_resource_id: @id)
     end
 
-    def product_type
-      QuickTravel::ProductType.all.detect { |pt| pt.id == product_type_id }
+    def self.all_with_price(opts)
+      find_all!("/api/resources/index_with_price.json",
+                opts.merge(cache: "#{name}.all_with_price-attrs"))
     end
 
-    # this method is also duplicated in accommodation class. because now its room facilities are now also available in property show api call
-    def room_facilities
-      if @_room_facilities.blank?
-        @_room_facilities = []
-        @room_facilities.each do |item|
-          @_room_facilities << RoomFacility.new(item['room_facility'])
-        end
-      end
-      @_room_facilities
+    def product_type
+      QuickTravel::ProductType.find(product_type_id)
     end
 
     def bed_requirements

data/lib/quick_travel/room_facility.rb

@@ -2,6 +2,5 @@ require 'quick_travel/adapter'
 
 module QuickTravel
   class RoomFacility < Adapter
-    attr_accessor :id, :accommodation_id, :category_id, :created_at, :name, :position, :room_facility_id, :updated_at
   end
 end

data/lib/quick_travel/route.rb

@@ -1,12 +1,5 @@
 module QuickTravel
   class Route < Adapter
-    attr_accessor :id, :name, :path, :position, :product_type_id, :reverse_id, :route_stops
-
-    # First route for product_type_id
-    def self.first(product_type_id)
-      generic_first("/product_types/#{product_type_id}/routes.json")
-    end
-
     # find_by_id -- but the API only does lookup by product_type_id
     def self.find_by_route_id_and_product_type_id(route_id, product_type_id)
       all_by_route_ids_and_product_type_id([route_id.to_i], product_type_id).first
@@ -16,26 +9,17 @@ module QuickTravel
     #
     # Initializes with path set
     def self.all_by_route_ids_and_product_type_id(route_ids, product_type_id)
-      all(product_type_id).select do|route|
+      all(product_type_id).select do |route|
         route_ids.include?(route.id.to_i)
       end
     end
 
     # All routes for a given product type
     def self.all(product_type_id)
-      cache_key = "trip_routes_#{product_type_id}"
-      routes = QuickTravel::Cache.cache_store.read(cache_key)
-
-      if routes.blank? || !routes.first.instance_of?(Route) # this is hack for development env. Lazy loading is main issue with it.
-        routes = self.find_all!("/product_types/#{product_type_id}/routes.json")
-        QuickTravel::Cache.cache_store.write(
-          cache_key,
-          routes,
-          expires_in: 1440.minutes # expires_in will only work with something like Rails.cache
-        )
-      end
-
-      routes
+      find_all!("/product_types/#{product_type_id}/routes.json",
+                cache: "QuickTravel::Route.all-#{product_type_id}-attrs",
+                # expires_in will only work with something like Rails.cache
+                cache_options: { expires_in: 1440.minutes })
     end
 
     def self.find(routes_list, route_id)
@@ -50,25 +34,25 @@ module QuickTravel
 
     def get_return_route_stop!(forward_stop)
       if forward_stop.blank?
-        fail AdapterException, 'Selected pick up/drop off stops have not been set up for the selected route.'
+        fail AdapterError, 'Selected pick up/drop off stops have not been set up for the selected route.'
       end
 
       reverse_stop = get_reverse_route!.route_stops.detect { |route_stop| route_stop.name == forward_stop.name }
 
       if reverse_stop.blank?
-        fail AdapterException, 'Selected pick up/drop off stops have not been setup on the reverse route.'
+        fail AdapterError, 'Selected pick up/drop off stops have not been setup on the reverse route.'
       end
       reverse_stop
     end
 
     def get_reverse_route!
       if reverse_id.blank?
-        fail AdapterException, 'Reverse has not been setup for the selected route.'
+        fail AdapterError, 'Reverse has not been setup for the selected route.'
       end
 
       reverse_route = Route.find_by_route_id_and_product_type_id(reverse_id, product_type_id)
       if reverse_route.blank?
-        fail AdapterException, 'Reverse does not exist for the selected route.'
+        fail AdapterError, 'Reverse does not exist for the selected route.'
       end
 
       reverse_route

data/lib/quick_travel/route_stop.rb

@@ -2,6 +2,5 @@ require 'quick_travel/adapter'
 
 module QuickTravel
   class RouteStop < Adapter
-    attr_accessor :id, :name, :address, :code, :position, :route_id
   end
 end

data/lib/quick_travel/service.rb

@@ -1,5 +1,6 @@
+require 'quick_travel/adapter'
+
 module QuickTravel
   class Service < Adapter
-    attr_accessor :id, :capacity, :booked, :weight, :max_weight, :unit_name, :deck_services
   end
 end