diff --git a/src/main/java/care/smith/top/backend/service/EntityService.java b/src/main/java/care/smith/top/backend/service/EntityService.java index 74e03a79..060d715c 100644 --- a/src/main/java/care/smith/top/backend/service/EntityService.java +++ b/src/main/java/care/smith/top/backend/service/EntityService.java @@ -334,7 +334,8 @@ public Page getEntities( List repositoryIds, Boolean includePrimary, Integer page) { - PageRequest pageRequest = PageRequest.of(page != null ? page - 1 : 0, pageSize); + PageRequest pageRequest = + PageRequest.of(page != null ? page - 1 : 0, pageSize, Sort.by(EntityDao_.ID)); return phenotypeRepository .findAllByRepositoryIdsAndRepository_PrimaryAndTitleAndEntityTypeAndDataTypeAndItemType( repositoryIds, @@ -362,7 +363,8 @@ public Page getEntitiesByRepositoryId( ItemType itemType, Integer page) { getRepository(organisationId, repositoryId); - PageRequest pageRequest = PageRequest.of(page != null ? page - 1 : 0, pageSize); + PageRequest pageRequest = + PageRequest.of(page != null ? page - 1 : 0, pageSize, Sort.by(EntityDao_.ID)); return phenotypeRepository .findAllByRepositoryIdAndTitleAndEntityTypeAndDataTypeAndItemType( diff --git a/src/main/java/care/smith/top/backend/service/QueryService.java b/src/main/java/care/smith/top/backend/service/QueryService.java index 80697cce..9d72dc96 100644 --- a/src/main/java/care/smith/top/backend/service/QueryService.java +++ b/src/main/java/care/smith/top/backend/service/QueryService.java @@ -2,6 +2,7 @@ import care.smith.top.backend.model.jpa.Permission; import care.smith.top.backend.model.jpa.QueryDao; +import care.smith.top.backend.model.jpa.QueryDao_; import care.smith.top.backend.repository.jpa.QueryRepository; import care.smith.top.backend.repository.jpa.RepositoryRepository; import care.smith.top.model.*; @@ -26,6 +27,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Sort; import org.springframework.http.HttpStatus; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.transaction.annotation.Transactional; @@ -191,7 +193,9 @@ public Query getQueryById(String organisationId, String repositoryId, UUID query @PreAuthorize( "hasPermission(#organisationId, 'care.smith.top.backend.model.jpa.OrganisationDao', 'WRITE')") public Page getQueries(String organisationId, String repositoryId, Integer page) { - PageRequest pageRequest = PageRequest.of(page == null ? 0 : page - 1, pageSize); + PageRequest pageRequest = + PageRequest.of( + page == null ? 0 : page - 1, pageSize, Sort.by(QueryDao_.CREATED_AT, QueryDao_.ID)); return queryRepository .findAllByRepository_OrganisationIdAndRepositoryIdOrderByCreatedAtDesc( organisationId, repositoryId, pageRequest) diff --git a/src/main/java/care/smith/top/backend/service/UserService.java b/src/main/java/care/smith/top/backend/service/UserService.java index b6c447d8..5b2456db 100644 --- a/src/main/java/care/smith/top/backend/service/UserService.java +++ b/src/main/java/care/smith/top/backend/service/UserService.java @@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Sort; import org.springframework.security.authentication.InsufficientAuthenticationException; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UserDetails; @@ -100,7 +101,9 @@ public Optional getUserById(String userId) { } public Page getUsers(String name, List organisationIds, Integer page) { - PageRequest pageRequest = PageRequest.of(page != null ? page - 1 : 0, pageSize); + PageRequest pageRequest = + PageRequest.of( + page != null ? page - 1 : 0, pageSize, Sort.by(UserDao_.USERNAME, UserDao_.ID)); return userRepository.findAllByUsernameAndOrganisationIds(name, organisationIds, pageRequest); }