The Unified and Autonomous Development Platform
Refactor pull request and issue change comments
Robin Shenc9980f764501
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.javaindex f3ff9112d9..ade5086b06 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java@@ -164,7 +164,7 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>comment.setContent(note);comment.setUser(change.getUser());comment.setIssue(change.getIssue());- comment.setDate(new DateTime(change.getDate()).plusMillis(1).toDate());+ comment.setDate(change.getDate());dao.persist(comment);}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestChangeManager.javaindex 7cb1e5d173..9a4b32186f 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestChangeManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestChangeManager.java@@ -5,8 +5,6 @@ import java.util.Date;import javax.inject.Inject;import javax.inject.Singleton;-import org.joda.time.DateTime;-import io.onedev.commons.loader.ListenerRegistry;import io.onedev.server.entitymanager.PullRequestChangeManager;import io.onedev.server.event.pullrequest.PullRequestChanged;@@ -43,7 +41,7 @@ public class DefaultPullRequestChangeManager extends BaseEntityManager<PullRequecomment.setContent(note);comment.setUser(change.getUser());comment.setRequest(change.getRequest());- comment.setDate(new DateTime(change.getDate()).plusMillis(1).toDate());+ comment.setDate(change.getDate());dao.persist(comment);}diff --git a/server-core/src/main/java/io/onedev/server/entityreference/DefaultEntityReferenceManager.java b/server-core/src/main/java/io/onedev/server/entityreference/DefaultEntityReferenceManager.javaindex 1a87ca9a81..0a805b4ed5 100644--- a/server-core/src/main/java/io/onedev/server/entityreference/DefaultEntityReferenceManager.java+++ b/server-core/src/main/java/io/onedev/server/entityreference/DefaultEntityReferenceManager.java@@ -30,6 +30,7 @@ import io.onedev.server.model.IssueChange;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;import io.onedev.server.persistence.annotation.Transactional;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.ProjectScopedNumber;@Singleton@@ -73,6 +74,7 @@ public class DefaultEntityReferenceManager implements EntityReferenceManager {IssueChange change = new IssueChange();change.setData(referencedFromIssueData);change.setDate(new Date());+ change.setUser(SecurityUtils.getUser());change.setIssue(referencedIssue);referencedIssue.getChanges().add(change);issueChangeManager.save(change);@@ -99,6 +101,7 @@ public class DefaultEntityReferenceManager implements EntityReferenceManager {PullRequestChange change = new PullRequestChange();change.setData(referencedFromIssueData);change.setDate(new Date());+ change.setUser(SecurityUtils.getUser());change.setRequest(referencedRequest);referencedRequest.getChanges().add(change);pullRequestChangeManager.save(change);@@ -132,6 +135,7 @@ public class DefaultEntityReferenceManager implements EntityReferenceManager {IssueChange change = new IssueChange();change.setData(referencedFromPullRequestData);change.setDate(new Date());+ change.setUser(SecurityUtils.getUser());change.setIssue(referencedIssue);referencedIssue.getChanges().add(change);issueChangeManager.save(change);@@ -158,6 +162,7 @@ public class DefaultEntityReferenceManager implements EntityReferenceManager {PullRequestChange change = new PullRequestChange();change.setData(referencedFromPullRequestData);change.setDate(new Date());+ change.setUser(SecurityUtils.getUser());change.setRequest(referencedRequest);referencedRequest.getChanges().add(change);pullRequestChangeManager.save(change);@@ -191,6 +196,7 @@ public class DefaultEntityReferenceManager implements EntityReferenceManager {IssueChange change = new IssueChange();change.setData(referencedFromCodeCommentData);change.setDate(new Date());+ change.setUser(SecurityUtils.getUser());change.setIssue(referencedIssue);referencedIssue.getChanges().add(change);issueChangeManager.save(change);@@ -217,6 +223,7 @@ public class DefaultEntityReferenceManager implements EntityReferenceManager {PullRequestChange change = new PullRequestChange();change.setData(referencedFromCodeCommentData);change.setDate(new Date());+ change.setUser(SecurityUtils.getUser());change.setRequest(referencedRequest);referencedRequest.getChanges().add(change);pullRequestChangeManager.save(change);diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChanged.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChanged.javaindex 185e02177a..2532e9fee4 100644--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChanged.java+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChanged.java@@ -47,7 +47,10 @@ public class PullRequestChanged extends PullRequestEvent implements CommitAwareObjectId commitId;if (change.getData() instanceof PullRequestMergeData) {MergePreview preview = getRequest().getMergePreview();- commitId = ObjectId.fromString(preview.getMergeCommitHash());+ if (preview != null)+ commitId = ObjectId.fromString(preview.getMergeCommitHash());+ else+ commitId = ObjectId.zeroId(); // Merged outside} else if (change.getData() instanceof PullRequestDiscardData) {commitId = ObjectId.fromString(getRequest().getLatestUpdate().getTargetHeadCommitHash());} else {diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.javaindex f3205b05d8..3afc1af8de 100644--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java@@ -3539,6 +3539,11 @@ public class DataMigrator {private void migrate77(File dataDir, Stack<Integer> versions) {Map<String, String> userIds = new HashMap<>();++ Long maxPullRequestCommentId = 0L;+ Long maxIssueCommentId = 0L;+ File issueCommentsFile = null;+ File pullRequestCommentsFile = null;for (File file: dataDir.listFiles()) {if (file.getName().startsWith("Users.xml")) {VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);@@ -3552,8 +3557,43 @@ public class DataMigrator {userIds.put(name, id);}dom.writeToFile(file, false);+ } else if (file.getName().startsWith("IssueComments.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ Long commentId = Long.parseLong(element.elementText("id").trim());+ if (commentId > maxIssueCommentId)+ maxIssueCommentId = commentId;+ }+ issueCommentsFile = file;+ } else if (file.getName().startsWith("PullRequestComments.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ Long commentId = Long.parseLong(element.elementText("id").trim());+ if (commentId > maxPullRequestCommentId)+ maxPullRequestCommentId = commentId;+ }+ pullRequestCommentsFile = file;}}++ VersionedXmlDoc issueCommentsDom;+ if (issueCommentsFile == null) {+ issueCommentsFile = new File(dataDir, "IssueComments.xml");+ issueCommentsDom = new VersionedXmlDoc();+ issueCommentsDom.addElement("list");+ } else {+ issueCommentsDom = VersionedXmlDoc.fromFile(issueCommentsFile);+ }++ VersionedXmlDoc pullRequestCommentsDom;+ if (pullRequestCommentsFile == null) {+ pullRequestCommentsFile = new File(dataDir, "PullRequestComments.xml");+ pullRequestCommentsDom = new VersionedXmlDoc();+ pullRequestCommentsDom.addElement("list");+ } else {+ pullRequestCommentsDom = VersionedXmlDoc.fromFile(pullRequestCommentsFile);+ }+for (File file: dataDir.listFiles()) {if (file.getName().startsWith("Projects.xml")) {VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);@@ -3565,6 +3605,8 @@ public class DataMigrator {} else if (file.getName().startsWith("PullRequestChanges.xml")) {VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);for (Element element: dom.getRootElement().elements()) {+ if (element.element("user") == null)+ element.addElement("user").setText("-1");Element dataElement = element.element("data");Element assigneeElement = dataElement.element("assignee");if (assigneeElement != null) {@@ -3586,10 +3628,50 @@ public class DataMigrator {element.detach();}}+ Element commentElement = element.element("comment");+ if (commentElement != null) {+ Element pullRequestCommentElement = pullRequestCommentsDom.getRootElement()+ .addElement("io.onedev.server.model.PullRequestComment");+ pullRequestCommentElement.addElement("content").setText(commentElement.getText().trim());+ pullRequestCommentElement.addAttribute("revision", "0.0");+ pullRequestCommentElement.addElement("id").setText(String.valueOf(++maxPullRequestCommentId));+ pullRequestCommentElement.addElement("request").setText(element.elementText("request").trim());+ pullRequestCommentElement.addElement("user").setText(element.elementText("user").trim());+ Element pullRequestCommentDateElement = pullRequestCommentElement.addElement("date");+ Element dateElement = element.element("date");+ pullRequestCommentDateElement.setText(dateElement.getText().trim());+ pullRequestCommentDateElement.addAttribute("class", "sql-timestamp");+ commentElement.detach();+ }+ }+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("IssueChanges.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ if (element.element("user") == null)+ element.addElement("user").setText("-1");+ Element commentElement = element.element("comment");+ if (commentElement != null) {+ Element issueCommentElement = issueCommentsDom.getRootElement()+ .addElement("io.onedev.server.model.IssueComment");+ issueCommentElement.addElement("content").setText(commentElement.getText().trim());+ issueCommentElement.addAttribute("revision", "0.0");+ issueCommentElement.addElement("id").setText(String.valueOf(++maxIssueCommentId));+ issueCommentElement.addElement("issue").setText(element.elementText("issue").trim());+ issueCommentElement.addElement("user").setText(element.elementText("user").trim());+ Element issueCommentDateElement = issueCommentElement.addElement("date");+ Element dateElement = element.element("date");+ issueCommentDateElement.setText(dateElement.getText().trim());+ issueCommentDateElement.addAttribute("class", "sql-timestamp");+ commentElement.detach();+ }}dom.writeToFile(file, false);}}++ issueCommentsDom.writeToFile(issueCommentsFile, false);+ pullRequestCommentsDom.writeToFile(pullRequestCommentsFile, false);}}diff --git a/server-core/src/main/java/io/onedev/server/model/IssueChange.java b/server-core/src/main/java/io/onedev/server/model/IssueChange.javaindex ac8d021218..6da8c02368 100644--- a/server-core/src/main/java/io/onedev/server/model/IssueChange.java+++ b/server-core/src/main/java/io/onedev/server/model/IssueChange.java@@ -2,7 +2,6 @@ package io.onedev.server.model;import java.util.Date;-import javax.annotation.Nullable;import javax.persistence.Column;import javax.persistence.Entity;import javax.persistence.FetchType;@@ -26,6 +25,7 @@ public class IssueChange extends AbstractEntity {private Issue issue;@ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)private User user;@Column(nullable=false)@@ -43,7 +43,6 @@ public class IssueChange extends AbstractEntity {this.issue = issue;}- @Nullablepublic User getUser() {return user;}diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestChange.java b/server-core/src/main/java/io/onedev/server/model/PullRequestChange.javaindex e86423f021..994a32868f 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequestChange.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestChange.java@@ -2,7 +2,6 @@ package io.onedev.server.model;import java.util.Date;-import javax.annotation.Nullable;import javax.persistence.Column;import javax.persistence.Entity;import javax.persistence.FetchType;@@ -27,6 +26,7 @@ public class PullRequestChange extends AbstractEntity {private PullRequest request;@ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)private User user;@Column(nullable=false)@@ -52,7 +52,6 @@ public class PullRequestChange extends AbstractEntity {this.data = data;}- @Nullablepublic User getUser() {return user;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.javaindex be585bcdce..ea274a1bc8 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java@@ -107,10 +107,6 @@ public abstract class IssueActivitiesPanel extends Panel {activities.add(new IssueOpenedActivity(getIssue()));List<IssueActivity> otherActivities = new ArrayList<>();- if (showComments) {- for (IssueComment comment: getIssue().getComments())- otherActivities.add(new IssueCommentedActivity(comment));- }if (showChangeHistory) {for (IssueChange change: getIssue().getChanges()) {@@ -121,13 +117,18 @@ public abstract class IssueActivitiesPanel extends Panel {}}+ if (showComments) {+ for (IssueComment comment: getIssue().getComments())+ otherActivities.add(new IssueCommentedActivity(comment));+ }+otherActivities.sort((o1, o2) -> {if (o1.getDate().getTime()<o2.getDate().getTime())return -1;else if (o1.getDate().getTime()>o2.getDate().getTime())return 1;- else- return 1;+ else+ return 0;});activities.addAll(otherActivities);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.javaindex 52e5a6e488..9e1b00a722 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java@@ -145,12 +145,6 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {otherActivities.add(new PullRequestUpdatedActivity(update));}- if (showComments) {- for (PullRequestComment comment: request.getComments()) {- otherActivities.add(new PullRequestCommentedActivity(comment));- }- }-if (showChangeHistory) {for (PullRequestChange change: getPullRequest().getChanges()) {if (!(change.getData() instanceof ReferencedFromAware)@@ -160,6 +154,12 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {}}+ if (showComments) {+ for (PullRequestComment comment: request.getComments()) {+ otherActivities.add(new PullRequestCommentedActivity(comment));+ }+ }+otherActivities.sort((o1, o2) -> {if (o1.getDate().getTime()<o2.getDate().getTime())return -1;