killbill 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1317a97f82ee47ef1edb43f6ae039412692e9796
-  data.tar.gz: 6d2dac9de214407b21145f82a6e11a6c5c039f9d
+  metadata.gz: 9b3dc2f6f6f18ecb0b78208ee9b4866ab4e64135
+  data.tar.gz: 67e7e0f1fc22c8bd8ac6f673226a281ee77a6d44
 SHA512:
-  metadata.gz: a9afc87e7362830ccd361ada67e17d7195c5b23145aa32044036d5c48b866da55a94994e7dceaaf2c3f5858c4ecf21c6fe4c5c5dcf7106cfd585b27b590ffc05
-  data.tar.gz: a6d19179afdf5241037b95984d3eff53d08bd68fba3783a2103036b4b23dacbc1dd5dc241f25138887bd519d0c586557f14bdbb045a8ae3200c8566b5f211479
+  metadata.gz: a0a93615aea2fbfe61c7239ff7ebce66c6c281ee49f085b20f04718e0994fb32ecc02bc426150665c0e5a25ea1c5061f251bb3ea259780e29c5dd252f1be7373
+  data.tar.gz: 54bf15ca7cf02ab75b3644da9bdb4101a04d58439b0d0deccf12736e3f4cc1231370cd29ae806d3293e205fa1a48b108a75a72060d179be97ccbb08b9a6e9033

data/NEWS

@@ -1,3 +1,7 @@
+3.1.2
+    Make ActiveMerchant plugins multi-tenant
+    Add support for ActiveMerchant integrations
+
 3.1.1
     Regenerate files for killbill-api 0.9.5 and killbill-plugin-api 0.7.2
 

data/VERSION

@@ -1 +1 @@
-3.1.1
+3.1.2

data/generators/active_merchant/templates/db/ddl.sql.rb

@@ -1,6 +1,5 @@
 CREATE TABLE `<%= identifier %>_payment_methods` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `kb_account_id` varchar(255) NOT NULL,
   `kb_payment_method_id` varchar(255) DEFAULT NULL,
   `token` varchar(255) DEFAULT NULL,
   `cc_first_name` varchar(255) DEFAULT NULL,
