Skip to content

Add sorting to paged responses #264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChristophB merged 1 commit into from
Aug 13, 2025
Merged

Add sorting to paged responses #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/main/java/care/smith/top/backend/service/EntityService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,8 @@ public Page<Entity> getEntities(
List<String> 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,
Expand Down Expand Up @@ -362,7 +363,8 @@ public Page<Entity> 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(
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/care/smith/top/backend/service/QueryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;
Expand All @@ -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;
Expand Down Expand Up @@ -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<Query> 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)
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/care/smith/top/backend/service/UserService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -100,7 +101,9 @@ public Optional<UserDao> getUserById(String userId) {
}

public Page<UserDao> getUsers(String name, List<String> 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);
}

Expand Down