chore(release): publish new version

- @standardnotes/analytics@2.9.1

packages/analytics/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.9.1](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.9.0...@standardnotes/analytics@2.9.1) (2022-11-10)
+
+### Bug Fixes
+
+* **analytics:** generate mrr stats for last 30 days including Today ([b92c4ae](https://github.com/standardnotes/server/commit/b92c4ae650b53db5c0bb2a9cf9afb01caeb8d822))
+
+# [2.9.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.8.3...@standardnotes/analytics@2.9.0) (2022-11-10)
+
+### Features
+
+* **analytics:** add mrr for annual, monthly, pro and plus subscription plans ([ce3e259](https://github.com/standardnotes/server/commit/ce3e259bdedd10796fb4469f0eabd64bc326a115))
+
 ## [2.8.3](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.8.2...@standardnotes/analytics@2.8.3) (2022-11-10)
 
 ### Bug Fixes

packages/analytics/bin/report.ts

@@ -109,12 +109,18 @@ const requestReport = async (
     }>
   }> = []
 
-  const thirtyDaysStatisticsNames = [StatisticsMeasure.MRR]
+  const thirtyDaysStatisticsNames = [
+    StatisticsMeasure.MRR,
+    StatisticsMeasure.AnnualPlansMRR,
+    StatisticsMeasure.MonthlyPlansMRR,
+    StatisticsMeasure.PlusPlansMRR,
+    StatisticsMeasure.ProPlansMRR,
+  ]
   for (const statisticName of thirtyDaysStatisticsNames) {
     statisticsOverTime.push({
       name: statisticName,
-      period: Period.Last30Days,
-      counts: await statisticsStore.calculateTotalCountOverPeriod(statisticName, Period.Last30Days),
+      period: Period.Last30DaysIncludingToday,
+      counts: await statisticsStore.calculateTotalCountOverPeriod(statisticName, Period.Last30DaysIncludingToday),
     })
   }
 

packages/analytics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/analytics",
-  "version": "2.8.3",
+  "version": "2.9.1",
   "engines": {
     "node": ">=14.0.0 <17.0.0"
   },

packages/analytics/src/Domain/Revenue/RevenueModificationRepositoryInterface.ts

@@ -3,6 +3,6 @@ import { RevenueModification } from './RevenueModification'
 
 export interface RevenueModificationRepositoryInterface {
   findLastByUserUuid(userUuid: Uuid): Promise<RevenueModification | null>
-  sumMRRDiff(): Promise<number>
+  sumMRRDiff(dto: { planName?: string; billingFrequency?: number }): Promise<number>
   save(revenueModification: RevenueModification): Promise<RevenueModification>
 }

packages/analytics/src/Domain/Statistics/StatisticsMeasure.ts

@@ -16,4 +16,8 @@ export enum StatisticsMeasure {
   NewCustomers = 'new-customers',
   TotalCustomers = 'total-customers',
   MRR = 'mrr',
+  MonthlyPlansMRR = 'monthly-plans-mrr',
+  AnnualPlansMRR = 'annual-plans-mrr',
+  ProPlansMRR = 'pro-plans-mrr',
+  PlusPlansMRR = 'plus-plans-mrr',
 }

packages/analytics/src/Domain/Time/Period.ts

@@ -26,4 +26,5 @@ export enum Period {
   OctoberThisYear,
   NovemberThisYear,
   DecemberThisYear,
+  Last30DaysIncludingToday,
 }

packages/analytics/src/Domain/Time/PeriodKeyGenerator.spec.ts

@@ -62,6 +62,41 @@ describe('PeriodKeyGenerator', () => {
     ])
   })
 
+  it('should generate period keys for last 30 days including Today', () => {
+    expect(createGenerator().getDiscretePeriodKeys(Period.Last30DaysIncludingToday)).toEqual([
+      '2022-4-25',
+      '2022-4-26',
+      '2022-4-27',
+      '2022-4-28',
+      '2022-4-29',
+      '2022-4-30',
+      '2022-5-1',
+      '2022-5-2',
+      '2022-5-3',
+      '2022-5-4',
+      '2022-5-5',
+      '2022-5-6',
+      '2022-5-7',
+      '2022-5-8',
+      '2022-5-9',
+      '2022-5-10',
+      '2022-5-11',
+      '2022-5-12',
+      '2022-5-13',
+      '2022-5-14',
+      '2022-5-15',
+      '2022-5-16',
+      '2022-5-17',
+      '2022-5-18',
+      '2022-5-19',
+      '2022-5-20',
+      '2022-5-21',
+      '2022-5-22',
+      '2022-5-23',
+      '2022-5-24',
+    ])
+  })
+
   it('should generate period keys for this year', () => {
     expect(createGenerator().getDiscretePeriodKeys(Period.ThisYear)).toEqual([
       '2022-1',

packages/analytics/src/Domain/Time/PeriodKeyGenerator.ts

@@ -33,6 +33,12 @@ export class PeriodKeyGenerator implements PeriodKeyGeneratorInterface {
           periodKeys.unshift(this.getDailyKey(this.getDateNDaysBefore(i)))
         }
 
+        return periodKeys
+      case Period.Last30DaysIncludingToday:
+        for (let i = 0; i <= 29; i++) {
+          periodKeys.unshift(this.getDailyKey(this.getDateNDaysBefore(i)))
+        }
+
         return periodKeys
       case Period.Last7Days:
         for (let i = 1; i <= 7; i++) {

packages/analytics/src/Domain/UseCase/CalculateMonthlyRecurringRevenue/CalculateMonthlyRecurringRevenue.ts

@@ -1,3 +1,4 @@
+import { SubscriptionBillingFrequency, SubscriptionName } from '@standardnotes/common'
 import { inject, injectable } from 'inversify'
 import TYPES from '../../../Bootstrap/Types'
 import { Result } from '../../Core/Result'
@@ -18,7 +19,7 @@ export class CalculateMonthlyRecurringRevenue implements DomainUseCaseInterface<
   ) {}
 
   async execute(_dto: CalculateMonthlyRecurringRevenueDTO): Promise<Result<MonthlyRevenue>> {
-    const mrrDiff = await this.revenueModificationRepository.sumMRRDiff()
+    const mrrDiff = await this.revenueModificationRepository.sumMRRDiff({})
 
     await this.statisticsStore.setMeasure(StatisticsMeasure.MRR, mrrDiff, [
       Period.Today,
@@ -26,6 +27,46 @@ export class CalculateMonthlyRecurringRevenue implements DomainUseCaseInterface<
       Period.ThisYear,
     ])
 
+    const monthlyPlansMrrDiff = await this.revenueModificationRepository.sumMRRDiff({
+      billingFrequency: SubscriptionBillingFrequency.Monthly,
+    })
+
+    await this.statisticsStore.setMeasure(StatisticsMeasure.MonthlyPlansMRR, monthlyPlansMrrDiff, [
+      Period.Today,
+      Period.ThisMonth,
+      Period.ThisYear,
+    ])
+
+    const annualPlansMrrDiff = await this.revenueModificationRepository.sumMRRDiff({
+      billingFrequency: SubscriptionBillingFrequency.Annual,
+    })
+
+    await this.statisticsStore.setMeasure(StatisticsMeasure.AnnualPlansMRR, annualPlansMrrDiff, [
+      Period.Today,
+      Period.ThisMonth,
+      Period.ThisYear,
+    ])
+
+    const proPlansMrrDiff = await this.revenueModificationRepository.sumMRRDiff({
+      planName: SubscriptionName.ProPlan,
+    })
+
+    await this.statisticsStore.setMeasure(StatisticsMeasure.ProPlansMRR, proPlansMrrDiff, [
+      Period.Today,
+      Period.ThisMonth,
+      Period.ThisYear,
+    ])
+
+    const plusPlansMrrDiff = await this.revenueModificationRepository.sumMRRDiff({
+      planName: SubscriptionName.PlusPlan,
+    })
+
+    await this.statisticsStore.setMeasure(StatisticsMeasure.PlusPlansMRR, plusPlansMrrDiff, [
+      Period.Today,
+      Period.ThisMonth,
+      Period.ThisYear,
+    ])
+
     return MonthlyRevenue.create(mrrDiff)
   }
 }

packages/analytics/src/Infra/MySQL/MySQLRevenueModificationRepository.ts

@@ -17,11 +17,17 @@ export class MySQLRevenueModificationRepository implements RevenueModificationRe
     private revenueModificationMap: MapInterface<RevenueModification, TypeORMRevenueModification>,
   ) {}
 
-  async sumMRRDiff(): Promise<number> {
-    const result = await this.ormRepository
-      .createQueryBuilder()
-      .select('sum(new_mrr - previous_mrr)', 'mrrDiff')
-      .getRawOne()
+  async sumMRRDiff(dto: { planName?: string; billingFrequency?: number }): Promise<number> {
+    const query = this.ormRepository.createQueryBuilder().select('sum(new_mrr - previous_mrr)', 'mrrDiff')
+
+    if (dto.planName !== undefined) {
+      query.where('subscription_plan = :planName', { planName: dto.planName })
+    }
+    if (dto.billingFrequency !== undefined) {
+      query.where('billing_frequency = :billingFrequency', { billingFrequency: dto.billingFrequency })
+    }
+
+    const result = await query.getRawOne()
 
     if (result === undefined) {
       return 0