Merged in task/dspace-cris-2023_02_x/DSC-1829 (pull request DSpace#2486)

[DSC-1829] Remove statusFilter added to Solr browse indexes queries to solve an issue with the collection administrators Approved-by: Vincenzo Mecca
4Science · Jul 16, 2024 · 451e066 · 451e066
2 parents b2de6c7 + 10771b0
commit 451e066
Show file tree

Hide file tree

Showing 3 changed files with 831 additions and 22 deletions.
diff --git a/dspace-api/src/main/java/org/dspace/authorize/dao/impl/ResourcePolicyDAOImpl.java b/dspace-api/src/main/java/org/dspace/authorize/dao/impl/ResourcePolicyDAOImpl.java
@@ -152,7 +152,7 @@ public List<ResourcePolicy> findByTypeGroupAction(Context context, DSpaceObject
  criteriaBuilder.equal(resourcePolicyRoot.get(ResourcePolicy_.actionId), action)
  )
  );
- return list(context, criteriaQuery, false, ResourcePolicy.class, 1, -1);
+ return list(context, criteriaQuery, false, ResourcePolicy.class, -1, -1);
  }
 
  @Override
@@ -170,7 +170,7 @@ public List<ResourcePolicy> findByTypeGroupActionExceptId(Context context, DSpac
  criteriaBuilder.notEqual(resourcePolicyRoot.get(ResourcePolicy_.id), notPolicyID)
  )
  );
- return list(context, criteriaQuery, false, ResourcePolicy.class, 1, -1);
+ return list(context, criteriaQuery, false, ResourcePolicy.class, -1, -1);
  }
 
  public List<ResourcePolicy> findByEPersonGroupTypeIdAction(Context context, EPerson e, List<Group> groups,
@@ -187,7 +187,7 @@ public List<ResourcePolicy> findByEPersonGroupTypeIdAction(Context context, EPer
  (resourcePolicyRoot.get(ResourcePolicy_.epersonGroup).in(groups)))
  )
  );
- return list(context, criteriaQuery, false, ResourcePolicy.class, 1, -1);
+ return list(context, criteriaQuery, false, ResourcePolicy.class, -1, -1);
  }
 
  @Override
@@ -291,7 +291,7 @@ public List<ResourcePolicy> findByDSoAndActionExceptRpType(Context context, DSpa
  )
  );
  }
- return list(context, criteriaQuery, false, ResourcePolicy.class, 1, 1);
+ return list(context, criteriaQuery, false, ResourcePolicy.class, -1, 1);
  }
 
  @Override

diff --git a/dspace-api/src/main/java/org/dspace/browse/SolrBrowseDAO.java b/dspace-api/src/main/java/org/dspace/browse/SolrBrowseDAO.java
@@ -8,7 +8,6 @@
 package org.dspace.browse;
 
 import java.io.Serializable;
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -181,7 +180,6 @@ private DiscoverResult getSolrResponse() throws BrowseException {
  if (sResponse == null) {
  DiscoverQuery query = new DiscoverQuery();
  addLocationScopeFilter(query);
- addStatusFilter(query);
  addExtraFilter(query);
  addDefaultFilterQueries(query);
  if (distinct) {
@@ -241,18 +239,6 @@ private void addExtraFilter(DiscoverQuery query) {
  }
  }
 
- private void addStatusFilter(DiscoverQuery query) {
- try {
- if (!authorizeService.isAdmin(context)
- && (authorizeService.isCommunityAdmin(context)
- || authorizeService.isCollectionAdmin(context))) {
- query.addFilterQueries(searcher.createLocationQueryForAdministrableItems(context));
- }
- } catch (SQLException ex) {
- log.error("Error looking up authorization rights of current user", ex);
- }
- }
-
  private void addLocationScopeFilter(DiscoverQuery query) {
  if (container != null) {
  if (containerIDField.startsWith("collection")) {
@@ -356,7 +342,6 @@ public int doOffsetQuery(String column, String value, boolean isAscending)
  throws BrowseException {
  DiscoverQuery query = new DiscoverQuery();
  addLocationScopeFilter(query);
- addStatusFilter(query);
  addExtraFilter(query);
  addDefaultFilterQueries(query);
  query.setMaxResults(0);