chore(release): publish new version

- @standardnotes/auth-server@1.148.2
 - @standardnotes/home-server@1.16.11
 - @standardnotes/revisions-server@1.38.3
 - @standardnotes/syncing-server@1.110.0

.github/workflows/common-e2e.yml

@@ -23,6 +23,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        suite: ['base', 'vaults']
         secondary_db_enabled: [true, false]
     runs-on: ubuntu-latest
 
@@ -55,21 +56,24 @@ jobs:
       run: docker/is-available.sh http://localhost:3123 $(pwd)/logs
 
     - name: Run E2E Test Suite
-      run: yarn dlx mocha-headless-chrome --timeout 3600000 -f http://localhost:9001/mocha/test.html
+      run: yarn dlx mocha-headless-chrome --timeout 3600000 -f http://localhost:9001/mocha/test.html?suite=${{ matrix.suite }}
 
-    - name: Show logs on failure
+    - name: Archive failed run logs
       if: ${{ failure() }}
-      run: |
+      uses: actions/upload-artifact@v3
-        echo "# Errors:"
+      with:
-        tail -n 100 logs/*.err
+        name: self-hosted-failure-logs-${{ matrix.suite }}-${{ matrix.secondary_db_enabled }}
-        echo "# Logs:"
+        retention-days: 5
-        tail -n 100 logs/*.log
+        path: |
+          logs/*.err
+          logs/*.log
 
   e2e-home-server:
     name: (Home Server) E2E Test Suite
     strategy:
       fail-fast: false
       matrix:
+        suite: ['base', 'vaults']
         db_type: [mysql, sqlite]
         cache_type: [redis, memory]
         secondary_db_enabled: [true, false]
@@ -159,8 +163,13 @@ jobs:
       run: for i in {1..30}; do curl -s http://localhost:3123/healthcheck && break || sleep 1; done
 
     - name: Run E2E Test Suite
-      run: yarn dlx mocha-headless-chrome --timeout 3600000 -f http://localhost:9001/mocha/test.html
+      run: yarn dlx mocha-headless-chrome --timeout 3600000 -f http://localhost:9001/mocha/test.html?suite=${{ matrix.suite }}
 
-    - name: Show logs on failure
+    - name: Archive failed run logs
       if: ${{ failure() }}
-      run: tail -n 500 logs/output.log
+      uses: actions/upload-artifact@v3
+      with:
+        name: home-server-failure-logs-${{ matrix.suite }}-${{ matrix.db_type }}-${{ matrix.cache_type }}-${{ matrix.secondary_db_enabled }}
+        retention-days: 5
+        path: |
+          logs/output.log

packages/analytics/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.27.2](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.27.1...@standardnotes/analytics@2.27.2) (2023-09-28)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.27.1](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.27.0...@standardnotes/analytics@2.27.1) (2023-09-27)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
 # [2.27.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.26.24...@standardnotes/analytics@2.27.0) (2023-09-26)
 
 ### Features

packages/analytics/package.json

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

packages/api-gateway/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.75.7](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.75.6...@standardnotes/api-gateway@1.75.7) (2023-09-28)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.75.6](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.75.5...@standardnotes/api-gateway@1.75.6) (2023-09-27)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
 ## [1.75.5](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.75.4...@standardnotes/api-gateway@1.75.5) (2023-09-26)
 
 **Note:** Version bump only for package @standardnotes/api-gateway

packages/api-gateway/package.json

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

packages/auth/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.148.2](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.148.1...@standardnotes/auth-server@1.148.2) (2023-09-29)
+
+### Bug Fixes
+
+* **auth:** increase ttl for in progress duration of transitions ([681e037](https://github.com/standardnotes/server/commit/681e0378ae6b97c838b0b34ccc630194b304b81a))
+
+## [1.148.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.148.0...@standardnotes/auth-server@1.148.1) (2023-09-29)
+
+### Bug Fixes
+
+* **auth:** disable transitions retriggering if they are in progress ([5ef6c5c](https://github.com/standardnotes/server/commit/5ef6c5c14a9f7a558de7ac9ff0ab99a5f831c127))
+
+# [1.148.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.147.1...@standardnotes/auth-server@1.148.0) (2023-09-28)
+
+### Features
+
+* block file operations during transition ([#856](https://github.com/standardnotes/server/issues/856)) ([676cf36](https://github.com/standardnotes/server/commit/676cf36f8d769aa433880b2800f0457d06fbbf14))
+
+## [1.147.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.147.0...@standardnotes/auth-server@1.147.1) (2023-09-27)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
 # [1.147.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.146.4...@standardnotes/auth-server@1.147.0) (2023-09-26)
 
 ### Features

packages/auth/bin/transition.ts

@@ -55,7 +55,7 @@ const requestTransition = async (
 
     let wasTransitionRequested = false
 
-    if (itemsTransitionStatus?.value !== TransitionStatus.STATUSES.Verified) {
+    if (itemsTransitionStatus === null || itemsTransitionStatus.value === TransitionStatus.STATUSES.Failed) {
       wasTransitionRequested = true
       await transitionStatusRepository.remove(user.uuid, 'items')
 
@@ -68,7 +68,7 @@ const requestTransition = async (
       )
     }
 
-    if (revisionsTransitionStatus?.value !== TransitionStatus.STATUSES.Verified) {
+    if (revisionsTransitionStatus === null || revisionsTransitionStatus.value === TransitionStatus.STATUSES.Failed) {
       wasTransitionRequested = true
       await transitionStatusRepository.remove(user.uuid, 'revisions')
 

packages/auth/package.json

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

packages/auth/src/Bootstrap/Container.ts

@@ -369,7 +369,7 @@ export class ContainerConfigLoader {
     // Mapping
     container
       .bind<MapperInterface<SessionTrace, TypeORMSessionTrace>>(TYPES.Auth_SessionTracePersistenceMapper)
-      .toConstantValue(new SessionTracePersistenceMapper())
+      .toConstantValue(new SessionTracePersistenceMapper(container.get<TimerInterface>(TYPES.Auth_Timer)))
     container
       .bind<MapperInterface<Authenticator, TypeORMAuthenticator>>(TYPES.Auth_AuthenticatorPersistenceMapper)
       .toConstantValue(new AuthenticatorPersistenceMapper())
@@ -458,8 +458,9 @@ export class ContainerConfigLoader {
       .bind<SessionTraceRepositoryInterface>(TYPES.Auth_SessionTraceRepository)
       .toConstantValue(
         new TypeORMSessionTraceRepository(
-          container.get(TYPES.Auth_ORMSessionTraceRepository),
+          container.get<Repository<TypeORMSessionTrace>>(TYPES.Auth_ORMSessionTraceRepository),
-          container.get(TYPES.Auth_SessionTracePersistenceMapper),
+          container.get<MapperInterface<SessionTrace, TypeORMSessionTrace>>(TYPES.Auth_SessionTracePersistenceMapper),
+          container.get<TimerInterface>(TYPES.Auth_Timer),
         ),
       )
     container
@@ -1011,7 +1012,6 @@ export class ContainerConfigLoader {
           container.get<SessionRepositoryInterface>(TYPES.Auth_SessionRepository),
           container.get<EphemeralSessionRepositoryInterface>(TYPES.Auth_EphemeralSessionRepository),
           container.get<RevokedSessionRepositoryInterface>(TYPES.Auth_RevokedSessionRepository),
-          container.get<RemoveSharedVaultUser>(TYPES.Auth_RemoveSharedVaultUser),
           container.get<winston.Logger>(TYPES.Auth_Logger),
         ),
       )

packages/auth/src/Domain/Handler/AccountDeletionRequestedEventHandler.ts

@@ -6,7 +6,6 @@ import { EphemeralSessionRepositoryInterface } from '../Session/EphemeralSession
 import { RevokedSessionRepositoryInterface } from '../Session/RevokedSessionRepositoryInterface'
 import { SessionRepositoryInterface } from '../Session/SessionRepositoryInterface'
 import { UserRepositoryInterface } from '../User/UserRepositoryInterface'
-import { RemoveSharedVaultUser } from '../UseCase/RemoveSharedVaultUser/RemoveSharedVaultUser'
 
 export class AccountDeletionRequestedEventHandler implements DomainEventHandlerInterface {
   constructor(
@@ -14,7 +13,6 @@ export class AccountDeletionRequestedEventHandler implements DomainEventHandlerI
     private sessionRepository: SessionRepositoryInterface,
     private ephemeralSessionRepository: EphemeralSessionRepositoryInterface,
     private revokedSessionRepository: RevokedSessionRepositoryInterface,
-    private removeSharedVaultUser: RemoveSharedVaultUser,
     private logger: Logger,
   ) {}
 
@@ -37,13 +35,6 @@ export class AccountDeletionRequestedEventHandler implements DomainEventHandlerI
 
     await this.removeSessions(userUuid.value)
 
-    const result = await this.removeSharedVaultUser.execute({
-      userUuid: userUuid.value,
-    })
-    if (result.isFailed()) {
-      this.logger.error(`Could not remove shared vault user: ${result.getError()}`)
-    }
-
     await this.userRepository.remove(user)
 
     this.logger.info(`Finished account cleanup for user: ${userUuid.value}`)

packages/auth/src/Domain/Session/SessionTraceRepositoryInterface.ts

@@ -3,7 +3,7 @@ import { SubscriptionPlanName, Uuid } from '@standardnotes/domain-core'
 import { SessionTrace } from './SessionTrace'
 
 export interface SessionTraceRepositoryInterface {
-  save(sessionTrace: SessionTrace): Promise<void>
+  insert(sessionTrace: SessionTrace): Promise<void>
   removeExpiredBefore(date: Date): Promise<void>
   findOneByUserUuidAndDate(userUuid: Uuid, date: Date): Promise<SessionTrace | null>
   countByDate(date: Date): Promise<number>

packages/auth/src/Domain/UseCase/CreateValetToken/CreateValetToken.spec.ts

@@ -1,14 +1,17 @@
 import 'reflect-metadata'
 
-import { TokenEncoderInterface, ValetTokenData, ValetTokenOperation } from '@standardnotes/security'
+import { TransitionStatus } from '@standardnotes/domain-core'
-import { CreateValetToken } from './CreateValetToken'
 import { TimerInterface } from '@standardnotes/time'
+import { TokenEncoderInterface, ValetTokenData, ValetTokenOperation } from '@standardnotes/security'
+
+import { CreateValetToken } from './CreateValetToken'
 import { UserSubscription } from '../../Subscription/UserSubscription'
 import { SubscriptionSettingServiceInterface } from '../../Setting/SubscriptionSettingServiceInterface'
 import { User } from '../../User/User'
 import { UserSubscriptionType } from '../../Subscription/UserSubscriptionType'
 import { SubscriptionSettingsAssociationServiceInterface } from '../../Setting/SubscriptionSettingsAssociationServiceInterface'
 import { UserSubscriptionServiceInterface } from '../../Subscription/UserSubscriptionServiceInterface'
+import { TransitionStatusRepositoryInterface } from '../../Transition/TransitionStatusRepositoryInterface'
 
 describe('CreateValetToken', () => {
   let tokenEncoder: TokenEncoderInterface<ValetTokenData>
@@ -20,6 +23,7 @@ describe('CreateValetToken', () => {
   let regularSubscription: UserSubscription
   let sharedSubscription: UserSubscription
   let user: User
+  let transitionStatusRepository: TransitionStatusRepositoryInterface
 
   const createUseCase = () =>
     new CreateValetToken(
@@ -29,6 +33,7 @@ describe('CreateValetToken', () => {
       userSubscriptionService,
       timer,
       valetTokenTTL,
+      transitionStatusRepository,
     )
 
   beforeEach(() => {
@@ -66,6 +71,11 @@ describe('CreateValetToken', () => {
 
     timer = {} as jest.Mocked<TimerInterface>
     timer.getTimestampInMicroseconds = jest.fn().mockReturnValue(100)
+
+    transitionStatusRepository = {} as jest.Mocked<TransitionStatusRepositoryInterface>
+    transitionStatusRepository.getStatus = jest
+      .fn()
+      .mockReturnValue(TransitionStatus.create(TransitionStatus.STATUSES.Verified).getValue())
   })
 
   it('should create a read valet token', async () => {
@@ -166,6 +176,7 @@ describe('CreateValetToken', () => {
       {
         sharedSubscriptionUuid: undefined,
         regularSubscriptionUuid: '1-2-3',
+        ongoingTransition: false,
         permittedOperation: 'write',
         permittedResources: [
           {
@@ -206,6 +217,7 @@ describe('CreateValetToken', () => {
       {
         sharedSubscriptionUuid: '2-3-4',
         regularSubscriptionUuid: '1-2-3',
+        ongoingTransition: false,
         permittedOperation: 'write',
         permittedResources: [
           {
@@ -266,6 +278,7 @@ describe('CreateValetToken', () => {
       {
         sharedSubscriptionUuid: undefined,
         regularSubscriptionUuid: '1-2-3',
+        ongoingTransition: false,
         permittedOperation: 'write',
         permittedResources: [
           {

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

@@ -13,6 +13,8 @@ import { CreateValetTokenDTO } from './CreateValetTokenDTO'
 import { SubscriptionSettingsAssociationServiceInterface } from '../../Setting/SubscriptionSettingsAssociationServiceInterface'
 import { UserSubscriptionServiceInterface } from '../../Subscription/UserSubscriptionServiceInterface'
 import { CreateValetTokenPayload } from '../../ValetToken/CreateValetTokenPayload'
+import { TransitionStatusRepositoryInterface } from '../../Transition/TransitionStatusRepositoryInterface'
+import { TransitionStatus } from '@standardnotes/domain-core'
 
 @injectable()
 export class CreateValetToken implements UseCaseInterface {
@@ -25,6 +27,8 @@ export class CreateValetToken implements UseCaseInterface {
     @inject(TYPES.Auth_UserSubscriptionService) private userSubscriptionService: UserSubscriptionServiceInterface,
     @inject(TYPES.Auth_Timer) private timer: TimerInterface,
     @inject(TYPES.Auth_VALET_TOKEN_TTL) private valetTokenTTL: number,
+    @inject(TYPES.Auth_TransitionStatusRepository)
+    private transitionStatusRepository: TransitionStatusRepositoryInterface,
   ) {}
 
   async execute(dto: CreateValetTokenDTO): Promise<CreateValetTokenResponseData> {
@@ -83,6 +87,8 @@ export class CreateValetToken implements UseCaseInterface {
       sharedSubscriptionUuid = sharedSubscription.uuid
     }
 
+    const transitionStatus = await this.transitionStatusRepository.getStatus(userUuid, 'items')
+
     const tokenData: ValetTokenData = {
       userUuid: dto.userUuid,
       permittedOperation: dto.operation,
@@ -91,6 +97,7 @@ export class CreateValetToken implements UseCaseInterface {
       uploadBytesLimit,
       sharedSubscriptionUuid,
       regularSubscriptionUuid: regularSubscription.uuid,
+      ongoingTransition: transitionStatus?.value === TransitionStatus.STATUSES.InProgress,
     }
 
     const valetToken = this.tokenEncoder.encodeExpirableToken(tokenData, this.valetTokenTTL)

packages/auth/src/Domain/UseCase/TraceSession/TraceSession.spec.ts

@@ -15,7 +15,7 @@ describe('TraceSession', () => {
   beforeEach(() => {
     sessionTraceRepository = {} as jest.Mocked<SessionTraceRepositoryInterface>
     sessionTraceRepository.findOneByUserUuidAndDate = jest.fn().mockReturnValue(null)
-    sessionTraceRepository.save = jest.fn()
+    sessionTraceRepository.insert = jest.fn()
 
     timer = {} as jest.Mocked<TimerInterface>
     timer.getUTCDateNDaysAhead = jest.fn().mockReturnValue(new Date())
@@ -30,7 +30,7 @@ describe('TraceSession', () => {
 
     expect(result.isFailed()).toBe(false)
     expect(result.getValue().props.userUuid.value).toEqual('0702b137-4f5c-438a-915e-8f8b46572ce5')
-    expect(sessionTraceRepository.save).toHaveBeenCalledTimes(1)
+    expect(sessionTraceRepository.insert).toHaveBeenCalledTimes(1)
   })
 
   it('should not save a session trace if one already exists for the same user and date', async () => {
@@ -43,7 +43,7 @@ describe('TraceSession', () => {
     })
 
     expect(result.isFailed()).toBe(false)
-    expect(sessionTraceRepository.save).not.toHaveBeenCalled()
+    expect(sessionTraceRepository.insert).not.toHaveBeenCalled()
   })
 
   it('should return an error if userUuid is invalid', async () => {
@@ -54,7 +54,7 @@ describe('TraceSession', () => {
     })
 
     expect(result.isFailed()).toBe(true)
-    expect(sessionTraceRepository.save).not.toHaveBeenCalled()
+    expect(sessionTraceRepository.insert).not.toHaveBeenCalled()
   })
 
   it('should return an error if username is invalid', async () => {
@@ -65,7 +65,7 @@ describe('TraceSession', () => {
     })
 
     expect(result.isFailed()).toBe(true)
-    expect(sessionTraceRepository.save).not.toHaveBeenCalled()
+    expect(sessionTraceRepository.insert).not.toHaveBeenCalled()
   })
 
   it('should return an error if subscriptionPlanName is invalid', async () => {
@@ -76,7 +76,7 @@ describe('TraceSession', () => {
     })
 
     expect(result.isFailed()).toBe(true)
-    expect(sessionTraceRepository.save).not.toHaveBeenCalled()
+    expect(sessionTraceRepository.insert).not.toHaveBeenCalled()
   })
 
   it('should not save a session trace if creating of the session trace fails', async () => {
@@ -90,7 +90,7 @@ describe('TraceSession', () => {
     })
 
     expect(result.isFailed()).toBe(true)
-    expect(sessionTraceRepository.save).not.toHaveBeenCalled()
+    expect(sessionTraceRepository.insert).not.toHaveBeenCalled()
 
     mock.mockRestore()
   })

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

@@ -53,7 +53,7 @@ export class TraceSession implements UseCaseInterface<SessionTrace> {
     }
     const sessionTrace = sessionTraceOrError.getValue()
 
-    await this.sessionTraceRepository.save(sessionTrace)
+    await this.sessionTraceRepository.insert(sessionTrace)
 
     return Result.ok<SessionTrace>(sessionTrace)
   }

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

@@ -19,8 +19,8 @@ export class RedisTransitionStatusRepository implements TransitionStatusReposito
         await this.redisClient.set(`${this.PREFIX}:${transitionType}:${userUuid}`, status.value)
         break
       case TransitionStatus.STATUSES.InProgress: {
-        const ttl2Hourse = 7_200
+        const ttl24Hours = 86_400
-        await this.redisClient.setex(`${this.PREFIX}:${transitionType}:${userUuid}`, ttl2Hourse, status.value)
+        await this.redisClient.setex(`${this.PREFIX}:${transitionType}:${userUuid}`, ttl24Hours, status.value)
         break
       }
     }

packages/auth/src/Infra/TypeORM/TypeORMSessionTraceRepository.ts

@@ -1,5 +1,7 @@
 import { MapperInterface, SubscriptionPlanName, Uuid } from '@standardnotes/domain-core'
+import { TimerInterface } from '@standardnotes/time'
 import { Repository } from 'typeorm'
+
 import { SessionTrace } from '../../Domain/Session/SessionTrace'
 import { SessionTraceRepositoryInterface } from '../../Domain/Session/SessionTraceRepositoryInterface'
 import { TypeORMSessionTrace } from './TypeORMSessionTrace'
@@ -8,13 +10,14 @@ export class TypeORMSessionTraceRepository implements SessionTraceRepositoryInte
   constructor(
     private ormRepository: Repository<TypeORMSessionTrace>,
     private mapper: MapperInterface<SessionTrace, TypeORMSessionTrace>,
+    private timer: TimerInterface,
   ) {}
 
   async countByDateAndSubscriptionPlanName(date: Date, subscriptionPlanName: SubscriptionPlanName): Promise<number> {
     return this.ormRepository
       .createQueryBuilder('trace')
       .where('trace.creation_date = :creationDate', {
-        creationDate: `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`,
+        creationDate: this.timer.convertDateToFormattedString(date, 'YYYY-MM-DD'),
       })
       .andWhere('trace.subscription_plan_name = :subscriptionPlanName', {
         subscriptionPlanName: subscriptionPlanName.value,
@@ -26,7 +29,7 @@ export class TypeORMSessionTraceRepository implements SessionTraceRepositoryInte
     return this.ormRepository
       .createQueryBuilder('trace')
       .where('trace.creation_date = :creationDate', {
-        creationDate: `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`,
+        creationDate: this.timer.convertDateToFormattedString(date, 'YYYY-MM-DD'),
       })
       .getCount()
   }
@@ -44,7 +47,7 @@ export class TypeORMSessionTraceRepository implements SessionTraceRepositoryInte
       .createQueryBuilder('trace')
       .where('trace.user_uuid = :userUuid AND trace.creation_date = :creationDate', {
         userUuid: userUuid.value,
-        creationDate: `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`,
+        creationDate: this.timer.convertDateToFormattedString(date, 'YYYY-MM-DD'),
       })
       .getOne()
 
@@ -55,9 +58,9 @@ export class TypeORMSessionTraceRepository implements SessionTraceRepositoryInte
     return this.mapper.toDomain(typeOrm)
   }
 
-  async save(sessionTrace: SessionTrace): Promise<void> {
+  async insert(sessionTrace: SessionTrace): Promise<void> {
     const persistence = this.mapper.toProjection(sessionTrace)
 
-    await this.ormRepository.save(persistence)
+    await this.ormRepository.insert(persistence)
   }
 }

packages/auth/src/Mapping/SessionTracePersistenceMapper.ts

@@ -1,8 +1,11 @@
 import { MapperInterface, SubscriptionPlanName, UniqueEntityId, Username, Uuid } from '@standardnotes/domain-core'
 import { SessionTrace } from '../Domain/Session/SessionTrace'
 import { TypeORMSessionTrace } from '../Infra/TypeORM/TypeORMSessionTrace'
+import { TimerInterface } from '@standardnotes/time'
 
 export class SessionTracePersistenceMapper implements MapperInterface<SessionTrace, TypeORMSessionTrace> {
+  constructor(private timer: TimerInterface) {}
+
   toDomain(projection: TypeORMSessionTrace): SessionTrace {
     const userUuidOrError = Uuid.create(projection.userUuid)
     if (userUuidOrError.isFailed()) {
@@ -50,11 +53,7 @@ export class SessionTracePersistenceMapper implements MapperInterface<SessionTra
     typeOrm.username = domain.props.username.value
     typeOrm.subscriptionPlanName = domain.props.subscriptionPlanName ? domain.props.subscriptionPlanName.value : null
     typeOrm.createdAt = domain.props.createdAt
-    typeOrm.creationDate = new Date(
+    typeOrm.creationDate = new Date(this.timer.convertDateToFormattedString(domain.props.createdAt, 'YYYY-MM-DD'))
-      domain.props.createdAt.getFullYear(),
-      domain.props.createdAt.getMonth(),
-      domain.props.createdAt.getDate(),
-    )
     typeOrm.expiresAt = domain.props.expiresAt
 
     return typeOrm

packages/domain-core/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.34.1](https://github.com/standardnotes/server/compare/@standardnotes/domain-core@1.34.0...@standardnotes/domain-core@1.34.1) (2023-09-27)
+
+### Bug Fixes
+
+* removing items in a vault and notifying about designated survivor ([#855](https://github.com/standardnotes/server/issues/855)) ([1d06ffe](https://github.com/standardnotes/server/commit/1d06ffe9d51722ada7baa040e1d5ed351fc28f39))
+
 # [1.34.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-core@1.33.2...@standardnotes/domain-core@1.34.0) (2023-09-26)
 
 ### Features

packages/domain-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/domain-core",
-  "version": "1.34.0",
+  "version": "1.34.1",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

packages/domain-core/src/Domain/Notification/NotificationPayloadIdentifierType.ts

@@ -5,6 +5,7 @@ import { NotificationPayloadIdentifierTypeProps } from './NotificationPayloadIde
 export class NotificationPayloadIdentifierType extends ValueObject<NotificationPayloadIdentifierTypeProps> {
   static readonly TYPES = {
     SharedVaultUuid: 'shared_vault_uuid',
+    UserUuid: 'user_uuid',
     SharedVaultInviteUuid: 'shared_vault_invite_uuid',
     ItemUuid: 'item_uuid',
   }

packages/domain-core/src/Domain/Notification/NotificationType.ts

@@ -7,6 +7,7 @@ export class NotificationType extends ValueObject<NotificationTypeProps> {
     SharedVaultItemRemoved: 'shared_vault_item_removed',
     SelfRemovedFromSharedVault: 'self_removed_from_shared_vault',
     UserRemovedFromSharedVault: 'user_removed_from_shared_vault',
+    UserDesignatedAsSurvivor: 'user_designated_as_survivor',
     UserAddedToSharedVault: 'user_added_to_shared_vault',
     SharedVaultInviteCanceled: 'shared_vault_invite_canceled',
     SharedVaultFileUploaded: 'shared_vault_file_uploaded',

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.13.1](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.13.0...@standardnotes/domain-events-infra@1.13.1) (2023-09-28)
+
+**Note:** Version bump only for package @standardnotes/domain-events-infra
+
 # [1.13.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.12.34...@standardnotes/domain-events-infra@1.13.0) (2023-09-26)
 
 ### Features

packages/domain-events-infra/package.json

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

packages/domain-events/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.131.1](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.131.0...@standardnotes/domain-events@2.131.1) (2023-09-28)
+
+**Note:** Version bump only for package @standardnotes/domain-events
+
 # [2.131.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.130.0...@standardnotes/domain-events@2.131.0) (2023-09-26)
 
 ### Features

packages/domain-events/package.json

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

packages/event-store/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.12.2](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.12.1...@standardnotes/event-store@1.12.2) (2023-09-28)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
+## [1.12.1](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.12.0...@standardnotes/event-store@1.12.1) (2023-09-27)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
 # [1.12.0](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.11.52...@standardnotes/event-store@1.12.0) (2023-09-26)
 
 ### Features

packages/event-store/package.json

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

packages/files/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.25.0](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.24.1...@standardnotes/files-server@1.25.0) (2023-09-28)
+
+### Features
+
+* block file operations during transition ([#856](https://github.com/standardnotes/files/issues/856)) ([676cf36](https://github.com/standardnotes/files/commit/676cf36f8d769aa433880b2800f0457d06fbbf14))
+
+## [1.24.1](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.24.0...@standardnotes/files-server@1.24.1) (2023-09-27)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
 # [1.24.0](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.23.2...@standardnotes/files-server@1.24.0) (2023-09-26)
 
 ### Features

packages/files/package.json

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

packages/files/src/Bootstrap/Container.ts

@@ -198,7 +198,9 @@ export class ContainerConfigLoader {
         .toConstantValue(
           new FSFileUploader(container.get(TYPES.Files_FILE_UPLOAD_PATH), container.get(TYPES.Files_Logger)),
         )
-      container.bind<FileRemoverInterface>(TYPES.Files_FileRemover).to(FSFileRemover)
+      container
+        .bind<FileRemoverInterface>(TYPES.Files_FileRemover)
+        .toConstantValue(new FSFileRemover(container.get<string>(TYPES.Files_FILE_UPLOAD_PATH)))
       container.bind<FileMoverInterface>(TYPES.Files_FileMover).to(FSFileMover)
     }
 
@@ -247,12 +249,26 @@ export class ContainerConfigLoader {
     // Handlers
     container
       .bind<AccountDeletionRequestedEventHandler>(TYPES.Files_AccountDeletionRequestedEventHandler)
-      .to(AccountDeletionRequestedEventHandler)
+      .toConstantValue(
+        new AccountDeletionRequestedEventHandler(
+          container.get<MarkFilesToBeRemoved>(TYPES.Files_MarkFilesToBeRemoved),
+          container.get<DomainEventPublisherInterface>(TYPES.Files_DomainEventPublisher),
+          container.get<DomainEventFactoryInterface>(TYPES.Files_DomainEventFactory),
+          container.get<winston.Logger>(TYPES.Files_Logger),
+        ),
+      )
     container
       .bind<SharedSubscriptionInvitationCanceledEventHandler>(
         TYPES.Files_SharedSubscriptionInvitationCanceledEventHandler,
       )
-      .to(SharedSubscriptionInvitationCanceledEventHandler)
+      .toConstantValue(
+        new SharedSubscriptionInvitationCanceledEventHandler(
+          container.get<MarkFilesToBeRemoved>(TYPES.Files_MarkFilesToBeRemoved),
+          container.get<DomainEventPublisherInterface>(TYPES.Files_DomainEventPublisher),
+          container.get<DomainEventFactoryInterface>(TYPES.Files_DomainEventFactory),
+          container.get<winston.Logger>(TYPES.Files_Logger),
+        ),
+      )
 
     const eventHandlers: Map<string, DomainEventHandlerInterface> = new Map([
       ['ACCOUNT_DELETION_REQUESTED', container.get(TYPES.Files_AccountDeletionRequestedEventHandler)],

packages/files/src/Domain/File/RemovedFileDescription.ts

@@ -1,5 +1,5 @@
 export type RemovedFileDescription = {
-  userUuid: string
+  userOrSharedVaultUuid: string
   filePath: string
   fileName: string
   fileByteSize: number

packages/files/src/Domain/Handler/AccountDeletionRequestedEventHandler.ts

@@ -3,18 +3,17 @@ import {
   DomainEventHandlerInterface,
   DomainEventPublisherInterface,
 } from '@standardnotes/domain-events'
-import { inject, injectable } from 'inversify'
+import { Logger } from 'winston'
 
-import TYPES from '../../Bootstrap/Types'
 import { DomainEventFactoryInterface } from '../Event/DomainEventFactoryInterface'
 import { MarkFilesToBeRemoved } from '../UseCase/MarkFilesToBeRemoved/MarkFilesToBeRemoved'
 
-@injectable()
 export class AccountDeletionRequestedEventHandler implements DomainEventHandlerInterface {
   constructor(
-    @inject(TYPES.Files_MarkFilesToBeRemoved) private markFilesToBeRemoved: MarkFilesToBeRemoved,
+    private markFilesToBeRemoved: MarkFilesToBeRemoved,
-    @inject(TYPES.Files_DomainEventPublisher) private domainEventPublisher: DomainEventPublisherInterface,
+    private domainEventPublisher: DomainEventPublisherInterface,
-    @inject(TYPES.Files_DomainEventFactory) private domainEventFactory: DomainEventFactoryInterface,
+    private domainEventFactory: DomainEventFactoryInterface,
+    private logger: Logger,
   ) {}
 
   async handle(event: AccountDeletionRequestedEvent): Promise<void> {
@@ -27,16 +26,23 @@ export class AccountDeletionRequestedEventHandler implements DomainEventHandlerI
     })
 
     if (result.isFailed()) {
+      this.logger.error(`Could not mark files for removal for user ${event.payload.userUuid}: ${result.getError()}`)
+
       return
     }
 
     const filesRemoved = result.getValue()
 
+    this.logger.debug(`Marked ${filesRemoved.length} files for removal for user ${event.payload.userUuid}`)
+
     for (const fileRemoved of filesRemoved) {
       await this.domainEventPublisher.publish(
         this.domainEventFactory.createFileRemovedEvent({
           regularSubscriptionUuid: event.payload.regularSubscriptionUuid,
-          ...fileRemoved,
+          userUuid: fileRemoved.userOrSharedVaultUuid,
+          filePath: fileRemoved.filePath,
+          fileName: fileRemoved.fileName,
+          fileByteSize: fileRemoved.fileByteSize,
         }),
       )
     }

packages/files/src/Domain/Handler/SharedSubscriptionInvitationCanceledEventHandler.ts

@@ -3,18 +3,17 @@ import {
   DomainEventHandlerInterface,
   DomainEventPublisherInterface,
 } from '@standardnotes/domain-events'
-import { inject, injectable } from 'inversify'
+import { Logger } from 'winston'
 
-import TYPES from '../../Bootstrap/Types'
 import { DomainEventFactoryInterface } from '../Event/DomainEventFactoryInterface'
 import { MarkFilesToBeRemoved } from '../UseCase/MarkFilesToBeRemoved/MarkFilesToBeRemoved'
 
-@injectable()
 export class SharedSubscriptionInvitationCanceledEventHandler implements DomainEventHandlerInterface {
   constructor(
-    @inject(TYPES.Files_MarkFilesToBeRemoved) private markFilesToBeRemoved: MarkFilesToBeRemoved,
+    private markFilesToBeRemoved: MarkFilesToBeRemoved,
-    @inject(TYPES.Files_DomainEventPublisher) private domainEventPublisher: DomainEventPublisherInterface,
+    private domainEventPublisher: DomainEventPublisherInterface,
-    @inject(TYPES.Files_DomainEventFactory) private domainEventFactory: DomainEventFactoryInterface,
+    private domainEventFactory: DomainEventFactoryInterface,
+    private logger: Logger,
   ) {}
 
   async handle(event: SharedSubscriptionInvitationCanceledEvent): Promise<void> {
@@ -27,16 +26,25 @@ export class SharedSubscriptionInvitationCanceledEventHandler implements DomainE
     })
 
     if (result.isFailed()) {
+      this.logger.error(
+        `Could not mark files to be removed for invitee: ${event.payload.inviteeIdentifier}: ${result.getError()}`,
+      )
+
       return
     }
 
     const filesRemoved = result.getValue()
 
+    this.logger.debug(`Marked ${filesRemoved.length} files for removal for invitee ${event.payload.inviteeIdentifier}`)
+
     for (const fileRemoved of filesRemoved) {
       await this.domainEventPublisher.publish(
         this.domainEventFactory.createFileRemovedEvent({
           regularSubscriptionUuid: event.payload.inviterSubscriptionUuid,
-          ...fileRemoved,
+          userUuid: fileRemoved.userOrSharedVaultUuid,
+          filePath: fileRemoved.filePath,
+          fileName: fileRemoved.fileName,
+          fileByteSize: fileRemoved.fileByteSize,
         }),
       )
     }

packages/files/src/Domain/Handler/SharedVaultRemovedEventHandler.ts

@@ -29,6 +29,10 @@ export class SharedVaultRemovedEventHandler implements DomainEventHandlerInterfa
 
     const filesRemoved = result.getValue()
 
+    this.logger.debug(
+      `Marked ${filesRemoved.length} files for removal for shared vault ${event.payload.sharedVaultUuid}`,
+    )
+
     for (const fileRemoved of filesRemoved) {
       await this.domainEventPublisher.publish(
         this.domainEventFactory.createSharedVaultFileRemovedEvent({

packages/files/src/Domain/Services/FileRemoverInterface.ts

@@ -2,5 +2,5 @@ import { RemovedFileDescription } from '../File/RemovedFileDescription'
 
 export interface FileRemoverInterface {
   remove(filePath: string): Promise<number>
-  markFilesToBeRemoved(userUuid: string): Promise<Array<RemovedFileDescription>>
+  markFilesToBeRemoved(userOrSharedVaultUuid: string): Promise<Array<RemovedFileDescription>>
 }

packages/files/src/Infra/FS/FSFileRemover.ts

@@ -1,18 +1,42 @@
-import { inject, injectable } from 'inversify'
 import { promises } from 'fs'
 
 import { FileRemoverInterface } from '../../Domain/Services/FileRemoverInterface'
 import { RemovedFileDescription } from '../../Domain/File/RemovedFileDescription'
-import TYPES from '../../Bootstrap/Types'
 
-@injectable()
 export class FSFileRemover implements FileRemoverInterface {
-  constructor(@inject(TYPES.Files_FILE_UPLOAD_PATH) private fileUploadPath: string) {}
+  constructor(private fileUploadPath: string) {}
 
-  async markFilesToBeRemoved(userUuid: string): Promise<Array<RemovedFileDescription>> {
+  async markFilesToBeRemoved(userOrSharedVaultUuid: string): Promise<Array<RemovedFileDescription>> {
-    await promises.rmdir(`${this.fileUploadPath}/${userUuid}`)
+    const removedFileDescriptions: RemovedFileDescription[] = []
 
-    return []
+    let directoryExists: boolean
+    try {
+      await promises.access(`${this.fileUploadPath}/${userOrSharedVaultUuid}`)
+      directoryExists = true
+    } catch (error) {
+      directoryExists = false
+    }
+
+    if (!directoryExists) {
+      return []
+    }
+
+    const files = await promises.readdir(`${this.fileUploadPath}/${userOrSharedVaultUuid}`, { withFileTypes: true })
+
+    for (const file of files) {
+      const filePath = `${this.fileUploadPath}/${userOrSharedVaultUuid}/${file.name}`
+
+      const fileByteSize = await this.remove(`${userOrSharedVaultUuid}/${file.name}`)
+
+      removedFileDescriptions.push({
+        filePath,
+        fileByteSize,
+        userOrSharedVaultUuid,
+        fileName: file.name,
+      })
+    }
+
+    return removedFileDescriptions
   }
 
   async remove(filePath: string): Promise<number> {

packages/files/src/Infra/InversifyExpress/Middleware/ValetTokenAuthMiddleware.spec.ts

@@ -13,6 +13,7 @@ describe('ValetTokenAuthMiddleware', () => {
 
   const logger = {
     debug: jest.fn(),
+    error: jest.fn(),
   } as unknown as jest.Mocked<Logger>
 
   const createMiddleware = () => new ValetTokenAuthMiddleware(tokenDecoder, logger)
@@ -222,4 +223,27 @@ describe('ValetTokenAuthMiddleware', () => {
 
     expect(next).toHaveBeenCalledWith(error)
   })
+
+  it('should throw an error if the valet token indicates an ongoing transition', async () => {
+    request.headers['x-valet-token'] = 'valet-token'
+
+    tokenDecoder.decodeToken = jest.fn().mockReturnValue({
+      userUuid: '1-2-3',
+      permittedResources: [
+        {
+          remoteIdentifier: '00000000-0000-0000-0000-000000000000',
+          unencryptedFileSize: 30,
+        },
+      ],
+      permittedOperation: 'write',
+      uploadBytesLimit: -1,
+      uploadBytesUsed: 80,
+      ongoingTransition: true,
+    })
+
+    await createMiddleware().handler(request, response, next)
+
+    expect(response.status).toHaveBeenCalledWith(500)
+    expect(next).not.toHaveBeenCalled()
+  })
 })

packages/files/src/Infra/InversifyExpress/Middleware/ValetTokenAuthMiddleware.ts

@@ -46,6 +46,19 @@ export class ValetTokenAuthMiddleware extends BaseMiddleware {
         return
       }
 
+      if (valetTokenData.ongoingTransition === true) {
+        this.logger.error(`Cannot perform file operations for user ${valetTokenData.userUuid} during transition`)
+
+        response.status(500).send({
+          error: {
+            tag: 'ongoing-transition',
+            message: 'Cannot perform file operations during transition',
+          },
+        })
+
+        return
+      }
+
       for (const resource of valetTokenData.permittedResources) {
         const resourceUuidOrError = Uuid.create(resource.remoteIdentifier)
         if (resourceUuidOrError.isFailed()) {

packages/files/src/Infra/S3/S3FileRemover.ts

@@ -59,7 +59,7 @@ export class S3FileRemover implements FileRemoverInterface {
         fileByteSize: file.Size as number,
         fileName: file.Key.replace(`${userUuid}/`, ''),
         filePath: file.Key,
-        userUuid,
+        userOrSharedVaultUuid: userUuid,
       })
     }
 

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.16.11](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.16.10...@standardnotes/home-server@1.16.11) (2023-09-29)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.16.10](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.16.9...@standardnotes/home-server@1.16.10) (2023-09-29)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.16.9](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.16.8...@standardnotes/home-server@1.16.9) (2023-09-28)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.16.8](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.16.7...@standardnotes/home-server@1.16.8) (2023-09-27)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
 ## [1.16.7](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.16.6...@standardnotes/home-server@1.16.7) (2023-09-26)
 
 **Note:** Version bump only for package @standardnotes/home-server

packages/home-server/package.json

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

packages/revisions/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.38.3](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.38.2...@standardnotes/revisions-server@1.38.3) (2023-09-29)
+
+### Bug Fixes
+
+* add paging memory to integrity check ([e4ca310](https://github.com/standardnotes/server/commit/e4ca310707b12b1c08073a391e8857ee52acd92b))
+
+## [1.38.2](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.38.1...@standardnotes/revisions-server@1.38.2) (2023-09-28)
+
+**Note:** Version bump only for package @standardnotes/revisions-server
+
+## [1.38.1](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.38.0...@standardnotes/revisions-server@1.38.1) (2023-09-27)
+
+**Note:** Version bump only for package @standardnotes/revisions-server
+
 # [1.38.0](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.37.3...@standardnotes/revisions-server@1.38.0) (2023-09-26)
 
 ### Features

packages/revisions/package.json

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

packages/revisions/src/Domain/Transition/TransitionRepositoryInterface.ts

@@ -1,4 +1,6 @@
 export interface TransitionRepositoryInterface {
   getPagingProgress(userUuid: string): Promise<number>
   setPagingProgress(userUuid: string, progress: number): Promise<void>
+  getIntegrityProgress(userUuid: string): Promise<number>
+  setIntegrityProgress(userUuid: string, progress: number): Promise<void>
 }

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

@@ -42,7 +42,6 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
     if (migrationResult.isFailed()) {
       return Result.fail(migrationResult.getError())
     }
-    const revisionsToSkipInIntegrityCheck = migrationResult.getValue()
 
     this.logger.info(`[${dto.userUuid}] Revisions migrated`)
 
@@ -50,11 +49,11 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
 
     this.logger.info(`[${dto.userUuid}] Checking integrity between primary and secondary database`)
 
-    const integrityCheckResult = await this.checkIntegrityBetweenPrimaryAndSecondaryDatabase(
+    const integrityCheckResult = await this.checkIntegrityBetweenPrimaryAndSecondaryDatabase(userUuid)
-      userUuid,
-      revisionsToSkipInIntegrityCheck,
-    )
     if (integrityCheckResult.isFailed()) {
+      await (this.transitionStatusRepository as TransitionRepositoryInterface).setPagingProgress(userUuid.value, 1)
+      await (this.transitionStatusRepository as TransitionRepositoryInterface).setIntegrityProgress(userUuid.value, 1)
+
       return Result.fail(integrityCheckResult.getError())
     }
 
@@ -75,7 +74,7 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
     return Result.ok()
   }
 
-  private async migrateRevisionsForUser(userUuid: Uuid): Promise<Result<string[]>> {
+  private async migrateRevisionsForUser(userUuid: Uuid): Promise<Result<void>> {
     try {
       const initialPage = await (this.transitionStatusRepository as TransitionRepositoryInterface).getPagingProgress(
         userUuid.value,
@@ -85,7 +84,6 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
 
       const totalRevisionsCountForUser = await this.primaryRevisionsRepository.countByUserUuid(userUuid)
       const totalPages = Math.ceil(totalRevisionsCountForUser / this.pageSize)
-      const revisionsToSkipInIntegrityCheck = []
       for (let currentPage = initialPage; currentPage <= totalPages; currentPage++) {
         await (this.transitionStatusRepository as TransitionRepositoryInterface).setPagingProgress(
           userUuid.value,
@@ -113,7 +111,6 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
                 this.logger.info(
                   `[${userUuid.value}] Revision ${revision.id.toString()} is older than revision in secondary database`,
                 )
-                revisionsToSkipInIntegrityCheck.push(revision.id.toString())
 
                 continue
               }
@@ -145,7 +142,7 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
         }
       }
 
-      return Result.ok(revisionsToSkipInIntegrityCheck)
+      return Result.ok()
     } catch (error) {
       return Result.fail(`Errored when migrating revisions for user ${userUuid.value}: ${(error as Error).message}`)
     }
@@ -171,11 +168,14 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
     await this.timer.sleep(twoSecondsInMilliseconds)
   }
 
-  private async checkIntegrityBetweenPrimaryAndSecondaryDatabase(
+  private async checkIntegrityBetweenPrimaryAndSecondaryDatabase(userUuid: Uuid): Promise<Result<boolean>> {
-    userUuid: Uuid,
-    revisionsToSkipInIntegrityCheck: string[],
-  ): Promise<Result<boolean>> {
     try {
+      const initialPage = await (this.transitionStatusRepository as TransitionRepositoryInterface).getIntegrityProgress(
+        userUuid.value,
+      )
+
+      this.logger.info(`[${userUuid.value}] Checking integrity from page ${initialPage}`)
+
       const totalRevisionsCountForUserInPrimary = await this.primaryRevisionsRepository.countByUserUuid(userUuid)
       const totalRevisionsCountForUserInSecondary = await (
         this.secondRevisionsRepository as RevisionRepositoryInterface
@@ -188,7 +188,12 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
       }
 
       const totalPages = Math.ceil(totalRevisionsCountForUserInPrimary / this.pageSize)
-      for (let currentPage = 1; currentPage <= totalPages; currentPage++) {
+      for (let currentPage = initialPage; currentPage <= totalPages; currentPage++) {
+        await (this.transitionStatusRepository as TransitionRepositoryInterface).setIntegrityProgress(
+          userUuid.value,
+          currentPage,
+        )
+
         const query = {
           userUuid: userUuid,
           offset: (currentPage - 1) * this.pageSize,
@@ -212,17 +217,25 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
             return Result.fail(`Revision ${revision.id.toString()} not found in secondary database`)
           }
 
-          if (revisionsToSkipInIntegrityCheck.includes(revision.id.toString())) {
+          if (revision.isIdenticalTo(revisionInSecondary)) {
             continue
           }
 
-          if (!revision.isIdenticalTo(revisionInSecondary)) {
+          if (revisionInSecondary.props.dates.updatedAt > revision.props.dates.updatedAt) {
-            return Result.fail(
+            this.logger.info(
-              `Revision ${revision.id.toString()} is not identical in primary and secondary database. Revision in primary database: ${JSON.stringify(
+              `[${
-                revision,
+                userUuid.value
-              )}, revision in secondary database: ${JSON.stringify(revisionInSecondary)}`,
+              }] Integrity check of revision ${revision.id.toString()} - is older than revision in secondary database`,
             )
+
+            continue
           }
+
+          return Result.fail(
+            `Revision ${revision.id.toString()} is not identical in primary and secondary database. Revision in primary database: ${JSON.stringify(
+              revision,
+            )}, revision in secondary database: ${JSON.stringify(revisionInSecondary)}`,
+          )
         }
       }
 

packages/revisions/src/Infra/Redis/RedisTransitionRepository.ts

@@ -3,10 +3,25 @@ import * as IORedis from 'ioredis'
 import { TransitionRepositoryInterface } from '../../Domain/Transition/TransitionRepositoryInterface'
 
 export class RedisTransitionRepository implements TransitionRepositoryInterface {
-  private readonly PREFIX = 'transition-revisions-paging-progress'
+  private readonly PREFIX = 'transition-revisions-migration-progress'
+  private readonly INTEGRITY_PREFIX = 'transition-revisions-integrity-progress'
 
   constructor(private redisClient: IORedis.Redis) {}
 
+  async getIntegrityProgress(userUuid: string): Promise<number> {
+    const progress = await this.redisClient.get(`${this.INTEGRITY_PREFIX}:${userUuid}`)
+
+    if (progress === null) {
+      return 1
+    }
+
+    return parseInt(progress)
+  }
+
+  async setIntegrityProgress(userUuid: string, progress: number): Promise<void> {
+    await this.redisClient.setex(`${this.INTEGRITY_PREFIX}:${userUuid}`, 172_800, progress.toString())
+  }
+
   async getPagingProgress(userUuid: string): Promise<number> {
     const progress = await this.redisClient.get(`${this.PREFIX}:${userUuid}`)
 

packages/revisions/src/Infra/TypeORM/SQL/SQLLegacyRevisionRepository.ts

@@ -30,7 +30,7 @@ export class SQLLegacyRevisionRepository implements RevisionRepositoryInterface
     const queryBuilder = this.ormRepository
       .createQueryBuilder('revision')
       .where('revision.user_uuid = :userUuid', { userUuid: dto.userUuid.value })
-      .orderBy('revision.uuid', 'ASC')
+      .orderBy('revision.created_at', 'ASC')
 
     if (dto.offset !== undefined) {
       queryBuilder.skip(dto.offset)

packages/scheduler/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.21.2](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.21.1...@standardnotes/scheduler-server@1.21.2) (2023-09-28)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
+## [1.21.1](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.21.0...@standardnotes/scheduler-server@1.21.1) (2023-09-27)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
 # [1.21.0](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.20.56...@standardnotes/scheduler-server@1.21.0) (2023-09-26)
 
 ### Features

packages/scheduler/package.json

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

packages/security/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.15.0](https://github.com/standardnotes/server/compare/@standardnotes/security@1.14.0...@standardnotes/security@1.15.0) (2023-09-28)
+
+### Features
+
+* block file operations during transition ([#856](https://github.com/standardnotes/server/issues/856)) ([676cf36](https://github.com/standardnotes/server/commit/676cf36f8d769aa433880b2800f0457d06fbbf14))
+
 # [1.14.0](https://github.com/standardnotes/server/compare/@standardnotes/security@1.13.1...@standardnotes/security@1.14.0) (2023-09-26)
 
 ### Features

packages/security/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/security",
-  "version": "1.14.0",
+  "version": "1.15.0",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

packages/security/src/Domain/Token/ValetTokenData.ts

@@ -11,4 +11,5 @@ export type ValetTokenData = {
   }>
   uploadBytesUsed: number
   uploadBytesLimit: number
+  ongoingTransition?: boolean
 }

packages/settings/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.21.41](https://github.com/standardnotes/server/compare/@standardnotes/settings@1.21.40...@standardnotes/settings@1.21.41) (2023-09-27)
+
+**Note:** Version bump only for package @standardnotes/settings
+
 ## [1.21.40](https://github.com/standardnotes/server/compare/@standardnotes/settings@1.21.39...@standardnotes/settings@1.21.40) (2023-09-26)
 
 **Note:** Version bump only for package @standardnotes/settings

packages/settings/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/settings",
-  "version": "1.21.40",
+  "version": "1.21.41",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

packages/syncing-server/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.110.0](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.109.2...@standardnotes/syncing-server@1.110.0) (2023-09-29)
+
+### Bug Fixes
+
+* add paging memory to integrity check ([e4ca310](https://github.com/standardnotes/syncing-server-js/commit/e4ca310707b12b1c08073a391e8857ee52acd92b))
+
+### Features
+
+* **syncing-server:** allow surviving only upon account deletion ([#857](https://github.com/standardnotes/syncing-server-js/issues/857)) ([609e85f](https://github.com/standardnotes/syncing-server-js/commit/609e85f926ebbc2887656c46df18471c68d70185))
+
+## [1.109.2](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.109.1...@standardnotes/syncing-server@1.109.2) (2023-09-28)
+
+**Note:** Version bump only for package @standardnotes/syncing-server
+
+## [1.109.1](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.109.0...@standardnotes/syncing-server@1.109.1) (2023-09-27)
+
+### Bug Fixes
+
+* removing items in a vault and notifying about designated survivor ([#855](https://github.com/standardnotes/syncing-server-js/issues/855)) ([1d06ffe](https://github.com/standardnotes/syncing-server-js/commit/1d06ffe9d51722ada7baa040e1d5ed351fc28f39))
+
 # [1.109.0](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.108.2...@standardnotes/syncing-server@1.109.0) (2023-09-26)
 
 ### Features

packages/syncing-server/package.json

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

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

@@ -899,6 +899,7 @@ export class ContainerConfigLoader {
           container.get<TimerInterface>(TYPES.Sync_Timer),
           container.get<DomainEventFactoryInterface>(TYPES.Sync_DomainEventFactory),
           container.get<DomainEventPublisherInterface>(TYPES.Sync_DomainEventPublisher),
+          container.get<AddNotificationForUser>(TYPES.Sync_AddNotificationForUser),
         ),
       )
     container

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

@@ -1,5 +1,5 @@
 import { AccountDeletionRequestedEvent, DomainEventHandlerInterface } from '@standardnotes/domain-events'
-import { RoleNameCollection } from '@standardnotes/domain-core'
+import { RoleNameCollection, Uuid } from '@standardnotes/domain-core'
 import { Logger } from 'winston'
 
 import { ItemRepositoryResolverInterface } from '../Item/ItemRepositoryResolverInterface'
@@ -15,18 +15,29 @@ export class AccountDeletionRequestedEventHandler implements DomainEventHandlerI
   ) {}
 
   async handle(event: AccountDeletionRequestedEvent): Promise<void> {
+    const userUuidOrError = Uuid.create(event.payload.userUuid)
+    if (userUuidOrError.isFailed()) {
+      this.logger.error(`AccountDeletionRequestedEventHandler failed: ${userUuidOrError.getError()}`)
+
+      return
+    }
+    const userUuid = userUuidOrError.getValue()
+
     const roleNamesOrError = RoleNameCollection.create(event.payload.roleNames)
     if (roleNamesOrError.isFailed()) {
+      this.logger.error(`AccountDeletionRequestedEventHandler failed: ${roleNamesOrError.getError()}`)
+
       return
     }
     const roleNames = roleNamesOrError.getValue()
 
     const itemRepository = this.itemRepositoryResolver.resolve(roleNames)
 
-    await itemRepository.deleteByUserUuid(event.payload.userUuid)
+    await itemRepository.deleteByUserUuidAndNotInSharedVault(userUuid)
 
     const deletingVaultsResult = await this.deleteSharedVaults.execute({
       ownerUuid: event.payload.userUuid,
+      allowSurviving: true,
     })
     if (deletingVaultsResult.isFailed()) {
       this.logger.error(
@@ -34,6 +45,16 @@ export class AccountDeletionRequestedEventHandler implements DomainEventHandlerI
       )
     }
 
+    const deletedSharedVaultUuids = Array.from(deletingVaultsResult.getValue().keys())
+
+    this.logger.debug(
+      `Deleting items from shared vaults: ${deletedSharedVaultUuids.map((uuid) => uuid.value).join(', ')}`,
+    )
+
+    if (deletedSharedVaultUuids.length !== 0) {
+      await itemRepository.deleteByUserUuidInSharedVaults(userUuid, deletedSharedVaultUuids)
+    }
+
     const deletingUserFromOtherVaultsResult = await this.removeUserFromSharedVaults.execute({
       userUuid: event.payload.userUuid,
     })

packages/syncing-server/src/Domain/Item/ItemRepositoryInterface.ts

@@ -6,7 +6,8 @@ import { ExtendedIntegrityPayload } from './ExtendedIntegrityPayload'
 import { ItemContentSizeDescriptor } from './ItemContentSizeDescriptor'
 
 export interface ItemRepositoryInterface {
-  deleteByUserUuid(userUuid: string): Promise<void>
+  deleteByUserUuidAndNotInSharedVault(userUuid: Uuid): Promise<void>
+  deleteByUserUuidInSharedVaults(userUuid: Uuid, sharedVaultUuids: Uuid[]): Promise<void>
   findAll(query: ItemQuery): Promise<Item[]>
   countAll(query: ItemQuery): Promise<number>
   findContentSizeForComputingTransferLimit(query: ItemQuery): Promise<Array<ItemContentSizeDescriptor>>

packages/syncing-server/src/Domain/Transition/TransitionRepositoryInterface.ts

@@ -1,4 +1,6 @@
 export interface TransitionRepositoryInterface {
   getPagingProgress(userUuid: string): Promise<number>
   setPagingProgress(userUuid: string, progress: number): Promise<void>
+  getIntegrityProgress(userUuid: string): Promise<number>
+  setIntegrityProgress(userUuid: string, progress: number): Promise<void>
 }

packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVault/DeleteSharedVault.spec.ts

@@ -96,6 +96,7 @@ describe('DeleteSharedVault', () => {
     const result = await useCase.execute({
       sharedVaultUuid: '00000000-0000-0000-0000-000000000000',
       originatorUuid: '00000000-0000-0000-0000-000000000000',
+      allowSurviving: false,
     })
 
     expect(result.isFailed()).toBeFalsy()
@@ -111,6 +112,7 @@ describe('DeleteSharedVault', () => {
     const result = await useCase.execute({
       sharedVaultUuid: '00000000-0000-0000-0000-000000000000',
       originatorUuid: '00000000-0000-0000-0000-000000000000',
+      allowSurviving: false,
     })
 
     expect(result.isFailed()).toBeTruthy()
@@ -125,6 +127,7 @@ describe('DeleteSharedVault', () => {
     const result = await useCase.execute({
       sharedVaultUuid: 'invalid',
       originatorUuid: '00000000-0000-0000-0000-000000000000',
+      allowSurviving: false,
     })
 
     expect(result.isFailed()).toBeTruthy()
@@ -139,6 +142,7 @@ describe('DeleteSharedVault', () => {
     const result = await useCase.execute({
       sharedVaultUuid: '00000000-0000-0000-0000-000000000000',
       originatorUuid: 'invalid',
+      allowSurviving: false,
     })
 
     expect(result.isFailed()).toBeTruthy()
@@ -159,6 +163,7 @@ describe('DeleteSharedVault', () => {
     const result = await useCase.execute({
       sharedVaultUuid: '00000000-0000-0000-0000-000000000000',
       originatorUuid: '00000000-0000-0000-0000-000000000000',
+      allowSurviving: false,
     })
 
     expect(result.isFailed()).toBeTruthy()
@@ -174,6 +179,7 @@ describe('DeleteSharedVault', () => {
     const result = await useCase.execute({
       sharedVaultUuid: '00000000-0000-0000-0000-000000000000',
       originatorUuid: '00000000-0000-0000-0000-000000000000',
+      allowSurviving: false,
     })
 
     expect(result.isFailed()).toBeTruthy()
@@ -188,6 +194,7 @@ describe('DeleteSharedVault', () => {
     const result = await useCase.execute({
       sharedVaultUuid: '00000000-0000-0000-0000-000000000000',
       originatorUuid: '00000000-0000-0000-0000-000000000000',
+      allowSurviving: false,
     })
 
     expect(result.isFailed()).toBeTruthy()
@@ -207,6 +214,7 @@ describe('DeleteSharedVault', () => {
       const result = await useCase.execute({
         sharedVaultUuid: '00000000-0000-0000-0000-000000000000',
         originatorUuid: '00000000-0000-0000-0000-000000000000',
+        allowSurviving: true,
       })
 
       expect(result.isFailed()).toBeFalsy()
@@ -223,6 +231,7 @@ describe('DeleteSharedVault', () => {
       const result = await useCase.execute({
         sharedVaultUuid: '00000000-0000-0000-0000-000000000000',
         originatorUuid: '00000000-0000-0000-0000-000000000000',
+        allowSurviving: true,
       })
 
       expect(result.isFailed()).toBeTruthy()
@@ -239,6 +248,7 @@ describe('DeleteSharedVault', () => {
       const result = await useCase.execute({
         sharedVaultUuid: '00000000-0000-0000-0000-000000000000',
         originatorUuid: '00000000-0000-0000-0000-000000000000',
+        allowSurviving: true,
       })
 
       expect(result.isFailed()).toBeTruthy()

packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVault/DeleteSharedVault.ts

@@ -10,7 +10,7 @@ import { CancelInviteToSharedVault } from '../CancelInviteToSharedVault/CancelIn
 import { DomainEventFactoryInterface } from '../../../Event/DomainEventFactoryInterface'
 import { TransferSharedVault } from '../TransferSharedVault/TransferSharedVault'
 
-export class DeleteSharedVault implements UseCaseInterface<void> {
+export class DeleteSharedVault implements UseCaseInterface<{ status: 'deleted' | 'transitioned' }> {
   constructor(
     private sharedVaultRepository: SharedVaultRepositoryInterface,
     private sharedVaultUserRepository: SharedVaultUserRepositoryInterface,
@@ -22,7 +22,7 @@ export class DeleteSharedVault implements UseCaseInterface<void> {
     private transferSharedVault: TransferSharedVault,
   ) {}
 
-  async execute(dto: DeleteSharedVaultDTO): Promise<Result<void>> {
+  async execute(dto: DeleteSharedVaultDTO): Promise<Result<{ status: 'deleted' | 'transitioned' }>> {
     const originatorUuidOrError = Uuid.create(dto.originatorUuid)
     if (originatorUuidOrError.isFailed()) {
       return Result.fail(originatorUuidOrError.getError())
@@ -56,30 +56,32 @@ export class DeleteSharedVault implements UseCaseInterface<void> {
       }
     }
 
-    const sharedVaultDesignatedSurvivor =
+    if (dto.allowSurviving) {
-      await this.sharedVaultUserRepository.findDesignatedSurvivorBySharedVaultUuid(sharedVaultUuid)
+      const sharedVaultDesignatedSurvivor =
-    if (sharedVaultDesignatedSurvivor) {
+        await this.sharedVaultUserRepository.findDesignatedSurvivorBySharedVaultUuid(sharedVaultUuid)
-      const result = await this.transferSharedVault.execute({
+      if (sharedVaultDesignatedSurvivor) {
-        sharedVaultUid: sharedVaultUuid.value,
+        const result = await this.transferSharedVault.execute({
-        fromUserUuid: originatorUuid.value,
+          sharedVaultUid: sharedVaultUuid.value,
-        toUserUuid: sharedVaultDesignatedSurvivor.props.userUuid.value,
+          fromUserUuid: originatorUuid.value,
-      })
+          toUserUuid: sharedVaultDesignatedSurvivor.props.userUuid.value,
+        })
 
-      if (result.isFailed()) {
+        if (result.isFailed()) {
-        return Result.fail(result.getError())
+          return Result.fail(result.getError())
+        }
+
+        const removingOwnerFromSharedVaultResult = await this.removeUserFromSharedVault.execute({
+          originatorUuid: originatorUuid.value,
+          sharedVaultUuid: sharedVaultUuid.value,
+          userUuid: originatorUuid.value,
+          forceRemoveOwner: true,
+        })
+        if (removingOwnerFromSharedVaultResult.isFailed()) {
+          return Result.fail(removingOwnerFromSharedVaultResult.getError())
+        }
+
+        return Result.ok({ status: 'transitioned' })
       }
-
-      const removingOwnerFromSharedVaultResult = await this.removeUserFromSharedVault.execute({
-        originatorUuid: originatorUuid.value,
-        sharedVaultUuid: sharedVaultUuid.value,
-        userUuid: originatorUuid.value,
-        forceRemoveOwner: true,
-      })
-      if (removingOwnerFromSharedVaultResult.isFailed()) {
-        return Result.fail(removingOwnerFromSharedVaultResult.getError())
-      }
-
-      return Result.ok()
     }
 
     const sharedVaultUsers = await this.sharedVaultUserRepository.findBySharedVaultUuid(sharedVaultUuid)
@@ -105,6 +107,6 @@ export class DeleteSharedVault implements UseCaseInterface<void> {
       }),
     )
 
-    return Result.ok()
+    return Result.ok({ status: 'deleted' })
   }
 }

packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVault/DeleteSharedVaultDTO.ts

@@ -1,4 +1,5 @@
 export interface DeleteSharedVaultDTO {
   originatorUuid: string
   sharedVaultUuid: string
+  allowSurviving: boolean
 }

packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVaults/DeleteSharedVaults.spec.ts

@@ -24,7 +24,7 @@ describe('DeleteSharedVaults', () => {
     sharedVaultRepository.findByUserUuid = jest.fn().mockResolvedValue([sharedVault])
 
     deleteSharedVaultUseCase = {} as jest.Mocked<DeleteSharedVault>
-    deleteSharedVaultUseCase.execute = jest.fn().mockResolvedValue(Result.ok())
+    deleteSharedVaultUseCase.execute = jest.fn().mockResolvedValue(Result.ok({ status: 'deleted' }))
   })
 
   it('should delete all shared vaults for a user', async () => {
@@ -32,6 +32,7 @@ describe('DeleteSharedVaults', () => {
 
     const result = await useCase.execute({
       ownerUuid: '00000000-0000-0000-0000-000000000000',
+      allowSurviving: true,
     })
 
     expect(result.isFailed()).toBe(false)
@@ -39,6 +40,7 @@ describe('DeleteSharedVaults', () => {
     expect(deleteSharedVaultUseCase.execute).toHaveBeenCalledWith({
       originatorUuid: '00000000-0000-0000-0000-000000000000',
       sharedVaultUuid: '00000000-0000-0000-0000-000000000000',
+      allowSurviving: true,
     })
   })
 
@@ -48,6 +50,7 @@ describe('DeleteSharedVaults', () => {
 
     const result = await useCase.execute({
       ownerUuid: '00000000-0000-0000-0000-000000000000',
+      allowSurviving: true,
     })
 
     expect(result.isFailed()).toBe(true)
@@ -55,6 +58,7 @@ describe('DeleteSharedVaults', () => {
     expect(deleteSharedVaultUseCase.execute).toHaveBeenCalledWith({
       originatorUuid: '00000000-0000-0000-0000-000000000000',
       sharedVaultUuid: '00000000-0000-0000-0000-000000000000',
+      allowSurviving: true,
     })
   })
 
@@ -63,6 +67,7 @@ describe('DeleteSharedVaults', () => {
 
     const result = await useCase.execute({
       ownerUuid: 'invalid',
+      allowSurviving: true,
     })
 
     expect(result.isFailed()).toBeTruthy()

packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVaults/DeleteSharedVaults.ts

@@ -4,13 +4,13 @@ import { DeleteSharedVaultsDTO } from './DeleteSharedVaultsDTO'
 import { DeleteSharedVault } from '../DeleteSharedVault/DeleteSharedVault'
 import { SharedVaultRepositoryInterface } from '../../../SharedVault/SharedVaultRepositoryInterface'
 
-export class DeleteSharedVaults implements UseCaseInterface<void> {
+export class DeleteSharedVaults implements UseCaseInterface<Map<Uuid, 'deleted' | 'transitioned'>> {
   constructor(
     private sharedVaultRepository: SharedVaultRepositoryInterface,
     private deleteSharedVaultUseCase: DeleteSharedVault,
   ) {}
 
-  async execute(dto: DeleteSharedVaultsDTO): Promise<Result<void>> {
+  async execute(dto: DeleteSharedVaultsDTO): Promise<Result<Map<Uuid, 'deleted' | 'transitioned'>>> {
     const ownerUuidOrError = Uuid.create(dto.ownerUuid)
     if (ownerUuidOrError.isFailed()) {
       return Result.fail(ownerUuidOrError.getError())
@@ -19,16 +19,20 @@ export class DeleteSharedVaults implements UseCaseInterface<void> {
 
     const sharedVaults = await this.sharedVaultRepository.findByUserUuid(ownerUuid)
 
+    const results = new Map<Uuid, 'deleted' | 'transitioned'>()
     for (const sharedVault of sharedVaults) {
       const result = await this.deleteSharedVaultUseCase.execute({
         originatorUuid: ownerUuid.value,
         sharedVaultUuid: sharedVault.id.toString(),
+        allowSurviving: dto.allowSurviving,
       })
       if (result.isFailed()) {
         return Result.fail(result.getError())
       }
+
+      results.set(sharedVault.uuid, result.getValue().status)
     }
 
-    return Result.ok()
+    return Result.ok(results)
   }
 }

packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVaults/DeleteSharedVaultsDTO.ts

@@ -1,3 +1,4 @@
 export interface DeleteSharedVaultsDTO {
   ownerUuid: string
+  allowSurviving: boolean
 }

packages/syncing-server/src/Domain/UseCase/SharedVaults/DesignateSurvivor/DesignateSurvivor.spec.ts

@@ -1,4 +1,11 @@
-import { SharedVaultUser, SharedVaultUserPermission, Timestamps, Uuid } from '@standardnotes/domain-core'
+import {
+  NotificationPayload,
+  Result,
+  SharedVaultUser,
+  SharedVaultUserPermission,
+  Timestamps,
+  Uuid,
+} from '@standardnotes/domain-core'
 
 import { SharedVaultUserRepositoryInterface } from '../../../SharedVault/User/SharedVaultUserRepositoryInterface'
 import { DesignateSurvivor } from './DesignateSurvivor'
@@ -7,6 +14,7 @@ import { DomainEventInterface, DomainEventPublisherInterface } from '@standardno
 import { DomainEventFactoryInterface } from '../../../Event/DomainEventFactoryInterface'
 import { SharedVault } from '../../../SharedVault/SharedVault'
 import { SharedVaultRepositoryInterface } from '../../../SharedVault/SharedVaultRepositoryInterface'
+import { AddNotificationForUser } from '../../Messaging/AddNotificationForUser/AddNotificationForUser'
 
 describe('DesignateSurvivor', () => {
   let sharedVault: SharedVault
@@ -17,6 +25,7 @@ describe('DesignateSurvivor', () => {
   let timer: TimerInterface
   let domainEventFactory: DomainEventFactoryInterface
   let domainEventPublisher: DomainEventPublisherInterface
+  let addNotificationForUser: AddNotificationForUser
 
   const createUseCase = () =>
     new DesignateSurvivor(
@@ -25,6 +34,7 @@ describe('DesignateSurvivor', () => {
       timer,
       domainEventFactory,
       domainEventPublisher,
+      addNotificationForUser,
     )
 
   beforeEach(() => {
@@ -68,6 +78,9 @@ describe('DesignateSurvivor', () => {
 
     domainEventPublisher = {} as jest.Mocked<DomainEventPublisherInterface>
     domainEventPublisher.publish = jest.fn()
+
+    addNotificationForUser = {} as jest.Mocked<AddNotificationForUser>
+    addNotificationForUser.execute = jest.fn().mockReturnValue(Result.ok())
   })
 
   it('should fail if shared vault uuid is invalid', async () => {
@@ -189,4 +202,39 @@ describe('DesignateSurvivor', () => {
     expect(sharedVaultUser.props.isDesignatedSurvivor).toBe(true)
     expect(sharedVaultUserRepository.save).toBeCalledTimes(2)
   })
+
+  it('should fail if it fails to add notification for user', async () => {
+    sharedVaultUserRepository.findBySharedVaultUuid = jest.fn().mockReturnValue([sharedVaultOwner, sharedVaultUser])
+
+    addNotificationForUser.execute = jest.fn().mockReturnValue(Result.fail('Failed to add notification'))
+
+    const useCase = createUseCase()
+
+    const result = await useCase.execute({
+      sharedVaultUuid: '00000000-0000-0000-0000-000000000000',
+      userUuid: '00000000-0000-0000-0000-000000000000',
+      originatorUuid: '00000000-0000-0000-0000-000000000002',
+    })
+
+    expect(result.isFailed()).toBe(true)
+  })
+
+  it('should fail if it fails to create notification payload', async () => {
+    sharedVaultUserRepository.findBySharedVaultUuid = jest.fn().mockReturnValue([sharedVaultOwner, sharedVaultUser])
+
+    const mock = jest.spyOn(NotificationPayload, 'create')
+    mock.mockReturnValue(Result.fail('Oops'))
+
+    const useCase = createUseCase()
+
+    const result = await useCase.execute({
+      sharedVaultUuid: '00000000-0000-0000-0000-000000000000',
+      userUuid: '00000000-0000-0000-0000-000000000000',
+      originatorUuid: '00000000-0000-0000-0000-000000000002',
+    })
+
+    expect(result.isFailed()).toBe(true)
+
+    mock.mockRestore()
+  })
 })

packages/syncing-server/src/Domain/UseCase/SharedVaults/DesignateSurvivor/DesignateSurvivor.ts

@@ -1,6 +1,9 @@
 import { TimerInterface } from '@standardnotes/time'
 import { DomainEventPublisherInterface } from '@standardnotes/domain-events'
 import {
+  NotificationPayload,
+  NotificationPayloadIdentifierType,
+  NotificationType,
   Result,
   SharedVaultUser,
   SharedVaultUserPermission,
@@ -13,6 +16,7 @@ import { SharedVaultUserRepositoryInterface } from '../../../SharedVault/User/Sh
 import { DesignateSurvivorDTO } from './DesignateSurvivorDTO'
 import { DomainEventFactoryInterface } from '../../../Event/DomainEventFactoryInterface'
 import { SharedVaultRepositoryInterface } from '../../../SharedVault/SharedVaultRepositoryInterface'
+import { AddNotificationForUser } from '../../Messaging/AddNotificationForUser/AddNotificationForUser'
 
 export class DesignateSurvivor implements UseCaseInterface<void> {
   constructor(
@@ -21,6 +25,7 @@ export class DesignateSurvivor implements UseCaseInterface<void> {
     private timer: TimerInterface,
     private domainEventFactory: DomainEventFactoryInterface,
     private domainEventPublisher: DomainEventPublisherInterface,
+    private addNotificationForUser: AddNotificationForUser,
   ) {}
 
   async execute(dto: DesignateSurvivorDTO): Promise<Result<void>> {
@@ -91,6 +96,13 @@ export class DesignateSurvivor implements UseCaseInterface<void> {
 
     await this.sharedVaultUserRepository.save(toBeDesignatedAsASurvivor)
 
+    sharedVault.props.timestamps = Timestamps.create(
+      sharedVault.props.timestamps.createdAt,
+      this.timer.getTimestampInMicroseconds(),
+    ).getValue()
+
+    await this.sharedVaultRepository.save(sharedVault)
+
     await this.domainEventPublisher.publish(
       this.domainEventFactory.createUserDesignatedAsSurvivorInSharedVaultEvent({
         sharedVaultUuid: sharedVaultUuid.value,
@@ -99,12 +111,32 @@ export class DesignateSurvivor implements UseCaseInterface<void> {
       }),
     )
 
-    sharedVault.props.timestamps = Timestamps.create(
+    const notificationPayloadOrError = NotificationPayload.create({
-      sharedVault.props.timestamps.createdAt,
+      primaryIdentifier: sharedVault.uuid,
-      this.timer.getTimestampInMicroseconds(),
+      primaryIndentifierType: NotificationPayloadIdentifierType.create(
-    ).getValue()
+        NotificationPayloadIdentifierType.TYPES.SharedVaultUuid,
+      ).getValue(),
+      secondaryIdentifier: userUuid,
+      secondaryIdentifierType: NotificationPayloadIdentifierType.create(
+        NotificationPayloadIdentifierType.TYPES.UserUuid,
+      ).getValue(),
+      type: NotificationType.create(NotificationType.TYPES.UserDesignatedAsSurvivor).getValue(),
+      version: '1.0',
+    })
+    if (notificationPayloadOrError.isFailed()) {
+      return Result.fail(notificationPayloadOrError.getError())
+    }
+    const notificationPayload = notificationPayloadOrError.getValue()
 
-    await this.sharedVaultRepository.save(sharedVault)
+    const result = await this.addNotificationForUser.execute({
+      userUuid: sharedVault.props.userUuid.value,
+      type: NotificationType.TYPES.UserDesignatedAsSurvivor,
+      payload: notificationPayload,
+      version: '1.0',
+    })
+    if (result.isFailed()) {
+      return Result.fail(result.getError())
+    }
 
     return Result.ok()
   }

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

@@ -43,7 +43,6 @@ export class TransitionItemsFromPrimaryToSecondaryDatabaseForUser implements Use
     if (migrationResult.isFailed()) {
       return Result.fail(migrationResult.getError())
     }
-    const itemsToSkipInIntegrityCheck = migrationResult.getValue()
 
     this.logger.info(`[${dto.userUuid}] Items migrated`)
 
@@ -51,11 +50,11 @@ export class TransitionItemsFromPrimaryToSecondaryDatabaseForUser implements Use
 
     this.logger.info(`[${dto.userUuid}] Checking integrity between primary and secondary database`)
 
-    const integrityCheckResult = await this.checkIntegrityBetweenPrimaryAndSecondaryDatabase(
+    const integrityCheckResult = await this.checkIntegrityBetweenPrimaryAndSecondaryDatabase(userUuid)
-      userUuid,
-      itemsToSkipInIntegrityCheck,
-    )
     if (integrityCheckResult.isFailed()) {
+      await (this.transitionStatusRepository as TransitionRepositoryInterface).setPagingProgress(userUuid.value, 1)
+      await (this.transitionStatusRepository as TransitionRepositoryInterface).setIntegrityProgress(userUuid.value, 1)
+
       return Result.fail(integrityCheckResult.getError())
     }
 
@@ -81,7 +80,7 @@ export class TransitionItemsFromPrimaryToSecondaryDatabaseForUser implements Use
     await this.timer.sleep(twoSecondsInMilliseconds)
   }
 
-  private async migrateItemsForUser(userUuid: Uuid): Promise<Result<string[]>> {
+  private async migrateItemsForUser(userUuid: Uuid): Promise<Result<void>> {
     try {
       const initialPage = await (this.transitionStatusRepository as TransitionRepositoryInterface).getPagingProgress(
         userUuid.value,
@@ -91,7 +90,6 @@ export class TransitionItemsFromPrimaryToSecondaryDatabaseForUser implements Use
 
       const totalItemsCountForUser = await this.primaryItemRepository.countAll({ userUuid: userUuid.value })
       const totalPages = Math.ceil(totalItemsCountForUser / this.pageSize)
-      const itemsToSkipInIntegrityCheck = []
       for (let currentPage = initialPage; currentPage <= totalPages; currentPage++) {
         await (this.transitionStatusRepository as TransitionRepositoryInterface).setPagingProgress(
           userUuid.value,
@@ -102,7 +100,7 @@ export class TransitionItemsFromPrimaryToSecondaryDatabaseForUser implements Use
           userUuid: userUuid.value,
           offset: (currentPage - 1) * this.pageSize,
           limit: this.pageSize,
-          sortBy: 'uuid',
+          sortBy: 'created_at_timestamp',
           sortOrder: 'ASC',
         }
 
@@ -120,7 +118,6 @@ export class TransitionItemsFromPrimaryToSecondaryDatabaseForUser implements Use
               }
               if (itemInSecondary.props.timestamps.updatedAt > item.props.timestamps.updatedAt) {
                 this.logger.info(`[${userUuid.value}] Item ${item.uuid.value} is older than item in secondary database`)
-                itemsToSkipInIntegrityCheck.push(item.uuid.value)
 
                 continue
               }
@@ -143,7 +140,7 @@ export class TransitionItemsFromPrimaryToSecondaryDatabaseForUser implements Use
         }
       }
 
-      return Result.ok(itemsToSkipInIntegrityCheck)
+      return Result.ok()
     } catch (error) {
       return Result.fail((error as Error).message)
     }
@@ -153,7 +150,7 @@ export class TransitionItemsFromPrimaryToSecondaryDatabaseForUser implements Use
     try {
       this.logger.info(`[${userUuid.value}] Cleaning up primary database items`)
 
-      await itemRepository.deleteByUserUuid(userUuid.value)
+      await itemRepository.deleteByUserUuidAndNotInSharedVault(userUuid)
 
       return Result.ok()
     } catch (error) {
@@ -161,11 +158,14 @@ export class TransitionItemsFromPrimaryToSecondaryDatabaseForUser implements Use
     }
   }
 
-  private async checkIntegrityBetweenPrimaryAndSecondaryDatabase(
+  private async checkIntegrityBetweenPrimaryAndSecondaryDatabase(userUuid: Uuid): Promise<Result<boolean>> {
-    userUuid: Uuid,
-    itemsToSkipInIntegrityCheck: string[],
-  ): Promise<Result<boolean>> {
     try {
+      const initialPage = await (this.transitionStatusRepository as TransitionRepositoryInterface).getIntegrityProgress(
+        userUuid.value,
+      )
+
+      this.logger.info(`[${userUuid.value}] Checking integrity from page ${initialPage}`)
+
       const totalItemsCountForUserInPrimary = await this.primaryItemRepository.countAll({ userUuid: userUuid.value })
       const totalItemsCountForUserInSecondary = await (
         this.secondaryItemRepository as ItemRepositoryInterface
@@ -180,12 +180,17 @@ export class TransitionItemsFromPrimaryToSecondaryDatabaseForUser implements Use
       }
 
       const totalPages = Math.ceil(totalItemsCountForUserInPrimary / this.pageSize)
-      for (let currentPage = 1; currentPage <= totalPages; currentPage++) {
+      for (let currentPage = initialPage; currentPage <= totalPages; currentPage++) {
+        await (this.transitionStatusRepository as TransitionRepositoryInterface).setIntegrityProgress(
+          userUuid.value,
+          currentPage,
+        )
+
         const query: ItemQuery = {
           userUuid: userUuid.value,
           offset: (currentPage - 1) * this.pageSize,
           limit: this.pageSize,
-          sortBy: 'uuid',
+          sortBy: 'created_at_timestamp',
           sortOrder: 'ASC',
         }
 
@@ -197,19 +202,25 @@ export class TransitionItemsFromPrimaryToSecondaryDatabaseForUser implements Use
             return Result.fail(`Item ${item.uuid.value} not found in secondary database`)
           }
 
-          if (itemsToSkipInIntegrityCheck.includes(item.id.toString())) {
+          if (item.isIdenticalTo(itemInSecondary)) {
             continue
           }
 
-          if (!item.isIdenticalTo(itemInSecondary)) {
+          if (itemInSecondary.props.timestamps.updatedAt > item.props.timestamps.updatedAt) {
-            return Result.fail(
+            this.logger.info(
-              `Item ${
+              `[${userUuid.value}] Integrity check of Item ${item.uuid.value} - is older than item in secondary database`,
-                item.uuid.value
-              } is not identical in primary and secondary database. Item in primary database: ${JSON.stringify(
-                item,
-              )}, item in secondary database: ${JSON.stringify(itemInSecondary)}`,
             )
+
+            continue
           }
+
+          return Result.fail(
+            `Item ${
+              item.uuid.value
+            } is not identical in primary and secondary database. Item in primary database: ${JSON.stringify(
+              item,
+            )}, item in secondary database: ${JSON.stringify(itemInSecondary)}`,
+          )
         }
       }
 

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

@@ -92,6 +92,7 @@ export class BaseSharedVaultsController extends BaseHttpController {
     const result = await this.deleteSharedVaultUseCase.execute({
       sharedVaultUuid: request.params.sharedVaultUuid,
       originatorUuid: response.locals.user.uuid,
+      allowSurviving: false,
     })
 
     if (result.isFailed()) {

packages/syncing-server/src/Infra/Redis/RedisTransitionRepository.ts

@@ -3,10 +3,25 @@ import * as IORedis from 'ioredis'
 import { TransitionRepositoryInterface } from '../../Domain/Transition/TransitionRepositoryInterface'
 
 export class RedisTransitionRepository implements TransitionRepositoryInterface {
-  private readonly PREFIX = 'transition-items-paging-progress'
+  private readonly PREFIX = 'transition-items-migration-progress'
+  private readonly INTEGRITY_PREFIX = 'transition-items-integrity-progress'
 
   constructor(private redisClient: IORedis.Redis) {}
 
+  async getIntegrityProgress(userUuid: string): Promise<number> {
+    const progress = await this.redisClient.get(`${this.INTEGRITY_PREFIX}:${userUuid}`)
+
+    if (progress === null) {
+      return 1
+    }
+
+    return parseInt(progress)
+  }
+
+  async setIntegrityProgress(userUuid: string, progress: number): Promise<void> {
+    await this.redisClient.setex(`${this.INTEGRITY_PREFIX}:${userUuid}`, 172_800, progress.toString())
+  }
+
   async getPagingProgress(userUuid: string): Promise<number> {
     const progress = await this.redisClient.get(`${this.PREFIX}:${userUuid}`)
 

packages/syncing-server/src/Infra/TypeORM/MongoDBItemRepository.ts

@@ -17,6 +17,15 @@ export class MongoDBItemRepository implements ItemRepositoryInterface {
     private logger: Logger,
   ) {}
 
+  async deleteByUserUuidInSharedVaults(userUuid: Uuid, sharedVaultUuids: Uuid[]): Promise<void> {
+    await this.mongoRepository.deleteMany({
+      $and: [
+        { userUuid: { $eq: userUuid.value } },
+        { sharedVaultUuid: { $in: sharedVaultUuids.map((uuid) => uuid.value) } },
+      ],
+    })
+  }
+
   async updateSharedVaultOwner(dto: { sharedVaultUuid: Uuid; fromOwnerUuid: Uuid; toOwnerUuid: Uuid }): Promise<void> {
     await this.mongoRepository.updateMany(
       {
@@ -37,8 +46,10 @@ export class MongoDBItemRepository implements ItemRepositoryInterface {
     await this.mongoRepository.deleteOne({ _id: { $eq: BSON.UUID.createFromHexString(uuid.value) } })
   }
 
-  async deleteByUserUuid(userUuid: string): Promise<void> {
+  async deleteByUserUuidAndNotInSharedVault(userUuid: Uuid): Promise<void> {
-    await this.mongoRepository.deleteMany({ userUuid })
+    await this.mongoRepository.deleteMany({
+      $and: [{ userUuid: { $eq: userUuid.value } }, { sharedVaultUuid: { $eq: null } }],
+    })
   }
 
   async findAll(query: ItemQuery): Promise<Item[]> {

packages/syncing-server/src/Infra/TypeORM/SQLItemRepository.ts

@@ -16,6 +16,28 @@ export class SQLItemRepository extends SQLLegacyItemRepository {
     super(ormRepository, mapper, logger)
   }
 
+  override async deleteByUserUuidInSharedVaults(userUuid: Uuid, sharedVaultUuids: Uuid[]): Promise<void> {
+    await this.ormRepository
+      .createQueryBuilder('item')
+      .delete()
+      .from('items')
+      .where('user_uuid = :userUuid', { userUuid: userUuid.value })
+      .andWhere('shared_vault_uuid IN (:...sharedVaultUuids)', {
+        sharedVaultUuids: sharedVaultUuids.map((uuid) => uuid.value),
+      })
+      .execute()
+  }
+
+  override async deleteByUserUuidAndNotInSharedVault(userUuid: Uuid): Promise<void> {
+    await this.ormRepository
+      .createQueryBuilder('item')
+      .delete()
+      .from('items')
+      .where('user_uuid = :userUuid', { userUuid: userUuid.value })
+      .andWhere('shared_vault_uuid IS NULL')
+      .execute()
+  }
+
   override async updateSharedVaultOwner(dto: {
     sharedVaultUuid: Uuid
     fromOwnerUuid: Uuid

packages/syncing-server/src/Infra/TypeORM/SQLLegacyItemRepository.ts

@@ -16,6 +16,10 @@ export class SQLLegacyItemRepository implements ItemRepositoryInterface {
     protected logger: Logger,
   ) {}
 
+  async deleteByUserUuidInSharedVaults(_userUuid: Uuid, _sharedVaultUuids: Uuid[]): Promise<void> {
+    this.logger.error('Method deleteByUserUuidInSharedVaults not supported.')
+  }
+
   async updateSharedVaultOwner(_dto: { sharedVaultUuid: Uuid; fromOwnerUuid: Uuid; toOwnerUuid: Uuid }): Promise<void> {
     this.logger.error('Method updateSharedVaultOwner not supported.')
   }
@@ -80,12 +84,12 @@ export class SQLLegacyItemRepository implements ItemRepositoryInterface {
     return itemContentSizeDescriptors
   }
 
-  async deleteByUserUuid(userUuid: string): Promise<void> {
+  async deleteByUserUuidAndNotInSharedVault(userUuid: Uuid): Promise<void> {
     await this.ormRepository
       .createQueryBuilder('item')
       .delete()
       .from('items')
-      .where('user_uuid = :userUuid', { userUuid })
+      .where('user_uuid = :userUuid', { userUuid: userUuid.value })
       .execute()
   }
 

packages/time/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.17.0](https://github.com/standardnotes/server/compare/@standardnotes/time@1.16.0...@standardnotes/time@1.17.0) (2023-09-28)
+
+### Features
+
+* block file operations during transition ([#856](https://github.com/standardnotes/server/issues/856)) ([676cf36](https://github.com/standardnotes/server/commit/676cf36f8d769aa433880b2800f0457d06fbbf14))
+
 # [1.16.0](https://github.com/standardnotes/server/compare/@standardnotes/time@1.15.3...@standardnotes/time@1.16.0) (2023-09-26)
 
 ### Features

packages/time/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/time",
-  "version": "1.16.0",
+  "version": "1.17.0",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

packages/time/src/Domain/Time/Timer.spec.ts

@@ -76,6 +76,11 @@ describe('Timer', () => {
     expect(isoString).toEqual('2021-03-29T08:00:05.000Z')
   })
 
+  it('should convert a date to formatted string', () => {
+    const isoString = createTimer().convertDateToFormattedString(new Date(Date.UTC(2021, 2, 29, 8, 0, 5)), 'YYYY-MM-DD')
+    expect(isoString).toEqual('2021-03-29')
+  })
+
   it('should convert a string date to microseconds', () => {
     const timestamp = createTimer().convertStringDateToMicroseconds('2021-03-29 08:00:05.233Z')
     expect(timestamp).toEqual(1617004805233000)

packages/time/src/Domain/Time/Timer.ts

@@ -95,6 +95,10 @@ export class Timer implements TimerInterface {
     return dayjs.utc(date).toISOString()
   }
 
+  convertDateToFormattedString(date: Date, format: string): string {
+    return dayjs.utc(date).format(format)
+  }
+
   dateWasNDaysAgo(date: Date): number {
     return dayjs.utc().diff(date, 'days')
   }

packages/time/src/Domain/Time/TimerInterface.ts

@@ -12,6 +12,7 @@ export interface TimerInterface {
   convertDateToMilliseconds(date: Date): number
   convertDateToMicroseconds(date: Date): number
   convertDateToISOString(date: Date): string
+  convertDateToFormattedString(date: Date, format: string): string
   convertStringDateToDate(date: string): Date
   convertStringDateToMicroseconds(date: string): number
   convertStringDateToMilliseconds(date: string): number

packages/websockets/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.11.2](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.11.1...@standardnotes/websockets-server@1.11.2) (2023-09-28)
+
+**Note:** Version bump only for package @standardnotes/websockets-server
+
+## [1.11.1](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.11.0...@standardnotes/websockets-server@1.11.1) (2023-09-27)
+
+**Note:** Version bump only for package @standardnotes/websockets-server
+
 # [1.11.0](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.10.53...@standardnotes/websockets-server@1.11.0) (2023-09-26)
 
 ### Features

packages/websockets/package.json

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