quicktravel_client 1.1.2 → 2.0.0

data/lib/quick_travel/adjustment.rb

@@ -2,7 +2,5 @@ require 'quick_travel/adapter'
 
 module QuickTravel
   class Adjustment < Adapter
-    attr_accessor :id, :description, :gross_in_cents
-    money :gross
   end
 end

data/lib/quick_travel/bed_configuration.rb

@@ -2,6 +2,5 @@ require 'quick_travel/adapter'
 
 module QuickTravel
   class BedConfiguration < Adapter
-    attr_accessor :created_at, :creator_id, :id, :name, :overriding_fare_basis_pointer_id, :resource_id, :updated_at, :updator_id
   end
 end

data/lib/quick_travel/bed_requirement.rb

@@ -2,6 +2,5 @@ require 'quick_travel/adapter'
 
 module QuickTravel
   class BedRequirement < Adapter
-    attr_accessor :id, :name, :single_bed_count, :double_bed_count
   end
 end

data/lib/quick_travel/booking.rb

@@ -3,24 +3,10 @@ require 'quick_travel/passenger'
 require 'quick_travel/vehicle'
 require 'quick_travel/payment'
 require 'quick_travel/payment_type'
-require 'quick_travel/discounts'
+require 'quick_travel/price_changes'
 
 module QuickTravel
   class Booking < Adapter
-    attr_accessor :reference, :state, :client_id, :first_travel_date, :created_at, :access_token
-    attr_accessor :gross_in_cents, :commission_in_cents, :cost_in_cents, :balance_in_cents, :paid_in_cents, :surcharge_in_cents
-    attr_accessor :deposit_in_cents, :deposit_due_on, :deposit_relevant
-
-    attr_accessor :id # booking_id. I am initializing this data member when we create booking.
-    attr_accessor :client_address, :client_party, :client_contact,
-                  :customer_contact_name, :customer_contact_phone, :customer_contact_mobile, :customer_contact_email,
-                  :post_code, :country_id, :referral_code_id,
-                  :discardable_in, :inactivatable_in,
-                  :promo_code, :web_site_name,
-                  :insurance_offered, :public_comments
-
-    money :gross, :balance, :commission, :paid, :surcharge, :deposit
-
     def self.api_base
       '/api/bookings'
     end
@@ -55,15 +41,7 @@ module QuickTravel
     end
 
     def country
-      Country.find(@country_id)
-    end
-
-    def deposit_due_on
-      @deposit_due_on_parsed ||= parse_date(@deposit_due_on)
-    end
-
-    def balance_due_on
-      @balance_due_on_parsed ||= parse_date(@balance_due_on)
+      Country.find(@country_id) if @country_id
     end
 
     # Create an empty booking
@@ -83,7 +61,7 @@ module QuickTravel
       options = { booking: default_options.merge(options) }
 
       response = post_and_validate("#{api_base}.json", options)
-      fail AdapterException.new(response) unless response['id']
+      fail AdapterError.new(response) unless response['id']
 
       return nil unless response['id']
       Booking.new(response)
@@ -93,7 +71,7 @@ module QuickTravel
     def update(options = {})
       response = put_and_validate("#{api_base}/#{@id}.json", booking: options)
       # id is returned if other attributes change otherwise success: true
-      fail AdapterException.new(response) unless response['id'] || response['success']
+      fail AdapterError.new(response) unless response['id'] || response['success']
 
       Booking.find(@id)
     end
@@ -108,7 +86,7 @@ module QuickTravel
     def update_with_nested_attributes!(booking_args = {})
       response = put_and_validate("#{api_base}/#{@id}/update_with_nested_attributes.json",
                                   booking: booking_args)
-      fail AdapterException.new(response) unless response['id']
+      fail AdapterError.new(response) unless response['id']
       Booking.find(response['id'])
     end
 
@@ -142,7 +120,7 @@ module QuickTravel
     # }
     def accommodation_reserve(reservations_options = {})
       if reservations_options[:last_travel_date].nil?
