chore(release): publish new version

- @standardnotes/analytics@2.9.7
 - @standardnotes/api-gateway@1.38.2
 - @standardnotes/auth-server@1.59.8
 - @standardnotes/common@1.44.2
 - @standardnotes/domain-events-infra@1.9.24
 - @standardnotes/domain-events@2.86.1
 - @standardnotes/event-store@1.6.19
 - @standardnotes/files-server@1.8.19
 - @standardnotes/predicates@1.5.5
 - @standardnotes/scheduler-server@1.13.20
 - @standardnotes/security@1.6.2
 - @standardnotes/settings@1.18.1
 - @standardnotes/sncrypto-node@1.12.1
 - @standardnotes/syncing-server@1.13.3
 - @standardnotes/time@1.13.1
 - @standardnotes/websockets-server@1.4.21
 - @standardnotes/workspace-server@1.17.19

.github/workflows/analytics.yml

@@ -0,0 +1,39 @@
+name: Analytics Server
+
+concurrency:
+  group: analytics
+  cancel-in-progress: true
+
+on:
+  push:
+    tags:
+      - '*standardnotes/analytics*'
+  workflow_dispatch:
+
+jobs:
+  call_server_application_workflow:
+    name: Server Application
+    uses: standardnotes/server/.github/workflows/common-server-application.yml@main
+    with:
+      service_name: analytics
+      workspace_name: "@standardnotes/analytics"
+      e2e_tag_parameter_name: analytics_image_tag
+      deploy_web: false
+      package_path: packages/analytics
+    secrets: inherit
+
+  newrelic:
+    needs: call_server_application_workflow
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Create New Relic deployment marker for Worker
+        uses: newrelic/deployment-marker-action@v1
+        with:
+          accountId: ${{ secrets.NEW_RELIC_ACCOUNT_ID }}
+          apiKey: ${{ secrets.NEW_RELIC_API_KEY }}
+          applicationId: ${{ secrets.NEW_RELIC_APPLICATION_ID_ANALYTICS_WORKER_PROD }}
+          revision: "${{ github.sha }}"
+          description: "Automated Deployment via Github Actions"
+          user: "${{ github.actor }}"

package.json

@@ -20,6 +20,7 @@
     "lint:event-store": "yarn workspace @standardnotes/event-store lint",
     "lint:websockets": "yarn workspace @standardnotes/websockets-server lint",
     "lint:workspace": "yarn workspace @standardnotes/workspace-server lint",
+    "lint:analytics": "yarn workspace @standardnotes/analytics lint",
     "clean": "yarn workspaces foreach -p --verbose run clean",
     "setup:env": "cp .env.sample .env && yarn workspaces foreach -p --verbose run setup:env",
     "start:auth": "yarn workspace @standardnotes/auth-server start",
@@ -32,6 +33,7 @@
     "start:api-gateway": "yarn workspace @standardnotes/api-gateway start",
     "start:websockets": "yarn workspace @standardnotes/websockets-server start",
     "start:workspace": "yarn workspace @standardnotes/workspace-server start",
+    "start:analytics": "yarn workspace @standardnotes/analytics worker",
     "release": "lerna version --conventional-graduate --conventional-commits --yes -m \"chore(release): publish new version\"",
     "publish": "lerna publish from-git --yes --no-verify-access --loglevel verbose",
     "postversion": "./scripts/push-tags-one-by-one.sh",
@@ -44,7 +46,7 @@
     "@lerna-lite/list": "^1.5.1",
     "@lerna-lite/run": "^1.5.1",
     "@types/jest": "^29.1.1",
-    "@types/newrelic": "^7.0.3",
+    "@types/newrelic": "^7.0.4",
     "@types/node": "^18.0.0",
     "@typescript-eslint/parser": "^5.40.1",
     "eslint": "^8.17.0",
@@ -57,7 +59,8 @@
   },
   "packageManager": "yarn@4.0.0-rc.25",
   "dependencies": {
+    "@newrelic/native-metrics": "^9.0.0",
     "@sentry/node": "^7.3.0",
-    "newrelic": "^9.0.0"
+    "newrelic": "^9.6.0"
   }
 }

packages/analytics/.env.sample

@@ -0,0 +1,28 @@
+LOG_LEVEL=debug
+NODE_ENV=development
+
+DB_HOST=127.0.0.1
+DB_REPLICA_HOST=127.0.0.1
+DB_PORT=3306
+DB_USERNAME=analytics
+DB_PASSWORD=changeme123
+DB_DATABASE=analytics
+DB_DEBUG_LEVEL=all # "all" | "query" | "schema" | "error" | "warn" | "info" | "log" | "migration"
+DB_MIGRATIONS_PATH=dist/migrations/*.js
+
+REDIS_URL=redis://cache
+REDIS_EVENTS_CHANNEL=events
+
+SNS_TOPIC_ARN=
+SNS_AWS_REGION=
+SQS_QUEUE_URL=
+SQS_AWS_REGION=
+
+# (Optional) New Relic Setup
+NEW_RELIC_ENABLED=false
+NEW_RELIC_APP_NAME=Analytics
+NEW_RELIC_LICENSE_KEY=
+NEW_RELIC_NO_CONFIG_FILE=true
+NEW_RELIC_DISTRIBUTED_TRACING_ENABLED=false
+NEW_RELIC_LOG_ENABLED=false
+NEW_RELIC_LOG_LEVEL=info

packages/analytics/CHANGELOG.md

@@ -3,6 +3,247 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.9.7](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.9.6...@standardnotes/analytics@2.9.7) (2022-11-14)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.9.6](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.9.5...@standardnotes/analytics@2.9.6) (2022-11-14)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.9.5](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.9.4...@standardnotes/analytics@2.9.5) (2022-11-11)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.9.4](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.9.3...@standardnotes/analytics@2.9.4) (2022-11-11)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.9.3](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.9.2...@standardnotes/analytics@2.9.3) (2022-11-10)
+
+### Bug Fixes
+
+* **analytics:** add five year plans mrr calculation ([a03c5bc](https://github.com/standardnotes/server/commit/a03c5bceea2a9b166b1d5ad75181021462a86627))
+
+## [2.9.2](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.9.1...@standardnotes/analytics@2.9.2) (2022-11-10)
+
+### Bug Fixes
+
+* **analytics:** add missing period for stats report ([9b593f2](https://github.com/standardnotes/server/commit/9b593f2a6b105ab8f9c7cef8bdda6892c42e20ef))
+
+## [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
+
+* **analytics:** mrr column types ([90aef90](https://github.com/standardnotes/server/commit/90aef905af05b8c1c86c7bd383df6b2b502f7c91))
+
+## [2.7.1](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.7.0...@standardnotes/analytics@2.7.1) (2022-11-09)
+
+### Bug Fixes
+
+* **analytics:** add missing created at column ([89502be](https://github.com/standardnotes/server/commit/89502bed638b17301e42e0d5916635b0a59f585d))
+
+# [2.7.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.6.0...@standardnotes/analytics@2.7.0) (2022-11-09)
+
+### Features
+
+* **analytics:** add saving revenue modifications upon subscription canceled ([52a257a](https://github.com/standardnotes/server/commit/52a257abb16034134a50474fbbb2493a00c58b99))
+
+# [2.6.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.5.0...@standardnotes/analytics@2.6.0) (2022-11-09)
+
+### Features
+
+* **analytics:** add saving revenue modifications upon subscription refunded ([0f65c05](https://github.com/standardnotes/server/commit/0f65c051abcff805e920f91d338e5fadda7905a9))
+
+# [2.5.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.4.0...@standardnotes/analytics@2.5.0) (2022-11-09)
+
+### Features
+
+* **analytics:** add saving revenue modifications upon subscription expired ([5c3db2c](https://github.com/standardnotes/server/commit/5c3db2cb29a929e44b63eb8226ce4ad1d14f8a99))
+
+# [2.4.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.3.1...@standardnotes/analytics@2.4.0) (2022-11-09)
+
+### Features
+
+* **analytics:** add saving revenue modifications upon subscription renewed ([cdb7fcf](https://github.com/standardnotes/server/commit/cdb7fcf8311fecfabe3ef9eb656cd6ec57b87de0))
+
+## [2.3.1](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.3.0...@standardnotes/analytics@2.3.1) (2022-11-09)
+
+### Bug Fixes
+
+* **analytics:** missing injectable annotation ([9d3ef24](https://github.com/standardnotes/server/commit/9d3ef24ba94ad28976a211d40f94f1bce8d0d305))
+
+# [2.3.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.2.0...@standardnotes/analytics@2.3.0) (2022-11-09)
+
+### Features
+
+* **analytics:** add saving revenue modifications upon subscription purchased ([5ea9941](https://github.com/standardnotes/server/commit/5ea9941519ffb3027527130ec869da14abc5e994))
+
+# [2.2.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.1.0...@standardnotes/analytics@2.2.0) (2022-11-08)
+
+### Features
+
+* **analytics:** add persistence for revenue modifications ([4928685](https://github.com/standardnotes/server/commit/49286851989f557d3b391b6b535a9aa307fbef50))
+* **analytics:** create new ddd architecture for persisting revenue modifications ([0103233](https://github.com/standardnotes/server/commit/0103233d4a1e222e7c9b059475c1cdc3b2617455))
+
+# [2.1.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@1.52.0...@standardnotes/analytics@2.1.0) (2022-11-07)
+
+### Features
+
+* remove analytics scope from other services in favor of a separate service ([ff1d5db](https://github.com/standardnotes/server/commit/ff1d5db12c93f8e51c07c3aecb9fed4be48ea96a))
+
+# [1.52.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@1.51.0...@standardnotes/analytics@1.52.0) (2022-11-07)
+
+### Features
+
+* **analytics:** add handling subscription reactivated events ([6359030](https://github.com/standardnotes/server/commit/63590300308975097f4d092a4f140f479093a1ae))
+
+# [1.51.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@1.50.0...@standardnotes/analytics@1.51.0) (2022-11-07)
+
+### Features
+
+* **analytics:** add handling subscription expired events ([c0f5817](https://github.com/standardnotes/server/commit/c0f5817d4753410ee5d997c1b94e340b400cb5d9))
+
+# [1.50.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@1.49.0...@standardnotes/analytics@1.50.0) (2022-11-07)
+
+### Features
+
+* **analytics:** add handling subscription purchased events ([f1834d5](https://github.com/standardnotes/server/commit/f1834d58d2215c81322e82a0ec279617103b3260))
+
+# [1.49.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@1.48.0...@standardnotes/analytics@1.49.0) (2022-11-07)
+
+### Features
+
+* **analytics:** add handling subscription refunded event ([197c991](https://github.com/standardnotes/server/commit/197c9914caf8fb31ce3ee69d05381d2a6416b366))
+
+# [1.48.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@1.47.0...@standardnotes/analytics@1.48.0) (2022-11-07)
+
+### Features
+
+* **analytics:** add subscription renewed event handler ([2aa57f1](https://github.com/standardnotes/server/commit/2aa57f1f0ddace741b79e9375b87464eaaba6320))
+
+# [1.47.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@1.46.0...@standardnotes/analytics@1.47.0) (2022-11-04)
+
+### Features
+
+* **analytics:** add subscription cancelled event handler ([037fb23](https://github.com/standardnotes/server/commit/037fb2398ae9aaa11682e1a8576bab28c69e0f9b))
+
+# [1.46.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@1.45.0...@standardnotes/analytics@1.46.0) (2022-11-04)
+
+### Features
+
+* **analytics:** add payment success event handler ([5902cbb](https://github.com/standardnotes/server/commit/5902cbb6218a5b3982b4c56f8d6644f4f5bc6d32))
+
+# [1.45.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@1.44.0...@standardnotes/analytics@1.45.0) (2022-11-04)
+
+### Features
+
+* add payment failed handler and email to analytics entity ([51b12d0](https://github.com/standardnotes/server/commit/51b12d05d49868db1d61313c4d8b3829994e7eb3))
+
+# [1.44.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@1.43.0...@standardnotes/analytics@1.44.0) (2022-11-04)
+
+### Features
+
+* **analytics:** removing analytics entity upon account deletion ([2720a7c](https://github.com/standardnotes/server/commit/2720a7c827a6352cb5254e88d42d45c385921448))
+
+# [1.43.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@1.42.0...@standardnotes/analytics@1.43.0) (2022-11-04)
+
+### Features
+
+* **analytics:** add account deletion event handler ([5383e0c](https://github.com/standardnotes/server/commit/5383e0cf525ddd203beee451f1cfd5fd8600b522))
+
+# [1.42.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@1.41.0...@standardnotes/analytics@1.42.0) (2022-11-04)
+
+### Bug Fixes
+
+* **analytics:** imports ([35611fb](https://github.com/standardnotes/server/commit/35611fbc07e50efbba954d7c96db9917e0dddd7d))
+
+### Features
+
+* **analytics:** add user registered handler ([034aa38](https://github.com/standardnotes/server/commit/034aa381539cf4b46769cfd1646dec2051d836c3))
+
+# [1.41.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@1.40.0...@standardnotes/analytics@1.41.0) (2022-11-04)
+
+### Bug Fixes
+
+* **analytics:** linter setup with migrations ([262d295](https://github.com/standardnotes/server/commit/262d2951218753f6f14613c5d8ae20ade0e4ef06))
+
+### Features
+
+* **analytics:** add retrieving user analytics id ([4e5ac0a](https://github.com/standardnotes/server/commit/4e5ac0a47b469e5fa681f0131d04c9823cebedf3))
+
+# [1.40.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@1.39.1...@standardnotes/analytics@1.40.0) (2022-11-04)
+
+### Features
+
+* **analytics:** add analytics entities ([f315b1a](https://github.com/standardnotes/server/commit/f315b1ac5c9369d36fa616c6b4bb5492148564f8))
+
+## [1.39.1](https://github.com/standardnotes/server/compare/@standardnotes/analytics@1.39.0...@standardnotes/analytics@1.39.1) (2022-11-04)
+
+### Bug Fixes
+
+* **analytics:** linter setup ([5329f2a](https://github.com/standardnotes/server/commit/5329f2a2fb815f8691e37279fcadcf01beb716ad))
+
+# [1.39.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@1.38.0...@standardnotes/analytics@1.39.0) (2022-11-04)
+
+### Features
+
+* **analytics:** move the analytics report from api-gateway to analytics ([34e11fd](https://github.com/standardnotes/server/commit/34e11fd5b0ef09a056c90127065c9dfae3e0172a))
+
+# [1.38.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@1.37.0...@standardnotes/analytics@1.38.0) (2022-11-04)
+
+### Features
+
+* add analytics worker service ([d568432](https://github.com/standardnotes/server/commit/d5684326b1301855d0e07415195d4b246292f9a9))
+
+# [1.37.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@1.36.0...@standardnotes/analytics@1.37.0) (2022-11-03)
+
+### Features
+
+* **auth:** add analytics for subscription reactivating ([460d6a8](https://github.com/standardnotes/server/commit/460d6a8d0f17eee624feb5d2588086ae6f0996e4))
+
 # [1.36.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@1.35.1...@standardnotes/analytics@1.36.0) (2022-10-19)
 
 ### Features

packages/analytics/Dockerfile

@@ -0,0 +1,17 @@
+FROM node:16.15.1-alpine
+
+RUN apk add --update \
+  curl \
+  && rm -rf /var/cache/apk/*
+
+ENV NODE_ENV production
+
+RUN corepack enable
+
+WORKDIR /workspace
+
+COPY ./ /workspace
+
+ENTRYPOINT [ "/workspace/packages/analytics/docker/entrypoint.sh" ]
+
+CMD [ "start-worker" ]

packages/analytics/bin/report.ts

@@ -4,34 +4,40 @@ import 'newrelic'
 
 import { Logger } from 'winston'
 
+import { DomainEventPublisherInterface } from '@standardnotes/domain-events'
+import { AnalyticsActivity } from '../src/Domain/Analytics/AnalyticsActivity'
+import { Period } from '../src/Domain/Time/Period'
+import { StatisticsMeasure } from '../src/Domain/Statistics/StatisticsMeasure'
+import { AnalyticsStoreInterface } from '../src/Domain/Analytics/AnalyticsStoreInterface'
+import { StatisticsStoreInterface } from '../src/Domain/Statistics/StatisticsStoreInterface'
+import { PeriodKeyGeneratorInterface } from '../src/Domain/Time/PeriodKeyGeneratorInterface'
 import { ContainerConfigLoader } from '../src/Bootstrap/Container'
 import TYPES from '../src/Bootstrap/Types'
 import { Env } from '../src/Bootstrap/Env'
-import {
-  DomainEventPublisherInterface,
-  DailyAnalyticsReportGeneratedEvent,
-  DomainEventService,
-} from '@standardnotes/domain-events'
-import {
-  AnalyticsActivity,
-  AnalyticsStoreInterface,
-  Period,
-  PeriodKeyGeneratorInterface,
-  StatisticsMeasure,
-  StatisticsStoreInterface,
-} from '@standardnotes/analytics'
+import { DomainEventFactoryInterface } from '../src/Domain/Event/DomainEventFactoryInterface'
+import { CalculateMonthlyRecurringRevenue } from '../src/Domain/UseCase/CalculateMonthlyRecurringRevenue/CalculateMonthlyRecurringRevenue'
 
 const requestReport = async (
   analyticsStore: AnalyticsStoreInterface,
   statisticsStore: StatisticsStoreInterface,
+  domainEventFactory: DomainEventFactoryInterface,
   domainEventPublisher: DomainEventPublisherInterface,
   periodKeyGenerator: PeriodKeyGeneratorInterface,
+  calculateMonthlyRecurringRevenue: CalculateMonthlyRecurringRevenue,
 ): Promise<void> => {
-  const analyticsOverTime = []
+  await calculateMonthlyRecurringRevenue.execute({})
+
+  const analyticsOverTime: Array<{
+    name: string
+    period: number
+    counts: Array<{
+      periodKey: string
+      totalCount: number
+    }>
+    totalCount: number
+  }> = []
 
   const thirtyDaysAnalyticsNames = [
-    AnalyticsActivity.GeneralActivity,
-    AnalyticsActivity.EditingItems,
     AnalyticsActivity.SubscriptionPurchased,
     AnalyticsActivity.Register,
     AnalyticsActivity.SubscriptionRenewed,
@@ -40,6 +46,7 @@ const requestReport = async (
     AnalyticsActivity.SubscriptionRefunded,
     AnalyticsActivity.ExistingCustomersChurn,
     AnalyticsActivity.NewCustomersChurn,
+    AnalyticsActivity.SubscriptionReactivated,
   ]
 
   for (const analyticsName of thirtyDaysAnalyticsNames) {
@@ -68,12 +75,13 @@ const requestReport = async (
     }
   }
 
-  const yesterdayActivityStatistics = []
+  const yesterdayActivityStatistics: Array<{
+    name: string
+    retention: number
+    totalCount: number
+  }> = []
   const yesterdayActivityNames = [
     AnalyticsActivity.LimitedDiscountOfferPurchased,
-    AnalyticsActivity.GeneralActivity,
-    AnalyticsActivity.GeneralActivityFreeUsers,
-    AnalyticsActivity.GeneralActivityPaidUsers,
     AnalyticsActivity.PaymentFailed,
     AnalyticsActivity.PaymentSuccess,
     AnalyticsActivity.NewCustomersChurn,
@@ -92,6 +100,40 @@ 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.FiveYearPlansMRR,
+    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,
@@ -107,13 +149,16 @@ const requestReport = async (
     StatisticsMeasure.SubscriptionLength,
     StatisticsMeasure.RegistrationToSubscriptionTime,
     StatisticsMeasure.RemainingSubscriptionTimePercentage,
-    StatisticsMeasure.NotesCountFreeUsers,
-    StatisticsMeasure.NotesCountPaidUsers,
-    StatisticsMeasure.FilesCount,
     StatisticsMeasure.NewCustomers,
     StatisticsMeasure.TotalCustomers,
   ]
-  const statisticMeasures = []
+  const statisticMeasures: Array<{
+    name: string
+    totalValue: number
+    average: number
+    increments: number
+    period: number
+  }> = []
   for (const statisticMeasureName of statisticMeasureNames) {
     for (const period of [Period.Yesterday, Period.ThisMonth]) {
       statisticMeasures.push({
@@ -126,27 +171,11 @@ const requestReport = async (
     }
   }
 
-  const periodKeys = periodKeyGenerator.getDiscretePeriodKeys(Period.Last7Days)
-  const retentionOverDays = []
-  for (let i = 0; i < periodKeys.length; i++) {
-    for (let j = 0; j < periodKeys.length - i; j++) {
-      const dailyRetention = await analyticsStore.calculateActivitiesRetention({
-        firstActivity: AnalyticsActivity.Register,
-        firstActivityPeriodKey: periodKeys[i],
-        secondActivity: AnalyticsActivity.GeneralActivity,
-        secondActivityPeriodKey: periodKeys[i + j],
-      })
-
-      retentionOverDays.push({
-        firstPeriodKey: periodKeys[i],
-        secondPeriodKey: periodKeys[i + j],
-        value: dailyRetention,
-      })
-    }
-  }
-
   const monthlyPeriodKeys = periodKeyGenerator.getDiscretePeriodKeys(Period.ThisYear)
-  const churnRates = []
+  const churnRates: Array<{
+    rate: number
+    periodKey: string
+  }> = []
   for (const monthPeriodKey of monthlyPeriodKeys) {
     const monthPeriod = periodKeyGenerator.convertPeriodKeyToPeriod(monthPeriodKey)
     const dailyPeriodKeys = periodKeyGenerator.getDiscretePeriodKeys(monthPeriod)
@@ -178,39 +207,16 @@ const requestReport = async (
     })
   }
 
-  const event: DailyAnalyticsReportGeneratedEvent = {
-    type: 'DAILY_ANALYTICS_REPORT_GENERATED',
-    createdAt: new Date(),
-    meta: {
-      correlation: {
-        userIdentifier: '',
-        userIdentifierType: 'uuid',
-      },
-      origin: DomainEventService.ApiGateway,
+  const event = domainEventFactory.createDailyAnalyticsReportGeneratedEvent({
+    activityStatistics: yesterdayActivityStatistics,
+    activityStatisticsOverTime: analyticsOverTime,
+    statisticsOverTime,
+    statisticMeasures,
+    churn: {
+      periodKeys: monthlyPeriodKeys,
+      values: churnRates,
     },
-    payload: {
-      applicationStatistics: await statisticsStore.getYesterdayApplicationUsage(),
-      snjsStatistics: await statisticsStore.getYesterdaySNJSUsage(),
-      outOfSyncIncidents: await statisticsStore.getYesterdayOutOfSyncIncidents(),
-      activityStatistics: yesterdayActivityStatistics,
-      activityStatisticsOverTime: analyticsOverTime,
-      statisticMeasures,
-      retentionStatistics: [
-        {
-          firstActivity: AnalyticsActivity.Register,
-          secondActivity: AnalyticsActivity.GeneralActivity,
-          retention: {
-            periodKeys,
-            values: retentionOverDays,
-          },
-        },
-      ],
-      churn: {
-        periodKeys: monthlyPeriodKeys,
-        values: churnRates,
-      },
-    },
-  }
+  })
 
   await domainEventPublisher.publish(event)
 }
@@ -226,10 +232,23 @@ void container.load().then((container) => {
 
   const analyticsStore: AnalyticsStoreInterface = container.get(TYPES.AnalyticsStore)
   const statisticsStore: StatisticsStoreInterface = container.get(TYPES.StatisticsStore)
+  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, domainEventPublisher, periodKeyGenerator))
+  Promise.resolve(
+    requestReport(
+      analyticsStore,
+      statisticsStore,
+      domainEventFactory,
+      domainEventPublisher,
+      periodKeyGenerator,
+      calculateMonthlyRecurringRevenue,
+    ),
+  )
     .then(() => {
       logger.info('Usage report generation complete')
 

packages/analytics/bin/worker.ts

@@ -0,0 +1,29 @@
+import 'reflect-metadata'
+
+import 'newrelic'
+
+import { Logger } from 'winston'
+import { DomainEventSubscriberFactoryInterface } from '@standardnotes/domain-events'
+import * as dayjs from 'dayjs'
+import * as utc from 'dayjs/plugin/utc'
+
+import { ContainerConfigLoader } from '../src/Bootstrap/Container'
+import TYPES from '../src/Bootstrap/Types'
+import { Env } from '../src/Bootstrap/Env'
+
+const container = new ContainerConfigLoader()
+void container.load().then((container) => {
+  dayjs.extend(utc)
+
+  const env: Env = new Env()
+  env.load()
+
+  const logger: Logger = container.get(TYPES.Logger)
+
+  logger.info('Starting worker...')
+
+  const subscriberFactory: DomainEventSubscriberFactoryInterface = container.get(TYPES.DomainEventSubscriberFactory)
+  subscriberFactory.create().start()
+
+  setInterval(() => logger.info('Alive and kicking!'), 20 * 60 * 1000)
+})

packages/analytics/docker/entrypoint.sh

@@ -0,0 +1,22 @@
+#!/bin/sh
+set -e
+
+COMMAND=$1 && shift 1
+
+case "$COMMAND" in
+  'start-worker' )
+    echo "Starting Worker..."
+    yarn workspace @standardnotes/analytics worker
+    ;;
+
+  'report' )
+    echo "Starting Usage Report Generation..."
+    yarn workspace @standardnotes/analytics report
+    ;;
+
+   * )
+    echo "Unknown command"
+    ;;
+esac
+
+exec "$@"

packages/analytics/jest.config.js

@@ -7,4 +7,5 @@ module.exports = {
   transform: {
     ...tsjPreset.transform,
   },
+  coveragePathIgnorePatterns: ['/Infra/'],
 }

packages/analytics/migrations/1667555285111-init_database.ts

@@ -0,0 +1,16 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+export class initDatabase1667555285111 implements MigrationInterface {
+  name = 'initDatabase1667555285111'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      'CREATE TABLE `analytics_entities` (`id` int NOT NULL AUTO_INCREMENT, `user_uuid` varchar(36) NOT NULL, INDEX `user_uuid` (`user_uuid`), PRIMARY KEY (`id`)) ENGINE=InnoDB',
+    )
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query('DROP INDEX `user_uuid` ON `analytics_entities`')
+    await queryRunner.query('DROP TABLE `analytics_entities`')
+  }
+}

packages/analytics/migrations/1667568051894-add_email_to_analytics_entity.ts

@@ -0,0 +1,15 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+export class addEmailToAnalyticsEntity1667568051894 implements MigrationInterface {
+  name = 'addEmailToAnalyticsEntity1667568051894'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query('ALTER TABLE `analytics_entities` ADD `user_email` varchar(255) NULL')
+    await queryRunner.query('CREATE INDEX `email` ON `analytics_entities` (`user_email`)')
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query('DROP INDEX `email` ON `analytics_entities`')
+    await queryRunner.query('ALTER TABLE `analytics_entities` DROP COLUMN `user_email`')
+  }
+}

packages/analytics/migrations/1667912580964-add_revenue_modifications.ts

@@ -0,0 +1,17 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+export class addRevenueModifications1667912580964 implements MigrationInterface {
+  name = 'addRevenueModifications1667912580964'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      'CREATE TABLE `revenue_modifications` (`uuid` varchar(36) NOT NULL, `subscription_id` int NOT NULL, `user_email` varchar(255) NOT NULL, `user_uuid` varchar(36) NOT NULL, `event_type` varchar(255) NOT NULL, `subscription_plan` varchar(255) NOT NULL, `billing_frequency` int NOT NULL, `new_customer` tinyint NOT NULL, `previous_mrr` int NOT NULL, `new_mrr` int NOT NULL, INDEX `email` (`user_email`), INDEX `user_uuid` (`user_uuid`), PRIMARY KEY (`uuid`)) ENGINE=InnoDB',
+    )
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query('DROP INDEX `user_uuid` ON `revenue_modifications`')
+    await queryRunner.query('DROP INDEX `email` ON `revenue_modifications`')
+    await queryRunner.query('DROP TABLE `revenue_modifications`')
+  }
+}

packages/analytics/migrations/1667994036734-add_missing_created_at.ts

@@ -0,0 +1,13 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+export class addMissingCreatedAt1667994036734 implements MigrationInterface {
+  name = 'addMissingCreatedAt1667994036734'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query('ALTER TABLE `revenue_modifications` ADD `created_at` bigint NOT NULL')
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query('ALTER TABLE `revenue_modifications` DROP COLUMN `created_at`')
+  }
+}

packages/analytics/migrations/1667995681714-fix_mrr_floating_columns.ts

@@ -0,0 +1,19 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+export class fixMrrFloatingColumns1667995681714 implements MigrationInterface {
+  name = 'fixMrrFloatingColumns1667995681714'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query('ALTER TABLE `revenue_modifications` DROP COLUMN `previous_mrr`')
+    await queryRunner.query('ALTER TABLE `revenue_modifications` ADD `previous_mrr` float NOT NULL')
+    await queryRunner.query('ALTER TABLE `revenue_modifications` DROP COLUMN `new_mrr`')
+    await queryRunner.query('ALTER TABLE `revenue_modifications` ADD `new_mrr` float NOT NULL')
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query('ALTER TABLE `revenue_modifications` DROP COLUMN `new_mrr`')
+    await queryRunner.query('ALTER TABLE `revenue_modifications` ADD `new_mrr` int NOT NULL')
+    await queryRunner.query('ALTER TABLE `revenue_modifications` DROP COLUMN `previous_mrr`')
+    await queryRunner.query('ALTER TABLE `revenue_modifications` ADD `previous_mrr` int NOT NULL')
+  }
+}

packages/analytics/package.json

@@ -1,17 +1,14 @@
 {
   "name": "@standardnotes/analytics",
-  "version": "1.36.0",
+  "version": "2.9.7",
   "engines": {
     "node": ">=14.0.0 <17.0.0"
   },
+  "private": true,
   "description": "Analytics tools for Standard Notes projects",
   "main": "dist/src/index.js",
   "author": "Standard Notes",
   "types": "dist/src/index.d.ts",
-  "files": [
-    "dist/src/**/*.js",
-    "dist/src/**/*.d.ts"
-  ],
   "publishConfig": {
     "access": "public"
   },
@@ -20,19 +17,45 @@
     "clean": "rm -fr dist",
     "build": "tsc --build",
     "lint": "eslint . --ext .ts",
-    "test": "jest spec --coverage"
+    "lint:fix": "eslint . --ext .ts --fix",
+    "test": "jest --coverage --config=./jest.config.js --maxWorkers=50%",
+    "worker": "yarn node dist/bin/worker.js",
+    "report": "yarn node dist/bin/report.js",
+    "setup:env": "cp .env.sample .env",
+    "typeorm": "typeorm-ts-node-commonjs"
   },
   "devDependencies": {
     "@types/ioredis": "^4.28.10",
     "@types/jest": "^29.1.1",
+    "@types/newrelic": "^7.0.4",
+    "@types/node": "^18.0.0",
+    "@types/uuid": "^8.3.0",
     "@typescript-eslint/eslint-plugin": "^5.30.0",
+    "eslint": "^8.14.0",
     "eslint-plugin-prettier": "^4.2.1",
     "jest": "^29.1.2",
     "ts-jest": "^29.0.3",
     "typescript": "^4.8.4"
   },
   "dependencies": {
+    "@newrelic/native-metrics": "^9.0.0",
+    "@newrelic/winston-enricher": "^4.0.0",
+    "@sentry/node": "^7.3.0",
+    "@standardnotes/common": "workspace:*",
+    "@standardnotes/domain-events": "workspace:*",
+    "@standardnotes/domain-events-infra": "workspace:*",
+    "@standardnotes/time": "workspace:*",
+    "aws-sdk": "^2.1158.0",
+    "dayjs": "^1.11.6",
+    "dotenv": "^16.0.1",
+    "inversify": "^6.0.1",
     "ioredis": "^5.2.3",
-    "reflect-metadata": "^0.1.13"
+    "mysql2": "^2.3.3",
+    "newrelic": "^9.6.0",
+    "reflect-metadata": "^0.1.13",
+    "shallow-equal-object": "^1.1.1",
+    "typeorm": "^0.3.6",
+    "uuid": "^9.0.0",
+    "winston": "^3.8.1"
   }
 }

packages/analytics/src/Bootstrap/Container.ts

@@ -0,0 +1,249 @@
+import * as winston from 'winston'
+import Redis from 'ioredis'
+import * as AWS from 'aws-sdk'
+import { Container } from 'inversify'
+import {
+  DomainEventHandlerInterface,
+  DomainEventMessageHandlerInterface,
+  DomainEventSubscriberFactoryInterface,
+} from '@standardnotes/domain-events'
+
+import { Env } from './Env'
+import TYPES from './Types'
+import { AppDataSource } from './DataSource'
+import { DomainEventFactory } from '../Domain/Event/DomainEventFactory'
+import {
+  RedisDomainEventPublisher,
+  RedisDomainEventSubscriberFactory,
+  RedisEventMessageHandler,
+  SNSDomainEventPublisher,
+  SQSDomainEventSubscriberFactory,
+  SQSEventMessageHandler,
+  SQSNewRelicEventMessageHandler,
+} from '@standardnotes/domain-events-infra'
+import { Timer, TimerInterface } from '@standardnotes/time'
+import { PeriodKeyGeneratorInterface } from '../Domain/Time/PeriodKeyGeneratorInterface'
+import { PeriodKeyGenerator } from '../Domain/Time/PeriodKeyGenerator'
+import { AnalyticsStoreInterface } from '../Domain/Analytics/AnalyticsStoreInterface'
+import { RedisAnalyticsStore } from '../Infra/Redis/RedisAnalyticsStore'
+import { StatisticsStoreInterface } from '../Domain/Statistics/StatisticsStoreInterface'
+import { RedisStatisticsStore } from '../Infra/Redis/RedisStatisticsStore'
+import { AnalyticsEntityRepositoryInterface } from '../Domain/Entity/AnalyticsEntityRepositoryInterface'
+import { MySQLAnalyticsEntityRepository } from '../Infra/MySQL/MySQLAnalyticsEntityRepository'
+import { Repository } from 'typeorm'
+import { AnalyticsEntity } from '../Domain/Entity/AnalyticsEntity'
+import { GetUserAnalyticsId } from '../Domain/UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
+import { UserRegisteredEventHandler } from '../Domain/Handler/UserRegisteredEventHandler'
+import { AccountDeletionRequestedEventHandler } from '../Domain/Handler/AccountDeletionRequestedEventHandler'
+import { PaymentFailedEventHandler } from '../Domain/Handler/PaymentFailedEventHandler'
+import { PaymentSuccessEventHandler } from '../Domain/Handler/PaymentSuccessEventHandler'
+import { SubscriptionCancelledEventHandler } from '../Domain/Handler/SubscriptionCancelledEventHandler'
+import { SubscriptionRenewedEventHandler } from '../Domain/Handler/SubscriptionRenewedEventHandler'
+import { SubscriptionRefundedEventHandler } from '../Domain/Handler/SubscriptionRefundedEventHandler'
+import { SubscriptionPurchasedEventHandler } from '../Domain/Handler/SubscriptionPurchasedEventHandler'
+import { SubscriptionExpiredEventHandler } from '../Domain/Handler/SubscriptionExpiredEventHandler'
+import { SubscriptionReactivatedEventHandler } from '../Domain/Handler/SubscriptionReactivatedEventHandler'
+import { RefundProcessedEventHandler } from '../Domain/Handler/RefundProcessedEventHandler'
+import { RevenueModificationRepositoryInterface } from '../Domain/Revenue/RevenueModificationRepositoryInterface'
+import { MySQLRevenueModificationRepository } from '../Infra/MySQL/MySQLRevenueModificationRepository'
+import { TypeORMRevenueModification } from '../Infra/TypeORM/TypeORMRevenueModification'
+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')
+
+export class ContainerConfigLoader {
+  async load(): Promise<Container> {
+    const env: Env = new Env()
+    env.load()
+
+    const container = new Container()
+
+    await AppDataSource.initialize()
+
+    const redisUrl = env.get('REDIS_URL')
+    const isRedisInClusterMode = redisUrl.indexOf(',') > 0
+    let redis
+    if (isRedisInClusterMode) {
+      redis = new Redis.Cluster(redisUrl.split(','))
+    } else {
+      redis = new Redis(redisUrl)
+    }
+
+    container.bind(TYPES.Redis).toConstantValue(redis)
+
+    const newrelicWinstonFormatter = newrelicFormatter(winston)
+    const winstonFormatters = [winston.format.splat(), winston.format.json()]
+    if (env.get('NEW_RELIC_ENABLED', true) === 'true') {
+      winstonFormatters.push(newrelicWinstonFormatter())
+    }
+
+    const logger = winston.createLogger({
+      level: env.get('LOG_LEVEL') || 'info',
+      format: winston.format.combine(...winstonFormatters),
+      transports: [new winston.transports.Console({ level: env.get('LOG_LEVEL') || 'info' })],
+    })
+    container.bind<winston.Logger>(TYPES.Logger).toConstantValue(logger)
+
+    if (env.get('SNS_AWS_REGION', true)) {
+      container.bind<AWS.SNS>(TYPES.SNS).toConstantValue(
+        new AWS.SNS({
+          apiVersion: 'latest',
+          region: env.get('SNS_AWS_REGION', true),
+        }),
+      )
+    }
+
+    if (env.get('SQS_QUEUE_URL', true)) {
+      const sqsConfig: AWS.SQS.Types.ClientConfiguration = {
+        apiVersion: 'latest',
+        region: env.get('SQS_AWS_REGION', true),
+      }
+      if (env.get('SQS_ACCESS_KEY_ID', true) && env.get('SQS_SECRET_ACCESS_KEY', true)) {
+        sqsConfig.credentials = {
+          accessKeyId: env.get('SQS_ACCESS_KEY_ID', true),
+          secretAccessKey: env.get('SQS_SECRET_ACCESS_KEY', true),
+        }
+      }
+      container.bind<AWS.SQS>(TYPES.SQS).toConstantValue(new AWS.SQS(sqsConfig))
+    }
+
+    // env vars
+    container.bind(TYPES.REDIS_URL).toConstantValue(env.get('REDIS_URL'))
+    container.bind(TYPES.SNS_TOPIC_ARN).toConstantValue(env.get('SNS_TOPIC_ARN', true))
+    container.bind(TYPES.SNS_AWS_REGION).toConstantValue(env.get('SNS_AWS_REGION', true))
+    container.bind(TYPES.SQS_QUEUE_URL).toConstantValue(env.get('SQS_QUEUE_URL', true))
+    container.bind(TYPES.REDIS_EVENTS_CHANNEL).toConstantValue(env.get('REDIS_EVENTS_CHANNEL'))
+    container.bind(TYPES.NEW_RELIC_ENABLED).toConstantValue(env.get('NEW_RELIC_ENABLED', true))
+
+    // Repositories
+    container
+      .bind<AnalyticsEntityRepositoryInterface>(TYPES.AnalyticsEntityRepository)
+      .to(MySQLAnalyticsEntityRepository)
+    container
+      .bind<RevenueModificationRepositoryInterface>(TYPES.RevenueModificationRepository)
+      .to(MySQLRevenueModificationRepository)
+
+    // ORM
+    container
+      .bind<Repository<AnalyticsEntity>>(TYPES.ORMAnalyticsEntityRepository)
+      .toConstantValue(AppDataSource.getRepository(AnalyticsEntity))
+    container
+      .bind<Repository<TypeORMRevenueModification>>(TYPES.ORMRevenueModificationRepository)
+      .toConstantValue(AppDataSource.getRepository(TypeORMRevenueModification))
+
+    // 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)
+    container
+      .bind<AccountDeletionRequestedEventHandler>(TYPES.AccountDeletionRequestedEventHandler)
+      .to(AccountDeletionRequestedEventHandler)
+    container.bind<PaymentFailedEventHandler>(TYPES.PaymentFailedEventHandler).to(PaymentFailedEventHandler)
+    container.bind<PaymentSuccessEventHandler>(TYPES.PaymentSuccessEventHandler).to(PaymentSuccessEventHandler)
+    container
+      .bind<SubscriptionCancelledEventHandler>(TYPES.SubscriptionCancelledEventHandler)
+      .to(SubscriptionCancelledEventHandler)
+    container
+      .bind<SubscriptionRenewedEventHandler>(TYPES.SubscriptionRenewedEventHandler)
+      .to(SubscriptionRenewedEventHandler)
+    container
+      .bind<SubscriptionRefundedEventHandler>(TYPES.SubscriptionRefundedEventHandler)
+      .to(SubscriptionRefundedEventHandler)
+    container
+      .bind<SubscriptionPurchasedEventHandler>(TYPES.SubscriptionPurchasedEventHandler)
+      .to(SubscriptionPurchasedEventHandler)
+    container
+      .bind<SubscriptionExpiredEventHandler>(TYPES.SubscriptionExpiredEventHandler)
+      .to(SubscriptionExpiredEventHandler)
+    container
+      .bind<SubscriptionReactivatedEventHandler>(TYPES.SubscriptionReactivatedEventHandler)
+      .to(SubscriptionReactivatedEventHandler)
+    container.bind<RefundProcessedEventHandler>(TYPES.RefundProcessedEventHandler).to(RefundProcessedEventHandler)
+
+    // Maps
+    container
+      .bind<MapInterface<RevenueModification, TypeORMRevenueModification>>(TYPES.RevenueModificationMap)
+      .to(RevenueModificationMap)
+
+    // Services
+    container.bind<DomainEventFactory>(TYPES.DomainEventFactory).to(DomainEventFactory)
+    container.bind<PeriodKeyGeneratorInterface>(TYPES.PeriodKeyGenerator).toConstantValue(new PeriodKeyGenerator())
+    container
+      .bind<AnalyticsStoreInterface>(TYPES.AnalyticsStore)
+      .toConstantValue(new RedisAnalyticsStore(container.get(TYPES.PeriodKeyGenerator), container.get(TYPES.Redis)))
+    container
+      .bind<StatisticsStoreInterface>(TYPES.StatisticsStore)
+      .toConstantValue(new RedisStatisticsStore(container.get(TYPES.PeriodKeyGenerator), container.get(TYPES.Redis)))
+    container.bind<TimerInterface>(TYPES.Timer).toConstantValue(new Timer())
+
+    if (env.get('SNS_TOPIC_ARN', true)) {
+      container
+        .bind<SNSDomainEventPublisher>(TYPES.DomainEventPublisher)
+        .toConstantValue(new SNSDomainEventPublisher(container.get(TYPES.SNS), container.get(TYPES.SNS_TOPIC_ARN)))
+    } else {
+      container
+        .bind<RedisDomainEventPublisher>(TYPES.DomainEventPublisher)
+        .toConstantValue(
+          new RedisDomainEventPublisher(container.get(TYPES.Redis), container.get(TYPES.REDIS_EVENTS_CHANNEL)),
+        )
+    }
+
+    const eventHandlers: Map<string, DomainEventHandlerInterface> = new Map([
+      ['USER_REGISTERED', container.get(TYPES.UserRegisteredEventHandler)],
+      ['ACCOUNT_DELETION_REQUESTED', container.get(TYPES.AccountDeletionRequestedEventHandler)],
+      ['PAYMENT_FAILED', container.get(TYPES.PaymentFailedEventHandler)],
+      ['PAYMENT_SUCCESS', container.get(TYPES.PaymentSuccessEventHandler)],
+      ['SUBSCRIPTION_CANCELLED', container.get(TYPES.SubscriptionCancelledEventHandler)],
+      ['SUBSCRIPTION_RENEWED', container.get(TYPES.SubscriptionRenewedEventHandler)],
+      ['SUBSCRIPTION_REFUNDED', container.get(TYPES.SubscriptionRefundedEventHandler)],
+      ['SUBSCRIPTION_PURCHASED', container.get(TYPES.SubscriptionPurchasedEventHandler)],
+      ['SUBSCRIPTION_EXPIRED', container.get(TYPES.SubscriptionExpiredEventHandler)],
+      ['SUBSCRIPTION_REACTIVATED', container.get(TYPES.SubscriptionReactivatedEventHandler)],
+      ['REFUND_PROCESSED', container.get(TYPES.RefundProcessedEventHandler)],
+    ])
+
+    if (env.get('SQS_QUEUE_URL', true)) {
+      container
+        .bind<DomainEventMessageHandlerInterface>(TYPES.DomainEventMessageHandler)
+        .toConstantValue(
+          env.get('NEW_RELIC_ENABLED', true) === 'true'
+            ? new SQSNewRelicEventMessageHandler(eventHandlers, container.get(TYPES.Logger))
+            : new SQSEventMessageHandler(eventHandlers, container.get(TYPES.Logger)),
+        )
+      container
+        .bind<DomainEventSubscriberFactoryInterface>(TYPES.DomainEventSubscriberFactory)
+        .toConstantValue(
+          new SQSDomainEventSubscriberFactory(
+            container.get(TYPES.SQS),
+            container.get(TYPES.SQS_QUEUE_URL),
+            container.get(TYPES.DomainEventMessageHandler),
+          ),
+        )
+    } else {
+      container
+        .bind<DomainEventMessageHandlerInterface>(TYPES.DomainEventMessageHandler)
+        .toConstantValue(new RedisEventMessageHandler(eventHandlers, container.get(TYPES.Logger)))
+      container
+        .bind<DomainEventSubscriberFactoryInterface>(TYPES.DomainEventSubscriberFactory)
+        .toConstantValue(
+          new RedisDomainEventSubscriberFactory(
+            container.get(TYPES.Redis),
+            container.get(TYPES.DomainEventMessageHandler),
+            container.get(TYPES.REDIS_EVENTS_CHANNEL),
+          ),
+        )
+    }
+
+    return container
+  }
+}

packages/analytics/src/Bootstrap/DataSource.ts

@@ -0,0 +1,44 @@
+import { DataSource, LoggerOptions } from 'typeorm'
+
+import { AnalyticsEntity } from '../Domain/Entity/AnalyticsEntity'
+import { TypeORMRevenueModification } from '../Infra/TypeORM/TypeORMRevenueModification'
+
+import { Env } from './Env'
+
+const env: Env = new Env()
+env.load()
+
+const maxQueryExecutionTime = env.get('DB_MAX_QUERY_EXECUTION_TIME', true)
+  ? +env.get('DB_MAX_QUERY_EXECUTION_TIME', true)
+  : 45_000
+
+export const AppDataSource = new DataSource({
+  type: 'mysql',
+  charset: 'utf8mb4',
+  supportBigNumbers: true,
+  bigNumberStrings: false,
+  maxQueryExecutionTime,
+  replication: {
+    master: {
+      host: env.get('DB_HOST'),
+      port: parseInt(env.get('DB_PORT')),
+      username: env.get('DB_USERNAME'),
+      password: env.get('DB_PASSWORD'),
+      database: env.get('DB_DATABASE'),
+    },
+    slaves: [
+      {
+        host: env.get('DB_REPLICA_HOST'),
+        port: parseInt(env.get('DB_PORT')),
+        username: env.get('DB_USERNAME'),
+        password: env.get('DB_PASSWORD'),
+        database: env.get('DB_DATABASE'),
+      },
+    ],
+    removeNodeErrorCount: 10,
+  },
+  entities: [AnalyticsEntity, TypeORMRevenueModification],
+  migrations: [env.get('DB_MIGRATIONS_PATH', true) ?? 'dist/migrations/*.js'],
+  migrationsRun: true,
+  logging: <LoggerOptions>env.get('DB_DEBUG_LEVEL'),
+})

packages/analytics/src/Bootstrap/Env.ts

@@ -0,0 +1,24 @@
+import { config, DotenvParseOutput } from 'dotenv'
+import { injectable } from 'inversify'
+
+@injectable()
+export class Env {
+  private env?: DotenvParseOutput
+
+  public load(): void {
+    const output = config()
+    this.env = <DotenvParseOutput>output.parsed
+  }
+
+  public get(key: string, optional = false): string {
+    if (!this.env) {
+      this.load()
+    }
+
+    if (!process.env[key] && !optional) {
+      throw new Error(`Environment variable ${key} not set`)
+    }
+
+    return <string>process.env[key]
+  }
+}

packages/analytics/src/Bootstrap/Types.ts

@@ -0,0 +1,49 @@
+const TYPES = {
+  Logger: Symbol.for('Logger'),
+  Redis: Symbol.for('Redis'),
+  SNS: Symbol.for('SNS'),
+  SQS: Symbol.for('SQS'),
+  // env vars
+  REDIS_URL: Symbol.for('REDIS_URL'),
+  SNS_TOPIC_ARN: Symbol.for('SNS_TOPIC_ARN'),
+  SNS_AWS_REGION: Symbol.for('SNS_AWS_REGION'),
+  SQS_QUEUE_URL: Symbol.for('SQS_QUEUE_URL'),
+  SQS_AWS_REGION: Symbol.for('SQS_AWS_REGION'),
+  REDIS_EVENTS_CHANNEL: Symbol.for('REDIS_EVENTS_CHANNEL'),
+  NEW_RELIC_ENABLED: Symbol.for('NEW_RELIC_ENABLED'),
+  // Repositories
+  AnalyticsEntityRepository: Symbol.for('AnalyticsEntityRepository'),
+  RevenueModificationRepository: Symbol.for('RevenueModificationRepository'),
+  // ORM
+  ORMAnalyticsEntityRepository: Symbol.for('ORMAnalyticsEntityRepository'),
+  ORMRevenueModificationRepository: Symbol.for('ORMRevenueModificationRepository'),
+  // Use Case
+  GetUserAnalyticsId: Symbol.for('GetUserAnalyticsId'),
+  SaveRevenueModification: Symbol.for('SaveRevenueModification'),
+  CalculateMonthlyRecurringRevenue: Symbol.for('CalculateMonthlyRecurringRevenue'),
+  // Handlers
+  UserRegisteredEventHandler: Symbol.for('UserRegisteredEventHandler'),
+  AccountDeletionRequestedEventHandler: Symbol.for('AccountDeletionRequestedEventHandler'),
+  PaymentFailedEventHandler: Symbol.for('PaymentFailedEventHandler'),
+  PaymentSuccessEventHandler: Symbol.for('PaymentSuccessEventHandler'),
+  SubscriptionCancelledEventHandler: Symbol.for('SubscriptionCancelledEventHandler'),
+  SubscriptionRenewedEventHandler: Symbol.for('SubscriptionRenewedEventHandler'),
+  SubscriptionRefundedEventHandler: Symbol.for('SubscriptionRefundedEventHandler'),
+  SubscriptionPurchasedEventHandler: Symbol.for('SubscriptionPurchasedEventHandler'),
+  SubscriptionExpiredEventHandler: Symbol.for('SubscriptionExpiredEventHandler'),
+  SubscriptionReactivatedEventHandler: Symbol.for('SubscriptionReactivatedEventHandler'),
+  RefundProcessedEventHandler: Symbol.for('RefundProcessedEventHandler'),
+  // Maps
+  RevenueModificationMap: Symbol.for('RevenueModificationMap'),
+  // Services
+  DomainEventPublisher: Symbol.for('DomainEventPublisher'),
+  DomainEventSubscriberFactory: Symbol.for('DomainEventSubscriberFactory'),
+  DomainEventFactory: Symbol.for('DomainEventFactory'),
+  DomainEventMessageHandler: Symbol.for('DomainEventMessageHandler'),
+  AnalyticsStore: Symbol.for('AnalyticsStore'),
+  StatisticsStore: Symbol.for('StatisticsStore'),
+  Timer: Symbol.for('Timer'),
+  PeriodKeyGenerator: Symbol.for('PeriodKeyGenerator'),
+}
+
+export default TYPES

packages/analytics/src/Domain/Analytics/AnalyticsActivity.ts

@@ -1,10 +1,4 @@
 export enum AnalyticsActivity {
-  GeneralActivity = 'general-activity',
-  GeneralActivityFreeUsers = 'general-activity-free-users',
-  GeneralActivityPaidUsers = 'general-activity-paid-users',
-  EditingItems = 'editing-items',
-  CheckingIntegrity = 'checking-integrity',
-  Login = 'login',
   Register = 'register',
   DeleteAccount = 'DeleteAccount',
   SubscriptionPurchased = 'subscription-purchased',
@@ -12,8 +6,7 @@ export enum AnalyticsActivity {
   SubscriptionRefunded = 'subscription-refunded',
   SubscriptionCancelled = 'subscription-cancelled',
   SubscriptionExpired = 'subscription-expired',
-  EmailUnbackedUpData = 'email-unbacked-up-data',
-  EmailBackup = 'email-backup',
+  SubscriptionReactivated = 'subscription-reactivated',
   LimitedDiscountOfferPurchased = 'limited-discount-offer-purchased',
   PaymentFailed = 'payment-failed',
   PaymentSuccess = 'payment-success',

packages/analytics/src/Domain/Common/Email.spec.ts

@@ -0,0 +1,16 @@
+import { Email } from './Email'
+
+describe('Email', () => {
+  it('should create a value object', () => {
+    const valueOrError = Email.create('test@test.te')
+
+    expect(valueOrError.isFailed()).toBeFalsy()
+    expect(valueOrError.getValue().value).toEqual('test@test.te')
+  })
+
+  it('should not create an invalid value object', () => {
+    const valueOrError = Email.create('')
+
+    expect(valueOrError.isFailed()).toBeTruthy()
+  })
+})

packages/analytics/src/Domain/Common/Email.ts

@@ -0,0 +1,21 @@
+import { ValueObject } from '../Core/ValueObject'
+import { Result } from '../Core/Result'
+import { EmailProps } from './EmailProps'
+
+export class Email extends ValueObject<EmailProps> {
+  get value(): string {
+    return this.props.value
+  }
+
+  private constructor(props: EmailProps) {
+    super(props)
+  }
+
+  static create(email: string): Result<Email> {
+    if (!!email === false || email.length === 0) {
+      return Result.fail<Email>('Email cannot be empty')
+    } else {
+      return Result.ok<Email>(new Email({ value: email }))
+    }
+  }
+}

packages/analytics/src/Domain/Common/EmailProps.ts

@@ -0,0 +1,3 @@
+export interface EmailProps {
+  value: string
+}

packages/analytics/src/Domain/Common/Uuid.spec.ts

@@ -0,0 +1,16 @@
+import { Uuid } from './Uuid'
+
+describe('Uuid', () => {
+  it('should create a value object', () => {
+    const valueOrError = Uuid.create('1-2-3')
+
+    expect(valueOrError.isFailed()).toBeFalsy()
+    expect(valueOrError.getValue().value).toEqual('1-2-3')
+  })
+
+  it('should not create an invalid value object', () => {
+    const valueOrError = Uuid.create('')
+
+    expect(valueOrError.isFailed()).toBeTruthy()
+  })
+})

packages/analytics/src/Domain/Common/Uuid.ts

@@ -0,0 +1,21 @@
+import { ValueObject } from '../Core/ValueObject'
+import { Result } from '../Core/Result'
+import { UuidProps } from './UuidProps'
+
+export class Uuid extends ValueObject<UuidProps> {
+  get value(): string {
+    return this.props.value
+  }
+
+  private constructor(props: UuidProps) {
+    super(props)
+  }
+
+  static create(uuid: string): Result<Uuid> {
+    if (!!uuid === false || uuid.length === 0) {
+      return Result.fail<Uuid>('Uuid cannot be empty')
+    } else {
+      return Result.ok<Uuid>(new Uuid({ value: uuid }))
+    }
+  }
+}

packages/analytics/src/Domain/Common/UuidProps.ts

@@ -0,0 +1,3 @@
+export interface UuidProps {
+  value: string
+}

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

@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+
+import { Entity } from './Entity'
+import { UniqueEntityId } from './UniqueEntityId'
+
+export abstract class Aggregate<T> extends Entity<T> {
+  get id(): UniqueEntityId {
+    return this._id
+  }
+}

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

@@ -0,0 +1,27 @@
+/* istanbul ignore file */
+
+import { UniqueEntityId } from './UniqueEntityId'
+
+export abstract class Entity<T> {
+  protected readonly _id: UniqueEntityId
+
+  constructor(public readonly props: T, id?: UniqueEntityId) {
+    this._id = id ? id : new UniqueEntityId()
+  }
+
+  public equals(object?: Entity<T>): boolean {
+    if (object == null || object == undefined) {
+      return false
+    }
+
+    if (this === object) {
+      return true
+    }
+
+    if (!(object instanceof Entity)) {
+      return false
+    }
+
+    return this._id.equals(object._id)
+  }
+}

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

@@ -0,0 +1,24 @@
+/* istanbul ignore file */
+
+export class Id<T> {
+  constructor(private value: T) {}
+
+  equals(id?: Id<T>): boolean {
+    if (id === null || id === undefined) {
+      return false
+    }
+    if (!(id instanceof this.constructor)) {
+      return false
+    }
+
+    return id.toValue() === this.value
+  }
+
+  toString() {
+    return String(this.value)
+  }
+
+  toValue(): T {
+    return this.value
+  }
+}

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

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

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

@@ -0,0 +1,10 @@
+/* istanbul ignore file */
+
+import { v4 as uuid } from 'uuid'
+import { Id } from './Id'
+
+export class UniqueEntityId extends Id<string | number> {
+  constructor(id?: string | number) {
+    super(id ? id : uuid())
+  }
+}

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

@@ -0,0 +1,24 @@
+/* istanbul ignore file */
+
+import { shallowEqual } from 'shallow-equal-object'
+
+import { ValueObjectProps } from './ValueObjectProps'
+
+export abstract class ValueObject<T extends ValueObjectProps> {
+  public readonly props: T
+
+  constructor(props: T) {
+    this.props = Object.freeze(props)
+  }
+
+  equals(valueObject?: ValueObject<T>): boolean {
+    if (valueObject === null || valueObject === undefined) {
+      return false
+    }
+    if (valueObject.props === undefined) {
+      return false
+    }
+
+    return shallowEqual(this.props, valueObject.props)
+  }
+}

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

@@ -0,0 +1,4 @@
+export interface ValueObjectProps {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  [index: string]: any
+}

packages/analytics/src/Domain/Entity/AnalyticsEntity.ts

@@ -0,0 +1,22 @@
+import { Column, Entity, Index, PrimaryGeneratedColumn } from 'typeorm'
+
+@Entity({ name: 'analytics_entities' })
+export class AnalyticsEntity {
+  @PrimaryGeneratedColumn()
+  declare id: number
+
+  @Column({
+    name: 'user_uuid',
+    length: 36,
+  })
+  @Index('user_uuid')
+  declare userUuid: string
+
+  @Column({
+    name: 'user_email',
+    length: 255,
+    nullable: true,
+  })
+  @Index('email')
+  declare userEmail: string
+}

packages/analytics/src/Domain/Entity/AnalyticsEntityRepositoryInterface.ts

@@ -3,5 +3,7 @@ import { AnalyticsEntity } from './AnalyticsEntity'
 
 export interface AnalyticsEntityRepositoryInterface {
   save(analyticsEntity: AnalyticsEntity): Promise<AnalyticsEntity>
+  remove(analyticsEntity: AnalyticsEntity): Promise<void>
   findOneByUserUuid(userUuid: Uuid): Promise<AnalyticsEntity | null>
+  findOneByUserEmail(email: string): Promise<AnalyticsEntity | null>
 }

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

@@ -0,0 +1,140 @@
+import 'reflect-metadata'
+
+import { TimerInterface } from '@standardnotes/time'
+
+import { AnalyticsActivity } from '../Analytics/AnalyticsActivity'
+import { StatisticsMeasure } from '../Statistics/StatisticsMeasure'
+import { Period } from '../Time/Period'
+
+import { DomainEventFactory } from './DomainEventFactory'
+
+describe('DomainEventFactory', () => {
+  let timer: TimerInterface
+
+  const createFactory = () => new DomainEventFactory(timer)
+
+  beforeEach(() => {
+    timer = {} as jest.Mocked<TimerInterface>
+    timer.getTimestampInMicroseconds = jest.fn().mockReturnValue(1)
+    timer.getUTCDate = jest.fn().mockReturnValue(new Date(1))
+  })
+
+  it('should create a DAILY_ANALYTICS_REPORT_GENERATED event', () => {
+    expect(
+      createFactory().createDailyAnalyticsReportGeneratedEvent({
+        activityStatistics: [
+          {
+            name: AnalyticsActivity.Register,
+            retention: 24,
+            totalCount: 45,
+          },
+        ],
+        statisticMeasures: [
+          {
+            name: StatisticsMeasure.Income,
+            totalValue: 43,
+            average: 23,
+            increments: 5,
+            period: Period.Today,
+          },
+        ],
+        activityStatisticsOverTime: [
+          {
+            name: AnalyticsActivity.Register,
+            period: Period.Last30Days,
+            counts: [
+              {
+                periodKey: '2022-10-9',
+                totalCount: 3,
+              },
+            ],
+            totalCount: 123,
+          },
+        ],
+        statisticsOverTime: [
+          {
+            name: StatisticsMeasure.MRR,
+            period: Period.Last30Days,
+            counts: [
+              {
+                periodKey: '2022-10-9',
+                totalCount: 3,
+              },
+            ],
+          },
+        ],
+        churn: {
+          periodKeys: ['2022-10-9'],
+          values: [
+            {
+              rate: 12,
+              periodKey: '2022-10-9',
+            },
+          ],
+        },
+      }),
+    ).toEqual({
+      createdAt: expect.any(Date),
+      meta: {
+        correlation: {
+          userIdentifier: '',
+          userIdentifierType: 'uuid',
+        },
+        origin: 'analytics',
+      },
+      payload: {
+        activityStatistics: [
+          {
+            name: 'register',
+            retention: 24,
+            totalCount: 45,
+          },
+        ],
+        activityStatisticsOverTime: [
+          {
+            counts: [
+              {
+                periodKey: '2022-10-9',
+                totalCount: 3,
+              },
+            ],
+            name: 'register',
+            period: 9,
+            totalCount: 123,
+          },
+        ],
+        statisticsOverTime: [
+          {
+            counts: [
+              {
+                periodKey: '2022-10-9',
+                totalCount: 3,
+              },
+            ],
+            name: 'mrr',
+            period: 9,
+          },
+        ],
+        churn: {
+          periodKeys: ['2022-10-9'],
+          values: [
+            {
+              periodKey: '2022-10-9',
+              rate: 12,
+            },
+          ],
+        },
+        statisticMeasures: [
+          {
+            average: 23,
+            increments: 5,
+            name: 'income',
+            period: 0,
+            totalValue: 43,
+          },
+        ],
+      },
+      type: 'DAILY_ANALYTICS_REPORT_GENERATED',
+    })
+  })
+})

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

@@ -0,0 +1,62 @@
+import { DomainEventService, DailyAnalyticsReportGeneratedEvent } from '@standardnotes/domain-events'
+import { TimerInterface } from '@standardnotes/time'
+import { inject, injectable } from 'inversify'
+import TYPES from '../../Bootstrap/Types'
+import { DomainEventFactoryInterface } from './DomainEventFactoryInterface'
+
+@injectable()
+export class DomainEventFactory implements DomainEventFactoryInterface {
+  constructor(@inject(TYPES.Timer) private timer: TimerInterface) {}
+
+  createDailyAnalyticsReportGeneratedEvent(dto: {
+    activityStatistics: Array<{
+      name: string
+      retention: number
+      totalCount: number
+    }>
+    statisticMeasures: Array<{
+      name: string
+      totalValue: number
+      average: number
+      increments: number
+      period: number
+    }>
+    activityStatisticsOverTime: Array<{
+      name: string
+      period: number
+      counts: Array<{
+        periodKey: string
+        totalCount: number
+      }>
+      totalCount: number
+    }>
+    statisticsOverTime: Array<{
+      name: string
+      period: number
+      counts: Array<{
+        periodKey: string
+        totalCount: number
+      }>
+    }>
+    churn: {
+      periodKeys: Array<string>
+      values: Array<{
+        rate: number
+        periodKey: string
+      }>
+    }
+  }): DailyAnalyticsReportGeneratedEvent {
+    return {
+      type: 'DAILY_ANALYTICS_REPORT_GENERATED',
+      createdAt: this.timer.getUTCDate(),
+      meta: {
+        correlation: {
+          userIdentifier: '',
+          userIdentifierType: 'uuid',
+        },
+        origin: DomainEventService.Analytics,
+      },
+      payload: dto,
+    }
+  }
+}

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

@@ -0,0 +1,42 @@
+import { DailyAnalyticsReportGeneratedEvent } from '@standardnotes/domain-events'
+
+export interface DomainEventFactoryInterface {
+  createDailyAnalyticsReportGeneratedEvent(dto: {
+    activityStatistics: Array<{
+      name: string
+      retention: number
+      totalCount: number
+    }>
+    statisticMeasures: Array<{
+      name: string
+      totalValue: number
+      average: number
+      increments: number
+      period: number
+    }>
+    activityStatisticsOverTime: Array<{
+      name: string
+      period: number
+      counts: Array<{
+        periodKey: string
+        totalCount: number
+      }>
+      totalCount: number
+    }>
+    statisticsOverTime: Array<{
+      name: string
+      period: number
+      counts: Array<{
+        periodKey: string
+        totalCount: number
+      }>
+    }>
+    churn: {
+      periodKeys: Array<string>
+      values: Array<{
+        rate: number
+        periodKey: string
+      }>
+    }
+  }): DailyAnalyticsReportGeneratedEvent
+}

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

@@ -0,0 +1,69 @@
+import 'reflect-metadata'
+
+import { AccountDeletionRequestedEvent } from '@standardnotes/domain-events'
+import { AccountDeletionRequestedEventHandler } from './AccountDeletionRequestedEventHandler'
+import { TimerInterface } from '@standardnotes/time'
+import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
+import { StatisticsStoreInterface } from '../Statistics/StatisticsStoreInterface'
+import { Period } from '../Time/Period'
+import { AnalyticsEntityRepositoryInterface } from '../Entity/AnalyticsEntityRepositoryInterface'
+
+describe('AccountDeletionRequestedEventHandler', () => {
+  let event: AccountDeletionRequestedEvent
+  let analyticsEntityRepository: AnalyticsEntityRepositoryInterface
+  let analyticsStore: AnalyticsStoreInterface
+  let statisticsStore: StatisticsStoreInterface
+  let timer: TimerInterface
+
+  const createHandler = () =>
+    new AccountDeletionRequestedEventHandler(analyticsEntityRepository, analyticsStore, statisticsStore, timer)
+
+  beforeEach(() => {
+    event = {} as jest.Mocked<AccountDeletionRequestedEvent>
+    event.createdAt = new Date(1)
+    event.payload = {
+      userUuid: '1-2-3',
+      userCreatedAtTimestamp: 1,
+      regularSubscriptionUuid: '2-3-4',
+    }
+
+    analyticsEntityRepository = {} as jest.Mocked<AnalyticsEntityRepositoryInterface>
+    analyticsEntityRepository.findOneByUserUuid = jest.fn().mockReturnValue({ id: 3 })
+    analyticsEntityRepository.remove = jest.fn()
+
+    analyticsStore = {} as jest.Mocked<AnalyticsStoreInterface>
+    analyticsStore.markActivity = jest.fn()
+
+    statisticsStore = {} as jest.Mocked<StatisticsStoreInterface>
+    statisticsStore.incrementMeasure = jest.fn()
+
+    timer = {} as jest.Mocked<TimerInterface>
+    timer.getTimestampInMicroseconds = jest.fn().mockReturnValue(123)
+  })
+
+  it('should mark account deletion and registration length', async () => {
+    await createHandler().handle(event)
+
+    expect(analyticsStore.markActivity).toHaveBeenCalledWith(['DeleteAccount'], 3, [
+      Period.Today,
+      Period.ThisWeek,
+      Period.ThisMonth,
+    ])
+    expect(statisticsStore.incrementMeasure).toHaveBeenCalledWith('registration-length', 122, [
+      Period.Today,
+      Period.ThisWeek,
+      Period.ThisMonth,
+    ])
+    expect(analyticsEntityRepository.remove).toHaveBeenCalled()
+  })
+
+  it('should not mark anything if entity is not found', async () => {
+    analyticsEntityRepository.findOneByUserUuid = jest.fn().mockReturnValue(null)
+
+    await createHandler().handle(event)
+
+    expect(analyticsStore.markActivity).not.toHaveBeenCalled()
+    expect(statisticsStore.incrementMeasure).not.toHaveBeenCalled()
+    expect(analyticsEntityRepository.remove).not.toHaveBeenCalled()
+  })
+})

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

@@ -0,0 +1,44 @@
+import { AccountDeletionRequestedEvent, DomainEventHandlerInterface } from '@standardnotes/domain-events'
+import { TimerInterface } from '@standardnotes/time'
+import { inject, injectable } from 'inversify'
+
+import TYPES from '../../Bootstrap/Types'
+import { AnalyticsActivity } from '../Analytics/AnalyticsActivity'
+import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
+import { AnalyticsEntityRepositoryInterface } from '../Entity/AnalyticsEntityRepositoryInterface'
+import { StatisticsMeasure } from '../Statistics/StatisticsMeasure'
+import { StatisticsStoreInterface } from '../Statistics/StatisticsStoreInterface'
+import { Period } from '../Time/Period'
+
+@injectable()
+export class AccountDeletionRequestedEventHandler implements DomainEventHandlerInterface {
+  constructor(
+    @inject(TYPES.AnalyticsEntityRepository) private analyticsEntityRepository: AnalyticsEntityRepositoryInterface,
+    @inject(TYPES.AnalyticsStore) private analyticsStore: AnalyticsStoreInterface,
+    @inject(TYPES.StatisticsStore) private statisticsStore: StatisticsStoreInterface,
+    @inject(TYPES.Timer) private timer: TimerInterface,
+  ) {}
+
+  async handle(event: AccountDeletionRequestedEvent): Promise<void> {
+    const analyticsEntity = await this.analyticsEntityRepository.findOneByUserUuid(event.payload.userUuid)
+
+    if (analyticsEntity === null) {
+      return
+    }
+
+    await this.analyticsStore.markActivity([AnalyticsActivity.DeleteAccount], analyticsEntity.id, [
+      Period.Today,
+      Period.ThisWeek,
+      Period.ThisMonth,
+    ])
+
+    const registrationLength = this.timer.getTimestampInMicroseconds() - event.payload.userCreatedAtTimestamp
+    await this.statisticsStore.incrementMeasure(StatisticsMeasure.RegistrationLength, registrationLength, [
+      Period.Today,
+      Period.ThisWeek,
+      Period.ThisMonth,
+    ])
+
+    await this.analyticsEntityRepository.remove(analyticsEntity)
+  }
+}

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

@@ -1,28 +1,19 @@
 import 'reflect-metadata'
 
 import { PaymentFailedEvent } from '@standardnotes/domain-events'
-import { AnalyticsStoreInterface } from '@standardnotes/analytics'
 
 import { PaymentFailedEventHandler } from './PaymentFailedEventHandler'
-import { UserRepositoryInterface } from '../User/UserRepositoryInterface'
-import { User } from '../User/User'
 import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
+import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
 
 describe('PaymentFailedEventHandler', () => {
-  let userRepository: UserRepositoryInterface
   let event: PaymentFailedEvent
-  let user: User
   let getUserAnalyticsId: GetUserAnalyticsId
   let analyticsStore: AnalyticsStoreInterface
 
-  const createHandler = () => new PaymentFailedEventHandler(userRepository, getUserAnalyticsId, analyticsStore)
+  const createHandler = () => new PaymentFailedEventHandler(getUserAnalyticsId, analyticsStore)
 
   beforeEach(() => {
-    user = {} as jest.Mocked<User>
-
-    userRepository = {} as jest.Mocked<UserRepositoryInterface>
-    userRepository.findOneByEmail = jest.fn().mockReturnValue(user)
-
     getUserAnalyticsId = {} as jest.Mocked<GetUserAnalyticsId>
     getUserAnalyticsId.execute = jest.fn().mockReturnValue({ analyticsId: 3 })
 
@@ -40,12 +31,4 @@ describe('PaymentFailedEventHandler', () => {
 
     expect(analyticsStore.markActivity).toHaveBeenCalled()
   })
-
-  it('should not mark payment failed for analytics if user is not found', async () => {
-    userRepository.findOneByEmail = jest.fn().mockReturnValue(null)
-
-    await createHandler().handle(event)
-
-    expect(analyticsStore.markActivity).not.toHaveBeenCalled()
-  })
 })

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

@@ -1,26 +1,21 @@
-import { AnalyticsActivity, AnalyticsStoreInterface, Period } from '@standardnotes/analytics'
 import { DomainEventHandlerInterface, PaymentFailedEvent } from '@standardnotes/domain-events'
 import { inject, injectable } from 'inversify'
 
 import TYPES from '../../Bootstrap/Types'
+import { AnalyticsActivity } from '../Analytics/AnalyticsActivity'
+import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
+import { Period } from '../Time/Period'
 import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
-import { UserRepositoryInterface } from '../User/UserRepositoryInterface'
 
 @injectable()
 export class PaymentFailedEventHandler implements DomainEventHandlerInterface {
   constructor(
-    @inject(TYPES.UserRepository) private userRepository: UserRepositoryInterface,
     @inject(TYPES.GetUserAnalyticsId) private getUserAnalyticsId: GetUserAnalyticsId,
     @inject(TYPES.AnalyticsStore) private analyticsStore: AnalyticsStoreInterface,
   ) {}
 
   async handle(event: PaymentFailedEvent): Promise<void> {
-    const user = await this.userRepository.findOneByEmail(event.payload.userEmail)
-    if (user === null) {
-      return
-    }
-
-    const { analyticsId } = await this.getUserAnalyticsId.execute({ userUuid: user.uuid })
+    const { analyticsId } = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
     await this.analyticsStore.markActivity([AnalyticsActivity.PaymentFailed], analyticsId, [
       Period.Today,
       Period.ThisWeek,

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

@@ -1,32 +1,25 @@
 import 'reflect-metadata'
 
 import { PaymentSuccessEvent } from '@standardnotes/domain-events'
-import { AnalyticsStoreInterface, Period, StatisticsStoreInterface } from '@standardnotes/analytics'
 
 import { PaymentSuccessEventHandler } from './PaymentSuccessEventHandler'
-import { UserRepositoryInterface } from '../User/UserRepositoryInterface'
-import { User } from '../User/User'
 import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
 import { Logger } from 'winston'
+import { StatisticsStoreInterface } from '../Statistics/StatisticsStoreInterface'
+import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
+import { Period } from '../Time/Period'
 
 describe('PaymentSuccessEventHandler', () => {
-  let userRepository: UserRepositoryInterface
   let event: PaymentSuccessEvent
-  let user: User
   let getUserAnalyticsId: GetUserAnalyticsId
   let analyticsStore: AnalyticsStoreInterface
   let statisticsStore: StatisticsStoreInterface
   let logger: Logger
 
   const createHandler = () =>
-    new PaymentSuccessEventHandler(userRepository, getUserAnalyticsId, analyticsStore, statisticsStore, logger)
+    new PaymentSuccessEventHandler(getUserAnalyticsId, analyticsStore, statisticsStore, logger)
 
   beforeEach(() => {
-    user = {} as jest.Mocked<User>
-
-    userRepository = {} as jest.Mocked<UserRepositoryInterface>
-    userRepository.findOneByEmail = jest.fn().mockReturnValue(user)
-
     getUserAnalyticsId = {} as jest.Mocked<GetUserAnalyticsId>
     getUserAnalyticsId.execute = jest.fn().mockReturnValue({ analyticsId: 3 })
 
@@ -79,12 +72,4 @@ describe('PaymentSuccessEventHandler', () => {
       Period.ThisMonth,
     ])
   })
-
-  it('should not mark payment failed for analytics if user is not found', async () => {
-    userRepository.findOneByEmail = jest.fn().mockReturnValue(null)
-
-    await createHandler().handle(event)
-
-    expect(analyticsStore.markActivity).not.toHaveBeenCalled()
-  })
 })

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

@@ -1,18 +1,15 @@
-import {
-  AnalyticsActivity,
-  AnalyticsStoreInterface,
-  Period,
-  StatisticsMeasure,
-  StatisticsStoreInterface,
-} from '@standardnotes/analytics'
 import { PaymentType, SubscriptionBillingFrequency, SubscriptionName } from '@standardnotes/common'
 import { DomainEventHandlerInterface, PaymentSuccessEvent } from '@standardnotes/domain-events'
 import { inject, injectable } from 'inversify'
 import { Logger } from 'winston'
 
 import TYPES from '../../Bootstrap/Types'
+import { AnalyticsActivity } from '../Analytics/AnalyticsActivity'
+import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
+import { StatisticsMeasure } from '../Statistics/StatisticsMeasure'
+import { StatisticsStoreInterface } from '../Statistics/StatisticsStoreInterface'
+import { Period } from '../Time/Period'
 import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
-import { UserRepositoryInterface } from '../User/UserRepositoryInterface'
 
 @injectable()
 export class PaymentSuccessEventHandler implements DomainEventHandlerInterface {
@@ -58,7 +55,6 @@ export class PaymentSuccessEventHandler implements DomainEventHandlerInterface {
   ])
 
   constructor(
-    @inject(TYPES.UserRepository) private userRepository: UserRepositoryInterface,
     @inject(TYPES.GetUserAnalyticsId) private getUserAnalyticsId: GetUserAnalyticsId,
     @inject(TYPES.AnalyticsStore) private analyticsStore: AnalyticsStoreInterface,
     @inject(TYPES.StatisticsStore) private statisticsStore: StatisticsStoreInterface,
@@ -66,12 +62,7 @@ export class PaymentSuccessEventHandler implements DomainEventHandlerInterface {
   ) {}
 
   async handle(event: PaymentSuccessEvent): Promise<void> {
-    const user = await this.userRepository.findOneByEmail(event.payload.userEmail)
-    if (user === null) {
-      return
-    }
-
-    const { analyticsId } = await this.getUserAnalyticsId.execute({ userUuid: user.uuid })
+    const { analyticsId } = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
     await this.analyticsStore.markActivity([AnalyticsActivity.PaymentSuccess], analyticsId, [
       Period.Today,
       Period.ThisWeek,

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

@@ -1,9 +1,11 @@
 import 'reflect-metadata'
 
 import { RefundProcessedEvent } from '@standardnotes/domain-events'
-import { Period, StatisticsMeasure, StatisticsStoreInterface } from '@standardnotes/analytics'
 
 import { RefundProcessedEventHandler } from './RefundProcessedEventHandler'
+import { StatisticsMeasure } from '../Statistics/StatisticsMeasure'
+import { StatisticsStoreInterface } from '../Statistics/StatisticsStoreInterface'
+import { Period } from '../Time/Period'
 
 describe('RefundProcessedEventHandler', () => {
   let event: RefundProcessedEvent

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

@@ -1,8 +1,10 @@
-import { Period, StatisticsMeasure, StatisticsStoreInterface } from '@standardnotes/analytics'
 import { DomainEventHandlerInterface, RefundProcessedEvent } from '@standardnotes/domain-events'
 import { inject, injectable } from 'inversify'
 
 import TYPES from '../../Bootstrap/Types'
+import { StatisticsMeasure } from '../Statistics/StatisticsMeasure'
+import { StatisticsStoreInterface } from '../Statistics/StatisticsStoreInterface'
+import { Period } from '../Time/Period'
 
 @injectable()
 export class RefundProcessedEventHandler implements DomainEventHandlerInterface {

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

@@ -0,0 +1,104 @@
+import 'reflect-metadata'
+
+import { SubscriptionName } from '@standardnotes/common'
+import { SubscriptionCancelledEvent } from '@standardnotes/domain-events'
+
+import { SubscriptionCancelledEventHandler } from './SubscriptionCancelledEventHandler'
+import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
+import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
+import { StatisticsMeasure } from '../Statistics/StatisticsMeasure'
+import { StatisticsStoreInterface } from '../Statistics/StatisticsStoreInterface'
+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
+  let getUserAnalyticsId: GetUserAnalyticsId
+  let analyticsStore: AnalyticsStoreInterface
+  let statisticsStore: StatisticsStoreInterface
+  let saveRevenueModification: SaveRevenueModification
+  let logger: Logger
+
+  const createHandler = () =>
+    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 })
+
+    analyticsStore = {} as jest.Mocked<AnalyticsStoreInterface>
+    analyticsStore.markActivity = jest.fn()
+
+    statisticsStore = {} as jest.Mocked<StatisticsStoreInterface>
+    statisticsStore.incrementMeasure = jest.fn()
+
+    event = {} as jest.Mocked<SubscriptionCancelledEvent>
+    event.createdAt = new Date(1)
+    event.type = 'SUBSCRIPTION_CANCELLED'
+    event.payload = {
+      subscriptionId: 1,
+      userEmail: 'test@test.com',
+      subscriptionName: SubscriptionName.ProPlan,
+      subscriptionCreatedAt: 1642395451515000,
+      subscriptionUpdatedAt: 1642395451515001,
+      lastPayedAt: 1642395451515001,
+      subscriptionEndsAt: 1642395451515000 + 10,
+      timestamp: 1,
+      offline: false,
+      replaced: false,
+      userExistingSubscriptionsCount: 1,
+      billingFrequency: 1,
+      payAmount: 12.99,
+    }
+
+    saveRevenueModification = {} as jest.Mocked<SaveRevenueModification>
+    saveRevenueModification.execute = jest.fn().mockReturnValue(Result.ok<RevenueModification>())
+  })
+
+  it('should track subscription cancelled statistics', async () => {
+    event.payload.timestamp = 1642395451516000
+
+    await createHandler().handle(event)
+
+    expect(analyticsStore.markActivity).toHaveBeenCalled()
+    expect(statisticsStore.incrementMeasure).toHaveBeenCalledWith(StatisticsMeasure.SubscriptionLength, 1000, [
+      Period.Today,
+      Period.ThisWeek,
+      Period.ThisMonth,
+    ])
+    expect(saveRevenueModification.execute).toHaveBeenCalled()
+  })
+
+  it('should not track statistics for subscriptions that are in a legacy 5 year plan', async () => {
+    event.payload.timestamp = 1642395451516000
+    event.payload.subscriptionEndsAt = 1642395451515000 + 126_230_400_000_001
+    event.payload.subscriptionCreatedAt = 1642395451515000
+
+    await createHandler().handle(event)
+
+    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

@@ -0,0 +1,84 @@
+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'
+import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
+import { Email } from '../Common/Email'
+import { StatisticsMeasure } from '../Statistics/StatisticsMeasure'
+import { StatisticsStoreInterface } from '../Statistics/StatisticsStoreInterface'
+import { SubscriptionEventType } from '../Subscription/SubscriptionEventType'
+import { SubscriptionPlanName } from '../Subscription/SubscriptionPlanName'
+import { Period } from '../Time/Period'
+import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
+import { SaveRevenueModification } from '../UseCase/SaveRevenueModification/SaveRevenueModification'
+
+@injectable()
+export class SubscriptionCancelledEventHandler implements DomainEventHandlerInterface {
+  constructor(
+    @inject(TYPES.GetUserAnalyticsId) private getUserAnalyticsId: GetUserAnalyticsId,
+    @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> {
+    const { analyticsId, userUuid } = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
+    await this.analyticsStore.markActivity([AnalyticsActivity.SubscriptionCancelled], analyticsId, [
+      Period.Today,
+      Period.ThisWeek,
+      Period.ThisMonth,
+    ])
+
+    await this.trackSubscriptionStatistics(event)
+
+    const result = await this.saveRevenueModification.execute({
+      billingFrequency: event.payload.billingFrequency,
+      eventType: SubscriptionEventType.create(event.type).getValue(),
+      newSubscriber: event.payload.userExistingSubscriptionsCount === 1,
+      payedAmount: event.payload.payAmount,
+      planName: SubscriptionPlanName.create(event.payload.subscriptionName).getValue(),
+      subscriptionId: event.payload.subscriptionId,
+      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) {
+    if (this.isLegacy5yearSubscriptionPlan(event.payload.subscriptionEndsAt, event.payload.subscriptionCreatedAt)) {
+      return
+    }
+
+    const subscriptionLength = event.payload.timestamp - event.payload.subscriptionCreatedAt
+    await this.statisticsStore.incrementMeasure(StatisticsMeasure.SubscriptionLength, subscriptionLength, [
+      Period.Today,
+      Period.ThisWeek,
+      Period.ThisMonth,
+    ])
+
+    const remainingSubscriptionTime = event.payload.subscriptionEndsAt - event.payload.timestamp
+    const totalSubscriptionTime = event.payload.subscriptionEndsAt - event.payload.lastPayedAt
+
+    const remainingSubscriptionPercentage = Math.floor((remainingSubscriptionTime / totalSubscriptionTime) * 100)
+
+    await this.statisticsStore.incrementMeasure(
+      StatisticsMeasure.RemainingSubscriptionTimePercentage,
+      remainingSubscriptionPercentage,
+      [Period.Today, Period.ThisWeek, Period.ThisMonth],
+    )
+  }
+
+  private isLegacy5yearSubscriptionPlan(subscriptionEndsAt: number, subscriptionCreatedAt: number) {
+    const fourYearsInMicroseconds = 126_230_400_000_000
+
+    return subscriptionEndsAt - subscriptionCreatedAt > fourYearsInMicroseconds
+  }
+}

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

@@ -0,0 +1,79 @@
+import 'reflect-metadata'
+
+import { SubscriptionName } from '@standardnotes/common'
+import { SubscriptionExpiredEvent } from '@standardnotes/domain-events'
+
+import { SubscriptionExpiredEventHandler } from './SubscriptionExpiredEventHandler'
+import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
+import { StatisticsStoreInterface } from '../Statistics/StatisticsStoreInterface'
+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
+  let getUserAnalyticsId: GetUserAnalyticsId
+  let analyticsStore: AnalyticsStoreInterface
+  let statisticsStore: StatisticsStoreInterface
+  let saveRevenueModification: SaveRevenueModification
+  let logger: Logger
+
+  const createHandler = () =>
+    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'
+    event.payload = {
+      subscriptionId: 1,
+      userEmail: 'test@test.com',
+      subscriptionName: SubscriptionName.PlusPlan,
+      timestamp: 1,
+      offline: false,
+      totalActiveSubscriptionsCount: 123,
+      userExistingSubscriptionsCount: 2,
+      billingFrequency: 1,
+      payAmount: 12.99,
+    }
+
+    getUserAnalyticsId = {} as jest.Mocked<GetUserAnalyticsId>
+    getUserAnalyticsId.execute = jest.fn().mockReturnValue({ analyticsId: 3 })
+
+    analyticsStore = {} as jest.Mocked<AnalyticsStoreInterface>
+    analyticsStore.markActivity = jest.fn()
+
+    statisticsStore = {} as jest.Mocked<StatisticsStoreInterface>
+    statisticsStore.setMeasure = jest.fn()
+
+    saveRevenueModification = {} as jest.Mocked<SaveRevenueModification>
+    saveRevenueModification.execute = jest.fn().mockReturnValue(Result.ok<RevenueModification>())
+  })
+
+  it('should update analytics and statistics', async () => {
+    await createHandler().handle(event)
+
+    expect(analyticsStore.markActivity).toHaveBeenCalled()
+    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

@@ -0,0 +1,58 @@
+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'
+import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
+import { Email } from '../Common/Email'
+import { StatisticsMeasure } from '../Statistics/StatisticsMeasure'
+import { StatisticsStoreInterface } from '../Statistics/StatisticsStoreInterface'
+import { SubscriptionEventType } from '../Subscription/SubscriptionEventType'
+import { SubscriptionPlanName } from '../Subscription/SubscriptionPlanName'
+import { Period } from '../Time/Period'
+import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
+import { SaveRevenueModification } from '../UseCase/SaveRevenueModification/SaveRevenueModification'
+
+@injectable()
+export class SubscriptionExpiredEventHandler implements DomainEventHandlerInterface {
+  constructor(
+    @inject(TYPES.GetUserAnalyticsId) private getUserAnalyticsId: GetUserAnalyticsId,
+    @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> {
+    const { analyticsId, userUuid } = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
+    await this.analyticsStore.markActivity(
+      [AnalyticsActivity.SubscriptionExpired, AnalyticsActivity.ExistingCustomersChurn],
+      analyticsId,
+      [Period.Today, Period.ThisWeek, Period.ThisMonth],
+    )
+
+    await this.statisticsStore.setMeasure(
+      StatisticsMeasure.TotalCustomers,
+      event.payload.totalActiveSubscriptionsCount,
+      [Period.Today, Period.ThisWeek, Period.ThisMonth, Period.ThisYear],
+    )
+
+    const result = await this.saveRevenueModification.execute({
+      billingFrequency: event.payload.billingFrequency,
+      eventType: SubscriptionEventType.create(event.type).getValue(),
+      newSubscriber: event.payload.userExistingSubscriptionsCount === 1,
+      payedAmount: event.payload.payAmount,
+      planName: SubscriptionPlanName.create(event.payload.subscriptionName).getValue(),
+      subscriptionId: event.payload.subscriptionId,
+      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

@@ -0,0 +1,102 @@
+import 'reflect-metadata'
+
+import { SubscriptionName } from '@standardnotes/common'
+import { SubscriptionPurchasedEvent } from '@standardnotes/domain-events'
+
+import { SubscriptionPurchasedEventHandler } from './SubscriptionPurchasedEventHandler'
+import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
+import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
+import { StatisticsStoreInterface } from '../Statistics/StatisticsStoreInterface'
+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
+  let subscriptionExpiresAt: number
+  let getUserAnalyticsId: GetUserAnalyticsId
+  let analyticsStore: AnalyticsStoreInterface
+  let statisticsStore: StatisticsStoreInterface
+  let saveRevenueModification: SaveRevenueModification
+  let logger: Logger
+
+  const createHandler = () =>
+    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()
+
+    event = {} as jest.Mocked<SubscriptionPurchasedEvent>
+    event.createdAt = new Date(1)
+    event.type = 'SUBSCRIPTION_PURCHASED'
+    event.payload = {
+      subscriptionId: 1,
+      userEmail: 'test@test.com',
+      subscriptionName: SubscriptionName.ProPlan,
+      subscriptionExpiresAt,
+      timestamp: 60,
+      offline: false,
+      discountCode: null,
+      limitedDiscountPurchased: false,
+      newSubscriber: true,
+      totalActiveSubscriptionsCount: 123,
+      userRegisteredAt: 23,
+      billingFrequency: 12,
+      payAmount: 29.99,
+    }
+
+    getUserAnalyticsId = {} as jest.Mocked<GetUserAnalyticsId>
+    getUserAnalyticsId.execute = jest.fn().mockReturnValue({ analyticsId: 3 })
+
+    analyticsStore = {} as jest.Mocked<AnalyticsStoreInterface>
+    analyticsStore.markActivity = jest.fn()
+    analyticsStore.unmarkActivity = jest.fn()
+
+    saveRevenueModification = {} as jest.Mocked<SaveRevenueModification>
+    saveRevenueModification.execute = jest.fn().mockReturnValue(Result.ok<RevenueModification>())
+  })
+
+  it('should mark subscription creation statistics', async () => {
+    await createHandler().handle(event)
+
+    expect(statisticsStore.incrementMeasure).toHaveBeenCalled()
+    expect(saveRevenueModification.execute).toHaveBeenCalled()
+  })
+
+  it("should not measure registration to subscription time if this is not user's first subscription", async () => {
+    event.payload.newSubscriber = false
+
+    await createHandler().handle(event)
+
+    expect(statisticsStore.incrementMeasure).not.toHaveBeenCalled()
+  })
+
+  it('should update analytics on limited discount offer purchasing', async () => {
+    event.payload.limitedDiscountPurchased = true
+
+    await createHandler().handle(event)
+
+    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

@@ -0,0 +1,82 @@
+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'
+import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
+import { Email } from '../Common/Email'
+import { StatisticsMeasure } from '../Statistics/StatisticsMeasure'
+import { StatisticsStoreInterface } from '../Statistics/StatisticsStoreInterface'
+import { SubscriptionEventType } from '../Subscription/SubscriptionEventType'
+import { SubscriptionPlanName } from '../Subscription/SubscriptionPlanName'
+import { Period } from '../Time/Period'
+import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
+import { SaveRevenueModification } from '../UseCase/SaveRevenueModification/SaveRevenueModification'
+
+@injectable()
+export class SubscriptionPurchasedEventHandler implements DomainEventHandlerInterface {
+  constructor(
+    @inject(TYPES.GetUserAnalyticsId) private getUserAnalyticsId: GetUserAnalyticsId,
+    @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> {
+    const { analyticsId, userUuid } = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
+    await this.analyticsStore.markActivity([AnalyticsActivity.SubscriptionPurchased], analyticsId, [
+      Period.Today,
+      Period.ThisWeek,
+      Period.ThisMonth,
+    ])
+    await this.analyticsStore.unmarkActivity(
+      [AnalyticsActivity.ExistingCustomersChurn, AnalyticsActivity.NewCustomersChurn],
+      analyticsId,
+      [Period.Today, Period.ThisWeek, Period.ThisMonth],
+    )
+
+    if (event.payload.limitedDiscountPurchased) {
+      await this.analyticsStore.markActivity([AnalyticsActivity.LimitedDiscountOfferPurchased], analyticsId, [
+        Period.Today,
+      ])
+    }
+
+    if (event.payload.newSubscriber) {
+      await this.statisticsStore.incrementMeasure(
+        StatisticsMeasure.RegistrationToSubscriptionTime,
+        event.payload.timestamp - event.payload.userRegisteredAt,
+        [Period.Today, Period.ThisWeek, Period.ThisMonth],
+      )
+      await this.statisticsStore.incrementMeasure(StatisticsMeasure.NewCustomers, 1, [
+        Period.Today,
+        Period.ThisWeek,
+        Period.ThisMonth,
+        Period.ThisYear,
+      ])
+      await this.statisticsStore.setMeasure(
+        StatisticsMeasure.TotalCustomers,
+        event.payload.totalActiveSubscriptionsCount,
+        [Period.Today, Period.ThisWeek, Period.ThisMonth, Period.ThisYear],
+      )
+    }
+
+    const result = await this.saveRevenueModification.execute({
+      billingFrequency: event.payload.billingFrequency,
+      eventType: SubscriptionEventType.create(event.type).getValue(),
+      newSubscriber: event.payload.newSubscriber,
+      payedAmount: event.payload.payAmount,
+      planName: SubscriptionPlanName.create(event.payload.subscriptionName).getValue(),
+      subscriptionId: event.payload.subscriptionId,
+      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/SubscriptionReactivatedEventHandler.spec.ts

@@ -0,0 +1,46 @@
+import 'reflect-metadata'
+
+import { SubscriptionName } from '@standardnotes/common'
+import { SubscriptionReactivatedEvent } from '@standardnotes/domain-events'
+
+import { SubscriptionReactivatedEventHandler } from './SubscriptionReactivatedEventHandler'
+import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
+import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
+import { Period } from '../Time/Period'
+
+describe('SubscriptionReactivatedEventHandler', () => {
+  let event: SubscriptionReactivatedEvent
+  let getUserAnalyticsId: GetUserAnalyticsId
+  let analyticsStore: AnalyticsStoreInterface
+
+  const createHandler = () => new SubscriptionReactivatedEventHandler(analyticsStore, getUserAnalyticsId)
+
+  beforeEach(() => {
+    event = {} as jest.Mocked<SubscriptionReactivatedEvent>
+    event.createdAt = new Date(1)
+    event.payload = {
+      previousSubscriptionId: 1,
+      currentSubscriptionId: 2,
+      userEmail: 'test@test.com',
+      subscriptionName: SubscriptionName.PlusPlan,
+      subscriptionExpiresAt: 5,
+      discountCode: 'exit-20',
+    }
+
+    getUserAnalyticsId = {} as jest.Mocked<GetUserAnalyticsId>
+    getUserAnalyticsId.execute = jest.fn().mockReturnValue({ analyticsId: 3 })
+
+    analyticsStore = {} as jest.Mocked<AnalyticsStoreInterface>
+    analyticsStore.markActivity = jest.fn()
+  })
+
+  it('should mark subscription reactivated activity for analytics', async () => {
+    await createHandler().handle(event)
+
+    expect(analyticsStore.markActivity).toHaveBeenCalledWith(['subscription-reactivated'], 3, [
+      Period.Today,
+      Period.ThisWeek,
+      Period.ThisMonth,
+    ])
+  })
+})

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

@@ -0,0 +1,25 @@
+import { DomainEventHandlerInterface, SubscriptionReactivatedEvent } from '@standardnotes/domain-events'
+import { inject, injectable } from 'inversify'
+
+import TYPES from '../../Bootstrap/Types'
+import { AnalyticsActivity } from '../Analytics/AnalyticsActivity'
+import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
+import { Period } from '../Time/Period'
+import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
+
+@injectable()
+export class SubscriptionReactivatedEventHandler implements DomainEventHandlerInterface {
+  constructor(
+    @inject(TYPES.AnalyticsStore) private analyticsStore: AnalyticsStoreInterface,
+    @inject(TYPES.GetUserAnalyticsId) private getUserAnalyticsId: GetUserAnalyticsId,
+  ) {}
+
+  async handle(event: SubscriptionReactivatedEvent): Promise<void> {
+    const { analyticsId } = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
+    await this.analyticsStore.markActivity([AnalyticsActivity.SubscriptionReactivated], analyticsId, [
+      Period.Today,
+      Period.ThisWeek,
+      Period.ThisMonth,
+    ])
+  }
+}

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

@@ -0,0 +1,110 @@
+import 'reflect-metadata'
+
+import { SubscriptionName } from '@standardnotes/common'
+import { SubscriptionRefundedEvent } from '@standardnotes/domain-events'
+
+import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
+import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
+
+import { SubscriptionRefundedEventHandler } from './SubscriptionRefundedEventHandler'
+import { StatisticsStoreInterface } from '../Statistics/StatisticsStoreInterface'
+import { AnalyticsActivity } from '../Analytics/AnalyticsActivity'
+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
+  let getUserAnalyticsId: GetUserAnalyticsId
+  let analyticsStore: AnalyticsStoreInterface
+  let statisticsStore: StatisticsStoreInterface
+  let saveRevenueModification: SaveRevenueModification
+  let logger: Logger
+
+  const createHandler = () =>
+    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'
+    event.payload = {
+      subscriptionId: 1,
+      userEmail: 'test@test.com',
+      subscriptionName: SubscriptionName.PlusPlan,
+      timestamp: 1,
+      offline: false,
+      userExistingSubscriptionsCount: 3,
+      totalActiveSubscriptionsCount: 1,
+      billingFrequency: 1,
+      payAmount: 12.99,
+    }
+
+    getUserAnalyticsId = {} as jest.Mocked<GetUserAnalyticsId>
+    getUserAnalyticsId.execute = jest.fn().mockReturnValue({ analyticsId: 3 })
+
+    analyticsStore = {} as jest.Mocked<AnalyticsStoreInterface>
+    analyticsStore.markActivity = jest.fn()
+    analyticsStore.wasActivityDone = jest.fn().mockReturnValue(true)
+
+    statisticsStore = {} as jest.Mocked<StatisticsStoreInterface>
+    statisticsStore.setMeasure = jest.fn()
+
+    saveRevenueModification = {} as jest.Mocked<SaveRevenueModification>
+    saveRevenueModification.execute = jest.fn().mockReturnValue(Result.ok<RevenueModification>())
+  })
+
+  it('should mark churn for new customer', async () => {
+    event.payload.userExistingSubscriptionsCount = 1
+    await createHandler().handle(event)
+
+    expect(analyticsStore.markActivity).toHaveBeenCalledWith([AnalyticsActivity.SubscriptionRefunded], 3, [
+      Period.Today,
+      Period.ThisWeek,
+      Period.ThisMonth,
+    ])
+
+    expect(analyticsStore.markActivity).toHaveBeenCalledWith([AnalyticsActivity.NewCustomersChurn], 3, [
+      Period.ThisMonth,
+    ])
+
+    expect(saveRevenueModification.execute).toHaveBeenCalled()
+  })
+
+  it('should mark churn for existing customer', async () => {
+    await createHandler().handle(event)
+
+    expect(analyticsStore.markActivity).toHaveBeenCalledWith([AnalyticsActivity.ExistingCustomersChurn], 3, [
+      Period.ThisMonth,
+    ])
+  })
+
+  it('should not mark churn if customer did not purchase subscription in defined analytic periods', async () => {
+    analyticsStore.wasActivityDone = jest.fn().mockReturnValue(false)
+
+    await createHandler().handle(event)
+
+    expect(analyticsStore.markActivity).not.toHaveBeenCalledWith([AnalyticsActivity.ExistingCustomersChurn], 3, [
+      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

@@ -0,0 +1,78 @@
+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'
+import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
+import { Email } from '../Common/Email'
+import { StatisticsMeasure } from '../Statistics/StatisticsMeasure'
+import { StatisticsStoreInterface } from '../Statistics/StatisticsStoreInterface'
+import { SubscriptionEventType } from '../Subscription/SubscriptionEventType'
+import { SubscriptionPlanName } from '../Subscription/SubscriptionPlanName'
+import { Period } from '../Time/Period'
+import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
+import { SaveRevenueModification } from '../UseCase/SaveRevenueModification/SaveRevenueModification'
+
+@injectable()
+export class SubscriptionRefundedEventHandler implements DomainEventHandlerInterface {
+  constructor(
+    @inject(TYPES.GetUserAnalyticsId) private getUserAnalyticsId: GetUserAnalyticsId,
+    @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> {
+    const { analyticsId, userUuid } = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
+    await this.analyticsStore.markActivity([AnalyticsActivity.SubscriptionRefunded], analyticsId, [
+      Period.Today,
+      Period.ThisWeek,
+      Period.ThisMonth,
+    ])
+
+    await this.markChurnActivity(analyticsId, event)
+
+    const result = await this.saveRevenueModification.execute({
+      billingFrequency: event.payload.billingFrequency,
+      eventType: SubscriptionEventType.create(event.type).getValue(),
+      newSubscriber: event.payload.userExistingSubscriptionsCount === 1,
+      payedAmount: event.payload.payAmount,
+      planName: SubscriptionPlanName.create(event.payload.subscriptionName).getValue(),
+      subscriptionId: event.payload.subscriptionId,
+      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> {
+    const churnActivity =
+      event.payload.userExistingSubscriptionsCount > 1
+        ? AnalyticsActivity.ExistingCustomersChurn
+        : AnalyticsActivity.NewCustomersChurn
+
+    for (const period of [Period.ThisMonth, Period.ThisWeek, Period.Today]) {
+      const customerPurchasedInPeriod = await this.analyticsStore.wasActivityDone(
+        AnalyticsActivity.SubscriptionPurchased,
+        analyticsId,
+        period,
+      )
+      if (customerPurchasedInPeriod) {
+        await this.analyticsStore.markActivity([churnActivity], analyticsId, [period])
+      }
+    }
+
+    await this.statisticsStore.setMeasure(
+      StatisticsMeasure.TotalCustomers,
+      event.payload.totalActiveSubscriptionsCount,
+      [Period.Today, Period.ThisWeek, Period.ThisMonth, Period.ThisYear],
+    )
+  }
+}

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

@@ -0,0 +1,68 @@
+import 'reflect-metadata'
+
+import { SubscriptionName } from '@standardnotes/common'
+import { SubscriptionRenewedEvent } from '@standardnotes/domain-events'
+
+import { SubscriptionRenewedEventHandler } from './SubscriptionRenewedEventHandler'
+import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
+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, 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'
+    event.payload = {
+      subscriptionId: 1,
+      userEmail: 'test@test.com',
+      subscriptionName: SubscriptionName.ProPlan,
+      subscriptionExpiresAt: 2,
+      timestamp: 1,
+      offline: false,
+      billingFrequency: 1,
+      payAmount: 12.99,
+    }
+
+    getUserAnalyticsId = {} as jest.Mocked<GetUserAnalyticsId>
+    getUserAnalyticsId.execute = jest.fn().mockReturnValue({ analyticsId: 3 })
+
+    analyticsStore = {} as jest.Mocked<AnalyticsStoreInterface>
+    analyticsStore.markActivity = jest.fn()
+    analyticsStore.unmarkActivity = jest.fn()
+
+    saveRevenueModification = {} as jest.Mocked<SaveRevenueModification>
+    saveRevenueModification.execute = jest.fn().mockReturnValue(Result.ok<RevenueModification>())
+  })
+
+  it('should track subscription renewed statistics', async () => {
+    await createHandler().handle(event)
+
+    expect(analyticsStore.markActivity).toHaveBeenCalled()
+    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

@@ -0,0 +1,54 @@
+import { DomainEventHandlerInterface, SubscriptionRenewedEvent } from '@standardnotes/domain-events'
+import { inject, injectable } from 'inversify'
+
+import TYPES from '../../Bootstrap/Types'
+import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
+import { AnalyticsActivity } from '../Analytics/AnalyticsActivity'
+import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
+import { Period } from '../Time/Period'
+import { SaveRevenueModification } from '../UseCase/SaveRevenueModification/SaveRevenueModification'
+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 {
+  constructor(
+    @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> {
+    const { analyticsId, userUuid } = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
+    await this.analyticsStore.markActivity([AnalyticsActivity.SubscriptionRenewed], analyticsId, [
+      Period.Today,
+      Period.ThisWeek,
+      Period.ThisMonth,
+    ])
+    await this.analyticsStore.unmarkActivity(
+      [AnalyticsActivity.ExistingCustomersChurn, AnalyticsActivity.NewCustomersChurn],
+      analyticsId,
+      [Period.Today, Period.ThisWeek, Period.ThisMonth],
+    )
+
+    const result = await this.saveRevenueModification.execute({
+      billingFrequency: event.payload.billingFrequency,
+      eventType: SubscriptionEventType.create(event.type).getValue(),
+      newSubscriber: false,
+      payedAmount: event.payload.payAmount,
+      planName: SubscriptionPlanName.create(event.payload.subscriptionName).getValue(),
+      subscriptionId: event.payload.subscriptionId,
+      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/UserRegisteredEventHandler.spec.ts

@@ -0,0 +1,47 @@
+import 'reflect-metadata'
+
+import { UserRegisteredEvent } from '@standardnotes/domain-events'
+import { ProtocolVersion } from '@standardnotes/common'
+
+import { UserRegisteredEventHandler } from './UserRegisteredEventHandler'
+import { AnalyticsEntityRepositoryInterface } from '../Entity/AnalyticsEntityRepositoryInterface'
+import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
+import { Period } from '../Time/Period'
+
+describe('UserRegisteredEventHandler', () => {
+  let analyticsEntityRepository: AnalyticsEntityRepositoryInterface
+  let event: UserRegisteredEvent
+  let analyticsStore: AnalyticsStoreInterface
+
+  const createHandler = () => new UserRegisteredEventHandler(analyticsEntityRepository, analyticsStore)
+
+  beforeEach(() => {
+    event = {} as jest.Mocked<UserRegisteredEvent>
+    event.createdAt = new Date(1)
+    event.payload = {
+      userUuid: '1-2-3',
+      email: 'test@test.te',
+      protocolVersion: ProtocolVersion.V004,
+    }
+
+    analyticsStore = {} as jest.Mocked<AnalyticsStoreInterface>
+    analyticsStore.markActivity = jest.fn()
+
+    analyticsEntityRepository = {} as jest.Mocked<AnalyticsEntityRepositoryInterface>
+    analyticsEntityRepository.save = jest.fn().mockImplementation((entity) => ({
+      ...entity,
+      id: 1,
+    }))
+  })
+
+  it('should save analytics entity upon user registration', async () => {
+    await createHandler().handle(event)
+
+    expect(analyticsEntityRepository.save).toHaveBeenCalled()
+    expect(analyticsStore.markActivity).toHaveBeenCalledWith(['register'], 1, [
+      Period.Today,
+      Period.ThisWeek,
+      Period.ThisMonth,
+    ])
+  })
+})

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

@@ -0,0 +1,30 @@
+import { DomainEventHandlerInterface, UserRegisteredEvent } from '@standardnotes/domain-events'
+import { inject, injectable } from 'inversify'
+
+import TYPES from '../../Bootstrap/Types'
+import { AnalyticsActivity } from '../Analytics/AnalyticsActivity'
+import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
+import { AnalyticsEntity } from '../Entity/AnalyticsEntity'
+import { AnalyticsEntityRepositoryInterface } from '../Entity/AnalyticsEntityRepositoryInterface'
+import { Period } from '../Time/Period'
+
+@injectable()
+export class UserRegisteredEventHandler implements DomainEventHandlerInterface {
+  constructor(
+    @inject(TYPES.AnalyticsEntityRepository) private analyticsEntityRepository: AnalyticsEntityRepositoryInterface,
+    @inject(TYPES.AnalyticsStore) private analyticsStore: AnalyticsStoreInterface,
+  ) {}
+
+  async handle(event: UserRegisteredEvent): Promise<void> {
+    let analyticsEntity = new AnalyticsEntity()
+    analyticsEntity.userUuid = event.payload.userUuid
+    analyticsEntity.userEmail = event.payload.email
+    analyticsEntity = await this.analyticsEntityRepository.save(analyticsEntity)
+
+    await this.analyticsStore.markActivity([AnalyticsActivity.Register], analyticsEntity.id, [
+      Period.Today,
+      Period.ThisWeek,
+      Period.ThisMonth,
+    ])
+  }
+}

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

@@ -0,0 +1,4 @@
+export interface MapInterface<T, U> {
+  toDomain(persistence: U): T
+  toPersistence(domain: T): U
+}

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

@@ -0,0 +1,81 @@
+import { injectable } from 'inversify'
+
+import { TypeORMRevenueModification } from '../../Infra/TypeORM/TypeORMRevenueModification'
+import { UniqueEntityId } from '../Core/UniqueEntityId'
+import { MonthlyRevenue } from '../Revenue/MonthlyRevenue'
+import { RevenueModification } from '../Revenue/RevenueModification'
+import { Subscription } from '../Subscription/Subscription'
+import { User } from '../User/User'
+import { MapInterface } from './MapInterface'
+import { Email } from '../Common/Email'
+import { SubscriptionPlanName } from '../Subscription/SubscriptionPlanName'
+import { SubscriptionEventType } from '../Subscription/SubscriptionEventType'
+
+@injectable()
+export class RevenueModificationMap implements MapInterface<RevenueModification, TypeORMRevenueModification> {
+  toDomain(persistence: TypeORMRevenueModification): RevenueModification {
+    const userOrError = User.create(
+      {
+        email: Email.create(persistence.userEmail).getValue(),
+      },
+      new UniqueEntityId(persistence.userUuid),
+    )
+    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,
+        payedAmount: persistence.billingFrequency * persistence.newMonthlyRevenue,
+        planName: SubscriptionPlanName.create(persistence.subscriptionPlan).getValue(),
+      },
+      new UniqueEntityId(persistence.subscriptionId),
+    )
+    if (subscriptionOrError.isFailed()) {
+      throw new Error(`Could not create subscription: ${subscriptionOrError.getError()}`)
+    }
+    const subscription = subscriptionOrError.getValue()
+
+    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 {
+    const { subscription, user } = domain.props
+    const persistence = new TypeORMRevenueModification()
+    persistence.uuid = domain.id.toString()
+    persistence.billingFrequency = subscription.props.billingFrequency
+    persistence.eventType = domain.props.eventType.value
+    persistence.isNewCustomer = subscription.props.isFirstSubscriptionForUser
+    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
+    persistence.userEmail = user.props.email.value
+    persistence.userUuid = user.id.toString()
+    persistence.createdAt = domain.props.createdAt
+
+    return persistence
+  }
+}

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

@@ -0,0 +1,16 @@
+import { MonthlyRevenue } from './MonthlyRevenue'
+
+describe('MonthlyRevenue', () => {
+  it('should create a value object', () => {
+    const valueOrError = MonthlyRevenue.create(123)
+
+    expect(valueOrError.isFailed()).toBeFalsy()
+    expect(valueOrError.getValue().value).toEqual(123)
+  })
+
+  it('should not create an invalid value object', () => {
+    const valueOrError = MonthlyRevenue.create(-3)
+
+    expect(valueOrError.isFailed()).toBeTruthy()
+  })
+})

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

@@ -0,0 +1,21 @@
+import { ValueObject } from '../Core/ValueObject'
+import { Result } from '../Core/Result'
+import { MonthlyRevenueProps } from './MonthlyRevenueProps'
+
+export class MonthlyRevenue extends ValueObject<MonthlyRevenueProps> {
+  get value(): number {
+    return this.props.value
+  }
+
+  private constructor(props: MonthlyRevenueProps) {
+    super(props)
+  }
+
+  static create(revenue: number): Result<MonthlyRevenue> {
+    if (isNaN(revenue) || revenue < 0) {
+      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/MonthlyRevenueProps.ts

@@ -0,0 +1,3 @@
+export interface MonthlyRevenueProps {
+  value: number
+}

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

@@ -0,0 +1,38 @@
+import { Email } from '../Common/Email'
+import { Subscription } from '../Subscription/Subscription'
+import { SubscriptionEventType } from '../Subscription/SubscriptionEventType'
+import { SubscriptionPlanName } from '../Subscription/SubscriptionPlanName'
+import { User } from '../User/User'
+import { MonthlyRevenue } from './MonthlyRevenue'
+import { RevenueModification } from './RevenueModification'
+
+describe('RevenueModification', () => {
+  let user: User
+  let subscription: Subscription
+
+  beforeEach(() => {
+    subscription = Subscription.create({
+      billingFrequency: 12,
+      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', () => {
+    const revenueModification = RevenueModification.create({
+      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.props.newMonthlyRevenue.value).toEqual(45)
+  })
+})

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

@@ -0,0 +1,14 @@
+import { Aggregate } from '../Core/Aggregate'
+import { Result } from '../Core/Result'
+import { UniqueEntityId } from '../Core/UniqueEntityId'
+import { RevenueModificationProps } from './RevenueModificationProps'
+
+export class RevenueModification extends Aggregate<RevenueModificationProps> {
+  private constructor(props: RevenueModificationProps, id?: UniqueEntityId) {
+    super(props, id)
+  }
+
+  static create(props: RevenueModificationProps, id?: UniqueEntityId): Result<RevenueModification> {
+    return Result.ok<RevenueModification>(new RevenueModification(props, id))
+  }
+}

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

@@ -0,0 +1,13 @@
+import { MonthlyRevenue } from './MonthlyRevenue'
+import { Subscription } from '../Subscription/Subscription'
+import { User } from '../User/User'
+import { SubscriptionEventType } from '../Subscription/SubscriptionEventType'
+
+export interface RevenueModificationProps {
+  user: User
+  subscription: Subscription
+  eventType: SubscriptionEventType
+  previousMonthlyRevenue: MonthlyRevenue
+  newMonthlyRevenue: MonthlyRevenue
+  createdAt: number
+}

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

@@ -0,0 +1,8 @@
+import { Uuid } from '../Common/Uuid'
+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

@@ -13,9 +13,12 @@ export enum StatisticsMeasure {
   RegistrationToSubscriptionTime = 'registration-to-subscription-time',
   RemainingSubscriptionTimePercentage = 'remaining-subscription-time-percentage',
   Refunds = 'refunds',
-  NotesCountFreeUsers = 'notes-count-free-users',
-  NotesCountPaidUsers = 'notes-count-paid-users',
-  FilesCount = 'files-count',
   NewCustomers = 'new-customers',
   TotalCustomers = 'total-customers',
+  MRR = 'mrr',
+  MonthlyPlansMRR = 'monthly-plans-mrr',
+  AnnualPlansMRR = 'annual-plans-mrr',
+  FiveYearPlansMRR = 'five-year-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

@@ -0,0 +1,15 @@
+import { Subscription } from './Subscription'
+import { SubscriptionPlanName } from './SubscriptionPlanName'
+
+describe('Subscription', () => {
+  it('should create an entity', () => {
+    const subscription = Subscription.create({
+      billingFrequency: 1,
+      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

@@ -0,0 +1,18 @@
+import { Entity } from '../Core/Entity'
+import { Result } from '../Core/Result'
+import { UniqueEntityId } from '../Core/UniqueEntityId'
+import { SubscriptionProps } from './SubscriptionProps'
+
+export class Subscription extends Entity<SubscriptionProps> {
+  get id(): UniqueEntityId {
+    return this._id
+  }
+
+  private constructor(props: SubscriptionProps, id?: UniqueEntityId) {
+    super(props, id)
+  }
+
+  static create(props: SubscriptionProps, id?: UniqueEntityId): Result<Subscription> {
+    return Result.ok<Subscription>(new Subscription(props, id))
+  }
+}

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

@@ -0,0 +1,16 @@
+import { SubscriptionEventType } from './SubscriptionEventType'
+
+describe('SubscriptionEventType', () => {
+  it('should create a value object', () => {
+    const valueOrError = SubscriptionEventType.create('SUBSCRIPTION_PURCHASED')
+
+    expect(valueOrError.isFailed()).toBeFalsy()
+    expect(valueOrError.getValue().value).toEqual('SUBSCRIPTION_PURCHASED')
+  })
+
+  it('should not create an invalid value object', () => {
+    const valueOrError = SubscriptionEventType.create('SUBSCRIPTION_REACTIVATED')
+
+    expect(valueOrError.isFailed()).toBeTruthy()
+  })
+})

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

@@ -0,0 +1,30 @@
+import { ValueObject } from '../Core/ValueObject'
+import { Result } from '../Core/Result'
+import { SubscriptionEventTypeProps } from './SubscriptionEventTypeProps'
+
+export class SubscriptionEventType extends ValueObject<SubscriptionEventTypeProps> {
+  get value(): string {
+    return this.props.value
+  }
+
+  private constructor(props: SubscriptionEventTypeProps) {
+    super(props)
+  }
+
+  static create(subscriptionEventType: string): Result<SubscriptionEventType> {
+    if (
+      ![
+        'SUBSCRIPTION_PURCHASED',
+        'SUBSCRIPTION_RENEWED',
+        'SUBSCRIPTION_EXPIRED',
+        'SUBSCRIPTION_REFUNDED',
+        'SUBSCRIPTION_CANCELLED',
+        'SUBSCRIPTION_DATA_MIGRATED',
+      ].includes(subscriptionEventType)
+    ) {
+      return Result.fail<SubscriptionEventType>(`Invalid subscription event type ${subscriptionEventType}`)
+    } else {
+      return Result.ok<SubscriptionEventType>(new SubscriptionEventType({ value: subscriptionEventType }))
+    }
+  }
+}

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

@@ -0,0 +1,3 @@
+export interface SubscriptionEventTypeProps {
+  value: string
+}

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

@@ -0,0 +1,16 @@
+import { SubscriptionPlanName } from './SubscriptionPlanName'
+
+describe('SubscriptionPlanName', () => {
+  it('should create a value object', () => {
+    const valueOrError = SubscriptionPlanName.create('PRO_PLAN')
+
+    expect(valueOrError.isFailed()).toBeFalsy()
+    expect(valueOrError.getValue().value).toEqual('PRO_PLAN')
+  })
+
+  it('should not create an invalid value object', () => {
+    const valueOrError = SubscriptionPlanName.create('TEST')
+
+    expect(valueOrError.isFailed()).toBeTruthy()
+  })
+})

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

@@ -0,0 +1,21 @@
+import { ValueObject } from '../Core/ValueObject'
+import { Result } from '../Core/Result'
+import { SubscriptionPlanNameProps } from './SubscriptionPlanNameProps'
+
+export class SubscriptionPlanName extends ValueObject<SubscriptionPlanNameProps> {
+  get value(): string {
+    return this.props.value
+  }
+
+  private constructor(props: SubscriptionPlanNameProps) {
+    super(props)
+  }
+
+  static create(subscriptionPlanName: string): Result<SubscriptionPlanName> {
+    if (!['PRO_PLAN', 'PLUS_PLAN'].includes(subscriptionPlanName)) {
+      return Result.fail<SubscriptionPlanName>(`Invalid subscription plan name ${subscriptionPlanName}`)
+    } else {
+      return Result.ok<SubscriptionPlanName>(new SubscriptionPlanName({ value: subscriptionPlanName }))
+    }
+  }
+}

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

@@ -0,0 +1,3 @@
+export interface SubscriptionPlanNameProps {
+  value: string
+}

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

@@ -0,0 +1,8 @@
+import { SubscriptionPlanName } from '../Subscription/SubscriptionPlanName'
+
+export interface SubscriptionProps {
+  planName: SubscriptionPlanName
+  isFirstSubscriptionForUser: boolean
+  payedAmount: number
+  billingFrequency: number
+}

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',