Add WorkerClass to PersistentJobState (#896)

Seems useful to store.

Author: jvyden

Refresh.Database/GameDatabaseContext.Workers.cs

@@ -41,18 +41,18 @@ public bool MarkWorkerContacted(int id)
         return true;
     }
 
-    public object? GetJobState(string jobId, Type type)
+    public object? GetJobState(string jobId, Type type, WorkerClass workerClass)
     {
-        PersistentJobState? state = this.JobStates.FirstOrDefault(s => s.JobId == jobId);
+        PersistentJobState? state = this.JobStates.FirstOrDefault(s => s.JobId == jobId && s.Class == workerClass);
         if (state == null)
             return null;
 
         return JsonConvert.DeserializeObject(state.State, type);
     }
 
-    public void UpdateOrCreateJobState(string jobId, object state)
+    public void UpdateOrCreateJobState(string jobId, object state, WorkerClass workerClass)
     {
-        PersistentJobState? jobState = this.JobStates.FirstOrDefault(s => s.JobId == jobId);
+        PersistentJobState? jobState = this.JobStates.FirstOrDefault(s => s.JobId == jobId && s.Class == workerClass);
         if (jobState == null)
         {
             jobState = new PersistentJobState

Refresh.Database/Migrations/20250726043747_AddClassToJobState.cs

@@ -0,0 +1,32 @@
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Refresh.Database.Migrations
+{
+    [DbContext(typeof(GameDatabaseContext))]
+    [Migration("20250726043747_AddClassToJobState")]
+    /// <inheritdoc />
+    public partial class AddClassToJobState : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "Class",
+                table: "JobStates",
+                type: "integer",
+                nullable: false,
+                defaultValue: 0);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Class",
+                table: "JobStates");
+        }
+    }
+}

Refresh.Database/Migrations/GameDatabaseContextModelSnapshot.cs

@@ -1594,6 +1594,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<string>("JobId")
                         .HasColumnType("text");
 
+                    b.Property<int>("Class")
+                        .HasColumnType("integer");
+
                     b.Property<string>("State")
                         .IsRequired()
                         .HasColumnType("jsonb");

Refresh.Database/Models/Workers/PersistentJobState.cs

@@ -3,5 +3,6 @@
 public class PersistentJobState
 {
     [Key, Required] public string JobId { get; set; } = null!;
+    public WorkerClass Class { get; set; } = WorkerClass.Refresh;
     [Column(TypeName = "jsonb"), Required] public string State { get; set; } = null!;
 }

Refresh.Workers/MigrationJob.cs

@@ -1,5 +1,6 @@
 using Microsoft.EntityFrameworkCore.Storage;
 using Refresh.Core;
+using Refresh.Database.Models.Workers;
 using Refresh.Workers.State;
 
 namespace Refresh.Workers;
@@ -9,6 +10,7 @@ public abstract class MigrationJob<TEntity> : WorkerJob, IJobStoresState where T
     public virtual string JobId => this.GetType().Name;
     public object JobState { get; set; } = null!;
     public Type JobStateType => typeof(MigrationJobState);
+    public WorkerClass JobClass => WorkerClass.Refresh;
 
     public MigrationJobState? MigrationJobState => JobState as MigrationJobState;
 

Refresh.Workers/State/IJobStoresState.cs

@@ -1,8 +1,11 @@
-namespace Refresh.Workers.State;
+using Refresh.Database.Models.Workers;
+
+namespace Refresh.Workers.State;
 
 public interface IJobStoresState
 {
     public string JobId { get; }
     public object JobState { get; set; }
     public Type JobStateType { get; }
+    public WorkerClass JobClass { get; }
 }

Refresh.Workers/WorkerManager.cs

@@ -2,6 +2,7 @@
 using NotEnoughLogs;
 using Refresh.Core;
 using Refresh.Database;
+using Refresh.Database.Models.Workers;
 using Refresh.Workers.State;
 
 namespace Refresh.Workers;
@@ -58,7 +59,7 @@ private void RunWorkCycle()
             IJobStoresState? jobWithState = job as IJobStoresState;
             if (jobWithState != null)
             {
-                object? jobState = context.Database.GetJobState(jobWithState.JobId, jobWithState.JobStateType);
+                object? jobState = context.Database.GetJobState(jobWithState.JobId, jobWithState.JobStateType, jobWithState.JobClass);
                 jobState ??= Activator.CreateInstance(jobWithState.JobStateType);
 
                 jobWithState.JobState = jobState!;
@@ -82,7 +83,7 @@ private void RunWorkCycle()
             }
 
             if (jobWithState != null)
-                context.Database.UpdateOrCreateJobState(jobWithState.JobId, jobWithState.JobState);
+                context.Database.UpdateOrCreateJobState(jobWithState.JobId, jobWithState.JobState, jobWithState.JobClass);
         }
 
         long now = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();