Merge branch 'feat/page-bulk-export' into feat/78039-150777-page-bulk-export-job-cron-test

apps/app/src/features/page-bulk-export/server/service/page-bulk-export/index.ts

@@ -17,8 +17,8 @@ import type { SupportedActionType } from '~/interfaces/activity';
 import { SupportedAction, SupportedTargetModel } from '~/interfaces/activity';
 import { AttachmentType, FilePathOnStoragePrefix } from '~/server/interfaces/attachment';
 import type { ActivityDocument } from '~/server/models/activity';
-import { Attachment } from '~/server/models/attachment';
 import type { IAttachmentDocument } from '~/server/models/attachment';
+import { Attachment } from '~/server/models/attachment';
 import type { PageModel, PageDocument } from '~/server/models/page';
 import Subscription from '~/server/models/subscription';
 import type { FileUploader } from '~/server/service/file-uploader';
@@ -383,7 +383,7 @@ class PageBulkExportService {
    * - abort multipart upload
    */
   async cleanUpExportJobResources(pageBulkExportJob: PageBulkExportJobDocument) {
-    this.pageBulkExportJobStreamManager?.destroyJobStream(pageBulkExportJob._id);
+    this.pageBulkExportJobStreamManager.destroyJobStream(pageBulkExportJob._id);
 
     const promises = [
       PageBulkExportPageSnapshot.deleteMany({ pageBulkExportJob }),

apps/app/src/features/page-bulk-export/server/service/page-bulk-export/page-bulk-export-job-stream-manager.ts

@@ -12,6 +12,9 @@ export class PageBulkExportJobStreamManager {
   private jobStreams: Record<string, Readable> = {};
 
   addJobStream(jobId: ObjectIdLike, stream: Readable): void {
+    if (this.jobStreams[jobId.toString()] != null) {
+      this.destroyJobStream(jobId);
+    }
     this.jobStreams[jobId.toString()] = stream;
   }
 

apps/app/src/server/service/export.ts

@@ -44,8 +44,6 @@ class ExportService {
 
   growiBridgeService: GrowiBridgeService;
 
-  getFile: (filename: string) => string;
-
   per = 100;
 
   zlibLevel = 9; // 0(min) - 9(max)