[us40] Add some delay before rescheduling a task to avoid duplicates of tasks scheduled in a short delay + Fix runAll and backup method returning multiple results

Author: Musholic

src/app/background-task/background-task.service.spec.ts

@@ -333,7 +333,7 @@ describe('BackgroundTaskService', () => {
       });
 
       // Assert
-      tick();
+      tick(1000);
       expect(result1).toEqual(2);
       expect(result2).toEqual(1);
     }));
@@ -349,13 +349,13 @@ describe('BackgroundTaskService', () => {
         return mustBeConsumedAsyncObservable(undefined);
       };
       backgroundTaskService.schedule("task1", task1);
-      tick();
+      tick(500);
 
       // Act
       backgroundTaskService.schedule("task1", task1);
 
       // Assert
-      tick();
+      tick(500);
       expect(result1).toEqual(2);
     }));
 
@@ -371,12 +371,12 @@ describe('BackgroundTaskService', () => {
         result1a++;
         return mustBeConsumedAsyncObservable(undefined);
       });
-      tick();
+      tick(500);
       backgroundTaskService.schedule("task1", () => {
         result1b++;
         return mustBeConsumedAsyncObservable(undefined);
       });
-      tick();
+      tick(500);
 
       // Act
       backgroundTaskService.schedule("task1", () => {
@@ -385,7 +385,7 @@ describe('BackgroundTaskService', () => {
       });
 
       // Assert
-      tick();
+      tick(500);
       expect(result1a).toEqual(1);
       expect(result1b).toEqual(1);
       expect(result1c).toEqual(1);
@@ -404,7 +404,7 @@ describe('BackgroundTaskService', () => {
             result1++;
           }));
       });
