record used needs and reviewer in state

goatcorp · Oct 3, 2024 · e80e36c · e80e36c
1 parent 1c898d7
commit e80e36c
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 10 deletions.
diff --git a/Plogon/BuildProcessor.cs b/Plogon/BuildProcessor.cs
@@ -1149,7 +1149,9 @@ await this.dockerClient.Containers.RemoveContainerAsync(containerCreateResponse.
                         task.Manifest.Plugin.Commit,
                         version!,
                         task.Manifest.Plugin.MinimumVersion,
-                        changelog);
+                        changelog,
+                        this.actor ?? throw new Exception("Committing, but actor is null"),
+                        allNeeds.Select(x => (x.Name, x.Version)));
 
                     this.CommitReviewedNeeds(allNeeds);
 

diff --git a/Plogon/Repo/PluginRepository.cs b/Plogon/Repo/PluginRepository.cs
@@ -110,7 +110,17 @@ public void RemovePlugin(string channelName, string plugin)
     /// <param name="effectiveVersion">New version of the plugin</param>
     /// <param name="minimumVersion">Minimum version Dalamud should still try to load.</param>
     /// <param name="changelog">Plugin changelog</param>
-    public void UpdatePluginHave(string channelName, string plugin, string haveCommit, string effectiveVersion, string? minimumVersion, string? changelog)
+    /// <param name="reviewer">Who reviewed this version</param>
+    /// <param name="needs">Needs we had for this version</param>
+    public void UpdatePluginHave(
+        string channelName,
+        string plugin,
+        string haveCommit,
+        string effectiveVersion,
+        string? minimumVersion,
+        string? changelog,
+        string reviewer,
+        IEnumerable<(string Key, string Version)> needs)
     {
         if (!this.State.Channels.ContainsKey(channelName))
         {
@@ -138,14 +148,13 @@ public void UpdatePluginHave(string channelName, string plugin, string haveCommi
             channel.Plugins[plugin] = pluginState;
         }
 
-        if (!string.IsNullOrWhiteSpace(changelog))
+        pluginState.Changelogs[effectiveVersion] = new State.Channel.PluginState.PluginChangelog
         {
-            pluginState.Changelogs[effectiveVersion] = new State.Channel.PluginState.PluginChangelog()
-            {
-                Changelog = changelog,
-                TimeReleased = DateTime.Now,
-            };
-        }
+            Changelog = changelog,
+            TimeReleased = DateTime.Now,
+            UsedNeeds = needs.Select(x => new State.Channel.PluginState.PluginChangelog.UsedNeed(x.Key, x.Version)).ToList(),
+            Reviewer = reviewer,
+        };
 
         SaveState();
     }

diff --git a/Plogon/Repo/State.cs b/Plogon/Repo/State.cs
@@ -37,10 +37,17 @@ public PluginState()
 
             public Dictionary<string, PluginChangelog> Changelogs { get; set; }
 
+            // This should really be "version", but we're stuck with "changelog" for now
             public class PluginChangelog
             {
                 public DateTime TimeReleased { get; set; }
-                public string Changelog { get; set; }
+                public string? Changelog { get; set; }
+
+                public record UsedNeed(string Key, string Version);
+
+                public List<UsedNeed>? UsedNeeds { get; set; }
+
+                public string Reviewer { get; set; }
             }
         }