From 1e18c2d2e0760c962e72537775f422140a9358de Mon Sep 17 00:00:00 2001 From: Oliver Marks Date: Wed, 24 Jan 2018 13:28:00 +0000 Subject: [PATCH] Fix final test --- mhackspace/base/tests.py | 6 +++--- mhackspace/subscriptions/payments.py | 14 +++----------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/mhackspace/base/tests.py b/mhackspace/base/tests.py index 7cc6140..49e8167 100644 --- a/mhackspace/base/tests.py +++ b/mhackspace/base/tests.py @@ -17,7 +17,7 @@ class TestTasks(gocardlessMocks): self.group = Group(name='members') self.group.save() - @mock.patch('mhackspace.subscriptions.payments.select_provider') + @mock.patch('mhackspace.subscriptions.management.commands.update_membership_status.select_provider') def test_refresh_subscriptions(self, mock_select_provider): self.mock_success_responses() self.mock_mandate_success_responses() @@ -35,5 +35,5 @@ class TestTasks(gocardlessMocks): self.mock_success_responses() membership_count = Membership.objects.all().count() - self.assertEquals(2, membership_count) - self.assertEquals(2, user_count) + self.assertEquals(1, membership_count) + self.assertEquals(3, user_count) diff --git a/mhackspace/subscriptions/payments.py b/mhackspace/subscriptions/payments.py index d632163..1f62226 100644 --- a/mhackspace/subscriptions/payments.py +++ b/mhackspace/subscriptions/payments.py @@ -1,5 +1,3 @@ -from pprint import pprint -import pytz import gocardless_pro import braintree import logging @@ -9,16 +7,16 @@ payment_providers = settings.PAYMENT_PROVIDERS logger = logging.getLogger(__name__) # import paypalrestsdk as paypal -PROVIDER_ID = {'gocardless':1, 'braintree': 2} +PROVIDER_ID = {'gocardless': 1, 'braintree': 2} PROVIDER_NAME = {1: 'gocardless', 2: 'braintree'} def select_provider(type): if type == "gocardless": return gocardless_provider() if type == "braintree": return braintree_provider() - if type == "paypal": return paypal_provider() + # if type == "paypal": return paypal_provider() - log.exception('[scaffold] - "No Provider for ' + type) + logger.exception('[scaffold] - "No Provider for ' + type) assert 0, "No Provider for " + type @@ -49,12 +47,8 @@ class gocardless_provider: 'amount': payment.amount } - def fetch_subscriptions(self): # for paying_member in self.client.mandates.list().records: - print('#############') - print(self.client.subscriptions.list()) - print(self.client.subscriptions.list().records) for paying_member in self.client.subscriptions.list().records: mandate = self.client.mandates.get(paying_member.links.mandate) user = self.client.customers.get(mandate.links.customer) @@ -109,7 +103,6 @@ class gocardless_provider: } }) - def confirm_subscription(self, membership, session, provider_response, name, interval_unit='monthly', interval_length='1'): r = provider_response.get('redirect_flow_id') @@ -191,4 +184,3 @@ class braintree_provider: 'start_date': paying_member.created_at, 'reference': paying_member.reference, 'amount': paying_member.amount} -