On restores, set "backup version" as existing version to apply required migrations between backup and current version installed

Author: thomaschampagne

appcore/src/app/desktop/backup/desktop-backup.service.ts

@@ -13,6 +13,8 @@ import { BackupMetadata } from "@elevate/shared/models/backup/backup-metadata.in
 import { RestoreEvent } from "@elevate/shared/models/backup/restore-event.int";
 import { BackupChunk } from "@elevate/shared/models/backup/backup-chunk.int";
 import { Channel } from "@elevate/shared/electron/channels.enum";
+import { VersionsProvider } from "../../shared/services/versions/versions-provider";
+import { DesktopVersionsProvider } from "../../shared/services/versions/impl/desktop-versions-provider.service";
 
 @Injectable()
 export class DesktopBackupService {
@@ -21,6 +23,7 @@ export class DesktopBackupService {
 
   constructor(
     @Inject(IPC_TUNNEL_SERVICE) public readonly ipcTunnelService: IpcTunnelService,
+    @Inject(VersionsProvider) public readonly versionsProvider: DesktopVersionsProvider,
     @Inject(LoggerService) protected readonly logger: LoggerService,
     @Inject(DataStore) public readonly desktopDataStore: DesktopDataStore<object>
   ) {}
@@ -222,7 +225,9 @@ export class DesktopBackupService {
               restoreProgress$.complete();
               channelSubscription.unsubscribe();
               this.logger.info(`Restored in ${Math.round(Date.now() - restoreStartTime)}ms`);
-              return Promise.resolve();
+
+              // Set "backup version" as existing version to apply required migrations between backup and current version installed
+              return this.versionsProvider.setExistingVersion(metadata.version);
             });
           }
         }

appcore/src/app/shared/services/app-service/desktop/desktop-app.service.ts

@@ -35,10 +35,7 @@ export class DesktopAppService extends AppService {
         if (requestedByVersion) {
           // Observe for recalculation done asked by an applied migration
           this.userSettingsService.fetch().then((userSettings: DesktopUserSettings) => {
-            const snackRef = this.snackBar.open(
-              "Last upgrade requires activities recalculation. Let it proceed.",
-              "Ok"
-            );
+            const snackRef = this.snackBar.open("Activities recalculation required. Let it proceed...", "Ok");
             this.activityService.recalculateAll(userSettings).then(() => {
               this.desktopMigrationService.clearRequiredRecalculation();
               snackRef.dismiss();