Another attempt

Author: Toastbrot236

Refresh.Database/GameDatabaseContext.Levels.cs

@@ -52,16 +52,12 @@ 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,
         };
 
-        // This prevents EF from trying to INSERT both the user and their stats in unit tests, 
-        // just because of us setting the level.Publisher reference, and throwing a duplicate key exception that way.
-        this.Entry(level.Publisher).State = EntityState.Unchanged;
-
         this.ApplyLevelMetadataFromAttributes(level);
         this.GameLevels.Add(level);
 
@@ -78,6 +74,8 @@ public GameLevel AddLevel(ISerializedPublishLevel createInfo, TokenGame game, Ga
             publisher.Statistics!.LevelCount++;
         });
 
+        level.Publisher = publisher;
+        this.Entry(level.Publisher).State = EntityState.Unchanged;
         return level;
     }
 

RefreshTests.GameServer/TestContext.cs

@@ -17,6 +17,7 @@
 using Refresh.Database.Models.Playlists;
 using Refresh.Interfaces.APIv3.Endpoints.DataTypes.Request;
 using Refresh.Database.Models.Photos;
+using Microsoft.EntityFrameworkCore;
 
 namespace RefreshTests.GameServer;
 
@@ -111,6 +112,7 @@ public GameUser CreateUser(string? username = null, GameUserRole role = GameUser
         GameUser user = this.Database.CreateUser(username, $"{username}@{username}.local");
         if (role != GameUserRole.User) this.Database.SetUserRole(user, role);
         if (verifyEmail) this.Database.VerifyUserEmail(user);
+        this.Database.Entry(user).State = EntityState.Unchanged;
 
         return user;
     }

RefreshTests.GameServer/Tests/Workers/JobStateTests.cs

@@ -111,11 +111,11 @@ public void ReExecutesMigrationJobAfterRollbackAndReupdate()
         GameLevel? firstLevelMigrated = context.Database.GetLevelById(firstLevel.LevelId);
         Assert.That(firstLevelMigrated, Is.Not.Null);
         Assert.That(firstLevelMigrated!.Title, Does.EndWith(" test"));
-        context.Database.Refresh();
 
         // We can ignore the fact that this level's title won't end on " test", since when we add a real migration job for a certain entity,
         // we also adjust that entity's creation/update methods in order to apply whatever change we want to new entities aswell.
         // We don't do it here, and it doesn't matter in this test.
+        context.Database.Refresh();
         GameLevel secondLevel = context.CreateLevel(user);
         // Should skip job because it's still "complete", so the new level won't be migrated.
         manager.RunWorkCycle();
@@ -134,8 +134,8 @@ public void ReExecutesMigrationJobAfterRollbackAndReupdate()
 
         // Simulate a roll-back, meaning the job wouldn't be in the WorkerManager anymore, so no migrations will happen, and the job state would be
         // auto-removed by WorkerManager.Start() in real cases.
-        manager = new(Logger, dataStore, context.DatabaseProvider);
         context.Database.Refresh();
+        manager = new(Logger, dataStore, context.DatabaseProvider);
         GameLevel thirdLevel = context.CreateLevel(user);
 
         manager.RemoveUnusedJobStates();