killbill-cybersource 5.0.1 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e5adf0bd139aaa649c6648ee5f0c713eb9dcaab
-  data.tar.gz: a6fc74fef61a79f9d87ee6ff08b2f47f2c37ade7
+  metadata.gz: ae2d49fdb4fd4bbe3b9be5e7b79ee0b14e12837a
+  data.tar.gz: 85d673ad015325da80051feb7bcaf67bbbcf243a
 SHA512:
-  metadata.gz: 60715d504beab4ba7e4944f961d2c956d5fa2ed55303c54d3ae01ce0ba1e2e04cc96f0ccd20d9761099463e755e9ae6d103b33899c9b38b62172d78c30e4a80e
-  data.tar.gz: 9fbae06da914dd66e685c318c35880163471c5a7512afbf26977303afd6935fd1d886675206ad8beca30dccf03ba3716633e8d5f3526a0fd27ff9bd068fb2eca
+  metadata.gz: b69a139a422956d25ee6651d97e8504a87334d9d405244e74400754de906ffe12df6016363e7c6d8fb9085fe6dcbd98f7f493ef8cb37010ea305e454a243a47e
+  data.tar.gz: b33fa00be1629c68fa7233108180eabb9dd2e363cd80a2e11a7d1e4fbea8f7fc66281ff3bad33a8d33cb2b743e90c8dbf0f7e6dab23157d21a562fdcdc6c9884

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    killbill-cybersource (5.0.1)
+    killbill-cybersource (5.1.0)
       actionpack (~> 4.1.0)
       actionview (~> 4.1.0)
       activemerchant (~> 1.48.0)
@@ -57,7 +57,7 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    builder (3.2.2)
+    builder (3.2.3)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     descendants_tracker (0.0.4)
@@ -77,9 +77,10 @@ GEM
       maven-tools (~> 1.1)
       ruby-maven (~> 3.3, >= 3.3.8)
     jdbc-mariadb (1.3.4)
+    jdbc-postgres (9.4.1206)
     jdbc-sqlite3 (3.8.11.2)
     jruby-openssl (0.9.18-java)
-    json (1.8.3-java)
+    json (1.8.6-java)
     killbill (8.3.1)
       rack (>= 1.5.2)
       sinatra (~> 1.3.4)
@@ -87,12 +88,12 @@ GEM
       tzinfo (~> 1.2.0)
     maven-tools (1.1.6)
       virtus (~> 1.0)
-    minitest (5.9.1)
+    minitest (5.10.1)
     monetize (1.1.0)
       money (~> 6.5.0)
     money (6.5.1)
       i18n (>= 0.6.4, <= 0.7.0)
-    nokogiri (1.6.8.1-java)
+    nokogiri (1.7.0.1-java)
     offsite_payments (2.1.0)
       actionpack (>= 3.2.20, < 5.0.0)
       active_utils (~> 3.0.0)
@@ -140,10 +141,11 @@ PLATFORMS
 DEPENDENCIES
   jbundler (~> 0.9.2)
   jdbc-mariadb (~> 1.1)
+  jdbc-postgres (~> 9.4)
   jdbc-sqlite3 (~> 3.7)
   killbill-cybersource!
   rake (>= 10.0.0)
   rspec (~> 2.12.0)
 
 BUNDLED WITH
-   1.11.2
+   1.14.3

data/NEWS

@@ -1,3 +1,6 @@
+5.0.2
+    Change ddl to be compatible with postgresql
+
 5.0.1
     Re-use original payment processor by default when crediting
 

data/VERSION

@@ -1 +1 @@
-5.0.1
+5.1.0

data/cybersource.yml

@@ -13,8 +13,11 @@
 # SQLite (development)
   :adapter: sqlite3
   :database: test.db
+# For PostgreSQL
+#  :adapter: postgresql
+#  :database: 'killbill'
 # For MySQL
-#  :adapter: mysql
+#  :adapter: mariadb
 #  :username: 'killbill'
 #  :password: 'killbill'
 #  :database: 'killbill' # or set the URL :

data/db/ddl.sql

