Merge branch 'main' into email-domain

Author: Toastbrot236

Refresh.Database/GameDatabaseContext.Levels.cs

@@ -52,7 +52,7 @@ public GameLevel AddLevel(ISerializedPublishLevel createInfo, TokenGame game, Ga
             EnforceMinMaxPlayers = createInfo.EnforceMinMaxPlayers,
             SameScreenGame = createInfo.SameScreenGame,
             BackgroundGuid = createInfo.BackgroundGuid,
-            Publisher = publisher,
+            PublisherUserId = publisher.UserId,
             GameVersion = game,
             PublishDate = timestamp,
             UpdateDate = timestamp,
@@ -63,22 +63,19 @@ public GameLevel AddLevel(ISerializedPublishLevel createInfo, TokenGame game, Ga
 
         this.SaveChanges();
 
-        this.CreateRevisionForLevel(level, level.Publisher);
-        this.GameLevelStatistics.Add(level.Statistics = new GameLevelStatistics
-        {
-            LevelId = level.LevelId,
-        });
-
-        this.SaveChanges();
-
-        if (level.Publisher != null)
+        this.WriteEnsuringStatistics(publisher, () =>
         {
-            this.WriteEnsuringStatistics(level.Publisher, () =>
+            this.GameLevelStatistics.Add(level.Statistics = new GameLevelStatistics
             {
-                level.Publisher.Statistics!.LevelCount++;
+                LevelId = level.LevelId,
             });
-        }
 
+            this.CreateRevisionForLevel(level, level.Publisher);
+            publisher.Statistics!.LevelCount++;
+        });
+
+        level.Publisher = publisher;
+        this.Entry(level.Publisher).State = EntityState.Unchanged;
         return level;
     }
 

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.Database/GameDatabaseContext.Pins.cs

@@ -169,6 +169,9 @@ private IEnumerable<PinProgressRelation> GetPinProgressesByUser(GameUser user, b
     public DatabaseList<PinProgressRelation> GetPinProgressesByUser(GameUser user, bool isBeta, TokenPlatform platform, int skip, int count)
         => new(this.GetPinProgressesByUser(user, isBeta, platform), skip, count);
 
+    public IQueryable<PinProgressRelation> GetAllPinProgressesByUserAndId(GameUser user, long pinId)
+        => this.PinProgressRelations.Where(p => p.PublisherId == user.UserId && p.PinId == pinId);
+
     public PinProgressRelation? GetUserPinProgress(long pinId, GameUser user, bool isBeta, TokenPlatform platform)
         => this.PinProgressRelations.FirstOrDefault(p => p.PinId == pinId && p.PublisherId == user.UserId 
             && (p.IsBeta == isBeta && p.Platform == platform || p.Platform == TokenPlatform.Website));
@@ -180,20 +183,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();
 }

Refresh.Database/GameDatabaseContext.Relations.cs

@@ -477,20 +477,6 @@ public GameReview UpdateReview(ISubmitReviewRequest updateInfo, GameReview revie
         this.SaveChanges();
         return review;
     }
-
-    public void MigrateReviewLabels(IEnumerable<GameReview> reviews)
-    {
-        foreach (GameReview review in reviews)
-        {
-#pragma warning disable CS0618 // LabelsString is obsolete          
-            if (string.IsNullOrWhiteSpace(review.LabelsString)) continue;
-
-            review.Labels = LabelExtensions.FromLbpCommaList(review.LabelsString).ToList();
-#pragma warning restore CS0618
-        }
-
-        this.SaveChanges();
-    }
 
     public void DeleteReviewsPostedByUser(GameUser user)
     {

Refresh.Database/GameDatabaseContext.Workers.cs

@@ -50,6 +50,13 @@ public bool MarkWorkerContacted(int id)
         return JsonConvert.DeserializeObject(state.State, type);
     }
 
+    public IQueryable<string> GetAllJobIds(WorkerClass? workerClass)
+    {
+        IQueryable<PersistentJobState> states = this.JobStates;
+        if (workerClass != null) states = states.Where(s => s.Class == workerClass);
+        return states.Select(s => s.JobId);
+    }
+
     public void UpdateOrCreateJobState(string jobId, object state, WorkerClass workerClass)
     {
         PersistentJobState? jobState = this.JobStates.FirstOrDefault(s => s.JobId == jobId && s.Class == workerClass);
@@ -58,6 +65,7 @@ public void UpdateOrCreateJobState(string jobId, object state, WorkerClass worke
             jobState = new PersistentJobState
             {
                 JobId = jobId,
+                Class = workerClass,
             };
 
             this.JobStates.Add(jobState);
@@ -66,4 +74,10 @@ public void UpdateOrCreateJobState(string jobId, object state, WorkerClass worke
         jobState.State = JsonConvert.SerializeObject(state, Formatting.None);
         this.SaveChanges();
     }
+
+    public void RemoveJobState(string jobId, bool save = true)
+    {
+        this.JobStates.RemoveRange(s => s.JobId == jobId);
+        if (save) this.SaveChanges();
+    }
 }

Refresh.Interfaces.Workers/Migrations/BackfillLevelAttributesMigration.cs

@@ -12,13 +12,14 @@ protected override IQueryable<GameLevel> SortAndFilter(IQueryable<GameLevel> que
             .OrderBy(l => l.LevelId);
     }
 
-    protected override void Migrate(WorkContext context, GameLevel[] batch)
+    protected override int Migrate(WorkContext context, GameLevel[] batch)
     {
         foreach (GameLevel level in batch)
         {
             context.Database.ApplyLevelMetadataFromAttributes(level);
         }
 
         context.Database.SaveChanges();
+        return batch.Length;
     }
 }

Refresh.Interfaces.Workers/Migrations/BackfillModdedPlanetFlagsMigration.cs

@@ -16,13 +16,14 @@ protected override IQueryable<GameUser> SortAndFilter(IQueryable<GameUser> query
             || u.BetaPlanetsHash != "0");
     }
 
