[WIP] marcidy/quick fix customer (#32)

* adding customer retrieval and charge by customer, not token

* logging.warn deprecation fix

* adding test coverage for customer retrieval issue

* guarding against null email

* whoops, param swap

Author: marcidy

donate/routes.py

@@ -55,6 +55,10 @@ def get_donation_params(form):
     charges = [charge for charge
                in form.getlist('charge[amount]')
                if charge not in ["", "other", ' ']]
+
+    if form['donor[email]'] == '':
+        raise KeyError('email')
+
     ret = {
         'charge': charges[0],
         'email': form['donor[email]'],
@@ -155,14 +159,19 @@ def donation():
         flash(msg)
         return redirect('/index#form')
     except se.RateLimitError as error:
-        app.logger.warn("RateLimitError hit!")
+        app.logger.warning("RateLimitError hit!")
         flash("Rate limit hit, please try again in a few seconds")
         return redirect('/index#form')
     except se.StripeError as error:
         app.logger.error("StripeError: {}".format(error))
         flash("Unexpected error, please check data and try again."
               "  If the error persists, please contact Noisebridge support")
         return redirect('/index#form')
+    except ValueError as error:
+        app.logger.error("ValueError: {}".format(error))
+        flash("Unexpected error, please check data and try again."
+              "  If the error persists, please contact Noisebridge support")
+        return redirect('/index#form')
         # TODO log request data, make sure charge failed
 
     if params['recurring']:

donate/vendor/stripe.py

@@ -40,13 +40,14 @@ def create_charge(recurring, cc_token, amount_in_cents,
     if recurring:
         charge = charge_monthly(
             cc_token,
-            amount_in_cents,
             email,
+            amount_in_cents,
             description)
 
     else:
         charge = charge_once(
             cc_token,
+            email,
             amount_in_cents,
             description)
 
@@ -92,37 +93,46 @@ def create_plan(amount, currency, interval):
     return {'plan_id': plan}
 
 
-def charge_monthly(cc_token, amount_in_cents, email, description):
+def charge_monthly(cc_token, email, amount_in_cents, description):
     """creates a recurring charge, in this case hard coded to the defaults
     in 'get_plan' which is USD and monthly.
     """
     customer = get_customer(cc_token=cc_token, email=email)
     plan = get_plan(amount_in_cents)
 
     with stripe_api() as api:
-        subscription = stripe.Subscription.create(
+        subscription = api.Subscription.create(
             customer=customer['customer_id'],
             items=[{'plan': plan['plan_id']}])
 
     return {**customer, **plan, 'subscription_id': subscription.id}
 
 
-def charge_once(cc_token, amount_in_cents, description):
+def charge_once(cc_token, email, amount_in_cents, description):
     """ Returns the id of a one-off charge"""
+    customer = get_customer(cc_token=cc_token, email=email)
     with stripe_api() as api:
         charge = api.Charge.create(
             amount=amount_in_cents,
             currency='usd',
             description=description,
-            source=cc_token)
+            customer=customer['customer_id'])
 
     return {'charge_id': charge.id, 'customer_id': charge.customer}
 
 
 def get_customer(cc_token, email):
     with stripe_api() as api:
-        customer = api.Customer.create(
-            source=cc_token,
-            email=email)
+        customer_list = api.Customer.list(email=email)
+
+    if len(customer_list) == 0:
+        with stripe_api() as api:
+            customer = api.Customer.create(
+                source=cc_token,
+                email=email)
+    elif len(customer_list) == 1:
+        customer = customer_list.data[0]
+    elif len(customer_list) > 1:
+        raise ValueError("More than one customer for: {}".format(email))
 
     return {'customer_id': customer.id}

tests/test_stripe.py

@@ -38,19 +38,34 @@ def test_stringify_stripe_error():
     assert msg == "An unexpected error occured processing your payment request"
 
 
-@patch('donate.vendor.stripe.stripe.Charge')
-def test_create_onetime_charge(charge):
+@patch('donate.vendor.stripe.stripe.Charge.create')
+@patch('donate.vendor.stripe.stripe.Customer.list')
+@patch('donate.vendor.stripe.stripe.Customer.create')
+def test_create_onetime_charge(customer_create, customer_list, charge):
 
     tok = "token"
+    email = "[email protected]"
     amt = 10000
     desc = "lasers"
-    charge_id = stripe_utils.charge_once(tok, amt, desc)
+    customer_list.return_value = []
+    m = Mock
+    m.id = "test_customer"
+    customer_create.return_value = m
+
+    charge_id = stripe_utils.charge_once(tok, email, amt, desc)
 
-    assert charge.create.called
-    charge.create.assert_called_with(amount=amt,
-                                     currency="usd",
-                                     description=desc,
-                                     source=tok)
+    assert charge.called
+    assert customer_create.called
+    customer_create.called_with(source=tok, email=email)
+    charge.assert_called_with(amount=amt, currency='usd',
+                              description=desc,
+                              customer="test_customer")
+
+    customer_list.return_value = [Mock(data=m)]
+    assert charge.called
+    charge.assert_called_with(amount=amt, currency='usd',
+                              description=desc,
+                              customer="test_customer")
 
 
 @patch('donate.vendor.stripe.create_plan')
@@ -91,6 +106,7 @@ def test_get_plan(plan, create_plan):
     plan = stripe_utils.get_plan(amt, ccy, interval)
     assert plan['plan_id'] == 10
 
+
 @patch('donate.vendor.stripe.stripe.Plan')
 def test_create_plan(plan):
 

tests/test_views.py

@@ -160,6 +160,14 @@ def test_get_donation_params(testapp, test_form):
     assert result['project_select'] == form.vals['project_select']
 
 
+def test_get_donation_params_error(testapp, test_form):
+    app = testapp
+    form = test_form
+    form.vals["donor[email]"] = ''
+    with pytest.raises(KeyError):
+        get_donation_params(form)
+
+
 @pytest.mark.usefixtures('test_db_project')
 def test_model_stripe_data(testapp, test_form, db):
     app = testapp
@@ -238,3 +246,8 @@ def test_donation_post(flash, create_charge, get_params, testapp,
 
     create_charge.return_value = {'charge_id': 0, 'customer_id': 1}
     response = app.post("/donation", data=test_form, follow_redirects=True)
+
+    create_charge.side_effect = ValueError("[email protected]")
+    response = app.post("/donation", data=test_form)
+    assert response.status_code == 302
+