killbill-paypal-express 1.0.14 → 1.0.15

data/VERSION

@@ -1 +1 @@
-1.0.14
+1.0.15

data/lib/paypal_express/api.rb

@@ -129,7 +129,40 @@ module Killbill::PaypalExpress
     end
 
     def reset_payment_methods(kb_account_id, payment_methods)
-      # No-op
+      return if payment_methods.nil?
+
+      paypal_pms = PaypalExpressPaymentMethod.from_kb_account_id(kb_account_id.to_s)
+
+      payment_methods.delete_if do |payment_method_info_plugin|
+        should_be_deleted = false
+        paypal_pms.each do |paypal_pm|
+          # Do paypal_pm and payment_method_info_plugin represent the same PayPal payment method?
+          if paypal_pm.external_payment_method_id == payment_method_info_plugin.external_payment_method_id
+            # Do we already have a kb_payment_method_id?
+            if paypal_pm.kb_payment_method_id == payment_method_info_plugin.payment_method_id.to_s
+              should_be_deleted = true
+              break
+            elsif paypal_pm.kb_payment_method_id.nil?
+              # We didn't have the kb_payment_method_id - update it
+              paypal_pm.kb_payment_method_id = payment_method_info_plugin.payment_method_id.to_s
+              should_be_deleted = paypal_pm.save
+              break
+              # Otherwise the same BAID points to 2 different kb_payment_method_id. This should never happen,
+              # but we cowardly will insert a second row below
+            end
+          end
+        end
+
+        should_be_deleted
+      end
+
+      # The remaining elements in payment_methods are not in our table (this should never happen?!)
+      payment_methods.each do |payment_method_info_plugin|
+        PaypalExpressPaymentMethod.create :kb_account_id => payment_method_info_plugin.account_id.to_s,
+                                          :kb_payment_method_id => payment_method_info_plugin.payment_method_id.to_s,
+                                          :paypal_express_baid => payment_method_info_plugin.external_payment_method_id,
+                                          :paypal_express_token => 'unknown (created by reset)'
+      end
     end
 
     private

data/lib/paypal_express/models/paypal_express_payment_method.rb

@@ -6,6 +6,8 @@ module Killbill::PaypalExpress
                     :paypal_express_baid,
                     :paypal_express_token
 
+    alias_attribute :external_payment_method_id, :paypal_express_baid
+
     def self.from_kb_account_id(kb_account_id)
       find_all_by_kb_account_id_and_is_deleted(kb_account_id, false)
     end
@@ -32,10 +34,6 @@ module Killbill::PaypalExpress
     end
 
     def to_payment_method_response
-      external_payment_method_id = paypal_express_baid
-      # No concept of default payment method in Paypal Express
-      is_default = false
-
       properties = []
       properties << Killbill::Plugin::Model::PaymentMethodKVInfo.new(false, 'payerId', paypal_express_payer_id)
       properties << Killbill::Plugin::Model::PaymentMethodKVInfo.new(false, 'baid', paypal_express_baid)
@@ -60,11 +58,12 @@ module Killbill::PaypalExpress
     end
 
     def to_payment_method_info_response
-      external_payment_method_id = paypal_express_baid
-      # No concept of default payment method in Paypal Express
-      is_default = false
-
       Killbill::Plugin::Model::PaymentMethodInfoPlugin.new(kb_account_id, kb_payment_method_id, is_default, external_payment_method_id)
     end
+
+    def is_default
+      # No concept of default payment method in Paypal Express
+      false
+    end
   end
 end

data/pom.xml

@@ -25,7 +25,7 @@
     <groupId>com.ning.killbill.ruby</groupId>
     <artifactId>paypal-express-plugin</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.14</version>
+    <version>1.0.15</version>
     <name>paypal-express-plugin</name>
     <url>http://github.com/killbill/killbill-paypal-express-plugin</url>
     <description>Plugin for accessing paypal as a payment gateway</description>

