Move photo subject migration out of Refresh.Database, don't migrate already migrated photos

Author: Toastbrot236

Refresh.Database/GameDatabaseContext.Photos.cs

@@ -119,67 +119,20 @@ public GamePhoto UploadPhoto(IPhotoUpload photo, IEnumerable<IPhotoUploadSubject
         return newPhoto;
     }
 
-    /// <remarks>
-    /// Migration only!!
-    /// </remarks>
-    public void MigratePhotoSubjects(GamePhoto photo, bool saveChanges)
+    public GamePhotoSubject AddSubjectForPhoto(GamePhoto photo, int playerId, string displayName, GameUser? user, List<float> bounds, bool save = true)
     {
-        List<GamePhotoSubject> subjects = [];
-
-#pragma warning disable CS0618 // obsoletion
-        
-        // If DisplayName is not null, there is a subject in that spot
-        if (photo.Subject1DisplayName != null)
-        {
-            subjects.Add(new()
-            {
-                Photo = photo,
-                PlayerId = 1,
-                DisplayName = photo.Subject1DisplayName,
-                User = photo.Subject1User,
-                Bounds = photo.Subject1Bounds,
-            });
-        }
-
-        if (photo.Subject2DisplayName != null)
-        {
-            subjects.Add(new()
-            {
-                Photo = photo,
-                PlayerId = 2,
-                DisplayName = photo.Subject2DisplayName,
-                User = photo.Subject2User,
-                Bounds = photo.Subject2Bounds,
-            });
-        }
-
-        if (photo.Subject3DisplayName != null)
-        {
-            subjects.Add(new()
-            {
-                Photo = photo,
-                PlayerId = 3,
-                DisplayName = photo.Subject3DisplayName,
-                User = photo.Subject3User,
-                Bounds = photo.Subject3Bounds,
-            });
-        }
-
-        if (photo.Subject4DisplayName != null)
+        GamePhotoSubject subject = new()
         {
-            subjects.Add(new()
-            {
-                Photo = photo,
-                PlayerId = 4,
-                DisplayName = photo.Subject4DisplayName,
-                User = photo.Subject4User,
-                Bounds = photo.Subject4Bounds,
-            });
-        }
-#pragma warning restore CS0618
+            Photo = photo,
+            PlayerId = playerId,
+            DisplayName = displayName,
+            User = user,
+            Bounds = bounds,
+        };
 
-        this.GamePhotoSubjects.AddRange(subjects);
-        if (saveChanges) this.SaveChanges();
+        this.GamePhotoSubjects.Add(subject);
+        if (save) this.SaveChanges();
+        return subject;
     }
 
     public void RemovePhoto(GamePhoto photo)
@@ -227,6 +180,9 @@ public IQueryable<GamePhotoSubject> GetSubjectsInPhoto(GamePhoto photo)
             .Where(s => s.PhotoId == photo.PhotoId)
             .OrderBy(s => s.PlayerId);
 
+    public int GetTotalSubjectsInPhoto(GamePhoto photo)
+        => this.GamePhotoSubjects.Count(s => s.PhotoId == photo.PhotoId);
+    
     public IQueryable<GameUser> GetUsersInPhoto(GamePhoto photo)
         => this.GetSubjectsInPhoto(photo)
             .Where(s => s.User != null)

Refresh.Interfaces.Workers/Migrations/MoveSubjectsOutOfGamePhotosMigration.cs

@@ -7,14 +7,43 @@ public class MoveSubjectsOutOfGamePhotosMigration : MigrationJob<GamePhoto>
 {
     protected override IQueryable<GamePhoto> SortAndFilter(IQueryable<GamePhoto> query)
     {
-        return query.OrderBy(p => p.PhotoId);
+        return query
+            .Where(p => p.Subjects.Count == 0)
+            .OrderBy(p => p.PhotoId);
     }
 
     protected override void Migrate(WorkContext context, GamePhoto[] batch)
     {
         foreach (GamePhoto photo in batch)
         {
-            context.Database.MigratePhotoSubjects(photo, false);
+            // Extra check to be sure
+            if (context.Database.GetTotalSubjectsInPhoto(photo) > 0)
+                continue;
+
+            #pragma warning disable CS0618 // obsoletion
+
+            // If DisplayName is not null, there is a subject in that spot
+            if (photo.Subject1DisplayName != null)
+            {
+                context.Database.AddSubjectForPhoto(photo, 1, photo.Subject1DisplayName, photo.Subject1User, photo.Subject1Bounds, false);
+            }
+
+            if (photo.Subject2DisplayName != null)
+            {
+                context.Database.AddSubjectForPhoto(photo, 2, photo.Subject2DisplayName, photo.Subject2User, photo.Subject2Bounds, false);
+            }
+
+            if (photo.Subject3DisplayName != null)
+            {
+                context.Database.AddSubjectForPhoto(photo, 3, photo.Subject3DisplayName, photo.Subject3User, photo.Subject3Bounds, false);
+            }
+
+            if (photo.Subject4DisplayName != null)
+            {
+                context.Database.AddSubjectForPhoto(photo, 4, photo.Subject4DisplayName, photo.Subject4User, photo.Subject4Bounds, false);
+            }
+
+            #pragma warning restore CS0618
         }
 
         context.Database.SaveChanges();