Bläddra i källkod

feat: extract shared vault user permission to domain-core

Karol Sójko 1 år sedan
förälder
incheckning
e215ac4343
29 ändrade filer med 62 tillägg och 54 borttagningar
  1. 0 0
      packages/domain-core/src/Domain/SharedVault/SharedVaultUserPermission.spec.ts
  2. 2 1
      packages/domain-core/src/Domain/SharedVault/SharedVaultUserPermission.ts
  3. 0 0
      packages/domain-core/src/Domain/SharedVault/SharedVaultUserPermissionProps.ts
  4. 3 0
      packages/domain-core/src/Domain/index.ts
  5. 9 2
      packages/syncing-server/src/Domain/Item/SaveRule/SharedVaultFilter.spec.ts
  6. 1 2
      packages/syncing-server/src/Domain/Item/SaveRule/SharedVaultFilter.ts
  7. 1 2
      packages/syncing-server/src/Domain/SharedVault/User/Invite/SharedVaultInvite.spec.ts
  8. 1 2
      packages/syncing-server/src/Domain/SharedVault/User/Invite/SharedVaultInviteProps.ts
  9. 1 2
      packages/syncing-server/src/Domain/SharedVault/User/SharedVaultUser.spec.ts
  10. 1 3
      packages/syncing-server/src/Domain/SharedVault/User/SharedVaultUserProps.ts
  11. 1 2
      packages/syncing-server/src/Domain/UseCase/SharedVaults/AcceptInviteToSharedVault/AcceptInviteToSharedVault.spec.ts
  12. 1 2
      packages/syncing-server/src/Domain/UseCase/SharedVaults/AddUserToSharedVault/AddUserToSharedVault.ts
  13. 1 2
      packages/syncing-server/src/Domain/UseCase/SharedVaults/CreateSharedVaultFileValetToken/CreateSharedVaultFileValetToken.spec.ts
  14. 1 2
      packages/syncing-server/src/Domain/UseCase/SharedVaults/CreateSharedVaultFileValetToken/CreateSharedVaultFileValetToken.ts
  15. 1 2
      packages/syncing-server/src/Domain/UseCase/SharedVaults/DeclineInviteToSharedVault/DeclineInviteToSharedVault.spec.ts
  16. 1 2
      packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVault/DeleteSharedVault.spec.ts
  17. 1 2
      packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesSentByUser/DeleteSharedVaultInvitesSentByUser.spec.ts
  18. 1 2
      packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesToUser/DeleteSharedVaultInvitesToUser.spec.ts
  19. 1 2
      packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaultInvitesSentByUser/GetSharedVaultInvitesSentByUser.spec.ts
  20. 1 2
      packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaultInvitesSentToUser/GetSharedVaultInvitesSentToUser.spec.ts
  21. 1 2
      packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaultUsers/GetSharedVaultUsers.spec.ts
  22. 1 2
      packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaults/GetSharedVaults.spec.ts
  23. 2 2
      packages/syncing-server/src/Domain/UseCase/SharedVaults/InviteUserToSharedVault/InviteUserToSharedVault.spec.ts
  24. 3 3
      packages/syncing-server/src/Domain/UseCase/SharedVaults/InviteUserToSharedVault/InviteUserToSharedVault.ts
  25. 1 2
      packages/syncing-server/src/Domain/UseCase/SharedVaults/RemoveUserFromSharedVault/RemoveUserFromSharedVault.spec.ts
  26. 1 2
      packages/syncing-server/src/Domain/UseCase/SharedVaults/UpdateSharedVaultInvite/UpdateSharedVaultInvite.spec.ts
  27. 9 3
      packages/syncing-server/src/Domain/UseCase/SharedVaults/UpdateSharedVaultInvite/UpdateSharedVaultInvite.ts
  28. 8 2
      packages/syncing-server/src/Mapping/Persistence/SharedVaultInvitePersistenceMapper.ts
  29. 7 2
      packages/syncing-server/src/Mapping/Persistence/SharedVaultUserPersistenceMapper.ts

+ 0 - 0
packages/syncing-server/src/Domain/SharedVault/User/SharedVaultUserPermission.spec.ts → packages/domain-core/src/Domain/SharedVault/SharedVaultUserPermission.spec.ts


+ 2 - 1
packages/syncing-server/src/Domain/SharedVault/User/SharedVaultUserPermission.ts → packages/domain-core/src/Domain/SharedVault/SharedVaultUserPermission.ts

@@ -1,4 +1,5 @@
-import { Result, ValueObject } from '@standardnotes/domain-core'
+import { Result } from '../Core/Result'
+import { ValueObject } from '../Core/ValueObject'
 
 import { SharedVaultUserPermissionProps } from './SharedVaultUserPermissionProps'
 

+ 0 - 0
packages/syncing-server/src/Domain/SharedVault/User/SharedVaultUserPermissionProps.ts → packages/domain-core/src/Domain/SharedVault/SharedVaultUserPermissionProps.ts


+ 3 - 0
packages/domain-core/src/Domain/index.ts

@@ -59,6 +59,9 @@ export * from './Service/ServiceIdentifier'
 export * from './Service/ServiceIdentifierProps'
 export * from './Service/ServiceInterface'
 
+export * from './SharedVault/SharedVaultUserPermission'
+export * from './SharedVault/SharedVaultUserPermissionProps'
+
 export * from './Subscription/SubscriptionPlanName'
 export * from './Subscription/SubscriptionPlanNameProps'
 

+ 9 - 2
packages/syncing-server/src/Domain/Item/SaveRule/SharedVaultFilter.spec.ts

@@ -1,6 +1,13 @@
-import { ContentType, Dates, Result, Timestamps, UniqueEntityId, Uuid } from '@standardnotes/domain-core'
+import {
+  ContentType,
+  Dates,
+  Result,
+  SharedVaultUserPermission,
+  Timestamps,
+  UniqueEntityId,
+  Uuid,
+} from '@standardnotes/domain-core'
 import { SharedVaultUser } from '../../SharedVault/User/SharedVaultUser'
-import { SharedVaultUserPermission } from '../../SharedVault/User/SharedVaultUserPermission'
 import { SharedVaultUserRepositoryInterface } from '../../SharedVault/User/SharedVaultUserRepositoryInterface'
 import { DetermineSharedVaultOperationOnItem } from '../../UseCase/SharedVaults/DetermineSharedVaultOperationOnItem/DetermineSharedVaultOperationOnItem'
 import { SharedVaultFilter } from './SharedVaultFilter'

+ 1 - 2
packages/syncing-server/src/Domain/Item/SaveRule/SharedVaultFilter.ts

@@ -1,12 +1,11 @@
 import { ConflictType } from '@standardnotes/responses'
-import { ContentType, Result, Uuid } from '@standardnotes/domain-core'
+import { ContentType, Result, SharedVaultUserPermission, Uuid } from '@standardnotes/domain-core'
 
 import { ItemSaveValidationDTO } from '../SaveValidator/ItemSaveValidationDTO'
 import { ItemSaveRuleResult } from './ItemSaveRuleResult'
 import { ItemSaveRuleInterface } from './ItemSaveRuleInterface'
 import { DetermineSharedVaultOperationOnItem } from '../../UseCase/SharedVaults/DetermineSharedVaultOperationOnItem/DetermineSharedVaultOperationOnItem'
 import { SharedVaultOperationOnItem } from '../../SharedVault/SharedVaultOperationOnItem'
