Finish 7.0.0-beta.3

Author: thomaschampagne

appcore/modules/shared/models/sync/activity.model.ts

@@ -111,6 +111,7 @@ export class GradeStats {
   public stdDev: number;
   public slopeTime: SlopeStats;
   public slopeSpeed: SlopeStats;
+  public slopePace: SlopeStats;
   public slopeDistance: SlopeStats;
   public slopeCadence: SlopeStats;
   public slopeProfile: SlopeProfile;

appcore/modules/shared/sync/compute/activity-computer.ts

@@ -1386,6 +1386,12 @@ export class ActivityComputer {
       down: _.round(_.mean(slopeProfileSpeeds.down), ActivityComputer.RND)
     };
 
+    const slopePace: SlopeStats = {
+      up: _.round(Movement.speedToPace(slopeSpeed.up)),
+      flat: _.round(Movement.speedToPace(slopeSpeed.flat)),
+      down: _.round(Movement.speedToPace(slopeSpeed.down))
+    };
+
     const slopeCadence: SlopeStats = {
       up: !_.isEmpty(slopeProfileCadences.up) ? _.round(_.mean(slopeProfileCadences.up), ActivityComputer.RND) : null,
       flat: !_.isEmpty(slopeProfileCadences.flat)
@@ -1411,6 +1417,7 @@ export class ActivityComputer {
       stdDev: _.round(standardDeviation, ActivityComputer.RND),
       slopeTime: slopeTime,
       slopeSpeed: slopeSpeed,
+      slopePace: slopePace,
       slopeDistance: slopeDistance,
       slopeCadence: slopeCadence,
       slopeProfile: slopeProfile,

appcore/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "elevate-sports-app",
-  "version": "7.0.0-beta.2",
+  "version": "7.0.0-beta.3",
   "license": "MPL-2.0",
   "scripts": {
     "ng": "ng",

appcore/package.json

@@ -798,21 +798,21 @@ export namespace StatsDef {
       export const paceUp = Stat.create<GradeStats>(
         PaceSensor.DEFAULT,
         "Climbing Pace",
-        ["stats", "grade", "slopeSpeed", "up"],
+        ["stats", "grade", "slopePace", "up"],
         `Climbing pace over ${ActivityComputer.GRADE_CLIMBING_LIMIT}% grade`
       );
 
       export const paceFlat = Stat.create<GradeStats>(
         PaceSensor.DEFAULT,
         "Flat Pace",
-        ["stats", "grade", "slopeSpeed", "flat"],
+        ["stats", "grade", "slopePace", "flat"],
         `Pace on flat between ${ActivityComputer.GRADE_DOWNHILL_LIMIT}% and ${ActivityComputer.GRADE_CLIMBING_LIMIT}% grade`
       );
 
       export const paceDown = Stat.create<GradeStats>(
         PaceSensor.DEFAULT,
         "Downhill Pace",
-        ["stats", "grade", "slopeSpeed", "down"],
+        ["stats", "grade", "slopePace", "down"],
         `Pace in downhills under ${ActivityComputer.GRADE_DOWNHILL_LIMIT}% grade`
       );
 

appcore/src/app/desktop/activity-view/shared/models/stats/stats-def.namespace.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/desktop/backup/desktop-backup.service.ts

@@ -1,10 +1,12 @@
 import { DesktopMigration } from "./desktop-migrations.model";
+import { Upgrade_7_0_0$beta_3 } from "./upgrade_7_0_0-beta.3/upgrade_7_0_0-beta.3";
 
 /**
  * Add desktop migrations inside LIST. The LIST is sorted from lowest to high versions
  */
 export class DesktopRegisteredMigrations {
   public static readonly LIST: DesktopMigration[] = [
+    new Upgrade_7_0_0$beta_3() // To version 7.0.0-beta.3
     /* Next Upgrade Here */
   ];
 }

appcore/src/app/desktop/migration/desktop-registered-migrations.ts

@@ -0,0 +1,36 @@
+import { DesktopMigration } from "../desktop-migrations.model";
+import { Injector } from "@angular/core";
+import { Activity } from "@elevate/shared/models/sync/activity.model";
+import _ from "lodash";
+
+export class Upgrade_7_0_0$beta_3 extends DesktopMigration {
+  public version: string = "7.0.0-beta.3";
+
+  public description: string = "Fix avg/max speeds/paces on intervals when imported from Strava";
+
+  public requiresRecalculation: boolean = true;
+
+  public upgrade(db: LokiConstructor, injector: Injector): Promise<void> {
+    const activitiesCollection = db.getCollection("activities");
+    if (activitiesCollection) {
+      const activitiesFromStrava = activitiesCollection.find({ connector: "STRAVA" });
+      if (activitiesFromStrava?.length) {
+        activitiesFromStrava.forEach((activity: Activity) => {
+          if (activity.laps?.length) {
+            activity.laps = activity.laps.map(lap => {
+              lap.avgSpeed = lap.avgSpeed >= 0 ? _.round(lap.avgSpeed * 3.6, 3) : null;
+              lap.avgPace = Number.isFinite(lap.avgSpeed) && lap.avgSpeed > 0 ? _.round(3600 / lap.avgSpeed) : null;
+
+              lap.maxSpeed = lap.maxSpeed >= 0 ? _.round(lap.maxSpeed * 3.6, 3) : null;
+              lap.maxPace = Number.isFinite(lap.maxSpeed) && lap.maxSpeed > 0 ? _.round(3600 / lap.maxSpeed) : null;
+
+              return lap;
+            });
+            activitiesCollection.update(activity);
+          }
+        });
+      }
+    }
+    return this.saveDatabase(db);
+  }
+}

appcore/src/app/desktop/migration/upgrade_7_0_0-beta.3/upgrade_7_0_0-beta.3.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();