#1480 black format

Author: chrisjsimpson

subscribie/blueprints/admin/__init__.py

@@ -1399,13 +1399,23 @@ def _generate_account_link(account_id):
     parameter on their account to see if they've completed the onboarding process.
     """
     # Stripe requires HTTPS URLs when in live mode
-    url_scheme = 'https' if stripe_livemode() else None
+    url_scheme = "https" if stripe_livemode() else None
 
     account_link = stripe.AccountLink.create(
         type="account_onboarding",
         account=account_id,
-        refresh_url=url_for("admin.stripe_connect", refresh="refresh", _external=True, _scheme=url_scheme),
-        return_url=url_for("admin.stripe_connect", success="success", _external=True, _scheme=url_scheme),
+        refresh_url=url_for(
+            "admin.stripe_connect",
+            refresh="refresh",
+            _external=True,
+            _scheme=url_scheme,
+        ),
+        return_url=url_for(
+            "admin.stripe_connect",
+            success="success",
+            _external=True,
+            _scheme=url_scheme,
+        ),
     )
     return account_link.url
 
@@ -2405,7 +2415,9 @@ def do_backfill_data(days, backfill_types, app):
                     log.info(">>> Completed backfilling transactions")
                     sys.stdout.flush()
                 except Exception as e:
-                    error_msg = f"Error backfilling transactions: {e}\n{traceback.format_exc()}"
+                    error_msg = (
+                        f"Error backfilling transactions: {e}\n{traceback.format_exc()}"
+                    )
                     log.error(error_msg)
                     sys.stdout.flush()
                     errors.append(f"transactions: {str(e)}")
@@ -2433,7 +2445,9 @@ def do_backfill_data(days, backfill_types, app):
                     log.info(">>> Completed backfilling persons")
                     sys.stdout.flush()
                 except Exception as e:
-                    error_msg = f"Error backfilling persons: {e}\n{traceback.format_exc()}"
+                    error_msg = (
+                        f"Error backfilling persons: {e}\n{traceback.format_exc()}"
+                    )
                     log.error(error_msg)
                     sys.stdout.flush()
                     errors.append(f"persons: {str(e)}")
@@ -2447,15 +2461,19 @@ def do_backfill_data(days, backfill_types, app):
                     log.info(">>> Completed backfilling invoices")
                     sys.stdout.flush()
                 except Exception as e:
-                    error_msg = f"Error backfilling invoices: {e}\n{traceback.format_exc()}"
+                    error_msg = (
+                        f"Error backfilling invoices: {e}\n{traceback.format_exc()}"
+                    )
                     log.error(error_msg)
                     sys.stdout.flush()
                     errors.append(f"invoices: {str(e)}")
 
             # Log final results
             log.info("=" * 80)
             if results:
-                log.info(f"BACKFILL SUCCESS: {', '.join(results)} for the last {days} days")
+                log.info(
+                    f"BACKFILL SUCCESS: {', '.join(results)} for the last {days} days"
+                )
             if errors:
                 log.error(f"BACKFILL ERRORS: {len(errors)} error(s) occurred")
                 for error in errors:
@@ -2465,7 +2483,9 @@ def do_backfill_data(days, backfill_types, app):
 
     except Exception as e:
         # Catch any unexpected errors in the background task itself
-        error_msg = f"FATAL ERROR in backfill background task:\n{traceback.format_exc()}"
+        error_msg = (
+            f"FATAL ERROR in backfill background task:\n{traceback.format_exc()}"
+        )
         log.error(error_msg)
         sys.stdout.flush()
         # Re-raise to ensure we see it

subscribie/blueprints/checkout/__init__.py

@@ -460,7 +460,7 @@ def stripe_create_checkout_session():
     payment_method_types = ["card"]
 
     # Stripe requires HTTPS URLs when in live mode
-    url_scheme = 'https' if get_stripe_livemode() else None
+    url_scheme = "https" if get_stripe_livemode() else None
 
     cancel_url = url_for("checkout.order_summary", _external=True, _scheme=url_scheme)
     mode = "payment"
@@ -492,7 +492,10 @@ def stripe_create_checkout_session():
         charge["sell_price"] = plan.getSellPrice(currency_code)
         charge["interval_amount"] = plan.getIntervalAmount(currency_code)
         success_url = url_for(
-            "checkout.instant_payment_complete", _external=True, plan=plan.uuid, _scheme=url_scheme
+            "checkout.instant_payment_complete",
+            _external=True,
+            plan=plan.uuid,
+            _scheme=url_scheme,
         )
 
         if plan.requirements.subscription:
@@ -568,7 +571,9 @@ def stripe_create_checkout_session():
             )
 
     elif is_donation is True:
-        success_url = url_for("checkout.instant_payment_complete", _external=True, _scheme=url_scheme)
+        success_url = url_for(
+            "checkout.instant_payment_complete", _external=True, _scheme=url_scheme
+        )
         donation_amount = int(session["donation_amount"] * 100)
         line_items.append(
             {

subscribie/blueprints/subscriber/__init__.py

@@ -266,7 +266,7 @@ def account():
             )
 
             # Stripe requires HTTPS URLs when in live mode
-            url_scheme = 'https' if get_stripe_livemode() else None
+            url_scheme = "https" if get_stripe_livemode() else None
 
             stripe_session = stripe.checkout.Session.create(
                 stripe_account=stripe_connect_account_id,
@@ -276,9 +276,13 @@ def account():
                 setup_intent_data={
                     "metadata": {"subscription_id": stripe_subscription.id}
                 },
-                success_url=url_for("subscriber.account", _external=True, _scheme=url_scheme)
+                success_url=url_for(
+                    "subscriber.account", _external=True, _scheme=url_scheme
+                )
                 + "?stripe_session_id={CHECKOUT_SESSION_ID}",
-                cancel_url=url_for("subscriber.account", _external=True, _scheme=url_scheme),
+                cancel_url=url_for(
+                    "subscriber.account", _external=True, _scheme=url_scheme
+                ),
             )
             if request.args.get("stripe_session_id"):
                 # Process stripe update payment request

subscribie/utils.py

@@ -653,8 +653,7 @@ def backfill_transactions(days=30):
         if paymentIntent.invoice:
             try:
                 invoice = stripe.Invoice.retrieve(
-                    stripe_account=stripe_connect_account_id,
-                    id=paymentIntent.invoice
+                    stripe_account=stripe_connect_account_id, id=paymentIntent.invoice
                 )
                 if invoice.subscription:
                     subscription_id = invoice.subscription
@@ -677,7 +676,9 @@ def backfill_transactions(days=30):
             # Update other fields that may have changed
             transaction.amount = paymentIntent.amount
             transaction.currency = paymentIntent.currency
-            transaction.payment_status = "paid" if paymentIntent.status == "succeeded" else paymentIntent.status
+            transaction.payment_status = (
+                "paid" if paymentIntent.status == "succeeded" else paymentIntent.status
+            )
 
             database.session.commit()
             updated_count += 1
@@ -689,8 +690,14 @@ def backfill_transactions(days=30):
             transaction.external_src = "stripe"
             transaction.currency = paymentIntent.currency
             transaction.amount = paymentIntent.amount
-            transaction.payment_status = "paid" if paymentIntent.status == "succeeded" else paymentIntent.status
-            transaction.comment = invoice.subscription_details.metadata.get("donation_comment") if invoice and invoice.subscription_details  else None
+            transaction.payment_status = (
+                "paid" if paymentIntent.status == "succeeded" else paymentIntent.status
+            )
+            transaction.comment = (
+                invoice.subscription_details.metadata.get("donation_comment")
+                if invoice and invoice.subscription_details
+                else None
+            )
             transaction.created_at = stripe_transaction_created_at
 
             # Try to find subscription in local database
@@ -703,29 +710,45 @@ def backfill_transactions(days=30):
                 if subscribie_subscription:
                     transaction.subscription = subscribie_subscription
                     transaction.person = subscribie_subscription.person
-                    log.info(f"Linked transaction to subscription {subscribie_subscription.id}")
+                    log.info(
+                        f"Linked transaction to subscription {subscribie_subscription.id}"
+                    )
                 else:
-                    log.warning(f"Subscription {subscription_id} not found in local database")
+                    log.warning(
+                        f"Subscription {subscription_id} not found in local database"
+                    )
 
             # Try to get person from metadata if no subscription found
             if transaction.person is None and paymentIntent.invoice:
-                person_uuid = invoice.subscription_details.metadata.get("person_uuid") if invoice and invoice.subscription_details else None
+                person_uuid = (
+                    invoice.subscription_details.metadata.get("person_uuid")
+                    if invoice and invoice.subscription_details
+                    else None
+                )
                 if person_uuid:
                     person = Person.query.filter_by(uuid=person_uuid).first()
                     if person:
                         transaction.person = person
-                        log.info(f"Linked transaction to person {person.id} via metadata")
+                        log.info(
+                            f"Linked transaction to person {person.id} via metadata"
+                        )
 
                 # Check if it's a donation
-                is_donation = invoice.subscription_details.metadata.get("is_donation", "False") if invoice and invoice.subscription_details else False
+                is_donation = (
+                    invoice.subscription_details.metadata.get("is_donation", "False")
+                    if invoice and invoice.subscription_details
+                    else False
+                )
                 if is_donation == "True":
                     transaction.is_donation = True
 
             database.session.add(transaction)
             database.session.commit()
             created_count += 1
 
-    log.info(f"Backfill complete: {created_count} transactions created, {updated_count} updated")
+    log.info(
+        f"Backfill complete: {created_count} transactions created, {updated_count} updated"
+    )
 
 
 def backfill_subscriptions(days=30):

tests/test_admin_backfill.py

@@ -4,6 +4,7 @@
 Tests the user-friendly backfill data form at /admin/backfill
 introduced in issue #1476.
 """
+
 import pytest
 from subscribie.models import User
 from unittest.mock import patch, MagicMock
@@ -14,6 +15,7 @@
 @contextmanager
 def user_set(app, user):
     """Context manager to set g.user for testing authenticated routes"""
+
     def handler(sender, **kwargs):
         g.user = user
 
@@ -62,7 +64,7 @@ def test_backfill_form_renders_successfully(
             assert 'id="backfill_subscriptions"' in response_data
             assert 'id="backfill_persons"' in response_data
             assert 'id="backfill_invoices"' in response_data
-            assert 'checked' in response_data  # At least some checkboxes are checked
+            assert "checked" in response_data  # At least some checkboxes are checked
 
     @patch("subscribie.blueprints.admin.backfill_transactions")
     @patch("subscribie.blueprints.admin.backfill_subscriptions")
@@ -95,7 +97,12 @@ def test_backfill_form_submission_with_all_types(
                 "/admin/backfill",
                 data={
                     "days": "30",
-                    "backfill_types": ["transactions", "subscriptions", "persons", "invoices"],
+                    "backfill_types": [
+                        "transactions",
+                        "subscriptions",
+                        "persons",
+                        "invoices",
+                    ],
                 },
                 follow_redirects=True,
             )
@@ -105,7 +112,10 @@ def test_backfill_form_submission_with_all_types(
             response_data = response.data.decode("utf-8")
 
             # Should show the backfill form again after redirect
-            assert "Backfill Data from Stripe" in response_data or "Synchronise Data from Stripe" in response_data
+            assert (
+                "Backfill Data from Stripe" in response_data
+                or "Synchronise Data from Stripe" in response_data
+            )
 
             # Give background thread a moment to start
             time.sleep(0.5)
@@ -146,7 +156,10 @@ def test_backfill_form_submission_with_single_type(
             response_data = response.data.decode("utf-8")
 
             # Should show the backfill form again after redirect
-            assert "Backfill Data from Stripe" in response_data or "Synchronise Data from Stripe" in response_data
+            assert (
+                "Backfill Data from Stripe" in response_data
+                or "Synchronise Data from Stripe" in response_data
+            )
 
             # Give background thread a moment to start
             time.sleep(0.5)
@@ -271,7 +284,9 @@ def test_backfill_requires_authentication(
 
         # Should redirect to login
         assert response.status_code == 302
-        assert "/auth/login" in response.location or "login" in response.location.lower()
+        assert (
+            "/auth/login" in response.location or "login" in response.location.lower()
+        )
 
     @patch("subscribie.blueprints.admin.backfill_transactions")
     def test_legacy_api_endpoint_preserved(