Move API Keys to Admin from settings file.

djstripe/admin/admin.py

@@ -9,6 +9,7 @@
 from stripe.error import InvalidRequestError
 
 from djstripe import models
+from djstripe.settings import djstripe_settings
 
 from .actions import CustomActionMixin
 from .admin_inline import (
@@ -22,6 +23,7 @@
 from .filters import CustomerHasSourceListFilter, CustomerSubscriptionStatusListFilter
 from .forms import (
     APIKeyAdminCreateForm,
+    APIKeyAdminEditForm,
     CustomActionForm,
     WebhookEndpointAdminCreateForm,
     WebhookEndpointAdminEditForm,
@@ -83,19 +85,22 @@ def __init__(self, *args, **kwargs):
 
     def get_list_display(self, request):
         return (
-            ("__str__", "id", "djstripe_owner_account")
-            + self.list_display
-            + ("created", "livemode")
+            "__str__",
+            "id",
+            "djstripe_owner_account",
+            *self.list_display,
+            "created",
+            "livemode",
         )
 
     def get_list_filter(self, request):
-        return self.list_filter + ("created", "livemode")
+        return (*self.list_filter, "created", "livemode")
 
     def get_readonly_fields(self, request, obj=None):
-        return self.readonly_fields + ("id", "djstripe_owner_account", "created")
+        return (*self.readonly_fields, "id", "djstripe_owner_account", "created")
 
     def get_search_fields(self, request):
-        return self.search_fields + ("id",)
+        return (*self.search_fields, "id")
 
     def get_fieldsets(self, request, obj=None):
         common_fields = ("livemode", "id", "djstripe_owner_account", "created")
@@ -114,16 +119,20 @@ def get_queryset(self, request):
 @admin.register(models.Account)
 class AccountAdmin(StripeModelAdmin):
     list_display = ("business_url", "country", "default_currency")
-    list_filter = ("details_submitted",)
-    search_fields = ("settings", "business_profile")
 
 
 @admin.register(models.APIKey)
 class APIKeyAdmin(admin.ModelAdmin):
     add_form_template = "djstripe/admin/add_form.html"
     change_form_template = "djstripe/admin/change_form.html"
 
-    list_display = ("__str__", "type", "djstripe_owner_account", "livemode")
+    list_display = (
+        "__str__",
+        "djstripe_is_account_default",
+        "type",
+        "djstripe_owner_account",
+        "livemode",
+    )
     readonly_fields = ("djstripe_owner_account", "livemode", "type", "secret")
     search_fields = ("name",)
 
@@ -135,12 +144,19 @@ def get_readonly_fields(self, request, obj=None):
     def get_fields(self, request, obj=None):
         if obj is None:
             return APIKeyAdminCreateForm.Meta.fields
-        return ["type", "djstripe_owner_account", "livemode", "name", "secret"]
+        return [
+            "type",
+            "djstripe_is_account_default",
+            "djstripe_owner_account",
+            "livemode",
+            "name",
+            "secret",
+        ]
 
     def get_form(self, request, obj=None, **kwargs):
         if obj is None:
             return APIKeyAdminCreateForm
-        return super().get_form(request, obj, **kwargs)
+        return APIKeyAdminEditForm
 
     def get_queryset(self, request):
         return super().get_queryset(request).select_related("djstripe_owner_account")
@@ -154,7 +170,24 @@ def save_model(self, request: Any, obj, form: Any, change: Any) -> None:
             with transaction.atomic():
                 obj.save()
         except IntegrityError:
-            pass
+            # Get the name and djstripe_is_account_default from the form
+            name = form.cleaned_data.get("name", "")
+            djstripe_is_account_default = form.cleaned_data.get(
+                "djstripe_is_account_default"
+            )
+
+            # Get APIKey from DB
+            instance = self.model.objects.get(secret=obj.secret)
+
+            # Update name and djstripe_is_account_default of APIKey
+            instance.name = name
+            instance.djstripe_is_account_default = djstripe_is_account_default
+            instance.save()
+
+    def get_changeform_initial_data(self, request) -> Dict[str, str]:
+        ret = super().get_changeform_initial_data(request)
+        ret.setdefault("djstripe_is_account_default", True)
+        return ret
 
 
 @admin.register(models.BalanceTransaction)
@@ -252,12 +285,13 @@ def get_queryset(self, request):
 class DiscountAdmin(ReadOnlyMixin, StripeModelAdmin):
     list_display = (
         "customer",
-        "coupon",
-        "invoice_item",
         "promotion_code",
         "subscription",
     )
-    list_filter = ("customer", "start", "end", "promotion_code", "coupon")
+    list_filter = (
+        "customer",
+        "promotion_code",
+    )
 
     def get_actions(self, request):
         """
@@ -402,7 +436,7 @@ class SessionAdmin(StripeModelAdmin):
     search_fields = ("customer__id", "customer_email")
 
     def get_queryset(self, request):
-        return super().get_queryset(request).select_related("customer", "subscription")
+        return super().get_queryset(request).select_related("customer")
 
 
 @admin.register(models.Invoice)
@@ -478,34 +512,6 @@ def get_actions(self, request):
         return actions
 
 
-@admin.register(models.Plan)
-class PlanAdmin(StripeModelAdmin):
-    radio_fields = {"interval": admin.HORIZONTAL}
-
-    def get_readonly_fields(self, request, obj=None):
-        """Return extra readonly_fields."""
-        readonly_fields = super().get_readonly_fields(request, obj)
-
-        if obj:
-            readonly_fields += (
-                "amount",
-                "currency",
-                "interval",
-                "interval_count",
-                "trial_period_days",
-            )
-
-        return readonly_fields
-
-    def get_queryset(self, request):
-        return (
-            super()
-            .get_queryset(request)
-            .select_related("product")
-            .prefetch_related("subscriptions")
-        )
-
-
 @admin.register(models.Price)
 class PriceAdmin(StripeModelAdmin):
     list_display = ("product", "currency", "active")
@@ -641,8 +647,7 @@ class ShippingRateAdmin(StripeModelAdmin):
 
 @admin.register(models.Subscription)
 class SubscriptionAdmin(StripeModelAdmin):
-    list_display = ("customer", "status", "get_product_name", "get_default_tax_rates")
-    list_filter = ("status", "cancel_at_period_end")
+    list_display = ("customer",)
 
     inlines = (SubscriptionItemInline, SubscriptionScheduleInline, LineItemInline)
 
@@ -658,68 +663,13 @@ def _cancel(self, request, queryset):
         context = self.get_admin_action_context(queryset, "_cancel", CustomActionForm)
         return render(request, "djstripe/admin/confirm_action.html", context)
 
-    def get_queryset(self, request):
-        return (
-            super()
-            .get_queryset(request)
-            .select_related(
-                "customer",
-                "plan",
-                "plan__product",
-            )
-            .prefetch_related(
-                "customer__subscriptions",
-                "customer__subscriptions__plan",
-                "customer__subscriptions__plan__product",
-                "default_tax_rates",
-            )
-        )
-
-    @admin.display(description="Default Tax Rates")
-    def get_default_tax_rates(self, obj):
-        result = [str(tax_rate) for tax_rate in obj.default_tax_rates.all()]
-        if result:
-            return ", ".join(result)
-
-    @admin.display(description="Product Name")
-    def get_product_name(self, obj):
-        if obj.plan and obj.plan.product:
-            return obj.plan.product.name
-
 
 @admin.register(models.SubscriptionSchedule)
 class SubscriptionScheduleAdmin(StripeModelAdmin):
     list_display = ("status", "subscription", "current_phase", "customer")
     list_filter = ("status", "subscription", "customer")
     list_select_related = ("customer", "customer__subscriber", "subscription")
 
-    @admin.display(description="Release Selected Subscription Schedules")
-    def _release_subscription_schedule(self, request, queryset):
-        """Release a SubscriptionSchedule."""
-        context = self.get_admin_action_context(
-            queryset, "_release_subscription_schedule", CustomActionForm
-        )
-        return render(request, "djstripe/admin/confirm_action.html", context)
-
-    @admin.display(description="Cancel Selected Subscription Schedules")
-    def _cancel_subscription_schedule(self, request, queryset):
-        """Cancel a SubscriptionSchedule."""
-        context = self.get_admin_action_context(
-            queryset, "_cancel_subscription_schedule", CustomActionForm
-        )
-        return render(request, "djstripe/admin/confirm_action.html", context)
-
-    def get_actions(self, request):
-        # get all actions
-        actions = super().get_actions(request)
-        actions["_release_subscription_schedule"] = self.get_action(
-            "_release_subscription_schedule"
-        )
-        actions["_cancel_subscription_schedule"] = self.get_action(
-            "_cancel_subscription_schedule"
-        )
-        return actions
-
 
 @admin.register(models.TaxCode)
 class TaxCodeAdmin(StripeModelAdmin):
@@ -775,12 +725,7 @@ def get_actions(self, request):
 
 @admin.register(models.UsageRecordSummary)
 class UsageRecordSummaryAdmin(StripeModelAdmin):
-    list_display = ("invoice", "subscription_item", "total_usage")
-
-    def get_queryset(self, request):
-        return (
-            super().get_queryset(request).select_related("invoice", "subscription_item")
-        )
+    pass
 
 
 @admin.register(models.WebhookEndpoint)
@@ -835,7 +780,8 @@ def get_fieldsets(self, request, obj=None):
                 "metadata",
                 "api_version",
                 "djstripe_uuid",
-                "tolerance",
+                "djstripe_tolerance",
+                "djstripe_validation_method",
             ]
             if obj.djstripe_uuid:
                 core_fields = [
@@ -855,7 +801,8 @@ def get_fieldsets(self, request, obj=None):
                 "metadata",
                 "api_version",
                 "enabled_events",
-                "tolerance",
+                "djstripe_tolerance",
+                "djstripe_validation_method",
             ]
 
         return [
@@ -871,16 +818,15 @@ def get_changeform_initial_data(self, request) -> Dict[str, str]:
         ret = super().get_changeform_initial_data(request)
         base_url = f"{request.scheme}://{request.get_host()}"
         ret.setdefault("base_url", base_url)
+        ret.setdefault("api_version", djstripe_settings.STRIPE_API_VERSION)
         return ret
 
     def delete_model(self, request, obj: models.WebhookEndpoint):
         try:
             obj._api_delete()
         except InvalidRequestError as e:
-            if e.user_message.startswith("No such webhook endpoint: "):
-                # Webhook was already deleted in Stripe
-                pass
-            else:
+            # Error other than Webhook was already deleted in Stripe
+            if not e.user_message.startswith("No such webhook endpoint: "):
                 raise
 
         return super().delete_model(request, obj)

djstripe/admin/filters.py

@@ -66,7 +66,7 @@ def lookups(self, request, model_admin):
         statuses = [
             [x, x.replace("_", " ").title()]
             for x in models.Subscription.objects.values_list(
-                "status", flat=True
+                "stripe_data__status", flat=True
             ).distinct()
         ]
         statuses.append(["none", "No Subscription"])