Skip to content

The Unified and Autonomous Development Platform

fix: watching issues of child projects does not work (#1500)

Robin Shendbb32df2a065
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueQueryPersonalizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueQueryPersonalizationManager.java
index f0fef5d0b1..1493f944ef 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/IssueQueryPersonalizationManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueQueryPersonalizationManager.java
@@ -4,6 +4,9 @@ import io.onedev.server.model.IssueQueryPersonalization;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.persistence.dao.EntityManager;
+import io.onedev.server.util.ProjectScope;
+
+import java.util.Collection;
public interface IssueQueryPersonalizationManager extends EntityManager<IssueQueryPersonalization> {
@@ -13,4 +16,6 @@ public interface IssueQueryPersonalizationManager extends EntityManager<IssueQue
void update(IssueQueryPersonalization personalization);
+ Collection<IssueQueryPersonalization> query(ProjectScope projectScope);
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueQueryPersonalizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueQueryPersonalizationManager.java
index 4db60c9e55..320e6a0737 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueQueryPersonalizationManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueQueryPersonalizationManager.java
@@ -2,6 +2,7 @@ package io.onedev.server.entitymanager.impl;
import com.google.common.base.Preconditions;
import io.onedev.server.entitymanager.IssueQueryPersonalizationManager;
+import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.IssueQueryPersonalization;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
@@ -11,21 +12,29 @@ 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.persistence.dao.EntityCriteria;
+import io.onedev.server.util.ProjectScope;
import org.hibernate.criterion.Restrictions;
import javax.inject.Inject;
import javax.inject.Singleton;
+import javax.persistence.criteria.CriteriaBuilder;
import java.util.Collection;
import java.util.HashSet;
import java.util.stream.Collectors;
+import static io.onedev.server.model.AbstractEntity.PROP_ID;
+import static io.onedev.server.model.IssueQueryPersonalization.PROP_PROJECT;
+
@Singleton
public class DefaultIssueQueryPersonalizationManager extends BaseEntityManager<IssueQueryPersonalization>
implements IssueQueryPersonalizationManager {
+ private final ProjectManager projectManager;
+
@Inject
- public DefaultIssueQueryPersonalizationManager(Dao dao) {
+ public DefaultIssueQueryPersonalizationManager(Dao dao, ProjectManager projectManager) {
super(dao);
+ this.projectManager = projectManager;
}
@Sessional
@@ -50,6 +59,30 @@ public class DefaultIssueQueryPersonalizationManager extends BaseEntityManager<I
Preconditions.checkState(!personalization.isNew());
createrOrUpdate(personalization);
}
+
+ @Sessional
+ @Override
+ public Collection<IssueQueryPersonalization> query(ProjectScope projectScope) {
+ CriteriaBuilder builder = getSession().getCriteriaBuilder();
+ var criteriaQuery = builder.createQuery(IssueQueryPersonalization.class);
+ var root = criteriaQuery.from(IssueQueryPersonalization.class);
+
+ var projectId = projectScope.getProject().getId();
+ Collection<Long> checkIds = new HashSet<>();
+ if (projectScope.isInherited()) {
+ for (Project ancestor: projectScope.getProject().getAncestors())
+ checkIds.add(ancestor.getId());
+ }
+ if (projectScope.isRecursive())
+ checkIds.addAll(projectManager.getSubtreeIds(projectId));
+ else
+ checkIds.add(projectId);
+ criteriaQuery.where(root.get(PROP_PROJECT).get(PROP_ID).in(checkIds));
+ var query = getSession().createQuery(criteriaQuery);
+ query.setFirstResult(0);
+ query.setMaxResults(Integer.MAX_VALUE);
+ return query.getResultList();
+ }
private void createrOrUpdate(IssueQueryPersonalization personalization) {
Collection<String> retainNames = new HashSet<>();
diff --git a/server-core/src/main/java/io/onedev/server/model/IssueQueryPersonalization.java b/server-core/src/main/java/io/onedev/server/model/IssueQueryPersonalization.java
index 533a678d3b..5c0faf8bb7 100644
--- a/server-core/src/main/java/io/onedev/server/model/IssueQueryPersonalization.java
+++ b/server-core/src/main/java/io/onedev/server/model/IssueQueryPersonalization.java
@@ -29,6 +29,8 @@ public class IssueQueryPersonalization extends AbstractEntity implements QueryPe
private static final long serialVersionUID = 1L;
+ public static final String PROP_PROJECT = "project";
+
@ManyToOne(fetch=FetchType.LAZY)
@JoinColumn(nullable=false)
private Project project;
diff --git a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
index eddb9dbe04..0954eaebb4 100644
--- a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
@@ -12,6 +12,7 @@ import javax.inject.Singleton;
import io.onedev.server.entitymanager.*;
import io.onedev.server.event.project.issue.*;
+import io.onedev.server.util.ProjectScope;
import org.apache.commons.lang3.StringUtils;
import com.google.common.collect.Lists;
@@ -52,12 +53,14 @@ public class IssueNotificationManager extends AbstractNotificationManager {
private final IssueMentionManager mentionManager;
+ private final IssueQueryPersonalizationManager queryPersonalizationManager;
+
@Inject
public IssueNotificationManager(MarkdownManager markdownManager, MailManager mailManager,
IssueWatchManager watchManager, VisitInfoManager userInfoManager,
UserManager userManager, SettingManager settingManager,
- IssueAuthorizationManager authorizationManager,
- IssueMentionManager mentionManager) {
+ IssueAuthorizationManager authorizationManager, IssueMentionManager mentionManager,
+ IssueQueryPersonalizationManager queryPersonalizationManager) {
super(markdownManager, settingManager);
this.mailManager = mailManager;
@@ -66,6 +69,7 @@ public class IssueNotificationManager extends AbstractNotificationManager {
this.userManager = userManager;
this.authorizationManager = authorizationManager;
this.mentionManager = mentionManager;
+ this.queryPersonalizationManager = queryPersonalizationManager;
}
@Transactional
@@ -98,7 +102,7 @@ public class IssueNotificationManager extends AbstractNotificationManager {
@Override
protected Collection<? extends QueryPersonalization<?>> getQueryPersonalizations() {
- return issue.getProject().getIssueQueryPersonalizations();
+ return queryPersonalizationManager.query(new ProjectScope(issue.getProject(), true, true));
}
@Override