ghost 4.44.0 → 4.45.0

package/core/server/services/stats/lib/members-stats-service.js

@@ -1,161 +0,0 @@
-const moment = require('moment');
-
-class MembersStatsService {
-    constructor({db}) {
-        this.db = db;
-    }
-
-    /**
-     * Get the current total members grouped by status
-     * @returns {Promise<TotalMembersByStatus>}
-     */
-    async getCount() {
-        const knex = this.db.knex;
-        const rows = await knex('members')
-            .select('status')
-            .select(knex.raw('COUNT(id) AS total'))
-            .groupBy('status');
-        
-        const paidEvent = rows.find(c => c.status === 'paid');
-        const freeEvent = rows.find(c => c.status === 'free');
-        const compedEvent = rows.find(c => c.status === 'comped');
-
-        return {
-            paid: paidEvent ? paidEvent.total : 0,
-            free: freeEvent ? freeEvent.total : 0,
-            comped: compedEvent ? compedEvent.total : 0
-        };
-    }
-
-    /**
-     * Get the member deltas by status for all days, sorted ascending
-     * @returns {Promise<MemberStatusDelta[]>} The deltas of paid, free and comped users per day, sorted ascending
-     */
-    async fetchAllStatusDeltas() {
-        const knex = this.db.knex;
-        const rows = await knex('members_status_events')
-            .select(knex.raw('DATE(created_at) as date'))
-            .select(knex.raw(`SUM(
-                CASE WHEN to_status='paid' THEN 1
-                ELSE 0 END
-            ) as paid_subscribed`))
-            .select(knex.raw(`SUM(
-                CASE WHEN from_status='paid' THEN 1
-                ELSE 0 END
-            ) as paid_canceled`))
-            .select(knex.raw(`SUM(
-                CASE WHEN to_status='comped' THEN 1
-                WHEN from_status='comped' THEN -1
-                ELSE 0 END
-            ) as comped_delta`))
-            .select(knex.raw(`SUM(
-                CASE WHEN to_status='free' THEN 1
-                WHEN from_status='free' THEN -1
-                ELSE 0 END
-            ) as free_delta`))
-            .groupByRaw('DATE(created_at)')
-            .orderByRaw('DATE(created_at)');
-        return rows;
-    }
-
-    /**
-     * Returns a list of the total members by status for each day, including the paid deltas paid_subscribed and paid_canceled
-     * @returns {Promise<CountHistory>}
-     */
-    async getCountHistory() {
-        const rows = await this.fetchAllStatusDeltas();
-
-        // Fetch current total amounts and start counting from there
-        const totals = await this.getCount();
-        let {paid, free, comped} = totals;
-
-        // Get today in UTC (default timezone)
-        const today = moment().format('YYYY-MM-DD');
-
-        const cumulativeResults = [];
-
-        // Loop in reverse order (needed to have correct sorted result)
-        for (let i = rows.length - 1; i >= 0; i -= 1) {
-            const row = rows[i];
-
-            // Convert JSDates to YYYY-MM-DD (in UTC)
-            const date = moment(row.date).format('YYYY-MM-DD');
-            if (date > today) {
-                // Skip results that are in the future (fix for invalid events)
-                continue;
-            }
-            cumulativeResults.unshift({
-                date,
-                paid: Math.max(0, paid),
-                free: Math.max(0, free),
-                comped: Math.max(0, comped),
-
-                // Deltas
-                paid_subscribed: row.paid_subscribed,
-                paid_canceled: row.paid_canceled
-            });
-
-            // Update current counts
-            paid -= row.paid_subscribed - row.paid_canceled;
-            free -= row.free_delta;
-            comped -= row.comped_delta;
-        }
-
-        // Now also add the oldest day we have left over (this one will be zero, which is also needed as a data point for graphs)
-        const oldestDate = rows.length > 0 ? moment(rows[0].date).add(-1, 'days').format('YYYY-MM-DD') : today;
-
-        cumulativeResults.unshift({
-            date: oldestDate,
-            paid: Math.max(0, paid),
-            free: Math.max(0, free),
-            comped: Math.max(0, comped),
-
-            // Deltas
-            paid_subscribed: 0,
-            paid_canceled: 0
-        });
-
-        return {
-            data: cumulativeResults,
-            meta: {
-                totals
-            }
-        };
-    }
-}
-
-module.exports = MembersStatsService;
-
-/**
- * @typedef MemberStatusDelta
- * @type {Object}
- * @property {Date} date
- * @property {number} paid_subscribed Paid members that subscribed on this day
- * @property {number} paid_canceled Paid members that canceled on this day
- * @property {number} comped_delta Total net comped members on this day
- * @property {number} free_delta Total net members on this day
- */
-
-/**
- * @typedef TotalMembersByStatus
- * @type {Object}
- * @property {number} paid Total paid members
- * @property {number} free Total free members
- * @property {number} comped Total comped members
- */
-
-/**
- * @typedef {Object} TotalMembersByStatusItem
- * @property {string} date In YYYY-MM-DD format
- * @property {number} paid Total paid members
- * @property {number} free Total free members
- * @property {number} comped Total comped members
- * @property {number} paid_subscribed Paid members that subscribed on this day
- * @property {number} paid_canceled Paid members that canceled on this day
- */
-
-/**
- * @typedef {Object} CountHistory
- * @property {TotalMembersByStatusItem[]} data List of the total members by status for each day, including the paid deltas paid_subscribed and paid_canceled
- * @property {Object} meta
- */

