killbill-cybersource 5.1.0 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae2d49fdb4fd4bbe3b9be5e7b79ee0b14e12837a
-  data.tar.gz: 85d673ad015325da80051feb7bcaf67bbbcf243a
+  metadata.gz: 0156e88d591e65a124e91d54707a6c35058e7cf4
+  data.tar.gz: 69163de4f9aa3c74d5325a6c561abab2f8e9efc3
 SHA512:
-  metadata.gz: b69a139a422956d25ee6651d97e8504a87334d9d405244e74400754de906ffe12df6016363e7c6d8fb9085fe6dcbd98f7f493ef8cb37010ea305e454a243a47e
-  data.tar.gz: b33fa00be1629c68fa7233108180eabb9dd2e363cd80a2e11a7d1e4fbea8f7fc66281ff3bad33a8d33cb2b743e90c8dbf0f7e6dab23157d21a562fdcdc6c9884
+  metadata.gz: c505cfb2f367215a4ec6b42fcc8edb5d33da5732cb9392bb5d862eb45b6f841e648c68fc572bff89b216c52ae169da79efeef80935d4d5b7763e7b2b4b05709c
+  data.tar.gz: 8d502c587dfc6a4fd41d28813e92bcc35875d85e68e7ffd8a545df043a0a51aa696716414dd51e4a8bdeee30dd1b49bac8968598671bdf1d7a844257fada10ad

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    killbill-cybersource (5.1.0)
+    killbill-cybersource (5.2.0)
       actionpack (~> 4.1.0)
       actionview (~> 4.1.0)
       activemerchant (~> 1.48.0)

data/VERSION

@@ -1 +1 @@
-5.1.0
+5.2.0

data/lib/cybersource/api.rb

@@ -134,6 +134,8 @@ module Killbill #:nodoc:
         # 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?
 
+        existing_request_ids = transaction_info_plugins.map{|trx_info| trx_info.first_payment_reference_id}.compact
+
         stale = false
         transaction_info_plugins.each do |transaction_info_plugin|
           # We only need to fix the UNDEFINED ones
@@ -171,7 +173,7 @@ module Killbill #:nodoc:
 
           threshold = (Killbill::Plugin::ActiveMerchant::Utils.normalized(options, :cancel_threshold) || ONE_DAY_AGO).to_i
           should_cancel_payment = delay_since_transaction >= threshold
-          if report.empty? && !should_cancel_payment
+          if (report.empty? || report_not_match(report, transaction_info_plugin.first_payment_reference_id, existing_request_ids)) && !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)")
             next
@@ -445,6 +447,11 @@ module Killbill #:nodoc:
         # We might want a 'util' function to make the conversion Joda DateTime to a Ruby Time object
         Time.parse(@clock.get_clock.get_utc_now.to_s)
       end
+
+      def report_not_match(report, request_id, existing_request_ids)
+        # Check if the response's request id is the request_id of a previous request. If so, then this report does not match.
+        report.request_id.nil? || (request_id != report.request_id && existing_request_ids.include?(report.request_id))
+      end
     end
   end
 end

data/lib/cybersource/cyber_source_on_demand.rb

@@ -94,6 +94,10 @@ module Killbill #:nodoc:
           @response.params['merchantReferenceCode'].nil?
         end
 
+        def request_id
+          @response.params['requestID']
+        end
+
         private
 
         def parse

data/pom.xml

@@ -25,7 +25,7 @@
     <groupId>org.kill-bill.billing.plugin.ruby</groupId>
     <artifactId>cybersource-plugin</artifactId>
     <packaging>pom</packaging>
-    <version>5.1.0</version>
+    <version>5.2.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/remote/integration_spec.rb

@@ -266,7 +266,7 @@ describe Killbill::Cybersource::PaymentPlugin do
       fix_transaction(0) if with_report_api
 
       # Compare the state of the old and new response
-      check_old_new_response(response, :PURCHASE, 0, initial_auth)
+      check_old_new_response(response, :PURCHASE, 0, initial_auth, payment_response.first_payment_reference_id)
 
       break unless with_report_api
 
@@ -280,14 +280,72 @@ describe Killbill::Cybersource::PaymentPlugin do
       fix_transaction(1)
 
       # Compare the state of the old and new response
