chore(release): publish new version

- @standardnotes/analytics@2.11.6
 - @standardnotes/api-gateway@1.38.9
 - @standardnotes/auth-server@1.60.4
 - @standardnotes/common@1.46.0
 - @standardnotes/domain-core@1.2.2
 - @standardnotes/domain-events-infra@1.9.31
 - @standardnotes/domain-events@2.90.1
 - @standardnotes/event-store@1.6.26
 - @standardnotes/files-server@1.8.26
 - @standardnotes/predicates@1.6.1
 - @standardnotes/revisions-server@1.2.2
 - @standardnotes/scheduler-server@1.13.27
 - @standardnotes/security@1.7.1
 - @standardnotes/syncing-server@1.16.1
 - @standardnotes/websockets-server@1.4.28
 - @standardnotes/workspace-server@1.17.26

.github/workflows/revisions.yml

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

.pnp.cjs

@@ -29,6 +29,10 @@ const RAW_RUNTIME_STATE =
       "name": "@standardnotes/common",\
       "reference": "workspace:packages/common"\
     },\
+    {\
+      "name": "@standardnotes/domain-core",\
+      "reference": "workspace:packages/domain-core"\
+    },\
     {\
       "name": "@standardnotes/domain-events",\
       "reference": "workspace:packages/domain-events"\
@@ -49,6 +53,10 @@ const RAW_RUNTIME_STATE =
       "name": "@standardnotes/predicates",\
       "reference": "workspace:packages/predicates"\
     },\
