Pārlūkot izejas kodu

apply Copilot review suggestions

Naoki427 5 mēneši atpakaļ
vecāks
revīzija
bb6b2ddeaa

+ 7 - 5
apps/app/src/features/audit-log-bulk-export/server/service/audit-log-bulk-export-job-cron/index.ts

@@ -68,9 +68,11 @@ class AuditLogBulkExportJobCronService
     })
       .sort({ createdAt: 1 })
       .limit(this.parallelExecLimit);
-    auditLogBulkExportJobInProgress.forEach((auditLogBulkExportJob) => {
-      this.proceedBulkExportJob(auditLogBulkExportJob);
-    });
+    await Promise.all(
+      auditLogBulkExportJobInProgress.map((job) =>
+        this.proceedBulkExportJob(job),
+      ),
+    );
   }
 
   async proceedBulkExportJob(
@@ -89,7 +91,7 @@ class AuditLogBulkExportJobCronService
       if (
         auditLogBulkExportJob.status === AuditLogBulkExportJobStatus.exporting
       ) {
-        exportAuditLogsToFsAsync.bind(this)(auditLogBulkExportJob);
+        await exportAuditLogsToFsAsync.bind(this)(auditLogBulkExportJob);
       } else if (
         auditLogBulkExportJob.status === AuditLogBulkExportJobStatus.uploading
       ) {
@@ -158,7 +160,7 @@ class AuditLogBulkExportJobCronService
 export let auditLogBulkExportJobCronService:
   | AuditLogBulkExportJobCronService
   | undefined;
-export default function instanciate(crowi: Crowi): void {
+export default function instantiate(crowi: Crowi): void {
   auditLogBulkExportJobCronService = new AuditLogBulkExportJobCronService(
     crowi,
   );

+ 2 - 2
apps/app/src/server/crowi/index.js

@@ -8,7 +8,7 @@ import lsxRoutes from '@growi/remark-lsx/dist/server/index.cjs';
 import mongoose from 'mongoose';
 import next from 'next';
 
-import instanciateAuditLogBulkExportJobCronService from '~/features/audit-log-bulk-export/server/service/audit-log-bulk-export-job-cron';
+import instantiateAuditLogBulkExportJobCronService from '~/features/audit-log-bulk-export/server/service/audit-log-bulk-export-job-cron';
 import { checkAuditLogExportJobInProgressCronService } from '~/features/audit-log-bulk-export/server/service/check-audit-log-bulk-export-job-in-progress-cron';
 import { KeycloakUserGroupSyncService } from '~/features/external-user-group/server/service/keycloak-user-group-sync';
 import { LdapUserGroupSyncService } from '~/features/external-user-group/server/service/ldap-user-group-sync';
@@ -366,7 +366,7 @@ Crowi.prototype.setupCron = function() {
   instanciatePageBulkExportJobCleanUpCronService(this);
   pageBulkExportJobCleanUpCronService.startCron();
 
-  instanciateAuditLogBulkExportJobCronService(this);
+  instantiateAuditLogBulkExportJobCronService(this);
   checkAuditLogExportJobInProgressCronService.startCron();
 
   startOpenaiCronIfEnabled();