-      tick();
+      tick(500);
 
       // Act
       backgroundTaskService.schedule("task1", () => {
@@ -413,7 +413,7 @@ describe('BackgroundTaskService', () => {
       });
 
       // Assert
-      tick();
+      tick(500);
       expect(result1).toEqual(0);
       tick(5000);
       expect(result1).toEqual(2);

src/app/background-task/background-task.service.ts

@@ -1,5 +1,5 @@
 import {Component, Injectable} from '@angular/core';
-import {BehaviorSubject, mergeMap, Observable, of, share} from "rxjs";
+import {BehaviorSubject, delay, mergeMap, Observable, of, shareReplay} from "rxjs";
 import {MatSnackBar, MatSnackBarModule, MatSnackBarRef} from "@angular/material/snack-bar";
 import {NgForOf, NgIf} from "@angular/common";
 import {HttpEventType, HttpProgressEvent, HttpResponse} from "@angular/common/http";
@@ -12,6 +12,7 @@ export class BackgroundTaskService {
   private snackBarRef?: MatSnackBarRef<SnackBarProgressIndicatorComponent>;
   private readonly scheduledTasks = new Set<string>();
   private readonly runningTasks = new Map<string, Observable<void>>();
+  private readonly DELAY_BEFORE_RESCHEDULE = 500;
 
   constructor(private snackBar: MatSnackBar) {
   }
@@ -76,8 +77,9 @@ export class BackgroundTaskService {
     }
     const scheduledTask = alreadyRunningTask.pipe(mergeMap(() => {
       const runningTask = task()
-        // Multicast the result to all future subscribers since we don't want to rerun the task once for each subscriber
-        .pipe(share());
+        .pipe(delay(this.DELAY_BEFORE_RESCHEDULE))
+        // Cache the result to all future subscribers since we don't want to rerun the task for each future subscriber
+        .pipe(shareReplay(1));
       this.runningTasks.set(taskName, runningTask);
       this.scheduledTasks.delete(taskName);
       return runningTask;

src/app/database/database-backup-and-restore.service.spec.ts

@@ -11,7 +11,7 @@ import {HttpEventType, HttpResponse} from "@angular/common/http";
 import {mockFileElement} from "../file-list/file-list.component.spec";
 import {fakeAsync, tick} from "@angular/core/testing";
 import {db} from "./db";
-import {BehaviorSubject, lastValueFrom} from "rxjs";
+import {BehaviorSubject, firstValueFrom} from "rxjs";
 import {mockBackgroundTaskService} from "../background-task/background-task.service.spec";
 import {Progress} from "../background-task/background-task.service";
 import {mockFilesCacheService} from "../files-cache/files-cache.service.spec";
@@ -81,7 +81,7 @@ describe('DatabaseBackupAndRestoreService', () => {
       mockFilesCacheService([dbBackupFile]);
 
       // Act
-      const restorePromise = lastValueFrom(databaseBackupAndRestoreService.restore());
+      const restorePromise = firstValueFrom(databaseBackupAndRestoreService.restore());
 
       // Assert
       // We need to explicitly wait for the restore to finish
@@ -118,7 +118,7 @@ describe('DatabaseBackupAndRestoreService', () => {
       db.rules.add(oldRule)
 
       // Act
-      const restorePromise = lastValueFrom(databaseBackupAndRestoreService.restore());
+      const restorePromise = firstValueFrom(databaseBackupAndRestoreService.restore());
 
       // Assert
       // We need to explicitly wait for the restore to finish
@@ -148,7 +148,7 @@ describe('DatabaseBackupAndRestoreService', () => {
       mockFilesCacheService([dbBackupFile]);
 
       // Act
-      const restorePromise = lastValueFrom(databaseBackupAndRestoreService.restore());
+      const restorePromise = firstValueFrom(databaseBackupAndRestoreService.restore());
 
       // Assert
       tick();
@@ -185,7 +185,7 @@ describe('DatabaseBackupAndRestoreService', () => {
         } as HttpResponse<any>));
 
       // Act
-      const backupPromise = lastValueFrom(databaseBackupAndRestoreService.backup());
+      const backupPromise = firstValueFrom(databaseBackupAndRestoreService.backup());
 
       // Assert
       // No failure in mock setup
@@ -226,7 +226,7 @@ describe('DatabaseBackupAndRestoreService', () => {
         } as HttpResponse<any>));
 
       // Act
-      const backupPromise = lastValueFrom(databaseBackupAndRestoreService.backup());
+      const backupPromise = firstValueFrom(databaseBackupAndRestoreService.backup());
 
       // Assert
       // No failure in mock setup

src/app/database/database-backup-and-restore.service.ts

@@ -2,7 +2,7 @@ import {Injectable} from '@angular/core';
 import {exportDB} from "dexie-export-import";
 import {db} from "./db";
 import {FileUploadService} from "../file-upload/file-upload.service";
-import {finalize, from, map, mergeMap, Observable, of, tap} from "rxjs";
+import {finalize, from, last, map, mergeMap, Observable, of, tap} from "rxjs";
 import {FileService} from "../file-list/file.service";
 import {FileElement, isFileElement} from "../file-list/file-list.component";
 import {BackgroundTaskService} from "../background-task/background-task.service";
@@ -40,9 +40,8 @@ export class DatabaseBackupAndRestoreService {
           return this.fileUploadService.upload({name: DatabaseBackupAndRestoreService.DB_NAME, blob}, dbFile?.id);
         }),
         tap(httpEvent => this.backgroundTaskService.updateProgress(progress, httpEvent)),
-        finalize(() => this.updateLastDbBackupTime()),
-        map(() => {
-        }));
+        last(null, undefined),
+        map(() => this.updateLastDbBackupTime()));
   }
 
   scheduleBackup() {

src/app/rules/rule.service.spec.ts

@@ -12,7 +12,7 @@ import {RuleRepository} from "./rule.repository";
 import {FilesCacheService} from "../files-cache/files-cache.service";
 import {mockFilesCacheService} from "../files-cache/files-cache.service.spec";
 import {mockBackgroundTaskService} from "../background-task/background-task.service.spec";
-import {BehaviorSubject, lastValueFrom} from "rxjs";
+import {BehaviorSubject, firstValueFrom} from "rxjs";
 import {Progress} from "../background-task/background-task.service";
 import {FileElement} from "../file-list/file-list.component";
 
@@ -99,7 +99,7 @@ describe('RuleService', () => {
       const service = mockElectricityBillSample(file, fileService);
 
       // Act
-      const runAllPromise = lastValueFrom(service.runAll(), {defaultValue: undefined});
+      const runAllPromise = firstValueFrom(service.runAll(), {defaultValue: undefined});
 
       // Assert
       tick();
@@ -114,7 +114,7 @@ describe('RuleService', () => {
       const service = mockElectricityBillSample(file, fileService);
 
       // Act
-      const runAllPromise = lastValueFrom(service.runAll(), {defaultValue: undefined});
+      const runAllPromise = firstValueFrom(service.runAll(), {defaultValue: undefined});
 
       // Assert
       tick();
@@ -149,7 +149,7 @@ describe('RuleService', () => {
       mockFilesCacheService([file]);
 
       // Act
-      const runAllPromise = lastValueFrom(service.runAll(), {defaultValue: undefined});
+      const runAllPromise = firstValueFrom(service.runAll(), {defaultValue: undefined});
 
       // Assert
       tick();
@@ -251,7 +251,7 @@ describe('RuleService', () => {
       mockFilesCacheService([file, otherFile], true);
 
       // Act
-      const runAllPromise = lastValueFrom(service.runAll(), {defaultValue: undefined});
+      const runAllPromise = firstValueFrom(service.runAll(), {defaultValue: undefined});
 
       // Assert
       tick();
@@ -301,7 +301,7 @@ describe('RuleService', () => {
       mockFilesCacheService([file]);
 
       // Act
-      const runAllPromise = lastValueFrom(service.runAll(), {defaultValue: undefined});
+      const runAllPromise = firstValueFrom(service.runAll(), {defaultValue: undefined});
 
       // Assert
       tick();
@@ -368,7 +368,7 @@ describe('RuleService', () => {
       mockFilesCacheService([file], true);
 
       // Act
-      const runAllPromise = lastValueFrom(service.runAll(), {defaultValue: undefined});
+      const runAllPromise = firstValueFrom(service.runAll(), {defaultValue: undefined});
 
       // Assert
       // fakeAsync(() => tick());

src/app/rules/rule.service.ts

@@ -1,6 +1,6 @@
 import {Injectable} from '@angular/core';
 import {FileService} from "../file-list/file.service";
-import {BehaviorSubject, concatMap, filter, find, from, map, mergeMap, Observable, of, tap, zip} from "rxjs";
+import {BehaviorSubject, concatMap, filter, find, from, last, map, mergeMap, Observable, of, tap, zip} from "rxjs";
 import {FileElement, isFileElement} from "../file-list/file-list.component";
 import {Rule, RuleRepository} from "./rule.repository";
 import {FilesCacheService} from "../files-cache/files-cache.service";
@@ -54,19 +54,21 @@ export class RuleService {
 
   runAll(): Observable<void> {
     return from(this.ruleRepository.findAll())
-      .pipe(mergeMap(rules => {
-        const fileOrFolders = this.filesCacheService.getAll()
-        // Get all files
-        const files = fileOrFolders
-          .filter((file): file is FileElement => isFileElement(file));
-
-        // Run the script for each file to get the associated category
-        // The amount of step is one download per file and one per rule running for each file
-        const stepAmount = files.length * (1 + rules.length);
-        const progress = this.backgroundTaskService.showProgress('Running all rules', stepAmount);
-        return this.runAllAndSetCategories(files, rules, progress)
-          .pipe(tap({complete: () => progress.next({value: 100, index: stepAmount})}));
-      }));
+      .pipe(
+        mergeMap(rules => {
+          const fileOrFolders = this.filesCacheService.getAll()
+          // Get all files
+          const files = fileOrFolders
+            .filter((file): file is FileElement => isFileElement(file));
+
+          // Run the script for each file to get the associated category
+          // The amount of step is one download per file and one per rule running for each file
+          const stepAmount = files.length * (1 + rules.length);
+          const progress = this.backgroundTaskService.showProgress('Running all rules', stepAmount);
+          return this.runAllAndSetCategories(files, rules, progress)
+            .pipe(tap({complete: () => progress.next({value: 100, index: stepAmount})}));
+        }),
+        last(null, undefined));
   }
 
   create(rule: Rule) {