+    {\
+      "name": "@standardnotes/revisions-server",\
+      "reference": "workspace:packages/revisions"\
+    },\
     {\
       "name": "@standardnotes/scheduler-server",\
       "reference": "workspace:packages/scheduler"\
@@ -89,11 +97,13 @@ const RAW_RUNTIME_STATE =
     ["@standardnotes/api-gateway", ["workspace:packages/api-gateway"]],\
     ["@standardnotes/auth-server", ["workspace:packages/auth"]],\
     ["@standardnotes/common", ["workspace:packages/common"]],\
+    ["@standardnotes/domain-core", ["workspace:packages/domain-core"]],\
     ["@standardnotes/domain-events", ["workspace:packages/domain-events"]],\
     ["@standardnotes/domain-events-infra", ["workspace:packages/domain-events-infra"]],\
     ["@standardnotes/event-store", ["workspace:packages/event-store"]],\
     ["@standardnotes/files-server", ["workspace:packages/files"]],\
     ["@standardnotes/predicates", ["workspace:packages/predicates"]],\
+    ["@standardnotes/revisions-server", ["workspace:packages/revisions"]],\
     ["@standardnotes/scheduler-server", ["workspace:packages/scheduler"]],\
     ["@standardnotes/security", ["workspace:packages/security"]],\
     ["@standardnotes/server-monorepo", ["workspace:."]],\
@@ -2532,6 +2542,7 @@ const RAW_RUNTIME_STATE =
           ["@newrelic/winston-enricher", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:4.0.0"],\
           ["@sentry/node", "npm:7.19.0"],\
           ["@standardnotes/common", "workspace:packages/common"],\
+          ["@standardnotes/domain-core", "workspace:packages/domain-core"],\
           ["@standardnotes/domain-events", "workspace:packages/domain-events"],\
           ["@standardnotes/domain-events-infra", "workspace:packages/domain-events-infra"],\
           ["@standardnotes/time", "workspace:packages/time"],\
@@ -2539,7 +2550,6 @@ const RAW_RUNTIME_STATE =
           ["@types/jest", "npm:29.1.1"],\
           ["@types/newrelic", "npm:7.0.4"],\
           ["@types/node", "npm:18.11.9"],\
-          ["@types/uuid", "npm:8.3.4"],\
           ["@typescript-eslint/eslint-plugin", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:5.30.5"],\
           ["aws-sdk", "npm:2.1253.0"],\
           ["dayjs", "npm:1.11.6"],\
@@ -2552,11 +2562,9 @@ const RAW_RUNTIME_STATE =
           ["mysql2", "npm:2.3.3"],\
           ["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"\
@@ -2701,7 +2709,6 @@ const RAW_RUNTIME_STATE =
         "packageLocation": "./packages/common/",\
         "packageDependencies": [\
           ["@standardnotes/common", "workspace:packages/common"],\
-          ["@newrelic/native-metrics", "npm:9.0.0"],\
           ["@types/jest", "npm:29.1.1"],\
           ["@types/node", "npm:18.11.9"],\
           ["@typescript-eslint/eslint-plugin", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:5.30.5"],\
@@ -2728,12 +2735,34 @@ const RAW_RUNTIME_STATE =
         "linkType": "HARD"\
       }]\
     ]],\
+    ["@standardnotes/domain-core", [\
+      ["workspace:packages/domain-core", {\
+        "packageLocation": "./packages/domain-core/",\
+        "packageDependencies": [\
+          ["@standardnotes/domain-core", "workspace:packages/domain-core"],\
+          ["@standardnotes/common", "workspace:packages/common"],\
+          ["@standardnotes/features", "npm:1.53.1"],\
+          ["@standardnotes/predicates", "workspace:packages/predicates"],\
+          ["@standardnotes/security", "workspace:packages/security"],\
+          ["@types/jest", "npm:29.1.1"],\
+          ["@types/uuid", "npm:8.3.4"],\
+          ["@typescript-eslint/eslint-plugin", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:5.30.5"],\
+          ["eslint-plugin-prettier", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:4.2.1"],\
+          ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
+          ["reflect-metadata", "npm:0.1.13"],\
+          ["shallow-equal-object", "npm:1.1.1"],\
+          ["ts-jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.0.3"],\
+          ["typescript", "patch:typescript@npm%3A4.8.4#optional!builtin<compat/typescript>::version=4.8.4&hash=701156"],\
+          ["uuid", "npm:9.0.0"]\
+        ],\
+        "linkType": "SOFT"\
+      }]\
+    ]],\
     ["@standardnotes/domain-events", [\
       ["workspace:packages/domain-events", {\
         "packageLocation": "./packages/domain-events/",\
         "packageDependencies": [\
           ["@standardnotes/domain-events", "workspace:packages/domain-events"],\
-          ["@newrelic/native-metrics", "npm:9.0.0"],\
           ["@standardnotes/common", "workspace:packages/common"],\
           ["@standardnotes/features", "npm:1.53.1"],\
           ["@standardnotes/predicates", "workspace:packages/predicates"],\
@@ -2944,7 +2973,6 @@ const RAW_RUNTIME_STATE =
         "packageLocation": "./packages/predicates/",\
         "packageDependencies": [\
           ["@standardnotes/predicates", "workspace:packages/predicates"],\
-          ["@newrelic/native-metrics", "npm:9.0.0"],\
           ["@standardnotes/common", "workspace:packages/common"],\
           ["@types/jest", "npm:29.1.1"],\
           ["@typescript-eslint/eslint-plugin", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:5.30.5"],\
@@ -2981,6 +3009,52 @@ const RAW_RUNTIME_STATE =
         "linkType": "HARD"\
       }]\
     ]],\
+    ["@standardnotes/revisions-server", [\
+      ["workspace:packages/revisions", {\
+        "packageLocation": "./packages/revisions/",\
+        "packageDependencies": [\
+          ["@standardnotes/revisions-server", "workspace:packages/revisions"],\
+          ["@newrelic/native-metrics", "npm:9.0.0"],\
+          ["@newrelic/winston-enricher", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:4.0.0"],\
+          ["@sentry/node", "npm:7.19.0"],\
+          ["@standardnotes/api", "npm:1.19.0"],\
+          ["@standardnotes/common", "workspace:packages/common"],\
+          ["@standardnotes/domain-core", "workspace:packages/domain-core"],\
+          ["@standardnotes/domain-events", "workspace:packages/domain-events"],\
+          ["@standardnotes/domain-events-infra", "workspace:packages/domain-events-infra"],\
+          ["@standardnotes/security", "workspace:packages/security"],\
+          ["@standardnotes/time", "workspace:packages/time"],\
+          ["@types/cors", "npm:2.8.12"],\
+          ["@types/dotenv", "npm:8.2.0"],\
+          ["@types/express", "npm:4.17.14"],\
+          ["@types/inversify-express-utils", "npm:2.0.0"],\
+          ["@types/ioredis", "npm:5.0.0"],\
+          ["@types/jest", "npm:29.1.1"],\
+          ["@types/newrelic", "npm:7.0.4"],\
+          ["@typescript-eslint/eslint-plugin", "virtual:04783e12400851b8a3d76e71495851cc94959db6e62f04cb0a31190080629440b182d8c8eb4d7f2b04e281912f2783a5fd4d2c3c6ab68d38b7097246c93f4c19#npm:5.40.1"],\
+          ["aws-sdk", "npm:2.1253.0"],\
+          ["cors", "npm:2.8.5"],\
+          ["dotenv", "npm:16.0.1"],\
+          ["eslint", "npm:8.25.0"],\
+          ["eslint-plugin-prettier", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:4.2.1"],\
+          ["express", "npm:4.18.2"],\
+          ["helmet", "npm:6.0.0"],\
+          ["inversify", "npm:6.0.1"],\
+          ["inversify-express-utils", "npm:6.4.3"],\
+          ["ioredis", "npm:5.2.4"],\
+          ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
+          ["mysql2", "npm:2.3.3"],\
+          ["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"],\
+          ["typeorm", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:0.3.10"],\
+          ["typescript", "patch:typescript@npm%3A4.8.4#optional!builtin<compat/typescript>::version=4.8.4&hash=701156"],\
+          ["winston", "npm:3.8.2"]\
+        ],\
+        "linkType": "SOFT"\
+      }]\
+    ]],\
     ["@standardnotes/scheduler-server", [\
       ["workspace:packages/scheduler", {\
         "packageLocation": "./packages/scheduler/",\
@@ -3024,7 +3098,6 @@ const RAW_RUNTIME_STATE =
         "packageLocation": "./packages/security/",\
         "packageDependencies": [\
           ["@standardnotes/security", "workspace:packages/security"],\
-          ["@newrelic/native-metrics", "npm:9.0.0"],\
           ["@standardnotes/common", "workspace:packages/common"],\
           ["@types/jest", "npm:29.1.1"],\
           ["@types/jsonwebtoken", "npm:8.5.9"],\
@@ -3096,7 +3169,6 @@ const RAW_RUNTIME_STATE =
         "packageLocation": "./packages/sncrypto-node/",\
         "packageDependencies": [\
           ["@standardnotes/sncrypto-node", "workspace:packages/sncrypto-node"],\
-          ["@newrelic/native-metrics", "npm:9.0.0"],\
           ["@standardnotes/sncrypto-common", "npm:1.13.0"],\
           ["@types/jest", "npm:29.1.1"],\
           ["@types/node", "npm:18.11.9"],\
@@ -3121,6 +3193,7 @@ const RAW_RUNTIME_STATE =
           ["@newrelic/winston-enricher", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:4.0.0"],\
           ["@sentry/node", "npm:7.19.0"],\
           ["@standardnotes/common", "workspace:packages/common"],\
+          ["@standardnotes/domain-core", "workspace:packages/domain-core"],\
           ["@standardnotes/domain-events", "workspace:packages/domain-events"],\
           ["@standardnotes/domain-events-infra", "workspace:packages/domain-events-infra"],\
           ["@standardnotes/payloads", "npm:1.5.1"],\
@@ -3174,7 +3247,6 @@ const RAW_RUNTIME_STATE =
         "packageLocation": "./packages/time/",\
         "packageDependencies": [\
           ["@standardnotes/time", "workspace:packages/time"],\
-          ["@newrelic/native-metrics", "npm:9.0.0"],\
           ["@types/jest", "npm:29.1.1"],\
           ["@types/microtime", "npm:2.1.0"],\
           ["@typescript-eslint/eslint-plugin", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:5.30.5"],\

package.json

@@ -21,6 +21,7 @@
     "lint:websockets": "yarn workspace @standardnotes/websockets-server lint",
     "lint:workspace": "yarn workspace @standardnotes/workspace-server lint",
     "lint:analytics": "yarn workspace @standardnotes/analytics lint",
+    "lint:revisions": "yarn workspace @standardnotes/revisions-server lint",
     "clean": "yarn workspaces foreach -p --verbose run clean",
     "setup:env": "cp .env.sample .env && yarn workspaces foreach -p --verbose run setup:env",
     "start:auth": "yarn workspace @standardnotes/auth-server start",
@@ -34,6 +35,7 @@
     "start:websockets": "yarn workspace @standardnotes/websockets-server start",
     "start:workspace": "yarn workspace @standardnotes/workspace-server start",
     "start:analytics": "yarn workspace @standardnotes/analytics worker",
+    "start:revisions": "yarn workspace @standardnotes/revisions-server start",
     "release": "lerna version --conventional-graduate --conventional-commits --yes -m \"chore(release): publish new version\"",
     "publish": "lerna publish from-git --yes --no-verify-access --loglevel verbose",
     "postversion": "./scripts/push-tags-one-by-one.sh",

packages/analytics/CHANGELOG.md

@@ -3,6 +3,64 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.11.6](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.5...@standardnotes/analytics@2.11.6) (2022-11-22)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.11.5](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.4...@standardnotes/analytics@2.11.5) (2022-11-21)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.11.4](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.3...@standardnotes/analytics@2.11.4) (2022-11-21)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.11.3](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.2...@standardnotes/analytics@2.11.3) (2022-11-18)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.11.2](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.1...@standardnotes/analytics@2.11.2) (2022-11-18)
+
+### Bug Fixes
+
+* **analytics:** specs ([507d43b](https://github.com/standardnotes/server/commit/507d43b3289d1e178644df6d3e15d1d55e56c7bb))
+
+## [2.11.1](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.0...@standardnotes/analytics@2.11.1) (2022-11-18)
+
+### Bug Fixes
+
+* mapper interface imports ([1ec0723](https://github.com/standardnotes/server/commit/1ec072373d640c4e2f24b9bb12fec0c678b48032))
+
+# [2.11.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.10.3...@standardnotes/analytics@2.11.0) (2022-11-16)
+
+### Features
+
+* **analytics:** add publishing churn calculation values in the report ([6c43a33](https://github.com/standardnotes/server/commit/6c43a331d09c2dcf1300742509da6a1d8ef2f5b7))
+
+## [2.10.3](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.10.2...@standardnotes/analytics@2.10.3) (2022-11-16)
+
+### Bug Fixes
+
+* **analytics:** exclude five year plans from mrr stats ([fe1b2a0](https://github.com/standardnotes/server/commit/fe1b2a0e0744417e592f3f61f42610765b416ce6))
+
+## [2.10.2](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.10.1...@standardnotes/analytics@2.10.2) (2022-11-14)
+
+### Bug Fixes
+
+* **analytics:** imports from domain-core ([15dfd6d](https://github.com/standardnotes/server/commit/15dfd6dcba75a772000eeb01b78a532067b01d5b))
+
+## [2.10.1](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.10.0...@standardnotes/analytics@2.10.1) (2022-11-14)
+
+### Bug Fixes
+
+* **syncing-server:** retrieving revisions ([50f7ae3](https://github.com/standardnotes/server/commit/50f7ae338ad66d3465fa16c31e7c47c57b1e0c3c))
+
+# [2.10.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.9.9...@standardnotes/analytics@2.10.0) (2022-11-14)
+
+### Features
+
+* **analytics:** extract domain core into a separate package ([0f94e2a](https://github.com/standardnotes/server/commit/0f94e2ad0c8927733eac31f130cbe649dce765f9))
+
 ## [2.9.9](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.9.6...@standardnotes/analytics@2.9.9) (2022-11-14)
 
 ### Bug Fixes

packages/analytics/bin/report.ts

@@ -175,6 +175,9 @@ const requestReport = async (
   const churnRates: Array<{
     rate: number
     periodKey: string
+    averageCustomersCount: number
+    existingCustomersChurn: number
+    newCustomersChurn: number
   }> = []
   for (const monthPeriodKey of monthlyPeriodKeys) {
     const monthPeriod = periodKeyGenerator.convertPeriodKeyToPeriod(monthPeriodKey)
@@ -204,6 +207,9 @@ const requestReport = async (
     churnRates.push({
       periodKey: monthPeriodKey,
       rate: averageCustomersCount ? (totalChurn / averageCustomersCount) * 100 : 0,
+      averageCustomersCount,
+      existingCustomersChurn,
+      newCustomersChurn,
     })
   }
 

packages/analytics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/analytics",
-  "version": "2.9.9",
+  "version": "2.11.6",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },
@@ -29,7 +29,6 @@
     "@types/jest": "^29.1.1",
     "@types/newrelic": "^7.0.4",
     "@types/node": "^18.11.9",
-    "@types/uuid": "^8.3.0",
     "@typescript-eslint/eslint-plugin": "^5.30.0",
     "eslint": "^8.14.0",
     "eslint-plugin-prettier": "^4.2.1",
@@ -42,6 +41,7 @@
     "@newrelic/winston-enricher": "^4.0.0",
     "@sentry/node": "^7.19.0",
     "@standardnotes/common": "workspace:*",
+    "@standardnotes/domain-core": "workspace:*",
     "@standardnotes/domain-events": "workspace:*",
     "@standardnotes/domain-events-infra": "workspace:*",
     "@standardnotes/time": "workspace:*",
@@ -53,9 +53,7 @@
     "mysql2": "^2.3.3",
     "newrelic": "^9.6.0",
     "reflect-metadata": "^0.1.13",
-    "shallow-equal-object": "^1.1.1",
     "typeorm": "^0.3.10",
-    "uuid": "^9.0.0",
     "winston": "^3.8.1"
   }
 }

packages/analytics/src/Bootstrap/Container.ts

@@ -7,6 +7,7 @@ import {
   DomainEventMessageHandlerInterface,
   DomainEventSubscriberFactoryInterface,
 } from '@standardnotes/domain-events'
+import { MapperInterface } from '@standardnotes/domain-core'
 
 import { Env } from './Env'
 import TYPES from './Types'
@@ -47,7 +48,6 @@ import { RefundProcessedEventHandler } from '../Domain/Handler/RefundProcessedEv
 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'
@@ -172,7 +172,7 @@ export class ContainerConfigLoader {
 
     // Maps
     container
-      .bind<MapInterface<RevenueModification, TypeORMRevenueModification>>(TYPES.RevenueModificationMap)
+      .bind<MapperInterface<RevenueModification, TypeORMRevenueModification>>(TYPES.RevenueModificationMap)
       .to(RevenueModificationMap)
 
     // Services

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

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

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

@@ -1,3 +1,5 @@
+/* istanbul ignore file */
+
 import { DomainEventService, DailyAnalyticsReportGeneratedEvent } from '@standardnotes/domain-events'
 import { TimerInterface } from '@standardnotes/time'
 import { inject, injectable } from 'inversify'
@@ -43,6 +45,9 @@ export class DomainEventFactory implements DomainEventFactoryInterface {
       values: Array<{
         rate: number
         periodKey: string
+        averageCustomersCount: number
+        existingCustomersChurn: number
+        newCustomersChurn: number
       }>
     }
   }): DailyAnalyticsReportGeneratedEvent {

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

@@ -36,6 +36,9 @@ export interface DomainEventFactoryInterface {
       values: Array<{
         rate: number
         periodKey: string
+        averageCustomersCount: number
+        existingCustomersChurn: number
+        newCustomersChurn: number
       }>
     }
   }): DailyAnalyticsReportGeneratedEvent

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

@@ -1,6 +1,7 @@
 import 'reflect-metadata'
 
 import { SubscriptionName } from '@standardnotes/common'
+import { Result } from '@standardnotes/domain-core'
 import { SubscriptionCancelledEvent } from '@standardnotes/domain-events'
 
 import { SubscriptionCancelledEventHandler } from './SubscriptionCancelledEventHandler'
@@ -9,7 +10,6 @@ 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'

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

@@ -1,11 +1,11 @@
 import { DomainEventHandlerInterface, SubscriptionCancelledEvent } from '@standardnotes/domain-events'
 import { inject, injectable } from 'inversify'
 import { Logger } from 'winston'
+import { Email } from '@standardnotes/domain-core'
 
 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'

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

@@ -2,13 +2,13 @@ import 'reflect-metadata'
 
 import { SubscriptionName } from '@standardnotes/common'
 import { SubscriptionExpiredEvent } from '@standardnotes/domain-events'
+import { Result } from '@standardnotes/domain-core'
 
 import { SubscriptionExpiredEventHandler } from './SubscriptionExpiredEventHandler'
 import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
 import { StatisticsStoreInterface } from '../Statistics/StatisticsStoreInterface'
 import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
 import { SaveRevenueModification } from '../UseCase/SaveRevenueModification/SaveRevenueModification'
-import { Result } from '../Core/Result'
 import { RevenueModification } from '../Revenue/RevenueModification'
 import { Logger } from 'winston'
 

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

@@ -1,11 +1,11 @@
 import { DomainEventHandlerInterface, SubscriptionExpiredEvent } from '@standardnotes/domain-events'
 import { inject, injectable } from 'inversify'
 import { Logger } from 'winston'
+import { Email } from '@standardnotes/domain-core'
 
 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'

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

@@ -2,6 +2,7 @@ import 'reflect-metadata'
 
 import { SubscriptionName } from '@standardnotes/common'
 import { SubscriptionPurchasedEvent } from '@standardnotes/domain-events'
+import { Result } from '@standardnotes/domain-core'
 
 import { SubscriptionPurchasedEventHandler } from './SubscriptionPurchasedEventHandler'
 import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
@@ -9,7 +10,6 @@ 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'
 

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

@@ -1,11 +1,11 @@
 import { DomainEventHandlerInterface, SubscriptionPurchasedEvent } from '@standardnotes/domain-events'
 import { inject, injectable } from 'inversify'
 import { Logger } from 'winston'
+import { Email } from '@standardnotes/domain-core'
 
 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'

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

@@ -2,6 +2,7 @@ import 'reflect-metadata'
 
 import { SubscriptionName } from '@standardnotes/common'
 import { SubscriptionRefundedEvent } from '@standardnotes/domain-events'
+import { Result } from '@standardnotes/domain-core'
 
 import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
 import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
@@ -10,7 +11,6 @@ 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'

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

@@ -1,11 +1,11 @@
 import { DomainEventHandlerInterface, SubscriptionRefundedEvent } from '@standardnotes/domain-events'
 import { inject, injectable } from 'inversify'
 import { Logger } from 'winston'
+import { Email } from '@standardnotes/domain-core'
 
 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'

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

@@ -2,13 +2,13 @@ import 'reflect-metadata'
 
 import { SubscriptionName } from '@standardnotes/common'
 import { SubscriptionRenewedEvent } from '@standardnotes/domain-events'
+import { Result } from '@standardnotes/domain-core'
 
 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', () => {

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

@@ -1,5 +1,6 @@
 import { DomainEventHandlerInterface, SubscriptionRenewedEvent } from '@standardnotes/domain-events'
 import { inject, injectable } from 'inversify'
+import { Email } from '@standardnotes/domain-core'
 
 import TYPES from '../../Bootstrap/Types'
 import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
@@ -7,7 +8,6 @@ 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'

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

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

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

@@ -1,18 +1,16 @@
 import { injectable } from 'inversify'
+import { Email, MapperInterface, UniqueEntityId } from '@standardnotes/domain-core'
 
 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> {
+export class RevenueModificationMap implements MapperInterface<RevenueModification, TypeORMRevenueModification> {
   toDomain(persistence: TypeORMRevenueModification): RevenueModification {
     const userOrError = User.create(
       {
@@ -61,7 +59,7 @@ export class RevenueModificationMap implements MapInterface<RevenueModification,
     return revenuModificationOrError.getValue()
   }
 
-  toPersistence(domain: RevenueModification): TypeORMRevenueModification {
+  toProjection(domain: RevenueModification): TypeORMRevenueModification {
     const { subscription, user } = domain.props
     const persistence = new TypeORMRevenueModification()
     persistence.uuid = domain.id.toString()

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

@@ -1,5 +1,5 @@
-import { ValueObject } from '../Core/ValueObject'
-import { Result } from '../Core/Result'
+import { Result, ValueObject } from '@standardnotes/domain-core'
+
 import { MonthlyRevenueProps } from './MonthlyRevenueProps'
 
 export class MonthlyRevenue extends ValueObject<MonthlyRevenueProps> {

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

@@ -1,4 +1,5 @@
-import { Email } from '../Common/Email'
+import { Email } from '@standardnotes/domain-core'
+
 import { Subscription } from '../Subscription/Subscription'
 import { SubscriptionEventType } from '../Subscription/SubscriptionEventType'
 import { SubscriptionPlanName } from '../Subscription/SubscriptionPlanName'

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

@@ -1,6 +1,5 @@
-import { Aggregate } from '../Core/Aggregate'
-import { Result } from '../Core/Result'
-import { UniqueEntityId } from '../Core/UniqueEntityId'
+import { Aggregate, UniqueEntityId, Result } from '@standardnotes/domain-core'
+
 import { RevenueModificationProps } from './RevenueModificationProps'
 
 export class RevenueModification extends Aggregate<RevenueModificationProps> {

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

@@ -1,8 +1,9 @@
-import { Uuid } from '../Common/Uuid'
+import { Uuid } from '@standardnotes/domain-core'
+
 import { RevenueModification } from './RevenueModification'
 
 export interface RevenueModificationRepositoryInterface {
   findLastByUserUuid(userUuid: Uuid): Promise<RevenueModification | null>
-  sumMRRDiff(dto: { planName?: string; billingFrequency?: number }): Promise<number>
+  sumMRRDiff(dto: { billingFrequencies: number[]; planNames?: string[] }): Promise<number>
   save(revenueModification: RevenueModification): Promise<RevenueModification>
 }

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

@@ -1,6 +1,5 @@
-import { Entity } from '../Core/Entity'
-import { Result } from '../Core/Result'
-import { UniqueEntityId } from '../Core/UniqueEntityId'
+import { Entity, Result, UniqueEntityId } from '@standardnotes/domain-core'
+
 import { SubscriptionProps } from './SubscriptionProps'
 
 export class Subscription extends Entity<SubscriptionProps> {

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

@@ -1,5 +1,5 @@
-import { ValueObject } from '../Core/ValueObject'
-import { Result } from '../Core/Result'
+import { ValueObject, Result } from '@standardnotes/domain-core'
+
 import { SubscriptionEventTypeProps } from './SubscriptionEventTypeProps'
 
 export class SubscriptionEventType extends ValueObject<SubscriptionEventTypeProps> {

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

@@ -1,5 +1,5 @@
-import { ValueObject } from '../Core/ValueObject'
-import { Result } from '../Core/Result'
+import { Result, ValueObject } from '@standardnotes/domain-core'
+
 import { SubscriptionPlanNameProps } from './SubscriptionPlanNameProps'
 
 export class SubscriptionPlanName extends ValueObject<SubscriptionPlanNameProps> {

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

@@ -1,7 +1,8 @@
 import { SubscriptionBillingFrequency, SubscriptionName } from '@standardnotes/common'
 import { inject, injectable } from 'inversify'
+import { Result } from '@standardnotes/domain-core'
+
 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'
@@ -19,7 +20,9 @@ export class CalculateMonthlyRecurringRevenue implements DomainUseCaseInterface<
   ) {}
 
   async execute(_dto: CalculateMonthlyRecurringRevenueDTO): Promise<Result<MonthlyRevenue>> {
-    const mrrDiff = await this.revenueModificationRepository.sumMRRDiff({})
+    const mrrDiff = await this.revenueModificationRepository.sumMRRDiff({
+      billingFrequencies: [SubscriptionBillingFrequency.Annual, SubscriptionBillingFrequency.Monthly],
+    })
 
     await this.statisticsStore.setMeasure(StatisticsMeasure.MRR, mrrDiff, [
       Period.Today,
@@ -28,7 +31,7 @@ export class CalculateMonthlyRecurringRevenue implements DomainUseCaseInterface<
     ])
 
     const monthlyPlansMrrDiff = await this.revenueModificationRepository.sumMRRDiff({
-      billingFrequency: SubscriptionBillingFrequency.Monthly,
+      billingFrequencies: [SubscriptionBillingFrequency.Monthly],
     })
 
     await this.statisticsStore.setMeasure(StatisticsMeasure.MonthlyPlansMRR, monthlyPlansMrrDiff, [
@@ -38,7 +41,7 @@ export class CalculateMonthlyRecurringRevenue implements DomainUseCaseInterface<
     ])
 
     const annualPlansMrrDiff = await this.revenueModificationRepository.sumMRRDiff({
-      billingFrequency: SubscriptionBillingFrequency.Annual,
+      billingFrequencies: [SubscriptionBillingFrequency.Annual],
     })
 
     await this.statisticsStore.setMeasure(StatisticsMeasure.AnnualPlansMRR, annualPlansMrrDiff, [
@@ -48,7 +51,7 @@ export class CalculateMonthlyRecurringRevenue implements DomainUseCaseInterface<
     ])
 
     const fiveYearPlansMrrDiff = await this.revenueModificationRepository.sumMRRDiff({
-      billingFrequency: SubscriptionBillingFrequency.FiveYear,
+      billingFrequencies: [SubscriptionBillingFrequency.FiveYear],
     })
 
     await this.statisticsStore.setMeasure(StatisticsMeasure.FiveYearPlansMRR, fiveYearPlansMrrDiff, [
@@ -58,7 +61,8 @@ export class CalculateMonthlyRecurringRevenue implements DomainUseCaseInterface<
     ])
 
     const proPlansMrrDiff = await this.revenueModificationRepository.sumMRRDiff({
-      planName: SubscriptionName.ProPlan,
+      planNames: [SubscriptionName.ProPlan],
+      billingFrequencies: [SubscriptionBillingFrequency.Annual, SubscriptionBillingFrequency.Monthly],
     })
 
     await this.statisticsStore.setMeasure(StatisticsMeasure.ProPlansMRR, proPlansMrrDiff, [
@@ -68,7 +72,8 @@ export class CalculateMonthlyRecurringRevenue implements DomainUseCaseInterface<
     ])
 
     const plusPlansMrrDiff = await this.revenueModificationRepository.sumMRRDiff({
-      planName: SubscriptionName.PlusPlan,
+      planNames: [SubscriptionName.PlusPlan],
+      billingFrequencies: [SubscriptionBillingFrequency.Annual, SubscriptionBillingFrequency.Monthly],
     })
 
     await this.statisticsStore.setMeasure(StatisticsMeasure.PlusPlansMRR, plusPlansMrrDiff, [

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

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

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

@@ -14,7 +14,7 @@ describe('GetUserAnalyticsId', () => {
   beforeEach(() => {
     analyticsEntity = {
       id: 123,
-      userUuid: '1-2-3',
+      userUuid: '84c0f8e8-544a-4c7e-9adf-26209303bc1d',
       userEmail: 'test@test.te',
     } as jest.Mocked<AnalyticsEntity>
 
@@ -24,11 +24,11 @@ describe('GetUserAnalyticsId', () => {
   })
 
   it('should return analytics id for a user by uuid', async () => {
-    expect(await (await createUseCase().execute({ userUuid: '1-2-3' })).analyticsId).toEqual(123)
+    expect((await createUseCase().execute({ userUuid: '1-2-3' })).analyticsId).toEqual(123)
   })
 
   it('should return analytics id for a user by email', async () => {
-    expect(await (await createUseCase().execute({ userEmail: 'test@test.te' })).analyticsId).toEqual(123)
+    expect((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,7 +1,7 @@
 import { inject, injectable } from 'inversify'
+import { Email, Uuid } from '@standardnotes/domain-core'
+
 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'

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

@@ -1,5 +1,4 @@
-import { Email } from '../../Common/Email'
-import { Uuid } from '../../Common/Uuid'
+import { Email, Uuid } from '@standardnotes/domain-core'
 
 export type GetUserAnalyticsIdResponse = {
   analyticsId: number

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

@@ -1,9 +1,8 @@
 import 'reflect-metadata'
 
 import { TimerInterface } from '@standardnotes/time'
+import { Email, Result, Uuid } from '@standardnotes/domain-core'
 
-import { Email } from '../../Common/Email'
-import { Uuid } from '../../Common/Uuid'
 import { MonthlyRevenue } from '../../Revenue/MonthlyRevenue'
 
 import { RevenueModification } from '../../Revenue/RevenueModification'
@@ -12,7 +11,6 @@ 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', () => {
@@ -48,7 +46,7 @@ describe('SaveRevenueModification', () => {
       planName: SubscriptionPlanName.create('PRO_PLAN').getValue(),
       subscriptionId: 1234,
       userEmail: Email.create('test@test.te').getValue(),
-      userUuid: Uuid.create('1-2-3').getValue(),
+      userUuid: Uuid.create('84c0f8e8-544a-4c7e-9adf-26209303bc1d').getValue(),
     })
 
     expect(revenueOrError.isFailed()).toBeFalsy()
@@ -66,7 +64,7 @@ describe('SaveRevenueModification', () => {
       planName: SubscriptionPlanName.create('PRO_PLAN').getValue(),
       subscriptionId: 1234,
       userEmail: Email.create('test@test.te').getValue(),
-      userUuid: Uuid.create('1-2-3').getValue(),
+      userUuid: Uuid.create('84c0f8e8-544a-4c7e-9adf-26209303bc1d').getValue(),
     })
 
     expect(revenueOrError.isFailed()).toBeFalsy()
@@ -84,7 +82,7 @@ describe('SaveRevenueModification', () => {
       planName: SubscriptionPlanName.create('PRO_PLAN').getValue(),
       subscriptionId: 1234,
       userEmail: Email.create('test@test.te').getValue(),
-      userUuid: Uuid.create('1-2-3').getValue(),
+      userUuid: Uuid.create('84c0f8e8-544a-4c7e-9adf-26209303bc1d').getValue(),
     })
 
     expect(revenueOrError.isFailed()).toBeFalsy()
@@ -104,7 +102,7 @@ describe('SaveRevenueModification', () => {
       planName: SubscriptionPlanName.create('PRO_PLAN').getValue(),
       subscriptionId: 1234,
       userEmail: Email.create('test@test.te').getValue(),
-      userUuid: Uuid.create('1-2-3').getValue(),
+      userUuid: Uuid.create('84c0f8e8-544a-4c7e-9adf-26209303bc1d').getValue(),
     })
 
     expect(revenueOrError.isFailed()).toBeFalsy()
@@ -125,7 +123,7 @@ describe('SaveRevenueModification', () => {
       planName: SubscriptionPlanName.create('PRO_PLAN').getValue(),
       subscriptionId: 1234,
       userEmail: Email.create('test@test.te').getValue(),
-      userUuid: Uuid.create('1-2-3').getValue(),
+      userUuid: Uuid.create('84c0f8e8-544a-4c7e-9adf-26209303bc1d').getValue(),
     })
 
     expect(revenueOrError.isFailed()).toBeTruthy()
@@ -145,7 +143,7 @@ describe('SaveRevenueModification', () => {
       planName: SubscriptionPlanName.create('PRO_PLAN').getValue(),
       subscriptionId: 1234,
       userEmail: Email.create('test@test.te').getValue(),
-      userUuid: Uuid.create('1-2-3').getValue(),
+      userUuid: Uuid.create('84c0f8e8-544a-4c7e-9adf-26209303bc1d').getValue(),
     })
 
     expect(revenueOrError.isFailed()).toBeTruthy()
@@ -165,7 +163,7 @@ describe('SaveRevenueModification', () => {
       planName: SubscriptionPlanName.create('PRO_PLAN').getValue(),
       subscriptionId: 1234,
       userEmail: Email.create('test@test.te').getValue(),
-      userUuid: Uuid.create('1-2-3').getValue(),
+      userUuid: Uuid.create('84c0f8e8-544a-4c7e-9adf-26209303bc1d').getValue(),
     })
 
     expect(revenueOrError.isFailed()).toBeTruthy()
@@ -185,7 +183,7 @@ describe('SaveRevenueModification', () => {
       planName: SubscriptionPlanName.create('PRO_PLAN').getValue(),
       subscriptionId: 1234,
       userEmail: Email.create('test@test.te').getValue(),
-      userUuid: Uuid.create('1-2-3').getValue(),
+      userUuid: Uuid.create('84c0f8e8-544a-4c7e-9adf-26209303bc1d').getValue(),
     })
 
     expect(revenueOrError.isFailed()).toBeTruthy()
@@ -205,7 +203,7 @@ describe('SaveRevenueModification', () => {
       planName: SubscriptionPlanName.create('PRO_PLAN').getValue(),
       subscriptionId: 1234,
       userEmail: Email.create('test@test.te').getValue(),
-      userUuid: Uuid.create('1-2-3').getValue(),
+      userUuid: Uuid.create('84c0f8e8-544a-4c7e-9adf-26209303bc1d').getValue(),
     })
 
     expect(revenueOrError.isFailed()).toBeTruthy()

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

@@ -1,13 +1,12 @@
 import { inject, injectable } from 'inversify'
+import { Result, UniqueEntityId } from '@standardnotes/domain-core'
 
 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'

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

@@ -1,5 +1,5 @@
-import { Email } from '../../Common/Email'
-import { Uuid } from '../../Common/Uuid'
+import { Email, Uuid } from '@standardnotes/domain-core'
+
 import { SubscriptionEventType } from '../../Subscription/SubscriptionEventType'
 import { SubscriptionPlanName } from '../../Subscription/SubscriptionPlanName'
 

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

@@ -1,4 +1,5 @@
-import { Email } from '../Common/Email'
+import { Email } from '@standardnotes/domain-core'
+
 import { User } from './User'
 
 describe('User', () => {

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

@@ -1,6 +1,5 @@
-import { Entity } from '../Core/Entity'
-import { Result } from '../Core/Result'
-import { UniqueEntityId } from '../Core/UniqueEntityId'
+import { Entity, Result, UniqueEntityId } from '@standardnotes/domain-core'
+
 import { UserProps } from './UserProps'
 
 export class User extends Entity<UserProps> {

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

@@ -1,4 +1,4 @@
-import { Email } from '../Common/Email'
+import { Email } from '@standardnotes/domain-core'
 
 export interface UserProps {
   email: Email

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

@@ -1,9 +1,8 @@
 import { inject, injectable } from 'inversify'
 import { Repository } from 'typeorm'
+import { MapperInterface, Uuid } from '@standardnotes/domain-core'
 
 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'
@@ -14,17 +13,17 @@ export class MySQLRevenueModificationRepository implements RevenueModificationRe
     @inject(TYPES.ORMRevenueModificationRepository)
     private ormRepository: Repository<TypeORMRevenueModification>,
     @inject(TYPES.RevenueModificationMap)
-    private revenueModificationMap: MapInterface<RevenueModification, TypeORMRevenueModification>,
+    private revenueModificationMap: MapperInterface<RevenueModification, TypeORMRevenueModification>,
   ) {}
 
-  async sumMRRDiff(dto: { planName?: string; billingFrequency?: number }): Promise<number> {
+  async sumMRRDiff(dto: { billingFrequencies: number[]; planNames?: string[] }): 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.billingFrequencies.length > 0) {
+      query.where('billing_frequency IN (:...billingFrequencies)', { billingFrequencies: dto.billingFrequencies })
     }
-    if (dto.billingFrequency !== undefined) {
-      query.where('billing_frequency = :billingFrequency', { billingFrequency: dto.billingFrequency })
+    if (dto.planNames && dto.planNames.length > 0) {
+      query.andWhere('subscription_plan IN (:...planNames)', { planNames: dto.planNames })
     }
 
     const result = await query.getRawOne()
@@ -52,7 +51,7 @@ export class MySQLRevenueModificationRepository implements RevenueModificationRe
   }
 
   async save(revenueModification: RevenueModification): Promise<RevenueModification> {
-    let persistence = this.revenueModificationMap.toPersistence(revenueModification)
+    let persistence = this.revenueModificationMap.toProjection(revenueModification)
 
     persistence = await this.ormRepository.save(persistence)
 

packages/api-gateway/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.38.9](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.38.8...@standardnotes/api-gateway@1.38.9) (2022-11-22)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.38.8](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.38.7...@standardnotes/api-gateway@1.38.8) (2022-11-21)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.38.7](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.38.6...@standardnotes/api-gateway@1.38.7) (2022-11-18)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.38.6](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.38.5...@standardnotes/api-gateway@1.38.6) (2022-11-16)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.38.5](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.38.4...@standardnotes/api-gateway@1.38.5) (2022-11-14)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
 ## [1.38.4](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.38.1...@standardnotes/api-gateway@1.38.4) (2022-11-14)
 
 ### Bug Fixes

packages/api-gateway/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/api-gateway",
-  "version": "1.38.4",
+  "version": "1.38.9",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },

packages/auth/CHANGELOG.md

@@ -3,6 +3,32 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.60.4](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.3...@standardnotes/auth-server@1.60.4) (2022-11-22)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.60.3](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.2...@standardnotes/auth-server@1.60.3) (2022-11-21)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.60.2](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.1...@standardnotes/auth-server@1.60.2) (2022-11-18)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.60.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.0...@standardnotes/auth-server@1.60.1) (2022-11-16)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+# [1.60.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.59.11...@standardnotes/auth-server@1.60.0) (2022-11-14)
+
+### Features
+
+* **auth:** add content size recalculation procedure trigger ([590ec66](https://github.com/standardnotes/server/commit/590ec6643db57adf3e202c6ccab4bac36aae8b59))
+
+## [1.59.11](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.59.10...@standardnotes/auth-server@1.59.11) (2022-11-14)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
 ## [1.59.10](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.59.7...@standardnotes/auth-server@1.59.10) (2022-11-14)
 
 ### Bug Fixes

packages/auth/bin/content.ts

@@ -0,0 +1,74 @@
+import 'reflect-metadata'
+
+import 'newrelic'
+
+import { Logger } from 'winston'
+import * as dayjs from 'dayjs'
+import * as utc from 'dayjs/plugin/utc'
+
+import { ContainerConfigLoader } from '../src/Bootstrap/Container'
+import TYPES from '../src/Bootstrap/Types'
+import { Env } from '../src/Bootstrap/Env'
+import { DomainEventPublisherInterface } from '@standardnotes/domain-events'
+import { DomainEventFactoryInterface } from '../src/Domain/Event/DomainEventFactoryInterface'
+import { UserRepositoryInterface } from '../src/Domain/User/UserRepositoryInterface'
+import { Stream } from 'stream'
+
+const requestRecalculation = async (
+  userRepository: UserRepositoryInterface,
+  domainEventFactory: DomainEventFactoryInterface,
+  domainEventPublisher: DomainEventPublisherInterface,
+  logger: Logger,
+): Promise<void> => {
+  const stream = await userRepository.streamAll()
+
+  return new Promise((resolve, reject) => {
+    stream
+      .pipe(
+        new Stream.Transform({
+          objectMode: true,
+          transform: async (rawUserData, _encoding, callback) => {
+            try {
+              await domainEventPublisher.publish(
+                domainEventFactory.createUserContentSizeRecalculationRequestedEvent(rawUserData.user_uuid),
+              )
+            } catch (error) {
+              logger.error(`Could not process user ${rawUserData.user_uuid}: ${(error as Error).message}`)
+            }
+
+            callback()
+          },
+        }),
+      )
+      .on('finish', resolve)
+      .on('error', reject)
+  })
+}
+
+const container = new ContainerConfigLoader()
+void container.load().then((container) => {
+  dayjs.extend(utc)
+
+  const env: Env = new Env()
+  env.load()
+
+  const logger: Logger = container.get(TYPES.Logger)
+
+  logger.info('Starting content size recalculation requests ...')
+
+  const userRepository: UserRepositoryInterface = container.get(TYPES.UserRepository)
+  const domainEventFactory: DomainEventFactoryInterface = container.get(TYPES.DomainEventFactory)
+  const domainEventPublisher: DomainEventPublisherInterface = container.get(TYPES.DomainEventPublisher)
+
+  Promise.resolve(requestRecalculation(userRepository, domainEventFactory, domainEventPublisher, logger))
+    .then(() => {
+      logger.info('content size recalculation requesting complete')
+
+      process.exit(0)
+    })
+    .catch((error) => {
+      logger.error(`Could not finish content size recalculation requesting : ${error.message}`)
+
+      process.exit(1)
+    })
+})

packages/auth/docker/entrypoint.sh

@@ -56,6 +56,11 @@ case "$COMMAND" in
     yarn workspace @standardnotes/auth-server email-campaign $MESSAGE_IDENTIFIER
     ;;
 
+  'content-recalculation' )
+    echo "Starting Content Size Recalculation..."
+    yarn workspace @standardnotes/auth-server content-recalculation
+    ;;
+
    * )
     echo "Unknown command"
     ;;

packages/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/auth-server",
-  "version": "1.59.10",
+  "version": "1.60.4",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },
@@ -25,6 +25,7 @@
     "daily-backup:google_drive": "yarn node dist/bin/backup.js google_drive daily",
     "daily-backup:one_drive": "yarn node dist/bin/backup.js one_drive daily",
     "weekly-backup:email": "yarn node dist/bin/backup.js email weekly",
+    "content-recalculation": "yarn node dist/bin/content.js",
     "email-campaign": "yarn node dist/bin/email.js",
     "typeorm": "typeorm-ts-node-commonjs",
     "upgrade:snjs": "yarn ncu -u '@standardnotes/*'"

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

@@ -1,406 +0,0 @@
-import 'reflect-metadata'
-
-import { EmailMessageIdentifier, ProtocolVersion, RoleName } from '@standardnotes/common'
-import { PredicateName, PredicateAuthority, PredicateVerificationResult } from '@standardnotes/predicates'
-import { TimerInterface } from '@standardnotes/time'
-
-import { DomainEventFactory } from './DomainEventFactory'
-import { InviteeIdentifierType } from '../SharedSubscription/InviteeIdentifierType'
-
-describe('DomainEventFactory', () => {
-  let timer: TimerInterface
-
-  const createFactory = () => new DomainEventFactory(timer)
-
-  beforeEach(() => {
-    timer = {} as jest.Mocked<TimerInterface>
-    timer.getTimestampInMicroseconds = jest.fn().mockReturnValue(1)
-    timer.getUTCDate = jest.fn().mockReturnValue(new Date(1))
-  })
-
-  it('should create a EXIT_DISCOUNT_APPLY_REQUESTED event', () => {
-    expect(
-      createFactory().createExitDiscountApplyRequestedEvent({
-        userEmail: 'test@test.te',
-        discountCode: 'exit-20',
-      }),
-    ).toEqual({
-      createdAt: expect.any(Date),
-      meta: {
-        correlation: {
-          userIdentifier: 'test@test.te',
-          userIdentifierType: 'email',
-        },
-        origin: 'auth',
-      },
-      payload: {
-        userEmail: 'test@test.te',
-        discountCode: 'exit-20',
-      },
-      type: 'EXIT_DISCOUNT_APPLY_REQUESTED',
-    })
-  })
-
-  it('should create a WEB_SOCKET_MESSAGE_REQUESTED event', () => {
-    expect(
-      createFactory().createWebSocketMessageRequestedEvent({
-        userUuid: '1-2-3',
-        message: 'foobar',
-      }),
-    ).toEqual({
-      createdAt: expect.any(Date),
-      meta: {
-        correlation: {
-          userIdentifier: '1-2-3',
-          userIdentifierType: 'uuid',
-        },
-        origin: 'auth',
-      },
-      payload: {
-        userUuid: '1-2-3',
-        message: 'foobar',
-      },
-      type: 'WEB_SOCKET_MESSAGE_REQUESTED',
-    })
-  })
-
-  it('should create a EMAIL_MESSAGE_REQUESTED event', () => {
-    expect(
-      createFactory().createEmailMessageRequestedEvent({
-        userEmail: 'test@test.te',
-        messageIdentifier: EmailMessageIdentifier.ENCOURAGE_EMAIL_BACKUPS,
-        context: {
-          foo: 'bar',
-        },
-      }),
-    ).toEqual({
-      createdAt: expect.any(Date),
-      meta: {
-        correlation: {
-          userIdentifier: 'test@test.te',
-          userIdentifierType: 'email',
-        },
-        origin: 'auth',
-      },
-      payload: {
-        messageIdentifier: 'ENCOURAGE_EMAIL_BACKUPS',
-        userEmail: 'test@test.te',
-        context: {
-          foo: 'bar',
-        },
-      },
-      type: 'EMAIL_MESSAGE_REQUESTED',
-    })
-  })
-
-  it('should create a PREDICATE_VERIFIED event', () => {
-    expect(
-      createFactory().createPredicateVerifiedEvent({
-        predicate: {
-          authority: PredicateAuthority.Auth,
-          jobUuid: '1-2-3',
-          name: PredicateName.EmailBackupsEnabled,
-        },
-        predicateVerificationResult: PredicateVerificationResult.Affirmed,
-        userUuid: '2-3-4',
-      }),
-    ).toEqual({
-      createdAt: expect.any(Date),
-      meta: {
-        correlation: {
-          userIdentifier: '2-3-4',
-          userIdentifierType: 'uuid',
-        },
-        origin: 'auth',
-      },
-      payload: {
-        predicate: {
-          authority: 'auth',
-          jobUuid: '1-2-3',
-          name: 'email-backups-enabled',
-        },
-        predicateVerificationResult: 'affirmed',
-      },
-      type: 'PREDICATE_VERIFIED',
-    })
-  })
-
-  it('should create a SHARED_SUBSCRIPTION_INVITATION_CANCELED event', () => {
-    expect(
-      createFactory().createSharedSubscriptionInvitationCanceledEvent({
-        inviterEmail: 'test@test.te',
-        inviterSubscriptionId: 1,
-        inviterSubscriptionUuid: '2-3-4',
-        inviteeIdentifier: 'invitee@test.te',
-        inviteeIdentifierType: InviteeIdentifierType.Email,
-        sharedSubscriptionInvitationUuid: '1-2-3',
-      }),
-    ).toEqual({
-      createdAt: expect.any(Date),
-      meta: {
-        correlation: {
-          userIdentifier: 'test@test.te',
-          userIdentifierType: 'email',
-        },
-        origin: 'auth',
-      },
-      payload: {
-        inviterEmail: 'test@test.te',
-        inviterSubscriptionId: 1,
-        inviterSubscriptionUuid: '2-3-4',
-        inviteeIdentifier: 'invitee@test.te',
-        inviteeIdentifierType: InviteeIdentifierType.Email,
-        sharedSubscriptionInvitationUuid: '1-2-3',
-      },
-      type: 'SHARED_SUBSCRIPTION_INVITATION_CANCELED',
-    })
-  })
-
-  it('should create a SHARED_SUBSCRIPTION_INVITATION_CREATED event', () => {
-    expect(
-      createFactory().createSharedSubscriptionInvitationCreatedEvent({
-        inviterEmail: 'test@test.te',
-        inviterSubscriptionId: 1,
-        inviteeIdentifier: 'invitee@test.te',
-        inviteeIdentifierType: InviteeIdentifierType.Email,
-        sharedSubscriptionInvitationUuid: '1-2-3',
-      }),
-    ).toEqual({
-      createdAt: expect.any(Date),
-      meta: {
-        correlation: {
-          userIdentifier: 'test@test.te',
-          userIdentifierType: 'email',
-        },
-        origin: 'auth',
-      },
-      payload: {
-        inviterEmail: 'test@test.te',
-        inviterSubscriptionId: 1,
-        inviteeIdentifier: 'invitee@test.te',
-        inviteeIdentifierType: InviteeIdentifierType.Email,
-        sharedSubscriptionInvitationUuid: '1-2-3',
-      },
-      type: 'SHARED_SUBSCRIPTION_INVITATION_CREATED',
-    })
-  })
-
-  it('should create a USER_DISABLED_SESSION_USER_AGENT_LOGGING event', () => {
-    expect(
-      createFactory().createUserDisabledSessionUserAgentLoggingEvent({
-        email: 'test@test.te',
-        userUuid: '1-2-3',
-      }),
-    ).toEqual({
-      createdAt: expect.any(Date),
-      meta: {
-        correlation: {
-          userIdentifier: '1-2-3',
-          userIdentifierType: 'uuid',
-        },
-        origin: 'auth',
-      },
-      payload: {
-        userUuid: '1-2-3',
-        email: 'test@test.te',
-      },
-      type: 'USER_DISABLED_SESSION_USER_AGENT_LOGGING',
-    })
-  })
-
-  it('should create a USER_SIGNED_IN event', () => {
-    expect(
-      createFactory().createUserSignedInEvent({
-        browser: 'Firefox 1',
-        device: 'iOS 1',
-        userEmail: 'test@test.te',
-        userUuid: '1-2-3',
-        signInAlertEnabled: true,
-        muteSignInEmailsSettingUuid: '2-3-4',
-      }),
-    ).toEqual({
-      createdAt: expect.any(Date),
-      meta: {
-        correlation: {
-          userIdentifier: '1-2-3',
-          userIdentifierType: 'uuid',
-        },
-        origin: 'auth',
-      },
-      payload: {
-        userUuid: '1-2-3',
-        userEmail: 'test@test.te',
-        browser: 'Firefox 1',
-        device: 'iOS 1',
-        signInAlertEnabled: true,
-        muteSignInEmailsSettingUuid: '2-3-4',
-      },
-      type: 'USER_SIGNED_IN',
-    })
-  })
-
-  it('should create a LISTED_ACCOUNT_REQUESTED event', () => {
-    expect(createFactory().createListedAccountRequestedEvent('1-2-3', 'test@test.te')).toEqual({
-      createdAt: expect.any(Date),
-      meta: {
-        correlation: {
-          userIdentifier: '1-2-3',
-          userIdentifierType: 'uuid',
-        },
-        origin: 'auth',
-      },
-      payload: {
-        userUuid: '1-2-3',
-        userEmail: 'test@test.te',
-      },
-      type: 'LISTED_ACCOUNT_REQUESTED',
-    })
-  })
-
-  it('should create a USER_REGISTERED event', () => {
-    expect(
-      createFactory().createUserRegisteredEvent({
-        userUuid: '1-2-3',
-        email: 'test@test.te',
-        protocolVersion: ProtocolVersion.V004,
-      }),
-    ).toEqual({
-      createdAt: expect.any(Date),
-      meta: {
-        correlation: {
-          userIdentifier: '1-2-3',
-          userIdentifierType: 'uuid',
-        },
-        origin: 'auth',
-      },
-      payload: {
-        userUuid: '1-2-3',
-        email: 'test@test.te',
-        protocolVersion: '004',
-      },
-      type: 'USER_REGISTERED',
-    })
-  })
-
-  it('should create a OFFLINE_SUBSCRIPTION_TOKEN_CREATED event', () => {
-    expect(createFactory().createOfflineSubscriptionTokenCreatedEvent('1-2-3', 'test@test.te')).toEqual({
-      createdAt: expect.any(Date),
-      meta: {
-        correlation: {
-          userIdentifier: 'test@test.te',
-          userIdentifierType: 'email',
-        },
-        origin: 'auth',
-      },
-      payload: {
-        token: '1-2-3',
-        email: 'test@test.te',
-      },
-      type: 'OFFLINE_SUBSCRIPTION_TOKEN_CREATED',
-    })
-  })
-
-  it('should create a USER_CHANGED_EMAIL event', () => {
-    expect(createFactory().createUserEmailChangedEvent('1-2-3', 'test@test.te', 'test2@test.te')).toEqual({
-      createdAt: expect.any(Date),
-      meta: {
-        correlation: {
-          userIdentifier: '1-2-3',
-          userIdentifierType: 'uuid',
-        },
-        origin: 'auth',
-      },
-      payload: {
-        userUuid: '1-2-3',
-        fromEmail: 'test@test.te',
-        toEmail: 'test2@test.te',
-      },
-      type: 'USER_EMAIL_CHANGED',
-    })
-  })
-
-  it('should create a CLOUD_BACKUP_REQUESTED event', () => {
-    expect(createFactory().createCloudBackupRequestedEvent('GOOGLE_DRIVE', 'test', '1-2-3', '2-3-4', true)).toEqual({
-      createdAt: expect.any(Date),
-      meta: {
-        correlation: {
-          userIdentifier: '1-2-3',
-          userIdentifierType: 'uuid',
-        },
-        origin: 'auth',
-      },
-      payload: {
-        cloudProvider: 'GOOGLE_DRIVE',
-        cloudProviderToken: 'test',
-        userUuid: '1-2-3',
-        muteEmailsSettingUuid: '2-3-4',
-        userHasEmailsMuted: true,
-      },
-      type: 'CLOUD_BACKUP_REQUESTED',
-    })
-  })
-
-  it('should create a EMAIL_BACKUP_REQUESTED event', () => {
-    expect(createFactory().createEmailBackupRequestedEvent('1-2-3', '2-3-4', true)).toEqual({
-      createdAt: expect.any(Date),
-      meta: {
-        correlation: {
-          userIdentifier: '1-2-3',
-          userIdentifierType: 'uuid',
-        },
-        origin: 'auth',
-      },
-      payload: {
-        userUuid: '1-2-3',
-        muteEmailsSettingUuid: '2-3-4',
-        userHasEmailsMuted: true,
-      },
-      type: 'EMAIL_BACKUP_REQUESTED',
-    })
-  })
-
-  it('should create a ACCOUNT_DELETION_REQUESTED event', () => {
-    expect(
-      createFactory().createAccountDeletionRequestedEvent({
-        userUuid: '1-2-3',
-        userCreatedAtTimestamp: 123,
-        regularSubscriptionUuid: '2-3-4',
-      }),
-    ).toEqual({
-      createdAt: expect.any(Date),
-      meta: {
-        correlation: {
-          userIdentifier: '1-2-3',
-          userIdentifierType: 'uuid',
-        },
-        origin: 'auth',
-      },
-      payload: {
-        userUuid: '1-2-3',
-        userCreatedAtTimestamp: 123,
-        regularSubscriptionUuid: '2-3-4',
-      },
-      type: 'ACCOUNT_DELETION_REQUESTED',
-    })
-  })
-
-  it('should create a USER_ROLE_CHANGED event', () => {
-    expect(createFactory().createUserRolesChangedEvent('1-2-3', 'test@test.com', [RoleName.ProUser])).toEqual({
-      createdAt: expect.any(Date),
-      meta: {
-        correlation: {
-          userIdentifier: '1-2-3',
-          userIdentifierType: 'uuid',
-        },
-        origin: 'auth',
-      },
-      payload: {
-        userUuid: '1-2-3',
-        email: 'test@test.com',
-        currentRoles: [RoleName.ProUser],
-        timestamp: expect.any(Number),
-      },
-      type: 'USER_ROLES_CHANGED',
-    })
-  })
-})

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

@@ -1,3 +1,5 @@
+/* istanbul ignore file */
+
 import { EmailMessageIdentifier, JSONString, ProtocolVersion, RoleName, Uuid } from '@standardnotes/common'
 import {
   AccountDeletionRequestedEvent,
@@ -17,6 +19,7 @@ import {
   EmailMessageRequestedEvent,
   WebSocketMessageRequestedEvent,
   ExitDiscountApplyRequestedEvent,
+  UserContentSizeRecalculationRequestedEvent,
 } from '@standardnotes/domain-events'
 import { Predicate, PredicateVerificationResult } from '@standardnotes/predicates'
 import { TimerInterface } from '@standardnotes/time'
@@ -29,6 +32,23 @@ import { DomainEventFactoryInterface } from './DomainEventFactoryInterface'
 export class DomainEventFactory implements DomainEventFactoryInterface {
   constructor(@inject(TYPES.Timer) private timer: TimerInterface) {}
 
+  createUserContentSizeRecalculationRequestedEvent(userUuid: string): UserContentSizeRecalculationRequestedEvent {
+    return {
+      type: 'USER_CONTENT_SIZE_RECALCULATION_REQUESTED',
+      createdAt: this.timer.getUTCDate(),
+      meta: {
+        correlation: {
+          userIdentifier: userUuid,
+          userIdentifierType: 'uuid',
+        },
+        origin: DomainEventService.Auth,
+      },
+      payload: {
+        userUuid,
+      },
+    }
+  }
+
   createExitDiscountApplyRequestedEvent(dto: {
     userEmail: string
     discountCode: string

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

@@ -17,10 +17,12 @@ import {
   EmailMessageRequestedEvent,
   WebSocketMessageRequestedEvent,
   ExitDiscountApplyRequestedEvent,
+  UserContentSizeRecalculationRequestedEvent,
 } from '@standardnotes/domain-events'
 import { InviteeIdentifierType } from '../SharedSubscription/InviteeIdentifierType'
 
 export interface DomainEventFactoryInterface {
+  createUserContentSizeRecalculationRequestedEvent(userUuid: string): UserContentSizeRecalculationRequestedEvent
   createWebSocketMessageRequestedEvent(dto: { userUuid: Uuid; message: JSONString }): WebSocketMessageRequestedEvent
   createEmailMessageRequestedEvent(dto: {
     userEmail: string

packages/common/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.46.0](https://github.com/standardnotes/server/compare/@standardnotes/common@1.45.0...@standardnotes/common@1.46.0) (2022-11-22)
+
+### Features
+
+* **common:** add marketing campaign for black friday 2022 email message identifier ([d77eb7f](https://github.com/standardnotes/server/commit/d77eb7f5f11bcc7cd5c6fa6d20e891b466af7b45))
+
+# [1.45.0](https://github.com/standardnotes/server/compare/@standardnotes/common@1.44.4...@standardnotes/common@1.45.0) (2022-11-14)
+
+### Features
+
+* **analytics:** extract domain core into a separate package ([0f94e2a](https://github.com/standardnotes/server/commit/0f94e2ad0c8927733eac31f130cbe649dce765f9))
+
 ## [1.44.4](https://github.com/standardnotes/server/compare/@standardnotes/common@1.44.1...@standardnotes/common@1.44.4) (2022-11-14)
 
 ### Bug Fixes

packages/common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/common",
-  "version": "1.44.4",
+  "version": "1.46.0",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },
@@ -32,7 +32,6 @@
     "typescript": "^4.8.4"
   },
   "dependencies": {
-    "@newrelic/native-metrics": "^9.0.0",
     "reflect-metadata": "^0.1.13"
   }
 }

packages/common/src/Domain/Email/EmailMessageIdentifier.ts

@@ -18,6 +18,7 @@ export enum EmailMessageIdentifier {
   STUDENT_DISCOUNT_REQUESTED = 'STUDENT_DISCOUNT_REQUESTED',
   STUDENT_DISCOUNT_APPROVED = 'STUDENT_DISCOUNT_APPROVED',
   MARKETING_CAMPAIGN_FILES = 'MARKETING_CAMPAIGN_FILES',
+  MARKETING_BLACK_FRIDAY_2022 = 'MARKETING_BLACK_FRIDAY_2022',
   PAYMENT_FAILED = 'PAYMENT_FAILED',
   SEND_INVOICE = 'SEND_INVOICE',
   DISCOUNT_NOTICE = 'DISCOUNT_NOTICE',

packages/domain-core/.eslintignore

@@ -0,0 +1 @@
+dist

packages/domain-core/.eslintrc

@@ -0,0 +1,6 @@
+{
+  "extends": "../../.eslintrc",
+  "parserOptions": {
+    "project": "./linter.tsconfig.json"
+  }
+}

packages/domain-core/CHANGELOG.md

@@ -0,0 +1,33 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## [1.2.2](https://github.com/standardnotes/server/compare/@standardnotes/domain-core@1.2.1...@standardnotes/domain-core@1.2.2) (2022-11-22)
+
+**Note:** Version bump only for package @standardnotes/domain-core
+
+## [1.2.1](https://github.com/standardnotes/server/compare/@standardnotes/domain-core@1.2.0...@standardnotes/domain-core@1.2.1) (2022-11-21)
+
+### Bug Fixes
+
+* **domain-core:** remove revisions related models to revisions microservice ([a6542dd](https://github.com/standardnotes/server/commit/a6542dd63870a8ada5fd8143d8e2133a570d9329))
+
+# [1.2.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-core@1.1.1...@standardnotes/domain-core@1.2.0) (2022-11-18)
+
+### Features
+
+* **domain-core:** add revision definition to domain core ([c8f3a0c](https://github.com/standardnotes/server/commit/c8f3a0ce7b589a6fbc47941fc5d1a44b6cf04fe3))
+* **revisions:** add revisions microservice ([d5c06bf](https://github.com/standardnotes/server/commit/d5c06bfa58a987685fbd8fbab0d22df3fcff3377))
+
+## [1.1.1](https://github.com/standardnotes/server/compare/@standardnotes/domain-core@1.1.0...@standardnotes/domain-core@1.1.1) (2022-11-14)
+
+### Bug Fixes
+
+* **syncing-server:** retrieving revisions ([50f7ae3](https://github.com/standardnotes/server/commit/50f7ae338ad66d3465fa16c31e7c47c57b1e0c3c))
+
+# 1.1.0 (2022-11-14)
+
+### Features
+
+* **analytics:** extract domain core into a separate package ([0f94e2a](https://github.com/standardnotes/server/commit/0f94e2ad0c8927733eac31f130cbe649dce765f9))

packages/domain-core/jest.config.js

@@ -0,0 +1,10 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const base = require('../../jest.config')
+const { defaults: tsjPreset } = require('ts-jest/presets')
+
+module.exports = {
+  ...base,
+  transform: {
+    ...tsjPreset.transform,
+  },
+}

packages/domain-core/linter.tsconfig.json

@@ -0,0 +1,4 @@
+{
+  "extends": "./tsconfig.json",
+  "exclude": ["dist"]
+}

packages/domain-core/package.json

@@ -0,0 +1,43 @@
+{
+  "name": "@standardnotes/domain-core",
+  "version": "1.2.2",
+  "engines": {
+    "node": ">=18.0.0 <19.0.0"
+  },
+  "description": "Domain Core SDK used in SN projects",
+  "main": "dist/src/index.js",
+  "types": "dist/src/index.d.ts",
+  "files": [
+    "dist/src/**/*.js",
+    "dist/src/**/*.d.ts"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "author": "Standard Notes",
+  "license": "AGPL-3.0-or-later",
+  "scripts": {
+    "clean": "rm -fr dist",
+    "build": "tsc --build",
+    "lint": "eslint . --ext .ts",
+    "test": "jest spec --coverage --passWithNoTests"
+  },
+  "dependencies": {
+    "@standardnotes/common": "workspace:*",
+    "@standardnotes/features": "^1.52.1",
+    "@standardnotes/predicates": "workspace:*",
+    "@standardnotes/security": "workspace:*",
+    "reflect-metadata": "^0.1.13",
+    "shallow-equal-object": "^1.1.1",
+    "uuid": "^9.0.0"
+  },
+  "devDependencies": {
+    "@types/jest": "^29.1.1",
+    "@types/uuid": "^8.3.0",
+    "@typescript-eslint/eslint-plugin": "^5.30.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "jest": "^29.1.2",
+    "ts-jest": "^29.0.3",
+    "typescript": "^4.8.4"
+  }
+}

packages/domain-core/src/Domain/Common/Timestamps.spec.ts

@@ -0,0 +1,21 @@
+import { Timestamps } from './Timestamps'
+
+describe('Timestamps', () => {
+  it('should create a value object', () => {
+    const valueOrError = Timestamps.create(new Date(1), new Date(2))
+
+    expect(valueOrError.isFailed()).toBeFalsy()
+    expect(valueOrError.getValue().createdAt).toEqual(new Date(1))
+    expect(valueOrError.getValue().updatedAt).toEqual(new Date(2))
+  })
+
+  it('should not create an invalid value object', () => {
+    let valueOrError = Timestamps.create(null as unknown as Date, '2' as unknown as Date)
+
+    expect(valueOrError.isFailed()).toBeTruthy()
+
+    valueOrError = Timestamps.create(new Date(2), '2' as unknown as Date)
+
+    expect(valueOrError.isFailed()).toBeTruthy()
+  })
+})

packages/domain-core/src/Domain/Common/Timestamps.ts

@@ -0,0 +1,32 @@
+import { Result } from '../Core/Result'
+import { ValueObject } from '../Core/ValueObject'
+import { TimestampsProps } from './TimestampsProps'
+
+export class Timestamps extends ValueObject<TimestampsProps> {
+  get createdAt(): Date {
+    return this.props.createdAt
+  }
+
+  get updatedAt(): Date {
+    return this.props.updatedAt
+  }
+
+  private constructor(props: TimestampsProps) {
+    super(props)
+  }
+
+  static create(createdAt: Date, updatedAt: Date): Result<Timestamps> {
+    if (!(createdAt instanceof Date)) {
+      return Result.fail<Timestamps>(
+        `Could not create Timestamps. Creation date should be a date object, given: ${createdAt}`,
+      )
+    }
+    if (!(updatedAt instanceof Date)) {
+      return Result.fail<Timestamps>(
+        `Could not create Timestamps. Update date should be a date object, given: ${createdAt}`,
+      )
+    }
+
+    return Result.ok<Timestamps>(new Timestamps({ createdAt, updatedAt }))
+  }
+}

packages/domain-core/src/Domain/Common/TimestampsProps.ts

@@ -0,0 +1,4 @@
+export interface TimestampsProps {
+  createdAt: Date
+  updatedAt: Date
+}

packages/domain-core/src/Domain/Common/Uuid.spec.ts

@@ -2,14 +2,14 @@ import { Uuid } from './Uuid'
 
 describe('Uuid', () => {
   it('should create a value object', () => {
-    const valueOrError = Uuid.create('1-2-3')
+    const valueOrError = Uuid.create('84c0f8e8-544a-4c7e-9adf-26209303bc1d')
 
     expect(valueOrError.isFailed()).toBeFalsy()
-    expect(valueOrError.getValue().value).toEqual('1-2-3')
+    expect(valueOrError.getValue().value).toEqual('84c0f8e8-544a-4c7e-9adf-26209303bc1d')
   })
 
   it('should not create an invalid value object', () => {
-    const valueOrError = Uuid.create('')
+    const valueOrError = Uuid.create('1-2-3')
 
     expect(valueOrError.isFailed()).toBeTruthy()
   })

packages/domain-core/src/Domain/Common/Uuid.ts

@@ -1,6 +1,7 @@
 import { ValueObject } from '../Core/ValueObject'
 import { Result } from '../Core/Result'
 import { UuidProps } from './UuidProps'
+import { Validator } from '../Core/Validator'
 
 export class Uuid extends ValueObject<UuidProps> {
   get value(): string {
@@ -12,8 +13,9 @@ export class Uuid extends ValueObject<UuidProps> {
   }
 
   static create(uuid: string): Result<Uuid> {
-    if (!!uuid === false || uuid.length === 0) {
-      return Result.fail<Uuid>('Uuid cannot be empty')
+    const validUuidOrError = Validator.isValidUuid(uuid)
+    if (validUuidOrError.isFailed()) {
+      return Result.fail<Uuid>(validUuidOrError.getError())
     } else {
       return Result.ok<Uuid>(new Uuid({ value: uuid }))
     }

packages/domain-core/src/Domain/Core/Validator.spec.ts

@@ -0,0 +1,32 @@
+import { Validator } from './Validator'
+
+describe('Validator', () => {
+  const validUuids = [
+    '2221101c-1da9-4d2b-9b32-b8be2a8d1c82',
+    'c08f2f29-a74b-42b4-aefd-98af9832391c',
+    'b453fa64-1493-443b-b5bb-bca7b9c696c7',
+  ]
+
+  const invalidUuids = [
+    123,
+    'someone@127.0.0.1',
+    '',
+    null,
+    'b453fa64-1493-443b-b5bb-ca7b9c696c7',
+    'c08f*f29-a74b-42b4-aefd-98af9832391c',
+    'c08f*f29-a74b-42b4-aefd-98af9832391c',
+    '../../escaped.sh',
+  ]
+
+  it('should validate proper uuids', () => {
+    for (const validUuid of validUuids) {
+      expect(Validator.isValidUuid(validUuid).isFailed()).toBeFalsy()
+    }
+  })
+
+  it('should not validate invalid uuids', () => {
+    for (const invalidUuid of invalidUuids) {
+      expect(Validator.isValidUuid(invalidUuid as string).isFailed()).toBeTruthy()
+    }
+  })
+})

packages/domain-core/src/Domain/Core/Validator.ts

@@ -0,0 +1,14 @@
+import { Result } from './Result'
+
+export class Validator {
+  private static readonly UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}$/i
+
+  static isValidUuid(value: string): Result<string> {
+    const matchesUuidRegex = String(value).toLowerCase().match(Validator.UUID_REGEX) !== null
+    if (matchesUuidRegex) {
+      return Result.ok()
+    }
+
+    return Result.fail(`Given value is not a valid uuid: ${value}`)
+  }
+}

packages/domain-core/src/Domain/Mapping/MapperInterface.ts

@@ -0,0 +1,4 @@
+export interface MapperInterface<T, U> {
+  toDomain(projection: U): T
+  toProjection(domain: T): U
+}

packages/domain-core/src/Domain/UseCase/UseCaseInterface.ts

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

packages/domain-core/src/Domain/index.ts

@@ -0,0 +1,19 @@
+export * from './Common/Email'
+export * from './Common/EmailProps'
+export * from './Common/Timestamps'
+export * from './Common/TimestampsProps'
+export * from './Common/Uuid'
+export * from './Common/UuidProps'
+
+export * from './Core/Aggregate'
+export * from './Core/Entity'
+export * from './Core/Id'
+export * from './Core/Result'
+export * from './Core/UniqueEntityId'
+export * from './Core/Validator'
+export * from './Core/ValueObject'
+export * from './Core/ValueObjectProps'
+
+export * from './Mapping/MapperInterface'
+
+export * from './UseCase/UseCaseInterface'

packages/domain-core/src/index.ts

@@ -0,0 +1 @@
+export * from './Domain'

packages/domain-core/tsconfig.json

@@ -0,0 +1,11 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "composite": true,
+    "outDir": "./dist",
+  },
+  "include": [
+    "src/**/*"
+  ],
+  "references": []
+}

packages/domain-events-infra/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.9.31](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.9.30...@standardnotes/domain-events-infra@1.9.31) (2022-11-22)
+
+**Note:** Version bump only for package @standardnotes/domain-events-infra
+
+## [1.9.30](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.9.29...@standardnotes/domain-events-infra@1.9.30) (2022-11-21)
+
+**Note:** Version bump only for package @standardnotes/domain-events-infra
+
+## [1.9.29](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.9.28...@standardnotes/domain-events-infra@1.9.29) (2022-11-18)
+
+**Note:** Version bump only for package @standardnotes/domain-events-infra
+
+## [1.9.28](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.9.27...@standardnotes/domain-events-infra@1.9.28) (2022-11-16)
+
+**Note:** Version bump only for package @standardnotes/domain-events-infra
+
+## [1.9.27](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.9.26...@standardnotes/domain-events-infra@1.9.27) (2022-11-14)
+
+**Note:** Version bump only for package @standardnotes/domain-events-infra
+
 ## [1.9.26](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.9.23...@standardnotes/domain-events-infra@1.9.26) (2022-11-14)
 
 ### Bug Fixes

packages/domain-events-infra/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/domain-events-infra",
-  "version": "1.9.26",
+  "version": "1.9.31",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },

packages/domain-events/CHANGELOG.md

@@ -3,6 +3,34 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.90.1](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.90.0...@standardnotes/domain-events@2.90.1) (2022-11-22)
+
+**Note:** Version bump only for package @standardnotes/domain-events
+
+# [2.90.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.89.0...@standardnotes/domain-events@2.90.0) (2022-11-21)
+
+### Features
+
+* **syncing-server:** add creating item dumps for revision service ([8d152dd](https://github.com/standardnotes/server/commit/8d152ddfcb3c88cbbf9df04e3ed6e2c02571d821))
+
+# [2.89.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.88.0...@standardnotes/domain-events@2.89.0) (2022-11-18)
+
+### Features
+
+* add item revision creation requested event ([5c9dff3](https://github.com/standardnotes/server/commit/5c9dff38c9006d39150ea95b2ca17c4ab7175ec2))
+
+# [2.88.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.87.0...@standardnotes/domain-events@2.88.0) (2022-11-16)
+
+### Features
+
+* **analytics:** add publishing churn calculation values in the report ([6c43a33](https://github.com/standardnotes/server/commit/6c43a331d09c2dcf1300742509da6a1d8ef2f5b7))
+
+# [2.87.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.86.3...@standardnotes/domain-events@2.87.0) (2022-11-14)
+
+### Features
+
+* **analytics:** extract domain core into a separate package ([0f94e2a](https://github.com/standardnotes/server/commit/0f94e2ad0c8927733eac31f130cbe649dce765f9))
+
 ## [2.86.3](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.86.0...@standardnotes/domain-events@2.86.3) (2022-11-14)
 
 ### Bug Fixes

packages/domain-events/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/domain-events",
-  "version": "2.86.3",
+  "version": "2.90.1",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },
@@ -23,7 +23,6 @@
     "test": "jest spec --coverage --passWithNoTests"
   },
   "dependencies": {
-    "@newrelic/native-metrics": "^9.0.0",
     "@standardnotes/common": "workspace:*",
     "@standardnotes/features": "^1.52.1",
     "@standardnotes/predicates": "workspace:*",

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

@@ -32,6 +32,9 @@ export interface DailyAnalyticsReportGeneratedEventPayload {
     periodKeys: Array<string>
     values: Array<{
       rate: number
+      averageCustomersCount: number
+      existingCustomersChurn: number
+      newCustomersChurn: number
       periodKey: string
     }>
   }

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

@@ -0,0 +1,7 @@
+import { DomainEventInterface } from './DomainEventInterface'
+import { ItemDumpedEventPayload } from './ItemDumpedEventPayload'
+
+export interface ItemDumpedEvent extends DomainEventInterface {
+  type: 'ITEM_DUMPED'
+  payload: ItemDumpedEventPayload
+}

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

@@ -0,0 +1,3 @@
+export interface ItemDumpedEventPayload {
+  fileDumpPath: string
+}

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

@@ -0,0 +1,7 @@
+import { DomainEventInterface } from './DomainEventInterface'
+import { ItemRevisionCreationRequestedEventPayload } from './ItemRevisionCreationRequestedEventPayload'
+
+export interface ItemRevisionCreationRequestedEvent extends DomainEventInterface {
+  type: 'ITEM_REVISION_CREATION_REQUESTED'
+  payload: ItemRevisionCreationRequestedEventPayload
+}

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

@@ -0,0 +1,3 @@
+export interface ItemRevisionCreationRequestedEventPayload {
+  itemUuid: string
+}

packages/domain-events/src/Domain/index.ts

@@ -46,6 +46,10 @@ export * from './Event/GoogleDriveBackupFailedEvent'
 export * from './Event/GoogleDriveBackupFailedEventPayload'
 export * from './Event/InvoiceGeneratedEvent'
 export * from './Event/InvoiceGeneratedEventPayload'
+export * from './Event/ItemDumpedEvent'
+export * from './Event/ItemDumpedEventPayload'
+export * from './Event/ItemRevisionCreationRequestedEvent'
+export * from './Event/ItemRevisionCreationRequestedEventPayload'
 export * from './Event/ItemsSyncedEvent'
 export * from './Event/ItemsSyncedEventPayload'
 export * from './Event/ListedAccountCreatedEvent'

packages/event-store/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.6.26](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.6.25...@standardnotes/event-store@1.6.26) (2022-11-22)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
+## [1.6.25](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.6.24...@standardnotes/event-store@1.6.25) (2022-11-21)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
+## [1.6.24](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.6.23...@standardnotes/event-store@1.6.24) (2022-11-18)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
+## [1.6.23](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.6.22...@standardnotes/event-store@1.6.23) (2022-11-16)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
+## [1.6.22](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.6.21...@standardnotes/event-store@1.6.22) (2022-11-14)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
 ## [1.6.21](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.6.18...@standardnotes/event-store@1.6.21) (2022-11-14)
 
 ### Bug Fixes

packages/event-store/package.json

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

packages/files/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.8.26](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.8.25...@standardnotes/files-server@1.8.26) (2022-11-22)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
+## [1.8.25](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.8.24...@standardnotes/files-server@1.8.25) (2022-11-21)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
+## [1.8.24](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.8.23...@standardnotes/files-server@1.8.24) (2022-11-18)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
+## [1.8.23](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.8.22...@standardnotes/files-server@1.8.23) (2022-11-16)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
+## [1.8.22](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.8.21...@standardnotes/files-server@1.8.22) (2022-11-14)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
 ## [1.8.21](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.8.18...@standardnotes/files-server@1.8.21) (2022-11-14)
 
 ### Bug Fixes

packages/files/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/files-server",
-  "version": "1.8.21",
+  "version": "1.8.26",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },

packages/predicates/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.6.1](https://github.com/standardnotes/server/compare/@standardnotes/predicates@1.6.0...@standardnotes/predicates@1.6.1) (2022-11-22)
+
+**Note:** Version bump only for package @standardnotes/predicates
+
+# [1.6.0](https://github.com/standardnotes/server/compare/@standardnotes/predicates@1.5.7...@standardnotes/predicates@1.6.0) (2022-11-14)
+
+### Features
+
+* **analytics:** extract domain core into a separate package ([0f94e2a](https://github.com/standardnotes/server/commit/0f94e2ad0c8927733eac31f130cbe649dce765f9))
+
 ## [1.5.7](https://github.com/standardnotes/server/compare/@standardnotes/predicates@1.5.4...@standardnotes/predicates@1.5.7) (2022-11-14)
 
 ### Bug Fixes

packages/predicates/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/predicates",
-  "version": "1.5.7",
+  "version": "1.6.1",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },
@@ -33,7 +33,6 @@
     "typescript": "^4.8.4"
   },
   "dependencies": {
-    "@newrelic/native-metrics": "^9.0.0",
     "@standardnotes/common": "workspace:*",
     "reflect-metadata": "^0.1.13"
   }

packages/revisions/.env.sample

@@ -0,0 +1,34 @@
+LOG_LEVEL=info
+NODE_ENV=development
+VERSION=development
+
+AUTH_JWT_SECRET=auth_jwt_secret
+
+PORT=3000
+
+DB_HOST=db
+DB_REPLICA_HOST=db
+DB_PORT=3306
+DB_USERNAME=std_notes_user
+DB_PASSWORD=changeme123
+DB_DATABASE=standard_notes_db
+DB_DEBUG_LEVEL=all # "all" | "query" | "schema" | "error" | "warn" | "info" | "log" | "migration"
+DB_MIGRATIONS_PATH=dist/migrations/*.js
+
+REDIS_URL=redis://cache
+
+SQS_QUEUE_URL=
+SQS_AWS_REGION=
+S3_AWS_REGION=
+S3_BACKUP_BUCKET_NAME=
+
+REDIS_EVENTS_CHANNEL=revisions
+
+# (Optional) New Relic Setup
+NEW_RELIC_ENABLED=false
+NEW_RELIC_APP_NAME="Revisions Server"
+NEW_RELIC_LICENSE_KEY=
+NEW_RELIC_NO_CONFIG_FILE=true
+NEW_RELIC_DISTRIBUTED_TRACING_ENABLED=false
+NEW_RELIC_LOG_ENABLED=false
+NEW_RELIC_LOG_LEVEL=info

packages/revisions/.eslintignore

@@ -0,0 +1,3 @@
+dist
+test-setup.ts
+data