@@ -1,92 +1,92 @@
-CREATE TABLE `cybersource_payment_methods` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `kb_payment_method_id` varchar(255) DEFAULT NULL,
-  `token` varchar(255) DEFAULT NULL,
-  `cc_first_name` varchar(255) DEFAULT NULL,
-  `cc_last_name` varchar(255) DEFAULT NULL,
-  `cc_type` varchar(255) DEFAULT NULL,
-  `cc_exp_month` varchar(255) DEFAULT NULL,
-  `cc_exp_year` varchar(255) DEFAULT NULL,
-  `cc_number` varchar(255) DEFAULT NULL,
-  `cc_last_4` varchar(255) DEFAULT NULL,
-  `cc_start_month` varchar(255) DEFAULT NULL,
-  `cc_start_year` varchar(255) DEFAULT NULL,
-  `cc_issue_number` varchar(255) DEFAULT NULL,
-  `cc_verification_value` varchar(255) DEFAULT NULL,
-  `cc_track_data` varchar(255) DEFAULT NULL,
-  `address1` varchar(255) DEFAULT NULL,
-  `address2` varchar(255) DEFAULT NULL,
-  `city` varchar(255) DEFAULT NULL,
-  `state` varchar(255) DEFAULT NULL,
-  `zip` varchar(255) DEFAULT NULL,
-  `country` varchar(255) DEFAULT NULL,
-  `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_cybersource_payment_methods_on_kb_account_id` (`kb_account_id`),
-  KEY `index_cybersource_payment_methods_on_kb_payment_method_id` (`kb_payment_method_id`)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
+CREATE TABLE cybersource_payment_methods (
+  id serial unique,
+  kb_payment_method_id varchar(255) DEFAULT NULL,
+  token varchar(255) DEFAULT NULL,
+  cc_first_name varchar(255) DEFAULT NULL,
+  cc_last_name varchar(255) DEFAULT NULL,
+  cc_type varchar(255) DEFAULT NULL,
+  cc_exp_month varchar(255) DEFAULT NULL,
+  cc_exp_year varchar(255) DEFAULT NULL,
+  cc_number varchar(255) DEFAULT NULL,
+  cc_last_4 varchar(255) DEFAULT NULL,
+  cc_start_month varchar(255) DEFAULT NULL,
+  cc_start_year varchar(255) DEFAULT NULL,
+  cc_issue_number varchar(255) DEFAULT NULL,
+  cc_verification_value varchar(255) DEFAULT NULL,
+  cc_track_data varchar(255) DEFAULT NULL,
+  address1 varchar(255) DEFAULT NULL,
+  address2 varchar(255) DEFAULT NULL,
+  city varchar(255) DEFAULT NULL,
+  state varchar(255) DEFAULT NULL,
+  zip varchar(255) DEFAULT NULL,
+  country varchar(255) DEFAULT NULL,
+  is_deleted boolean 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)
+) /*! ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin */;
+CREATE INDEX index_cybersource_payment_methods_kb_account_id ON cybersource_payment_methods(kb_account_id);
+CREATE INDEX index_cybersource_payment_methods_kb_payment_method_id ON cybersource_payment_methods(kb_payment_method_id);
+  
+CREATE TABLE cybersource_transactions (
+  id serial unique,
+  cybersource_response_id bigint /*! unsigned */ NOT NULL,
+  api_call varchar(255) NOT NULL,
+  kb_payment_id varchar(255) NOT NULL,
+  kb_payment_transaction_id varchar(255) NOT NULL,
+  transaction_type varchar(255) NOT NULL,
+  payment_processor_account_id varchar(255) DEFAULT NULL,
+  txn_id varchar(255) DEFAULT NULL,
+  amount_in_cents int DEFAULT NULL,
+  currency varchar(255) DEFAULT 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)
+) /*! ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin */;
+CREATE INDEX index_cybersource_transactions_kb_payment_id ON cybersource_transactions(kb_payment_id);
+CREATE INDEX index_cybersource_transactions_cybersource_response_id ON cybersource_transactions(cybersource_response_id);
 