-        fail AdapterException.new('No checkout date specified')
+        fail AdapterError.new('No checkout date specified')
       end
 
       last_travel_date = Date.strptime(reservations_options[:last_travel_date], '%d/%m/%Y')
@@ -203,7 +181,7 @@ module QuickTravel
 
     def delete_reservation_by_id(reservation_id)
       if state != 'new'
-        fail AdapterException.new('Reservation cannot be deleted unless the booking is new')
+        fail AdapterError.new('Reservation cannot be deleted unless the booking is new')
       end
 
       delete_and_validate("#{api_base}/#{@id}/reservations/#{reservation_id}.json")
@@ -247,7 +225,7 @@ module QuickTravel
     # It returns booking items for a booking.
     # Array of BookingItem
     def reservations
-      fail AdapterException, 'Reservations have not been set from API' if @reservations_attributes.nil?
+      fail AdapterError, 'Reservations have not been set from API' if @reservations_attributes.nil?
       @_reservations_object_array ||= @reservations_attributes.map { |item| Reservation.new(item) }
     end
 
@@ -256,18 +234,22 @@ module QuickTravel
     end
 
     def client_address
+      return nil unless @client_address
       @client_address_object ||= Address.new(@client_address)
     end
 
     def client_party
+      return nil unless @client_party
       @client_party_object ||= Party.new(@client_party)
     end
 
     def client_contact
+      return nil unless @client_contact
       @client_contact_object ||= Contact.new(@client_contact)
     end
 
     def client
+      return nil unless @client
       @client_object ||= Client.new(@client)
     end
 
@@ -314,20 +296,19 @@ module QuickTravel
       (balance_in_cents == 0 && state != 'new' && !reservations.empty?) || state == 'quote'
     end
 
-    def discount
-      @discount ||= fetch_discount
+    def price_change
+      @price_change ||= fetch_price_change
     end
 
-    def discount_on(reservation)
-      discount.discount_on(reservation.id)
+    def price_change_on(reservation)
+      price_change.price_change_on(reservation.id)
     end
 
-    def total_discount_on(reservation)
-      discount.total_discount_on(reservation.id)
+    def total_price_change_on(reservation)
+      price_change.total_price_change_on(reservation.id)
     end
 
-    def calculate_price_quote(segments = {})
-      params = segments.merge(segments: segments.keys)
+    def calculate_price_quote(params = {})
       response = post_and_validate("#{api_base}/#{@id}/price_quotes/calculate", params)
       Money.new(response['quoted_booking_gross_in_cents'])
     end
@@ -357,14 +338,9 @@ module QuickTravel
 
     private
 
-    def parse_date(hash)
-      return if hash.blank? || hash['_value'].blank?
-      hash['_value'].to_date
-    end
-
-    def fetch_discount
-      attributes = get_and_validate("#{api_base}/#{@id}/discount.json")
-      QuickTravel::Discounts::BookingDiscount.new(attributes)
+    def fetch_price_change
+      attributes = get_and_validate("#{api_base}/#{@id}/price_change.json")
+      QuickTravel::PriceChanges::BookingPriceChange.new(attributes)
     end
   end
 end

data/lib/quick_travel/cache.rb

@@ -13,26 +13,20 @@ module QuickTravel
       yield.tap { |value| cache_store.write(key, value, cache_options) }
     end
 
-    def self.cache_store
-      @@cache_store
+    def self.delete(key)
+      cache_store.delete(key)
     end
 
-    def self.cache_store=(store)
-      @@cache_store = store
+    def self.clear
+      cache_store.clear
     end
-  end
 
-  class DefaultCacheStore
-    def initialize
-      @store = {}
-    end
-
-    def write(key, value)
-      @store[key] = value
+    def self.cache_store
+      @@cache_store
     end
 
-    def read(key)
-      @store[key]
+    def self.cache_store=(store)
+      @@cache_store = store
     end
   end
 end

data/lib/quick_travel/checkout.rb

