Merge pull request #10 from BouyguesTelecom/clean/archi-folder

change backup-storage in utils => delegated-storage in api
BouyguesTelecom · Nov 19, 2024 · 8a78afc · 8a78afc
2 parents 44357d0 + 3b87d3d
commit 8a78afc
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 101 deletions.
diff --git a/local/redis/dumps/dump.rdb b/local/redis/dumps/dump.rdb
diff --git a/src/api/controllers/backup.controller.ts b/src/api/controllers/backup.controller.ts
@@ -1,5 +1,5 @@
 import { Request, Response } from 'express';
-import { getLastDump, deleteFileBackup, getFileBackup, updateFileBackup, uploadFileBackup } from '../utils/backup-storage';
+import { getLastDump, deleteFileBackup, getFileBackup, updateFileBackup, uploadFileBackup } from '../delegated-storage/index';
 import fs from 'fs';
 import { BackupProps } from '../props/backup';
 

diff --git a/...s/backup-storage/distant-backend/utils.ts → ...elegated-storage/distant-backend/utils.ts b/...s/backup-storage/distant-backend/utils.ts → ...elegated-storage/distant-backend/utils.ts
@@ -1,8 +1,8 @@
 import fetch, { Headers } from 'node-fetch';
-import { BackupProps } from '../../../props/backup';
-import { connectClient, disconnectClient } from '../../redis/connection';
-import { addMultipleFiles } from '../../redis/operations';
-import { logger } from '../../logs/winston';
+import { BackupProps } from '../../props/backup';
+import { connectClient, disconnectClient } from '../../utils/redis/connection';
+import { addMultipleFiles } from '../../utils/redis/operations';
+import { logger } from '../../utils/logs/winston';
 
 interface UploadFileProps {
     filepath: string;

diff --git a/src/api/utils/backup-storage/index.ts → src/api/delegated-storage/index.ts b/src/api/utils/backup-storage/index.ts → src/api/delegated-storage/index.ts
@@ -1,6 +1,6 @@
 import * as distantBackend from './distant-backend/utils';
 import * as s3 from './s3/utils';
-import { logger } from '../logs/winston';
+import { logger } from '../utils/logs/winston';
 
 export interface FilePathProps {
     filepath: string;

diff --git a/...api/utils/backup-storage/s3/connection.ts → src/api/delegated-storage/s3/connection.ts b/...api/utils/backup-storage/s3/connection.ts → src/api/delegated-storage/s3/connection.ts
diff --git a/src/api/utils/backup-storage/s3/utils.ts → src/api/delegated-storage/s3/utils.ts b/src/api/utils/backup-storage/s3/utils.ts → src/api/delegated-storage/s3/utils.ts
@@ -1,9 +1,9 @@
 import { minioClient } from './connection';
 import { FileProps } from '../types';
 import { promisify } from 'node:util';
-import { addMultipleFiles, getLastVersion } from '../../redis/operations';
-import { connectClient, disconnectClient } from '../../redis/connection';
-import app from '../../../app';
+import { addMultipleFiles, getLastVersion } from '../../utils/redis/operations';
+import { connectClient, disconnectClient } from '../../utils/redis/connection';
+import app from '../../app';
 
 export const getLastDump = async () => {
     const getObjectAsync = promisify(minioClient.getObject.bind(minioClient));

diff --git a/src/api/utils/backup-storage/types.ts → src/api/delegated-storage/types.ts b/src/api/utils/backup-storage/types.ts → src/api/delegated-storage/types.ts
diff --git a/src/api/server.ts b/src/api/server.ts
@@ -2,8 +2,8 @@ import app from './app';
 import { logger } from './utils/logs/winston';
 import fs from 'fs';
 import { redisClient } from './utils/redis/connection';
-import { getLastDump } from './utils/backup-storage';
-import { minioClient } from './utils/backup-storage/s3/connection';
+import { getLastDump } from './delegated-storage/index';
+import { minioClient } from './delegated-storage/s3/connection';
 import { expressListRoutes } from './utils/list-routes';
 import fetch from 'node-fetch';
 

diff --git a/src/api/tests/api.test.ts b/src/api/tests/api.test.ts