Skip to content

Commit ba38a11

Browse files
authored
fix(SubPlat): Base Stripe logical subscription's payment_provider on the Stripe subscription's collection_method (DENG-9768). (#8174)
1 parent 62fe9a3 commit ba38a11

File tree

1 file changed

+6
-13
lines changed
  • sql/moz-fx-data-shared-prod/subscription_platform_derived/stripe_logical_subscriptions_history_v1

1 file changed

+6
-13
lines changed

sql/moz-fx-data-shared-prod/subscription_platform_derived/stripe_logical_subscriptions_history_v1/query.sql

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,6 @@ plan_services AS (
7777
GROUP BY
7878
plan_id
7979
),
80-
paypal_subscriptions AS (
81-
SELECT DISTINCT
82-
subscription_id
83-
FROM
84-
`moz-fx-data-shared-prod.stripe_external.invoice_v1`
85-
WHERE
86-
JSON_VALUE(metadata, '$.paypalTransactionId') IS NOT NULL
87-
),
8880
subscriptions_history_charge_summaries AS (
8981
SELECT
9082
history.id AS subscriptions_history_id,
@@ -226,7 +218,11 @@ SELECT
226218
FORMAT_TIMESTAMP('%FT%H:%M:%E6S', history.subscription_first_active_at)
227219
) AS id,
228220
'Stripe' AS provider,
229-
IF(paypal_subscriptions.subscription_id IS NOT NULL, 'PayPal', 'Stripe') AS payment_provider,
221+
IF(
222+
history.subscription.collection_method = 'send_invoice',
223+
'PayPal',
224+
'Stripe'
225+
) AS payment_provider,
230226
history.subscription.id AS provider_subscription_id,
231227
subscription_item.id AS provider_subscription_item_id,
232228
history.subscription.created AS provider_subscription_created_at,
@@ -247,7 +243,7 @@ SELECT
247243
charge_summaries.latest_card_country
248244
)
249245
-- SubPlat copies the PayPal billing agreement country to the customer's address.
250-
WHEN paypal_subscriptions.subscription_id IS NOT NULL
246+
WHEN history.subscription.collection_method = 'send_invoice'
251247
THEN NULLIF(history.subscription.customer.address.country, '')
252248
ELSE charge_summaries.latest_card_country
253249
END AS country_code,
@@ -366,9 +362,6 @@ CROSS JOIN
366362
LEFT JOIN
367363
plan_services
368364
ON subscription_item.plan.id = plan_services.plan_id
369-
LEFT JOIN
370-
paypal_subscriptions
371-
ON history.subscription.id = paypal_subscriptions.subscription_id
372365
LEFT JOIN
373366
subscriptions_history_charge_summaries AS charge_summaries
374367
ON history.id = charge_summaries.subscriptions_history_id

0 commit comments

Comments
 (0)