Rework CorrectWebsitePinProgressPlatformMigration

Author: Toastbrot236

Refresh.Database/GameDatabaseContext.Pins.cs

@@ -180,20 +180,19 @@ private IEnumerable<ProfilePinRelation> GetProfilePinsByUser(GameUser user, Toke
 
     public DatabaseList<ProfilePinRelation> GetProfilePinsByUser(GameUser user, TokenGame game, TokenPlatform platform, int skip, int count)
         => new(this.GetProfilePinsByUser(user, game, platform), skip, count);
-
-    #region Migration Methods
 
     public void AddPinProgress(PinProgressRelation relation, bool save)
     {
         this.PinProgressRelations.Add(relation);
         if (save) this.SaveChanges();
     }
 
-    public void RemoveAllPinProgressesByIdAndUser(long pinId, ObjectId userId, bool save)
+    public void RemovePinProgress(PinProgressRelation relation, bool save)
     {
-        this.PinProgressRelations.RemoveRange(p => p.PinId == pinId && p.PublisherId == userId);
+        this.PinProgressRelations.Remove(relation);
         if (save) this.SaveChanges();
     }
 
-    #endregion
+    public int GetTotalPinProgresses()
+        => this.PinProgressRelations.Count();
 }

…ons/CorrectWebsitePinProgressPlatform.cs …ctWebsitePinProgressPlatformMigration.csRefresh.Interfaces.Workers/Migrations/CorrectWebsitePinProgressPlatform.cs renamed to Refresh.Interfaces.Workers/Migrations/CorrectWebsitePinProgressPlatformMigration.cs Refresh.Interfaces.Workers/Migrations/CorrectWebsitePinProgressPlatform.cs renamed to Refresh.Interfaces.Workers/Migrations/CorrectWebsitePinProgressPlatformMigration.cs

@@ -7,9 +7,9 @@
 
 namespace Refresh.Interfaces.Workers.Migrations;
 
-public class CorrectWebsitePinProgressPlatform : MigrationJob<PinProgressRelation>
+public class CorrectWebsitePinProgressPlatformMigration : MigrationJob<PinProgressRelation>
 {
-    private List<long> websitePinIds =
+    private readonly List<long> WebsitePinIds =
     [
         (long)ServerPins.HeartPlayerOnWebsite,
         (long)ServerPins.QueueLevelOnWebsite,
@@ -19,13 +19,15 @@ public class CorrectWebsitePinProgressPlatform : MigrationJob<PinProgressRelatio
     protected override IQueryable<PinProgressRelation> SortAndFilter(IQueryable<PinProgressRelation> query)
     {
         return query
-            .Where(p => this.websitePinIds.Contains(p.PinId))
+            .Where(p => this.WebsitePinIds.Contains(p.PinId))
             .OrderBy(p => p.PinId);
     }
 
-    protected override void Migrate(WorkContext context, PinProgressRelation[] batch)
+    protected override int Migrate(WorkContext context, PinProgressRelation[] batch)
     {
-        foreach (long pinId in this.websitePinIds)
+        int pinsLeft = batch.Length;
+
+        foreach (long pinId in this.WebsitePinIds)
         {
             IEnumerable<IGrouping<ObjectId, PinProgressRelation>> pinsByUser = batch
                 .Where(r => r.PinId == pinId)
@@ -38,12 +40,16 @@ protected override void Migrate(WorkContext context, PinProgressRelation[] batch
 
                 // Find best one by the current user
                 PinProgressRelation relationToMigrate = group.MaxBy(r => r.Progress)!;
+                List<PinProgressRelation> relationsToRemove = group.ToList();
 
-                // Remove all already existing progresses to remove duplicates
-                context.Database.RemoveAllPinProgressesByIdAndUser(pinId, relationToMigrate.PublisherId, false);
+                foreach (PinProgressRelation relation in group)
+                {
+                    context.Database.RemovePinProgress(relation, false);
+                    pinsLeft--;
+                }
 
                 // Now take the best progress we've just got and add it as a website pin, preserving other old metadata
-                context.Database.AddPinProgress(new()
+                PinProgressRelation newRelation = new()
                 {
                     PinId = relationToMigrate.PinId,
                     Progress = relationToMigrate.Progress,
@@ -52,10 +58,14 @@ protected override void Migrate(WorkContext context, PinProgressRelation[] batch
                     LastUpdated = relationToMigrate.LastUpdated,
                     IsBeta = false, // doesn't matter here
                     Platform = TokenPlatform.Website,
-                }, false);
+                };
+
+                context.Database.AddPinProgress(newRelation, false);
+                pinsLeft++;
             }
         }
 
         context.Database.SaveChanges();
+        return pinsLeft;
     }
 }

Refresh.Interfaces.Workers/RefreshWorkerManager.cs

@@ -25,7 +25,7 @@ public static WorkerManager Create(Logger logger, IDataStore dataStore, GameData
         manager.AddJob<BackfillReviewLabelsMigration>();
         manager.AddJob<ClampPlayerLimitsMigration>();
         manager.AddJob<BackfillModdedPlanetFlagsMigration>();
-        manager.AddJob<CorrectWebsitePinProgressPlatform>();
+        manager.AddJob<CorrectWebsitePinProgressPlatformMigration>();
         manager.AddJob<CalculateScoreRanksMigration>();
         manager.AddJob<MoveSubjectsOutOfGamePhotosMigration>();