@@ -24,6 +23,8 @@ CREATE TABLE `<%= identifier %>_payment_methods` (
   `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
   `created_at` datetime NOT NULL,
   `updated_at` datetime NOT NULL,
+  `kb_account_id` varchar(255) DEFAULT NULL,
+  `kb_tenant_id` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `index_<%= identifier %>_payment_methods_on_kb_account_id` (`kb_account_id`),
   KEY `index_<%= identifier %>_payment_methods_on_kb_payment_method_id` (`kb_payment_method_id`)
@@ -39,6 +40,8 @@ CREATE TABLE `<%= identifier %>_transactions` (
   `currency` varchar(255) NOT NULL,
   `created_at` datetime NOT NULL,
   `updated_at` datetime NOT NULL,
+  `kb_account_id` varchar(255) NOT NULL,
+  `kb_tenant_id` varchar(255) NOT NULL,
   PRIMARY KEY (`id`),
   KEY `index_<%= identifier %>_transactions_on_kb_payment_id` (`kb_payment_id`)
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
@@ -60,5 +63,7 @@ CREATE TABLE `<%= identifier %>_responses` (
   `success` tinyint(1) DEFAULT NULL,
   `created_at` datetime NOT NULL,
   `updated_at` datetime NOT NULL,
+  `kb_account_id` varchar(255) DEFAULT NULL,
+  `kb_tenant_id` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;

data/generators/active_merchant/templates/db/schema.rb

@@ -2,7 +2,6 @@ require 'active_record'
 
 ActiveRecord::Schema.define(:version => 20140410153635) do
   create_table "<%= identifier %>_payment_methods", :force => true do |t|
-    t.string   "kb_account_id",            :null => false
     t.string   "kb_payment_method_id"      # NULL before Kill Bill knows about it
     t.string   "token"                     # <%= identifier %> id
     t.string   "cc_first_name"
@@ -26,6 +25,8 @@ ActiveRecord::Schema.define(:version => 20140410153635) do
     t.boolean  "is_deleted",               :null => false, :default => false
     t.datetime "created_at",               :null => false
     t.datetime "updated_at",               :null => false
+    t.string   "kb_account_id"
+    t.string   "kb_tenant_id"
   end
 
   add_index(:<%= identifier %>_payment_methods, :kb_account_id)
@@ -40,6 +41,8 @@ ActiveRecord::Schema.define(:version => 20140410153635) do
     t.string   "currency",                       :null => false
     t.datetime "created_at",                     :null => false
     t.datetime "updated_at",                     :null => false
+    t.string   "kb_account_id",                  :null => false
+    t.string   "kb_tenant_id",                   :null => false
   end
 
   add_index(:<%= identifier %>_transactions, :kb_payment_id)
@@ -60,5 +63,7 @@ ActiveRecord::Schema.define(:version => 20140410153635) do
     t.boolean  "success"
     t.datetime "created_at",        :null => false
     t.datetime "updated_at",        :null => false
+    t.string   "kb_account_id"
+    t.string   "kb_tenant_id"
   end
 end

data/generators/active_merchant/templates/lib/api.rb

@@ -20,7 +20,7 @@ module Killbill #:nodoc:
         options = {}
 
         properties = merge_properties(properties, options)
-        super(kb_account_id, kb_payment_id, kb_payment_method_id, amount, currency, context, properties)
+        super(kb_account_id, kb_payment_id, kb_payment_method_id, amount, currency, properties, context)
       end
 
       def capture_payment(kb_account_id, kb_payment_id, kb_payment_method_id, amount, currency, properties, context)
@@ -103,16 +103,36 @@ module Killbill #:nodoc:
         super
       end
 
-      def reset_payment_methods(kb_account_id, payment_methods, properties)
+      def reset_payment_methods(kb_account_id, payment_methods, properties, context)
         super
       end
 
       def build_form_descriptor(kb_account_id, descriptor_fields, properties, context)
-        super
+        # Pass extra parameters for the gateway here
+        options = {}
+        properties = merge_properties(properties, options)
+
+        # Add your custom static hidden tags here
+        options = {
+            #:token => config[:<%= identifier %>][:token]
+        }
+        descriptor_fields = merge_properties(descriptor_fields, options)
+
+        super(kb_account_id, descriptor_fields, properties, context)
       end
 
       def process_notification(notification, properties, context)
-        super
+        # Pass extra parameters for the gateway here
+        options = {}
+        properties = merge_properties(properties, options)
+
+        super(notification, properties, context) do |gw_notification, service|
+          # Retrieve the payment
+          # gw_notification.kb_payment_id =
+          #
+          # Set the response body
+          # gw_notification.entity =
+        end
       end
     end
   end

data/generators/active_merchant/templates/lib/application.rb

@@ -8,10 +8,10 @@ configure do
   # Usage: rackup -Ilib -E test
   if development? or test?
     # Make sure the plugin is initialized
-    plugin = ::Killbill::<%= class_name %>::PaymentPlugin.new
-    plugin.logger = Logger.new(STDOUT)
+    plugin              = ::Killbill::<%= class_name %>::PaymentPlugin.new
+    plugin.logger       = Logger.new(STDOUT)
     plugin.logger.level = Logger::INFO
-    plugin.conf_dir = File.dirname(File.dirname(__FILE__)) + '/..'
+    plugin.conf_dir     = File.dirname(File.dirname(__FILE__)) + '/..'
     plugin.start_plugin
   end
 end
@@ -28,23 +28,23 @@ end
 
 # curl -v http://127.0.0.1:9292/plugins/killbill-<%= identifier %>/form
 get '/plugins/killbill-<%= identifier %>/form', :provides => 'html' do
-  order_id = request.GET['order_id']
+  order_id   = request.GET['order_id']
   account_id = request.GET['account_id']
-  options = {
-      :amount => request.GET['amount'],
-      :currency => request.GET['currency'],
-      :test => request.GET['test'],
-      :credential2 => request.GET['credential2'],
-      :credential3 => request.GET['credential3'],
-      :credential4 => request.GET['credential4'],
-      :country => request.GET['country'],
-      :account_name => request.GET['account_name'],
+  options    = {
+      :amount           => request.GET['amount'],
+      :currency         => request.GET['currency'],
+      :test             => request.GET['test'],
+      :credential2      => request.GET['credential2'],
+      :credential3      => request.GET['credential3'],
+      :credential4      => request.GET['credential4'],
+      :country          => request.GET['country'],
+      :account_name     => request.GET['account_name'],
       :transaction_type => request.GET['transaction_type'],
-      :authcode => request.GET['authcode'],
-      :notify_url => request.GET['notify_url'],
-      :return_url => request.GET['return_url'],
-      :redirect_param => request.GET['redirect_param'],
-      :forward_url => request.GET['forward_url']
+      :authcode         => request.GET['authcode'],
+      :notify_url       => request.GET['notify_url'],
+      :return_url       => request.GET['return_url'],
+      :redirect_param   => request.GET['redirect_param'],
+      :forward_url      => request.GET['forward_url']
   }
 
   @form = plugin(session).payment_form_for(order_id, account_id, :<%= identifier %>, options) do |service|
@@ -81,4 +81,4 @@ get '/plugins/killbill-<%= identifier %>/1.0/responses/:id', :provides => 'json'
   else
     status 404
   end
-end
+end

data/generators/active_merchant/templates/lib/models/payment_method.rb

@@ -4,9 +4,10 @@ module Killbill #:nodoc:
 
       self.table_name = '<%= identifier %>_payment_methods'
 
-      def self.from_response(kb_account_id, kb_payment_method_id, cc_or_token, response, options, extra_params = {})
+      def self.from_response(kb_account_id, kb_payment_method_id, kb_tenant_id, cc_or_token, response, options, extra_params = {})
         super(kb_account_id,
               kb_payment_method_id,
+              kb_tenant_id,
               cc_or_token,
               response,
               options,

data/generators/active_merchant/templates/lib/models/response.rb

@@ -6,9 +6,11 @@ module Killbill #:nodoc:
 
       has_one :<%= identifier %>_transaction
 
-      def self.from_response(api_call, kb_payment_id, response, extra_params = {})
+      def self.from_response(api_call, kb_account_id, kb_payment_id, kb_tenant_id, response, extra_params = {})
         super(api_call,
+              kb_account_id,
               kb_payment_id,
+              kb_tenant_id,
               response,
               {
                   # Pass custom key/values here

data/generators/active_merchant/templates/plugin.gemspec.rb

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
 
   s.rdoc_options << '--exclude' << '.'
 
-  s.add_dependency 'killbill', '~> 3.1.0'
+  s.add_dependency 'killbill', '~> 3.1.2'
   s.add_dependency 'activemerchant', '~> 1.42.9'
   s.add_dependency 'activerecord', '~> 4.1.0'
   s.add_dependency 'actionpack', '~> 4.1.0'

data/generators/active_merchant/templates/spec/base_plugin_spec.rb

@@ -14,10 +14,11 @@ describe Killbill::<%= class_name %>::PaymentPlugin do
       eos
       file.close
 
-      @plugin = Killbill::<%= class_name %>::PaymentPlugin.new
-      @plugin.logger = Logger.new(STDOUT)
+      @plugin              = Killbill::<%= class_name %>::PaymentPlugin.new
+      @plugin.logger       = Logger.new(STDOUT)
       @plugin.logger.level = Logger::INFO
-      @plugin.conf_dir = File.dirname(file)
+      @plugin.conf_dir     = File.dirname(file)
+      @plugin.kb_apis      = Killbill::Plugin::KillbillApi.new('<%= identifier %>', {})
 
       # Start the plugin here - since the config file will be deleted
       @plugin.start_plugin
@@ -27,4 +28,32 @@ describe Killbill::<%= class_name %>::PaymentPlugin do
   it 'should start and stop correctly' do
     @plugin.stop_plugin
   end
+
+  it 'should generate forms correctly' do
+    kb_account_id = SecureRandom.uuid
+    kb_tenant_id  = SecureRandom.uuid
+    context       = @plugin.kb_apis.create_context(kb_tenant_id)
+    fields        = @plugin.hash_to_properties({
+                                                   :order_id => '1234',
+                                                   :amount   => 10
+                                               })
+    form          = @plugin.build_form_descriptor kb_account_id, fields, [], context
+
+    form.kb_account_id.should == kb_account_id
+    form.form_method.should == 'POST'
+    form.form_url.should == 'https://<%= identifier %>.com'
+
+    form_fields = @plugin.properties_to_hash(form.form_fields)
+  end
+
+  it 'should receive notifications correctly' do
+    description    = 'description'
+
+    kb_tenant_id = SecureRandom.uuid
+    context      = @plugin.kb_apis.create_context(kb_tenant_id)
+    properties   = @plugin.hash_to_properties({ :description => description })
+
+    notification    = ""
+    gw_notification = @plugin.process_notification notification, properties, context
+  end
 end

data/lib/killbill/gen/plugin-api/payment_plugin_api.rb

@@ -647,8 +647,8 @@ module Killbill
           end
         end
 
-        java_signature 'Java::void resetPaymentMethods(Java::java.util.UUID, Java::java.util.List, Java::java.lang.Iterable)'
-        def reset_payment_methods(kbAccountId, paymentMethods, properties)
+        java_signature 'Java::void resetPaymentMethods(Java::java.util.UUID, Java::java.util.List, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def reset_payment_methods(kbAccountId, paymentMethods, properties, context)
 
           # conversion for kbAccountId [type = java.util.UUID]
           kbAccountId = kbAccountId.nil? ? nil : kbAccountId.to_s
@@ -670,8 +670,11 @@ module Killbill
             tmp << m
           end
           properties = tmp
+
+          # conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
+          context = Killbill::Plugin::Model::CallContext.new.to_ruby(context) unless context.nil?
           begin
-            @delegate_plugin.reset_payment_methods(kbAccountId, paymentMethods, properties)
+            @delegate_plugin.reset_payment_methods(kbAccountId, paymentMethods, properties, context)
           rescue Exception => e
             message = "Failure in reset_payment_methods: #{e}"
             unless e.backtrace.nil?

data/lib/killbill/helpers/active_merchant/active_record/models/payment_method.rb

@@ -11,9 +11,10 @@ module Killbill
 
           self.abstract_class = true
 
-          def self.from_response(kb_account_id, kb_payment_method_id, cc_or_token, response, options, extra_params = {}, model = PaymentMethod)
+          def self.from_response(kb_account_id, kb_payment_method_id, kb_tenant_id, cc_or_token, response, options, extra_params = {}, model = PaymentMethod)
             model.new({
                           :kb_account_id        => kb_account_id,
+                          :kb_tenant_id         => kb_tenant_id,
                           :kb_payment_method_id => kb_payment_method_id,
                           :token                => response.authorization,
                           :cc_first_name        => cc_or_token.kind_of?(::ActiveMerchant::Billing::CreditCard) ? cc_or_token.first_name : nil,
@@ -31,19 +32,19 @@ module Killbill
                       }.merge!(extra_params))
           end
 
-          def self.from_kb_account_id(kb_account_id)
-            where('kb_account_id = ? AND is_deleted = ?', kb_account_id, false)
+          def self.from_kb_account_id(kb_account_id, kb_tenant_id)
+            where('kb_account_id = ? AND kb_tenant_id = ? AND is_deleted = ?', kb_account_id, kb_tenant_id, false)
           end
 
-          def self.from_kb_payment_method_id(kb_payment_method_id)
-            payment_methods = where('kb_payment_method_id = ? AND is_deleted = ?', kb_payment_method_id, false)
+          def self.from_kb_payment_method_id(kb_payment_method_id, kb_tenant_id)
+            payment_methods = where('kb_payment_method_id = ? AND kb_tenant_id = ? AND is_deleted = ?', kb_payment_method_id, kb_tenant_id, false)
             raise "No payment method found for payment method #{kb_payment_method_id}" if payment_methods.empty?
             raise "Kill Bill payment method #{kb_payment_method_id} mapping to multiple active plugin payment methods" if payment_methods.size > 1
             payment_methods[0]
           end
 
-          def self.mark_as_deleted!(kb_payment_method_id)
-            payment_method = from_kb_payment_method_id(kb_payment_method_id)
+          def self.mark_as_deleted!(kb_payment_method_id, kb_tenant_id)
+            payment_method = from_kb_payment_method_id(kb_payment_method_id, kb_tenant_id)
             payment_method.is_deleted = true
             payment_method.save!
           end
@@ -74,10 +75,10 @@ module Killbill
           end
 
           # VisibleForTesting
-          def self.search_query(search_key, offset = nil, limit = nil)
+          def self.search_query(search_key, kb_tenant_id, offset = nil, limit = nil)
             t = self.arel_table
 
-            query = t.where(search_where_clause(t, search_key))
+            query = t.where(search_where_clause(t, search_key).and(t[:kb_tenant_id].eq(kb_tenant_id)))
                      .order(t[:id])
 
             if offset.blank? and limit.blank?
@@ -93,16 +94,16 @@ module Killbill
             query
           end
 
-          def self.search(search_key, offset = 0, limit = 100)
+          def self.search(search_key, kb_tenant_id, offset = 0, limit = 100)
             pagination = Killbill::Plugin::Model::Pagination.new
             pagination.current_offset = offset
-            pagination.total_nb_records = self.count_by_sql(self.search_query(search_key))
+            pagination.total_nb_records = self.count_by_sql(self.search_query(search_key, kb_tenant_id))
             pagination.max_nb_records = self.count
             pagination.next_offset = (!pagination.total_nb_records.nil? && offset + limit >= pagination.total_nb_records) ? nil : offset + limit
             # Reduce the limit if the specified value is larger than the number of records
             actual_limit = [pagination.max_nb_records, limit].min
             pagination.iterator = StreamyResultSet.new(actual_limit) do |offset,limit|
-              self.find_by_sql(self.search_query(search_key, offset, limit))
+              self.find_by_sql(self.search_query(search_key, kb_tenant_id, offset, limit))
                   .map(&:to_payment_method_response)
             end
             pagination

data/lib/killbill/helpers/active_merchant/active_record/models/response.rb

@@ -13,10 +13,12 @@ module Killbill
 
           self.abstract_class = true
 
-          def self.from_response(api_call, kb_payment_id, response, extra_params = {}, model = Response)
+          def self.from_response(api_call, kb_account_id, kb_payment_id, kb_tenant_id, response, extra_params = {}, model = Response)
             model.new({
                           :api_call                => api_call,
+                          :kb_account_id           => kb_account_id,
                           :kb_payment_id           => kb_payment_id,
+                          :kb_tenant_id            => kb_tenant_id,
                           :message                 => response.message,
                           :authorization           => response.authorization,
                           :fraud_review            => response.fraud_review?,
@@ -55,10 +57,10 @@ module Killbill
           end
 
           # VisibleForTesting
-          def self.search_query(api_call, search_key, offset = nil, limit = nil)
+          def self.search_query(api_call, search_key, kb_tenant_id, offset = nil, limit = nil)
             t = self.arel_table
 
-            query = t.where(search_where_clause(t, search_key, api_call))
+            query = t.where(search_where_clause(t, search_key, api_call).and(t[:kb_tenant_id].eq(kb_tenant_id)))
                      .order(t[:id])
 
             if offset.blank? and limit.blank?
@@ -74,17 +76,17 @@ module Killbill
             query
           end
 
-          def self.search(search_key, offset = 0, limit = 100, type = :payment)
+          def self.search(search_key, kb_tenant_id, offset = 0, limit = 100, type = :payment)
             api_call                    = type == :payment ? 'charge' : 'refund'
             pagination                  = ::Killbill::Plugin::Model::Pagination.new
             pagination.current_offset   = offset
-            pagination.total_nb_records = self.count_by_sql(self.search_query(api_call, search_key))
+            pagination.total_nb_records = self.count_by_sql(self.search_query(api_call, search_key, kb_tenant_id))
             pagination.max_nb_records   = self.where(:api_call => api_call, :success => true).count
             pagination.next_offset      = (!pagination.total_nb_records.nil? && offset + limit >= pagination.total_nb_records) ? nil : offset + limit
             # Reduce the limit if the specified value is larger than the number of records
             actual_limit                = [pagination.max_nb_records, limit].min
             pagination.iterator         = ::Killbill::Plugin::ActiveMerchant::ActiveRecord::StreamyResultSet.new(actual_limit) do |offset, limit|
-              self.find_by_sql(self.search_query(api_call, search_key, offset, limit))
+              self.find_by_sql(self.search_query(api_call, search_key, kb_tenant_id, offset, limit))
               .map { |x| type == :payment ? x.to_payment_response : x.to_refund_response }
             end
             pagination

data/lib/killbill/helpers/active_merchant/active_record/models/transaction.rb

@@ -8,29 +8,29 @@ module Killbill
 
           self.abstract_class = true
 
-          def self.authorization_from_kb_payment_id(kb_payment_id)
-            transaction_from_kb_payment_id :authorize, kb_payment_id, :single
+          def self.authorization_from_kb_payment_id(kb_payment_id, kb_tenant_id)
+            transaction_from_kb_payment_id :authorize, kb_payment_id, kb_tenant_id, :single
           end
 
-          def self.charge_from_kb_payment_id(kb_payment_id)
-            transaction_from_kb_payment_id :charge, kb_payment_id, :single
+          def self.charge_from_kb_payment_id(kb_payment_id, kb_tenant_id)
+            transaction_from_kb_payment_id :charge, kb_payment_id, kb_tenant_id, :single
           end
 
-          def self.refunds_from_kb_payment_id(kb_payment_id)
-            transaction_from_kb_payment_id :refund, kb_payment_id, :multiple
+          def self.refunds_from_kb_payment_id(kb_payment_id, kb_tenant_id)
+            transaction_from_kb_payment_id :refund, kb_payment_id, kb_tenant_id, :multiple
           end
 
-          def self.find_candidate_transaction_for_refund(kb_payment_id, amount_in_cents)
+          def self.find_candidate_transaction_for_refund(kb_payment_id, kb_tenant_id, amount_in_cents)
             begin
-              do_find_candidate_transaction_for_refund :authorize, kb_payment_id, amount_in_cents
+              do_find_candidate_transaction_for_refund :authorize, kb_payment_id, kb_tenant_id, amount_in_cents
             rescue
-              do_find_candidate_transaction_for_refund :charge, kb_payment_id, amount_in_cents
+              do_find_candidate_transaction_for_refund :charge, kb_payment_id, kb_tenant_id, amount_in_cents
             end
           end
 
-          def self.do_find_candidate_transaction_for_refund(api_call, kb_payment_id, amount_in_cents)
+          def self.do_find_candidate_transaction_for_refund(api_call, kb_payment_id, kb_tenant_id, amount_in_cents)
             # Find one successful charge which amount is at least the amount we are trying to refund
-            transactions = where('amount_in_cents >= ? AND api_call = ? and kb_payment_id = ?', amount_in_cents, api_call, kb_payment_id)
+            transactions = where('amount_in_cents >= ? AND api_call = ? AND kb_tenant_id = ? AND kb_payment_id = ?', amount_in_cents, api_call, kb_tenant_id, kb_payment_id)
             raise "Unable to find transaction for payment #{kb_payment_id} and api_call #{api_call}" if transactions.size == 0
 
             # We have candidates, but we now need to make sure we didn't refund more than for the specified amount
@@ -46,8 +46,8 @@ module Killbill
 
           private
 
-          def self.transaction_from_kb_payment_id(api_call, kb_payment_id, how_many)
-            transactions = where('api_call = ? and kb_payment_id = ?', api_call, kb_payment_id)
+          def self.transaction_from_kb_payment_id(api_call, kb_payment_id, kb_tenant_id, how_many)
+            transactions = where('api_call = ? AND kb_tenant_id = ? AND kb_payment_id = ?', api_call, kb_tenant_id, kb_payment_id)
             raise "Unable to find transaction id for payment #{kb_payment_id}" if transactions.empty?
             if how_many == :single
               raise "Kill Bill payment #{kb_payment_id} mapping to multiple plugin transactions" if transactions.size > 1

data/lib/killbill/helpers/active_merchant/killbill_spec_helper.rb

@@ -3,7 +3,7 @@ module Killbill
     module ActiveMerchant
       module RSpec
 
-        def create_payment_method(payment_method_model=::Killbill::Plugin::ActiveMerchant::ActiveRecord::PaymentMethod, kb_account_id=nil)
+        def create_payment_method(payment_method_model=::Killbill::Plugin::ActiveMerchant::ActiveRecord::PaymentMethod, kb_account_id=nil, kb_tenant_id=nil)
           kb_payment_method_id = SecureRandom.uuid
 
           if kb_account_id.nil?
@@ -13,7 +13,11 @@ module Killbill
             create_kb_account kb_account_id
           end
 
-          account = @plugin.kb_apis.account_user_api.get_account_by_id(kb_account_id, @plugin.kb_apis.create_context)
+          context = @plugin.kb_apis.create_context(kb_tenant_id)
+          account = @plugin.kb_apis.account_user_api.get_account_by_id(kb_account_id, context)
+
+          # The rest is pure Ruby
+          context = context.to_ruby(context)
 
           # Generate a token
           cc_number             = '4242424242424242'
@@ -50,9 +54,9 @@ module Killbill
 
           info            = Killbill::Plugin::Model::PaymentMethodPlugin.new
           info.properties = properties
-          payment_method  = @plugin.add_payment_method(kb_account_id, kb_payment_method_id, info, true, nil)
+          payment_method  = @plugin.add_payment_method(kb_account_id, kb_payment_method_id, info, true, [], context)
 
-          pm = payment_method_model.from_kb_payment_method_id kb_payment_method_id
+          pm = payment_method_model.from_kb_payment_method_id kb_payment_method_id, context.tenant_id
           pm.should == payment_method
           pm.kb_account_id.should == kb_account_id
           pm.kb_payment_method_id.should == kb_payment_method_id
@@ -90,7 +94,7 @@ module Killbill
         end
 
         def create_pm_kv_info(key, value)
-          prop       = ::Killbill::Plugin::Model::PaymentMethodKVInfo.new
+          prop       = ::Killbill::Plugin::Model::PluginProperty.new
           prop.key   = key
           prop.value = value
           prop

data/lib/killbill/helpers/active_merchant/payment_plugin.rb

@@ -40,7 +40,7 @@ module Killbill
           amount_in_cents = Monetize.from_numeric(amount, currency).cents.to_i
 
           # If the authorization was already made, just return the status (one auth per kb payment id)
-          transaction = @transaction_model.authorization_from_kb_payment_id(kb_payment_id) rescue nil
+          transaction = @transaction_model.authorization_from_kb_payment_id(kb_payment_id, context.tenant_id) rescue nil
           return transaction.send("#{@identifier}_response").to_payment_response(transaction) unless transaction.nil?
 
           options[:order_id]    ||= kb_payment_id
@@ -49,7 +49,7 @@ module Killbill
 
           # Retrieve the payment method
           if options[:credit_card].blank?
-            pm             = @payment_method_model.from_kb_payment_method_id(kb_payment_method_id)
+            pm             = @payment_method_model.from_kb_payment_method_id(kb_payment_method_id, context.tenant_id)
             payment_source = pm.token
           else
             payment_source = ::ActiveMerchant::Billing::CreditCard.new(options[:credit_card])
@@ -57,7 +57,7 @@ module Killbill
 
           # Go to the gateway
           gw_response           = gateway.authorize amount_in_cents, payment_source, options
-          response, transaction = save_response_and_transaction gw_response, :authorize, kb_payment_id, amount_in_cents, currency
+          response, transaction = save_response_and_transaction gw_response, :authorize, kb_account_id, context.tenant_id, kb_payment_id, amount_in_cents, currency
 
           response.to_payment_response(transaction)
         end
@@ -73,11 +73,11 @@ module Killbill
           options[:description] ||= "Kill Bill capture for #{kb_payment_id}"
 
           # Retrieve the authorization
-          authorization = @transaction_model.authorization_from_kb_payment_id(kb_payment_id).txn_id
+          authorization = @transaction_model.authorization_from_kb_payment_id(kb_payment_id, context.tenant_id).txn_id
 
           # Go to the gateway
           gw_response           = gateway.capture amount_in_cents, authorization, options
-          response, transaction = save_response_and_transaction gw_response, :capture, kb_payment_id, amount_in_cents, currency
+          response, transaction = save_response_and_transaction gw_response, :capture, kb_account_id, context.tenant_id, kb_payment_id, amount_in_cents, currency
 
           response.to_payment_response(transaction)
         end
@@ -87,11 +87,11 @@ module Killbill
           options[:description] ||= "Kill Bill void for #{kb_payment_id}"
 
           # Retrieve the authorization
-          authorization = @transaction_model.authorization_from_kb_payment_id(kb_payment_id).txn_id
+          authorization = @transaction_model.authorization_from_kb_payment_id(kb_payment_id, context.tenant_id).txn_id
 
           # Go to the gateway
           gw_response           = gateway.void authorization, options
-          response, transaction = save_response_and_transaction gw_response, :void, kb_payment_id
+          response, transaction = save_response_and_transaction gw_response, :void, kb_account_id, context.tenant_id, kb_payment_id
 
           response.to_payment_response(transaction)
         end
@@ -103,7 +103,7 @@ module Killbill
           amount_in_cents = Monetize.from_numeric(amount, currency).cents.to_i
 
           # If the payment was already made, just return the status
-          transaction = @transaction_model.charge_from_kb_payment_id(kb_payment_id) rescue nil
+          transaction = @transaction_model.charge_from_kb_payment_id(kb_payment_id, context.tenant_id) rescue nil
           return transaction.send("#{@identifier}_response").to_payment_response(transaction) unless transaction.nil?
 
           options[:order_id]    ||= kb_payment_id
@@ -112,7 +112,7 @@ module Killbill
 
           # Retrieve the payment method
           if options[:credit_card].blank?
-            pm             = @payment_method_model.from_kb_payment_method_id(kb_payment_method_id)
+            pm             = @payment_method_model.from_kb_payment_method_id(kb_payment_method_id, context.tenant_id)
             payment_source = pm.token
           else
             payment_source = ::ActiveMerchant::Billing::CreditCard.new(options[:credit_card])
@@ -120,7 +120,7 @@ module Killbill
 
           # Go to the gateway
           gw_response           = gateway.purchase amount_in_cents, payment_source, options
-          response, transaction = save_response_and_transaction gw_response, :charge, kb_payment_id, amount_in_cents, currency
+          response, transaction = save_response_and_transaction gw_response, :charge, kb_account_id, context.tenant_id, kb_payment_id, amount_in_cents, currency
 
           response.to_payment_response(transaction)
         end
@@ -131,11 +131,11 @@ module Killbill
           # Use Money to compute the amount in cents, as it depends on the currency (1 cent of BTC is 1 Satoshi, not 0.01 BTC)
           amount_in_cents = Monetize.from_numeric(amount, currency).cents.to_i
 
-          transaction           = @transaction_model.find_candidate_transaction_for_refund(kb_payment_id, amount_in_cents)
+          transaction           = @transaction_model.find_candidate_transaction_for_refund(kb_payment_id, context.tenant_id, amount_in_cents)
 
           # Go to the gateway
           gw_response           = gateway.refund amount_in_cents, transaction.txn_id, options
-          response, transaction = save_response_and_transaction gw_response, :refund, kb_payment_id, amount_in_cents, currency
+          response, transaction = save_response_and_transaction gw_response, :refund, kb_account_id, context.tenant_id, kb_payment_id, amount_in_cents, currency
 
           response.to_refund_response(transaction)
         end
@@ -144,7 +144,7 @@ module Killbill
           options = properties_to_hash(properties)
 
           # We assume the payment is immutable in the Gateway and only look at our tables
-          transaction = @transaction_model.charge_from_kb_payment_id(kb_payment_id)
+          transaction = @transaction_model.charge_from_kb_payment_id(kb_payment_id, context.tenant_id)
 
           transaction.send("#{@identifier}_response").to_payment_response(transaction)
         end
@@ -153,7 +153,7 @@ module Killbill
           options = properties_to_hash(properties)
 
           # We assume the refund is immutable in the Gateway and only look at our tables
-          transactions = @transaction_model.refunds_from_kb_payment_id(kb_payment_id)
+          transactions = @transaction_model.refunds_from_kb_payment_id(kb_payment_id, context.tenant_id)
 
           transactions.map { |t| t.send("#{@identifier}_response").to_refund_response(t) }
         end
@@ -194,10 +194,10 @@ module Killbill
 
           # Go to the gateway
           gw_response           = gateway.store cc_or_token, options
-          response, transaction = save_response_and_transaction gw_response, :add_payment_method
+          response, transaction = save_response_and_transaction gw_response, :add_payment_method, kb_account_id, context.tenant_id
 
           if response.success
-            payment_method = @payment_method_model.from_response(kb_account_id, kb_payment_method_id, cc_or_token, gw_response, options)
+            payment_method = @payment_method_model.from_response(kb_account_id, kb_payment_method_id, context.tenant_id, cc_or_token, gw_response, options)
             payment_method.save!
             payment_method
           else
@@ -208,7 +208,7 @@ module Killbill
         def delete_payment_method(kb_account_id, kb_payment_method_id, properties, context)
           options = properties_to_hash(properties)
 
-          pm = @payment_method_model.from_kb_payment_method_id(kb_payment_method_id)
+          pm = @payment_method_model.from_kb_payment_method_id(kb_payment_method_id, context.tenant_id)
 
           # Delete the card
           if options[:customer_id]
@@ -216,10 +216,10 @@ module Killbill
           else
             gw_response = gateway.unstore(pm.token, options)
           end
-          response, transaction = save_response_and_transaction gw_response, :delete_payment_method
+          response, transaction = save_response_and_transaction gw_response, :delete_payment_method, kb_account_id, context.tenant_id
 
           if response.success
-            @payment_method_model.mark_as_deleted! kb_payment_method_id
+            @payment_method_model.mark_as_deleted! kb_payment_method_id, context.tenant_id
           else
             raise response.message
           end
@@ -227,20 +227,20 @@ module Killbill
 
         def get_payment_method_detail(kb_account_id, kb_payment_method_id, properties, context)
           options = properties_to_hash(properties)
-          @payment_method_model.from_kb_payment_method_id(kb_payment_method_id).to_payment_method_response
+          @payment_method_model.from_kb_payment_method_id(kb_payment_method_id, context.tenant_id).to_payment_method_response
         end
 
         def get_payment_methods(kb_account_id, refresh_from_gateway = false, properties, context)
           options = properties_to_hash(properties)
-          @payment_method_model.from_kb_account_id(kb_account_id).collect { |pm| pm.to_payment_method_info_response }
+          @payment_method_model.from_kb_account_id(kb_account_id, context.tenant_id).collect { |pm| pm.to_payment_method_info_response }
         end
 
-        def reset_payment_methods(kb_account_id, payment_methods, properties)
+        def reset_payment_methods(kb_account_id, payment_methods, properties, context)
           return if payment_methods.nil?
 
           options = properties_to_hash(properties)
 
-          pms = @payment_method_model.from_kb_account_id(kb_account_id)
+          pms = @payment_method_model.from_kb_account_id(kb_account_id, context.tenant_id)
 
           payment_methods.delete_if do |payment_method_info_plugin|
             should_be_deleted = false
@@ -268,42 +268,126 @@ module Killbill
           payment_methods.each do |payment_method_info_plugin|
             pm = @payment_method_model.create :kb_account_id        => kb_account_id,
                                               :kb_payment_method_id => payment_method_info_plugin.payment_method_id,
+                                              :kb_tenant_id         => context.tenant_id,
                                               :token                => payment_method_info_plugin.external_payment_method_id
           end
         end
 
         def search_payments(search_key, offset = 0, limit = 100, properties, context)
           options = properties_to_hash(properties)
-          @response_model.search(search_key, offset, limit, :payment)
+          @response_model.search(search_key, context.tenant_id, offset, limit, :payment)
         end
 
         def search_refunds(search_key, offset = 0, limit = 100, properties, context)
           options = properties_to_hash(properties)
-          @response_model.search(search_key, offset, limit, :refund)
+          @response_model.search(search_key, context.tenant_id, offset, limit, :refund)
         end
 
         def search_payment_methods(search_key, offset = 0, limit = 100, properties, context)
           options = properties_to_hash(properties)
-          @payment_method_model.search(search_key, offset, limit)
+          @payment_method_model.search(search_key, context.tenant_id, offset, limit)
         end
 
         def build_form_descriptor(kb_account_id, descriptor_fields, properties, context)
-          options = properties_to_hash(properties)
+          options = properties_to_hash(descriptor_fields)
+          order = options.delete(:order_id)
+          account = options.delete(:account_id)
+          service_options = {
+              :amount           => options.delete(:amount),
+              :currency         => options.delete(:currency),
+              :test             => options.delete(:test),
+              :credential2      => options.delete(:credential2),
+              :credential3      => options.delete(:credential3),
+              :credential4      => options.delete(:credential4),
+              :country          => options.delete(:country),
+              :account_name     => options.delete(:account_name),
+              :transaction_type => options.delete(:transaction_type),
+              :authcode         => options.delete(:authcode),
+              :notify_url       => options.delete(:notify_url),
+              :return_url       => options.delete(:return_url),
+              :redirect_param   => options.delete(:redirect_param),
+              :forward_url      => options.delete(:forward_url)
+          }
+
+          # Retrieve the ActiveMerchant integration
+          integration_module = ::ActiveMerchant::Billing::Integrations.const_get(@identifier.to_s.camelize)
+          service_class = integration_module.const_get('Helper')
+          service = service_class.new(order, account, service_options)
+
+          # Add the specified fields
+          options.each do |field, value|
+            mapping = service_class.mappings[field]
+            next if mapping.nil?
+            case mapping
+              when Array
+                mapping.each{ |field2| service.add_field(field2, value) }
+              when Hash
+                options2 = value.is_a?(Hash) ? value : {}
+                mapping.each{ |key, field2| service.add_field(field2, options2[key]) }
+              else
+                service.add_field(mapping, value)
+            end
+          end
+
+          form_fields = {}
+          service.form_fields.each do |field, value|
+            form_fields[field] = value
+          end
+          service.raw_html_fields.each do |field, value|
+            form_fields[field] = value
+          end
+
+          # Build the response object
+          descriptor = ::Killbill::Plugin::Model::HostedPaymentPageFormDescriptor.new
+          descriptor.kb_account_id = kb_account_id
+          descriptor.form_method = service.form_method || 'POST'
+          descriptor.form_url = service.respond_to?(:credential_based_url) ? service.credential_based_url : integration_module.service_url
+          descriptor.form_fields = hash_to_properties(form_fields)
+          # Any other custom property
+          descriptor.properties = hash_to_properties({})
+
+          descriptor
         end
 
-        def process_notification(notification, properties, context)
+        def process_notification(notification, properties, context, &proc)
           options = properties_to_hash(properties)
+
+          # Retrieve the ActiveMerchant integration
+          integration_module = ::ActiveMerchant::Billing::Integrations.const_get(@identifier.to_s.camelize)
+          service_class = integration_module.const_get('Notification')
+          # notification is either a body or a query string
+          service = service_class.new(notification, options)
+
+          if service.respond_to? :acknowledge
+            service.acknowledge
+          end
+
+          gw_notification = ::Killbill::Plugin::Model::GatewayNotification.new
+          gw_notification.kb_payment_id = nil
+          gw_notification.status = service.status == 'Completed' ? 200 : 400
+          gw_notification.headers = {}
+          gw_notification.properties = []
+
+          if service.respond_to? :success_response
+            gw_notification.entity = service.success_response(properties_to_hash(properties))
+          else
+            gw_notification.entity = ''
+          end
+
+          yield(gw_notification, service) if block_given?
+
+          gw_notification
         end
 
         # Utilities
 
         # Deprecated
         def find_value_from_payment_method_props(payment_method_props, key)
-          find_value_from_properties(payment_method_props, key)
+          find_value_from_properties(payment_method_props.properties, key)
         end
 
         def find_value_from_properties(properties, key)
-          prop = (payment_method_props.properties.find { |kv| kv.key == key })
+          prop = (properties.find { |kv| kv.key == key })
           prop.nil? ? nil : prop.value
         end
 
@@ -312,11 +396,11 @@ module Killbill
           account.currency
         end
 
-        def save_response_and_transaction(response, api_call, kb_payment_id=nil, amount_in_cents=0, currency=nil)
+        def save_response_and_transaction(response, api_call, kb_account_id, kb_tenant_id, kb_payment_id=nil, amount_in_cents=0, currency=nil)
           @logger.warn "Unsuccessful #{api_call}: #{response.message}" unless response.success?
 
           # Save the response to our logs
-          response = @response_model.from_response(api_call, kb_payment_id, response)
+          response = @response_model.from_response(api_call, kb_account_id, kb_payment_id, kb_tenant_id, response)
           response.save!
 
           transaction = nil
@@ -324,6 +408,8 @@ module Killbill
           if response.success and !kb_payment_id.blank? and !txn_id.blank?
             # Record the transaction
             transaction = response.send("create_#{@identifier}_transaction!",
+                                        :kb_account_id   => kb_account_id,
+                                        :kb_tenant_id    => kb_tenant_id,
                                         :amount_in_cents => amount_in_cents,
                                         :currency        => currency,
                                         :api_call        => api_call,
@@ -339,9 +425,17 @@ module Killbill
           ::Killbill::Plugin::ActiveMerchant.gateway
         end
 
+        def config
+          ::Killbill::Plugin::ActiveMerchant.config
+        end
+
+        def hash_to_properties(options)
+          merge_properties([], options)
+        end
+
         def properties_to_hash(properties, options = {})
           merged = {}
-          properties.each do |p|
+          (properties || []).each do |p|
             merged[p.key.to_sym] = p.value
           end
           merged.merge(options)

data/lib/killbill/payment.rb

@@ -55,7 +55,7 @@ module Killbill
         raise OperationUnsupportedByGatewayError
       end
 
-      def reset_payment_methods(kb_account_id, payment_methods, properties)
+      def reset_payment_methods(kb_account_id, payment_methods, properties, context)
         raise OperationUnsupportedByGatewayError
       end
     end

data/spec/killbill/helpers/payment_method_spec.rb

@@ -18,22 +18,22 @@ describe Killbill::Plugin::ActiveMerchant::ActiveRecord::PaymentMethod do
 
   it 'should generate the right SQL query' do
     # Check count query (search query numeric)
-    expected_query = "SELECT COUNT(DISTINCT \"test_payment_methods\".\"id\") FROM \"test_payment_methods\"  WHERE ((((((((((((((\"test_payment_methods\".\"kb_account_id\" = '1234' OR \"test_payment_methods\".\"kb_payment_method_id\" = '1234') OR \"test_payment_methods\".\"token\" = '1234') OR \"test_payment_methods\".\"cc_type\" = '1234') OR \"test_payment_methods\".\"state\" = '1234') OR \"test_payment_methods\".\"zip\" = '1234') OR \"test_payment_methods\".\"cc_first_name\" LIKE '%1234%') OR \"test_payment_methods\".\"cc_last_name\" LIKE '%1234%') OR \"test_payment_methods\".\"address1\" LIKE '%1234%') OR \"test_payment_methods\".\"address2\" LIKE '%1234%') OR \"test_payment_methods\".\"city\" LIKE '%1234%') OR \"test_payment_methods\".\"country\" LIKE '%1234%') OR \"test_payment_methods\".\"cc_exp_month\" = 1234) OR \"test_payment_methods\".\"cc_exp_year\" = 1234) OR \"test_payment_methods\".\"cc_last_4\" = 1234)  ORDER BY \"test_payment_methods\".\"id\""
+    expected_query = "SELECT COUNT(DISTINCT \"test_payment_methods\".\"id\") FROM \"test_payment_methods\"  WHERE ((((((((((((((\"test_payment_methods\".\"kb_account_id\" = '1234' OR \"test_payment_methods\".\"kb_payment_method_id\" = '1234') OR \"test_payment_methods\".\"token\" = '1234') OR \"test_payment_methods\".\"cc_type\" = '1234') OR \"test_payment_methods\".\"state\" = '1234') OR \"test_payment_methods\".\"zip\" = '1234') OR \"test_payment_methods\".\"cc_first_name\" LIKE '%1234%') OR \"test_payment_methods\".\"cc_last_name\" LIKE '%1234%') OR \"test_payment_methods\".\"address1\" LIKE '%1234%') OR \"test_payment_methods\".\"address2\" LIKE '%1234%') OR \"test_payment_methods\".\"city\" LIKE '%1234%') OR \"test_payment_methods\".\"country\" LIKE '%1234%') OR \"test_payment_methods\".\"cc_exp_month\" = 1234) OR \"test_payment_methods\".\"cc_exp_year\" = 1234) OR \"test_payment_methods\".\"cc_last_4\" = 1234) AND \"test_payment_methods\".\"kb_tenant_id\" = '11-22-33'  ORDER BY \"test_payment_methods\".\"id\""
     # Note that Kill Bill will pass a String, even for numeric types
-    ::Killbill::Test::TestPaymentMethod.search_query('1234').to_sql.should == expected_query
+    ::Killbill::Test::TestPaymentMethod.search_query('1234', '11-22-33').to_sql.should == expected_query
 
     # Check query with results (search query numeric)
-    expected_query = "SELECT  DISTINCT \"test_payment_methods\".* FROM \"test_payment_methods\"  WHERE ((((((((((((((\"test_payment_methods\".\"kb_account_id\" = '1234' OR \"test_payment_methods\".\"kb_payment_method_id\" = '1234') OR \"test_payment_methods\".\"token\" = '1234') OR \"test_payment_methods\".\"cc_type\" = '1234') OR \"test_payment_methods\".\"state\" = '1234') OR \"test_payment_methods\".\"zip\" = '1234') OR \"test_payment_methods\".\"cc_first_name\" LIKE '%1234%') OR \"test_payment_methods\".\"cc_last_name\" LIKE '%1234%') OR \"test_payment_methods\".\"address1\" LIKE '%1234%') OR \"test_payment_methods\".\"address2\" LIKE '%1234%') OR \"test_payment_methods\".\"city\" LIKE '%1234%') OR \"test_payment_methods\".\"country\" LIKE '%1234%') OR \"test_payment_methods\".\"cc_exp_month\" = 1234) OR \"test_payment_methods\".\"cc_exp_year\" = 1234) OR \"test_payment_methods\".\"cc_last_4\" = 1234)  ORDER BY \"test_payment_methods\".\"id\" LIMIT 10 OFFSET 0"
+    expected_query = "SELECT  DISTINCT \"test_payment_methods\".* FROM \"test_payment_methods\"  WHERE ((((((((((((((\"test_payment_methods\".\"kb_account_id\" = '1234' OR \"test_payment_methods\".\"kb_payment_method_id\" = '1234') OR \"test_payment_methods\".\"token\" = '1234') OR \"test_payment_methods\".\"cc_type\" = '1234') OR \"test_payment_methods\".\"state\" = '1234') OR \"test_payment_methods\".\"zip\" = '1234') OR \"test_payment_methods\".\"cc_first_name\" LIKE '%1234%') OR \"test_payment_methods\".\"cc_last_name\" LIKE '%1234%') OR \"test_payment_methods\".\"address1\" LIKE '%1234%') OR \"test_payment_methods\".\"address2\" LIKE '%1234%') OR \"test_payment_methods\".\"city\" LIKE '%1234%') OR \"test_payment_methods\".\"country\" LIKE '%1234%') OR \"test_payment_methods\".\"cc_exp_month\" = 1234) OR \"test_payment_methods\".\"cc_exp_year\" = 1234) OR \"test_payment_methods\".\"cc_last_4\" = 1234) AND \"test_payment_methods\".\"kb_tenant_id\" = '11-22-33'  ORDER BY \"test_payment_methods\".\"id\" LIMIT 10 OFFSET 0"
     # Note that Kill Bill will pass a String, even for numeric types
-    ::Killbill::Test::TestPaymentMethod.search_query('1234', 0, 10).to_sql.should == expected_query
+    ::Killbill::Test::TestPaymentMethod.search_query('1234', '11-22-33', 0, 10).to_sql.should == expected_query
 
     # Check count query (search query string)
-    expected_query = "SELECT COUNT(DISTINCT \"test_payment_methods\".\"id\") FROM \"test_payment_methods\"  WHERE (((((((((((\"test_payment_methods\".\"kb_account_id\" = 'XXX' OR \"test_payment_methods\".\"kb_payment_method_id\" = 'XXX') OR \"test_payment_methods\".\"token\" = 'XXX') OR \"test_payment_methods\".\"cc_type\" = 'XXX') OR \"test_payment_methods\".\"state\" = 'XXX') OR \"test_payment_methods\".\"zip\" = 'XXX') OR \"test_payment_methods\".\"cc_first_name\" LIKE '%XXX%') OR \"test_payment_methods\".\"cc_last_name\" LIKE '%XXX%') OR \"test_payment_methods\".\"address1\" LIKE '%XXX%') OR \"test_payment_methods\".\"address2\" LIKE '%XXX%') OR \"test_payment_methods\".\"city\" LIKE '%XXX%') OR \"test_payment_methods\".\"country\" LIKE '%XXX%')  ORDER BY \"test_payment_methods\".\"id\""
-    ::Killbill::Test::TestPaymentMethod.search_query('XXX').to_sql.should == expected_query
+    expected_query = "SELECT COUNT(DISTINCT \"test_payment_methods\".\"id\") FROM \"test_payment_methods\"  WHERE (((((((((((\"test_payment_methods\".\"kb_account_id\" = 'XXX' OR \"test_payment_methods\".\"kb_payment_method_id\" = 'XXX') OR \"test_payment_methods\".\"token\" = 'XXX') OR \"test_payment_methods\".\"cc_type\" = 'XXX') OR \"test_payment_methods\".\"state\" = 'XXX') OR \"test_payment_methods\".\"zip\" = 'XXX') OR \"test_payment_methods\".\"cc_first_name\" LIKE '%XXX%') OR \"test_payment_methods\".\"cc_last_name\" LIKE '%XXX%') OR \"test_payment_methods\".\"address1\" LIKE '%XXX%') OR \"test_payment_methods\".\"address2\" LIKE '%XXX%') OR \"test_payment_methods\".\"city\" LIKE '%XXX%') OR \"test_payment_methods\".\"country\" LIKE '%XXX%') AND \"test_payment_methods\".\"kb_tenant_id\" = '11-22-33'  ORDER BY \"test_payment_methods\".\"id\""
+    ::Killbill::Test::TestPaymentMethod.search_query('XXX', '11-22-33').to_sql.should == expected_query
 
     # Check query with results (search query string)
-    expected_query = "SELECT  DISTINCT \"test_payment_methods\".* FROM \"test_payment_methods\"  WHERE (((((((((((\"test_payment_methods\".\"kb_account_id\" = 'XXX' OR \"test_payment_methods\".\"kb_payment_method_id\" = 'XXX') OR \"test_payment_methods\".\"token\" = 'XXX') OR \"test_payment_methods\".\"cc_type\" = 'XXX') OR \"test_payment_methods\".\"state\" = 'XXX') OR \"test_payment_methods\".\"zip\" = 'XXX') OR \"test_payment_methods\".\"cc_first_name\" LIKE '%XXX%') OR \"test_payment_methods\".\"cc_last_name\" LIKE '%XXX%') OR \"test_payment_methods\".\"address1\" LIKE '%XXX%') OR \"test_payment_methods\".\"address2\" LIKE '%XXX%') OR \"test_payment_methods\".\"city\" LIKE '%XXX%') OR \"test_payment_methods\".\"country\" LIKE '%XXX%')  ORDER BY \"test_payment_methods\".\"id\" LIMIT 10 OFFSET 0"
-    ::Killbill::Test::TestPaymentMethod.search_query('XXX', 0, 10).to_sql.should == expected_query
+    expected_query = "SELECT  DISTINCT \"test_payment_methods\".* FROM \"test_payment_methods\"  WHERE (((((((((((\"test_payment_methods\".\"kb_account_id\" = 'XXX' OR \"test_payment_methods\".\"kb_payment_method_id\" = 'XXX') OR \"test_payment_methods\".\"token\" = 'XXX') OR \"test_payment_methods\".\"cc_type\" = 'XXX') OR \"test_payment_methods\".\"state\" = 'XXX') OR \"test_payment_methods\".\"zip\" = 'XXX') OR \"test_payment_methods\".\"cc_first_name\" LIKE '%XXX%') OR \"test_payment_methods\".\"cc_last_name\" LIKE '%XXX%') OR \"test_payment_methods\".\"address1\" LIKE '%XXX%') OR \"test_payment_methods\".\"address2\" LIKE '%XXX%') OR \"test_payment_methods\".\"city\" LIKE '%XXX%') OR \"test_payment_methods\".\"country\" LIKE '%XXX%') AND \"test_payment_methods\".\"kb_tenant_id\" = '11-22-33'  ORDER BY \"test_payment_methods\".\"id\" LIMIT 10 OFFSET 0"
+    ::Killbill::Test::TestPaymentMethod.search_query('XXX', '11-22-33', 0, 10).to_sql.should == expected_query
   end
 
   it 'should search all fields' do
@@ -41,6 +41,7 @@ describe Killbill::Plugin::ActiveMerchant::ActiveRecord::PaymentMethod do
 
     pm = ::Killbill::Test::TestPaymentMethod.create :kb_account_id        => '11-22-33-44',
                                                     :kb_payment_method_id => '55-66-77-88',
+                                                    :kb_tenant_id         => '11-22-33',
                                                     :cc_first_name        => 'ccFirstName',
                                                     :cc_last_name         => 'ccLastName',
                                                     :cc_type              => 'ccType',
@@ -65,6 +66,7 @@ describe Killbill::Plugin::ActiveMerchant::ActiveRecord::PaymentMethod do
 
     pm2 = ::Killbill::Test::TestPaymentMethod.create :kb_account_id        => '22-33-44-55',
                                                      :kb_payment_method_id => '66-77-88-99',
+                                                     :kb_tenant_id         => '11-22-33',
                                                      :cc_first_name        => 'ccFirstName',
                                                      :cc_last_name         => 'ccLastName',
                                                      :cc_type              => 'ccType',
@@ -92,7 +94,7 @@ describe Killbill::Plugin::ActiveMerchant::ActiveRecord::PaymentMethod do
   private
 
   def do_search(search_key)
-    pagination = ::Killbill::Test::TestPaymentMethod.search(search_key)
+    pagination = ::Killbill::Test::TestPaymentMethod.search(search_key, '11-22-33')
     pagination.current_offset.should == 0
     results = pagination.iterator.to_a
     pagination.total_nb_records.should == results.size

data/spec/killbill/helpers/response_spec.rb

@@ -18,45 +18,53 @@ describe Killbill::Plugin::ActiveMerchant::ActiveRecord::Response do
 
   it 'should generate the right SQL query' do
     # Check count query (search query numeric)
-    expected_query = "SELECT COUNT(DISTINCT \"test_responses\".\"id\") FROM \"test_responses\"  WHERE (((\"test_responses\".\"kb_payment_id\" = '1234' OR \"test_responses\".\"message\" = '1234') OR \"test_responses\".\"authorization\" = '1234') OR \"test_responses\".\"fraud_review\" = '1234') AND \"test_responses\".\"api_call\" = 'charge' AND \"test_responses\".\"success\" = 't'  ORDER BY \"test_responses\".\"id\""
+    expected_query = "SELECT COUNT(DISTINCT \"test_responses\".\"id\") FROM \"test_responses\"  WHERE (((\"test_responses\".\"kb_payment_id\" = '1234' OR \"test_responses\".\"message\" = '1234') OR \"test_responses\".\"authorization\" = '1234') OR \"test_responses\".\"fraud_review\" = '1234') AND \"test_responses\".\"api_call\" = 'charge' AND \"test_responses\".\"success\" = 't' AND \"test_responses\".\"kb_tenant_id\" = '11-22-33'  ORDER BY \"test_responses\".\"id\""
     # Note that Kill Bill will pass a String, even for numeric types
-    ::Killbill::Test::TestResponse.search_query('charge', '1234').to_sql.should == expected_query
+    ::Killbill::Test::TestResponse.search_query('charge', '1234', '11-22-33').to_sql.should == expected_query
 
     # Check query with results (search query numeric)
-    expected_query = "SELECT  DISTINCT \"test_responses\".* FROM \"test_responses\"  WHERE (((\"test_responses\".\"kb_payment_id\" = '1234' OR \"test_responses\".\"message\" = '1234') OR \"test_responses\".\"authorization\" = '1234') OR \"test_responses\".\"fraud_review\" = '1234') AND \"test_responses\".\"api_call\" = 'charge' AND \"test_responses\".\"success\" = 't'  ORDER BY \"test_responses\".\"id\" LIMIT 10 OFFSET 0"
+    expected_query = "SELECT  DISTINCT \"test_responses\".* FROM \"test_responses\"  WHERE (((\"test_responses\".\"kb_payment_id\" = '1234' OR \"test_responses\".\"message\" = '1234') OR \"test_responses\".\"authorization\" = '1234') OR \"test_responses\".\"fraud_review\" = '1234') AND \"test_responses\".\"api_call\" = 'charge' AND \"test_responses\".\"success\" = 't' AND \"test_responses\".\"kb_tenant_id\" = '11-22-33'  ORDER BY \"test_responses\".\"id\" LIMIT 10 OFFSET 0"
     # Note that Kill Bill will pass a String, even for numeric types
-    ::Killbill::Test::TestResponse.search_query('charge', '1234', 0, 10).to_sql.should == expected_query
+    ::Killbill::Test::TestResponse.search_query('charge', '1234', '11-22-33', 0, 10).to_sql.should == expected_query
 
     # Check count query (search query string)
-    expected_query = "SELECT COUNT(DISTINCT \"test_responses\".\"id\") FROM \"test_responses\"  WHERE (((\"test_responses\".\"kb_payment_id\" = 'XXX' OR \"test_responses\".\"message\" = 'XXX') OR \"test_responses\".\"authorization\" = 'XXX') OR \"test_responses\".\"fraud_review\" = 'XXX') AND \"test_responses\".\"api_call\" = 'charge' AND \"test_responses\".\"success\" = 't'  ORDER BY \"test_responses\".\"id\""
-    ::Killbill::Test::TestResponse.search_query('charge', 'XXX').to_sql.should == expected_query
+    expected_query = "SELECT COUNT(DISTINCT \"test_responses\".\"id\") FROM \"test_responses\"  WHERE (((\"test_responses\".\"kb_payment_id\" = 'XXX' OR \"test_responses\".\"message\" = 'XXX') OR \"test_responses\".\"authorization\" = 'XXX') OR \"test_responses\".\"fraud_review\" = 'XXX') AND \"test_responses\".\"api_call\" = 'charge' AND \"test_responses\".\"success\" = 't' AND \"test_responses\".\"kb_tenant_id\" = '11-22-33'  ORDER BY \"test_responses\".\"id\""
+    ::Killbill::Test::TestResponse.search_query('charge', 'XXX', '11-22-33').to_sql.should == expected_query
 
     # Check query with results (search query string)
-    expected_query = "SELECT  DISTINCT \"test_responses\".* FROM \"test_responses\"  WHERE (((\"test_responses\".\"kb_payment_id\" = 'XXX' OR \"test_responses\".\"message\" = 'XXX') OR \"test_responses\".\"authorization\" = 'XXX') OR \"test_responses\".\"fraud_review\" = 'XXX') AND \"test_responses\".\"api_call\" = 'charge' AND \"test_responses\".\"success\" = 't'  ORDER BY \"test_responses\".\"id\" LIMIT 10 OFFSET 0"
-    ::Killbill::Test::TestResponse.search_query('charge', 'XXX', 0, 10).to_sql.should == expected_query
+    expected_query = "SELECT  DISTINCT \"test_responses\".* FROM \"test_responses\"  WHERE (((\"test_responses\".\"kb_payment_id\" = 'XXX' OR \"test_responses\".\"message\" = 'XXX') OR \"test_responses\".\"authorization\" = 'XXX') OR \"test_responses\".\"fraud_review\" = 'XXX') AND \"test_responses\".\"api_call\" = 'charge' AND \"test_responses\".\"success\" = 't' AND \"test_responses\".\"kb_tenant_id\" = '11-22-33'  ORDER BY \"test_responses\".\"id\" LIMIT 10 OFFSET 0"
+    ::Killbill::Test::TestResponse.search_query('charge', 'XXX', '11-22-33', 0, 10).to_sql.should == expected_query
   end
 
   it 'should search all fields' do
     do_search('foo').size.should == 0
 
     pm       = ::Killbill::Test::TestResponse.create :api_call      => 'charge',
+                                                     :kb_account_id => '55-66-77-88',
                                                      :kb_payment_id => '11-22-33-44',
+                                                     :kb_tenant_id  => '11-22-33',
                                                      :success       => true
 
     # Wrong api_call
     ignored1 = ::Killbill::Test::TestResponse.create :api_call      => 'add_payment_method',
+                                                     :kb_account_id => '55-66-77-88',
                                                      :kb_payment_id => pm.kb_payment_id,
+                                                     :kb_tenant_id  => '11-22-33',
                                                      :success       => true
 
     # Not successful
     ignored2 = ::Killbill::Test::TestResponse.create :api_call      => 'charge',
+                                                     :kb_account_id => '55-66-77-88',
                                                      :kb_payment_id => pm.kb_payment_id,
+                                                     :kb_tenant_id  => '11-22-33',
                                                      :success       => false
 
     do_search(pm.kb_payment_id).size.should == 1
 
     pm2 = ::Killbill::Test::TestResponse.create :api_call      => 'charge',
+                                                :kb_account_id => '55-66-77-88',
                                                 :kb_payment_id => pm.kb_payment_id,
+                                                :kb_tenant_id  => '11-22-33',
                                                 :success       => true
 
     do_search(pm.kb_payment_id).size.should == 2
@@ -65,7 +73,7 @@ describe Killbill::Plugin::ActiveMerchant::ActiveRecord::Response do
   private
 
   def do_search(search_key)
-    pagination = ::Killbill::Test::TestResponse.search(search_key)
+    pagination = ::Killbill::Test::TestResponse.search(search_key, '11-22-33')
     pagination.current_offset.should == 0
     results = pagination.iterator.to_a
     pagination.total_nb_records.should == results.size

data/spec/killbill/helpers/test_schema.rb

@@ -2,7 +2,6 @@ require 'active_record'
 
 ActiveRecord::Schema.define(:version => 20140410153635) do
   create_table "test_payment_methods", :force => true do |t|
-    t.string   "kb_account_id",            :null => false
     t.string   "kb_payment_method_id"      # NULL before Kill Bill knows about it
     t.string   "token"
     t.string   "cc_first_name"
@@ -20,6 +19,8 @@ ActiveRecord::Schema.define(:version => 20140410153635) do
     t.boolean  "is_deleted",             :null => false, :default => false
     t.datetime "created_at",             :null => false
     t.datetime "updated_at",             :null => false
+    t.string   "kb_account_id",          :null => false
+    t.string   "kb_tenant_id",           :null => false
   end
 
   add_index(:test_payment_methods, :kb_account_id)
@@ -33,6 +34,8 @@ ActiveRecord::Schema.define(:version => 20140410153635) do
     t.string   "currency",              :null => false
     t.datetime "created_at",            :null => false
     t.datetime "updated_at",            :null => false
+    t.string   "kb_account_id",         :null => false
+    t.string   "kb_tenant_id",          :null => false
   end
 
   add_index(:test_transactions, :kb_payment_id)
@@ -53,5 +56,7 @@ ActiveRecord::Schema.define(:version => 20140410153635) do
     t.boolean  "success"
     t.datetime "created_at",        :null => false
     t.datetime "updated_at",        :null => false
+    t.string   "kb_account_id",     :null => false
+    t.string   "kb_tenant_id",      :null => false
   end
 end

data/spec/killbill/payment_plugin_api_spec.rb

@@ -4,6 +4,7 @@ require 'spec_helper'
 describe Killbill::Plugin::Api::PaymentPluginApi do
 
   before(:all) do
+    @call_context = Killbill::Plugin::Model::CallContext.new
     logger = ::Logger.new(STDOUT)
     @paymentPluginApi =  Killbill::Plugin::Api::PaymentPluginApi.new("Killbill::Plugin::PaymentTest", { "logger" => logger })
     @kb_account_id = java.util.UUID.fromString("aa5c926e-3d9d-4435-b44b-719d7b583256")
@@ -117,11 +118,11 @@ describe Killbill::Plugin::Api::PaymentPluginApi do
   end
 
   it "should_test_reset_payment_methods_ok" do
-    @paymentPluginApi.reset_payment_methods(@kb_account_id, java.util.ArrayList.new, @properties)
+    @paymentPluginApi.reset_payment_methods(@kb_account_id, java.util.ArrayList.new, @properties, @call_context)
   end
 
   it "should_test_reset_payment_methods_exception" do
     @paymentPluginApi.delegate_plugin.send(:raise_exception_on_next_calls)
-    lambda { @paymentPluginApi.reset_payment_methods(@kb_account_id, java.util.ArrayList.new, @properties) }.should raise_error Java::org.killbill.billing.payment.plugin.api.PaymentPluginApiException
+    lambda { @paymentPluginApi.reset_payment_methods(@kb_account_id, java.util.ArrayList.new, @properties, @call_context) }.should raise_error Java::org.killbill.billing.payment.plugin.api.PaymentPluginApiException
   end
 end

data/spec/killbill/payment_plugin_spec.rb

@@ -33,6 +33,6 @@ describe Killbill::Plugin::Payment do
 
     lambda { @plugin.get_payment_method_detail(@kb_account_id, @payment_method, @properties, @call_context) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
     lambda { @plugin.get_payment_methods(@kb_account_id, true, @properties, @call_context) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
-    lambda { @plugin.reset_payment_methods(@kb_account_id, @properties, @payment_methods) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
+    lambda { @plugin.reset_payment_methods(@kb_account_id, @properties, @payment_methods, @call_context) }.should raise_error Killbill::Plugin::Payment::OperationUnsupportedByGatewayError
   end
 end

data/spec/killbill/payment_test.rb

@@ -82,7 +82,7 @@ module Killbill
         end
       end
 
-      def reset_payment_methods(kb_account_id, payment_methods, properties)
+      def reset_payment_methods(kb_account_id, payment_methods, properties, context)
         if @raise_exception
           raise StandardError.new("Test exception")
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2014-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra