Skip to content

fix(SubPlat): Base Stripe logical subscription's payment_provider on the Stripe subscription's collection_method (DENG-9768) #8174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 2, 2025
Merged

fix(SubPlat): Base Stripe logical subscription's payment_provider on the Stripe subscription's collection_method (DENG-9768) #8174

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 6 additions & 13 deletions ...ared-prod/subscription_platform_derived/stripe_logical_subscriptions_history_v1/query.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,6 @@ plan_services AS (
GROUP BY
plan_id
),
paypal_subscriptions AS (
SELECT DISTINCT
subscription_id
FROM
`moz-fx-data-shared-prod.stripe_external.invoice_v1`
WHERE
JSON_VALUE(metadata, '$.paypalTransactionId') IS NOT NULL
),
subscriptions_history_charge_summaries AS (
SELECT
history.id AS subscriptions_history_id,
Expand Down Expand Up @@ -226,7 +218,11 @@ SELECT
FORMAT_TIMESTAMP('%FT%H:%M:%E6S', history.subscription_first_active_at)
) AS id,
'Stripe' AS provider,
IF(paypal_subscriptions.subscription_id IS NOT NULL, 'PayPal', 'Stripe') AS payment_provider,
IF(
history.subscription.collection_method = 'send_invoice',
'PayPal',
'Stripe'
) AS payment_provider,
history.subscription.id AS provider_subscription_id,
subscription_item.id AS provider_subscription_item_id,
history.subscription.created AS provider_subscription_created_at,
Expand All @@ -247,7 +243,7 @@ SELECT
charge_summaries.latest_card_country
)
-- SubPlat copies the PayPal billing agreement country to the customer's address.
WHEN paypal_subscriptions.subscription_id IS NOT NULL
WHEN history.subscription.collection_method = 'send_invoice'
THEN NULLIF(history.subscription.customer.address.country, '')
ELSE charge_summaries.latest_card_country
END AS country_code,
Expand Down Expand Up @@ -344,9 +340,6 @@ CROSS JOIN
LEFT JOIN
plan_services
ON subscription_item.plan.id = plan_services.plan_id
LEFT JOIN
paypal_subscriptions
ON history.subscription.id = paypal_subscriptions.subscription_id
LEFT JOIN
subscriptions_history_charge_summaries AS charge_summaries
ON history.id = charge_summaries.subscriptions_history_id
Expand Down