Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-03-11 02:12:21 -05:00
Code Issues Activity

Updated calculation of MRR history to use mrr column (#14481)

Browse source 
refs https://github.com/TryGhost/Team/issues/1518

- Uses mrr column now
- Doesn't account for `cancel_at_period_end` until a migration fixes the MRR values: https://github.com/TryGhost/Ghost/pull/14480
This commit is contained in:
Simon Backx 2022-04-19 17:07:20 +02:00 • committed by GitHub
parent 0c72e78e6a
commit a3215a6edf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/server/services/stats/lib/mrr-stats-service.js
View file

@ -13,15 +13,7 @@ class MrrStatsService {
const knex = this.db.knex; const knex = this.db.knex;
const rows = await knex('members_stripe_customers_subscriptions') const rows = await knex('members_stripe_customers_subscriptions')
.select(knex.raw(`plan_currency as currency`)) .select(knex.raw(`plan_currency as currency`))
.select(knex.raw(`SUM( .select(knex.raw(`SUM(mrr) AS mrr`))
CASE WHEN plan_interval = 'year' THEN
FLOOR(plan_amount / 12)
ELSE
plan_amount
END
) AS mrr`))
.whereIn('status', ['active', 'unpaid', 'past_due'])
.where('cancel_at_period_end', 0)
.groupBy('plan_currency') .groupBy('plan_currency')
.orderBy('currency'); .orderBy('currency');

2
test/utils/fixtures/data-generator.js
View file

@ -506,7 +506,7 @@ DataGenerator.Content = {
plan_interval: 'month', plan_interval: 'month',
plan_amount: '1000', plan_amount: '1000',
plan_currency: 'usd', plan_currency: 'usd',
mrr: 1000 mrr: 0
}, },
{ {
id: ObjectId().toHexString(), id: ObjectId().toHexString(),