Skip to content

The Unified and Autonomous Development Platform

chore: refactor various entity touch manager

Robin Shenf81837b2a353
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentTouchManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentTouchManager.java
index e7691a3cae..4462dc1ec0 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentTouchManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentTouchManager.java
@@ -1,10 +1,12 @@
package io.onedev.server.entitymanager.impl;
import io.onedev.server.entitymanager.CodeCommentTouchManager;
+import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.event.Listen;
import io.onedev.server.event.entity.EntityPersisted;
import io.onedev.server.event.entity.EntityRemoved;
import io.onedev.server.model.*;
+import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.BaseEntityManager;
@@ -14,7 +16,6 @@ import org.hibernate.criterion.Restrictions;
import javax.inject.Inject;
import javax.inject.Singleton;
-
import java.util.List;
import static io.onedev.server.model.CodeCommentTouch.PROP_COMMENT_ID;
@@ -24,23 +25,33 @@ import static java.lang.String.format;
public class DefaultCodeCommentTouchManager extends BaseEntityManager<CodeCommentTouch>
implements CodeCommentTouchManager {
+ private final ProjectManager projectManager;
+
+ private final TransactionManager transactionManager;
+
@Inject
- public DefaultCodeCommentTouchManager(Dao dao) {
- super(dao);
- }
+ public DefaultCodeCommentTouchManager(Dao dao, ProjectManager projectManager, TransactionManager transactionManager) {
+ super(dao);
+ this.projectManager = projectManager;
+ this.transactionManager = transactionManager;
+ }
@Transactional
@Override
public void touch(Project project, Long commentId) {
- var query = getSession().createQuery(format("delete from CodeCommentTouch where project=:project and %s=:%s", PROP_COMMENT_ID, PROP_COMMENT_ID));
- query.setParameter("project", project);
- query.setParameter(PROP_COMMENT_ID, commentId);
- query.executeUpdate();
-
- var touch = new CodeCommentTouch();
- touch.setProject(project);
- touch.setCommentId(commentId);
- dao.persist(touch);
+ var projectId = project.getId();
+ transactionManager.runAfterCommit(() -> transactionManager.runAsync(() -> {
+ var innerProject = projectManager.load(projectId);
+ var query = getSession().createQuery(format("delete from CodeCommentTouch where project=:project and %s=:%s", PROP_COMMENT_ID, PROP_COMMENT_ID));
+ query.setParameter("project", innerProject);
+ query.setParameter(PROP_COMMENT_ID, commentId);
+ query.executeUpdate();
+
+ var touch = new CodeCommentTouch();
+ touch.setProject(innerProject);
+ touch.setCommentId(commentId);
+ dao.persist(touch);
+ }));
}
@Sessional
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueTouchManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueTouchManager.java
index 2ae67ae491..ceb5634e8a 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueTouchManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueTouchManager.java
@@ -1,10 +1,12 @@
package io.onedev.server.entitymanager.impl;
import io.onedev.server.entitymanager.IssueTouchManager;
+import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.event.Listen;
import io.onedev.server.event.entity.EntityPersisted;
import io.onedev.server.event.entity.EntityRemoved;
import io.onedev.server.model.*;
+import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.BaseEntityManager;
@@ -23,24 +25,34 @@ import static java.lang.String.format;
@Singleton
public class DefaultIssueTouchManager extends BaseEntityManager<IssueTouch>
implements IssueTouchManager {
-
+
+ private final ProjectManager projectManager;
+
+ private final TransactionManager transactionManager;
+
@Inject
- public DefaultIssueTouchManager(Dao dao) {
+ public DefaultIssueTouchManager(Dao dao, ProjectManager projectManager, TransactionManager transactionManager) {
super(dao);
+ this.projectManager = projectManager;
+ this.transactionManager = transactionManager;
}
@Transactional
@Override
public void touch(Project project, Long issueId) {
- var query = getSession().createQuery(format("delete from IssueTouch where project=:project and %s=:%s", PROP_ISSUE_ID, PROP_ISSUE_ID));
- query.setParameter("project", project);
- query.setParameter(PROP_ISSUE_ID, issueId);
- query.executeUpdate();
-
- var touch = new IssueTouch();
- touch.setProject(project);
- touch.setIssueId(issueId);
- dao.persist(touch);
+ var projectId = project.getId();
+ transactionManager.runAfterCommit(() -> transactionManager.runAsync(() -> {
+ var innerProject = projectManager.load(projectId);
+ var query = getSession().createQuery(format("delete from IssueTouch where project=:project and %s=:%s", PROP_ISSUE_ID, PROP_ISSUE_ID));
+ query.setParameter("project", innerProject);
+ query.setParameter(PROP_ISSUE_ID, issueId);
+ query.executeUpdate();
+
+ var touch = new IssueTouch();
+ touch.setProject(innerProject);
+ touch.setIssueId(issueId);
+ dao.persist(touch);
+ }));
}
@Sessional
@@ -57,6 +69,7 @@ public class DefaultIssueTouchManager extends BaseEntityManager<IssueTouch>
public void on(EntityPersisted event) {
if (event.getEntity() instanceof Issue) {
Issue issue = (Issue) event.getEntity();
+
touch(issue.getProject(), issue.getId());
} else if (event.getEntity() instanceof IssueComment) {
IssueComment comment = (IssueComment) event.getEntity();
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestTouchManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestTouchManager.java
index 15fd6d320d..3f88118001 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestTouchManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestTouchManager.java
@@ -1,10 +1,12 @@
package io.onedev.server.entitymanager.impl;
+import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.PullRequestTouchManager;
import io.onedev.server.event.Listen;
import io.onedev.server.event.entity.EntityPersisted;
import io.onedev.server.event.entity.EntityRemoved;
import io.onedev.server.model.*;
+import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.BaseEntityManager;
@@ -14,7 +16,6 @@ import org.hibernate.criterion.Restrictions;
import javax.inject.Inject;
import javax.inject.Singleton;
-
import java.util.List;
import static io.onedev.server.model.PullRequestTouch.PROP_REQUEST_ID;
@@ -24,23 +25,34 @@ import static java.lang.String.format;
public class DefaultPullRequestTouchManager extends BaseEntityManager<PullRequestTouch>
implements PullRequestTouchManager {
+ private final ProjectManager projectManager;
+
+ private final TransactionManager transactionManager;
+
@Inject
- public DefaultPullRequestTouchManager(Dao dao) {
- super(dao);
- }
+ public DefaultPullRequestTouchManager(Dao dao, ProjectManager projectManager, TransactionManager transactionManager) {
+ super(dao);
+ this.projectManager = projectManager;
+ this.transactionManager = transactionManager;
+ }
@Transactional
@Override
public void touch(Project project, Long requestId) {
- var query = getSession().createQuery(format("delete from PullRequestTouch where project=:project and %s=:%s", PROP_REQUEST_ID, PROP_REQUEST_ID));
- query.setParameter("project", project);
- query.setParameter(PROP_REQUEST_ID, requestId);
- query.executeUpdate();
+ var projectId = project.getId();
+ transactionManager.runAfterCommit(() -> transactionManager.runAsync(() -> {
+ var innerProject = projectManager.load(projectId);
+ var query = getSession().createQuery(format("delete from PullRequestTouch where project=:project and %s=:%s", PROP_REQUEST_ID, PROP_REQUEST_ID));
+ query.setParameter("project", innerProject);
+ query.setParameter(PROP_REQUEST_ID, requestId);
+ query.executeUpdate();
+
+ var touch = new PullRequestTouch();
+ touch.setProject(innerProject);
+ touch.setRequestId(requestId);
+ dao.persist(touch);
+ }));
- var touch = new PullRequestTouch();
- touch.setProject(project);
- touch.setRequestId(requestId);
- dao.persist(touch);
}
@Sessional