chore(release): publish new version

- @standardnotes/home-server@1.15.70 - @standardnotes/syncing-server@1.100.0
feat(syncing-server): remove owned shared vaults upon account deletion (#838 )
2026-04-22 09:01:42 -04:00 · 2023-09-20 11:17:47 +00:00 · 2023-09-20 12:59:03 +02:00 · 2023-09-20 09:04:29 +00:00 · 2023-09-20 10:47:19 +02:00 · 2023-09-19 13:25:30 +00:00
46 changed files with 604 additions and 211 deletions
@@ -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.

+## [2.26.18](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.26.17...@standardnotes/analytics@2.26.18) (2023-09-20)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.26.17](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.26.16...@standardnotes/analytics@2.26.17) (2023-09-19)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
 ## [2.26.16](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.26.15...@standardnotes/analytics@2.26.16) (2023-09-18)

 **Note:** Version bump only for package @standardnotes/analytics
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/analytics",
-  "version": "2.26.16",
+  "version": "2.26.18",
  "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.74.16](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.74.15...@standardnotes/api-gateway@1.74.16) (2023-09-20)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.74.15](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.74.14...@standardnotes/api-gateway@1.74.15) (2023-09-19)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
 ## [1.74.14](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.74.13...@standardnotes/api-gateway@1.74.14) (2023-09-18)

 **Note:** Version bump only for package @standardnotes/api-gateway
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/api-gateway",
-  "version": "1.74.14",
+  "version": "1.74.16",
  "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.143.8](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.143.7...@standardnotes/auth-server@1.143.8) (2023-09-20)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.143.7](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.143.6...@standardnotes/auth-server@1.143.7) (2023-09-19)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
 ## [1.143.6](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.143.4...@standardnotes/auth-server@1.143.6) (2023-09-19)

 ### Bug Fixes
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/auth-server",
-  "version": "1.143.6",
+  "version": "1.143.8",
  "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.

+# [1.31.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-core@1.30.1...@standardnotes/domain-core@1.31.0) (2023-09-20)
+
+### Features
+
+* **syncing-server:** add notification for user upon declined shared vault invitation ([#837](https://github.com/standardnotes/server/issues/837)) ([31e7aaf](https://github.com/standardnotes/server/commit/31e7aaf253029a951d8b943d6cffd655cd5ca765))
+
+## [1.30.1](https://github.com/standardnotes/server/compare/@standardnotes/domain-core@1.30.0...@standardnotes/domain-core@1.30.1) (2023-09-19)
+
+### Bug Fixes
+
+* **domain-core:** allow any version and variant of the UUID format ([de081fe](https://github.com/standardnotes/server/commit/de081fe78658bdd36c8c5d86b70a16a2880aa3d1))
+
 # [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
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/domain-core",
-  "version": "1.30.0",
+  "version": "1.31.0",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -5,6 +5,7 @@ describe('Validator', () => {
    '2221101c-1da9-4d2b-9b32-b8be2a8d1c82',
    'c08f2f29-a74b-42b4-aefd-98af9832391c',
    'b453fa64-1493-443b-b5bb-bca7b9c696c7',
+    'fa7350b3-77cf-8c0c-40b2-6046b13254fe',
  ]

  const invalidUuids = [
@@ -1,12 +1,13 @@
 import { Result } from './Result'

 export class Validator {
-  private static readonly UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}$/i
+  private static readonly UUID_ANY_VERSION_AND_VARIANT_REGEX =
+    /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
  private static readonly EMAIL_REGEX =
    /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/

  static isValidUuid(value: string): Result<string> {
-    const matchesUuidRegex = String(value).toLowerCase().match(Validator.UUID_REGEX) !== null
+    const matchesUuidRegex = String(value).toLowerCase().match(Validator.UUID_ANY_VERSION_AND_VARIANT_REGEX) !== null
    if (matchesUuidRegex) {
      return Result.ok()
    }
@@ -7,6 +7,7 @@ export class NotificationType extends ValueObject<NotificationTypeProps> {
    SharedVaultItemRemoved: 'shared_vault_item_removed',
    RemovedFromSharedVault: 'removed_from_shared_vault',
    UserAddedToSharedVault: 'user_added_to_shared_vault',
+    SharedVaultInviteDeclined: 'shared_vault_invite_declined',
    SharedVaultFileUploaded: 'shared_vault_file_uploaded',
    SharedVaultFileRemoved: 'shared_vault_file_removed',
  }
@@ -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.11.46](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.11.45...@standardnotes/event-store@1.11.46) (2023-09-20)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
+## [1.11.45](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.11.44...@standardnotes/event-store@1.11.45) (2023-09-19)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
 ## [1.11.44](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.11.43...@standardnotes/event-store@1.11.44) (2023-09-18)

 **Note:** Version bump only for package @standardnotes/event-store
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/event-store",
-  "version": "1.11.44",
+  "version": "1.11.46",
  "description": "Event Store Service",
  "private": true,
  "main": "dist/src/index.js",
@@ -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.22.25](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.22.24...@standardnotes/files-server@1.22.25) (2023-09-20)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
+## [1.22.24](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.22.23...@standardnotes/files-server@1.22.24) (2023-09-19)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
 ## [1.22.23](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.22.22...@standardnotes/files-server@1.22.23) (2023-09-18)

 **Note:** Version bump only for package @standardnotes/files-server
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/files-server",
-  "version": "1.22.23",
+  "version": "1.22.25",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.15.70](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.69...@standardnotes/home-server@1.15.70) (2023-09-20)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.15.69](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.68...@standardnotes/home-server@1.15.69) (2023-09-20)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.15.68](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.67...@standardnotes/home-server@1.15.68) (2023-09-19)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.15.67](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.66...@standardnotes/home-server@1.15.67) (2023-09-19)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.15.66](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.65...@standardnotes/home-server@1.15.66) (2023-09-19)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.15.65](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.64...@standardnotes/home-server@1.15.65) (2023-09-19)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
 ## [1.15.64](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.63...@standardnotes/home-server@1.15.64) (2023-09-19)

 **Note:** Version bump only for package @standardnotes/home-server
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/home-server",
-  "version": "1.15.64",
+  "version": "1.15.70",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -3,6 +3,36 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.35.8](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.35.7...@standardnotes/revisions-server@1.35.8) (2023-09-20)
+
+**Note:** Version bump only for package @standardnotes/revisions-server
+
+## [1.35.7](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.35.6...@standardnotes/revisions-server@1.35.7) (2023-09-19)
+
+### Bug Fixes
+
+* skip removing already existing content in secondary to pick up where the transition left of ([857c6af](https://github.com/standardnotes/server/commit/857c6af9468ec829ff4dce9a96ba7bf9c14d55a5))
+
+## [1.35.6](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.35.5...@standardnotes/revisions-server@1.35.6) (2023-09-19)
+
+### Bug Fixes
+
+* increase timeout for secondary database to catch up for indexes to be rebuilt ([b265a39](https://github.com/standardnotes/server/commit/b265a39b635373c36ee8c3d8e09f0631159b3574))
+* logs verbosity during transitions ([e589029](https://github.com/standardnotes/server/commit/e589029722ab9f4debc8aa6cc78913f877eda2e3))
+
+## [1.35.5](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.35.4...@standardnotes/revisions-server@1.35.5) (2023-09-19)
+
+### Bug Fixes
+
+* add checking for secondary items logs ([a1a3e9f](https://github.com/standardnotes/server/commit/a1a3e9f586358b943b1b490a1382e42f081f7d06))
+* logs for removing already existing content and paging through diff of the content ([a40b17b](https://github.com/standardnotes/server/commit/a40b17b141f1d5954e1a45b969d5a941386c68d0))
+
+## [1.35.4](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.35.3...@standardnotes/revisions-server@1.35.4) (2023-09-19)
+
+### Bug Fixes
+
+* logs formatting during transition for better readability ([0ae028d](https://github.com/standardnotes/server/commit/0ae028db739decec8c50321b18b0af515e00bd23))
+
 ## [1.35.3](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.35.2...@standardnotes/revisions-server@1.35.3) (2023-09-19)

 ### Bug Fixes
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/revisions-server",
-  "version": "1.35.3",
+  "version": "1.35.8",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -29,7 +29,7 @@ export class TransitionRequestedEventHandler implements DomainEventHandlerInterf
    }

    if (await this.isAlreadyMigrated(userUuid)) {
-      this.logger.info(`User ${event.payload.userUuid} already migrated.`)
+      this.logger.info(`[${event.payload.userUuid}] User already migrated.`)

      await this.domainEventPublisher.publish(
        this.domainEventFactory.createTransitionStatusUpdatedEvent({
@@ -43,7 +43,7 @@ export class TransitionRequestedEventHandler implements DomainEventHandlerInterf
      return
    }

-    this.logger.info(`Handling transition requested event for user ${event.payload.userUuid}`)
+    this.logger.info(`[${event.payload.userUuid}] Handling transition requested event`)

    await this.domainEventPublisher.publish(
      this.domainEventFactory.createTransitionStatusUpdatedEvent({
@@ -59,7 +59,7 @@ export class TransitionRequestedEventHandler implements DomainEventHandlerInterf
    })

    if (result.isFailed()) {
-      this.logger.error(`Failed to transition for user ${event.payload.userUuid}`)
+      this.logger.error(`[${event.payload.userUuid}] Failed to transition: ${result.getError()}`)

      await this.domainEventPublisher.publish(
        this.domainEventFactory.createTransitionStatusUpdatedEvent({
@@ -88,7 +88,7 @@ export class TransitionRequestedEventHandler implements DomainEventHandlerInterf

    if (totalRevisionsCountForUserInPrimary > 0) {
      this.logger.info(
-        `User ${userUuid.value} has ${totalRevisionsCountForUserInPrimary} revisions in primary database.`,
+        `[${userUuid.value}] User has ${totalRevisionsCountForUserInPrimary} revisions in primary database.`,
      )
    }

@@ -98,9 +98,7 @@ export class TransitionRequestedEventHandler implements DomainEventHandlerInterf
  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()}`,
-      )
+      this.logger.error(`[${event.payload.userUuid}] Failed to transition revisions: ${userUuidOrError.getError()}`)
      await this.domainEventPublisher.publish(
        this.domainEventFactory.createTransitionStatusUpdatedEvent({
          userUuid: event.payload.userUuid,
@@ -17,7 +17,7 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
  ) {}

  async execute(dto: TransitionRevisionsFromPrimaryToSecondaryDatabaseForUserDTO): Promise<Result<void>> {
-    this.logger.info(`Transitioning revisions for user ${dto.userUuid}`)
+    this.logger.info(`[${dto.userUuid}] Transitioning revisions for user`)

    if (this.secondRevisionsRepository === null) {
      return Result.fail('Secondary revision repository is not set')
@@ -31,30 +31,27 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements

    let newRevisionsInSecondaryCount = 0
    let updatedRevisionsInSecondary: string[] = []
+    let alreadyIdenticalInSecondaryAndPrimary: string[] = []
    if (await this.hasAlreadyDataInSecondaryDatabase(userUuid)) {
-      const { alreadyExistingInPrimary, newRevisionsInSecondary, updatedInSecondary } =
+      const { alreadyExistingInSecondaryAndPrimary, newRevisionsInSecondary, updatedInSecondary } =
        await this.getNewRevisionsCreatedInSecondaryDatabase(userUuid)

-      for (const existingRevisionUuid of alreadyExistingInPrimary) {
-        this.logger.info(`Removing revision ${existingRevisionUuid} from secondary database`)
-        await (this.secondRevisionsRepository as RevisionRepositoryInterface).removeOneByUuid(
-          Uuid.create(existingRevisionUuid).getValue(),
-          userUuid,
-        )
-      }
+      this.logger.info(
+        `[${dto.userUuid}] ${alreadyExistingInSecondaryAndPrimary.length} already existing identical revisions in primary and secondary.`,
+      )
+
+      alreadyIdenticalInSecondaryAndPrimary = alreadyExistingInSecondaryAndPrimary

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

      newRevisionsInSecondaryCount = newRevisionsInSecondary.length

      if (updatedInSecondary.length > 0) {
-        this.logger.info(
-          `Found ${updatedInSecondary.length} updated revisions in secondary database for user ${userUuid.value}`,
-        )
+        this.logger.info(`[${dto.userUuid}] Found ${updatedInSecondary.length} updated revisions in secondary database`)
      }

      updatedRevisionsInSecondary = updatedInSecondary
@@ -66,15 +63,19 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements

    const migrationTimeStart = this.timer.getTimestampInMicroseconds()

-    this.logger.debug(`Transitioning revisions for user ${userUuid.value}`)
+    this.logger.info(`[${dto.userUuid}] Migrating revisions`)

-    const migrationResult = await this.migrateRevisionsForUser(userUuid, updatedRevisionsInSecondary)
+    const migrationResult = await this.migrateRevisionsForUser(
+      userUuid,
+      updatedRevisionsInSecondary,
+      alreadyIdenticalInSecondaryAndPrimary,
+    )
    if (migrationResult.isFailed()) {
      if (newRevisionsInSecondaryCount === 0 && updatedRevisionsInSecondaryCount === 0) {
        const cleanupResult = await this.deleteRevisionsForUser(userUuid, this.secondRevisionsRepository)
        if (cleanupResult.isFailed()) {
          this.logger.error(
-            `Failed to clean up secondary database revisions for user ${userUuid.value}: ${cleanupResult.getError()}`,
+            `[${dto.userUuid}] Failed to clean up secondary database revisions: ${cleanupResult.getError()}`,
          )
        }
      }
@@ -88,13 +89,14 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
      userUuid,
      newRevisionsInSecondaryCount,
      updatedRevisionsInSecondary,
+      alreadyIdenticalInSecondaryAndPrimary,
    )
    if (integrityCheckResult.isFailed()) {
      if (newRevisionsInSecondaryCount === 0 && updatedRevisionsInSecondaryCount === 0) {
        const cleanupResult = await this.deleteRevisionsForUser(userUuid, this.secondRevisionsRepository)
        if (cleanupResult.isFailed()) {
          this.logger.error(
-            `Failed to clean up secondary database revisions for user ${userUuid.value}: ${cleanupResult.getError()}`,
+            `[${dto.userUuid}] Failed to clean up secondary database revisions: ${cleanupResult.getError()}`,
          )
        }
      }
@@ -104,9 +106,7 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements

    const cleanupResult = await this.deleteRevisionsForUser(userUuid, this.primaryRevisionsRepository)
    if (cleanupResult.isFailed()) {
-      this.logger.error(
-        `Failed to clean up primary database revisions for user ${userUuid.value}: ${cleanupResult.getError()}`,
-      )
+      this.logger.error(`[${dto.userUuid}] Failed to clean up primary database revisions: ${cleanupResult.getError()}`)
    }

    const migrationTimeEnd = this.timer.getTimestampInMicroseconds()
@@ -115,16 +115,19 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
    const migrationDurationTimeStructure = this.timer.convertMicrosecondsToTimeStructure(migrationDuration)

    this.logger.info(
-      `Transitioned revisions for user ${userUuid.value} in ${migrationDurationTimeStructure.hours}h ${migrationDurationTimeStructure.minutes}m ${migrationDurationTimeStructure.seconds}s ${migrationDurationTimeStructure.milliseconds}ms`,
+      `[${dto.userUuid}] Transitioned revisions in ${migrationDurationTimeStructure.hours}h ${migrationDurationTimeStructure.minutes}m ${migrationDurationTimeStructure.seconds}s ${migrationDurationTimeStructure.milliseconds}ms`,
    )

    return Result.ok()
  }

-  private async migrateRevisionsForUser(userUuid: Uuid, updatedRevisionsInSecondary: string[]): Promise<Result<void>> {
+  private async migrateRevisionsForUser(
+    userUuid: Uuid,
+    updatedRevisionsInSecondary: string[],
+    alreadyExistingInSecondaryAndPrimary: string[],
+  ): Promise<Result<void>> {
    try {
      const totalRevisionsCountForUser = await this.primaryRevisionsRepository.countByUserUuid(userUuid)
-      let totalRevisionsCountTransitionedToSecondary = 0
      const totalPages = Math.ceil(totalRevisionsCountForUser / this.pageSize)
      for (let currentPage = 1; currentPage <= totalPages; currentPage++) {
        const query = {
@@ -141,23 +144,26 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
              updatedRevisionsInSecondary.find((updatedRevisionUuid) => updatedRevisionUuid === revision.id.toString())
            ) {
              this.logger.info(
-                `Skipping saving revision ${revision.id.toString()} as it was updated in secondary database`,
+                `[${
+                  userUuid.value
+                }] Skipping saving revision ${revision.id.toString()} as it was updated in secondary database`,
              )

              continue
            }

-            this.logger.debug(
-              `Transitioning revision #${
-                totalRevisionsCountTransitionedToSecondary + 1
-              }: ${revision.id.toString()} to secondary database`,
-            )
+            if (
+              alreadyExistingInSecondaryAndPrimary.find(
+                (alreadyExistingRevisionUuid) => alreadyExistingRevisionUuid === revision.id.toString(),
+              )
+            ) {
+              continue
+            }

            const didSave = await (this.secondRevisionsRepository as RevisionRepositoryInterface).insert(revision)
            if (!didSave) {
              return Result.fail(`Failed to save revision ${revision.id.toString()} to secondary database`)
            }
-            totalRevisionsCountTransitionedToSecondary++
          } catch (error) {
            return Result.fail(
              `Errored when saving revision ${revision.id.toString()} to secondary database: ${
@@ -168,8 +174,6 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
        }
      }

-      this.logger.debug(`Transitioned ${totalRevisionsCountTransitionedToSecondary} revisions to secondary database`)
-
      return Result.ok()
    } catch (error) {
      return Result.fail(`Errored when migrating revisions for user ${userUuid.value}: ${(error as Error).message}`)
@@ -190,8 +194,8 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
  }

  private async allowForSecondaryDatabaseToCatchUp(): Promise<void> {
-    const twoSecondsInMilliseconds = 2_000
-    await this.timer.sleep(twoSecondsInMilliseconds)
+    const tenSecondsInMillisecondsToRebuildIndexes = 10_000
+    await this.timer.sleep(tenSecondsInMillisecondsToRebuildIndexes)
  }

  private async hasAlreadyDataInSecondaryDatabase(userUuid: Uuid): Promise<boolean> {
@@ -202,7 +206,7 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
    const hasAlreadyDataInSecondaryDatabase = totalRevisionsCountForUserInSecondary > 0
    if (hasAlreadyDataInSecondaryDatabase) {
      this.logger.info(
-        `User ${userUuid.value} has already ${totalRevisionsCountForUserInSecondary} revisions in secondary database`,
+        `[${userUuid.value}] User has already ${totalRevisionsCountForUserInSecondary} revisions in secondary database`,
      )
    }

@@ -210,14 +214,18 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
  }

  private async getNewRevisionsCreatedInSecondaryDatabase(userUuid: Uuid): Promise<{
-    alreadyExistingInPrimary: string[]
+    alreadyExistingInSecondaryAndPrimary: string[]
    newRevisionsInSecondary: string[]
    updatedInSecondary: string[]
  }> {
-    const totalRevisionsCountForUser = await this.primaryRevisionsRepository.countByUserUuid(userUuid)
+    this.logger.info(`[${userUuid.value}] Checking for new revisions created in secondary database`)
+
+    const totalRevisionsCountForUser = await (
+      this.secondRevisionsRepository as RevisionRepositoryInterface
+    ).countByUserUuid(userUuid)
    const totalPages = Math.ceil(totalRevisionsCountForUser / this.pageSize)

-    const alreadyExistingInPrimary: string[] = []
+    const alreadyExistingInSecondaryAndPrimary: string[] = []
    const newRevisionsInSecondary: string[] = []
    const updatedInSecondary: string[] = []

@@ -230,17 +238,17 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements

      const revisions = await (this.secondRevisionsRepository as RevisionRepositoryInterface).findByUserUuid(query)
      for (const revision of revisions) {
-        const { revisionInPrimary, newerRevisionInSecondary } =
+        const { identicalRevisionInPrimary, newerRevisionInSecondary } =
          await this.checkIfRevisionExistsInPrimaryDatabase(revision)
-        if (revisionInPrimary !== null) {
-          alreadyExistingInPrimary.push(revision.id.toString())
+        if (identicalRevisionInPrimary !== null) {
+          alreadyExistingInSecondaryAndPrimary.push(revision.id.toString())
          continue
        }
        if (newerRevisionInSecondary !== null) {
          updatedInSecondary.push(newerRevisionInSecondary.id.toString())
          continue
        }
-        if (revisionInPrimary === null && newerRevisionInSecondary === null) {
+        if (identicalRevisionInPrimary === null && newerRevisionInSecondary === null) {
          newRevisionsInSecondary.push(revision.id.toString())
          continue
        }
@@ -248,7 +256,7 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
    }

    return {
-      alreadyExistingInPrimary,
+      alreadyExistingInSecondaryAndPrimary,
      newRevisionsInSecondary,
      updatedInSecondary,
    }
@@ -256,7 +264,7 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements

  private async checkIfRevisionExistsInPrimaryDatabase(
    revision: Revision,
-  ): Promise<{ revisionInPrimary: Revision | null; newerRevisionInSecondary: Revision | null }> {
+  ): Promise<{ identicalRevisionInPrimary: Revision | null; newerRevisionInSecondary: Revision | null }> {
    const revisionInPrimary = await this.primaryRevisionsRepository.findOneByUuid(
      Uuid.create(revision.id.toString()).getValue(),
      revision.props.userUuid as Uuid,
@@ -265,27 +273,28 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements

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

    if (!revision.isIdenticalTo(revisionInPrimary)) {
      this.logger.error(
-        `Revision ${revision.id.toString()} is not identical in primary and secondary database. Revision in secondary database: ${JSON.stringify(
+        `[${revision.props.userUuid
+          ?.value}] Revision ${revision.id.toString()} is not identical in primary and secondary database. Revision in secondary database: ${JSON.stringify(
          revision,
        )}, revision in primary database: ${JSON.stringify(revisionInPrimary)}`,
      )

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

    return {
-      revisionInPrimary: revisionInPrimary,
+      identicalRevisionInPrimary: revisionInPrimary,
      newerRevisionInSecondary: null,
    }
  }
@@ -294,6 +303,7 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
    userUuid: Uuid,
    newRevisionsInSecondaryCount: number,
    updatedRevisionsInSecondary: string[],
+    alreadyExistingInSecondaryAndPrimary: string[],
  ): Promise<Result<boolean>> {
    try {
      const totalRevisionsCountForUserInPrimary = await this.primaryRevisionsRepository.countByUserUuid(userUuid)
@@ -327,11 +337,21 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
            updatedRevisionsInSecondary.find((updatedRevisionUuid) => updatedRevisionUuid === revision.id.toString())
          ) {
            this.logger.info(
-              `Skipping integrity check for revision ${revision.id.toString()} as it was updated in secondary database`,
+              `[${
+                userUuid.value
+              }] Skipping integrity check for revision ${revision.id.toString()} as it was updated in secondary database`,
            )
            continue
          }

+          if (
+            alreadyExistingInSecondaryAndPrimary.find(
+              (alreadyExistingRevisionUuid) => alreadyExistingRevisionUuid === revision.id.toString(),
+            )
+          ) {
+            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(
@@ -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.20.50](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.20.49...@standardnotes/scheduler-server@1.20.50) (2023-09-20)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
+## [1.20.49](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.20.48...@standardnotes/scheduler-server@1.20.49) (2023-09-19)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
 ## [1.20.48](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.20.47...@standardnotes/scheduler-server@1.20.48) (2023-09-18)

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

+# [1.100.0](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.99.0...@standardnotes/syncing-server@1.100.0) (2023-09-20)
+
+### Features
+
+* **syncing-server:** remove owned shared vaults upon account deletion ([#838](https://github.com/standardnotes/syncing-server-js/issues/838)) ([22a8cc9](https://github.com/standardnotes/syncing-server-js/commit/22a8cc90f1232fd5f5646f613c80bd7c60186670))
+
+# [1.99.0](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.98.6...@standardnotes/syncing-server@1.99.0) (2023-09-20)
+
+### Features
+
+* **syncing-server:** add notification for user upon declined shared vault invitation ([#837](https://github.com/standardnotes/syncing-server-js/issues/837)) ([31e7aaf](https://github.com/standardnotes/syncing-server-js/commit/31e7aaf253029a951d8b943d6cffd655cd5ca765))
+
+## [1.98.6](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.98.5...@standardnotes/syncing-server@1.98.6) (2023-09-19)
+
+### Bug Fixes
+
+* skip removing already existing content in secondary to pick up where the transition left of ([857c6af](https://github.com/standardnotes/syncing-server-js/commit/857c6af9468ec829ff4dce9a96ba7bf9c14d55a5))
+
+## [1.98.5](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.98.4...@standardnotes/syncing-server@1.98.5) (2023-09-19)
+
+### Bug Fixes
+
+* increase timeout for secondary database to catch up for indexes to be rebuilt ([b265a39](https://github.com/standardnotes/syncing-server-js/commit/b265a39b635373c36ee8c3d8e09f0631159b3574))
+* logs verbosity during transitions ([e589029](https://github.com/standardnotes/syncing-server-js/commit/e589029722ab9f4debc8aa6cc78913f877eda2e3))
+
+## [1.98.4](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.98.3...@standardnotes/syncing-server@1.98.4) (2023-09-19)
+
+### Bug Fixes
+
+* add checking for secondary items logs ([a1a3e9f](https://github.com/standardnotes/syncing-server-js/commit/a1a3e9f586358b943b1b490a1382e42f081f7d06))
+* logs for removing already existing content and paging through diff of the content ([a40b17b](https://github.com/standardnotes/syncing-server-js/commit/a40b17b141f1d5954e1a45b969d5a941386c68d0))
+
+## [1.98.3](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.98.2...@standardnotes/syncing-server@1.98.3) (2023-09-19)
+
+### Bug Fixes
+
+* logs formatting during transition for better readability ([0ae028d](https://github.com/standardnotes/syncing-server-js/commit/0ae028db739decec8c50321b18b0af515e00bd23))
+
 ## [1.98.2](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.98.1...@standardnotes/syncing-server@1.98.2) (2023-09-19)

 ### Bug Fixes
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/syncing-server",
-  "version": "1.98.2",
+  "version": "1.100.0",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -165,6 +165,7 @@ import { SQLItemPersistenceMapper } from '../Mapping/Persistence/SQLItemPersiste
 import { SQLItemRepository } from '../Infra/TypeORM/SQLItemRepository'
 import { SendEventToClient } from '../Domain/UseCase/Syncing/SendEventToClient/SendEventToClient'
 import { TransitionRequestedEventHandler } from '../Domain/Handler/TransitionRequestedEventHandler'
+import { DeleteSharedVaults } from '../Domain/UseCase/SharedVaults/DeleteSharedVaults/DeleteSharedVaults'

 export class ContainerConfigLoader {
  private readonly DEFAULT_CONTENT_SIZE_TRANSFER_LIMIT = 10_000_000
@@ -723,7 +724,12 @@ export class ContainerConfigLoader {
      )
    container
      .bind<DeclineInviteToSharedVault>(TYPES.Sync_DeclineInviteToSharedVault)
-      .toConstantValue(new DeclineInviteToSharedVault(container.get(TYPES.Sync_SharedVaultInviteRepository)))
+      .toConstantValue(
+        new DeclineInviteToSharedVault(
+          container.get<SharedVaultInviteRepositoryInterface>(TYPES.Sync_SharedVaultInviteRepository),
+          container.get<AddNotificationForUser>(TYPES.Sync_AddNotificationForUser),
+        ),
+      )
    container
      .bind<DeleteSharedVaultInvitesToUser>(TYPES.Sync_DeleteSharedVaultInvitesToUser)
      .toConstantValue(
@@ -775,10 +781,19 @@ export class ContainerConfigLoader {
      .bind<DeleteSharedVault>(TYPES.Sync_DeleteSharedVault)
      .toConstantValue(
        new DeleteSharedVault(
-          container.get(TYPES.Sync_SharedVaultRepository),
-          container.get(TYPES.Sync_SharedVaultUserRepository),
-          container.get(TYPES.Sync_SharedVaultInviteRepository),
-          container.get(TYPES.Sync_RemoveSharedVaultUser),
+          container.get<SharedVaultRepositoryInterface>(TYPES.Sync_SharedVaultRepository),
+          container.get<SharedVaultUserRepositoryInterface>(TYPES.Sync_SharedVaultUserRepository),
+          container.get<SharedVaultInviteRepositoryInterface>(TYPES.Sync_SharedVaultInviteRepository),
+          container.get<RemoveUserFromSharedVault>(TYPES.Sync_RemoveSharedVaultUser),
+          container.get<DeclineInviteToSharedVault>(TYPES.Sync_DeclineInviteToSharedVault),
+        ),
+      )
+    container
+      .bind<DeleteSharedVaults>(TYPES.Sync_DeleteSharedVaults)
+      .toConstantValue(
+        new DeleteSharedVaults(
+          container.get<SharedVaultRepositoryInterface>(TYPES.Sync_SharedVaultRepository),
+          container.get<DeleteSharedVault>(TYPES.Sync_DeleteSharedVault),
        ),
      )
    container
@@ -897,6 +912,7 @@ export class ContainerConfigLoader {
      .toConstantValue(
        new AccountDeletionRequestedEventHandler(
          container.get<ItemRepositoryResolverInterface>(TYPES.Sync_ItemRepositoryResolver),
+          container.get<DeleteSharedVaults>(TYPES.Sync_DeleteSharedVaults),
          container.get<Logger>(TYPES.Sync_Logger),
        ),
      )
@@ -54,6 +54,7 @@ const TYPES = {
  Sync_GetSharedVaults: Symbol.for('Sync_GetSharedVaults'),
  Sync_CreateSharedVault: Symbol.for('Sync_CreateSharedVault'),
  Sync_DeleteSharedVault: Symbol.for('Sync_DeleteSharedVault'),
+  Sync_DeleteSharedVaults: Symbol.for('Sync_DeleteSharedVaults'),
  Sync_CreateSharedVaultFileValetToken: Symbol.for('Sync_CreateSharedVaultFileValetToken'),
  Sync_GetSharedVaultUsers: Symbol.for('Sync_GetSharedVaultUsers'),
  Sync_AddUserToSharedVault: Symbol.for('Sync_AddUserToSharedVault'),
@@ -1,71 +0,0 @@
-import 'reflect-metadata'
-
-import { AccountDeletionRequestedEvent } from '@standardnotes/domain-events'
-import { Logger } from 'winston'
-import { Item } from '../Item/Item'
-import { ItemRepositoryInterface } from '../Item/ItemRepositoryInterface'
-import { AccountDeletionRequestedEventHandler } from './AccountDeletionRequestedEventHandler'
-import { Uuid, ContentType, Dates, Timestamps, UniqueEntityId } from '@standardnotes/domain-core'
-import { ItemRepositoryResolverInterface } from '../Item/ItemRepositoryResolverInterface'
-
-describe('AccountDeletionRequestedEventHandler', () => {
-  let itemRepositoryResolver: ItemRepositoryResolverInterface
-  let itemRepository: ItemRepositoryInterface
-  let logger: Logger
-  let event: AccountDeletionRequestedEvent
-  let item: Item
-
-  const createHandler = () => new AccountDeletionRequestedEventHandler(itemRepositoryResolver, logger)
-
-  beforeEach(() => {
-    item = Item.create(
-      {
-        userUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
-        updatedWithSession: null,
-        content: 'foobar',
-        contentType: ContentType.create(ContentType.TYPES.Note).getValue(),
-        encItemKey: null,
-        authHash: null,
-        itemsKeyId: null,
-        duplicateOf: null,
-        deleted: false,
-        dates: Dates.create(new Date(1616164633241311), new Date(1616164633241311)).getValue(),
-        timestamps: Timestamps.create(1616164633241311, 1616164633241311).getValue(),
-      },
-      new UniqueEntityId('00000000-0000-0000-0000-000000000000'),
-    ).getValue()
-
-    itemRepository = {} as jest.Mocked<ItemRepositoryInterface>
-    itemRepository.findAll = jest.fn().mockReturnValue([item])
-    itemRepository.deleteByUserUuid = jest.fn()
-
-    itemRepositoryResolver = {} as jest.Mocked<ItemRepositoryResolverInterface>
-    itemRepositoryResolver.resolve = jest.fn().mockReturnValue(itemRepository)
-
-    logger = {} as jest.Mocked<Logger>
-    logger.info = jest.fn()
-
-    event = {} as jest.Mocked<AccountDeletionRequestedEvent>
-    event.createdAt = new Date(1)
-    event.payload = {
-      userUuid: '2-3-4',
-      userCreatedAtTimestamp: 1,
-      regularSubscriptionUuid: '1-2-3',
-      roleNames: ['CORE_USER'],
-    }
-  })
-
-  it('should remove all items for a user', async () => {
-    await createHandler().handle(event)
-
-    expect(itemRepository.deleteByUserUuid).toHaveBeenCalledWith('2-3-4')
-  })
-
-  it('should do nothing if role names are not valid', async () => {
-    event.payload.roleNames = ['INVALID_ROLE_NAME']
-
-    await createHandler().handle(event)
-
-    expect(itemRepository.deleteByUserUuid).not.toHaveBeenCalled()
-  })
-})
@@ -3,10 +3,12 @@ import { RoleNameCollection } from '@standardnotes/domain-core'
 import { Logger } from 'winston'

 import { ItemRepositoryResolverInterface } from '../Item/ItemRepositoryResolverInterface'
+import { DeleteSharedVaults } from '../UseCase/SharedVaults/DeleteSharedVaults/DeleteSharedVaults'

 export class AccountDeletionRequestedEventHandler implements DomainEventHandlerInterface {
  constructor(
    private itemRepositoryResolver: ItemRepositoryResolverInterface,
+    private deleteSharedVaults: DeleteSharedVaults,
    private logger: Logger,
  ) {}

@@ -21,6 +23,15 @@ export class AccountDeletionRequestedEventHandler implements DomainEventHandlerI

    await itemRepository.deleteByUserUuid(event.payload.userUuid)

+    const result = await this.deleteSharedVaults.execute({
+      ownerUuid: event.payload.userUuid,
+    })
+    if (result.isFailed()) {
+      this.logger.error(`Failed to delete shared vaults for user: ${event.payload.userUuid}: ${result.getError()}`)
+
+      return
+    }
+
    this.logger.info(`Finished account cleanup for user: ${event.payload.userUuid}`)
  }
 }
@@ -30,7 +30,7 @@ export class TransitionRequestedEventHandler implements DomainEventHandlerInterf
    }

    if (await this.isAlreadyMigrated(userUuid)) {
-      this.logger.info(`User ${event.payload.userUuid} already migrated.`)
+      this.logger.info(`[${event.payload.userUuid}] User already migrated.`)

      await this.domainEventPublisher.publish(
        this.domainEventFactory.createTransitionStatusUpdatedEvent({
@@ -44,7 +44,7 @@ export class TransitionRequestedEventHandler implements DomainEventHandlerInterf
      return
    }

-    this.logger.info(`Handling transition requested event for user ${event.payload.userUuid}`)
+    this.logger.info(`[${event.payload.userUuid}] Handling transition requested event`)

    await this.domainEventPublisher.publish(
      this.domainEventFactory.createTransitionStatusUpdatedEvent({
@@ -60,7 +60,7 @@ export class TransitionRequestedEventHandler implements DomainEventHandlerInterf
    })

    if (result.isFailed()) {
-      this.logger.error(`Failed to trigger transition for user ${event.payload.userUuid}`)
+      this.logger.error(`[${event.payload.userUuid}] Failed to trigger transition: ${result.getError()}`)

      await this.domainEventPublisher.publish(
        this.domainEventFactory.createTransitionStatusUpdatedEvent({
@@ -90,7 +90,7 @@ export class TransitionRequestedEventHandler implements DomainEventHandlerInterf
    })

    if (totalItemsCountForUserInPrimary > 0) {
-      this.logger.info(`User ${userUuid.value} has ${totalItemsCountForUserInPrimary} items in primary database.`)
+      this.logger.info(`[${userUuid.value}] User has ${totalItemsCountForUserInPrimary} items in primary database.`)
    }

    return totalItemsCountForUserInPrimary === 0
@@ -99,7 +99,7 @@ export class TransitionRequestedEventHandler implements DomainEventHandlerInterf
  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()}`)
+      this.logger.error(`[${event.payload.userUuid}] Failed to transition items: ${userUuidOrError.getError()}`)

      await this.domainEventPublisher.publish(
        this.domainEventFactory.createTransitionStatusUpdatedEvent({
@@ -3,6 +3,7 @@ import { SharedVault } from './SharedVault'

 export interface SharedVaultRepositoryInterface {
  findByUuid(uuid: Uuid): Promise<SharedVault | null>
+  findByUserUuid(userUuid: Uuid): Promise<SharedVault[]>
  countByUserUuid(userUuid: Uuid): Promise<number>
  findByUuids(uuids: Uuid[], lastSyncTime?: number): Promise<SharedVault[]>
  save(sharedVault: SharedVault): Promise<void>
@@ -6,7 +6,7 @@ export interface SharedVaultInviteRepositoryInterface {
  findByUuid(sharedVaultInviteUuid: Uuid): Promise<SharedVaultInvite | null>
  save(sharedVaultInvite: SharedVaultInvite): Promise<void>
  remove(sharedVaultInvite: SharedVaultInvite): Promise<void>
-  removeBySharedVaultUuid(sharedVaultUuid: Uuid): Promise<void>
+  findBySharedVaultUuid(sharedVaultUuid: Uuid): Promise<SharedVaultInvite[]>
  findByUserUuid(userUuid: Uuid): Promise<SharedVaultInvite[]>
  findByUserUuidUpdatedAfter(userUuid: Uuid, updatedAtTimestamp: number): Promise<SharedVaultInvite[]>
  findBySenderUuid(senderUuid: Uuid): Promise<SharedVaultInvite[]>
@@ -1,13 +1,15 @@
-import { SharedVaultUserPermission, Timestamps, Uuid } from '@standardnotes/domain-core'
+import { NotificationPayload, Result, SharedVaultUserPermission, Timestamps, Uuid } from '@standardnotes/domain-core'
 import { SharedVaultInviteRepositoryInterface } from '../../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface'
 import { DeclineInviteToSharedVault } from './DeclineInviteToSharedVault'
 import { SharedVaultInvite } from '../../../SharedVault/User/Invite/SharedVaultInvite'
+import { AddNotificationForUser } from '../../Messaging/AddNotificationForUser/AddNotificationForUser'

 describe('DeclineInviteToSharedVault', () => {
  let sharedVaultInviteRepository: SharedVaultInviteRepositoryInterface
  let invite: SharedVaultInvite
+  let addNotificationForUser: AddNotificationForUser

-  const createUseCase = () => new DeclineInviteToSharedVault(sharedVaultInviteRepository)
+  const createUseCase = () => new DeclineInviteToSharedVault(sharedVaultInviteRepository, addNotificationForUser)

  beforeEach(() => {
    invite = SharedVaultInvite.create({
@@ -22,6 +24,9 @@ describe('DeclineInviteToSharedVault', () => {
    sharedVaultInviteRepository = {} as jest.Mocked<SharedVaultInviteRepositoryInterface>
    sharedVaultInviteRepository.findByUuid = jest.fn().mockResolvedValue(invite)
    sharedVaultInviteRepository.remove = jest.fn()
+
+    addNotificationForUser = {} as jest.Mocked<AddNotificationForUser>
+    addNotificationForUser.execute = jest.fn().mockReturnValue(Result.ok())
  })

  it('should fail if invite uuid is invalid', async () => {
@@ -36,6 +41,37 @@ describe('DeclineInviteToSharedVault', () => {
    expect(result.getError()).toBe('Given value is not a valid uuid: invalid')
  })

+  it('should fail if adding a notification for user fails', async () => {
+    addNotificationForUser.execute = jest.fn().mockReturnValue(Result.fail('Error'))
+
+    const useCase = createUseCase()
+
+    const result = await useCase.execute({
+      inviteUuid: '00000000-0000-0000-0000-000000000000',
+      userUuid: '00000000-0000-0000-0000-000000000000',
+    })
+
+    expect(result.isFailed()).toBe(true)
+    expect(result.getError()).toBe('Error')
+  })
+
+  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({
+      inviteUuid: '00000000-0000-0000-0000-000000000000',
+      userUuid: '00000000-0000-0000-0000-000000000000',
+    })
+
+    expect(result.isFailed()).toBe(true)
+    expect(result.getError()).toBe('Oops')
+
+    mock.mockRestore()
+  })
+
  it('should fail if originator uuid is invalid', async () => {
    const useCase = createUseCase()

@@ -1,9 +1,14 @@
-import { Result, UseCaseInterface, Uuid } from '@standardnotes/domain-core'
+import { NotificationPayload, NotificationType, Result, UseCaseInterface, Uuid } from '@standardnotes/domain-core'
+
 import { DeclineInviteToSharedVaultDTO } from './DeclineInviteToSharedVaultDTO'
 import { SharedVaultInviteRepositoryInterface } from '../../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface'
+import { AddNotificationForUser } from '../../Messaging/AddNotificationForUser/AddNotificationForUser'

 export class DeclineInviteToSharedVault implements UseCaseInterface<void> {
-  constructor(private sharedVaultInviteRepository: SharedVaultInviteRepositoryInterface) {}
+  constructor(
+    private sharedVaultInviteRepository: SharedVaultInviteRepositoryInterface,
+    private addNotificationForUser: AddNotificationForUser,
+  ) {}

  async execute(dto: DeclineInviteToSharedVaultDTO): Promise<Result<void>> {
    const inviteUuidOrError = Uuid.create(dto.inviteUuid)
@@ -29,6 +34,26 @@ export class DeclineInviteToSharedVault implements UseCaseInterface<void> {

    await this.sharedVaultInviteRepository.remove(invite)

+    const notificationPayloadOrError = NotificationPayload.create({
+      sharedVaultUuid: invite.props.sharedVaultUuid,
+      type: NotificationType.create(NotificationType.TYPES.SharedVaultInviteDeclined).getValue(),
+      version: '1.0',
+    })
+    if (notificationPayloadOrError.isFailed()) {
+      return Result.fail(notificationPayloadOrError.getError())
+    }
+    const notificationPayload = notificationPayloadOrError.getValue()
+
+    const result = await this.addNotificationForUser.execute({
+      userUuid: invite.props.userUuid.value,
+      type: NotificationType.TYPES.SharedVaultInviteDeclined,
+      payload: notificationPayload,
+      version: '1.0',
+    })
+    if (result.isFailed()) {
+      return Result.fail(result.getError())
+    }
+
    return Result.ok()
  }
 }
@@ -6,14 +6,18 @@ import { SharedVaultUserRepositoryInterface } from '../../../SharedVault/User/Sh
 import { DeleteSharedVault } from './DeleteSharedVault'
 import { SharedVault } from '../../../SharedVault/SharedVault'
 import { RemoveUserFromSharedVault } from '../RemoveUserFromSharedVault/RemoveUserFromSharedVault'
+import { DeclineInviteToSharedVault } from '../DeclineInviteToSharedVault/DeclineInviteToSharedVault'
+import { SharedVaultInvite } from '../../../SharedVault/User/Invite/SharedVaultInvite'

 describe('DeleteSharedVault', () => {
  let sharedVaultRepository: SharedVaultRepositoryInterface
  let sharedVaultUserRepository: SharedVaultUserRepositoryInterface
  let sharedVaultInviteRepository: SharedVaultInviteRepositoryInterface
  let removeUserFromSharedVault: RemoveUserFromSharedVault
+  let declineInviteToSharedVault: DeclineInviteToSharedVault
  let sharedVault: SharedVault
  let sharedVaultUser: SharedVaultUser
+  let sharedVaultInvite: SharedVaultInvite

  const createUseCase = () =>
    new DeleteSharedVault(
@@ -21,6 +25,7 @@ describe('DeleteSharedVault', () => {
      sharedVaultUserRepository,
      sharedVaultInviteRepository,
      removeUserFromSharedVault,
+      declineInviteToSharedVault,
    )

  beforeEach(() => {
@@ -42,8 +47,19 @@ describe('DeleteSharedVault', () => {
    sharedVaultUserRepository = {} as jest.Mocked<SharedVaultUserRepositoryInterface>
    sharedVaultUserRepository.findBySharedVaultUuid = jest.fn().mockResolvedValue([sharedVaultUser])

+    sharedVaultInvite = SharedVaultInvite.create({
+      encryptedMessage: 'test',
+      userUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+      sharedVaultUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+      senderUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+      permission: SharedVaultUserPermission.create(SharedVaultUserPermission.PERMISSIONS.Read).getValue(),
+      timestamps: Timestamps.create(123, 123).getValue(),
+    }).getValue()
    sharedVaultInviteRepository = {} as jest.Mocked<SharedVaultInviteRepositoryInterface>
-    sharedVaultInviteRepository.removeBySharedVaultUuid = jest.fn()
+    sharedVaultInviteRepository.findBySharedVaultUuid = jest.fn().mockReturnValue([sharedVaultInvite])
+
+    declineInviteToSharedVault = {} as jest.Mocked<DeclineInviteToSharedVault>
+    declineInviteToSharedVault.execute = jest.fn().mockReturnValue(Result.ok())

    removeUserFromSharedVault = {} as jest.Mocked<RemoveUserFromSharedVault>
    removeUserFromSharedVault.execute = jest.fn().mockReturnValue(Result.ok())
@@ -59,7 +75,7 @@ describe('DeleteSharedVault', () => {

    expect(result.isFailed()).toBeFalsy()
    expect(sharedVaultRepository.remove).toHaveBeenCalled()
-    expect(sharedVaultInviteRepository.removeBySharedVaultUuid).toHaveBeenCalled()
+    expect(declineInviteToSharedVault.execute).toHaveBeenCalled()
    expect(removeUserFromSharedVault.execute).toHaveBeenCalled()
  })

@@ -74,7 +90,7 @@ describe('DeleteSharedVault', () => {

    expect(result.isFailed()).toBeTruthy()
    expect(sharedVaultRepository.remove).not.toHaveBeenCalled()
-    expect(sharedVaultInviteRepository.removeBySharedVaultUuid).not.toHaveBeenCalled()
+    expect(declineInviteToSharedVault.execute).not.toHaveBeenCalled()
    expect(removeUserFromSharedVault.execute).not.toHaveBeenCalled()
  })

@@ -88,7 +104,7 @@ describe('DeleteSharedVault', () => {

    expect(result.isFailed()).toBeTruthy()
    expect(sharedVaultRepository.remove).not.toHaveBeenCalled()
-    expect(sharedVaultInviteRepository.removeBySharedVaultUuid).not.toHaveBeenCalled()
+    expect(declineInviteToSharedVault.execute).not.toHaveBeenCalled()
    expect(removeUserFromSharedVault.execute).not.toHaveBeenCalled()
  })

@@ -102,7 +118,7 @@ describe('DeleteSharedVault', () => {

    expect(result.isFailed()).toBeTruthy()
    expect(sharedVaultRepository.remove).not.toHaveBeenCalled()
-    expect(sharedVaultInviteRepository.removeBySharedVaultUuid).not.toHaveBeenCalled()
+    expect(declineInviteToSharedVault.execute).not.toHaveBeenCalled()
    expect(removeUserFromSharedVault.execute).not.toHaveBeenCalled()
  })

@@ -122,7 +138,7 @@ describe('DeleteSharedVault', () => {

    expect(result.isFailed()).toBeTruthy()
    expect(sharedVaultRepository.remove).not.toHaveBeenCalled()
-    expect(sharedVaultInviteRepository.removeBySharedVaultUuid).not.toHaveBeenCalled()
+    expect(declineInviteToSharedVault.execute).not.toHaveBeenCalled()
    expect(removeUserFromSharedVault.execute).not.toHaveBeenCalled()
  })

@@ -137,7 +153,22 @@ describe('DeleteSharedVault', () => {

    expect(result.isFailed()).toBeTruthy()
    expect(sharedVaultRepository.remove).not.toHaveBeenCalled()
-    expect(sharedVaultInviteRepository.removeBySharedVaultUuid).not.toHaveBeenCalled()
+    expect(declineInviteToSharedVault.execute).not.toHaveBeenCalled()
+    expect(removeUserFromSharedVault.execute).toHaveBeenCalled()
+  })
+
+  it('should return error if declining invite to shared vault fails', async () => {
+    declineInviteToSharedVault.execute = jest.fn().mockReturnValue(Result.fail('failed'))
+    const useCase = createUseCase()
+
+    const result = await useCase.execute({
+      sharedVaultUuid: '00000000-0000-0000-0000-000000000000',
+      originatorUuid: '00000000-0000-0000-0000-000000000000',
+    })
+
+    expect(result.isFailed()).toBeTruthy()
+    expect(sharedVaultRepository.remove).not.toHaveBeenCalled()
+    expect(declineInviteToSharedVault.execute).toHaveBeenCalled()
    expect(removeUserFromSharedVault.execute).toHaveBeenCalled()
  })
 })
@@ -5,6 +5,7 @@ import { SharedVaultRepositoryInterface } from '../../../SharedVault/SharedVault
 import { SharedVaultUserRepositoryInterface } from '../../../SharedVault/User/SharedVaultUserRepositoryInterface'
 import { SharedVaultInviteRepositoryInterface } from '../../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface'
 import { RemoveUserFromSharedVault } from '../RemoveUserFromSharedVault/RemoveUserFromSharedVault'
+import { DeclineInviteToSharedVault } from '../DeclineInviteToSharedVault/DeclineInviteToSharedVault'

 export class DeleteSharedVault implements UseCaseInterface<void> {
  constructor(
@@ -12,6 +13,7 @@ export class DeleteSharedVault implements UseCaseInterface<void> {
    private sharedVaultUserRepository: SharedVaultUserRepositoryInterface,
    private sharedVaultInviteRepository: SharedVaultInviteRepositoryInterface,
    private removeUserFromSharedVault: RemoveUserFromSharedVault,
+    private declineInviteToSharedVault: DeclineInviteToSharedVault,
  ) {}

  async execute(dto: DeleteSharedVaultDTO): Promise<Result<void>> {
@@ -50,7 +52,17 @@ export class DeleteSharedVault implements UseCaseInterface<void> {
      }
    }

-    await this.sharedVaultInviteRepository.removeBySharedVaultUuid(sharedVaultUuid)
+    const sharedVaultInvites = await this.sharedVaultInviteRepository.findBySharedVaultUuid(sharedVaultUuid)
+    for (const sharedVaultInvite of sharedVaultInvites) {
+      const result = await this.declineInviteToSharedVault.execute({
+        inviteUuid: sharedVaultInvite.id.toString(),
+        userUuid: sharedVaultInvite.props.userUuid.value,
+      })
+
+      if (result.isFailed()) {
+        return Result.fail(result.getError())
+      }
+    }

    await this.sharedVaultRepository.remove(sharedVault)

@@ -0,0 +1,72 @@
+import { Result, Timestamps, UniqueEntityId, Uuid } from '@standardnotes/domain-core'
+import { SharedVault } from '../../../SharedVault/SharedVault'
+import { SharedVaultRepositoryInterface } from '../../../SharedVault/SharedVaultRepositoryInterface'
+import { DeleteSharedVault } from '../DeleteSharedVault/DeleteSharedVault'
+import { DeleteSharedVaults } from './DeleteSharedVaults'
+
+describe('DeleteSharedVaults', () => {
+  let sharedVaultRepository: SharedVaultRepositoryInterface
+  let deleteSharedVaultUseCase: DeleteSharedVault
+  let sharedVault: SharedVault
+
+  const createUseCase = () => new DeleteSharedVaults(sharedVaultRepository, deleteSharedVaultUseCase)
+
+  beforeEach(() => {
+    sharedVault = SharedVault.create(
+      {
+        fileUploadBytesUsed: 2,
+        userUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+        timestamps: Timestamps.create(123, 123).getValue(),
+      },
+      new UniqueEntityId('00000000-0000-0000-0000-000000000000'),
+    ).getValue()
+    sharedVaultRepository = {} as jest.Mocked<SharedVaultRepositoryInterface>
+    sharedVaultRepository.findByUserUuid = jest.fn().mockResolvedValue([sharedVault])
+
+    deleteSharedVaultUseCase = {} as jest.Mocked<DeleteSharedVault>
+    deleteSharedVaultUseCase.execute = jest.fn().mockResolvedValue(Result.ok())
+  })
+
+  it('should delete all shared vaults for a user', async () => {
+    const useCase = createUseCase()
+
+    const result = await useCase.execute({
+      ownerUuid: '00000000-0000-0000-0000-000000000000',
+    })
+
+    expect(result.isFailed()).toBe(false)
+    expect(sharedVaultRepository.findByUserUuid).toHaveBeenCalled()
+    expect(deleteSharedVaultUseCase.execute).toHaveBeenCalledWith({
+      originatorUuid: '00000000-0000-0000-0000-000000000000',
+      sharedVaultUuid: '00000000-0000-0000-0000-000000000000',
+    })
+  })
+
+  it('should return error if delete shared vault fails', async () => {
+    deleteSharedVaultUseCase.execute = jest.fn().mockResolvedValue(Result.fail('error'))
+    const useCase = createUseCase()
+
+    const result = await useCase.execute({
+      ownerUuid: '00000000-0000-0000-0000-000000000000',
+    })
+
+    expect(result.isFailed()).toBe(true)
+    expect(sharedVaultRepository.findByUserUuid).toHaveBeenCalled()
+    expect(deleteSharedVaultUseCase.execute).toHaveBeenCalledWith({
+      originatorUuid: '00000000-0000-0000-0000-000000000000',
+      sharedVaultUuid: '00000000-0000-0000-0000-000000000000',
+    })
+  })
+
+  it('should return error if owner uuid is invalid', async () => {
+    const useCase = createUseCase()
+
+    const result = await useCase.execute({
+      ownerUuid: 'invalid',
+    })
+
+    expect(result.isFailed()).toBeTruthy()
+    expect(sharedVaultRepository.findByUserUuid).not.toHaveBeenCalled()
+    expect(deleteSharedVaultUseCase.execute).not.toHaveBeenCalled()
+  })
+})
@@ -0,0 +1,34 @@
+import { Result, UseCaseInterface, Uuid } from '@standardnotes/domain-core'
+
+import { DeleteSharedVaultsDTO } from './DeleteSharedVaultsDTO'
+import { DeleteSharedVault } from '../DeleteSharedVault/DeleteSharedVault'
+import { SharedVaultRepositoryInterface } from '../../../SharedVault/SharedVaultRepositoryInterface'
+
+export class DeleteSharedVaults implements UseCaseInterface<void> {
+  constructor(
+    private sharedVaultRepository: SharedVaultRepositoryInterface,
+    private deleteSharedVaultUseCase: DeleteSharedVault,
+  ) {}
+
+  async execute(dto: DeleteSharedVaultsDTO): Promise<Result<void>> {
+    const ownerUuidOrError = Uuid.create(dto.ownerUuid)
+    if (ownerUuidOrError.isFailed()) {
+      return Result.fail(ownerUuidOrError.getError())
+    }
+    const ownerUuid = ownerUuidOrError.getValue()
+
+    const sharedVaults = await this.sharedVaultRepository.findByUserUuid(ownerUuid)
+
+    for (const sharedVault of sharedVaults) {
+      const result = await this.deleteSharedVaultUseCase.execute({
+        originatorUuid: ownerUuid.value,
+        sharedVaultUuid: sharedVault.id.toString(),
+      })
+      if (result.isFailed()) {
+        return Result.fail(result.getError())
+      }
+    }
+
+    return Result.ok()
+  }
+}
@@ -0,0 +1,3 @@
+export interface DeleteSharedVaultsDTO {
+  ownerUuid: string
+}
@@ -18,7 +18,7 @@ export class TransitionItemsFromPrimaryToSecondaryDatabaseForUser implements Use
  ) {}

  async execute(dto: TransitionItemsFromPrimaryToSecondaryDatabaseForUserDTO): Promise<Result<void>> {
-    this.logger.info(`Transitioning items for user ${dto.userUuid}`)
+    this.logger.info(`[${dto.userUuid}] Transitioning items`)

    if (this.secondaryItemRepository === null) {
      return Result.fail('Secondary item repository is not set')
@@ -32,29 +32,25 @@ export class TransitionItemsFromPrimaryToSecondaryDatabaseForUser implements Use

    let newItemsInSecondaryCount = 0
    let updatedItemsInSecondary: string[] = []
+    let alreadyIdenticalInSecondaryAndPrimary: string[] = []
    if (await this.hasAlreadyDataInSecondaryDatabase(userUuid)) {
-      const { alreadyExistingInPrimary, newItemsInSecondary, updatedInSecondary } =
+      const { alreadyExistingInSecondaryAndPrimary, newItemsInSecondary, updatedInSecondary } =
        await this.getNewItemsCreatedInSecondaryDatabase(userUuid)

-      for (const existingItemUuid of alreadyExistingInPrimary) {
-        this.logger.info(`Removing item ${existingItemUuid} from secondary database`)
-        await (this.secondaryItemRepository as ItemRepositoryInterface).removeByUuid(
-          Uuid.create(existingItemUuid).getValue(),
-        )
-      }
+      this.logger.info(
+        `[${dto.userUuid}] ${alreadyExistingInSecondaryAndPrimary.length} already existing identical items in primary and secondary.`,
+      )
+
+      alreadyIdenticalInSecondaryAndPrimary = alreadyExistingInSecondaryAndPrimary

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

      newItemsInSecondaryCount = newItemsInSecondary.length

      if (updatedInSecondary.length > 0) {
-        this.logger.info(
-          `Found ${updatedInSecondary.length} updated items in secondary database for user ${userUuid.value}`,
-        )
+        this.logger.info(`[${dto.userUuid}] Found ${updatedInSecondary.length} updated items in secondary database.`)
      }

      updatedItemsInSecondary = updatedInSecondary
@@ -65,13 +61,19 @@ export class TransitionItemsFromPrimaryToSecondaryDatabaseForUser implements Use

    const migrationTimeStart = this.timer.getTimestampInMicroseconds()

-    const migrationResult = await this.migrateItemsForUser(userUuid, updatedItemsInSecondary)
+    this.logger.info(`[${dto.userUuid}] Migrating items`)
+
+    const migrationResult = await this.migrateItemsForUser(
+      userUuid,
+      updatedItemsInSecondary,
+      alreadyIdenticalInSecondaryAndPrimary,
+    )
    if (migrationResult.isFailed()) {
      if (newItemsInSecondaryCount === 0 && updatedItemsInSecondaryCount === 0) {
        const cleanupResult = await this.deleteItemsForUser(userUuid, this.secondaryItemRepository)
        if (cleanupResult.isFailed()) {
          this.logger.error(
-            `Failed to clean up secondary database items for user ${userUuid.value}: ${cleanupResult.getError()}`,
+            `[${dto.userUuid}] Failed to clean up secondary database items: ${cleanupResult.getError()}`,
          )
        }
      }
@@ -85,13 +87,14 @@ export class TransitionItemsFromPrimaryToSecondaryDatabaseForUser implements Use
      userUuid,
      newItemsInSecondaryCount,
      updatedItemsInSecondary,
+      alreadyIdenticalInSecondaryAndPrimary,
    )
    if (integrityCheckResult.isFailed()) {
      if (newItemsInSecondaryCount === 0 && updatedItemsInSecondaryCount === 0) {
        const cleanupResult = await this.deleteItemsForUser(userUuid, this.secondaryItemRepository)
        if (cleanupResult.isFailed()) {
          this.logger.error(
-            `Failed to clean up secondary database items for user ${userUuid.value}: ${cleanupResult.getError()}`,
+            `[${dto.userUuid}] Failed to clean up secondary database items: ${cleanupResult.getError()}`,
          )
        }
      }
@@ -101,9 +104,7 @@ export class TransitionItemsFromPrimaryToSecondaryDatabaseForUser implements Use

    const cleanupResult = await this.deleteItemsForUser(userUuid, this.primaryItemRepository)
    if (cleanupResult.isFailed()) {
-      this.logger.error(
-        `Failed to clean up primary database items for user ${userUuid.value}: ${cleanupResult.getError()}`,
-      )
+      this.logger.error(`[${dto.userUuid}] Failed to clean up primary database items: ${cleanupResult.getError()}`)
    }

    const migrationTimeEnd = this.timer.getTimestampInMicroseconds()
@@ -112,7 +113,7 @@ export class TransitionItemsFromPrimaryToSecondaryDatabaseForUser implements Use
    const migrationDurationTimeStructure = this.timer.convertMicrosecondsToTimeStructure(migrationDuration)

    this.logger.info(
-      `Transitioned items for user ${userUuid.value} in ${migrationDurationTimeStructure.hours}h ${migrationDurationTimeStructure.minutes}m ${migrationDurationTimeStructure.seconds}s ${migrationDurationTimeStructure.milliseconds}ms`,
+      `[${dto.userUuid}] Transitioned items in ${migrationDurationTimeStructure.hours}h ${migrationDurationTimeStructure.minutes}m ${migrationDurationTimeStructure.seconds}s ${migrationDurationTimeStructure.milliseconds}ms`,
    )

    return Result.ok()
@@ -125,27 +126,31 @@ export class TransitionItemsFromPrimaryToSecondaryDatabaseForUser implements Use

    const hasAlreadyDataInSecondaryDatabase = totalItemsCountForUser > 0
    if (hasAlreadyDataInSecondaryDatabase) {
-      this.logger.info(`User ${userUuid.value} has already ${totalItemsCountForUser} items in secondary database`)
+      this.logger.info(`[${userUuid.value}] User has already ${totalItemsCountForUser} items in secondary database`)
    }

    return hasAlreadyDataInSecondaryDatabase
  }

  private async allowForSecondaryDatabaseToCatchUp(): Promise<void> {
-    const twoSecondsInMilliseconds = 2_000
-    await this.timer.sleep(twoSecondsInMilliseconds)
+    const tenSecondsInMillisecondsToRebuildIndexes = 10_000
+    await this.timer.sleep(tenSecondsInMillisecondsToRebuildIndexes)
  }

  private async getNewItemsCreatedInSecondaryDatabase(userUuid: Uuid): Promise<{
-    alreadyExistingInPrimary: string[]
+    alreadyExistingInSecondaryAndPrimary: string[]
    newItemsInSecondary: string[]
    updatedInSecondary: string[]
  }> {
-    const alreadyExistingInPrimary: string[] = []
+    this.logger.info(`[${userUuid.value}] Checking for new items in secondary database`)
+
+    const alreadyExistingInSecondaryAndPrimary: string[] = []
    const updatedInSecondary: string[] = []
    const newItemsInSecondary: string[] = []

-    const totalItemsCountForUser = await this.primaryItemRepository.countAll({ userUuid: userUuid.value })
+    const totalItemsCountForUser = await (this.secondaryItemRepository as ItemRepositoryInterface).countAll({
+      userUuid: userUuid.value,
+    })
    const totalPages = Math.ceil(totalItemsCountForUser / this.pageSize)
    for (let currentPage = 1; currentPage <= totalPages; currentPage++) {
      const query: ItemQuery = {
@@ -158,16 +163,16 @@ export class TransitionItemsFromPrimaryToSecondaryDatabaseForUser implements Use

      const items = await (this.secondaryItemRepository as ItemRepositoryInterface).findAll(query)
      for (const item of items) {
-        const { itemInPrimary, newerItemInSecondary } = await this.checkIfItemExistsInPrimaryDatabase(item)
-        if (itemInPrimary !== null) {
-          alreadyExistingInPrimary.push(item.id.toString())
+        const { identicalItemInPrimary, newerItemInSecondary } = await this.checkIfItemExistsInPrimaryDatabase(item)
+        if (identicalItemInPrimary !== null) {
+          alreadyExistingInSecondaryAndPrimary.push(item.id.toString())
          continue
        }
        if (newerItemInSecondary !== null) {
          updatedInSecondary.push(newerItemInSecondary.id.toString())
          continue
        }
-        if (itemInPrimary === null && newerItemInSecondary === null) {
+        if (identicalItemInPrimary === null && newerItemInSecondary === null) {
          newItemsInSecondary.push(item.id.toString())
          continue
        }
@@ -175,7 +180,7 @@ export class TransitionItemsFromPrimaryToSecondaryDatabaseForUser implements Use
    }

    return {
-      alreadyExistingInPrimary,
+      alreadyExistingInSecondaryAndPrimary,
      newItemsInSecondary,
      updatedInSecondary,
    }
@@ -183,30 +188,36 @@ export class TransitionItemsFromPrimaryToSecondaryDatabaseForUser implements Use

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

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

    if (!item.isIdenticalTo(itemInPrimary)) {
      this.logger.error(
-        `Revision ${item.id.toString()} is not identical in primary and secondary database. Revision in secondary database: ${JSON.stringify(
+        `[${
+          item.props.userUuid.value
+        }] Item ${item.id.toString()} is not identical in primary and secondary database. Item in secondary database: ${JSON.stringify(
          item,
-        )}, revision in primary database: ${JSON.stringify(itemInPrimary)}`,
+        )}, item in primary database: ${JSON.stringify(itemInPrimary)}`,
      )

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

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

-  private async migrateItemsForUser(userUuid: Uuid, updatedItemsInSecondary: string[]): Promise<Result<void>> {
+  private async migrateItemsForUser(
+    userUuid: Uuid,
+    updatedItemsInSecondary: string[],
+    alreadyExistingInSecondaryAndPrimary: string[],
+  ): Promise<Result<void>> {
    try {
      const totalItemsCountForUser = await this.primaryItemRepository.countAll({ userUuid: userUuid.value })
      const totalPages = Math.ceil(totalItemsCountForUser / this.pageSize)
@@ -223,10 +234,16 @@ export class TransitionItemsFromPrimaryToSecondaryDatabaseForUser implements Use

        for (const item of items) {
          if (updatedItemsInSecondary.find((updatedItemUuid) => item.uuid.value === updatedItemUuid)) {
-            this.logger.info(`Skipping saving item ${item.uuid.value} as it was updated in secondary database`)
+            this.logger.info(
+              `[${userUuid.value}] Skipping saving item ${item.uuid.value} as it was updated in secondary database`,
+            )

            continue
          }
+          if (alreadyExistingInSecondaryAndPrimary.find((itemUuid) => item.uuid.value === itemUuid)) {
+            continue
+          }
+
          await (this.secondaryItemRepository as ItemRepositoryInterface).save(item)
        }
      }
@@ -251,6 +268,7 @@ export class TransitionItemsFromPrimaryToSecondaryDatabaseForUser implements Use
    userUuid: Uuid,
    newItemsInSecondaryCount: number,
    updatedItemsInSecondary: string[],
+    alreadyExistingInSecondaryAndPrimary: string[],
  ): Promise<Result<boolean>> {
    try {
      const totalItemsCountForUserInPrimary = await this.primaryItemRepository.countAll({ userUuid: userUuid.value })
@@ -286,11 +304,15 @@ export class TransitionItemsFromPrimaryToSecondaryDatabaseForUser implements Use

          if (updatedItemsInSecondary.find((updatedItemUuid) => item.uuid.value === updatedItemUuid)) {
            this.logger.info(
-              `Skipping integrity check for item ${item.uuid.value} as it was updated in secondary database`,
+              `[${userUuid.value}] Skipping integrity check for item ${item.uuid.value} as it was updated in secondary database`,
            )
            continue
          }

+          if (alreadyExistingInSecondaryAndPrimary.find((itemUuid) => item.uuid.value === itemUuid)) {
+            continue
+          }
+
          if (!item.isIdenticalTo(itemInSecondary)) {
            return Result.fail(
              `Item ${
@@ -64,13 +64,13 @@ export class TypeORMSharedVaultInviteRepository implements SharedVaultInviteRepo
    return persistence.map((p) => this.mapper.toDomain(p))
  }

-  async removeBySharedVaultUuid(sharedVaultUuid: Uuid): Promise<void> {
-    await this.ormRepository
+  async findBySharedVaultUuid(sharedVaultUuid: Uuid): Promise<SharedVaultInvite[]> {
+    const persistence = await this.ormRepository
      .createQueryBuilder('shared_vault_invite')
-      .delete()
-      .from('shared_vault_invites')
-      .where('shared_vault_uuid = :sharedVaultUuid', { sharedVaultUuid: sharedVaultUuid.value })
-      .execute()
+      .where('shared_vault_invite.shared_vault_uuid = :sharedVaultUuid', { sharedVaultUuid: sharedVaultUuid.value })
+      .getMany()
+
+    return persistence.map((p) => this.mapper.toDomain(p))
  }

  async findByUserUuidAndSharedVaultUuid(dto: {
@@ -11,6 +11,17 @@ export class TypeORMSharedVaultRepository implements SharedVaultRepositoryInterf
    private mapper: MapperInterface<SharedVault, TypeORMSharedVault>,
  ) {}

+  async findByUserUuid(userUuid: Uuid): Promise<SharedVault[]> {
+    const persistence = await this.ormRepository
+      .createQueryBuilder('shared_vault')
+      .where('shared_vault.user_uuid = :userUuid', {
+        userUuid: userUuid.value,
+      })
+      .getMany()
+
+    return persistence.map((p) => this.mapper.toDomain(p))
+  }
+
  async countByUserUuid(userUuid: Uuid): Promise<number> {
    const count = await this.ormRepository
      .createQueryBuilder('shared_vault')
@@ -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.10.47](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.10.46...@standardnotes/websockets-server@1.10.47) (2023-09-20)
+
+**Note:** Version bump only for package @standardnotes/websockets-server
+
+## [1.10.46](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.10.45...@standardnotes/websockets-server@1.10.46) (2023-09-19)
+
+**Note:** Version bump only for package @standardnotes/websockets-server
+
 ## [1.10.45](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.10.44...@standardnotes/websockets-server@1.10.45) (2023-09-18)

 **Note:** Version bump only for package @standardnotes/websockets-server
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/websockets-server",
-  "version": "1.10.45",
+  "version": "1.10.47",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
Author	SHA1	Message	Date
standardci	06d4200909	chore(release): publish new version - @standardnotes/home-server@1.15.70 - @standardnotes/syncing-server@1.100.0	2023-09-20 11:17:47 +00:00
Karol Sójko	22a8cc90f1	feat(syncing-server): remove owned shared vaults upon account deletion (#838 )	2023-09-20 12:59:03 +02:00
standardci	5cf84e31b0	chore(release): publish new version - @standardnotes/analytics@2.26.18 - @standardnotes/api-gateway@1.74.16 - @standardnotes/auth-server@1.143.8 - @standardnotes/domain-core@1.31.0 - @standardnotes/event-store@1.11.46 - @standardnotes/files-server@1.22.25 - @standardnotes/home-server@1.15.69 - @standardnotes/revisions-server@1.35.8 - @standardnotes/scheduler-server@1.20.50 - @standardnotes/settings@1.21.35 - @standardnotes/syncing-server@1.99.0 - @standardnotes/websockets-server@1.10.47	2023-09-20 09:04:29 +00:00
Karol Sójko	31e7aaf253	feat(syncing-server): add notification for user upon declined shared vault invitation (#837 )	2023-09-20 10:47:19 +02:00
standardci	8ec3d37c18	chore(release): publish new version - @standardnotes/analytics@2.26.17 - @standardnotes/api-gateway@1.74.15 - @standardnotes/auth-server@1.143.7 - @standardnotes/domain-core@1.30.1 - @standardnotes/event-store@1.11.45 - @standardnotes/files-server@1.22.24 - @standardnotes/home-server@1.15.68 - @standardnotes/revisions-server@1.35.7 - @standardnotes/scheduler-server@1.20.49 - @standardnotes/settings@1.21.34 - @standardnotes/syncing-server@1.98.6 - @standardnotes/websockets-server@1.10.46	2023-09-19 13:25:30 +00:00
Karol Sójko	857c6af946	fix: skip removing already existing content in secondary to pick up where the transition left of	2023-09-19 14:55:40 +02:00
Karol Sójko	de081fe786	fix(domain-core): allow any version and variant of the UUID format	2023-09-19 14:42:19 +02:00
standardci	0aeeb2d1cf	chore(release): publish new version - @standardnotes/home-server@1.15.67 - @standardnotes/revisions-server@1.35.6 - @standardnotes/syncing-server@1.98.5	2023-09-19 11:23:30 +00:00
Karol Sójko	e589029722	fix: logs verbosity during transitions	2023-09-19 13:04:43 +02:00
Karol Sójko	b265a39b63	fix: increase timeout for secondary database to catch up for indexes to be rebuilt	2023-09-19 13:04:43 +02:00
standardci	ed5cfd86db	chore(release): publish new version - @standardnotes/home-server@1.15.66 - @standardnotes/revisions-server@1.35.5 - @standardnotes/syncing-server@1.98.4	2023-09-19 11:04:14 +00:00
Karol Sójko	a1a3e9f586	fix: add checking for secondary items logs	2023-09-19 12:45:08 +02:00
Karol Sójko	a40b17b141	fix: logs for removing already existing content and paging through diff of the content	2023-09-19 12:43:09 +02:00
standardci	18181ed9df	chore(release): publish new version - @standardnotes/home-server@1.15.65 - @standardnotes/revisions-server@1.35.4 - @standardnotes/syncing-server@1.98.3	2023-09-19 08:46:37 +00:00
Karol Sójko	0ae028db73	fix: logs formatting during transition for better readability	2023-09-19 10:27:21 +02:00