The Unified and Autonomous Development Platform
fix: Normal user experience slow page load because of many find-by-id issue queries
Robin Shen017c77aef921
diff --git a/server-core/src/main/java/io/onedev/server/security/DefaultAuthorizingService.java b/server-core/src/main/java/io/onedev/server/security/DefaultAuthorizingService.javaindex 4dace66572..6737dc66a5 100644--- a/server-core/src/main/java/io/onedev/server/security/DefaultAuthorizingService.java+++ b/server-core/src/main/java/io/onedev/server/security/DefaultAuthorizingService.java@@ -27,15 +27,15 @@ import com.google.common.collect.Lists;import io.onedev.commons.loader.ManagedSerializedForm;import io.onedev.server.model.Group;-import io.onedev.server.model.IssueAuthorization;import io.onedev.server.model.Project;import io.onedev.server.model.UserAuthorization;import io.onedev.server.persistence.SessionService;import io.onedev.server.security.permission.BasePermission;-import io.onedev.server.security.permission.ConfidentialIssuePermission;+import io.onedev.server.security.permission.ConfidentialIssuesPermission;import io.onedev.server.security.permission.ProjectPermission;import io.onedev.server.security.permission.SystemAdministration;import io.onedev.server.security.permission.UserAdministration;+import io.onedev.server.service.IssueAuthorizationService;import io.onedev.server.service.SettingService;import io.onedev.server.util.Pair;import io.onedev.server.util.facade.UserFacade;@@ -48,6 +48,9 @@ public class DefaultAuthorizingService extends AuthorizingRealm implements Autho@Injectprivate SettingService settingService;++ @Inject+ private IssueAuthorizationService issueAuthorizationService;private final MetaDataKey<Map<String, AuthorizationInfo>> AUTHORIZATION_INFOS = new MetaDataKey<>() {};@@ -79,11 +82,8 @@ public class DefaultAuthorizingService extends AuthorizingRealm implements Authofor (UserAuthorization authorization : user.getProjectAuthorizations())permissions.add(new ProjectPermission(authorization.getProject(), authorization.getRole()));- for (IssueAuthorization authorization : user.getIssueAuthorizations()) {- permissions.add(new ProjectPermission(- authorization.getIssue().getProject(),- new ConfidentialIssuePermission(authorization.getIssue())));- }++ permissions.add(new ConfidentialIssuesPermission(issueAuthorizationService.getAuthorizedIssueIds(user)));}}diff --git a/server-core/src/main/java/io/onedev/server/security/permission/ConfidentialIssuesPermission.java b/server-core/src/main/java/io/onedev/server/security/permission/ConfidentialIssuesPermission.javanew file mode 100644index 0000000000..897f98ed50--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/security/permission/ConfidentialIssuesPermission.java@@ -0,0 +1,40 @@+package io.onedev.server.security.permission;++import java.util.Set;++import org.apache.shiro.authz.Permission;+import org.jetbrains.annotations.Nullable;++import io.onedev.server.util.facade.UserFacade;++public class ConfidentialIssuesPermission implements BasePermission {++ private final Set<Long> issueIds;++ public ConfidentialIssuesPermission(Set<Long> issueIds) {+ this.issueIds = issueIds;+ }++ @Override+ public boolean implies(Permission p) {+ if (p instanceof ConfidentialIssuePermission) {+ ConfidentialIssuePermission issuePermission = (ConfidentialIssuePermission) p;+ return issueIds.contains(issuePermission.getIssue().getId());+ } else if (p instanceof ConfidentialIssuesPermission) {+ ConfidentialIssuesPermission issuesPermission = (ConfidentialIssuesPermission) p;+ return issueIds.containsAll(issuesPermission.getIssueIds());+ } else {+ return false;+ }+ }++ public Set<Long> getIssueIds() {+ return issueIds;+ }++ @Override+ public boolean isApplicable(@Nullable UserFacade user) {+ return user != null;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/service/IssueAuthorizationService.java b/server-core/src/main/java/io/onedev/server/service/IssueAuthorizationService.javaindex ff198ef22f..995517295b 100644--- a/server-core/src/main/java/io/onedev/server/service/IssueAuthorizationService.java+++ b/server-core/src/main/java/io/onedev/server/service/IssueAuthorizationService.java@@ -1,5 +1,7 @@package io.onedev.server.service;+import java.util.Set;+import io.onedev.server.model.Issue;import io.onedev.server.model.IssueAuthorization;import io.onedev.server.model.User;@@ -10,4 +12,6 @@ public interface IssueAuthorizationService extends EntityService<IssueAuthorizatvoid createOrUpdate(IssueAuthorization authorization);+ Set<Long> getAuthorizedIssueIds(User user);+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueAuthorizationService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueAuthorizationService.javaindex 46e04f7bd4..ea271f5d19 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueAuthorizationService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueAuthorizationService.java@@ -1,12 +1,17 @@package io.onedev.server.service.impl;+import java.util.HashSet;import java.util.List;+import java.util.Set;import javax.inject.Singleton;+import org.hibernate.query.Query;+import io.onedev.server.model.Issue;import io.onedev.server.model.IssueAuthorization;import io.onedev.server.model.User;+import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.service.IssueAuthorizationService;@@ -48,5 +53,15 @@ public class DefaultIssueAuthorizationService extends BaseEntityService<IssueAutpublic void createOrUpdate(IssueAuthorization authorization) {dao.persist(authorization);}-++ @SuppressWarnings("unchecked")+ @Sessional+ @Override+ public Set<Long> getAuthorizedIssueIds(User user) {+ Query<Long> query = getSession().createQuery(+ "select issue.id from IssueAuthorization where user=:user");+ query.setParameter("user", user);+ return new HashSet<>(query.list());+ }+}