From c424554d4a9f49560e4f3d379a93c64bdabab29e Mon Sep 17 00:00:00 2001
From: keito <131662659+mst-mkt@users.noreply.github.com>
Date: Wed, 25 Jun 2025 20:30:17 +0900
Subject: ジョブキューの`Progress`の値を正しく計算する (#16218)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: ジョブキューのProgressの値の範囲を 0~100 に統一

* fix(backend): ジョブキューのProgressの計算に用いる総数を最初に一度だけ取得する
---
 .../src/queue/processors/CleanRemoteFilesProcessorService.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'packages/backend/src/queue/processors/CleanRemoteFilesProcessorService.ts')

diff --git a/packages/backend/src/queue/processors/CleanRemoteFilesProcessorService.ts b/packages/backend/src/queue/processors/CleanRemoteFilesProcessorService.ts
index 728fc9e72b..782b74f0cd 100644
--- a/packages/backend/src/queue/processors/CleanRemoteFilesProcessorService.ts
+++ b/packages/backend/src/queue/processors/CleanRemoteFilesProcessorService.ts
@@ -34,6 +34,11 @@ export class CleanRemoteFilesProcessorService {
 		let deletedCount = 0;
 		let cursor: MiDriveFile['id'] | null = null;
 
+		const total = await this.driveFilesRepository.countBy({
+			userHost: Not(IsNull()),
+			isLink: false,
+		});
+
 		while (true) {
 			const files = await this.driveFilesRepository.find({
 				where: {
@@ -58,12 +63,7 @@ export class CleanRemoteFilesProcessorService {
 
 			deletedCount += 8;
 
-			const total = await this.driveFilesRepository.countBy({
-				userHost: Not(IsNull()),
-				isLink: false,
-			});
-
-			job.updateProgress(100 / total * deletedCount);
+			job.updateProgress(deletedCount * total / 100);
 		}
 
 		this.logger.succ('All cached remote files has been deleted.');
-- 
cgit v1.2.3-freya