chore(release): publish new version

- @standardnotes/home-server@1.15.45
 - @standardnotes/revisions-server@1.33.14

packages/analytics/CHANGELOG.md

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

packages/analytics/package.json

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

packages/api-gateway/CHANGELOG.md

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

packages/api-gateway/package.json

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

packages/auth/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.141.7](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.141.6...@standardnotes/auth-server@1.141.7) (2023-09-12)
+
+### Bug Fixes
+
+* retry failed revision transitions ([e535cd5](https://github.com/standardnotes/server/commit/e535cd504cf1929539ff7faf13e9c1fdd2b7bfd1))
+
 ## [1.141.6](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.141.5...@standardnotes/auth-server@1.141.6) (2023-09-12)
 
 **Note:** Version bump only for package @standardnotes/auth-server

packages/auth/bin/transition.ts

@@ -11,6 +11,7 @@ import { DomainEventPublisherInterface } from '@standardnotes/domain-events'
 import { DomainEventFactoryInterface } from '../src/Domain/Event/DomainEventFactoryInterface'
 import { UserRepositoryInterface } from '../src/Domain/User/UserRepositoryInterface'
 import { RoleName } from '@standardnotes/domain-core'
+import { TransitionStatusRepositoryInterface } from '../src/Domain/Transition/TransitionStatusRepositoryInterface'
 
 const inputArgs = process.argv.slice(2)
 const startDateString = inputArgs[0]
@@ -18,6 +19,7 @@ const endDateString = inputArgs[1]
 
 const requestTransition = async (
   userRepository: UserRepositoryInterface,
+  transitionStatusRepository: TransitionStatusRepositoryInterface,
   logger: Logger,
   domainEventFactory: DomainEventFactoryInterface,
   domainEventPublisher: DomainEventPublisherInterface,
@@ -37,7 +39,10 @@ const requestTransition = async (
       continue
     }
 
-    const transitionRequestedEvent = domainEventFactory.createTransitionRequestedEvent({ userUuid: user.uuid })
+    const transitionRequestedEvent = domainEventFactory.createTransitionRequestedEvent({
+      userUuid: user.uuid,
+      type: 'items',
+    })
 
     usersTriggered += 1
 
@@ -47,6 +52,20 @@ const requestTransition = async (
   logger.info(
     `Triggered transition for ${usersTriggered} users created between ${startDateString} and ${endDateString}`,
   )
+
+  const revisionStatuses = await transitionStatusRepository.getStatuses('revisions')
+  const failedStatuses = revisionStatuses.filter((status) => status.status === 'FAILED')
+
+  logger.info(`Found ${failedStatuses.length} failed revision transitions`)
+
+  for (const status of failedStatuses) {
+    const transitionRequestedEvent = domainEventFactory.createTransitionRequestedEvent({
+      userUuid: status.userUuid,
+      type: 'revisions',
+    })
+
+    await domainEventPublisher.publish(transitionRequestedEvent)
+  }
 }
 
 const container = new ContainerConfigLoader('worker')
@@ -63,8 +82,13 @@ void container.load().then((container) => {
   const userRepository: UserRepositoryInterface = container.get(TYPES.Auth_UserRepository)
   const domainEventFactory: DomainEventFactoryInterface = container.get(TYPES.Auth_DomainEventFactory)
   const domainEventPublisher: DomainEventPublisherInterface = container.get(TYPES.Auth_DomainEventPublisher)
+  const transitionStatusRepository: TransitionStatusRepositoryInterface = container.get(
+    TYPES.Auth_TransitionStatusRepository,
+  )
 
-  Promise.resolve(requestTransition(userRepository, logger, domainEventFactory, domainEventPublisher))
+  Promise.resolve(
+    requestTransition(userRepository, transitionStatusRepository, logger, domainEventFactory, domainEventPublisher),
+  )
     .then(() => {
       logger.info(`Finished transition request for users created between ${startDateString} and ${endDateString}`)
 

packages/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/auth-server",
-  "version": "1.141.6",
+  "version": "1.141.7",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

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

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

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

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

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

@@ -9,4 +9,7 @@ export interface TransitionStatusRepositoryInterface {
     userUuid: string,
     transitionType: 'items' | 'revisions',
   ): Promise<'STARTED' | 'IN_PROGRESS' | 'FAILED' | null>
+  getStatuses(
+    transitionType: 'items' | 'revisions',
+  ): Promise<Array<{ userUuid: string; status: 'STARTED' | 'IN_PROGRESS' | 'FAILED' }>>
 }

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

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

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

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

packages/domain-events-infra/CHANGELOG.md

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

packages/domain-events-infra/package.json

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

packages/domain-events/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.125.3](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.125.2...@standardnotes/domain-events@2.125.3) (2023-09-12)
+
+### Bug Fixes
+
+* retry failed revision transitions ([e535cd5](https://github.com/standardnotes/server/commit/e535cd504cf1929539ff7faf13e9c1fdd2b7bfd1))
+
 ## [2.125.2](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.125.1...@standardnotes/domain-events@2.125.2) (2023-09-12)
 
 ### Bug Fixes

packages/domain-events/package.json

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

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

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

packages/event-store/CHANGELOG.md

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

packages/event-store/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/event-store",
-  "version": "1.11.38",
+  "version": "1.11.39",
   "description": "Event Store Service",
   "private": true,
   "main": "dist/src/index.js",

packages/files/CHANGELOG.md

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

packages/files/package.json

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

packages/home-server/CHANGELOG.md

@@ -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.15.45](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.44...@standardnotes/home-server@1.15.45) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.15.44](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.43...@standardnotes/home-server@1.15.44) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.15.43](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.42...@standardnotes/home-server@1.15.43) (2023-09-12)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
 ## [1.15.42](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.41...@standardnotes/home-server@1.15.42) (2023-09-12)
 
 **Note:** Version bump only for package @standardnotes/home-server

packages/home-server/package.json

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

packages/revisions/CHANGELOG.md

@@ -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.33.14](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.33.13...@standardnotes/revisions-server@1.33.14) (2023-09-12)
+
+### Bug Fixes
+
+* **revisions:** handle transitions with already existing data in secondary ([aa83526](https://github.com/standardnotes/server/commit/aa835268ea80e3aa74907e449d189e8b2774a859))
+
+## [1.33.13](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.33.12...@standardnotes/revisions-server@1.33.13) (2023-09-12)
+
+### Bug Fixes
+
+* retry failed revision transitions ([e535cd5](https://github.com/standardnotes/server/commit/e535cd504cf1929539ff7faf13e9c1fdd2b7bfd1))
+
 ## [1.33.12](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.33.11...@standardnotes/revisions-server@1.33.12) (2023-09-12)
 
 **Note:** Version bump only for package @standardnotes/revisions-server

packages/revisions/package.json

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

packages/revisions/src/Bootstrap/Container.ts

@@ -68,6 +68,7 @@ import { SQLRevisionMetadataPersistenceMapper } from '../Mapping/Persistence/SQL
 import { SQLRevisionPersistenceMapper } from '../Mapping/Persistence/SQL/SQLRevisionPersistenceMapper'
 import { RemoveRevisionsFromSharedVault } from '../Domain/UseCase/RemoveRevisionsFromSharedVault/RemoveRevisionsFromSharedVault'
 import { ItemRemovedFromSharedVaultEventHandler } from '../Domain/Handler/ItemRemovedFromSharedVaultEventHandler'
+import { TransitionRequestedEventHandler } from '../Domain/Handler/TransitionRequestedEventHandler'
 
 export class ContainerConfigLoader {
   constructor(private mode: 'server' | 'worker' = 'server') {}
@@ -458,6 +459,16 @@ export class ContainerConfigLoader {
           container.get<winston.Logger>(TYPES.Revisions_Logger),
         ),
       )
+    container
+      .bind<TransitionRequestedEventHandler>(TYPES.Revisions_TransitionRequestedEventHandler)
+      .toConstantValue(
+        new TransitionRequestedEventHandler(
+          container.get<TriggerTransitionFromPrimaryToSecondaryDatabaseForUser>(
+            TYPES.Revisions_TriggerTransitionFromPrimaryToSecondaryDatabaseForUser,
+          ),
+          container.get<winston.Logger>(TYPES.Revisions_Logger),
+        ),
+      )
 
     const eventHandlers: Map<string, DomainEventHandlerInterface> = new Map([
       ['ITEM_DUMPED', container.get(TYPES.Revisions_ItemDumpedEventHandler)],
@@ -465,6 +476,7 @@ export class ContainerConfigLoader {
       ['REVISIONS_COPY_REQUESTED', container.get(TYPES.Revisions_RevisionsCopyRequestedEventHandler)],
       ['TRANSITION_STATUS_UPDATED', container.get(TYPES.Revisions_TransitionStatusUpdatedEventHandler)],
       ['ITEM_REMOVED_FROM_SHARED_VAULT', container.get(TYPES.Revisions_ItemRemovedFromSharedVaultEventHandler)],
+      ['TRANSITION_REQUESTED', container.get(TYPES.Revisions_TransitionRequestedEventHandler)],
     ])
 
     if (isConfiguredForHomeServer) {

packages/revisions/src/Bootstrap/Types.ts

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

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

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

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

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

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

@@ -1,9 +1,11 @@
+/* istanbul ignore file */
 import { Result, UseCaseInterface, Uuid } from '@standardnotes/domain-core'
 import { TimerInterface } from '@standardnotes/time'
 import { Logger } from 'winston'
 
 import { TransitionRevisionsFromPrimaryToSecondaryDatabaseForUserDTO } from './TransitionRevisionsFromPrimaryToSecondaryDatabaseForUserDTO'
 import { RevisionRepositoryInterface } from '../../../Revision/RevisionRepositoryInterface'
+import { Revision } from '../../../Revision/Revision'
 
 export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements UseCaseInterface<void> {
   constructor(
@@ -33,10 +35,21 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
       return Result.ok()
     }
 
+    let newRevisionsInSecondaryCount = 0
     if (await this.hasAlreadyDataInSecondaryDatabase(userUuid)) {
-      return Result.fail(`Revisions for user ${userUuid.value} already exist in secondary database`)
+      const newRevisions = await this.getNewRevisionsCreatedInSecondaryDatabase(userUuid)
+      for (const existingRevision of newRevisions.alreadyExistingInPrimary) {
+        await (this.secondRevisionsRepository as RevisionRepositoryInterface).removeOneByUuid(
+          Uuid.create(existingRevision.id.toString()).getValue(),
+          userUuid,
+        )
+      }
+
+      newRevisionsInSecondaryCount = newRevisions.newRevisionsInSecondary.length
     }
 
+    await this.allowForSecondaryDatabaseToCatchUp()
+
     const migrationTimeStart = this.timer.getTimestampInMicroseconds()
 
     this.logger.debug(`Transitioning revisions for user ${userUuid.value}`)
@@ -55,7 +68,10 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
 
     await this.allowForSecondaryDatabaseToCatchUp()
 
-    const integrityCheckResult = await this.checkIntegrityBetweenPrimaryAndSecondaryDatabase(userUuid)
+    const integrityCheckResult = await this.checkIntegrityBetweenPrimaryAndSecondaryDatabase(
+      userUuid,
+      newRevisionsInSecondaryCount,
+    )
     if (integrityCheckResult.isFailed()) {
       const cleanupResult = await this.deleteRevisionsForUser(userUuid, this.secondRevisionsRepository)
       if (cleanupResult.isFailed()) {
@@ -157,13 +173,66 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
     return totalRevisionsCountForUserInSecondary > 0
   }
 
+  private async getNewRevisionsCreatedInSecondaryDatabase(userUuid: Uuid): Promise<{
+    alreadyExistingInPrimary: Revision[]
+    newRevisionsInSecondary: Revision[]
+  }> {
+    const revisions = await (this.secondRevisionsRepository as RevisionRepositoryInterface).findByUserUuid({
+      userUuid: userUuid,
+    })
+
+    const alreadyExistingInPrimary: Revision[] = []
+    const newRevisionsInSecondary: Revision[] = []
+
+    for (const revision of revisions) {
+      const revisionExistsInPrimary = await this.checkIfRevisionExistsInPrimaryDatabase(revision)
+      if (revisionExistsInPrimary) {
+        alreadyExistingInPrimary.push(revision)
+      } else {
+        newRevisionsInSecondary.push(revision)
+      }
+    }
+
+    return {
+      alreadyExistingInPrimary: alreadyExistingInPrimary,
+      newRevisionsInSecondary: newRevisionsInSecondary,
+    }
+  }
+
+  private async checkIfRevisionExistsInPrimaryDatabase(revision: Revision): Promise<boolean> {
+    const revisionInPrimary = await this.primaryRevisionsRepository.findOneByUuid(
+      Uuid.create(revision.id.toString()).getValue(),
+      revision.props.userUuid as Uuid,
+      [],
+    )
+
+    if (revisionInPrimary === null) {
+      return false
+    }
+
+    if (!revision.isIdenticalTo(revisionInPrimary)) {
+      this.logger.error(
+        `Revision ${revision.id.toString()} is not identical in primary and secondary database. Revision in secondary database: ${JSON.stringify(
+          revision,
+        )}, revision in primary database: ${JSON.stringify(revisionInPrimary)}`,
+      )
+
+      return false
+    }
+
+    return true
+  }
+
   private async isAlreadyMigrated(userUuid: Uuid): Promise<boolean> {
     const totalRevisionsCountForUserInPrimary = await this.primaryRevisionsRepository.countByUserUuid(userUuid)
 
     return totalRevisionsCountForUserInPrimary === 0
   }
 
-  private async checkIntegrityBetweenPrimaryAndSecondaryDatabase(userUuid: Uuid): Promise<Result<boolean>> {
+  private async checkIntegrityBetweenPrimaryAndSecondaryDatabase(
+    userUuid: Uuid,
+    newRevisionsInSecondaryCount: number,
+  ): Promise<Result<boolean>> {
     try {
       const totalRevisionsCountForUserInPrimary = await this.primaryRevisionsRepository.countByUserUuid(userUuid)
 
@@ -206,9 +275,12 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
         this.secondRevisionsRepository as RevisionRepositoryInterface
       ).countByUserUuid(userUuid)
 
-      if (totalRevisionsCountForUserInPrimary !== totalRevisionsCountForUserInSecondary) {
+      if (
+        totalRevisionsCountForUserInPrimary + newRevisionsInSecondaryCount !==
+        totalRevisionsCountForUserInSecondary
+      ) {
         return Result.fail(
-          `Total revisions count for user ${userUuid.value} in primary database (${totalRevisionsCountForUserInPrimary}) does not match total revisions count in secondary database (${totalRevisionsCountForUserInSecondary})`,
+          `Total revisions count for user ${userUuid.value} in primary database (${totalRevisionsCountForUserInPrimary} + ${newRevisionsInSecondaryCount}) does not match total revisions count in secondary database (${totalRevisionsCountForUserInSecondary})`,
         )
       }
 

packages/scheduler/CHANGELOG.md

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

packages/scheduler/package.json

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

packages/syncing-server/CHANGELOG.md

@@ -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.95.11](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.95.10...@standardnotes/syncing-server@1.95.11) (2023-09-12)
+
+### Bug Fixes
+
+* **syncing-server:** binding ([e91a832](https://github.com/standardnotes/syncing-server-js/commit/e91a8321527ac269ba9822ce270184db5bc57099))
+
+## [1.95.10](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.95.9...@standardnotes/syncing-server@1.95.10) (2023-09-12)
+
+### Bug Fixes
+
+* retry failed revision transitions ([e535cd5](https://github.com/standardnotes/syncing-server-js/commit/e535cd504cf1929539ff7faf13e9c1fdd2b7bfd1))
+* **syncing-server:** log syncing errors ([b9c9f74](https://github.com/standardnotes/syncing-server-js/commit/b9c9f74d0c699cf72ea6090627bd5716ac8360d7))
+
 ## [1.95.9](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.95.8...@standardnotes/syncing-server@1.95.9) (2023-09-12)
 
 **Note:** Version bump only for package @standardnotes/syncing-server

packages/syncing-server/package.json

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

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

@@ -666,13 +666,14 @@ export class ContainerConfigLoader {
       .bind<SyncItems>(TYPES.Sync_SyncItems)
       .toConstantValue(
         new SyncItems(
-          container.get(TYPES.Sync_ItemRepositoryResolver),
-          container.get(TYPES.Sync_GetItems),
-          container.get(TYPES.Sync_SaveItems),
-          container.get(TYPES.Sync_GetSharedVaults),
-          container.get(TYPES.Sync_GetSharedVaultInvitesSentToUser),
-          container.get(TYPES.Sync_GetMessagesSentToUser),
-          container.get(TYPES.Sync_GetUserNotifications),
+          container.get<ItemRepositoryResolverInterface>(TYPES.Sync_ItemRepositoryResolver),
+          container.get<GetItems>(TYPES.Sync_GetItems),
+          container.get<SaveItems>(TYPES.Sync_SaveItems),
+          container.get<GetSharedVaults>(TYPES.Sync_GetSharedVaults),
+          container.get<GetSharedVaultInvitesSentToUser>(TYPES.Sync_GetSharedVaultInvitesSentToUser),
+          container.get<GetMessagesSentToUser>(TYPES.Sync_GetMessagesSentToUser),
+          container.get<GetUserNotifications>(TYPES.Sync_GetUserNotifications),
+          container.get<Logger>(TYPES.Sync_Logger),
         ),
       )
     container.bind<CheckIntegrity>(TYPES.Sync_CheckIntegrity).toDynamicValue((context: interfaces.Context) => {

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

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

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

@@ -14,6 +14,7 @@ import { GetMessagesSentToUser } from '../../Messaging/GetMessagesSentToUser/Get
 import { GetUserNotifications } from '../../Messaging/GetUserNotifications/GetUserNotifications'
 import { GetSharedVaultInvitesSentToUser } from '../../SharedVaults/GetSharedVaultInvitesSentToUser/GetSharedVaultInvitesSentToUser'
 import { ItemRepositoryResolverInterface } from '../../../Item/ItemRepositoryResolverInterface'
+import { Logger } from 'winston'
 
 describe('SyncItems', () => {
   let getItemsUseCase: GetItems
@@ -28,6 +29,7 @@ describe('SyncItems', () => {
   let getSharedVaultInvitesSentToUserUseCase: GetSharedVaultInvitesSentToUser
   let getMessagesSentToUser: GetMessagesSentToUser
   let getUserNotifications: GetUserNotifications
+  let logger: Logger
 
   const createUseCase = () =>
     new SyncItems(
@@ -38,9 +40,15 @@ describe('SyncItems', () => {
       getSharedVaultInvitesSentToUserUseCase,
       getMessagesSentToUser,
       getUserNotifications,
+      logger,
     )
 
   beforeEach(() => {
+    logger = {} as jest.Mocked<Logger>
+    logger.info = jest.fn()
+    logger.debug = jest.fn()
+    logger.error = jest.fn()
+
     item1 = Item.create(
       {
         userUuid: Uuid.create('00000000-0000-0000-0000-000000000000').getValue(),
@@ -188,6 +196,35 @@ describe('SyncItems', () => {
     })
   })
 
+  it('should log error if sync items throws an error', async () => {
+    getItemsUseCase.execute = jest.fn().mockImplementation(() => {
+      throw new Error('error')
+    })
+
+    let caughtError = null
+    try {
+      await createUseCase().execute({
+        userUuid: '1-2-3',
+        onGoingRevisionsTransition: false,
+        itemHashes: [itemHash],
+        computeIntegrityHash: false,
+        syncToken: 'foo',
+        cursorToken: 'bar',
+        limit: 10,
+        readOnlyAccess: false,
+        contentType: 'Note',
+        apiVersion: ApiVersion.v20200115,
+        sessionUuid: null,
+        snjsVersion: '1.2.3',
+        roleNames: [RoleName.NAMES.CoreUser],
+      })
+    } catch (error) {
+      caughtError = error
+    }
+
+    expect(caughtError).not.toBeNull()
+  })
+
   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',

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

@@ -11,6 +11,7 @@ import { GetSharedVaultInvitesSentToUser } from '../../SharedVaults/GetSharedVau
 import { GetMessagesSentToUser } from '../../Messaging/GetMessagesSentToUser/GetMessagesSentToUser'
 import { GetUserNotifications } from '../../Messaging/GetUserNotifications/GetUserNotifications'
 import { ItemRepositoryResolverInterface } from '../../../Item/ItemRepositoryResolverInterface'
+import { Logger } from 'winston'
 
 export class SyncItems implements UseCaseInterface<SyncItemsResponse> {
   constructor(
@@ -21,99 +22,111 @@ export class SyncItems implements UseCaseInterface<SyncItemsResponse> {
     private getSharedVaultInvitesSentToUserUseCase: GetSharedVaultInvitesSentToUser,
     private getMessagesSentToUser: GetMessagesSentToUser,
     private getUserNotifications: GetUserNotifications,
+    private logger: Logger,
   ) {}
 
   async execute(dto: SyncItemsDTO): Promise<Result<SyncItemsResponse>> {
-    const roleNamesOrError = RoleNameCollection.create(dto.roleNames)
-    if (roleNamesOrError.isFailed()) {
-      return Result.fail(roleNamesOrError.getError())
-    }
-    const roleNames = roleNamesOrError.getValue()
+    try {
+      const roleNamesOrError = RoleNameCollection.create(dto.roleNames)
+      if (roleNamesOrError.isFailed()) {
+        return Result.fail(roleNamesOrError.getError())
+      }
+      const roleNames = roleNamesOrError.getValue()
 
-    const getItemsResultOrError = await this.getItemsUseCase.execute({
-      userUuid: dto.userUuid,
-      syncToken: dto.syncToken,
-      cursorToken: dto.cursorToken,
-      limit: dto.limit,
-      contentType: dto.contentType,
-      sharedVaultUuids: dto.sharedVaultUuids,
-      roleNames: dto.roleNames,
-    })
-    if (getItemsResultOrError.isFailed()) {
-      return Result.fail(getItemsResultOrError.getError())
-    }
-    const getItemsResult = getItemsResultOrError.getValue()
+      const getItemsResultOrError = await this.getItemsUseCase.execute({
+        userUuid: dto.userUuid,
+        syncToken: dto.syncToken,
+        cursorToken: dto.cursorToken,
+        limit: dto.limit,
+        contentType: dto.contentType,
+        sharedVaultUuids: dto.sharedVaultUuids,
+        roleNames: dto.roleNames,
+      })
+      if (getItemsResultOrError.isFailed()) {
+        return Result.fail(getItemsResultOrError.getError())
+      }
+      const getItemsResult = getItemsResultOrError.getValue()
 
-    const saveItemsResultOrError = await this.saveItemsUseCase.execute({
-      itemHashes: dto.itemHashes,
-      userUuid: dto.userUuid,
-      apiVersion: dto.apiVersion,
-      readOnlyAccess: dto.readOnlyAccess,
-      sessionUuid: dto.sessionUuid,
-      snjsVersion: dto.snjsVersion,
-      roleNames: dto.roleNames,
-      onGoingRevisionsTransition: dto.onGoingRevisionsTransition,
-    })
-    if (saveItemsResultOrError.isFailed()) {
-      return Result.fail(saveItemsResultOrError.getError())
-    }
-    const saveItemsResult = saveItemsResultOrError.getValue()
+      const saveItemsResultOrError = await this.saveItemsUseCase.execute({
+        itemHashes: dto.itemHashes,
+        userUuid: dto.userUuid,
+        apiVersion: dto.apiVersion,
+        readOnlyAccess: dto.readOnlyAccess,
+        sessionUuid: dto.sessionUuid,
+        snjsVersion: dto.snjsVersion,
+        roleNames: dto.roleNames,
+        onGoingRevisionsTransition: dto.onGoingRevisionsTransition,
+      })
+      if (saveItemsResultOrError.isFailed()) {
+        return Result.fail(saveItemsResultOrError.getError())
+      }
+      const saveItemsResult = saveItemsResultOrError.getValue()
 
-    let retrievedItems = this.filterOutSyncConflictsForConsecutiveSyncs(getItemsResult.items, saveItemsResult.conflicts)
-    const isSharedVaultExclusiveSync = dto.sharedVaultUuids && dto.sharedVaultUuids.length > 0
-    if (this.isFirstSync(dto) && !isSharedVaultExclusiveSync) {
-      retrievedItems = await this.frontLoadKeysItemsToTop(dto.userUuid, roleNames, retrievedItems)
-    }
+      let retrievedItems = this.filterOutSyncConflictsForConsecutiveSyncs(
+        getItemsResult.items,
+        saveItemsResult.conflicts,
+      )
+      const isSharedVaultExclusiveSync = dto.sharedVaultUuids && dto.sharedVaultUuids.length > 0
+      if (this.isFirstSync(dto) && !isSharedVaultExclusiveSync) {
+        retrievedItems = await this.frontLoadKeysItemsToTop(dto.userUuid, roleNames, retrievedItems)
+      }
 
-    const sharedVaultsOrError = await this.getSharedVaultsUseCase.execute({
-      userUuid: dto.userUuid,
-      lastSyncTime: getItemsResult.lastSyncTime ?? undefined,
-    })
-    if (sharedVaultsOrError.isFailed()) {
-      return Result.fail(sharedVaultsOrError.getError())
-    }
-    const sharedVaults = sharedVaultsOrError.getValue()
+      const sharedVaultsOrError = await this.getSharedVaultsUseCase.execute({
+        userUuid: dto.userUuid,
+        lastSyncTime: getItemsResult.lastSyncTime ?? undefined,
+      })
+      if (sharedVaultsOrError.isFailed()) {
+        return Result.fail(sharedVaultsOrError.getError())
+      }
+      const sharedVaults = sharedVaultsOrError.getValue()
 
-    const sharedVaultInvitesOrError = await this.getSharedVaultInvitesSentToUserUseCase.execute({
-      userUuid: dto.userUuid,
-      lastSyncTime: getItemsResult.lastSyncTime ?? undefined,
-    })
-    if (sharedVaultInvitesOrError.isFailed()) {
-      return Result.fail(sharedVaultInvitesOrError.getError())
-    }
-    const sharedVaultInvites = sharedVaultInvitesOrError.getValue()
+      const sharedVaultInvitesOrError = await this.getSharedVaultInvitesSentToUserUseCase.execute({
+        userUuid: dto.userUuid,
+        lastSyncTime: getItemsResult.lastSyncTime ?? undefined,
+      })
+      if (sharedVaultInvitesOrError.isFailed()) {
+        return Result.fail(sharedVaultInvitesOrError.getError())
+      }
+      const sharedVaultInvites = sharedVaultInvitesOrError.getValue()
 
-    const messagesOrError = await this.getMessagesSentToUser.execute({
-      recipientUuid: dto.userUuid,
-      lastSyncTime: getItemsResult.lastSyncTime ?? undefined,
-    })
-    if (messagesOrError.isFailed()) {
-      return Result.fail(messagesOrError.getError())
-    }
-    const messages = messagesOrError.getValue()
+      const messagesOrError = await this.getMessagesSentToUser.execute({
+        recipientUuid: dto.userUuid,
+        lastSyncTime: getItemsResult.lastSyncTime ?? undefined,
+      })
+      if (messagesOrError.isFailed()) {
+        return Result.fail(messagesOrError.getError())
+      }
+      const messages = messagesOrError.getValue()
 
-    const notificationsOrError = await this.getUserNotifications.execute({
-      userUuid: dto.userUuid,
-      lastSyncTime: getItemsResult.lastSyncTime ?? undefined,
-    })
-    if (notificationsOrError.isFailed()) {
-      return Result.fail(notificationsOrError.getError())
-    }
-    const notifications = notificationsOrError.getValue()
+      const notificationsOrError = await this.getUserNotifications.execute({
+        userUuid: dto.userUuid,
+        lastSyncTime: getItemsResult.lastSyncTime ?? undefined,
+      })
+      if (notificationsOrError.isFailed()) {
+        return Result.fail(notificationsOrError.getError())
+      }
+      const notifications = notificationsOrError.getValue()
 
-    const syncResponse: SyncItemsResponse = {
-      retrievedItems,
-      syncToken: saveItemsResult.syncToken,
-      savedItems: saveItemsResult.savedItems,
-      conflicts: saveItemsResult.conflicts,
-      cursorToken: getItemsResult.cursorToken,
-      sharedVaultInvites,
-      sharedVaults,
-      messages,
-      notifications,
-    }
+      const syncResponse: SyncItemsResponse = {
+        retrievedItems,
+        syncToken: saveItemsResult.syncToken,
+        savedItems: saveItemsResult.savedItems,
+        conflicts: saveItemsResult.conflicts,
+        cursorToken: getItemsResult.cursorToken,
+        sharedVaultInvites,
+        sharedVaults,
+        messages,
+        notifications,
+      }
 
-    return Result.ok(syncResponse)
+      return Result.ok(syncResponse)
+    } catch (error) {
+      const itemHashUuids = dto.itemHashes.map((itemHash) => itemHash.props.uuid)
+      this.logger.error(
+        `Sync error for user ${dto.userUuid} syncing items ${itemHashUuids.join(',')}: ${(error as Error).message}`,
+      )
+      throw error
+    }
   }
 
   private isFirstSync(dto: SyncItemsDTO): boolean {

packages/websockets/CHANGELOG.md

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

packages/websockets/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/websockets-server",
-  "version": "1.10.39",
+  "version": "1.10.40",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },