Улучшение соответсвия

Report/puml/fig_04_domain_class.puml

@@ -1,4 +1,5 @@
 @startuml fig_04_domain_class
+title Модуль :domain — IVaultsManager / IVault / IStorage
 scale 1.15
 skinparam shadowing false
 skinparam classFontSize 10
@@ -23,9 +24,13 @@ package usecases {
     class GetOpenedStoragesUseCase {
         + getOpenedStorages(): StateFlow<Map<UUID, IStorageInfo>>
     }
-    class ManageLocalVaultUseCase {
-        + getLocalStorages(): StateFlow<List<IStorageInfo>>
-        + createStorage(): Unit
+    class ManageVaultUseCase {
+        + find(UUID): IVault?
+        + storagesOf(UUID): Flow<List<IStorage>>
+        + createStorage(UUID): IStorage
+    }
+    class FindStorageUseCase {
+        + find(UUID): IStorage?
     }
     class StorageFileManagementUseCase {
         + getAllDirs(): Unit
@@ -101,9 +106,6 @@ package interfaces {
     class ILogger {
         + debug(String, String): void
     }
-    class IYandexVault {
-        + getAccountEmail(): String
-    }
     class IMetaInfo {
         + getSize(): long
         + isDeleted(): boolean
@@ -125,13 +127,9 @@ package interfaces {
         + isVirtualStorage(): boolean
     }
     class IVaultsManager {
-        + getLocalVault(): IVault
-        + removeRemoteVault(UUID): Unit
-        + addYandexVault(String): Unit
-        + getRemoteVaults(): StateFlow<List<IVault>>
-        + getAllStorages(): StateFlow<List<IStorage>>
-        + getAllVaults(): StateFlow<List<IVault>>
-        + getUnlockManager(): IUnlockManager
+        + vaults: StateFlow<List<IVault>>
+        + allStorages: StateFlow<List<IStorage>>
+        + unlockManager: IUnlockManager
     }
     class IStorageMetaInfo {
         + getEncInfo(): StorageEncryptionInfo
@@ -150,22 +148,16 @@ package interfaces {
         + getMetaInfo(): StateFlow<IStorageMetaInfo>
         + isVirtualStorage(): boolean
     }
-    class IStorageExplorer {
-        + getCurrentPath(): StateFlow<String>
-    }
     class IVaultInfo {
-        + getAvailableSpace(): StateFlow<Integer>
-        + getType(): VaultType
-        + getTotalSpace(): StateFlow<Integer>
-        + getUuid(): UUID
-        + isAvailable(): StateFlow<Boolean>
-        + getStorages(): StateFlow<List<IStorageInfo>>
+        + uuid: UUID
     }
     class IUnlockManager {
+        + openedStorages: StateFlow<Map<UUID, IStorage>>
+        + getOpenedStorageKey(UUID): EncryptKey
+        + open(IStorage, EncryptKey, boolean): IStorage
+        + rememberKey(IStorage, EncryptKey): Unit
         + close(IStorage): Unit
         + close(UUID): Unit
-        + open(IStorage, EncryptKey, boolean): Unit
-        + getOpenedStorages(): StateFlow<Map<UUID, IStorage>>
     }
     class IDirectory {
         + getMetaInfo(): IMetaInfo
@@ -194,15 +186,16 @@ package interfaces {
         + getFileInfo(String): Unit
     }
     class IVault {
-        + getAvailableSpace(): StateFlow<Integer>
-        + getType(): VaultType
-        + getTotalSpace(): StateFlow<Integer>
+        + uuid: UUID
+        + storages: StateFlow<List<IStorage>>
+        + storagesScanInProgress: StateFlow<Boolean>
+        + isAvailable: StateFlow<Boolean>
+        + totalSpace: StateFlow<Long>
+        + availableSpace: StateFlow<Long>
+        + createStorage(): IStorage
+        + createStorage(StorageEncryptionInfo): IStorage
         + remove(IStorage): Unit
-        + createStorage(StorageEncryptionInfo): Unit
-        + getUuid(): UUID
-        + isAvailable(): StateFlow<Boolean>
-        + getStorages(): StateFlow<List<IStorage>>
-        + createStorage(): Unit
+        + rescanStorages(): Unit
     }
 }
 
@@ -277,25 +270,6 @@ package common.impl {
     }
 }
 
-package auth {
-    class RemoteYandexAuthResult {
-    }
-    class RemoteYandexSignInLauncher {
-        + launch(): void
-    }
-}
-
-package enums {
-    class VaultType {
-        + DECRYPTED: VaultType
-        + LOCAL: VaultType
-        + YANDEX: VaultType
-        + valueOf(String): VaultType
-        + values(): VaultType[]
-        + getEntries(): EnumEntries<VaultType>
-    }
-}
-
 usecases.ManageStoragesEncryptionUseCase ..> interfaces.IStorageMetaInfo
 usecases.ManageStoragesEncryptionUseCase ..> interfaces.IStorageInfo
 usecases.ManageStoragesEncryptionUseCase ..> tasks.TaskProgress
@@ -312,20 +286,16 @@ usecases.RemoveStorageUseCase ..> interfaces.IUnlockManager
 usecases.RemoveStorageUseCase ..> interfaces.IVault
 tasks.TaskLogLine ..> tasks.TaskLogLevel
 tasks.PipelineWork ..> tasks.TaskContext
-interfaces.IVault <|.. interfaces.IYandexVault
-interfaces.IVaultInfo <|.. interfaces.IYandexVault
-interfaces.IYandexVault ..> interfaces.IStorage
-interfaces.IYandexVault ..> interfaces.IVault
-interfaces.IYandexVault ..> enums.VaultType
-interfaces.IYandexVault ..> datatypes.StorageEncryptionInfo
 usecases.GetOpenedStoragesUseCase ..> interfaces.IStorageInfo
 usecases.GetOpenedStoragesUseCase ..> interfaces.IUnlockManager
 tasks.TaskContext ..> tasks.TaskLogLevel
 tasks.TaskContext ..> tasks.TaskProgress
 tasks.TaskContext ..> tasks.TaskId
-usecases.ManageLocalVaultUseCase ..> interfaces.IStorageInfo
-usecases.ManageLocalVaultUseCase ..> interfaces.IVaultsManager
-usecases.ManageLocalVaultUseCase ..> interfaces.IVault
+usecases.ManageVaultUseCase ..> interfaces.IStorage
+usecases.ManageVaultUseCase ..> interfaces.IVaultsManager
+usecases.ManageVaultUseCase ..> interfaces.IVault
+usecases.FindStorageUseCase ..> interfaces.IStorage
+usecases.FindStorageUseCase ..> interfaces.IVaultsManager
 usecases.StorageFileManagementUseCase ..> interfaces.IFile
 usecases.StorageFileManagementUseCase ..> interfaces.IStorage
 usecases.StorageFileManagementUseCase ..> interfaces.IStorageInfo
@@ -362,9 +332,7 @@ interfaces.IStorageInfo ..> interfaces.IStorageMetaInfo
 interfaces.IStorageInfo ..> interfaces.IStorage
 usecases.RenameStorageUseCase ..> interfaces.IStorage
 usecases.RenameStorageUseCase ..> interfaces.IStorageInfo
-interfaces.IVaultInfo ..> interfaces.IStorageInfo
 interfaces.IVaultInfo ..> interfaces.IVault
-interfaces.IVaultInfo ..> enums.VaultType
 tasks.TaskForegroundItem ..> tasks.TaskProgress
 tasks.TaskForegroundItem ..> tasks.TaskId
 interfaces.IUnlockManager ..> interfaces.IStorage
@@ -376,9 +344,7 @@ interfaces.IStorageAccessor ..> datatypes.DataPackage
 interfaces.IVaultInfo <|.. interfaces.IVault
 interfaces.IVault ..> interfaces.IStorage
 interfaces.IVault ..> interfaces.IVaultInfo
-interfaces.IVault ..> enums.VaultType
 interfaces.IVault ..> datatypes.StorageEncryptionInfo
-auth.RemoteYandexSignInLauncher ..> auth.RemoteYandexAuthResult
 datatypes.DataPackage <|-- datatypes.DataPage
 datatypes.DataPage ..> datatypes.DataPackage
 interfaces.IFile <|.. common.impl.CommonFile