[WIP/RFC] integration branch review

.circleci/config.yml

@@ -123,7 +123,7 @@ jobs:
         environment:
           - TOXENV=py36-dj20-postgres
           - PINAX_STRIPE_DATABASE_HOST=127.0.0.1
-          - PINAX_STRIPE_DATABASE_USER=root
+          - PINAX_STRIPE_DATABASE_USER=postgres
           - PINAX_STRIPE_DATABASE_NAME=circle_test
       - image: circleci/postgres:9.6-alpine
   release:
@@ -153,86 +153,6 @@ workflows:
   version: 2
   test:
     jobs:
-      - lint:
-          filters:
-            tags:
-              only: /.*/
-      - py27dj18:
-          filters:
-            tags:
-              only: /.*/
-      - py27dj110:
-          filters:
-            tags:
-              only: /.*/
-      - py27dj111:
-          filters:
-            tags:
-              only: /.*/
-      - py34dj18:
-          filters:
-            tags:
-              only: /.*/
-      - py34dj110:
-          filters:
-            tags:
-              only: /.*/
-      - py34dj111:
-          filters:
-            tags:
-              only: /.*/
-      - py34dj20:
-          filters:
-            tags:
-              only: /.*/
-      - py35dj18:
-          filters:
-            tags:
-              only: /.*/
-      - py35dj110:
-          filters:
-            tags:
-              only: /.*/
-      - py35dj111:
-          filters:
-            tags:
-              only: /.*/
-      - py35dj20:
-          filters:
-            tags:
-              only: /.*/
-      - py36dj111:
-          filters:
-            tags:
-              only: /.*/
-      - py36dj20:
-          filters:
-            tags:
-              only: /.*/
-      - py36dj20psql:
-          filters:
-            tags:
-              only: /.*/
-      - release:
-          context: org-global
-          requires:
-            - lint
-            - py27dj18
-            - py27dj110
-            - py27dj111
-            - py34dj18
-            - py34dj110
-            - py34dj111
-            - py34dj20
-            - py35dj18
-            - py35dj110
-            - py35dj111
-            - py35dj20
-            - py36dj111
-            - py36dj20
-            - py36dj20psql
-          filters:
-            tags:
-              only: /[0-9]+(\.[0-9]+)*/
-            branches:
-              ignore: /.*/
+      - lint
+      - py27dj111
+      - py36dj20psql

Makefile

@@ -0,0 +1,9 @@
+.PHONY: makemigrations mergemigrations
+
+makemigrations mergemigrations: PINAX_STRIPE_DATABASE_ENGINE=django.db.backends.sqlite3
+
+makemigrations:
+	django-admin makemigrations pinax_stripe
+
+mergemigrations:
+	django-admin makemigrations --merge pinax_stripe

pinax/stripe/actions/coupons.py

@@ -6,9 +6,15 @@
 def sync_coupons():
     """
     Synchronizes all coupons from the Stripe API
+
+    TODO: Support connect / stripe_account param
     """
     coupons = stripe.Coupon.auto_paging_iter()
     for coupon in coupons:
+        sync_coupon_from_stripe_data(coupon)
+
+
+def sync_coupon_from_stripe_data(coupon, stripe_account=None):
         defaults = dict(
             amount_off=(
                 utils.convert_amount_for_db(coupon["amount_off"], coupon["currency"])
@@ -18,15 +24,24 @@ def sync_coupons():
             currency=coupon["currency"] or "",
             duration=coupon["duration"],
             duration_in_months=coupon["duration_in_months"],
+            livemode=coupon["livemode"],
             max_redemptions=coupon["max_redemptions"],
             metadata=coupon["metadata"],
             percent_off=coupon["percent_off"],
             redeem_by=utils.convert_tstamp(coupon["redeem_by"]) if coupon["redeem_by"] else None,
             times_redeemed=coupon["times_redeemed"],
             valid=coupon["valid"],
+            stripe_account=stripe_account,
         )
         obj, created = models.Coupon.objects.get_or_create(
             stripe_id=coupon["id"],
+            stripe_account=stripe_account,
             defaults=defaults
         )
         utils.update_with_defaults(obj, defaults, created)
+        return obj
+
+
+def purge_local(coupon, stripe_account=None):
+    return models.Coupon.objects.filter(
+        stripe_id=coupon["id"], stripe_account=stripe_account).delete()

pinax/stripe/actions/subscriptions.py

@@ -6,6 +6,7 @@
 import stripe
 
 from .. import hooks, models, utils
+from .coupons import sync_coupon_from_stripe_data
 
 
 def cancel(subscription, at_period_end=True):
@@ -167,6 +168,18 @@ def sync_subscription_from_stripe_data(customer, subscription):
         defaults=defaults
     )
     sub = utils.update_with_defaults(sub, defaults, created)
