Skip to content

The Unified and Autonomous Development Platform

feat: Log comment removal in issue activities page (OD-1918)

Robin Shen1642fd3d8c8d
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueCommentManager.java
index 56e55043fd..0f8fffa766 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueCommentManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueCommentManager.java
@@ -1,15 +1,18 @@
package io.onedev.server.entitymanager.impl;
import com.google.common.base.Preconditions;
+import io.onedev.server.entitymanager.IssueChangeManager;
import io.onedev.server.entitymanager.IssueCommentManager;
import io.onedev.server.event.ListenerRegistry;
import io.onedev.server.event.project.issue.IssueCommentCreated;
-import io.onedev.server.event.project.issue.IssueCommentDeleted;
import io.onedev.server.event.project.issue.IssueCommentEdited;
+import io.onedev.server.model.IssueChange;
import io.onedev.server.model.IssueComment;
+import io.onedev.server.model.support.issue.changedata.IssueCommentRemoveData;
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.inject.Inject;
import javax.inject.Singleton;
@@ -18,11 +21,14 @@ import java.util.Collection;
@Singleton
public class DefaultIssueCommentManager extends BaseEntityManager<IssueComment> implements IssueCommentManager {
+ private final IssueChangeManager changeManager;
+
private final ListenerRegistry listenerRegistry;
@Inject
- public DefaultIssueCommentManager(Dao dao, ListenerRegistry listenerRegistry) {
+ public DefaultIssueCommentManager(Dao dao, IssueChangeManager changeManager, ListenerRegistry listenerRegistry) {
super(dao);
+ this.changeManager = changeManager;
this.listenerRegistry = listenerRegistry;
}
@@ -38,9 +44,13 @@ public class DefaultIssueCommentManager extends BaseEntityManager<IssueComment>
@Override
public void delete(IssueComment comment) {
dao.remove(comment);
-
comment.getIssue().setCommentCount(comment.getIssue().getCommentCount()-1);
- listenerRegistry.post(new IssueCommentDeleted(comment));
+
+ IssueChange change = new IssueChange();
+ change.setIssue(comment.getIssue());
+ change.setUser(SecurityUtils.getUser());
+ change.setData(new IssueCommentRemoveData());
+ changeManager.create(change, null);
}
@Transactional
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestCommentManager.java
index 65416c2e89..61dba7cf37 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestCommentManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestCommentManager.java
@@ -1,29 +1,36 @@
package io.onedev.server.entitymanager.impl;
import com.google.common.base.Preconditions;
+import io.onedev.server.entitymanager.PullRequestChangeManager;
import io.onedev.server.entitymanager.PullRequestCommentManager;
import io.onedev.server.event.ListenerRegistry;
import io.onedev.server.event.project.pullrequest.PullRequestCommentCreated;
-import io.onedev.server.event.project.pullrequest.PullRequestCommentDeleted;
import io.onedev.server.event.project.pullrequest.PullRequestCommentEdited;
+import io.onedev.server.model.PullRequestChange;
import io.onedev.server.model.PullRequestComment;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestCommentRemovedData;
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.inject.Inject;
import javax.inject.Singleton;
import java.util.Collection;
+import java.util.Date;
@Singleton
public class DefaultPullRequestCommentManager extends BaseEntityManager<PullRequestComment>
implements PullRequestCommentManager {
+ private final PullRequestChangeManager changeManager;
+
private final ListenerRegistry listenerRegistry;
@Inject
- public DefaultPullRequestCommentManager(Dao dao, ListenerRegistry listenerRegistry) {
+ public DefaultPullRequestCommentManager(Dao dao, PullRequestChangeManager changeManager, ListenerRegistry listenerRegistry) {
super(dao);
+ this.changeManager = changeManager;
this.listenerRegistry = listenerRegistry;
}
@@ -32,7 +39,12 @@ public class DefaultPullRequestCommentManager extends BaseEntityManager<PullRequ
public void delete(PullRequestComment comment) {
super.delete(comment);
comment.getRequest().setCommentCount(comment.getRequest().getCommentCount()-1);
- listenerRegistry.post(new PullRequestCommentDeleted(comment));
+ PullRequestChange change = new PullRequestChange();
+ change.setDate(new Date());
+ change.setRequest(comment.getRequest());
+ change.setData(new PullRequestCommentRemovedData());
+ change.setUser(SecurityUtils.getUser());
+ changeManager.create(change, null);
}
@Transactional
diff --git a/server-core/src/main/java/io/onedev/server/event/project/issue/IssueCommentDeleted.java b/server-core/src/main/java/io/onedev/server/event/project/issue/IssueCommentDeleted.java
deleted file mode 100644
index dbba9d50d4..0000000000
--- a/server-core/src/main/java/io/onedev/server/event/project/issue/IssueCommentDeleted.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package io.onedev.server.event.project.issue;
-
-import io.onedev.server.model.IssueComment;
-import io.onedev.server.security.SecurityUtils;
-
-import java.util.Date;
-
-public class IssueCommentDeleted extends IssueEvent {
-
- private final Long commentId;
-
- private static final long serialVersionUID = 1L;
-
- public IssueCommentDeleted(IssueComment comment) {
- super(SecurityUtils.getUser(), new Date(), comment.getIssue());
- this.commentId = comment.getId();
- }
-
- public Long getCommentId() {
- return commentId;
- }
-
- @Override
- public boolean affectsListing() {
- return false;
- }
-
- @Override
- public boolean isMinor() {
- return true;
- }
-
- @Override
- public String getActivity() {
- return "comment deleted";
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCommentDeleted.java b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCommentDeleted.java
deleted file mode 100644
index 5b644ac540..0000000000
--- a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCommentDeleted.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package io.onedev.server.event.project.pullrequest;
-
-import io.onedev.server.model.PullRequestComment;
-import io.onedev.server.security.SecurityUtils;
-
-import java.util.Date;
-
-public class PullRequestCommentDeleted extends PullRequestEvent {
-
- private final Long commentId;
-
- private static final long serialVersionUID = 1L;
-
- public PullRequestCommentDeleted(PullRequestComment comment) {
- super(SecurityUtils.getUser(), new Date(), comment.getRequest());
- this.commentId = comment.getId();
- }
-
- public Long getCommentId() {
- return commentId;
- }
-
- @Override
- public boolean isMinor() {
- return true;
- }
-
- @Override
- public String getActivity() {
- return "comment deleted";
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueCommentRemoveData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueCommentRemoveData.java
new file mode 100644
index 0000000000..58cfaab309
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueCommentRemoveData.java
@@ -0,0 +1,39 @@
+package io.onedev.server.model.support.issue.changedata;
+
+import io.onedev.server.model.Group;
+import io.onedev.server.model.User;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+public class IssueCommentRemoveData extends IssueChangeData {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public String getActivity() {
+ return "removed comment";
+ }
+
+ @Override
+ public Map<String, Collection<User>> getNewUsers() {
+ return new HashMap<>();
+ }
+
+ @Override
+ public Map<String, Group> getNewGroups() {
+ return new HashMap<>();
+ }
+
+ @Override
+ public boolean affectsListing() {
+ return false;
+ }
+
+ @Override
+ public boolean isMinor() {
+ return true;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestCommentRemovedData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestCommentRemovedData.java
new file mode 100644
index 0000000000..dd4898db95
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestCommentRemovedData.java
@@ -0,0 +1,17 @@
+package io.onedev.server.model.support.pullrequest.changedata;
+
+public class PullRequestCommentRemovedData extends PullRequestChangeData {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public String getActivity() {
+ return "removed comment";
+ }
+
+ @Override
+ public boolean isMinor() {
+ return true;
+ }
+
+}
\ No newline at end of file