Ver código fonte

replace method call

Yuki Takei 1 ano atrás
pai
commit
acb70e0b37
1 arquivos alterados com 6 adições e 4 exclusões
  1. 6 4
      apps/app/src/server/service/g2g-transfer.ts

+ 6 - 4
apps/app/src/server/service/g2g-transfer.ts

@@ -5,6 +5,7 @@ import type { Readable } from 'stream';
 
 
 // eslint-disable-next-line no-restricted-imports
 // eslint-disable-next-line no-restricted-imports
 import type { IUser } from '@growi/core';
 import type { IUser } from '@growi/core';
+import { ConfigSource } from '@growi/core';
 import rawAxios, { type AxiosRequestConfig } from 'axios';
 import rawAxios, { type AxiosRequestConfig } from 'axios';
 import FormData from 'form-data';
 import FormData from 'form-data';
 import mongoose, { Types as MongooseTypes } from 'mongoose';
 import mongoose, { Types as MongooseTypes } from 'mongoose';
@@ -24,6 +25,7 @@ import { Attachment } from '../models/attachment';
 import { G2GTransferError, G2GTransferErrorCode } from '../models/vo/g2g-transfer-error';
 import { G2GTransferError, G2GTransferErrorCode } from '../models/vo/g2g-transfer-error';
 
 
 import { configManager } from './config-manager';
 import { configManager } from './config-manager';
+import type { ConfigKey } from './config-manager/config-definition';
 import { generateOverwriteParams } from './import/overwrite-params';
 import { generateOverwriteParams } from './import/overwrite-params';
 
 
 const logger = loggerFactory('growi:service:g2g-transfer');
 const logger = loggerFactory('growi:service:g2g-transfer');
@@ -50,7 +52,7 @@ const UPLOAD_CONFIG_KEYS = [
   'azure:storageContainerName',
   'azure:storageContainerName',
   'azure:referenceFileWithRelayMode',
   'azure:referenceFileWithRelayMode',
   'azure:useOnlyEnvVarsForSomeOptions',
   'azure:useOnlyEnvVarsForSomeOptions',
-] as const;
+] satisfies ConfigKey[];
 
 
 /**
 /**
  * File upload related configs
  * File upload related configs
@@ -654,7 +656,7 @@ export class G2GTransferReceiverService implements Receiver {
       await importService.import(collections, importSettingsMap);
       await importService.import(collections, importSettingsMap);
 
 
       // restore file upload config from cache
       // restore file upload config from cache
-      await configManager.removeConfigsInTheSameNamespace('crowi', UPLOAD_CONFIG_KEYS);
+      await configManager.removeConfigs(UPLOAD_CONFIG_KEYS);
       await configManager.updateConfigs(fileUploadConfigs);
       await configManager.updateConfigs(fileUploadConfigs);
     }
     }
     else {
     else {
@@ -671,7 +673,7 @@ export class G2GTransferReceiverService implements Receiver {
 
 
   public async getFileUploadConfigs(): Promise<FileUploadConfigs> {
   public async getFileUploadConfigs(): Promise<FileUploadConfigs> {
     const fileUploadConfigs = Object.fromEntries(UPLOAD_CONFIG_KEYS.map((key) => {
     const fileUploadConfigs = Object.fromEntries(UPLOAD_CONFIG_KEYS.map((key) => {
-      return [key, configManager.getConfigFromDB('crowi', key)];
+      return [key, configManager.getConfig(key, ConfigSource.db)];
     })) as FileUploadConfigs;
     })) as FileUploadConfigs;
 
 
     return fileUploadConfigs;
     return fileUploadConfigs;
@@ -680,7 +682,7 @@ export class G2GTransferReceiverService implements Receiver {
   public async updateFileUploadConfigs(fileUploadConfigs: FileUploadConfigs): Promise<void> {
   public async updateFileUploadConfigs(fileUploadConfigs: FileUploadConfigs): Promise<void> {
     const { appService } = this.crowi;
     const { appService } = this.crowi;
 
 
-    await configManager.removeConfigsInTheSameNamespace('crowi', Object.keys(fileUploadConfigs));
+    await configManager.removeConfigs(Object.keys(fileUploadConfigs));
     await configManager.updateConfigs(fileUploadConfigs);
     await configManager.updateConfigs(fileUploadConfigs);
     await this.crowi.setUpFileUpload(true);
     await this.crowi.setUpFileUpload(true);
     await appService.setupAfterInstall();
     await appService.setupAfterInstall();