From 49f8b4a0243f74733eb1c773c15a05b3c566b1ed Mon Sep 17 00:00:00 2001 From: Futa Arai Date: Mon, 2 Sep 2024 21:09:40 +0900 Subject: [PATCH] move envToModuleMappings to file-uploader interface file --- apps/app/src/interfaces/file-uploader.ts | 10 +++++++++- apps/app/src/server/service/file-uploader/index.ts | 11 ++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/apps/app/src/interfaces/file-uploader.ts b/apps/app/src/interfaces/file-uploader.ts index 362ed9c50af..eb3eb331097 100644 --- a/apps/app/src/interfaces/file-uploader.ts +++ b/apps/app/src/interfaces/file-uploader.ts @@ -9,7 +9,7 @@ export const FileUploadType = { export type FileUploadType = typeof FileUploadType[keyof typeof FileUploadType] -// file upload type strings you can specify in the env var +// file upload type strings you can specify in the env variable export const FileUploadTypeForEnvVar = { ...FileUploadType, mongo: 'mongo', @@ -18,3 +18,11 @@ export const FileUploadTypeForEnvVar = { } as const; export type FileUploadTypeForEnvVar = typeof FileUploadTypeForEnvVar[keyof typeof FileUploadTypeForEnvVar] + +// mapping from env variable to actual module name +export const EnvToModuleMappings = { + ...FileUploadTypeForEnvVar, + mongo: 'gridfs', + mongodb: 'gridfs', + gcp: 'gcs', +} as const; diff --git a/apps/app/src/server/service/file-uploader/index.ts b/apps/app/src/server/service/file-uploader/index.ts index 05fdac9097b..8dcd8772340 100644 --- a/apps/app/src/server/service/file-uploader/index.ts +++ b/apps/app/src/server/service/file-uploader/index.ts @@ -1,4 +1,4 @@ -import { FileUploadTypeForEnvVar } from '~/interfaces/file-uploader'; +import { EnvToModuleMappings } from '~/interfaces/file-uploader'; import type Crowi from '~/server/crowi'; import loggerFactory from '~/utils/logger'; @@ -10,15 +10,8 @@ export type { FileUploader } from './file-uploader'; const logger = loggerFactory('growi:service:FileUploaderServise'); -const envToModuleMappings = { - ...FileUploadTypeForEnvVar, - mongo: 'gridfs', - mongodb: 'gridfs', - gcp: 'gcs', -} as const; - export const getUploader = (crowi: Crowi): FileUploader => { - const method = envToModuleMappings[configManager.getConfig('crowi', 'app:fileUploadType')]; + const method = EnvToModuleMappings[configManager.getConfig('crowi', 'app:fileUploadType')]; const modulePath = `./${method}`; const uploader = require(modulePath)(crowi);