From efc0a015f8109f0fa685f6eb224a51b965386115 Mon Sep 17 00:00:00 2001
From: Daniel <dhaavi@users.noreply.github.com>
Date: Tue, 19 Sep 2023 10:03:48 +0200
Subject: [PATCH] Improve profile migrations

---
 profile/migrations.go | 38 ++++++++++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/profile/migrations.go b/profile/migrations.go
index c8607b6f..3a5d52e5 100644
--- a/profile/migrations.go
+++ b/profile/migrations.go
@@ -2,6 +2,7 @@ package profile
 
 import (
 	"context"
+	"fmt"
 	"regexp"
 
 	"github.com/hashicorp/go-version"
@@ -118,6 +119,11 @@ func migrateIcons(ctx context.Context, _, to *version.Version, db *database.Inte
 	}
 
 	// Migrate all profiles.
+	var (
+		lastErr error
+		failed  int
+		total   int
+	)
 	for r := range it.Next {
 		// Parse profile.
 		profile, err := EnsureProfile(r)
@@ -140,10 +146,13 @@ func migrateIcons(ctx context.Context, _, to *version.Version, db *database.Inte
 		// Save back to DB.
 		err = db.Put(profile)
 		if err != nil {
+			failed++
+			lastErr = err
 			log.Tracer(ctx).Debugf("profiles: failed to save profile %s after migration: %s", r.Key(), err)
 		} else {
 			log.Tracer(ctx).Tracef("profiles: migrated profile %s to %s", r.Key(), to)
 		}
+		total++
 	}
 
 	// Check if there was an error while iterating.
@@ -151,7 +160,12 @@ func migrateIcons(ctx context.Context, _, to *version.Version, db *database.Inte
 		log.Tracer(ctx).Errorf("profile: failed to migrate from icon fields: failed to iterate over profiles for migration: %s", err)
 	}
 
-	return nil
+	// Log migration failure and try again next time.
+	if lastErr != nil {
+		return fmt.Errorf("failed to migrate %d profiles (out of %d pending) - last error: %w", failed, total, lastErr)
+	}
+
+	return lastErr
 }
 
 var randomUUIDRegex = regexp.MustCompile(`^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$`)
@@ -167,6 +181,11 @@ func migrateToDerivedIDs(ctx context.Context, _, to *version.Version, db *databa
 	}
 
 	// Migrate all profiles.
+	var (
+		lastErr error
+		failed  int
+		total   int
+	)
 	for r := range it.Next {
 		// Parse profile.
 		profile, err := EnsureProfile(r)
@@ -181,6 +200,7 @@ func migrateToDerivedIDs(ctx context.Context, _, to *version.Version, db *databa
 		}
 
 		// Generate new ID.
+		oldScopedID := profile.ScopedID()
 		newID := deriveProfileID(profile.Fingerprints)
 
 		// If they match, skip migration for this profile.
@@ -188,9 +208,8 @@ func migrateToDerivedIDs(ctx context.Context, _, to *version.Version, db *databa
 			continue
 		}
 
-		// Add old ID to profiles that we need to delete.
-		profilesToDelete = append(profilesToDelete, profile.ScopedID())
-
+		// Reset key.
+		profile.ResetKey()
 		// Set new ID and rebuild the key.
 		profile.ID = newID
 		profile.makeKey()
@@ -198,10 +217,16 @@ func migrateToDerivedIDs(ctx context.Context, _, to *version.Version, db *databa
 		// Save back to DB.
 		err = db.Put(profile)
 		if err != nil {
+			failed++
+			lastErr = err
 			log.Tracer(ctx).Debugf("profiles: failed to save profile %s after migration: %s", r.Key(), err)
 		} else {
 			log.Tracer(ctx).Tracef("profiles: migrated profile %s to %s", r.Key(), to)
+
+			// Add old ID to profiles that we need to delete.
+			profilesToDelete = append(profilesToDelete, oldScopedID)
 		}
+		total++
 	}
 
 	// Check if there was an error while iterating.
@@ -216,5 +241,10 @@ func migrateToDerivedIDs(ctx context.Context, _, to *version.Version, db *databa
 		}
 	}
 
+	// Log migration failure and try again next time.
+	if lastErr != nil {
+		return fmt.Errorf("failed to migrate %d profiles (out of %d pending) - last error: %w", failed, total, lastErr)
+	}
+
 	return nil
 }