chore(release): publish new version

- @standardnotes/analytics@2.9.1

packages/analytics/CHANGELOG.md

@@ -3,6 +3,48 @@
 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
+
+* **analytics:** add subscription id to error logs ([81be065](https://github.com/standardnotes/server/commit/81be06598c918279f98a8ba6b59ea1b3803c949c))
+
+## [2.8.2](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.8.1...@standardnotes/analytics@2.8.2) (2022-11-10)
+
+### Bug Fixes
+
+* **analytics:** add monthly mrr to the report ([fce47a0](https://github.com/standardnotes/server/commit/fce47a0a37a67b3edf3ea0b6ccda43c54dbd9870))
+
+## [2.8.1](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.8.0...@standardnotes/analytics@2.8.1) (2022-11-10)
+
+### Bug Fixes
+
+* **analytics:** add persisting mrr for this month and this year as well ([8df0482](https://github.com/standardnotes/server/commit/8df0482eb4bfd63b9639fd786c9b6952ad7f801d))
+
+# [2.8.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.7.3...@standardnotes/analytics@2.8.0) (2022-11-10)
+
+### Features
+
+* **analytics:** add calculating monthly recurring revenue ([77e5065](https://github.com/standardnotes/server/commit/77e50655f6fa7f9c28e13f8b8bc6de246c0454f0))
+
+## [2.7.3](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.7.2...@standardnotes/analytics@2.7.3) (2022-11-10)
+
+### Bug Fixes
+
+* **analytics:** arhcitecture arrangements for use case execution ([7393954](https://github.com/standardnotes/server/commit/7393954ff6ece6143f7661104299172548db90ee))
+
 ## [2.7.2](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.7.1...@standardnotes/analytics@2.7.2) (2022-11-09)
 
 ### Bug Fixes

packages/analytics/bin/report.ts

@@ -15,6 +15,7 @@ import { ContainerConfigLoader } from '../src/Bootstrap/Container'
 import TYPES from '../src/Bootstrap/Types'
 import { Env } from '../src/Bootstrap/Env'
 import { DomainEventFactoryInterface } from '../src/Domain/Event/DomainEventFactoryInterface'
+import { CalculateMonthlyRecurringRevenue } from '../src/Domain/UseCase/CalculateMonthlyRecurringRevenue/CalculateMonthlyRecurringRevenue'
 
 const requestReport = async (
   analyticsStore: AnalyticsStoreInterface,
@@ -22,7 +23,10 @@ const requestReport = async (
   domainEventFactory: DomainEventFactoryInterface,
   domainEventPublisher: DomainEventPublisherInterface,
   periodKeyGenerator: PeriodKeyGeneratorInterface,
+  calculateMonthlyRecurringRevenue: CalculateMonthlyRecurringRevenue,
 ): Promise<void> => {
+  await calculateMonthlyRecurringRevenue.execute({})
+
   const analyticsOverTime: Array<{
     name: string
     period: number
@@ -96,6 +100,39 @@ const requestReport = async (
     })
   }
 
+  const statisticsOverTime: Array<{
+    name: string
+    period: number
+    counts: Array<{
+      periodKey: string
+      totalCount: number
+    }>
+  }> = []
+
+  const thirtyDaysStatisticsNames = [
+    StatisticsMeasure.MRR,
+    StatisticsMeasure.AnnualPlansMRR,
+    StatisticsMeasure.MonthlyPlansMRR,
+    StatisticsMeasure.PlusPlansMRR,
+    StatisticsMeasure.ProPlansMRR,
+  ]
+  for (const statisticName of thirtyDaysStatisticsNames) {
+    statisticsOverTime.push({
+      name: statisticName,
+      period: Period.Last30DaysIncludingToday,
+      counts: await statisticsStore.calculateTotalCountOverPeriod(statisticName, Period.Last30DaysIncludingToday),
+    })
+  }
+
+  const monthlyStatisticsNames = [StatisticsMeasure.MRR]
+  for (const statisticName of monthlyStatisticsNames) {
+    statisticsOverTime.push({
+      name: statisticName,
+      period: Period.ThisYear,
+      counts: await statisticsStore.calculateTotalCountOverPeriod(statisticName, Period.ThisYear),
+    })
+  }
+
   const statisticMeasureNames = [
     StatisticsMeasure.Income,
     StatisticsMeasure.PlusSubscriptionInitialAnnualPaymentsIncome,
@@ -170,13 +207,10 @@ const requestReport = async (
   }
 
   const event = domainEventFactory.createDailyAnalyticsReportGeneratedEvent({
-    applicationStatistics: await statisticsStore.getYesterdayApplicationUsage(),
-    snjsStatistics: await statisticsStore.getYesterdaySNJSUsage(),
-    outOfSyncIncidents: await statisticsStore.getYesterdayOutOfSyncIncidents(),
     activityStatistics: yesterdayActivityStatistics,
     activityStatisticsOverTime: analyticsOverTime,
+    statisticsOverTime,
     statisticMeasures,
-    retentionStatistics: [],
     churn: {
       periodKeys: monthlyPeriodKeys,
       values: churnRates,
@@ -200,9 +234,19 @@ void container.load().then((container) => {
   const domainEventFactory: DomainEventFactoryInterface = container.get(TYPES.DomainEventFactory)
   const domainEventPublisher: DomainEventPublisherInterface = container.get(TYPES.DomainEventPublisher)
   const periodKeyGenerator: PeriodKeyGeneratorInterface = container.get(TYPES.PeriodKeyGenerator)
+  const calculateMonthlyRecurringRevenue: CalculateMonthlyRecurringRevenue = container.get(
+    TYPES.CalculateMonthlyRecurringRevenue,
+  )
 
   Promise.resolve(
-    requestReport(analyticsStore, statisticsStore, domainEventFactory, domainEventPublisher, periodKeyGenerator),
+    requestReport(
+      analyticsStore,
+      statisticsStore,
+      domainEventFactory,
+      domainEventPublisher,
+      periodKeyGenerator,
+      calculateMonthlyRecurringRevenue,
+    ),
   )
     .then(() => {
       logger.info('Usage report generation complete')

packages/analytics/package.json

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

packages/analytics/src/Bootstrap/Container.ts

@@ -51,6 +51,7 @@ import { MapInterface } from '../Domain/Map/MapInterface'
 import { RevenueModification } from '../Domain/Revenue/RevenueModification'
 import { RevenueModificationMap } from '../Domain/Map/RevenueModificationMap'
 import { SaveRevenueModification } from '../Domain/UseCase/SaveRevenueModification/SaveRevenueModification'
+import { CalculateMonthlyRecurringRevenue } from '../Domain/UseCase/CalculateMonthlyRecurringRevenue/CalculateMonthlyRecurringRevenue'
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const newrelicFormatter = require('@newrelic/winston-enricher')
@@ -138,6 +139,9 @@ export class ContainerConfigLoader {
     // Use Case
     container.bind<GetUserAnalyticsId>(TYPES.GetUserAnalyticsId).to(GetUserAnalyticsId)
     container.bind<SaveRevenueModification>(TYPES.SaveRevenueModification).to(SaveRevenueModification)
+    container
+      .bind<CalculateMonthlyRecurringRevenue>(TYPES.CalculateMonthlyRecurringRevenue)
+      .to(CalculateMonthlyRecurringRevenue)
 
     // Hanlders
     container.bind<UserRegisteredEventHandler>(TYPES.UserRegisteredEventHandler).to(UserRegisteredEventHandler)

packages/analytics/src/Bootstrap/Types.ts

@@ -20,6 +20,7 @@ const TYPES = {
   // Use Case
   GetUserAnalyticsId: Symbol.for('GetUserAnalyticsId'),
   SaveRevenueModification: Symbol.for('SaveRevenueModification'),
+  CalculateMonthlyRecurringRevenue: Symbol.for('CalculateMonthlyRecurringRevenue'),
   // Handlers
   UserRegisteredEventHandler: Symbol.for('UserRegisteredEventHandler'),
   AccountDeletionRequestedEventHandler: Symbol.for('AccountDeletionRequestedEventHandler'),

packages/analytics/src/Domain/Core/Result.ts

@@ -1,7 +1,7 @@
 /* istanbul ignore file */
 
 export class Result<T> {
-  constructor(private isSuccess: boolean, private error?: T | string, private value?: T) {
+  constructor(private isSuccess: boolean, private error?: string, private value?: T) {
     Object.freeze(this)
   }
 
@@ -11,13 +11,13 @@ export class Result<T> {
 
   getValue(): T {
     if (!this.isSuccess) {
-      throw new Error('Cannot get value of an unsuccessfull result')
+      throw new Error(`Cannot get value of an unsuccessfull result: ${this.error}`)
     }
 
     return this.value as T
   }
 
-  getError(): T | string {
+  getError(): string {
     if (this.isSuccess || this.error === undefined) {
       throw new Error('Cannot get an error of a successfull result')
     }
@@ -29,7 +29,7 @@ export class Result<T> {
     return new Result<U>(true, undefined, value)
   }
 
-  static fail<U>(error: U | string): Result<U> {
+  static fail<U>(error: string): Result<U> {
     return new Result<U>(false, error)
   }
 }

packages/analytics/src/Domain/Event/DomainEventFactory.spec.ts

@@ -22,18 +22,6 @@ describe('DomainEventFactory', () => {
   it('should create a DAILY_ANALYTICS_REPORT_GENERATED event', () => {
     expect(
       createFactory().createDailyAnalyticsReportGeneratedEvent({
-        snjsStatistics: [
-          {
-            version: '1-2-3',
-            count: 2,
-          },
-        ],
-        applicationStatistics: [
-          {
-            version: '2-3-4',
-            count: 45,
-          },
-        ],
         activityStatistics: [
           {
             name: AnalyticsActivity.Register,
@@ -63,8 +51,18 @@ describe('DomainEventFactory', () => {
             totalCount: 123,
           },
         ],
-        outOfSyncIncidents: 324,
-        retentionStatistics: [],
+        statisticsOverTime: [
+          {
+            name: StatisticsMeasure.MRR,
+            period: Period.Last30Days,
+            counts: [
+              {
+                periodKey: '2022-10-9',
+                totalCount: 3,
+              },
+            ],
+          },
+        ],
         churn: {
           periodKeys: ['2022-10-9'],
           values: [
@@ -105,10 +103,16 @@ describe('DomainEventFactory', () => {
             totalCount: 123,
           },
         ],
-        applicationStatistics: [
+        statisticsOverTime: [
           {
-            count: 45,
-            version: '2-3-4',
+            counts: [
+              {
+                periodKey: '2022-10-9',
+                totalCount: 3,
+              },
+            ],
+            name: 'mrr',
+            period: 9,
           },
         ],
         churn: {
@@ -120,14 +124,6 @@ describe('DomainEventFactory', () => {
             },
           ],
         },
-        outOfSyncIncidents: 324,
-        retentionStatistics: [],
-        snjsStatistics: [
-          {
-            count: 2,
-            version: '1-2-3',
-          },
-        ],
         statisticMeasures: [
           {
             average: 23,

packages/analytics/src/Domain/Event/DomainEventFactory.ts

@@ -9,14 +9,6 @@ export class DomainEventFactory implements DomainEventFactoryInterface {
   constructor(@inject(TYPES.Timer) private timer: TimerInterface) {}
 
   createDailyAnalyticsReportGeneratedEvent(dto: {
-    snjsStatistics: Array<{
-      version: string
-      count: number
-    }>
-    applicationStatistics: Array<{
-      version: string
-      count: number
-    }>
     activityStatistics: Array<{
       name: string
       retention: number
@@ -38,18 +30,13 @@ export class DomainEventFactory implements DomainEventFactoryInterface {
       }>
       totalCount: number
     }>
-    outOfSyncIncidents: number
-    retentionStatistics: Array<{
-      firstActivity: string
-      secondActivity: string
-      retention: {
-        periodKeys: Array<string>
-        values: Array<{
-          firstPeriodKey: string
-          secondPeriodKey: string
-          value: number
-        }>
-      }
+    statisticsOverTime: Array<{
+      name: string
+      period: number
+      counts: Array<{
+        periodKey: string
+        totalCount: number
+      }>
     }>
     churn: {
       periodKeys: Array<string>

packages/analytics/src/Domain/Event/DomainEventFactoryInterface.ts

@@ -2,14 +2,6 @@ import { DailyAnalyticsReportGeneratedEvent } from '@standardnotes/domain-events
 
 export interface DomainEventFactoryInterface {
   createDailyAnalyticsReportGeneratedEvent(dto: {
-    snjsStatistics: Array<{
-      version: string
-      count: number
-    }>
-    applicationStatistics: Array<{
-      version: string
-      count: number
-    }>
     activityStatistics: Array<{
       name: string
       retention: number
@@ -31,18 +23,13 @@ export interface DomainEventFactoryInterface {
       }>
       totalCount: number
     }>
-    outOfSyncIncidents: number
-    retentionStatistics: Array<{
-      firstActivity: string
-      secondActivity: string
-      retention: {
-        periodKeys: Array<string>
-        values: Array<{
-          firstPeriodKey: string
-          secondPeriodKey: string
-          value: number
-        }>
-      }
+    statisticsOverTime: Array<{
+      name: string
+      period: number
+      counts: Array<{
+        periodKey: string
+        totalCount: number
+      }>
     }>
     churn: {
       periodKeys: Array<string>

packages/analytics/src/Domain/Handler/SubscriptionCancelledEventHandler.spec.ts

@@ -12,6 +12,7 @@ import { Period } from '../Time/Period'
 import { Result } from '../Core/Result'
 import { RevenueModification } from '../Revenue/RevenueModification'
 import { SaveRevenueModification } from '../UseCase/SaveRevenueModification/SaveRevenueModification'
+import { Logger } from 'winston'
 
 describe('SubscriptionCancelledEventHandler', () => {
   let event: SubscriptionCancelledEvent
@@ -19,11 +20,21 @@ describe('SubscriptionCancelledEventHandler', () => {
   let analyticsStore: AnalyticsStoreInterface
   let statisticsStore: StatisticsStoreInterface
   let saveRevenueModification: SaveRevenueModification
+  let logger: Logger
 
   const createHandler = () =>
-    new SubscriptionCancelledEventHandler(getUserAnalyticsId, analyticsStore, statisticsStore, saveRevenueModification)
+    new SubscriptionCancelledEventHandler(
+      getUserAnalyticsId,
+      analyticsStore,
+      statisticsStore,
+      saveRevenueModification,
+      logger,
+    )
 
   beforeEach(() => {
+    logger = {} as jest.Mocked<Logger>
+    logger.error = jest.fn()
+
     getUserAnalyticsId = {} as jest.Mocked<GetUserAnalyticsId>
     getUserAnalyticsId.execute = jest.fn().mockReturnValue({ analyticsId: 3 })
 
@@ -80,4 +91,14 @@ describe('SubscriptionCancelledEventHandler', () => {
     expect(statisticsStore.incrementMeasure).not.toHaveBeenCalled()
     expect(saveRevenueModification.execute).toHaveBeenCalled()
   })
+
+  it('should log failure to save revenue modification', async () => {
+    saveRevenueModification.execute = jest.fn().mockReturnValue(Result.fail('Oops'))
+
+    event.payload.timestamp = 1642395451516000
+
+    await createHandler().handle(event)
+
+    expect(logger.error).toHaveBeenCalled()
+  })
 })

packages/analytics/src/Domain/Handler/SubscriptionCancelledEventHandler.ts

@@ -1,5 +1,6 @@
 import { DomainEventHandlerInterface, SubscriptionCancelledEvent } from '@standardnotes/domain-events'
 import { inject, injectable } from 'inversify'
+import { Logger } from 'winston'
 
 import TYPES from '../../Bootstrap/Types'
 import { AnalyticsActivity } from '../Analytics/AnalyticsActivity'
@@ -20,6 +21,7 @@ export class SubscriptionCancelledEventHandler implements DomainEventHandlerInte
     @inject(TYPES.AnalyticsStore) private analyticsStore: AnalyticsStoreInterface,
     @inject(TYPES.StatisticsStore) private statisticsStore: StatisticsStoreInterface,
     @inject(TYPES.SaveRevenueModification) private saveRevenueModification: SaveRevenueModification,
+    @inject(TYPES.Logger) private logger: Logger,
   ) {}
 
   async handle(event: SubscriptionCancelledEvent): Promise<void> {
@@ -32,7 +34,7 @@ export class SubscriptionCancelledEventHandler implements DomainEventHandlerInte
 
     await this.trackSubscriptionStatistics(event)
 
-    await this.saveRevenueModification.execute({
+    const result = await this.saveRevenueModification.execute({
       billingFrequency: event.payload.billingFrequency,
       eventType: SubscriptionEventType.create(event.type).getValue(),
       newSubscriber: event.payload.userExistingSubscriptionsCount === 1,
@@ -42,6 +44,12 @@ export class SubscriptionCancelledEventHandler implements DomainEventHandlerInte
       userEmail: Email.create(event.payload.userEmail).getValue(),
       userUuid,
     })
+
+    if (result.isFailed()) {
+      this.logger.error(
+        `[${event.type}][${event.payload.subscriptionId}] Could not save revenue modification: ${result.getError()}`,
+      )
+    }
   }
 
   private async trackSubscriptionStatistics(event: SubscriptionCancelledEvent) {

packages/analytics/src/Domain/Handler/SubscriptionExpiredEventHandler.spec.ts

@@ -10,6 +10,7 @@ import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
 import { SaveRevenueModification } from '../UseCase/SaveRevenueModification/SaveRevenueModification'
 import { Result } from '../Core/Result'
 import { RevenueModification } from '../Revenue/RevenueModification'
+import { Logger } from 'winston'
 
 describe('SubscriptionExpiredEventHandler', () => {
   let event: SubscriptionExpiredEvent
@@ -17,11 +18,21 @@ describe('SubscriptionExpiredEventHandler', () => {
   let analyticsStore: AnalyticsStoreInterface
   let statisticsStore: StatisticsStoreInterface
   let saveRevenueModification: SaveRevenueModification
+  let logger: Logger
 
   const createHandler = () =>
-    new SubscriptionExpiredEventHandler(getUserAnalyticsId, analyticsStore, statisticsStore, saveRevenueModification)
+    new SubscriptionExpiredEventHandler(
+      getUserAnalyticsId,
+      analyticsStore,
+      statisticsStore,
+      saveRevenueModification,
+      logger,
+    )
 
   beforeEach(() => {
+    logger = {} as jest.Mocked<Logger>
+    logger.error = jest.fn()
+
     event = {} as jest.Mocked<SubscriptionExpiredEvent>
     event.createdAt = new Date(1)
     event.type = 'SUBSCRIPTION_EXPIRED'
@@ -57,4 +68,12 @@ describe('SubscriptionExpiredEventHandler', () => {
     expect(statisticsStore.setMeasure).toHaveBeenCalled()
     expect(saveRevenueModification.execute).toHaveBeenCalled()
   })
+
+  it('should log failure to save revenue modification', async () => {
+    saveRevenueModification.execute = jest.fn().mockReturnValue(Result.fail('Oops'))
+
+    await createHandler().handle(event)
+
+    expect(logger.error).toHaveBeenCalled()
+  })
 })

packages/analytics/src/Domain/Handler/SubscriptionExpiredEventHandler.ts

@@ -1,5 +1,6 @@
 import { DomainEventHandlerInterface, SubscriptionExpiredEvent } from '@standardnotes/domain-events'
 import { inject, injectable } from 'inversify'
+import { Logger } from 'winston'
 
 import TYPES from '../../Bootstrap/Types'
 import { AnalyticsActivity } from '../Analytics/AnalyticsActivity'
@@ -20,6 +21,7 @@ export class SubscriptionExpiredEventHandler implements DomainEventHandlerInterf
     @inject(TYPES.AnalyticsStore) private analyticsStore: AnalyticsStoreInterface,
     @inject(TYPES.StatisticsStore) private statisticsStore: StatisticsStoreInterface,
     @inject(TYPES.SaveRevenueModification) private saveRevenueModification: SaveRevenueModification,
+    @inject(TYPES.Logger) private logger: Logger,
   ) {}
 
   async handle(event: SubscriptionExpiredEvent): Promise<void> {
@@ -36,7 +38,7 @@ export class SubscriptionExpiredEventHandler implements DomainEventHandlerInterf
       [Period.Today, Period.ThisWeek, Period.ThisMonth, Period.ThisYear],
     )
 
-    await this.saveRevenueModification.execute({
+    const result = await this.saveRevenueModification.execute({
       billingFrequency: event.payload.billingFrequency,
       eventType: SubscriptionEventType.create(event.type).getValue(),
       newSubscriber: event.payload.userExistingSubscriptionsCount === 1,
@@ -46,5 +48,11 @@ export class SubscriptionExpiredEventHandler implements DomainEventHandlerInterf
       userEmail: Email.create(event.payload.userEmail).getValue(),
       userUuid,
     })
+
+    if (result.isFailed()) {
+      this.logger.error(
+        `[${event.type}][${event.payload.subscriptionId}] Could not save revenue modification: ${result.getError()}`,
+      )
+    }
   }
 }

packages/analytics/src/Domain/Handler/SubscriptionPurchasedEventHandler.spec.ts

@@ -11,6 +11,7 @@ import { Period } from '../Time/Period'
 import { SaveRevenueModification } from '../UseCase/SaveRevenueModification/SaveRevenueModification'
 import { Result } from '../Core/Result'
 import { RevenueModification } from '../Revenue/RevenueModification'
+import { Logger } from 'winston'
 
 describe('SubscriptionPurchasedEventHandler', () => {
   let event: SubscriptionPurchasedEvent
@@ -19,11 +20,21 @@ describe('SubscriptionPurchasedEventHandler', () => {
   let analyticsStore: AnalyticsStoreInterface
   let statisticsStore: StatisticsStoreInterface
   let saveRevenueModification: SaveRevenueModification
+  let logger: Logger
 
   const createHandler = () =>
-    new SubscriptionPurchasedEventHandler(getUserAnalyticsId, analyticsStore, statisticsStore, saveRevenueModification)
+    new SubscriptionPurchasedEventHandler(
+      getUserAnalyticsId,
+      analyticsStore,
+      statisticsStore,
+      saveRevenueModification,
+      logger,
+    )
 
   beforeEach(() => {
+    logger = {} as jest.Mocked<Logger>
+    logger.error = jest.fn()
+
     statisticsStore = {} as jest.Mocked<StatisticsStoreInterface>
     statisticsStore.incrementMeasure = jest.fn()
     statisticsStore.setMeasure = jest.fn()
@@ -80,4 +91,12 @@ describe('SubscriptionPurchasedEventHandler', () => {
 
     expect(analyticsStore.markActivity).toHaveBeenCalledWith(['limited-discount-offer-purchased'], 3, [Period.Today])
   })
+
+  it('should log failure to save revenue modification', async () => {
+    saveRevenueModification.execute = jest.fn().mockReturnValue(Result.fail('Oops'))
+
+    await createHandler().handle(event)
+
+    expect(logger.error).toHaveBeenCalled()
+  })
 })

packages/analytics/src/Domain/Handler/SubscriptionPurchasedEventHandler.ts

@@ -1,5 +1,6 @@
 import { DomainEventHandlerInterface, SubscriptionPurchasedEvent } from '@standardnotes/domain-events'
 import { inject, injectable } from 'inversify'
+import { Logger } from 'winston'
 
 import TYPES from '../../Bootstrap/Types'
 import { AnalyticsActivity } from '../Analytics/AnalyticsActivity'
@@ -20,6 +21,7 @@ export class SubscriptionPurchasedEventHandler implements DomainEventHandlerInte
     @inject(TYPES.AnalyticsStore) private analyticsStore: AnalyticsStoreInterface,
     @inject(TYPES.StatisticsStore) private statisticsStore: StatisticsStoreInterface,
     @inject(TYPES.SaveRevenueModification) private saveRevenueModification: SaveRevenueModification,
+    @inject(TYPES.Logger) private logger: Logger,
   ) {}
 
   async handle(event: SubscriptionPurchasedEvent): Promise<void> {
@@ -60,7 +62,7 @@ export class SubscriptionPurchasedEventHandler implements DomainEventHandlerInte
       )
     }
 
-    await this.saveRevenueModification.execute({
+    const result = await this.saveRevenueModification.execute({
       billingFrequency: event.payload.billingFrequency,
       eventType: SubscriptionEventType.create(event.type).getValue(),
       newSubscriber: event.payload.newSubscriber,
@@ -70,5 +72,11 @@ export class SubscriptionPurchasedEventHandler implements DomainEventHandlerInte
       userEmail: Email.create(event.payload.userEmail).getValue(),
       userUuid,
     })
+
+    if (result.isFailed()) {
+      this.logger.error(
+        `[${event.type}][${event.payload.subscriptionId}] Could not save revenue modification: ${result.getError()}`,
+      )
+    }
   }
 }

packages/analytics/src/Domain/Handler/SubscriptionRefundedEventHandler.spec.ts

@@ -13,6 +13,7 @@ import { Period } from '../Time/Period'
 import { Result } from '../Core/Result'
 import { RevenueModification } from '../Revenue/RevenueModification'
 import { SaveRevenueModification } from '../UseCase/SaveRevenueModification/SaveRevenueModification'
+import { Logger } from 'winston'
 
 describe('SubscriptionRefundedEventHandler', () => {
   let event: SubscriptionRefundedEvent
@@ -20,11 +21,21 @@ describe('SubscriptionRefundedEventHandler', () => {
   let analyticsStore: AnalyticsStoreInterface
   let statisticsStore: StatisticsStoreInterface
   let saveRevenueModification: SaveRevenueModification
+  let logger: Logger
 
   const createHandler = () =>
-    new SubscriptionRefundedEventHandler(getUserAnalyticsId, analyticsStore, statisticsStore, saveRevenueModification)
+    new SubscriptionRefundedEventHandler(
+      getUserAnalyticsId,
+      analyticsStore,
+      statisticsStore,
+      saveRevenueModification,
+      logger,
+    )
 
   beforeEach(() => {
+    logger = {} as jest.Mocked<Logger>
+    logger.error = jest.fn()
+
     event = {} as jest.Mocked<SubscriptionRefundedEvent>
     event.createdAt = new Date(1)
     event.type = 'SUBSCRIPTION_REFUNDED'
@@ -88,4 +99,12 @@ describe('SubscriptionRefundedEventHandler', () => {
       Period.ThisMonth,
     ])
   })
+
+  it('should log failure to save revenue modification', async () => {
+    saveRevenueModification.execute = jest.fn().mockReturnValue(Result.fail('Oops'))
+
+    await createHandler().handle(event)
+
+    expect(logger.error).toHaveBeenCalled()
+  })
 })

packages/analytics/src/Domain/Handler/SubscriptionRefundedEventHandler.ts

@@ -1,5 +1,6 @@
 import { DomainEventHandlerInterface, SubscriptionRefundedEvent } from '@standardnotes/domain-events'
 import { inject, injectable } from 'inversify'
+import { Logger } from 'winston'
 
 import TYPES from '../../Bootstrap/Types'
 import { AnalyticsActivity } from '../Analytics/AnalyticsActivity'
@@ -20,6 +21,7 @@ export class SubscriptionRefundedEventHandler implements DomainEventHandlerInter
     @inject(TYPES.AnalyticsStore) private analyticsStore: AnalyticsStoreInterface,
     @inject(TYPES.StatisticsStore) private statisticsStore: StatisticsStoreInterface,
     @inject(TYPES.SaveRevenueModification) private saveRevenueModification: SaveRevenueModification,
+    @inject(TYPES.Logger) private logger: Logger,
   ) {}
 
   async handle(event: SubscriptionRefundedEvent): Promise<void> {
@@ -32,7 +34,7 @@ export class SubscriptionRefundedEventHandler implements DomainEventHandlerInter
 
     await this.markChurnActivity(analyticsId, event)
 
-    await this.saveRevenueModification.execute({
+    const result = await this.saveRevenueModification.execute({
       billingFrequency: event.payload.billingFrequency,
       eventType: SubscriptionEventType.create(event.type).getValue(),
       newSubscriber: event.payload.userExistingSubscriptionsCount === 1,
@@ -42,6 +44,12 @@ export class SubscriptionRefundedEventHandler implements DomainEventHandlerInter
       userEmail: Email.create(event.payload.userEmail).getValue(),
       userUuid,
     })
+
+    if (result.isFailed()) {
+      this.logger.error(
+        `[${event.type}][${event.payload.subscriptionId}] Could not save revenue modification: ${result.getError()}`,
+      )
+    }
   }
 
   private async markChurnActivity(analyticsId: number, event: SubscriptionRefundedEvent): Promise<void> {

packages/analytics/src/Domain/Handler/SubscriptionRenewedEventHandler.spec.ts

@@ -9,17 +9,22 @@ import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
 import { SaveRevenueModification } from '../UseCase/SaveRevenueModification/SaveRevenueModification'
 import { RevenueModification } from '../Revenue/RevenueModification'
 import { Result } from '../Core/Result'
+import { Logger } from 'winston'
 
 describe('SubscriptionRenewedEventHandler', () => {
   let event: SubscriptionRenewedEvent
   let getUserAnalyticsId: GetUserAnalyticsId
   let analyticsStore: AnalyticsStoreInterface
   let saveRevenueModification: SaveRevenueModification
+  let logger: Logger
 
   const createHandler = () =>
-    new SubscriptionRenewedEventHandler(getUserAnalyticsId, analyticsStore, saveRevenueModification)
+    new SubscriptionRenewedEventHandler(getUserAnalyticsId, analyticsStore, saveRevenueModification, logger)
 
   beforeEach(() => {
+    logger = {} as jest.Mocked<Logger>
+    logger.error = jest.fn()
+
     event = {} as jest.Mocked<SubscriptionRenewedEvent>
     event.createdAt = new Date(1)
     event.type = 'SUBSCRIPTION_RENEWED'
@@ -52,4 +57,12 @@ describe('SubscriptionRenewedEventHandler', () => {
     expect(analyticsStore.unmarkActivity).toHaveBeenCalled()
     expect(saveRevenueModification.execute).toHaveBeenCalled()
   })
+
+  it('should log failure to save revenue modification', async () => {
+    saveRevenueModification.execute = jest.fn().mockReturnValue(Result.fail('Oops'))
+
+    await createHandler().handle(event)
+
+    expect(logger.error).toHaveBeenCalled()
+  })
 })

packages/analytics/src/Domain/Handler/SubscriptionRenewedEventHandler.ts

@@ -10,6 +10,7 @@ import { SaveRevenueModification } from '../UseCase/SaveRevenueModification/Save
 import { Email } from '../Common/Email'
 import { SubscriptionEventType } from '../Subscription/SubscriptionEventType'
 import { SubscriptionPlanName } from '../Subscription/SubscriptionPlanName'
+import { Logger } from 'winston'
 
 @injectable()
 export class SubscriptionRenewedEventHandler implements DomainEventHandlerInterface {
@@ -17,6 +18,7 @@ export class SubscriptionRenewedEventHandler implements DomainEventHandlerInterf
     @inject(TYPES.GetUserAnalyticsId) private getUserAnalyticsId: GetUserAnalyticsId,
     @inject(TYPES.AnalyticsStore) private analyticsStore: AnalyticsStoreInterface,
     @inject(TYPES.SaveRevenueModification) private saveRevenueModification: SaveRevenueModification,
+    @inject(TYPES.Logger) private logger: Logger,
   ) {}
 
   async handle(event: SubscriptionRenewedEvent): Promise<void> {
@@ -32,7 +34,7 @@ export class SubscriptionRenewedEventHandler implements DomainEventHandlerInterf
       [Period.Today, Period.ThisWeek, Period.ThisMonth],
     )
 
-    await this.saveRevenueModification.execute({
+    const result = await this.saveRevenueModification.execute({
       billingFrequency: event.payload.billingFrequency,
       eventType: SubscriptionEventType.create(event.type).getValue(),
       newSubscriber: false,
@@ -42,5 +44,11 @@ export class SubscriptionRenewedEventHandler implements DomainEventHandlerInterf
       userEmail: Email.create(event.payload.userEmail).getValue(),
       userUuid,
     })
+
+    if (result.isFailed()) {
+      this.logger.error(
+        `[${event.type}][${event.payload.subscriptionId}] Could not save revenue modification: ${result.getError()}`,
+      )
+    }
   }
 }

packages/analytics/src/Domain/Map/RevenueModificationMap.ts

@@ -14,13 +14,18 @@ import { SubscriptionEventType } from '../Subscription/SubscriptionEventType'
 @injectable()
 export class RevenueModificationMap implements MapInterface<RevenueModification, TypeORMRevenueModification> {
   toDomain(persistence: TypeORMRevenueModification): RevenueModification {
-    const user = User.create(
+    const userOrError = User.create(
       {
         email: Email.create(persistence.userEmail).getValue(),
       },
       new UniqueEntityId(persistence.userUuid),
     )
-    const subscription = Subscription.create(
+    if (userOrError.isFailed()) {
+      throw new Error(`Could not create user: ${userOrError.getError()}`)
+    }
+    const user = userOrError.getValue()
+
+    const subscriptionOrError = Subscription.create(
       {
         billingFrequency: persistence.billingFrequency,
         isFirstSubscriptionForUser: persistence.isNewCustomer,
@@ -29,18 +34,31 @@ export class RevenueModificationMap implements MapInterface<RevenueModification,
       },
       new UniqueEntityId(persistence.subscriptionId),
     )
-    const previousMonthlyRevenueOrError = MonthlyRevenue.create(persistence.previousMonthlyRevenue)
+    if (subscriptionOrError.isFailed()) {
+      throw new Error(`Could not create subscription: ${subscriptionOrError.getError()}`)
+    }
+    const subscription = subscriptionOrError.getValue()
 
-    return RevenueModification.create(
+    const previousMonthlyRevenueOrError = MonthlyRevenue.create(persistence.previousMonthlyRevenue)
+    const newMonthlyRevenueOrError = MonthlyRevenue.create(persistence.newMonthlyRevenue)
+
+    const revenuModificationOrError = RevenueModification.create(
       {
         user,
         subscription,
         eventType: SubscriptionEventType.create(persistence.eventType).getValue(),
         previousMonthlyRevenue: previousMonthlyRevenueOrError.getValue(),
+        newMonthlyRevenue: newMonthlyRevenueOrError.getValue(),
         createdAt: persistence.createdAt,
       },
       new UniqueEntityId(persistence.uuid),
     )
+
+    if (revenuModificationOrError.isFailed()) {
+      throw new Error(`Could not map revenue modification to domain: ${revenuModificationOrError.getError()}`)
+    }
+
+    return revenuModificationOrError.getValue()
   }
 
   toPersistence(domain: RevenueModification): TypeORMRevenueModification {
@@ -50,7 +68,7 @@ export class RevenueModificationMap implements MapInterface<RevenueModification,
     persistence.billingFrequency = subscription.props.billingFrequency
     persistence.eventType = domain.props.eventType.value
     persistence.isNewCustomer = subscription.props.isFirstSubscriptionForUser
-    persistence.newMonthlyRevenue = domain.newMonthlyRevenue.value
+    persistence.newMonthlyRevenue = domain.props.newMonthlyRevenue.value
     persistence.previousMonthlyRevenue = domain.props.previousMonthlyRevenue.value
     persistence.subscriptionId = subscription.id.toValue() as number
     persistence.subscriptionPlan = subscription.props.planName.value

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

@@ -13,7 +13,7 @@ export class MonthlyRevenue extends ValueObject<MonthlyRevenueProps> {
 
   static create(revenue: number): Result<MonthlyRevenue> {
     if (isNaN(revenue) || revenue < 0) {
-      return Result.fail<MonthlyRevenue>('Monthly revenue must be a non-negative number')
+      return Result.fail<MonthlyRevenue>(`Monthly revenue must be a non-negative number. Supplied: ${revenue}`)
     } else {
       return Result.ok<MonthlyRevenue>(new MonthlyRevenue({ value: revenue }))
     }

packages/analytics/src/Domain/Revenue/RevenueModification.spec.ts

@@ -16,10 +16,10 @@ describe('RevenueModification', () => {
       isFirstSubscriptionForUser: true,
       payedAmount: 123,
       planName: SubscriptionPlanName.create('PRO_PLAN').getValue(),
-    })
+    }).getValue()
     user = User.create({
       email: Email.create('test@test.te').getValue(),
-    })
+    }).getValue()
   })
 
   it('should create an aggregate for purchased subscription', () => {
@@ -27,37 +27,12 @@ describe('RevenueModification', () => {
       createdAt: 2,
       eventType: SubscriptionEventType.create('SUBSCRIPTION_PURCHASED').getValue(),
       previousMonthlyRevenue: MonthlyRevenue.create(123).getValue(),
+      newMonthlyRevenue: MonthlyRevenue.create(45).getValue(),
       subscription,
       user,
-    })
+    }).getValue()
 
     expect(revenueModification.id.toString()).toHaveLength(36)
-    expect(revenueModification.newMonthlyRevenue.value).toEqual(123 / 12)
-  })
-
-  it('should create an aggregate for subscription expired', () => {
-    const revenueModification = RevenueModification.create({
-      createdAt: 1,
-      eventType: SubscriptionEventType.create('SUBSCRIPTION_EXPIRED').getValue(),
-      previousMonthlyRevenue: MonthlyRevenue.create(123).getValue(),
-      subscription,
-      user,
-    })
-
-    expect(revenueModification.id.toString()).toHaveLength(36)
-    expect(revenueModification.newMonthlyRevenue.value).toEqual(0)
-  })
-
-  it('should create an aggregate for subscription cancelled', () => {
-    const revenueModification = RevenueModification.create({
-      createdAt: 2,
-      eventType: SubscriptionEventType.create('SUBSCRIPTION_CANCELLED').getValue(),
-      previousMonthlyRevenue: MonthlyRevenue.create(123).getValue(),
-      subscription,
-      user,
-    })
-
-    expect(revenueModification.id.toString()).toHaveLength(36)
-    expect(revenueModification.newMonthlyRevenue.value).toEqual(123)
+    expect(revenueModification.props.newMonthlyRevenue.value).toEqual(45)
   })
 })

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

@@ -1,6 +1,6 @@
 import { Aggregate } from '../Core/Aggregate'
+import { Result } from '../Core/Result'
 import { UniqueEntityId } from '../Core/UniqueEntityId'
-import { MonthlyRevenue } from './MonthlyRevenue'
 import { RevenueModificationProps } from './RevenueModificationProps'
 
 export class RevenueModification extends Aggregate<RevenueModificationProps> {
@@ -8,31 +8,7 @@ export class RevenueModification extends Aggregate<RevenueModificationProps> {
     super(props, id)
   }
 
-  static create(props: RevenueModificationProps, id?: UniqueEntityId): RevenueModification {
-    return new RevenueModification(props, id)
-  }
-
-  get newMonthlyRevenue(): MonthlyRevenue {
-    const { subscription } = this.props
-
-    let revenue = 0
-    switch (this.props.eventType.value) {
-      case 'SUBSCRIPTION_PURCHASED':
-      case 'SUBSCRIPTION_RENEWED':
-      case 'SUBSCRIPTION_DATA_MIGRATED':
-        revenue = subscription.props.payedAmount / subscription.props.billingFrequency
-        break
-      case 'SUBSCRIPTION_EXPIRED':
-      case 'SUBSCRIPTION_REFUNDED':
-        revenue = 0
-        break
-      case 'SUBSCRIPTION_CANCELLED':
-        revenue = this.props.previousMonthlyRevenue.value
-        break
-    }
-
-    const monthlyRevenueOrError = MonthlyRevenue.create(revenue)
-
-    return monthlyRevenueOrError.getValue()
+  static create(props: RevenueModificationProps, id?: UniqueEntityId): Result<RevenueModification> {
+    return Result.ok<RevenueModification>(new RevenueModification(props, id))
   }
 }

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

@@ -8,5 +8,6 @@ export interface RevenueModificationProps {
   subscription: Subscription
   eventType: SubscriptionEventType
   previousMonthlyRevenue: MonthlyRevenue
+  newMonthlyRevenue: MonthlyRevenue
   createdAt: number
 }

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

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

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

@@ -15,4 +15,9 @@ export enum StatisticsMeasure {
   Refunds = 'refunds',
   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/Statistics/StatisticsStoreInterface.ts

@@ -13,4 +13,8 @@ export interface StatisticsStoreInterface {
   getMeasureAverage(measure: StatisticsMeasure, period: Period): Promise<number>
   getMeasureTotal(measure: StatisticsMeasure, periodOrPeriodKey: Period | string): Promise<number>
   getMeasureIncrementCounts(measure: StatisticsMeasure, period: Period): Promise<number>
+  calculateTotalCountOverPeriod(
+    measure: StatisticsMeasure,
+    period: Period,
+  ): Promise<Array<{ periodKey: string; totalCount: number }>>
 }

packages/analytics/src/Domain/Subscription/Subscription.spec.ts

@@ -8,7 +8,7 @@ describe('Subscription', () => {
       isFirstSubscriptionForUser: true,
       payedAmount: 12.99,
       planName: SubscriptionPlanName.create('PRO_PLAN').getValue(),
-    })
+    }).getValue()
 
     expect(subscription.id.toString()).toHaveLength(36)
   })

packages/analytics/src/Domain/Subscription/Subscription.ts

@@ -1,4 +1,5 @@
 import { Entity } from '../Core/Entity'
+import { Result } from '../Core/Result'
 import { UniqueEntityId } from '../Core/UniqueEntityId'
 import { SubscriptionProps } from './SubscriptionProps'
 
@@ -11,7 +12,7 @@ export class Subscription extends Entity<SubscriptionProps> {
     super(props, id)
   }
 
-  static create(props: SubscriptionProps, id?: UniqueEntityId): Subscription {
-    return new Subscription(props, id)
+  static create(props: SubscriptionProps, id?: UniqueEntityId): Result<Subscription> {
+    return Result.ok<Subscription>(new Subscription(props, id))
   }
 }

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.spec.ts

@@ -0,0 +1,33 @@
+import 'reflect-metadata'
+
+import { RevenueModificationRepositoryInterface } from '../../Revenue/RevenueModificationRepositoryInterface'
+import { StatisticsMeasure } from '../../Statistics/StatisticsMeasure'
+import { StatisticsStoreInterface } from '../../Statistics/StatisticsStoreInterface'
+import { Period } from '../../Time/Period'
+
+import { CalculateMonthlyRecurringRevenue } from './CalculateMonthlyRecurringRevenue'
+
+describe('CalculateMonthlyRecurringRevenue', () => {
+  let revenueModificationRepository: RevenueModificationRepositoryInterface
+  let statisticsStore: StatisticsStoreInterface
+
+  const createUseCase = () => new CalculateMonthlyRecurringRevenue(revenueModificationRepository, statisticsStore)
+
+  beforeEach(() => {
+    revenueModificationRepository = {} as jest.Mocked<RevenueModificationRepositoryInterface>
+    revenueModificationRepository.sumMRRDiff = jest.fn().mockReturnValue(123.45)
+
+    statisticsStore = {} as jest.Mocked<StatisticsStoreInterface>
+    statisticsStore.setMeasure = jest.fn()
+  })
+
+  it('should calculate the MRR diff and persist it as a statistic', async () => {
+    await createUseCase().execute({})
+
+    expect(statisticsStore.setMeasure).toHaveBeenCalledWith(StatisticsMeasure.MRR, 123.45, [
+      Period.Today,
+      Period.ThisMonth,
+      Period.ThisYear,
+    ])
+  })
+})

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

@@ -0,0 +1,72 @@
+import { SubscriptionBillingFrequency, SubscriptionName } from '@standardnotes/common'
+import { inject, injectable } from 'inversify'
+import TYPES from '../../../Bootstrap/Types'
+import { Result } from '../../Core/Result'
+import { MonthlyRevenue } from '../../Revenue/MonthlyRevenue'
+import { RevenueModificationRepositoryInterface } from '../../Revenue/RevenueModificationRepositoryInterface'
+import { StatisticsMeasure } from '../../Statistics/StatisticsMeasure'
+import { StatisticsStoreInterface } from '../../Statistics/StatisticsStoreInterface'
+import { Period } from '../../Time/Period'
+import { DomainUseCaseInterface } from '../DomainUseCaseInterface'
+import { CalculateMonthlyRecurringRevenueDTO } from './CalculateMonthlyRecurringRevenueDTO'
+
+@injectable()
+export class CalculateMonthlyRecurringRevenue implements DomainUseCaseInterface<MonthlyRevenue> {
+  constructor(
+    @inject(TYPES.RevenueModificationRepository)
+    private revenueModificationRepository: RevenueModificationRepositoryInterface,
+    @inject(TYPES.StatisticsStore) private statisticsStore: StatisticsStoreInterface,
+  ) {}
+
+  async execute(_dto: CalculateMonthlyRecurringRevenueDTO): Promise<Result<MonthlyRevenue>> {
+    const mrrDiff = await this.revenueModificationRepository.sumMRRDiff({})
+
+    await this.statisticsStore.setMeasure(StatisticsMeasure.MRR, mrrDiff, [
+      Period.Today,
+      Period.ThisMonth,
+      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/Domain/UseCase/CalculateMonthlyRecurringRevenue/CalculateMonthlyRecurringRevenueDTO.ts

@@ -0,0 +1,2 @@
+/* eslint-disable @typescript-eslint/no-empty-interface */
+export interface CalculateMonthlyRecurringRevenueDTO {}

packages/analytics/src/Domain/UseCase/SaveRevenueModification/SaveRevenueModification.spec.ts

@@ -11,28 +11,35 @@ import { RevenueModificationRepositoryInterface } from '../../Revenue/RevenueMod
 import { SubscriptionEventType } from '../../Subscription/SubscriptionEventType'
 import { SubscriptionPlanName } from '../../Subscription/SubscriptionPlanName'
 import { SaveRevenueModification } from './SaveRevenueModification'
+import { User } from '../../User/User'
+import { Result } from '../../Core/Result'
+import { Subscription } from '../../Subscription/Subscription'
 
 describe('SaveRevenueModification', () => {
   let revenueModificationRepository: RevenueModificationRepositoryInterface
-  let previousMonthlyRevenue: RevenueModification
+  let previousMonthlyRevenueModification: RevenueModification
   let timer: TimerInterface
 
   const createUseCase = () => new SaveRevenueModification(revenueModificationRepository, timer)
 
   beforeEach(() => {
-    previousMonthlyRevenue = {
-      newMonthlyRevenue: MonthlyRevenue.create(2).getValue(),
+    const previousMonthlyRevenue = {
+      value: 2,
+    } as jest.Mocked<MonthlyRevenue>
+    previousMonthlyRevenueModification = {
+      props: {},
     } as jest.Mocked<RevenueModification>
+    previousMonthlyRevenueModification.props.newMonthlyRevenue = previousMonthlyRevenue
 
     revenueModificationRepository = {} as jest.Mocked<RevenueModificationRepositoryInterface>
-    revenueModificationRepository.findLastByUserUuid = jest.fn().mockReturnValue(previousMonthlyRevenue)
+    revenueModificationRepository.findLastByUserUuid = jest.fn().mockReturnValue(previousMonthlyRevenueModification)
     revenueModificationRepository.save = jest.fn()
 
     timer = {} as jest.Mocked<TimerInterface>
     timer.getTimestampInMicroseconds = jest.fn().mockReturnValue(1)
   })
 
-  it('should persist a revenue modification', async () => {
+  it('should persist a revenue modification for subscription purchased event', async () => {
     const revenueOrError = await createUseCase().execute({
       billingFrequency: 1,
       eventType: SubscriptionEventType.create('SUBSCRIPTION_PURCHASED').getValue(),
@@ -43,8 +50,166 @@ describe('SaveRevenueModification', () => {
       userEmail: Email.create('test@test.te').getValue(),
       userUuid: Uuid.create('1-2-3').getValue(),
     })
+
     expect(revenueOrError.isFailed()).toBeFalsy()
     const revenue = revenueOrError.getValue()
-    expect(revenue.newMonthlyRevenue.value).toEqual(12.99)
+
+    expect(revenue.props.newMonthlyRevenue.value).toEqual(12.99)
+  })
+
+  it('should persist a revenue modification for subscription expired event', async () => {
+    const revenueOrError = await createUseCase().execute({
+      billingFrequency: 1,
+      eventType: SubscriptionEventType.create('SUBSCRIPTION_EXPIRED').getValue(),
+      newSubscriber: true,
+      payedAmount: 12.99,
+      planName: SubscriptionPlanName.create('PRO_PLAN').getValue(),
+      subscriptionId: 1234,
+      userEmail: Email.create('test@test.te').getValue(),
+      userUuid: Uuid.create('1-2-3').getValue(),
+    })
+
+    expect(revenueOrError.isFailed()).toBeFalsy()
+    const revenue = revenueOrError.getValue()
+
+    expect(revenue.props.newMonthlyRevenue.value).toEqual(0)
+  })
+
+  it('should persist a revenue modification for subscription cancelled event', async () => {
+    const revenueOrError = await createUseCase().execute({
+      billingFrequency: 1,
+      eventType: SubscriptionEventType.create('SUBSCRIPTION_CANCELLED').getValue(),
+      newSubscriber: true,
+      payedAmount: 2,
+      planName: SubscriptionPlanName.create('PRO_PLAN').getValue(),
+      subscriptionId: 1234,
+      userEmail: Email.create('test@test.te').getValue(),
+      userUuid: Uuid.create('1-2-3').getValue(),
+    })
+
+    expect(revenueOrError.isFailed()).toBeFalsy()
+    const revenue = revenueOrError.getValue()
+
+    expect(revenue.props.newMonthlyRevenue.value).toEqual(2)
+  })
+
+  it('should persist a revenue modification for subscription purchased event if previous revenue modification did not exist', async () => {
+    revenueModificationRepository.findLastByUserUuid = jest.fn().mockReturnValue(null)
+
+    const revenueOrError = await createUseCase().execute({
+      billingFrequency: 1,
+      eventType: SubscriptionEventType.create('SUBSCRIPTION_PURCHASED').getValue(),
+      newSubscriber: true,
+      payedAmount: 12.99,
+      planName: SubscriptionPlanName.create('PRO_PLAN').getValue(),
+      subscriptionId: 1234,
+      userEmail: Email.create('test@test.te').getValue(),
+      userUuid: Uuid.create('1-2-3').getValue(),
+    })
+
+    expect(revenueOrError.isFailed()).toBeFalsy()
+    const revenue = revenueOrError.getValue()
+
+    expect(revenue.props.newMonthlyRevenue.value).toEqual(12.99)
+  })
+
+  it('should not persist a revenue modification if failed to create user', async () => {
+    const mock = jest.spyOn(User, 'create')
+    mock.mockReturnValue(Result.fail('Oops'))
+
+    const revenueOrError = await createUseCase().execute({
+      billingFrequency: 1,
+      eventType: SubscriptionEventType.create('SUBSCRIPTION_PURCHASED').getValue(),
+      newSubscriber: true,
+      payedAmount: 12.99,
+      planName: SubscriptionPlanName.create('PRO_PLAN').getValue(),
+      subscriptionId: 1234,
+      userEmail: Email.create('test@test.te').getValue(),
+      userUuid: Uuid.create('1-2-3').getValue(),
+    })
+
+    expect(revenueOrError.isFailed()).toBeTruthy()
+
+    mock.mockRestore()
+  })
+
+  it('should not persist a revenue modification if failed to create a subscription', async () => {
+    const mock = jest.spyOn(Subscription, 'create')
+    mock.mockReturnValue(Result.fail('Oops'))
+
+    const revenueOrError = await createUseCase().execute({
+      billingFrequency: 1,
+      eventType: SubscriptionEventType.create('SUBSCRIPTION_PURCHASED').getValue(),
+      newSubscriber: true,
+      payedAmount: 12.99,
+      planName: SubscriptionPlanName.create('PRO_PLAN').getValue(),
+      subscriptionId: 1234,
+      userEmail: Email.create('test@test.te').getValue(),
+      userUuid: Uuid.create('1-2-3').getValue(),
+    })
+
+    expect(revenueOrError.isFailed()).toBeTruthy()
+
+    mock.mockRestore()
+  })
+
+  it('should not persist a revenue modification if failed to create a previous monthly revenue', async () => {
+    const mock = jest.spyOn(MonthlyRevenue, 'create')
+    mock.mockReturnValue(Result.fail('Oops'))
+
+    const revenueOrError = await createUseCase().execute({
+      billingFrequency: 1,
+      eventType: SubscriptionEventType.create('SUBSCRIPTION_PURCHASED').getValue(),
+      newSubscriber: true,
+      payedAmount: 12.99,
+      planName: SubscriptionPlanName.create('PRO_PLAN').getValue(),
+      subscriptionId: 1234,
+      userEmail: Email.create('test@test.te').getValue(),
+      userUuid: Uuid.create('1-2-3').getValue(),
+    })
+
+    expect(revenueOrError.isFailed()).toBeTruthy()
+
+    mock.mockRestore()
+  })
+
+  it('should not persist a revenue modification if failed to create a next monthly revenue', async () => {
+    const mock = jest.spyOn(MonthlyRevenue, 'create')
+    mock.mockReturnValueOnce(Result.ok()).mockReturnValueOnce(Result.fail('Oops'))
+
+    const revenueOrError = await createUseCase().execute({
+      billingFrequency: 1,
+      eventType: SubscriptionEventType.create('SUBSCRIPTION_PURCHASED').getValue(),
+      newSubscriber: true,
+      payedAmount: 12.99,
+      planName: SubscriptionPlanName.create('PRO_PLAN').getValue(),
+      subscriptionId: 1234,
+      userEmail: Email.create('test@test.te').getValue(),
+      userUuid: Uuid.create('1-2-3').getValue(),
+    })
+
+    expect(revenueOrError.isFailed()).toBeTruthy()
+
+    mock.mockRestore()
+  })
+
+  it('should not persist a revenue modification if failed to create it', async () => {
+    const mock = jest.spyOn(RevenueModification, 'create')
+    mock.mockReturnValue(Result.fail('Oops'))
+
+    const revenueOrError = await createUseCase().execute({
+      billingFrequency: 1,
+      eventType: SubscriptionEventType.create('SUBSCRIPTION_PURCHASED').getValue(),
+      newSubscriber: true,
+      payedAmount: 12.99,
+      planName: SubscriptionPlanName.create('PRO_PLAN').getValue(),
+      subscriptionId: 1234,
+      userEmail: Email.create('test@test.te').getValue(),
+      userUuid: Uuid.create('1-2-3').getValue(),
+    })
+
+    expect(revenueOrError.isFailed()).toBeTruthy()
+
+    mock.mockRestore()
   })
 })

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

@@ -1,4 +1,5 @@
 import { inject, injectable } from 'inversify'
+
 import TYPES from '../../../Bootstrap/Types'
 import { UniqueEntityId } from '../../Core/UniqueEntityId'
 import { MonthlyRevenue } from '../../Revenue/MonthlyRevenue'
@@ -10,6 +11,7 @@ import { Result } from '../../Core/Result'
 import { DomainUseCaseInterface } from '../DomainUseCaseInterface'
 import { SaveRevenueModificationDTO } from './SaveRevenueModificationDTO'
 import { TimerInterface } from '@standardnotes/time'
+import { SubscriptionEventType } from '../../Subscription/SubscriptionEventType'
 
 @injectable()
 export class SaveRevenueModification implements DomainUseCaseInterface<RevenueModification> {
@@ -20,13 +22,18 @@ export class SaveRevenueModification implements DomainUseCaseInterface<RevenueMo
   ) {}
 
   async execute(dto: SaveRevenueModificationDTO): Promise<Result<RevenueModification>> {
-    const user = User.create(
+    const userOrError = User.create(
       {
         email: dto.userEmail,
       },
       new UniqueEntityId(dto.userUuid.value),
     )
-    const subscription = Subscription.create(
+    if (userOrError.isFailed()) {
+      return Result.fail<RevenueModification>(userOrError.getError())
+    }
+    const user = userOrError.getValue()
+
+    const subscriptionOrError = Subscription.create(
       {
         isFirstSubscriptionForUser: dto.newSubscriber,
         payedAmount: dto.payedAmount,
@@ -35,23 +42,77 @@ export class SaveRevenueModification implements DomainUseCaseInterface<RevenueMo
       },
       new UniqueEntityId(dto.subscriptionId),
     )
+    if (subscriptionOrError.isFailed()) {
+      return Result.fail<RevenueModification>(subscriptionOrError.getError())
+    }
+    const subscription = subscriptionOrError.getValue()
+
+    const previousMonthlyRevenueOrError = MonthlyRevenue.create(0)
+    if (previousMonthlyRevenueOrError.isFailed()) {
+      return Result.fail<RevenueModification>(previousMonthlyRevenueOrError.getError())
+    }
+    let previousMonthlyRevenue = previousMonthlyRevenueOrError.getValue()
 
-    let previousMonthlyRevenue = MonthlyRevenue.create(0).getValue()
     const previousRevenueModification = await this.revenueModificationRepository.findLastByUserUuid(dto.userUuid)
     if (previousRevenueModification !== null) {
-      previousMonthlyRevenue = previousRevenueModification.newMonthlyRevenue
+      previousMonthlyRevenue = previousRevenueModification.props.newMonthlyRevenue
     }
+    const newMonthlyRevenueOrError = this.calculateNewMonthlyRevenue(
+      subscription,
+      previousMonthlyRevenue,
+      dto.eventType,
+    )
+    if (newMonthlyRevenueOrError.isFailed()) {
+      return Result.fail<RevenueModification>(newMonthlyRevenueOrError.getError())
+    }
+    const newMonthlyRevenue = newMonthlyRevenueOrError.getValue()
 
-    const revenueModification = RevenueModification.create({
+    const revenueModificationOrError = RevenueModification.create({
       eventType: dto.eventType,
       subscription,
       user,
       previousMonthlyRevenue,
+      newMonthlyRevenue,
       createdAt: this.timer.getTimestampInMicroseconds(),
     })
 
+    if (revenueModificationOrError.isFailed()) {
+      return Result.fail<RevenueModification>(revenueModificationOrError.getError())
+    }
+    const revenueModification = revenueModificationOrError.getValue()
+
     await this.revenueModificationRepository.save(revenueModification)
 
     return Result.ok<RevenueModification>(revenueModification)
   }
+
+  private calculateNewMonthlyRevenue(
+    subscription: Subscription,
+    previousMonthlyRevenue: MonthlyRevenue,
+    eventType: SubscriptionEventType,
+  ): Result<MonthlyRevenue> {
+    let revenue = 0
+    switch (eventType.value) {
+      case 'SUBSCRIPTION_PURCHASED':
+      case 'SUBSCRIPTION_RENEWED':
+      case 'SUBSCRIPTION_DATA_MIGRATED':
+        revenue = subscription.props.payedAmount / subscription.props.billingFrequency
+        break
+      case 'SUBSCRIPTION_EXPIRED':
+      case 'SUBSCRIPTION_REFUNDED':
+        revenue = 0
+        break
+      case 'SUBSCRIPTION_CANCELLED':
+        revenue = previousMonthlyRevenue.value
+        break
+    }
+
+    const monthlyRevenueOrError = MonthlyRevenue.create(revenue)
+
+    if (monthlyRevenueOrError.isFailed()) {
+      return Result.fail<MonthlyRevenue>(monthlyRevenueOrError.getError())
+    }
+
+    return Result.ok<MonthlyRevenue>(monthlyRevenueOrError.getValue())
+  }
 }

packages/analytics/src/Domain/User/User.spec.ts

@@ -5,7 +5,7 @@ describe('User', () => {
   it('should create an entity', () => {
     const user = User.create({
       email: Email.create('test@test.te').getValue(),
-    })
+    }).getValue()
 
     expect(user.id.toString()).toHaveLength(36)
   })

packages/analytics/src/Domain/User/User.ts

@@ -1,4 +1,5 @@
 import { Entity } from '../Core/Entity'
+import { Result } from '../Core/Result'
 import { UniqueEntityId } from '../Core/UniqueEntityId'
 import { UserProps } from './UserProps'
 
@@ -11,7 +12,7 @@ export class User extends Entity<UserProps> {
     super(props, id)
   }
 
-  public static create(props: UserProps, id?: UniqueEntityId): User {
-    return new User(props, id)
+  public static create(props: UserProps, id?: UniqueEntityId): Result<User> {
+    return Result.ok<User>(new User(props, id))
   }
 }

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

@@ -17,6 +17,25 @@ export class MySQLRevenueModificationRepository implements RevenueModificationRe
     private revenueModificationMap: MapInterface<RevenueModification, TypeORMRevenueModification>,
   ) {}
 
+  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
+    }
+
+    return +(+result.mrrDiff).toFixed(2)
+  }
+
   async findLastByUserUuid(userUuid: Uuid): Promise<RevenueModification | null> {
     const persistence = await this.ormRepository
       .createQueryBuilder()

packages/analytics/src/Infra/Redis/RedisAnalyticsStore.spec.ts

@@ -1,209 +0,0 @@
-import * as IORedis from 'ioredis'
-import { AnalyticsActivity } from '../../Domain/Analytics/AnalyticsActivity'
-import { Period } from '../../Domain/Time/Period'
-import { PeriodKeyGeneratorInterface } from '../../Domain/Time/PeriodKeyGeneratorInterface'
-
-import { RedisAnalyticsStore } from './RedisAnalyticsStore'
-
-describe('RedisAnalyticsStore', () => {
-  let redisClient: IORedis.Redis
-  let pipeline: IORedis.Pipeline
-  let periodKeyGenerator: PeriodKeyGeneratorInterface
-
-  const createStore = () => new RedisAnalyticsStore(periodKeyGenerator, redisClient)
-
-  beforeEach(() => {
-    pipeline = {} as jest.Mocked<IORedis.Pipeline>
-    pipeline.incr = jest.fn()
-    pipeline.setbit = jest.fn()
-    pipeline.exec = jest.fn()
-
-    redisClient = {} as jest.Mocked<IORedis.Redis>
-    redisClient.pipeline = jest.fn().mockReturnValue(pipeline)
-    redisClient.incr = jest.fn()
-    redisClient.setbit = jest.fn()
-    redisClient.getbit = jest.fn().mockReturnValue(1)
-    redisClient.bitop = jest.fn()
-    redisClient.expire = jest.fn()
-
-    periodKeyGenerator = {} as jest.Mocked<PeriodKeyGeneratorInterface>
-    periodKeyGenerator.getPeriodKey = jest.fn().mockReturnValue('period-key')
-  })
-
-  it('should calculate total count over time of activities', async () => {
-    redisClient.bitcount = jest.fn().mockReturnValue(70)
-
-    periodKeyGenerator.getDiscretePeriodKeys = jest.fn().mockReturnValue(['2022-4-24', '2022-4-25', '2022-4-26'])
-
-    await createStore().calculateActivityTotalCountOverTime(AnalyticsActivity.Register, Period.Last30Days)
-
-    expect(redisClient.bitop).toHaveBeenCalledTimes(1)
-    expect(redisClient.bitop).toHaveBeenNthCalledWith(
-      1,
-      'OR',
-      'bitmap:action:register:timespan:2022-4-24-2022-4-26',
-      'bitmap:action:register:timespan:2022-4-24',
-      'bitmap:action:register:timespan:2022-4-25',
-      'bitmap:action:register:timespan:2022-4-26',
-    )
-    expect(redisClient.bitcount).toHaveBeenCalledWith('bitmap:action:register:timespan:2022-4-24-2022-4-26')
-  })
-
-  it('should not calculate total count over time of activities if period is unsupported', async () => {
-    let caughtError = null
-    try {
-      await createStore().calculateActivityTotalCountOverTime(AnalyticsActivity.Register, Period.LastWeek)
-    } catch (error) {
-      caughtError = error
-    }
-
-    expect(caughtError).not.toBeNull()
-  })
-
-  it('should calculate total count changes of activities', async () => {
-    periodKeyGenerator.getDiscretePeriodKeys = jest.fn().mockReturnValue(['2022-4-24', '2022-4-25', '2022-4-26'])
-
-    redisClient.bitcount = jest.fn().mockReturnValueOnce(70).mockReturnValueOnce(71).mockReturnValueOnce(72)
-
-    expect(
-      await createStore().calculateActivityChangesTotalCount(AnalyticsActivity.Register, Period.Last30Days),
-    ).toEqual([
-      {
-        periodKey: '2022-4-24',
-        totalCount: 70,
-      },
-      {
-        periodKey: '2022-4-25',
-        totalCount: 71,
-      },
-      {
-        periodKey: '2022-4-26',
-        totalCount: 72,
-      },
-    ])
-
-    expect(redisClient.bitcount).toHaveBeenNthCalledWith(1, 'bitmap:action:register:timespan:2022-4-24')
-    expect(redisClient.bitcount).toHaveBeenNthCalledWith(2, 'bitmap:action:register:timespan:2022-4-25')
-    expect(redisClient.bitcount).toHaveBeenNthCalledWith(3, 'bitmap:action:register:timespan:2022-4-26')
-  })
-
-  it('should throw error on calculating total count changes of activities on unsupported period', async () => {
-    periodKeyGenerator.getDiscretePeriodKeys = jest.fn().mockReturnValue(['2022-4-24', '2022-4-25', '2022-4-26'])
-
-    redisClient.bitcount = jest.fn().mockReturnValueOnce(70).mockReturnValueOnce(71).mockReturnValueOnce(72)
-
-    let caughtError = null
-    try {
-      await createStore().calculateActivityChangesTotalCount(AnalyticsActivity.Register, Period.LastWeek)
-    } catch (error) {
-      caughtError = error
-    }
-
-    expect(caughtError).not.toBeNull()
-  })
-
-  it('should calculate total count of activities by period', async () => {
-    redisClient.bitcount = jest.fn().mockReturnValue(70)
-
-    expect(await createStore().calculateActivityTotalCount(AnalyticsActivity.Register, Period.Yesterday)).toEqual(70)
-
-    expect(redisClient.bitcount).toHaveBeenCalledWith('bitmap:action:register:timespan:period-key')
-  })
-
-  it('should calculate total count of activities by period key', async () => {
-    redisClient.bitcount = jest.fn().mockReturnValue(70)
-
-    expect(await createStore().calculateActivityTotalCount(AnalyticsActivity.Register, '2022-10-03')).toEqual(70)
-
-    expect(redisClient.bitcount).toHaveBeenCalledWith('bitmap:action:register:timespan:2022-10-03')
-  })
-
-  it('should calculate activity retention', async () => {
-    redisClient.bitcount = jest.fn().mockReturnValueOnce(7).mockReturnValueOnce(10)
-
-    expect(
-      await createStore().calculateActivityRetention(
-        AnalyticsActivity.Register,
-        Period.DayBeforeYesterday,
-        Period.Yesterday,
-      ),
-    ).toEqual(70)
-
-    expect(redisClient.bitop).toHaveBeenCalledWith(
-      'AND',
-      'bitmap:action:register-register:timespan:period-key',
-      'bitmap:action:register:timespan:period-key',
-      'bitmap:action:register:timespan:period-key',
-    )
-  })
-
-  it('shoud tell if activity was done', async () => {
-    await createStore().wasActivityDone(AnalyticsActivity.Register, 123, Period.Yesterday)
-
-    expect(redisClient.getbit).toHaveBeenCalledWith('bitmap:action:register:timespan:period-key', 123)
-  })
-
-  it('should mark activity as done', async () => {
-    await createStore().markActivity([AnalyticsActivity.Register], 123, [Period.Today])
-
-    expect(pipeline.setbit).toBeCalledTimes(1)
-    expect(pipeline.setbit).toHaveBeenNthCalledWith(1, 'bitmap:action:register:timespan:period-key', 123, 1)
-    expect(pipeline.exec).toHaveBeenCalled()
-  })
-
-  it('should mark activities as done', async () => {
-    await createStore().markActivity([AnalyticsActivity.Register, AnalyticsActivity.SubscriptionPurchased], 123, [
-      Period.Today,
-      Period.ThisWeek,
-    ])
-
-    expect(pipeline.setbit).toBeCalledTimes(4)
-    expect(pipeline.setbit).toHaveBeenNthCalledWith(1, 'bitmap:action:register:timespan:period-key', 123, 1)
-    expect(pipeline.setbit).toHaveBeenNthCalledWith(2, 'bitmap:action:register:timespan:period-key', 123, 1)
-    expect(pipeline.setbit).toHaveBeenNthCalledWith(
-      3,
-      'bitmap:action:subscription-purchased:timespan:period-key',
-      123,
-      1,
-    )
-    expect(pipeline.setbit).toHaveBeenNthCalledWith(
-      4,
-      'bitmap:action:subscription-purchased:timespan:period-key',
-      123,
-      1,
-    )
-    expect(pipeline.exec).toHaveBeenCalled()
-  })
-
-  it('should unmark activity as done', async () => {
-    await createStore().unmarkActivity([AnalyticsActivity.Register], 123, [Period.Today])
-
-    expect(pipeline.setbit).toBeCalledTimes(1)
-    expect(pipeline.setbit).toHaveBeenNthCalledWith(1, 'bitmap:action:register:timespan:period-key', 123, 0)
-    expect(pipeline.exec).toHaveBeenCalled()
-  })
-
-  it('should unmark activities as done', async () => {
-    await createStore().unmarkActivity([AnalyticsActivity.Register, AnalyticsActivity.SubscriptionPurchased], 123, [
-      Period.Today,
-      Period.ThisWeek,
-    ])
-
-    expect(pipeline.setbit).toBeCalledTimes(4)
-    expect(pipeline.setbit).toHaveBeenNthCalledWith(1, 'bitmap:action:register:timespan:period-key', 123, 0)
-    expect(pipeline.setbit).toHaveBeenNthCalledWith(2, 'bitmap:action:register:timespan:period-key', 123, 0)
-    expect(pipeline.setbit).toHaveBeenNthCalledWith(
-      3,
-      'bitmap:action:subscription-purchased:timespan:period-key',
-      123,
-      0,
-    )
-    expect(pipeline.setbit).toHaveBeenNthCalledWith(
-      4,
-      'bitmap:action:subscription-purchased:timespan:period-key',
-      123,
-      0,
-    )
-    expect(pipeline.exec).toHaveBeenCalled()
-  })
-})

packages/analytics/src/Infra/Redis/RedisStatisticsStore.spec.ts

@@ -1,145 +0,0 @@
-import * as IORedis from 'ioredis'
-
-import { StatisticsMeasure } from '../../Domain/Statistics/StatisticsMeasure'
-import { Period } from '../../Domain/Time/Period'
-import { PeriodKeyGeneratorInterface } from '../../Domain/Time/PeriodKeyGeneratorInterface'
-
-import { RedisStatisticsStore } from './RedisStatisticsStore'
-
-describe('RedisStatisticsStore', () => {
-  let redisClient: IORedis.Redis
-  let periodKeyGenerator: PeriodKeyGeneratorInterface
-  let pipeline: IORedis.Pipeline
-
-  const createStore = () => new RedisStatisticsStore(periodKeyGenerator, redisClient)
-
-  beforeEach(() => {
-    pipeline = {} as jest.Mocked<IORedis.Pipeline>
-    pipeline.incr = jest.fn()
-    pipeline.incrbyfloat = jest.fn()
-    pipeline.set = jest.fn()
-    pipeline.setbit = jest.fn()
-    pipeline.exec = jest.fn()
-
-    redisClient = {} as jest.Mocked<IORedis.Redis>
-    redisClient.pipeline = jest.fn().mockReturnValue(pipeline)
-    redisClient.incr = jest.fn()
-    redisClient.setbit = jest.fn()
-    redisClient.getbit = jest.fn().mockReturnValue(1)
-
-    periodKeyGenerator = {} as jest.Mocked<PeriodKeyGeneratorInterface>
-    periodKeyGenerator.getPeriodKey = jest.fn().mockReturnValue('period-key')
-  })
-
-  it('should get yesterday out of sync incidents', async () => {
-    redisClient.get = jest.fn().mockReturnValue(1)
-
-    expect(await createStore().getYesterdayOutOfSyncIncidents()).toEqual(1)
-  })
-
-  it('should default to 0 yesterday out of sync incidents', async () => {
-    redisClient.get = jest.fn().mockReturnValue(null)
-
-    expect(await createStore().getYesterdayOutOfSyncIncidents()).toEqual(0)
-  })
-
-  it('should get yesterday application version usage', async () => {
-    redisClient.keys = jest
-      .fn()
-      .mockReturnValue([
-        'count:action:application-request:1.2.3:timespan:2022-3-10',
-        'count:action:application-request:2.3.4:timespan:2022-3-10',
-      ])
-    redisClient.get = jest.fn().mockReturnValueOnce(3).mockReturnValueOnce(4)
-
-    expect(await createStore().getYesterdayApplicationUsage()).toEqual([
-      { count: 3, version: '1.2.3' },
-      { count: 4, version: '2.3.4' },
-    ])
-  })
-
-  it('should get yesterday snjs version usage', async () => {
-    redisClient.keys = jest
-      .fn()
-      .mockReturnValue([
-        'count:action:snjs-request:1.2.3:timespan:2022-3-10',
-        'count:action:snjs-request:2.3.4:timespan:2022-3-10',
-      ])
-    redisClient.get = jest.fn().mockReturnValueOnce(3).mockReturnValueOnce(4)
-
-    expect(await createStore().getYesterdaySNJSUsage()).toEqual([
-      { count: 3, version: '1.2.3' },
-      { count: 4, version: '2.3.4' },
-    ])
-  })
-
-  it('should increment application version usage', async () => {
-    await createStore().incrementApplicationVersionUsage('1.2.3')
-
-    expect(pipeline.incr).toHaveBeenCalled()
-    expect(pipeline.exec).toHaveBeenCalled()
-  })
-
-  it('should increment snjs version usage', async () => {
-    await createStore().incrementSNJSVersionUsage('1.2.3')
-
-    expect(pipeline.incr).toHaveBeenCalled()
-    expect(pipeline.exec).toHaveBeenCalled()
-  })
-
-  it('should increment out of sync incedent count', async () => {
-    await createStore().incrementOutOfSyncIncidents()
-
-    expect(pipeline.incr).toHaveBeenCalled()
-    expect(pipeline.exec).toHaveBeenCalled()
-  })
-
-  it('should set a value to a measure', async () => {
-    await createStore().setMeasure(StatisticsMeasure.Income, 2, [Period.Today, Period.ThisMonth])
-
-    expect(pipeline.set).toHaveBeenCalledTimes(2)
-    expect(pipeline.exec).toHaveBeenCalled()
-  })
-
-  it('should increment measure by a value', async () => {
-    await createStore().incrementMeasure(StatisticsMeasure.Income, 2, [Period.Today, Period.ThisMonth])
-
-    expect(pipeline.incr).toHaveBeenCalledTimes(2)
-    expect(pipeline.incrbyfloat).toHaveBeenCalledTimes(2)
-    expect(pipeline.exec).toHaveBeenCalled()
-  })
-
-  it('should count a measurement average', async () => {
-    redisClient.get = jest.fn().mockReturnValueOnce('5').mockReturnValueOnce('2')
-
-    expect(await createStore().getMeasureAverage(StatisticsMeasure.Income, Period.Today)).toEqual(2 / 5)
-  })
-
-  it('should count a measurement average - 0 increments', async () => {
-    redisClient.get = jest.fn().mockReturnValueOnce(null).mockReturnValueOnce(null)
-
-    expect(await createStore().getMeasureAverage(StatisticsMeasure.Income, Period.Today)).toEqual(0)
-  })
-
-  it('should count a measurement average - 0 total value', async () => {
-    redisClient.get = jest.fn().mockReturnValueOnce(5).mockReturnValueOnce(null)
-
-    expect(await createStore().getMeasureAverage(StatisticsMeasure.Income, Period.Today)).toEqual(0)
-  })
-
-  it('should retrieve a measurement total for period', async () => {
-    redisClient.get = jest.fn().mockReturnValueOnce(5)
-
-    expect(await createStore().getMeasureTotal(StatisticsMeasure.Income, Period.Today)).toEqual(5)
-
-    expect(redisClient.get).toHaveBeenCalledWith('count:measure:income:timespan:period-key')
-  })
-
-  it('should retrieve a measurement total for period key', async () => {
-    redisClient.get = jest.fn().mockReturnValueOnce(5)
-
-    expect(await createStore().getMeasureTotal(StatisticsMeasure.Income, '2022-10-03')).toEqual(5)
-
-    expect(redisClient.get).toHaveBeenCalledWith('count:measure:income:timespan:2022-10-03')
-  })
-})

packages/analytics/src/Infra/Redis/RedisStatisticsStore.ts

@@ -9,6 +9,34 @@ import { PeriodKeyGeneratorInterface } from '../../Domain/Time/PeriodKeyGenerato
 export class RedisStatisticsStore implements StatisticsStoreInterface {
   constructor(private periodKeyGenerator: PeriodKeyGeneratorInterface, private redisClient: IORedis.Redis) {}
 
+  async calculateTotalCountOverPeriod(
+    measure: StatisticsMeasure,
+    period: Period,
+  ): Promise<{ periodKey: string; totalCount: number }[]> {
+    if (
+      ![
+        Period.Last30Days,
+        Period.ThisYear,
+        Period.Q1ThisYear,
+        Period.Q2ThisYear,
+        Period.Q3ThisYear,
+        Period.Q4ThisYear,
+      ].includes(period)
+    ) {
+      throw new Error(`Unsuporrted period: ${period}`)
+    }
+    const periodKeys = this.periodKeyGenerator.getDiscretePeriodKeys(period)
+    const counts = []
+    for (const periodKey of periodKeys) {
+      counts.push({
+        periodKey,
+        totalCount: await this.getMeasureTotal(measure, periodKey),
+      })
+    }
+
+    return counts
+  }
+
   async getMeasureIncrementCounts(measure: StatisticsMeasure, period: Period): Promise<number> {
     const increments = await this.redisClient.get(
       `count:increments:${measure}:timespan:${this.periodKeyGenerator.getPeriodKey(period)}`,

packages/api-gateway/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.37.6](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.37.5...@standardnotes/api-gateway@1.37.6) (2022-11-10)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
 ## [1.37.5](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.37.4...@standardnotes/api-gateway@1.37.5) (2022-11-09)
 
 **Note:** Version bump only for package @standardnotes/api-gateway

packages/api-gateway/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/api-gateway",
-  "version": "1.37.5",
+  "version": "1.37.6",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/auth/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.59.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.59.0...@standardnotes/auth-server@1.59.1) (2022-11-10)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
 # [1.59.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.58.0...@standardnotes/auth-server@1.59.0) (2022-11-09)
 
 ### Features

packages/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/auth-server",
-  "version": "1.59.0",
+  "version": "1.59.1",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/domain-events-infra/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.9.19](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.9.18...@standardnotes/domain-events-infra@1.9.19) (2022-11-10)
+
+**Note:** Version bump only for package @standardnotes/domain-events-infra
+
 ## [1.9.18](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.9.17...@standardnotes/domain-events-infra@1.9.18) (2022-11-09)
 
 **Note:** Version bump only for package @standardnotes/domain-events-infra

packages/domain-events-infra/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/domain-events-infra",
-  "version": "1.9.18",
+  "version": "1.9.19",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/domain-events/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.84.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.83.0...@standardnotes/domain-events@2.84.0) (2022-11-10)
+
+### Features
+
+* **analytics:** add calculating monthly recurring revenue ([77e5065](https://github.com/standardnotes/server/commit/77e50655f6fa7f9c28e13f8b8bc6de246c0454f0))
+
 # [2.83.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.82.0...@standardnotes/domain-events@2.83.0) (2022-11-09)
 
 ### Features

packages/domain-events/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/domain-events",
-  "version": "2.83.0",
+  "version": "2.84.0",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/domain-events/src/Domain/Event/DailyAnalyticsReportGeneratedEventPayload.ts

@@ -1,12 +1,4 @@
 export interface DailyAnalyticsReportGeneratedEventPayload {
-  snjsStatistics: Array<{
-    version: string
-    count: number
-  }>
-  applicationStatistics: Array<{
-    version: string
-    count: number
-  }>
   activityStatistics: Array<{
     name: string
     retention: number
@@ -28,18 +20,13 @@ export interface DailyAnalyticsReportGeneratedEventPayload {
     }>
     totalCount: number
   }>
-  outOfSyncIncidents: number
-  retentionStatistics: Array<{
-    firstActivity: string
-    secondActivity: string
-    retention: {
-      periodKeys: Array<string>
-      values: Array<{
-        firstPeriodKey: string
-        secondPeriodKey: string
-        value: number
-      }>
-    }
+  statisticsOverTime: Array<{
+    name: string
+    period: number
+    counts: Array<{
+      periodKey: string
+      totalCount: number
+    }>
   }>
   churn: {
     periodKeys: Array<string>

packages/event-store/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.6.14](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.6.13...@standardnotes/event-store@1.6.14) (2022-11-10)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
 ## [1.6.13](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.6.12...@standardnotes/event-store@1.6.13) (2022-11-09)
 
 **Note:** Version bump only for package @standardnotes/event-store

packages/event-store/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/event-store",
-  "version": "1.6.13",
+  "version": "1.6.14",
   "description": "Event Store Service",
   "private": true,
   "main": "dist/src/index.js",

packages/files/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.8.14](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.8.13...@standardnotes/files-server@1.8.14) (2022-11-10)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
 ## [1.8.13](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.8.12...@standardnotes/files-server@1.8.13) (2022-11-09)
 
 **Note:** Version bump only for package @standardnotes/files-server

packages/files/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/files-server",
-  "version": "1.8.13",
+  "version": "1.8.14",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/scheduler/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.13.15](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.13.14...@standardnotes/scheduler-server@1.13.15) (2022-11-10)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
 ## [1.13.14](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.13.13...@standardnotes/scheduler-server@1.13.14) (2022-11-09)
 
 **Note:** Version bump only for package @standardnotes/scheduler-server

packages/scheduler/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/scheduler-server",
-  "version": "1.13.14",
+  "version": "1.13.15",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/syncing-server/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.11.6](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.11.5...@standardnotes/syncing-server@1.11.6) (2022-11-10)
+
+**Note:** Version bump only for package @standardnotes/syncing-server
+
 ## [1.11.5](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.11.4...@standardnotes/syncing-server@1.11.5) (2022-11-09)
 
 **Note:** Version bump only for package @standardnotes/syncing-server

packages/syncing-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/syncing-server",
-  "version": "1.11.5",
+  "version": "1.11.6",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/websockets/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.4.14](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.4.13...@standardnotes/websockets-server@1.4.14) (2022-11-10)
+
+**Note:** Version bump only for package @standardnotes/websockets-server
+
 ## [1.4.13](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.4.12...@standardnotes/websockets-server@1.4.13) (2022-11-09)
 
 **Note:** Version bump only for package @standardnotes/websockets-server

packages/websockets/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/websockets-server",
-  "version": "1.4.13",
+  "version": "1.4.14",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/workspace/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.17.14](https://github.com/standardnotes/server/compare/@standardnotes/workspace-server@1.17.13...@standardnotes/workspace-server@1.17.14) (2022-11-10)
+
+**Note:** Version bump only for package @standardnotes/workspace-server
+
 ## [1.17.13](https://github.com/standardnotes/server/compare/@standardnotes/workspace-server@1.17.12...@standardnotes/workspace-server@1.17.13) (2022-11-09)
 
 **Note:** Version bump only for package @standardnotes/workspace-server

packages/workspace/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/workspace-server",
-  "version": "1.17.13",
+  "version": "1.17.14",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },