Yuki Takei 1 год назад
Родитель
Сommit
071f1478f4

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

@@ -12,7 +12,7 @@ import mongoose, { Types as MongooseTypes } from 'mongoose';
 import { G2G_PROGRESS_STATUS } from '~/interfaces/g2g-transfer';
 import GrowiArchiveImportOption from '~/models/admin/growi-archive-import-option';
 import TransferKeyModel from '~/server/models/transfer-key';
-import { getImportService, type ImportSettings } from '~/server/service/import';
+import { getImportService, ImportMode, type ImportSettings } from '~/server/service/import';
 import { createBatchStream } from '~/server/util/batch-stream';
 import axios from '~/utils/axios';
 import loggerFactory from '~/utils/logger';
@@ -611,7 +611,7 @@ export class G2GTransferReceiverService implements Receiver {
     innerFileStats.forEach(({ fileName, collectionName }) => {
       const options = new GrowiArchiveImportOption(null, optionsMap[collectionName]);
 
-      if (collectionName === 'configs' && options.mode !== 'flushAndInsert') {
+      if (collectionName === 'configs' && options.mode !== ImportMode.flushAndInsert) {
         throw new Error('`flushAndInsert` is only available as an import setting for configs collection');
       }
       if (collectionName === 'pages' && options.mode === 'insert') {

+ 3 - 2
apps/app/src/server/service/import/import.ts

@@ -25,6 +25,7 @@ import { configManager } from '../config-manager';
 import type { ConvertMap } from './construct-convert-map';
 import { constructConvertMap } from './construct-convert-map';
 import { getModelFromCollectionName } from './get-model-from-collection-name';
+import { ImportMode } from './import-mode';
 import type { ImportSettings, OverwriteParams } from './import-settings';
 import { keepOriginal } from './overwrite-function';
 
@@ -200,7 +201,7 @@ export class ImportService {
       this.validateImportSettings(collectionName, importSettings);
 
       // flush
-      if (mode === 'flushAndInsert') {
+      if (mode === ImportMode.flushAndInsert) {
         await collection.deleteMany({});
       }
 
@@ -293,7 +294,7 @@ export class ImportService {
 
     switch (collectionName) {
       case 'configs':
-        if (mode !== 'flushAndInsert') {
+        if (mode !== ImportMode.flushAndInsert) {
           throw new Error(`The specified mode '${mode}' is not allowed when importing to 'configs' collection.`);
         }
         break;