From 8bc92616d2fbeb833c3fcbef6b87538745fc7f3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20S=C3=B3jko?= Date: Tue, 11 Oct 2022 11:59:51 +0200 Subject: [PATCH] feat(workspace): extract workspace user status to common --- .../src/Domain/Workspace/WorkspaceUserStatus.ts | 0 packages/common/src/Domain/index.ts | 1 + .../src/Domain/UseCase/AcceptInvitation/AcceptInvitation.ts | 2 +- .../src/Domain/UseCase/CreateWorkspace/CreateWorkspace.ts | 3 +-- .../UseCase/InviteToWorkspace/InviteToWorkspace.spec.ts | 1 + packages/workspace/src/Domain/Workspace/WorkspaceUser.ts | 4 +--- 6 files changed, 5 insertions(+), 6 deletions(-) rename packages/{workspace => common}/src/Domain/Workspace/WorkspaceUserStatus.ts (100%) diff --git a/packages/workspace/src/Domain/Workspace/WorkspaceUserStatus.ts b/packages/common/src/Domain/Workspace/WorkspaceUserStatus.ts similarity index 100% rename from packages/workspace/src/Domain/Workspace/WorkspaceUserStatus.ts rename to packages/common/src/Domain/Workspace/WorkspaceUserStatus.ts diff --git a/packages/common/src/Domain/index.ts b/packages/common/src/Domain/index.ts index 8779f81eb..a770d5c84 100644 --- a/packages/common/src/Domain/index.ts +++ b/packages/common/src/Domain/index.ts @@ -26,3 +26,4 @@ export * from './Validator/UuidValidator' export * from './Validator/ValidatorInterface' export * from './Workspace/WorkspaceAccessLevel' export * from './Workspace/WorkspaceType' +export * from './Workspace/WorkspaceUserStatus' diff --git a/packages/workspace/src/Domain/UseCase/AcceptInvitation/AcceptInvitation.ts b/packages/workspace/src/Domain/UseCase/AcceptInvitation/AcceptInvitation.ts index 01ca793df..357834b3a 100644 --- a/packages/workspace/src/Domain/UseCase/AcceptInvitation/AcceptInvitation.ts +++ b/packages/workspace/src/Domain/UseCase/AcceptInvitation/AcceptInvitation.ts @@ -1,4 +1,5 @@ import { TimerInterface } from '@standardnotes/time' +import { WorkspaceUserStatus } from '@standardnotes/common' import { inject, injectable } from 'inversify' import TYPES from '../../../Bootstrap/Types' @@ -6,7 +7,6 @@ import { WorkspaceInviteRepositoryInterface } from '../../Invite/WorkspaceInvite import { WorkspaceInviteStatus } from '../../Invite/WorkspaceInviteStatus' import { WorkspaceUser } from '../../Workspace/WorkspaceUser' import { WorkspaceUserRepositoryInterface } from '../../Workspace/WorkspaceUserRepositoryInterface' -import { WorkspaceUserStatus } from '../../Workspace/WorkspaceUserStatus' import { UseCaseInterface } from '../UseCaseInterface' import { AcceptInvitationDTO } from './AcceptInvitationDTO' diff --git a/packages/workspace/src/Domain/UseCase/CreateWorkspace/CreateWorkspace.ts b/packages/workspace/src/Domain/UseCase/CreateWorkspace/CreateWorkspace.ts index 08442ddf3..bf0193f74 100644 --- a/packages/workspace/src/Domain/UseCase/CreateWorkspace/CreateWorkspace.ts +++ b/packages/workspace/src/Domain/UseCase/CreateWorkspace/CreateWorkspace.ts @@ -1,5 +1,5 @@ import { TimerInterface } from '@standardnotes/time' -import { WorkspaceAccessLevel } from '@standardnotes/common' +import { WorkspaceAccessLevel, WorkspaceUserStatus } from '@standardnotes/common' import { inject, injectable } from 'inversify' import TYPES from '../../../Bootstrap/Types' @@ -7,7 +7,6 @@ import { Workspace } from '../../Workspace/Workspace' import { WorkspaceRepositoryInterface } from '../../Workspace/WorkspaceRepositoryInterface' import { WorkspaceUser } from '../../Workspace/WorkspaceUser' import { WorkspaceUserRepositoryInterface } from '../../Workspace/WorkspaceUserRepositoryInterface' -import { WorkspaceUserStatus } from '../../Workspace/WorkspaceUserStatus' import { UseCaseInterface } from '../UseCaseInterface' import { CreateWorkspaceDTO } from './CreateWorkspaceDTO' diff --git a/packages/workspace/src/Domain/UseCase/InviteToWorkspace/InviteToWorkspace.spec.ts b/packages/workspace/src/Domain/UseCase/InviteToWorkspace/InviteToWorkspace.spec.ts index f6c2cd674..349ed6a4e 100644 --- a/packages/workspace/src/Domain/UseCase/InviteToWorkspace/InviteToWorkspace.spec.ts +++ b/packages/workspace/src/Domain/UseCase/InviteToWorkspace/InviteToWorkspace.spec.ts @@ -60,6 +60,7 @@ describe('InviteToWorkspace', () => { }) expect(workspaceInviteRepository.save).toHaveBeenCalledWith({ + accessLevel: 'write-and-read', inviterUuid: 'u-1-2-3', inviteeEmail: 'test@test.te', workspaceUuid: 'w-1-2-3', diff --git a/packages/workspace/src/Domain/Workspace/WorkspaceUser.ts b/packages/workspace/src/Domain/Workspace/WorkspaceUser.ts index 646ca671b..ca5de6f2c 100644 --- a/packages/workspace/src/Domain/Workspace/WorkspaceUser.ts +++ b/packages/workspace/src/Domain/Workspace/WorkspaceUser.ts @@ -1,8 +1,6 @@ -import { WorkspaceAccessLevel } from '@standardnotes/common' +import { WorkspaceAccessLevel, WorkspaceUserStatus } from '@standardnotes/common' import { Column, Entity, Index, PrimaryGeneratedColumn } from 'typeorm' -import { WorkspaceUserStatus } from './WorkspaceUserStatus' - @Entity({ name: 'workspace_users' }) @Index('index_workspace_users_on_workspace_and_user', ['userUuid', 'workspaceUuid'], { unique: true }) export class WorkspaceUser {