-      check_old_new_response(response, :REFUND, 1, initial_auth)
+      check_old_new_response(response, :REFUND, 1, initial_auth, refund_response.first_payment_reference_id)
+    end
+
+    it 'should fix UNDEFINED captures' do
+      @plugin.authorize_payment(@pm.kb_account_id, @kb_payment.id, @kb_payment.transactions[0].id, @pm.kb_payment_method_id, @amount, @currency, @properties, @call_context)
+      payment_response = @plugin.capture_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(payment_response, @amount, :CAPTURE, :PROCESSED, 'Successful transaction', '100')
+
+      # Force a transition to :UNDEFINED
+      response, initial_auth = transition_last_response_to_UNDEFINED(2)
+
+      # Skip if the report API isn't configured
+      fix_transaction(1) if with_report_api
+
+      # Compare the state of the old and new response
+      check_old_new_response(response, :CAPTURE, 1, initial_auth, payment_response.first_payment_reference_id)
+
+      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')
+    end
+
+    it 'should not fix UNDEFINED captures if the report only covers the previous request' do
+      @plugin.authorize_payment(@pm.kb_account_id, @kb_payment.id, @kb_payment.transactions[0].id, @pm.kb_payment_method_id, @amount, @currency, @properties, @call_context)
+
+      # Skip gw call so that on_demand report api won't return a record for this call
+      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
+      @plugin.capture_payment(@pm.kb_account_id, @kb_payment.id, @kb_payment.transactions[1].id, @pm.kb_payment_method_id, @amount, @currency, properties_with_skip_gw, @call_context)
+
+      # Force a transition to :UNDEFINED
+      transition_last_response_to_UNDEFINED(2)
+
+      # Shouldn't be able to fix the capture because it skipped the gateway call
+      fix_transaction(1, :UNDEFINED) if with_report_api
+    end
+
+    it 'should not fix UNDEFINED refunds if the report only covers the previous requests' do
+      @plugin.authorize_payment(@pm.kb_account_id, @kb_payment.id, @kb_payment.transactions[0].id, @pm.kb_payment_method_id, @amount, @currency, @properties, @call_context)
+      @plugin.capture_payment(@pm.kb_account_id, @kb_payment.id, @kb_payment.transactions[1].id, @pm.kb_payment_method_id, @amount, @currency, @properties, @call_context)
+
+      # Skip gw call so that on_demand report api won't return a record for this call
+      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
+      @plugin.refund_payment(@pm.kb_account_id, @kb_payment.id, @kb_payment.transactions[1].id, @pm.kb_payment_method_id, @amount, @currency, properties_with_skip_gw, @call_context)
+
+      # Force a transition to :UNDEFINED
+      transition_last_response_to_UNDEFINED(3)
+
+      # Shouldn't be able to fix the capture because it skipped the gateway call
+      fix_transaction(2, :UNDEFINED) if with_report_api
     end
 
     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)
+      response.update(:authorization => nil, :params_request_id => nil, :message => {:payment_plugin_status => 'UNDEFINED'}.to_json)
 
       skip_gw = Killbill::Plugin::Model::PluginProperty.new
       skip_gw.key = 'skip_gw'
@@ -303,7 +361,7 @@ describe Killbill::Cybersource::PaymentPlugin do
       [response, initial_auth]
     end
 
-    def fix_transaction(transaction_nb)
+    def fix_transaction(transaction_nb, expected_state=:PROCESSED)
       # The report API can be delayed
       await do
         !@plugin.get_single_transaction_report(report_api, @kb_payment.transactions[0].id, Time.now.utc).empty? ||
@@ -323,7 +381,7 @@ describe Killbill::Cybersource::PaymentPlugin do
       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)
+      transaction_info_plugins.last.status.should eq(expected_state)
 
       # Set skip_gw=true, to check the local state
       skip_gw = Killbill::Plugin::Model::PluginProperty.new
@@ -333,10 +391,10 @@ describe Killbill::Cybersource::PaymentPlugin do
       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 == transaction_nb + 1
-      transaction_info_plugins.last.status.should eq(:PROCESSED)
+      transaction_info_plugins.last.status.should eq(expected_state)
     end
 
-    def check_old_new_response(response, transaction_type, transaction_nb, initial_auth)
+    def check_old_new_response(response, transaction_type, transaction_nb, initial_auth, request_id)
       new_response = Killbill::Cybersource::CybersourceResponse.last
       new_response.id.should == response.id
       new_response.api_call.should == transaction_type.to_s.downcase
@@ -354,12 +412,13 @@ describe Killbill::Cybersource::PaymentPlugin do
       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_authorization_code.should == response.params_authorization_code unless response.params_authorization_code.nil?
+      new_response.params_avs_code.should == response.params_avs_code unless response.params_avs_code.nil?
+      new_response.params_avs_code_raw.should == response.params_avs_code_raw unless response.params_avs_code.nil?
       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"}')
+      new_response.params_request_id.should == request_id if with_report_api
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-cybersource
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.2.0
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-04-10 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement