chore(release): publish new version

- @standardnotes/auth-server@1.141.13
 - @standardnotes/home-server@1.15.54
 - @standardnotes/revisions-server@1.33.21
 - @standardnotes/syncing-server@1.95.18

packages/api-gateway/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.74.10](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.74.9...@standardnotes/api-gateway@1.74.10) (2023-09-13)
+
+### Bug Fixes
+
+* adjust transition timestamps to be universal ([c7807d0](https://github.com/standardnotes/api-gateway/commit/c7807d0f9e69ce572c4c03ff606375d706f24d9f))
+
 ## [1.74.9](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.74.8...@standardnotes/api-gateway@1.74.9) (2023-09-13)
 
 **Note:** Version bump only for package @standardnotes/api-gateway

packages/api-gateway/package.json

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

packages/api-gateway/src/Controller/v1/UsersController.ts

@@ -80,15 +80,6 @@ export class UsersController extends BaseHttpController {
     )
   }
 
-  @httpGet('/transition-status', TYPES.ApiGateway_RequiredCrossServiceTokenMiddleware)
-  async getTransitionStatus(request: Request, response: Response): Promise<void> {
-    await this.httpService.callAuthServer(
-      request,
-      response,
-      this.endpointResolver.resolveEndpointOrMethodIdentifier('GET', 'users/transition-status'),
-    )
-  }
-
   @httpGet('/:userId/params', TYPES.ApiGateway_RequiredCrossServiceTokenMiddleware)
   async getKeyParams(request: Request, response: Response): Promise<void> {
     await this.httpService.callAuthServer(

packages/api-gateway/src/Service/Resolver/EndpointResolver.ts

@@ -43,7 +43,6 @@ export class EndpointResolver implements EndpointResolverInterface {
     ['[PATCH]:users/:userId', 'auth.users.update'],
     ['[PUT]:users/:userUuid/attributes/credentials', 'auth.users.updateCredentials'],
     ['[GET]:users/params', 'auth.users.getKeyParams'],
-    ['[GET]:users/transition-status', 'auth.users.transition-status'],
     ['[DELETE]:users/:userUuid', 'auth.users.delete'],
     ['[POST]:listed', 'auth.users.createListedAccount'],
     ['[POST]:auth', 'auth.users.register'],
@@ -59,13 +58,11 @@ export class EndpointResolver implements EndpointResolverInterface {
     // Syncing Server
     ['[POST]:items/sync', 'sync.items.sync'],
     ['[POST]:items/check-integrity', 'sync.items.check_integrity'],
-    ['[POST]:items/transition', 'sync.items.transition'],
     ['[GET]:items/:uuid', 'sync.items.get_item'],
     // Revisions Controller V2
     ['[GET]:items/:itemUuid/revisions', 'revisions.revisions.getRevisions'],
     ['[GET]:items/:itemUuid/revisions/:id', 'revisions.revisions.getRevision'],
     ['[DELETE]:items/:itemUuid/revisions/:id', 'revisions.revisions.deleteRevision'],
-    ['[POST]:revisions/transition', 'revisions.revisions.transition'],
     // Messages Controller
     ['[GET]:messages/', 'sync.messages.get-received'],
     ['[GET]:messages/outbound', 'sync.messages.get-sent'],

packages/auth/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.141.13](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.141.12...@standardnotes/auth-server@1.141.13) (2023-09-14)
+
+### Bug Fixes
+
+* **auth:** set ttl for started and not picked up transitions to 10h ([fe8ca82](https://github.com/standardnotes/server/commit/fe8ca828fb37306e0e5056627e67366885e86861))
+
+## [1.141.12](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.141.11...@standardnotes/auth-server@1.141.12) (2023-09-13)
+
+### Bug Fixes
+
+* **auth:** remove re-triggering revisions transition ([5984e4c](https://github.com/standardnotes/server/commit/5984e4c3e7e550e5ed53805bde1e6dabcbe54da8))
+
+## [1.141.11](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.141.10...@standardnotes/auth-server@1.141.11) (2023-09-13)
+
+### Bug Fixes
+
+* **auth:** passing transition timestamp ([c164bde](https://github.com/standardnotes/server/commit/c164bde847b5974e74fd439f0d439526ad439443))
+
+## [1.141.10](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.141.9...@standardnotes/auth-server@1.141.10) (2023-09-13)
+
+### Bug Fixes
+
+* adjust transition timestamps to be universal ([c7807d0](https://github.com/standardnotes/server/commit/c7807d0f9e69ce572c4c03ff606375d706f24d9f))
+
 ## [1.141.9](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.141.8...@standardnotes/auth-server@1.141.9) (2023-09-13)
 
 ### Bug Fixes

packages/auth/bin/transition.ts

@@ -10,7 +10,7 @@ import { Env } from '../src/Bootstrap/Env'
 import { DomainEventPublisherInterface } from '@standardnotes/domain-events'
 import { DomainEventFactoryInterface } from '../src/Domain/Event/DomainEventFactoryInterface'
 import { UserRepositoryInterface } from '../src/Domain/User/UserRepositoryInterface'
-import { TransitionStatusRepositoryInterface } from '../src/Domain/Transition/TransitionStatusRepositoryInterface'
+import { TimerInterface } from '@standardnotes/time'
 
 const inputArgs = process.argv.slice(2)
 const startDateString = inputArgs[0]
@@ -18,23 +18,28 @@ const endDateString = inputArgs[1]
 
 const requestTransition = async (
   userRepository: UserRepositoryInterface,
-  transitionStatusRepository: TransitionStatusRepositoryInterface,
   logger: Logger,
   domainEventFactory: DomainEventFactoryInterface,
   domainEventPublisher: DomainEventPublisherInterface,
+  timer: TimerInterface,
 ): Promise<void> => {
   const startDate = new Date(startDateString)
   const endDate = new Date(endDateString)
 
   const users = await userRepository.findAllCreatedBetween(startDate, endDate)
 
-  logger.info(`Found ${users.length} users created between ${startDateString} and ${endDateString}`)
+  const timestamp = timer.getTimestampInMicroseconds()
+
+  logger.info(
+    `[TRANSITION ${timestamp}] Found ${users.length} users created between ${startDateString} and ${endDateString}`,
+  )
 
   let usersTriggered = 0
   for (const user of users) {
     const transitionRequestedEvent = domainEventFactory.createTransitionRequestedEvent({
       userUuid: user.uuid,
       type: 'items',
+      timestamp,
     })
 
     usersTriggered += 1
@@ -43,22 +48,8 @@ const requestTransition = async (
   }
 
   logger.info(
-    `Triggered transition for ${usersTriggered} users created between ${startDateString} and ${endDateString}`,
+    `[TRANSITION ${timestamp}] Triggered transition for ${usersTriggered} users created between ${startDateString} and ${endDateString}`,
   )
-
-  const revisionStatuses = await transitionStatusRepository.getStatuses('revisions')
-  const failedStatuses = revisionStatuses.filter((status) => status.status === 'FAILED')
-
-  logger.info(`Found ${failedStatuses.length} failed revision transitions`)
-
-  for (const status of failedStatuses) {
-    const transitionRequestedEvent = domainEventFactory.createTransitionRequestedEvent({
-      userUuid: status.userUuid,
-      type: 'revisions',
-    })
-
-    await domainEventPublisher.publish(transitionRequestedEvent)
-  }
 }
 
 const container = new ContainerConfigLoader('worker')
@@ -75,13 +66,9 @@ 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,
-  )
+  const timer = container.get<TimerInterface>(TYPES.Auth_Timer)
 
-  Promise.resolve(
-    requestTransition(userRepository, transitionStatusRepository, logger, domainEventFactory, domainEventPublisher),
-  )
+  Promise.resolve(requestTransition(userRepository, logger, domainEventFactory, domainEventPublisher, timer))
     .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.9",
+  "version": "1.141.13",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

packages/auth/src/Bootstrap/Container.ts

@@ -1276,7 +1276,6 @@ export class ContainerConfigLoader {
             container.get<ClearLoginAttempts>(TYPES.Auth_ClearLoginAttempts),
             container.get<IncreaseLoginAttempts>(TYPES.Auth_IncreaseLoginAttempts),
             container.get<ChangeCredentials>(TYPES.Auth_ChangeCredentials),
-            container.get<GetTransitionStatus>(TYPES.Auth_GetTransitionStatus),
             container.get<ControllerContainerInterface>(TYPES.Auth_ControllerContainer),
           ),
         )

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

@@ -33,7 +33,11 @@ import { DomainEventFactoryInterface } from './DomainEventFactoryInterface'
 export class DomainEventFactory implements DomainEventFactoryInterface {
   constructor(@inject(TYPES.Auth_Timer) private timer: TimerInterface) {}
 
-  createTransitionRequestedEvent(dto: { userUuid: string; type: 'items' | 'revisions' }): TransitionRequestedEvent {
+  createTransitionRequestedEvent(dto: {
+    userUuid: string
+    type: 'items' | 'revisions'
+    timestamp: number
+  }): TransitionRequestedEvent {
     return {
       type: 'TRANSITION_REQUESTED',
       createdAt: this.timer.getUTCDate(),
@@ -44,10 +48,7 @@ export class DomainEventFactory implements DomainEventFactoryInterface {
         },
         origin: DomainEventService.Auth,
       },
-      payload: {
-        timestamp: this.timer.getTimestampInMicroseconds(),
-        ...dto,
-      },
+      payload: dto,
     }
   }
 

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

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

packages/auth/src/Domain/UseCase/UpdateTransitionStatus/UpdateTransitionStatus.ts

@@ -30,23 +30,29 @@ export class UpdateTransitionStatus implements UseCaseInterface<void> {
       await this.roleService.addRoleToUser(userUuid, RoleName.create(RoleName.NAMES.TransitionUser).getValue())
     }
 
-    const itemStatuses = await this.transitionStatusRepository.getStatuses('items')
-    const itemsStartedStatusesCount = itemStatuses.filter((status) => status.status === 'STARTED').length
-    const itemsInProgressStatusesCount = itemStatuses.filter((status) => status.status === 'IN_PROGRESS').length
-    const itemsFailedStatusesCount = itemStatuses.filter((status) => status.status === 'FAILED').length
+    if (dto.transitionType === 'items') {
+      const itemStatuses = await this.transitionStatusRepository.getStatuses('items')
+      const itemsStartedStatusesCount = itemStatuses.filter((status) => status.status === 'STARTED').length
+      const itemsInProgressStatusesCount = itemStatuses.filter((status) => status.status === 'IN_PROGRESS').length
+      const itemsFailedStatusesCount = itemStatuses.filter((status) => status.status === 'FAILED').length
 
-    this.logger.info(
-      `[TRANSITION ${dto.transitionTimestamp}] Items transition statuses: ${itemsStartedStatusesCount} started, ${itemsInProgressStatusesCount} in progress, ${itemsFailedStatusesCount} failed`,
-    )
+      this.logger.info(
+        `[TRANSITION ${dto.transitionTimestamp}] Items transition statuses: ${itemsStartedStatusesCount} started, ${itemsInProgressStatusesCount} in progress, ${itemsFailedStatusesCount} failed`,
+      )
+    }
 
-    const revisionStatuses = await this.transitionStatusRepository.getStatuses('revisions')
-    const revisionsStartedStatusesCount = revisionStatuses.filter((status) => status.status === 'STARTED').length
-    const revisionsInProgressStatusesCount = revisionStatuses.filter((status) => status.status === 'IN_PROGRESS').length
-    const revisionsFailedStatusesCount = revisionStatuses.filter((status) => status.status === 'FAILED').length
+    if (dto.transitionType === 'revisions') {
+      const revisionStatuses = await this.transitionStatusRepository.getStatuses('revisions')
+      const revisionsStartedStatusesCount = revisionStatuses.filter((status) => status.status === 'STARTED').length
+      const revisionsInProgressStatusesCount = revisionStatuses.filter(
+        (status) => status.status === 'IN_PROGRESS',
+      ).length
+      const revisionsFailedStatusesCount = revisionStatuses.filter((status) => status.status === 'FAILED').length
 
-    this.logger.info(
-      `[TRANSITION ${dto.transitionTimestamp}] Revisions transition statuses: ${revisionsStartedStatusesCount} started, ${revisionsInProgressStatusesCount} in progress, ${revisionsFailedStatusesCount} failed`,
-    )
+      this.logger.info(
+        `[TRANSITION ${dto.transitionTimestamp}] Revisions transition statuses: ${revisionsStartedStatusesCount} started, ${revisionsInProgressStatusesCount} in progress, ${revisionsFailedStatusesCount} failed`,
+      )
+    }
 
     return Result.ok()
   }

packages/auth/src/Infra/InversifyExpressUtils/AnnotatedUsersController.spec.ts

@@ -14,7 +14,6 @@ import { IncreaseLoginAttempts } from '../../Domain/UseCase/IncreaseLoginAttempt
 import { InviteToSharedSubscription } from '../../Domain/UseCase/InviteToSharedSubscription/InviteToSharedSubscription'
 import { UpdateUser } from '../../Domain/UseCase/UpdateUser'
 import { User } from '../../Domain/User/User'
-import { GetTransitionStatus } from '../../Domain/UseCase/GetTransitionStatus/GetTransitionStatus'
 
 describe('AnnotatedUsersController', () => {
   let updateUser: UpdateUser
@@ -25,7 +24,6 @@ describe('AnnotatedUsersController', () => {
   let increaseLoginAttempts: IncreaseLoginAttempts
   let changeCredentials: ChangeCredentials
   let inviteToSharedSubscription: InviteToSharedSubscription
-  let getTransitionStatus: GetTransitionStatus
 
   let request: express.Request
   let response: express.Response
@@ -40,7 +38,6 @@ describe('AnnotatedUsersController', () => {
       clearLoginAttempts,
       increaseLoginAttempts,
       changeCredentials,
-      getTransitionStatus,
     )
 
   beforeEach(() => {
@@ -72,9 +69,6 @@ describe('AnnotatedUsersController', () => {
     inviteToSharedSubscription = {} as jest.Mocked<InviteToSharedSubscription>
     inviteToSharedSubscription.execute = jest.fn()
 
-    getTransitionStatus = {} as jest.Mocked<GetTransitionStatus>
-    getTransitionStatus.execute = jest.fn()
-
     request = {
       headers: {},
       body: {},

packages/auth/src/Infra/InversifyExpressUtils/AnnotatedUsersController.ts

@@ -18,7 +18,6 @@ import { ClearLoginAttempts } from '../../Domain/UseCase/ClearLoginAttempts'
 import { IncreaseLoginAttempts } from '../../Domain/UseCase/IncreaseLoginAttempts'
 import { ChangeCredentials } from '../../Domain/UseCase/ChangeCredentials/ChangeCredentials'
 import { BaseUsersController } from './Base/BaseUsersController'
-import { GetTransitionStatus } from '../../Domain/UseCase/GetTransitionStatus/GetTransitionStatus'
 
 @controller('/users')
 export class AnnotatedUsersController extends BaseUsersController {
@@ -30,7 +29,6 @@ export class AnnotatedUsersController extends BaseUsersController {
     @inject(TYPES.Auth_ClearLoginAttempts) override clearLoginAttempts: ClearLoginAttempts,
     @inject(TYPES.Auth_IncreaseLoginAttempts) override increaseLoginAttempts: IncreaseLoginAttempts,
     @inject(TYPES.Auth_ChangeCredentials) override changeCredentialsUseCase: ChangeCredentials,
-    @inject(TYPES.Auth_GetTransitionStatus) override getTransitionStatusUseCase: GetTransitionStatus,
   ) {
     super(
       updateUser,
@@ -40,7 +38,6 @@ export class AnnotatedUsersController extends BaseUsersController {
       clearLoginAttempts,
       increaseLoginAttempts,
       changeCredentialsUseCase,
-      getTransitionStatusUseCase,
     )
   }
 
@@ -54,11 +51,6 @@ export class AnnotatedUsersController extends BaseUsersController {
     return super.keyParams(request)
   }
 
-  @httpGet('/transition-status', TYPES.Auth_RequiredCrossServiceTokenMiddleware)
-  override async transitionStatus(request: Request, response: Response): Promise<results.JsonResult> {
-    return super.transitionStatus(request, response)
-  }
-
   @httpDelete('/:userUuid', TYPES.Auth_RequiredCrossServiceTokenMiddleware)
   override async deleteAccount(request: Request, response: Response): Promise<results.JsonResult> {
     return super.deleteAccount(request, response)

packages/auth/src/Infra/InversifyExpressUtils/Base/BaseUsersController.ts

@@ -10,7 +10,6 @@ import { GetUserSubscription } from '../../../Domain/UseCase/GetUserSubscription
 import { IncreaseLoginAttempts } from '../../../Domain/UseCase/IncreaseLoginAttempts'
 import { UpdateUser } from '../../../Domain/UseCase/UpdateUser'
 import { ErrorTag } from '@standardnotes/responses'
-import { GetTransitionStatus } from '../../../Domain/UseCase/GetTransitionStatus/GetTransitionStatus'
 
 export class BaseUsersController extends BaseHttpController {
   constructor(
@@ -21,7 +20,6 @@ export class BaseUsersController extends BaseHttpController {
     protected clearLoginAttempts: ClearLoginAttempts,
     protected increaseLoginAttempts: IncreaseLoginAttempts,
     protected changeCredentialsUseCase: ChangeCredentials,
-    protected getTransitionStatusUseCase: GetTransitionStatus,
     private controllerContainer?: ControllerContainerInterface,
   ) {
     super()
@@ -32,7 +30,6 @@ export class BaseUsersController extends BaseHttpController {
       this.controllerContainer.register('auth.users.getSubscription', this.getSubscription.bind(this))
       this.controllerContainer.register('auth.users.updateCredentials', this.changeCredentials.bind(this))
       this.controllerContainer.register('auth.users.delete', this.deleteAccount.bind(this))
-      this.controllerContainer.register('auth.users.transition-status', this.transitionStatus.bind(this))
     }
   }
 
@@ -106,30 +103,6 @@ export class BaseUsersController extends BaseHttpController {
     return this.json(result.keyParams)
   }
 
-  async transitionStatus(_request: Request, response: Response): Promise<results.JsonResult> {
-    const result = await this.getTransitionStatusUseCase.execute({
-      userUuid: response.locals.user.uuid,
-      transitionType: 'items',
-    })
-
-    if (result.isFailed()) {
-      return this.json(
-        {
-          error: {
-            message: result.getError(),
-          },
-        },
-        400,
-      )
-    }
-
-    response.setHeader('x-invalidate-cache', response.locals.user.uuid)
-
-    return this.json({
-      status: result.getValue(),
-    })
-  }
-
   async deleteAccount(request: Request, response: Response): Promise<results.JsonResult> {
     if (request.params.userUuid !== response.locals.user.uuid) {
       return this.json(

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

@@ -28,7 +28,9 @@ export class RedisTransitionStatusRepository implements TransitionStatusReposito
     status: 'STARTED' | 'IN_PROGRESS' | 'FAILED',
   ): Promise<void> {
     if (status === 'IN_PROGRESS') {
-      await this.redisClient.setex(`${this.PREFIX}:${transitionType}:${userUuid}`, 7200, status)
+      await this.redisClient.setex(`${this.PREFIX}:${transitionType}:${userUuid}`, 7_200, status)
+    } else if (status === 'STARTED') {
+      await this.redisClient.setex(`${this.PREFIX}:${transitionType}:${userUuid}`, 36_000, status)
     } else {
       await this.redisClient.set(`${this.PREFIX}:${transitionType}:${userUuid}`, status)
     }

packages/home-server/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.15.54](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.53...@standardnotes/home-server@1.15.54) (2023-09-14)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.15.53](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.52...@standardnotes/home-server@1.15.53) (2023-09-13)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.15.52](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.51...@standardnotes/home-server@1.15.52) (2023-09-13)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.15.51](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.50...@standardnotes/home-server@1.15.51) (2023-09-13)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
 ## [1.15.50](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.15.49...@standardnotes/home-server@1.15.50) (2023-09-13)
 
 **Note:** Version bump only for package @standardnotes/home-server

packages/home-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/home-server",
-  "version": "1.15.50",
+  "version": "1.15.54",
   "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.21](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.33.20...@standardnotes/revisions-server@1.33.21) (2023-09-14)
+
+### Bug Fixes
+
+* skip already updated items and revisions in integrity check ([#825](https://github.com/standardnotes/server/issues/825)) ([03a4a3f](https://github.com/standardnotes/server/commit/03a4a3f2abc0b4e09942ba39dbd227524068dfb6))
+
+## [1.33.20](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.33.19...@standardnotes/revisions-server@1.33.20) (2023-09-13)
+
+### Bug Fixes
+
+* adjust transition timestamps to be universal ([c7807d0](https://github.com/standardnotes/server/commit/c7807d0f9e69ce572c4c03ff606375d706f24d9f))
+
 ## [1.33.19](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.33.18...@standardnotes/revisions-server@1.33.19) (2023-09-13)
 
 ### Bug Fixes

packages/revisions/package.json

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

packages/revisions/src/Bootstrap/Container.ts

@@ -520,9 +520,6 @@ export class ContainerConfigLoader {
             container.get<DeleteRevision>(TYPES.Revisions_DeleteRevision),
             container.get<RevisionHttpMapper>(TYPES.Revisions_RevisionHttpMapper),
             container.get<RevisionMetadataHttpMapper>(TYPES.Revisions_RevisionMetadataHttpMapper),
-            container.get<TriggerTransitionFromPrimaryToSecondaryDatabaseForUser>(
-              TYPES.Revisions_TriggerTransitionFromPrimaryToSecondaryDatabaseForUser,
-            ),
             container.get<ControllerContainerInterface>(TYPES.Revisions_ControllerContainer),
           ),
         )

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

@@ -9,6 +9,7 @@ export class DomainEventFactory implements DomainEventFactoryInterface {
   createTransitionStatusUpdatedEvent(dto: {
     userUuid: string
     transitionType: 'items' | 'revisions'
+    transitionTimestamp: number
     status: 'STARTED' | 'FAILED' | 'FINISHED'
   }): TransitionStatusUpdatedEvent {
     return {
@@ -21,10 +22,7 @@ export class DomainEventFactory implements DomainEventFactoryInterface {
         },
         origin: DomainEventService.SyncingServer,
       },
-      payload: {
-        transitionTimestamp: this.timer.getTimestampInMicroseconds(),
-        ...dto,
-      },
+      payload: dto,
     }
   }
 }

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

@@ -4,6 +4,7 @@ export interface DomainEventFactoryInterface {
   createTransitionStatusUpdatedEvent(dto: {
     userUuid: string
     transitionType: 'items' | 'revisions'
+    transitionTimestamp: number
     status: 'STARTED' | 'IN_PROGRESS' | 'FAILED' | 'FINISHED'
   }): TransitionStatusUpdatedEvent
 }

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

@@ -18,6 +18,7 @@ export class TransitionRequestedEventHandler implements DomainEventHandlerInterf
 
     const result = await this.triggerTransitionFromPrimaryToSecondaryDatabaseForUser.execute({
       userUuid: event.payload.userUuid,
+      transitionTimestamp: event.payload.timestamp,
     })
 
     if (result.isFailed()) {

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

@@ -25,6 +25,7 @@ export class TransitionStatusUpdatedEventHandler implements DomainEventHandlerIn
           userUuid: event.payload.userUuid,
           status: 'STARTED',
           transitionType: 'revisions',
+          transitionTimestamp: event.payload.transitionTimestamp,
         }),
       )
 
@@ -42,6 +43,7 @@ export class TransitionStatusUpdatedEventHandler implements DomainEventHandlerIn
             userUuid: event.payload.userUuid,
             status: 'FAILED',
             transitionType: 'revisions',
+            transitionTimestamp: event.payload.transitionTimestamp,
           }),
         )
 
@@ -54,6 +56,7 @@ export class TransitionStatusUpdatedEventHandler implements DomainEventHandlerIn
             userUuid: event.payload.userUuid,
             status: 'FINISHED',
             transitionType: 'revisions',
+            transitionTimestamp: event.payload.transitionTimestamp,
           }),
         )
 
@@ -65,6 +68,7 @@ export class TransitionStatusUpdatedEventHandler implements DomainEventHandlerIn
           userUuid: event.payload.userUuid,
           status: 'IN_PROGRESS',
           transitionType: 'revisions',
+          transitionTimestamp: event.payload.transitionTimestamp,
         }),
       )
 
@@ -80,6 +84,7 @@ export class TransitionStatusUpdatedEventHandler implements DomainEventHandlerIn
             userUuid: event.payload.userUuid,
             status: 'FAILED',
             transitionType: 'revisions',
+            transitionTimestamp: event.payload.transitionTimestamp,
           }),
         )
 
@@ -91,6 +96,7 @@ export class TransitionStatusUpdatedEventHandler implements DomainEventHandlerIn
           userUuid: event.payload.userUuid,
           status: 'FINISHED',
           transitionType: 'revisions',
+          transitionTimestamp: event.payload.transitionTimestamp,
         }),
       )
 

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

@@ -87,6 +87,7 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
     const integrityCheckResult = await this.checkIntegrityBetweenPrimaryAndSecondaryDatabase(
       userUuid,
       newRevisionsInSecondaryCount,
+      updatedRevisionsInSecondary,
     )
     if (integrityCheckResult.isFailed()) {
       if (newRevisionsInSecondaryCount === 0 && updatedRevisionsInSecondaryCount === 0) {
@@ -144,6 +145,10 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
                 (updatedRevision) => updatedRevision.id.toString() === revision.id.toString(),
               )
             ) {
+              this.logger.info(
+                `Skipping saving revision ${revision.id.toString()} as it was updated in secondary database`,
+              )
+
               continue
             }
 
@@ -285,6 +290,7 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
   private async checkIntegrityBetweenPrimaryAndSecondaryDatabase(
     userUuid: Uuid,
     newRevisionsInSecondaryCount: number,
+    updatedRevisionsInSecondary: Revision[],
   ): Promise<Result<boolean>> {
     try {
       const totalRevisionsCountForUserInPrimary = await this.primaryRevisionsRepository.countByUserUuid(userUuid)
@@ -314,6 +320,17 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
             return Result.fail(`Revision ${revision.id.toString()} not found in secondary database`)
           }
 
+          if (
+            updatedRevisionsInSecondary.find(
+              (updatedRevision) => updatedRevision.id.toString() === revision.id.toString(),
+            )
+          ) {
+            this.logger.info(
+              `Skipping integrity check for revision ${revision.id.toString()} as it was updated in secondary database`,
+            )
+            continue
+          }
+
           if (!revision.isIdenticalTo(revisionInSecondary)) {
             return Result.fail(
               `Revision ${revision.id.toString()} is not identical in primary and secondary database. Revision in primary database: ${JSON.stringify(

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

@@ -23,6 +23,7 @@ describe('TriggerTransitionFromPrimaryToSecondaryDatabaseForUser', () => {
 
     await useCase.execute({
       userUuid: '00000000-0000-0000-0000-000000000000',
+      transitionTimestamp: 123,
     })
 
     expect(domainEventPubliser.publish).toHaveBeenCalled()

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

@@ -15,6 +15,7 @@ export class TriggerTransitionFromPrimaryToSecondaryDatabaseForUser implements U
       userUuid: dto.userUuid,
       status: 'STARTED',
       transitionType: 'revisions',
+      transitionTimestamp: dto.transitionTimestamp,
     })
 
     await this.domainEventPubliser.publish(event)

packages/revisions/src/Domain/UseCase/Transition/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser/TriggerTransitionFromPrimaryToSecondaryDatabaseForUserDTO.ts

@@ -1,3 +1,4 @@
 export interface TriggerTransitionFromPrimaryToSecondaryDatabaseForUserDTO {
   userUuid: string
+  transitionTimestamp: number
 }

packages/revisions/src/Infra/InversifyExpress/AnnotatedRevisionsController.ts

@@ -1,5 +1,5 @@
 import { Request, Response } from 'express'
-import { controller, httpDelete, httpGet, httpPost, results } from 'inversify-express-utils'
+import { controller, httpDelete, httpGet, results } from 'inversify-express-utils'
 import { inject } from 'inversify'
 
 import TYPES from '../../Bootstrap/Types'
@@ -12,7 +12,6 @@ import { Revision } from '../../Domain/Revision/Revision'
 import { RevisionMetadata } from '../../Domain/Revision/RevisionMetadata'
 import { RevisionHttpRepresentation } from '../../Mapping/Http/RevisionHttpRepresentation'
 import { RevisionMetadataHttpRepresentation } from '../../Mapping/Http/RevisionMetadataHttpRepresentation'
-import { TriggerTransitionFromPrimaryToSecondaryDatabaseForUser } from '../../Domain/UseCase/Transition/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser'
 
 @controller('', TYPES.Revisions_ApiGatewayAuthMiddleware)
 export class AnnotatedRevisionsController extends BaseRevisionsController {
@@ -24,17 +23,8 @@ export class AnnotatedRevisionsController extends BaseRevisionsController {
     override revisionHttpMapper: MapperInterface<Revision, RevisionHttpRepresentation>,
     @inject(TYPES.Revisions_RevisionMetadataHttpMapper)
     override revisionMetadataHttpMapper: MapperInterface<RevisionMetadata, RevisionMetadataHttpRepresentation>,
-    @inject(TYPES.Revisions_TriggerTransitionFromPrimaryToSecondaryDatabaseForUser)
-    override triggerTransitionFromPrimaryToSecondaryDatabaseForUser: TriggerTransitionFromPrimaryToSecondaryDatabaseForUser,
   ) {
-    super(
-      getRevisionsMetadata,
-      doGetRevision,
-      doDeleteRevision,
-      revisionHttpMapper,
-      revisionMetadataHttpMapper,
-      triggerTransitionFromPrimaryToSecondaryDatabaseForUser,
-    )
+    super(getRevisionsMetadata, doGetRevision, doDeleteRevision, revisionHttpMapper, revisionMetadataHttpMapper)
   }
 
   @httpGet('/items/:itemUuid/revisions')
@@ -51,9 +41,4 @@ export class AnnotatedRevisionsController extends BaseRevisionsController {
   override async deleteRevision(request: Request, response: Response): Promise<results.JsonResult> {
     return super.deleteRevision(request, response)
   }
-
-  @httpPost('/revisions/transition')
-  override async transition(request: Request, response: Response): Promise<results.JsonResult> {
-    return super.transition(request, response)
-  }
 }

packages/revisions/src/Infra/InversifyExpress/Base/BaseRevisionsController.ts

@@ -11,7 +11,6 @@ import { GetRevision } from '../../../Domain/UseCase/GetRevision/GetRevision'
 import { GetRevisionsMetada } from '../../../Domain/UseCase/GetRevisionsMetada/GetRevisionsMetada'
 import { RevisionHttpRepresentation } from '../../../Mapping/Http/RevisionHttpRepresentation'
 import { RevisionMetadataHttpRepresentation } from '../../../Mapping/Http/RevisionMetadataHttpRepresentation'
-import { TriggerTransitionFromPrimaryToSecondaryDatabaseForUser } from '../../../Domain/UseCase/Transition/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser'
 
 export class BaseRevisionsController extends BaseHttpController {
   constructor(
@@ -20,7 +19,6 @@ export class BaseRevisionsController extends BaseHttpController {
     protected doDeleteRevision: DeleteRevision,
     protected revisionHttpMapper: MapperInterface<Revision, RevisionHttpRepresentation>,
     protected revisionMetadataHttpMapper: MapperInterface<RevisionMetadata, RevisionMetadataHttpRepresentation>,
-    protected triggerTransitionFromPrimaryToSecondaryDatabaseForUser: TriggerTransitionFromPrimaryToSecondaryDatabaseForUser,
     private controllerContainer?: ControllerContainerInterface,
   ) {
     super()
@@ -29,7 +27,6 @@ export class BaseRevisionsController extends BaseHttpController {
       this.controllerContainer.register('revisions.revisions.getRevisions', this.getRevisions.bind(this))
       this.controllerContainer.register('revisions.revisions.getRevision', this.getRevision.bind(this))
       this.controllerContainer.register('revisions.revisions.deleteRevision', this.deleteRevision.bind(this))
-      this.controllerContainer.register('revisions.revisions.transition', this.transition.bind(this))
     }
   }
 
@@ -108,23 +105,4 @@ export class BaseRevisionsController extends BaseHttpController {
       message: revisionOrError.getValue(),
     })
   }
-
-  async transition(_request: Request, response: Response): Promise<results.JsonResult> {
-    const result = await this.triggerTransitionFromPrimaryToSecondaryDatabaseForUser.execute({
-      userUuid: response.locals.user.uuid,
-    })
-
-    if (result.isFailed()) {
-      return this.json(
-        {
-          error: { message: result.getError() },
-        },
-        400,
-      )
-    }
-
-    response.setHeader('x-invalidate-cache', response.locals.user.uuid)
-
-    return this.json({ success: true })
-  }
 }

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.18](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.95.17...@standardnotes/syncing-server@1.95.18) (2023-09-14)
+
+### Bug Fixes
+
+* skip already updated items and revisions in integrity check ([#825](https://github.com/standardnotes/syncing-server-js/issues/825)) ([03a4a3f](https://github.com/standardnotes/syncing-server-js/commit/03a4a3f2abc0b4e09942ba39dbd227524068dfb6))
+* **syncing-server:** updating with missing creation date ([#824](https://github.com/standardnotes/syncing-server-js/issues/824)) ([3a8607d](https://github.com/standardnotes/syncing-server-js/commit/3a8607d1465cabedad68b84c753e407342e60d20))
+
+## [1.95.17](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.95.16...@standardnotes/syncing-server@1.95.17) (2023-09-13)
+
+### Bug Fixes
+
+* adjust transition timestamps to be universal ([c7807d0](https://github.com/standardnotes/syncing-server-js/commit/c7807d0f9e69ce572c4c03ff606375d706f24d9f))
+
 ## [1.95.16](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.95.15...@standardnotes/syncing-server@1.95.16) (2023-09-13)
 
 ### Bug Fixes

packages/syncing-server/bin/transition.ts

@@ -6,16 +6,19 @@ import { ContainerConfigLoader } from '../src/Bootstrap/Container'
 import TYPES from '../src/Bootstrap/Types'
 import { Env } from '../src/Bootstrap/Env'
 import { TriggerTransitionFromPrimaryToSecondaryDatabaseForUser } from '../src/Domain/UseCase/Transition/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser'
+import { TimerInterface } from '@standardnotes/time'
 
 const inputArgs = process.argv.slice(2)
 const userUuid = inputArgs[0]
 
 const requestTransition = async (
   triggerTransitionFromPrimaryToSecondaryDatabaseForUser: TriggerTransitionFromPrimaryToSecondaryDatabaseForUser,
+  timer: TimerInterface,
   logger: Logger,
 ): Promise<void> => {
   const result = await triggerTransitionFromPrimaryToSecondaryDatabaseForUser.execute({
     userUuid,
+    transitionTimestamp: timer.getTimestampInMicroseconds(),
   })
   if (result.isFailed()) {
     logger.error(`Could not trigger transition for user ${userUuid}: ${result.getError()}`)
@@ -35,8 +38,9 @@ void container.load().then((container) => {
 
   const triggerTransitionFromPrimaryToSecondaryDatabaseForUser: TriggerTransitionFromPrimaryToSecondaryDatabaseForUser =
     container.get(TYPES.Sync_TriggerTransitionFromPrimaryToSecondaryDatabaseForUser)
+  const timer = container.get<TimerInterface>(TYPES.Sync_Timer)
 
-  Promise.resolve(requestTransition(triggerTransitionFromPrimaryToSecondaryDatabaseForUser, logger))
+  Promise.resolve(requestTransition(triggerTransitionFromPrimaryToSecondaryDatabaseForUser, timer, logger))
     .then(() => {
       logger.info(`Transition triggered for user ${userUuid}`)
 

packages/syncing-server/package.json

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

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

@@ -1090,9 +1090,6 @@ export class ContainerConfigLoader {
             container.get<SyncItems>(TYPES.Sync_SyncItems),
             container.get<CheckIntegrity>(TYPES.Sync_CheckIntegrity),
             container.get<GetItem>(TYPES.Sync_GetItem),
-            container.get<TriggerTransitionFromPrimaryToSecondaryDatabaseForUser>(
-              TYPES.Sync_TriggerTransitionFromPrimaryToSecondaryDatabaseForUser,
-            ),
             container.get<MapperInterface<Item, ItemHttpRepresentation>>(TYPES.Sync_ItemHttpMapper),
             container.get<SyncResponseFactoryResolverInterface>(TYPES.Sync_SyncResponseFactoryResolver),
             container.get<ControllerContainerInterface>(TYPES.Sync_ControllerContainer),

packages/syncing-server/src/Domain/Event/DomainEventFactory.ts

@@ -172,6 +172,7 @@ export class DomainEventFactory implements DomainEventFactoryInterface {
   createTransitionStatusUpdatedEvent(dto: {
     userUuid: string
     transitionType: 'items' | 'revisions'
+    transitionTimestamp: number
     status: 'STARTED' | 'FAILED' | 'FINISHED'
   }): TransitionStatusUpdatedEvent {
     return {
@@ -184,10 +185,7 @@ export class DomainEventFactory implements DomainEventFactoryInterface {
         },
         origin: DomainEventService.SyncingServer,
       },
-      payload: {
-        transitionTimestamp: this.timer.getTimestampInMicroseconds(),
-        ...dto,
-      },
+      payload: dto,
     }
   }
 

packages/syncing-server/src/Domain/Event/DomainEventFactoryInterface.ts

@@ -52,6 +52,7 @@ export interface DomainEventFactoryInterface {
   createTransitionStatusUpdatedEvent(dto: {
     userUuid: string
     transitionType: 'items' | 'revisions'
+    transitionTimestamp: number
     status: 'STARTED' | 'IN_PROGRESS' | 'FAILED' | 'FINISHED'
   }): TransitionStatusUpdatedEvent
   createEmailRequestedEvent(dto: {

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

@@ -18,6 +18,7 @@ export class TransitionRequestedEventHandler implements DomainEventHandlerInterf
 
     const result = await this.triggerTransitionFromPrimaryToSecondaryDatabaseForUser.execute({
       userUuid: event.payload.userUuid,
+      transitionTimestamp: event.payload.timestamp,
     })
 
     if (result.isFailed()) {

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

@@ -25,6 +25,7 @@ export class TransitionStatusUpdatedEventHandler implements DomainEventHandlerIn
             userUuid: event.payload.userUuid,
             status: 'FINISHED',
             transitionType: 'items',
+            transitionTimestamp: event.payload.transitionTimestamp,
           }),
         )
 
@@ -36,6 +37,7 @@ export class TransitionStatusUpdatedEventHandler implements DomainEventHandlerIn
           userUuid: event.payload.userUuid,
           status: 'IN_PROGRESS',
           transitionType: 'items',
+          transitionTimestamp: event.payload.transitionTimestamp,
         }),
       )
 
@@ -51,6 +53,7 @@ export class TransitionStatusUpdatedEventHandler implements DomainEventHandlerIn
             userUuid: event.payload.userUuid,
             status: 'FAILED',
             transitionType: 'items',
+            transitionTimestamp: event.payload.transitionTimestamp,
           }),
         )
 
@@ -62,6 +65,7 @@ export class TransitionStatusUpdatedEventHandler implements DomainEventHandlerIn
           userUuid: event.payload.userUuid,
           status: 'FINISHED',
           transitionType: 'items',
+          transitionTimestamp: event.payload.transitionTimestamp,
         }),
       )
     }

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

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

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

@@ -23,6 +23,7 @@ import { SharedVaultOperationOnItem } from '../../../SharedVault/SharedVaultOper
 import { AddNotificationForUser } from '../../Messaging/AddNotificationForUser/AddNotificationForUser'
 import { RemoveNotificationsForUser } from '../../Messaging/RemoveNotificationsForUser/RemoveNotificationsForUser'
 import { ItemRepositoryResolverInterface } from '../../../Item/ItemRepositoryResolverInterface'
+import { ItemHash } from '../../../Item/ItemHash'
 
 export class UpdateExistingItem implements UseCaseInterface<Item> {
   constructor(
@@ -115,17 +116,7 @@ export class UpdateExistingItem implements UseCaseInterface<Item> {
     )
     const updatedAtDate = this.timer.convertMicrosecondsToDate(updatedAtTimestamp)
 
-    let createdAtTimestamp: number
-    let createdAtDate: Date
-    if (dto.itemHash.props.created_at_timestamp) {
-      createdAtTimestamp = dto.itemHash.props.created_at_timestamp
-      createdAtDate = this.timer.convertMicrosecondsToDate(createdAtTimestamp)
-    } else if (dto.itemHash.props.created_at) {
-      createdAtTimestamp = this.timer.convertStringDateToMicroseconds(dto.itemHash.props.created_at)
-      createdAtDate = this.timer.convertStringDateToDate(dto.itemHash.props.created_at)
-    } else {
-      return Result.fail('Created at timestamp is required.')
-    }
+    const { createdAtDate, createdAtTimestamp } = this.determineCreatedAt(dto.itemHash)
 
     const datesOrError = Dates.create(createdAtDate, updatedAtDate)
     if (datesOrError.isFailed()) {
@@ -221,6 +212,29 @@ export class UpdateExistingItem implements UseCaseInterface<Item> {
     return Result.ok(dto.existingItem)
   }
 
+  private determineCreatedAt(itemHash: ItemHash): { createdAtDate: Date; createdAtTimestamp: number } {
+    let createdAtTimestamp: number
+    let createdAtDate: Date
+    if (itemHash.props.created_at_timestamp) {
+      createdAtTimestamp = itemHash.props.created_at_timestamp
+      createdAtDate = this.timer.convertMicrosecondsToDate(createdAtTimestamp)
+    } else if (itemHash.props.created_at) {
+      createdAtTimestamp = this.timer.convertStringDateToMicroseconds(itemHash.props.created_at)
+      createdAtDate = this.timer.convertStringDateToDate(itemHash.props.created_at)
+    } else if (itemHash.props.updated_at_timestamp) {
+      createdAtTimestamp = itemHash.props.updated_at_timestamp
+      createdAtDate = this.timer.convertMicrosecondsToDate(itemHash.props.updated_at_timestamp)
+    } else if (itemHash.props.updated_at) {
+      createdAtTimestamp = this.timer.convertStringDateToMicroseconds(itemHash.props.updated_at)
+      createdAtDate = this.timer.convertStringDateToDate(itemHash.props.updated_at)
+    } else {
+      createdAtTimestamp = 0
+      createdAtDate = new Date(0)
+    }
+
+    return { createdAtDate, createdAtTimestamp }
+  }
+
   private async addNotificationsAndPublishEvents(
     userUuid: Uuid,
     sharedVaultOperation: SharedVaultOperationOnItem | null,

packages/syncing-server/src/Domain/UseCase/Transition/TransitionItemsFromPrimaryToSecondaryDatabaseForUser/TransitionItemsFromPrimaryToSecondaryDatabaseForUser.ts

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

packages/syncing-server/src/Domain/UseCase/Transition/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser.spec.ts

@@ -23,6 +23,7 @@ describe('TriggerTransitionFromPrimaryToSecondaryDatabaseForUser', () => {
 
     await useCase.execute({
       userUuid: '00000000-0000-0000-0000-000000000000',
+      transitionTimestamp: 123,
     })
 
     expect(domainEventPubliser.publish).toHaveBeenCalled()

packages/syncing-server/src/Domain/UseCase/Transition/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser.ts

@@ -15,6 +15,7 @@ export class TriggerTransitionFromPrimaryToSecondaryDatabaseForUser implements U
       userUuid: dto.userUuid,
       status: 'STARTED',
       transitionType: 'items',
+      transitionTimestamp: dto.transitionTimestamp,
     })
 
     await this.domainEventPubliser.publish(event)

packages/syncing-server/src/Domain/UseCase/Transition/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser/TriggerTransitionFromPrimaryToSecondaryDatabaseForUserDTO.ts

@@ -1,3 +1,4 @@
 export interface TriggerTransitionFromPrimaryToSecondaryDatabaseForUserDTO {
   userUuid: string
+  transitionTimestamp: number
 }

packages/syncing-server/src/Infra/InversifyExpressUtils/AnnotatedItemsController.ts

@@ -11,7 +11,6 @@ import { SyncItems } from '../../Domain/UseCase/Syncing/SyncItems/SyncItems'
 import { BaseItemsController } from './Base/BaseItemsController'
 import { MapperInterface } from '@standardnotes/domain-core'
 import { ItemHttpRepresentation } from '../../Mapping/Http/ItemHttpRepresentation'
-import { TriggerTransitionFromPrimaryToSecondaryDatabaseForUser } from '../../Domain/UseCase/Transition/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser'
 
 @controller('/items', TYPES.Sync_AuthMiddleware)
 export class AnnotatedItemsController extends BaseItemsController {
@@ -19,20 +18,11 @@ export class AnnotatedItemsController extends BaseItemsController {
     @inject(TYPES.Sync_SyncItems) override syncItems: SyncItems,
     @inject(TYPES.Sync_CheckIntegrity) override checkIntegrity: CheckIntegrity,
     @inject(TYPES.Sync_GetItem) override getItem: GetItem,
-    @inject(TYPES.Sync_TriggerTransitionFromPrimaryToSecondaryDatabaseForUser)
-    override triggerTransitionFromPrimaryToSecondaryDatabaseForUser: TriggerTransitionFromPrimaryToSecondaryDatabaseForUser,
     @inject(TYPES.Sync_ItemHttpMapper) override itemHttpMapper: MapperInterface<Item, ItemHttpRepresentation>,
     @inject(TYPES.Sync_SyncResponseFactoryResolver)
     override syncResponseFactoryResolver: SyncResponseFactoryResolverInterface,
   ) {
-    super(
-      syncItems,
-      checkIntegrity,
-      getItem,
-      triggerTransitionFromPrimaryToSecondaryDatabaseForUser,
-      itemHttpMapper,
-      syncResponseFactoryResolver,
-    )
+    super(syncItems, checkIntegrity, getItem, itemHttpMapper, syncResponseFactoryResolver)
   }
 
   @httpPost('/sync')
@@ -45,11 +35,6 @@ export class AnnotatedItemsController extends BaseItemsController {
     return super.checkItemsIntegrity(request, response)
   }
 
-  @httpPost('/transition')
-  override async transition(request: Request, response: Response): Promise<results.JsonResult> {
-    return super.transition(request, response)
-  }
-
   @httpGet('/:uuid')
   override async getSingleItem(request: Request, response: Response): Promise<results.JsonResult> {
     return super.getSingleItem(request, response)

packages/syncing-server/src/Infra/InversifyExpressUtils/Base/BaseItemsController.ts

@@ -12,14 +12,12 @@ import { ApiVersion } from '../../../Domain/Api/ApiVersion'
 import { SyncItems } from '../../../Domain/UseCase/Syncing/SyncItems/SyncItems'
 import { ItemHttpRepresentation } from '../../../Mapping/Http/ItemHttpRepresentation'
 import { ItemHash } from '../../../Domain/Item/ItemHash'
-import { TriggerTransitionFromPrimaryToSecondaryDatabaseForUser } from '../../../Domain/UseCase/Transition/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser/TriggerTransitionFromPrimaryToSecondaryDatabaseForUser'
 
 export class BaseItemsController extends BaseHttpController {
   constructor(
     protected syncItems: SyncItems,
     protected checkIntegrity: CheckIntegrity,
     protected getItem: GetItem,
-    protected triggerTransitionFromPrimaryToSecondaryDatabaseForUser: TriggerTransitionFromPrimaryToSecondaryDatabaseForUser,
     protected itemHttpMapper: MapperInterface<Item, ItemHttpRepresentation>,
     protected syncResponseFactoryResolver: SyncResponseFactoryResolverInterface,
     private controllerContainer?: ControllerContainerInterface,
@@ -30,7 +28,6 @@ export class BaseItemsController extends BaseHttpController {
       this.controllerContainer.register('sync.items.sync', this.sync.bind(this))
       this.controllerContainer.register('sync.items.check_integrity', this.checkItemsIntegrity.bind(this))
       this.controllerContainer.register('sync.items.get_item', this.getSingleItem.bind(this))
-      this.controllerContainer.register('sync.items.transition', this.transition.bind(this))
     }
   }
 
@@ -113,25 +110,6 @@ export class BaseItemsController extends BaseHttpController {
     })
   }
 
-  async transition(_request: Request, response: Response): Promise<results.JsonResult> {
-    const result = await this.triggerTransitionFromPrimaryToSecondaryDatabaseForUser.execute({
-      userUuid: response.locals.user.uuid,
-    })
-
-    if (result.isFailed()) {
-      return this.json(
-        {
-          error: { message: result.getError() },
-        },
-        400,
-      )
-    }
-
-    response.setHeader('x-invalidate-cache', response.locals.user.uuid)
-
-    return this.json({ success: true })
-  }
-
   async getSingleItem(request: Request, response: Response): Promise<results.JsonResult> {
     const result = await this.getItem.execute({
       userUuid: response.locals.user.uuid,