Nullify ReviInfoTestMerge

src/Tgstation.Server.Host/Components/Instance.cs

@@ -368,10 +368,7 @@ namespace Tgstation.Server.Host.Components
 						{
 							var testMerges = updatedTestMerges ?? oldRevInfo.ActiveTestMerges.Select(x => x.TestMerge);
 							var revInfoTestMerges = testMerges.Select(
-								testMerge => new RevInfoTestMerge
-								{
-									TestMerge = testMerge,
-								})
+								testMerge => new RevInfoTestMerge(testMerge, currentRevInfo))
 								.ToList();
 
 							currentRevInfo.ActiveTestMerges = revInfoTestMerges;

src/Tgstation.Server.Host/Components/Repository/RepositoryUpdateService.cs

@@ -228,10 +228,7 @@ namespace Tgstation.Server.Host.Components.Repository
 							foreach (var activeTestMerge in previousRevInfo.ActiveTestMerges)
 								lastRevisionInfo.ActiveTestMerges.Add(activeTestMerge);
 
-							lastRevisionInfo.ActiveTestMerges.Add(new RevInfoTestMerge
-							{
-								TestMerge = testMergeToAdd,
-							});
+							lastRevisionInfo.ActiveTestMerges.Add(new RevInfoTestMerge(testMergeToAdd, lastRevisionInfo));
 							lastRevisionInfo.PrimaryTestMerge = testMergeToAdd;
 
 							needsUpdate = true;

src/Tgstation.Server.Host/Models/RevInfoTestMerge.cs

@@ -1,6 +1,5 @@
-using System.ComponentModel.DataAnnotations;
-
-#nullable disable
+using System;
+using System.ComponentModel.DataAnnotations;
 
 namespace Tgstation.Server.Host.Models
 {
@@ -25,5 +24,26 @@ namespace Tgstation.Server.Host.Models
 		/// </summary>
 		[Required]
 		public RevisionInformation RevisionInformation { get; set; }
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="RevInfoTestMerge"/> class.
+		/// </summary>
+		[Obsolete("For use by EFCore only", true)]
+		public RevInfoTestMerge()
+		{
+			TestMerge = null!;
+			RevisionInformation = null!;
+		}
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="RevInfoTestMerge"/> class.
+		/// </summary>
+		/// <param name="testMerge">The value of <see cref="TestMerge"/>.</param>
+		/// <param name="revisionInformation">The value of <see cref="RevisionInformation"/>.</param>
+		public RevInfoTestMerge(TestMerge testMerge, RevisionInformation revisionInformation)
+		{
+			TestMerge = testMerge ?? throw new ArgumentNullException(nameof(testMerge));
+			RevisionInformation = revisionInformation ?? throw new ArgumentNullException(nameof(revisionInformation));
+		}
 	}
 }