-import { SharedVaultUserPermission } from '../../SharedVault/User/SharedVaultUserPermission'
 import { SharedVaultUserRepositoryInterface } from '../../SharedVault/User/SharedVaultUserRepositoryInterface'
 
 export class SharedVaultFilter implements ItemSaveRuleInterface {

+ 1 - 2
packages/syncing-server/src/Domain/SharedVault/User/Invite/SharedVaultInvite.spec.ts

@@ -1,7 +1,6 @@
-import { Timestamps, Uuid } from '@standardnotes/domain-core'
+import { SharedVaultUserPermission, Timestamps, Uuid } from '@standardnotes/domain-core'
 
 import { SharedVaultInvite } from './SharedVaultInvite'
-import { SharedVaultUserPermission } from '../SharedVaultUserPermission'
 
 describe('SharedVaultInvite', () => {
   it('should create an entity', () => {

+ 1 - 2
packages/syncing-server/src/Domain/SharedVault/User/Invite/SharedVaultInviteProps.ts

@@ -1,5 +1,4 @@
-import { Timestamps, Uuid } from '@standardnotes/domain-core'
-import { SharedVaultUserPermission } from '../SharedVaultUserPermission'
+import { SharedVaultUserPermission, Timestamps, Uuid } from '@standardnotes/domain-core'
 
 export interface SharedVaultInviteProps {
   sharedVaultUuid: Uuid

+ 1 - 2
packages/syncing-server/src/Domain/SharedVault/User/SharedVaultUser.spec.ts

@@ -1,7 +1,6 @@
-import { Timestamps, Uuid } from '@standardnotes/domain-core'
+import { SharedVaultUserPermission, Timestamps, Uuid } from '@standardnotes/domain-core'
 
 import { SharedVaultUser } from './SharedVaultUser'
-import { SharedVaultUserPermission } from './SharedVaultUserPermission'
 
 describe('SharedVaultUser', () => {
   it('should create an entity', () => {

+ 1 - 3
packages/syncing-server/src/Domain/SharedVault/User/SharedVaultUserProps.ts

@@ -1,6 +1,4 @@
-import { Timestamps, Uuid } from '@standardnotes/domain-core'
-
-import { SharedVaultUserPermission } from './SharedVaultUserPermission'
+import { SharedVaultUserPermission, Timestamps, Uuid } from '@standardnotes/domain-core'
 
 export interface SharedVaultUserProps {
   sharedVaultUuid: Uuid

+ 1 - 2
packages/syncing-server/src/Domain/UseCase/SharedVaults/AcceptInviteToSharedVault/AcceptInviteToSharedVault.spec.ts

@@ -1,9 +1,8 @@
-import { Result, Timestamps, Uuid } from '@standardnotes/domain-core'
+import { Result, SharedVaultUserPermission, Timestamps, Uuid } from '@standardnotes/domain-core'
 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'
 
 describe('AcceptInviteToSharedVault', () => {
   let addUserToSharedVault: AddUserToSharedVault

+ 1 - 2
packages/syncing-server/src/Domain/UseCase/SharedVaults/AddUserToSharedVault/AddUserToSharedVault.ts

@@ -1,11 +1,10 @@
-import { Result, Timestamps, UseCaseInterface, Uuid } from '@standardnotes/domain-core'
+import { Result, SharedVaultUserPermission, Timestamps, UseCaseInterface, Uuid } from '@standardnotes/domain-core'
 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'
 
 export class AddUserToSharedVault implements UseCaseInterface<SharedVaultUser> {
   constructor(

+ 1 - 2
packages/syncing-server/src/Domain/UseCase/SharedVaults/CreateSharedVaultFileValetToken/CreateSharedVaultFileValetToken.spec.ts

@@ -4,8 +4,7 @@ import { SharedVaultUserRepositoryInterface } from '../../../SharedVault/User/Sh
 import { CreateSharedVaultFileValetToken } from './CreateSharedVaultFileValetToken'
 import { SharedVault } from '../../../SharedVault/SharedVault'
 import { SharedVaultUser } from '../../../SharedVault/User/SharedVaultUser'
-import { SharedVaultUserPermission } from '../../../SharedVault/User/SharedVaultUserPermission'
-import { Timestamps, Uuid } from '@standardnotes/domain-core'
+import { SharedVaultUserPermission, Timestamps, Uuid } from '@standardnotes/domain-core'
 
 describe('CreateSharedVaultFileValetToken', () => {
   let sharedVaultRepository: SharedVaultRepositoryInterface

+ 1 - 2
packages/syncing-server/src/Domain/UseCase/SharedVaults/CreateSharedVaultFileValetToken/CreateSharedVaultFileValetToken.ts

@@ -1,10 +1,9 @@
 import { SharedVaultValetTokenData, TokenEncoderInterface, ValetTokenOperation } from '@standardnotes/security'
+import { Result, SharedVaultUserPermission, UseCaseInterface, Uuid } from '@standardnotes/domain-core'
 
 import { SharedVaultRepositoryInterface } from '../../../SharedVault/SharedVaultRepositoryInterface'
-import { Result, UseCaseInterface, Uuid } from '@standardnotes/domain-core'
 import { SharedVaultUserRepositoryInterface } from '../../../SharedVault/User/SharedVaultUserRepositoryInterface'
 import { CreateSharedVaultFileValetTokenDTO } from './CreateSharedVaultFileValetTokenDTO'
-import { SharedVaultUserPermission } from '../../../SharedVault/User/SharedVaultUserPermission'
 
 export class CreateSharedVaultFileValetToken implements UseCaseInterface<string> {
   constructor(

+ 1 - 2
packages/syncing-server/src/Domain/UseCase/SharedVaults/DeclineInviteToSharedVault/DeclineInviteToSharedVault.spec.ts

@@ -1,8 +1,7 @@
-import { Timestamps, Uuid } from '@standardnotes/domain-core'
+import { SharedVaultUserPermission, Timestamps, Uuid } from '@standardnotes/domain-core'
 import { SharedVaultInviteRepositoryInterface } from '../../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface'
 import { DeclineInviteToSharedVault } from './DeclineInviteToSharedVault'
 import { SharedVaultInvite } from '../../../SharedVault/User/Invite/SharedVaultInvite'
-import { SharedVaultUserPermission } from '../../../SharedVault/User/SharedVaultUserPermission'
 
 describe('DeclineInviteToSharedVault', () => {
   let sharedVaultInviteRepository: SharedVaultInviteRepositoryInterface

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

@@ -1,4 +1,4 @@
-import { Uuid, Timestamps, Result } from '@standardnotes/domain-core'
+import { Uuid, Timestamps, Result, SharedVaultUserPermission } from '@standardnotes/domain-core'
 
 import { SharedVaultRepositoryInterface } from '../../../SharedVault/SharedVaultRepositoryInterface'
 import { SharedVaultInviteRepositoryInterface } from '../../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface'
@@ -6,7 +6,6 @@ import { SharedVaultUserRepositoryInterface } from '../../../SharedVault/User/Sh
 import { DeleteSharedVault } from './DeleteSharedVault'
 import { SharedVault } from '../../../SharedVault/SharedVault'
 import { SharedVaultUser } from '../../../SharedVault/User/SharedVaultUser'
-import { SharedVaultUserPermission } from '../../../SharedVault/User/SharedVaultUserPermission'
 import { RemoveUserFromSharedVault } from '../RemoveUserFromSharedVault/RemoveUserFromSharedVault'
 
 describe('DeleteSharedVault', () => {

+ 1 - 2
packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesSentByUser/DeleteSharedVaultInvitesSentByUser.spec.ts

@@ -1,9 +1,8 @@
-import { Result, Timestamps, Uuid } from '@standardnotes/domain-core'
+import { Result, SharedVaultUserPermission, Timestamps, Uuid } from '@standardnotes/domain-core'
 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'
 
 describe('DeleteSharedVaultInvitesSentByUser', () => {
   let sharedVaultInviteRepository: SharedVaultInviteRepositoryInterface

+ 1 - 2
packages/syncing-server/src/Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesToUser/DeleteSharedVaultInvitesToUser.spec.ts

@@ -1,9 +1,8 @@
-import { Result, Timestamps, Uuid } from '@standardnotes/domain-core'
+import { Result, SharedVaultUserPermission, Timestamps, Uuid } from '@standardnotes/domain-core'
 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'
 
 describe('DeleteSharedVaultInvitesToUser', () => {
   let sharedVaultInviteRepository: SharedVaultInviteRepositoryInterface

+ 1 - 2
packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaultInvitesSentByUser/GetSharedVaultInvitesSentByUser.spec.ts

@@ -1,8 +1,7 @@
-import { Uuid, Timestamps } from '@standardnotes/domain-core'
+import { Uuid, Timestamps, SharedVaultUserPermission } 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 { GetSharedVaultInvitesSentByUser } from './GetSharedVaultInvitesSentByUser'
 
 describe('GetSharedVaultInvitesSentByUser', () => {

+ 1 - 2
packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaultInvitesSentToUser/GetSharedVaultInvitesSentToUser.spec.ts

@@ -1,8 +1,7 @@
-import { Uuid, Timestamps } from '@standardnotes/domain-core'
+import { Uuid, Timestamps, SharedVaultUserPermission } 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 { GetSharedVaultInvitesSentToUser } from './GetSharedVaultInvitesSentToUser'
 
 describe('GetSharedVaultInvitesSentToUser', () => {

+ 1 - 2
packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaultUsers/GetSharedVaultUsers.spec.ts

@@ -1,8 +1,7 @@
-import { Uuid, Timestamps } from '@standardnotes/domain-core'
+import { Uuid, Timestamps, SharedVaultUserPermission } 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 { GetSharedVaultUsers } from './GetSharedVaultUsers'
 

+ 1 - 2
packages/syncing-server/src/Domain/UseCase/SharedVaults/GetSharedVaults/GetSharedVaults.spec.ts

@@ -1,8 +1,7 @@
-import { Timestamps, Uuid } from '@standardnotes/domain-core'
+import { SharedVaultUserPermission, 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 { GetSharedVaults } from './GetSharedVaults'
 

+ 2 - 2
packages/syncing-server/src/Domain/UseCase/SharedVaults/InviteUserToSharedVault/InviteUserToSharedVault.spec.ts

@@ -1,11 +1,11 @@
 import { TimerInterface } from '@standardnotes/time'
+import { Uuid, Timestamps, Result, SharedVaultUserPermission } from '@standardnotes/domain-core'
+
 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 { Uuid, Timestamps, Result } from '@standardnotes/domain-core'
-import { SharedVaultUserPermission } from '../../../SharedVault/User/SharedVaultUserPermission'
 
 describe('InviteUserToSharedVault', () => {
   let sharedVaultRepository: SharedVaultRepositoryInterface

+ 3 - 3
packages/syncing-server/src/Domain/UseCase/SharedVaults/InviteUserToSharedVault/InviteUserToSharedVault.ts

@@ -1,10 +1,10 @@
-import { Result, Timestamps, UseCaseInterface, Uuid } from '@standardnotes/domain-core'
+import { Result, SharedVaultUserPermission, Timestamps, UseCaseInterface, Uuid } from '@standardnotes/domain-core'
+import { TimerInterface } from '@standardnotes/time'
+
 import { SharedVaultInvite } from '../../../SharedVault/User/Invite/SharedVaultInvite'
 import { SharedVaultRepositoryInterface } from '../../../SharedVault/SharedVaultRepositoryInterface'
 import { InviteUserToSharedVaultDTO } from './InviteUserToSharedVaultDTO'
 import { SharedVaultInviteRepositoryInterface } from '../../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface'
-import { TimerInterface } from '@standardnotes/time'
-import { SharedVaultUserPermission } from '../../../SharedVault/User/SharedVaultUserPermission'
 
 export class InviteUserToSharedVault implements UseCaseInterface<SharedVaultInvite> {
   constructor(

+ 1 - 2
packages/syncing-server/src/Domain/UseCase/SharedVaults/RemoveUserFromSharedVault/RemoveUserFromSharedVault.spec.ts

@@ -1,9 +1,8 @@
-import { Uuid, Timestamps, Result, NotificationPayload } from '@standardnotes/domain-core'
+import { Uuid, Timestamps, Result, NotificationPayload, SharedVaultUserPermission } 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 { RemoveUserFromSharedVault } from './RemoveUserFromSharedVault'
 import { AddNotificationForUser } from '../../Messaging/AddNotificationForUser/AddNotificationForUser'

+ 1 - 2
packages/syncing-server/src/Domain/UseCase/SharedVaults/UpdateSharedVaultInvite/UpdateSharedVaultInvite.spec.ts

@@ -2,8 +2,7 @@ import { TimerInterface } from '@standardnotes/time'
 import { SharedVaultInviteRepositoryInterface } from '../../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface'
 import { UpdateSharedVaultInvite } from './UpdateSharedVaultInvite'
 import { SharedVaultInvite } from '../../../SharedVault/User/Invite/SharedVaultInvite'
-import { Timestamps, Uuid } from '@standardnotes/domain-core'
-import { SharedVaultUserPermission } from '../../../SharedVault/User/SharedVaultUserPermission'
+import { SharedVaultUserPermission, Timestamps, Uuid } from '@standardnotes/domain-core'
 
 describe('UpdateSharedVaultInvite', () => {
   let sharedVaultInviteRepository: SharedVaultInviteRepositoryInterface

+ 9 - 3
packages/syncing-server/src/Domain/UseCase/SharedVaults/UpdateSharedVaultInvite/UpdateSharedVaultInvite.ts

@@ -1,9 +1,15 @@
-import { Result, Timestamps, UseCaseInterface, Uuid, Validator } from '@standardnotes/domain-core'
+import {
+  Result,
+  SharedVaultUserPermission,
+  Timestamps,
+  UseCaseInterface,
+  Uuid,
+  Validator,
+} from '@standardnotes/domain-core'
+import { TimerInterface } from '@standardnotes/time'
 
 import { SharedVaultInviteRepositoryInterface } from '../../../SharedVault/User/Invite/SharedVaultInviteRepositoryInterface'
 import { UpdateSharedVaultInviteDTO } from './UpdateSharedVaultInviteDTO'
-import { SharedVaultUserPermission } from '../../../SharedVault/User/SharedVaultUserPermission'
-import { TimerInterface } from '@standardnotes/time'
 import { SharedVaultInvite } from '../../../SharedVault/User/Invite/SharedVaultInvite'
 
 export class UpdateSharedVaultInvite implements UseCaseInterface<SharedVaultInvite> {

+ 8 - 2
packages/syncing-server/src/Mapping/Persistence/SharedVaultInvitePersistenceMapper.ts

@@ -1,8 +1,14 @@
-import { Timestamps, MapperInterface, UniqueEntityId, Uuid, Validator } from '@standardnotes/domain-core'
+import {
+  Timestamps,
+  MapperInterface,
+  UniqueEntityId,
+  Uuid,
+  Validator,
+  SharedVaultUserPermission,
+} from '@standardnotes/domain-core'
 
 import { SharedVaultInvite } from '../../Domain/SharedVault/User/Invite/SharedVaultInvite'
 import { TypeORMSharedVaultInvite } from '../../Infra/TypeORM/TypeORMSharedVaultInvite'
-import { SharedVaultUserPermission } from '../../Domain/SharedVault/User/SharedVaultUserPermission'
 
 export class SharedVaultInvitePersistenceMapper
   implements MapperInterface<SharedVaultInvite, TypeORMSharedVaultInvite>

+ 7 - 2
packages/syncing-server/src/Mapping/Persistence/SharedVaultUserPersistenceMapper.ts

@@ -1,8 +1,13 @@
-import { Timestamps, MapperInterface, UniqueEntityId, Uuid } from '@standardnotes/domain-core'
+import {
+  Timestamps,
+  MapperInterface,
+  UniqueEntityId,
+  Uuid,
+  SharedVaultUserPermission,
+} from '@standardnotes/domain-core'
 
 import { SharedVaultUser } from '../../Domain/SharedVault/User/SharedVaultUser'
 import { TypeORMSharedVaultUser } from '../../Infra/TypeORM/TypeORMSharedVaultUser'
-import { SharedVaultUserPermission } from '../../Domain/SharedVault/User/SharedVaultUserPermission'
 
 export class SharedVaultUserPersistenceMapper implements MapperInterface<SharedVaultUser, TypeORMSharedVaultUser> {
   toDomain(projection: TypeORMSharedVaultUser): SharedVaultUser {