chore(release): publish new version

- @standardnotes/home-server@1.15.72 - @standardnotes/revisions-server@1.36.1 - @standardnotes/syncing-server@1.101.1
fix: secondary database catch up time
2026-04-22 09:01:42 -04:00 · 2023-09-21 07:34:07 +00:00 · 2023-09-21 09:17:00 +02:00 · 2023-09-20 14:13:03 +00:00 · 2023-09-20 15:31:57 +02:00 · 2023-09-20 15:03:17 +02:00
68 changed files with 510 additions and 105 deletions
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

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

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

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

+# [1.32.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-core@1.31.0...@standardnotes/domain-core@1.32.0) (2023-09-20)
+
+### Features
+
+* **syncing-server:** distinct notifications upon user removal from shared vault ([#840](https://github.com/standardnotes/server/issues/840)) ([41e2136](https://github.com/standardnotes/server/commit/41e2136bc07312974701a70652528d304105e0f9))
+
 # [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
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/domain-core",
-  "version": "1.31.0",
+  "version": "1.32.0",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -5,7 +5,8 @@ import { NotificationTypeProps } from './NotificationTypeProps'
 export class NotificationType extends ValueObject<NotificationTypeProps> {
  static readonly TYPES = {
    SharedVaultItemRemoved: 'shared_vault_item_removed',
-    RemovedFromSharedVault: 'removed_from_shared_vault',
+    SelfRemovedFromSharedVault: 'self_removed_from_shared_vault',
+    UserRemovedFromSharedVault: 'user_removed_from_shared_vault',
    UserAddedToSharedVault: 'user_added_to_shared_vault',
    SharedVaultInviteDeclined: 'shared_vault_invite_declined',
    SharedVaultFileUploaded: 'shared_vault_file_uploaded',
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

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

+# [2.128.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.127.0...@standardnotes/domain-events@2.128.0) (2023-09-20)
+
+### Features
+
+* add unassigning items and revisions upon shared vault removal ([#839](https://github.com/standardnotes/server/issues/839)) ([378eced](https://github.com/standardnotes/server/commit/378ecedfcc4fb23475c2329fb37479edb3b48a39))
+
 # [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
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/domain-events",
-  "version": "2.127.0",
+  "version": "2.128.0",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -2,5 +2,4 @@ export interface ItemRemovedFromSharedVaultEventPayload {
  userUuid: string
  itemUuid: string
  sharedVaultUuid: string
-  roleNames: string[]
 }
@@ -0,0 +1,7 @@
+import { DomainEventInterface } from './DomainEventInterface'
+import { SharedVaultRemovedEventPayload } from './SharedVaultRemovedEventPayload'
+
+export interface SharedVaultRemovedEvent extends DomainEventInterface {
+  type: 'SHARED_VAULT_REMOVED'
+  payload: SharedVaultRemovedEventPayload
+}
@@ -0,0 +1,3 @@
+export interface SharedVaultRemovedEventPayload {
+  sharedVaultUuid: string
+}
@@ -76,6 +76,8 @@ export * from './Event/SharedVaultFileRemovedEvent'
 export * from './Event/SharedVaultFileRemovedEventPayload'
 export * from './Event/SharedVaultFileUploadedEvent'
 export * from './Event/SharedVaultFileUploadedEventPayload'
+export * from './Event/SharedVaultRemovedEvent'
+export * from './Event/SharedVaultRemovedEventPayload'
 export * from './Event/StatisticPersistenceRequestedEvent'
 export * from './Event/StatisticPersistenceRequestedEventPayload'
 export * from './Event/SubscriptionCancelledEvent'
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

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

+## [1.22.26](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.22.25...@standardnotes/files-server@1.22.26) (2023-09-20)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
 ## [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,6 +1,6 @@
 {
  "name": "@standardnotes/files-server",
-  "version": "1.22.25",
+  "version": "1.22.26",
  "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.15.72](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.71...@standardnotes/home-server@1.15.72) (2023-09-21)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.15.71](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.70...@standardnotes/home-server@1.15.71) (2023-09-20)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
 ## [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,6 +1,6 @@
 {
  "name": "@standardnotes/home-server",
-  "version": "1.15.70",
+  "version": "1.15.72",
  "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.36.1](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.36.0...@standardnotes/revisions-server@1.36.1) (2023-09-21)
+
+### Bug Fixes
+
+* secondary database catch up time ([880db10](https://github.com/standardnotes/server/commit/880db1038a39d4610a2593489a18e207487347a2))
+
+# [1.36.0](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.35.8...@standardnotes/revisions-server@1.36.0) (2023-09-20)
+
+### Features
+
+* add unassigning items and revisions upon shared vault removal ([#839](https://github.com/standardnotes/server/issues/839)) ([378eced](https://github.com/standardnotes/server/commit/378ecedfcc4fb23475c2329fb37479edb3b48a39))
+
 ## [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,6 +1,6 @@
 {
  "name": "@standardnotes/revisions-server",
-  "version": "1.35.8",
+  "version": "1.36.1",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -67,6 +67,7 @@ import { SQLRevisionPersistenceMapper } from '../Mapping/Persistence/SQL/SQLRevi
 import { RemoveRevisionsFromSharedVault } from '../Domain/UseCase/RemoveRevisionsFromSharedVault/RemoveRevisionsFromSharedVault'
 import { ItemRemovedFromSharedVaultEventHandler } from '../Domain/Handler/ItemRemovedFromSharedVaultEventHandler'
 import { TransitionRequestedEventHandler } from '../Domain/Handler/TransitionRequestedEventHandler'
+import { SharedVaultRemovedEventHandler } from '../Domain/Handler/SharedVaultRemovedEventHandler'

 export class ContainerConfigLoader {
  constructor(private mode: 'server' | 'worker' = 'server') {}
@@ -356,7 +357,9 @@ export class ContainerConfigLoader {
      .bind<RemoveRevisionsFromSharedVault>(TYPES.Revisions_RemoveRevisionsFromSharedVault)
      .toConstantValue(
        new RemoveRevisionsFromSharedVault(
-          container.get<RevisionRepositoryResolverInterface>(TYPES.Revisions_RevisionRepositoryResolver),
+          isSecondaryDatabaseEnabled
+            ? container.get<RevisionRepositoryInterface>(TYPES.Revisions_MongoDBRevisionRepository)
+            : container.get<RevisionRepositoryInterface>(TYPES.Revisions_SQLRevisionRepository),
        ),
      )

@@ -448,6 +451,14 @@ export class ContainerConfigLoader {
          container.get<winston.Logger>(TYPES.Revisions_Logger),
        ),
      )
+    container
+      .bind<SharedVaultRemovedEventHandler>(TYPES.Revisions_SharedVaultRemovedEventHandler)
+      .toConstantValue(
+        new SharedVaultRemovedEventHandler(
+          container.get<RemoveRevisionsFromSharedVault>(TYPES.Revisions_RemoveRevisionsFromSharedVault),
+          container.get<winston.Logger>(TYPES.Revisions_Logger),
+        ),
+      )

    const eventHandlers: Map<string, DomainEventHandlerInterface> = new Map([
      ['ITEM_DUMPED', container.get(TYPES.Revisions_ItemDumpedEventHandler)],
@@ -455,6 +466,7 @@ export class ContainerConfigLoader {
      ['REVISIONS_COPY_REQUESTED', container.get(TYPES.Revisions_RevisionsCopyRequestedEventHandler)],
      ['ITEM_REMOVED_FROM_SHARED_VAULT', container.get(TYPES.Revisions_ItemRemovedFromSharedVaultEventHandler)],
      ['TRANSITION_REQUESTED', container.get(TYPES.Revisions_TransitionRequestedEventHandler)],
+      ['SHARED_VAULT_REMOVED', container.get(TYPES.Revisions_SharedVaultRemovedEventHandler)],
    ])

    if (isConfiguredForHomeServer) {
@@ -57,6 +57,7 @@ const TYPES = {
  Revisions_RevisionsCopyRequestedEventHandler: Symbol.for('Revisions_RevisionsCopyRequestedEventHandler'),
  Revisions_ItemRemovedFromSharedVaultEventHandler: Symbol.for('Revisions_ItemRemovedFromSharedVaultEventHandler'),
  Revisions_TransitionRequestedEventHandler: Symbol.for('Revisions_TransitionRequestedEventHandler'),
+  Revisions_SharedVaultRemovedEventHandler: Symbol.for('Revisions_SharedVaultRemovedEventHandler'),
  // Services
  Revisions_CrossServiceTokenDecoder: Symbol.for('Revisions_CrossServiceTokenDecoder'),
  Revisions_DomainEventSubscriberFactory: Symbol.for('Revisions_DomainEventSubscriberFactory'),
@@ -9,10 +9,15 @@ export class ItemRemovedFromSharedVaultEventHandler implements DomainEventHandle
  ) {}

  async handle(event: ItemRemovedFromSharedVaultEvent): Promise<void> {
+    if (!event.payload.itemUuid) {
+      this.logger.error('ItemRemovedFromSharedVaultEvent is missing itemUuid')
+
+      return
+    }
+
    const result = await this.removeRevisionsFromSharedVault.execute({
      sharedVaultUuid: event.payload.sharedVaultUuid,
      itemUuid: event.payload.itemUuid,
-      roleNames: event.payload.roleNames,
    })

    if (result.isFailed()) {
@@ -0,0 +1,21 @@
+import { DomainEventHandlerInterface, SharedVaultRemovedEvent } from '@standardnotes/domain-events'
+import { Logger } from 'winston'
+
+import { RemoveRevisionsFromSharedVault } from '../UseCase/RemoveRevisionsFromSharedVault/RemoveRevisionsFromSharedVault'
+
+export class SharedVaultRemovedEventHandler implements DomainEventHandlerInterface {
+  constructor(
+    private removeRevisionsFromSharedVault: RemoveRevisionsFromSharedVault,
+    private logger: Logger,
+  ) {}
+
+  async handle(event: SharedVaultRemovedEvent): Promise<void> {
+    const result = await this.removeRevisionsFromSharedVault.execute({
+      sharedVaultUuid: event.payload.sharedVaultUuid,
+    })
+
+    if (result.isFailed()) {
+      this.logger.error(`Failed to remove revisions from shared vault: ${result.getError()}`)
+    }
+  }
+}
@@ -13,5 +13,5 @@ export interface RevisionRepositoryInterface {
  updateUserUuid(itemUuid: Uuid, userUuid: Uuid): Promise<void>
  findByUserUuid(dto: { userUuid: Uuid; offset?: number; limit?: number }): Promise<Array<Revision>>
  insert(revision: Revision): Promise<boolean>
-  clearSharedVaultAndKeySystemAssociations(itemUuid: Uuid, sharedVaultUuid: Uuid): Promise<void>
+  clearSharedVaultAndKeySystemAssociations(dto: { itemUuid?: Uuid; sharedVaultUuid: Uuid }): Promise<void>
 }
@@ -1,19 +1,14 @@
 import { RevisionRepositoryInterface } from '../../Revision/RevisionRepositoryInterface'
-import { RevisionRepositoryResolverInterface } from '../../Revision/RevisionRepositoryResolverInterface'
 import { RemoveRevisionsFromSharedVault } from './RemoveRevisionsFromSharedVault'

 describe('RemoveRevisionsFromSharedVault', () => {
-  let revisionRepositoryResolver: RevisionRepositoryResolverInterface
  let revisionRepository: RevisionRepositoryInterface

-  const createUseCase = () => new RemoveRevisionsFromSharedVault(revisionRepositoryResolver)
+  const createUseCase = () => new RemoveRevisionsFromSharedVault(revisionRepository)

  beforeEach(() => {
    revisionRepository = {} as jest.Mocked<RevisionRepositoryInterface>
    revisionRepository.clearSharedVaultAndKeySystemAssociations = jest.fn()
-
-    revisionRepositoryResolver = {} as jest.Mocked<RevisionRepositoryResolverInterface>
-    revisionRepositoryResolver.resolve = jest.fn().mockReturnValue(revisionRepository)
  })

  it('should clear shared vault and key system associations', async () => {
@@ -22,7 +17,16 @@ describe('RemoveRevisionsFromSharedVault', () => {
    await useCase.execute({
      itemUuid: '00000000-0000-0000-0000-000000000000',
      sharedVaultUuid: '00000000-0000-0000-0000-000000000001',
-      roleNames: ['CORE_USER'],
+    })
+
+    expect(revisionRepository.clearSharedVaultAndKeySystemAssociations).toHaveBeenCalled()
+  })
+
+  it('should clear shared vault and key system associations for all items in a vault when item uuid is not provided', async () => {
+    const useCase = createUseCase()
+
+    await useCase.execute({
+      sharedVaultUuid: '00000000-0000-0000-0000-000000000001',
    })

    expect(revisionRepository.clearSharedVaultAndKeySystemAssociations).toHaveBeenCalled()
@@ -34,7 +38,6 @@ describe('RemoveRevisionsFromSharedVault', () => {
    const result = await useCase.execute({
      itemUuid: '00000000-0000-0000-0000-000000000000',
      sharedVaultUuid: 'invalid',
-      roleNames: ['CORE_USER'],
    })

    expect(result.isFailed()).toBe(true)
@@ -46,19 +49,6 @@ describe('RemoveRevisionsFromSharedVault', () => {
    const result = await useCase.execute({
      itemUuid: 'invalid',
      sharedVaultUuid: '00000000-0000-0000-0000-000000000001',
-      roleNames: ['CORE_USER'],
-    })
-
-    expect(result.isFailed()).toBe(true)
-  })
-
-  it('should return error when role names are invalid', async () => {
-    const useCase = createUseCase()
-
-    const result = await useCase.execute({
-      itemUuid: '00000000-0000-0000-0000-000000000000',
-      sharedVaultUuid: '00000000-0000-0000-0000-000000000001',
-      roleNames: ['invalid'],
    })

    expect(result.isFailed()).toBe(true)
@@ -1,9 +1,10 @@
-import { Result, RoleNameCollection, UseCaseInterface, Uuid } from '@standardnotes/domain-core'
-import { RevisionRepositoryResolverInterface } from '../../Revision/RevisionRepositoryResolverInterface'
+import { Result, UseCaseInterface, Uuid } from '@standardnotes/domain-core'
+
 import { RemoveRevisionsFromSharedVaultDTO } from './RemoveRevisionsFromSharedVaultDTO'
+import { RevisionRepositoryInterface } from '../../Revision/RevisionRepositoryInterface'

 export class RemoveRevisionsFromSharedVault implements UseCaseInterface<void> {
-  constructor(private revisionRepositoryResolver: RevisionRepositoryResolverInterface) {}
+  constructor(private revisionRepository: RevisionRepositoryInterface) {}

  async execute(dto: RemoveRevisionsFromSharedVaultDTO): Promise<Result<void>> {
    const sharedVaultUuidOrError = Uuid.create(dto.sharedVaultUuid)
@@ -12,21 +13,19 @@ export class RemoveRevisionsFromSharedVault implements UseCaseInterface<void> {
    }
    const sharedVaultUuid = sharedVaultUuidOrError.getValue()

-    const itemUuidOrError = Uuid.create(dto.itemUuid)
-    if (itemUuidOrError.isFailed()) {
-      return Result.fail(itemUuidOrError.getError())
+    let itemUuid: Uuid | undefined
+    if (dto.itemUuid !== undefined) {
+      const itemUuidOrError = Uuid.create(dto.itemUuid)
+      if (itemUuidOrError.isFailed()) {
+        return Result.fail(itemUuidOrError.getError())
+      }
+      itemUuid = itemUuidOrError.getValue()
    }
-    const itemUuid = itemUuidOrError.getValue()

-    const roleNamesOrError = RoleNameCollection.create(dto.roleNames)
-    if (roleNamesOrError.isFailed()) {
-      return Result.fail(roleNamesOrError.getError())
-    }
-    const roleNames = roleNamesOrError.getValue()
-
-    const revisionRepository = this.revisionRepositoryResolver.resolve(roleNames)
-
-    await revisionRepository.clearSharedVaultAndKeySystemAssociations(itemUuid, sharedVaultUuid)
+    await this.revisionRepository.clearSharedVaultAndKeySystemAssociations({
+      itemUuid,
+      sharedVaultUuid,
+    })

    return Result.ok()
  }
@@ -1,5 +1,4 @@
 export interface RemoveRevisionsFromSharedVaultDTO {
-  itemUuid: string
+  itemUuid?: string
  sharedVaultUuid: string
-  roleNames: string[]
 }
@@ -59,8 +59,6 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements

    const updatedRevisionsInSecondaryCount = updatedRevisionsInSecondary.length

-    await this.allowForSecondaryDatabaseToCatchUp()
-
    const migrationTimeStart = this.timer.getTimestampInMicroseconds()

    this.logger.info(`[${dto.userUuid}] Migrating revisions`)
@@ -194,8 +192,8 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
  }

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

  private async hasAlreadyDataInSecondaryDatabase(userUuid: Uuid): Promise<boolean> {
@@ -1,5 +1,5 @@
 import { MapperInterface, Uuid } from '@standardnotes/domain-core'
-import { MongoRepository } from 'typeorm'
+import { MongoRepository, ObjectLiteral } from 'typeorm'
 import { BSON } from 'mongodb'
 import { Logger } from 'winston'

@@ -16,19 +16,25 @@ export class MongoDBRevisionRepository implements RevisionRepositoryInterface {
    private logger: Logger,
  ) {}

-  async clearSharedVaultAndKeySystemAssociations(itemUuid: Uuid, sharedVaultUuid: Uuid): Promise<void> {
-    await this.mongoRepository.updateMany(
-      {
-        itemUuid: { $eq: itemUuid.value },
-        sharedVaultUuid: { $eq: sharedVaultUuid.value },
+  async clearSharedVaultAndKeySystemAssociations(dto: { itemUuid?: Uuid; sharedVaultUuid: Uuid }): Promise<void> {
+    let query: ObjectLiteral
+    if (dto.itemUuid !== undefined) {
+      query = {
+        itemUuid: { $eq: dto.itemUuid.value },
+        sharedVaultUuid: { $eq: dto.sharedVaultUuid.value },
+      }
+    } else {
+      query = {
+        sharedVaultUuid: { $eq: dto.sharedVaultUuid.value },
+      }
+    }
+
+    await this.mongoRepository.updateMany(query, {
+      $set: {
+        sharedVaultUuid: null,
+        keySystemIdentifier: null,
      },
-      {
-        $set: {
-          sharedVaultUuid: null,
-          keySystemIdentifier: null,
-        },
-      },
-    )
+    })
  }

  async countByUserUuid(userUuid: Uuid): Promise<number> {
@@ -15,7 +15,7 @@ export class SQLLegacyRevisionRepository implements RevisionRepositoryInterface
    protected logger: Logger,
  ) {}

-  async clearSharedVaultAndKeySystemAssociations(_itemUuid: Uuid, _sharedVaultUuid: Uuid): Promise<void> {
+  async clearSharedVaultAndKeySystemAssociations(_dto: { itemUuid?: Uuid; sharedVaultUuid: Uuid }): Promise<void> {
    this.logger.error('Method clearSharedVaultAndKeySystemAssociations not implemented.')
  }

@@ -66,19 +66,27 @@ export class SQLRevisionRepository extends SQLLegacyRevisionRepository {
    return this.revisionMapper.toDomain(sqlRevision)
  }

-  override async clearSharedVaultAndKeySystemAssociations(itemUuid: Uuid, sharedVaultUuid: Uuid): Promise<void> {
-    await this.ormRepository
-      .createQueryBuilder()
-      .update()
-      .set({
-        sharedVaultUuid: null,
-        keySystemIdentifier: null,
+  override async clearSharedVaultAndKeySystemAssociations(dto: {
+    itemUuid?: Uuid
+    sharedVaultUuid: Uuid
+  }): Promise<void> {
+    const queryBuilder = this.ormRepository.createQueryBuilder().update().set({
+      sharedVaultUuid: null,
+      keySystemIdentifier: null,
+    })
+
+    if (dto.itemUuid !== undefined) {
+      queryBuilder.where('item_uuid = :itemUuid AND shared_vault_uuid = :sharedVaultUuid', {
+        itemUuid: dto.itemUuid.value,
+        sharedVaultUuid: dto.sharedVaultUuid.value,
      })
-      .where('item_uuid = :itemUuid AND shared_vault_uuid = :sharedVaultUuid', {
-        itemUuid: itemUuid.value,
-        sharedVaultUuid: sharedVaultUuid.value,
+    } else {
+      queryBuilder.where('shared_vault_uuid = :sharedVaultUuid', {
+        sharedVaultUuid: dto.sharedVaultUuid.value,
      })
-      .execute()
+    }
+
+    await queryBuilder.execute()
  }

  override async findMetadataByItemId(
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

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

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

+## [1.101.1](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.101.0...@standardnotes/syncing-server@1.101.1) (2023-09-21)
+
+### Bug Fixes
+
+* secondary database catch up time ([880db10](https://github.com/standardnotes/syncing-server-js/commit/880db1038a39d4610a2593489a18e207487347a2))
+
+# [1.101.0](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.100.0...@standardnotes/syncing-server@1.101.0) (2023-09-20)
+
+### Features
+
+* add unassigning items and revisions upon shared vault removal ([#839](https://github.com/standardnotes/syncing-server-js/issues/839)) ([378eced](https://github.com/standardnotes/syncing-server-js/commit/378ecedfcc4fb23475c2329fb37479edb3b48a39))
+* **syncing-server:** distinct notifications upon user removal from shared vault ([#840](https://github.com/standardnotes/syncing-server-js/issues/840)) ([41e2136](https://github.com/standardnotes/syncing-server-js/commit/41e2136bc07312974701a70652528d304105e0f9))
+
 # [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
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/syncing-server",
-  "version": "1.100.0",
+  "version": "1.101.1",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -166,6 +166,8 @@ 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'
+import { RemoveItemsFromSharedVault } from '../Domain/UseCase/SharedVaults/RemoveItemsFromSharedVault/RemoveItemsFromSharedVault'
+import { SharedVaultRemovedEventHandler } from '../Domain/Handler/SharedVaultRemovedEventHandler'

 export class ContainerConfigLoader {
  private readonly DEFAULT_CONTENT_SIZE_TRANSFER_LIMIT = 10_000_000
@@ -764,6 +766,7 @@ export class ContainerConfigLoader {
          container.get<SharedVaultUserRepositoryInterface>(TYPES.Sync_SharedVaultUserRepository),
          container.get<SharedVaultRepositoryInterface>(TYPES.Sync_SharedVaultRepository),
          container.get<AddNotificationsForUsers>(TYPES.Sync_AddNotificationsForUsers),
+          container.get<AddNotificationForUser>(TYPES.Sync_AddNotificationForUser),
          container.get<DomainEventFactoryInterface>(TYPES.Sync_DomainEventFactory),
          container.get<DomainEventPublisherInterface>(TYPES.Sync_DomainEventPublisher),
        ),
@@ -786,6 +789,8 @@ export class ContainerConfigLoader {
          container.get<SharedVaultInviteRepositoryInterface>(TYPES.Sync_SharedVaultInviteRepository),
          container.get<RemoveUserFromSharedVault>(TYPES.Sync_RemoveSharedVaultUser),
          container.get<DeclineInviteToSharedVault>(TYPES.Sync_DeclineInviteToSharedVault),
+          container.get<DomainEventFactoryInterface>(TYPES.Sync_DomainEventFactory),
+          container.get<DomainEventPublisherInterface>(TYPES.Sync_DomainEventPublisher),
        ),
      )
    container
@@ -851,6 +856,15 @@ export class ContainerConfigLoader {
          env.get('MIGRATION_BATCH_SIZE', true) ? +env.get('MIGRATION_BATCH_SIZE', true) : 100,
        ),
      )
+    container
+      .bind<RemoveItemsFromSharedVault>(TYPES.Sync_RemoveItemsFromSharedVault)
+      .toConstantValue(
+        new RemoveItemsFromSharedVault(
+          isSecondaryDatabaseEnabled
+            ? container.get<ItemRepositoryInterface>(TYPES.Sync_MongoDBItemRepository)
+            : container.get<ItemRepositoryInterface>(TYPES.Sync_SQLItemRepository),
+        ),
+      )

    // Services
    container
@@ -966,6 +980,14 @@ export class ContainerConfigLoader {
          container.get<Logger>(TYPES.Sync_Logger),
        ),
      )
+    container
+      .bind<SharedVaultRemovedEventHandler>(TYPES.Sync_SharedVaultRemovedEventHandler)
+      .toConstantValue(
+        new SharedVaultRemovedEventHandler(
+          container.get<RemoveItemsFromSharedVault>(TYPES.Sync_RemoveItemsFromSharedVault),
+          container.get<Logger>(TYPES.Sync_Logger),
+        ),
+      )

    // Services
    container.bind<ContentDecoder>(TYPES.Sync_ContentDecoder).toDynamicValue(() => new ContentDecoder())
@@ -1004,6 +1026,10 @@ export class ContainerConfigLoader {
        'TRANSITION_REQUESTED',
        container.get<TransitionRequestedEventHandler>(TYPES.Sync_TransitionRequestedEventHandler),
      ],
+      [
+        'SHARED_VAULT_REMOVED',
+        container.get<SharedVaultRemovedEventHandler>(TYPES.Sync_SharedVaultRemovedEventHandler),
+      ],
    ])
    if (!isConfiguredForHomeServer) {
      container.bind(TYPES.Sync_AUTH_SERVER_URL).toConstantValue(env.get('AUTH_SERVER_URL'))
@@ -86,6 +86,7 @@ const TYPES = {
    'Sync_TransitionItemsFromPrimaryToSecondaryDatabaseForUser',
  ),
  Sync_SendEventToClient: Symbol.for('Sync_SendEventToClient'),
+  Sync_RemoveItemsFromSharedVault: Symbol.for('Sync_RemoveItemsFromSharedVault'),
  // Handlers
  Sync_AccountDeletionRequestedEventHandler: Symbol.for('Sync_AccountDeletionRequestedEventHandler'),
  Sync_DuplicateItemSyncedEventHandler: Symbol.for('Sync_DuplicateItemSyncedEventHandler'),
@@ -95,6 +96,7 @@ const TYPES = {
  Sync_SharedVaultFileUploadedEventHandler: Symbol.for('Sync_SharedVaultFileUploadedEventHandler'),
  Sync_SharedVaultFileMovedEventHandler: Symbol.for('Sync_SharedVaultFileMovedEventHandler'),
  Sync_TransitionRequestedEventHandler: Symbol.for('Sync_TransitionRequestedEventHandler'),
+  Sync_SharedVaultRemovedEventHandler: Symbol.for('Sync_SharedVaultRemovedEventHandler'),
  // Services
  Sync_ContentDecoder: Symbol.for('Sync_ContentDecoder'),
  Sync_DomainEventPublisher: Symbol.for('Sync_DomainEventPublisher'),
@@ -9,6 +9,7 @@ import {
  MessageSentToUserEvent,
  NotificationAddedForUserEvent,
  RevisionsCopyRequestedEvent,
+  SharedVaultRemovedEvent,
  TransitionStatusUpdatedEvent,
  UserAddedToSharedVaultEvent,
  UserInvitedToSharedVaultEvent,
@@ -21,11 +22,25 @@ import { DomainEventFactoryInterface } from './DomainEventFactoryInterface'
 export class DomainEventFactory implements DomainEventFactoryInterface {
  constructor(private timer: TimerInterface) {}

+  createSharedVaultRemovedEvent(dto: { sharedVaultUuid: string }): SharedVaultRemovedEvent {
+    return {
+      type: 'SHARED_VAULT_REMOVED',
+      createdAt: this.timer.getUTCDate(),
+      meta: {
+        correlation: {
+          userIdentifier: dto.sharedVaultUuid,
+          userIdentifierType: 'shared-vault-uuid',
+        },
+        origin: DomainEventService.SyncingServer,
+      },
+      payload: dto,
+    }
+  }
+
  createItemRemovedFromSharedVaultEvent(dto: {
    sharedVaultUuid: string
    itemUuid: string
    userUuid: string
-    roleNames: string[]
  }): ItemRemovedFromSharedVaultEvent {
    return {
      type: 'ITEM_REMOVED_FROM_SHARED_VAULT',
@@ -7,6 +7,7 @@ import {
  MessageSentToUserEvent,
  NotificationAddedForUserEvent,
  RevisionsCopyRequestedEvent,
+  SharedVaultRemovedEvent,
  TransitionStatusUpdatedEvent,
  UserAddedToSharedVaultEvent,
  UserInvitedToSharedVaultEvent,
@@ -99,6 +100,6 @@ export interface DomainEventFactoryInterface {
    sharedVaultUuid: string
    itemUuid: string
    userUuid: string
-    roleNames: string[]
  }): ItemRemovedFromSharedVaultEvent
+  createSharedVaultRemovedEvent(dto: { sharedVaultUuid: string }): SharedVaultRemovedEvent
 }
@@ -0,0 +1,22 @@
+import { DomainEventHandlerInterface, SharedVaultRemovedEvent } from '@standardnotes/domain-events'
+import { RemoveItemsFromSharedVault } from '../UseCase/SharedVaults/RemoveItemsFromSharedVault/RemoveItemsFromSharedVault'
+import { Logger } from 'winston'
+
+export class SharedVaultRemovedEventHandler implements DomainEventHandlerInterface {
+  constructor(
+    private removeItemsFromSharedVault: RemoveItemsFromSharedVault,
+    private logger: Logger,
+  ) {}
+
+  async handle(event: SharedVaultRemovedEvent): Promise<void> {
+    const result = await this.removeItemsFromSharedVault.execute({
+      sharedVaultUuid: event.payload.sharedVaultUuid,
+    })
+
+    if (result.isFailed()) {
+      this.logger.error(
+        `Failed to remove items from shared vault ${event.payload.sharedVaultUuid}: ${result.getError()}`,
+      )
+    }
+  }
+}
@@ -19,4 +19,5 @@ export interface ItemRepositoryInterface {
  save(item: Item): Promise<void>
  markItemsAsDeleted(itemUuids: Array<string>, updatedAtTimestamp: number): Promise<void>
  updateContentSize(itemUuid: string, contentSize: number): Promise<void>
+  unassignFromSharedVault(sharedVaultUuid: Uuid): Promise<void>
 }
@@ -6,7 +6,7 @@ describe('Notification', () => {
  it('should create an entity', () => {
    const payload = NotificationPayload.create({
      sharedVaultUuid: Uuid.create('0e8c3c7e-3f1a-4f7a-9b5a-5b2b0a7d4b1e').getValue(),
-      type: NotificationType.create(NotificationType.TYPES.RemovedFromSharedVault).getValue(),
+      type: NotificationType.create(NotificationType.TYPES.SelfRemovedFromSharedVault).getValue(),
      version: '1.0',
    }).getValue()

@@ -29,7 +29,7 @@ describe('AddNotificationForUser', () => {

    payload = NotificationPayload.create({
      sharedVaultUuid: Uuid.create('0e8c3c7e-3f1a-4f7a-9b5a-5b2b0a7d4b1e').getValue(),
-      type: NotificationType.create(NotificationType.TYPES.RemovedFromSharedVault).getValue(),
+      type: NotificationType.create(NotificationType.TYPES.SelfRemovedFromSharedVault).getValue(),
      version: '1.0',
    }).getValue()

@@ -50,7 +50,7 @@ describe('AddNotificationForUser', () => {

    const result = await useCase.execute({
      userUuid: '0e8c3c7e-3f1a-4f7a-9b5a-5b2b0a7d4b1e',
-      type: NotificationType.TYPES.RemovedFromSharedVault,
+      type: NotificationType.TYPES.SelfRemovedFromSharedVault,
      payload,
      version: '1.0',
    })
@@ -63,7 +63,7 @@ describe('AddNotificationForUser', () => {

    const result = await useCase.execute({
      userUuid: 'invalid',
-      type: NotificationType.TYPES.RemovedFromSharedVault,
+      type: NotificationType.TYPES.SelfRemovedFromSharedVault,
      payload,
      version: '1.0',
    })
@@ -94,7 +94,7 @@ describe('AddNotificationForUser', () => {

    const result = await useCase.execute({
      userUuid: '0e8c3c7e-3f1a-4f7a-9b5a-5b2b0a7d4b1e',
-      type: NotificationType.TYPES.RemovedFromSharedVault,
+      type: NotificationType.TYPES.SelfRemovedFromSharedVault,
      payload,
      version: '1.0',
    })
@@ -111,7 +111,7 @@ describe('AddNotificationForUser', () => {

    const result = await useCase.execute({
      userUuid: '0e8c3c7e-3f1a-4f7a-9b5a-5b2b0a7d4b1e',
-      type: NotificationType.TYPES.RemovedFromSharedVault,
+      type: NotificationType.TYPES.SelfRemovedFromSharedVault,
      payload,
      version: '1.0',
    })
@@ -54,6 +54,35 @@ describe('AddNotificationsForUsers', () => {
    expect(addNotificationForUser.execute).toHaveBeenCalledTimes(1)
  })

+  it('should not add notification for exceptUserUuid', async () => {
+    const useCase = createUseCase()
+
+    const result = await useCase.execute({
+      exceptUserUuid: '00000000-0000-0000-0000-000000000000',
+      sharedVaultUuid: '00000000-0000-0000-0000-000000000000',
+      type: 'test',
+      payload,
+      version: '1.0',
+    })
+
+    expect(result.isFailed()).toBeFalsy()
+    expect(addNotificationForUser.execute).toHaveBeenCalledTimes(0)
+  })
+
+  it('should return error if exceptUserUuid is invalid', async () => {
+    const useCase = createUseCase()
+
+    const result = await useCase.execute({
+      exceptUserUuid: 'invalid',
+      sharedVaultUuid: '00000000-0000-0000-0000-000000000000',
+      type: 'test',
+      payload,
+      version: '1.0',
+    })
+
+    expect(result.isFailed()).toBeTruthy()
+  })
+
  it('should return error if shared vault uuid is invalid', async () => {
    const useCase = createUseCase()

@@ -17,8 +17,21 @@ export class AddNotificationsForUsers implements UseCaseInterface<void> {
    }
    const sharedVaultUuid = sharedVaultUuidOrError.getValue()

+    let exceptUserUuid: Uuid | undefined
+    if (dto.exceptUserUuid) {
+      const exceptUserUuidOrError = Uuid.create(dto.exceptUserUuid)
+      if (exceptUserUuidOrError.isFailed()) {
+        return Result.fail(exceptUserUuidOrError.getError())
+      }
+      exceptUserUuid = exceptUserUuidOrError.getValue()
+    }
+
    const sharedVaultUsers = await this.sharedVaultUserRepository.findBySharedVaultUuid(sharedVaultUuid)
    for (const sharedVaultUser of sharedVaultUsers) {
+      if (exceptUserUuid && sharedVaultUser.props.userUuid.equals(exceptUserUuid)) {
+        continue
+      }
+
      const result = await this.addNotificationForUser.execute({
        userUuid: sharedVaultUser.props.userUuid.value,
        type: dto.type,
@@ -1,6 +1,7 @@
 import { NotificationPayload } from '@standardnotes/domain-core'

 export interface AddNotificationsForUsersDTO {
+  exceptUserUuid?: string
  sharedVaultUuid: string
  version: string
  type: string
@@ -1,4 +1,5 @@
 import { Uuid, Timestamps, Result, SharedVaultUserPermission, SharedVaultUser } from '@standardnotes/domain-core'
+import { DomainEventInterface, DomainEventPublisherInterface } from '@standardnotes/domain-events'

 import { SharedVaultRepositoryInterface } from '../../../SharedVault/SharedVaultRepositoryInterface'
 import { SharedVaultInviteRepositoryInterface } from '../../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface'
@@ -8,6 +9,7 @@ import { SharedVault } from '../../../SharedVault/SharedVault'
 import { RemoveUserFromSharedVault } from '../RemoveUserFromSharedVault/RemoveUserFromSharedVault'
 import { DeclineInviteToSharedVault } from '../DeclineInviteToSharedVault/DeclineInviteToSharedVault'
 import { SharedVaultInvite } from '../../../SharedVault/User/Invite/SharedVaultInvite'
+import { DomainEventFactoryInterface } from '../../../Event/DomainEventFactoryInterface'

 describe('DeleteSharedVault', () => {
  let sharedVaultRepository: SharedVaultRepositoryInterface
@@ -18,6 +20,8 @@ describe('DeleteSharedVault', () => {
  let sharedVault: SharedVault
  let sharedVaultUser: SharedVaultUser
  let sharedVaultInvite: SharedVaultInvite
+  let domainEventFactory: DomainEventFactoryInterface
+  let domainEventPublisher: DomainEventPublisherInterface

  const createUseCase = () =>
    new DeleteSharedVault(
@@ -26,6 +30,8 @@ describe('DeleteSharedVault', () => {
      sharedVaultInviteRepository,
      removeUserFromSharedVault,
      declineInviteToSharedVault,
+      domainEventFactory,
+      domainEventPublisher,
    )

  beforeEach(() => {
@@ -63,6 +69,17 @@ describe('DeleteSharedVault', () => {

    removeUserFromSharedVault = {} as jest.Mocked<RemoveUserFromSharedVault>
    removeUserFromSharedVault.execute = jest.fn().mockReturnValue(Result.ok())
+
+    domainEventFactory = {} as jest.Mocked<DomainEventFactoryInterface>
+    domainEventFactory.createUserRemovedFromSharedVaultEvent = jest
+      .fn()
+      .mockReturnValue({} as jest.Mocked<DomainEventInterface>)
+    domainEventFactory.createSharedVaultRemovedEvent = jest
+      .fn()
+      .mockReturnValue({} as jest.Mocked<DomainEventInterface>)
+
+    domainEventPublisher = {} as jest.Mocked<DomainEventPublisherInterface>
+    domainEventPublisher.publish = jest.fn()
  })

  it('should remove shared vault', async () => {
@@ -1,4 +1,5 @@
 import { Result, UseCaseInterface, Uuid } from '@standardnotes/domain-core'
+import { DomainEventPublisherInterface } from '@standardnotes/domain-events'

 import { DeleteSharedVaultDTO } from './DeleteSharedVaultDTO'
 import { SharedVaultRepositoryInterface } from '../../../SharedVault/SharedVaultRepositoryInterface'
@@ -6,6 +7,7 @@ import { SharedVaultUserRepositoryInterface } from '../../../SharedVault/User/Sh
 import { SharedVaultInviteRepositoryInterface } from '../../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface'
 import { RemoveUserFromSharedVault } from '../RemoveUserFromSharedVault/RemoveUserFromSharedVault'
 import { DeclineInviteToSharedVault } from '../DeclineInviteToSharedVault/DeclineInviteToSharedVault'
+import { DomainEventFactoryInterface } from '../../../Event/DomainEventFactoryInterface'

 export class DeleteSharedVault implements UseCaseInterface<void> {
  constructor(
@@ -14,6 +16,8 @@ export class DeleteSharedVault implements UseCaseInterface<void> {
    private sharedVaultInviteRepository: SharedVaultInviteRepositoryInterface,
    private removeUserFromSharedVault: RemoveUserFromSharedVault,
    private declineInviteToSharedVault: DeclineInviteToSharedVault,
+    private domainEventFactory: DomainEventFactoryInterface,
+    private domainEventPublisher: DomainEventPublisherInterface,
  ) {}

  async execute(dto: DeleteSharedVaultDTO): Promise<Result<void>> {
@@ -66,6 +70,12 @@ export class DeleteSharedVault implements UseCaseInterface<void> {

    await this.sharedVaultRepository.remove(sharedVault)

+    await this.domainEventPublisher.publish(
+      this.domainEventFactory.createSharedVaultRemovedEvent({
+        sharedVaultUuid: sharedVaultUuid.value,
+      }),
+    )
+
    return Result.ok()
  }
 }
@@ -0,0 +1,33 @@
+import { ItemRepositoryInterface } from '../../../Item/ItemRepositoryInterface'
+import { RemoveItemsFromSharedVault } from './RemoveItemsFromSharedVault'
+
+describe('RemoveItemsFromSharedVault', () => {
+  let itemRepository: ItemRepositoryInterface
+
+  const createUseCase = () => new RemoveItemsFromSharedVault(itemRepository)
+
+  beforeEach(() => {
+    itemRepository = {} as jest.Mocked<ItemRepositoryInterface>
+    itemRepository.unassignFromSharedVault = jest.fn()
+  })
+
+  it('should unassign items from shared vault', async () => {
+    const useCase = createUseCase()
+
+    await useCase.execute({
+      sharedVaultUuid: '00000000-0000-0000-0000-000000000000',
+    })
+
+    expect(itemRepository.unassignFromSharedVault).toHaveBeenCalled()
+  })
+
+  it('should return error when shared vault uuid is invalid', async () => {
+    const useCase = createUseCase()
+
+    const result = await useCase.execute({
+      sharedVaultUuid: 'invalid-uuid',
+    })
+
+    expect(result.isFailed()).toBe(true)
+  })
+})
@@ -0,0 +1,20 @@
+import { Result, UseCaseInterface, Uuid } from '@standardnotes/domain-core'
+
+import { ItemRepositoryInterface } from '../../../Item/ItemRepositoryInterface'
+import { RemoveItemsFromSharedVaultDTO } from './RemoveItemsFromSharedVaultDTO'
+
+export class RemoveItemsFromSharedVault implements UseCaseInterface<void> {
+  constructor(private itemRepository: ItemRepositoryInterface) {}
+
+  async execute(dto: RemoveItemsFromSharedVaultDTO): Promise<Result<void>> {
+    const sharedVaultUuidOrError = Uuid.create(dto.sharedVaultUuid)
+    if (sharedVaultUuidOrError.isFailed()) {
+      return Result.fail(sharedVaultUuidOrError.getError())
+    }
+    const sharedVaultUuid = sharedVaultUuidOrError.getValue()
+
+    await this.itemRepository.unassignFromSharedVault(sharedVaultUuid)
+
+    return Result.ok()
+  }
+}
@@ -0,0 +1,3 @@
+export interface RemoveItemsFromSharedVaultDTO {
+  sharedVaultUuid: string
+}
@@ -14,11 +14,13 @@ import { RemoveUserFromSharedVault } from './RemoveUserFromSharedVault'
 import { DomainEventFactoryInterface } from '../../../Event/DomainEventFactoryInterface'
 import { DomainEventInterface, DomainEventPublisherInterface } from '@standardnotes/domain-events'
 import { AddNotificationsForUsers } from '../../Messaging/AddNotificationsForUsers/AddNotificationsForUsers'
+import { AddNotificationForUser } from '../../Messaging/AddNotificationForUser/AddNotificationForUser'

 describe('RemoveUserFromSharedVault', () => {
  let sharedVaultRepository: SharedVaultRepositoryInterface
  let sharedVaultUserRepository: SharedVaultUserRepositoryInterface
  let addNotificationsForUsers: AddNotificationsForUsers
+  let addNotificationForUser: AddNotificationForUser
  let sharedVault: SharedVault
  let sharedVaultUser: SharedVaultUser
  let domainEventFactory: DomainEventFactoryInterface
@@ -29,6 +31,7 @@ describe('RemoveUserFromSharedVault', () => {
      sharedVaultUserRepository,
      sharedVaultRepository,
      addNotificationsForUsers,
+      addNotificationForUser,
      domainEventFactory,
      domainEventPublisher,
    )
@@ -56,6 +59,9 @@ describe('RemoveUserFromSharedVault', () => {
    addNotificationsForUsers = {} as jest.Mocked<AddNotificationsForUsers>
    addNotificationsForUsers.execute = jest.fn().mockReturnValue(Result.ok())

+    addNotificationForUser = {} as jest.Mocked<AddNotificationForUser>
+    addNotificationForUser.execute = jest.fn().mockReturnValue(Result.ok())
+
    domainEventFactory = {} as jest.Mocked<DomainEventFactoryInterface>
    domainEventFactory.createUserRemovedFromSharedVaultEvent = jest
      .fn()
@@ -215,6 +221,19 @@ describe('RemoveUserFromSharedVault', () => {
    expect(result.isFailed()).toBe(true)
  })

+  it('should return error if notification could not be added for the user removed', async () => {
+    addNotificationForUser.execute = jest.fn().mockResolvedValue(Result.fail('Could not add notification'))
+
+    const useCase = createUseCase()
+    const result = await useCase.execute({
+      originatorUuid: '00000000-0000-0000-0000-000000000000',
+      sharedVaultUuid: '00000000-0000-0000-0000-000000000000',
+      userUuid: '00000000-0000-0000-0000-000000000001',
+    })
+
+    expect(result.isFailed()).toBe(true)
+  })
+
  it('should return error if notification payload could not be created', async () => {
    const mock = jest.spyOn(NotificationPayload, 'create')
    mock.mockReturnValue(Result.fail('Oops'))
@@ -231,4 +250,21 @@ describe('RemoveUserFromSharedVault', () => {

    mock.mockRestore()
  })
+
+  it('should return error if self notification payload could not be created', async () => {
+    const mock = jest.spyOn(NotificationPayload, 'create')
+    mock.mockReturnValueOnce(Result.ok()).mockReturnValueOnce(Result.fail('Oops'))
+
+    const useCase = createUseCase()
+    const result = await useCase.execute({
+      originatorUuid: '00000000-0000-0000-0000-000000000000',
+      sharedVaultUuid: '00000000-0000-0000-0000-000000000000',
+      userUuid: '00000000-0000-0000-0000-000000000001',
+    })
+
+    expect(result.isFailed()).toBe(true)
+    expect(result.getError()).toBe('Oops')
+
+    mock.mockRestore()
+  })
 })
@@ -6,12 +6,14 @@ import { SharedVaultRepositoryInterface } from '../../../SharedVault/SharedVault
 import { SharedVaultUserRepositoryInterface } from '../../../SharedVault/User/SharedVaultUserRepositoryInterface'
 import { DomainEventFactoryInterface } from '../../../Event/DomainEventFactoryInterface'
 import { AddNotificationsForUsers } from '../../Messaging/AddNotificationsForUsers/AddNotificationsForUsers'
+import { AddNotificationForUser } from '../../Messaging/AddNotificationForUser/AddNotificationForUser'

 export class RemoveUserFromSharedVault implements UseCaseInterface<void> {
  constructor(
    private sharedVaultUsersRepository: SharedVaultUserRepositoryInterface,
    private sharedVaultRepository: SharedVaultRepositoryInterface,
-    private addNotificationForUsers: AddNotificationsForUsers,
+    private addNotificationsForUsers: AddNotificationsForUsers,
+    private addNotificationForUser: AddNotificationForUser,
    private domainEventFactory: DomainEventFactoryInterface,
    private domainEventPublisher: DomainEventPublisherInterface,
  ) {}
@@ -63,7 +65,7 @@ export class RemoveUserFromSharedVault implements UseCaseInterface<void> {

    const notificationPayloadOrError = NotificationPayload.create({
      sharedVaultUuid: sharedVault.uuid,
-      type: NotificationType.create(NotificationType.TYPES.RemovedFromSharedVault).getValue(),
+      type: NotificationType.create(NotificationType.TYPES.UserRemovedFromSharedVault).getValue(),
      version: '1.0',
    })
    if (notificationPayloadOrError.isFailed()) {
@@ -71,9 +73,10 @@ export class RemoveUserFromSharedVault implements UseCaseInterface<void> {
    }
    const notificationPayload = notificationPayloadOrError.getValue()

-    const result = await this.addNotificationForUsers.execute({
+    const result = await this.addNotificationsForUsers.execute({
      sharedVaultUuid: sharedVault.id.toString(),
-      type: NotificationType.TYPES.RemovedFromSharedVault,
+      exceptUserUuid: userUuid.value,
+      type: NotificationType.TYPES.UserRemovedFromSharedVault,
      payload: notificationPayload,
      version: '1.0',
    })
@@ -81,6 +84,26 @@ export class RemoveUserFromSharedVault implements UseCaseInterface<void> {
      return Result.fail(result.getError())
    }

+    const selfNotificationPayloadOrError = NotificationPayload.create({
+      sharedVaultUuid: sharedVault.uuid,
+      type: NotificationType.create(NotificationType.TYPES.SelfRemovedFromSharedVault).getValue(),
+      version: '1.0',
+    })
+    if (selfNotificationPayloadOrError.isFailed()) {
+      return Result.fail(selfNotificationPayloadOrError.getError())
+    }
+    const selfNotificationPayload = selfNotificationPayloadOrError.getValue()
+
+    const selfResult = await this.addNotificationForUser.execute({
+      userUuid: userUuid.value,
+      type: NotificationType.TYPES.SelfRemovedFromSharedVault,
+      payload: selfNotificationPayload,
+      version: '1.0',
+    })
+    if (selfResult.isFailed()) {
+      return Result.fail(selfResult.getError())
+    }
+
    await this.domainEventPublisher.publish(
      this.domainEventFactory.createUserRemovedFromSharedVaultEvent({
        sharedVaultUuid: dto.sharedVaultUuid,
@@ -270,7 +270,6 @@ export class UpdateExistingItem implements UseCaseInterface<Item> {
          sharedVaultUuid: sharedVaultOperation.props.sharedVaultUuid.value,
          itemUuid: dto.existingItem.uuid.value,
          userUuid: userUuid.value,
-          roleNames: dto.roleNames,
        }),
      )
    }
@@ -57,8 +57,6 @@ export class TransitionItemsFromPrimaryToSecondaryDatabaseForUser implements Use
    }
    const updatedItemsInSecondaryCount = updatedItemsInSecondary.length

-    await this.allowForSecondaryDatabaseToCatchUp()
-
    const migrationTimeStart = this.timer.getTimestampInMicroseconds()

    this.logger.info(`[${dto.userUuid}] Migrating items`)
@@ -133,8 +131,8 @@ export class TransitionItemsFromPrimaryToSecondaryDatabaseForUser implements Use
  }

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

  private async getNewItemsCreatedInSecondaryDatabase(userUuid: Uuid): Promise<{
@@ -17,6 +17,13 @@ export class MongoDBItemRepository implements ItemRepositoryInterface {
    private logger: Logger,
  ) {}

+  async unassignFromSharedVault(sharedVaultUuid: Uuid): Promise<void> {
+    await this.mongoRepository.updateMany(
+      { sharedVaultUuid: { $eq: sharedVaultUuid.value } },
+      { $set: { sharedVaultUuid: null } },
+    )
+  }
+
  async removeByUuid(uuid: Uuid): Promise<void> {
    await this.mongoRepository.deleteOne({ _id: { $eq: BSON.UUID.createFromHexString(uuid.value) } })
  }
@@ -1,5 +1,5 @@
 import { Repository, SelectQueryBuilder } from 'typeorm'
-import { MapperInterface } from '@standardnotes/domain-core'
+import { MapperInterface, Uuid } from '@standardnotes/domain-core'
 import { Logger } from 'winston'

 import { Item } from '../../Domain/Item/Item'
@@ -16,6 +16,19 @@ export class SQLItemRepository extends SQLLegacyItemRepository {
    super(ormRepository, mapper, logger)
  }

+  override async unassignFromSharedVault(sharedVaultUuid: Uuid): Promise<void> {
+    await this.ormRepository
+      .createQueryBuilder('item')
+      .update()
+      .set({
+        sharedVaultUuid: null,
+      })
+      .where('shared_vault_uuid = :sharedVaultUuid', {
+        sharedVaultUuid: sharedVaultUuid.value,
+      })
+      .execute()
+  }
+
  protected override createFindAllQueryBuilder(query: ItemQuery): SelectQueryBuilder<SQLItem> {
    const queryBuilder = this.ormRepository.createQueryBuilder('item')

@@ -16,6 +16,10 @@ export class SQLLegacyItemRepository implements ItemRepositoryInterface {
    protected logger: Logger,
  ) {}

+  async unassignFromSharedVault(_sharedVaultUuid: Uuid): Promise<void> {
+    this.logger.error('Method unassignFromSharedVault not supported.')
+  }
+
  async removeByUuid(uuid: Uuid): Promise<void> {
    await this.ormRepository
      .createQueryBuilder('item')
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.10.48](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.10.47...@standardnotes/websockets-server@1.10.48) (2023-09-20)
+
+**Note:** Version bump only for package @standardnotes/websockets-server
+
 ## [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,6 +1,6 @@
 {
  "name": "@standardnotes/websockets-server",
-  "version": "1.10.47",
+  "version": "1.10.48",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
Author	SHA1	Message	Date
standardci	db35b9fcab	chore(release): publish new version - @standardnotes/home-server@1.15.72 - @standardnotes/revisions-server@1.36.1 - @standardnotes/syncing-server@1.101.1	2023-09-21 07:34:07 +00:00
Karol Sójko	880db1038a	fix: secondary database catch up time	2023-09-21 09:17:00 +02:00
standardci	414b090efb	chore(release): publish new version - @standardnotes/analytics@2.26.19 - @standardnotes/api-gateway@1.74.17 - @standardnotes/auth-server@1.143.9 - @standardnotes/domain-core@1.32.0 - @standardnotes/domain-events-infra@1.12.31 - @standardnotes/domain-events@2.128.0 - @standardnotes/event-store@1.11.47 - @standardnotes/files-server@1.22.26 - @standardnotes/home-server@1.15.71 - @standardnotes/revisions-server@1.36.0 - @standardnotes/scheduler-server@1.20.51 - @standardnotes/settings@1.21.36 - @standardnotes/syncing-server@1.101.0 - @standardnotes/websockets-server@1.10.48	2023-09-20 14:13:03 +00:00
Karol Sójko	41e2136bc0	feat(syncing-server): distinct notifications upon user removal from shared vault (#840 )	2023-09-20 15:31:57 +02:00
Karol Sójko	378ecedfcc	feat: add unassigning items and revisions upon shared vault removal (#839 ) * feat: add unassigning items and revisions upon shared vault removal * fix(syncing-server): update event payload creation	2023-09-20 15:03:17 +02:00