commit a261cb9c7dcf515289dd1197829ed2dfdcebfe01
author Nasser Grainawi <nasser.grainawi@linaro.org> Mon Jun 17 14:24:38 2024 -0600
committer Nasser Grainawi <nasser.grainawi@linaro.org> Wed Jun 19 13:12:21 2024 -0600
tree 452c9158f56027386c168024342870f147d1e332
parent 96d9efaa113a8e125234377ae208a05f0589c983

OutputStreamQuery: Add patchset comments when adding patchsets

This keeps more of the per-patchset logic together for later refactors.

Change-Id: I3d98e55fd77363c6403f5d4f46fa70959f00359f
Release-Notes: skip

java/com/google/gerrit/server/query/change/OutputStreamQuery.java

diff --git a/java/com/google/gerrit/server/query/change/OutputStreamQuery.java b/java/com/google/gerrit/server/query/change/OutputStreamQuery.java
index 91e54b9..e5dde1e 100644
--- a/java/com/google/gerrit/server/query/change/OutputStreamQuery.java
+++ b/java/com/google/gerrit/server/query/change/OutputStreamQuery.java
@@ -310,6 +310,11 @@
           d,
           labelTypes,
           accountLoader);
+      if (includeComments) {
+        for (PatchSetAttribute attribute : c.patchSets) {
+          eventFactory.addPatchSetComments(attribute, d.publishedComments(), accountLoader);
+        }
+      }
     }
 
     if (includeCurrentPatchSet) {
@@ -335,11 +340,6 @@
 
     if (includeComments) {
       eventFactory.addComments(c, d.messages(), accountLoader);
-      if (includePatchSets) {
-        for (PatchSetAttribute attribute : c.patchSets) {
-          eventFactory.addPatchSetComments(attribute, d.publishedComments(), accountLoader);
-        }
-      }
     }
 
     if (includeDependencies) {