refactor utils

apps/app/src/server/routes/attachment/get.ts

@@ -14,11 +14,10 @@ import loggerFactory from '~/utils/logger';
 import type Crowi from '../../crowi';
 import { certifySharedPageAttachmentMiddleware } from '../../middlewares/certify-shared-page-attachment';
 import { Attachment, type IAttachmentDocument } from '../../models';
-import ApiResponse from '../../util/apiResponse';
-
 import {
   toExpressHttpHeaders, ContentHeaders, applyHeaders,
-} from './utils/headers';
+} from '../../service/file-uploader';
+import ApiResponse from '../../util/apiResponse';
 
 
 const logger = loggerFactory('growi:routes:attachment:get');

apps/app/src/server/service/file-uploader/aws.ts

@@ -14,12 +14,12 @@ import urljoin from 'url-join';
 
 import type { RespondOptions } from '~/server/interfaces/attachment';
 import type { IAttachmentDocument } from '~/server/models';
-import { ContentHeaders } from '~/server/routes/attachment/utils/headers';
 import loggerFactory from '~/utils/logger';
 
 import { configManager } from '../config-manager';
 
 import { AbstractFileUploader, type SaveFileParam } from './file-uploader';
+import { ContentHeaders } from './utils';
 
 
 const logger = loggerFactory('growi:service:fileUploaderAws');

apps/app/src/server/service/file-uploader/gcs.ts

@@ -5,12 +5,12 @@ import urljoin from 'url-join';
 import type Crowi from '~/server/crowi';
 import type { RespondOptions } from '~/server/interfaces/attachment';
 import type { IAttachmentDocument } from '~/server/models';
-import { ContentHeaders } from '~/server/routes/attachment/utils/headers';
 import loggerFactory from '~/utils/logger';
 
 import { configManager } from '../config-manager';
 
 import { AbstractFileUploader, type SaveFileParam } from './file-uploader';
+import { ContentHeaders } from './utils';
 
 const logger = loggerFactory('growi:service:fileUploaderGcs');
 

apps/app/src/server/service/file-uploader/index.ts

@@ -32,3 +32,5 @@ export const getUploader = (crowi: Crowi): FileUploader => {
 
   return uploader;
 };
+
+export * from './utils';

apps/app/src/server/service/file-uploader/local.ts

@@ -4,14 +4,14 @@ import type { Response } from 'express';
 
 import type { RespondOptions } from '~/server/interfaces/attachment';
 import type { IAttachmentDocument } from '~/server/models';
-import {
-  ContentHeaders, applyHeaders,
-} from '~/server/routes/attachment/utils/headers';
 import loggerFactory from '~/utils/logger';
 
 import { configManager } from '../config-manager';
 
 import { AbstractFileUploader, type SaveFileParam } from './file-uploader';
+import {
+  ContentHeaders, applyHeaders,
+} from './utils';
 
 
 const logger = loggerFactory('growi:service:fileUploaderLocal');

apps/app/src/server/service/file-uploader/utils/index.ts

@@ -0,0 +1 @@
+export * from './headers';