package/core/server/services/stats/lib/mrr-stats-service.js

@@ -1,154 +0,0 @@
-const moment = require('moment');
-
-class MrrStatsService {
-    constructor({db}) {
-        this.db = db;
-    }
-
-    /**
-     * Get the current total MRR, grouped by currency (ascending order)
-     * @returns {Promise<MrrByCurrency[]>}
-     */
-    async getCurrentMrr() {
-        const knex = this.db.knex;
-        const rows = await knex('members_stripe_customers_subscriptions')
-            .select(knex.raw(`plan_currency as currency`))
-            .select(knex.raw(`SUM(
-                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')
-            .orderBy('currency');
-
-        if (rows.length === 0) {
-            // Add a USD placeholder to always have at least one currency
-            rows.push({
-                currency: 'usd',
-                mrr: 0
-            });
-        }
-
-        return rows;
-    }
-
-    /**
-     * Get the MRR deltas for all days (from old to new), grouped by currency (ascending alphabetically)
-     * @returns {Promise<MrrDelta[]>} The deltas sorted from new to old
-     */
-    async fetchAllDeltas() {
-        const knex = this.db.knex;
-        const rows = await knex('members_paid_subscription_events')
-            .select('currency')
-            // In SQLite, DATE(created_at) would map to a string value, while DATE(created_at) would map to a JSDate object in MySQL
-            // That is why we need the cast here (to have some consistency)
-            .select(knex.raw('CAST(DATE(created_at) as CHAR) as date'))
-            .select(knex.raw(`SUM(mrr_delta) as delta`))
-            .groupByRaw('CAST(DATE(created_at) as CHAR), currency')
-            .orderByRaw('CAST(DATE(created_at) as CHAR), currency');
-        return rows;
-    }
-
-    /**
-     * Returns a list of the MRR history for each day and currency, including the current MRR per currency as meta data. 
-     * The respons is in ascending date order, and currencies for the same date are always in ascending order.
-     * @returns {Promise<MrrHistory>}
-     */
-    async getHistory() {
-        // Fetch current total amounts and start counting from there
-        const totals = await this.getCurrentMrr();
-
-        const rows = await this.fetchAllDeltas();
-
-        // Get today in UTC (default timezone)
-        const today = moment().format('YYYY-MM-DD');
-
-        const results = [];
-
-        // Create a map of the totals by currency for fast lookup and editing
-        const currentTotals = {};
-        for (const total of totals) {
-            currentTotals[total.currency] = total.mrr;
-        }
-
-        // Loop in reverse order (needed to have correct sorted result)
-        for (let i = rows.length - 1; i >= 0; i -= 1) {
-            const row = rows[i];
-
-            if (currentTotals[row.currency] === undefined) {
-                // Skip unexpected currencies that are not in the totals
-                continue;
-            }
-
-            // Convert JSDates to YYYY-MM-DD (in UTC)
-            const date = moment(row.date).format('YYYY-MM-DD');
-            
-            if (date > today) {
-                // Skip results that are in the future for some reason
-                continue;
-            }
-
-            results.unshift({
-                date,
-                mrr: Math.max(0, currentTotals[row.currency]),
-                currency: row.currency
-            });
-
-            currentTotals[row.currency] -= row.delta;
-        }
-
-        // Now also add the oldest days we have left over and do not have deltas
-        const oldestDate = rows.length > 0 ? moment(rows[0].date).add(-1, 'days').format('YYYY-MM-DD') : today;
-        
-        // Note that we also need to loop the totals in reverse order because we need to unshift
-        for (let i = totals.length - 1; i >= 0; i -= 1) {
-            const total = totals[i];
-            results.unshift({
-                date: oldestDate,
-                mrr: Math.max(0, currentTotals[total.currency]),
-                currency: total.currency
-            });
-        }
-        
-        return {
-            data: results,
-            meta: {
-                totals
-            }
-        };
-    }
-}
-
-module.exports = MrrStatsService;
-
-/**
- * @typedef MrrByCurrency
- * @type {Object}
- * @property {number} mrr
- * @property {string} currency
- */
-
-/**
- * @typedef MrrDelta
- * @type {Object}
- * @property {Date} date
- * @property {string} currency
- * @property {number} delta MRR change on this day
- */
-
-/**
- * @typedef {Object} MrrRecord
- * @property {string} date In YYYY-MM-DD format
- * @property {string} currency
- * @property {number} mrr MRR on this day
- */
-
-/**
- * @typedef {Object} MrrHistory
- * @property {MrrRecord[]} data List of the total members by status for each day, including the paid deltas paid_subscribed and paid_canceled
- * @property {Object} meta
- */