chore(release): publish new version

- @standardnotes/auth-server@1.141.14
 - @standardnotes/home-server@1.15.55
 - @standardnotes/syncing-server@1.95.19

.pnp.cjs

@@ -3326,10 +3326,10 @@ const RAW_RUNTIME_STATE =
       }]\
     ]],\
     ["@hexagon/base64", [\
-      ["npm:1.1.26", {\
-        "packageLocation": "./.yarn/cache/@hexagon-base64-npm-1.1.26-dbfda05df8-e42582ed12.zip/node_modules/@hexagon/base64/",\
+      ["npm:1.1.27", {\
+        "packageLocation": "./.yarn/cache/@hexagon-base64-npm-1.1.27-df6f264962-899fffaf54.zip/node_modules/@hexagon/base64/",\
         "packageDependencies": [\
-          ["@hexagon/base64", "npm:1.1.26"]\
+          ["@hexagon/base64", "npm:1.1.27"]\
         ],\
         "linkType": "HARD"\
       }]\
@@ -5067,44 +5067,29 @@ const RAW_RUNTIME_STATE =
         "linkType": "HARD"\
       }]\
     ]],\
-    ["@simplewebauthn/iso-webcrypto", [\
-      ["npm:7.2.0", {\
-        "packageLocation": "./.yarn/cache/@simplewebauthn-iso-webcrypto-npm-7.2.0-db7b12b859-b57899d0ad.zip/node_modules/@simplewebauthn/iso-webcrypto/",\
-        "packageDependencies": [\
-          ["@simplewebauthn/iso-webcrypto", "npm:7.2.0"],\
-          ["@simplewebauthn/typescript-types", "npm:7.0.0"],\
-          ["@types/node", "npm:18.16.16"]\
-        ],\
-        "linkType": "HARD"\
-      }]\
-    ]],\
     ["@simplewebauthn/server", [\
-      ["npm:7.2.0", {\
-        "packageLocation": "./.yarn/cache/@simplewebauthn-server-npm-7.2.0-f1ed5fde8a-2e37c87edd.zip/node_modules/@simplewebauthn/server/",\
+      ["npm:8.1.1", {\
+        "packageLocation": "./.yarn/cache/@simplewebauthn-server-npm-8.1.1-106d3bd108-a07c2a067b.zip/node_modules/@simplewebauthn/server/",\
         "packageDependencies": [\
-          ["@simplewebauthn/server", "npm:7.2.0"],\
-          ["@hexagon/base64", "npm:1.1.26"],\
+          ["@simplewebauthn/server", "npm:8.1.1"],\
+          ["@hexagon/base64", "npm:1.1.27"],\
           ["@peculiar/asn1-android", "npm:2.3.6"],\
           ["@peculiar/asn1-ecc", "npm:2.3.6"],\
           ["@peculiar/asn1-rsa", "npm:2.3.6"],\
           ["@peculiar/asn1-schema", "npm:2.3.6"],\
           ["@peculiar/asn1-x509", "npm:2.3.6"],\
-          ["@simplewebauthn/iso-webcrypto", "npm:7.2.0"],\
-          ["@simplewebauthn/typescript-types", "npm:7.0.0"],\
-          ["@types/debug", "npm:4.1.8"],\
-          ["@types/node", "npm:18.16.16"],\
-          ["cbor-x", "npm:1.5.3"],\
-          ["cross-fetch", "npm:3.1.6"],\
-          ["debug", "virtual:ac3d8e680759ce54399273724d44e041d6c9b73454d191d411a8c44bb27e22f02aaf6ed9d3ad0ac1c298eac4833cff369c9c7b84c573016112c4f84be2cd8543#npm:4.3.4"]\
+          ["@simplewebauthn/typescript-types", "npm:8.0.0"],\
+          ["cbor-x", "npm:1.5.4"],\
+          ["cross-fetch", "npm:4.0.0"]\
         ],\
         "linkType": "HARD"\
       }]\
     ]],\
     ["@simplewebauthn/typescript-types", [\
-      ["npm:7.0.0", {\
-        "packageLocation": "./.yarn/cache/@simplewebauthn-typescript-types-npm-7.0.0-cc6ca20415-124238ea18.zip/node_modules/@simplewebauthn/typescript-types/",\
+      ["npm:8.0.0", {\
+        "packageLocation": "./.yarn/cache/@simplewebauthn-typescript-types-npm-8.0.0-f3b313c27b-21e0b13268.zip/node_modules/@simplewebauthn/typescript-types/",\
         "packageDependencies": [\
-          ["@simplewebauthn/typescript-types", "npm:7.0.0"]\
+          ["@simplewebauthn/typescript-types", "npm:8.0.0"]\
         ],\
         "linkType": "HARD"\
       }]\
@@ -5864,8 +5849,8 @@ const RAW_RUNTIME_STATE =
           ["@cbor-extract/cbor-extract-linux-arm64", "npm:2.1.1"],\
           ["@cbor-extract/cbor-extract-linux-x64", "npm:2.1.1"],\
           ["@newrelic/winston-enricher", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:4.0.1"],\
-          ["@simplewebauthn/server", "npm:7.2.0"],\
-          ["@simplewebauthn/typescript-types", "npm:7.0.0"],\
+          ["@simplewebauthn/server", "npm:8.1.1"],\
+          ["@simplewebauthn/typescript-types", "npm:8.0.0"],\
           ["@standardnotes/api", "npm:1.26.26"],\
           ["@standardnotes/common", "workspace:packages/common"],\
           ["@standardnotes/domain-core", "workspace:packages/domain-core"],\
@@ -6720,16 +6705,6 @@ const RAW_RUNTIME_STATE =
         "linkType": "HARD"\
       }]\
     ]],\
-    ["@types/debug", [\
-      ["npm:4.1.8", {\
-        "packageLocation": "./.yarn/cache/@types-debug-npm-4.1.8-a04e2ca136-9c190e8129.zip/node_modules/@types/debug/",\
-        "packageDependencies": [\
-          ["@types/debug", "npm:4.1.8"],\
-          ["@types/ms", "npm:0.7.31"]\
-        ],\
-        "linkType": "HARD"\
-      }]\
-    ]],\
     ["@types/dotenv", [\
       ["npm:8.2.0", {\
         "packageLocation": "./.yarn/cache/@types-dotenv-npm-8.2.0-f4d0e3d65b-13f90a36f7.zip/node_modules/@types/dotenv/",\
@@ -6956,15 +6931,6 @@ const RAW_RUNTIME_STATE =
         "linkType": "HARD"\
       }]\
     ]],\
-    ["@types/ms", [\
-      ["npm:0.7.31", {\
-        "packageLocation": "./.yarn/cache/@types-ms-npm-0.7.31-ea3b89342b-cccb52777b.zip/node_modules/@types/ms/",\
-        "packageDependencies": [\
-          ["@types/ms", "npm:0.7.31"]\
-        ],\
-        "linkType": "HARD"\
-      }]\
-    ]],\
     ["@types/newrelic", [\
       ["npm:9.14.0", {\
         "packageLocation": "./.yarn/cache/@types-newrelic-npm-9.14.0-4668da51a1-2ec951bd8f.zip/node_modules/@types/newrelic/",\
@@ -6982,13 +6948,6 @@ const RAW_RUNTIME_STATE =
         ],\
         "linkType": "HARD"\
       }],\
-      ["npm:18.16.16", {\
-        "packageLocation": "./.yarn/cache/@types-node-npm-18.16.16-8a41330dc3-946bd4d8e6.zip/node_modules/@types/node/",\
-        "packageDependencies": [\
-          ["@types/node", "npm:18.16.16"]\
-        ],\
-        "linkType": "HARD"\
-      }],\
       ["npm:20.2.5", {\
         "packageLocation": "./.yarn/cache/@types-node-npm-20.2.5-0014d2d9ce-55e4f8d08e.zip/node_modules/@types/node/",\
         "packageDependencies": [\
@@ -8706,10 +8665,10 @@ const RAW_RUNTIME_STATE =
       }]\
     ]],\
     ["cbor-x", [\
-      ["npm:1.5.3", {\
-        "packageLocation": "./.yarn/cache/cbor-x-npm-1.5.3-1d452dd267-d4df85b339.zip/node_modules/cbor-x/",\
+      ["npm:1.5.4", {\
+        "packageLocation": "./.yarn/cache/cbor-x-npm-1.5.4-2d5a649a4b-742aea498a.zip/node_modules/cbor-x/",\
         "packageDependencies": [\
-          ["cbor-x", "npm:1.5.3"],\
+          ["cbor-x", "npm:1.5.4"],\
           ["cbor-extract", "npm:2.1.1"]\
         ],\
         "linkType": "HARD"\
@@ -9434,11 +9393,11 @@ const RAW_RUNTIME_STATE =
       }]\
     ]],\
     ["cross-fetch", [\
-      ["npm:3.1.6", {\
-        "packageLocation": "./.yarn/cache/cross-fetch-npm-3.1.6-cdb982d446-a8989fca82.zip/node_modules/cross-fetch/",\
+      ["npm:4.0.0", {\
+        "packageLocation": "./.yarn/cache/cross-fetch-npm-4.0.0-9c67668db4-30e86b703a.zip/node_modules/cross-fetch/",\
         "packageDependencies": [\
-          ["cross-fetch", "npm:3.1.6"],\
-          ["node-fetch", "virtual:0f92dfe7f9dc4fd492639d4a5b7805c2b27442bf599fd4f370b22a7966ba078f5d4525e2a8e8af29369f20e1833ed084bd52be59679efaa6c1c6c10cdbcd8baa#npm:2.6.11"]\
+          ["cross-fetch", "npm:4.0.0"],\
+          ["node-fetch", "virtual:9c67668db478e95ba4d6a763bc55027eeff0d22eaf59478017ea07386fc33a3c7b7b625af78aa86a33991a9a500a7aa216e28632de568f02adefd662ef53a42d#npm:2.7.0"]\
         ],\
         "linkType": "HARD"\
       }]\
@@ -14174,6 +14133,13 @@ const RAW_RUNTIME_STATE =
         ],\
         "linkType": "SOFT"\
       }],\
+      ["npm:2.7.0", {\
+        "packageLocation": "./.yarn/cache/node-fetch-npm-2.7.0-587d57004e-a3ad788903.zip/node_modules/node-fetch/",\
+        "packageDependencies": [\
+          ["node-fetch", "npm:2.7.0"]\
+        ],\
+        "linkType": "SOFT"\
+      }],\
       ["npm:3.3.1", {\
         "packageLocation": "./.yarn/cache/node-fetch-npm-3.3.1-576511fc5a-1d0c635bdf.zip/node_modules/node-fetch/",\
         "packageDependencies": [\
@@ -14197,6 +14163,20 @@ const RAW_RUNTIME_STATE =
           "encoding"\
         ],\
         "linkType": "HARD"\
+      }],\
+      ["virtual:9c67668db478e95ba4d6a763bc55027eeff0d22eaf59478017ea07386fc33a3c7b7b625af78aa86a33991a9a500a7aa216e28632de568f02adefd662ef53a42d#npm:2.7.0", {\
+        "packageLocation": "./.yarn/__virtual__/node-fetch-virtual-0ec1497d1c/0/cache/node-fetch-npm-2.7.0-587d57004e-a3ad788903.zip/node_modules/node-fetch/",\
+        "packageDependencies": [\
+          ["node-fetch", "virtual:9c67668db478e95ba4d6a763bc55027eeff0d22eaf59478017ea07386fc33a3c7b7b625af78aa86a33991a9a500a7aa216e28632de568f02adefd662ef53a42d#npm:2.7.0"],\
+          ["@types/encoding", null],\
+          ["encoding", null],\
+          ["whatwg-url", "npm:5.0.0"]\
+        ],\
+        "packagePeers": [\
+          "@types/encoding",\
+          "encoding"\
+        ],\
+        "linkType": "HARD"\
       }]\
     ]],\
     ["node-gyp", [\

docker-compose.ci.yml

@@ -53,7 +53,7 @@ services:
     image: mysql:8
     container_name: db-ci
     env_file: .github/ci.env
-    expose:
+    ports:
       - 3306
     restart: unless-stopped
     command: --default-authentication-plugin=mysql_native_password --character-set-server=utf8mb4 --collation-server=utf8mb4_general_ci
@@ -66,7 +66,7 @@ services:
   secondary_db:
     image: mongo:5.0
     container_name: secondary_db-ci
-    expose:
+    ports:
       - 27017
     restart: unless-stopped
     volumes:
@@ -83,7 +83,7 @@ services:
     container_name: cache-ci
     volumes:
       - ./data/redis/:/data
-    expose:
+    ports:
       - 6379
     restart: unless-stopped
     networks:

packages/analytics/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.
 
+## [2.26.12](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.26.11...@standardnotes/analytics@2.26.12) (2023-09-13)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.26.11](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.26.10...@standardnotes/analytics@2.26.11) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.26.10](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.26.9...@standardnotes/analytics@2.26.10) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.26.9](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.26.8...@standardnotes/analytics@2.26.9) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.26.8](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.26.7...@standardnotes/analytics@2.26.8) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
 ## [2.26.7](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.26.6...@standardnotes/analytics@2.26.7) (2023-09-08)
 
 **Note:** Version bump only for package @standardnotes/analytics

packages/analytics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/analytics",
-  "version": "2.26.7",
+  "version": "2.26.12",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

packages/api-gateway/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.74.10](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.74.9...@standardnotes/api-gateway@1.74.10) (2023-09-13)
+
+### Bug Fixes
+
+* adjust transition timestamps to be universal ([c7807d0](https://github.com/standardnotes/api-gateway/commit/c7807d0f9e69ce572c4c03ff606375d706f24d9f))
+
+## [1.74.9](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.74.8...@standardnotes/api-gateway@1.74.9) (2023-09-13)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.74.8](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.74.7...@standardnotes/api-gateway@1.74.8) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.74.7](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.74.6...@standardnotes/api-gateway@1.74.7) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.74.6](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.74.5...@standardnotes/api-gateway@1.74.6) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.74.5](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.74.4...@standardnotes/api-gateway@1.74.5) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
 ## [1.74.4](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.74.3...@standardnotes/api-gateway@1.74.4) (2023-09-11)
 
 ### Bug Fixes

packages/api-gateway/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/api-gateway",
-  "version": "1.74.4",
+  "version": "1.74.10",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

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

@@ -80,15 +80,6 @@ export class UsersController extends BaseHttpController {
     )
   }
 
-  @httpGet('/transition-status', TYPES.ApiGateway_RequiredCrossServiceTokenMiddleware)
-  async getTransitionStatus(request: Request, response: Response): Promise<void> {
-    await this.httpService.callAuthServer(
-      request,
-      response,
-      this.endpointResolver.resolveEndpointOrMethodIdentifier('GET', 'users/transition-status'),
-    )
-  }
-
   @httpGet('/:userId/params', TYPES.ApiGateway_RequiredCrossServiceTokenMiddleware)
   async getKeyParams(request: Request, response: Response): Promise<void> {
     await this.httpService.callAuthServer(

packages/api-gateway/src/Service/Resolver/EndpointResolver.ts

@@ -43,7 +43,6 @@ export class EndpointResolver implements EndpointResolverInterface {
     ['[PATCH]:users/:userId', 'auth.users.update'],
     ['[PUT]:users/:userUuid/attributes/credentials', 'auth.users.updateCredentials'],
     ['[GET]:users/params', 'auth.users.getKeyParams'],
-    ['[GET]:users/transition-status', 'auth.users.transition-status'],
     ['[DELETE]:users/:userUuid', 'auth.users.delete'],
     ['[POST]:listed', 'auth.users.createListedAccount'],
     ['[POST]:auth', 'auth.users.register'],
@@ -59,13 +58,11 @@ export class EndpointResolver implements EndpointResolverInterface {
     // Syncing Server
     ['[POST]:items/sync', 'sync.items.sync'],
     ['[POST]:items/check-integrity', 'sync.items.check_integrity'],
-    ['[POST]:items/transition', 'sync.items.transition'],
     ['[GET]:items/:uuid', 'sync.items.get_item'],
     // Revisions Controller V2
     ['[GET]:items/:itemUuid/revisions', 'revisions.revisions.getRevisions'],
     ['[GET]:items/:itemUuid/revisions/:id', 'revisions.revisions.getRevision'],
     ['[DELETE]:items/:itemUuid/revisions/:id', 'revisions.revisions.deleteRevision'],
-    ['[POST]:revisions/transition', 'revisions.revisions.transition'],
     // Messages Controller
     ['[GET]:messages/', 'sync.messages.get-received'],
     ['[GET]:messages/outbound', 'sync.messages.get-sent'],

packages/auth/CHANGELOG.md

@@ -3,6 +3,73 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.141.14](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.141.13...@standardnotes/auth-server@1.141.14) (2023-09-15)
+
+### Bug Fixes
+
+* **auth:** remove extensive logs from updating transitions ([2a1859e](https://github.com/standardnotes/server/commit/2a1859e4beff4cc7c4348ebbff8357a8e061bf5e))
+* **auth:** upgrade simplewebauthn dependency ([#826](https://github.com/standardnotes/server/issues/826)) ([dd9a9c6](https://github.com/standardnotes/server/commit/dd9a9c68cb431a61700a8e5d8247eb1b505a9d62))
+
+## [1.141.13](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.141.12...@standardnotes/auth-server@1.141.13) (2023-09-14)
+
+### Bug Fixes
+
+* **auth:** set ttl for started and not picked up transitions to 10h ([fe8ca82](https://github.com/standardnotes/server/commit/fe8ca828fb37306e0e5056627e67366885e86861))
+
+## [1.141.12](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.141.11...@standardnotes/auth-server@1.141.12) (2023-09-13)
+
+### Bug Fixes
+
+* **auth:** remove re-triggering revisions transition ([5984e4c](https://github.com/standardnotes/server/commit/5984e4c3e7e550e5ed53805bde1e6dabcbe54da8))
+
+## [1.141.11](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.141.10...@standardnotes/auth-server@1.141.11) (2023-09-13)
+
+### Bug Fixes
+
+* **auth:** passing transition timestamp ([c164bde](https://github.com/standardnotes/server/commit/c164bde847b5974e74fd439f0d439526ad439443))
+
+## [1.141.10](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.141.9...@standardnotes/auth-server@1.141.10) (2023-09-13)
+
+### Bug Fixes
+
+* adjust transition timestamps to be universal ([c7807d0](https://github.com/standardnotes/server/commit/c7807d0f9e69ce572c4c03ff606375d706f24d9f))
+
+## [1.141.9](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.141.8...@standardnotes/auth-server@1.141.9) (2023-09-13)
+
+### Bug Fixes
+
+* display transition progress in logs ([38685c1](https://github.com/standardnotes/server/commit/38685c1861b13e398dd96aa39f2cf1aece2090fb))
+
+## [1.141.8](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.141.7...@standardnotes/auth-server@1.141.8) (2023-09-12)
+
+### Bug Fixes
+
+* **auth:** add transition role only if the items transition has completed ([f055e52](https://github.com/standardnotes/server/commit/f055e52e06b6e93501abd340dfce214d5363bc30))
+* **auth:** remove the transition role constraint ([afe385a](https://github.com/standardnotes/server/commit/afe385aed4ba5ca53d8ef429ae4154f4ccf81419))
+* imports ([54113ab](https://github.com/standardnotes/server/commit/54113abe2a961720a3561e5ff3a0069046ea8d25))
+
+## [1.141.7](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.141.6...@standardnotes/auth-server@1.141.7) (2023-09-12)
+
+### Bug Fixes
+
+* retry failed revision transitions ([e535cd5](https://github.com/standardnotes/server/commit/e535cd504cf1929539ff7faf13e9c1fdd2b7bfd1))
+
+## [1.141.6](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.141.5...@standardnotes/auth-server@1.141.6) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.141.5](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.141.4...@standardnotes/auth-server@1.141.5) (2023-09-12)
+
+### Bug Fixes
+
+* domain event values ([f0abfe8](https://github.com/standardnotes/server/commit/f0abfe89fca0049c47131389683efe2f5aff23f8))
+
+## [1.141.4](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.141.3...@standardnotes/auth-server@1.141.4) (2023-09-12)
+
+### Bug Fixes
+
+* adjust transitions to not create revisions during ongoing revisions transition ([106d8f9](https://github.com/standardnotes/server/commit/106d8f9192f630794ca4ddc2c4503f2c6cd196e7))
+
 ## [1.141.3](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.141.2...@standardnotes/auth-server@1.141.3) (2023-09-12)
 
 ### Bug Fixes

packages/auth/bin/transition.ts

@@ -10,7 +10,7 @@ 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 { RoleName } from '@standardnotes/domain-core'
+import { TimerInterface } from '@standardnotes/time'
 
 const inputArgs = process.argv.slice(2)
 const startDateString = inputArgs[0]
@@ -21,23 +21,26 @@ const requestTransition = async (
   logger: Logger,
   domainEventFactory: DomainEventFactoryInterface,
   domainEventPublisher: DomainEventPublisherInterface,
+  timer: TimerInterface,
 ): Promise<void> => {
   const startDate = new Date(startDateString)
   const endDate = new Date(endDateString)
 
   const users = await userRepository.findAllCreatedBetween(startDate, endDate)
 
-  logger.info(`Found ${users.length} users created between ${startDateString} and ${endDateString}`)
+  const timestamp = timer.getTimestampInMicroseconds()
+
+  logger.info(
+    `[TRANSITION ${timestamp}] Found ${users.length} users created between ${startDateString} and ${endDateString}`,
+  )
 
   let usersTriggered = 0
   for (const user of users) {
-    const roles = await user.roles
-    const userHasTransitionUserRole = roles.some((role) => role.name === RoleName.NAMES.TransitionUser) === true
-    if (userHasTransitionUserRole === true) {
-      continue
-    }
-
-    const transitionRequestedEvent = domainEventFactory.createTransitionRequestedEvent({ userUuid: user.uuid })
+    const transitionRequestedEvent = domainEventFactory.createTransitionRequestedEvent({
+      userUuid: user.uuid,
+      type: 'items',
+      timestamp,
+    })
 
     usersTriggered += 1
 
@@ -45,7 +48,7 @@ const requestTransition = async (
   }
 
   logger.info(
-    `Triggered transition for ${usersTriggered} users created between ${startDateString} and ${endDateString}`,
+    `[TRANSITION ${timestamp}] Triggered transition for ${usersTriggered} users created between ${startDateString} and ${endDateString}`,
   )
 }
 
@@ -63,8 +66,9 @@ void container.load().then((container) => {
   const userRepository: UserRepositoryInterface = container.get(TYPES.Auth_UserRepository)
   const domainEventFactory: DomainEventFactoryInterface = container.get(TYPES.Auth_DomainEventFactory)
   const domainEventPublisher: DomainEventPublisherInterface = container.get(TYPES.Auth_DomainEventPublisher)
+  const timer = container.get<TimerInterface>(TYPES.Auth_Timer)
 
-  Promise.resolve(requestTransition(userRepository, logger, domainEventFactory, domainEventPublisher))
+  Promise.resolve(requestTransition(userRepository, logger, domainEventFactory, domainEventPublisher, timer))
     .then(() => {
       logger.info(`Finished transition request for users created between ${startDateString} and ${endDateString}`)
 

packages/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/auth-server",
-  "version": "1.141.3",
+  "version": "1.141.14",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },
@@ -40,8 +40,8 @@
     "@aws-sdk/client-sqs": "^3.332.0",
     "@cbor-extract/cbor-extract-linux-arm64": "^2.1.1",
     "@cbor-extract/cbor-extract-linux-x64": "^2.1.1",
-    "@simplewebauthn/server": "^7.2.0",
-    "@simplewebauthn/typescript-types": "^7.0.0",
+    "@simplewebauthn/server": "^8.1.1",
+    "@simplewebauthn/typescript-types": "^8.0.0",
     "@standardnotes/api": "^1.26.26",
     "@standardnotes/common": "workspace:*",
     "@standardnotes/domain-core": "workspace:^",

packages/auth/src/Bootstrap/Container.ts

@@ -1275,7 +1275,6 @@ export class ContainerConfigLoader {
             container.get<ClearLoginAttempts>(TYPES.Auth_ClearLoginAttempts),
             container.get<IncreaseLoginAttempts>(TYPES.Auth_IncreaseLoginAttempts),
             container.get<ChangeCredentials>(TYPES.Auth_ChangeCredentials),
-            container.get<GetTransitionStatus>(TYPES.Auth_GetTransitionStatus),
             container.get<ControllerContainerInterface>(TYPES.Auth_ControllerContainer),
           ),
         )

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

@@ -33,7 +33,11 @@ import { DomainEventFactoryInterface } from './DomainEventFactoryInterface'
 export class DomainEventFactory implements DomainEventFactoryInterface {
   constructor(@inject(TYPES.Auth_Timer) private timer: TimerInterface) {}
 
-  createTransitionRequestedEvent(dto: { userUuid: string }): TransitionRequestedEvent {
+  createTransitionRequestedEvent(dto: {
+    userUuid: string
+    type: 'items' | 'revisions'
+    timestamp: number
+  }): TransitionRequestedEvent {
     return {
       type: 'TRANSITION_REQUESTED',
       createdAt: this.timer.getUTCDate(),

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

@@ -90,5 +90,9 @@ export interface DomainEventFactoryInterface {
   }): StatisticPersistenceRequestedEvent
   createSessionCreatedEvent(dto: { userUuid: string }): SessionCreatedEvent
   createSessionRefreshedEvent(dto: { userUuid: string }): SessionRefreshedEvent
-  createTransitionRequestedEvent(dto: { userUuid: string }): TransitionRequestedEvent
+  createTransitionRequestedEvent(dto: {
+    userUuid: string
+    type: 'items' | 'revisions'
+    timestamp: number
+  }): TransitionRequestedEvent
 }

packages/auth/src/Domain/Handler/TransitionStatusUpdatedEventHandler.ts

@@ -13,6 +13,7 @@ export class TransitionStatusUpdatedEventHandler implements DomainEventHandlerIn
       status: event.payload.status,
       userUuid: event.payload.userUuid,
       transitionType: event.payload.transitionType,
+      transitionTimestamp: event.payload.transitionTimestamp,
     })
 
     if (result.isFailed()) {

packages/auth/src/Domain/Transition/TransitionStatusRepositoryInterface.ts

@@ -1,8 +1,15 @@
 export interface TransitionStatusRepositoryInterface {
-  updateStatus(userUuid: string, transitionType: 'items' | 'revisions', status: 'STARTED' | 'FAILED'): Promise<void>
+  updateStatus(
+    userUuid: string,
+    transitionType: 'items' | 'revisions',
+    status: 'STARTED' | 'IN_PROGRESS' | 'FAILED',
+  ): Promise<void>
   removeStatus(userUuid: string, transitionType: 'items' | 'revisions'): Promise<void>
   getStatus(
     userUuid: string,
     transitionType: 'items' | 'revisions',
   ): Promise<'STARTED' | 'IN_PROGRESS' | 'FAILED' | null>
+  getStatuses(
+    transitionType: 'items' | 'revisions',
+  ): Promise<Array<{ userUuid: string; status: 'STARTED' | 'IN_PROGRESS' | 'FAILED' }>>
 }

packages/auth/src/Domain/UseCase/CreateCrossServiceToken/CreateCrossServiceToken.spec.ts

@@ -113,6 +113,7 @@ describe('CreateCrossServiceToken', () => {
           uuid: '00000000-0000-0000-0000-000000000000',
         },
         ongoing_transition: false,
+        ongoing_revisions_transition: false,
       },
       60,
     )
@@ -148,6 +149,7 @@ describe('CreateCrossServiceToken', () => {
           uuid: '00000000-0000-0000-0000-000000000000',
         },
         ongoing_transition: true,
+        ongoing_revisions_transition: true,
       },
       60,
     )
@@ -177,6 +179,7 @@ describe('CreateCrossServiceToken', () => {
           uuid: '00000000-0000-0000-0000-000000000000',
         },
         ongoing_transition: false,
+        ongoing_revisions_transition: false,
       },
       60,
     )
@@ -206,6 +209,7 @@ describe('CreateCrossServiceToken', () => {
           uuid: '00000000-0000-0000-0000-000000000000',
         },
         ongoing_transition: false,
+        ongoing_revisions_transition: false,
       },
       60,
     )
@@ -261,6 +265,7 @@ describe('CreateCrossServiceToken', () => {
             email: 'test@test.te',
             uuid: '00000000-0000-0000-0000-000000000000',
           },
+          ongoing_revisions_transition: false,
           ongoing_transition: false,
         },
         60,

packages/auth/src/Domain/UseCase/CreateCrossServiceToken/CreateCrossServiceToken.ts

@@ -48,6 +48,7 @@ export class CreateCrossServiceToken implements UseCaseInterface<string> {
     }
 
     const transitionStatus = await this.transitionStatusRepository.getStatus(user.uuid, 'items')
+    const revisionsTransitionStatus = await this.transitionStatusRepository.getStatus(user.uuid, 'revisions')
 
     const roles = await user.roles
 
@@ -60,6 +61,8 @@ export class CreateCrossServiceToken implements UseCaseInterface<string> {
       roles: this.projectRoles(roles),
       shared_vault_owner_context: undefined,
       ongoing_transition: transitionStatus === 'IN_PROGRESS',
+      ongoing_revisions_transition:
+        revisionsTransitionStatus === 'STARTED' || revisionsTransitionStatus === 'IN_PROGRESS',
       belongs_to_shared_vaults: sharedVaultAssociations.map((association) => ({
         shared_vault_uuid: association.props.sharedVaultUuid.value,
         permission: association.props.permission.value,

packages/auth/src/Domain/UseCase/GenerateAuthenticatorAuthenticationOptions/GenerateAuthenticatorAuthenticationOptions.ts

@@ -35,7 +35,7 @@ export class GenerateAuthenticatorAuthenticationOptions
         .update(`u2f-selector-${dto.username}${this.pseudoKeyParamsKey}`)
         .digest('base64url')
 
-      const options = generateAuthenticationOptions({
+      const options = await generateAuthenticationOptions({
         allowCredentials: [
           {
             id: Buffer.from(credentialIdHash),
@@ -56,7 +56,7 @@ export class GenerateAuthenticatorAuthenticationOptions
     const userUuid = userUuidOrError.getValue()
 
     const authenticators = await this.authenticatorRepository.findByUserUuid(userUuid)
-    const options = generateAuthenticationOptions({
+    const options = await generateAuthenticationOptions({
       allowCredentials: authenticators.map((authenticator) => ({
         id: authenticator.props.credentialId,
         type: 'public-key',

packages/auth/src/Domain/UseCase/GenerateAuthenticatorRegistrationOptions/GenerateAuthenticatorRegistrationOptions.ts

@@ -52,7 +52,7 @@ export class GenerateAuthenticatorRegistrationOptions
     }
 
     const authenticators = await this.authenticatorRepository.findByUserUuid(userUuid)
-    const options = generateRegistrationOptions({
+    const options = await generateRegistrationOptions({
       rpID: this.relyingPartyId,
       rpName: this.relyingPartyName,
       userID: userUuid.value,

packages/auth/src/Domain/UseCase/UpdateTransitionStatus/UpdateTransitionStatus.spec.ts

@@ -14,6 +14,20 @@ describe('UpdateTransitionStatus', () => {
     transitionStatusRepository = {} as jest.Mocked<TransitionStatusRepositoryInterface>
     transitionStatusRepository.removeStatus = jest.fn()
     transitionStatusRepository.updateStatus = jest.fn()
+    transitionStatusRepository.getStatuses = jest.fn().mockResolvedValue([
+      {
+        userUuid: '00000000-0000-0000-0000-000000000000',
+        status: 'STARTED',
+      },
+      {
+        userUuid: '00000000-0000-0000-0000-000000000001',
+        status: 'IN_PROGRESS',
+      },
+      {
+        userUuid: '00000000-0000-0000-0000-000000000002',
+        status: 'FAILED',
+      },
+    ])
 
     roleService = {} as jest.Mocked<RoleServiceInterface>
     roleService.addRoleToUser = jest.fn()
@@ -26,6 +40,7 @@ describe('UpdateTransitionStatus', () => {
       userUuid: '00000000-0000-0000-0000-000000000000',
       status: 'FINISHED',
       transitionType: 'items',
+      transitionTimestamp: 123,
     })
 
     expect(result.isFailed()).toBeFalsy()
@@ -39,6 +54,24 @@ describe('UpdateTransitionStatus', () => {
     )
   })
 
+  it('should remove transition status', async () => {
+    const useCase = createUseCase()
+
+    const result = await useCase.execute({
+      userUuid: '00000000-0000-0000-0000-000000000000',
+      status: 'FINISHED',
+      transitionType: 'revisions',
+      transitionTimestamp: 123,
+    })
+
+    expect(result.isFailed()).toBeFalsy()
+    expect(transitionStatusRepository.removeStatus).toHaveBeenCalledWith(
+      '00000000-0000-0000-0000-000000000000',
+      'revisions',
+    )
+    expect(roleService.addRoleToUser).not.toHaveBeenCalled()
+  })
+
   it('should update transition status', async () => {
     const useCase = createUseCase()
 
@@ -46,6 +79,7 @@ describe('UpdateTransitionStatus', () => {
       userUuid: '00000000-0000-0000-0000-000000000000',
       status: 'STARTED',
       transitionType: 'items',
+      transitionTimestamp: 123,
     })
 
     expect(result.isFailed()).toBeFalsy()
@@ -63,6 +97,7 @@ describe('UpdateTransitionStatus', () => {
       userUuid: 'invalid',
       status: 'STARTED',
       transitionType: 'items',
+      transitionTimestamp: 123,
     })
 
     expect(result.isFailed()).toBeTruthy()

packages/auth/src/Domain/UseCase/UpdateTransitionStatus/UpdateTransitionStatus.ts

@@ -16,15 +16,17 @@ export class UpdateTransitionStatus implements UseCaseInterface<void> {
     }
     const userUuid = userUuidOrError.getValue()
 
-    if (dto.status === 'FINISHED') {
-      await this.transitionStatusRepository.removeStatus(dto.userUuid, dto.transitionType)
-
-      await this.roleService.addRoleToUser(userUuid, RoleName.create(RoleName.NAMES.TransitionUser).getValue())
+    if (dto.status !== 'FINISHED') {
+      await this.transitionStatusRepository.updateStatus(dto.userUuid, dto.transitionType, dto.status)
 
       return Result.ok()
     }
 
-    await this.transitionStatusRepository.updateStatus(dto.userUuid, dto.transitionType, dto.status)
+    await this.transitionStatusRepository.removeStatus(dto.userUuid, dto.transitionType)
+
+    if (dto.transitionType === 'items') {
+      await this.roleService.addRoleToUser(userUuid, RoleName.create(RoleName.NAMES.TransitionUser).getValue())
+    }
 
     return Result.ok()
   }

packages/auth/src/Domain/UseCase/UpdateTransitionStatus/UpdateTransitionStatusDTO.ts

@@ -1,5 +1,6 @@
 export interface UpdateTransitionStatusDTO {
   userUuid: string
   transitionType: 'items' | 'revisions'
-  status: 'STARTED' | 'FINISHED' | 'FAILED'
+  transitionTimestamp: number
+  status: 'STARTED' | 'IN_PROGRESS' | 'FINISHED' | 'FAILED'
 }

packages/auth/src/Infra/InMemory/InMemoryTransitionStatusRepository.ts

@@ -4,6 +4,24 @@ export class InMemoryTransitionStatusRepository implements TransitionStatusRepos
   private itemStatuses: Map<string, 'STARTED' | 'FAILED'> = new Map()
   private revisionStatuses: Map<string, 'STARTED' | 'FAILED'> = new Map()
 
+  async getStatuses(
+    transitionType: 'items' | 'revisions',
+  ): Promise<{ userUuid: string; status: 'STARTED' | 'FAILED' | 'IN_PROGRESS' }[]> {
+    const statuses: { userUuid: string; status: 'STARTED' | 'FAILED' | 'IN_PROGRESS' }[] = []
+
+    if (transitionType === 'items') {
+      for (const [userUuid, status] of this.itemStatuses) {
+        statuses.push({ userUuid, status })
+      }
+    } else {
+      for (const [userUuid, status] of this.revisionStatuses) {
+        statuses.push({ userUuid, status })
+      }
+    }
+
+    return statuses
+  }
+
   async updateStatus(
     userUuid: string,
     transitionType: 'items' | 'revisions',

packages/auth/src/Infra/InversifyExpressUtils/AnnotatedUsersController.spec.ts

@@ -14,7 +14,6 @@ import { IncreaseLoginAttempts } from '../../Domain/UseCase/IncreaseLoginAttempt
 import { InviteToSharedSubscription } from '../../Domain/UseCase/InviteToSharedSubscription/InviteToSharedSubscription'
 import { UpdateUser } from '../../Domain/UseCase/UpdateUser'
 import { User } from '../../Domain/User/User'
-import { GetTransitionStatus } from '../../Domain/UseCase/GetTransitionStatus/GetTransitionStatus'
 
 describe('AnnotatedUsersController', () => {
   let updateUser: UpdateUser
@@ -25,7 +24,6 @@ describe('AnnotatedUsersController', () => {
   let increaseLoginAttempts: IncreaseLoginAttempts
   let changeCredentials: ChangeCredentials
   let inviteToSharedSubscription: InviteToSharedSubscription
-  let getTransitionStatus: GetTransitionStatus
 
   let request: express.Request
   let response: express.Response
@@ -40,7 +38,6 @@ describe('AnnotatedUsersController', () => {
       clearLoginAttempts,
       increaseLoginAttempts,
       changeCredentials,
-      getTransitionStatus,
     )
 
   beforeEach(() => {
@@ -72,9 +69,6 @@ describe('AnnotatedUsersController', () => {
     inviteToSharedSubscription = {} as jest.Mocked<InviteToSharedSubscription>
     inviteToSharedSubscription.execute = jest.fn()
 
-    getTransitionStatus = {} as jest.Mocked<GetTransitionStatus>
-    getTransitionStatus.execute = jest.fn()
-
     request = {
       headers: {},
       body: {},

packages/auth/src/Infra/InversifyExpressUtils/AnnotatedUsersController.ts

@@ -18,7 +18,6 @@ import { ClearLoginAttempts } from '../../Domain/UseCase/ClearLoginAttempts'
 import { IncreaseLoginAttempts } from '../../Domain/UseCase/IncreaseLoginAttempts'
 import { ChangeCredentials } from '../../Domain/UseCase/ChangeCredentials/ChangeCredentials'
 import { BaseUsersController } from './Base/BaseUsersController'
-import { GetTransitionStatus } from '../../Domain/UseCase/GetTransitionStatus/GetTransitionStatus'
 
 @controller('/users')
 export class AnnotatedUsersController extends BaseUsersController {
@@ -30,7 +29,6 @@ export class AnnotatedUsersController extends BaseUsersController {
     @inject(TYPES.Auth_ClearLoginAttempts) override clearLoginAttempts: ClearLoginAttempts,
     @inject(TYPES.Auth_IncreaseLoginAttempts) override increaseLoginAttempts: IncreaseLoginAttempts,
     @inject(TYPES.Auth_ChangeCredentials) override changeCredentialsUseCase: ChangeCredentials,
-    @inject(TYPES.Auth_GetTransitionStatus) override getTransitionStatusUseCase: GetTransitionStatus,
   ) {
     super(
       updateUser,
@@ -40,7 +38,6 @@ export class AnnotatedUsersController extends BaseUsersController {
       clearLoginAttempts,
       increaseLoginAttempts,
       changeCredentialsUseCase,
-      getTransitionStatusUseCase,
     )
   }
 
@@ -54,11 +51,6 @@ export class AnnotatedUsersController extends BaseUsersController {
     return super.keyParams(request)
   }
 
-  @httpGet('/transition-status', TYPES.Auth_RequiredCrossServiceTokenMiddleware)
-  override async transitionStatus(request: Request, response: Response): Promise<results.JsonResult> {
-    return super.transitionStatus(request, response)
-  }
-
   @httpDelete('/:userUuid', TYPES.Auth_RequiredCrossServiceTokenMiddleware)
   override async deleteAccount(request: Request, response: Response): Promise<results.JsonResult> {
     return super.deleteAccount(request, response)

packages/auth/src/Infra/InversifyExpressUtils/Base/BaseUsersController.ts

@@ -10,7 +10,6 @@ import { GetUserSubscription } from '../../../Domain/UseCase/GetUserSubscription
 import { IncreaseLoginAttempts } from '../../../Domain/UseCase/IncreaseLoginAttempts'
 import { UpdateUser } from '../../../Domain/UseCase/UpdateUser'
 import { ErrorTag } from '@standardnotes/responses'
-import { GetTransitionStatus } from '../../../Domain/UseCase/GetTransitionStatus/GetTransitionStatus'
 
 export class BaseUsersController extends BaseHttpController {
   constructor(
@@ -21,7 +20,6 @@ export class BaseUsersController extends BaseHttpController {
     protected clearLoginAttempts: ClearLoginAttempts,
     protected increaseLoginAttempts: IncreaseLoginAttempts,
     protected changeCredentialsUseCase: ChangeCredentials,
-    protected getTransitionStatusUseCase: GetTransitionStatus,
     private controllerContainer?: ControllerContainerInterface,
   ) {
     super()
@@ -32,7 +30,6 @@ export class BaseUsersController extends BaseHttpController {
       this.controllerContainer.register('auth.users.getSubscription', this.getSubscription.bind(this))
       this.controllerContainer.register('auth.users.updateCredentials', this.changeCredentials.bind(this))
       this.controllerContainer.register('auth.users.delete', this.deleteAccount.bind(this))
-      this.controllerContainer.register('auth.users.transition-status', this.transitionStatus.bind(this))
     }
   }
 
@@ -106,30 +103,6 @@ export class BaseUsersController extends BaseHttpController {
     return this.json(result.keyParams)
   }
 
-  async transitionStatus(_request: Request, response: Response): Promise<results.JsonResult> {
-    const result = await this.getTransitionStatusUseCase.execute({
-      userUuid: response.locals.user.uuid,
-      transitionType: 'items',
-    })
-
-    if (result.isFailed()) {
-      return this.json(
-        {
-          error: {
-            message: result.getError(),
-          },
-        },
-        400,
-      )
-    }
-
-    response.setHeader('x-invalidate-cache', response.locals.user.uuid)
-
-    return this.json({
-      status: result.getValue(),
-    })
-  }
-
   async deleteAccount(request: Request, response: Response): Promise<results.JsonResult> {
     if (request.params.userUuid !== response.locals.user.uuid) {
       return this.json(

packages/auth/src/Infra/Redis/RedisTransitionStatusRepository.ts

@@ -7,12 +7,33 @@ export class RedisTransitionStatusRepository implements TransitionStatusReposito
 
   constructor(private redisClient: IORedis.Redis) {}
 
+  async getStatuses(
+    transitionType: 'items' | 'revisions',
+  ): Promise<{ userUuid: string; status: 'STARTED' | 'IN_PROGRESS' | 'FAILED' }[]> {
+    const keys = await this.redisClient.keys(`${this.PREFIX}:${transitionType}:*`)
+    const statuses = await Promise.all(
+      keys.map(async (key) => {
+        const userUuid = key.split(':')[2]
+        const status = (await this.redisClient.get(key)) as 'STARTED' | 'IN_PROGRESS' | 'FAILED'
+        return { userUuid, status }
+      }),
+    )
+
+    return statuses
+  }
+
   async updateStatus(
     userUuid: string,
     transitionType: 'items' | 'revisions',
-    status: 'STARTED' | 'FAILED',
+    status: 'STARTED' | 'IN_PROGRESS' | 'FAILED',
   ): Promise<void> {
-    await this.redisClient.set(`${this.PREFIX}:${transitionType}:${userUuid}`, status)
+    if (status === 'IN_PROGRESS') {
+      await this.redisClient.setex(`${this.PREFIX}:${transitionType}:${userUuid}`, 7_200, status)
+    } else if (status === 'STARTED') {
+      await this.redisClient.setex(`${this.PREFIX}:${transitionType}:${userUuid}`, 36_000, status)
+    } else {
+      await this.redisClient.set(`${this.PREFIX}:${transitionType}:${userUuid}`, status)
+    }
   }
 
   async removeStatus(userUuid: string, transitionType: 'items' | 'revisions'): Promise<void> {

packages/domain-core/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.28.1](https://github.com/standardnotes/server/compare/@standardnotes/domain-core@1.28.0...@standardnotes/domain-core@1.28.1) (2023-09-12)
+
+### Bug Fixes
+
+* comparing uuids ([0a1d162](https://github.com/standardnotes/server/commit/0a1d1624e818000f2e951f29323a88e6e233c755))
+
 # [1.28.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-core@1.27.0...@standardnotes/domain-core@1.28.0) (2023-09-07)
 
 ### Features

packages/domain-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/domain-core",
-  "version": "1.28.0",
+  "version": "1.28.1",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

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

@@ -8,6 +8,13 @@ describe('Uuid', () => {
     expect(valueOrError.getValue().value).toEqual('84c0f8e8-544a-4c7e-9adf-26209303bc1d')
   })
 
+  it('should create a value object on upper case', () => {
+    const valueOrError = Uuid.create('00B57455-B563-4B50-A2AA-B19762102219')
+
+    expect(valueOrError.isFailed()).toBeFalsy()
+    expect(valueOrError.getValue().value).toEqual('00B57455-B563-4B50-A2AA-B19762102219')
+  })
+
   it('should not create an invalid value object', () => {
     const valueOrError = Uuid.create('1-2-3')
 

packages/domain-events-infra/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.12.28](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.12.27...@standardnotes/domain-events-infra@1.12.28) (2023-09-13)
+
+**Note:** Version bump only for package @standardnotes/domain-events-infra
+
+## [1.12.27](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.12.26...@standardnotes/domain-events-infra@1.12.27) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/domain-events-infra
+
+## [1.12.26](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.12.25...@standardnotes/domain-events-infra@1.12.26) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/domain-events-infra
+
+## [1.12.25](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.12.24...@standardnotes/domain-events-infra@1.12.25) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/domain-events-infra
+
 ## [1.12.24](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.12.23...@standardnotes/domain-events-infra@1.12.24) (2023-09-08)
 
 **Note:** Version bump only for package @standardnotes/domain-events-infra

packages/domain-events-infra/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/domain-events-infra",
-  "version": "1.12.24",
+  "version": "1.12.28",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

packages/domain-events/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.125.4](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.125.3...@standardnotes/domain-events@2.125.4) (2023-09-13)
+
+### Bug Fixes
+
+* display transition progress in logs ([38685c1](https://github.com/standardnotes/server/commit/38685c1861b13e398dd96aa39f2cf1aece2090fb))
+
+## [2.125.3](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.125.2...@standardnotes/domain-events@2.125.3) (2023-09-12)
+
+### Bug Fixes
+
+* retry failed revision transitions ([e535cd5](https://github.com/standardnotes/server/commit/e535cd504cf1929539ff7faf13e9c1fdd2b7bfd1))
+
+## [2.125.2](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.125.1...@standardnotes/domain-events@2.125.2) (2023-09-12)
+
+### Bug Fixes
+
+* domain event values ([f0abfe8](https://github.com/standardnotes/server/commit/f0abfe89fca0049c47131389683efe2f5aff23f8))
+
+## [2.125.1](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.125.0...@standardnotes/domain-events@2.125.1) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/domain-events
+
 # [2.125.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.124.0...@standardnotes/domain-events@2.125.0) (2023-09-08)
 
 ### Features

packages/domain-events/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/domain-events",
-  "version": "2.125.0",
+  "version": "2.125.4",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

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

@@ -1,3 +1,5 @@
 export interface TransitionRequestedEventPayload {
   userUuid: string
+  type: 'items' | 'revisions'
+  timestamp: number
 }

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

@@ -1,5 +1,6 @@
 export interface TransitionStatusUpdatedEventPayload {
   userUuid: string
   transitionType: 'items' | 'revisions'
-  status: 'STARTED' | 'FINISHED' | 'FAILED'
+  transitionTimestamp: number
+  status: 'STARTED' | 'IN_PROGRESS' | 'FINISHED' | 'FAILED'
 }

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.11.40](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.11.39...@standardnotes/event-store@1.11.40) (2023-09-13)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
+## [1.11.39](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.11.38...@standardnotes/event-store@1.11.39) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
+## [1.11.38](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.11.37...@standardnotes/event-store@1.11.38) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
+## [1.11.37](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.11.36...@standardnotes/event-store@1.11.37) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
+## [1.11.36](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.11.35...@standardnotes/event-store@1.11.36) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
 ## [1.11.35](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.11.34...@standardnotes/event-store@1.11.35) (2023-09-08)
 
 **Note:** Version bump only for package @standardnotes/event-store

packages/event-store/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/event-store",
-  "version": "1.11.35",
+  "version": "1.11.40",
   "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.22.19](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.22.18...@standardnotes/files-server@1.22.19) (2023-09-13)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
+## [1.22.18](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.22.17...@standardnotes/files-server@1.22.18) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
+## [1.22.17](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.22.16...@standardnotes/files-server@1.22.17) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
+## [1.22.16](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.22.15...@standardnotes/files-server@1.22.16) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
+## [1.22.15](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.22.14...@standardnotes/files-server@1.22.15) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
 ## [1.22.14](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.22.13...@standardnotes/files-server@1.22.14) (2023-09-08)
 
 **Note:** Version bump only for package @standardnotes/files-server

packages/files/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/files-server",
-  "version": "1.22.14",
+  "version": "1.22.19",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

packages/home-server/CHANGELOG.md

@@ -3,6 +3,78 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.15.55](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.54...@standardnotes/home-server@1.15.55) (2023-09-15)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.15.54](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.53...@standardnotes/home-server@1.15.54) (2023-09-14)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.15.53](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.52...@standardnotes/home-server@1.15.53) (2023-09-13)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.15.52](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.51...@standardnotes/home-server@1.15.52) (2023-09-13)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.15.51](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.50...@standardnotes/home-server@1.15.51) (2023-09-13)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.15.50](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.49...@standardnotes/home-server@1.15.50) (2023-09-13)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.15.49](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.48...@standardnotes/home-server@1.15.49) (2023-09-13)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.15.48](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.47...@standardnotes/home-server@1.15.48) (2023-09-13)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.15.47](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.46...@standardnotes/home-server@1.15.47) (2023-09-13)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.15.46](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.45...@standardnotes/home-server@1.15.46) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.15.45](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.44...@standardnotes/home-server@1.15.45) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.15.44](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.43...@standardnotes/home-server@1.15.44) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.15.43](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.42...@standardnotes/home-server@1.15.43) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.15.42](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.41...@standardnotes/home-server@1.15.42) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.15.41](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.40...@standardnotes/home-server@1.15.41) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.15.40](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.39...@standardnotes/home-server@1.15.40) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.15.39](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.38...@standardnotes/home-server@1.15.39) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.15.38](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.37...@standardnotes/home-server@1.15.38) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
 ## [1.15.37](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.36...@standardnotes/home-server@1.15.37) (2023-09-12)
 
 **Note:** Version bump only for package @standardnotes/home-server

packages/home-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/home-server",
-  "version": "1.15.37",
+  "version": "1.15.55",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

packages/revisions/CHANGELOG.md

@@ -3,6 +3,80 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.33.21](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.33.20...@standardnotes/revisions-server@1.33.21) (2023-09-14)
+
+### Bug Fixes
+
+* skip already updated items and revisions in integrity check ([#825](https://github.com/standardnotes/server/issues/825)) ([03a4a3f](https://github.com/standardnotes/server/commit/03a4a3f2abc0b4e09942ba39dbd227524068dfb6))
+
+## [1.33.20](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.33.19...@standardnotes/revisions-server@1.33.20) (2023-09-13)
+
+### Bug Fixes
+
+* adjust transition timestamps to be universal ([c7807d0](https://github.com/standardnotes/server/commit/c7807d0f9e69ce572c4c03ff606375d706f24d9f))
+
+## [1.33.19](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.33.18...@standardnotes/revisions-server@1.33.19) (2023-09-13)
+
+### Bug Fixes
+
+* include handling updated items in revisions in secondary ([fbcb45c](https://github.com/standardnotes/server/commit/fbcb45c3a23fde09702fae7bfcb409bdbb610191))
+
+## [1.33.18](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.33.17...@standardnotes/revisions-server@1.33.18) (2023-09-13)
+
+### Bug Fixes
+
+* display transition progress in logs ([38685c1](https://github.com/standardnotes/server/commit/38685c1861b13e398dd96aa39f2cf1aece2090fb))
+
+## [1.33.17](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.33.16...@standardnotes/revisions-server@1.33.17) (2023-09-13)
+
+### Bug Fixes
+
+* setting status for already migrated users ([9be4c00](https://github.com/standardnotes/server/commit/9be4c002b755fea057489b6077b297162223aefe))
+
+## [1.33.16](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.33.15...@standardnotes/revisions-server@1.33.16) (2023-09-13)
+
+### Bug Fixes
+
+* cleanup only for 0 new items ([b1d88b1](https://github.com/standardnotes/server/commit/b1d88b15be78a48224963e337a222fb675ed2692))
+
+## [1.33.15](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.33.14...@standardnotes/revisions-server@1.33.15) (2023-09-12)
+
+### Bug Fixes
+
+* sync between primary and secondary database with diff ([fab5d18](https://github.com/standardnotes/server/commit/fab5d180645e0a6fa0c9c67205d44f27c8a65c8b))
+
+## [1.33.14](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.33.13...@standardnotes/revisions-server@1.33.14) (2023-09-12)
+
+### Bug Fixes
+
+* **revisions:** handle transitions with already existing data in secondary ([aa83526](https://github.com/standardnotes/server/commit/aa835268ea80e3aa74907e449d189e8b2774a859))
+
+## [1.33.13](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.33.12...@standardnotes/revisions-server@1.33.13) (2023-09-12)
+
+### Bug Fixes
+
+* retry failed revision transitions ([e535cd5](https://github.com/standardnotes/server/commit/e535cd504cf1929539ff7faf13e9c1fdd2b7bfd1))
+
+## [1.33.12](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.33.11...@standardnotes/revisions-server@1.33.12) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/revisions-server
+
+## [1.33.11](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.33.10...@standardnotes/revisions-server@1.33.11) (2023-09-12)
+
+### Bug Fixes
+
+* comparing uuids ([0a1d162](https://github.com/standardnotes/server/commit/0a1d1624e818000f2e951f29323a88e6e233c755))
+
+## [1.33.10](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.33.9...@standardnotes/revisions-server@1.33.10) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/revisions-server
+
+## [1.33.9](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.33.8...@standardnotes/revisions-server@1.33.9) (2023-09-12)
+
+### Bug Fixes
+
+* adjust transitions to not create revisions during ongoing revisions transition ([106d8f9](https://github.com/standardnotes/server/commit/106d8f9192f630794ca4ddc2c4503f2c6cd196e7))
+
 ## [1.33.8](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.33.7...@standardnotes/revisions-server@1.33.8) (2023-09-12)
 
 ### Bug Fixes

packages/revisions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/revisions-server",
-  "version": "1.33.8",
+  "version": "1.33.21",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

packages/revisions/src/Bootstrap/Container.ts

@@ -68,6 +68,7 @@ import { SQLRevisionMetadataPersistenceMapper } from '../Mapping/Persistence/SQL
 import { SQLRevisionPersistenceMapper } from '../Mapping/Persistence/SQL/SQLRevisionPersistenceMapper'
 import { RemoveRevisionsFromSharedVault } from '../Domain/UseCase/RemoveRevisionsFromSharedVault/RemoveRevisionsFromSharedVault'
 import { ItemRemovedFromSharedVaultEventHandler } from '../Domain/Handler/ItemRemovedFromSharedVaultEventHandler'
+import { TransitionRequestedEventHandler } from '../Domain/Handler/TransitionRequestedEventHandler'
 
 export class ContainerConfigLoader {
   constructor(private mode: 'server' | 'worker' = 'server') {}
@@ -419,6 +420,7 @@ export class ContainerConfigLoader {
         new ItemDumpedEventHandler(
           container.get<DumpRepositoryInterface>(TYPES.Revisions_DumpRepository),
           container.get<RevisionRepositoryResolverInterface>(TYPES.Revisions_RevisionRepositoryResolver),
+          container.get<winston.Logger>(TYPES.Revisions_Logger),
         ),
       )
     container
@@ -441,6 +443,7 @@ export class ContainerConfigLoader {
       .bind<TransitionStatusUpdatedEventHandler>(TYPES.Revisions_TransitionStatusUpdatedEventHandler)
       .toConstantValue(
         new TransitionStatusUpdatedEventHandler(
+          container.get<RevisionRepositoryInterface>(TYPES.Revisions_SQLRevisionRepository),
           container.get<TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser>(
             TYPES.Revisions_TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser,
           ),
@@ -457,6 +460,16 @@ export class ContainerConfigLoader {
           container.get<winston.Logger>(TYPES.Revisions_Logger),
         ),
       )
+    container
+      .bind<TransitionRequestedEventHandler>(TYPES.Revisions_TransitionRequestedEventHandler)
+      .toConstantValue(
+        new TransitionRequestedEventHandler(
+          container.get<TriggerTransitionFromPrimaryToSecondaryDatabaseForUser>(
+            TYPES.Revisions_TriggerTransitionFromPrimaryToSecondaryDatabaseForUser,
+          ),
+          container.get<winston.Logger>(TYPES.Revisions_Logger),
+        ),
+      )
 
     const eventHandlers: Map<string, DomainEventHandlerInterface> = new Map([
       ['ITEM_DUMPED', container.get(TYPES.Revisions_ItemDumpedEventHandler)],
@@ -464,6 +477,7 @@ export class ContainerConfigLoader {
       ['REVISIONS_COPY_REQUESTED', container.get(TYPES.Revisions_RevisionsCopyRequestedEventHandler)],
       ['TRANSITION_STATUS_UPDATED', container.get(TYPES.Revisions_TransitionStatusUpdatedEventHandler)],
       ['ITEM_REMOVED_FROM_SHARED_VAULT', container.get(TYPES.Revisions_ItemRemovedFromSharedVaultEventHandler)],
+      ['TRANSITION_REQUESTED', container.get(TYPES.Revisions_TransitionRequestedEventHandler)],
     ])
 
     if (isConfiguredForHomeServer) {
@@ -506,9 +520,6 @@ export class ContainerConfigLoader {
             container.get<DeleteRevision>(TYPES.Revisions_DeleteRevision),
             container.get<RevisionHttpMapper>(TYPES.Revisions_RevisionHttpMapper),
             container.get<RevisionMetadataHttpMapper>(TYPES.Revisions_RevisionMetadataHttpMapper),
-            container.get<TriggerTransitionFromPrimaryToSecondaryDatabaseForUser>(
-              TYPES.Revisions_TriggerTransitionFromPrimaryToSecondaryDatabaseForUser,
-            ),
             container.get<ControllerContainerInterface>(TYPES.Revisions_ControllerContainer),
           ),
         )

packages/revisions/src/Bootstrap/Types.ts

@@ -60,6 +60,7 @@ const TYPES = {
   Revisions_RevisionsCopyRequestedEventHandler: Symbol.for('Revisions_RevisionsCopyRequestedEventHandler'),
   Revisions_TransitionStatusUpdatedEventHandler: Symbol.for('Revisions_TransitionStatusUpdatedEventHandler'),
   Revisions_ItemRemovedFromSharedVaultEventHandler: Symbol.for('Revisions_ItemRemovedFromSharedVaultEventHandler'),
+  Revisions_TransitionRequestedEventHandler: Symbol.for('Revisions_TransitionRequestedEventHandler'),
   // Services
   Revisions_CrossServiceTokenDecoder: Symbol.for('Revisions_CrossServiceTokenDecoder'),
   Revisions_DomainEventSubscriberFactory: Symbol.for('Revisions_DomainEventSubscriberFactory'),

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

@@ -9,6 +9,7 @@ export class DomainEventFactory implements DomainEventFactoryInterface {
   createTransitionStatusUpdatedEvent(dto: {
     userUuid: string
     transitionType: 'items' | 'revisions'
+    transitionTimestamp: number
     status: 'STARTED' | 'FAILED' | 'FINISHED'
   }): TransitionStatusUpdatedEvent {
     return {

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

@@ -4,6 +4,7 @@ export interface DomainEventFactoryInterface {
   createTransitionStatusUpdatedEvent(dto: {
     userUuid: string
     transitionType: 'items' | 'revisions'
+    transitionTimestamp: number
     status: 'STARTED' | 'IN_PROGRESS' | 'FAILED' | 'FINISHED'
   }): TransitionStatusUpdatedEvent
 }

packages/revisions/src/Domain/Handler/ItemDumpedEventHandler.spec.ts

@@ -1,4 +1,7 @@
 import { ItemDumpedEvent } from '@standardnotes/domain-events'
+import { Logger } from 'winston'
+import { Uuid, ContentType, Dates } from '@standardnotes/domain-core'
+
 import { DumpRepositoryInterface } from '../Dump/DumpRepositoryInterface'
 import { Revision } from '../Revision/Revision'
 import { RevisionRepositoryInterface } from '../Revision/RevisionRepositoryInterface'
@@ -11,11 +14,22 @@ describe('ItemDumpedEventHandler', () => {
   let revisionRepositoryResolver: RevisionRepositoryResolverInterface
   let revision: Revision
   let event: ItemDumpedEvent
+  let logger: Logger
 
-  const createHandler = () => new ItemDumpedEventHandler(dumpRepository, revisionRepositoryResolver)
+  const createHandler = () => new ItemDumpedEventHandler(dumpRepository, revisionRepositoryResolver, logger)
 
   beforeEach(() => {
-    revision = {} as jest.Mocked<Revision>
+    revision = Revision.create({
+      itemUuid: Uuid.create('84c0f8e8-544a-4c7e-9adf-26209303bc1d').getValue(),
+      userUuid: Uuid.create('84c0f8e8-544a-4c7e-9adf-26209303bc1d').getValue(),
+      content: 'test',
+      contentType: ContentType.create('Note').getValue(),
+      itemsKeyId: 'test',
+      encItemKey: 'test',
+      authHash: 'test',
+      creationDate: new Date(1),
+      dates: Dates.create(new Date(1), new Date(2)).getValue(),
+    }).getValue()
 
     dumpRepository = {} as jest.Mocked<DumpRepositoryInterface>
     dumpRepository.getRevisionFromDumpPath = jest.fn().mockReturnValue(revision)
@@ -32,6 +46,10 @@ describe('ItemDumpedEventHandler', () => {
       fileDumpPath: 'foobar',
       roleNames: ['CORE_USER'],
     }
+
+    logger = {} as jest.Mocked<Logger>
+    logger.debug = jest.fn()
+    logger.error = jest.fn()
   })
 
   it('should save a revision from file dump', async () => {

packages/revisions/src/Domain/Handler/ItemDumpedEventHandler.ts

@@ -3,16 +3,20 @@ import { DomainEventHandlerInterface, ItemDumpedEvent } from '@standardnotes/dom
 import { DumpRepositoryInterface } from '../Dump/DumpRepositoryInterface'
 import { RevisionRepositoryResolverInterface } from '../Revision/RevisionRepositoryResolverInterface'
 import { RoleNameCollection } from '@standardnotes/domain-core'
+import { Logger } from 'winston'
 
 export class ItemDumpedEventHandler implements DomainEventHandlerInterface {
   constructor(
     private dumpRepository: DumpRepositoryInterface,
     private revisionRepositoryResolver: RevisionRepositoryResolverInterface,
+    private logger: Logger,
   ) {}
 
   async handle(event: ItemDumpedEvent): Promise<void> {
     const revision = await this.dumpRepository.getRevisionFromDumpPath(event.payload.fileDumpPath)
     if (revision === null) {
+      this.logger.error(`Revision not found for dump path ${event.payload.fileDumpPath}`)
+
       await this.dumpRepository.removeDump(event.payload.fileDumpPath)
 
       return
@@ -20,6 +24,8 @@ export class ItemDumpedEventHandler implements DomainEventHandlerInterface {
 
     const roleNamesOrError = RoleNameCollection.create(event.payload.roleNames)
     if (roleNamesOrError.isFailed()) {
+      this.logger.error(`Invalid role names ${event.payload.roleNames}`)
+
       await this.dumpRepository.removeDump(event.payload.fileDumpPath)
 
       return
@@ -28,7 +34,10 @@ export class ItemDumpedEventHandler implements DomainEventHandlerInterface {
 
     const revisionRepository = this.revisionRepositoryResolver.resolve(roleNames)
 
-    await revisionRepository.insert(revision)
+    const successfullyInserted = await revisionRepository.insert(revision)
+    if (!successfullyInserted) {
+      this.logger.error(`Could not insert revision ${revision.id.toString()}`)
+    }
 
     await this.dumpRepository.removeDump(event.payload.fileDumpPath)
   }

packages/revisions/src/Domain/Handler/TransitionRequestedEventHandler.ts

@@ -0,0 +1,28 @@
+import { DomainEventHandlerInterface, TransitionRequestedEvent } from '@standardnotes/domain-events'
+import { Logger } from 'winston'
+
+import { TriggerTransitionFromPrimaryToSecondaryDatabaseForUser } from '../UseCase/Transition/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser'
+
+export class TransitionRequestedEventHandler implements DomainEventHandlerInterface {
+  constructor(
+    private triggerTransitionFromPrimaryToSecondaryDatabaseForUser: TriggerTransitionFromPrimaryToSecondaryDatabaseForUser,
+    private logger: Logger,
+  ) {}
+
+  async handle(event: TransitionRequestedEvent): Promise<void> {
+    if (event.payload.type !== 'revisions') {
+      return
+    }
+
+    this.logger.info(`Handling transition requested event for user ${event.payload.userUuid}`)
+
+    const result = await this.triggerTransitionFromPrimaryToSecondaryDatabaseForUser.execute({
+      userUuid: event.payload.userUuid,
+      transitionTimestamp: event.payload.timestamp,
+    })
+
+    if (result.isFailed()) {
+      this.logger.error(`Failed to trigger transition for user ${event.payload.userUuid}`)
+    }
+  }
+}

packages/revisions/src/Domain/Handler/TransitionStatusUpdatedEventHandler.ts

@@ -6,9 +6,12 @@ import {
 import { Logger } from 'winston'
 import { DomainEventFactoryInterface } from '../Event/DomainEventFactoryInterface'
 import { TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser } from '../UseCase/Transition/TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser/TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser'
+import { Uuid } from '@standardnotes/domain-core'
+import { RevisionRepositoryInterface } from '../Revision/RevisionRepositoryInterface'
 
 export class TransitionStatusUpdatedEventHandler implements DomainEventHandlerInterface {
   constructor(
+    private primaryRevisionsRepository: RevisionRepositoryInterface,
     private transitionRevisionsFromPrimaryToSecondaryDatabaseForUser: TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser,
     private domainEventPublisher: DomainEventPublisherInterface,
     private domainEventFactory: DomainEventFactoryInterface,
@@ -22,6 +25,7 @@ export class TransitionStatusUpdatedEventHandler implements DomainEventHandlerIn
           userUuid: event.payload.userUuid,
           status: 'STARTED',
           transitionType: 'revisions',
+          transitionTimestamp: event.payload.transitionTimestamp,
         }),
       )
 
@@ -29,11 +33,42 @@ export class TransitionStatusUpdatedEventHandler implements DomainEventHandlerIn
     }
 
     if (event.payload.status === 'STARTED' && event.payload.transitionType === 'revisions') {
+      const userUuidOrError = Uuid.create(event.payload.userUuid)
+      if (userUuidOrError.isFailed()) {
+        this.logger.error(
+          `Failed to transition revisions for user ${event.payload.userUuid}: ${userUuidOrError.getError()}`,
+        )
+        await this.domainEventPublisher.publish(
+          this.domainEventFactory.createTransitionStatusUpdatedEvent({
+            userUuid: event.payload.userUuid,
+            status: 'FAILED',
+            transitionType: 'revisions',
+            transitionTimestamp: event.payload.transitionTimestamp,
+          }),
+        )
+
+        return
+      }
+
+      if (await this.isAlreadyMigrated(userUuidOrError.getValue())) {
+        await this.domainEventPublisher.publish(
+          this.domainEventFactory.createTransitionStatusUpdatedEvent({
+            userUuid: event.payload.userUuid,
+            status: 'FINISHED',
+            transitionType: 'revisions',
+            transitionTimestamp: event.payload.transitionTimestamp,
+          }),
+        )
+
+        return
+      }
+
       await this.domainEventPublisher.publish(
         this.domainEventFactory.createTransitionStatusUpdatedEvent({
           userUuid: event.payload.userUuid,
           status: 'IN_PROGRESS',
           transitionType: 'revisions',
+          transitionTimestamp: event.payload.transitionTimestamp,
         }),
       )
 
@@ -49,6 +84,7 @@ export class TransitionStatusUpdatedEventHandler implements DomainEventHandlerIn
             userUuid: event.payload.userUuid,
             status: 'FAILED',
             transitionType: 'revisions',
+            transitionTimestamp: event.payload.transitionTimestamp,
           }),
         )
 
@@ -60,10 +96,23 @@ export class TransitionStatusUpdatedEventHandler implements DomainEventHandlerIn
           userUuid: event.payload.userUuid,
           status: 'FINISHED',
           transitionType: 'revisions',
+          transitionTimestamp: event.payload.transitionTimestamp,
         }),
       )
 
       return
     }
   }
+
+  private async isAlreadyMigrated(userUuid: Uuid): Promise<boolean> {
+    const totalRevisionsCountForUserInPrimary = await this.primaryRevisionsRepository.countByUserUuid(userUuid)
+
+    if (totalRevisionsCountForUserInPrimary > 0) {
+      this.logger.info(
+        `User ${userUuid.value} has ${totalRevisionsCountForUserInPrimary} revisions in primary database.`,
+      )
+    }
+
+    return totalRevisionsCountForUserInPrimary === 0
+  }
 }

packages/revisions/src/Domain/Revision/Revision.ts

@@ -12,7 +12,7 @@ export class Revision extends Entity<RevisionProps> {
   }
 
   isIdenticalTo(revision: Revision): boolean {
-    if (this._id.toString() !== revision._id.toString()) {
+    if (this._id.toString().toLowerCase() !== revision._id.toString().toLowerCase()) {
       return false
     }
 

packages/revisions/src/Domain/UseCase/Transition/TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser/TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser.spec.ts

@@ -1,435 +0,0 @@
-import { Logger } from 'winston'
-
-import { RevisionRepositoryInterface } from '../../../Revision/RevisionRepositoryInterface'
-import { TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser } from './TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser'
-import { Revision } from '../../../Revision/Revision'
-import { ContentType, Dates, UniqueEntityId, Uuid } from '@standardnotes/domain-core'
-import { TimerInterface } from '@standardnotes/time'
-
-describe('TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser', () => {
-  let primaryRevisionRepository: RevisionRepositoryInterface
-  let secondaryRevisionRepository: RevisionRepositoryInterface | null
-  let logger: Logger
-  let primaryRevision1: Revision
-  let primaryRevision2: Revision
-  let secondaryRevision1: Revision
-  let secondaryRevision2: Revision
-  let timer: TimerInterface
-
-  const createUseCase = () =>
-    new TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser(
-      primaryRevisionRepository,
-      secondaryRevisionRepository,
-      timer,
-      logger,
-      1,
-    )
-
-  beforeEach(() => {
-    primaryRevision1 = Revision.create(
-      {
-        itemUuid: Uuid.create('84c0f8e8-544a-4c7e-9adf-26209303bc1d').getValue(),
-        userUuid: Uuid.create('84c0f8e8-544a-4c7e-9adf-26209303bc1d').getValue(),
-        content: 'test',
-        contentType: ContentType.create('Note').getValue(),
-        itemsKeyId: 'test',
-        encItemKey: 'test',
-        authHash: 'test',
-        creationDate: new Date(1),
-        dates: Dates.create(new Date(1), new Date(2)).getValue(),
-      },
-      new UniqueEntityId('00000000-0000-0000-0000-000000000000'),
-    ).getValue()
-
-    primaryRevision2 = Revision.create(
-      {
-        itemUuid: Uuid.create('84c0f8e8-544a-4c7e-9adf-26209303bc2d').getValue(),
-        userUuid: Uuid.create('84c0f8e8-544a-4c7e-9adf-26209303bc1d').getValue(),
-        content: 'test',
-        contentType: ContentType.create('Note').getValue(),
-        itemsKeyId: 'test',
-        encItemKey: 'test',
-        authHash: 'test',
-        creationDate: new Date(1),
-        dates: Dates.create(new Date(1), new Date(2)).getValue(),
-      },
-      new UniqueEntityId('00000000-0000-0000-0000-000000000001'),
-    ).getValue()
-
-    secondaryRevision1 = Revision.create(
-      {
-        itemUuid: Uuid.create('84c0f8e8-544a-4c7e-9adf-26209303bc1d').getValue(),
-        userUuid: Uuid.create('84c0f8e8-544a-4c7e-9adf-26209303bc1d').getValue(),
-        content: 'test',
-        contentType: ContentType.create('Note').getValue(),
-        itemsKeyId: 'test',
-        encItemKey: 'test',
-        authHash: 'test',
-        creationDate: new Date(1),
-        dates: Dates.create(new Date(1), new Date(2)).getValue(),
-      },
-      new UniqueEntityId('00000000-0000-0000-0000-000000000000'),
-    ).getValue()
-
-    secondaryRevision2 = Revision.create(
-      {
-        itemUuid: Uuid.create('84c0f8e8-544a-4c7e-9adf-26209303bc2d').getValue(),
-        userUuid: Uuid.create('84c0f8e8-544a-4c7e-9adf-26209303bc1d').getValue(),
-        content: 'test',
-        contentType: ContentType.create('Note').getValue(),
-        itemsKeyId: 'test',
-        encItemKey: 'test',
-        authHash: 'test',
-        creationDate: new Date(1),
-        dates: Dates.create(new Date(1), new Date(2)).getValue(),
-      },
-      new UniqueEntityId('00000000-0000-0000-0000-000000000001'),
-    ).getValue()
-
-    primaryRevisionRepository = {} as jest.Mocked<RevisionRepositoryInterface>
-    primaryRevisionRepository.countByUserUuid = jest.fn().mockResolvedValue(2)
-    primaryRevisionRepository.findByUserUuid = jest
-      .fn()
-      .mockResolvedValueOnce([primaryRevision1])
-      .mockResolvedValueOnce([primaryRevision2])
-      .mockResolvedValueOnce([primaryRevision1])
-      .mockResolvedValueOnce([primaryRevision2])
-    primaryRevisionRepository.removeByUserUuid = jest.fn().mockResolvedValue(undefined)
-
-    secondaryRevisionRepository = {} as jest.Mocked<RevisionRepositoryInterface>
-    secondaryRevisionRepository.insert = jest.fn().mockResolvedValue(true)
-    secondaryRevisionRepository.removeByUserUuid = jest.fn().mockResolvedValue(undefined)
-    secondaryRevisionRepository.countByUserUuid = jest.fn().mockResolvedValue(2)
-    secondaryRevisionRepository.findOneByUuid = jest
-      .fn()
-      .mockResolvedValueOnce(secondaryRevision1)
-      .mockResolvedValueOnce(secondaryRevision2)
-
-    logger = {} as jest.Mocked<Logger>
-    logger.error = jest.fn()
-    logger.info = jest.fn()
-    logger.debug = jest.fn()
-
-    timer = {} as jest.Mocked<TimerInterface>
-    timer.sleep = jest.fn()
-    timer.getTimestampInMicroseconds = jest.fn().mockReturnValue(123)
-    timer.convertMicrosecondsToTimeStructure = jest.fn().mockReturnValue({
-      days: 0,
-      hours: 0,
-      minutes: 0,
-      seconds: 0,
-      milliseconds: 0,
-    })
-  })
-
-  describe('successfull transition', () => {
-    it('should transition Revisions from primary to secondary database', async () => {
-      const useCase = createUseCase()
-
-      const result = await useCase.execute({
-        userUuid: '00000000-0000-0000-0000-000000000000',
-      })
-
-      expect(result.isFailed()).toBeFalsy()
-
-      expect(primaryRevisionRepository.countByUserUuid).toHaveBeenCalledTimes(3)
-      expect(primaryRevisionRepository.countByUserUuid).toHaveBeenCalledWith(
-        Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
-      )
-      expect(primaryRevisionRepository.findByUserUuid).toHaveBeenCalledTimes(4)
-      expect(primaryRevisionRepository.findByUserUuid).toHaveBeenNthCalledWith(1, {
-        userUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
-        limit: 1,
-        offset: 0,
-      })
-      expect(primaryRevisionRepository.findByUserUuid).toHaveBeenNthCalledWith(2, {
-        userUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
-        limit: 1,
-        offset: 1,
-      })
-      expect(primaryRevisionRepository.findByUserUuid).toHaveBeenNthCalledWith(3, {
-        userUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
-        limit: 1,
-        offset: 0,
-      })
-      expect(primaryRevisionRepository.findByUserUuid).toHaveBeenNthCalledWith(4, {
-        userUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
-        limit: 1,
-        offset: 1,
-      })
-      expect((secondaryRevisionRepository as RevisionRepositoryInterface).insert).toHaveBeenCalledTimes(2)
-      expect((secondaryRevisionRepository as RevisionRepositoryInterface).insert).toHaveBeenCalledWith(primaryRevision1)
-      expect((secondaryRevisionRepository as RevisionRepositoryInterface).insert).toHaveBeenCalledWith(primaryRevision2)
-      expect((secondaryRevisionRepository as RevisionRepositoryInterface).removeByUserUuid).not.toHaveBeenCalled()
-      expect(primaryRevisionRepository.removeByUserUuid).toHaveBeenCalledTimes(1)
-    })
-
-    it('should log an error if deleting Revisions from primary database fails', async () => {
-      primaryRevisionRepository.removeByUserUuid = jest.fn().mockRejectedValue(new Error('error'))
-
-      const useCase = createUseCase()
-
-      const result = await useCase.execute({
-        userUuid: '00000000-0000-0000-0000-000000000000',
-      })
-
-      expect(result.isFailed()).toBeFalsy()
-
-      expect(logger.error).toHaveBeenCalledTimes(1)
-      expect(logger.error).toHaveBeenCalledWith(
-        'Failed to clean up primary database revisions for user 00000000-0000-0000-0000-000000000000: Errored when deleting revisions for user 00000000-0000-0000-0000-000000000000: error',
-      )
-    })
-  })
-
-  describe('failed transition', () => {
-    it('should remove Revisions from secondary database if integrity check fails', async () => {
-      const secondaryRevision2WithDifferentContent = Revision.create({
-        ...secondaryRevision2.props,
-        content: 'different-content',
-      }).getValue()
-
-      ;(secondaryRevisionRepository as RevisionRepositoryInterface).findOneByUuid = jest
-        .fn()
-        .mockResolvedValueOnce(secondaryRevision1)
-        .mockResolvedValueOnce(secondaryRevision2WithDifferentContent)
-
-      const useCase = createUseCase()
-
-      const result = await useCase.execute({
-        userUuid: '00000000-0000-0000-0000-000000000000',
-      })
-
-      expect(result.isFailed()).toBeTruthy()
-
-      expect((secondaryRevisionRepository as RevisionRepositoryInterface).removeByUserUuid).toHaveBeenCalledTimes(1)
-      expect(primaryRevisionRepository.removeByUserUuid).not.toHaveBeenCalled()
-    })
-
-    it('should remove Revisions from secondary database if migrating Revisions fails', async () => {
-      primaryRevisionRepository.findByUserUuid = jest
-        .fn()
-        .mockResolvedValueOnce([primaryRevision1])
-        .mockRejectedValueOnce(new Error('error'))
-
-      const useCase = createUseCase()
-
-      const result = await useCase.execute({
-        userUuid: '00000000-0000-0000-0000-000000000000',
-      })
-
-      expect(result.isFailed()).toBeTruthy()
-      expect(result.getError()).toEqual(
-        'Errored when migrating revisions for user 00000000-0000-0000-0000-000000000000: error',
-      )
-
-      expect((secondaryRevisionRepository as RevisionRepositoryInterface).removeByUserUuid).toHaveBeenCalledTimes(1)
-      expect(primaryRevisionRepository.removeByUserUuid).not.toHaveBeenCalled()
-    })
-
-    it('should return an error for a specific revision if it errors when saving to secondary database', async () => {
-      ;(secondaryRevisionRepository as RevisionRepositoryInterface).insert = jest
-        .fn()
-        .mockResolvedValueOnce(true)
-        .mockRejectedValueOnce(new Error('error'))
-
-      const useCase = createUseCase()
-
-      const result = await useCase.execute({
-        userUuid: '84c0f8e8-544a-4c7e-9adf-26209303bc1d',
-      })
-
-      expect(result.isFailed()).toBeTruthy()
-      expect(result.getError()).toEqual(
-        'Errored when saving revision 00000000-0000-0000-0000-000000000001 to secondary database: error',
-      )
-    })
-
-    it('should log an error if deleting Revisions from secondary database fails upon migration failure', async () => {
-      primaryRevisionRepository.findByUserUuid = jest
-        .fn()
-        .mockResolvedValueOnce([primaryRevision1])
-        .mockRejectedValueOnce(new Error('error'))
-      ;(secondaryRevisionRepository as RevisionRepositoryInterface).removeByUserUuid = jest
-        .fn()
-        .mockRejectedValue(new Error('error'))
-
-      const useCase = createUseCase()
-
-      const result = await useCase.execute({
-        userUuid: '00000000-0000-0000-0000-000000000000',
-      })
-
-      expect(result.isFailed()).toBeTruthy()
-
-      expect(logger.error).toHaveBeenCalledTimes(1)
-      expect(logger.error).toHaveBeenCalledWith(
-        'Failed to clean up secondary database revisions for user 00000000-0000-0000-0000-000000000000: Errored when deleting revisions for user 00000000-0000-0000-0000-000000000000: error',
-      )
-    })
-
-    it('should log an error if deleting Revisions from secondary database fails upon integrity check failure', async () => {
-      const secondaryRevision2WithDifferentContent = Revision.create({
-        ...secondaryRevision2.props,
-        content: 'different-content',
-      }).getValue()
-
-      ;(secondaryRevisionRepository as RevisionRepositoryInterface).findOneByUuid = jest
-        .fn()
-        .mockResolvedValueOnce(secondaryRevision1)
-        .mockResolvedValueOnce(secondaryRevision2WithDifferentContent)
-      ;(secondaryRevisionRepository as RevisionRepositoryInterface).removeByUserUuid = jest
-        .fn()
-        .mockRejectedValue(new Error('error'))
-
-      const useCase = createUseCase()
-
-      const result = await useCase.execute({
-        userUuid: '00000000-0000-0000-0000-000000000000',
-      })
-
-      expect(result.isFailed()).toBeTruthy()
-
-      expect(logger.error).toHaveBeenCalledTimes(1)
-      expect(logger.error).toHaveBeenCalledWith(
-        'Failed to clean up secondary database revisions for user 00000000-0000-0000-0000-000000000000: Errored when deleting revisions for user 00000000-0000-0000-0000-000000000000: error',
-      )
-    })
-
-    it('should not perform the transition if secondary Revision repository is not set', async () => {
-      secondaryRevisionRepository = null
-
-      const useCase = createUseCase()
-
-      const result = await useCase.execute({
-        userUuid: '00000000-0000-0000-0000-000000000000',
-      })
-
-      expect(result.isFailed()).toBeTruthy()
-      expect(result.getError()).toEqual('Secondary revision repository is not set')
-
-      expect(primaryRevisionRepository.countByUserUuid).not.toHaveBeenCalled()
-      expect(primaryRevisionRepository.findByUserUuid).not.toHaveBeenCalled()
-      expect(primaryRevisionRepository.removeByUserUuid).not.toHaveBeenCalled()
-    })
-
-    it('should not perform the transition if the user uuid is invalid', async () => {
-      const useCase = createUseCase()
-
-      const result = await useCase.execute({
-        userUuid: 'invalid-uuid',
-      })
-
-      expect(result.isFailed()).toBeTruthy()
-      expect(result.getError()).toEqual('Given value is not a valid uuid: invalid-uuid')
-
-      expect(primaryRevisionRepository.countByUserUuid).not.toHaveBeenCalled()
-      expect(primaryRevisionRepository.findByUserUuid).not.toHaveBeenCalled()
-      expect(primaryRevisionRepository.removeByUserUuid).not.toHaveBeenCalled()
-    })
-
-    it('should fail integrity check if the Revision count is not the same in both databases', async () => {
-      ;(secondaryRevisionRepository as RevisionRepositoryInterface).countByUserUuid = jest.fn().mockResolvedValue(1)
-
-      const useCase = createUseCase()
-
-      const result = await useCase.execute({
-        userUuid: '00000000-0000-0000-0000-000000000000',
-      })
-
-      expect(result.isFailed()).toBeTruthy()
-      expect(result.getError()).toEqual(
-        'Total revisions count for user 00000000-0000-0000-0000-000000000000 in primary database (2) does not match total revisions count in secondary database (1)',
-      )
-
-      expect(primaryRevisionRepository.countByUserUuid).toHaveBeenCalledTimes(3)
-      expect(primaryRevisionRepository.countByUserUuid).toHaveBeenCalledWith(
-        Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
-      )
-      expect((secondaryRevisionRepository as RevisionRepositoryInterface).countByUserUuid).toHaveBeenCalledTimes(1)
-      expect(primaryRevisionRepository.removeByUserUuid).not.toHaveBeenCalled()
-      expect((secondaryRevisionRepository as RevisionRepositoryInterface).removeByUserUuid).toHaveBeenCalledTimes(1)
-    })
-
-    it('should fail if one Revision is not found in the secondary database', async () => {
-      ;(secondaryRevisionRepository as RevisionRepositoryInterface).findOneByUuid = jest
-        .fn()
-        .mockResolvedValueOnce(secondaryRevision1)
-        .mockResolvedValueOnce(null)
-
-      const useCase = createUseCase()
-
-      const result = await useCase.execute({
-        userUuid: '00000000-0000-0000-0000-000000000000',
-      })
-
-      expect(result.isFailed()).toBeTruthy()
-      expect(result.getError()).toEqual('Revision 00000000-0000-0000-0000-000000000001 not found in secondary database')
-
-      expect(primaryRevisionRepository.countByUserUuid).toHaveBeenCalledTimes(3)
-      expect(primaryRevisionRepository.countByUserUuid).toHaveBeenCalledWith(
-        Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
-      )
-      expect((secondaryRevisionRepository as RevisionRepositoryInterface).countByUserUuid).not.toHaveBeenCalled()
-      expect(primaryRevisionRepository.removeByUserUuid).not.toHaveBeenCalled()
-      expect((secondaryRevisionRepository as RevisionRepositoryInterface).removeByUserUuid).toHaveBeenCalledTimes(1)
-    })
-
-    it('should fail if an error is thrown during integrity check between primary and secondary database', async () => {
-      ;(secondaryRevisionRepository as RevisionRepositoryInterface).countByUserUuid = jest
-        .fn()
-        .mockRejectedValue(new Error('error'))
-
-      const useCase = createUseCase()
-
-      const result = await useCase.execute({
-        userUuid: '00000000-0000-0000-0000-000000000000',
-      })
-
-      expect(result.isFailed()).toBeTruthy()
-      expect(result.getError()).toEqual('Errored when checking integrity between primary and secondary database: error')
-
-      expect(primaryRevisionRepository.removeByUserUuid).not.toHaveBeenCalled()
-      expect((secondaryRevisionRepository as RevisionRepositoryInterface).removeByUserUuid).toHaveBeenCalledTimes(1)
-    })
-
-    it('should fail if a revisions did not save in the secondary database', async () => {
-      ;(secondaryRevisionRepository as RevisionRepositoryInterface).insert = jest.fn().mockResolvedValue(false)
-
-      const useCase = createUseCase()
-
-      const result = await useCase.execute({
-        userUuid: '00000000-0000-0000-0000-000000000000',
-      })
-
-      expect(result.isFailed()).toBeTruthy()
-      expect(result.getError()).toEqual(
-        'Failed to save revision 00000000-0000-0000-0000-000000000000 to secondary database',
-      )
-
-      expect(primaryRevisionRepository.removeByUserUuid).not.toHaveBeenCalled()
-      expect((secondaryRevisionRepository as RevisionRepositoryInterface).removeByUserUuid).toHaveBeenCalledTimes(1)
-    })
-  })
-
-  it('should not migrate revisions if there are no revisions in the primary database', async () => {
-    primaryRevisionRepository.countByUserUuid = jest.fn().mockResolvedValue(0)
-
-    const useCase = createUseCase()
-
-    const result = await useCase.execute({
-      userUuid: '00000000-0000-0000-0000-000000000000',
-    })
-
-    expect(result.isFailed()).toBeFalsy()
-
-    expect(primaryRevisionRepository.countByUserUuid).toHaveBeenCalledTimes(1)
-    expect(primaryRevisionRepository.countByUserUuid).toHaveBeenCalledWith(
-      Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
-    )
-    expect(primaryRevisionRepository.findByUserUuid).not.toHaveBeenCalled()
-    expect((secondaryRevisionRepository as RevisionRepositoryInterface).insert).not.toHaveBeenCalled()
-    expect(primaryRevisionRepository.removeByUserUuid).not.toHaveBeenCalled()
-    expect((secondaryRevisionRepository as RevisionRepositoryInterface).removeByUserUuid).not.toHaveBeenCalled()
-  })
-})

packages/revisions/src/Domain/UseCase/Transition/TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser/TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser.ts

@@ -1,9 +1,11 @@
+/* istanbul ignore file */
 import { Result, UseCaseInterface, Uuid } from '@standardnotes/domain-core'
 import { TimerInterface } from '@standardnotes/time'
 import { Logger } from 'winston'
 
 import { TransitionRevisionsFromPrimaryToSecondaryDatabaseForUserDTO } from './TransitionRevisionsFromPrimaryToSecondaryDatabaseForUserDTO'
 import { RevisionRepositoryInterface } from '../../../Revision/RevisionRepositoryInterface'
+import { Revision } from '../../../Revision/Revision'
 
 export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements UseCaseInterface<void> {
   constructor(
@@ -15,6 +17,8 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
   ) {}
 
   async execute(dto: TransitionRevisionsFromPrimaryToSecondaryDatabaseForUserDTO): Promise<Result<void>> {
+    this.logger.info(`Transitioning revisions for user ${dto.userUuid}`)
+
     if (this.secondRevisionsRepository === null) {
       return Result.fail('Secondary revision repository is not set')
     }
@@ -25,23 +29,54 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
     }
     const userUuid = userUuidOrError.getValue()
 
-    if (await this.isAlreadyMigrated(userUuid)) {
-      this.logger.info(`Revisions for user ${userUuid.value} are already migrated`)
+    let newRevisionsInSecondaryCount = 0
+    let updatedRevisionsInSecondary: Revision[] = []
+    if (await this.hasAlreadyDataInSecondaryDatabase(userUuid)) {
+      const { alreadyExistingInPrimary, newRevisionsInSecondary, updatedInSecondary } =
+        await this.getNewRevisionsCreatedInSecondaryDatabase(userUuid)
 
-      return Result.ok()
+      for (const existingRevision of alreadyExistingInPrimary) {
+        this.logger.info(`Removing revision ${existingRevision.id.toString()} from secondary database`)
+        await (this.secondRevisionsRepository as RevisionRepositoryInterface).removeOneByUuid(
+          Uuid.create(existingRevision.id.toString()).getValue(),
+          userUuid,
+        )
+      }
+
+      if (newRevisionsInSecondary.length > 0) {
+        this.logger.info(
+          `Found ${newRevisionsInSecondary.length} new revisions in secondary database for user ${userUuid.value}`,
+        )
+      }
+
+      newRevisionsInSecondaryCount = newRevisionsInSecondary.length
+
+      if (updatedInSecondary.length > 0) {
+        this.logger.info(
+          `Found ${updatedInSecondary.length} updated revisions in secondary database for user ${userUuid.value}`,
+        )
+      }
+
+      updatedRevisionsInSecondary = updatedInSecondary
     }
 
+    const updatedRevisionsInSecondaryCount = updatedRevisionsInSecondary.length
+
+    await this.allowForSecondaryDatabaseToCatchUp()
+
     const migrationTimeStart = this.timer.getTimestampInMicroseconds()
 
     this.logger.debug(`Transitioning revisions for user ${userUuid.value}`)
 
-    const migrationResult = await this.migrateRevisionsForUser(userUuid)
+    const migrationResult = await this.migrateRevisionsForUser(userUuid, updatedRevisionsInSecondary)
     if (migrationResult.isFailed()) {
-      const cleanupResult = await this.deleteRevisionsForUser(userUuid, this.secondRevisionsRepository)
-      if (cleanupResult.isFailed()) {
-        this.logger.error(
-          `Failed to clean up secondary database revisions for user ${userUuid.value}: ${cleanupResult.getError()}`,
-        )
+      if (newRevisionsInSecondaryCount === 0 && updatedRevisionsInSecondaryCount === 0) {
+        const cleanupResult = await this.deleteRevisionsForUser(userUuid, this.secondRevisionsRepository)
+        if (cleanupResult.isFailed()) {
+          this.logger.error(
+            `Failed to clean up secondary database revisions for user ${userUuid.value}: ${cleanupResult.getError()}`,
+          )
+        }
       }
 
       return Result.fail(migrationResult.getError())
@@ -49,13 +84,19 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
 
     await this.allowForSecondaryDatabaseToCatchUp()
 
-    const integrityCheckResult = await this.checkIntegrityBetweenPrimaryAndSecondaryDatabase(userUuid)
+    const integrityCheckResult = await this.checkIntegrityBetweenPrimaryAndSecondaryDatabase(
+      userUuid,
+      newRevisionsInSecondaryCount,
+      updatedRevisionsInSecondary,
+    )
     if (integrityCheckResult.isFailed()) {
-      const cleanupResult = await this.deleteRevisionsForUser(userUuid, this.secondRevisionsRepository)
-      if (cleanupResult.isFailed()) {
-        this.logger.error(
-          `Failed to clean up secondary database revisions for user ${userUuid.value}: ${cleanupResult.getError()}`,
-        )
+      if (newRevisionsInSecondaryCount === 0 && updatedRevisionsInSecondaryCount === 0) {
+        const cleanupResult = await this.deleteRevisionsForUser(userUuid, this.secondRevisionsRepository)
+        if (cleanupResult.isFailed()) {
+          this.logger.error(
+            `Failed to clean up secondary database revisions for user ${userUuid.value}: ${cleanupResult.getError()}`,
+          )
+        }
       }
 
       return Result.fail(integrityCheckResult.getError())
@@ -80,7 +121,10 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
     return Result.ok()
   }
 
-  private async migrateRevisionsForUser(userUuid: Uuid): Promise<Result<void>> {
+  private async migrateRevisionsForUser(
+    userUuid: Uuid,
+    updatedRevisionsInSecondary: Revision[],
+  ): Promise<Result<void>> {
     try {
       const totalRevisionsCountForUser = await this.primaryRevisionsRepository.countByUserUuid(userUuid)
       let totalRevisionsCountTransitionedToSecondary = 0
@@ -96,6 +140,18 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
 
         for (const revision of revisions) {
           try {
+            if (
+              updatedRevisionsInSecondary.find(
+                (updatedRevision) => updatedRevision.id.toString() === revision.id.toString(),
+              )
+            ) {
+              this.logger.info(
+                `Skipping saving revision ${revision.id.toString()} as it was updated in secondary database`,
+              )
+
+              continue
+            }
+
             this.logger.debug(
               `Transitioning revision #${
                 totalRevisionsCountTransitionedToSecondary + 1
@@ -143,13 +199,99 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
     await this.timer.sleep(twoSecondsInMilliseconds)
   }
 
-  private async isAlreadyMigrated(userUuid: Uuid): Promise<boolean> {
-    const totalRevisionsCountForUserInPrimary = await this.primaryRevisionsRepository.countByUserUuid(userUuid)
+  private async hasAlreadyDataInSecondaryDatabase(userUuid: Uuid): Promise<boolean> {
+    const totalRevisionsCountForUserInSecondary = await (
+      this.secondRevisionsRepository as RevisionRepositoryInterface
+    ).countByUserUuid(userUuid)
 
-    return totalRevisionsCountForUserInPrimary === 0
+    const hasAlreadyDataInSecondaryDatabase = totalRevisionsCountForUserInSecondary > 0
+    if (hasAlreadyDataInSecondaryDatabase) {
+      this.logger.info(
+        `User ${userUuid.value} has already ${totalRevisionsCountForUserInSecondary} revisions in secondary database`,
+      )
+    }
+
+    return hasAlreadyDataInSecondaryDatabase
   }
 
-  private async checkIntegrityBetweenPrimaryAndSecondaryDatabase(userUuid: Uuid): Promise<Result<boolean>> {
+  private async getNewRevisionsCreatedInSecondaryDatabase(userUuid: Uuid): Promise<{
+    alreadyExistingInPrimary: Revision[]
+    newRevisionsInSecondary: Revision[]
+    updatedInSecondary: Revision[]
+  }> {
+    const revisions = await (this.secondRevisionsRepository as RevisionRepositoryInterface).findByUserUuid({
+      userUuid: userUuid,
+    })
+
+    const alreadyExistingInPrimary: Revision[] = []
+    const newRevisionsInSecondary: Revision[] = []
+    const updatedInSecondary: Revision[] = []
+
+    for (const revision of revisions) {
+      const { revisionInPrimary, newerRevisionInSecondary } =
+        await this.checkIfRevisionExistsInPrimaryDatabase(revision)
+      if (revisionInPrimary !== null) {
+        alreadyExistingInPrimary.push(revision)
+        continue
+      }
+      if (newerRevisionInSecondary !== null) {
+        updatedInSecondary.push(newerRevisionInSecondary)
+        continue
+      }
+      if (revisionInPrimary === null && newerRevisionInSecondary === null) {
+        newRevisionsInSecondary.push(revision)
+        continue
+      }
+    }
+
+    return {
+      alreadyExistingInPrimary: alreadyExistingInPrimary,
+      newRevisionsInSecondary: newRevisionsInSecondary,
+      updatedInSecondary: updatedInSecondary,
+    }
+  }
+
+  private async checkIfRevisionExistsInPrimaryDatabase(
+    revision: Revision,
+  ): Promise<{ revisionInPrimary: Revision | null; newerRevisionInSecondary: Revision | null }> {
+    const revisionInPrimary = await this.primaryRevisionsRepository.findOneByUuid(
+      Uuid.create(revision.id.toString()).getValue(),
+      revision.props.userUuid as Uuid,
+      [],
+    )
+
+    if (revisionInPrimary === null) {
+      return {
+        revisionInPrimary: null,
+        newerRevisionInSecondary: null,
+      }
+    }
+
+    if (!revision.isIdenticalTo(revisionInPrimary)) {
+      this.logger.error(
+        `Revision ${revision.id.toString()} is not identical in primary and secondary database. Revision in secondary database: ${JSON.stringify(
+          revision,
+        )}, revision in primary database: ${JSON.stringify(revisionInPrimary)}`,
+      )
+
+      return {
+        revisionInPrimary: null,
+        newerRevisionInSecondary:
+          revision.props.dates.updatedAt > revisionInPrimary.props.dates.updatedAt ? revision : null,
+      }
+    }
+
+    return {
+      revisionInPrimary: revisionInPrimary,
+      newerRevisionInSecondary: null,
+    }
+  }
+
+  private async checkIntegrityBetweenPrimaryAndSecondaryDatabase(
+    userUuid: Uuid,
+    newRevisionsInSecondaryCount: number,
+    updatedRevisionsInSecondary: Revision[],
+  ): Promise<Result<boolean>> {
     try {
       const totalRevisionsCountForUserInPrimary = await this.primaryRevisionsRepository.countByUserUuid(userUuid)
 
@@ -178,6 +320,17 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
             return Result.fail(`Revision ${revision.id.toString()} not found in secondary database`)
           }
 
+          if (
+            updatedRevisionsInSecondary.find(
+              (updatedRevision) => updatedRevision.id.toString() === revision.id.toString(),
+            )
+          ) {
+            this.logger.info(
+              `Skipping integrity check for revision ${revision.id.toString()} as it was updated in secondary database`,
+            )
+            continue
+          }
+
           if (!revision.isIdenticalTo(revisionInSecondary)) {
             return Result.fail(
               `Revision ${revision.id.toString()} is not identical in primary and secondary database. Revision in primary database: ${JSON.stringify(
@@ -192,9 +345,12 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
         this.secondRevisionsRepository as RevisionRepositoryInterface
       ).countByUserUuid(userUuid)
 
-      if (totalRevisionsCountForUserInPrimary !== totalRevisionsCountForUserInSecondary) {
+      if (
+        totalRevisionsCountForUserInPrimary + newRevisionsInSecondaryCount !==
+        totalRevisionsCountForUserInSecondary
+      ) {
         return Result.fail(
-          `Total revisions count for user ${userUuid.value} in primary database (${totalRevisionsCountForUserInPrimary}) does not match total revisions count in secondary database (${totalRevisionsCountForUserInSecondary})`,
+          `Total revisions count for user ${userUuid.value} in primary database (${totalRevisionsCountForUserInPrimary} + ${newRevisionsInSecondaryCount}) does not match total revisions count in secondary database (${totalRevisionsCountForUserInSecondary})`,
         )
       }
 

packages/revisions/src/Domain/UseCase/Transition/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser.spec.ts

@@ -23,6 +23,7 @@ describe('TriggerTransitionFromPrimaryToSecondaryDatabaseForUser', () => {
 
     await useCase.execute({
       userUuid: '00000000-0000-0000-0000-000000000000',
+      transitionTimestamp: 123,
     })
 
     expect(domainEventPubliser.publish).toHaveBeenCalled()

packages/revisions/src/Domain/UseCase/Transition/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser.ts

@@ -15,6 +15,7 @@ export class TriggerTransitionFromPrimaryToSecondaryDatabaseForUser implements U
       userUuid: dto.userUuid,
       status: 'STARTED',
       transitionType: 'revisions',
+      transitionTimestamp: dto.transitionTimestamp,
     })
 
     await this.domainEventPubliser.publish(event)

packages/revisions/src/Domain/UseCase/Transition/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser/TriggerTransitionFromPrimaryToSecondaryDatabaseForUserDTO.ts

@@ -1,3 +1,4 @@
 export interface TriggerTransitionFromPrimaryToSecondaryDatabaseForUserDTO {
   userUuid: string
+  transitionTimestamp: number
 }

packages/revisions/src/Infra/InversifyExpress/AnnotatedRevisionsController.ts

@@ -1,5 +1,5 @@
 import { Request, Response } from 'express'
-import { controller, httpDelete, httpGet, httpPost, results } from 'inversify-express-utils'
+import { controller, httpDelete, httpGet, results } from 'inversify-express-utils'
 import { inject } from 'inversify'
 
 import TYPES from '../../Bootstrap/Types'
@@ -12,7 +12,6 @@ import { Revision } from '../../Domain/Revision/Revision'
 import { RevisionMetadata } from '../../Domain/Revision/RevisionMetadata'
 import { RevisionHttpRepresentation } from '../../Mapping/Http/RevisionHttpRepresentation'
 import { RevisionMetadataHttpRepresentation } from '../../Mapping/Http/RevisionMetadataHttpRepresentation'
-import { TriggerTransitionFromPrimaryToSecondaryDatabaseForUser } from '../../Domain/UseCase/Transition/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser'
 
 @controller('', TYPES.Revisions_ApiGatewayAuthMiddleware)
 export class AnnotatedRevisionsController extends BaseRevisionsController {
@@ -24,17 +23,8 @@ export class AnnotatedRevisionsController extends BaseRevisionsController {
     override revisionHttpMapper: MapperInterface<Revision, RevisionHttpRepresentation>,
     @inject(TYPES.Revisions_RevisionMetadataHttpMapper)
     override revisionMetadataHttpMapper: MapperInterface<RevisionMetadata, RevisionMetadataHttpRepresentation>,
-    @inject(TYPES.Revisions_TriggerTransitionFromPrimaryToSecondaryDatabaseForUser)
-    override triggerTransitionFromPrimaryToSecondaryDatabaseForUser: TriggerTransitionFromPrimaryToSecondaryDatabaseForUser,
   ) {
-    super(
-      getRevisionsMetadata,
-      doGetRevision,
-      doDeleteRevision,
-      revisionHttpMapper,
-      revisionMetadataHttpMapper,
-      triggerTransitionFromPrimaryToSecondaryDatabaseForUser,
-    )
+    super(getRevisionsMetadata, doGetRevision, doDeleteRevision, revisionHttpMapper, revisionMetadataHttpMapper)
   }
 
   @httpGet('/items/:itemUuid/revisions')
@@ -51,9 +41,4 @@ export class AnnotatedRevisionsController extends BaseRevisionsController {
   override async deleteRevision(request: Request, response: Response): Promise<results.JsonResult> {
     return super.deleteRevision(request, response)
   }
-
-  @httpPost('/revisions/transition')
-  override async transition(request: Request, response: Response): Promise<results.JsonResult> {
-    return super.transition(request, response)
-  }
 }

packages/revisions/src/Infra/InversifyExpress/Base/BaseRevisionsController.ts

@@ -11,7 +11,6 @@ import { GetRevision } from '../../../Domain/UseCase/GetRevision/GetRevision'
 import { GetRevisionsMetada } from '../../../Domain/UseCase/GetRevisionsMetada/GetRevisionsMetada'
 import { RevisionHttpRepresentation } from '../../../Mapping/Http/RevisionHttpRepresentation'
 import { RevisionMetadataHttpRepresentation } from '../../../Mapping/Http/RevisionMetadataHttpRepresentation'
-import { TriggerTransitionFromPrimaryToSecondaryDatabaseForUser } from '../../../Domain/UseCase/Transition/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser'
 
 export class BaseRevisionsController extends BaseHttpController {
   constructor(
@@ -20,7 +19,6 @@ export class BaseRevisionsController extends BaseHttpController {
     protected doDeleteRevision: DeleteRevision,
     protected revisionHttpMapper: MapperInterface<Revision, RevisionHttpRepresentation>,
     protected revisionMetadataHttpMapper: MapperInterface<RevisionMetadata, RevisionMetadataHttpRepresentation>,
-    protected triggerTransitionFromPrimaryToSecondaryDatabaseForUser: TriggerTransitionFromPrimaryToSecondaryDatabaseForUser,
     private controllerContainer?: ControllerContainerInterface,
   ) {
     super()
@@ -29,7 +27,6 @@ export class BaseRevisionsController extends BaseHttpController {
       this.controllerContainer.register('revisions.revisions.getRevisions', this.getRevisions.bind(this))
       this.controllerContainer.register('revisions.revisions.getRevision', this.getRevision.bind(this))
       this.controllerContainer.register('revisions.revisions.deleteRevision', this.deleteRevision.bind(this))
-      this.controllerContainer.register('revisions.revisions.transition', this.transition.bind(this))
     }
   }
 
@@ -108,23 +105,4 @@ export class BaseRevisionsController extends BaseHttpController {
       message: revisionOrError.getValue(),
     })
   }
-
-  async transition(_request: Request, response: Response): Promise<results.JsonResult> {
-    const result = await this.triggerTransitionFromPrimaryToSecondaryDatabaseForUser.execute({
-      userUuid: response.locals.user.uuid,
-    })
-
-    if (result.isFailed()) {
-      return this.json(
-        {
-          error: { message: result.getError() },
-        },
-        400,
-      )
-    }
-
-    response.setHeader('x-invalidate-cache', response.locals.user.uuid)
-
-    return this.json({ success: true })
-  }
 }

packages/scheduler/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.20.44](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.20.43...@standardnotes/scheduler-server@1.20.44) (2023-09-13)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
+## [1.20.43](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.20.42...@standardnotes/scheduler-server@1.20.43) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
+## [1.20.42](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.20.41...@standardnotes/scheduler-server@1.20.42) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
+## [1.20.41](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.20.40...@standardnotes/scheduler-server@1.20.41) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
+## [1.20.40](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.20.39...@standardnotes/scheduler-server@1.20.40) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
 ## [1.20.39](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.20.38...@standardnotes/scheduler-server@1.20.39) (2023-09-08)
 
 **Note:** Version bump only for package @standardnotes/scheduler-server

packages/scheduler/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/scheduler-server",
-  "version": "1.20.39",
+  "version": "1.20.44",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

packages/security/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.13.1](https://github.com/standardnotes/server/compare/@standardnotes/security@1.13.0...@standardnotes/security@1.13.1) (2023-09-12)
+
+### Bug Fixes
+
+* adjust transitions to not create revisions during ongoing revisions transition ([106d8f9](https://github.com/standardnotes/server/commit/106d8f9192f630794ca4ddc2c4503f2c6cd196e7))
+
 # [1.13.0](https://github.com/standardnotes/server/compare/@standardnotes/security@1.12.2...@standardnotes/security@1.13.0) (2023-09-06)
 
 ### Features

packages/security/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/security",
-  "version": "1.13.0",
+  "version": "1.13.1",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

packages/security/src/Domain/Token/CrossServiceTokenData.ts

@@ -25,4 +25,5 @@ export type CrossServiceTokenData = {
   }
   extensionKey?: string
   ongoing_transition?: boolean
+  ongoing_revisions_transition?: boolean
 }

packages/settings/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.21.31](https://github.com/standardnotes/server/compare/@standardnotes/settings@1.21.30...@standardnotes/settings@1.21.31) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/settings
+
 ## [1.21.30](https://github.com/standardnotes/server/compare/@standardnotes/settings@1.21.29...@standardnotes/settings@1.21.30) (2023-09-07)
 
 **Note:** Version bump only for package @standardnotes/settings

packages/settings/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/settings",
-  "version": "1.21.30",
+  "version": "1.21.31",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

packages/syncing-server/CHANGELOG.md

@@ -3,6 +3,96 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.95.19](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.95.18...@standardnotes/syncing-server@1.95.19) (2023-09-15)
+
+### Bug Fixes
+
+* **syncing-server:** remove unused index in mongodb ([9147ff5](https://github.com/standardnotes/syncing-server-js/commit/9147ff5d49c507d943f4f8c6775f7c1fff878b0f))
+
+## [1.95.18](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.95.17...@standardnotes/syncing-server@1.95.18) (2023-09-14)
+
+### Bug Fixes
+
+* skip already updated items and revisions in integrity check ([#825](https://github.com/standardnotes/syncing-server-js/issues/825)) ([03a4a3f](https://github.com/standardnotes/syncing-server-js/commit/03a4a3f2abc0b4e09942ba39dbd227524068dfb6))
+* **syncing-server:** updating with missing creation date ([#824](https://github.com/standardnotes/syncing-server-js/issues/824)) ([3a8607d](https://github.com/standardnotes/syncing-server-js/commit/3a8607d1465cabedad68b84c753e407342e60d20))
+
+## [1.95.17](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.95.16...@standardnotes/syncing-server@1.95.17) (2023-09-13)
+
+### Bug Fixes
+
+* adjust transition timestamps to be universal ([c7807d0](https://github.com/standardnotes/syncing-server-js/commit/c7807d0f9e69ce572c4c03ff606375d706f24d9f))
+
+## [1.95.16](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.95.15...@standardnotes/syncing-server@1.95.16) (2023-09-13)
+
+### Bug Fixes
+
+* include handling updated items in revisions in secondary ([fbcb45c](https://github.com/standardnotes/syncing-server-js/commit/fbcb45c3a23fde09702fae7bfcb409bdbb610191))
+
+## [1.95.15](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.95.14...@standardnotes/syncing-server@1.95.15) (2023-09-13)
+
+### Bug Fixes
+
+* display transition progress in logs ([38685c1](https://github.com/standardnotes/syncing-server-js/commit/38685c1861b13e398dd96aa39f2cf1aece2090fb))
+
+## [1.95.14](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.95.13...@standardnotes/syncing-server@1.95.14) (2023-09-13)
+
+### Bug Fixes
+
+* setting status for already migrated users ([9be4c00](https://github.com/standardnotes/syncing-server-js/commit/9be4c002b755fea057489b6077b297162223aefe))
+
+## [1.95.13](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.95.12...@standardnotes/syncing-server@1.95.13) (2023-09-13)
+
+### Bug Fixes
+
+* cleanup only for 0 new items ([b1d88b1](https://github.com/standardnotes/syncing-server-js/commit/b1d88b15be78a48224963e337a222fb675ed2692))
+* **syncing-server:** add catch up timeout for secondary db ([ff78285](https://github.com/standardnotes/syncing-server-js/commit/ff78285e43db849bdc44caa36f602150562b4d81))
+* **syncing-server:** case insensitive integrity check ([d5536f5](https://github.com/standardnotes/syncing-server-js/commit/d5536f54304e2aecd59dbece7650254f7c2101bb))
+
+## [1.95.12](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.95.11...@standardnotes/syncing-server@1.95.12) (2023-09-12)
+
+### Bug Fixes
+
+* sync between primary and secondary database with diff ([fab5d18](https://github.com/standardnotes/syncing-server-js/commit/fab5d180645e0a6fa0c9c67205d44f27c8a65c8b))
+
+## [1.95.11](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.95.10...@standardnotes/syncing-server@1.95.11) (2023-09-12)
+
+### Bug Fixes
+
+* **syncing-server:** binding ([e91a832](https://github.com/standardnotes/syncing-server-js/commit/e91a8321527ac269ba9822ce270184db5bc57099))
+
+## [1.95.10](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.95.9...@standardnotes/syncing-server@1.95.10) (2023-09-12)
+
+### Bug Fixes
+
+* retry failed revision transitions ([e535cd5](https://github.com/standardnotes/syncing-server-js/commit/e535cd504cf1929539ff7faf13e9c1fdd2b7bfd1))
+* **syncing-server:** log syncing errors ([b9c9f74](https://github.com/standardnotes/syncing-server-js/commit/b9c9f74d0c699cf72ea6090627bd5716ac8360d7))
+
+## [1.95.9](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.95.8...@standardnotes/syncing-server@1.95.9) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/syncing-server
+
+## [1.95.8](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.95.7...@standardnotes/syncing-server@1.95.8) (2023-09-12)
+
+### Bug Fixes
+
+* **syncing-server:** allow fetching shared vault users for members ([#821](https://github.com/standardnotes/syncing-server-js/issues/821)) ([25047bf](https://github.com/standardnotes/syncing-server-js/commit/25047bf46dfabba7b12eafb59519de3f08822e45))
+
+## [1.95.7](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.95.6...@standardnotes/syncing-server@1.95.7) (2023-09-12)
+
+### Bug Fixes
+
+* comparing uuids ([0a1d162](https://github.com/standardnotes/syncing-server-js/commit/0a1d1624e818000f2e951f29323a88e6e233c755))
+
+## [1.95.6](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.95.5...@standardnotes/syncing-server@1.95.6) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/syncing-server
+
+## [1.95.5](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.95.4...@standardnotes/syncing-server@1.95.5) (2023-09-12)
+
+### Bug Fixes
+
+* adjust transitions to not create revisions during ongoing revisions transition ([106d8f9](https://github.com/standardnotes/syncing-server-js/commit/106d8f9192f630794ca4ddc2c4503f2c6cd196e7))
+
 ## [1.95.4](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.95.3...@standardnotes/syncing-server@1.95.4) (2023-09-12)
 
 ### Bug Fixes

packages/syncing-server/bin/transition.ts

@@ -6,16 +6,19 @@ import { ContainerConfigLoader } from '../src/Bootstrap/Container'
 import TYPES from '../src/Bootstrap/Types'
 import { Env } from '../src/Bootstrap/Env'
 import { TriggerTransitionFromPrimaryToSecondaryDatabaseForUser } from '../src/Domain/UseCase/Transition/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser'
+import { TimerInterface } from '@standardnotes/time'
 
 const inputArgs = process.argv.slice(2)
 const userUuid = inputArgs[0]
 
 const requestTransition = async (
   triggerTransitionFromPrimaryToSecondaryDatabaseForUser: TriggerTransitionFromPrimaryToSecondaryDatabaseForUser,
+  timer: TimerInterface,
   logger: Logger,
 ): Promise<void> => {
   const result = await triggerTransitionFromPrimaryToSecondaryDatabaseForUser.execute({
     userUuid,
+    transitionTimestamp: timer.getTimestampInMicroseconds(),
   })
   if (result.isFailed()) {
     logger.error(`Could not trigger transition for user ${userUuid}: ${result.getError()}`)
@@ -35,8 +38,9 @@ void container.load().then((container) => {
 
   const triggerTransitionFromPrimaryToSecondaryDatabaseForUser: TriggerTransitionFromPrimaryToSecondaryDatabaseForUser =
     container.get(TYPES.Sync_TriggerTransitionFromPrimaryToSecondaryDatabaseForUser)
+  const timer = container.get<TimerInterface>(TYPES.Sync_Timer)
 
-  Promise.resolve(requestTransition(triggerTransitionFromPrimaryToSecondaryDatabaseForUser, logger))
+  Promise.resolve(requestTransition(triggerTransitionFromPrimaryToSecondaryDatabaseForUser, timer, logger))
     .then(() => {
       logger.info(`Transition triggered for user ${userUuid}`)
 

packages/syncing-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/syncing-server",
-  "version": "1.95.4",
+  "version": "1.95.19",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

packages/syncing-server/src/Bootstrap/Container.ts

@@ -666,13 +666,14 @@ export class ContainerConfigLoader {
       .bind<SyncItems>(TYPES.Sync_SyncItems)
       .toConstantValue(
         new SyncItems(
-          container.get(TYPES.Sync_ItemRepositoryResolver),
-          container.get(TYPES.Sync_GetItems),
-          container.get(TYPES.Sync_SaveItems),
-          container.get(TYPES.Sync_GetSharedVaults),
-          container.get(TYPES.Sync_GetSharedVaultInvitesSentToUser),
-          container.get(TYPES.Sync_GetMessagesSentToUser),
-          container.get(TYPES.Sync_GetUserNotifications),
+          container.get<ItemRepositoryResolverInterface>(TYPES.Sync_ItemRepositoryResolver),
+          container.get<GetItems>(TYPES.Sync_GetItems),
+          container.get<SaveItems>(TYPES.Sync_SaveItems),
+          container.get<GetSharedVaults>(TYPES.Sync_GetSharedVaults),
+          container.get<GetSharedVaultInvitesSentToUser>(TYPES.Sync_GetSharedVaultInvitesSentToUser),
+          container.get<GetMessagesSentToUser>(TYPES.Sync_GetMessagesSentToUser),
+          container.get<GetUserNotifications>(TYPES.Sync_GetUserNotifications),
+          container.get<Logger>(TYPES.Sync_Logger),
         ),
       )
     container.bind<CheckIntegrity>(TYPES.Sync_CheckIntegrity).toDynamicValue((context: interfaces.Context) => {
@@ -951,6 +952,7 @@ export class ContainerConfigLoader {
       .bind<TransitionStatusUpdatedEventHandler>(TYPES.Sync_TransitionStatusUpdatedEventHandler)
       .toConstantValue(
         new TransitionStatusUpdatedEventHandler(
+          container.get<ItemRepositoryInterface>(TYPES.Sync_SQLItemRepository),
           container.get<TransitionItemsFromPrimaryToSecondaryDatabaseForUser>(
             TYPES.Sync_TransitionItemsFromPrimaryToSecondaryDatabaseForUser,
           ),
@@ -1088,9 +1090,6 @@ export class ContainerConfigLoader {
             container.get<SyncItems>(TYPES.Sync_SyncItems),
             container.get<CheckIntegrity>(TYPES.Sync_CheckIntegrity),
             container.get<GetItem>(TYPES.Sync_GetItem),
-            container.get<TriggerTransitionFromPrimaryToSecondaryDatabaseForUser>(
-              TYPES.Sync_TriggerTransitionFromPrimaryToSecondaryDatabaseForUser,
-            ),
             container.get<MapperInterface<Item, ItemHttpRepresentation>>(TYPES.Sync_ItemHttpMapper),
             container.get<SyncResponseFactoryResolverInterface>(TYPES.Sync_SyncResponseFactoryResolver),
             container.get<ControllerContainerInterface>(TYPES.Sync_ControllerContainer),

packages/syncing-server/src/Domain/Event/DomainEventFactory.ts

@@ -172,6 +172,7 @@ export class DomainEventFactory implements DomainEventFactoryInterface {
   createTransitionStatusUpdatedEvent(dto: {
     userUuid: string
     transitionType: 'items' | 'revisions'
+    transitionTimestamp: number
     status: 'STARTED' | 'FAILED' | 'FINISHED'
   }): TransitionStatusUpdatedEvent {
     return {

packages/syncing-server/src/Domain/Event/DomainEventFactoryInterface.ts

@@ -52,6 +52,7 @@ export interface DomainEventFactoryInterface {
   createTransitionStatusUpdatedEvent(dto: {
     userUuid: string
     transitionType: 'items' | 'revisions'
+    transitionTimestamp: number
     status: 'STARTED' | 'IN_PROGRESS' | 'FAILED' | 'FINISHED'
   }): TransitionStatusUpdatedEvent
   createEmailRequestedEvent(dto: {

packages/syncing-server/src/Domain/Handler/TransitionRequestedEventHandler.ts

@@ -10,10 +10,15 @@ export class TransitionRequestedEventHandler implements DomainEventHandlerInterf
   ) {}
 
   async handle(event: TransitionRequestedEvent): Promise<void> {
+    if (event.payload.type !== 'items') {
+      return
+    }
+
     this.logger.info(`Handling transition requested event for user ${event.payload.userUuid}`)
 
     const result = await this.triggerTransitionFromPrimaryToSecondaryDatabaseForUser.execute({
       userUuid: event.payload.userUuid,
+      transitionTimestamp: event.payload.timestamp,
     })
 
     if (result.isFailed()) {

packages/syncing-server/src/Domain/Handler/TransitionStatusUpdatedEventHandler.ts

@@ -6,9 +6,11 @@ import {
 import { Logger } from 'winston'
 import { TransitionItemsFromPrimaryToSecondaryDatabaseForUser } from '../UseCase/Transition/TransitionItemsFromPrimaryToSecondaryDatabaseForUser/TransitionItemsFromPrimaryToSecondaryDatabaseForUser'
 import { DomainEventFactoryInterface } from '../Event/DomainEventFactoryInterface'
+import { ItemRepositoryInterface } from '../Item/ItemRepositoryInterface'
 
 export class TransitionStatusUpdatedEventHandler implements DomainEventHandlerInterface {
   constructor(
+    private primaryItemRepository: ItemRepositoryInterface,
     private transitionItemsFromPrimaryToSecondaryDatabaseForUser: TransitionItemsFromPrimaryToSecondaryDatabaseForUser,
     private domainEventPublisher: DomainEventPublisherInterface,
     private domainEventFactory: DomainEventFactoryInterface,
@@ -17,11 +19,25 @@ export class TransitionStatusUpdatedEventHandler implements DomainEventHandlerIn
 
   async handle(event: TransitionStatusUpdatedEvent): Promise<void> {
     if (event.payload.status === 'STARTED' && event.payload.transitionType === 'items') {
+      if (await this.isAlreadyMigrated(event.payload.userUuid)) {
+        await this.domainEventPublisher.publish(
+          this.domainEventFactory.createTransitionStatusUpdatedEvent({
+            userUuid: event.payload.userUuid,
+            status: 'FINISHED',
+            transitionType: 'items',
+            transitionTimestamp: event.payload.transitionTimestamp,
+          }),
+        )
+
+        return
+      }
+
       await this.domainEventPublisher.publish(
         this.domainEventFactory.createTransitionStatusUpdatedEvent({
           userUuid: event.payload.userUuid,
           status: 'IN_PROGRESS',
           transitionType: 'items',
+          transitionTimestamp: event.payload.transitionTimestamp,
         }),
       )
 
@@ -37,6 +53,7 @@ export class TransitionStatusUpdatedEventHandler implements DomainEventHandlerIn
             userUuid: event.payload.userUuid,
             status: 'FAILED',
             transitionType: 'items',
+            transitionTimestamp: event.payload.transitionTimestamp,
           }),
         )
 
@@ -48,8 +65,19 @@ export class TransitionStatusUpdatedEventHandler implements DomainEventHandlerIn
           userUuid: event.payload.userUuid,
           status: 'FINISHED',
           transitionType: 'items',
+          transitionTimestamp: event.payload.transitionTimestamp,
         }),
       )
     }
   }
+
+  private async isAlreadyMigrated(userUuid: string): Promise<boolean> {
+    const totalItemsCountForUser = await this.primaryItemRepository.countAll({ userUuid })
+
+    if (totalItemsCountForUser > 0) {
+      this.logger.info(`User ${userUuid} has ${totalItemsCountForUser} items in primary database.`)
+    }
+
+    return totalItemsCountForUser === 0
+  }
 }

packages/syncing-server/src/Domain/Item/Item.ts

@@ -54,7 +54,7 @@ export class Item extends Aggregate<ItemProps> {
   }
 
   isIdenticalTo(item: Item): boolean {
-    if (this._id.toString() !== item._id.toString()) {
+    if (this._id.toString().toLowerCase() !== item._id.toString().toLowerCase()) {
       return false
     }
 

packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaultUsers/GetSharedVaultUsers.spec.ts

@@ -58,13 +58,8 @@ describe('GetSharedVaultUsers', () => {
     expect(result.getError()).toBe('Shared vault not found')
   })
 
-  it('returns error when originator is not the owner of the shared vault', async () => {
-    sharedVault = SharedVault.create({
-      fileUploadBytesUsed: 2,
-      userUuid: Uuid.create('00000000-0000-0000-0000-000000000001').getValue(),
-      timestamps: Timestamps.create(123, 123).getValue(),
-    }).getValue()
-    sharedVaultRepository.findByUuid = jest.fn().mockResolvedValue(sharedVault)
+  it('returns error when originator is not a member of the shared vault', async () => {
+    sharedVaultUsersRepository.findBySharedVaultUuid = jest.fn().mockResolvedValue([])
 
     const useCase = createUseCase()
     const result = await useCase.execute({
@@ -73,7 +68,7 @@ describe('GetSharedVaultUsers', () => {
     })
 
     expect(result.isFailed()).toBe(true)
-    expect(result.getError()).toBe('Only the owner can get shared vault users')
+    expect(result.getError()).toBe('Originator is not a member of the shared vault')
   })
 
   it('returns error when shared vault uuid is invalid', async () => {

packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaultUsers/GetSharedVaultUsers.ts

@@ -28,13 +28,15 @@ export class GetSharedVaultUsers implements UseCaseInterface<SharedVaultUser[]>
       return Result.fail('Shared vault not found')
     }
 
-    const isOriginatorTheOwnerOfTheSharedVault = sharedVault.props.userUuid.equals(originatorUuid)
-    if (!isOriginatorTheOwnerOfTheSharedVault) {
-      return Result.fail('Only the owner can get shared vault users')
-    }
-
     const sharedVaultUsers = await this.sharedVaultUsersRepository.findBySharedVaultUuid(sharedVaultUuid)
 
+    const isOriginatorAMember = sharedVaultUsers.some((sharedVaultUser) =>
+      sharedVaultUser.props.userUuid.equals(originatorUuid),
+    )
+    if (!isOriginatorAMember) {
+      return Result.fail('Originator is not a member of the shared vault')
+    }
+
     return Result.ok(sharedVaultUsers)
   }
 }

packages/syncing-server/src/Domain/UseCase/Syncing/CheckIntegrity/CheckIntegrity.spec.ts

@@ -22,7 +22,7 @@ describe('CheckIntegrity', () => {
         content_type: ContentType.TYPES.Note,
       },
       {
-        uuid: '2-3-4',
+        uuid: '2-3-4-a',
         updated_at_timestamp: 2,
         content_type: ContentType.TYPES.Note,
       },
@@ -56,7 +56,7 @@ describe('CheckIntegrity', () => {
           updated_at_timestamp: 1,
         },
         {
-          uuid: '2-3-4',
+          uuid: '2-3-4-A',
           updated_at_timestamp: 2,
         },
         {
@@ -82,7 +82,7 @@ describe('CheckIntegrity', () => {
           updated_at_timestamp: 1,
         },
         {
-          uuid: '2-3-4',
+          uuid: '2-3-4-A',
           updated_at_timestamp: 1,
         },
         {
@@ -98,7 +98,7 @@ describe('CheckIntegrity', () => {
     })
     expect(result.getValue()).toEqual([
       {
-        uuid: '2-3-4',
+        uuid: '2-3-4-A',
         updated_at_timestamp: 2,
       },
     ])
@@ -113,7 +113,7 @@ describe('CheckIntegrity', () => {
           updated_at_timestamp: 1,
         },
         {
-          uuid: '2-3-4',
+          uuid: '2-3-4-A',
           updated_at_timestamp: 2,
         },
         {
@@ -140,7 +140,7 @@ describe('CheckIntegrity', () => {
           updated_at_timestamp: 1,
         },
         {
-          uuid: '2-3-4',
+          uuid: '2-3-4-A',
           updated_at_timestamp: 2,
         },
         {

packages/syncing-server/src/Domain/UseCase/Syncing/CheckIntegrity/CheckIntegrity.ts

@@ -20,15 +20,17 @@ export class CheckIntegrity implements UseCaseInterface<IntegrityPayload[]> {
 
     const serverItemIntegrityPayloadsMap = new Map<string, ExtendedIntegrityPayload>()
     for (const serverItemIntegrityPayload of serverItemIntegrityPayloads) {
-      serverItemIntegrityPayloadsMap.set(serverItemIntegrityPayload.uuid, serverItemIntegrityPayload)
+      serverItemIntegrityPayloadsMap.set(serverItemIntegrityPayload.uuid.toLowerCase(), serverItemIntegrityPayload)
     }
 
     const clientItemIntegrityPayloadsMap = new Map<string, number>()
+    const caseInsensitiveUuidsMap = new Map<string, string>()
     for (const clientItemIntegrityPayload of dto.integrityPayloads) {
       clientItemIntegrityPayloadsMap.set(
-        clientItemIntegrityPayload.uuid,
+        clientItemIntegrityPayload.uuid.toLowerCase(),
         clientItemIntegrityPayload.updated_at_timestamp,
       )
+      caseInsensitiveUuidsMap.set(clientItemIntegrityPayload.uuid.toLowerCase(), clientItemIntegrityPayload.uuid)
     }
 
     const mismatches: IntegrityPayload[] = []
@@ -58,7 +60,7 @@ export class CheckIntegrity implements UseCaseInterface<IntegrityPayload[]> {
         serverItemIntegrityPayload.content_type !== ContentType.TYPES.ItemsKey
       ) {
         mismatches.unshift({
-          uuid: serverItemIntegrityPayloadUuid,
+          uuid: caseInsensitiveUuidsMap.get(serverItemIntegrityPayloadUuid) as string,
           updated_at_timestamp: serverItemIntegrityPayloadUpdatedAtTimestamp,
         })
       }

packages/syncing-server/src/Domain/UseCase/Syncing/SaveItems/SaveItems.spec.ts

@@ -84,6 +84,7 @@ describe('SaveItems', () => {
     const result = await useCase.execute({
       itemHashes: [itemHash1],
       userUuid: 'user-uuid',
+      onGoingRevisionsTransition: false,
       apiVersion: '1',
       readOnlyAccess: false,
       sessionUuid: 'session-uuid',
@@ -96,6 +97,7 @@ describe('SaveItems', () => {
     expect(saveNewItem.execute).toHaveBeenCalledWith({
       itemHash: itemHash1,
       userUuid: 'user-uuid',
+      onGoingRevisionsTransition: false,
       sessionUuid: 'session-uuid',
       roleNames: ['CORE_USER'],
     })
@@ -109,6 +111,7 @@ describe('SaveItems', () => {
     const result = await useCase.execute({
       itemHashes: [itemHash1],
       userUuid: 'user-uuid',
+      onGoingRevisionsTransition: false,
       apiVersion: '1',
       readOnlyAccess: false,
       sessionUuid: 'session-uuid',
@@ -133,6 +136,7 @@ describe('SaveItems', () => {
     const result = await useCase.execute({
       itemHashes: [itemHash1],
       userUuid: 'user-uuid',
+      onGoingRevisionsTransition: false,
       apiVersion: '1',
       readOnlyAccess: false,
       sessionUuid: 'session-uuid',
@@ -155,6 +159,7 @@ describe('SaveItems', () => {
     const result = await useCase.execute({
       itemHashes: [itemHash1],
       userUuid: 'user-uuid',
+      onGoingRevisionsTransition: false,
       apiVersion: '1',
       readOnlyAccess: true,
       sessionUuid: 'session-uuid',
@@ -178,6 +183,7 @@ describe('SaveItems', () => {
     const result = await useCase.execute({
       itemHashes: [itemHash1],
       userUuid: 'user-uuid',
+      onGoingRevisionsTransition: false,
       apiVersion: '1',
       readOnlyAccess: false,
       sessionUuid: 'session-uuid',
@@ -197,6 +203,7 @@ describe('SaveItems', () => {
     const result = await useCase.execute({
       itemHashes: [itemHash1],
       userUuid: 'user-uuid',
+      onGoingRevisionsTransition: false,
       apiVersion: '1',
       readOnlyAccess: false,
       sessionUuid: 'session-uuid',
@@ -215,6 +222,7 @@ describe('SaveItems', () => {
 
     const result = await useCase.execute({
       itemHashes: [itemHash1],
+      onGoingRevisionsTransition: false,
       userUuid: '00000000-0000-0000-0000-000000000000',
       apiVersion: '1',
       readOnlyAccess: false,
@@ -229,6 +237,7 @@ describe('SaveItems', () => {
       existingItem: savedItem,
       sessionUuid: 'session-uuid',
       performingUserUuid: '00000000-0000-0000-0000-000000000000',
+      onGoingRevisionsTransition: false,
       roleNames: ['CORE_USER'],
     })
   })
@@ -242,6 +251,7 @@ describe('SaveItems', () => {
     const result = await useCase.execute({
       itemHashes: [itemHash1],
       userUuid: 'user-uuid',
+      onGoingRevisionsTransition: false,
       apiVersion: '1',
       readOnlyAccess: false,
       sessionUuid: 'session-uuid',
@@ -267,6 +277,7 @@ describe('SaveItems', () => {
     const result = await useCase.execute({
       itemHashes: [ItemHash.create({ ...itemHash1.props, uuid: 'invalid-uuid' }).getValue()],
       userUuid: 'user-uuid',
+      onGoingRevisionsTransition: false,
       apiVersion: '1',
       readOnlyAccess: false,
       sessionUuid: 'session-uuid',
@@ -313,6 +324,7 @@ describe('SaveItems', () => {
         ItemHash.create({ ...itemHash1.props, uuid: '00000000-0000-0000-0000-000000000003' }).getValue(),
       ],
       userUuid: 'user-uuid',
+      onGoingRevisionsTransition: false,
       apiVersion: '2',
       readOnlyAccess: false,
       sessionUuid: 'session-uuid',
@@ -330,6 +342,7 @@ describe('SaveItems', () => {
     const result = await useCase.execute({
       itemHashes: [itemHash1],
       userUuid: 'user-uuid',
+      onGoingRevisionsTransition: false,
       apiVersion: '2',
       readOnlyAccess: false,
       sessionUuid: 'session-uuid',

packages/syncing-server/src/Domain/UseCase/Syncing/SaveItems/SaveItems.ts

@@ -86,6 +86,7 @@ export class SaveItems implements UseCaseInterface<SaveItemsResult> {
           sessionUuid: dto.sessionUuid,
           performingUserUuid: dto.userUuid,
           roleNames: dto.roleNames,
+          onGoingRevisionsTransition: dto.onGoingRevisionsTransition,
         })
         if (udpatedItemOrError.isFailed()) {
           this.logger.error(
@@ -109,6 +110,7 @@ export class SaveItems implements UseCaseInterface<SaveItemsResult> {
             itemHash,
             sessionUuid: dto.sessionUuid,
             roleNames: dto.roleNames,
+            onGoingRevisionsTransition: dto.onGoingRevisionsTransition,
           })
           if (newItemOrError.isFailed()) {
             this.logger.error(

packages/syncing-server/src/Domain/UseCase/Syncing/SaveItems/SaveItemsDTO.ts

@@ -8,4 +8,5 @@ export interface SaveItemsDTO {
   sessionUuid: string | null
   snjsVersion: string
   roleNames: string[]
+  onGoingRevisionsTransition: boolean
 }

packages/syncing-server/src/Domain/UseCase/Syncing/SaveNewItem/SaveNewItem.spec.ts

@@ -90,6 +90,7 @@ describe('SaveNewItem', () => {
 
     const result = await useCase.execute({
       userUuid: '00000000-0000-0000-0000-000000000000',
+      onGoingRevisionsTransition: false,
       roleNames: [RoleName.NAMES.CoreUser],
       sessionUuid: '00000000-0000-0000-0000-000000000001',
       itemHash: itemHash1,
@@ -112,6 +113,7 @@ describe('SaveNewItem', () => {
 
     const result = await useCase.execute({
       userUuid: '00000000-0000-0000-0000-000000000000',
+      onGoingRevisionsTransition: true,
       roleNames: [RoleName.NAMES.CoreUser],
       sessionUuid: '00000000-0000-0000-0000-000000000001',
       itemHash: itemHash1,
@@ -132,6 +134,7 @@ describe('SaveNewItem', () => {
 
     const result = await useCase.execute({
       userUuid: '00000000-0000-0000-0000-000000000000',
+      onGoingRevisionsTransition: false,
       roleNames: [RoleName.NAMES.CoreUser],
       sessionUuid: '00000000-0000-0000-0000-000000000001',
       itemHash: itemHash1,
@@ -150,6 +153,7 @@ describe('SaveNewItem', () => {
 
     const result = await useCase.execute({
       userUuid: '00000000-0000-0000-0000-000000000000',
+      onGoingRevisionsTransition: false,
       roleNames: [RoleName.NAMES.CoreUser],
       sessionUuid: '00000000-0000-0000-0000-000000000001',
       itemHash: itemHash1,
@@ -170,6 +174,7 @@ describe('SaveNewItem', () => {
 
     const result = await useCase.execute({
       userUuid: '00000000-0000-0000-0000-000000000000',
+      onGoingRevisionsTransition: false,
       roleNames: [RoleName.NAMES.CoreUser],
       sessionUuid: '00000000-0000-0000-0000-000000000001',
       itemHash: itemHash1,
@@ -190,6 +195,7 @@ describe('SaveNewItem', () => {
 
     const result = await useCase.execute({
       userUuid: '00000000-0000-0000-0000-000000000000',
+      onGoingRevisionsTransition: false,
       roleNames: [RoleName.NAMES.CoreUser],
       sessionUuid: '00000000-0000-0000-0000-000000000001',
       itemHash: itemHash1,
@@ -208,6 +214,7 @@ describe('SaveNewItem', () => {
       sessionUuid: '00000000-0000-0000-0000-000000000001',
       itemHash: itemHash1,
       roleNames: [RoleName.NAMES.CoreUser],
+      onGoingRevisionsTransition: false,
     })
 
     expect(result.isFailed()).toBeTruthy()
@@ -218,6 +225,7 @@ describe('SaveNewItem', () => {
 
     const result = await useCase.execute({
       userUuid: '00000000-0000-0000-0000-000000000000',
+      onGoingRevisionsTransition: false,
       sessionUuid: '00000000-0000-0000-0000-000000000001',
       itemHash: itemHash1,
       roleNames: ['invalid'],
@@ -231,6 +239,7 @@ describe('SaveNewItem', () => {
 
     const result = await useCase.execute({
       userUuid: '00000000-0000-0000-0000-000000000000',
+      onGoingRevisionsTransition: false,
       roleNames: [RoleName.NAMES.CoreUser],
       sessionUuid: '00000000-0000-0000-0000-00000000000',
       itemHash: itemHash1,
@@ -249,6 +258,7 @@ describe('SaveNewItem', () => {
 
     const result = await useCase.execute({
       userUuid: '00000000-0000-0000-0000-000000000000',
+      onGoingRevisionsTransition: false,
       roleNames: [RoleName.NAMES.CoreUser],
       sessionUuid: '00000000-0000-0000-0000-000000000001',
       itemHash: itemHash1,
@@ -267,6 +277,7 @@ describe('SaveNewItem', () => {
 
     const result = await useCase.execute({
       userUuid: '00000000-0000-0000-0000-000000000000',
+      onGoingRevisionsTransition: false,
       roleNames: [RoleName.NAMES.CoreUser],
       sessionUuid: '00000000-0000-0000-0000-000000000001',
       itemHash: itemHash1,
@@ -285,6 +296,7 @@ describe('SaveNewItem', () => {
 
     const result = await useCase.execute({
       userUuid: '00000000-0000-0000-0000-000000000000',
+      onGoingRevisionsTransition: false,
       roleNames: [RoleName.NAMES.CoreUser],
       sessionUuid: '00000000-0000-0000-0000-000000000001',
       itemHash: itemHash1,
@@ -305,6 +317,7 @@ describe('SaveNewItem', () => {
 
     const result = await useCase.execute({
       userUuid: '00000000-0000-0000-0000-000000000000',
+      onGoingRevisionsTransition: false,
       roleNames: [RoleName.NAMES.CoreUser],
       sessionUuid: '00000000-0000-0000-0000-000000000001',
       itemHash: itemHash1,
@@ -328,6 +341,7 @@ describe('SaveNewItem', () => {
       sessionUuid: '00000000-0000-0000-0000-000000000001',
       itemHash: itemHash1,
       roleNames: [RoleName.NAMES.CoreUser],
+      onGoingRevisionsTransition: false,
     })
 
     expect(result.isFailed()).toBeTruthy()
@@ -344,6 +358,7 @@ describe('SaveNewItem', () => {
 
       const result = await useCase.execute({
         userUuid: '00000000-0000-0000-0000-000000000000',
+        onGoingRevisionsTransition: false,
         roleNames: [RoleName.NAMES.CoreUser],
         sessionUuid: '00000000-0000-0000-0000-000000000001',
         itemHash: itemHash1,
@@ -371,6 +386,7 @@ describe('SaveNewItem', () => {
 
       const result = await useCase.execute({
         userUuid: '00000000-0000-0000-0000-000000000000',
+        onGoingRevisionsTransition: false,
         roleNames: [RoleName.NAMES.CoreUser],
         sessionUuid: '00000000-0000-0000-0000-000000000001',
         itemHash: itemHash1,
@@ -393,6 +409,7 @@ describe('SaveNewItem', () => {
 
       const result = await useCase.execute({
         userUuid: '00000000-0000-0000-0000-000000000000',
+        onGoingRevisionsTransition: false,
         roleNames: [RoleName.NAMES.CoreUser],
         sessionUuid: '00000000-0000-0000-0000-000000000001',
         itemHash: itemHash1,
@@ -412,6 +429,7 @@ describe('SaveNewItem', () => {
 
       const result = await useCase.execute({
         userUuid: '00000000-0000-0000-0000-000000000000',
+        onGoingRevisionsTransition: false,
         roleNames: [RoleName.NAMES.CoreUser],
         sessionUuid: '00000000-0000-0000-0000-000000000001',
         itemHash: itemHash1,
@@ -435,6 +453,7 @@ describe('SaveNewItem', () => {
 
       const result = await useCase.execute({
         userUuid: '00000000-0000-0000-0000-000000000000',
+        onGoingRevisionsTransition: false,
         roleNames: [RoleName.NAMES.CoreUser],
         sessionUuid: '00000000-0000-0000-0000-000000000001',
         itemHash: itemHash1,

packages/syncing-server/src/Domain/UseCase/Syncing/SaveNewItem/SaveNewItem.ts

@@ -145,13 +145,15 @@ export class SaveNewItem implements UseCaseInterface<Item> {
     await itemRepository.save(newItem)
 
     if (contentType.value !== null && [ContentType.TYPES.Note, ContentType.TYPES.File].includes(contentType.value)) {
-      await this.domainEventPublisher.publish(
-        this.domainEventFactory.createItemRevisionCreationRequested({
-          itemUuid: newItem.id.toString(),
-          userUuid: newItem.props.userUuid.value,
-          roleNames: dto.roleNames,
-        }),
-      )
+      if (!dto.onGoingRevisionsTransition) {
+        await this.domainEventPublisher.publish(
+          this.domainEventFactory.createItemRevisionCreationRequested({
+            itemUuid: newItem.id.toString(),
+            userUuid: newItem.props.userUuid.value,
+            roleNames: dto.roleNames,
+          }),
+        )
+      }
     }
 
     if (duplicateOf) {