data/spec/paypal_express/base_plugin_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'logger'
 
 describe Killbill::PaypalExpress::PaymentPlugin do
   before(:each) do
@@ -10,10 +9,11 @@ describe Killbill::PaypalExpress::PaymentPlugin do
   :signature: 'signature'
   :login: 'login'
   :password: 'password'
+# As defined by spec_helper.rb
 :database:
   :adapter: 'sqlite3'
-  :database: 'shouldntmatter.db'
-eos
+  :database: 'test.db'
+      eos
       file.close
 
       @plugin = Killbill::PaypalExpress::PaymentPlugin.new
@@ -25,7 +25,55 @@ eos
     end
   end
 
-  it "should start and stop correctly" do
+  it 'should start and stop correctly' do
     @plugin.stop_plugin
   end
+
+  it 'should reset payment methods' do
+    kb_account_id = '129384'
+
+    @plugin.get_payment_methods(kb_account_id, false, nil).size.should == 0
+    verify_pms kb_account_id, 0
+
+    # Create a pm with a kb_payment_method_id
+    Killbill::PaypalExpress::PaypalExpressPaymentMethod.create :kb_account_id => kb_account_id,
+                                                               :kb_payment_method_id => 'kb-1',
+                                                               :paypal_express_token => 'doesnottmatter',
+                                                               :paypal_express_baid => 'paypal-1'
+    verify_pms kb_account_id, 1
+
+    # Add some in KillBill and reset
+    payment_methods = []
+    # Random order... Shouldn't matter...
+    payment_methods << Killbill::Plugin::Model::PaymentMethodInfoPlugin.new(kb_account_id, 'kb-3', false, 'paypal-3')
+    payment_methods << Killbill::Plugin::Model::PaymentMethodInfoPlugin.new(kb_account_id, 'kb-2', false, 'paypal-2')
+    payment_methods << Killbill::Plugin::Model::PaymentMethodInfoPlugin.new(kb_account_id, 'kb-4', false, 'paypal-4')
+    @plugin.reset_payment_methods kb_account_id, payment_methods
+    verify_pms kb_account_id, 4
+
+    # Add a payment method without a kb_payment_method_id
+    Killbill::PaypalExpress::PaypalExpressPaymentMethod.create :kb_account_id => kb_account_id,
+                                                               :paypal_express_token => 'doesnottmatter',
+                                                               :paypal_express_baid => 'paypal-5'
+    @plugin.get_payment_methods(kb_account_id, false, nil).size.should == 5
+
+    # Verify we can match it
+    payment_methods << Killbill::Plugin::Model::PaymentMethodInfoPlugin.new(kb_account_id, 'kb-5', false, 'paypal-5')
+    @plugin.reset_payment_methods kb_account_id, payment_methods
+    verify_pms kb_account_id, 5
+
+    @plugin.stop_plugin
+  end
+
+  private
+
+  def verify_pms(kb_account_id, size)
+    pms = @plugin.get_payment_methods(kb_account_id, false, nil)
+    pms.size.should == size
+    pms.each do |pm|
+      pm.account_id.should == kb_account_id
+      pm.is_default.should == false
+      pm.external_payment_method_id.should == 'paypal-' + pm.payment_method_id.split('-')[1]
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 require 'bundler'
 require 'paypal_express'
 
+require 'logger'
+
 require 'rspec'
 
 RSpec.configure do |config|
@@ -11,8 +13,8 @@ end
 
 require 'active_record'
 ActiveRecord::Base.establish_connection(
-  :adapter => 'sqlite3',
-  :database => 'test.db'
+    :adapter => 'sqlite3',
+    :database => 'test.db'
 )
 # Create the schema
 require File.expand_path(File.dirname(__FILE__) + '../../db/schema.rb')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: killbill-paypal-express
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.15
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-06-03 00:00:00.000000000 Z
+date: 2013-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill