chore(release): publish new version

- @standardnotes/analytics@2.9.6
 - @standardnotes/api-gateway@1.38.1
 - @standardnotes/auth-server@1.59.7
 - @standardnotes/domain-events-infra@1.9.23
 - @standardnotes/event-store@1.6.18
 - @standardnotes/files-server@1.8.18
 - @standardnotes/scheduler-server@1.13.19
 - @standardnotes/syncing-server@1.13.2
 - @standardnotes/websockets-server@1.4.20
 - @standardnotes/workspace-server@1.17.18

.pnp.cjs

@@ -118,13 +118,13 @@ const RAW_RUNTIME_STATE =
           ["@lerna-lite/run", "npm:1.6.0"],\
           ["@sentry/node", "npm:7.5.0"],\
           ["@types/jest", "npm:29.1.1"],\
-          ["@types/newrelic", "npm:7.0.3"],\
+          ["@types/newrelic", "npm:7.0.4"],\
           ["@types/node", "npm:18.0.3"],\
           ["@typescript-eslint/parser", "virtual:8859b278716fedf3e7458b5628625f7e35678c418626878559a0b816445001b7e24c55546f4677ba4c20b521aa0cf52cc33ac07deff171e383ada6eeab69933f#npm:5.40.1"],\
           ["eslint", "npm:8.19.0"],\
           ["eslint-config-prettier", "virtual:8859b278716fedf3e7458b5628625f7e35678c418626878559a0b816445001b7e24c55546f4677ba4c20b521aa0cf52cc33ac07deff171e383ada6eeab69933f#npm:8.5.0"],\
           ["ini", "npm:3.0.0"],\
-          ["newrelic", "npm:9.0.0"],\
+          ["newrelic", "npm:9.6.0"],\
           ["npm-check-updates", "npm:16.0.1"],\
           ["prettier", "npm:2.7.1"],\
           ["ts-node", "virtual:8859b278716fedf3e7458b5628625f7e35678c418626878559a0b816445001b7e24c55546f4677ba4c20b521aa0cf52cc33ac07deff171e383ada6eeab69933f#npm:10.9.1"],\
@@ -1865,12 +1865,12 @@ const RAW_RUNTIME_STATE =
         ],\
         "linkType": "SOFT"\
       }],\
-      ["virtual:65e8703d5df08d5ff3f7296fcb759f276254ee430ae6f3cc1f03da392ff63066a3c6c59591c38f36f19d3e877285287a834b5c55e22d764dc2cb0938f7128707#npm:5.0.0", {\
-        "packageLocation": "./.yarn/__virtual__/@newrelic-aws-sdk-virtual-e9040e4121/0/cache/@newrelic-aws-sdk-npm-5.0.0-7d9d10d58f-ed1dc3fa16.zip/node_modules/@newrelic/aws-sdk/",\
+      ["virtual:f10080c2deb75096716a913b06010dcd94891c77539a757ab32210a1efc3ff91527b36d6c7c46e890db826160e0724553ca23acd0a8a734b5554c9600c71eb52#npm:5.0.0", {\
+        "packageLocation": "./.yarn/__virtual__/@newrelic-aws-sdk-virtual-ccf1e948b3/0/cache/@newrelic-aws-sdk-npm-5.0.0-7d9d10d58f-ed1dc3fa16.zip/node_modules/@newrelic/aws-sdk/",\
         "packageDependencies": [\
-          ["@newrelic/aws-sdk", "virtual:65e8703d5df08d5ff3f7296fcb759f276254ee430ae6f3cc1f03da392ff63066a3c6c59591c38f36f19d3e877285287a834b5c55e22d764dc2cb0938f7128707#npm:5.0.0"],\
+          ["@newrelic/aws-sdk", "virtual:f10080c2deb75096716a913b06010dcd94891c77539a757ab32210a1efc3ff91527b36d6c7c46e890db826160e0724553ca23acd0a8a734b5554c9600c71eb52#npm:5.0.0"],\
           ["@types/newrelic", null],\
-          ["newrelic", "npm:9.0.0"]\
+          ["newrelic", "npm:9.6.0"]\
         ],\
         "packagePeers": [\
           "@types/newrelic",\
@@ -1887,12 +1887,12 @@ const RAW_RUNTIME_STATE =
         ],\
         "linkType": "SOFT"\
       }],\
-      ["virtual:65e8703d5df08d5ff3f7296fcb759f276254ee430ae6f3cc1f03da392ff63066a3c6c59591c38f36f19d3e877285287a834b5c55e22d764dc2cb0938f7128707#npm:7.0.0", {\
-        "packageLocation": "./.yarn/__virtual__/@newrelic-koa-virtual-d6376894e6/0/cache/@newrelic-koa-npm-7.0.0-903c251b9f-0fc2298c8b.zip/node_modules/@newrelic/koa/",\
+      ["virtual:f10080c2deb75096716a913b06010dcd94891c77539a757ab32210a1efc3ff91527b36d6c7c46e890db826160e0724553ca23acd0a8a734b5554c9600c71eb52#npm:7.0.0", {\
+        "packageLocation": "./.yarn/__virtual__/@newrelic-koa-virtual-613d84b4f1/0/cache/@newrelic-koa-npm-7.0.0-903c251b9f-0fc2298c8b.zip/node_modules/@newrelic/koa/",\
         "packageDependencies": [\
-          ["@newrelic/koa", "virtual:65e8703d5df08d5ff3f7296fcb759f276254ee430ae6f3cc1f03da392ff63066a3c6c59591c38f36f19d3e877285287a834b5c55e22d764dc2cb0938f7128707#npm:7.0.0"],\
+          ["@newrelic/koa", "virtual:f10080c2deb75096716a913b06010dcd94891c77539a757ab32210a1efc3ff91527b36d6c7c46e890db826160e0724553ca23acd0a8a734b5554c9600c71eb52#npm:7.0.0"],\
           ["@types/newrelic", null],\
-          ["newrelic", "npm:9.0.0"]\
+          ["newrelic", "npm:9.6.0"]\
         ],\
         "packagePeers": [\
           "@types/newrelic",\
@@ -1922,12 +1922,12 @@ const RAW_RUNTIME_STATE =
         ],\
         "linkType": "SOFT"\
       }],\
-      ["virtual:65e8703d5df08d5ff3f7296fcb759f276254ee430ae6f3cc1f03da392ff63066a3c6c59591c38f36f19d3e877285287a834b5c55e22d764dc2cb0938f7128707#npm:6.0.0", {\
-        "packageLocation": "./.yarn/__virtual__/@newrelic-superagent-virtual-c2a5d7b8a8/0/cache/@newrelic-superagent-npm-6.0.0-db8b77d0f3-b77997b792.zip/node_modules/@newrelic/superagent/",\
+      ["virtual:f10080c2deb75096716a913b06010dcd94891c77539a757ab32210a1efc3ff91527b36d6c7c46e890db826160e0724553ca23acd0a8a734b5554c9600c71eb52#npm:6.0.0", {\
+        "packageLocation": "./.yarn/__virtual__/@newrelic-superagent-virtual-37eb7b41a0/0/cache/@newrelic-superagent-npm-6.0.0-db8b77d0f3-b77997b792.zip/node_modules/@newrelic/superagent/",\
         "packageDependencies": [\
-          ["@newrelic/superagent", "virtual:65e8703d5df08d5ff3f7296fcb759f276254ee430ae6f3cc1f03da392ff63066a3c6c59591c38f36f19d3e877285287a834b5c55e22d764dc2cb0938f7128707#npm:6.0.0"],\
+          ["@newrelic/superagent", "virtual:f10080c2deb75096716a913b06010dcd94891c77539a757ab32210a1efc3ff91527b36d6c7c46e890db826160e0724553ca23acd0a8a734b5554c9600c71eb52#npm:6.0.0"],\
           ["@types/newrelic", null],\
-          ["newrelic", "npm:9.0.0"]\
+          ["newrelic", "npm:9.6.0"]\
         ],\
         "packagePeers": [\
           "@types/newrelic",\
@@ -1948,8 +1948,8 @@ const RAW_RUNTIME_STATE =
         "packageLocation": "./.yarn/__virtual__/@newrelic-winston-enricher-virtual-6b8c53ab3d/0/cache/@newrelic-winston-enricher-npm-4.0.0-ebaf2d0d28-3fc901cded.zip/node_modules/@newrelic/winston-enricher/",\
         "packageDependencies": [\
           ["@newrelic/winston-enricher", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:4.0.0"],\
-          ["@types/newrelic", "npm:7.0.3"],\
-          ["newrelic", "npm:9.0.0"]\
+          ["@types/newrelic", "npm:7.0.4"],\
+          ["newrelic", "npm:9.6.0"]\
         ],\
         "packagePeers": [\
           "@types/newrelic",\
@@ -2549,8 +2549,9 @@ const RAW_RUNTIME_STATE =
           ["@standardnotes/time", "workspace:packages/time"],\
           ["@types/ioredis", "npm:4.28.10"],\
           ["@types/jest", "npm:29.1.1"],\
-          ["@types/newrelic", "npm:7.0.3"],\
+          ["@types/newrelic", "npm:7.0.4"],\
           ["@types/node", "npm:18.0.3"],\
+          ["@types/uuid", "npm:8.3.4"],\
           ["@typescript-eslint/eslint-plugin", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:5.30.5"],\
           ["aws-sdk", "npm:2.1234.0"],\
           ["dayjs", "npm:1.11.6"],\
@@ -2561,11 +2562,13 @@ const RAW_RUNTIME_STATE =
           ["ioredis", "npm:5.2.3"],\
           ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
           ["mysql2", "npm:2.3.3"],\
-          ["newrelic", "npm:9.0.0"],\
+          ["newrelic", "npm:9.6.0"],\
           ["reflect-metadata", "npm:0.1.13"],\
+          ["shallow-equal-object", "npm:1.1.1"],\
           ["ts-jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.0.3"],\
           ["typeorm", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:0.3.10"],\
           ["typescript", "patch:typescript@npm%3A4.8.4#optional!builtin<compat/typescript>::version=4.8.4&hash=701156"],\
+          ["uuid", "npm:9.0.0"],\
           ["winston", "npm:3.8.2"]\
         ],\
         "linkType": "SOFT"\
@@ -2604,11 +2607,11 @@ const RAW_RUNTIME_STATE =
           ["@types/ioredis", "npm:4.28.10"],\
           ["@types/jest", "npm:29.1.1"],\
           ["@types/jsonwebtoken", "npm:8.5.9"],\
-          ["@types/newrelic", "npm:7.0.3"],\
+          ["@types/newrelic", "npm:7.0.4"],\
           ["@types/prettyjson", "npm:0.0.30"],\
           ["@typescript-eslint/eslint-plugin", "virtual:04783e12400851b8a3d76e71495851cc94959db6e62f04cb0a31190080629440b182d8c8eb4d7f2b04e281912f2783a5fd4d2c3c6ab68d38b7097246c93f4c19#npm:5.40.1"],\
           ["aws-sdk", "npm:2.1234.0"],\
-          ["axios", "npm:0.27.2"],\
+          ["axios", "npm:1.1.3"],\
           ["cors", "npm:2.8.5"],\
           ["dotenv", "npm:16.0.1"],\
           ["eslint", "npm:8.25.0"],\
@@ -2620,7 +2623,7 @@ const RAW_RUNTIME_STATE =
           ["ioredis", "npm:5.2.3"],\
           ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
           ["jsonwebtoken", "npm:8.5.1"],\
-          ["newrelic", "npm:9.0.0"],\
+          ["newrelic", "npm:9.6.0"],\
           ["nodemon", "npm:2.0.20"],\
           ["npm-check-updates", "npm:16.0.1"],\
           ["prettyjson", "npm:1.2.5"],\
@@ -2667,14 +2670,14 @@ const RAW_RUNTIME_STATE =
           ["@types/express", "npm:4.17.14"],\
           ["@types/ioredis", "npm:4.28.10"],\
           ["@types/jest", "npm:29.1.1"],\
-          ["@types/newrelic", "npm:7.0.3"],\
+          ["@types/newrelic", "npm:7.0.4"],\
           ["@types/otplib", "npm:10.0.0"],\
           ["@types/prettyjson", "npm:0.0.30"],\
           ["@types/ua-parser-js", "npm:0.7.36"],\
           ["@types/uuid", "npm:8.3.4"],\
           ["@typescript-eslint/eslint-plugin", "virtual:04783e12400851b8a3d76e71495851cc94959db6e62f04cb0a31190080629440b182d8c8eb4d7f2b04e281912f2783a5fd4d2c3c6ab68d38b7097246c93f4c19#npm:5.40.1"],\
           ["aws-sdk", "npm:2.1234.0"],\
-          ["axios", "npm:0.27.2"],\
+          ["axios", "npm:1.1.3"],\
           ["bcryptjs", "npm:2.4.3"],\
           ["cors", "npm:2.8.5"],\
           ["dayjs", "npm:1.11.6"],\
@@ -2687,7 +2690,7 @@ const RAW_RUNTIME_STATE =
           ["ioredis", "npm:5.2.3"],\
           ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
           ["mysql2", "npm:2.3.3"],\
-          ["newrelic", "npm:9.0.0"],\
+          ["newrelic", "npm:9.6.0"],\
           ["nodemon", "npm:2.0.20"],\
           ["npm-check-updates", "npm:16.0.1"],\
           ["otplib", "npm:12.0.1"],\
@@ -2696,7 +2699,7 @@ const RAW_RUNTIME_STATE =
           ["ts-jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.0.3"],\
           ["typeorm", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:0.3.10"],\
           ["typescript", "patch:typescript@npm%3A4.8.4#optional!builtin<compat/typescript>::version=4.8.4&hash=701156"],\
-          ["ua-parser-js", "npm:1.0.2"],\
+          ["ua-parser-js", "npm:1.0.32"],\
           ["uuid", "npm:9.0.0"],\
           ["winston", "npm:3.8.2"]\
         ],\
@@ -2762,13 +2765,13 @@ const RAW_RUNTIME_STATE =
           ["@standardnotes/domain-events", "workspace:packages/domain-events"],\
           ["@types/ioredis", "npm:4.28.10"],\
           ["@types/jest", "npm:29.1.1"],\
-          ["@types/newrelic", "npm:7.0.3"],\
+          ["@types/newrelic", "npm:7.0.4"],\
           ["@typescript-eslint/eslint-plugin", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:5.30.5"],\
           ["aws-sdk", "npm:2.1234.0"],\
           ["eslint-plugin-prettier", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:4.2.1"],\
           ["ioredis", "npm:5.2.3"],\
           ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
-          ["newrelic", "npm:9.0.0"],\
+          ["newrelic", "npm:9.6.0"],\
           ["reflect-metadata", "npm:0.1.13"],\
           ["sqs-consumer", "virtual:685a6222c3349423674bb7f0684ba34e2ab20912010f352e04dcf707a156e13183fc382e2417cb37a60f3e7b52fd0178c53181674890e1773eb83e190dc13378#npm:5.7.0"],\
           ["ts-jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.0.3"],\
@@ -2803,7 +2806,7 @@ const RAW_RUNTIME_STATE =
           ["@standardnotes/time", "workspace:packages/time"],\
           ["@types/ioredis", "npm:4.28.10"],\
           ["@types/jest", "npm:29.1.1"],\
-          ["@types/newrelic", "npm:7.0.3"],\
+          ["@types/newrelic", "npm:7.0.4"],\
           ["@types/nodemailer", "npm:6.4.6"],\
           ["@typescript-eslint/eslint-plugin", "virtual:04783e12400851b8a3d76e71495851cc94959db6e62f04cb0a31190080629440b182d8c8eb4d7f2b04e281912f2783a5fd4d2c3c6ab68d38b7097246c93f4c19#npm:5.40.1"],\
           ["aws-sdk", "npm:2.1234.0"],\
@@ -2814,7 +2817,7 @@ const RAW_RUNTIME_STATE =
           ["ioredis", "npm:5.2.3"],\
           ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
           ["mysql2", "npm:2.3.3"],\
-          ["newrelic", "npm:9.0.0"],\
+          ["newrelic", "npm:9.6.0"],\
           ["reflect-metadata", "npm:0.1.13"],\
           ["ts-jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.0.3"],\
           ["typeorm", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:0.3.10"],\
@@ -2868,7 +2871,7 @@ const RAW_RUNTIME_STATE =
           ["@types/ioredis", "npm:4.28.10"],\
           ["@types/jest", "npm:29.1.1"],\
           ["@types/jsonwebtoken", "npm:8.5.9"],\
-          ["@types/newrelic", "npm:7.0.3"],\
+          ["@types/newrelic", "npm:7.0.4"],\
           ["@types/prettyjson", "npm:0.0.30"],\
           ["@types/uuid", "npm:8.3.4"],\
           ["@typescript-eslint/eslint-plugin", "virtual:04783e12400851b8a3d76e71495851cc94959db6e62f04cb0a31190080629440b182d8c8eb4d7f2b04e281912f2783a5fd4d2c3c6ab68d38b7097246c93f4c19#npm:5.40.1"],\
@@ -2887,7 +2890,7 @@ const RAW_RUNTIME_STATE =
           ["ioredis", "npm:5.2.3"],\
           ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
           ["jsonwebtoken", "npm:8.5.1"],\
-          ["newrelic", "npm:9.0.0"],\
+          ["newrelic", "npm:9.6.0"],\
           ["nodemon", "npm:2.0.20"],\
           ["npm-check-updates", "npm:16.0.1"],\
           ["prettyjson", "npm:1.2.5"],\
@@ -2996,7 +2999,7 @@ const RAW_RUNTIME_STATE =
           ["@standardnotes/time", "workspace:packages/time"],\
           ["@types/ioredis", "npm:4.28.10"],\
           ["@types/jest", "npm:29.1.1"],\
-          ["@types/newrelic", "npm:7.0.3"],\
+          ["@types/newrelic", "npm:7.0.4"],\
           ["@types/node", "npm:18.0.3"],\
           ["@typescript-eslint/eslint-plugin", "virtual:04783e12400851b8a3d76e71495851cc94959db6e62f04cb0a31190080629440b182d8c8eb4d7f2b04e281912f2783a5fd4d2c3c6ab68d38b7097246c93f4c19#npm:5.40.1"],\
           ["aws-sdk", "npm:2.1234.0"],\
@@ -3008,7 +3011,7 @@ const RAW_RUNTIME_STATE =
           ["ioredis", "npm:5.2.3"],\
           ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
           ["mysql2", "npm:2.3.3"],\
-          ["newrelic", "npm:9.0.0"],\
+          ["newrelic", "npm:9.6.0"],\
           ["npm-check-updates", "npm:16.0.1"],\
           ["reflect-metadata", "npm:0.1.13"],\
           ["ts-jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.0.3"],\
@@ -3050,13 +3053,13 @@ const RAW_RUNTIME_STATE =
           ["@lerna-lite/run", "npm:1.6.0"],\
           ["@sentry/node", "npm:7.5.0"],\
           ["@types/jest", "npm:29.1.1"],\
-          ["@types/newrelic", "npm:7.0.3"],\
+          ["@types/newrelic", "npm:7.0.4"],\
           ["@types/node", "npm:18.0.3"],\
           ["@typescript-eslint/parser", "virtual:8859b278716fedf3e7458b5628625f7e35678c418626878559a0b816445001b7e24c55546f4677ba4c20b521aa0cf52cc33ac07deff171e383ada6eeab69933f#npm:5.40.1"],\
           ["eslint", "npm:8.19.0"],\
           ["eslint-config-prettier", "virtual:8859b278716fedf3e7458b5628625f7e35678c418626878559a0b816445001b7e24c55546f4677ba4c20b521aa0cf52cc33ac07deff171e383ada6eeab69933f#npm:8.5.0"],\
           ["ini", "npm:3.0.0"],\
-          ["newrelic", "npm:9.0.0"],\
+          ["newrelic", "npm:9.6.0"],\
           ["npm-check-updates", "npm:16.0.1"],\
           ["prettier", "npm:2.7.1"],\
           ["ts-node", "virtual:8859b278716fedf3e7458b5628625f7e35678c418626878559a0b816445001b7e24c55546f4677ba4c20b521aa0cf52cc33ac07deff171e383ada6eeab69933f#npm:10.9.1"],\
@@ -3130,13 +3133,13 @@ const RAW_RUNTIME_STATE =
           ["@types/ioredis", "npm:4.28.10"],\
           ["@types/jest", "npm:29.1.1"],\
           ["@types/jsonwebtoken", "npm:8.5.9"],\
-          ["@types/newrelic", "npm:7.0.3"],\
+          ["@types/newrelic", "npm:7.0.4"],\
           ["@types/prettyjson", "npm:0.0.30"],\
           ["@types/ua-parser-js", "npm:0.7.36"],\
           ["@types/uuid", "npm:8.3.4"],\
           ["@typescript-eslint/eslint-plugin", "virtual:04783e12400851b8a3d76e71495851cc94959db6e62f04cb0a31190080629440b182d8c8eb4d7f2b04e281912f2783a5fd4d2c3c6ab68d38b7097246c93f4c19#npm:5.40.1"],\
           ["aws-sdk", "npm:2.1234.0"],\
-          ["axios", "npm:0.27.2"],\
+          ["axios", "npm:1.1.3"],\
           ["cors", "npm:2.8.5"],\
           ["dotenv", "npm:16.0.1"],\
           ["eslint", "npm:8.25.0"],\
@@ -3149,7 +3152,7 @@ const RAW_RUNTIME_STATE =
           ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
           ["jsonwebtoken", "npm:8.5.1"],\
           ["mysql2", "npm:2.3.3"],\
-          ["newrelic", "npm:9.0.0"],\
+          ["newrelic", "npm:9.6.0"],\
           ["nodemon", "npm:2.0.20"],\
           ["npm-check-updates", "npm:16.0.1"],\
           ["prettyjson", "npm:1.2.5"],\
@@ -3157,7 +3160,7 @@ const RAW_RUNTIME_STATE =
           ["ts-jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.0.3"],\
           ["typeorm", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:0.3.10"],\
           ["typescript", "patch:typescript@npm%3A4.8.4#optional!builtin<compat/typescript>::version=4.8.4&hash=701156"],\
-          ["ua-parser-js", "npm:1.0.2"],\
+          ["ua-parser-js", "npm:1.0.32"],\
           ["uuid", "npm:9.0.0"],\
           ["winston", "npm:3.8.2"]\
         ],\
@@ -3223,10 +3226,10 @@ const RAW_RUNTIME_STATE =
           ["@types/express", "npm:4.17.14"],\
           ["@types/ioredis", "npm:4.28.10"],\
           ["@types/jest", "npm:29.1.1"],\
-          ["@types/newrelic", "npm:7.0.3"],\
+          ["@types/newrelic", "npm:7.0.4"],\
           ["@typescript-eslint/eslint-plugin", "virtual:04783e12400851b8a3d76e71495851cc94959db6e62f04cb0a31190080629440b182d8c8eb4d7f2b04e281912f2783a5fd4d2c3c6ab68d38b7097246c93f4c19#npm:5.40.1"],\
           ["aws-sdk", "npm:2.1234.0"],\
-          ["axios", "npm:0.27.2"],\
+          ["axios", "npm:1.1.3"],\
           ["cors", "npm:2.8.5"],\
           ["dotenv", "npm:16.0.1"],\
           ["eslint", "npm:8.25.0"],\
@@ -3237,7 +3240,7 @@ const RAW_RUNTIME_STATE =
           ["ioredis", "npm:5.2.3"],\
           ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
           ["mysql2", "npm:2.3.3"],\
-          ["newrelic", "npm:9.0.0"],\
+          ["newrelic", "npm:9.6.0"],\
           ["reflect-metadata", "npm:0.1.13"],\
           ["ts-jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.0.3"],\
           ["typeorm", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:0.3.10"],\
@@ -3265,7 +3268,7 @@ const RAW_RUNTIME_STATE =
           ["@types/express", "npm:4.17.14"],\
           ["@types/ioredis", "npm:4.28.10"],\
           ["@types/jest", "npm:29.1.1"],\
-          ["@types/newrelic", "npm:7.0.3"],\
+          ["@types/newrelic", "npm:7.0.4"],\
           ["@typescript-eslint/eslint-plugin", "virtual:04783e12400851b8a3d76e71495851cc94959db6e62f04cb0a31190080629440b182d8c8eb4d7f2b04e281912f2783a5fd4d2c3c6ab68d38b7097246c93f4c19#npm:5.40.1"],\
           ["aws-sdk", "npm:2.1234.0"],\
           ["cors", "npm:2.8.5"],\
@@ -3278,7 +3281,7 @@ const RAW_RUNTIME_STATE =
           ["ioredis", "npm:5.2.3"],\
           ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
           ["mysql2", "npm:2.3.3"],\
-          ["newrelic", "npm:9.0.0"],\
+          ["newrelic", "npm:9.6.0"],\
           ["reflect-metadata", "npm:0.1.13"],\
           ["ts-jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.0.3"],\
           ["typeorm", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:0.3.10"],\
@@ -3660,10 +3663,10 @@ const RAW_RUNTIME_STATE =
       }]\
     ]],\
     ["@types/newrelic", [\
-      ["npm:7.0.3", {\
-        "packageLocation": "./.yarn/cache/@types-newrelic-npm-7.0.3-c49600c8f5-f56ebaa21c.zip/node_modules/@types/newrelic/",\
+      ["npm:7.0.4", {\
+        "packageLocation": "./.yarn/cache/@types-newrelic-npm-7.0.4-4f0b179b51-b44215b3ab.zip/node_modules/@types/newrelic/",\
         "packageDependencies": [\
-          ["@types/newrelic", "npm:7.0.3"]\
+          ["@types/newrelic", "npm:7.0.4"]\
         ],\
         "linkType": "HARD"\
       }]\
@@ -4746,12 +4749,13 @@ const RAW_RUNTIME_STATE =
       }]\
     ]],\
     ["axios", [\
-      ["npm:0.27.2", {\
-        "packageLocation": "./.yarn/cache/axios-npm-0.27.2-dbe3a48aea-4cd898afe9.zip/node_modules/axios/",\
+      ["npm:1.1.3", {\
+        "packageLocation": "./.yarn/cache/axios-npm-1.1.3-4b63965ac1-2e28acd01c.zip/node_modules/axios/",\
         "packageDependencies": [\
-          ["axios", "npm:0.27.2"],\
-          ["follow-redirects", "virtual:dbe3a48aea1dd5649e16abaf23d4ae05582d2149e16141955113766a0f84f681baf358c77ddccfc82eb23e4ccc66c6c912df62a9c01f2a83f1842bf86cc297b1#npm:1.15.2"],\
-          ["form-data", "npm:4.0.0"]\
+          ["axios", "npm:1.1.3"],\
+          ["follow-redirects", "virtual:4b63965ac1b2157b91a1875529bea3b0bbc3068d3676d1bef28bff5cf6689705374a86cc3832f95ba8d934037a93cc0e09c3662c13ca0e747800d7ca279a53c0#npm:1.15.2"],\
+          ["form-data", "npm:4.0.0"],\
+          ["proxy-from-env", "npm:1.1.0"]\
         ],\
         "linkType": "HARD"\
       }]\
@@ -7296,10 +7300,10 @@ const RAW_RUNTIME_STATE =
         ],\
         "linkType": "SOFT"\
       }],\
-      ["virtual:dbe3a48aea1dd5649e16abaf23d4ae05582d2149e16141955113766a0f84f681baf358c77ddccfc82eb23e4ccc66c6c912df62a9c01f2a83f1842bf86cc297b1#npm:1.15.2", {\
-        "packageLocation": "./.yarn/__virtual__/follow-redirects-virtual-42073a9d6a/0/cache/follow-redirects-npm-1.15.2-1ec1dd82be-930171f8b8.zip/node_modules/follow-redirects/",\
+      ["virtual:4b63965ac1b2157b91a1875529bea3b0bbc3068d3676d1bef28bff5cf6689705374a86cc3832f95ba8d934037a93cc0e09c3662c13ca0e747800d7ca279a53c0#npm:1.15.2", {\
+        "packageLocation": "./.yarn/__virtual__/follow-redirects-virtual-b0bb08d690/0/cache/follow-redirects-npm-1.15.2-1ec1dd82be-930171f8b8.zip/node_modules/follow-redirects/",\
         "packageDependencies": [\
-          ["follow-redirects", "virtual:dbe3a48aea1dd5649e16abaf23d4ae05582d2149e16141955113766a0f84f681baf358c77ddccfc82eb23e4ccc66c6c912df62a9c01f2a83f1842bf86cc297b1#npm:1.15.2"],\
+          ["follow-redirects", "virtual:4b63965ac1b2157b91a1875529bea3b0bbc3068d3676d1bef28bff5cf6689705374a86cc3832f95ba8d934037a93cc0e09c3662c13ca0e747800d7ca279a53c0#npm:1.15.2"],\
           ["@types/debug", null],\
           ["debug", null]\
         ],\
@@ -10372,18 +10376,17 @@ const RAW_RUNTIME_STATE =
       }]\
     ]],\
     ["newrelic", [\
-      ["npm:9.0.0", {\
-        "packageLocation": "./.yarn/cache/newrelic-npm-9.0.0-65e8703d5d-397f7d2626.zip/node_modules/newrelic/",\
+      ["npm:9.6.0", {\
+        "packageLocation": "./.yarn/cache/newrelic-npm-9.6.0-f10080c2de-eb378acde1.zip/node_modules/newrelic/",\
         "packageDependencies": [\
-          ["newrelic", "npm:9.0.0"],\
+          ["newrelic", "npm:9.6.0"],\
           ["@grpc/grpc-js", "npm:1.6.7"],\
           ["@grpc/proto-loader", "npm:0.6.13"],\
-          ["@newrelic/aws-sdk", "virtual:65e8703d5df08d5ff3f7296fcb759f276254ee430ae6f3cc1f03da392ff63066a3c6c59591c38f36f19d3e877285287a834b5c55e22d764dc2cb0938f7128707#npm:5.0.0"],\
-          ["@newrelic/koa", "virtual:65e8703d5df08d5ff3f7296fcb759f276254ee430ae6f3cc1f03da392ff63066a3c6c59591c38f36f19d3e877285287a834b5c55e22d764dc2cb0938f7128707#npm:7.0.0"],\
+          ["@newrelic/aws-sdk", "virtual:f10080c2deb75096716a913b06010dcd94891c77539a757ab32210a1efc3ff91527b36d6c7c46e890db826160e0724553ca23acd0a8a734b5554c9600c71eb52#npm:5.0.0"],\
+          ["@newrelic/koa", "virtual:f10080c2deb75096716a913b06010dcd94891c77539a757ab32210a1efc3ff91527b36d6c7c46e890db826160e0724553ca23acd0a8a734b5554c9600c71eb52#npm:7.0.0"],\
           ["@newrelic/native-metrics", "npm:9.0.0"],\
-          ["@newrelic/superagent", "virtual:65e8703d5df08d5ff3f7296fcb759f276254ee430ae6f3cc1f03da392ff63066a3c6c59591c38f36f19d3e877285287a834b5c55e22d764dc2cb0938f7128707#npm:6.0.0"],\
+          ["@newrelic/superagent", "virtual:f10080c2deb75096716a913b06010dcd94891c77539a757ab32210a1efc3ff91527b36d6c7c46e890db826160e0724553ca23acd0a8a734b5554c9600c71eb52#npm:6.0.0"],\
           ["@tyriar/fibonacci-heap", "npm:2.0.9"],\
-          ["async", "npm:3.2.4"],\
           ["concat-stream", "npm:2.0.0"],\
           ["https-proxy-agent", "npm:5.0.1"],\
           ["json-stringify-safe", "npm:5.0.1"],\
@@ -11476,6 +11479,15 @@ const RAW_RUNTIME_STATE =
         "linkType": "HARD"\
       }]\
     ]],\
+    ["proxy-from-env", [\
+      ["npm:1.1.0", {\
+        "packageLocation": "./.yarn/cache/proxy-from-env-npm-1.1.0-c13d07f26b-0bba2ef7c8.zip/node_modules/proxy-from-env/",\
+        "packageDependencies": [\
+          ["proxy-from-env", "npm:1.1.0"]\
+        ],\
+        "linkType": "HARD"\
+      }]\
+    ]],\
     ["pseudomap", [\
       ["npm:1.0.2", {\
         "packageLocation": "./.yarn/cache/pseudomap-npm-1.0.2-0d0e40fee0-33cfbb99ac.zip/node_modules/pseudomap/",\
@@ -12213,6 +12225,15 @@ const RAW_RUNTIME_STATE =
         "linkType": "HARD"\
       }]\
     ]],\
+    ["shallow-equal-object", [\
+      ["npm:1.1.1", {\
+        "packageLocation": "./.yarn/cache/shallow-equal-object-npm-1.1.1-a41b289b2e-9e5e0cd10b.zip/node_modules/shallow-equal-object/",\
+        "packageDependencies": [\
+          ["shallow-equal-object", "npm:1.1.1"]\
+        ],\
+        "linkType": "HARD"\
+      }]\
+    ]],\
     ["shebang-command", [\
       ["npm:2.0.0", {\
         "packageLocation": "./.yarn/cache/shebang-command-npm-2.0.0-eb2b01921d-5907a8d5fa.zip/node_modules/shebang-command/",\
@@ -13472,10 +13493,10 @@ const RAW_RUNTIME_STATE =
       }]\
     ]],\
     ["ua-parser-js", [\
-      ["npm:1.0.2", {\
-        "packageLocation": "./.yarn/cache/ua-parser-js-npm-1.0.2-c3376785e2-5ee14b105c.zip/node_modules/ua-parser-js/",\
+      ["npm:1.0.32", {\
+        "packageLocation": "./.yarn/cache/ua-parser-js-npm-1.0.32-95b0b6a78d-9d320c6742.zip/node_modules/ua-parser-js/",\
         "packageDependencies": [\
-          ["ua-parser-js", "npm:1.0.2"]\
+          ["ua-parser-js", "npm:1.0.32"]\
         ],\
         "linkType": "HARD"\
       }]\

package.json

@@ -46,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",
@@ -60,6 +60,6 @@
   "packageManager": "yarn@4.0.0-rc.25",
   "dependencies": {
     "@sentry/node": "^7.3.0",
-    "newrelic": "^9.0.0"
+    "newrelic": "^9.6.0"
   }
 }

packages/analytics/CHANGELOG.md

@@ -3,6 +3,127 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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

packages/analytics/bin/report.ts

@@ -15,6 +15,7 @@ import { ContainerConfigLoader } from '../src/Bootstrap/Container'
 import TYPES from '../src/Bootstrap/Types'
 import { Env } from '../src/Bootstrap/Env'
 import { DomainEventFactoryInterface } from '../src/Domain/Event/DomainEventFactoryInterface'
+import { CalculateMonthlyRecurringRevenue } from '../src/Domain/UseCase/CalculateMonthlyRecurringRevenue/CalculateMonthlyRecurringRevenue'
 
 const requestReport = async (
   analyticsStore: AnalyticsStoreInterface,
@@ -22,7 +23,10 @@ const requestReport = async (
   domainEventFactory: DomainEventFactoryInterface,
   domainEventPublisher: DomainEventPublisherInterface,
   periodKeyGenerator: PeriodKeyGeneratorInterface,
+  calculateMonthlyRecurringRevenue: CalculateMonthlyRecurringRevenue,
 ): Promise<void> => {
+  await calculateMonthlyRecurringRevenue.execute({})
+
   const analyticsOverTime: Array<{
     name: string
     period: number
@@ -96,6 +100,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,
@@ -170,13 +208,10 @@ const requestReport = async (
   }
 
   const event = domainEventFactory.createDailyAnalyticsReportGeneratedEvent({
-    applicationStatistics: await statisticsStore.getYesterdayApplicationUsage(),
-    snjsStatistics: await statisticsStore.getYesterdaySNJSUsage(),
-    outOfSyncIncidents: await statisticsStore.getYesterdayOutOfSyncIncidents(),
     activityStatistics: yesterdayActivityStatistics,
     activityStatisticsOverTime: analyticsOverTime,
+    statisticsOverTime,
     statisticMeasures,
-    retentionStatistics: [],
     churn: {
       periodKeys: monthlyPeriodKeys,
       values: churnRates,
@@ -200,9 +235,19 @@ void container.load().then((container) => {
   const domainEventFactory: DomainEventFactoryInterface = container.get(TYPES.DomainEventFactory)
   const domainEventPublisher: DomainEventPublisherInterface = container.get(TYPES.DomainEventPublisher)
   const periodKeyGenerator: PeriodKeyGeneratorInterface = container.get(TYPES.PeriodKeyGenerator)
+  const calculateMonthlyRecurringRevenue: CalculateMonthlyRecurringRevenue = container.get(
+    TYPES.CalculateMonthlyRecurringRevenue,
+  )
 
   Promise.resolve(
-    requestReport(analyticsStore, statisticsStore, domainEventFactory, domainEventPublisher, periodKeyGenerator),
+    requestReport(
+      analyticsStore,
+      statisticsStore,
+      domainEventFactory,
+      domainEventPublisher,
+      periodKeyGenerator,
+      calculateMonthlyRecurringRevenue,
+    ),
   )
     .then(() => {
       logger.info('Usage report generation complete')

packages/analytics/jest.config.js

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

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,6 +1,6 @@
 {
   "name": "@standardnotes/analytics",
-  "version": "2.1.0",
+  "version": "2.9.6",
   "engines": {
     "node": ">=14.0.0 <17.0.0"
   },
@@ -27,8 +27,9 @@
   "devDependencies": {
     "@types/ioredis": "^4.28.10",
     "@types/jest": "^29.1.1",
-    "@types/newrelic": "^7.0.3",
+    "@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",
@@ -49,9 +50,11 @@
     "inversify": "^6.0.1",
     "ioredis": "^5.2.3",
     "mysql2": "^2.3.3",
-    "newrelic": "^9.0.0",
+    "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

@@ -44,6 +44,14 @@ import { SubscriptionPurchasedEventHandler } from '../Domain/Handler/Subscriptio
 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')
@@ -116,14 +124,24 @@ export class ContainerConfigLoader {
     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)
@@ -152,6 +170,11 @@ export class ContainerConfigLoader {
       .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())

packages/analytics/src/Bootstrap/DataSource.ts

@@ -1,6 +1,7 @@
 import { DataSource, LoggerOptions } from 'typeorm'
 
 import { AnalyticsEntity } from '../Domain/Entity/AnalyticsEntity'
+import { TypeORMRevenueModification } from '../Infra/TypeORM/TypeORMRevenueModification'
 
 import { Env } from './Env'
 
@@ -36,7 +37,7 @@ export const AppDataSource = new DataSource({
     ],
     removeNodeErrorCount: 10,
   },
-  entities: [AnalyticsEntity],
+  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/Types.ts

@@ -13,10 +13,14 @@ const TYPES = {
   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'),
@@ -29,6 +33,8 @@ const TYPES = {
   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'),

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/Event/DomainEventFactory.spec.ts

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

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

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

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

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

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

@@ -9,16 +9,32 @@ 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)
+  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 })
 
@@ -30,6 +46,7 @@ describe('SubscriptionCancelledEventHandler', () => {
 
     event = {} as jest.Mocked<SubscriptionCancelledEvent>
     event.createdAt = new Date(1)
+    event.type = 'SUBSCRIPTION_CANCELLED'
     event.payload = {
       subscriptionId: 1,
       userEmail: 'test@test.com',
@@ -41,7 +58,13 @@ describe('SubscriptionCancelledEventHandler', () => {
       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 () => {
@@ -55,6 +78,7 @@ describe('SubscriptionCancelledEventHandler', () => {
       Period.ThisWeek,
       Period.ThisMonth,
     ])
+    expect(saveRevenueModification.execute).toHaveBeenCalled()
   })
 
   it('should not track statistics for subscriptions that are in a legacy 5 year plan', async () => {
@@ -65,5 +89,16 @@ describe('SubscriptionCancelledEventHandler', () => {
     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

@@ -1,13 +1,18 @@
 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 {
@@ -15,10 +20,12 @@ export class SubscriptionCancelledEventHandler implements DomainEventHandlerInte
     @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 } = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
+    const { analyticsId, userUuid } = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
     await this.analyticsStore.markActivity([AnalyticsActivity.SubscriptionCancelled], analyticsId, [
       Period.Today,
       Period.ThisWeek,
@@ -26,6 +33,23 @@ export class SubscriptionCancelledEventHandler implements DomainEventHandlerInte
     ])
 
     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) {

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

@@ -7,18 +7,35 @@ import { SubscriptionExpiredEventHandler } from './SubscriptionExpiredEventHandl
 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)
+  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',
@@ -26,6 +43,9 @@ describe('SubscriptionExpiredEventHandler', () => {
       timestamp: 1,
       offline: false,
       totalActiveSubscriptionsCount: 123,
+      userExistingSubscriptionsCount: 2,
+      billingFrequency: 1,
+      payAmount: 12.99,
     }
 
     getUserAnalyticsId = {} as jest.Mocked<GetUserAnalyticsId>
@@ -36,6 +56,9 @@ describe('SubscriptionExpiredEventHandler', () => {
 
     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 () => {
@@ -43,5 +66,14 @@ describe('SubscriptionExpiredEventHandler', () => {
 
     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

@@ -1,13 +1,18 @@
 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 {
@@ -15,10 +20,12 @@ export class SubscriptionExpiredEventHandler implements DomainEventHandlerInterf
     @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 } = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
+    const { analyticsId, userUuid } = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
     await this.analyticsStore.markActivity(
       [AnalyticsActivity.SubscriptionExpired, AnalyticsActivity.ExistingCustomersChurn],
       analyticsId,
@@ -30,5 +37,22 @@ export class SubscriptionExpiredEventHandler implements DomainEventHandlerInterf
       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

@@ -8,6 +8,10 @@ import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyti
 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
@@ -15,16 +19,29 @@ describe('SubscriptionPurchasedEventHandler', () => {
   let getUserAnalyticsId: GetUserAnalyticsId
   let analyticsStore: AnalyticsStoreInterface
   let statisticsStore: StatisticsStoreInterface
+  let saveRevenueModification: SaveRevenueModification
+  let logger: Logger
 
-  const createHandler = () => new SubscriptionPurchasedEventHandler(getUserAnalyticsId, analyticsStore, statisticsStore)
+  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',
@@ -37,6 +54,8 @@ describe('SubscriptionPurchasedEventHandler', () => {
       newSubscriber: true,
       totalActiveSubscriptionsCount: 123,
       userRegisteredAt: 23,
+      billingFrequency: 12,
+      payAmount: 29.99,
     }
 
     getUserAnalyticsId = {} as jest.Mocked<GetUserAnalyticsId>
@@ -45,12 +64,16 @@ describe('SubscriptionPurchasedEventHandler', () => {
     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 () => {
@@ -68,4 +91,12 @@ describe('SubscriptionPurchasedEventHandler', () => {
 
     expect(analyticsStore.markActivity).toHaveBeenCalledWith(['limited-discount-offer-purchased'], 3, [Period.Today])
   })
+
+  it('should log failure to save revenue modification', async () => {
+    saveRevenueModification.execute = jest.fn().mockReturnValue(Result.fail('Oops'))
+
+    await createHandler().handle(event)
+
+    expect(logger.error).toHaveBeenCalled()
+  })
 })

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

@@ -1,13 +1,18 @@
 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 {
@@ -15,10 +20,12 @@ export class SubscriptionPurchasedEventHandler implements DomainEventHandlerInte
     @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 } = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
+    const { analyticsId, userUuid } = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
     await this.analyticsStore.markActivity([AnalyticsActivity.SubscriptionPurchased], analyticsId, [
       Period.Today,
       Period.ThisWeek,
@@ -54,5 +61,22 @@ export class SubscriptionPurchasedEventHandler implements DomainEventHandlerInte
         [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/SubscriptionRefundedEventHandler.spec.ts

@@ -10,18 +10,35 @@ import { SubscriptionRefundedEventHandler } from './SubscriptionRefundedEventHan
 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)
+  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',
@@ -30,6 +47,8 @@ describe('SubscriptionRefundedEventHandler', () => {
       offline: false,
       userExistingSubscriptionsCount: 3,
       totalActiveSubscriptionsCount: 1,
+      billingFrequency: 1,
+      payAmount: 12.99,
     }
 
     getUserAnalyticsId = {} as jest.Mocked<GetUserAnalyticsId>
@@ -41,6 +60,9 @@ describe('SubscriptionRefundedEventHandler', () => {
 
     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 () => {
@@ -56,6 +78,8 @@ describe('SubscriptionRefundedEventHandler', () => {
     expect(analyticsStore.markActivity).toHaveBeenCalledWith([AnalyticsActivity.NewCustomersChurn], 3, [
       Period.ThisMonth,
     ])
+
+    expect(saveRevenueModification.execute).toHaveBeenCalled()
   })
 
   it('should mark churn for existing customer', async () => {
@@ -75,4 +99,12 @@ describe('SubscriptionRefundedEventHandler', () => {
       Period.ThisMonth,
     ])
   })
+
+  it('should log failure to save revenue modification', async () => {
+    saveRevenueModification.execute = jest.fn().mockReturnValue(Result.fail('Oops'))
+
+    await createHandler().handle(event)
+
+    expect(logger.error).toHaveBeenCalled()
+  })
 })

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

@@ -1,13 +1,18 @@
 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 {
@@ -15,10 +20,12 @@ export class SubscriptionRefundedEventHandler implements DomainEventHandlerInter
     @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 } = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
+    const { analyticsId, userUuid } = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
     await this.analyticsStore.markActivity([AnalyticsActivity.SubscriptionRefunded], analyticsId, [
       Period.Today,
       Period.ThisWeek,
@@ -26,6 +33,23 @@ export class SubscriptionRefundedEventHandler implements DomainEventHandlerInter
     ])
 
     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> {

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

@@ -6,17 +6,28 @@ 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)
+  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',
@@ -24,6 +35,8 @@ describe('SubscriptionRenewedEventHandler', () => {
       subscriptionExpiresAt: 2,
       timestamp: 1,
       offline: false,
+      billingFrequency: 1,
+      payAmount: 12.99,
     }
 
     getUserAnalyticsId = {} as jest.Mocked<GetUserAnalyticsId>
@@ -32,6 +45,9 @@ describe('SubscriptionRenewedEventHandler', () => {
     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 () => {
@@ -39,5 +55,14 @@ describe('SubscriptionRenewedEventHandler', () => {
 
     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

@@ -6,16 +6,23 @@ import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyti
 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 } = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
+    const { analyticsId, userUuid } = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
     await this.analyticsStore.markActivity([AnalyticsActivity.SubscriptionRenewed], analyticsId, [
       Period.Today,
       Period.ThisWeek,
@@ -26,5 +33,22 @@ export class SubscriptionRenewedEventHandler implements DomainEventHandlerInterf
       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/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

@@ -15,4 +15,10 @@ export enum StatisticsMeasure {
   Refunds = 'refunds',
   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',

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

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

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

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

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

@@ -0,0 +1,82 @@
+import { SubscriptionBillingFrequency, SubscriptionName } from '@standardnotes/common'
+import { inject, injectable } from 'inversify'
+import TYPES from '../../../Bootstrap/Types'
+import { Result } from '../../Core/Result'
+import { MonthlyRevenue } from '../../Revenue/MonthlyRevenue'
+import { RevenueModificationRepositoryInterface } from '../../Revenue/RevenueModificationRepositoryInterface'
+import { StatisticsMeasure } from '../../Statistics/StatisticsMeasure'
+import { StatisticsStoreInterface } from '../../Statistics/StatisticsStoreInterface'
+import { Period } from '../../Time/Period'
+import { DomainUseCaseInterface } from '../DomainUseCaseInterface'
+import { CalculateMonthlyRecurringRevenueDTO } from './CalculateMonthlyRecurringRevenueDTO'
+
+@injectable()
+export class CalculateMonthlyRecurringRevenue implements DomainUseCaseInterface<MonthlyRevenue> {
+  constructor(
+    @inject(TYPES.RevenueModificationRepository)
+    private revenueModificationRepository: RevenueModificationRepositoryInterface,
+    @inject(TYPES.StatisticsStore) private statisticsStore: StatisticsStoreInterface,
+  ) {}
+
+  async execute(_dto: CalculateMonthlyRecurringRevenueDTO): Promise<Result<MonthlyRevenue>> {
+    const mrrDiff = await this.revenueModificationRepository.sumMRRDiff({})
+
+    await this.statisticsStore.setMeasure(StatisticsMeasure.MRR, mrrDiff, [
+      Period.Today,
+      Period.ThisMonth,
+      Period.ThisYear,
+    ])
+
+    const monthlyPlansMrrDiff = await this.revenueModificationRepository.sumMRRDiff({
+      billingFrequency: SubscriptionBillingFrequency.Monthly,
+    })
+
+    await this.statisticsStore.setMeasure(StatisticsMeasure.MonthlyPlansMRR, monthlyPlansMrrDiff, [
+      Period.Today,
+      Period.ThisMonth,
+      Period.ThisYear,
+    ])
+
+    const annualPlansMrrDiff = await this.revenueModificationRepository.sumMRRDiff({
+      billingFrequency: SubscriptionBillingFrequency.Annual,
+    })
+
+    await this.statisticsStore.setMeasure(StatisticsMeasure.AnnualPlansMRR, annualPlansMrrDiff, [
+      Period.Today,
+      Period.ThisMonth,
+      Period.ThisYear,
+    ])
+
+    const fiveYearPlansMrrDiff = await this.revenueModificationRepository.sumMRRDiff({
+      billingFrequency: SubscriptionBillingFrequency.FiveYear,
+    })
+
+    await this.statisticsStore.setMeasure(StatisticsMeasure.FiveYearPlansMRR, fiveYearPlansMrrDiff, [
+      Period.Today,
+      Period.ThisMonth,
+      Period.ThisYear,
+    ])
+
+    const proPlansMrrDiff = await this.revenueModificationRepository.sumMRRDiff({
+      planName: SubscriptionName.ProPlan,
+    })
+
+    await this.statisticsStore.setMeasure(StatisticsMeasure.ProPlansMRR, proPlansMrrDiff, [
+      Period.Today,
+      Period.ThisMonth,
+      Period.ThisYear,
+    ])
+
+    const plusPlansMrrDiff = await this.revenueModificationRepository.sumMRRDiff({
+      planName: SubscriptionName.PlusPlan,
+    })
+
+    await this.statisticsStore.setMeasure(StatisticsMeasure.PlusPlansMRR, plusPlansMrrDiff, [
+      Period.Today,
+      Period.ThisMonth,
+      Period.ThisYear,
+    ])
+
+    return MonthlyRevenue.create(mrrDiff)
+  }
+}

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

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

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

@@ -0,0 +1,5 @@
+import { Result } from '../Core/Result'
+
+export interface DomainUseCaseInterface<T> {
+  execute(...args: any[]): Promise<Result<T>>
+}

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

@@ -12,7 +12,11 @@ describe('GetUserAnalyticsId', () => {
   const createUseCase = () => new GetUserAnalyticsId(analyticsEntityRepository)
 
   beforeEach(() => {
-    analyticsEntity = { id: 123 } as jest.Mocked<AnalyticsEntity>
+    analyticsEntity = {
+      id: 123,
+      userUuid: '1-2-3',
+      userEmail: 'test@test.te',
+    } as jest.Mocked<AnalyticsEntity>
 
     analyticsEntityRepository = {} as jest.Mocked<AnalyticsEntityRepositoryInterface>
     analyticsEntityRepository.findOneByUserUuid = jest.fn().mockReturnValue(analyticsEntity)
@@ -20,11 +24,11 @@ describe('GetUserAnalyticsId', () => {
   })
 
   it('should return analytics id for a user by uuid', async () => {
-    expect(await createUseCase().execute({ userUuid: '1-2-3' })).toEqual({ analyticsId: 123 })
+    expect(await (await createUseCase().execute({ userUuid: '1-2-3' })).analyticsId).toEqual(123)
   })
 
   it('should return analytics id for a user by email', async () => {
-    expect(await createUseCase().execute({ userEmail: 'test@test.te' })).toEqual({ analyticsId: 123 })
+    expect(await (await createUseCase().execute({ userEmail: 'test@test.te' })).analyticsId).toEqual(123)
   })
 
   it('should throw error if user is missing analytics entity', async () => {

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

@@ -1,5 +1,7 @@
 import { inject, injectable } from 'inversify'
 import TYPES from '../../../Bootstrap/Types'
+import { Email } from '../../Common/Email'
+import { Uuid } from '../../Common/Uuid'
 import { AnalyticsEntityRepositoryInterface } from '../../Entity/AnalyticsEntityRepositoryInterface'
 import { UseCaseInterface } from '../UseCaseInterface'
 import { GetUserAnalyticsIdDTO } from './GetUserAnalyticsIdDTO'
@@ -25,6 +27,8 @@ export class GetUserAnalyticsId implements UseCaseInterface {
 
     return {
       analyticsId: analyticsEntity.id,
+      userUuid: Uuid.create(analyticsEntity.userUuid).getValue(),
+      userEmail: Email.create(analyticsEntity.userEmail).getValue(),
     }
   }
 }

packages/analytics/src/Domain/UseCase/GetUserAnalyticsId/GetUserAnalyticsIdResponse.ts

@@ -1,3 +1,8 @@
+import { Email } from '../../Common/Email'
+import { Uuid } from '../../Common/Uuid'
+
 export type GetUserAnalyticsIdResponse = {
   analyticsId: number
+  userEmail: Email
+  userUuid: Uuid
 }

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

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

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

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

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

@@ -0,0 +1,15 @@
+import { Email } from '../../Common/Email'
+import { Uuid } from '../../Common/Uuid'
+import { SubscriptionEventType } from '../../Subscription/SubscriptionEventType'
+import { SubscriptionPlanName } from '../../Subscription/SubscriptionPlanName'
+
+export interface SaveRevenueModificationDTO {
+  eventType: SubscriptionEventType
+  payedAmount: number
+  planName: SubscriptionPlanName
+  newSubscriber: boolean
+  userUuid: Uuid
+  userEmail: Email
+  subscriptionId: number
+  billingFrequency: number
+}

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

@@ -0,0 +1,12 @@
+import { Email } from '../Common/Email'
+import { User } from './User'
+
+describe('User', () => {
+  it('should create an entity', () => {
+    const user = User.create({
+      email: Email.create('test@test.te').getValue(),
+    }).getValue()
+
+    expect(user.id.toString()).toHaveLength(36)
+  })
+})

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

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

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

@@ -0,0 +1,5 @@
+import { Email } from '../Common/Email'
+
+export interface UserProps {
+  email: Email
+}

packages/analytics/src/Infra/MySQL/MySQLAnalyticsEntityRepository.spec.ts

@@ -1,60 +0,0 @@
-import 'reflect-metadata'
-
-import { Repository, SelectQueryBuilder } from 'typeorm'
-
-import { AnalyticsEntity } from '../../Domain/Entity/AnalyticsEntity'
-
-import { MySQLAnalyticsEntityRepository } from './MySQLAnalyticsEntityRepository'
-
-describe('MySQLAnalyticsEntityRepository', () => {
-  let ormRepository: Repository<AnalyticsEntity>
-  let analyticsEntity: AnalyticsEntity
-  let queryBuilder: SelectQueryBuilder<AnalyticsEntity>
-
-  const createRepository = () => new MySQLAnalyticsEntityRepository(ormRepository)
-
-  beforeEach(() => {
-    analyticsEntity = {} as jest.Mocked<AnalyticsEntity>
-
-    queryBuilder = {} as jest.Mocked<SelectQueryBuilder<AnalyticsEntity>>
-
-    ormRepository = {} as jest.Mocked<Repository<AnalyticsEntity>>
-    ormRepository.save = jest.fn()
-    ormRepository.remove = jest.fn()
-    ormRepository.createQueryBuilder = jest.fn().mockImplementation(() => queryBuilder)
-  })
-
-  it('should save', async () => {
-    await createRepository().save(analyticsEntity)
-
-    expect(ormRepository.save).toHaveBeenCalledWith(analyticsEntity)
-  })
-
-  it('should remove', async () => {
-    await createRepository().remove(analyticsEntity)
-
-    expect(ormRepository.remove).toHaveBeenCalledWith(analyticsEntity)
-  })
-
-  it('should find one by user uuid', async () => {
-    queryBuilder.where = jest.fn().mockReturnThis()
-    queryBuilder.getOne = jest.fn().mockReturnValue(analyticsEntity)
-
-    const result = await createRepository().findOneByUserUuid('123')
-
-    expect(queryBuilder.where).toHaveBeenCalledWith('analytics_entity.user_uuid = :userUuid', { userUuid: '123' })
-
-    expect(result).toEqual(analyticsEntity)
-  })
-
-  it('should find one by user email', async () => {
-    queryBuilder.where = jest.fn().mockReturnThis()
-    queryBuilder.getOne = jest.fn().mockReturnValue(analyticsEntity)
-
-    const result = await createRepository().findOneByUserEmail('test@test.te')
-
-    expect(queryBuilder.where).toHaveBeenCalledWith('analytics_entity.user_email = :email', { email: 'test@test.te' })
-
-    expect(result).toEqual(analyticsEntity)
-  })
-})

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

@@ -0,0 +1,61 @@
+import { inject, injectable } from 'inversify'
+import { Repository } from 'typeorm'
+
+import TYPES from '../../Bootstrap/Types'
+import { Uuid } from '../../Domain/Common/Uuid'
+import { MapInterface } from '../../Domain/Map/MapInterface'
+import { RevenueModification } from '../../Domain/Revenue/RevenueModification'
+import { RevenueModificationRepositoryInterface } from '../../Domain/Revenue/RevenueModificationRepositoryInterface'
+import { TypeORMRevenueModification } from '../TypeORM/TypeORMRevenueModification'
+
+@injectable()
+export class MySQLRevenueModificationRepository implements RevenueModificationRepositoryInterface {
+  constructor(
+    @inject(TYPES.ORMRevenueModificationRepository)
+    private ormRepository: Repository<TypeORMRevenueModification>,
+    @inject(TYPES.RevenueModificationMap)
+    private revenueModificationMap: MapInterface<RevenueModification, TypeORMRevenueModification>,
+  ) {}
+
+  async sumMRRDiff(dto: { planName?: string; billingFrequency?: number }): Promise<number> {
+    const query = this.ormRepository.createQueryBuilder().select('sum(new_mrr - previous_mrr)', 'mrrDiff')
+
+    if (dto.planName !== undefined) {
+      query.where('subscription_plan = :planName', { planName: dto.planName })
+    }
+    if (dto.billingFrequency !== undefined) {
+      query.where('billing_frequency = :billingFrequency', { billingFrequency: dto.billingFrequency })
+    }
+
+    const result = await query.getRawOne()
+
+    if (result === undefined) {
+      return 0
+    }
+
+    return +(+result.mrrDiff).toFixed(2)
+  }
+
+  async findLastByUserUuid(userUuid: Uuid): Promise<RevenueModification | null> {
+    const persistence = await this.ormRepository
+      .createQueryBuilder()
+      .where('user_uuid = :userUuid', { userUuid: userUuid.value })
+      .orderBy('created_at', 'DESC')
+      .limit(1)
+      .getOne()
+
+    if (persistence === null) {
+      return null
+    }
+
+    return this.revenueModificationMap.toDomain(persistence)
+  }
+
+  async save(revenueModification: RevenueModification): Promise<RevenueModification> {
+    let persistence = this.revenueModificationMap.toPersistence(revenueModification)
+
+    persistence = await this.ormRepository.save(persistence)
+
+    return this.revenueModificationMap.toDomain(persistence)
+  }
+}

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

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

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

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

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

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

packages/analytics/src/Infra/TypeORM/TypeORMRevenueModification.ts

@@ -0,0 +1,67 @@
+import { Column, Entity, Index, PrimaryColumn } from 'typeorm'
+
+@Entity({ name: 'revenue_modifications' })
+export class TypeORMRevenueModification {
+  @PrimaryColumn({
+    type: 'uuid',
+    length: 36,
+  })
+  declare uuid: string
+
+  @Column({
+    name: 'subscription_id',
+  })
+  declare subscriptionId: number
+
+  @Column({
+    name: 'user_email',
+    length: 255,
+  })
+  @Index('email')
+  declare userEmail: string
+
+  @Column({
+    name: 'user_uuid',
+    length: 36,
+  })
+  @Index('user_uuid')
+  declare userUuid: string
+
+  @Column({
+    name: 'event_type',
+  })
+  declare eventType: string
+
+  @Column({
+    name: 'subscription_plan',
+  })
+  declare subscriptionPlan: string
+
+  @Column({
+    name: 'billing_frequency',
+  })
+  declare billingFrequency: number
+
+  @Column({
+    name: 'new_customer',
+  })
+  declare isNewCustomer: boolean
+
+  @Column({
+    name: 'previous_mrr',
+    type: 'float',
+  })
+  declare previousMonthlyRevenue: number
+
+  @Column({
+    name: 'new_mrr',
+    type: 'float',
+  })
+  declare newMonthlyRevenue: number
+
+  @Column({
+    name: 'created_at',
+    type: 'bigint',
+  })
+  declare createdAt: number
+}

packages/api-gateway/CHANGELOG.md

@@ -3,6 +3,62 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.38.1](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.38.0...@standardnotes/api-gateway@1.38.1) (2022-11-14)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+# [1.38.0](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.37.11...@standardnotes/api-gateway@1.38.0) (2022-11-13)
+
+### Features
+
+* iap confirm endpoint ([#338](https://github.com/standardnotes/api-gateway/issues/338)) ([3bba367](https://github.com/standardnotes/api-gateway/commit/3bba36742ac00c8756dd69f3a81ea124538d5cbe))
+
+## [1.37.11](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.37.10...@standardnotes/api-gateway@1.37.11) (2022-11-11)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.37.10](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.37.9...@standardnotes/api-gateway@1.37.10) (2022-11-11)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.37.9](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.37.8...@standardnotes/api-gateway@1.37.9) (2022-11-10)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.37.8](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.37.7...@standardnotes/api-gateway@1.37.8) (2022-11-10)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.37.7](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.37.6...@standardnotes/api-gateway@1.37.7) (2022-11-10)
+
+### Bug Fixes
+
+* **api-gateway:** setting headers ([3c2ac05](https://github.com/standardnotes/api-gateway/commit/3c2ac05c606371305b76dd368d5fe9287045f380))
+
+## [1.37.6](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.37.5...@standardnotes/api-gateway@1.37.6) (2022-11-10)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.37.5](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.37.4...@standardnotes/api-gateway@1.37.5) (2022-11-09)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.37.4](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.37.3...@standardnotes/api-gateway@1.37.4) (2022-11-09)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.37.3](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.37.2...@standardnotes/api-gateway@1.37.3) (2022-11-09)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.37.2](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.37.1...@standardnotes/api-gateway@1.37.2) (2022-11-09)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.37.1](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.37.0...@standardnotes/api-gateway@1.37.1) (2022-11-09)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
 # [1.37.0](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.36.14...@standardnotes/api-gateway@1.37.0) (2022-11-07)
 
 ### Features

packages/api-gateway/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/api-gateway",
-  "version": "1.37.0",
+  "version": "1.38.1",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -28,7 +28,7 @@
     "@standardnotes/security": "workspace:*",
     "@standardnotes/time": "workspace:*",
     "aws-sdk": "^2.1160.0",
-    "axios": "^0.27.2",
+    "axios": "^1.1.3",
     "cors": "2.8.5",
     "dotenv": "^16.0.1",
     "express": "^4.18.1",
@@ -37,7 +37,7 @@
     "inversify-express-utils": "^6.4.3",
     "ioredis": "^5.2.0",
     "jsonwebtoken": "8.5.1",
-    "newrelic": "^9.0.0",
+    "newrelic": "^9.6.0",
     "prettyjson": "^1.2.5",
     "reflect-metadata": "0.1.13",
     "winston": "^3.8.1"
@@ -48,7 +48,7 @@
     "@types/ioredis": "^4.28.10",
     "@types/jest": "^29.1.1",
     "@types/jsonwebtoken": "^8.5.0",
-    "@types/newrelic": "^7.0.3",
+    "@types/newrelic": "^7.0.4",
     "@types/prettyjson": "^0.0.30",
     "@typescript-eslint/eslint-plugin": "^5.29.0",
     "eslint": "^8.14.0",

packages/api-gateway/src/Bootstrap/Container.ts

@@ -1,5 +1,7 @@
 import * as winston from 'winston'
-import axios, { AxiosInstance } from 'axios'
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const axios = require('axios')
+import { AxiosInstance } from 'axios'
 import Redis from 'ioredis'
 import { Container } from 'inversify'
 import { Timer, TimerInterface } from '@standardnotes/time'

packages/api-gateway/src/Controller/AuthMiddleware.ts

@@ -60,7 +60,7 @@ export class AuthMiddleware extends BaseMiddleware {
         })
 
         if (authResponse.status > 200) {
-          response.setHeader('content-type', authResponse.headers['content-type'])
+          response.setHeader('content-type', authResponse.headers['content-type'] as string)
           response.status(authResponse.status).send(authResponse.data)
 
           return

packages/api-gateway/src/Controller/SubscriptionTokenAuthMiddleware.ts

@@ -20,7 +20,8 @@ export class SubscriptionTokenAuthMiddleware extends BaseMiddleware {
   }
 
   async handler(request: Request, response: Response, next: NextFunction): Promise<void> {
-    const subscriptionToken = request.query.subscription_token
+    const subscriptionToken = request.query.subscription_token || request.body.subscription_token
+
     const email = request.headers['x-offline-email']
     if (!subscriptionToken) {
       response.status(401).send({
@@ -58,7 +59,7 @@ export class SubscriptionTokenAuthMiddleware extends BaseMiddleware {
       })
 
       if (authResponse.status > 200) {
-        response.setHeader('content-type', authResponse.headers['content-type'])
+        response.setHeader('content-type', authResponse.headers['content-type'] as string)
         response.status(authResponse.status).send(authResponse.data)
 
         return

packages/api-gateway/src/Controller/WebSocketAuthMiddleware.ts

@@ -48,7 +48,7 @@ export class WebSocketAuthMiddleware extends BaseMiddleware {
       })
 
       if (authResponse.status > 200) {
-        response.setHeader('content-type', authResponse.headers['content-type'])
+        response.setHeader('content-type', authResponse.headers['content-type'] as string)
         response.status(authResponse.status).send(authResponse.data)
 
         return

packages/api-gateway/src/Controller/v1/PaymentsController.ts

@@ -45,6 +45,11 @@ export class PaymentsController extends BaseHttpController {
     await this.httpService.callPaymentsServer(request, response, 'api/subscriptions/tiered', request.body)
   }
 
+  @httpPost('/subscriptions/apple_iap_confirm', TYPES.SubscriptionTokenAuthMiddleware)
+  async appleIAPConfirm(request: Request, response: Response): Promise<void> {
+    await this.httpService.callPaymentsServer(request, response, 'api/subscriptions/apple_iap_confirm', request.body)
+  }
+
   @all('/subscriptions(/*)?')
   async subscriptions(request: Request, response: Response): Promise<void> {
     await this.httpService.callPaymentsServer(request, response, request.path.replace('v1', 'api'), request.body)

packages/auth/CHANGELOG.md

@@ -3,6 +3,70 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.59.7](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.59.6...@standardnotes/auth-server@1.59.7) (2022-11-14)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.59.6](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.59.5...@standardnotes/auth-server@1.59.6) (2022-11-11)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.59.5](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.59.4...@standardnotes/auth-server@1.59.5) (2022-11-11)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.59.4](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.59.3...@standardnotes/auth-server@1.59.4) (2022-11-10)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.59.3](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.59.2...@standardnotes/auth-server@1.59.3) (2022-11-10)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.59.2](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.59.1...@standardnotes/auth-server@1.59.2) (2022-11-10)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.59.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.59.0...@standardnotes/auth-server@1.59.1) (2022-11-10)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+# [1.59.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.58.0...@standardnotes/auth-server@1.59.0) (2022-11-09)
+
+### Features
+
+* **analytics:** add saving revenue modifications upon subscription canceled ([52a257a](https://github.com/standardnotes/server/commit/52a257abb16034134a50474fbbb2493a00c58b99))
+
+# [1.58.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.57.0...@standardnotes/auth-server@1.58.0) (2022-11-09)
+
+### Features
+
+* **analytics:** add saving revenue modifications upon subscription refunded ([0f65c05](https://github.com/standardnotes/server/commit/0f65c051abcff805e920f91d338e5fadda7905a9))
+
+# [1.57.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.56.0...@standardnotes/auth-server@1.57.0) (2022-11-09)
+
+### Features
+
+* **analytics:** add saving revenue modifications upon subscription expired ([5c3db2c](https://github.com/standardnotes/server/commit/5c3db2cb29a929e44b63eb8226ce4ad1d14f8a99))
+
+# [1.56.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.55.0...@standardnotes/auth-server@1.56.0) (2022-11-09)
+
+### Features
+
+* **analytics:** add saving revenue modifications upon subscription renewed ([cdb7fcf](https://github.com/standardnotes/server/commit/cdb7fcf8311fecfabe3ef9eb656cd6ec57b87de0))
+
+# [1.55.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.54.0...@standardnotes/auth-server@1.55.0) (2022-11-09)
+
+### Features
+
+* **analytics:** add saving revenue modifications upon subscription purchased ([5ea9941](https://github.com/standardnotes/server/commit/5ea9941519ffb3027527130ec869da14abc5e994))
+
+# [1.54.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.53.0...@standardnotes/auth-server@1.54.0) (2022-11-07)
+
+### Features
+
+* **auth:** remove analytics table in favor of analytics service ([49feadd](https://github.com/standardnotes/server/commit/49feadd32a5fc8994a1b63f5293d41ca60f01e02))
+
 # [1.53.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.52.1...@standardnotes/auth-server@1.53.0) (2022-11-07)
 
 ### Features

packages/auth/migrations/1667818539829-remove_analytics.ts

@@ -0,0 +1,15 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+export class removeAnalytics1667818539829 implements MigrationInterface {
+  name = 'removeAnalytics1667818539829'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query('ALTER TABLE `analytics_entities` DROP FOREIGN KEY `FK_d2717c4ce2600b9f7acb6b378c5`')
+    await queryRunner.query('DROP INDEX `REL_d2717c4ce2600b9f7acb6b378c` ON `analytics_entities`')
+    await queryRunner.query('DROP TABLE `analytics_entities`')
+  }
+
+  public async down(): Promise<void> {
+    return
+  }
+}

packages/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/auth-server",
-  "version": "1.53.0",
+  "version": "1.59.7",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -45,7 +45,7 @@
     "@standardnotes/sncrypto-node": "workspace:*",
     "@standardnotes/time": "workspace:*",
     "aws-sdk": "^2.1159.0",
-    "axios": "^0.27.2",
+    "axios": "^1.1.3",
     "bcryptjs": "2.4.3",
     "cors": "2.8.5",
     "dayjs": "^1.11.6",
@@ -55,12 +55,12 @@
     "inversify-express-utils": "^6.4.3",
     "ioredis": "^5.2.0",
     "mysql2": "^2.3.3",
-    "newrelic": "^9.0.0",
+    "newrelic": "^9.6.0",
     "otplib": "12.0.1",
     "prettyjson": "^1.2.5",
     "reflect-metadata": "0.1.13",
     "typeorm": "^0.3.6",
-    "ua-parser-js": "1.0.2",
+    "ua-parser-js": "^1.0.32",
     "uuid": "^9.0.0",
     "winston": "^3.8.1"
   },
@@ -70,7 +70,7 @@
     "@types/express": "^4.17.11",
     "@types/ioredis": "^4.28.10",
     "@types/jest": "^29.1.1",
-    "@types/newrelic": "^7.0.3",
+    "@types/newrelic": "^7.0.4",
     "@types/otplib": "^10.0.0",
     "@types/prettyjson": "^0.0.30",
     "@types/ua-parser-js": "^0.7.36",