From a118229faf3d154006e479ec18a5678e30fbf54d Mon Sep 17 00:00:00 2001
From: Anthony Rimet <anthony.rimet03@gmail.com>
Date: Mon, 25 Sep 2023 17:48:52 +0200
Subject: [PATCH] Fix(tenant): Add tenant name in path for upload file

---
 globalConfig.json                     | 2 +-
 src/api/controller/api/upload.js      | 8 ++++----
 src/api/controller/api/upload.spec.js | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/globalConfig.json b/globalConfig.json
index f53601ce2..43aa976ac 100644
--- a/globalConfig.json
+++ b/globalConfig.json
@@ -1 +1 @@
-{"mongoUri":"mongodb://127.0.0.1:36595/jest?","mongoDBName":"jest"}
\ No newline at end of file
+{"mongoUri":"mongodb://127.0.0.1:43217/jest?","mongoDBName":"jest"}
\ No newline at end of file
diff --git a/src/api/controller/api/upload.js b/src/api/controller/api/upload.js
index 766930ae8..9769b64c1 100644
--- a/src/api/controller/api/upload.js
+++ b/src/api/controller/api/upload.js
@@ -70,9 +70,9 @@ export const parseRequest = async (ctx, loaderName, next) => {
         totalChunks: parseInt(resumableTotalChunks, 10),
         totalSize: parseInt(resumableTotalSize, 10),
         currentChunkSize: parseInt(resumableCurrentChunkSize, 10),
-        filename: `${config.uploadDir}/${resumableIdentifier}`,
+        filename: `${config.uploadDir}/${ctx.tenant}_${resumableIdentifier}`,
         extension,
-        chunkname: `${config.uploadDir}/${resumableIdentifier}.${chunkNumber}`,
+        chunkname: `${config.uploadDir}/${ctx.tenant}_${resumableIdentifier}.${chunkNumber}`,
         stream,
         customLoader: loaderName === 'custom-loader' ? customLoader : null,
     };
@@ -168,8 +168,8 @@ export const checkChunkMiddleware = async (ctx, loaderName) => {
     const chunkNumber = parseInt(resumableChunkNumber, 10);
     const totalChunks = parseInt(resumableTotalChunks, 10);
     const currentChunkSize = parseInt(resumableCurrentChunkSize, 10);
-    const filename = `${config.uploadDir}/${resumableIdentifier}`;
-    const chunkname = `${config.uploadDir}/${resumableIdentifier}.${resumableChunkNumber}`;
+    const filename = `${config.uploadDir}/${ctx.tenant}_${resumableIdentifier}`;
+    const chunkname = `${config.uploadDir}/${ctx.tenant}_${resumableIdentifier}.${resumableChunkNumber}`;
     const [extension] = resumableFilename.match(/[^.]*$/);
 
     const exists = await checkFileExists(chunkname, currentChunkSize);
diff --git a/src/api/controller/api/upload.spec.js b/src/api/controller/api/upload.spec.js
index f5f27fab8..26b7b8154 100644
--- a/src/api/controller/api/upload.spec.js
+++ b/src/api/controller/api/upload.spec.js
@@ -44,8 +44,8 @@ describe('upload', () => {
             expect(next).toHaveBeenCalled();
             expect(ctx.resumable).toEqual({
                 stream: 'stream',
-                filename: `${config.uploadDir}/identifier`,
-                chunkname: `${config.uploadDir}/identifier.10`,
+                filename: `${config.uploadDir}/lodex_test_identifier`,
+                chunkname: `${config.uploadDir}/lodex_test_identifier.10`,
                 totalChunks: 100,
                 totalSize: 500,
                 currentChunkSize: 5,