feat: Move Backup & Cache Repository to new folder structure (#18239)

* feat: Move AudioRepository to new folder structure

* feat: Move Backup & Cache Repository to new folder structure

* fix path for cache repository

src/script/components/HistoryExport/HistoryExport.tsx

@@ -25,6 +25,7 @@ import {Button, ButtonVariant, FlexBox} from '@wireapp/react-ui-kit';
 
 import {LoadingBar} from 'Components/LoadingBar/LoadingBar';
 import {PrimaryModal} from 'Components/Modals/PrimaryModal';
+import {CancelError} from 'Repositories/backup/Error';
 import {ClientState} from 'src/script/client/ClientState';
 import {User} from 'src/script/entity/User';
 import {ContentState} from 'src/script/page/useAppState';
@@ -33,7 +34,6 @@ import {getLogger} from 'Util/Logger';
 import {getCurrentDate} from 'Util/TimeUtil';
 import {downloadBlob} from 'Util/util';
 
-import {CancelError} from '../../backup/Error';
 import {Config} from '../../Config';
 import {RootContext} from '../../page/RootProvider';
 

src/script/components/HistoryImport/HistoryImport.tsx

@@ -24,6 +24,14 @@ import {Button, ButtonVariant} from '@wireapp/react-ui-kit';
 import * as Icon from 'Components/Icon';
 import {LoadingBar} from 'Components/LoadingBar/LoadingBar';
 import {PrimaryModal} from 'Components/Modals/PrimaryModal';
+import {BackupRepository} from 'Repositories/backup/BackupRepository';
+import {
+  CancelError,
+  DifferentAccountError,
+  IncompatibleBackupError,
+  IncompatibleBackupFormatError,
+  InvalidPassword,
+} from 'Repositories/backup/Error';
 import {User} from 'src/script/entity/User';
 import {ContentState} from 'src/script/page/useAppState';
 import {checkBackupEncryption} from 'Util/BackupUtil';
@@ -33,14 +41,6 @@ import {loadFileBuffer} from 'Util/util';
 
 import {BackupFileUpload} from './BackupFileUpload';
 
-import {BackupRepository} from '../../backup/BackupRepository';
-import {
-  CancelError,
-  DifferentAccountError,
-  IncompatibleBackupError,
-  IncompatibleBackupFormatError,
-  InvalidPassword,
-} from '../../backup/Error';
 import {Config} from '../../Config';
 import {MotionDuration} from '../../motion/MotionDuration';
 

src/script/main/app.ts

@@ -34,6 +34,9 @@ import {WebAppEvents} from '@wireapp/webapp-events';
 import {PrimaryModal} from 'Components/Modals/PrimaryModal';
 import {AssetRepository} from 'Repositories/assets/AssetRepository';
 import {AudioRepository} from 'Repositories/audio/AudioRepository';
+import {BackupRepository} from 'Repositories/backup/BackupRepository';
+import {BackupService} from 'Repositories/backup/BackupService';
+import {CacheRepository} from 'Repositories/cache/CacheRepository';
 import {initializeDataDog} from 'Util/DataDog';
 import {DebugUtil} from 'Util/DebugUtil';
 import {Environment} from 'Util/Environment';
@@ -47,9 +50,6 @@ import {AppInitializationStep, checkIndexedDb, InitializationEventLogger} from '
 import '../../style/default.less';
 import {SIGN_OUT_REASON} from '../auth/SignOutReason';
 import {URLParameter} from '../auth/URLParameter';
-import {BackupRepository} from '../backup/BackupRepository';
-import {BackupService} from '../backup/BackupService';
-import {CacheRepository} from '../cache/CacheRepository';
 import {CallingRepository} from '../calling/CallingRepository';
 import {ClientRepository, ClientService} from '../client';
 import {getClientMLSConfig} from '../client/clientMLSConfig';

src/script/backup/BackupRepository.test.ts → src/script/repositories/backup/BackupRepository.test.ts

@@ -34,11 +34,11 @@ import {BackupService} from './BackupService';
 import {CancelError, DifferentAccountError, IncompatiblePlatformError} from './Error';
 import {handleZipEvent} from './zipWorker';
 
-import {User} from '../entity/User';
-import {ClientEvent} from '../event/Client';
-import {DatabaseTypes, createStorageEngine} from '../service/StoreEngineProvider';
-import {StorageService} from '../storage';
-import {StorageSchemata} from '../storage/StorageSchemata';
+import {User} from '../../entity/User';
+import {ClientEvent} from '../../event/Client';
+import {DatabaseTypes, createStorageEngine} from '../../service/StoreEngineProvider';
+import {StorageService} from '../../storage';
+import {StorageSchemata} from '../../storage/StorageSchemata';
 
 const conversationId = '35a9a89d-70dc-4d9e-88a2-4d8758458a6a';
 

src/script/backup/BackupRepository.ts → src/script/repositories/backup/BackupRepository.ts

@@ -40,13 +40,13 @@ import {
 } from './Error';
 import {preprocessConversations, preprocessEvents, preprocessUsers} from './recordPreprocessors';
 
-import type {ConversationRepository} from '../conversation/ConversationRepository';
-import {isReadableConversation} from '../conversation/ConversationSelectors';
-import type {Conversation} from '../entity/Conversation';
-import {User} from '../entity/User';
-import {EventRecord, UserRecord} from '../storage';
-import {ConversationRecord} from '../storage/record/ConversationRecord';
-import {StorageSchemata} from '../storage/StorageSchemata';
+import type {ConversationRepository} from '../../conversation/ConversationRepository';
+import {isReadableConversation} from '../../conversation/ConversationSelectors';
+import type {Conversation} from '../../entity/Conversation';
+import {User} from '../../entity/User';
+import {EventRecord, UserRecord} from '../../storage';
+import {ConversationRecord} from '../../storage/record/ConversationRecord';
+import {StorageSchemata} from '../../storage/StorageSchemata';
 
 interface Metadata {
   client_id: string;

src/script/backup/BackupService.ts → src/script/repositories/backup/BackupService.ts

@@ -23,8 +23,8 @@ import {container} from 'tsyringe';
 
 import {Logger, getLogger} from 'Util/Logger';
 
-import {CONVERSATION} from '../event/Client';
-import {StorageService} from '../storage';
+import {CONVERSATION} from '../../event/Client';
+import {StorageService} from '../../storage';
 
 export class BackupService {
   private readonly logger: Logger;

src/script/backup/recordPreprocessors.ts → src/script/repositories/backup/recordPreprocessors.ts

@@ -17,8 +17,8 @@
  *
  */
 
-import {ClientEvent} from '../event/Client';
-import {ConversationRecord, EventRecord, UserRecord} from '../storage';
+import {ClientEvent} from '../../event/Client';
+import {ConversationRecord, EventRecord, UserRecord} from '../../storage';
 
 export function preprocessEvents(events: EventRecord[]): EventRecord[] {
   // The verification message are not relevant for a new device (no conversation can be verified on a new device).

src/script/cache/CacheRepository.ts → src/script/repositories/cache/CacheRepository.ts

@@ -21,7 +21,7 @@ import {amplify} from 'amplify';
 
 import {resetStoreValue} from 'Util/StorageUtil';
 
-import {StorageKey} from '../storage/StorageKey';
+import {StorageKey} from '../../storage/StorageKey';
 
 export class CacheRepository {
   public static CACHE_KEY = {

src/script/util/BackupUtil.ts

@@ -17,7 +17,7 @@
  *
  */
 
-import {ENCRYPTED_BACKUP_FORMAT} from '../backup/BackUpHeader';
+import {ENCRYPTED_BACKUP_FORMAT} from 'Repositories/backup/BackUpHeader';
 
 export const checkBackupEncryption = async (data: ArrayBuffer | Blob): Promise<boolean> => {
   const fileBytes = await getFileBytes(data);

src/script/view_model/MainViewModel.ts

@@ -21,13 +21,13 @@ import {container} from 'tsyringe';
 
 import type {AssetRepository} from 'Repositories/assets/AssetRepository';
 import type {AudioRepository} from 'Repositories/audio/AudioRepository';
+import type {BackupRepository} from 'Repositories/backup/BackupRepository';
 
 import {ActionsViewModel} from './ActionsViewModel';
 import {CallingViewModel} from './CallingViewModel';
 import {ContentViewModel} from './ContentViewModel';
 import {ListViewModel} from './ListViewModel';
 
-import type {BackupRepository} from '../backup/BackupRepository';
 import type {CallingRepository} from '../calling/CallingRepository';
 import type {ClientRepository} from '../client';
 import type {ConnectionRepository} from '../connection/ConnectionRepository';

test/unit_tests/cache/CacheRepositorySpec.js

@@ -19,7 +19,7 @@
 
 import {amplify} from 'amplify';
 
-import {CacheRepository} from 'src/script/cache/CacheRepository';
+import {CacheRepository} from 'Repositories/cache/CacheRepository';
 import {StorageKey} from 'src/script/storage/StorageKey';
 import {createUuid} from 'Util/uuid';