Different attempt at fixing level test fails

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,
-            PublisherUserId = publisher.UserId,
+            Publisher = publisher,
             GameVersion = game,
             PublishDate = timestamp,
             UpdateDate = timestamp,
@@ -61,31 +61,24 @@ public GameLevel AddLevel(ISerializedPublishLevel createInfo, TokenGame game, Ga
         this.ApplyLevelMetadataFromAttributes(level);
         this.GameLevels.Add(level);
 
-        this.SaveChanges();
-
-        this.CreateRevisionForLevel(level, level.Publisher);
-        this.GameLevelStatistics.Add(level.Statistics = new GameLevelStatistics
-        {
-            LevelId = level.LevelId,
-        });
+        // Seems unnecessary, but prevents EF from trying to INSERT both unconditionally in unit tests
+        this.GameUsers.Update(publisher);
+        if (publisher.Statistics != null)
+            this.GameUserStatistics.Update(publisher.Statistics);
 
         this.SaveChanges();
 
-        if (publisher != null)
+        this.WriteEnsuringStatistics(publisher, () =>
         {
-            this.WriteEnsuringStatistics(publisher, () =>
+            this.GameLevelStatistics.Add(level.Statistics = new GameLevelStatistics
             {
-                // even if the level count does get updated, ChangeTracker.HasChanges() will return false anyways
-                // (in unit tests atleast), failing the assert
-                this.GameUsers.Update(publisher);
-                publisher.Statistics!.LevelCount++;
+                LevelId = level.LevelId,
             });
-        }
 
-        // setting Publisher on an untracked object prevents EF from unconditionally trying to INSERT the publisher into the 
-        // GameUsers table on the next SaveChanges() call in unit tests, causing a duplicate key exception
-        level = level.Clone();
-        level.Publisher = publisher;
+            this.CreateRevisionForLevel(level, level.Publisher);
+            publisher.Statistics!.LevelCount++;
+        });
+
         return level;
     }
 

RefreshTests.GameServer/Tests/Levels/UploadTests.cs

@@ -25,15 +25,18 @@ public void CanCreateLevelDirectly()
     }
 
     [Test]
-    public void CanCreateTwoLevelsWhileRefreshing()
+    public void CanCreateMultipleLevelsWhileRefreshing()
     {
         using TestContext context = this.GetServer(false);
         GameUser user = context.CreateUser();
+
         context.Database.Refresh();
         GameLevel level1 = context.CreateLevel(user);
         context.Database.Refresh();
         GameLevel level2 = context.CreateLevel(user);
         context.Database.Refresh();
+        GameLevel level3 = context.CreateLevel(user);
+        context.Database.Refresh();
     }
 
     [Test]