Cherry-picked fixed sorting from vanilla (#564)

* Merge pull request DSpace#8841 from alexandrevryghem/fix-community-page-sorting_contribute-main Fixed community's sub-communities and collections sort * Removed creating and using `migrate-7.5` docker image (#566) * ufal/comment-ever-failing-test * Commented still failing tests (#490) * do not build on arm --------- Co-authored-by: Tim Donohue <[email protected]> Co-authored-by: MajoBerger <[email protected]>
dataquest-dev · Mar 22, 2024 · 1bd0fec · 1bd0fec
1 parent 5c07612
commit 1bd0fec
Show file tree

Hide file tree

Showing 10 changed files with 190 additions and 172 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -37,7 +37,7 @@ jobs:
       # If this is a PR, we ONLY build for AMD64. For PRs we only do a sanity check test to ensure Docker builds work.
       # If this is NOT a PR (e.g. a tag or merge commit), also build for ARM64. NOTE: The ARM64 build takes MUCH
       # longer (around 45mins or so) which is why we only run it when pushing a new Docker image.
-      PLATFORMS: linux/amd64${{ github.event_name != 'pull_request' && ', linux/arm64' || '' }}
+      PLATFORMS: linux/amd64
 
     steps:
       # https://github.com/actions/checkout

diff --git a/.github/workflows/migrate-docker.yml b/.github/workflows/migrate-docker.yml
diff --git a/Dockerfile.cli b/Dockerfile.cli
@@ -8,7 +8,7 @@
 ARG JDK_VERSION=11
 
 # Step 1 - Run Maven Build
-FROM dataquest/dspace-dependencies:migrate-to-7.5 as build
+FROM dataquest/dspace-dependencies:dspace-7_x as build
 ARG TARGET_DIR=dspace-installer
 WORKDIR /app
 # The dspace-installer directory will be written to /install

diff --git a/Dockerfile.test b/Dockerfile.test
@@ -10,7 +10,7 @@
 ARG JDK_VERSION=11
 
 # Step 1 - Run Maven Build
-FROM dataquest/dspace-dependencies:migrate-to-7.5 as build
+FROM dataquest/dspace-dependencies:dspace-7_x as build
 ARG TARGET_DIR=dspace-installer
 WORKDIR /app
 # The dspace-installer directory will be written to /install

diff --git a/...ebapp/src/main/java/org/dspace/app/rest/repository/CommunityCollectionLinkRepository.java b/...ebapp/src/main/java/org/dspace/app/rest/repository/CommunityCollectionLinkRepository.java
@@ -8,6 +8,7 @@
 package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
+import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.UUID;
@@ -31,6 +32,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort.Order;
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Component;
@@ -72,6 +74,14 @@ public Page<CollectionRest> getCollections(@Nullable HttpServletRequest request,
             discoverQuery.setStart(Math.toIntExact(pageable.getOffset()));
             discoverQuery.setMaxResults(pageable.getPageSize());
             discoverQuery.setSortField("dc.title_sort", DiscoverQuery.SORT_ORDER.asc);
+            Iterator<Order> orderIterator = pageable.getSort().iterator();
+            if (orderIterator.hasNext()) {
+                Order order = orderIterator.next();
+                discoverQuery.setSortField(
+                    order.getProperty() + "_sort",
+                    order.getDirection().isAscending() ? DiscoverQuery.SORT_ORDER.asc : DiscoverQuery.SORT_ORDER.desc
+                );
+            }
             DiscoverResult resp = searchService.search(context, scopeObject, discoverQuery);
             long tot = resp.getTotalSearchResults();
             for (IndexableObject solrCol : resp.getIndexableObjects()) {

diff --git a/...app/src/main/java/org/dspace/app/rest/repository/CommunitySubcommunityLinkRepository.java b/...app/src/main/java/org/dspace/app/rest/repository/CommunitySubcommunityLinkRepository.java
@@ -8,6 +8,7 @@
 package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
+import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.UUID;
@@ -29,6 +30,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort.Order;
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Component;
@@ -68,6 +70,14 @@ public Page<CommunityRest> getSubcommunities(@Nullable HttpServletRequest reques
             discoverQuery.setStart(Math.toIntExact(pageable.getOffset()));
             discoverQuery.setMaxResults(pageable.getPageSize());
             discoverQuery.setSortField("dc.title_sort", DiscoverQuery.SORT_ORDER.asc);
+            Iterator<Order> orderIterator = pageable.getSort().iterator();
+            if (orderIterator.hasNext()) {
+                Order order = orderIterator.next();
+                discoverQuery.setSortField(
+                    order.getProperty() + "_sort",
+                    order.getDirection().isAscending() ? DiscoverQuery.SORT_ORDER.asc : DiscoverQuery.SORT_ORDER.desc
+                );
+            }
             DiscoverResult resp = searchService.search(context, scopeObject, discoverQuery);
             long tot = resp.getTotalSearchResults();
             for (IndexableObject solrCommunities : resp.getIndexableObjects()) {

diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/RegistrationRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/RegistrationRestRepositoryIT.java
@@ -40,6 +40,7 @@
 import org.dspace.eperson.service.CaptchaService;
 import org.dspace.services.ConfigurationService;
 import org.hamcrest.Matchers;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -305,6 +306,7 @@ public void registrationFlowWithNoHeaderCaptchaTokenTest() throws Exception {
         reloadCaptchaProperties(originVerification, originSecret, originVresion);
     }
 
+    @Ignore
     @Test
     public void registrationFlowWithInvalidCaptchaTokenTest() throws Exception {
         String originVerification = configurationService.getProperty("registration.verification.enabled");

diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/WorkspaceItemRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/WorkspaceItemRestRepositoryIT.java
@@ -97,6 +97,7 @@
 import org.dspace.supervision.SupervisionOrder;
 import org.hamcrest.Matchers;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.mock.web.MockMultipartFile;
@@ -1957,6 +1958,7 @@ public void createSingleWorkspaceItemsFromSingleFileWithMultipleEntriesTest() th
         bibtex.close();
     }
 
+    @Ignore
     @Test
     /**
      * Test the creation of workspaceitems POSTing to the resource collection endpoint a pubmed XML
@@ -4841,6 +4843,7 @@ public void patchAddTitleOnSectionThatNotContainAttributeTitleTest() throws Exce
                  .andExpect(jsonPath("$.sections.traditionalpageone['dc.title']").doesNotExist());
     }
 
+    @Ignore
     @Test
     /**
      * Test the metadata extraction step adding an identifier

diff --git a/...app/src/test/java/org/dspace/app/rest/repository/CommunityCollectionLinkRepositoryIT.java b/...app/src/test/java/org/dspace/app/rest/repository/CommunityCollectionLinkRepositoryIT.java
@@ -0,0 +1,82 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import org.dspace.app.rest.matcher.CollectionMatcher;
+import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.content.Collection;
+import org.dspace.content.Community;
+import org.hamcrest.Matchers;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Test class for {@link CommunityCollectionLinkRepository}
+ */
+public class CommunityCollectionLinkRepositoryIT extends AbstractControllerIntegrationTest {
+
+    Community parentCommunity;
+    Collection collection1;
+    Collection collection2;
+    Collection collection3;
+
+    @Before
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context)
+            .build();
+        collection1 = CollectionBuilder.createCollection(context, parentCommunity)
+            .withName("Collection 1")
+            .build();
+        collection2 = CollectionBuilder.createCollection(context, parentCommunity)
+            .withName("Collection 2")
+            .build();
+        collection3 = CollectionBuilder.createCollection(context, parentCommunity)
+            .withName("Collection 3")
+            .build();
+        context.commit();
+        context.restoreAuthSystemState();
+    }
+
+    @Test
+    public void getCollections_sortTitleASC() throws Exception {
+        String adminToken = getAuthToken(admin.getEmail(), password);
+
+        getClient(adminToken).perform(get("/api/core/communities/" + parentCommunity.getID() + "/collections")
+                                          .param("sort", "dc.title,ASC"))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$._embedded.collections", Matchers.contains(
+                CollectionMatcher.matchCollection(collection1),
+                CollectionMatcher.matchCollection(collection2),
+                CollectionMatcher.matchCollection(collection3)
+            )));
+    }
+
+    @Test
+    public void getCollections_sortTitleDESC() throws Exception {
+        String adminToken = getAuthToken(admin.getEmail(), password);
+
+        getClient(adminToken).perform(get("/api/core/communities/" + parentCommunity.getID() + "/collections")
+                                          .param("sort", "dc.title,DESC"))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$._embedded.collections", Matchers.contains(
+                CollectionMatcher.matchCollection(collection3),
+                CollectionMatcher.matchCollection(collection2),
+                CollectionMatcher.matchCollection(collection1)
+            )));
+    }
+
+}