TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-23 11:55:01 +03:00
Code Issues Projects Releases Wiki Activity

🐛 Fixed 3D secure payment not counted as paid subscription in graph

Browse Source 
fixes https://github.com/TryGhost/Team/issues/2644

A 3D secure payment first has a status of incomplete, then active.

With the current logic, this creates 2 MemberPaidSubscriptionEvents:

- `created` with mrr_delta of 0
- `active` with mrr_delta of 5

We need to also count 'active' events. And to complement that, also 'inactive' events to make sure we balance out in rare cases.
This commit is contained in:
Simon Backx 2023-03-09 15:26:24 +01:00 committed by Simon Backx
parent c71582877c
commit 400e1b4ab6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ghost/stats-service/lib/subscriptions.js
View File

@ -93,27 +93,27 @@ class SubscriptionStatsService {
`)) `))
.select(knex.raw(`SUM( .select(knex.raw(`SUM(
CASE CASE
WHEN members_paid_subscription_events.type IN ('created','reactivated') AND members_paid_subscription_events.mrr_delta != 0 THEN 1 WHEN members_paid_subscription_events.type IN ('created','reactivated','active') AND members_paid_subscription_events.mrr_delta != 0 THEN 1
WHEN members_paid_subscription_events.type='updated' AND price.id = to_price.id THEN 1 WHEN members_paid_subscription_events.type='updated' AND price.id = to_price.id THEN 1
ELSE 0 ELSE 0
END END
) as positive_delta`)) ) as positive_delta`))
.select(knex.raw(`SUM( .select(knex.raw(`SUM(
CASE CASE
WHEN members_paid_subscription_events.type IN ('canceled', 'expired') AND members_paid_subscription_events.mrr_delta != 0 THEN 1 WHEN members_paid_subscription_events.type IN ('canceled', 'expired','inactive') AND members_paid_subscription_events.mrr_delta != 0 THEN 1
WHEN members_paid_subscription_events.type='updated' AND price.id = from_price.id THEN 1 WHEN members_paid_subscription_events.type='updated' AND price.id = from_price.id THEN 1
ELSE 0 ELSE 0
END END
) as negative_delta`)) ) as negative_delta`))
.select(knex.raw(`SUM( .select(knex.raw(`SUM(
CASE CASE
WHEN members_paid_subscription_events.type IN ('created','reactivated') AND members_paid_subscription_events.mrr_delta != 0 THEN 1 WHEN members_paid_subscription_events.type IN ('created','reactivated','active') AND members_paid_subscription_events.mrr_delta != 0 THEN 1
ELSE 0 ELSE 0
END END
) as signups`)) ) as signups`))
.select(knex.raw(`SUM( .select(knex.raw(`SUM(
CASE CASE
WHEN members_paid_subscription_events.type IN ('canceled', 'expired') AND members_paid_subscription_events.mrr_delta != 0 THEN 1 WHEN members_paid_subscription_events.type IN ('canceled', 'expired','inactive') AND members_paid_subscription_events.mrr_delta != 0 THEN 1
ELSE 0 ELSE 0
END END
) as cancellations`)) ) as cancellations`))