chore(release): publish new version

- @standardnotes/analytics@2.26.15 - @standardnotes/api-gateway@1.74.13 - @standardnotes/auth-server@1.143.2 - @standardnotes/domain-core@1.30.0 - @standardnotes/event-store@1.11.43 - @standardnotes/files-server@1.22.22 - @standardnotes/home-server@1.15.60 - @standardnotes/revisions-server@1.35.1 - @standardnotes/scheduler-server@1.20.47 - @standardnotes/settings@1.21.33 - @standardnotes/syncing-server@1.98.0 - @standardnotes/websockets-server@1.10.44
feat: add publishing notifications for users when a user is added to vault (#834 )
2026-04-28 00:01:24 -04:00 · 2023-09-18 08:44:10 +00:00 · 2023-09-18 10:27:24 +02:00 · 2023-09-15 15:42:29 +00:00 · 2023-09-15 17:23:49 +02:00 · 2023-09-15 15:13:07 +00:00
107 changed files with 1178 additions and 1197 deletions
@@ -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", [\
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [2.26.15](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.26.14...@standardnotes/analytics@2.26.15) (2023-09-18)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.26.14](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.26.13...@standardnotes/analytics@2.26.14) (2023-09-15)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.26.13](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.26.12...@standardnotes/analytics@2.26.13) (2023-09-15)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
 ## [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
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/analytics",
-  "version": "2.26.12",
+  "version": "2.26.15",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.74.13](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.74.12...@standardnotes/api-gateway@1.74.13) (2023-09-18)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.74.12](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.74.11...@standardnotes/api-gateway@1.74.12) (2023-09-15)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.74.11](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.74.10...@standardnotes/api-gateway@1.74.11) (2023-09-15)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [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,6 +1,6 @@
 {
  "name": "@standardnotes/api-gateway",
-  "version": "1.74.9",
+  "version": "1.74.13",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -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(
@@ -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'],
@@ -3,6 +3,65 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.143.2](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.143.1...@standardnotes/auth-server@1.143.2) (2023-09-18)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.143.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.143.0...@standardnotes/auth-server@1.143.1) (2023-09-15)
+
+### Bug Fixes
+
+* **auth:** retrieving transition status ([66ef4be](https://github.com/standardnotes/server/commit/66ef4be656561b9c3ef9fe6359d7bbef14627a1f))
+
+# [1.143.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.142.1...@standardnotes/auth-server@1.143.0) (2023-09-15)
+
+### Features
+
+* refactor transition to minimize status changes ([#828](https://github.com/standardnotes/server/issues/828)) ([36f07c6](https://github.com/standardnotes/server/commit/36f07c691afc213ecf817d6e98f885ddb19a6ed6))
+
+## [1.142.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.142.0...@standardnotes/auth-server@1.142.1) (2023-09-15)
+
+### Bug Fixes
+
+* add debug logs for updating transition status on auth ([0477507](https://github.com/standardnotes/server/commit/0477507a6a951dc2bb904711c870e2c40a0664bd))
+
+# [1.142.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.141.14...@standardnotes/auth-server@1.142.0) (2023-09-15)
+
+### Features
+
+* add skipping verified transitions ([#827](https://github.com/standardnotes/server/issues/827)) ([d4d4945](https://github.com/standardnotes/server/commit/d4d49454a68de0acdf440dc202fa14b9743905f6))
+
+## [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
@@ -10,55 +10,79 @@ 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 { TimerInterface } from '@standardnotes/time'
 import { TransitionStatusRepositoryInterface } from '../src/Domain/Transition/TransitionStatusRepositoryInterface'
+import { RoleName, TransitionStatus } from '@standardnotes/domain-core'

 const inputArgs = process.argv.slice(2)
 const startDateString = inputArgs[0]
 const endDateString = inputArgs[1]

 const requestTransition = async (
-  userRepository: UserRepositoryInterface,
  transitionStatusRepository: TransitionStatusRepositoryInterface,
+  userRepository: UserRepositoryInterface,
  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 transitionRequestedEvent = domainEventFactory.createTransitionRequestedEvent({
-      userUuid: user.uuid,
-      type: 'items',
-    })
+    const itemsTransitionStatus = await transitionStatusRepository.getStatus(user.uuid, 'items')
+    const revisionsTransitionStatus = await transitionStatusRepository.getStatus(user.uuid, 'revisions')
+
+    const userRoles = await user.roles
+
+    const userHasTransitionRole = userRoles.some((role) => role.name === RoleName.NAMES.TransitionUser)
+    const bothTransitionStatusesAreVerified =
+      itemsTransitionStatus?.value === TransitionStatus.STATUSES.Verified &&
+      revisionsTransitionStatus?.value === TransitionStatus.STATUSES.Verified
+
+    if (userHasTransitionRole && bothTransitionStatusesAreVerified) {
+      continue
+    }
+
+    if (itemsTransitionStatus?.value !== TransitionStatus.STATUSES.Verified) {
+      await transitionStatusRepository.remove(user.uuid, 'items')
+
+      await domainEventPublisher.publish(
+        domainEventFactory.createTransitionRequestedEvent({
+          userUuid: user.uuid,
+          type: 'items',
+          timestamp,
+        }),
+      )
+    }
+
+    if (revisionsTransitionStatus?.value !== TransitionStatus.STATUSES.Verified) {
+      await transitionStatusRepository.remove(user.uuid, 'revisions')
+
+      await domainEventPublisher.publish(
+        domainEventFactory.createTransitionRequestedEvent({
+          userUuid: user.uuid,
+          type: 'revisions',
+          timestamp,
+        }),
+      )
+    }

    usersTriggered += 1
-
-    await domainEventPublisher.publish(transitionRequestedEvent)
  }

  logger.info(
-    `Triggered transition for ${usersTriggered} users created between ${startDateString} and ${endDateString}`,
+    `[TRANSITION ${timestamp}] Triggered transition for ${usersTriggered} users created between ${startDateString} and ${endDateString}`,
  )
-
-  const revisionStatuses = await transitionStatusRepository.getStatuses('revisions')
-  const failedStatuses = revisionStatuses.filter((status) => status.status === 'FAILED')
-
-  logger.info(`Found ${failedStatuses.length} failed revision transitions`)
-
-  for (const status of failedStatuses) {
-    const transitionRequestedEvent = domainEventFactory.createTransitionRequestedEvent({
-      userUuid: status.userUuid,
-      type: 'revisions',
-    })
-
-    await domainEventPublisher.publish(transitionRequestedEvent)
-  }
 }

 const container = new ContainerConfigLoader('worker')
@@ -75,12 +99,20 @@ 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 transitionStatusRepository: TransitionStatusRepositoryInterface = container.get(
+  const timer = container.get<TimerInterface>(TYPES.Auth_Timer)
+  const transitionStatusRepository = container.get<TransitionStatusRepositoryInterface>(
    TYPES.Auth_TransitionStatusRepository,
  )

  Promise.resolve(
-    requestTransition(userRepository, transitionStatusRepository, logger, domainEventFactory, domainEventPublisher),
+    requestTransition(
+      transitionStatusRepository,
+      userRepository,
+      logger,
+      domainEventFactory,
+      domainEventPublisher,
+      timer,
+    ),
  )
    .then(() => {
      logger.info(`Finished transition request for users created between ${startDateString} and ${endDateString}`)
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/auth-server",
-  "version": "1.141.9",
+  "version": "1.143.2",
  "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:^",
@@ -263,7 +263,6 @@ import { RedisTransitionStatusRepository } from '../Infra/Redis/RedisTransitionS
 import { InMemoryTransitionStatusRepository } from '../Infra/InMemory/InMemoryTransitionStatusRepository'
 import { TransitionStatusUpdatedEventHandler } from '../Domain/Handler/TransitionStatusUpdatedEventHandler'
 import { UpdateTransitionStatus } from '../Domain/UseCase/UpdateTransitionStatus/UpdateTransitionStatus'
-import { GetTransitionStatus } from '../Domain/UseCase/GetTransitionStatus/GetTransitionStatus'
 import { TypeORMSharedVaultUser } from '../Infra/TypeORM/TypeORMSharedVaultUser'
 import { SharedVaultUserPersistenceMapper } from '../Mapping/SharedVaultUserPersistenceMapper'
 import { SharedVaultUserRepositoryInterface } from '../Domain/SharedVault/SharedVaultUserRepositoryInterface'
@@ -946,14 +945,6 @@ export class ContainerConfigLoader {
          container.get<winston.Logger>(TYPES.Auth_Logger),
        ),
      )
-    container
-      .bind<GetTransitionStatus>(TYPES.Auth_GetTransitionStatus)
-      .toConstantValue(
-        new GetTransitionStatus(
-          container.get<TransitionStatusRepositoryInterface>(TYPES.Auth_TransitionStatusRepository),
-          container.get<UserRepositoryInterface>(TYPES.Auth_UserRepository),
-        ),
-      )
    container
      .bind<AddSharedVaultUser>(TYPES.Auth_AddSharedVaultUser)
      .toConstantValue(
@@ -1276,7 +1267,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),
          ),
        )
@@ -159,7 +159,6 @@ const TYPES = {
  Auth_GetUserKeyParamsRecovery: Symbol.for('Auth_GetUserKeyParamsRecovery'),
  Auth_UpdateStorageQuotaUsedForUser: Symbol.for('Auth_UpdateStorageQuotaUsedForUser'),
  Auth_UpdateTransitionStatus: Symbol.for('Auth_UpdateTransitionStatus'),
-  Auth_GetTransitionStatus: Symbol.for('Auth_GetTransitionStatus'),
  Auth_AddSharedVaultUser: Symbol.for('Auth_AddSharedVaultUser'),
  Auth_RemoveSharedVaultUser: Symbol.for('Auth_RemoveSharedVaultUser'),
  // Handlers
@@ -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; type: 'items' | 'revisions' }): TransitionRequestedEvent {
+  createTransitionRequestedEvent(dto: {
+    userUuid: string
+    type: 'items' | 'revisions'
+    timestamp: number
+  }): TransitionRequestedEvent {
    return {
      type: 'TRANSITION_REQUESTED',
      createdAt: this.timer.getUTCDate(),
@@ -44,10 +48,7 @@ export class DomainEventFactory implements DomainEventFactoryInterface {
        },
        origin: DomainEventService.Auth,
      },
-      payload: {
-        timestamp: this.timer.getTimestampInMicroseconds(),
-        ...dto,
-      },
+      payload: dto,
    }
  }

@@ -90,5 +90,9 @@ export interface DomainEventFactoryInterface {
  }): StatisticPersistenceRequestedEvent
  createSessionCreatedEvent(dto: { userUuid: string }): SessionCreatedEvent
  createSessionRefreshedEvent(dto: { userUuid: string }): SessionRefreshedEvent
-  createTransitionRequestedEvent(dto: { userUuid: string; type: 'items' | 'revisions' }): TransitionRequestedEvent
+  createTransitionRequestedEvent(dto: {
+    userUuid: string
+    type: 'items' | 'revisions'
+    timestamp: number
+  }): TransitionRequestedEvent
 }
@@ -1,15 +1,7 @@
+import { TransitionStatus } from '@standardnotes/domain-core'
+
 export interface TransitionStatusRepositoryInterface {
-  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' }>>
+  updateStatus(userUuid: string, transitionType: 'items' | 'revisions', status: TransitionStatus): Promise<void>
+  getStatus(userUuid: string, transitionType: 'items' | 'revisions'): Promise<TransitionStatus | null>
+  remove(userUuid: string, transitionType: 'items' | 'revisions'): Promise<void>
 }
@@ -9,7 +9,14 @@ import { UserRepositoryInterface } from '../../User/UserRepositoryInterface'

 import { CreateCrossServiceToken } from './CreateCrossServiceToken'
 import { GetSetting } from '../GetSetting/GetSetting'
-import { Result, SharedVaultUser, SharedVaultUserPermission, Timestamps, Uuid } from '@standardnotes/domain-core'
+import {
+  Result,
+  SharedVaultUser,
+  SharedVaultUserPermission,
+  Timestamps,
+  TransitionStatus,
+  Uuid,
+} from '@standardnotes/domain-core'
 import { TransitionStatusRepositoryInterface } from '../../Transition/TransitionStatusRepositoryInterface'
 import { SharedVaultUserRepositoryInterface } from '../../SharedVault/SharedVaultUserRepositoryInterface'

@@ -72,7 +79,9 @@ describe('CreateCrossServiceToken', () => {
    getSettingUseCase.execute = jest.fn().mockReturnValue(Result.ok({ setting: { value: '100' } }))

    transitionStatusRepository = {} as jest.Mocked<TransitionStatusRepositoryInterface>
-    transitionStatusRepository.getStatus = jest.fn().mockReturnValue('TO-DO')
+    transitionStatusRepository.getStatus = jest
+      .fn()
+      .mockReturnValue(TransitionStatus.create(TransitionStatus.STATUSES.Verified).getValue())

    sharedVaultUserRepository = {} as jest.Mocked<SharedVaultUserRepositoryInterface>
    sharedVaultUserRepository.findByUserUuid = jest.fn().mockReturnValue([
@@ -120,7 +129,9 @@ describe('CreateCrossServiceToken', () => {
  })

  it('should create a cross service token for user that has an ongoing transaction', async () => {
-    transitionStatusRepository.getStatus = jest.fn().mockReturnValue('IN_PROGRESS')
+    transitionStatusRepository.getStatus = jest
+      .fn()
+      .mockReturnValue(TransitionStatus.create(TransitionStatus.STATUSES.InProgress).getValue())

    await createUseCase().execute({
      user,
@@ -1,6 +1,6 @@
 import { TokenEncoderInterface, CrossServiceTokenData } from '@standardnotes/security'
 import { inject, injectable } from 'inversify'
-import { Result, UseCaseInterface, Uuid } from '@standardnotes/domain-core'
+import { Result, TransitionStatus, UseCaseInterface, Uuid } from '@standardnotes/domain-core'

 import TYPES from '../../../Bootstrap/Types'
 import { ProjectorInterface } from '../../../Projection/ProjectorInterface'
@@ -60,9 +60,8 @@ export class CreateCrossServiceToken implements UseCaseInterface<string> {
      user: this.projectUser(user),
      roles: this.projectRoles(roles),
      shared_vault_owner_context: undefined,
-      ongoing_transition: transitionStatus === 'IN_PROGRESS',
-      ongoing_revisions_transition:
-        revisionsTransitionStatus === 'STARTED' || revisionsTransitionStatus === 'IN_PROGRESS',
+      ongoing_transition: transitionStatus?.value === TransitionStatus.STATUSES.InProgress,
+      ongoing_revisions_transition: revisionsTransitionStatus?.value === TransitionStatus.STATUSES.InProgress,
      belongs_to_shared_vaults: sharedVaultAssociations.map((association) => ({
        shared_vault_uuid: association.props.sharedVaultUuid.value,
        permission: association.props.permission.value,
@@ -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',
@@ -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,
@@ -1,114 +0,0 @@
-import { RoleName } from '@standardnotes/domain-core'
-import { Role } from '../../Role/Role'
-import { TransitionStatusRepositoryInterface } from '../../Transition/TransitionStatusRepositoryInterface'
-import { User } from '../../User/User'
-import { UserRepositoryInterface } from '../../User/UserRepositoryInterface'
-import { GetTransitionStatus } from './GetTransitionStatus'
-
-describe('GetTransitionStatus', () => {
-  let transitionStatusRepository: TransitionStatusRepositoryInterface
-  let userRepository: UserRepositoryInterface
-  let user: User
-  let role: Role
-
-  const createUseCase = () => new GetTransitionStatus(transitionStatusRepository, userRepository)
-
-  beforeEach(() => {
-    transitionStatusRepository = {} as jest.Mocked<TransitionStatusRepositoryInterface>
-    transitionStatusRepository.getStatus = jest.fn().mockReturnValue(null)
-
-    role = {} as jest.Mocked<Role>
-    role.name = RoleName.NAMES.CoreUser
-
-    user = {
-      uuid: '00000000-0000-0000-0000-000000000000',
-      email: 'test@test.te',
-    } as jest.Mocked<User>
-    user.roles = Promise.resolve([role])
-
-    userRepository = {} as jest.Mocked<UserRepositoryInterface>
-    userRepository.findOneByUuid = jest.fn().mockReturnValue(user)
-  })
-
-  it('returns transition status FINISHED', async () => {
-    role.name = RoleName.NAMES.TransitionUser
-    user.roles = Promise.resolve([role])
-    userRepository.findOneByUuid = jest.fn().mockReturnValue(user)
-
-    const useCase = createUseCase()
-
-    const result = await useCase.execute({
-      userUuid: '00000000-0000-0000-0000-000000000000',
-      transitionType: 'items',
-    })
-
-    expect(result.isFailed()).toBeFalsy()
-    expect(result.getValue()).toEqual('FINISHED')
-  })
-
-  it('returns transition status STARTED', async () => {
-    const useCase = createUseCase()
-
-    transitionStatusRepository.getStatus = jest.fn().mockReturnValue('STARTED')
-
-    const result = await useCase.execute({
-      userUuid: '00000000-0000-0000-0000-000000000000',
-      transitionType: 'items',
-    })
-
-    expect(result.isFailed()).toBeFalsy()
-    expect(result.getValue()).toEqual('STARTED')
-  })
-
-  it('returns transition status TO-DO', async () => {
-    const useCase = createUseCase()
-
-    const result = await useCase.execute({
-      userUuid: '00000000-0000-0000-0000-000000000000',
-      transitionType: 'items',
-    })
-
-    expect(result.isFailed()).toBeFalsy()
-    expect(result.getValue()).toEqual('TO-DO')
-  })
-
-  it('returns transition status FAILED', async () => {
-    const useCase = createUseCase()
-
-    transitionStatusRepository.getStatus = jest.fn().mockReturnValue('FAILED')
-
-    const result = await useCase.execute({
-      userUuid: '00000000-0000-0000-0000-000000000000',
-      transitionType: 'items',
-    })
-
-    expect(result.isFailed()).toBeFalsy()
-    expect(result.getValue()).toEqual('FAILED')
-  })
-
-  it('return error if user uuid is invalid', async () => {
-    const useCase = createUseCase()
-
-    const result = await useCase.execute({
-      userUuid: 'invalid',
-      transitionType: 'items',
-    })
-
-    expect(result.isFailed()).toBeTruthy()
-    expect(result.getError()).toEqual('Given value is not a valid uuid: invalid')
-  })
-
-  it('return error if user not found', async () => {
-    const useCase = createUseCase()
-
-    userRepository.findOneByUuid = jest.fn().mockReturnValue(null)
-
-    const result = await useCase.execute({
-      userUuid: '00000000-0000-0000-0000-000000000000',
-      transitionType: 'items',
-    })
-
-    expect(result.isFailed()).toBeTruthy()
-    expect(result.getError()).toEqual('User not found.')
-  })
-})
@@ -1,43 +0,0 @@
-import { Result, RoleName, UseCaseInterface, Uuid } from '@standardnotes/domain-core'
-
-import { GetTransitionStatusDTO } from './GetTransitionStatusDTO'
-import { UserRepositoryInterface } from '../../User/UserRepositoryInterface'
-import { TransitionStatusRepositoryInterface } from '../../Transition/TransitionStatusRepositoryInterface'
-
-export class GetTransitionStatus
-  implements UseCaseInterface<'TO-DO' | 'STARTED' | 'IN_PROGRESS' | 'FINISHED' | 'FAILED'>
-{
-  constructor(
-    private transitionStatusRepository: TransitionStatusRepositoryInterface,
-    private userRepository: UserRepositoryInterface,
-  ) {}
-
-  async execute(
-    dto: GetTransitionStatusDTO,
-  ): Promise<Result<'TO-DO' | 'STARTED' | 'IN_PROGRESS' | 'FINISHED' | 'FAILED'>> {
-    const userUuidOrError = Uuid.create(dto.userUuid)
-    if (userUuidOrError.isFailed()) {
-      return Result.fail(userUuidOrError.getError())
-    }
-    const userUuid = userUuidOrError.getValue()
-
-    const user = await this.userRepository.findOneByUuid(userUuid)
-    if (user === null) {
-      return Result.fail('User not found.')
-    }
-
-    const roles = await user.roles
-    for (const role of roles) {
-      if (role.name === RoleName.NAMES.TransitionUser) {
-        return Result.ok('FINISHED')
-      }
-    }
-
-    const transitionStatus = await this.transitionStatusRepository.getStatus(userUuid.value, dto.transitionType)
-    if (transitionStatus === null) {
-      return Result.ok('TO-DO')
-    }
-
-    return Result.ok(transitionStatus)
-  }
-}
@@ -1,4 +0,0 @@
-export interface GetTransitionStatusDTO {
-  userUuid: string
-  transitionType: 'items' | 'revisions'
-}
@@ -1,4 +1,4 @@
-import { RoleName, Uuid } from '@standardnotes/domain-core'
+import { RoleName, TransitionStatus, Uuid } from '@standardnotes/domain-core'

 import { RoleServiceInterface } from '../../Role/RoleServiceInterface'
 import { TransitionStatusRepositoryInterface } from '../../Transition/TransitionStatusRepositoryInterface'
@@ -17,82 +17,42 @@ describe('UpdateTransitionStatus', () => {
    logger.info = jest.fn()

    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',
-      },
-    ])
+    transitionStatusRepository.getStatus = jest.fn().mockResolvedValue(null)

    roleService = {} as jest.Mocked<RoleServiceInterface>
    roleService.addRoleToUser = jest.fn()
  })

-  it('should remove transition status and add TransitionUser role', async () => {
+  it('should add TRANSITION_USER role', async () => {
    const useCase = createUseCase()

    const result = await useCase.execute({
      userUuid: '00000000-0000-0000-0000-000000000000',
-      status: 'FINISHED',
+      status: 'VERIFIED',
      transitionType: 'items',
      transitionTimestamp: 123,
    })

    expect(result.isFailed()).toBeFalsy()
-    expect(transitionStatusRepository.removeStatus).toHaveBeenCalledWith(
-      '00000000-0000-0000-0000-000000000000',
-      'items',
-    )
    expect(roleService.addRoleToUser).toHaveBeenCalledWith(
      Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
      RoleName.create(RoleName.NAMES.TransitionUser).getValue(),
    )
  })

-  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()

    const result = await useCase.execute({
      userUuid: '00000000-0000-0000-0000-000000000000',
-      status: 'STARTED',
+      status: TransitionStatus.STATUSES.InProgress,
      transitionType: 'items',
      transitionTimestamp: 123,
    })

    expect(result.isFailed()).toBeFalsy()
-    expect(transitionStatusRepository.updateStatus).toHaveBeenCalledWith(
-      '00000000-0000-0000-0000-000000000000',
-      'items',
-      'STARTED',
-    )
+    expect(transitionStatusRepository.updateStatus).toHaveBeenCalled()
  })

  it('should return error when user uuid is invalid', async () => {
@@ -108,4 +68,40 @@ describe('UpdateTransitionStatus', () => {
    expect(result.isFailed()).toBeTruthy()
    expect(result.getError()).toEqual('Given value is not a valid uuid: invalid')
  })
+
+  it('should not update status if transition is already verified', async () => {
+    transitionStatusRepository.getStatus = jest
+      .fn()
+      .mockResolvedValue(TransitionStatus.create(TransitionStatus.STATUSES.Verified).getValue())
+
+    const useCase = createUseCase()
+
+    const result = await useCase.execute({
+      userUuid: '00000000-0000-0000-0000-000000000000',
+      status: TransitionStatus.STATUSES.InProgress,
+      transitionType: 'items',
+      transitionTimestamp: 123,
+    })
+
+    expect(result.isFailed()).toBeFalsy()
+    expect(transitionStatusRepository.updateStatus).not.toHaveBeenCalled()
+  })
+
+  it('should not update status if transition is already failed', async () => {
+    transitionStatusRepository.getStatus = jest
+      .fn()
+      .mockResolvedValue(TransitionStatus.create(TransitionStatus.STATUSES.Failed).getValue())
+
+    const useCase = createUseCase()
+
+    const result = await useCase.execute({
+      userUuid: '00000000-0000-0000-0000-000000000000',
+      status: TransitionStatus.STATUSES.InProgress,
+      transitionType: 'items',
+      transitionTimestamp: 123,
+    })
+
+    expect(result.isFailed()).toBeFalsy()
+    expect(transitionStatusRepository.updateStatus).not.toHaveBeenCalled()
+  })
 })
@@ -1,4 +1,4 @@
-import { Result, RoleName, UseCaseInterface, Uuid } from '@standardnotes/domain-core'
+import { Result, RoleName, TransitionStatus, UseCaseInterface, Uuid } from '@standardnotes/domain-core'
 import { TransitionStatusRepositoryInterface } from '../../Transition/TransitionStatusRepositoryInterface'
 import { UpdateTransitionStatusDTO } from './UpdateTransitionStatusDTO'
 import { RoleServiceInterface } from '../../Role/RoleServiceInterface'
@@ -18,36 +18,23 @@ export class UpdateTransitionStatus implements UseCaseInterface<void> {
    }
    const userUuid = userUuidOrError.getValue()

-    if (dto.status !== 'FINISHED') {
-      await this.transitionStatusRepository.updateStatus(dto.userUuid, dto.transitionType, dto.status)
+    const currentStatus = await this.transitionStatusRepository.getStatus(dto.userUuid, dto.transitionType)
+    if (
+      [TransitionStatus.STATUSES.Verified, TransitionStatus.STATUSES.Failed].includes(currentStatus?.value as string)
+    ) {
+      this.logger.info(`User ${dto.userUuid} transition already finished.`)

      return Result.ok()
    }

-    await this.transitionStatusRepository.removeStatus(dto.userUuid, dto.transitionType)
+    const transitionStatus = TransitionStatus.create(dto.status).getValue()

-    if (dto.transitionType === 'items') {
+    await this.transitionStatusRepository.updateStatus(dto.userUuid, dto.transitionType, transitionStatus)
+
+    if (dto.transitionType === 'items' && transitionStatus.value === TransitionStatus.STATUSES.Verified) {
      await this.roleService.addRoleToUser(userUuid, RoleName.create(RoleName.NAMES.TransitionUser).getValue())
    }

-    const itemStatuses = await this.transitionStatusRepository.getStatuses('items')
-    const itemsStartedStatusesCount = itemStatuses.filter((status) => status.status === 'STARTED').length
-    const itemsInProgressStatusesCount = itemStatuses.filter((status) => status.status === 'IN_PROGRESS').length
-    const itemsFailedStatusesCount = itemStatuses.filter((status) => status.status === 'FAILED').length
-
-    this.logger.info(
-      `[TRANSITION ${dto.transitionTimestamp}] Items transition statuses: ${itemsStartedStatusesCount} started, ${itemsInProgressStatusesCount} in progress, ${itemsFailedStatusesCount} failed`,
-    )
-
-    const revisionStatuses = await this.transitionStatusRepository.getStatuses('revisions')
-    const revisionsStartedStatusesCount = revisionStatuses.filter((status) => status.status === 'STARTED').length
-    const revisionsInProgressStatusesCount = revisionStatuses.filter((status) => status.status === 'IN_PROGRESS').length
-    const revisionsFailedStatusesCount = revisionStatuses.filter((status) => status.status === 'FAILED').length
-
-    this.logger.info(
-      `[TRANSITION ${dto.transitionTimestamp}] Revisions transition statuses: ${revisionsStartedStatusesCount} started, ${revisionsInProgressStatusesCount} in progress, ${revisionsFailedStatusesCount} failed`,
-    )
-
    return Result.ok()
  }
 }
@@ -2,5 +2,5 @@ export interface UpdateTransitionStatusDTO {
  userUuid: string
  transitionType: 'items' | 'revisions'
  transitionTimestamp: number
-  status: 'STARTED' | 'IN_PROGRESS' | 'FINISHED' | 'FAILED'
+  status: string
 }
@@ -1,40 +1,19 @@
+import { TransitionStatus } from '@standardnotes/domain-core'
 import { TransitionStatusRepositoryInterface } from '../../Domain/Transition/TransitionStatusRepositoryInterface'

 export class InMemoryTransitionStatusRepository implements TransitionStatusRepositoryInterface {
-  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' }[] = []
+  private itemStatuses: Map<string, string> = new Map()
+  private revisionStatuses: Map<string, string> = new Map()

+  async updateStatus(userUuid: string, transitionType: 'items' | 'revisions', status: TransitionStatus): Promise<void> {
    if (transitionType === 'items') {
-      for (const [userUuid, status] of this.itemStatuses) {
-        statuses.push({ userUuid, status })
-      }
+      this.itemStatuses.set(userUuid, status.value)
    } else {
-      for (const [userUuid, status] of this.revisionStatuses) {
-        statuses.push({ userUuid, status })
-      }
-    }
-
-    return statuses
-  }
-
-  async updateStatus(
-    userUuid: string,
-    transitionType: 'items' | 'revisions',
-    status: 'STARTED' | 'FAILED',
-  ): Promise<void> {
-    if (transitionType === 'items') {
-      this.itemStatuses.set(userUuid, status)
-    } else {
-      this.revisionStatuses.set(userUuid, status)
+      this.revisionStatuses.set(userUuid, status.value)
    }
  }

-  async removeStatus(userUuid: string, transitionType: 'items' | 'revisions'): Promise<void> {
+  async remove(userUuid: string, transitionType: 'items' | 'revisions'): Promise<void> {
    if (transitionType === 'items') {
      this.itemStatuses.delete(userUuid)
    } else {
@@ -42,8 +21,8 @@ export class InMemoryTransitionStatusRepository implements TransitionStatusRepos
    }
  }

-  async getStatus(userUuid: string, transitionType: 'items' | 'revisions'): Promise<'STARTED' | 'FAILED' | null> {
-    let status: 'STARTED' | 'FAILED' | null = null
+  async getStatus(userUuid: string, transitionType: 'items' | 'revisions'): Promise<TransitionStatus | null> {
+    let status: string | null

    if (transitionType === 'items') {
      status = this.itemStatuses.get(userUuid) ?? null
@@ -51,6 +30,10 @@ export class InMemoryTransitionStatusRepository implements TransitionStatusRepos
      status = this.revisionStatuses.get(userUuid) ?? null
    }

-    return status
+    if (status === null) {
+      return null
+    }
+
+    return TransitionStatus.create(status).getValue()
  }
 }
@@ -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: {},
@@ -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)
@@ -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(
@@ -1,53 +1,43 @@
 import * as IORedis from 'ioredis'

 import { TransitionStatusRepositoryInterface } from '../../Domain/Transition/TransitionStatusRepositoryInterface'
+import { TransitionStatus } from '@standardnotes/domain-core'

 export class RedisTransitionStatusRepository implements TransitionStatusRepositoryInterface {
  private readonly PREFIX = 'transition'

  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' | 'IN_PROGRESS' | 'FAILED',
-  ): Promise<void> {
-    if (status === 'IN_PROGRESS') {
-      await this.redisClient.setex(`${this.PREFIX}:${transitionType}:${userUuid}`, 7200, status)
-    } else {
-      await this.redisClient.set(`${this.PREFIX}:${transitionType}:${userUuid}`, status)
-    }
-  }
-
-  async removeStatus(userUuid: string, transitionType: 'items' | 'revisions'): Promise<void> {
+  async remove(userUuid: string, transitionType: 'items' | 'revisions'): Promise<void> {
    await this.redisClient.del(`${this.PREFIX}:${transitionType}:${userUuid}`)
  }

-  async getStatus(
-    userUuid: string,
-    transitionType: 'items' | 'revisions',
-  ): Promise<'STARTED' | 'IN_PROGRESS' | 'FAILED' | null> {
-    const status = (await this.redisClient.get(`${this.PREFIX}:${transitionType}:${userUuid}`)) as
-      | 'STARTED'
-      | 'IN_PROGRESS'
-      | 'FAILED'
-      | null
+  async updateStatus(userUuid: string, transitionType: 'items' | 'revisions', status: TransitionStatus): Promise<void> {
+    switch (status.value) {
+      case TransitionStatus.STATUSES.Failed:
+      case TransitionStatus.STATUSES.Verified:
+        await this.redisClient.set(`${this.PREFIX}:${transitionType}:${userUuid}`, status.value)
+        break
+      case TransitionStatus.STATUSES.InProgress: {
+        const ttl2Hourse = 7_200
+        await this.redisClient.setex(`${this.PREFIX}:${transitionType}:${userUuid}`, ttl2Hourse, status.value)
+        break
+      }
+    }
+  }

-    return status
+  async getStatus(userUuid: string, transitionType: 'items' | 'revisions'): Promise<TransitionStatus | null> {
+    const status = await this.redisClient.get(`${this.PREFIX}:${transitionType}:${userUuid}`)
+
+    if (status === null) {
+      return null
+    }
+
+    const transitionStatusOrError = TransitionStatus.create(status)
+    if (transitionStatusOrError.isFailed()) {
+      return null
+    }
+
+    return transitionStatusOrError.getValue()
  }
 }
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+# [1.30.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-core@1.29.0...@standardnotes/domain-core@1.30.0) (2023-09-18)
+
+### Features
+
+* add publishing notifications for users when a user is added to vault ([#834](https://github.com/standardnotes/server/issues/834)) ([547a79e](https://github.com/standardnotes/server/commit/547a79e23174dab0a756e4e5bee218e4859b3b42))
+
+# [1.29.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-core@1.28.1...@standardnotes/domain-core@1.29.0) (2023-09-15)
+
+### Features
+
+* refactor transition to minimize status changes ([#828](https://github.com/standardnotes/server/issues/828)) ([36f07c6](https://github.com/standardnotes/server/commit/36f07c691afc213ecf817d6e98f885ddb19a6ed6))
+
 ## [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
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/domain-core",
-  "version": "1.28.1",
+  "version": "1.30.0",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -6,6 +6,7 @@ export class NotificationType extends ValueObject<NotificationTypeProps> {
  static readonly TYPES = {
    SharedVaultItemRemoved: 'shared_vault_item_removed',
    RemovedFromSharedVault: 'removed_from_shared_vault',
+    UserAddedToSharedVault: 'user_added_to_shared_vault',
    SharedVaultFileUploaded: 'shared_vault_file_uploaded',
    SharedVaultFileRemoved: 'shared_vault_file_removed',
  }
@@ -0,0 +1,28 @@
+import { Result } from '../Core/Result'
+import { ValueObject } from '../Core/ValueObject'
+import { TransitionStatusProps } from './TransitionStatusProps'
+
+export class TransitionStatus extends ValueObject<TransitionStatusProps> {
+  static readonly STATUSES = {
+    InProgress: 'IN_PROGRESS',
+    Failed: 'FAILED',
+    Verified: 'VERIFIED',
+  }
+
+  get value(): string {
+    return this.props.value
+  }
+
+  private constructor(props: TransitionStatusProps) {
+    super(props)
+  }
+
+  static create(name: string): Result<TransitionStatus> {
+    const isValidName = Object.values(this.STATUSES).includes(name)
+    if (!isValidName) {
+      return Result.fail<TransitionStatus>('Invalid transition status name.')
+    } else {
+      return Result.ok<TransitionStatus>(new TransitionStatus({ value: name }))
+    }
+  }
+}
@@ -0,0 +1,3 @@
+export interface TransitionStatusProps {
+  value: string
+}
@@ -67,5 +67,8 @@ export * from './SharedVault/SharedVaultUserProps'
 export * from './Subscription/SubscriptionPlanName'
 export * from './Subscription/SubscriptionPlanNameProps'

+export * from './Transition/TransitionStatus'
+export * from './Transition/TransitionStatusProps'
+
 export * from './UseCase/SyncUseCaseInterface'
 export * from './UseCase/UseCaseInterface'
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.12.30](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.12.29...@standardnotes/domain-events-infra@1.12.30) (2023-09-15)
+
+**Note:** Version bump only for package @standardnotes/domain-events-infra
+
+## [1.12.29](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.12.28...@standardnotes/domain-events-infra@1.12.29) (2023-09-15)
+
+**Note:** Version bump only for package @standardnotes/domain-events-infra
+
 ## [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,6 +1,6 @@
 {
  "name": "@standardnotes/domain-events-infra",
-  "version": "1.12.28",
+  "version": "1.12.30",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+# [2.127.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.126.0...@standardnotes/domain-events@2.127.0) (2023-09-15)
+
+### Features
+
+* refactor transition to minimize status changes ([#828](https://github.com/standardnotes/server/issues/828)) ([36f07c6](https://github.com/standardnotes/server/commit/36f07c691afc213ecf817d6e98f885ddb19a6ed6))
+
+# [2.126.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.125.4...@standardnotes/domain-events@2.126.0) (2023-09-15)
+
+### Features
+
+* add skipping verified transitions ([#827](https://github.com/standardnotes/server/issues/827)) ([d4d4945](https://github.com/standardnotes/server/commit/d4d49454a68de0acdf440dc202fa14b9743905f6))
+
 ## [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
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/domain-events",
-  "version": "2.125.4",
+  "version": "2.127.0",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -2,5 +2,5 @@ export interface TransitionStatusUpdatedEventPayload {
  userUuid: string
  transitionType: 'items' | 'revisions'
  transitionTimestamp: number
-  status: 'STARTED' | 'IN_PROGRESS' | 'FINISHED' | 'FAILED'
+  status: string
 }
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.11.43](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.11.42...@standardnotes/event-store@1.11.43) (2023-09-18)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
+## [1.11.42](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.11.41...@standardnotes/event-store@1.11.42) (2023-09-15)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
+## [1.11.41](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.11.40...@standardnotes/event-store@1.11.41) (2023-09-15)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
 ## [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,6 +1,6 @@
 {
  "name": "@standardnotes/event-store",
-  "version": "1.11.40",
+  "version": "1.11.43",
  "description": "Event Store Service",
  "private": true,
  "main": "dist/src/index.js",
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.22.22](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.22.21...@standardnotes/files-server@1.22.22) (2023-09-18)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
+## [1.22.21](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.22.20...@standardnotes/files-server@1.22.21) (2023-09-15)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
+## [1.22.20](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.22.19...@standardnotes/files-server@1.22.20) (2023-09-15)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
 ## [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,6 +1,6 @@
 {
  "name": "@standardnotes/files-server",
-  "version": "1.22.19",
+  "version": "1.22.22",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -3,6 +3,50 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.15.60](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.59...@standardnotes/home-server@1.15.60) (2023-09-18)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.15.59](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.58...@standardnotes/home-server@1.15.59) (2023-09-15)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.15.58](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.57...@standardnotes/home-server@1.15.58) (2023-09-15)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.15.57](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.56...@standardnotes/home-server@1.15.57) (2023-09-15)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.15.56](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.55...@standardnotes/home-server@1.15.56) (2023-09-15)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [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,6 +1,6 @@
 {
  "name": "@standardnotes/home-server",
-  "version": "1.15.49",
+  "version": "1.15.60",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -3,6 +3,46 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.35.1](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.35.0...@standardnotes/revisions-server@1.35.1) (2023-09-18)
+
+**Note:** Version bump only for package @standardnotes/revisions-server
+
+# [1.35.0](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.34.1...@standardnotes/revisions-server@1.35.0) (2023-09-15)
+
+### Features
+
+* refactor transition to minimize status changes ([#828](https://github.com/standardnotes/server/issues/828)) ([36f07c6](https://github.com/standardnotes/server/commit/36f07c691afc213ecf817d6e98f885ddb19a6ed6))
+
+## [1.34.1](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.34.0...@standardnotes/revisions-server@1.34.1) (2023-09-15)
+
+### Bug Fixes
+
+* add debug logs for transition status updates ([3e7856c](https://github.com/standardnotes/server/commit/3e7856c895e73b775c8977c6c6e86dffd5755c00))
+
+# [1.34.0](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.33.21...@standardnotes/revisions-server@1.34.0) (2023-09-15)
+
+### Features
+
+* add skipping verified transitions ([#827](https://github.com/standardnotes/server/issues/827)) ([d4d4945](https://github.com/standardnotes/server/commit/d4d49454a68de0acdf440dc202fa14b9743905f6))
+
+## [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
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/revisions-server",
-  "version": "1.33.18",
+  "version": "1.35.1",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -60,8 +60,6 @@ import { RevisionHttpRepresentation } from '../Mapping/Http/RevisionHttpRepresen
 import { TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser } from '../Domain/UseCase/Transition/TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser/TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser'
 import { DomainEventFactoryInterface } from '../Domain/Event/DomainEventFactoryInterface'
 import { DomainEventFactory } from '../Domain/Event/DomainEventFactory'
-import { TransitionStatusUpdatedEventHandler } from '../Domain/Handler/TransitionStatusUpdatedEventHandler'
-import { TriggerTransitionFromPrimaryToSecondaryDatabaseForUser } from '../Domain/UseCase/Transition/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser'
 import { SQLRevision } from '../Infra/TypeORM/SQL/SQLRevision'
 import { SQLRevisionRepository } from '../Infra/TypeORM/SQL/SQLRevisionRepository'
 import { SQLRevisionMetadataPersistenceMapper } from '../Mapping/Persistence/SQL/SQLRevisionMetadataPersistenceMapper'
@@ -354,16 +352,6 @@ export class ContainerConfigLoader {
          env.get('MIGRATION_BATCH_SIZE', true) ? +env.get('MIGRATION_BATCH_SIZE', true) : 100,
        ),
      )
-    container
-      .bind<TriggerTransitionFromPrimaryToSecondaryDatabaseForUser>(
-        TYPES.Revisions_TriggerTransitionFromPrimaryToSecondaryDatabaseForUser,
-      )
-      .toConstantValue(
-        new TriggerTransitionFromPrimaryToSecondaryDatabaseForUser(
-          container.get<DomainEventPublisherInterface>(TYPES.Revisions_DomainEventPublisher),
-          container.get<DomainEventFactoryInterface>(TYPES.Revisions_DomainEventFactory),
-        ),
-      )
    container
      .bind<RemoveRevisionsFromSharedVault>(TYPES.Revisions_RemoveRevisionsFromSharedVault)
      .toConstantValue(
@@ -439,19 +427,6 @@ export class ContainerConfigLoader {
          container.get<winston.Logger>(TYPES.Revisions_Logger),
        ),
      )
-    container
-      .bind<TransitionStatusUpdatedEventHandler>(TYPES.Revisions_TransitionStatusUpdatedEventHandler)
-      .toConstantValue(
-        new TransitionStatusUpdatedEventHandler(
-          container.get<RevisionRepositoryInterface>(TYPES.Revisions_SQLRevisionRepository),
-          container.get<TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser>(
-            TYPES.Revisions_TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser,
-          ),
-          container.get<DomainEventPublisherInterface>(TYPES.Revisions_DomainEventPublisher),
-          container.get<DomainEventFactoryInterface>(TYPES.Revisions_DomainEventFactory),
-          container.get<winston.Logger>(TYPES.Revisions_Logger),
-        ),
-      )
    container
      .bind<ItemRemovedFromSharedVaultEventHandler>(TYPES.Revisions_ItemRemovedFromSharedVaultEventHandler)
      .toConstantValue(
@@ -464,9 +439,12 @@ export class ContainerConfigLoader {
      .bind<TransitionRequestedEventHandler>(TYPES.Revisions_TransitionRequestedEventHandler)
      .toConstantValue(
        new TransitionRequestedEventHandler(
-          container.get<TriggerTransitionFromPrimaryToSecondaryDatabaseForUser>(
-            TYPES.Revisions_TriggerTransitionFromPrimaryToSecondaryDatabaseForUser,
+          container.get<TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser>(
+            TYPES.Revisions_TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser,
          ),
+          container.get<RevisionRepositoryInterface>(TYPES.Revisions_SQLRevisionRepository),
+          container.get<DomainEventPublisherInterface>(TYPES.Revisions_DomainEventPublisher),
+          container.get<DomainEventFactoryInterface>(TYPES.Revisions_DomainEventFactory),
          container.get<winston.Logger>(TYPES.Revisions_Logger),
        ),
      )
@@ -475,7 +453,6 @@ export class ContainerConfigLoader {
      ['ITEM_DUMPED', container.get(TYPES.Revisions_ItemDumpedEventHandler)],
      ['ACCOUNT_DELETION_REQUESTED', container.get(TYPES.Revisions_AccountDeletionRequestedEventHandler)],
      ['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)],
    ])
@@ -520,9 +497,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),
          ),
        )
@@ -46,9 +46,6 @@ const TYPES = {
  Revisions_TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser: Symbol.for(
    'Revisions_TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser',
  ),
-  Revisions_TriggerTransitionFromPrimaryToSecondaryDatabaseForUser: Symbol.for(
-    'Revisions_TriggerTransitionFromPrimaryToSecondaryDatabaseForUser',
-  ),
  Revisions_RemoveRevisionsFromSharedVault: Symbol.for('Revisions_RemoveRevisionsFromSharedVault'),
  // Controller
  Revisions_ControllerContainer: Symbol.for('Revisions_ControllerContainer'),
@@ -58,7 +55,6 @@ const TYPES = {
  Revisions_ItemDumpedEventHandler: Symbol.for('Revisions_ItemDumpedEventHandler'),
  Revisions_AccountDeletionRequestedEventHandler: Symbol.for('Revisions_AccountDeletionRequestedEventHandler'),
  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
@@ -9,7 +9,8 @@ export class DomainEventFactory implements DomainEventFactoryInterface {
  createTransitionStatusUpdatedEvent(dto: {
    userUuid: string
    transitionType: 'items' | 'revisions'
-    status: 'STARTED' | 'FAILED' | 'FINISHED'
+    transitionTimestamp: number
+    status: string
  }): TransitionStatusUpdatedEvent {
    return {
      type: 'TRANSITION_STATUS_UPDATED',
@@ -19,12 +20,9 @@ export class DomainEventFactory implements DomainEventFactoryInterface {
          userIdentifier: dto.userUuid,
          userIdentifierType: 'uuid',
        },
-        origin: DomainEventService.SyncingServer,
-      },
-      payload: {
-        transitionTimestamp: this.timer.getTimestampInMicroseconds(),
-        ...dto,
+        origin: DomainEventService.Revisions,
      },
+      payload: dto,
    }
  }
 }
@@ -4,6 +4,7 @@ export interface DomainEventFactoryInterface {
  createTransitionStatusUpdatedEvent(dto: {
    userUuid: string
    transitionType: 'items' | 'revisions'
-    status: 'STARTED' | 'IN_PROGRESS' | 'FAILED' | 'FINISHED'
+    transitionTimestamp: number
+    status: string
  }): TransitionStatusUpdatedEvent
 }
@@ -1,11 +1,20 @@
-import { DomainEventHandlerInterface, TransitionRequestedEvent } from '@standardnotes/domain-events'
+import {
+  DomainEventHandlerInterface,
+  DomainEventPublisherInterface,
+  TransitionRequestedEvent,
+} from '@standardnotes/domain-events'
 import { Logger } from 'winston'
-
-import { TriggerTransitionFromPrimaryToSecondaryDatabaseForUser } from '../UseCase/Transition/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser'
+import { TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser } from '../UseCase/Transition/TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser/TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser'
+import { DomainEventFactoryInterface } from '../Event/DomainEventFactoryInterface'
+import { RevisionRepositoryInterface } from '../Revision/RevisionRepositoryInterface'
+import { TransitionStatus, Uuid } from '@standardnotes/domain-core'

 export class TransitionRequestedEventHandler implements DomainEventHandlerInterface {
  constructor(
-    private triggerTransitionFromPrimaryToSecondaryDatabaseForUser: TriggerTransitionFromPrimaryToSecondaryDatabaseForUser,
+    private transitionRevisionsFromPrimaryToSecondaryDatabaseForUser: TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser,
+    private primaryRevisionsRepository: RevisionRepositoryInterface,
+    private domainEventPublisher: DomainEventPublisherInterface,
+    private domainEventFactory: DomainEventFactoryInterface,
    private logger: Logger,
  ) {}

@@ -14,14 +23,96 @@ export class TransitionRequestedEventHandler implements DomainEventHandlerInterf
      return
    }

+    const userUuid = await this.getUserUuidFromEvent(event)
+    if (!userUuid) {
+      return
+    }
+
+    if (await this.isAlreadyMigrated(userUuid)) {
+      this.logger.info(`User ${event.payload.userUuid} already migrated.`)
+
+      await this.domainEventPublisher.publish(
+        this.domainEventFactory.createTransitionStatusUpdatedEvent({
+          userUuid: event.payload.userUuid,
+          status: TransitionStatus.STATUSES.Verified,
+          transitionType: 'revisions',
+          transitionTimestamp: event.payload.timestamp,
+        }),
+      )
+
+      return
+    }
+
    this.logger.info(`Handling transition requested event for user ${event.payload.userUuid}`)

-    const result = await this.triggerTransitionFromPrimaryToSecondaryDatabaseForUser.execute({
+    await this.domainEventPublisher.publish(
+      this.domainEventFactory.createTransitionStatusUpdatedEvent({
+        userUuid: event.payload.userUuid,
+        status: TransitionStatus.STATUSES.InProgress,
+        transitionType: 'revisions',
+        transitionTimestamp: event.payload.timestamp,
+      }),
+    )
+
+    const result = await this.transitionRevisionsFromPrimaryToSecondaryDatabaseForUser.execute({
      userUuid: event.payload.userUuid,
    })

    if (result.isFailed()) {
-      this.logger.error(`Failed to trigger transition for user ${event.payload.userUuid}`)
+      this.logger.error(`Failed to transition for user ${event.payload.userUuid}`)
+
+      await this.domainEventPublisher.publish(
+        this.domainEventFactory.createTransitionStatusUpdatedEvent({
+          userUuid: event.payload.userUuid,
+          status: TransitionStatus.STATUSES.Failed,
+          transitionType: 'revisions',
+          transitionTimestamp: event.payload.timestamp,
+        }),
+      )
+
+      return
    }
+
+    await this.domainEventPublisher.publish(
+      this.domainEventFactory.createTransitionStatusUpdatedEvent({
+        userUuid: event.payload.userUuid,
+        status: TransitionStatus.STATUSES.Verified,
+        transitionType: 'revisions',
+        transitionTimestamp: event.payload.timestamp,
+      }),
+    )
+  }
+
+  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
+  }
+
+  private async getUserUuidFromEvent(event: TransitionRequestedEvent): Promise<Uuid | null> {
+    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: TransitionStatus.STATUSES.Failed,
+          transitionType: 'revisions',
+          transitionTimestamp: event.payload.timestamp,
+        }),
+      )
+
+      return null
+    }
+
+    return userUuidOrError.getValue()
  }
 }
@@ -1,112 +0,0 @@
-import {
-  DomainEventHandlerInterface,
-  DomainEventPublisherInterface,
-  TransitionStatusUpdatedEvent,
-} from '@standardnotes/domain-events'
-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,
-    private logger: Logger,
-  ) {}
-
-  async handle(event: TransitionStatusUpdatedEvent): Promise<void> {
-    if (event.payload.status === 'STARTED' && event.payload.transitionType === 'items') {
-      await this.domainEventPublisher.publish(
-        this.domainEventFactory.createTransitionStatusUpdatedEvent({
-          userUuid: event.payload.userUuid,
-          status: 'STARTED',
-          transitionType: 'revisions',
-        }),
-      )
-
-      return
-    }
-
-    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',
-          }),
-        )
-
-        return
-      }
-
-      if (await this.isAlreadyMigrated(userUuidOrError.getValue())) {
-        await this.domainEventPublisher.publish(
-          this.domainEventFactory.createTransitionStatusUpdatedEvent({
-            userUuid: event.payload.userUuid,
-            status: 'FINISHED',
-            transitionType: 'revisions',
-          }),
-        )
-
-        return
-      }
-
-      await this.domainEventPublisher.publish(
-        this.domainEventFactory.createTransitionStatusUpdatedEvent({
-          userUuid: event.payload.userUuid,
-          status: 'IN_PROGRESS',
-          transitionType: 'revisions',
-        }),
-      )
-
-      const result = await this.transitionRevisionsFromPrimaryToSecondaryDatabaseForUser.execute({
-        userUuid: event.payload.userUuid,
-      })
-
-      if (result.isFailed()) {
-        this.logger.error(`Failed to transition revisions for user ${event.payload.userUuid}: ${result.getError()}`)
-
-        await this.domainEventPublisher.publish(
-          this.domainEventFactory.createTransitionStatusUpdatedEvent({
-            userUuid: event.payload.userUuid,
-            status: 'FAILED',
-            transitionType: 'revisions',
-          }),
-        )
-
-        return
-      }
-
-      await this.domainEventPublisher.publish(
-        this.domainEventFactory.createTransitionStatusUpdatedEvent({
-          userUuid: event.payload.userUuid,
-          status: 'FINISHED',
-          transitionType: 'revisions',
-        }),
-      )
-
-      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
-  }
-}
@@ -30,9 +30,12 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
    const userUuid = userUuidOrError.getValue()

    let newRevisionsInSecondaryCount = 0
+    let updatedRevisionsInSecondary: Revision[] = []
    if (await this.hasAlreadyDataInSecondaryDatabase(userUuid)) {
-      const newRevisions = await this.getNewRevisionsCreatedInSecondaryDatabase(userUuid)
-      for (const existingRevision of newRevisions.alreadyExistingInPrimary) {
+      const { alreadyExistingInPrimary, newRevisionsInSecondary, updatedInSecondary } =
+        await this.getNewRevisionsCreatedInSecondaryDatabase(userUuid)
+
+      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(),
@@ -40,24 +43,34 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
        )
      }

-      if (newRevisions.newRevisionsInSecondary.length > 0) {
+      if (newRevisionsInSecondary.length > 0) {
        this.logger.info(
-          `Found ${newRevisions.newRevisionsInSecondary.length} new revisions in secondary database for user ${userUuid.value}`,
+          `Found ${newRevisionsInSecondary.length} new revisions in secondary database for user ${userUuid.value}`,
        )
      }

-      newRevisionsInSecondaryCount = newRevisions.newRevisionsInSecondary.length
+      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()) {
-      if (newRevisionsInSecondaryCount === 0) {
+      if (newRevisionsInSecondaryCount === 0 && updatedRevisionsInSecondaryCount === 0) {
        const cleanupResult = await this.deleteRevisionsForUser(userUuid, this.secondRevisionsRepository)
        if (cleanupResult.isFailed()) {
          this.logger.error(
@@ -74,9 +87,10 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
    const integrityCheckResult = await this.checkIntegrityBetweenPrimaryAndSecondaryDatabase(
      userUuid,
      newRevisionsInSecondaryCount,
+      updatedRevisionsInSecondary,
    )
    if (integrityCheckResult.isFailed()) {
-      if (newRevisionsInSecondaryCount === 0) {
+      if (newRevisionsInSecondaryCount === 0 && updatedRevisionsInSecondaryCount === 0) {
        const cleanupResult = await this.deleteRevisionsForUser(userUuid, this.secondRevisionsRepository)
        if (cleanupResult.isFailed()) {
          this.logger.error(
@@ -107,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
@@ -123,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
@@ -188,6 +217,7 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
  private async getNewRevisionsCreatedInSecondaryDatabase(userUuid: Uuid): Promise<{
    alreadyExistingInPrimary: Revision[]
    newRevisionsInSecondary: Revision[]
+    updatedInSecondary: Revision[]
  }> {
    const revisions = await (this.secondRevisionsRepository as RevisionRepositoryInterface).findByUserUuid({
      userUuid: userUuid,
@@ -195,23 +225,35 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements

    const alreadyExistingInPrimary: Revision[] = []
    const newRevisionsInSecondary: Revision[] = []
+    const updatedInSecondary: Revision[] = []

    for (const revision of revisions) {
-      const revisionExistsInPrimary = await this.checkIfRevisionExistsInPrimaryDatabase(revision)
-      if (revisionExistsInPrimary) {
+      const { revisionInPrimary, newerRevisionInSecondary } =
+        await this.checkIfRevisionExistsInPrimaryDatabase(revision)
+      if (revisionInPrimary !== null) {
        alreadyExistingInPrimary.push(revision)
-      } else {
+        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<boolean> {
+  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,
@@ -219,7 +261,10 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
    )

    if (revisionInPrimary === null) {
-      return false
+      return {
+        revisionInPrimary: null,
+        newerRevisionInSecondary: null,
+      }
    }

    if (!revision.isIdenticalTo(revisionInPrimary)) {
@@ -229,15 +274,23 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
        )}, revision in primary database: ${JSON.stringify(revisionInPrimary)}`,
      )

-      return false
+      return {
+        revisionInPrimary: null,
+        newerRevisionInSecondary:
+          revision.props.dates.updatedAt > revisionInPrimary.props.dates.updatedAt ? revision : null,
+      }
    }

-    return true
+    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)
@@ -267,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(
@@ -1,30 +0,0 @@
-import { DomainEventPublisherInterface } from '@standardnotes/domain-events'
-
-import { TriggerTransitionFromPrimaryToSecondaryDatabaseForUser } from './TriggerTransitionFromPrimaryToSecondaryDatabaseForUser'
-import { DomainEventFactoryInterface } from '../../../Event/DomainEventFactoryInterface'
-
-describe('TriggerTransitionFromPrimaryToSecondaryDatabaseForUser', () => {
-  let domainEventPubliser: DomainEventPublisherInterface
-  let domainEventFactory: DomainEventFactoryInterface
-
-  const createUseCase = () =>
-    new TriggerTransitionFromPrimaryToSecondaryDatabaseForUser(domainEventPubliser, domainEventFactory)
-
-  beforeEach(() => {
-    domainEventPubliser = {} as jest.Mocked<DomainEventPublisherInterface>
-    domainEventPubliser.publish = jest.fn()
-
-    domainEventFactory = {} as jest.Mocked<DomainEventFactoryInterface>
-    domainEventFactory.createTransitionStatusUpdatedEvent = jest.fn()
-  })
-
-  it('should publish transition status updated event', async () => {
-    const useCase = createUseCase()
-
-    await useCase.execute({
-      userUuid: '00000000-0000-0000-0000-000000000000',
-    })
-
-    expect(domainEventPubliser.publish).toHaveBeenCalled()
-  })
-})
@@ -1,24 +0,0 @@
-import { Result, UseCaseInterface } from '@standardnotes/domain-core'
-import { DomainEventPublisherInterface } from '@standardnotes/domain-events'
-
-import { TriggerTransitionFromPrimaryToSecondaryDatabaseForUserDTO } from './TriggerTransitionFromPrimaryToSecondaryDatabaseForUserDTO'
-import { DomainEventFactoryInterface } from '../../../Event/DomainEventFactoryInterface'
-
-export class TriggerTransitionFromPrimaryToSecondaryDatabaseForUser implements UseCaseInterface<void> {
-  constructor(
-    private domainEventPubliser: DomainEventPublisherInterface,
-    private domainEventFactory: DomainEventFactoryInterface,
-  ) {}
-
-  async execute(dto: TriggerTransitionFromPrimaryToSecondaryDatabaseForUserDTO): Promise<Result<void>> {
-    const event = this.domainEventFactory.createTransitionStatusUpdatedEvent({
-      userUuid: dto.userUuid,
-      status: 'STARTED',
-      transitionType: 'revisions',
-    })
-
-    await this.domainEventPubliser.publish(event)
-
-    return Result.ok()
-  }
-}
@@ -1,3 +0,0 @@
-export interface TriggerTransitionFromPrimaryToSecondaryDatabaseForUserDTO {
-  userUuid: string
-}
@@ -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)
-  }
 }
@@ -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 })
-  }
 }
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.20.47](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.20.46...@standardnotes/scheduler-server@1.20.47) (2023-09-18)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
+## [1.20.46](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.20.45...@standardnotes/scheduler-server@1.20.46) (2023-09-15)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
+## [1.20.45](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.20.44...@standardnotes/scheduler-server@1.20.45) (2023-09-15)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
 ## [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,6 +1,6 @@
 {
  "name": "@standardnotes/scheduler-server",
-  "version": "1.20.44",
+  "version": "1.20.47",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.21.33](https://github.com/standardnotes/server/compare/@standardnotes/settings@1.21.32...@standardnotes/settings@1.21.33) (2023-09-18)
+
+**Note:** Version bump only for package @standardnotes/settings
+
+## [1.21.32](https://github.com/standardnotes/server/compare/@standardnotes/settings@1.21.31...@standardnotes/settings@1.21.32) (2023-09-15)
+
+**Note:** Version bump only for package @standardnotes/settings
+
 ## [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,6 +1,6 @@
 {
  "name": "@standardnotes/settings",
-  "version": "1.21.31",
+  "version": "1.21.33",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -3,6 +3,55 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+# [1.98.0](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.97.0...@standardnotes/syncing-server@1.98.0) (2023-09-18)
+
+### Features
+
+* add publishing notifications for users when a user is added to vault ([#834](https://github.com/standardnotes/syncing-server-js/issues/834)) ([547a79e](https://github.com/standardnotes/syncing-server-js/commit/547a79e23174dab0a756e4e5bee218e4859b3b42))
+
+# [1.97.0](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.96.1...@standardnotes/syncing-server@1.97.0) (2023-09-15)
+
+### Features
+
+* refactor transition to minimize status changes ([#828](https://github.com/standardnotes/syncing-server-js/issues/828)) ([36f07c6](https://github.com/standardnotes/syncing-server-js/commit/36f07c691afc213ecf817d6e98f885ddb19a6ed6))
+
+## [1.96.1](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.96.0...@standardnotes/syncing-server@1.96.1) (2023-09-15)
+
+### Bug Fixes
+
+* add debug logs for transition status updates ([3e7856c](https://github.com/standardnotes/syncing-server-js/commit/3e7856c895e73b775c8977c6c6e86dffd5755c00))
+
+# [1.96.0](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.95.19...@standardnotes/syncing-server@1.96.0) (2023-09-15)
+
+### Features
+
+* add skipping verified transitions ([#827](https://github.com/standardnotes/syncing-server-js/issues/827)) ([d4d4945](https://github.com/standardnotes/syncing-server-js/commit/d4d49454a68de0acdf440dc202fa14b9743905f6))
+
+## [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
@@ -1,50 +0,0 @@
-import 'reflect-metadata'
-
-import { Logger } from 'winston'
-
-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'
-
-const inputArgs = process.argv.slice(2)
-const userUuid = inputArgs[0]
-
-const requestTransition = async (
-  triggerTransitionFromPrimaryToSecondaryDatabaseForUser: TriggerTransitionFromPrimaryToSecondaryDatabaseForUser,
-  logger: Logger,
-): Promise<void> => {
-  const result = await triggerTransitionFromPrimaryToSecondaryDatabaseForUser.execute({
-    userUuid,
-  })
-  if (result.isFailed()) {
-    logger.error(`Could not trigger transition for user ${userUuid}: ${result.getError()}`)
-  }
-
-  return
-}
-
-const container = new ContainerConfigLoader('worker')
-void container.load().then((container) => {
-  const env: Env = new Env()
-  env.load()
-
-  const logger: Logger = container.get(TYPES.Sync_Logger)
-
-  logger.info(`Starting transitiong for user ${userUuid} ...`)
-
-  const triggerTransitionFromPrimaryToSecondaryDatabaseForUser: TriggerTransitionFromPrimaryToSecondaryDatabaseForUser =
-    container.get(TYPES.Sync_TriggerTransitionFromPrimaryToSecondaryDatabaseForUser)
-
-  Promise.resolve(requestTransition(triggerTransitionFromPrimaryToSecondaryDatabaseForUser, logger))
-    .then(() => {
-      logger.info(`Transition triggered for user ${userUuid}`)
-
-      process.exit(0)
-    })
-    .catch((error) => {
-      logger.error(`Could not trigger transition for user ${userUuid}: ${error.message}`)
-
-      process.exit(1)
-    })
-})
@@ -1,11 +0,0 @@
-'use strict'
-
-const path = require('path')
-
-const pnp = require(path.normalize(path.resolve(__dirname, '../../..', '.pnp.cjs'))).setup()
-
-const index = require(path.normalize(path.resolve(__dirname, '../dist/bin/transition.js')))
-
-Object.defineProperty(exports, '__esModule', { value: true })
-
-exports.default = index
@@ -14,12 +14,6 @@ case "$COMMAND" in
    node docker/entrypoint-worker.js
    ;;

-  'transition' )
-    echo "[Docker] Starting transition Single User..."
-    USER_UUID=$1 && shift 1
-    node docker/entrypoint-transition.js $USER_UUID
-    ;;
-
   * )
    echo "[Docker] Unknown command"
    ;;
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/syncing-server",
-  "version": "1.95.15",
+  "version": "1.98.0",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -160,8 +160,6 @@ import { ItemRepositoryResolverInterface } from '../Domain/Item/ItemRepositoryRe
 import { TypeORMItemRepositoryResolver } from '../Infra/TypeORM/TypeORMItemRepositoryResolver'
 import { TransitionItemsFromPrimaryToSecondaryDatabaseForUser } from '../Domain/UseCase/Transition/TransitionItemsFromPrimaryToSecondaryDatabaseForUser/TransitionItemsFromPrimaryToSecondaryDatabaseForUser'
 import { SharedVaultFileMovedEventHandler } from '../Domain/Handler/SharedVaultFileMovedEventHandler'
-import { TransitionStatusUpdatedEventHandler } from '../Domain/Handler/TransitionStatusUpdatedEventHandler'
-import { TriggerTransitionFromPrimaryToSecondaryDatabaseForUser } from '../Domain/UseCase/Transition/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser'
 import { SQLItem } from '../Infra/TypeORM/SQLItem'
 import { SQLItemPersistenceMapper } from '../Mapping/Persistence/SQLItemPersistenceMapper'
 import { SQLItemRepository } from '../Infra/TypeORM/SQLItemRepository'
@@ -622,14 +620,14 @@ export class ContainerConfigLoader {
      .bind<UpdateExistingItem>(TYPES.Sync_UpdateExistingItem)
      .toConstantValue(
        new UpdateExistingItem(
-          container.get(TYPES.Sync_ItemRepositoryResolver),
-          container.get(TYPES.Sync_Timer),
-          container.get(TYPES.Sync_DomainEventPublisher),
-          container.get(TYPES.Sync_DomainEventFactory),
-          container.get(TYPES.Sync_REVISIONS_FREQUENCY),
-          container.get(TYPES.Sync_DetermineSharedVaultOperationOnItem),
-          container.get(TYPES.Sync_AddNotificationForUser),
-          container.get(TYPES.Sync_RemoveNotificationsForUser),
+          container.get<ItemRepositoryResolverInterface>(TYPES.Sync_ItemRepositoryResolver),
+          container.get<TimerInterface>(TYPES.Sync_Timer),
+          container.get<DomainEventPublisherInterface>(TYPES.Sync_DomainEventPublisher),
+          container.get<DomainEventFactoryInterface>(TYPES.Sync_DomainEventFactory),
+          container.get<number>(TYPES.Sync_REVISIONS_FREQUENCY),
+          container.get<DetermineSharedVaultOperationOnItem>(TYPES.Sync_DetermineSharedVaultOperationOnItem),
+          container.get<AddNotificationsForUsers>(TYPES.Sync_AddNotificationsForUsers),
+          container.get<RemoveNotificationsForUser>(TYPES.Sync_RemoveNotificationsForUser),
        ),
      )
    container
@@ -712,6 +710,7 @@ export class ContainerConfigLoader {
          container.get<TimerInterface>(TYPES.Sync_Timer),
          container.get<DomainEventFactoryInterface>(TYPES.Sync_DomainEventFactory),
          container.get<DomainEventPublisherInterface>(TYPES.Sync_DomainEventPublisher),
+          container.get<AddNotificationsForUsers>(TYPES.Sync_AddNotificationsForUsers),
        ),
      )
    container
@@ -758,7 +757,7 @@ export class ContainerConfigLoader {
        new RemoveUserFromSharedVault(
          container.get<SharedVaultUserRepositoryInterface>(TYPES.Sync_SharedVaultUserRepository),
          container.get<SharedVaultRepositoryInterface>(TYPES.Sync_SharedVaultRepository),
-          container.get<AddNotificationForUser>(TYPES.Sync_AddNotificationForUser),
+          container.get<AddNotificationsForUsers>(TYPES.Sync_AddNotificationsForUsers),
          container.get<DomainEventFactoryInterface>(TYPES.Sync_DomainEventFactory),
          container.get<DomainEventPublisherInterface>(TYPES.Sync_DomainEventPublisher),
        ),
@@ -837,16 +836,6 @@ export class ContainerConfigLoader {
          env.get('MIGRATION_BATCH_SIZE', true) ? +env.get('MIGRATION_BATCH_SIZE', true) : 100,
        ),
      )
-    container
-      .bind<TriggerTransitionFromPrimaryToSecondaryDatabaseForUser>(
-        TYPES.Sync_TriggerTransitionFromPrimaryToSecondaryDatabaseForUser,
-      )
-      .toConstantValue(
-        new TriggerTransitionFromPrimaryToSecondaryDatabaseForUser(
-          container.get<DomainEventPublisherInterface>(TYPES.Sync_DomainEventPublisher),
-          container.get<DomainEventFactoryInterface>(TYPES.Sync_DomainEventFactory),
-        ),
-      )

    // Services
    container
@@ -949,9 +938,9 @@ export class ContainerConfigLoader {
        ),
      )
    container
-      .bind<TransitionStatusUpdatedEventHandler>(TYPES.Sync_TransitionStatusUpdatedEventHandler)
+      .bind<TransitionRequestedEventHandler>(TYPES.Sync_TransitionRequestedEventHandler)
      .toConstantValue(
-        new TransitionStatusUpdatedEventHandler(
+        new TransitionRequestedEventHandler(
          container.get<ItemRepositoryInterface>(TYPES.Sync_SQLItemRepository),
          container.get<TransitionItemsFromPrimaryToSecondaryDatabaseForUser>(
            TYPES.Sync_TransitionItemsFromPrimaryToSecondaryDatabaseForUser,
@@ -961,16 +950,6 @@ export class ContainerConfigLoader {
          container.get<Logger>(TYPES.Sync_Logger),
        ),
      )
-    container
-      .bind<TransitionRequestedEventHandler>(TYPES.Sync_TransitionRequestedEventHandler)
-      .toConstantValue(
-        new TransitionRequestedEventHandler(
-          container.get<TriggerTransitionFromPrimaryToSecondaryDatabaseForUser>(
-            TYPES.Sync_TriggerTransitionFromPrimaryToSecondaryDatabaseForUser,
-          ),
-          container.get<Logger>(TYPES.Sync_Logger),
-        ),
-      )

    // Services
    container.bind<ContentDecoder>(TYPES.Sync_ContentDecoder).toDynamicValue(() => new ContentDecoder())
@@ -1005,10 +984,6 @@ export class ContainerConfigLoader {
        'SHARED_VAULT_FILE_MOVED',
        container.get<SharedVaultFileMovedEventHandler>(TYPES.Sync_SharedVaultFileMovedEventHandler),
      ],
-      [
-        'TRANSITION_STATUS_UPDATED',
-        container.get<TransitionStatusUpdatedEventHandler>(TYPES.Sync_TransitionStatusUpdatedEventHandler),
-      ],
      [
        'TRANSITION_REQUESTED',
        container.get<TransitionRequestedEventHandler>(TYPES.Sync_TransitionRequestedEventHandler),
@@ -1090,9 +1065,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),
@@ -84,9 +84,6 @@ const TYPES = {
  Sync_TransitionItemsFromPrimaryToSecondaryDatabaseForUser: Symbol.for(
    'Sync_TransitionItemsFromPrimaryToSecondaryDatabaseForUser',
  ),
-  Sync_TriggerTransitionFromPrimaryToSecondaryDatabaseForUser: Symbol.for(
-    'Sync_TriggerTransitionFromPrimaryToSecondaryDatabaseForUser',
-  ),
  Sync_SendEventToClient: Symbol.for('Sync_SendEventToClient'),
  // Handlers
  Sync_AccountDeletionRequestedEventHandler: Symbol.for('Sync_AccountDeletionRequestedEventHandler'),
@@ -96,7 +93,6 @@ const TYPES = {
  Sync_SharedVaultFileRemovedEventHandler: Symbol.for('Sync_SharedVaultFileRemovedEventHandler'),
  Sync_SharedVaultFileUploadedEventHandler: Symbol.for('Sync_SharedVaultFileUploadedEventHandler'),
  Sync_SharedVaultFileMovedEventHandler: Symbol.for('Sync_SharedVaultFileMovedEventHandler'),
-  Sync_TransitionStatusUpdatedEventHandler: Symbol.for('Sync_TransitionStatusUpdatedEventHandler'),
  Sync_TransitionRequestedEventHandler: Symbol.for('Sync_TransitionRequestedEventHandler'),
  // Services
  Sync_ContentDecoder: Symbol.for('Sync_ContentDecoder'),
@@ -172,7 +172,8 @@ export class DomainEventFactory implements DomainEventFactoryInterface {
  createTransitionStatusUpdatedEvent(dto: {
    userUuid: string
    transitionType: 'items' | 'revisions'
-    status: 'STARTED' | 'FAILED' | 'FINISHED'
+    transitionTimestamp: number
+    status: string
  }): TransitionStatusUpdatedEvent {
    return {
      type: 'TRANSITION_STATUS_UPDATED',
@@ -184,10 +185,7 @@ export class DomainEventFactory implements DomainEventFactoryInterface {
        },
        origin: DomainEventService.SyncingServer,
      },
-      payload: {
-        transitionTimestamp: this.timer.getTimestampInMicroseconds(),
-        ...dto,
-      },
+      payload: dto,
    }
  }

@@ -52,7 +52,8 @@ export interface DomainEventFactoryInterface {
  createTransitionStatusUpdatedEvent(dto: {
    userUuid: string
    transitionType: 'items' | 'revisions'
-    status: 'STARTED' | 'IN_PROGRESS' | 'FAILED' | 'FINISHED'
+    transitionTimestamp: number
+    status: string
  }): TransitionStatusUpdatedEvent
  createEmailRequestedEvent(dto: {
    userEmail: string
@@ -1,11 +1,21 @@
-import { DomainEventHandlerInterface, TransitionRequestedEvent } from '@standardnotes/domain-events'
+import {
+  DomainEventHandlerInterface,
+  DomainEventPublisherInterface,
+  TransitionRequestedEvent,
+} from '@standardnotes/domain-events'
 import { Logger } from 'winston'
+import { TransitionStatus, Uuid } from '@standardnotes/domain-core'

-import { TriggerTransitionFromPrimaryToSecondaryDatabaseForUser } from '../UseCase/Transition/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser'
+import { TransitionItemsFromPrimaryToSecondaryDatabaseForUser } from '../UseCase/Transition/TransitionItemsFromPrimaryToSecondaryDatabaseForUser/TransitionItemsFromPrimaryToSecondaryDatabaseForUser'
+import { ItemRepositoryInterface } from '../Item/ItemRepositoryInterface'
+import { DomainEventFactoryInterface } from '../Event/DomainEventFactoryInterface'

 export class TransitionRequestedEventHandler implements DomainEventHandlerInterface {
  constructor(
-    private triggerTransitionFromPrimaryToSecondaryDatabaseForUser: TriggerTransitionFromPrimaryToSecondaryDatabaseForUser,
+    private primaryItemRepository: ItemRepositoryInterface,
+    private transitionItemsFromPrimaryToSecondaryDatabaseForUser: TransitionItemsFromPrimaryToSecondaryDatabaseForUser,
+    private domainEventPublisher: DomainEventPublisherInterface,
+    private domainEventFactory: DomainEventFactoryInterface,
    private logger: Logger,
  ) {}

@@ -14,14 +24,95 @@ export class TransitionRequestedEventHandler implements DomainEventHandlerInterf
      return
    }

+    const userUuid = await this.getUserUuidFromEvent(event)
+    if (!userUuid) {
+      return
+    }
+
+    if (await this.isAlreadyMigrated(userUuid)) {
+      this.logger.info(`User ${event.payload.userUuid} already migrated.`)
+
+      await this.domainEventPublisher.publish(
+        this.domainEventFactory.createTransitionStatusUpdatedEvent({
+          userUuid: event.payload.userUuid,
+          status: TransitionStatus.STATUSES.Verified,
+          transitionType: 'items',
+          transitionTimestamp: event.payload.timestamp,
+        }),
+      )
+
+      return
+    }
+
    this.logger.info(`Handling transition requested event for user ${event.payload.userUuid}`)

-    const result = await this.triggerTransitionFromPrimaryToSecondaryDatabaseForUser.execute({
+    await this.domainEventPublisher.publish(
+      this.domainEventFactory.createTransitionStatusUpdatedEvent({
+        userUuid: event.payload.userUuid,
+        status: TransitionStatus.STATUSES.InProgress,
+        transitionType: 'items',
+        transitionTimestamp: event.payload.timestamp,
+      }),
+    )
+
+    const result = await this.transitionItemsFromPrimaryToSecondaryDatabaseForUser.execute({
      userUuid: event.payload.userUuid,
    })

    if (result.isFailed()) {
      this.logger.error(`Failed to trigger transition for user ${event.payload.userUuid}`)
+
+      await this.domainEventPublisher.publish(
+        this.domainEventFactory.createTransitionStatusUpdatedEvent({
+          userUuid: event.payload.userUuid,
+          status: TransitionStatus.STATUSES.Failed,
+          transitionType: 'items',
+          transitionTimestamp: event.payload.timestamp,
+        }),
+      )
+
+      return
    }
+
+    await this.domainEventPublisher.publish(
+      this.domainEventFactory.createTransitionStatusUpdatedEvent({
+        userUuid: event.payload.userUuid,
+        status: TransitionStatus.STATUSES.Verified,
+        transitionType: 'items',
+        transitionTimestamp: event.payload.timestamp,
+      }),
+    )
+  }
+
+  private async isAlreadyMigrated(userUuid: Uuid): Promise<boolean> {
+    const totalItemsCountForUserInPrimary = await this.primaryItemRepository.countAll({
+      userUuid: userUuid.value,
+    })
+
+    if (totalItemsCountForUserInPrimary > 0) {
+      this.logger.info(`User ${userUuid.value} has ${totalItemsCountForUserInPrimary} items in primary database.`)
+    }
+
+    return totalItemsCountForUserInPrimary === 0
+  }
+
+  private async getUserUuidFromEvent(event: TransitionRequestedEvent): Promise<Uuid | null> {
+    const userUuidOrError = Uuid.create(event.payload.userUuid)
+    if (userUuidOrError.isFailed()) {
+      this.logger.error(`Failed to transition items for user ${event.payload.userUuid}: ${userUuidOrError.getError()}`)
+
+      await this.domainEventPublisher.publish(
+        this.domainEventFactory.createTransitionStatusUpdatedEvent({
+          userUuid: event.payload.userUuid,
+          status: TransitionStatus.STATUSES.Failed,
+          transitionType: 'items',
+          transitionTimestamp: event.payload.timestamp,
+        }),
+      )
+
+      return null
+    }
+
+    return userUuidOrError.getValue()
  }
 }
@@ -1,79 +0,0 @@
-import {
-  DomainEventHandlerInterface,
-  DomainEventPublisherInterface,
-  TransitionStatusUpdatedEvent,
-} from '@standardnotes/domain-events'
-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,
-    private logger: Logger,
-  ) {}
-
-  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',
-          }),
-        )
-
-        return
-      }
-
-      await this.domainEventPublisher.publish(
-        this.domainEventFactory.createTransitionStatusUpdatedEvent({
-          userUuid: event.payload.userUuid,
-          status: 'IN_PROGRESS',
-          transitionType: 'items',
-        }),
-      )
-
-      const result = await this.transitionItemsFromPrimaryToSecondaryDatabaseForUser.execute({
-        userUuid: event.payload.userUuid,
-      })
-
-      if (result.isFailed()) {
-        this.logger.error(`Failed to transition items for user ${event.payload.userUuid}: ${result.getError()}`)
-
-        await this.domainEventPublisher.publish(
-          this.domainEventFactory.createTransitionStatusUpdatedEvent({
-            userUuid: event.payload.userUuid,
-            status: 'FAILED',
-            transitionType: 'items',
-          }),
-        )
-
-        return
-      }
-
-      await this.domainEventPublisher.publish(
-        this.domainEventFactory.createTransitionStatusUpdatedEvent({
-          userUuid: event.payload.userUuid,
-          status: 'FINISHED',
-          transitionType: 'items',
-        }),
-      )
-    }
-  }
-
-  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
-  }
-}
@@ -1,5 +1,5 @@
 import { TimerInterface } from '@standardnotes/time'
-import { Result, SharedVaultUser } from '@standardnotes/domain-core'
+import { NotificationPayload, Result, SharedVaultUser } from '@standardnotes/domain-core'
 import { DomainEventInterface, DomainEventPublisherInterface } from '@standardnotes/domain-events'

 import { SharedVaultRepositoryInterface } from '../../../SharedVault/SharedVaultRepositoryInterface'
@@ -7,6 +7,7 @@ import { SharedVaultUserRepositoryInterface } from '../../../SharedVault/User/Sh
 import { AddUserToSharedVault } from './AddUserToSharedVault'
 import { SharedVault } from '../../../SharedVault/SharedVault'
 import { DomainEventFactoryInterface } from '../../../Event/DomainEventFactoryInterface'
+import { AddNotificationsForUsers } from '../../Messaging/AddNotificationsForUsers/AddNotificationsForUsers'

 describe('AddUserToSharedVault', () => {
  let sharedVaultRepository: SharedVaultRepositoryInterface
@@ -15,6 +16,7 @@ describe('AddUserToSharedVault', () => {
  let sharedVault: SharedVault
  let domainEventFactory: DomainEventFactoryInterface
  let domainEventPublisher: DomainEventPublisherInterface
+  let addNotificationsForUsers: AddNotificationsForUsers

  const validUuid = '00000000-0000-0000-0000-000000000000'

@@ -25,6 +27,7 @@ describe('AddUserToSharedVault', () => {
      timer,
      domainEventFactory,
      domainEventPublisher,
+      addNotificationsForUsers,
    )

  beforeEach(() => {
@@ -46,6 +49,9 @@ describe('AddUserToSharedVault', () => {

    domainEventPublisher = {} as jest.Mocked<DomainEventPublisherInterface>
    domainEventPublisher.publish = jest.fn()
+
+    addNotificationsForUsers = {} as jest.Mocked<AddNotificationsForUsers>
+    addNotificationsForUsers.execute = jest.fn().mockReturnValue(Result.ok())
  })

  it('should return a failure result if the shared vault uuid is invalid', async () => {
@@ -122,6 +128,39 @@ describe('AddUserToSharedVault', () => {
    mockSharedVaultUser.mockRestore()
  })

+  it('should return a failure if add notification for users fails', async () => {
+    addNotificationsForUsers.execute = jest.fn().mockReturnValue(Result.fail('Oops'))
+
+    const useCase = createUseCase()
+
+    const result = await useCase.execute({
+      sharedVaultUuid: validUuid,
+      userUuid: validUuid,
+      permission: 'read',
+    })
+
+    expect(result.isFailed()).toBe(true)
+    expect(result.getError()).toBe('Oops')
+  })
+
+  it('should return error if notification payload could not be created', async () => {
+    const mock = jest.spyOn(NotificationPayload, 'create')
+    mock.mockReturnValue(Result.fail('Oops'))
+
+    const useCase = createUseCase()
+
+    const result = await useCase.execute({
+      sharedVaultUuid: validUuid,
+      userUuid: validUuid,
+      permission: 'read',
+    })
+
+    expect(result.isFailed()).toBe(true)
+    expect(result.getError()).toBe('Oops')
+
+    mock.mockRestore()
+  })
+
  it('should add a user to a shared vault', async () => {
    const useCase = createUseCase()

@@ -1,4 +1,6 @@
 import {
+  NotificationPayload,
+  NotificationType,
  Result,
  SharedVaultUser,
  SharedVaultUserPermission,
@@ -13,6 +15,7 @@ import { AddUserToSharedVaultDTO } from './AddUserToSharedVaultDTO'
 import { SharedVaultRepositoryInterface } from '../../../SharedVault/SharedVaultRepositoryInterface'
 import { SharedVaultUserRepositoryInterface } from '../../../SharedVault/User/SharedVaultUserRepositoryInterface'
 import { DomainEventFactoryInterface } from '../../../Event/DomainEventFactoryInterface'
+import { AddNotificationsForUsers } from '../../Messaging/AddNotificationsForUsers/AddNotificationsForUsers'

 export class AddUserToSharedVault implements UseCaseInterface<SharedVaultUser> {
  constructor(
@@ -21,6 +24,7 @@ export class AddUserToSharedVault implements UseCaseInterface<SharedVaultUser> {
    private timer: TimerInterface,
    private domainEventFactory: DomainEventFactoryInterface,
    private domainEventPublisher: DomainEventPublisherInterface,
+    private addNotificationForUsers: AddNotificationsForUsers,
  ) {}

  async execute(dto: AddUserToSharedVaultDTO): Promise<Result<SharedVaultUser>> {
@@ -67,6 +71,26 @@ export class AddUserToSharedVault implements UseCaseInterface<SharedVaultUser> {

    await this.sharedVaultUserRepository.save(sharedVaultUser)

+    const notificationPayloadOrError = NotificationPayload.create({
+      sharedVaultUuid: sharedVaultUuid,
+      type: NotificationType.create(NotificationType.TYPES.UserAddedToSharedVault).getValue(),
+      version: '1.0',
+    })
+    if (notificationPayloadOrError.isFailed()) {
+      return Result.fail(notificationPayloadOrError.getError())
+    }
+    const notificationPayload = notificationPayloadOrError.getValue()
+
+    const result = await this.addNotificationForUsers.execute({
+      sharedVaultUuid: sharedVaultUuid.value,
+      type: NotificationType.TYPES.UserAddedToSharedVault,
+      payload: notificationPayload,
+      version: '1.0',
+    })
+    if (result.isFailed()) {
+      return Result.fail(result.getError())
+    }
+
    await this.domainEventPublisher.publish(
      this.domainEventFactory.createUserAddedToSharedVaultEvent({
        sharedVaultUuid: sharedVaultUser.props.sharedVaultUuid.value,
@@ -11,14 +11,14 @@ import { SharedVault } from '../../../SharedVault/SharedVault'
 import { SharedVaultRepositoryInterface } from '../../../SharedVault/SharedVaultRepositoryInterface'
 import { SharedVaultUserRepositoryInterface } from '../../../SharedVault/User/SharedVaultUserRepositoryInterface'
 import { RemoveUserFromSharedVault } from './RemoveUserFromSharedVault'
-import { AddNotificationForUser } from '../../Messaging/AddNotificationForUser/AddNotificationForUser'
 import { DomainEventFactoryInterface } from '../../../Event/DomainEventFactoryInterface'
 import { DomainEventInterface, DomainEventPublisherInterface } from '@standardnotes/domain-events'
+import { AddNotificationsForUsers } from '../../Messaging/AddNotificationsForUsers/AddNotificationsForUsers'

 describe('RemoveUserFromSharedVault', () => {
  let sharedVaultRepository: SharedVaultRepositoryInterface
  let sharedVaultUserRepository: SharedVaultUserRepositoryInterface
-  let addNotificationForUser: AddNotificationForUser
+  let addNotificationsForUsers: AddNotificationsForUsers
  let sharedVault: SharedVault
  let sharedVaultUser: SharedVaultUser
  let domainEventFactory: DomainEventFactoryInterface
@@ -28,7 +28,7 @@ describe('RemoveUserFromSharedVault', () => {
    new RemoveUserFromSharedVault(
      sharedVaultUserRepository,
      sharedVaultRepository,
-      addNotificationForUser,
+      addNotificationsForUsers,
      domainEventFactory,
      domainEventPublisher,
    )
@@ -53,8 +53,8 @@ describe('RemoveUserFromSharedVault', () => {
    sharedVaultUserRepository.findByUserUuidAndSharedVaultUuid = jest.fn().mockResolvedValue(sharedVaultUser)
    sharedVaultUserRepository.remove = jest.fn()

-    addNotificationForUser = {} as jest.Mocked<AddNotificationForUser>
-    addNotificationForUser.execute = jest.fn().mockReturnValue(Result.ok())
+    addNotificationsForUsers = {} as jest.Mocked<AddNotificationsForUsers>
+    addNotificationsForUsers.execute = jest.fn().mockReturnValue(Result.ok())

    domainEventFactory = {} as jest.Mocked<DomainEventFactoryInterface>
    domainEventFactory.createUserRemovedFromSharedVaultEvent = jest
@@ -199,11 +199,11 @@ describe('RemoveUserFromSharedVault', () => {
      userUuid: '00000000-0000-0000-0000-000000000001',
    })

-    expect(addNotificationForUser.execute).toHaveBeenCalled()
+    expect(addNotificationsForUsers.execute).toHaveBeenCalled()
  })

  it('should return error if notification could not be added', async () => {
-    addNotificationForUser.execute = jest.fn().mockResolvedValue(Result.fail('Could not add notification'))
+    addNotificationsForUsers.execute = jest.fn().mockResolvedValue(Result.fail('Could not add notification'))

    const useCase = createUseCase()
    const result = await useCase.execute({
@@ -228,5 +228,7 @@ describe('RemoveUserFromSharedVault', () => {

    expect(result.isFailed()).toBe(true)
    expect(result.getError()).toBe('Oops')
+
+    mock.mockRestore()
  })
 })
@@ -4,14 +4,14 @@ import { DomainEventPublisherInterface } from '@standardnotes/domain-events'
 import { RemoveUserFromSharedVaultDTO } from './RemoveUserFromSharedVaultDTO'
 import { SharedVaultRepositoryInterface } from '../../../SharedVault/SharedVaultRepositoryInterface'
 import { SharedVaultUserRepositoryInterface } from '../../../SharedVault/User/SharedVaultUserRepositoryInterface'
-import { AddNotificationForUser } from '../../Messaging/AddNotificationForUser/AddNotificationForUser'
 import { DomainEventFactoryInterface } from '../../../Event/DomainEventFactoryInterface'
+import { AddNotificationsForUsers } from '../../Messaging/AddNotificationsForUsers/AddNotificationsForUsers'

 export class RemoveUserFromSharedVault implements UseCaseInterface<void> {
  constructor(
    private sharedVaultUsersRepository: SharedVaultUserRepositoryInterface,
    private sharedVaultRepository: SharedVaultRepositoryInterface,
-    private addNotificationForUser: AddNotificationForUser,
+    private addNotificationForUsers: AddNotificationsForUsers,
    private domainEventFactory: DomainEventFactoryInterface,
    private domainEventPublisher: DomainEventPublisherInterface,
  ) {}
@@ -71,8 +71,8 @@ export class RemoveUserFromSharedVault implements UseCaseInterface<void> {
    }
    const notificationPayload = notificationPayloadOrError.getValue()

-    const result = await this.addNotificationForUser.execute({
-      userUuid: sharedVaultUser.props.userUuid.value,
+    const result = await this.addNotificationForUsers.execute({
+      sharedVaultUuid: sharedVault.id.toString(),
      type: NotificationType.TYPES.RemovedFromSharedVault,
      payload: notificationPayload,
      version: '1.0',
@@ -18,10 +18,10 @@ import {
 import { SharedVaultAssociation } from '../../../SharedVault/SharedVaultAssociation'
 import { KeySystemAssociation } from '../../../KeySystem/KeySystemAssociation'
 import { DetermineSharedVaultOperationOnItem } from '../../SharedVaults/DetermineSharedVaultOperationOnItem/DetermineSharedVaultOperationOnItem'
-import { AddNotificationForUser } from '../../Messaging/AddNotificationForUser/AddNotificationForUser'
 import { RemoveNotificationsForUser } from '../../Messaging/RemoveNotificationsForUser/RemoveNotificationsForUser'
 import { SharedVaultOperationOnItem } from '../../../SharedVault/SharedVaultOperationOnItem'
 import { ItemRepositoryResolverInterface } from '../../../Item/ItemRepositoryResolverInterface'
+import { AddNotificationsForUsers } from '../../Messaging/AddNotificationsForUsers/AddNotificationsForUsers'

 describe('UpdateExistingItem', () => {
  let itemRepository: ItemRepositoryInterface
@@ -32,7 +32,7 @@ describe('UpdateExistingItem', () => {
  let itemHash1: ItemHash
  let item1: Item
  let determineSharedVaultOperationOnItem: DetermineSharedVaultOperationOnItem
-  let addNotificationForUser: AddNotificationForUser
+  let addNotificationsForUsers: AddNotificationsForUsers
  let removeNotificationsForUser: RemoveNotificationsForUser

  const createUseCase = () =>
@@ -43,7 +43,7 @@ describe('UpdateExistingItem', () => {
      domainEventFactory,
      5,
      determineSharedVaultOperationOnItem,
-      addNotificationForUser,
+      addNotificationsForUsers,
      removeNotificationsForUser,
    )

@@ -128,8 +128,8 @@ describe('UpdateExistingItem', () => {
      ),
    )

-    addNotificationForUser = {} as jest.Mocked<AddNotificationForUser>
-    addNotificationForUser.execute = jest.fn().mockReturnValue(Result.ok())
+    addNotificationsForUsers = {} as jest.Mocked<AddNotificationsForUsers>
+    addNotificationsForUsers.execute = jest.fn().mockReturnValue(Result.ok())

    removeNotificationsForUser = {} as jest.Mocked<RemoveNotificationsForUser>
    removeNotificationsForUser.execute = jest.fn().mockReturnValue(Result.ok())
@@ -298,7 +298,7 @@ describe('UpdateExistingItem', () => {
    expect(itemRepository.save).toHaveBeenCalled()
  })

-  it('should return error if created at time is not give in any form', async () => {
+  it('should fallback to updated at timestamp if created at time is not give in any form', async () => {
    const useCase = createUseCase()

    const result = await useCase.execute({
@@ -308,13 +308,59 @@ describe('UpdateExistingItem', () => {
        ...itemHash1.props,
        created_at: undefined,
        created_at_timestamp: undefined,
+        updated_at_timestamp: 123,
      }).getValue(),
      sessionUuid: '00000000-0000-0000-0000-000000000000',
      performingUserUuid: '00000000-0000-0000-0000-000000000000',
      roleNames: [RoleName.NAMES.CoreUser],
    })

-    expect(result.isFailed()).toBeTruthy()
+    expect(result.isFailed()).toBeFalsy()
+    expect(itemRepository.save).toHaveBeenCalled()
+  })
+
+  it('should fallback to updated at date if created at time is not give in any form', async () => {
+    const useCase = createUseCase()
+
+    const result = await useCase.execute({
+      existingItem: item1,
+      onGoingRevisionsTransition: false,
+      itemHash: ItemHash.create({
+        ...itemHash1.props,
+        created_at: undefined,
+        created_at_timestamp: undefined,
+        updated_at_timestamp: undefined,
+        updated_at: '2020-01-01T00:00:00.000Z',
+      }).getValue(),
+      sessionUuid: '00000000-0000-0000-0000-000000000000',
+      performingUserUuid: '00000000-0000-0000-0000-000000000000',
+      roleNames: [RoleName.NAMES.CoreUser],
+    })
+
+    expect(result.isFailed()).toBeFalsy()
+    expect(itemRepository.save).toHaveBeenCalled()
+  })
+
+  it('should fallback to 0 if created at and update at time is not give in any form', async () => {
+    const useCase = createUseCase()
+
+    const result = await useCase.execute({
+      existingItem: item1,
+      onGoingRevisionsTransition: false,
+      itemHash: ItemHash.create({
+        ...itemHash1.props,
+        created_at: undefined,
+        created_at_timestamp: undefined,
+        updated_at_timestamp: undefined,
+        updated_at: undefined,
+      }).getValue(),
+      sessionUuid: '00000000-0000-0000-0000-000000000000',
+      performingUserUuid: '00000000-0000-0000-0000-000000000000',
+      roleNames: [RoleName.NAMES.CoreUser],
+    })
+
+    expect(result.isFailed()).toBeFalsy()
+    expect(itemRepository.save).toHaveBeenCalled()
  })

  it('should return error if dates could not be created from timestamps', async () => {
@@ -534,7 +580,7 @@ describe('UpdateExistingItem', () => {
        ),
      )

-      addNotificationForUser.execute = jest.fn().mockReturnValue(Result.fail('Oops'))
+      addNotificationsForUsers.execute = jest.fn().mockReturnValue(Result.fail('Oops'))

      const useCase = createUseCase()

@@ -20,9 +20,10 @@ import { SharedVaultAssociation } from '../../../SharedVault/SharedVaultAssociat
 import { KeySystemAssociation } from '../../../KeySystem/KeySystemAssociation'
 import { DetermineSharedVaultOperationOnItem } from '../../SharedVaults/DetermineSharedVaultOperationOnItem/DetermineSharedVaultOperationOnItem'
 import { SharedVaultOperationOnItem } from '../../../SharedVault/SharedVaultOperationOnItem'
-import { AddNotificationForUser } from '../../Messaging/AddNotificationForUser/AddNotificationForUser'
 import { RemoveNotificationsForUser } from '../../Messaging/RemoveNotificationsForUser/RemoveNotificationsForUser'
 import { ItemRepositoryResolverInterface } from '../../../Item/ItemRepositoryResolverInterface'
+import { ItemHash } from '../../../Item/ItemHash'
+import { AddNotificationsForUsers } from '../../Messaging/AddNotificationsForUsers/AddNotificationsForUsers'

 export class UpdateExistingItem implements UseCaseInterface<Item> {
  constructor(
@@ -32,7 +33,7 @@ export class UpdateExistingItem implements UseCaseInterface<Item> {
    private domainEventFactory: DomainEventFactoryInterface,
    private revisionFrequency: number,
    private determineSharedVaultOperationOnItem: DetermineSharedVaultOperationOnItem,
-    private addNotificationForUser: AddNotificationForUser,
+    private addNotificationForUsers: AddNotificationsForUsers,
    private removeNotificationsForUser: RemoveNotificationsForUser,
  ) {}

@@ -115,17 +116,7 @@ export class UpdateExistingItem implements UseCaseInterface<Item> {
    )
    const updatedAtDate = this.timer.convertMicrosecondsToDate(updatedAtTimestamp)

-    let createdAtTimestamp: number
-    let createdAtDate: Date
-    if (dto.itemHash.props.created_at_timestamp) {
-      createdAtTimestamp = dto.itemHash.props.created_at_timestamp
-      createdAtDate = this.timer.convertMicrosecondsToDate(createdAtTimestamp)
-    } else if (dto.itemHash.props.created_at) {
-      createdAtTimestamp = this.timer.convertStringDateToMicroseconds(dto.itemHash.props.created_at)
-      createdAtDate = this.timer.convertStringDateToDate(dto.itemHash.props.created_at)
-    } else {
-      return Result.fail('Created at timestamp is required.')
-    }
+    const { createdAtDate, createdAtTimestamp } = this.determineCreatedAt(dto.itemHash)

    const datesOrError = Dates.create(createdAtDate, updatedAtDate)
    if (datesOrError.isFailed()) {
@@ -221,6 +212,29 @@ export class UpdateExistingItem implements UseCaseInterface<Item> {
    return Result.ok(dto.existingItem)
  }

+  private determineCreatedAt(itemHash: ItemHash): { createdAtDate: Date; createdAtTimestamp: number } {
+    let createdAtTimestamp: number
+    let createdAtDate: Date
+    if (itemHash.props.created_at_timestamp) {
+      createdAtTimestamp = itemHash.props.created_at_timestamp
+      createdAtDate = this.timer.convertMicrosecondsToDate(createdAtTimestamp)
+    } else if (itemHash.props.created_at) {
+      createdAtTimestamp = this.timer.convertStringDateToMicroseconds(itemHash.props.created_at)
+      createdAtDate = this.timer.convertStringDateToDate(itemHash.props.created_at)
+    } else if (itemHash.props.updated_at_timestamp) {
+      createdAtTimestamp = itemHash.props.updated_at_timestamp
+      createdAtDate = this.timer.convertMicrosecondsToDate(itemHash.props.updated_at_timestamp)
+    } else if (itemHash.props.updated_at) {
+      createdAtTimestamp = this.timer.convertStringDateToMicroseconds(itemHash.props.updated_at)
+      createdAtDate = this.timer.convertStringDateToDate(itemHash.props.updated_at)
+    } else {
+      createdAtTimestamp = 0
+      createdAtDate = new Date(0)
+    }
+
+    return { createdAtDate, createdAtTimestamp }
+  }
+
  private async addNotificationsAndPublishEvents(
    userUuid: Uuid,
    sharedVaultOperation: SharedVaultOperationOnItem | null,
@@ -241,10 +255,10 @@ export class UpdateExistingItem implements UseCaseInterface<Item> {
      }
      const payload = notificationPayloadOrError.getValue()

-      const result = await this.addNotificationForUser.execute({
+      const result = await this.addNotificationForUsers.execute({
        payload,
        type: NotificationType.TYPES.SharedVaultItemRemoved,
-        userUuid: userUuid.value,
+        sharedVaultUuid: sharedVaultOperation.props.sharedVaultUuid.value,
        version: '1.0',
      })
      if (result.isFailed()) {
@@ -31,29 +31,41 @@ export class TransitionItemsFromPrimaryToSecondaryDatabaseForUser implements Use
    const userUuid = userUuidOrError.getValue()

    let newItemsInSecondaryCount = 0
+    let updatedItemsInSecondary: Item[] = []
    if (await this.hasAlreadyDataInSecondaryDatabase(userUuid)) {
-      const newItems = await this.getNewItemsCreatedInSecondaryDatabase(userUuid)
-      for (const existingItem of newItems.alreadyExistingInPrimary) {
+      const { alreadyExistingInPrimary, newItemsInSecondary, updatedInSecondary } =
+        await this.getNewItemsCreatedInSecondaryDatabase(userUuid)
+
+      for (const existingItem of alreadyExistingInPrimary) {
        this.logger.info(`Removing item ${existingItem.uuid.value} from secondary database`)
        await (this.secondaryItemRepository as ItemRepositoryInterface).remove(existingItem)
      }

-      if (newItems.newItemsInSecondary.length > 0) {
+      if (newItemsInSecondary.length > 0) {
        this.logger.info(
-          `Found ${newItems.newItemsInSecondary.length} new items in secondary database for user ${userUuid.value}`,
+          `Found ${newItemsInSecondary.length} new items in secondary database for user ${userUuid.value}`,
        )
      }

-      newItemsInSecondaryCount = newItems.newItemsInSecondary.length
+      newItemsInSecondaryCount = newItemsInSecondary.length
+
+      if (updatedInSecondary.length > 0) {
+        this.logger.info(
+          `Found ${updatedInSecondary.length} updated items in secondary database for user ${userUuid.value}`,
+        )
+      }
+
+      updatedItemsInSecondary = updatedInSecondary
    }
+    const updatedItemsInSecondaryCount = updatedItemsInSecondary.length

    await this.allowForSecondaryDatabaseToCatchUp()

    const migrationTimeStart = this.timer.getTimestampInMicroseconds()

-    const migrationResult = await this.migrateItemsForUser(userUuid)
+    const migrationResult = await this.migrateItemsForUser(userUuid, updatedItemsInSecondary)
    if (migrationResult.isFailed()) {
-      if (newItemsInSecondaryCount === 0) {
+      if (newItemsInSecondaryCount === 0 && updatedItemsInSecondaryCount === 0) {
        const cleanupResult = await this.deleteItemsForUser(userUuid, this.secondaryItemRepository)
        if (cleanupResult.isFailed()) {
          this.logger.error(
@@ -70,9 +82,10 @@ export class TransitionItemsFromPrimaryToSecondaryDatabaseForUser implements Use
    const integrityCheckResult = await this.checkIntegrityBetweenPrimaryAndSecondaryDatabase(
      userUuid,
      newItemsInSecondaryCount,
+      updatedItemsInSecondary,
    )
    if (integrityCheckResult.isFailed()) {
-      if (newItemsInSecondaryCount === 0) {
+      if (newItemsInSecondaryCount === 0 && updatedItemsInSecondaryCount === 0) {
        const cleanupResult = await this.deleteItemsForUser(userUuid, this.secondaryItemRepository)
        if (cleanupResult.isFailed()) {
          this.logger.error(
@@ -124,34 +137,46 @@ export class TransitionItemsFromPrimaryToSecondaryDatabaseForUser implements Use
  private async getNewItemsCreatedInSecondaryDatabase(userUuid: Uuid): Promise<{
    alreadyExistingInPrimary: Item[]
    newItemsInSecondary: Item[]
+    updatedInSecondary: Item[]
  }> {
    const items = await (this.secondaryItemRepository as ItemRepositoryInterface).findAll({
      userUuid: userUuid.value,
    })

    const alreadyExistingInPrimary: Item[] = []
+    const updatedInSecondary: Item[] = []
    const newItemsInSecondary: Item[] = []

    for (const item of items) {
-      const itemExistsInPrimary = await this.checkIfItemExistsInPrimaryDatabase(item)
-      if (itemExistsInPrimary) {
+      const { itemInPrimary, newerItemInSecondary } = await this.checkIfItemExistsInPrimaryDatabase(item)
+      if (itemInPrimary !== null) {
        alreadyExistingInPrimary.push(item)
-      } else {
+        continue
+      }
+      if (newerItemInSecondary !== null) {
+        updatedInSecondary.push(newerItemInSecondary)
+        continue
+      }
+      if (itemInPrimary === null && newerItemInSecondary === null) {
        newItemsInSecondary.push(item)
+        continue
      }
    }

    return {
-      alreadyExistingInPrimary: alreadyExistingInPrimary,
-      newItemsInSecondary: newItemsInSecondary,
+      alreadyExistingInPrimary,
+      newItemsInSecondary,
+      updatedInSecondary,
    }
  }

-  private async checkIfItemExistsInPrimaryDatabase(item: Item): Promise<boolean> {
+  private async checkIfItemExistsInPrimaryDatabase(
+    item: Item,
+  ): Promise<{ itemInPrimary: Item | null; newerItemInSecondary: Item | null }> {
    const itemInPrimary = await this.primaryItemRepository.findByUuid(item.uuid)

    if (itemInPrimary === null) {
-      return false
+      return { itemInPrimary: null, newerItemInSecondary: null }
    }

    if (!item.isIdenticalTo(itemInPrimary)) {
@@ -161,13 +186,16 @@ export class TransitionItemsFromPrimaryToSecondaryDatabaseForUser implements Use
        )}, revision in primary database: ${JSON.stringify(itemInPrimary)}`,
      )

-      return false
+      return {
+        itemInPrimary: null,
+        newerItemInSecondary: item.props.timestamps.updatedAt > itemInPrimary.props.timestamps.updatedAt ? item : null,
+      }
    }

-    return true
+    return { itemInPrimary: itemInPrimary, newerItemInSecondary: null }
  }

-  private async migrateItemsForUser(userUuid: Uuid): Promise<Result<void>> {
+  private async migrateItemsForUser(userUuid: Uuid, updatedItemsInSecondary: Item[]): Promise<Result<void>> {
    try {
      const totalItemsCountForUser = await this.primaryItemRepository.countAll({ userUuid: userUuid.value })
      const totalPages = Math.ceil(totalItemsCountForUser / this.pageSize)
@@ -181,6 +209,11 @@ export class TransitionItemsFromPrimaryToSecondaryDatabaseForUser implements Use
        const items = await this.primaryItemRepository.findAll(query)

        for (const item of items) {
+          if (updatedItemsInSecondary.find((updatedItem) => updatedItem.uuid.equals(item.uuid))) {
+            this.logger.info(`Skipping saving item ${item.uuid.value} as it was updated in secondary database`)
+
+            continue
+          }
          await (this.secondaryItemRepository as ItemRepositoryInterface).save(item)
        }
      }
@@ -204,6 +237,7 @@ export class TransitionItemsFromPrimaryToSecondaryDatabaseForUser implements Use
  private async checkIntegrityBetweenPrimaryAndSecondaryDatabase(
    userUuid: Uuid,
    newItemsInSecondaryCount: number,
+    updatedItemsInSecondary: Item[],
  ): Promise<Result<boolean>> {
    try {
      const totalItemsCountForUserInPrimary = await this.primaryItemRepository.countAll({ userUuid: userUuid.value })
@@ -235,6 +269,13 @@ export class TransitionItemsFromPrimaryToSecondaryDatabaseForUser implements Use
            return Result.fail(`Item ${item.uuid.value} not found in secondary database`)
          }

+          if (updatedItemsInSecondary.find((updatedItem) => updatedItem.uuid.equals(item.uuid))) {
+            this.logger.info(
+              `Skipping integrity check for item ${item.uuid.value} as it was updated in secondary database`,
+            )
+            continue
+          }
+
          if (!item.isIdenticalTo(itemInSecondary)) {
            return Result.fail(
              `Item ${
@@ -1,30 +0,0 @@
-import { DomainEventPublisherInterface } from '@standardnotes/domain-events'
-
-import { TriggerTransitionFromPrimaryToSecondaryDatabaseForUser } from './TriggerTransitionFromPrimaryToSecondaryDatabaseForUser'
-import { DomainEventFactoryInterface } from '../../../Event/DomainEventFactoryInterface'
-
-describe('TriggerTransitionFromPrimaryToSecondaryDatabaseForUser', () => {
-  let domainEventPubliser: DomainEventPublisherInterface
-  let domainEventFactory: DomainEventFactoryInterface
-
-  const createUseCase = () =>
-    new TriggerTransitionFromPrimaryToSecondaryDatabaseForUser(domainEventPubliser, domainEventFactory)
-
-  beforeEach(() => {
-    domainEventPubliser = {} as jest.Mocked<DomainEventPublisherInterface>
-    domainEventPubliser.publish = jest.fn()
-
-    domainEventFactory = {} as jest.Mocked<DomainEventFactoryInterface>
-    domainEventFactory.createTransitionStatusUpdatedEvent = jest.fn()
-  })
-
-  it('should publish transition status updated event', async () => {
-    const useCase = createUseCase()
-
-    await useCase.execute({
-      userUuid: '00000000-0000-0000-0000-000000000000',
-    })
-
-    expect(domainEventPubliser.publish).toHaveBeenCalled()
-  })
-})
@@ -1,24 +0,0 @@
-import { Result, UseCaseInterface } from '@standardnotes/domain-core'
-import { DomainEventPublisherInterface } from '@standardnotes/domain-events'
-
-import { TriggerTransitionFromPrimaryToSecondaryDatabaseForUserDTO } from './TriggerTransitionFromPrimaryToSecondaryDatabaseForUserDTO'
-import { DomainEventFactoryInterface } from '../../../Event/DomainEventFactoryInterface'
-
-export class TriggerTransitionFromPrimaryToSecondaryDatabaseForUser implements UseCaseInterface<void> {
-  constructor(
-    private domainEventPubliser: DomainEventPublisherInterface,
-    private domainEventFactory: DomainEventFactoryInterface,
-  ) {}
-
-  async execute(dto: TriggerTransitionFromPrimaryToSecondaryDatabaseForUserDTO): Promise<Result<void>> {
-    const event = this.domainEventFactory.createTransitionStatusUpdatedEvent({
-      userUuid: dto.userUuid,
-      status: 'STARTED',
-      transitionType: 'items',
-    })
-
-    await this.domainEventPubliser.publish(event)
-
-    return Result.ok()
-  }
-}
@@ -1,3 +0,0 @@
-export interface TriggerTransitionFromPrimaryToSecondaryDatabaseForUserDTO {
-  userUuid: string
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
standardci	de2e167582	chore(release): publish new version - @standardnotes/analytics@2.26.15 - @standardnotes/api-gateway@1.74.13 - @standardnotes/auth-server@1.143.2 - @standardnotes/domain-core@1.30.0 - @standardnotes/event-store@1.11.43 - @standardnotes/files-server@1.22.22 - @standardnotes/home-server@1.15.60 - @standardnotes/revisions-server@1.35.1 - @standardnotes/scheduler-server@1.20.47 - @standardnotes/settings@1.21.33 - @standardnotes/syncing-server@1.98.0 - @standardnotes/websockets-server@1.10.44	2023-09-18 08:44:10 +00:00
Karol Sójko	547a79e231	feat: add publishing notifications for users when a user is added to vault (#834 )	2023-09-18 10:27:24 +02:00
standardci	5a3afb3b17	chore(release): publish new version - @standardnotes/auth-server@1.143.1 - @standardnotes/home-server@1.15.59	2023-09-15 15:42:29 +00:00
Karol Sójko	66ef4be656	fix(auth): retrieving transition status	2023-09-15 17:23:49 +02:00
standardci	c5d0d63ddd	chore(release): publish new version - @standardnotes/analytics@2.26.14 - @standardnotes/api-gateway@1.74.12 - @standardnotes/auth-server@1.143.0 - @standardnotes/domain-core@1.29.0 - @standardnotes/domain-events-infra@1.12.30 - @standardnotes/domain-events@2.127.0 - @standardnotes/event-store@1.11.42 - @standardnotes/files-server@1.22.21 - @standardnotes/home-server@1.15.58 - @standardnotes/revisions-server@1.35.0 - @standardnotes/scheduler-server@1.20.46 - @standardnotes/settings@1.21.32 - @standardnotes/syncing-server@1.97.0 - @standardnotes/websockets-server@1.10.43	2023-09-15 15:13:07 +00:00
Karol Sójko	36f07c691a	feat: refactor transition to minimize status changes (#828 )	2023-09-15 16:56:08 +02:00
standardci	ac0390e7c3	chore(release): publish new version - @standardnotes/auth-server@1.142.1 - @standardnotes/home-server@1.15.57 - @standardnotes/revisions-server@1.34.1 - @standardnotes/syncing-server@1.96.1	2023-09-15 11:15:32 +00:00
Karol Sójko	0477507a6a	fix: add debug logs for updating transition status on auth	2023-09-15 12:57:43 +02:00
Karol Sójko	3e7856c895	fix: add debug logs for transition status updates	2023-09-15 12:55:04 +02:00
standardci	6778a80f21	chore(release): publish new version - @standardnotes/analytics@2.26.13 - @standardnotes/api-gateway@1.74.11 - @standardnotes/auth-server@1.142.0 - @standardnotes/domain-events-infra@1.12.29 - @standardnotes/domain-events@2.126.0 - @standardnotes/event-store@1.11.41 - @standardnotes/files-server@1.22.20 - @standardnotes/home-server@1.15.56 - @standardnotes/revisions-server@1.34.0 - @standardnotes/scheduler-server@1.20.45 - @standardnotes/syncing-server@1.96.0 - @standardnotes/websockets-server@1.10.42	2023-09-15 09:49:09 +00:00
Karol Sójko	d4d49454a6	feat: add skipping verified transitions (#827 ) * fix(syncing-server): remove transitioning individual users * feat: add skipping verified transitions * fix(auth): remove unused use case	2023-09-15 11:31:52 +02:00
standardci	04b52e6773	chore(release): publish new version - @standardnotes/auth-server@1.141.14 - @standardnotes/home-server@1.15.55 - @standardnotes/syncing-server@1.95.19	2023-09-15 08:53:53 +00:00
Karol Sójko	2a1859e4be	fix(auth): remove extensive logs from updating transitions	2023-09-15 10:35:50 +02:00
Karol Sójko	dd9a9c68cb	fix(auth): upgrade simplewebauthn dependency (#826 )	2023-09-15 10:35:14 +02:00
Karol Sójko	9147ff5d49	fix(syncing-server): remove unused index in mongodb	2023-09-14 14:18:20 +02:00
standardci	503b84531b	chore(release): publish new version - @standardnotes/auth-server@1.141.13 - @standardnotes/home-server@1.15.54 - @standardnotes/revisions-server@1.33.21 - @standardnotes/syncing-server@1.95.18	2023-09-14 10:16:54 +00:00
Karol Sójko	fe8ca828fb	fix(auth): set ttl for started and not picked up transitions to 10h	2023-09-14 11:57:21 +02:00
Karol Sójko	03a4a3f2ab	fix: skip already updated items and revisions in integrity check (#825 )	2023-09-14 11:54:30 +02:00
Karol Sójko	3a8607d146	fix(syncing-server): updating with missing creation date (#824 )	2023-09-14 11:45:24 +02:00
standardci	93b6e65554	chore(release): publish new version - @standardnotes/auth-server@1.141.12 - @standardnotes/home-server@1.15.53	2023-09-13 10:22:30 +00:00
Karol Sójko	5984e4c3e7	fix(auth): remove re-triggering revisions transition	2023-09-13 11:51:34 +02:00
standardci	b4257c10ea	chore(release): publish new version - @standardnotes/auth-server@1.141.11 - @standardnotes/home-server@1.15.52	2023-09-13 09:41:28 +00:00
Karol Sójko	c164bde847	fix(auth): passing transition timestamp	2023-09-13 11:03:32 +02:00
standardci	883df939dd	chore(release): publish new version - @standardnotes/api-gateway@1.74.10 - @standardnotes/auth-server@1.141.10 - @standardnotes/home-server@1.15.51 - @standardnotes/revisions-server@1.33.20 - @standardnotes/syncing-server@1.95.17	2023-09-13 08:40:17 +00:00
Karol Sójko	c7807d0f9e	fix: adjust transition timestamps to be universal	2023-09-13 10:25:02 +02:00
standardci	fc90343aaa	chore(release): publish new version - @standardnotes/home-server@1.15.50 - @standardnotes/revisions-server@1.33.19 - @standardnotes/syncing-server@1.95.16	2023-09-13 08:17:45 +00:00
Karol Sójko	fbcb45c3a2	fix: include handling updated items in revisions in secondary	2023-09-13 10:00:02 +02:00