-    protected override void Migrate(WorkContext context, GameUser[] batch)
+    protected override int Migrate(WorkContext context, GameUser[] batch)
     {
         foreach (GameUser user in batch)
         {
             context.Database.UpdatePlanetModdedStatus(user);
         }
 
         context.Database.SaveChanges();
+        return batch.Length;
     }
 }

Refresh.Interfaces.Workers/Migrations/BackfillReviewLabelsMigration.cs

@@ -1,13 +1,25 @@
-using Refresh.Database.Models.Comments; 
+using Refresh.Database.Models.Comments;
+using Refresh.Database.Models.Levels;
 using Refresh.Workers;
 
 namespace Refresh.Interfaces.Workers.Migrations;
 
 public class BackfillReviewLabelsMigration : MigrationJob<GameReview>
 {
-    protected override void Migrate(WorkContext context, GameReview[] batch)
+    protected override int Migrate(WorkContext context, GameReview[] batch)
     {
-        context.Database.MigrateReviewLabels(batch);
+        foreach (GameReview review in batch)
+        {
+#pragma warning disable CS0618 // LabelsString is obsolete          
+            if (string.IsNullOrWhiteSpace(review.LabelsString)) continue;
+
+            context.Database.Update(review);
+            review.Labels = LabelExtensions.FromLbpCommaList(review.LabelsString).ToList();
+#pragma warning restore CS0618
+        }
+
+        context.Database.SaveChanges();
+        return batch.Length;
     }
 
     protected override IQueryable<GameReview> SortAndFilter(IQueryable<GameReview> query)

Refresh.Interfaces.Workers/Migrations/BackfillRevisionMigration.cs

@@ -5,12 +5,13 @@ namespace Refresh.Interfaces.Workers.Migrations;
 
 public class BackfillRevisionMigration : MigrationJob<GameLevel>
 {
-    protected override void Migrate(WorkContext context, GameLevel[] batch)
+    protected override int Migrate(WorkContext context, GameLevel[] batch)
     {
         foreach (GameLevel level in batch)
         {
             context.Database.CreateRevisionForLevel(level, null);
         }
+        return batch.Length;
     }
 
     protected override IQueryable<GameLevel> SortAndFilter(IQueryable<GameLevel> query)

Refresh.Interfaces.Workers/Migrations/CalculateScoreRanksMigration.cs

@@ -12,12 +12,13 @@ protected override IQueryable<GameLevel> SortAndFilter(IQueryable<GameLevel> que
         return query.OrderBy(l => l.LevelId);
     }
 
-    protected override void Migrate(WorkContext context, GameLevel[] batch)
+    protected override int Migrate(WorkContext context, GameLevel[] batch)
     {
         foreach (GameLevel level in batch)
         {
             context.Database.RecalculateScoreStatistics(level);
         }
         context.Database.SaveChanges();
+        return batch.Length;
     }
 }