+    if subscription.get("discount", None):
+        defaults = {
+            "start": utils.convert_tstamp(subscription["discount"]["start"]),
+            "end": utils.convert_tstamp(subscription["discount"]["end"]) if subscription["discount"]["end"] else None,
+            "coupon": sync_coupon_from_stripe_data(subscription["discount"]["coupon"], stripe_account=customer.stripe_account),
+        }
+
+        obj, created = models.Discount.objects.get_or_create(
+            subscription=sub,
+            defaults=defaults
+        )
+        utils.update_with_defaults(obj, defaults, created)
     return sub
 
 

pinax/stripe/admin.py

@@ -28,10 +28,11 @@
 def user_search_fields():
     User = get_user_model()
     fields = [
-        "user__{0}".format(User.USERNAME_FIELD)
+        "user__{0}".format(User.USERNAME_FIELD),
+        "users__{0}".format(User.USERNAME_FIELD),
     ]
     if "email" in [f.name for f in User._meta.fields]:  # pragma: no branch
-        fields += ["user__email"]
+        fields += ["user__email", "users__email"]
     return fields
 
 
@@ -169,6 +170,7 @@ class ChargeAdmin(ModelAdmin):
         "disputed",
         "refunded",
         "receipt_sent",
+        "display_outcome",
         "created_at",
     ]
     list_select_related = [
@@ -193,6 +195,12 @@ class ChargeAdmin(ModelAdmin):
         "stripe_account_stripe_id",
     ]
 
+    def display_outcome(self, obj):
+        return "{} / {}".format(
+            obj.outcome.get("type", "-"),
+            obj.outcome.get("risk_level", "-")) if obj.outcome else None
+    display_outcome.short_description = "Outcome"
+
     def get_queryset(self, request):
         qs = super(ChargeAdmin, self).get_queryset(request)
         return qs.prefetch_related("customer__user", "customer__users")
@@ -225,6 +233,9 @@ class EventAdmin(ModelAdmin):
         "created_at",
         "stripe_account",
     ]
+    list_select_related = [
+        "stripe_account",
+    ]
     list_filter = [
         "kind",
         "created_at",
@@ -267,7 +278,7 @@ class CustomerAdmin(ModelAdmin):
     raw_id_fields = ["user", "stripe_account"]
     list_display = [
         "stripe_id",
-        "user",
+        "__str__",
         "account_balance",
         "currency",
         "delinquent",
@@ -276,6 +287,10 @@ class CustomerAdmin(ModelAdmin):
         "date_purged",
         "stripe_account",
     ]
+    list_select_related = [
+        "stripe_account",
+        "user",
+    ]
     list_filter = [
         "delinquent",
         CustomerHasCardListFilter,
@@ -291,6 +306,10 @@ class CustomerAdmin(ModelAdmin):
         BitcoinReceiverInline
     ]
 
+    def get_queryset(self, request):
+        qs = super(CustomerAdmin, self).get_queryset(request)
+        return qs.prefetch_related("users")
+
 
 class InvoiceItemInline(admin.TabularInline):
     model = InvoiceItem
@@ -364,6 +383,9 @@ class PlanAdmin(ModelAdmin):
         "trial_period_days",
         "stripe_account",
     ]
+    list_select_related = [
+        "stripe_account",
+    ]
     search_fields = [
         "stripe_id",
         "name",
@@ -376,6 +398,7 @@ class PlanAdmin(ModelAdmin):
 
 
 class CouponAdmin(ModelAdmin):
+    raw_id_fields = ["stripe_account"]
     list_display = [
         "stripe_id",
         "amount_off",
@@ -412,6 +435,9 @@ class TransferAdmin(ModelAdmin):
         "description",
         "stripe_account",
     ]
+    list_select_related = [
+        "stripe_account",
+    ]
     search_fields = [
         "stripe_id",
         "event__stripe_id",