Merge pull request #352 from thehyve/rc

Release version 1.0.7.
thehyve · Jun 28, 2021 · 44a02ba · 44a02ba
2 parents 1d9c43a + ad94b0d
commit 44a02ba
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## [1.0.7]
+- Return all active organisations instead of just the first page of 20. (Resolves issue [PODIUM-307](https://thehyve.atlassian.net/browse/PODIUM-307).)
+
 ## [1.0.6]
 - Requests to public endpoints no longer send the Authorization header;
 - Login issue fixed (an expired/invalid auth token no longer breaks the app);

diff --git a/podium-common/pom.xml b/podium-common/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>nl.thehyve.podium</groupId>
         <artifactId>podium</artifactId>
-        <version>1.0.6</version>
+        <version>1.0.7</version>
         <relativePath>../</relativePath>
     </parent>
 

diff --git a/podium-gateway/package.json b/podium-gateway/package.json
@@ -1,6 +1,6 @@
 {
   "name": "podium-gateway",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "Podium Gateway Request Portal",
   "private": true,
   "cacheDirectories": [

diff --git a/podium-gateway/pom.xml b/podium-gateway/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <artifactId>podium</artifactId>
         <groupId>nl.thehyve.podium</groupId>
-        <version>1.0.6</version>
+        <version>1.0.7</version>
         <relativePath>../</relativePath>
     </parent>
 

diff --git a/podium-uaa/pom.xml b/podium-uaa/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <artifactId>podium</artifactId>
         <groupId>nl.thehyve.podium</groupId>
-        <version>1.0.6</version>
+        <version>1.0.7</version>
         <relativePath>../</relativePath>
     </parent>
 

diff --git a/podium-uaa/src/main/java/nl/thehyve/podium/repository/OrganisationRepository.java b/podium-uaa/src/main/java/nl/thehyve/podium/repository/OrganisationRepository.java
@@ -12,8 +12,7 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import java.util.Collection;
-import java.util.UUID;
+import java.util.*;
 
 /**
  * Spring Data JPA repository for the Organisation entity.
@@ -33,7 +32,7 @@ public interface OrganisationRepository extends JpaRepository<Organisation,Long>
 
     Organisation findByShortNameAndDeletedFalse(String shortName);
 
-    Page<Organisation> findAllByActivatedTrueAndDeletedFalse(Pageable pageable);
+    List<Organisation> findAllByActivatedTrueAndDeletedFalse();
 
     Page<Organisation> findAllByActivatedTrueAndDeletedFalseAndUuidIn(Collection<UUID> organisationUuids, Pageable pageable);
 

diff --git a/podium-uaa/src/main/java/nl/thehyve/podium/service/OrganisationService.java b/podium-uaa/src/main/java/nl/thehyve/podium/service/OrganisationService.java
@@ -144,14 +144,15 @@ public Page<OrganisationRepresentation> findAll(Pageable pageable) {
     /**
      * Get active organisations.
      *
-     * @param pageable the pagination information
      * @return list of entities
      */
     @Transactional(readOnly = true)
-    public Page<OrganisationRepresentation> findAllAvailable(Pageable pageable) {
+    public List<OrganisationRepresentation> findAllAvailable() {
         log.debug("Request to get all active organisations");
-        Page<Organisation> result = organisationRepository.findAllByActivatedTrueAndDeletedFalse(pageable);
-        return result.map(organisationMapper::organisationToOrganisationDTO);
+        List<Organisation> result = organisationRepository.findAllByActivatedTrueAndDeletedFalse();
+        return result.stream()
+            .map(organisationMapper::organisationToOrganisationDTO)
+            .collect(Collectors.toList());
     }
 
     /**

diff --git a/podium-uaa/src/main/java/nl/thehyve/podium/web/rest/OrganisationServer.java b/podium-uaa/src/main/java/nl/thehyve/podium/web/rest/OrganisationServer.java
@@ -195,20 +195,18 @@ public ResponseEntity<List<OrganisationRepresentation>> getAdminOrganisations(@A
     }
 
     /**
-     * GET  /organisations/available : get all the organisations.
+     * GET  /organisations/available : get all the active organisations.
      *
-     * @param pageable the pagination information
      * @return the ResponseEntity with status 200 (OK) and the list of organisations in body
      * @throws URISyntaxException if there is an error to generate the pagination HTTP headers
      */
     @AnyAuthorisedUser
     @GetMapping("/organisations/available")
-    public ResponseEntity<List<OrganisationRepresentation>> getActiveOrganisations(@ApiParam Pageable pageable)
+    public ResponseEntity<List<OrganisationRepresentation>> getActiveOrganisations()
         throws URISyntaxException {
-        log.debug("REST request to get a page of Organisations");
-        Page<OrganisationRepresentation> page = organisationService.findAllAvailable(pageable);
-        HttpHeaders headers = PaginationUtil.generatePaginationHttpHeaders(page, "/api/organisations");
-        return new ResponseEntity<>(page.getContent(), headers, HttpStatus.OK);
+        log.debug("REST request to get all active Organisations");
+        List<OrganisationRepresentation> organisations = organisationService.findAllAvailable();
+        return new ResponseEntity<>(organisations, HttpStatus.OK);
     }
 
     /**

diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,7 @@
 
     <groupId>nl.thehyve.podium</groupId>
     <artifactId>podium</artifactId>
-    <version>1.0.6</version>
+    <version>1.0.7</version>
     <name>Podium</name>
     <packaging>pom</packaging>