The Unified and Autonomous Development Platform
fix: Adjust comment date to prevent timestamp conflicts in issue and pull request changes
Robin Shen53d1c0eedb8c
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 30399119fc..614950b552 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@@ -121,7 +121,7 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>comment.setContent(note);comment.setUser(change.getUser());comment.setIssue(change.getIssue());- comment.setDate(change.getDate());+ comment.setDate(new DateTime(change.getDate()).minusSeconds(1).toDate());dao.persist(comment);comment.getIssue().setCommentCount(comment.getIssue().getCommentCount()+1);}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 1d878169f7..b257b4aec4 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@@ -1,6 +1,16 @@package io.onedev.server.entitymanager.impl;+import java.util.Date;+import java.util.Objects;++import javax.annotation.Nullable;+import javax.inject.Inject;+import javax.inject.Singleton;++import org.joda.time.DateTime;+import com.google.common.base.Preconditions;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.entitymanager.PullRequestChangeManager;import io.onedev.server.entityreference.ReferenceChangeManager;@@ -11,18 +21,16 @@ import io.onedev.server.model.PullRequestChange;import io.onedev.server.model.PullRequestComment;import io.onedev.server.model.support.pullrequest.AutoMerge;import io.onedev.server.model.support.pullrequest.MergeStrategy;-import io.onedev.server.model.support.pullrequest.changedata.*;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestAutoMergeChangeData;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestDescriptionChangeData;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeStrategyChangeData;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestTargetBranchChangeData;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestTitleChangeData;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.BaseEntityManager;import io.onedev.server.persistence.dao.Dao;import io.onedev.server.security.SecurityUtils;-import javax.annotation.Nullable;-import javax.inject.Inject;-import javax.inject.Singleton;-import java.util.Date;-import java.util.Objects;-@Singletonpublic class DefaultPullRequestChangeManager extends BaseEntityManager<PullRequestChange>implements PullRequestChangeManager {@@ -50,7 +58,7 @@ public class DefaultPullRequestChangeManager extends BaseEntityManager<PullRequecomment.setContent(note);comment.setUser(change.getUser());comment.setRequest(change.getRequest());- comment.setDate(change.getDate());+ comment.setDate(new DateTime(change.getDate()).minusSeconds(1).toDate());dao.persist(comment);comment.getRequest().setCommentCount(comment.getRequest().getCommentCount()+1);}