diff --git a/packages/syncing-server/src/Bootstrap/Container.ts b/packages/syncing-server/src/Bootstrap/Container.ts index 040c77e7b..642d125ab 100644 --- a/packages/syncing-server/src/Bootstrap/Container.ts +++ b/packages/syncing-server/src/Bootstrap/Container.ts @@ -41,9 +41,9 @@ import { SyncResponseFactory20161215 } from '../Domain/Item/SyncResponse/SyncRes import { SyncResponseFactory20200115 } from '../Domain/Item/SyncResponse/SyncResponseFactory20200115' import { SyncResponseFactoryResolver } from '../Domain/Item/SyncResponse/SyncResponseFactoryResolver' import { SyncResponseFactoryResolverInterface } from '../Domain/Item/SyncResponse/SyncResponseFactoryResolverInterface' -import { CheckIntegrity } from '../Domain/UseCase/CheckIntegrity/CheckIntegrity' -import { GetItem } from '../Domain/UseCase/GetItem/GetItem' -import { SyncItems } from '../Domain/UseCase/SyncItems' +import { CheckIntegrity } from '../Domain/UseCase/Syncing/CheckIntegrity/CheckIntegrity' +import { GetItem } from '../Domain/UseCase/Syncing/GetItem/GetItem' +import { SyncItems } from '../Domain/UseCase/Syncing/SyncItems/SyncItems' import { InversifyExpressAuthMiddleware } from '../Infra/InversifyExpressUtils/Middleware/InversifyExpressAuthMiddleware' import { ItemConflictProjection } from '../Projection/ItemConflictProjection' import { ItemConflictProjector } from '../Projection/ItemConflictProjector' diff --git a/packages/syncing-server/src/Domain/Item/SyncResponse/SyncResponseFactory20161215.ts b/packages/syncing-server/src/Domain/Item/SyncResponse/SyncResponseFactory20161215.ts index 857fc6e5f..d26606289 100644 --- a/packages/syncing-server/src/Domain/Item/SyncResponse/SyncResponseFactory20161215.ts +++ b/packages/syncing-server/src/Domain/Item/SyncResponse/SyncResponseFactory20161215.ts @@ -1,12 +1,13 @@ +import { ConflictType } from '@standardnotes/responses' + import { ProjectorInterface } from '../../../Projection/ProjectorInterface' -import { SyncItemsResponse } from '../../UseCase/SyncItemsResponse' import { Item } from '../Item' import { ItemConflict } from '../ItemConflict' import { ItemHash } from '../ItemHash' import { ItemProjection } from '../../../Projection/ItemProjection' import { SyncResponse20161215 } from './SyncResponse20161215' import { SyncResponseFactoryInterface } from './SyncResponseFactoryInterface' -import { ConflictType } from '@standardnotes/responses' +import { SyncItemsResponse } from '../../UseCase/Syncing/SyncItems/SyncItemsResponse' export class SyncResponseFactory20161215 implements SyncResponseFactoryInterface { private readonly LEGACY_MIN_CONFLICT_INTERVAL = 20_000_000 diff --git a/packages/syncing-server/src/Domain/Item/SyncResponse/SyncResponseFactory20200115.ts b/packages/syncing-server/src/Domain/Item/SyncResponse/SyncResponseFactory20200115.ts index 67ece6f7a..8eb5960e3 100644 --- a/packages/syncing-server/src/Domain/Item/SyncResponse/SyncResponseFactory20200115.ts +++ b/packages/syncing-server/src/Domain/Item/SyncResponse/SyncResponseFactory20200115.ts @@ -1,5 +1,4 @@ import { ProjectorInterface } from '../../../Projection/ProjectorInterface' -import { SyncItemsResponse } from '../../UseCase/SyncItemsResponse' import { Item } from '../Item' import { ItemConflict } from '../ItemConflict' import { ItemConflictProjection } from '../../../Projection/ItemConflictProjection' @@ -7,6 +6,7 @@ import { ItemProjection } from '../../../Projection/ItemProjection' import { SyncResponse20200115 } from './SyncResponse20200115' import { SyncResponseFactoryInterface } from './SyncResponseFactoryInterface' import { SavedItemProjection } from '../../../Projection/SavedItemProjection' +import { SyncItemsResponse } from '../../UseCase/Syncing/SyncItems/SyncItemsResponse' export class SyncResponseFactory20200115 implements SyncResponseFactoryInterface { constructor( diff --git a/packages/syncing-server/src/Domain/Item/SyncResponse/SyncResponseFactoryInterface.ts b/packages/syncing-server/src/Domain/Item/SyncResponse/SyncResponseFactoryInterface.ts index 36cdb7edb..eb194ec47 100644 --- a/packages/syncing-server/src/Domain/Item/SyncResponse/SyncResponseFactoryInterface.ts +++ b/packages/syncing-server/src/Domain/Item/SyncResponse/SyncResponseFactoryInterface.ts @@ -1,4 +1,4 @@ -import { SyncItemsResponse } from '../../UseCase/SyncItemsResponse' +import { SyncItemsResponse } from '../../UseCase/Syncing/SyncItems/SyncItemsResponse' import { SyncResponse20161215 } from './SyncResponse20161215' import { SyncResponse20200115 } from './SyncResponse20200115' diff --git a/packages/syncing-server/src/Domain/UseCase/CreateSharedVault/CreateSharedVaultResult.ts b/packages/syncing-server/src/Domain/UseCase/CreateSharedVault/CreateSharedVaultResult.ts deleted file mode 100644 index 878f23e1b..000000000 --- a/packages/syncing-server/src/Domain/UseCase/CreateSharedVault/CreateSharedVaultResult.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { SharedVault } from '../../SharedVault/SharedVault' -import { SharedVaultUser } from '../../SharedVault/User/SharedVaultUser' - -export interface CreateSharedVaultResult { - sharedVaultUser: SharedVaultUser - sharedVault: SharedVault -} diff --git a/packages/syncing-server/src/Domain/UseCase/AddNotificationForUser/AddNotificationForUser.spec.ts b/packages/syncing-server/src/Domain/UseCase/Messaging/AddNotificationForUser/AddNotificationForUser.spec.ts similarity index 91% rename from packages/syncing-server/src/Domain/UseCase/AddNotificationForUser/AddNotificationForUser.spec.ts rename to packages/syncing-server/src/Domain/UseCase/Messaging/AddNotificationForUser/AddNotificationForUser.spec.ts index e2411f6ef..6c74c9a3b 100644 --- a/packages/syncing-server/src/Domain/UseCase/AddNotificationForUser/AddNotificationForUser.spec.ts +++ b/packages/syncing-server/src/Domain/UseCase/Messaging/AddNotificationForUser/AddNotificationForUser.spec.ts @@ -1,10 +1,10 @@ import { TimerInterface } from '@standardnotes/time' import { Result } from '@standardnotes/domain-core' -import { NotificationRepositoryInterface } from '../../Notifications/NotificationRepositoryInterface' -import { Notification } from '../../Notifications/Notification' +import { NotificationRepositoryInterface } from '../../../Notifications/NotificationRepositoryInterface' +import { Notification } from '../../../Notifications/Notification' import { AddNotificationForUser } from './AddNotificationForUser' -import { NotificationType } from '../../Notifications/NotificationType' +import { NotificationType } from '../../../Notifications/NotificationType' describe('AddNotificationForUser', () => { let notificationRepository: NotificationRepositoryInterface diff --git a/packages/syncing-server/src/Domain/UseCase/AddNotificationForUser/AddNotificationForUser.ts b/packages/syncing-server/src/Domain/UseCase/Messaging/AddNotificationForUser/AddNotificationForUser.ts similarity index 86% rename from packages/syncing-server/src/Domain/UseCase/AddNotificationForUser/AddNotificationForUser.ts rename to packages/syncing-server/src/Domain/UseCase/Messaging/AddNotificationForUser/AddNotificationForUser.ts index 10d66f2e4..a0870288c 100644 --- a/packages/syncing-server/src/Domain/UseCase/AddNotificationForUser/AddNotificationForUser.ts +++ b/packages/syncing-server/src/Domain/UseCase/Messaging/AddNotificationForUser/AddNotificationForUser.ts @@ -2,9 +2,9 @@ import { Result, Timestamps, UseCaseInterface, Uuid, Validator } from '@standard import { TimerInterface } from '@standardnotes/time' import { AddNotificationForUserDTO } from './AddNotificationForUserDTO' -import { NotificationRepositoryInterface } from '../../Notifications/NotificationRepositoryInterface' -import { Notification } from '../../Notifications/Notification' -import { NotificationType } from '../../Notifications/NotificationType' +import { NotificationRepositoryInterface } from '../../../Notifications/NotificationRepositoryInterface' +import { Notification } from '../../../Notifications/Notification' +import { NotificationType } from '../../../Notifications/NotificationType' export class AddNotificationForUser implements UseCaseInterface { constructor(private notificationRepository: NotificationRepositoryInterface, private timer: TimerInterface) {} diff --git a/packages/syncing-server/src/Domain/UseCase/AddNotificationForUser/AddNotificationForUserDTO.ts b/packages/syncing-server/src/Domain/UseCase/Messaging/AddNotificationForUser/AddNotificationForUserDTO.ts similarity index 100% rename from packages/syncing-server/src/Domain/UseCase/AddNotificationForUser/AddNotificationForUserDTO.ts rename to packages/syncing-server/src/Domain/UseCase/Messaging/AddNotificationForUser/AddNotificationForUserDTO.ts diff --git a/packages/syncing-server/src/Domain/UseCase/RemoveUserEvents/RemoveUserEvents.ts b/packages/syncing-server/src/Domain/UseCase/RemoveUserEvents/RemoveUserEvents.ts deleted file mode 100644 index cc28f4b8f..000000000 --- a/packages/syncing-server/src/Domain/UseCase/RemoveUserEvents/RemoveUserEvents.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Result, UseCaseInterface } from '@standardnotes/domain-core' - -import { RemoveUserEventsDTO } from './RemoveUserEventsDTO' - -export class RemoveUserEvents implements UseCaseInterface { - async execute(_dto: RemoveUserEventsDTO): Promise> { - throw new Error('Method not implemented.') - } -} diff --git a/packages/syncing-server/src/Domain/UseCase/RemoveUserEvents/RemoveUserEventsDTO.ts b/packages/syncing-server/src/Domain/UseCase/RemoveUserEvents/RemoveUserEventsDTO.ts deleted file mode 100644 index 8cf9dbb4e..000000000 --- a/packages/syncing-server/src/Domain/UseCase/RemoveUserEvents/RemoveUserEventsDTO.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface RemoveUserEventsDTO { - sharedVaultUuid: string - userUuid: string -} diff --git a/packages/syncing-server/src/Domain/UseCase/AcceptInviteToSharedVault/AcceptInviteToSharedVault.spec.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/AcceptInviteToSharedVault/AcceptInviteToSharedVault.spec.ts similarity index 92% rename from packages/syncing-server/src/Domain/UseCase/AcceptInviteToSharedVault/AcceptInviteToSharedVault.spec.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/AcceptInviteToSharedVault/AcceptInviteToSharedVault.spec.ts index b6a118d6d..d45d6cae0 100644 --- a/packages/syncing-server/src/Domain/UseCase/AcceptInviteToSharedVault/AcceptInviteToSharedVault.spec.ts +++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/AcceptInviteToSharedVault/AcceptInviteToSharedVault.spec.ts @@ -1,9 +1,9 @@ import { Result, Timestamps, Uuid } from '@standardnotes/domain-core' -import { SharedVaultInviteRepositoryInterface } from '../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface' +import { SharedVaultInviteRepositoryInterface } from '../../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface' import { AddUserToSharedVault } from '../AddUserToSharedVault/AddUserToSharedVault' import { AcceptInviteToSharedVault } from './AcceptInviteToSharedVault' -import { SharedVaultInvite } from '../../SharedVault/User/Invite/SharedVaultInvite' -import { SharedVaultUserPermission } from '../../SharedVault/User/SharedVaultUserPermission' +import { SharedVaultInvite } from '../../../SharedVault/User/Invite/SharedVaultInvite' +import { SharedVaultUserPermission } from '../../../SharedVault/User/SharedVaultUserPermission' describe('AcceptInviteToSharedVault', () => { let addUserToSharedVault: AddUserToSharedVault diff --git a/packages/syncing-server/src/Domain/UseCase/AcceptInviteToSharedVault/AcceptInviteToSharedVault.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/AcceptInviteToSharedVault/AcceptInviteToSharedVault.ts similarity index 93% rename from packages/syncing-server/src/Domain/UseCase/AcceptInviteToSharedVault/AcceptInviteToSharedVault.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/AcceptInviteToSharedVault/AcceptInviteToSharedVault.ts index 4250b4ffb..37786c854 100644 --- a/packages/syncing-server/src/Domain/UseCase/AcceptInviteToSharedVault/AcceptInviteToSharedVault.ts +++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/AcceptInviteToSharedVault/AcceptInviteToSharedVault.ts @@ -1,6 +1,6 @@ import { Result, UseCaseInterface, Uuid } from '@standardnotes/domain-core' import { AcceptInviteToSharedVaultDTO } from './AcceptInviteToSharedVaultDTO' -import { SharedVaultInviteRepositoryInterface } from '../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface' +import { SharedVaultInviteRepositoryInterface } from '../../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface' import { AddUserToSharedVault } from '../AddUserToSharedVault/AddUserToSharedVault' export class AcceptInviteToSharedVault implements UseCaseInterface { diff --git a/packages/syncing-server/src/Domain/UseCase/AcceptInviteToSharedVault/AcceptInviteToSharedVaultDTO.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/AcceptInviteToSharedVault/AcceptInviteToSharedVaultDTO.ts similarity index 100% rename from packages/syncing-server/src/Domain/UseCase/AcceptInviteToSharedVault/AcceptInviteToSharedVaultDTO.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/AcceptInviteToSharedVault/AcceptInviteToSharedVaultDTO.ts diff --git a/packages/syncing-server/src/Domain/UseCase/AddUserToSharedVault/AddUserToSharedVault.spec.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/AddUserToSharedVault/AddUserToSharedVault.spec.ts similarity index 75% rename from packages/syncing-server/src/Domain/UseCase/AddUserToSharedVault/AddUserToSharedVault.spec.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/AddUserToSharedVault/AddUserToSharedVault.spec.ts index bb6a94247..fdde7b031 100644 --- a/packages/syncing-server/src/Domain/UseCase/AddUserToSharedVault/AddUserToSharedVault.spec.ts +++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/AddUserToSharedVault/AddUserToSharedVault.spec.ts @@ -1,14 +1,12 @@ import { TimerInterface } from '@standardnotes/time' -import { SharedVaultRepositoryInterface } from '../../SharedVault/SharedVaultRepositoryInterface' -import { SharedVaultUserRepositoryInterface } from '../../SharedVault/User/SharedVaultUserRepositoryInterface' -import { RemoveUserEvents } from '../RemoveUserEvents/RemoveUserEvents' +import { SharedVaultRepositoryInterface } from '../../../SharedVault/SharedVaultRepositoryInterface' +import { SharedVaultUserRepositoryInterface } from '../../../SharedVault/User/SharedVaultUserRepositoryInterface' import { AddUserToSharedVault } from './AddUserToSharedVault' import { Result } from '@standardnotes/domain-core' -import { SharedVault } from '../../SharedVault/SharedVault' -import { SharedVaultUser } from '../../SharedVault/User/SharedVaultUser' +import { SharedVault } from '../../../SharedVault/SharedVault' +import { SharedVaultUser } from '../../../SharedVault/User/SharedVaultUser' describe('AddUserToSharedVault', () => { - let removeUserEvents: RemoveUserEvents let sharedVaultRepository: SharedVaultRepositoryInterface let sharedVaultUserRepository: SharedVaultUserRepositoryInterface let timer: TimerInterface @@ -16,13 +14,9 @@ describe('AddUserToSharedVault', () => { const validUuid = '00000000-0000-0000-0000-000000000000' - const createUseCase = () => - new AddUserToSharedVault(removeUserEvents, sharedVaultRepository, sharedVaultUserRepository, timer) + const createUseCase = () => new AddUserToSharedVault(sharedVaultRepository, sharedVaultUserRepository, timer) beforeEach(() => { - removeUserEvents = {} as jest.Mocked - removeUserEvents.execute = jest.fn().mockResolvedValue(Result.ok()) - sharedVault = {} as jest.Mocked sharedVaultRepository = {} as jest.Mocked @@ -89,21 +83,6 @@ describe('AddUserToSharedVault', () => { expect(result.getError()).toBe('Attempting to add a shared vault user to a non-existent shared vault') }) - it('should return a failure result if removing user events fails', async () => { - const useCase = createUseCase() - - removeUserEvents.execute = jest.fn().mockResolvedValueOnce(Result.fail('test')) - - const result = await useCase.execute({ - sharedVaultUuid: validUuid, - userUuid: validUuid, - permission: 'read', - }) - - expect(result.isFailed()).toBe(true) - expect(result.getError()).toBe('test') - }) - it('should return a failure result if creating the shared vault user fails', async () => { const useCase = createUseCase() diff --git a/packages/syncing-server/src/Domain/UseCase/AddUserToSharedVault/AddUserToSharedVault.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/AddUserToSharedVault/AddUserToSharedVault.ts similarity index 72% rename from packages/syncing-server/src/Domain/UseCase/AddUserToSharedVault/AddUserToSharedVault.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/AddUserToSharedVault/AddUserToSharedVault.ts index 46ade78e9..f61b58fbc 100644 --- a/packages/syncing-server/src/Domain/UseCase/AddUserToSharedVault/AddUserToSharedVault.ts +++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/AddUserToSharedVault/AddUserToSharedVault.ts @@ -2,15 +2,13 @@ import { Result, Timestamps, UseCaseInterface, Uuid } from '@standardnotes/domai import { TimerInterface } from '@standardnotes/time' import { AddUserToSharedVaultDTO } from './AddUserToSharedVaultDTO' -import { SharedVaultRepositoryInterface } from '../../SharedVault/SharedVaultRepositoryInterface' -import { SharedVaultUser } from '../../SharedVault/User/SharedVaultUser' -import { SharedVaultUserRepositoryInterface } from '../../SharedVault/User/SharedVaultUserRepositoryInterface' -import { SharedVaultUserPermission } from '../../SharedVault/User/SharedVaultUserPermission' -import { RemoveUserEvents } from '../RemoveUserEvents/RemoveUserEvents' +import { SharedVaultRepositoryInterface } from '../../../SharedVault/SharedVaultRepositoryInterface' +import { SharedVaultUser } from '../../../SharedVault/User/SharedVaultUser' +import { SharedVaultUserRepositoryInterface } from '../../../SharedVault/User/SharedVaultUserRepositoryInterface' +import { SharedVaultUserPermission } from '../../../SharedVault/User/SharedVaultUserPermission' export class AddUserToSharedVault implements UseCaseInterface { constructor( - private removeUserEvents: RemoveUserEvents, private sharedVaultRepository: SharedVaultRepositoryInterface, private sharedVaultUserRepository: SharedVaultUserRepositoryInterface, private timer: TimerInterface, @@ -40,14 +38,6 @@ export class AddUserToSharedVault implements UseCaseInterface { } const permission = permissionOrError.getValue() - const removingEventsResult = await this.removeUserEvents.execute({ - sharedVaultUuid: sharedVaultUuid.value, - userUuid: userUuid.value, - }) - if (removingEventsResult.isFailed()) { - return Result.fail(removingEventsResult.getError()) - } - const timestamps = Timestamps.create( this.timer.getTimestampInMicroseconds(), this.timer.getTimestampInMicroseconds(), diff --git a/packages/syncing-server/src/Domain/UseCase/AddUserToSharedVault/AddUserToSharedVaultDTO.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/AddUserToSharedVault/AddUserToSharedVaultDTO.ts similarity index 100% rename from packages/syncing-server/src/Domain/UseCase/AddUserToSharedVault/AddUserToSharedVaultDTO.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/AddUserToSharedVault/AddUserToSharedVaultDTO.ts diff --git a/packages/syncing-server/src/Domain/UseCase/CreateSharedVault/CreateSharedVault.spec.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/CreateSharedVault/CreateSharedVault.spec.ts similarity index 94% rename from packages/syncing-server/src/Domain/UseCase/CreateSharedVault/CreateSharedVault.spec.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/CreateSharedVault/CreateSharedVault.spec.ts index 84cefccdc..016060a90 100644 --- a/packages/syncing-server/src/Domain/UseCase/CreateSharedVault/CreateSharedVault.spec.ts +++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/CreateSharedVault/CreateSharedVault.spec.ts @@ -1,10 +1,10 @@ import { TimerInterface } from '@standardnotes/time' import { Result } from '@standardnotes/domain-core' -import { SharedVaultRepositoryInterface } from '../../SharedVault/SharedVaultRepositoryInterface' +import { SharedVaultRepositoryInterface } from '../../../SharedVault/SharedVaultRepositoryInterface' import { AddUserToSharedVault } from '../AddUserToSharedVault/AddUserToSharedVault' import { CreateSharedVault } from './CreateSharedVault' -import { SharedVault } from '../../SharedVault/SharedVault' +import { SharedVault } from '../../../SharedVault/SharedVault' describe('CreateSharedVault', () => { let addUserToSharedVault: AddUserToSharedVault diff --git a/packages/syncing-server/src/Domain/UseCase/CreateSharedVault/CreateSharedVault.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/CreateSharedVault/CreateSharedVault.ts similarity index 92% rename from packages/syncing-server/src/Domain/UseCase/CreateSharedVault/CreateSharedVault.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/CreateSharedVault/CreateSharedVault.ts index 3d029ba43..ec09ea17a 100644 --- a/packages/syncing-server/src/Domain/UseCase/CreateSharedVault/CreateSharedVault.ts +++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/CreateSharedVault/CreateSharedVault.ts @@ -2,9 +2,9 @@ import { Result, Timestamps, UseCaseInterface, Uuid } from '@standardnotes/domai import { CreateSharedVaultResult } from './CreateSharedVaultResult' import { CreateSharedVaultDTO } from './CreateSharedVaultDTO' import { TimerInterface } from '@standardnotes/time' -import { SharedVaultRepositoryInterface } from '../../SharedVault/SharedVaultRepositoryInterface' +import { SharedVaultRepositoryInterface } from '../../../SharedVault/SharedVaultRepositoryInterface' import { AddUserToSharedVault } from '../AddUserToSharedVault/AddUserToSharedVault' -import { SharedVault } from '../../SharedVault/SharedVault' +import { SharedVault } from '../../../SharedVault/SharedVault' export class CreateSharedVault implements UseCaseInterface { private readonly FILE_UPLOAD_BYTES_LIMIT = 1_000_000 diff --git a/packages/syncing-server/src/Domain/UseCase/CreateSharedVault/CreateSharedVaultDTO.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/CreateSharedVault/CreateSharedVaultDTO.ts similarity index 100% rename from packages/syncing-server/src/Domain/UseCase/CreateSharedVault/CreateSharedVaultDTO.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/CreateSharedVault/CreateSharedVaultDTO.ts diff --git a/packages/syncing-server/src/Domain/UseCase/SharedVaults/CreateSharedVault/CreateSharedVaultResult.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/CreateSharedVault/CreateSharedVaultResult.ts new file mode 100644 index 000000000..a284655b9 --- /dev/null +++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/CreateSharedVault/CreateSharedVaultResult.ts @@ -0,0 +1,7 @@ +import { SharedVault } from '../../../SharedVault/SharedVault' +import { SharedVaultUser } from '../../../SharedVault/User/SharedVaultUser' + +export interface CreateSharedVaultResult { + sharedVaultUser: SharedVaultUser + sharedVault: SharedVault +} diff --git a/packages/syncing-server/src/Domain/UseCase/CreateSharedVaultFileValetToken/CreateSharedVaultFileValetToken.spec.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/CreateSharedVaultFileValetToken/CreateSharedVaultFileValetToken.spec.ts similarity index 97% rename from packages/syncing-server/src/Domain/UseCase/CreateSharedVaultFileValetToken/CreateSharedVaultFileValetToken.spec.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/CreateSharedVaultFileValetToken/CreateSharedVaultFileValetToken.spec.ts index 389b9ecae..858ab8b8b 100644 --- a/packages/syncing-server/src/Domain/UseCase/CreateSharedVaultFileValetToken/CreateSharedVaultFileValetToken.spec.ts +++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/CreateSharedVaultFileValetToken/CreateSharedVaultFileValetToken.spec.ts @@ -1,10 +1,10 @@ import { SharedVaultValetTokenData, TokenEncoderInterface, ValetTokenOperation } from '@standardnotes/security' -import { SharedVaultRepositoryInterface } from '../../SharedVault/SharedVaultRepositoryInterface' -import { SharedVaultUserRepositoryInterface } from '../../SharedVault/User/SharedVaultUserRepositoryInterface' +import { SharedVaultRepositoryInterface } from '../../../SharedVault/SharedVaultRepositoryInterface' +import { SharedVaultUserRepositoryInterface } from '../../../SharedVault/User/SharedVaultUserRepositoryInterface' import { CreateSharedVaultFileValetToken } from './CreateSharedVaultFileValetToken' -import { SharedVault } from '../../SharedVault/SharedVault' -import { SharedVaultUser } from '../../SharedVault/User/SharedVaultUser' -import { SharedVaultUserPermission } from '../../SharedVault/User/SharedVaultUserPermission' +import { SharedVault } from '../../../SharedVault/SharedVault' +import { SharedVaultUser } from '../../../SharedVault/User/SharedVaultUser' +import { SharedVaultUserPermission } from '../../../SharedVault/User/SharedVaultUserPermission' import { Timestamps, Uuid } from '@standardnotes/domain-core' describe('CreateSharedVaultFileValetToken', () => { diff --git a/packages/syncing-server/src/Domain/UseCase/CreateSharedVaultFileValetToken/CreateSharedVaultFileValetToken.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/CreateSharedVaultFileValetToken/CreateSharedVaultFileValetToken.ts similarity index 93% rename from packages/syncing-server/src/Domain/UseCase/CreateSharedVaultFileValetToken/CreateSharedVaultFileValetToken.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/CreateSharedVaultFileValetToken/CreateSharedVaultFileValetToken.ts index 6a965d6ce..7928b0049 100644 --- a/packages/syncing-server/src/Domain/UseCase/CreateSharedVaultFileValetToken/CreateSharedVaultFileValetToken.ts +++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/CreateSharedVaultFileValetToken/CreateSharedVaultFileValetToken.ts @@ -1,10 +1,10 @@ import { SharedVaultValetTokenData, TokenEncoderInterface, ValetTokenOperation } from '@standardnotes/security' -import { SharedVaultRepositoryInterface } from '../../SharedVault/SharedVaultRepositoryInterface' +import { SharedVaultRepositoryInterface } from '../../../SharedVault/SharedVaultRepositoryInterface' import { Result, UseCaseInterface, Uuid } from '@standardnotes/domain-core' -import { SharedVaultUserRepositoryInterface } from '../../SharedVault/User/SharedVaultUserRepositoryInterface' +import { SharedVaultUserRepositoryInterface } from '../../../SharedVault/User/SharedVaultUserRepositoryInterface' import { CreateSharedVaultFileValetTokenDTO } from './CreateSharedVaultFileValetTokenDTO' -import { SharedVaultUserPermission } from '../../SharedVault/User/SharedVaultUserPermission' +import { SharedVaultUserPermission } from '../../../SharedVault/User/SharedVaultUserPermission' export class CreateSharedVaultFileValetToken implements UseCaseInterface { constructor( diff --git a/packages/syncing-server/src/Domain/UseCase/CreateSharedVaultFileValetToken/CreateSharedVaultFileValetTokenDTO.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/CreateSharedVaultFileValetToken/CreateSharedVaultFileValetTokenDTO.ts similarity index 100% rename from packages/syncing-server/src/Domain/UseCase/CreateSharedVaultFileValetToken/CreateSharedVaultFileValetTokenDTO.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/CreateSharedVaultFileValetToken/CreateSharedVaultFileValetTokenDTO.ts diff --git a/packages/syncing-server/src/Domain/UseCase/DeclineInviteToSharedVault/DeclineInviteToSharedVault.spec.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/DeclineInviteToSharedVault/DeclineInviteToSharedVault.spec.ts similarity index 90% rename from packages/syncing-server/src/Domain/UseCase/DeclineInviteToSharedVault/DeclineInviteToSharedVault.spec.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/DeclineInviteToSharedVault/DeclineInviteToSharedVault.spec.ts index b33c290fa..5fb82499c 100644 --- a/packages/syncing-server/src/Domain/UseCase/DeclineInviteToSharedVault/DeclineInviteToSharedVault.spec.ts +++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/DeclineInviteToSharedVault/DeclineInviteToSharedVault.spec.ts @@ -1,8 +1,8 @@ import { Timestamps, Uuid } from '@standardnotes/domain-core' -import { SharedVaultInviteRepositoryInterface } from '../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface' +import { SharedVaultInviteRepositoryInterface } from '../../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface' import { DeclineInviteToSharedVault } from './DeclineInviteToSharedVault' -import { SharedVaultInvite } from '../../SharedVault/User/Invite/SharedVaultInvite' -import { SharedVaultUserPermission } from '../../SharedVault/User/SharedVaultUserPermission' +import { SharedVaultInvite } from '../../../SharedVault/User/Invite/SharedVaultInvite' +import { SharedVaultUserPermission } from '../../../SharedVault/User/SharedVaultUserPermission' describe('DeclineInviteToSharedVault', () => { let sharedVaultInviteRepository: SharedVaultInviteRepositoryInterface diff --git a/packages/syncing-server/src/Domain/UseCase/DeclineInviteToSharedVault/DeclineInviteToSharedVault.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/DeclineInviteToSharedVault/DeclineInviteToSharedVault.ts similarity index 90% rename from packages/syncing-server/src/Domain/UseCase/DeclineInviteToSharedVault/DeclineInviteToSharedVault.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/DeclineInviteToSharedVault/DeclineInviteToSharedVault.ts index 9ad3c919e..c767e7a7c 100644 --- a/packages/syncing-server/src/Domain/UseCase/DeclineInviteToSharedVault/DeclineInviteToSharedVault.ts +++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/DeclineInviteToSharedVault/DeclineInviteToSharedVault.ts @@ -1,6 +1,6 @@ import { Result, UseCaseInterface, Uuid } from '@standardnotes/domain-core' import { DeclineInviteToSharedVaultDTO } from './DeclineInviteToSharedVaultDTO' -import { SharedVaultInviteRepositoryInterface } from '../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface' +import { SharedVaultInviteRepositoryInterface } from '../../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface' export class DeclineInviteToSharedVault implements UseCaseInterface { constructor(private sharedVaultInviteRepository: SharedVaultInviteRepositoryInterface) {} diff --git a/packages/syncing-server/src/Domain/UseCase/DeclineInviteToSharedVault/DeclineInviteToSharedVaultDTO.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/DeclineInviteToSharedVault/DeclineInviteToSharedVaultDTO.ts similarity index 100% rename from packages/syncing-server/src/Domain/UseCase/DeclineInviteToSharedVault/DeclineInviteToSharedVaultDTO.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/DeclineInviteToSharedVault/DeclineInviteToSharedVaultDTO.ts diff --git a/packages/syncing-server/src/Domain/UseCase/DeleteSharedVault/DeleteSharedVault.spec.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVault/DeleteSharedVault.spec.ts similarity index 91% rename from packages/syncing-server/src/Domain/UseCase/DeleteSharedVault/DeleteSharedVault.spec.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVault/DeleteSharedVault.spec.ts index 4468a49f7..bef949e37 100644 --- a/packages/syncing-server/src/Domain/UseCase/DeleteSharedVault/DeleteSharedVault.spec.ts +++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVault/DeleteSharedVault.spec.ts @@ -1,12 +1,12 @@ import { Uuid, Timestamps, Result } from '@standardnotes/domain-core' -import { SharedVaultRepositoryInterface } from '../../SharedVault/SharedVaultRepositoryInterface' -import { SharedVaultInviteRepositoryInterface } from '../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface' -import { SharedVaultUserRepositoryInterface } from '../../SharedVault/User/SharedVaultUserRepositoryInterface' +import { SharedVaultRepositoryInterface } from '../../../SharedVault/SharedVaultRepositoryInterface' +import { SharedVaultInviteRepositoryInterface } from '../../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface' +import { SharedVaultUserRepositoryInterface } from '../../../SharedVault/User/SharedVaultUserRepositoryInterface' import { DeleteSharedVault } from './DeleteSharedVault' -import { SharedVault } from '../../SharedVault/SharedVault' -import { SharedVaultUser } from '../../SharedVault/User/SharedVaultUser' -import { SharedVaultUserPermission } from '../../SharedVault/User/SharedVaultUserPermission' +import { SharedVault } from '../../../SharedVault/SharedVault' +import { SharedVaultUser } from '../../../SharedVault/User/SharedVaultUser' +import { SharedVaultUserPermission } from '../../../SharedVault/User/SharedVaultUserPermission' import { RemoveUserFromSharedVault } from '../RemoveUserFromSharedVault/RemoveUserFromSharedVault' describe('DeleteSharedVault', () => { diff --git a/packages/syncing-server/src/Domain/UseCase/DeleteSharedVault/DeleteSharedVault.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVault/DeleteSharedVault.ts similarity index 86% rename from packages/syncing-server/src/Domain/UseCase/DeleteSharedVault/DeleteSharedVault.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVault/DeleteSharedVault.ts index c543decc7..3865baf77 100644 --- a/packages/syncing-server/src/Domain/UseCase/DeleteSharedVault/DeleteSharedVault.ts +++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVault/DeleteSharedVault.ts @@ -1,9 +1,9 @@ import { Result, UseCaseInterface, Uuid } from '@standardnotes/domain-core' import { DeleteSharedVaultDTO } from './DeleteSharedVaultDTO' -import { SharedVaultRepositoryInterface } from '../../SharedVault/SharedVaultRepositoryInterface' -import { SharedVaultUserRepositoryInterface } from '../../SharedVault/User/SharedVaultUserRepositoryInterface' -import { SharedVaultInviteRepositoryInterface } from '../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface' +import { SharedVaultRepositoryInterface } from '../../../SharedVault/SharedVaultRepositoryInterface' +import { SharedVaultUserRepositoryInterface } from '../../../SharedVault/User/SharedVaultUserRepositoryInterface' +import { SharedVaultInviteRepositoryInterface } from '../../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface' import { RemoveUserFromSharedVault } from '../RemoveUserFromSharedVault/RemoveUserFromSharedVault' export class DeleteSharedVault implements UseCaseInterface { diff --git a/packages/syncing-server/src/Domain/UseCase/DeleteSharedVault/DeleteSharedVaultDTO.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVault/DeleteSharedVaultDTO.ts similarity index 100% rename from packages/syncing-server/src/Domain/UseCase/DeleteSharedVault/DeleteSharedVaultDTO.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVault/DeleteSharedVaultDTO.ts diff --git a/packages/syncing-server/src/Domain/UseCase/DeleteSharedVaultInvitesSentByUser/DeleteSharedVaultInvitesSentByUser.spec.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesSentByUser/DeleteSharedVaultInvitesSentByUser.spec.ts similarity index 90% rename from packages/syncing-server/src/Domain/UseCase/DeleteSharedVaultInvitesSentByUser/DeleteSharedVaultInvitesSentByUser.spec.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesSentByUser/DeleteSharedVaultInvitesSentByUser.spec.ts index 2bb0ecd60..34c288e11 100644 --- a/packages/syncing-server/src/Domain/UseCase/DeleteSharedVaultInvitesSentByUser/DeleteSharedVaultInvitesSentByUser.spec.ts +++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesSentByUser/DeleteSharedVaultInvitesSentByUser.spec.ts @@ -1,9 +1,9 @@ import { Result, Timestamps, Uuid } from '@standardnotes/domain-core' -import { SharedVaultInviteRepositoryInterface } from '../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface' +import { SharedVaultInviteRepositoryInterface } from '../../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface' import { DeclineInviteToSharedVault } from '../DeclineInviteToSharedVault/DeclineInviteToSharedVault' import { DeleteSharedVaultInvitesSentByUser } from './DeleteSharedVaultInvitesSentByUser' -import { SharedVaultInvite } from '../../SharedVault/User/Invite/SharedVaultInvite' -import { SharedVaultUserPermission } from '../../SharedVault/User/SharedVaultUserPermission' +import { SharedVaultInvite } from '../../../SharedVault/User/Invite/SharedVaultInvite' +import { SharedVaultUserPermission } from '../../../SharedVault/User/SharedVaultUserPermission' describe('DeleteSharedVaultInvitesSentByUser', () => { let sharedVaultInviteRepository: SharedVaultInviteRepositoryInterface diff --git a/packages/syncing-server/src/Domain/UseCase/DeleteSharedVaultInvitesSentByUser/DeleteSharedVaultInvitesSentByUser.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesSentByUser/DeleteSharedVaultInvitesSentByUser.ts similarity index 92% rename from packages/syncing-server/src/Domain/UseCase/DeleteSharedVaultInvitesSentByUser/DeleteSharedVaultInvitesSentByUser.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesSentByUser/DeleteSharedVaultInvitesSentByUser.ts index a6ea22943..a415f6c73 100644 --- a/packages/syncing-server/src/Domain/UseCase/DeleteSharedVaultInvitesSentByUser/DeleteSharedVaultInvitesSentByUser.ts +++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesSentByUser/DeleteSharedVaultInvitesSentByUser.ts @@ -1,7 +1,7 @@ import { Result, UseCaseInterface, Uuid } from '@standardnotes/domain-core' import { DeleteSharedVaultInvitesSentByUserDTO } from './DeleteSharedVaultInvitesSentByUserDTO' import { DeclineInviteToSharedVault } from '../DeclineInviteToSharedVault/DeclineInviteToSharedVault' -import { SharedVaultInviteRepositoryInterface } from '../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface' +import { SharedVaultInviteRepositoryInterface } from '../../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface' export class DeleteSharedVaultInvitesSentByUser implements UseCaseInterface { constructor( diff --git a/packages/syncing-server/src/Domain/UseCase/DeleteSharedVaultInvitesSentByUser/DeleteSharedVaultInvitesSentByUserDTO.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesSentByUser/DeleteSharedVaultInvitesSentByUserDTO.ts similarity index 100% rename from packages/syncing-server/src/Domain/UseCase/DeleteSharedVaultInvitesSentByUser/DeleteSharedVaultInvitesSentByUserDTO.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesSentByUser/DeleteSharedVaultInvitesSentByUserDTO.ts diff --git a/packages/syncing-server/src/Domain/UseCase/DeleteSharedVaultInvitesToUser/DeleteSharedVaultInvitesToUser.spec.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesToUser/DeleteSharedVaultInvitesToUser.spec.ts similarity index 88% rename from packages/syncing-server/src/Domain/UseCase/DeleteSharedVaultInvitesToUser/DeleteSharedVaultInvitesToUser.spec.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesToUser/DeleteSharedVaultInvitesToUser.spec.ts index b9becccd8..130e87326 100644 --- a/packages/syncing-server/src/Domain/UseCase/DeleteSharedVaultInvitesToUser/DeleteSharedVaultInvitesToUser.spec.ts +++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesToUser/DeleteSharedVaultInvitesToUser.spec.ts @@ -1,9 +1,9 @@ import { Result, Timestamps, Uuid } from '@standardnotes/domain-core' -import { SharedVaultInviteRepositoryInterface } from '../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface' +import { SharedVaultInviteRepositoryInterface } from '../../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface' import { DeclineInviteToSharedVault } from '../DeclineInviteToSharedVault/DeclineInviteToSharedVault' import { DeleteSharedVaultInvitesToUser } from './DeleteSharedVaultInvitesToUser' -import { SharedVaultInvite } from '../../SharedVault/User/Invite/SharedVaultInvite' -import { SharedVaultUserPermission } from '../../SharedVault/User/SharedVaultUserPermission' +import { SharedVaultInvite } from '../../../SharedVault/User/Invite/SharedVaultInvite' +import { SharedVaultUserPermission } from '../../../SharedVault/User/SharedVaultUserPermission' describe('DeleteSharedVaultInvitesToUser', () => { let sharedVaultInviteRepository: SharedVaultInviteRepositoryInterface diff --git a/packages/syncing-server/src/Domain/UseCase/DeleteSharedVaultInvitesToUser/DeleteSharedVaultInvitesToUser.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesToUser/DeleteSharedVaultInvitesToUser.ts similarity index 90% rename from packages/syncing-server/src/Domain/UseCase/DeleteSharedVaultInvitesToUser/DeleteSharedVaultInvitesToUser.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesToUser/DeleteSharedVaultInvitesToUser.ts index 15a6a3c3b..106908b14 100644 --- a/packages/syncing-server/src/Domain/UseCase/DeleteSharedVaultInvitesToUser/DeleteSharedVaultInvitesToUser.ts +++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesToUser/DeleteSharedVaultInvitesToUser.ts @@ -1,7 +1,7 @@ import { Result, UseCaseInterface, Uuid } from '@standardnotes/domain-core' import { DeleteSharedVaultInvitesToUserDTO } from './DeleteSharedVaultInvitesToUserDTO' import { DeclineInviteToSharedVault } from '../DeclineInviteToSharedVault/DeclineInviteToSharedVault' -import { SharedVaultInviteRepositoryInterface } from '../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface' +import { SharedVaultInviteRepositoryInterface } from '../../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface' export class DeleteSharedVaultInvitesToUser implements UseCaseInterface { constructor( diff --git a/packages/syncing-server/src/Domain/UseCase/DeleteSharedVaultInvitesToUser/DeleteSharedVaultInvitesToUserDTO.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesToUser/DeleteSharedVaultInvitesToUserDTO.ts similarity index 100% rename from packages/syncing-server/src/Domain/UseCase/DeleteSharedVaultInvitesToUser/DeleteSharedVaultInvitesToUserDTO.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesToUser/DeleteSharedVaultInvitesToUserDTO.ts diff --git a/packages/syncing-server/src/Domain/UseCase/GetSharedVaultInvitesSentByUser/GetSharedVaultInvitesSentByUser.spec.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaultInvitesSentByUser/GetSharedVaultInvitesSentByUser.spec.ts similarity index 89% rename from packages/syncing-server/src/Domain/UseCase/GetSharedVaultInvitesSentByUser/GetSharedVaultInvitesSentByUser.spec.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaultInvitesSentByUser/GetSharedVaultInvitesSentByUser.spec.ts index b59637ff7..c6fb6bdab 100644 --- a/packages/syncing-server/src/Domain/UseCase/GetSharedVaultInvitesSentByUser/GetSharedVaultInvitesSentByUser.spec.ts +++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaultInvitesSentByUser/GetSharedVaultInvitesSentByUser.spec.ts @@ -1,8 +1,8 @@ import { Uuid, Timestamps } from '@standardnotes/domain-core' -import { SharedVaultInvite } from '../../SharedVault/User/Invite/SharedVaultInvite' -import { SharedVaultInviteRepositoryInterface } from '../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface' -import { SharedVaultUserPermission } from '../../SharedVault/User/SharedVaultUserPermission' +import { SharedVaultInvite } from '../../../SharedVault/User/Invite/SharedVaultInvite' +import { SharedVaultInviteRepositoryInterface } from '../../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface' +import { SharedVaultUserPermission } from '../../../SharedVault/User/SharedVaultUserPermission' import { GetSharedVaultInvitesSentByUser } from './GetSharedVaultInvitesSentByUser' describe('GetSharedVaultInvitesSentByUser', () => { diff --git a/packages/syncing-server/src/Domain/UseCase/GetSharedVaultInvitesSentByUser/GetSharedVaultInvitesSentByUser.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaultInvitesSentByUser/GetSharedVaultInvitesSentByUser.ts similarity index 85% rename from packages/syncing-server/src/Domain/UseCase/GetSharedVaultInvitesSentByUser/GetSharedVaultInvitesSentByUser.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaultInvitesSentByUser/GetSharedVaultInvitesSentByUser.ts index 04ff7bc69..5a1121dcb 100644 --- a/packages/syncing-server/src/Domain/UseCase/GetSharedVaultInvitesSentByUser/GetSharedVaultInvitesSentByUser.ts +++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaultInvitesSentByUser/GetSharedVaultInvitesSentByUser.ts @@ -1,7 +1,7 @@ import { Result, UseCaseInterface, Uuid } from '@standardnotes/domain-core' -import { SharedVaultInvite } from '../../SharedVault/User/Invite/SharedVaultInvite' +import { SharedVaultInvite } from '../../../SharedVault/User/Invite/SharedVaultInvite' import { GetSharedVaultInvitesSentByUserDTO } from './GetSharedVaultInvitesSentByUserDTO' -import { SharedVaultInviteRepositoryInterface } from '../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface' +import { SharedVaultInviteRepositoryInterface } from '../../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface' export class GetSharedVaultInvitesSentByUser implements UseCaseInterface { constructor(private sharedVaultInviteRepository: SharedVaultInviteRepositoryInterface) {} diff --git a/packages/syncing-server/src/Domain/UseCase/GetSharedVaultInvitesSentByUser/GetSharedVaultInvitesSentByUserDTO.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaultInvitesSentByUser/GetSharedVaultInvitesSentByUserDTO.ts similarity index 100% rename from packages/syncing-server/src/Domain/UseCase/GetSharedVaultInvitesSentByUser/GetSharedVaultInvitesSentByUserDTO.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaultInvitesSentByUser/GetSharedVaultInvitesSentByUserDTO.ts diff --git a/packages/syncing-server/src/Domain/UseCase/GetSharedVaultInvitesSentToUser/GetSharedVaultInvitesSentToUser.spec.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaultInvitesSentToUser/GetSharedVaultInvitesSentToUser.spec.ts similarity index 86% rename from packages/syncing-server/src/Domain/UseCase/GetSharedVaultInvitesSentToUser/GetSharedVaultInvitesSentToUser.spec.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaultInvitesSentToUser/GetSharedVaultInvitesSentToUser.spec.ts index 1d5f86e86..1d54ebf2e 100644 --- a/packages/syncing-server/src/Domain/UseCase/GetSharedVaultInvitesSentToUser/GetSharedVaultInvitesSentToUser.spec.ts +++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaultInvitesSentToUser/GetSharedVaultInvitesSentToUser.spec.ts @@ -1,8 +1,8 @@ import { Uuid, Timestamps } from '@standardnotes/domain-core' -import { SharedVaultInvite } from '../../SharedVault/User/Invite/SharedVaultInvite' -import { SharedVaultInviteRepositoryInterface } from '../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface' -import { SharedVaultUserPermission } from '../../SharedVault/User/SharedVaultUserPermission' +import { SharedVaultInvite } from '../../../SharedVault/User/Invite/SharedVaultInvite' +import { SharedVaultInviteRepositoryInterface } from '../../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface' +import { SharedVaultUserPermission } from '../../../SharedVault/User/SharedVaultUserPermission' import { GetSharedVaultInvitesSentToUser } from './GetSharedVaultInvitesSentToUser' describe('GetSharedVaultInvitesSentToUser', () => { diff --git a/packages/syncing-server/src/Domain/UseCase/GetSharedVaultInvitesSentToUser/GetSharedVaultInvitesSentToUser.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaultInvitesSentToUser/GetSharedVaultInvitesSentToUser.ts similarity index 77% rename from packages/syncing-server/src/Domain/UseCase/GetSharedVaultInvitesSentToUser/GetSharedVaultInvitesSentToUser.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaultInvitesSentToUser/GetSharedVaultInvitesSentToUser.ts index 7ac5e91a3..aa9c0363a 100644 --- a/packages/syncing-server/src/Domain/UseCase/GetSharedVaultInvitesSentToUser/GetSharedVaultInvitesSentToUser.ts +++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaultInvitesSentToUser/GetSharedVaultInvitesSentToUser.ts @@ -1,7 +1,7 @@ import { Result, UseCaseInterface, Uuid } from '@standardnotes/domain-core' -import { SharedVaultInvite } from '../../SharedVault/User/Invite/SharedVaultInvite' +import { SharedVaultInvite } from '../../../SharedVault/User/Invite/SharedVaultInvite' import { GetSharedVaultInvitesSentToUserDTO } from './GetSharedVaultInvitesSentToUserDTO' -import { SharedVaultInviteRepositoryInterface } from '../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface' +import { SharedVaultInviteRepositoryInterface } from '../../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface' export class GetSharedVaultInvitesSentToUser implements UseCaseInterface { constructor(private sharedVaultInviteRepository: SharedVaultInviteRepositoryInterface) {} diff --git a/packages/syncing-server/src/Domain/UseCase/GetSharedVaultInvitesSentToUser/GetSharedVaultInvitesSentToUserDTO.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaultInvitesSentToUser/GetSharedVaultInvitesSentToUserDTO.ts similarity index 100% rename from packages/syncing-server/src/Domain/UseCase/GetSharedVaultInvitesSentToUser/GetSharedVaultInvitesSentToUserDTO.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaultInvitesSentToUser/GetSharedVaultInvitesSentToUserDTO.ts diff --git a/packages/syncing-server/src/Domain/UseCase/GetSharedVaultUsers/GetSharedVaultUsers.spec.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaultUsers/GetSharedVaultUsers.spec.ts similarity index 89% rename from packages/syncing-server/src/Domain/UseCase/GetSharedVaultUsers/GetSharedVaultUsers.spec.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaultUsers/GetSharedVaultUsers.spec.ts index 3ffae6995..896cc3f89 100644 --- a/packages/syncing-server/src/Domain/UseCase/GetSharedVaultUsers/GetSharedVaultUsers.spec.ts +++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaultUsers/GetSharedVaultUsers.spec.ts @@ -1,9 +1,9 @@ import { Uuid, Timestamps } from '@standardnotes/domain-core' -import { SharedVault } from '../../SharedVault/SharedVault' -import { SharedVaultRepositoryInterface } from '../../SharedVault/SharedVaultRepositoryInterface' -import { SharedVaultUser } from '../../SharedVault/User/SharedVaultUser' -import { SharedVaultUserPermission } from '../../SharedVault/User/SharedVaultUserPermission' -import { SharedVaultUserRepositoryInterface } from '../../SharedVault/User/SharedVaultUserRepositoryInterface' +import { SharedVault } from '../../../SharedVault/SharedVault' +import { SharedVaultRepositoryInterface } from '../../../SharedVault/SharedVaultRepositoryInterface' +import { SharedVaultUser } from '../../../SharedVault/User/SharedVaultUser' +import { SharedVaultUserPermission } from '../../../SharedVault/User/SharedVaultUserPermission' +import { SharedVaultUserRepositoryInterface } from '../../../SharedVault/User/SharedVaultUserRepositoryInterface' import { GetSharedVaultUsers } from './GetSharedVaultUsers' describe('GetSharedVaultUsers', () => { diff --git a/packages/syncing-server/src/Domain/UseCase/GetSharedVaultUsers/GetSharedVaultUsers.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaultUsers/GetSharedVaultUsers.ts similarity index 83% rename from packages/syncing-server/src/Domain/UseCase/GetSharedVaultUsers/GetSharedVaultUsers.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaultUsers/GetSharedVaultUsers.ts index ee12b7037..11b0adba0 100644 --- a/packages/syncing-server/src/Domain/UseCase/GetSharedVaultUsers/GetSharedVaultUsers.ts +++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaultUsers/GetSharedVaultUsers.ts @@ -1,8 +1,8 @@ import { Result, UseCaseInterface, Uuid } from '@standardnotes/domain-core' -import { SharedVaultUser } from '../../SharedVault/User/SharedVaultUser' +import { SharedVaultUser } from '../../../SharedVault/User/SharedVaultUser' import { GetSharedVaultUsersDTO } from './GetSharedVaultUsersDTO' -import { SharedVaultUserRepositoryInterface } from '../../SharedVault/User/SharedVaultUserRepositoryInterface' -import { SharedVaultRepositoryInterface } from '../../SharedVault/SharedVaultRepositoryInterface' +import { SharedVaultUserRepositoryInterface } from '../../../SharedVault/User/SharedVaultUserRepositoryInterface' +import { SharedVaultRepositoryInterface } from '../../../SharedVault/SharedVaultRepositoryInterface' export class GetSharedVaultUsers implements UseCaseInterface { constructor( diff --git a/packages/syncing-server/src/Domain/UseCase/GetSharedVaultUsers/GetSharedVaultUsersDTO.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaultUsers/GetSharedVaultUsersDTO.ts similarity index 100% rename from packages/syncing-server/src/Domain/UseCase/GetSharedVaultUsers/GetSharedVaultUsersDTO.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaultUsers/GetSharedVaultUsersDTO.ts diff --git a/packages/syncing-server/src/Domain/UseCase/GetSharedVaults/GetSharedVaults.spec.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaults/GetSharedVaults.spec.ts similarity index 83% rename from packages/syncing-server/src/Domain/UseCase/GetSharedVaults/GetSharedVaults.spec.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaults/GetSharedVaults.spec.ts index b07636eb1..053d590ed 100644 --- a/packages/syncing-server/src/Domain/UseCase/GetSharedVaults/GetSharedVaults.spec.ts +++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaults/GetSharedVaults.spec.ts @@ -1,9 +1,9 @@ import { Timestamps, Uuid } from '@standardnotes/domain-core' -import { SharedVault } from '../../SharedVault/SharedVault' -import { SharedVaultRepositoryInterface } from '../../SharedVault/SharedVaultRepositoryInterface' -import { SharedVaultUser } from '../../SharedVault/User/SharedVaultUser' -import { SharedVaultUserPermission } from '../../SharedVault/User/SharedVaultUserPermission' -import { SharedVaultUserRepositoryInterface } from '../../SharedVault/User/SharedVaultUserRepositoryInterface' +import { SharedVault } from '../../../SharedVault/SharedVault' +import { SharedVaultRepositoryInterface } from '../../../SharedVault/SharedVaultRepositoryInterface' +import { SharedVaultUser } from '../../../SharedVault/User/SharedVaultUser' +import { SharedVaultUserPermission } from '../../../SharedVault/User/SharedVaultUserPermission' +import { SharedVaultUserRepositoryInterface } from '../../../SharedVault/User/SharedVaultUserRepositoryInterface' import { GetSharedVaults } from './GetSharedVaults' describe('GetSharedVaults', () => { diff --git a/packages/syncing-server/src/Domain/UseCase/GetSharedVaults/GetSharedVaults.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaults/GetSharedVaults.ts similarity index 80% rename from packages/syncing-server/src/Domain/UseCase/GetSharedVaults/GetSharedVaults.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaults/GetSharedVaults.ts index 118a9faf1..4f30924a4 100644 --- a/packages/syncing-server/src/Domain/UseCase/GetSharedVaults/GetSharedVaults.ts +++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaults/GetSharedVaults.ts @@ -1,9 +1,9 @@ import { Result, UseCaseInterface, Uuid } from '@standardnotes/domain-core' -import { SharedVault } from '../../SharedVault/SharedVault' +import { SharedVault } from '../../../SharedVault/SharedVault' import { GetSharedVaultsDTO } from './GetSharedVaultsDTO' -import { SharedVaultUserRepositoryInterface } from '../../SharedVault/User/SharedVaultUserRepositoryInterface' -import { SharedVaultRepositoryInterface } from '../../SharedVault/SharedVaultRepositoryInterface' +import { SharedVaultUserRepositoryInterface } from '../../../SharedVault/User/SharedVaultUserRepositoryInterface' +import { SharedVaultRepositoryInterface } from '../../../SharedVault/SharedVaultRepositoryInterface' export class GetSharedVaults implements UseCaseInterface { constructor( diff --git a/packages/syncing-server/src/Domain/UseCase/GetSharedVaults/GetSharedVaultsDTO.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaults/GetSharedVaultsDTO.ts similarity index 100% rename from packages/syncing-server/src/Domain/UseCase/GetSharedVaults/GetSharedVaultsDTO.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaults/GetSharedVaultsDTO.ts diff --git a/packages/syncing-server/src/Domain/UseCase/InviteUserToSharedVault/InviteUserToSharedVault.spec.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/InviteUserToSharedVault/InviteUserToSharedVault.spec.ts similarity index 94% rename from packages/syncing-server/src/Domain/UseCase/InviteUserToSharedVault/InviteUserToSharedVault.spec.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/InviteUserToSharedVault/InviteUserToSharedVault.spec.ts index a456b49ef..610b3c76f 100644 --- a/packages/syncing-server/src/Domain/UseCase/InviteUserToSharedVault/InviteUserToSharedVault.spec.ts +++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/InviteUserToSharedVault/InviteUserToSharedVault.spec.ts @@ -1,11 +1,11 @@ import { TimerInterface } from '@standardnotes/time' -import { SharedVaultRepositoryInterface } from '../../SharedVault/SharedVaultRepositoryInterface' -import { SharedVaultInviteRepositoryInterface } from '../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface' +import { SharedVaultRepositoryInterface } from '../../../SharedVault/SharedVaultRepositoryInterface' +import { SharedVaultInviteRepositoryInterface } from '../../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface' import { InviteUserToSharedVault } from './InviteUserToSharedVault' -import { SharedVault } from '../../SharedVault/SharedVault' -import { SharedVaultInvite } from '../../SharedVault/User/Invite/SharedVaultInvite' +import { SharedVault } from '../../../SharedVault/SharedVault' +import { SharedVaultInvite } from '../../../SharedVault/User/Invite/SharedVaultInvite' import { Uuid, Timestamps, Result } from '@standardnotes/domain-core' -import { SharedVaultUserPermission } from '../../SharedVault/User/SharedVaultUserPermission' +import { SharedVaultUserPermission } from '../../../SharedVault/User/SharedVaultUserPermission' describe('InviteUserToSharedVault', () => { let sharedVaultRepository: SharedVaultRepositoryInterface diff --git a/packages/syncing-server/src/Domain/UseCase/InviteUserToSharedVault/InviteUserToSharedVault.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/InviteUserToSharedVault/InviteUserToSharedVault.ts similarity index 87% rename from packages/syncing-server/src/Domain/UseCase/InviteUserToSharedVault/InviteUserToSharedVault.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/InviteUserToSharedVault/InviteUserToSharedVault.ts index f0fbc9cee..a2dbb020e 100644 --- a/packages/syncing-server/src/Domain/UseCase/InviteUserToSharedVault/InviteUserToSharedVault.ts +++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/InviteUserToSharedVault/InviteUserToSharedVault.ts @@ -1,10 +1,10 @@ import { Result, Timestamps, UseCaseInterface, Uuid } from '@standardnotes/domain-core' -import { SharedVaultInvite } from '../../SharedVault/User/Invite/SharedVaultInvite' -import { SharedVaultRepositoryInterface } from '../../SharedVault/SharedVaultRepositoryInterface' +import { SharedVaultInvite } from '../../../SharedVault/User/Invite/SharedVaultInvite' +import { SharedVaultRepositoryInterface } from '../../../SharedVault/SharedVaultRepositoryInterface' import { InviteUserToSharedVaultDTO } from './InviteUserToSharedVaultDTO' -import { SharedVaultInviteRepositoryInterface } from '../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface' +import { SharedVaultInviteRepositoryInterface } from '../../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface' import { TimerInterface } from '@standardnotes/time' -import { SharedVaultUserPermission } from '../../SharedVault/User/SharedVaultUserPermission' +import { SharedVaultUserPermission } from '../../../SharedVault/User/SharedVaultUserPermission' export class InviteUserToSharedVault implements UseCaseInterface { constructor( diff --git a/packages/syncing-server/src/Domain/UseCase/InviteUserToSharedVault/InviteUserToSharedVaultDTO.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/InviteUserToSharedVault/InviteUserToSharedVaultDTO.ts similarity index 100% rename from packages/syncing-server/src/Domain/UseCase/InviteUserToSharedVault/InviteUserToSharedVaultDTO.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/InviteUserToSharedVault/InviteUserToSharedVaultDTO.ts diff --git a/packages/syncing-server/src/Domain/UseCase/RemoveUserFromSharedVault/RemoveUserFromSharedVault.spec.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/RemoveUserFromSharedVault/RemoveUserFromSharedVault.spec.ts similarity index 92% rename from packages/syncing-server/src/Domain/UseCase/RemoveUserFromSharedVault/RemoveUserFromSharedVault.spec.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/RemoveUserFromSharedVault/RemoveUserFromSharedVault.spec.ts index d8e70ef3b..03c4d7e89 100644 --- a/packages/syncing-server/src/Domain/UseCase/RemoveUserFromSharedVault/RemoveUserFromSharedVault.spec.ts +++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/RemoveUserFromSharedVault/RemoveUserFromSharedVault.spec.ts @@ -1,12 +1,12 @@ import { Uuid, Timestamps, Result } from '@standardnotes/domain-core' -import { SharedVault } from '../../SharedVault/SharedVault' -import { SharedVaultRepositoryInterface } from '../../SharedVault/SharedVaultRepositoryInterface' -import { SharedVaultUser } from '../../SharedVault/User/SharedVaultUser' -import { SharedVaultUserPermission } from '../../SharedVault/User/SharedVaultUserPermission' -import { SharedVaultUserRepositoryInterface } from '../../SharedVault/User/SharedVaultUserRepositoryInterface' +import { SharedVault } from '../../../SharedVault/SharedVault' +import { SharedVaultRepositoryInterface } from '../../../SharedVault/SharedVaultRepositoryInterface' +import { SharedVaultUser } from '../../../SharedVault/User/SharedVaultUser' +import { SharedVaultUserPermission } from '../../../SharedVault/User/SharedVaultUserPermission' +import { SharedVaultUserRepositoryInterface } from '../../../SharedVault/User/SharedVaultUserRepositoryInterface' import { RemoveUserFromSharedVault } from './RemoveUserFromSharedVault' -import { AddNotificationForUser } from '../AddNotificationForUser/AddNotificationForUser' +import { AddNotificationForUser } from '../../Messaging/AddNotificationForUser/AddNotificationForUser' describe('RemoveUserFromSharedVault', () => { let sharedVaultRepository: SharedVaultRepositoryInterface diff --git a/packages/syncing-server/src/Domain/UseCase/RemoveUserFromSharedVault/RemoveUserFromSharedVault.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/RemoveUserFromSharedVault/RemoveUserFromSharedVault.ts similarity index 86% rename from packages/syncing-server/src/Domain/UseCase/RemoveUserFromSharedVault/RemoveUserFromSharedVault.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/RemoveUserFromSharedVault/RemoveUserFromSharedVault.ts index 34d5e1742..e0e5338d4 100644 --- a/packages/syncing-server/src/Domain/UseCase/RemoveUserFromSharedVault/RemoveUserFromSharedVault.ts +++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/RemoveUserFromSharedVault/RemoveUserFromSharedVault.ts @@ -1,10 +1,10 @@ import { Result, UseCaseInterface, Uuid } from '@standardnotes/domain-core' import { RemoveUserFromSharedVaultDTO } from './RemoveUserFromSharedVaultDTO' -import { SharedVaultRepositoryInterface } from '../../SharedVault/SharedVaultRepositoryInterface' -import { SharedVaultUserRepositoryInterface } from '../../SharedVault/User/SharedVaultUserRepositoryInterface' -import { AddNotificationForUser } from '../AddNotificationForUser/AddNotificationForUser' -import { NotificationType } from '../../Notifications/NotificationType' +import { SharedVaultRepositoryInterface } from '../../../SharedVault/SharedVaultRepositoryInterface' +import { SharedVaultUserRepositoryInterface } from '../../../SharedVault/User/SharedVaultUserRepositoryInterface' +import { NotificationType } from '../../../Notifications/NotificationType' +import { AddNotificationForUser } from '../../Messaging/AddNotificationForUser/AddNotificationForUser' export class RemoveUserFromSharedVault implements UseCaseInterface { constructor( diff --git a/packages/syncing-server/src/Domain/UseCase/RemoveUserFromSharedVault/RemoveUserFromSharedVaultDTO.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/RemoveUserFromSharedVault/RemoveUserFromSharedVaultDTO.ts similarity index 100% rename from packages/syncing-server/src/Domain/UseCase/RemoveUserFromSharedVault/RemoveUserFromSharedVaultDTO.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/RemoveUserFromSharedVault/RemoveUserFromSharedVaultDTO.ts diff --git a/packages/syncing-server/src/Domain/UseCase/UpdateSharedVaultInvite/UpdateSharedVaultInvite.spec.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/UpdateSharedVaultInvite/UpdateSharedVaultInvite.spec.ts similarity index 94% rename from packages/syncing-server/src/Domain/UseCase/UpdateSharedVaultInvite/UpdateSharedVaultInvite.spec.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/UpdateSharedVaultInvite/UpdateSharedVaultInvite.spec.ts index 0eded5976..e3edc9ee1 100644 --- a/packages/syncing-server/src/Domain/UseCase/UpdateSharedVaultInvite/UpdateSharedVaultInvite.spec.ts +++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/UpdateSharedVaultInvite/UpdateSharedVaultInvite.spec.ts @@ -1,9 +1,9 @@ import { TimerInterface } from '@standardnotes/time' -import { SharedVaultInviteRepositoryInterface } from '../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface' +import { SharedVaultInviteRepositoryInterface } from '../../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface' import { UpdateSharedVaultInvite } from './UpdateSharedVaultInvite' -import { SharedVaultInvite } from '../../SharedVault/User/Invite/SharedVaultInvite' +import { SharedVaultInvite } from '../../../SharedVault/User/Invite/SharedVaultInvite' import { Timestamps, Uuid } from '@standardnotes/domain-core' -import { SharedVaultUserPermission } from '../../SharedVault/User/SharedVaultUserPermission' +import { SharedVaultUserPermission } from '../../../SharedVault/User/SharedVaultUserPermission' describe('UpdateSharedVaultInvite', () => { let sharedVaultInviteRepository: SharedVaultInviteRepositoryInterface diff --git a/packages/syncing-server/src/Domain/UseCase/UpdateSharedVaultInvite/UpdateSharedVaultInvite.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/UpdateSharedVaultInvite/UpdateSharedVaultInvite.ts similarity index 87% rename from packages/syncing-server/src/Domain/UseCase/UpdateSharedVaultInvite/UpdateSharedVaultInvite.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/UpdateSharedVaultInvite/UpdateSharedVaultInvite.ts index c928a7373..721e05522 100644 --- a/packages/syncing-server/src/Domain/UseCase/UpdateSharedVaultInvite/UpdateSharedVaultInvite.ts +++ b/packages/syncing-server/src/Domain/UseCase/SharedVaults/UpdateSharedVaultInvite/UpdateSharedVaultInvite.ts @@ -1,10 +1,10 @@ import { Result, Timestamps, UseCaseInterface, Uuid, Validator } from '@standardnotes/domain-core' -import { SharedVaultInviteRepositoryInterface } from '../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface' +import { SharedVaultInviteRepositoryInterface } from '../../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface' import { UpdateSharedVaultInviteDTO } from './UpdateSharedVaultInviteDTO' -import { SharedVaultUserPermission } from '../../SharedVault/User/SharedVaultUserPermission' +import { SharedVaultUserPermission } from '../../../SharedVault/User/SharedVaultUserPermission' import { TimerInterface } from '@standardnotes/time' -import { SharedVaultInvite } from '../../SharedVault/User/Invite/SharedVaultInvite' +import { SharedVaultInvite } from '../../../SharedVault/User/Invite/SharedVaultInvite' export class UpdateSharedVaultInvite implements UseCaseInterface { constructor( diff --git a/packages/syncing-server/src/Domain/UseCase/UpdateSharedVaultInvite/UpdateSharedVaultInviteDTO.ts b/packages/syncing-server/src/Domain/UseCase/SharedVaults/UpdateSharedVaultInvite/UpdateSharedVaultInviteDTO.ts similarity index 100% rename from packages/syncing-server/src/Domain/UseCase/UpdateSharedVaultInvite/UpdateSharedVaultInviteDTO.ts rename to packages/syncing-server/src/Domain/UseCase/SharedVaults/UpdateSharedVaultInvite/UpdateSharedVaultInviteDTO.ts diff --git a/packages/syncing-server/src/Domain/UseCase/CheckIntegrity/CheckIntegrity.spec.ts b/packages/syncing-server/src/Domain/UseCase/Syncing/CheckIntegrity/CheckIntegrity.spec.ts similarity index 97% rename from packages/syncing-server/src/Domain/UseCase/CheckIntegrity/CheckIntegrity.spec.ts rename to packages/syncing-server/src/Domain/UseCase/Syncing/CheckIntegrity/CheckIntegrity.spec.ts index a1bce6656..50a51d916 100644 --- a/packages/syncing-server/src/Domain/UseCase/CheckIntegrity/CheckIntegrity.spec.ts +++ b/packages/syncing-server/src/Domain/UseCase/Syncing/CheckIntegrity/CheckIntegrity.spec.ts @@ -1,6 +1,6 @@ import 'reflect-metadata' -import { ItemRepositoryInterface } from '../../Item/ItemRepositoryInterface' +import { ItemRepositoryInterface } from '../../../Item/ItemRepositoryInterface' import { CheckIntegrity } from './CheckIntegrity' import { ContentType } from '@standardnotes/common' diff --git a/packages/syncing-server/src/Domain/UseCase/CheckIntegrity/CheckIntegrity.ts b/packages/syncing-server/src/Domain/UseCase/Syncing/CheckIntegrity/CheckIntegrity.ts similarity index 91% rename from packages/syncing-server/src/Domain/UseCase/CheckIntegrity/CheckIntegrity.ts rename to packages/syncing-server/src/Domain/UseCase/Syncing/CheckIntegrity/CheckIntegrity.ts index f8d32a867..dd9ce6aa1 100644 --- a/packages/syncing-server/src/Domain/UseCase/CheckIntegrity/CheckIntegrity.ts +++ b/packages/syncing-server/src/Domain/UseCase/Syncing/CheckIntegrity/CheckIntegrity.ts @@ -1,11 +1,11 @@ import { IntegrityPayload } from '@standardnotes/responses' import { ContentType } from '@standardnotes/common' -import { ItemRepositoryInterface } from '../../Item/ItemRepositoryInterface' -import { UseCaseInterface } from '../UseCaseInterface' +import { ItemRepositoryInterface } from '../../../Item/ItemRepositoryInterface' +import { UseCaseInterface } from '../../UseCaseInterface' import { CheckIntegrityDTO } from './CheckIntegrityDTO' import { CheckIntegrityResponse } from './CheckIntegrityResponse' -import { ExtendedIntegrityPayload } from '../../Item/ExtendedIntegrityPayload' +import { ExtendedIntegrityPayload } from '../../../Item/ExtendedIntegrityPayload' export class CheckIntegrity implements UseCaseInterface { constructor(private itemRepository: ItemRepositoryInterface) {} diff --git a/packages/syncing-server/src/Domain/UseCase/CheckIntegrity/CheckIntegrityDTO.ts b/packages/syncing-server/src/Domain/UseCase/Syncing/CheckIntegrity/CheckIntegrityDTO.ts similarity index 100% rename from packages/syncing-server/src/Domain/UseCase/CheckIntegrity/CheckIntegrityDTO.ts rename to packages/syncing-server/src/Domain/UseCase/Syncing/CheckIntegrity/CheckIntegrityDTO.ts diff --git a/packages/syncing-server/src/Domain/UseCase/CheckIntegrity/CheckIntegrityResponse.ts b/packages/syncing-server/src/Domain/UseCase/Syncing/CheckIntegrity/CheckIntegrityResponse.ts similarity index 100% rename from packages/syncing-server/src/Domain/UseCase/CheckIntegrity/CheckIntegrityResponse.ts rename to packages/syncing-server/src/Domain/UseCase/Syncing/CheckIntegrity/CheckIntegrityResponse.ts diff --git a/packages/syncing-server/src/Domain/UseCase/GetItem/GetItem.spec.ts b/packages/syncing-server/src/Domain/UseCase/Syncing/GetItem/GetItem.spec.ts similarity index 88% rename from packages/syncing-server/src/Domain/UseCase/GetItem/GetItem.spec.ts rename to packages/syncing-server/src/Domain/UseCase/Syncing/GetItem/GetItem.spec.ts index eb97418a6..9d1beae3d 100644 --- a/packages/syncing-server/src/Domain/UseCase/GetItem/GetItem.spec.ts +++ b/packages/syncing-server/src/Domain/UseCase/Syncing/GetItem/GetItem.spec.ts @@ -1,6 +1,6 @@ import 'reflect-metadata' -import { Item } from '../../Item/Item' -import { ItemRepositoryInterface } from '../../Item/ItemRepositoryInterface' +import { Item } from '../../../Item/Item' +import { ItemRepositoryInterface } from '../../../Item/ItemRepositoryInterface' import { GetItem } from './GetItem' diff --git a/packages/syncing-server/src/Domain/UseCase/GetItem/GetItem.ts b/packages/syncing-server/src/Domain/UseCase/Syncing/GetItem/GetItem.ts similarity index 80% rename from packages/syncing-server/src/Domain/UseCase/GetItem/GetItem.ts rename to packages/syncing-server/src/Domain/UseCase/Syncing/GetItem/GetItem.ts index d95007d30..7ec77ccd3 100644 --- a/packages/syncing-server/src/Domain/UseCase/GetItem/GetItem.ts +++ b/packages/syncing-server/src/Domain/UseCase/Syncing/GetItem/GetItem.ts @@ -1,5 +1,5 @@ -import { ItemRepositoryInterface } from '../../Item/ItemRepositoryInterface' -import { UseCaseInterface } from '../UseCaseInterface' +import { ItemRepositoryInterface } from '../../../Item/ItemRepositoryInterface' +import { UseCaseInterface } from '../../UseCaseInterface' import { GetItemDTO } from './GetItemDTO' import { GetItemResponse } from './GetItemResponse' diff --git a/packages/syncing-server/src/Domain/UseCase/GetItem/GetItemDTO.ts b/packages/syncing-server/src/Domain/UseCase/Syncing/GetItem/GetItemDTO.ts similarity index 100% rename from packages/syncing-server/src/Domain/UseCase/GetItem/GetItemDTO.ts rename to packages/syncing-server/src/Domain/UseCase/Syncing/GetItem/GetItemDTO.ts diff --git a/packages/syncing-server/src/Domain/UseCase/GetItem/GetItemResponse.ts b/packages/syncing-server/src/Domain/UseCase/Syncing/GetItem/GetItemResponse.ts similarity index 76% rename from packages/syncing-server/src/Domain/UseCase/GetItem/GetItemResponse.ts rename to packages/syncing-server/src/Domain/UseCase/Syncing/GetItem/GetItemResponse.ts index bfe4f6b4e..e6b9bbccd 100644 --- a/packages/syncing-server/src/Domain/UseCase/GetItem/GetItemResponse.ts +++ b/packages/syncing-server/src/Domain/UseCase/Syncing/GetItem/GetItemResponse.ts @@ -1,4 +1,4 @@ -import { Item } from '../../Item/Item' +import { Item } from '../../../Item/Item' export type GetItemResponse = | { diff --git a/packages/syncing-server/src/Domain/UseCase/SyncItems.spec.ts b/packages/syncing-server/src/Domain/UseCase/Syncing/SyncItems/SyncItems.spec.ts similarity index 94% rename from packages/syncing-server/src/Domain/UseCase/SyncItems.spec.ts rename to packages/syncing-server/src/Domain/UseCase/Syncing/SyncItems/SyncItems.spec.ts index 1857fe253..f988041d4 100644 --- a/packages/syncing-server/src/Domain/UseCase/SyncItems.spec.ts +++ b/packages/syncing-server/src/Domain/UseCase/Syncing/SyncItems/SyncItems.spec.ts @@ -2,10 +2,10 @@ import 'reflect-metadata' import { ContentType } from '@standardnotes/common' -import { ApiVersion } from '../Api/ApiVersion' -import { Item } from '../Item/Item' -import { ItemHash } from '../Item/ItemHash' -import { ItemServiceInterface } from '../Item/ItemServiceInterface' +import { ApiVersion } from '../../../Api/ApiVersion' +import { Item } from '../../../Item/Item' +import { ItemHash } from '../../../Item/ItemHash' +import { ItemServiceInterface } from '../../../Item/ItemServiceInterface' import { SyncItems } from './SyncItems' diff --git a/packages/syncing-server/src/Domain/UseCase/SyncItems.ts b/packages/syncing-server/src/Domain/UseCase/Syncing/SyncItems/SyncItems.ts similarity index 89% rename from packages/syncing-server/src/Domain/UseCase/SyncItems.ts rename to packages/syncing-server/src/Domain/UseCase/Syncing/SyncItems/SyncItems.ts index 641202fd4..3fcbd953d 100644 --- a/packages/syncing-server/src/Domain/UseCase/SyncItems.ts +++ b/packages/syncing-server/src/Domain/UseCase/Syncing/SyncItems/SyncItems.ts @@ -1,9 +1,9 @@ -import { Item } from '../Item/Item' -import { ItemConflict } from '../Item/ItemConflict' -import { ItemServiceInterface } from '../Item/ItemServiceInterface' +import { Item } from '../../../Item/Item' +import { ItemConflict } from '../../../Item/ItemConflict' +import { ItemServiceInterface } from '../../../Item/ItemServiceInterface' +import { UseCaseInterface } from '../../UseCaseInterface' import { SyncItemsDTO } from './SyncItemsDTO' import { SyncItemsResponse } from './SyncItemsResponse' -import { UseCaseInterface } from './UseCaseInterface' export class SyncItems implements UseCaseInterface { constructor(private itemService: ItemServiceInterface) {} diff --git a/packages/syncing-server/src/Domain/UseCase/SyncItemsDTO.ts b/packages/syncing-server/src/Domain/UseCase/Syncing/SyncItems/SyncItemsDTO.ts similarity index 85% rename from packages/syncing-server/src/Domain/UseCase/SyncItemsDTO.ts rename to packages/syncing-server/src/Domain/UseCase/Syncing/SyncItems/SyncItemsDTO.ts index 6e57bac14..c17497ed5 100644 --- a/packages/syncing-server/src/Domain/UseCase/SyncItemsDTO.ts +++ b/packages/syncing-server/src/Domain/UseCase/Syncing/SyncItems/SyncItemsDTO.ts @@ -1,4 +1,4 @@ -import { ItemHash } from '../Item/ItemHash' +import { ItemHash } from '../../../Item/ItemHash' export type SyncItemsDTO = { userUuid: string diff --git a/packages/syncing-server/src/Domain/UseCase/SyncItemsResponse.ts b/packages/syncing-server/src/Domain/UseCase/Syncing/SyncItems/SyncItemsResponse.ts similarity index 62% rename from packages/syncing-server/src/Domain/UseCase/SyncItemsResponse.ts rename to packages/syncing-server/src/Domain/UseCase/Syncing/SyncItems/SyncItemsResponse.ts index fcc940ddd..108a73a03 100644 --- a/packages/syncing-server/src/Domain/UseCase/SyncItemsResponse.ts +++ b/packages/syncing-server/src/Domain/UseCase/Syncing/SyncItems/SyncItemsResponse.ts @@ -1,5 +1,5 @@ -import { Item } from '../Item/Item' -import { ItemConflict } from '../Item/ItemConflict' +import { Item } from '../../../Item/Item' +import { ItemConflict } from '../../../Item/ItemConflict' export type SyncItemsResponse = { retrievedItems: Array diff --git a/packages/syncing-server/src/Infra/InversifyExpressUtils/HomeServer/HomeServerItemsController.ts b/packages/syncing-server/src/Infra/InversifyExpressUtils/HomeServer/HomeServerItemsController.ts index 9e0a7268c..f48ffc3d0 100644 --- a/packages/syncing-server/src/Infra/InversifyExpressUtils/HomeServer/HomeServerItemsController.ts +++ b/packages/syncing-server/src/Infra/InversifyExpressUtils/HomeServer/HomeServerItemsController.ts @@ -4,12 +4,12 @@ import { Request, Response } from 'express' import { Item } from '../../../Domain/Item/Item' import { SyncResponseFactoryResolverInterface } from '../../../Domain/Item/SyncResponse/SyncResponseFactoryResolverInterface' -import { CheckIntegrity } from '../../../Domain/UseCase/CheckIntegrity/CheckIntegrity' -import { GetItem } from '../../../Domain/UseCase/GetItem/GetItem' -import { SyncItems } from '../../../Domain/UseCase/SyncItems' +import { CheckIntegrity } from '../../../Domain/UseCase/Syncing/CheckIntegrity/CheckIntegrity' +import { GetItem } from '../../../Domain/UseCase/Syncing/GetItem/GetItem' import { ItemProjection } from '../../../Projection/ItemProjection' import { ProjectorInterface } from '../../../Projection/ProjectorInterface' import { ApiVersion } from '../../../Domain/Api/ApiVersion' +import { SyncItems } from '../../../Domain/UseCase/Syncing/SyncItems/SyncItems' export class HomeServerItemsController extends BaseHttpController { constructor( diff --git a/packages/syncing-server/src/Infra/InversifyExpressUtils/HomeServer/HomeServerSharedVaultInvitesController.ts b/packages/syncing-server/src/Infra/InversifyExpressUtils/HomeServer/HomeServerSharedVaultInvitesController.ts index 649c44383..85b6452c6 100644 --- a/packages/syncing-server/src/Infra/InversifyExpressUtils/HomeServer/HomeServerSharedVaultInvitesController.ts +++ b/packages/syncing-server/src/Infra/InversifyExpressUtils/HomeServer/HomeServerSharedVaultInvitesController.ts @@ -3,16 +3,16 @@ import { BaseHttpController, results } from 'inversify-express-utils' import { HttpStatusCode } from '@standardnotes/responses' import { ControllerContainerInterface, MapperInterface } from '@standardnotes/domain-core' -import { InviteUserToSharedVault } from '../../../Domain/UseCase/InviteUserToSharedVault/InviteUserToSharedVault' +import { InviteUserToSharedVault } from '../../../Domain/UseCase/SharedVaults/InviteUserToSharedVault/InviteUserToSharedVault' import { SharedVaultInvite } from '../../../Domain/SharedVault/User/Invite/SharedVaultInvite' import { SharedVaultInviteHttpRepresentation } from '../../../Mapping/Http/SharedVaultInviteHttpRepresentation' -import { UpdateSharedVaultInvite } from '../../../Domain/UseCase/UpdateSharedVaultInvite/UpdateSharedVaultInvite' -import { AcceptInviteToSharedVault } from '../../../Domain/UseCase/AcceptInviteToSharedVault/AcceptInviteToSharedVault' -import { DeclineInviteToSharedVault } from '../../../Domain/UseCase/DeclineInviteToSharedVault/DeclineInviteToSharedVault' -import { DeleteSharedVaultInvitesToUser } from '../../../Domain/UseCase/DeleteSharedVaultInvitesToUser/DeleteSharedVaultInvitesToUser' -import { GetSharedVaultInvitesSentByUser } from '../../../Domain/UseCase/GetSharedVaultInvitesSentByUser/GetSharedVaultInvitesSentByUser' -import { DeleteSharedVaultInvitesSentByUser } from '../../../Domain/UseCase/DeleteSharedVaultInvitesSentByUser/DeleteSharedVaultInvitesSentByUser' -import { GetSharedVaultInvitesSentToUser } from '../../../Domain/UseCase/GetSharedVaultInvitesSentToUser/GetSharedVaultInvitesSentToUser' +import { UpdateSharedVaultInvite } from '../../../Domain/UseCase/SharedVaults/UpdateSharedVaultInvite/UpdateSharedVaultInvite' +import { AcceptInviteToSharedVault } from '../../../Domain/UseCase/SharedVaults/AcceptInviteToSharedVault/AcceptInviteToSharedVault' +import { DeclineInviteToSharedVault } from '../../../Domain/UseCase/SharedVaults/DeclineInviteToSharedVault/DeclineInviteToSharedVault' +import { DeleteSharedVaultInvitesToUser } from '../../../Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesToUser/DeleteSharedVaultInvitesToUser' +import { GetSharedVaultInvitesSentByUser } from '../../../Domain/UseCase/SharedVaults/GetSharedVaultInvitesSentByUser/GetSharedVaultInvitesSentByUser' +import { DeleteSharedVaultInvitesSentByUser } from '../../../Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesSentByUser/DeleteSharedVaultInvitesSentByUser' +import { GetSharedVaultInvitesSentToUser } from '../../../Domain/UseCase/SharedVaults/GetSharedVaultInvitesSentToUser/GetSharedVaultInvitesSentToUser' export class HomeServerSharedVaultInvitesController extends BaseHttpController { constructor( diff --git a/packages/syncing-server/src/Infra/InversifyExpressUtils/HomeServer/HomeServerSharedVaultUsersController.ts b/packages/syncing-server/src/Infra/InversifyExpressUtils/HomeServer/HomeServerSharedVaultUsersController.ts index df3b5a292..f6f9ad892 100644 --- a/packages/syncing-server/src/Infra/InversifyExpressUtils/HomeServer/HomeServerSharedVaultUsersController.ts +++ b/packages/syncing-server/src/Infra/InversifyExpressUtils/HomeServer/HomeServerSharedVaultUsersController.ts @@ -5,8 +5,8 @@ import { ControllerContainerInterface, MapperInterface } from '@standardnotes/do import { SharedVaultUser } from '../../../Domain/SharedVault/User/SharedVaultUser' import { SharedVaultUserHttpRepresentation } from '../../../Mapping/Http/SharedVaultUserHttpRepresentation' -import { GetSharedVaultUsers } from '../../../Domain/UseCase/GetSharedVaultUsers/GetSharedVaultUsers' -import { RemoveUserFromSharedVault } from '../../../Domain/UseCase/RemoveUserFromSharedVault/RemoveUserFromSharedVault' +import { GetSharedVaultUsers } from '../../../Domain/UseCase/SharedVaults/GetSharedVaultUsers/GetSharedVaultUsers' +import { RemoveUserFromSharedVault } from '../../../Domain/UseCase/SharedVaults/RemoveUserFromSharedVault/RemoveUserFromSharedVault' export class HomeServerSharedVaultUsersController extends BaseHttpController { constructor( diff --git a/packages/syncing-server/src/Infra/InversifyExpressUtils/HomeServer/HomeServerSharedVaultsController.ts b/packages/syncing-server/src/Infra/InversifyExpressUtils/HomeServer/HomeServerSharedVaultsController.ts index 6c5f3cd7d..51cfbf6b5 100644 --- a/packages/syncing-server/src/Infra/InversifyExpressUtils/HomeServer/HomeServerSharedVaultsController.ts +++ b/packages/syncing-server/src/Infra/InversifyExpressUtils/HomeServer/HomeServerSharedVaultsController.ts @@ -3,14 +3,14 @@ import { BaseHttpController, results } from 'inversify-express-utils' import { HttpStatusCode } from '@standardnotes/responses' import { ControllerContainerInterface, MapperInterface } from '@standardnotes/domain-core' -import { GetSharedVaults } from '../../../Domain/UseCase/GetSharedVaults/GetSharedVaults' +import { GetSharedVaults } from '../../../Domain/UseCase/SharedVaults/GetSharedVaults/GetSharedVaults' import { SharedVault } from '../../../Domain/SharedVault/SharedVault' import { SharedVaultHttpRepresentation } from '../../../Mapping/Http/SharedVaultHttpRepresentation' -import { CreateSharedVault } from '../../../Domain/UseCase/CreateSharedVault/CreateSharedVault' +import { CreateSharedVault } from '../../../Domain/UseCase/SharedVaults/CreateSharedVault/CreateSharedVault' import { SharedVaultUser } from '../../../Domain/SharedVault/User/SharedVaultUser' import { SharedVaultUserHttpRepresentation } from '../../../Mapping/Http/SharedVaultUserHttpRepresentation' -import { DeleteSharedVault } from '../../../Domain/UseCase/DeleteSharedVault/DeleteSharedVault' -import { CreateSharedVaultFileValetToken } from '../../../Domain/UseCase/CreateSharedVaultFileValetToken/CreateSharedVaultFileValetToken' +import { DeleteSharedVault } from '../../../Domain/UseCase/SharedVaults/DeleteSharedVault/DeleteSharedVault' +import { CreateSharedVaultFileValetToken } from '../../../Domain/UseCase/SharedVaults/CreateSharedVaultFileValetToken/CreateSharedVaultFileValetToken' export class HomeServerSharedVaultsController extends BaseHttpController { constructor( diff --git a/packages/syncing-server/src/Infra/InversifyExpressUtils/InversifyExpressItemsController.spec.ts b/packages/syncing-server/src/Infra/InversifyExpressUtils/InversifyExpressItemsController.spec.ts index 7239ffc38..2ce92cf22 100644 --- a/packages/syncing-server/src/Infra/InversifyExpressUtils/InversifyExpressItemsController.spec.ts +++ b/packages/syncing-server/src/Infra/InversifyExpressUtils/InversifyExpressItemsController.spec.ts @@ -12,9 +12,9 @@ import { ApiVersion } from '../../Domain/Api/ApiVersion' import { SyncResponse20200115 } from '../../Domain/Item/SyncResponse/SyncResponse20200115' import { SyncResponseFactoryInterface } from '../../Domain/Item/SyncResponse/SyncResponseFactoryInterface' import { SyncResponseFactoryResolverInterface } from '../../Domain/Item/SyncResponse/SyncResponseFactoryResolverInterface' -import { CheckIntegrity } from '../../Domain/UseCase/CheckIntegrity/CheckIntegrity' -import { GetItem } from '../../Domain/UseCase/GetItem/GetItem' -import { SyncItems } from '../../Domain/UseCase/SyncItems' +import { CheckIntegrity } from '../../Domain/UseCase/Syncing/CheckIntegrity/CheckIntegrity' +import { GetItem } from '../../Domain/UseCase/Syncing/GetItem/GetItem' +import { SyncItems } from '../../Domain/UseCase/Syncing/SyncItems/SyncItems' describe('InversifyExpressItemsController', () => { let syncItems: SyncItems diff --git a/packages/syncing-server/src/Infra/InversifyExpressUtils/InversifyExpressItemsController.ts b/packages/syncing-server/src/Infra/InversifyExpressUtils/InversifyExpressItemsController.ts index 7a13b23f8..ea74cb611 100644 --- a/packages/syncing-server/src/Infra/InversifyExpressUtils/InversifyExpressItemsController.ts +++ b/packages/syncing-server/src/Infra/InversifyExpressUtils/InversifyExpressItemsController.ts @@ -5,9 +5,9 @@ import { controller, httpGet, httpPost, results } from 'inversify-express-utils' import TYPES from '../../Bootstrap/Types' import { Item } from '../../Domain/Item/Item' import { SyncResponseFactoryResolverInterface } from '../../Domain/Item/SyncResponse/SyncResponseFactoryResolverInterface' -import { CheckIntegrity } from '../../Domain/UseCase/CheckIntegrity/CheckIntegrity' -import { GetItem } from '../../Domain/UseCase/GetItem/GetItem' -import { SyncItems } from '../../Domain/UseCase/SyncItems' +import { CheckIntegrity } from '../../Domain/UseCase/Syncing/CheckIntegrity/CheckIntegrity' +import { GetItem } from '../../Domain/UseCase/Syncing/GetItem/GetItem' +import { SyncItems } from '../../Domain/UseCase/Syncing/SyncItems/SyncItems' import { ItemProjection } from '../../Projection/ItemProjection' import { ProjectorInterface } from '../../Projection/ProjectorInterface' import { HomeServerItemsController } from './HomeServer/HomeServerItemsController' diff --git a/packages/syncing-server/src/Infra/InversifyExpressUtils/InversifyExpressSharedVaultInvitesController.ts b/packages/syncing-server/src/Infra/InversifyExpressUtils/InversifyExpressSharedVaultInvitesController.ts index 8a958447b..5cf669028 100644 --- a/packages/syncing-server/src/Infra/InversifyExpressUtils/InversifyExpressSharedVaultInvitesController.ts +++ b/packages/syncing-server/src/Infra/InversifyExpressUtils/InversifyExpressSharedVaultInvitesController.ts @@ -4,16 +4,16 @@ import { Request, Response } from 'express' import TYPES from '../../Bootstrap/Types' import { SharedVaultInvite } from '../../Domain/SharedVault/User/Invite/SharedVaultInvite' -import { AcceptInviteToSharedVault } from '../../Domain/UseCase/AcceptInviteToSharedVault/AcceptInviteToSharedVault' -import { DeclineInviteToSharedVault } from '../../Domain/UseCase/DeclineInviteToSharedVault/DeclineInviteToSharedVault' -import { DeleteSharedVaultInvitesSentByUser } from '../../Domain/UseCase/DeleteSharedVaultInvitesSentByUser/DeleteSharedVaultInvitesSentByUser' -import { DeleteSharedVaultInvitesToUser } from '../../Domain/UseCase/DeleteSharedVaultInvitesToUser/DeleteSharedVaultInvitesToUser' -import { GetSharedVaultInvitesSentByUser } from '../../Domain/UseCase/GetSharedVaultInvitesSentByUser/GetSharedVaultInvitesSentByUser' -import { InviteUserToSharedVault } from '../../Domain/UseCase/InviteUserToSharedVault/InviteUserToSharedVault' -import { UpdateSharedVaultInvite } from '../../Domain/UseCase/UpdateSharedVaultInvite/UpdateSharedVaultInvite' +import { AcceptInviteToSharedVault } from '../../Domain/UseCase/SharedVaults/AcceptInviteToSharedVault/AcceptInviteToSharedVault' +import { DeclineInviteToSharedVault } from '../../Domain/UseCase/SharedVaults/DeclineInviteToSharedVault/DeclineInviteToSharedVault' +import { DeleteSharedVaultInvitesSentByUser } from '../../Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesSentByUser/DeleteSharedVaultInvitesSentByUser' +import { DeleteSharedVaultInvitesToUser } from '../../Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesToUser/DeleteSharedVaultInvitesToUser' +import { GetSharedVaultInvitesSentByUser } from '../../Domain/UseCase/SharedVaults/GetSharedVaultInvitesSentByUser/GetSharedVaultInvitesSentByUser' +import { InviteUserToSharedVault } from '../../Domain/UseCase/SharedVaults/InviteUserToSharedVault/InviteUserToSharedVault' +import { UpdateSharedVaultInvite } from '../../Domain/UseCase/SharedVaults/UpdateSharedVaultInvite/UpdateSharedVaultInvite' import { SharedVaultInviteHttpRepresentation } from '../../Mapping/Http/SharedVaultInviteHttpRepresentation' import { HomeServerSharedVaultInvitesController } from './HomeServer/HomeServerSharedVaultInvitesController' -import { GetSharedVaultInvitesSentToUser } from '../../Domain/UseCase/GetSharedVaultInvitesSentToUser/GetSharedVaultInvitesSentToUser' +import { GetSharedVaultInvitesSentToUser } from '../../Domain/UseCase/SharedVaults/GetSharedVaultInvitesSentToUser/GetSharedVaultInvitesSentToUser' import { inject } from 'inversify' @controller('/shared-vaults', TYPES.Sync_AuthMiddleware) diff --git a/packages/syncing-server/src/Infra/InversifyExpressUtils/InversifyExpressSharedVaultUsersController.ts b/packages/syncing-server/src/Infra/InversifyExpressUtils/InversifyExpressSharedVaultUsersController.ts index 5ecbb819d..eba1e4c7d 100644 --- a/packages/syncing-server/src/Infra/InversifyExpressUtils/InversifyExpressSharedVaultUsersController.ts +++ b/packages/syncing-server/src/Infra/InversifyExpressUtils/InversifyExpressSharedVaultUsersController.ts @@ -7,8 +7,8 @@ import { HomeServerSharedVaultUsersController } from './HomeServer/HomeServerSha import TYPES from '../../Bootstrap/Types' import { SharedVaultUser } from '../../Domain/SharedVault/User/SharedVaultUser' import { SharedVaultUserHttpRepresentation } from '../../Mapping/Http/SharedVaultUserHttpRepresentation' -import { GetSharedVaultUsers } from '../../Domain/UseCase/GetSharedVaultUsers/GetSharedVaultUsers' -import { RemoveUserFromSharedVault } from '../../Domain/UseCase/RemoveUserFromSharedVault/RemoveUserFromSharedVault' +import { GetSharedVaultUsers } from '../../Domain/UseCase/SharedVaults/GetSharedVaultUsers/GetSharedVaultUsers' +import { RemoveUserFromSharedVault } from '../../Domain/UseCase/SharedVaults/RemoveUserFromSharedVault/RemoveUserFromSharedVault' @controller('/shared-vaults/:sharedVaultUuid/users', TYPES.Sync_AuthMiddleware) export class InversifyExpressSharedVaultUsersController extends HomeServerSharedVaultUsersController { diff --git a/packages/syncing-server/src/Infra/InversifyExpressUtils/InversifyExpressSharedVaultsController.ts b/packages/syncing-server/src/Infra/InversifyExpressUtils/InversifyExpressSharedVaultsController.ts index 1c9dfbcbc..6cc3ed5fb 100644 --- a/packages/syncing-server/src/Infra/InversifyExpressUtils/InversifyExpressSharedVaultsController.ts +++ b/packages/syncing-server/src/Infra/InversifyExpressUtils/InversifyExpressSharedVaultsController.ts @@ -7,10 +7,10 @@ import { HomeServerSharedVaultsController } from './HomeServer/HomeServerSharedV import TYPES from '../../Bootstrap/Types' import { SharedVault } from '../../Domain/SharedVault/SharedVault' import { SharedVaultUser } from '../../Domain/SharedVault/User/SharedVaultUser' -import { CreateSharedVault } from '../../Domain/UseCase/CreateSharedVault/CreateSharedVault' -import { CreateSharedVaultFileValetToken } from '../../Domain/UseCase/CreateSharedVaultFileValetToken/CreateSharedVaultFileValetToken' -import { DeleteSharedVault } from '../../Domain/UseCase/DeleteSharedVault/DeleteSharedVault' -import { GetSharedVaults } from '../../Domain/UseCase/GetSharedVaults/GetSharedVaults' +import { CreateSharedVault } from '../../Domain/UseCase/SharedVaults/CreateSharedVault/CreateSharedVault' +import { CreateSharedVaultFileValetToken } from '../../Domain/UseCase/SharedVaults/CreateSharedVaultFileValetToken/CreateSharedVaultFileValetToken' +import { DeleteSharedVault } from '../../Domain/UseCase/SharedVaults/DeleteSharedVault/DeleteSharedVault' +import { GetSharedVaults } from '../../Domain/UseCase/SharedVaults/GetSharedVaults/GetSharedVaults' import { SharedVaultHttpRepresentation } from '../../Mapping/Http/SharedVaultHttpRepresentation' import { SharedVaultUserHttpRepresentation } from '../../Mapping/Http/SharedVaultUserHttpRepresentation'