WIP: refactor

apps/app/src/server/routes/apiv3/import.js

@@ -2,15 +2,11 @@ import { ErrorV3 } from '@growi/core/dist/models';
 
 import { SupportedAction } from '~/interfaces/activity';
 import { getImportService } from '~/server/service/import';
+import { generateOverwriteParams } from '~/server/service/import/overwrite-params';
 import loggerFactory from '~/utils/logger';
 
 import { generateAddActivityMiddleware } from '../../middlewares/add-activity';
 
-import overwriteParamsAttachmentFilesChunks from './overwrite-params/attachmentFiles.chunks';
-import overwriteParamsPages from './overwrite-params/pages';
-import overwriteParamsRevisions from './overwrite-params/revisions';
-
-
 const logger = loggerFactory('growi:routes:apiv3:import'); // eslint-disable-line no-unused-vars
 
 const path = require('path');
@@ -52,26 +48,6 @@ const router = express.Router();
  *            description: whether the current importing job exists or not
  */
 
-/**
- * generate overwrite params with overwrite-params/* modules
- * @param {string} collectionName
- * @param {string} operatorUserId Operator user id
- * @param {GrowiArchiveImportOption} options GrowiArchiveImportOption instance
- * @return {import('~/server/service/import').OverwriteParams}
- */
-export const generateOverwriteParams = (collectionName, operatorUserId, options) => {
-  switch (collectionName) {
-    case 'pages':
-      return overwriteParamsPages(operatorUserId, options);
-    case 'revisions':
-      return overwriteParamsRevisions(operatorUserId, options);
-    case 'attachmentFiles.chunks':
-      return overwriteParamsAttachmentFilesChunks(operatorUserId, options);
-    default:
-      return {};
-  }
-};
-
 export default function route(crowi) {
   const { growiBridgeService, socketIoService } = crowi;
   const importService = getImportService(crowi);

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

@@ -12,7 +12,6 @@ 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 { generateOverwriteParams } from '~/server/routes/apiv3/import';
 import { getImportService, type ImportSettings } from '~/server/service/import';
 import { createBatchStream } from '~/server/util/batch-stream';
 import axios from '~/utils/axios';
@@ -24,6 +23,7 @@ import { Attachment } from '../models/attachment';
 import { G2GTransferError, G2GTransferErrorCode } from '../models/vo/g2g-transfer-error';
 
 import { configManager } from './config-manager';
+import { generateOverwriteParams } from './import/overwrite-params';
 
 const logger = loggerFactory('growi:service:g2g-transfer');
 

apps/app/src/server/service/import/overwrite-params/index.ts

@@ -0,0 +1,23 @@
+import type GrowiArchiveImportOption from '~/models/admin/growi-archive-import-option';
+
+import type { OverwriteParams } from '../import-settings';
+
+import overwriteParamsAttachmentFilesChunks from './attachmentFiles.chunks';
+import overwriteParamsPages from './pages';
+import overwriteParamsRevisions from './revisions';
+
+/**
+ * generate overwrite params with overwrite-params/* modules
+ */
+export const generateOverwriteParams = (collectionName: string, operatorUserId: string, options: GrowiArchiveImportOption): OverwriteParams => {
+  switch (collectionName) {
+    case 'pages':
+      return overwriteParamsPages(operatorUserId, options);
+    case 'revisions':
+      return overwriteParamsRevisions(operatorUserId, options);
+    case 'attachmentFiles.chunks':
+      return overwriteParamsAttachmentFilesChunks(operatorUserId, options);
+    default:
+      return {};
+  }
+};