chore(release): publish new version

- @standardnotes/home-server@1.13.13 - @standardnotes/syncing-server@1.70.5
fix(syncing-server): uuid comparison when removing user
2026-04-27 06:01:30 -04:00 · 2023-07-26 11:19:11 +00:00 · 2023-07-26 13:02:03 +02:00 · 2023-07-26 10:54:46 +00:00 · 2023-07-26 12:39:24 +02:00 · 2023-07-26 10:38:44 +00:00
53 changed files with 868 additions and 130 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.25.4](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.25.3...@standardnotes/analytics@2.25.4) (2023-07-26)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
 ## [2.25.3](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.25.2...@standardnotes/analytics@2.25.3) (2023-07-21)

 **Note:** Version bump only for package @standardnotes/analytics
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/analytics",
-  "version": "2.25.3",
+  "version": "2.25.4",
  "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.67.3](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.67.2...@standardnotes/api-gateway@1.67.3) (2023-07-26)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
 ## [1.67.2](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.67.1...@standardnotes/api-gateway@1.67.2) (2023-07-21)

 **Note:** Version bump only for package @standardnotes/api-gateway
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/api-gateway",
-  "version": "1.67.2",
+  "version": "1.67.3",
  "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.126.3](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.126.2...@standardnotes/auth-server@1.126.3) (2023-07-26)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
 ## [1.126.2](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.126.1...@standardnotes/auth-server@1.126.2) (2023-07-21)

 **Note:** Version bump only for package @standardnotes/auth-server
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/auth-server",
-  "version": "1.126.2",
+  "version": "1.126.3",
  "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.23.4](https://github.com/standardnotes/server/compare/@standardnotes/domain-core@1.23.3...@standardnotes/domain-core@1.23.4) (2023-07-26)
+
+### Bug Fixes
+
+* **syncing-server:** persisting aggregate changes from root ([#674](https://github.com/standardnotes/server/issues/674)) ([c34f548](https://github.com/standardnotes/server/commit/c34f548e45bbd8defb8d490936e90755fd284e78))
+
 ## [1.23.3](https://github.com/standardnotes/server/compare/@standardnotes/domain-core@1.23.2...@standardnotes/domain-core@1.23.3) (2023-07-21)

 ### Bug Fixes
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/domain-core",
-  "version": "1.23.3",
+  "version": "1.23.4",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -1,5 +1,20 @@
 /* istanbul ignore file */

+import { Change } from './Change'
 import { Entity } from './Entity'

-export abstract class Aggregate<T> extends Entity<T> {}
+export abstract class Aggregate<T> extends Entity<T> {
+  private changesOnAggregateRoot: Change[] = []
+
+  addChange(change: Change): void {
+    this.changesOnAggregateRoot.push(change)
+  }
+
+  flushChanges(): void {
+    this.changesOnAggregateRoot = []
+  }
+
+  getChanges(): Change[] {
+    return this.changesOnAggregateRoot
+  }
+}
@@ -0,0 +1,26 @@
+/* istanbul ignore file */
+
+import { ChangeProps } from './ChangeProps'
+import { Result } from './Result'
+
+export class Change {
+  static readonly TYPES = {
+    Add: 'add',
+    Remove: 'remove',
+    Modify: 'modify',
+  }
+
+  public readonly props: ChangeProps
+
+  constructor(props: ChangeProps) {
+    this.props = Object.freeze(props)
+  }
+
+  static create(props: ChangeProps): Result<Change> {
+    if (!Object.values(Change.TYPES).includes(props.changeType)) {
+      return Result.fail('Invalid change type')
+    }
+
+    return Result.ok(new Change(props))
+  }
+}
@@ -0,0 +1,9 @@
+/* istanbul ignore file */
+
+import { Entity } from './Entity'
+
+export interface ChangeProps {
+  aggregateRootUuid: string
+  changeType: string
+  changeData: Entity<unknown>
+}
@@ -27,6 +27,8 @@ export * from './Common/Uuid'
 export * from './Common/UuidProps'

 export * from './Core/Aggregate'
+export * from './Core/Change'
+export * from './Core/ChangeProps'
 export * from './Core/Entity'
 export * from './Core/Id'
 export * from './Core/Result'
@@ -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.11](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.11.10...@standardnotes/event-store@1.11.11) (2023-07-26)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
 ## [1.11.10](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.11.9...@standardnotes/event-store@1.11.10) (2023-07-21)

 **Note:** Version bump only for package @standardnotes/event-store
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/event-store",
-  "version": "1.11.10",
+  "version": "1.11.11",
  "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.19.13](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.19.12...@standardnotes/files-server@1.19.13) (2023-07-26)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
 ## [1.19.12](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.19.11...@standardnotes/files-server@1.19.12) (2023-07-21)

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

+## [1.13.13](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.13.12...@standardnotes/home-server@1.13.13) (2023-07-26)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.13.12](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.13.11...@standardnotes/home-server@1.13.12) (2023-07-26)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.13.11](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.13.10...@standardnotes/home-server@1.13.11) (2023-07-26)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.13.10](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.13.9...@standardnotes/home-server@1.13.10) (2023-07-25)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.13.9](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.13.8...@standardnotes/home-server@1.13.9) (2023-07-25)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
 ## [1.13.8](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.13.7...@standardnotes/home-server@1.13.8) (2023-07-25)

 **Note:** Version bump only for package @standardnotes/home-server
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/home-server",
-  "version": "1.13.8",
+  "version": "1.13.13",
  "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.25.4](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.25.3...@standardnotes/revisions-server@1.25.4) (2023-07-26)
+
+**Note:** Version bump only for package @standardnotes/revisions-server
+
 ## [1.25.3](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.25.2...@standardnotes/revisions-server@1.25.3) (2023-07-21)

 **Note:** Version bump only for package @standardnotes/revisions-server
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/revisions-server",
-  "version": "1.25.3",
+  "version": "1.25.4",
  "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.20.13](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.20.12...@standardnotes/scheduler-server@1.20.13) (2023-07-26)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
 ## [1.20.12](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.20.11...@standardnotes/scheduler-server@1.20.12) (2023-07-21)

 **Note:** Version bump only for package @standardnotes/scheduler-server
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/scheduler-server",
-  "version": "1.20.12",
+  "version": "1.20.13",
  "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.18](https://github.com/standardnotes/server/compare/@standardnotes/settings@1.21.17...@standardnotes/settings@1.21.18) (2023-07-26)
+
+**Note:** Version bump only for package @standardnotes/settings
+
 ## [1.21.17](https://github.com/standardnotes/server/compare/@standardnotes/settings@1.21.16...@standardnotes/settings@1.21.17) (2023-07-21)

 **Note:** Version bump only for package @standardnotes/settings
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/settings",
-  "version": "1.21.17",
+  "version": "1.21.18",
  "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.70.5](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.70.4...@standardnotes/syncing-server@1.70.5) (2023-07-26)
+
+### Bug Fixes
+
+* **syncing-server:** uuid comparison when removing user ([886ccf8](https://github.com/standardnotes/syncing-server-js/commit/886ccf84c1f3b9309ce7d01354ca815af1424b72))
+
+## [1.70.4](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.70.3...@standardnotes/syncing-server@1.70.4) (2023-07-26)
+
+### Bug Fixes
+
+* **syncing-serve:** removing other users from shared vault ([6b2389c](https://github.com/standardnotes/syncing-server-js/commit/6b2389cdc3da6d522f9ce0ba3ddff3ef1e99674f))
+
+## [1.70.3](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.70.2...@standardnotes/syncing-server@1.70.3) (2023-07-26)
+
+### Bug Fixes
+
+* **syncing-server:** persisting aggregate changes from root ([#674](https://github.com/standardnotes/syncing-server-js/issues/674)) ([c34f548](https://github.com/standardnotes/syncing-server-js/commit/c34f548e45bbd8defb8d490936e90755fd284e78))
+
+## [1.70.2](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.70.1...@standardnotes/syncing-server@1.70.2) (2023-07-25)
+
+### Bug Fixes
+
+* **syncing-server:** remove notifications after adding item to vault ([#672](https://github.com/standardnotes/syncing-server-js/issues/672)) ([8f88a87](https://github.com/standardnotes/syncing-server-js/commit/8f88a87c93e21f52a029167f2408ff061e2a4e93))
+
+## [1.70.1](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.70.0...@standardnotes/syncing-server@1.70.1) (2023-07-25)
+
+### Bug Fixes
+
+* **syncing-server:** allow sender to decline the invite ([#671](https://github.com/standardnotes/syncing-server-js/issues/671)) ([46c4947](https://github.com/standardnotes/syncing-server-js/commit/46c4947871f342f0a07c68562b0e3e77e7e114d4))
+
 # [1.70.0](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.69.0...@standardnotes/syncing-server@1.70.0) (2023-07-25)

 ### Features
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/syncing-server",
-  "version": "1.70.0",
+  "version": "1.70.5",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -152,6 +152,7 @@ import { NotificationHttpMapper } from '../Mapping/Http/NotificationHttpMapper'
 import { NotificationHttpRepresentation } from '../Mapping/Http/NotificationHttpRepresentation'
 import { DetermineSharedVaultOperationOnItem } from '../Domain/UseCase/SharedVaults/DetermineSharedVaultOperationOnItem/DetermineSharedVaultOperationOnItem'
 import { SharedVaultFilter } from '../Domain/Item/SaveRule/SharedVaultFilter'
+import { RemoveNotificationsForUser } from '../Domain/UseCase/Messaging/RemoveNotificationsForUser/RemoveNotificationsForUser'

 export class ContainerConfigLoader {
  private readonly DEFAULT_CONTENT_SIZE_TRANSFER_LIMIT = 10_000_000
@@ -549,6 +550,14 @@ export class ContainerConfigLoader {
          container.get(TYPES.Sync_DomainEventFactory),
        ),
      )
+    container
+      .bind<AddNotificationForUser>(TYPES.Sync_AddNotificationForUser)
+      .toConstantValue(
+        new AddNotificationForUser(container.get(TYPES.Sync_NotificationRepository), container.get(TYPES.Sync_Timer)),
+      )
+    container
+      .bind<RemoveNotificationsForUser>(TYPES.Sync_RemoveNotificationsForUser)
+      .toConstantValue(new RemoveNotificationsForUser(container.get(TYPES.Sync_NotificationRepository)))
    container
      .bind<UpdateExistingItem>(TYPES.Sync_UpdateExistingItem)
      .toConstantValue(
@@ -558,6 +567,9 @@ export class ContainerConfigLoader {
          container.get(TYPES.Sync_DomainEventPublisher),
          container.get(TYPES.Sync_DomainEventFactory),
          container.get(TYPES.Sync_REVISIONS_FREQUENCY),
+          container.get(TYPES.Sync_DetermineSharedVaultOperationOnItem),
+          container.get(TYPES.Sync_AddNotificationForUser),
+          container.get(TYPES.Sync_RemoveNotificationsForUser),
        ),
      )
    container
@@ -673,11 +685,6 @@ export class ContainerConfigLoader {
          container.get(TYPES.Sync_SharedVaultRepository),
        ),
      )
-    container
-      .bind<AddNotificationForUser>(TYPES.Sync_AddNotificationForUser)
-      .toConstantValue(
-        new AddNotificationForUser(container.get(TYPES.Sync_NotificationRepository), container.get(TYPES.Sync_Timer)),
-      )
    container
      .bind<RemoveUserFromSharedVault>(TYPES.Sync_RemoveSharedVaultUser)
      .toConstantValue(
@@ -57,6 +57,7 @@ const TYPES = {
  Sync_GetSharedVaultUsers: Symbol.for('Sync_GetSharedVaultUsers'),
  Sync_AddUserToSharedVault: Symbol.for('Sync_AddUserToSharedVault'),
  Sync_AddNotificationForUser: Symbol.for('Sync_AddNotificationForUser'),
+  Sync_RemoveNotificationsForUser: Symbol.for('Sync_RemoveNotificationsForUser'),
  Sync_RemoveSharedVaultUser: Symbol.for('Sync_RemoveSharedVaultUser'),
  Sync_InviteUserToSharedVault: Symbol.for('Sync_InviteUserToSharedVault'),
  Sync_UpdateSharedVaultInvite: Symbol.for('Sync_UpdateSharedVaultInvite'),
@@ -2,6 +2,7 @@ import { ContentType, Dates, Timestamps, UniqueEntityId, Uuid } from '@standardn

 import { Item } from './Item'
 import { SharedVaultAssociation } from '../SharedVault/SharedVaultAssociation'
+import { KeySystemAssociation } from '../KeySystem/KeySystemAssociation'

 describe('Item', () => {
  it('should create an aggregate', () => {
@@ -97,4 +98,155 @@ describe('Item', () => {
        .isAssociatedWithSharedVault(Uuid.create('00000000-0000-0000-0000-000000000000').getValue()),
    ).toBeFalsy()
  })
+
+  it('should tell if an item is associated with a key system', () => {
+    const entityOrError = Item.create({
+      duplicateOf: null,
+      itemsKeyId: 'items-key-id',
+      content: 'content',
+      contentType: ContentType.create(ContentType.TYPES.Note).getValue(),
+      encItemKey: 'enc-item-key',
+      authHash: 'auth-hash',
+      userUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+      deleted: false,
+      updatedWithSession: null,
+      dates: Dates.create(new Date(123), new Date(123)).getValue(),
+      timestamps: Timestamps.create(123, 123).getValue(),
+      keySystemAssociation: KeySystemAssociation.create({
+        itemUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+        keySystemIdentifier: 'key-system-identifier',
+        timestamps: Timestamps.create(123, 123).getValue(),
+      }).getValue(),
+    })
+
+    expect(entityOrError.isFailed()).toBeFalsy()
+    expect(entityOrError.getValue().isAssociatedWithKeySystem('key-system-identifier')).toBeTruthy()
+  })
+
+  it('should tell that an item is not associated with a key system', () => {
+    const entityOrError = Item.create({
+      duplicateOf: null,
+      itemsKeyId: 'items-key-id',
+      content: 'content',
+      contentType: ContentType.create(ContentType.TYPES.Note).getValue(),
+      encItemKey: 'enc-item-key',
+      authHash: 'auth-hash',
+      userUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+      deleted: false,
+      updatedWithSession: null,
+      dates: Dates.create(new Date(123), new Date(123)).getValue(),
+      timestamps: Timestamps.create(123, 123).getValue(),
+    })
+
+    expect(entityOrError.isFailed()).toBeFalsy()
+    expect(entityOrError.getValue().isAssociatedWithKeySystem('key-system-identifier')).toBeFalsy()
+  })
+
+  it('should set shared vault association', () => {
+    const sharedVaultAssociation = SharedVaultAssociation.create({
+      itemUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+      sharedVaultUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+      lastEditedBy: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+      timestamps: Timestamps.create(123, 123).getValue(),
+    }).getValue()
+
+    const entity = Item.create({
+      duplicateOf: null,
+      itemsKeyId: 'items-key-id',
+      content: 'content',
+      contentType: ContentType.create(ContentType.TYPES.Note).getValue(),
+      encItemKey: 'enc-item-key',
+      authHash: 'auth-hash',
+      userUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+      deleted: false,
+      updatedWithSession: null,
+      dates: Dates.create(new Date(123), new Date(123)).getValue(),
+      timestamps: Timestamps.create(123, 123).getValue(),
+    }).getValue()
+
+    entity.setSharedVaultAssociation(sharedVaultAssociation)
+
+    expect(entity.props.sharedVaultAssociation).toEqual(sharedVaultAssociation)
+    expect(entity.getChanges()).toHaveLength(1)
+  })
+
+  it('should unset a shared vault association', () => {
+    const entity = Item.create({
+      duplicateOf: null,
+      itemsKeyId: 'items-key-id',
+      content: 'content',
+      contentType: ContentType.create(ContentType.TYPES.Note).getValue(),
+      encItemKey: 'enc-item-key',
+      authHash: 'auth-hash',
+      userUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+      deleted: false,
+      updatedWithSession: null,
+      dates: Dates.create(new Date(123), new Date(123)).getValue(),
+      timestamps: Timestamps.create(123, 123).getValue(),
+      sharedVaultAssociation: SharedVaultAssociation.create({
+        itemUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+        sharedVaultUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+        lastEditedBy: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+        timestamps: Timestamps.create(123, 123).getValue(),
+      }).getValue(),
+    }).getValue()
+
+    entity.unsetSharedVaultAssociation()
+
+    expect(entity.props.sharedVaultAssociation).toBeUndefined()
+    expect(entity.getChanges()).toHaveLength(1)
+  })
+
+  it('should set key system association', () => {
+    const keySystemAssociation = KeySystemAssociation.create({
+      itemUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+      keySystemIdentifier: 'key-system-identifier',
+      timestamps: Timestamps.create(123, 123).getValue(),
+    }).getValue()
+
+    const entity = Item.create({
+      duplicateOf: null,
+      itemsKeyId: 'items-key-id',
+      content: 'content',
+      contentType: ContentType.create(ContentType.TYPES.Note).getValue(),
+      encItemKey: 'enc-item-key',
+      authHash: 'auth-hash',
+      userUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+      deleted: false,
+      updatedWithSession: null,
+      dates: Dates.create(new Date(123), new Date(123)).getValue(),
+      timestamps: Timestamps.create(123, 123).getValue(),
+    }).getValue()
+
+    entity.setKeySystemAssociation(keySystemAssociation)
+
+    expect(entity.props.keySystemAssociation).toEqual(keySystemAssociation)
+    expect(entity.getChanges()).toHaveLength(1)
+  })
+
+  it('should unset a key system association', () => {
+    const entity = Item.create({
+      duplicateOf: null,
+      itemsKeyId: 'items-key-id',
+      content: 'content',
+      contentType: ContentType.create(ContentType.TYPES.Note).getValue(),
+      encItemKey: 'enc-item-key',
+      authHash: 'auth-hash',
+      userUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+      deleted: false,
+      updatedWithSession: null,
+      dates: Dates.create(new Date(123), new Date(123)).getValue(),
+      timestamps: Timestamps.create(123, 123).getValue(),
+      keySystemAssociation: KeySystemAssociation.create({
+        itemUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+        keySystemIdentifier: 'key-system-identifier',
+        timestamps: Timestamps.create(123, 123).getValue(),
+      }).getValue(),
+    }).getValue()
+
+    entity.unsetKeySystemAssociation()
+
+    expect(entity.props.keySystemAssociation).toBeUndefined()
+    expect(entity.getChanges()).toHaveLength(1)
+  })
 })
@@ -1,8 +1,23 @@
-import { Aggregate, Result, UniqueEntityId, Uuid } from '@standardnotes/domain-core'
+import { Aggregate, Change, Result, UniqueEntityId, Uuid } from '@standardnotes/domain-core'

 import { ItemProps } from './ItemProps'
+import { SharedVaultAssociation } from '../SharedVault/SharedVaultAssociation'
+import { KeySystemAssociation } from '../KeySystem/KeySystemAssociation'

 export class Item extends Aggregate<ItemProps> {
+  private constructor(props: ItemProps, id?: UniqueEntityId) {
+    super(props, id)
+  }
+
+  static create(props: ItemProps, id?: UniqueEntityId): Result<Item> {
+    if (!props.contentSize) {
+      const contentSize = Buffer.byteLength(JSON.stringify(props))
+      props.contentSize = contentSize
+    }
+
+    return Result.ok<Item>(new Item(props, id))
+  }
+
  get uuid(): Uuid {
    const uuidOrError = Uuid.create(this._id.toString())
    if (uuidOrError.isFailed()) {
@@ -40,16 +55,57 @@ export class Item extends Aggregate<ItemProps> {
    return this.props.keySystemAssociation.props.keySystemIdentifier === keySystemIdentifier
  }

-  private constructor(props: ItemProps, id?: UniqueEntityId) {
-    super(props, id)
+  setSharedVaultAssociation(sharedVaultAssociation: SharedVaultAssociation): void {
+    this.addChange(
+      Change.create({
+        aggregateRootUuid: this.uuid.value,
+        changeType: this.props.sharedVaultAssociation ? Change.TYPES.Modify : Change.TYPES.Add,
+        changeData: sharedVaultAssociation,
+      }).getValue(),
+    )
+
+    this.props.sharedVaultAssociation = sharedVaultAssociation
  }

-  static create(props: ItemProps, id?: UniqueEntityId): Result<Item> {
-    if (!props.contentSize) {
-      const contentSize = Buffer.byteLength(JSON.stringify(props))
-      props.contentSize = contentSize
+  unsetSharedVaultAssociation(): void {
+    if (!this.props.sharedVaultAssociation) {
+      return
    }

-    return Result.ok<Item>(new Item(props, id))
+    this.addChange(
+      Change.create({
+        aggregateRootUuid: this.uuid.value,
+        changeType: Change.TYPES.Remove,
+        changeData: this.props.sharedVaultAssociation,
+      }).getValue(),
+    )
+    this.props.sharedVaultAssociation = undefined
+  }
+
+  setKeySystemAssociation(keySystemAssociation: KeySystemAssociation): void {
+    this.addChange(
+      Change.create({
+        aggregateRootUuid: this.uuid.value,
+        changeType: this.props.keySystemAssociation ? Change.TYPES.Modify : Change.TYPES.Add,
+        changeData: keySystemAssociation,
+      }).getValue(),
+    )
+
+    this.props.keySystemAssociation = keySystemAssociation
+  }
+
+  unsetKeySystemAssociation(): void {
+    if (!this.props.keySystemAssociation) {
+      return
+    }
+
+    this.addChange(
+      Change.create({
+        aggregateRootUuid: this.uuid.value,
+        changeType: Change.TYPES.Remove,
+        changeData: this.props.keySystemAssociation,
+      }).getValue(),
+    )
+    this.props.keySystemAssociation = undefined
  }
 }
@@ -72,24 +72,11 @@ describe('SharedVaultFilter', () => {
      .mockResolvedValueOnce(null)
  })

-  it('should return as passed if the item hash does not represent a shared vault item', async () => {
+  it('should return as passed if the item hash does not represent a shared vault item and existing item is not a shared vault item', async () => {
    itemHash = ItemHash.create({
      ...itemHash.props,
      shared_vault_uuid: null,
    }).getValue()
-
-    const filter = createFilter()
-    const result = await filter.check({
-      apiVersion: '001',
-      existingItem: existingItem,
-      itemHash: itemHash,
-      userUuid: '00000000-0000-0000-0000-000000000000',
-    })
-
-    expect(result.passed).toBe(true)
-  })
-
-  it('should return as passed if the item is not a shared vault item', async () => {
    existingItem = Item.create({
      ...existingItem.props,
      sharedVaultAssociation: undefined,
@@ -16,7 +16,7 @@ export class SharedVaultFilter implements ItemSaveRuleInterface {
  ) {}

  async check(dto: ItemSaveValidationDTO): Promise<ItemSaveRuleResult> {
-    if (!dto.itemHash.representsASharedVaultItem() || !dto.existingItem?.isAssociatedWithASharedVault()) {
+    if (!dto.itemHash.representsASharedVaultItem() && !dto.existingItem?.isAssociatedWithASharedVault()) {
      return {
        passed: true,
      }
@@ -1,4 +1,4 @@
-import { Uuid } from '@standardnotes/domain-core'
+import { NotificationType, Uuid } from '@standardnotes/domain-core'

 import { Notification } from './Notification'

@@ -6,4 +6,6 @@ export interface NotificationRepositoryInterface {
  save(notification: Notification): Promise<void>
  findByUserUuidUpdatedAfter(userUuid: Uuid, lastSyncTime: number): Promise<Notification[]>
  findByUserUuid(userUuid: Uuid): Promise<Notification[]>
+  findByUserUuidAndType(userUuid: Uuid, type: NotificationType): Promise<Notification[]>
+  remove(notification: Notification): Promise<void>
 }
@@ -0,0 +1,64 @@
+import { NotificationPayload, NotificationType, Timestamps, Uuid } from '@standardnotes/domain-core'
+
+import { NotificationRepositoryInterface } from '../../../Notifications/NotificationRepositoryInterface'
+import { RemoveNotificationsForUser } from './RemoveNotificationsForUser'
+import { Notification } from '../../../Notifications/Notification'
+
+describe('RemoveNotificationsForUser', () => {
+  let notificationRepository: NotificationRepositoryInterface
+  let notification: Notification
+
+  const createUseCase = () => new RemoveNotificationsForUser(notificationRepository)
+
+  beforeEach(() => {
+    notification = Notification.create({
+      userUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+      type: NotificationType.create(NotificationType.TYPES.SharedVaultItemRemoved).getValue(),
+      payload: NotificationPayload.create({
+        itemUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+        sharedVaultUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+        type: NotificationType.create(NotificationType.TYPES.SharedVaultItemRemoved).getValue(),
+        version: '1.0',
+      }).getValue(),
+      timestamps: Timestamps.create(123, 123).getValue(),
+    }).getValue()
+
+    notificationRepository = {} as jest.Mocked<NotificationRepositoryInterface>
+    notificationRepository.findByUserUuidAndType = jest.fn().mockResolvedValue([notification])
+    notificationRepository.remove = jest.fn()
+  })
+
+  it('should remove notifications for user', async () => {
+    const useCase = createUseCase()
+
+    const result = await useCase.execute({
+      userUuid: '00000000-0000-0000-0000-000000000000',
+      type: NotificationType.TYPES.SharedVaultItemRemoved,
+    })
+
+    expect(result.isFailed()).toBeFalsy()
+    expect(notificationRepository.remove).toHaveBeenCalledWith(notification)
+  })
+
+  it('should fail if user uuid is invalid', async () => {
+    const useCase = createUseCase()
+
+    const result = await useCase.execute({
+      userUuid: 'invalid',
+      type: NotificationType.TYPES.SharedVaultItemRemoved,
+    })
+
+    expect(result.isFailed()).toBeTruthy()
+  })
+
+  it('should fail if notification type is invalid', async () => {
+    const useCase = createUseCase()
+
+    const result = await useCase.execute({
+      userUuid: '00000000-0000-0000-0000-000000000000',
+      type: 'invalid',
+    })
+
+    expect(result.isFailed()).toBeTruthy()
+  })
+})
@@ -0,0 +1,29 @@
+import { NotificationType, Result, UseCaseInterface, Uuid } from '@standardnotes/domain-core'
+
+import { RemoveNotificationsForUserDTO } from './RemoveNotificationsForUserDTO'
+import { NotificationRepositoryInterface } from '../../../Notifications/NotificationRepositoryInterface'
+
+export class RemoveNotificationsForUser implements UseCaseInterface<void> {
+  constructor(private notificationRepository: NotificationRepositoryInterface) {}
+
+  async execute(dto: RemoveNotificationsForUserDTO): Promise<Result<void>> {
+    const userUuidOrError = Uuid.create(dto.userUuid)
+    if (userUuidOrError.isFailed()) {
+      return Result.fail(userUuidOrError.getError())
+    }
+    const userUuid = userUuidOrError.getValue()
+
+    const typeOrError = NotificationType.create(dto.type)
+    if (typeOrError.isFailed()) {
+      return Result.fail(typeOrError.getError())
+    }
+    const type = typeOrError.getValue()
+
+    const notifications = await this.notificationRepository.findByUserUuidAndType(userUuid, type)
+    for (const notification of notifications) {
+      await this.notificationRepository.remove(notification)
+    }
+
+    return Result.ok()
+  }
+}
@@ -0,0 +1,4 @@
+export interface RemoveNotificationsForUserDTO {
+  type: string
+  userUuid: string
+}
@@ -30,7 +30,7 @@ describe('DeclineInviteToSharedVault', () => {

    const result = await useCase.execute({
      inviteUuid: 'invalid',
-      originatorUuid: '00000000-0000-0000-0000-000000000000',
+      userUuid: '00000000-0000-0000-0000-000000000000',
    })

    expect(result.isFailed()).toBe(true)
@@ -42,7 +42,7 @@ describe('DeclineInviteToSharedVault', () => {

    const result = await useCase.execute({
      inviteUuid: '00000000-0000-0000-0000-000000000000',
-      originatorUuid: 'invalid',
+      userUuid: 'invalid',
    })

    expect(result.isFailed()).toBe(true)
@@ -56,7 +56,7 @@ describe('DeclineInviteToSharedVault', () => {

    const result = await useCase.execute({
      inviteUuid: '00000000-0000-0000-0000-000000000000',
-      originatorUuid: '00000000-0000-0000-0000-000000000000',
+      userUuid: '00000000-0000-0000-0000-000000000000',
    })

    expect(result.isFailed()).toBe(true)
@@ -68,11 +68,11 @@ describe('DeclineInviteToSharedVault', () => {

    const result = await useCase.execute({
      inviteUuid: '00000000-0000-0000-0000-000000000000',
-      originatorUuid: '00000000-0000-0000-0000-000000000001',
+      userUuid: '00000000-0000-0000-0000-000000000001',
    })

    expect(result.isFailed()).toBe(true)
-    expect(result.getError()).toBe('Only the recipient of the invite can decline it')
+    expect(result.getError()).toBe('Only the recipient or the sender can decline the invite')
  })

  it('should delete invite', async () => {
@@ -80,7 +80,7 @@ describe('DeclineInviteToSharedVault', () => {

    await useCase.execute({
      inviteUuid: '00000000-0000-0000-0000-000000000000',
-      originatorUuid: '00000000-0000-0000-0000-000000000000',
+      userUuid: '00000000-0000-0000-0000-000000000000',
    })

    expect(sharedVaultInviteRepository.remove).toHaveBeenCalled()
@@ -12,19 +12,19 @@ export class DeclineInviteToSharedVault implements UseCaseInterface<void> {
    }
    const inviteUuid = inviteUuidOrError.getValue()

-    const originatorUuidOrError = Uuid.create(dto.originatorUuid)
-    if (originatorUuidOrError.isFailed()) {
-      return Result.fail(originatorUuidOrError.getError())
+    const userUuidOrError = Uuid.create(dto.userUuid)
+    if (userUuidOrError.isFailed()) {
+      return Result.fail(userUuidOrError.getError())
    }
-    const originatorUuid = originatorUuidOrError.getValue()
+    const userUuid = userUuidOrError.getValue()

    const invite = await this.sharedVaultInviteRepository.findByUuid(inviteUuid)
    if (!invite) {
      return Result.fail('Invite not found')
    }

-    if (!invite.props.userUuid.equals(originatorUuid)) {
-      return Result.fail('Only the recipient of the invite can decline it')
+    if (!invite.props.userUuid.equals(userUuid) && !invite.props.senderUuid.equals(userUuid)) {
+      return Result.fail('Only the recipient or the sender can decline the invite')
    }

    await this.sharedVaultInviteRepository.remove(invite)
@@ -1,4 +1,4 @@
 export interface DeclineInviteToSharedVaultDTO {
  inviteUuid: string
-  originatorUuid: string
+  userUuid: string
 }
@@ -29,7 +29,7 @@ export class DeleteSharedVaultInvitesSentByUser implements UseCaseInterface<void
    for (const invite of inboundInvites) {
      const result = await this.declineInviteToSharedVault.execute({
        inviteUuid: invite.id.toString(),
-        originatorUuid: userUuid.value,
+        userUuid: userUuid.value,
      })
      if (result.isFailed()) {
        return Result.fail(result.getError())
@@ -20,7 +20,7 @@ export class DeleteSharedVaultInvitesToUser implements UseCaseInterface<void> {
    for (const invite of inboundInvites) {
      const result = await this.declineInviteToSharedVault.execute({
        inviteUuid: invite.id.toString(),
-        originatorUuid: userUuid.value,
+        userUuid: userUuid.value,
      })
      if (result.isFailed()) {
        return Result.fail(result.getError())
@@ -45,12 +45,13 @@ describe('RemoveUserFromSharedVault', () => {

  it('should remove user from shared vault', async () => {
    const useCase = createUseCase()
-    await useCase.execute({
+    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()).toBeFalsy()
    expect(sharedVaultUserRepository.remove).toHaveBeenCalledWith(sharedVaultUser)
  })

@@ -99,7 +100,7 @@ describe('RemoveUserFromSharedVault', () => {
    })

    expect(result.isFailed()).toBe(true)
-    expect(result.getError()).toBe('Only owner can remove users from shared vault')
+    expect(result.getError()).toBe('Only owner can remove other users from shared vault')
  })

  it('should remove shared vault user if user is owner and is being force removed', async () => {
@@ -37,8 +37,9 @@ export class RemoveUserFromSharedVault implements UseCaseInterface<void> {
    }

    const originatorIsOwner = sharedVault.props.userUuid.equals(originatorUuid)
-    if (!originatorIsOwner) {
-      return Result.fail('Only owner can remove users from shared vault')
+    const removingSomeoneElseWhenNotOwner = !originatorIsOwner && !userUuid.equals(originatorUuid)
+    if (removingSomeoneElseWhenNotOwner) {
+      return Result.fail('Only owner can remove other users from shared vault')
    }

    const removingOwner = sharedVault.props.userUuid.equals(userUuid)
@@ -87,7 +87,27 @@ export class SaveNewItem implements UseCaseInterface<Item> {
    }
    const timestamps = timestampsOrError.getValue()

-    let sharedVaultAssociation = undefined
+    const itemOrError = Item.create(
+      {
+        updatedWithSession,
+        content: dto.itemHash.props.content ?? null,
+        userUuid,
+        contentType,
+        encItemKey: dto.itemHash.props.enc_item_key ?? null,
+        authHash: dto.itemHash.props.auth_hash ?? null,
+        itemsKeyId: dto.itemHash.props.items_key_id ?? null,
+        duplicateOf,
+        deleted: dto.itemHash.props.deleted ?? false,
+        dates,
+        timestamps,
+      },
+      new UniqueEntityId(uuid.value),
+    )
+    if (itemOrError.isFailed()) {
+      return Result.fail(itemOrError.getError())
+    }
+    const newItem = itemOrError.getValue()
+
    if (dto.itemHash.representsASharedVaultItem()) {
      const sharedVaultAssociationOrError = SharedVaultAssociation.create({
        lastEditedBy: userUuid,
@@ -101,10 +121,9 @@ export class SaveNewItem implements UseCaseInterface<Item> {
      if (sharedVaultAssociationOrError.isFailed()) {
        return Result.fail(sharedVaultAssociationOrError.getError())
      }
-      sharedVaultAssociation = sharedVaultAssociationOrError.getValue()
+      newItem.setSharedVaultAssociation(sharedVaultAssociationOrError.getValue())
    }

-    let keySystemAssociation = undefined
    if (dto.itemHash.hasDedicatedKeySystemAssociation()) {
      const keySystemIdentifiedValidationResult = Validator.isNotEmptyString(dto.itemHash.props.key_system_identifier)
      if (keySystemIdentifiedValidationResult.isFailed()) {
@@ -123,32 +142,9 @@ export class SaveNewItem implements UseCaseInterface<Item> {
      if (keySystemAssociationOrError.isFailed()) {
        return Result.fail(keySystemAssociationOrError.getError())
      }
-      keySystemAssociation = keySystemAssociationOrError.getValue()
+      newItem.setKeySystemAssociation(keySystemAssociationOrError.getValue())
    }

-    const itemOrError = Item.create(
-      {
-        updatedWithSession,
-        content: dto.itemHash.props.content ?? null,
-        userUuid,
-        contentType,
-        encItemKey: dto.itemHash.props.enc_item_key ?? null,
-        authHash: dto.itemHash.props.auth_hash ?? null,
-        itemsKeyId: dto.itemHash.props.items_key_id ?? null,
-        duplicateOf,
-        deleted: dto.itemHash.props.deleted ?? false,
-        dates,
-        timestamps,
-        keySystemAssociation,
-        sharedVaultAssociation,
-      },
-      new UniqueEntityId(uuid.value),
-    )
-    if (itemOrError.isFailed()) {
-      return Result.fail(itemOrError.getError())
-    }
-    const newItem = itemOrError.getValue()
-
    await this.itemRepository.save(newItem)

    if (contentType.value !== null && [ContentType.TYPES.Note, ContentType.TYPES.File].includes(contentType.value)) {
@@ -177,7 +177,7 @@ describe('SyncItems', () => {
    })
  })

-  it('should sync items and return items keys on top for first sync', async () => {
+  it('should sync items and return items keys on top for first sync that is not a shared vault exclusive sync', async () => {
    const result = await createUseCase().execute({
      userUuid: '1-2-3',
      itemHashes: [itemHash],
@@ -202,6 +202,32 @@ describe('SyncItems', () => {
    })
  })

+  it('should sync items and not return items keys on top for first sync that is a shared vault exclusive sync', async () => {
+    const result = await createUseCase().execute({
+      userUuid: '1-2-3',
+      itemHashes: [itemHash],
+      computeIntegrityHash: false,
+      limit: 10,
+      readOnlyAccess: false,
+      sessionUuid: '2-3-4',
+      contentType: 'Note',
+      apiVersion: ApiVersion.v20200115,
+      snjsVersion: '1.2.3',
+      sharedVaultUuids: ['00000000-0000-0000-0000-000000000000'],
+    })
+    expect(result.getValue()).toEqual({
+      conflicts: [],
+      cursorToken: 'asdzxc',
+      retrievedItems: [item1],
+      savedItems: [item2],
+      syncToken: 'qwerty',
+      sharedVaults: [],
+      sharedVaultInvites: [],
+      notifications: [],
+      messages: [],
+    })
+  })
+
  it('should sync items and return filtered out sync conflicts for consecutive sync operations', async () => {
    getItemsUseCase.execute = jest.fn().mockReturnValue(
      Result.ok({
@@ -50,7 +50,8 @@ export class SyncItems implements UseCaseInterface<SyncItemsResponse> {
    const saveItemsResult = saveItemsResultOrError.getValue()

    let retrievedItems = this.filterOutSyncConflictsForConsecutiveSyncs(getItemsResult.items, saveItemsResult.conflicts)
-    if (this.isFirstSync(dto)) {
+    const isSharedVaultExclusiveSync = dto.sharedVaultUuids && dto.sharedVaultUuids.length > 0
+    if (this.isFirstSync(dto) && !isSharedVaultExclusiveSync) {
      retrievedItems = await this.frontLoadKeysItemsToTop(dto.userUuid, retrievedItems)
    }

@@ -5,9 +5,21 @@ import { Item } from '../../../Item/Item'
 import { ItemHash } from '../../../Item/ItemHash'
 import { ItemRepositoryInterface } from '../../../Item/ItemRepositoryInterface'
 import { UpdateExistingItem } from './UpdateExistingItem'
-import { Uuid, ContentType, Dates, Timestamps, UniqueEntityId, Result } from '@standardnotes/domain-core'
+import {
+  Uuid,
+  ContentType,
+  Dates,
+  Timestamps,
+  UniqueEntityId,
+  Result,
+  NotificationPayload,
+} from '@standardnotes/domain-core'
 import { SharedVaultAssociation } from '../../../SharedVault/SharedVaultAssociation'
 import { KeySystemAssociation } from '../../../KeySystem/KeySystemAssociation'
+import { DetermineSharedVaultOperationOnItem } from '../../SharedVaults/DetermineSharedVaultOperationOnItem/DetermineSharedVaultOperationOnItem'
+import { AddNotificationForUser } from '../../Messaging/AddNotificationForUser/AddNotificationForUser'
+import { RemoveNotificationsForUser } from '../../Messaging/RemoveNotificationsForUser/RemoveNotificationsForUser'
+import { SharedVaultOperationOnItem } from '../../../SharedVault/SharedVaultOperationOnItem'

 describe('UpdateExistingItem', () => {
  let itemRepository: ItemRepositoryInterface
@@ -16,8 +28,21 @@ describe('UpdateExistingItem', () => {
  let domainEventFactory: DomainEventFactoryInterface
  let itemHash1: ItemHash
  let item1: Item
+  let determineSharedVaultOperationOnItem: DetermineSharedVaultOperationOnItem
+  let addNotificationForUser: AddNotificationForUser
+  let removeNotificationsForUser: RemoveNotificationsForUser

-  const createUseCase = () => new UpdateExistingItem(itemRepository, timer, domainEventPublisher, domainEventFactory, 5)
+  const createUseCase = () =>
+    new UpdateExistingItem(
+      itemRepository,
+      timer,
+      domainEventPublisher,
+      domainEventFactory,
+      5,
+      determineSharedVaultOperationOnItem,
+      addNotificationForUser,
+      removeNotificationsForUser,
+    )

  beforeEach(() => {
    const timeHelper = new Timer()
@@ -80,6 +105,25 @@ describe('UpdateExistingItem', () => {
    domainEventFactory.createItemRevisionCreationRequested = jest
      .fn()
      .mockReturnValue({} as jest.Mocked<DomainEventInterface>)
+
+    determineSharedVaultOperationOnItem = {} as jest.Mocked<DetermineSharedVaultOperationOnItem>
+    determineSharedVaultOperationOnItem.execute = jest.fn().mockResolvedValue(
+      Result.ok(
+        SharedVaultOperationOnItem.create({
+          existingItem: item1,
+          incomingItemHash: itemHash1,
+          sharedVaultUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+          type: SharedVaultOperationOnItem.TYPES.AddToSharedVault,
+          userUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+        }).getValue(),
+      ),
+    )
+
+    addNotificationForUser = {} as jest.Mocked<AddNotificationForUser>
+    addNotificationForUser.execute = jest.fn().mockReturnValue(Result.ok())
+
+    removeNotificationsForUser = {} as jest.Mocked<RemoveNotificationsForUser>
+    removeNotificationsForUser.execute = jest.fn().mockReturnValue(Result.ok())
  })

  it('should update item', async () => {
@@ -306,12 +350,14 @@ describe('UpdateExistingItem', () => {
        shared_vault_uuid: '00000000-0000-0000-0000-000000000000',
      }).getValue()

-      item1.props.sharedVaultAssociation = SharedVaultAssociation.create({
-        itemUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
-        sharedVaultUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
-        lastEditedBy: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
-        timestamps: Timestamps.create(123, 123).getValue(),
-      }).getValue()
+      item1.setSharedVaultAssociation(
+        SharedVaultAssociation.create({
+          itemUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+          sharedVaultUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+          lastEditedBy: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+          timestamps: Timestamps.create(123, 123).getValue(),
+        }).getValue(),
+      )
      const idBefore = item1.props.sharedVaultAssociation?.id.toString()

      const result = await useCase.execute({
@@ -324,7 +370,7 @@ describe('UpdateExistingItem', () => {
      expect(result.isFailed()).toBeFalsy()

      expect(item1.props.sharedVaultAssociation).not.toBeUndefined()
-      expect(item1.props.sharedVaultAssociation.id.toString()).toEqual(idBefore)
+      expect((item1.props.sharedVaultAssociation as SharedVaultAssociation).id.toString()).toEqual(idBefore)
    })

    it('should return error if shared vault association could not be created', async () => {
@@ -349,6 +395,111 @@ describe('UpdateExistingItem', () => {
      expect(result.isFailed()).toBeTruthy()
      mock.mockRestore()
    })
+
+    it('should return error if it fails to determine the shared vault operation on item', async () => {
+      const useCase = createUseCase()
+
+      determineSharedVaultOperationOnItem.execute = jest.fn().mockReturnValue(Result.fail('Oops'))
+
+      const itemHash = ItemHash.create({
+        ...itemHash1.props,
+        shared_vault_uuid: '00000000-0000-0000-0000-000000000000',
+      }).getValue()
+
+      const result = await useCase.execute({
+        existingItem: item1,
+        itemHash,
+        sessionUuid: '00000000-0000-0000-0000-000000000000',
+        performingUserUuid: '00000000-0000-0000-0000-000000000000',
+      })
+      expect(result.isFailed()).toBeTruthy()
+    })
+
+    it('should return error if it fails to add notification for user', async () => {
+      determineSharedVaultOperationOnItem.execute = jest.fn().mockReturnValue(
+        Result.ok(
+          SharedVaultOperationOnItem.create({
+            existingItem: item1,
+            incomingItemHash: itemHash1,
+            sharedVaultUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+            type: SharedVaultOperationOnItem.TYPES.RemoveFromSharedVault,
+            userUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+          }).getValue(),
+        ),
+      )
+
+      addNotificationForUser.execute = jest.fn().mockReturnValue(Result.fail('Oops'))
+
+      const useCase = createUseCase()
+
+      const itemHash = ItemHash.create({
+        ...itemHash1.props,
+        shared_vault_uuid: '00000000-0000-0000-0000-000000000000',
+      }).getValue()
+
+      const result = await useCase.execute({
+        existingItem: item1,
+        itemHash,
+        sessionUuid: '00000000-0000-0000-0000-000000000000',
+        performingUserUuid: '00000000-0000-0000-0000-000000000000',
+      })
+      expect(result.isFailed()).toBeTruthy()
+    })
+
+    it('should return error if it fails to create notification payload for user', async () => {
+      determineSharedVaultOperationOnItem.execute = jest.fn().mockReturnValue(
+        Result.ok(
+          SharedVaultOperationOnItem.create({
+            existingItem: item1,
+            incomingItemHash: itemHash1,
+            sharedVaultUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+            type: SharedVaultOperationOnItem.TYPES.RemoveFromSharedVault,
+            userUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+          }).getValue(),
+        ),
+      )
+
+      const mock = jest.spyOn(NotificationPayload, 'create')
+      mock.mockImplementation(() => {
+        return Result.fail('Oops')
+      })
+
+      const useCase = createUseCase()
+
+      const itemHash = ItemHash.create({
+        ...itemHash1.props,
+        shared_vault_uuid: '00000000-0000-0000-0000-000000000000',
+      }).getValue()
+
+      const result = await useCase.execute({
+        existingItem: item1,
+        itemHash,
+        sessionUuid: '00000000-0000-0000-0000-000000000000',
+        performingUserUuid: '00000000-0000-0000-0000-000000000000',
+      })
+      expect(result.isFailed()).toBeTruthy()
+
+      mock.mockRestore()
+    })
+
+    it('should return error if it fails to remove notifications for user', async () => {
+      const useCase = createUseCase()
+
+      removeNotificationsForUser.execute = jest.fn().mockReturnValue(Result.fail('Oops'))
+
+      const itemHash = ItemHash.create({
+        ...itemHash1.props,
+        shared_vault_uuid: '00000000-0000-0000-0000-000000000000',
+      }).getValue()
+
+      const result = await useCase.execute({
+        existingItem: item1,
+        itemHash,
+        sessionUuid: '00000000-0000-0000-0000-000000000000',
+        performingUserUuid: '00000000-0000-0000-0000-000000000000',
+      })
+      expect(result.isFailed()).toBeTruthy()
+    })
  })

  describe('when item is associated to a key system', () => {
@@ -379,11 +530,13 @@ describe('UpdateExistingItem', () => {
        key_system_identifier: '00000000-0000-0000-0000-000000000000',
      }).getValue()

-      item1.props.keySystemAssociation = KeySystemAssociation.create({
-        itemUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
-        keySystemIdentifier: '00000000-0000-0000-0000-000000000000',
-        timestamps: Timestamps.create(123, 123).getValue(),
-      }).getValue()
+      item1.setKeySystemAssociation(
+        KeySystemAssociation.create({
+          itemUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
+          keySystemIdentifier: '00000000-0000-0000-0000-000000000000',
+          timestamps: Timestamps.create(123, 123).getValue(),
+        }).getValue(),
+      )
      const idBefore = item1.props.keySystemAssociation?.id.toString()

      const result = await useCase.execute({
@@ -396,7 +549,7 @@ describe('UpdateExistingItem', () => {
      expect(result.isFailed()).toBeFalsy()

      expect(item1.props.keySystemAssociation).not.toBeUndefined()
-      expect(item1.props.keySystemAssociation.id.toString()).toEqual(idBefore)
+      expect((item1.props.keySystemAssociation as KeySystemAssociation).id.toString()).toEqual(idBefore)
    })

    it('should return error if key system identifier is invalid', async () => {
@@ -1,6 +1,8 @@
 import {
  ContentType,
  Dates,
+  NotificationPayload,
+  NotificationType,
  Result,
  Timestamps,
  UniqueEntityId,
@@ -17,6 +19,10 @@ import { ItemRepositoryInterface } from '../../../Item/ItemRepositoryInterface'
 import { DomainEventFactoryInterface } from '../../../Event/DomainEventFactoryInterface'
 import { SharedVaultAssociation } from '../../../SharedVault/SharedVaultAssociation'
 import { KeySystemAssociation } from '../../../KeySystem/KeySystemAssociation'
+import { DetermineSharedVaultOperationOnItem } from '../../SharedVaults/DetermineSharedVaultOperationOnItem/DetermineSharedVaultOperationOnItem'
+import { SharedVaultOperationOnItem } from '../../../SharedVault/SharedVaultOperationOnItem'
+import { AddNotificationForUser } from '../../Messaging/AddNotificationForUser/AddNotificationForUser'
+import { RemoveNotificationsForUser } from '../../Messaging/RemoveNotificationsForUser/RemoveNotificationsForUser'

 export class UpdateExistingItem implements UseCaseInterface<Item> {
  constructor(
@@ -25,6 +31,9 @@ export class UpdateExistingItem implements UseCaseInterface<Item> {
    private domainEventPublisher: DomainEventPublisherInterface,
    private domainEventFactory: DomainEventFactoryInterface,
    private revisionFrequency: number,
+    private determineSharedVaultOperationOnItem: DetermineSharedVaultOperationOnItem,
+    private addNotificationForUser: AddNotificationForUser,
+    private removeNotificationsForUser: RemoveNotificationsForUser,
  ) {}

  async execute(dto: UpdateExistingItemDTO): Promise<Result<Item>> {
@@ -113,6 +122,7 @@ export class UpdateExistingItem implements UseCaseInterface<Item> {

    dto.existingItem.props.contentSize = Buffer.byteLength(JSON.stringify(dto.existingItem))

+    let sharedVaultOperation: SharedVaultOperationOnItem | null = null
    if (dto.itemHash.representsASharedVaultItem()) {
      const sharedVaultAssociationOrError = SharedVaultAssociation.create(
        {
@@ -137,32 +147,50 @@ export class UpdateExistingItem implements UseCaseInterface<Item> {
        return Result.fail(sharedVaultAssociationOrError.getError())
      }

-      dto.existingItem.props.sharedVaultAssociation = sharedVaultAssociationOrError.getValue()
+      dto.existingItem.setSharedVaultAssociation(sharedVaultAssociationOrError.getValue())
+
+      const sharedVaultOperationOrError = await this.determineSharedVaultOperationOnItem.execute({
+        existingItem: dto.existingItem,
+        itemHash: dto.itemHash,
+        userUuid: userUuid.value,
+      })
+      if (sharedVaultOperationOrError.isFailed()) {
+        return Result.fail(sharedVaultOperationOrError.getError())
+      }
+      sharedVaultOperation = sharedVaultOperationOrError.getValue()
+    } else {
+      dto.existingItem.unsetSharedVaultAssociation()
    }

-    if (
-      dto.itemHash.hasDedicatedKeySystemAssociation() &&
-      !dto.existingItem.isAssociatedWithKeySystem(dto.itemHash.props.key_system_identifier as string)
-    ) {
+    if (dto.itemHash.hasDedicatedKeySystemAssociation()) {
      const keySystemIdentifiedValidationResult = Validator.isNotEmptyString(dto.itemHash.props.key_system_identifier)
      if (keySystemIdentifiedValidationResult.isFailed()) {
        return Result.fail(keySystemIdentifiedValidationResult.getError())
      }
      const keySystemIdentifier = dto.itemHash.props.key_system_identifier as string

-      const keySystemAssociationOrError = KeySystemAssociation.create({
-        itemUuid: Uuid.create(dto.existingItem.id.toString()).getValue(),
-        timestamps: Timestamps.create(
-          this.timer.getTimestampInMicroseconds(),
-          this.timer.getTimestampInMicroseconds(),
-        ).getValue(),
-        keySystemIdentifier,
-      })
+      const keySystemAssociationOrError = KeySystemAssociation.create(
+        {
+          itemUuid: Uuid.create(dto.existingItem.id.toString()).getValue(),
+          timestamps: Timestamps.create(
+            this.timer.getTimestampInMicroseconds(),
+            this.timer.getTimestampInMicroseconds(),
+          ).getValue(),
+          keySystemIdentifier,
+        },
+        new UniqueEntityId(
+          dto.existingItem.props.keySystemAssociation
+            ? dto.existingItem.props.keySystemAssociation.id.toString()
+            : undefined,
+        ),
+      )
      if (keySystemAssociationOrError.isFailed()) {
        return Result.fail(keySystemAssociationOrError.getError())
      }

-      dto.existingItem.props.keySystemAssociation = keySystemAssociationOrError.getValue()
+      dto.existingItem.setKeySystemAssociation(keySystemAssociationOrError.getValue())
+    } else {
+      dto.existingItem.unsetKeySystemAssociation()
    }

    if (dto.itemHash.props.deleted === true) {
@@ -199,6 +227,55 @@ export class UpdateExistingItem implements UseCaseInterface<Item> {
      )
    }

+    const notificationsResult = await this.addNotifications(dto.existingItem.uuid, userUuid, sharedVaultOperation)
+    if (notificationsResult.isFailed()) {
+      return Result.fail(notificationsResult.getError())
+    }
+
    return Result.ok(dto.existingItem)
  }
+
+  private async addNotifications(
+    itemUuid: Uuid,
+    userUuid: Uuid,
+    sharedVaultOperation: SharedVaultOperationOnItem | null,
+  ): Promise<Result<void>> {
+    if (
+      sharedVaultOperation &&
+      sharedVaultOperation.props.type === SharedVaultOperationOnItem.TYPES.RemoveFromSharedVault
+    ) {
+      const notificationPayloadOrError = NotificationPayload.create({
+        sharedVaultUuid: sharedVaultOperation.props.sharedVaultUuid,
+        type: NotificationType.create(NotificationType.TYPES.SharedVaultItemRemoved).getValue(),
+        itemUuid: itemUuid,
+        version: '1.0',
+      })
+      if (notificationPayloadOrError.isFailed()) {
+        return Result.fail(notificationPayloadOrError.getError())
+      }
+      const payload = notificationPayloadOrError.getValue()
+
+      const result = await this.addNotificationForUser.execute({
+        payload,
+        type: NotificationType.TYPES.SharedVaultItemRemoved,
+        userUuid: userUuid.value,
+        version: '1.0',
+      })
+      if (result.isFailed()) {
+        return Result.fail(result.getError())
+      }
+    }
+
+    if (sharedVaultOperation && sharedVaultOperation.props.type === SharedVaultOperationOnItem.TYPES.AddToSharedVault) {
+      const result = await this.removeNotificationsForUser.execute({
+        type: NotificationType.TYPES.SharedVaultItemRemoved,
+        userUuid: userUuid.value,
+      })
+      if (result.isFailed()) {
+        return Result.fail(result.getError())
+      }
+    }
+
+    return Result.ok()
+  }
 }
@@ -132,7 +132,7 @@ export class HomeServerSharedVaultInvitesController extends BaseHttpController {
  async declineSharedVaultInvite(request: Request, response: Response): Promise<results.JsonResult> {
    const result = await this.declineSharedVaultInviteUseCase.execute({
      inviteUuid: request.params.inviteUuid,
-      originatorUuid: response.locals.user.uuid,
+      userUuid: response.locals.user.uuid,
    })

    if (result.isFailed()) {
@@ -239,7 +239,7 @@ export class HomeServerSharedVaultInvitesController extends BaseHttpController {
  async deleteSharedVaultInvite(request: Request, response: Response): Promise<results.JsonResult> {
    const result = await this.declineSharedVaultInviteUseCase.execute({
      inviteUuid: request.params.inviteUuid,
-      originatorUuid: response.locals.user.uuid,
+      userUuid: response.locals.user.uuid,
    })

    if (result.isFailed()) {
@@ -1,6 +1,6 @@
 import { ReadStream } from 'fs'
 import { Repository, SelectQueryBuilder } from 'typeorm'
-import { MapperInterface, Uuid } from '@standardnotes/domain-core'
+import { Change, MapperInterface, Uuid } from '@standardnotes/domain-core'

 import { Item } from '../../Domain/Item/Item'
 import { ItemQuery } from '../../Domain/Item/ItemQuery'
@@ -10,6 +10,8 @@ import { TypeORMItem } from './TypeORMItem'
 import { KeySystemAssociationRepositoryInterface } from '../../Domain/KeySystem/KeySystemAssociationRepositoryInterface'
 import { SharedVaultAssociationRepositoryInterface } from '../../Domain/SharedVault/SharedVaultAssociationRepositoryInterface'
 import { TypeORMSharedVaultAssociation } from './TypeORMSharedVaultAssociation'
+import { SharedVaultAssociation } from '../../Domain/SharedVault/SharedVaultAssociation'
+import { KeySystemAssociation } from '../../Domain/KeySystem/KeySystemAssociation'

 export class TypeORMItemRepository implements ItemRepositoryInterface {
  constructor(
@@ -24,13 +26,7 @@ export class TypeORMItemRepository implements ItemRepositoryInterface {

    await this.ormRepository.save(persistence)

-    if (item.props.sharedVaultAssociation) {
-      await this.sharedVaultAssociationRepository.save(item.props.sharedVaultAssociation)
-    }
-
-    if (item.props.keySystemAssociation) {
-      await this.keySystemAssociationRepository.save(item.props.keySystemAssociation)
-    }
+    await this.persistAssociationChanges(item)
  }

  async remove(item: Item): Promise<void> {
@@ -273,4 +269,27 @@ export class TypeORMItemRepository implements ItemRepositoryInterface {
      item.props.sharedVaultAssociation = sharedVaultAssociation
    }
  }
+
+  private async persistAssociationChanges(item: Item): Promise<void> {
+    for (const change of item.getChanges()) {
+      if (change.props.changeData instanceof SharedVaultAssociation) {
+        if ([Change.TYPES.Add, Change.TYPES.Modify].includes(change.props.changeType)) {
+          await this.sharedVaultAssociationRepository.save(change.props.changeData)
+        }
+        if (change.props.changeType === Change.TYPES.Remove) {
+          await this.sharedVaultAssociationRepository.remove(change.props.changeData)
+        }
+      }
+      if (change.props.changeData instanceof KeySystemAssociation) {
+        if ([Change.TYPES.Add, Change.TYPES.Modify].includes(change.props.changeType)) {
+          await this.keySystemAssociationRepository.save(change.props.changeData)
+        }
+        if (change.props.changeType === Change.TYPES.Remove) {
+          await this.keySystemAssociationRepository.remove(change.props.changeData)
+        }
+      }
+    }
+
+    item.flushChanges()
+  }
 }
@@ -1,5 +1,5 @@
 import { Repository } from 'typeorm'
-import { MapperInterface, Uuid } from '@standardnotes/domain-core'
+import { MapperInterface, NotificationType, Uuid } from '@standardnotes/domain-core'

 import { NotificationRepositoryInterface } from '../../Domain/Notifications/NotificationRepositoryInterface'
 import { TypeORMNotification } from './TypeORMNotification'
@@ -11,6 +11,24 @@ export class TypeORMNotificationRepository implements NotificationRepositoryInte
    private mapper: MapperInterface<Notification, TypeORMNotification>,
  ) {}

+  async findByUserUuidAndType(userUuid: Uuid, type: NotificationType): Promise<Notification[]> {
+    const persistence = await this.ormRepository
+      .createQueryBuilder('notification')
+      .where('notification.user_uuid = :userUuid', {
+        userUuid: userUuid.value,
+      })
+      .andWhere('notification.type = :type', {
+        type: type.value,
+      })
+      .getMany()
+
+    return persistence.map((p) => this.mapper.toDomain(p))
+  }
+
+  async remove(notification: Notification): Promise<void> {
+    await this.ormRepository.remove(this.mapper.toProjection(notification))
+  }
+
  async save(sharedVault: Notification): Promise<void> {
    const persistence = this.mapper.toProjection(sharedVault)

@@ -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.6](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.10.5...@standardnotes/websockets-server@1.10.6) (2023-07-26)
+
+**Note:** Version bump only for package @standardnotes/websockets-server
+
 ## [1.10.5](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.10.4...@standardnotes/websockets-server@1.10.5) (2023-07-21)

 **Note:** Version bump only for package @standardnotes/websockets-server
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/websockets-server",
-  "version": "1.10.5",
+  "version": "1.10.6",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
Author	SHA1	Message	Date
standardci	bc8048790f	chore(release): publish new version - @standardnotes/home-server@1.13.13 - @standardnotes/syncing-server@1.70.5	2023-07-26 11:19:11 +00:00
Karol Sójko	886ccf84c1	fix(syncing-server): uuid comparison when removing user	2023-07-26 13:02:03 +02:00
standardci	c067cb9fe4	chore(release): publish new version - @standardnotes/home-server@1.13.12 - @standardnotes/syncing-server@1.70.4	2023-07-26 10:54:46 +00:00
Karol Sójko	6b2389cdc3	fix(syncing-serve): removing other users from shared vault	2023-07-26 12:39:24 +02:00
standardci	d93916b159	chore(release): publish new version - @standardnotes/analytics@2.25.4 - @standardnotes/api-gateway@1.67.3 - @standardnotes/auth-server@1.126.3 - @standardnotes/domain-core@1.23.4 - @standardnotes/event-store@1.11.11 - @standardnotes/files-server@1.19.13 - @standardnotes/home-server@1.13.11 - @standardnotes/revisions-server@1.25.4 - @standardnotes/scheduler-server@1.20.13 - @standardnotes/settings@1.21.18 - @standardnotes/syncing-server@1.70.3 - @standardnotes/websockets-server@1.10.6	2023-07-26 10:38:44 +00:00
Karol Sójko	c34f548e45	fix(syncing-server): persisting aggregate changes from root (#674 )	2023-07-26 12:23:10 +02:00
standardci	6fcd56cc86	chore(release): publish new version - @standardnotes/home-server@1.13.10 - @standardnotes/syncing-server@1.70.2	2023-07-25 14:07:10 +00:00
Karol Sójko	8f88a87c93	fix(syncing-server): remove notifications after adding item to vault (#672 )	2023-07-25 15:51:42 +02:00
standardci	f8c2f84322	chore(release): publish new version - @standardnotes/home-server@1.13.9 - @standardnotes/syncing-server@1.70.1	2023-07-25 11:25:55 +00:00
Karol Sójko	46c4947871	fix(syncing-server): allow sender to decline the invite (#671 )	2023-07-25 13:05:10 +02:00