-CREATE TABLE `cybersource_transactions` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `cybersource_response_id` int(11) NOT NULL,
-  `api_call` varchar(255) NOT NULL,
-  `kb_payment_id` varchar(255) NOT NULL,
-  `kb_payment_transaction_id` varchar(255) NOT NULL,
-  `transaction_type` varchar(255) NOT NULL,
-  `payment_processor_account_id` varchar(255) DEFAULT NULL,
-  `txn_id` varchar(255) DEFAULT NULL,
-  `amount_in_cents` int(11) DEFAULT NULL,
-  `currency` varchar(255) DEFAULT 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_cybersource_transactions_on_kb_payment_id` (`kb_payment_id`),
-  KEY `index_cybersource_transactions_on_cybersource_response_id` (`cybersource_response_id`)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-CREATE TABLE `cybersource_responses` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `api_call` varchar(255) NOT NULL,
-  `kb_payment_id` varchar(255) DEFAULT NULL,
-  `kb_payment_transaction_id` varchar(255) DEFAULT NULL,
-  `transaction_type` varchar(255) DEFAULT NULL,
-  `payment_processor_account_id` varchar(255) DEFAULT NULL,
-  `message` text DEFAULT NULL,
-  `authorization` varchar(255) DEFAULT NULL,
-  `fraud_review` tinyint(1) DEFAULT NULL,
-  `test` tinyint(1) DEFAULT NULL,
-  `params_merchant_reference_code` varchar(255) DEFAULT NULL,
-  `params_request_id` varchar(255) DEFAULT NULL,
-  `params_decision` varchar(255) DEFAULT NULL,
-  `params_reason_code` varchar(255) DEFAULT NULL,
-  `params_request_token` varchar(255) DEFAULT NULL,
-  `params_currency` varchar(255) DEFAULT NULL,
-  `params_amount` varchar(255) DEFAULT NULL,
-  `params_authorization_code` varchar(255) DEFAULT NULL,
-  `params_avs_code` varchar(255) DEFAULT NULL,
-  `params_avs_code_raw` varchar(255) DEFAULT NULL,
-  `params_cv_code` varchar(255) DEFAULT NULL,
-  `params_authorized_date_time` varchar(255) DEFAULT NULL,
-  `params_processor_response` varchar(255) DEFAULT NULL,
-  `params_reconciliation_id` varchar(255) DEFAULT NULL,
-  `params_subscription_id` varchar(255) DEFAULT NULL,
-  `avs_result_code` varchar(255) DEFAULT NULL,
-  `avs_result_message` varchar(255) DEFAULT NULL,
-  `avs_result_street_match` varchar(255) DEFAULT NULL,
-  `avs_result_postal_match` varchar(255) DEFAULT NULL,
-  `cvv_result_code` varchar(255) DEFAULT NULL,
-  `cvv_result_message` varchar(255) DEFAULT NULL,
-  `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`),
-  KEY `index_cybersource_responses_on_kb_payment_id_kb_tenant_id` (`kb_payment_id`, `kb_tenant_id`)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
+CREATE TABLE cybersource_responses (
+  id serial unique,
+  api_call varchar(255) NOT NULL,
+  kb_payment_id varchar(255) DEFAULT NULL,
+  kb_payment_transaction_id varchar(255) DEFAULT NULL,
+  transaction_type varchar(255) DEFAULT NULL,
+  payment_processor_account_id varchar(255) DEFAULT NULL,
+  message text DEFAULT NULL,
+  authorisation varchar(255) DEFAULT NULL,
+  fraud_review boolean DEFAULT NULL,
+  test boolean DEFAULT NULL,
+  params_merchant_reference_code varchar(255) DEFAULT NULL,
+  params_request_id varchar(255) DEFAULT NULL,
+  params_decision varchar(255) DEFAULT NULL,
+  params_reason_code varchar(255) DEFAULT NULL,
+  params_request_token varchar(255) DEFAULT NULL,
+  params_currency varchar(255) DEFAULT NULL,
+  params_amount varchar(255) DEFAULT NULL,
+  params_authorization_code varchar(255) DEFAULT NULL,
+  params_avs_code varchar(255) DEFAULT NULL,
+  params_avs_code_raw varchar(255) DEFAULT NULL,
+  params_cv_code varchar(255) DEFAULT NULL,
+  params_authorized_date_time varchar(255) DEFAULT NULL,
+  params_processor_response varchar(255) DEFAULT NULL,
+  params_reconciliation_id varchar(255) DEFAULT NULL,
+  params_subscription_id varchar(255) DEFAULT NULL,
+  avs_result_code varchar(255) DEFAULT NULL,
+  avs_result_message varchar(255) DEFAULT NULL,
+  avs_result_street_match varchar(255) DEFAULT NULL,
+  avs_result_postal_match varchar(255) DEFAULT NULL,
+  cvv_result_code varchar(255) DEFAULT NULL,
+  cvv_result_message varchar(255) DEFAULT NULL,
+  success boolean 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 */;
+CREATE INDEX index_cybersource_responses_kb_payment_id_kb_tenant_id ON cybersource_responses(kb_payment_id, kb_tenant_id);

data/killbill-cybersource.gemspec

@@ -46,6 +46,7 @@ Gem::Specification.new do |s|
   if defined?(JRUBY_VERSION)
     s.add_development_dependency 'jdbc-sqlite3', '~> 3.7'
     s.add_development_dependency 'jdbc-mariadb', '~> 1.1'
+    s.add_development_dependency 'jdbc-postgres', '~> 9.4'
   else
     s.add_development_dependency 'sqlite3', '~> 1.3.7'
   end

data/lib/cybersource/api.rb

@@ -2,6 +2,7 @@ module Killbill #:nodoc:
   module Cybersource #:nodoc:
     class PaymentPlugin < ::Killbill::Plugin::ActiveMerchant::PaymentPlugin
 
+      FIVE_MINUTES_AGO = (1 * 300)
       ONE_DAY_AGO = (1 * 86400)
       SIXTY_DAYS_AGO = (60 * 86400)
 
@@ -120,6 +121,19 @@ module Killbill #:nodoc:
 
         options = properties_to_hash(properties)
 
+        initial_transaction = nil
+        transaction_info_plugins.each do |transaction_info_plugin|
+          initial_transaction = transaction_info_plugin if transaction_info_plugin.transaction_type == :AUTHORIZE || transaction_info_plugin.transaction_type == :PURCHASE || transaction_info_plugin.transaction_type == :CREDIT
+        end
+
+        # Should never happen (maybe transaction_type wasn't saved?)...
+        initial_transaction = transaction_info_plugins.last if initial_transaction.nil?
+
+        authorization = find_value_from_properties(initial_transaction.properties, 'authorization')
+        order_id = Killbill::Plugin::ActiveMerchant::Utils.normalized(options, :order_id)
+        # authorization is very likely nil, as we didn't get an answer from the gateway in the first place
+        order_id ||= authorization.split(';')[0] unless authorization.nil?
+
         stale = false
         transaction_info_plugins.each do |transaction_info_plugin|
           # We only need to fix the UNDEFINED ones
@@ -132,18 +146,20 @@ module Killbill #:nodoc:
           end
 
           report_date = transaction_info_plugin.created_date
-          authorization = find_value_from_properties(transaction_info_plugin.properties, 'authorization')
+          delay_since_transaction = now - report_date
+          delay_since_transaction = 0 if delay_since_transaction < 0
 
-          order_id = Killbill::Plugin::ActiveMerchant::Utils.normalized(options, :order_id)
-          # authorization is very likely nil, as we didn't get an answer from the gateway in the first place
-          order_id ||= authorization.split(';')[0] unless authorization.nil?
+          # Give some time for CyberSource to update their records
+          janitor_delay_threshold = (Killbill::Plugin::ActiveMerchant::Utils.normalized(options, :janitor_delay_threshold) || FIVE_MINUTES_AGO).to_i
+          should_refresh_status = delay_since_transaction >= janitor_delay_threshold
+          next unless should_refresh_status
 
           # Retrieve the report from CyberSource
           if order_id.nil?
             # order_id undetermined - try the defaults (see PaymentPlugin#dispatch_to_gateways)
-            report = get_report(transaction_info_plugin.kb_transaction_payment_id, report_date, options, context)
-            if report.nil?
-              kb_transaction = get_kb_transaction(kb_payment_id, transaction_info_plugin.kb_transaction_payment_id, context.tenant_id)
+            report = get_report(initial_transaction.kb_transaction_payment_id, report_date, options, context)
+            if report.nil? || report.empty?
+              kb_transaction = get_kb_transaction(kb_payment_id, initial_transaction.kb_transaction_payment_id, context.tenant_id)
               report = get_report(kb_transaction.external_key, report_date, options, context)
             end
           else
@@ -154,7 +170,7 @@ module Killbill #:nodoc:
           next if report.nil?
 
           threshold = (Killbill::Plugin::ActiveMerchant::Utils.normalized(options, :cancel_threshold) || ONE_DAY_AGO).to_i
-          should_cancel_payment = (now - report_date) >= threshold
+          should_cancel_payment = delay_since_transaction >= threshold
           if report.empty? && !should_cancel_payment
             # We'll retry later
             logger.info("Unable to fix UNDEFINED kb_transaction_id='#{transaction_info_plugin.kb_transaction_payment_id}' (not found in CyberSource)")

data/lib/cybersource/cyber_source_on_demand.rb

@@ -137,6 +137,9 @@ module Killbill #:nodoc:
                                                               :authorization => authorization,
                                                               :avs_result => {:code => params['avsCode']},
                                                               :cvv_result => params['cvCode'])
+        rescue => e
+          @logger.warn "Error '#{e.message}' parsing report: #{@hash_report}\n#{e.backtrace.join("\n")}"
+          raise e
         end
 
         def parse_report
@@ -148,8 +151,13 @@ module Killbill #:nodoc:
         end
 
         def parse_request(report)
-          # Assume the report contains a single request
-          !report.nil? && !report['Requests'].nil? ? report['Requests']['Request'] : nil
+          if !report.nil? && !report['Requests'].nil?
+            requests = report['Requests']['Request']
+            # First one seems to be the last request made, assume it's the one we are looking for (no other easy way to tell unfortunately)
+            requests.is_a?(Hash) ? requests : requests.first
+          else
+            nil
+          end
         end
 
         # Note: for now, we only look at the response from CyberSource.
@@ -163,8 +171,8 @@ module Killbill #:nodoc:
 
           success = true
           application_replies.each do |application_reply|
-            success &&= (application_reply['RCode'].to_s == '1')
-            # Last message by convention
+            success = (application_reply['RCode'].to_s == '1')
+            # Assume last entry is the one we are looking for (no other easy way to tell unfortunately)
             msg = application_reply['RMsg']
           end
           [success, msg]

data/pom.xml

@@ -25,7 +25,7 @@
     <groupId>org.kill-bill.billing.plugin.ruby</groupId>
     <artifactId>cybersource-plugin</artifactId>
     <packaging>pom</packaging>
-    <version>5.0.1</version>
+    <version>5.1.0</version>
     <name>cybersource-plugin</name>
     <url>http://github.com/killbill/killbill-cybersource-plugin</url>
     <description>Plugin for accessing Cybersource as a payment gateway</description>

data/spec/cybersource/cyber_source_on_demand_spec.rb

@@ -255,7 +255,7 @@ eos
 eos
     report = Killbill::Cybersource::CyberSourceOnDemand::CyberSourceOnDemandTransactionReport.new(xml_report, Logger.new(STDOUT))
     response = report.response
-    response.success?.should be_false
+    response.success?.should be_true
     response.message.should == 'Score exceeds threshold. Score = 84'
     response.params['merchantReferenceCode'].should == '1234'
     response.params['requestID'].should == '2434465504100167904567'

data/spec/cybersource/remote/integration_spec.rb

@@ -7,13 +7,13 @@ describe Killbill::Cybersource::PaymentPlugin do
   include ::Killbill::Plugin::ActiveMerchant::RSpec
 
   before(:each) do
+    @plugin = build_plugin(::Killbill::Cybersource::PaymentPlugin, 'cybersource')
+    @plugin.start_plugin
+
     ::Killbill::Cybersource::CybersourcePaymentMethod.delete_all
     ::Killbill::Cybersource::CybersourceResponse.delete_all
     ::Killbill::Cybersource::CybersourceTransaction.delete_all
 
-    @plugin = build_plugin(::Killbill::Cybersource::PaymentPlugin, 'cybersource')
-    @plugin.start_plugin
-
     @call_context = build_call_context
 
     @properties = []
@@ -254,66 +254,126 @@ describe Killbill::Cybersource::PaymentPlugin do
     check_response(payment_response, @amount, :PURCHASE, :PROCESSED, 'Successful transaction', '100')
   end
 
-  it 'should be able to fix UNDEFINED payments' do
-    payment_response = @plugin.purchase_payment(@pm.kb_account_id, @kb_payment.id, @kb_payment.transactions[0].id, @pm.kb_payment_method_id, @amount, @currency, @properties, @call_context)
-    check_response(payment_response, @amount, :PURCHASE, :PROCESSED, 'Successful transaction', '100')
+  shared_examples 'fix_undefined_payments' do
+    it 'should be able to fix UNDEFINED payments' do
+      payment_response = @plugin.purchase_payment(@pm.kb_account_id, @kb_payment.id, @kb_payment.transactions[0].id, @pm.kb_payment_method_id, @amount, @currency, @properties, @call_context)
+      check_response(payment_response, @amount, :PURCHASE, :PROCESSED, 'Successful transaction', '100')
 
-    # Force a transition to :UNDEFINED
-    Killbill::Cybersource::CybersourceTransaction.last.delete
-    response = Killbill::Cybersource::CybersourceResponse.last
-    response.update(:message => {:payment_plugin_status => 'UNDEFINED'}.to_json)
+      # Force a transition to :UNDEFINED
+      response, initial_auth = transition_last_response_to_UNDEFINED(1)
 
-    skip_gw = Killbill::Plugin::Model::PluginProperty.new
-    skip_gw.key = 'skip_gw'
-    skip_gw.value = 'true'
-    properties_with_skip_gw = @properties.clone
-    properties_with_skip_gw << skip_gw
+      # Skip if the report API isn't configured
+      fix_transaction(0) if with_report_api
 
-    # Set skip_gw=true, to avoid calling the report API
-    transaction_info_plugins = @plugin.get_payment_info(@pm.kb_account_id, @kb_payment.id, properties_with_skip_gw, @call_context)
-    transaction_info_plugins.size.should == 1
-    transaction_info_plugins.first.status.should eq(:UNDEFINED)
+      # Compare the state of the old and new response
+      check_old_new_response(response, :PURCHASE, 0, initial_auth)
+
+      break unless with_report_api
+
+      # Try a full refund
+      refund_response = @plugin.refund_payment(@pm.kb_account_id, @kb_payment.id, @kb_payment.transactions[1].id, @pm.kb_payment_method_id, @amount, @currency, @properties, @call_context)
+      check_response(refund_response, @amount, :REFUND, :PROCESSED, 'Successful transaction', '100')
+
+      # Force a transition to :UNDEFINED
+      response, initial_auth = transition_last_response_to_UNDEFINED(2)
+
+      fix_transaction(1)
+
+      # Compare the state of the old and new response
+      check_old_new_response(response, :REFUND, 1, initial_auth)
+    end
 
-    # Skip if the report API isn't configured
-    if with_report_api
+    def transition_last_response_to_UNDEFINED(expected_nb_transactions)
+      Killbill::Cybersource::CybersourceTransaction.last.delete
+      response = Killbill::Cybersource::CybersourceResponse.last
+      initial_auth = response.authorization
+      response.update(:authorization => nil, :message => {:payment_plugin_status => 'UNDEFINED'}.to_json)
+
+      skip_gw = Killbill::Plugin::Model::PluginProperty.new
+      skip_gw.key = 'skip_gw'
+      skip_gw.value = 'true'
+      properties_with_skip_gw = @properties.clone
+      properties_with_skip_gw << skip_gw
+
+      # Set skip_gw=true, to avoid calling the report API
+      transaction_info_plugins = @plugin.get_payment_info(@pm.kb_account_id, @kb_payment.id, properties_with_skip_gw, @call_context)
+      transaction_info_plugins.size.should == expected_nb_transactions
+      transaction_info_plugins.last.status.should eq(:UNDEFINED)
+
+      [response, initial_auth]
+    end
+
+    def fix_transaction(transaction_nb)
       # The report API can be delayed
-      await { !@plugin.get_single_transaction_report(report_api, @kb_payment.transactions[0].id, Time.now.utc).empty? }
+      await do
+        !@plugin.get_single_transaction_report(report_api, @kb_payment.transactions[0].id, Time.now.utc).empty? ||
+            !@plugin.get_single_transaction_report(report_api, @kb_payment.transactions[0].external_key, Time.now.utc).empty?
+      end
 
-      # Fix it
+      # Plugin delay hasn't been reached yet
       transaction_info_plugins = @plugin.get_payment_info(@pm.kb_account_id, @kb_payment.id, @properties, @call_context)
-      transaction_info_plugins.size.should == 1
-      transaction_info_plugins.first.status.should eq(:PROCESSED)
+      transaction_info_plugins.size.should == transaction_nb + 1
+      transaction_info_plugins.last.status.should eq(:UNDEFINED)
+
+      # Fix it
+      janitor_delay_threshold = Killbill::Plugin::Model::PluginProperty.new
+      janitor_delay_threshold.key = 'janitor_delay_threshold'
+      janitor_delay_threshold.value = '0'
+      properties_with_janitor_delay_threshold = @properties.clone
+      properties_with_janitor_delay_threshold << janitor_delay_threshold
+      transaction_info_plugins = @plugin.get_payment_info(@pm.kb_account_id, @kb_payment.id, properties_with_janitor_delay_threshold, @call_context)
+      transaction_info_plugins.size.should == transaction_nb + 1
+      transaction_info_plugins.last.status.should eq(:PROCESSED)
 
       # Set skip_gw=true, to check the local state
+      skip_gw = Killbill::Plugin::Model::PluginProperty.new
+      skip_gw.key = 'skip_gw'
+      skip_gw.value = 'true'
+      properties_with_skip_gw = @properties.clone
+      properties_with_skip_gw << skip_gw
       transaction_info_plugins = @plugin.get_payment_info(@pm.kb_account_id, @kb_payment.id, properties_with_skip_gw, @call_context)
-      transaction_info_plugins.size.should == 1
-      transaction_info_plugins.first.status.should eq(:PROCESSED)
+      transaction_info_plugins.size.should == transaction_nb + 1
+      transaction_info_plugins.last.status.should eq(:PROCESSED)
+    end
+
+    def check_old_new_response(response, transaction_type, transaction_nb, initial_auth)
+      new_response = Killbill::Cybersource::CybersourceResponse.last
+      new_response.id.should == response.id
+      new_response.api_call.should == transaction_type.to_s.downcase
+      new_response.kb_tenant_id.should == @call_context.tenant_id
+      new_response.kb_account_id.should == @pm.kb_account_id
+      new_response.kb_payment_id.should == @kb_payment.id
+      new_response.kb_payment_transaction_id.should == @kb_payment.transactions[transaction_nb].id
+      new_response.transaction_type.should == transaction_type.to_s
+      new_response.payment_processor_account_id.should == 'default'
+      # The report API doesn't give us the token
+      new_response.authorization.split(';')[0..1].should == initial_auth.split(';')[0..1] if with_report_api
+      new_response.test.should be_true
+      new_response.params_merchant_reference_code.should == response.params_merchant_reference_code
+      new_response.params_decision.should == response.params_decision
+      new_response.params_request_token.should == response.params_request_token
+      new_response.params_currency.should == response.params_currency
+      new_response.params_amount.should == response.params_amount
+      new_response.params_authorization_code.should == response.params_authorization_code
+      new_response.params_avs_code.should == response.params_avs_code
+      new_response.params_avs_code_raw.should == response.params_avs_code_raw
+      new_response.params_reconciliation_id.should == response.params_reconciliation_id
+      new_response.success.should be_true
+      new_response.message.should == (with_report_api ? 'Request was processed successfully.' : '{"payment_plugin_status":"UNDEFINED"}')
+    end
+  end
+
+  describe 'with on demand API' do
+    context 'using defaults' do
+     it_behaves_like 'fix_undefined_payments'
     end
 
-    # Compare the state of the old and new response
-    new_response = Killbill::Cybersource::CybersourceResponse.last
-    new_response.id.should == response.id
-    new_response.api_call.should == 'purchase'
-    new_response.kb_tenant_id.should == @call_context.tenant_id
-    new_response.kb_account_id.should == @pm.kb_account_id
-    new_response.kb_payment_id.should == @kb_payment.id
-    new_response.kb_payment_transaction_id.should == @kb_payment.transactions[0].id
-    new_response.transaction_type.should == 'PURCHASE'
-    new_response.payment_processor_account_id.should == 'default'
-    # The report API doesn't give us the token
-    new_response.authorization.split(';')[0..1].should == response.authorization.split(';')[0..1]
-    new_response.test.should be_true
-    new_response.params_merchant_reference_code.should == response.params_merchant_reference_code
-    new_response.params_decision.should == response.params_decision
-    new_response.params_request_token.should == response.params_request_token
-    new_response.params_currency.should == response.params_currency
-    new_response.params_amount.should == response.params_amount
-    new_response.params_authorization_code.should == response.params_authorization_code
-    new_response.params_avs_code.should == response.params_avs_code
-    new_response.params_avs_code_raw.should == response.params_avs_code_raw
-    new_response.params_reconciliation_id.should == response.params_reconciliation_id
-    new_response.success.should be_true
-    new_response.message.should == (with_report_api ? 'Request was processed successfully.' : '{"payment_plugin_status":"UNDEFINED"}')
+    context 'using external_key_as_order_id' do
+      before do
+        @properties << build_property('external_key_as_order_id', true)
+      end
+      it_behaves_like 'fix_undefined_payments'
+    end
   end
 
   it 'should eventually cancel UNDEFINED payments' do
@@ -330,14 +390,20 @@ describe Killbill::Cybersource::PaymentPlugin do
     skip_gw = Killbill::Plugin::Model::PluginProperty.new
     skip_gw.key = 'skip_gw'
     skip_gw.value = 'true'
-    properties_with_cancel_threshold = @properties.clone
-    properties_with_cancel_threshold << skip_gw
-    transaction_info_plugins = @plugin.get_payment_info(@pm.kb_account_id, @kb_payment.id, properties_with_cancel_threshold, @call_context)
+    properties_with_skip_gw = @properties.clone
+    properties_with_skip_gw << skip_gw
+    transaction_info_plugins = @plugin.get_payment_info(@pm.kb_account_id, @kb_payment.id, properties_with_skip_gw, @call_context)
     transaction_info_plugins.size.should == 1
     transaction_info_plugins.first.status.should eq(:UNDEFINED)
 
+    janitor_delay_threshold = Killbill::Plugin::Model::PluginProperty.new
+    janitor_delay_threshold.key = 'janitor_delay_threshold'
+    janitor_delay_threshold.value = '0'
+    properties_with_janitor_delay_threshold = @properties.clone
+    properties_with_janitor_delay_threshold << janitor_delay_threshold
+
     # Call the reporting API (if configured) and verify the state still cannot be fixed
-    transaction_info_plugins = @plugin.get_payment_info(@pm.kb_account_id, @kb_payment.id, @properties, @call_context)
+    transaction_info_plugins = @plugin.get_payment_info(@pm.kb_account_id, @kb_payment.id, properties_with_janitor_delay_threshold, @call_context)
     transaction_info_plugins.size.should == 1
     transaction_info_plugins.first.status.should eq(:UNDEFINED)
 
@@ -348,7 +414,7 @@ describe Killbill::Cybersource::PaymentPlugin do
     cancel_threshold = Killbill::Plugin::Model::PluginProperty.new
     cancel_threshold.key = 'cancel_threshold'
     cancel_threshold.value = '0'
-    properties_with_cancel_threshold = @properties.clone
+    properties_with_cancel_threshold = properties_with_janitor_delay_threshold.clone
     properties_with_cancel_threshold << cancel_threshold
     transaction_info_plugins = @plugin.get_payment_info(@pm.kb_account_id, @kb_payment.id, properties_with_cancel_threshold, @call_context)
     transaction_info_plugins.size.should == 1

data/spec/spec_helper.rb

@@ -12,11 +12,15 @@ RSpec.configure do |config|
   config.formatter = 'documentation'
 end
 
-require 'active_record'
-ActiveRecord::Base.establish_connection(
-    :adapter => 'sqlite3',
-    :database => 'test.db'
-)
+require defined?(JRUBY_VERSION) ? 'arjdbc' : 'active_record'
+db_config = {
+  :adapter => ENV['AR_ADAPTER'] || 'sqlite3',
+  :database => ENV['AR_DATABASE'] || 'test.db',
+}
+db_config[:username] = ENV['AR_USERNAME'] if ENV['AR_USERNAME']
+db_config[:password] = ENV['AR_PASSWORD'] if ENV['AR_PASSWORD']
+ActiveRecord::Base.establish_connection(db_config)
+
 # For debugging
 #ActiveRecord::Base.logger = Logger.new(STDOUT)
 # Create the schema

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-cybersource
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.1.0
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-11-29 00:00:00.000000000 Z
+date: 2017-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -262,6 +262,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '9.4'
+  name: jdbc-postgres
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '9.4'
 description: Kill Bill payment plugin for Cybersource.
 email: killbilling-users@googlegroups.com
 executables: []