@@ -45,7 +45,7 @@ module QuickTravel
       attrs[:completed] = (attrs['progress'] == 'completed')
       attrs[:successful] = attrs[:completed]
       attrs
-    rescue AdapterException => e
+    rescue AdapterError => e
       {
         completed:  true,
         successful: false,

data/lib/quick_travel/client.rb

@@ -1,8 +1,6 @@
+require 'quick_travel/adapter'
+
 module QuickTravel
   class Client < Adapter
-    attr_accessor :id, :party_id, :surchargeless, :client_type,
-                  :contact_phone, :contact_mobile, :contact_email,
-                  :name,
-                  :first_name, :last_name
   end
 end

data/lib/quick_travel/client_type.rb

@@ -1,6 +1,7 @@
+require 'quick_travel/adapter'
+
 module QuickTravel
   class ClientType < Adapter
-    attr_accessor :id, :name, :agent, :position, :right_id
     self.api_base = '/client_types'
   end
 end

data/lib/quick_travel/connection_error.rb

@@ -1,5 +1,5 @@
 module QuickTravel
-  class ConnectionError < Exception
+  class ConnectionError < StandardError
     attr_reader :original
     def initialize(msg, original = $ERROR_INFO)
       super(msg)

data/lib/quick_travel/constants.rb

@@ -9,7 +9,6 @@ module QuickTravel
 
   # System wide
   PROPERTY_CACHE_TIMEOUT = 1440 # minutes
-  AUSTRALIA_COUNTRY_ID = 14
   QT_DATE_FORMAT = '%d-%m-%Y'
 
   DEFAULT_REFERRAL_CODE_ID = 33

data/lib/quick_travel/contact.rb

@@ -1,5 +1,4 @@
 module QuickTravel
   class Contact < Adapter
-    attr_accessor :phone, :email, :id
   end
 end

data/lib/quick_travel/country.rb

@@ -1,10 +1,7 @@
 require 'quick_travel/adapter'
-require 'quick_travel/cache'
 
 module QuickTravel
   class Country < Adapter
-    attr_accessor :id, :iso_3166_code, :name, :latitude, :longitude
-
     self.api_base = '/api/countries'
     self.lookup = true
   end

data/lib/quick_travel/document.rb

@@ -2,8 +2,6 @@ require 'quick_travel/adapter'
 
 module QuickTravel
   class Document < Adapter
-    attr_accessor :id, :booking_id, :name
-
     self.api_base = "/front_office/bookings/#{@booking_id}/documents"
 
     # We used to direct the browser to QT directly

data/lib/quick_travel/document_group.rb

@@ -3,8 +3,6 @@ require 'quick_travel/encrypt'
 
 module QuickTravel
   class DocumentGroup < Adapter
-    attr_accessor :id, :booking_id
-
     self.api_base = "/front_office/bookings/#{@booking_id}/document_groups"
 
     def pdf_url

data/lib/quick_travel/location.rb

@@ -2,8 +2,6 @@ require 'quick_travel/adapter'
 
 module QuickTravel
   class Location < Adapter
-    attr_accessor :id, :name, :region_ids
-
     self.api_base = '/locations'
     self.lookup = true
 

data/lib/quick_travel/party.rb

@@ -2,20 +2,13 @@ module QuickTravel
   class Party < Adapter
     LOGIN_URL = '/login.json'
 
-    attr_accessor :id, :type, :name, :login, :title, :first_name, :last_name, :gender, :active, :internal_staff, :display_name
-
-    attr_accessor :client_id, :vendor_id
-    attr_accessor :surchargeable
-    attr_accessor :client_type_id, :client_type_name, :client_type_is_agent
-    attr_accessor :default_web_user, :rights
-
-    attr_accessor :phone, :mobile, :email   # if has a contact
-    attr_accessor :post_code, :country_id   # if has an address
+    attr_reader :phone, :mobile, :email   # if has a contact
+    attr_reader :post_code, :country_id   # if has an address
 
     def initialize(hash = {})
       super
       if type.blank?
-        self.type = 'Person'
+        @type = 'Person'
       end
     end
 
@@ -30,7 +23,9 @@ module QuickTravel
     # @returns: Party: Valid Credentials
     #          Nil: Invalid Credentialss
     def self.login(options = { login: nil, password: nil })
-      fail 'You must specify :login and :password' unless options[:login] && options[:password]
+      unless options[:login] && options[:password]
+        fail ArgumentError, 'You must specify :login and :password'
+      end
       response = post_and_validate(LOGIN_URL, options)
       Party.new(response) unless response[:error]
     end
@@ -42,7 +37,7 @@ module QuickTravel
 
     def self.set_password_via_token(token, password)
       post_and_validate('/sessions/set_password_via_token', token: token, password: password)
-    rescue QuickTravel::AdapterException => e
+    rescue QuickTravel::AdapterError => e
       { error: e.message }
     end
   end

data/lib/quick_travel/passenger.rb

@@ -2,6 +2,5 @@ require 'quick_travel/adapter'
 
 module QuickTravel
   class Passenger < Adapter
-    attr_accessor :id, :passenger_type_id, :age, :gender, :title, :first_name, :last_name, :details, :passenger_type_name
   end
 end

data/lib/quick_travel/passenger_price_break.rb

@@ -2,7 +2,5 @@ require 'quick_travel/adapter'
 
 module QuickTravel
   class PassengerPriceBreak < Adapter
-    attr_accessor :amount_in_cents
-    money :amount
   end
 end

data/lib/quick_travel/passenger_type.rb

@@ -2,8 +2,6 @@ require 'quick_travel/adapter'
 
 module QuickTravel
   class PassengerType < Adapter
-    attr_accessor :age_range_required, :default_age, :id, :maximum_age, :minimum_age, :name, :position, :code
-
     self.api_base = '/passenger_types'
     self.lookup = true
 

data/lib/quick_travel/payment.rb

@@ -3,9 +3,6 @@ require 'quick_travel/credit_card'
 
 module QuickTravel
   class Payment < Adapter
-    attr_accessor :id, :payment_type_id, :amount_in_cents, :authorization, :success, :created_at
-    money :amount
-
     def payment_type
       QuickTravel::PaymentType.find(@payment_type_id)
     end

data/lib/quick_travel/payment_type.rb

@@ -3,19 +3,6 @@ require 'quick_travel/cache'
 
 module QuickTravel
   class PaymentType < Adapter
-    attr_accessor :id,
-                  :name,
-                  :description,
-                  :position,
-                  :active,
-                  :payment_method,
-                  :for_frequent_traveller_redemption,
-                  :notes,
-                  :surchargeable,
-                  :transaction_fee,
-                  :redirect,
-                  :credit_card_brand
-
     self.api_base = '/payment_types'
     self.lookup = true
 
@@ -34,5 +21,9 @@ module QuickTravel
     def as_json(options = nil)
       super.merge(code: code)
     end
+
+    def self.information
+      get_and_validate('/api/payment_types/information.json')
+    end
   end
 end

data/lib/quick_travel/price_changes.rb

@@ -0,0 +1,3 @@
+require 'quick_travel/price_changes/price_change'
+require 'quick_travel/price_changes/price_change_tree'
+require 'quick_travel/price_changes/booking_price_change'

data/lib/quick_travel/price_changes/booking_price_change.rb

@@ -0,0 +1,30 @@
+module QuickTravel
+  module PriceChanges
+    class BookingPriceChange < PriceChangeTree
+      def initialize(attrs = {})
+        super(
+          attrs.merge(
+            'root'     => attrs,
+            'children' => attrs['reservation_price_changes']
+          )
+        )
+      end
+
+      def reservation_price_changes
+        @children
+      end
+
+      def discounts
+        price_changes.select(&:negative?)
+      end
+
+      def surcharges
+        price_changes.select(&:positive?)
+      end
+
+      def price_changes
+        @children.flat_map(&:roots)
+      end
+    end
+  end
+end