include file count in callback

Author: wp99cp

backend/src/endpoints/queue/queue.controller.ts

@@ -66,7 +66,10 @@ export class QueueController {
     @Post('recalculateHashes')
     @AdminOnly()
     @OutputDto(null)
-    async recalculateHashes(): Promise<void> {
+    async recalculateHashes(): Promise<{
+        success: boolean;
+        fileCount: number;
+    }> {
         return await this.queueService.recalculateHashes();
     }
 

backend/src/services/queue.service.ts

@@ -167,9 +167,12 @@ export class QueueService implements OnModuleInit {
     /**
      * re-caluclates the hashes for all files without a valid hash
      */
-    async recalculateHashes(): Promise<void> {
+    async recalculateHashes(): Promise<{
+        success: boolean;
+        fileCount: number;
+    }> {
         const files = await this.fileRepository.find({
-            where: { hash: '' },
+            where: { hash: '', state: FileState.OK },
             relations: ['mission', 'mission.project'],
         });
 
@@ -185,6 +188,11 @@ export class QueueService implements OnModuleInit {
                 logger.error(error);
             }
         }
+
+        return {
+            success: true,
+            fileCount: files.length,
+        };
     }
 
     async confirmUpload(uuid: string, md5: string): Promise<void> {

frontend/src/components/user-profile/admin-settings.vue

@@ -74,10 +74,10 @@ async function resetFileSizes(): Promise<void> {
 }
 
 async function recalculateHashes(): Promise<void> {
-    await axios.post('queue/recalculateHashes');
+    const { data } = await axios.post('queue/recalculateHashes');
 
     $q.notify({
-        message: 'Hash recalculation started',
+        message: `Recalculating hashes started. ${data.fileCount} files to process`,
         color: 'positive',
         position: 'bottom',
         timeout: 2000,