Merge pull request #527 from SumOfUs/going-cardless-ak

Post original payment to AK
SumOfUs · Jun 1, 2016 · 3111c9d · 3111c9d
2 parents 3679d1a + 79b07f6
commit 3111c9d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 22 deletions.
diff --git a/app/models/payment/go_cardless/subscription.rb b/app/models/payment/go_cardless/subscription.rb
@@ -12,15 +12,10 @@ def initialize(subscription, event = {})
     def call
       Payment::GoCardless.write_transaction(event['links']['payment'], amount, currency, page.id, subscription)
 
-      # Hack - ActionKit creates a transaction along with a recurring donation action, so when
-      # we eventually create our first transaction we don't need to pass this on.
-      #
-      if subscription.transactions.count > 1
-        ChampaignQueue.push(
-          type: 'subscription-payment',
-          recurring_id: @subscription.go_cardless_id
-        )
-      end
+      ChampaignQueue.push(
+        type: 'subscription-payment',
+        recurring_id: @subscription.go_cardless_id
+      )
     end
   end
 end

diff --git a/lib/payment_processor/clients/braintree/webhook_handler.rb b/lib/payment_processor/clients/braintree/webhook_handler.rb
@@ -42,16 +42,13 @@ def handle_subscription_charged
             return
           end
 
-          # Original transaction was made with the subscription
-          if subscription.transactions.count > 0
-            customer = Payment::BraintreeCustomer.find_by(member_id: original_action.member_id)
-            Payment.write_transaction(@notification, original_action.page_id, original_action.member_id, customer, false)
+          customer = Payment::BraintreeCustomer.find_by(member_id: original_action.member_id)
+          Payment.write_transaction(@notification, original_action.page_id, original_action.member_id, customer, false)
 
-            ChampaignQueue.push(
-              type: 'subscription-payment',
-              recurring_id: original_action.form_data['subscription_id']
-            )
-          end
+          ChampaignQueue.push(
+            type: 'subscription-payment',
+            recurring_id: original_action.form_data['subscription_id']
+          )
 
         end
 

diff --git a/spec/lib/payment_processor/clients/braintree/webhook_handler_spec.rb b/spec/lib/payment_processor/clients/braintree/webhook_handler_spec.rb
@@ -46,7 +46,7 @@ module Braintree
                 let(:transactions) { [] }
 
                 it 'pushes the transaction to be queued' do
-                  expect(ChampaignQueue).not_to have_received(:push)
+                  expect(ChampaignQueue).to have_received(:push)
                 end
               end
 

diff --git a/spec/lib/payment_processor/go_cardless/webhook_handler_spec.rb b/spec/lib/payment_processor/go_cardless/webhook_handler_spec.rb
@@ -322,8 +322,9 @@ module PaymentProcessor::GoCardless
         end
 
         context 'first created payment' do
-          it "doesn't post to queue" do
-            expect( ChampaignQueue ).not_to have_received(:push)
+          it "it posts to queue" do
+            expect( ChampaignQueue ).to have_received(:push)
+              .with({type: "subscription-payment", recurring_id: "index_ID_123" }).once
           end
         end
 
@@ -334,7 +335,7 @@ module PaymentProcessor::GoCardless
 
           it "posts to queue" do
             expect( ChampaignQueue ).to have_received(:push)
-              .with({type: "subscription-payment", recurring_id: "index_ID_123" })
+              .with({type: "subscription-payment", recurring_id: "index_ID_123" }).twice
           end
         end
       end