From 2a3a61d4a18e66cf9ab4e507799f311877ff6d8e Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Tue, 27 Feb 2024 09:21:12 +0100 Subject: [PATCH] OZG-4994 OZG-5068 Merge the methods createFindVorgangRequestBuilder --- .../de/ozgcloud/alfa/vorgang/VorgangRemoteService.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangRemoteService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangRemoteService.java index 664833f36b..a6d44d0c43 100644 --- a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangRemoteService.java +++ b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangRemoteService.java @@ -71,14 +71,12 @@ class VorgangRemoteService { private GrpcFindVorgangRequest.Builder createFindVorgangRequestBuilder(FindVorgaengeHeaderRequestCriteria requestCriteria, FilterCriteria filterCriteria) { - return createFindVorgangRequestBuilder(requestCriteria).setQuery(createQuery(filterCriteria)).setFilterBy(createFilterBy(filterCriteria)); - } - - private GrpcFindVorgangRequest.Builder createFindVorgangRequestBuilder(FindVorgaengeHeaderRequestCriteria requestCriteria) { return GrpcFindVorgangRequest.newBuilder() .setOrderBy(GrpcOrderBy.valueOf(requestCriteria.getOrderBy().name())) .setLimit(requestCriteria.getLimit()) - .setOffset(requestCriteria.getPage() * requestCriteria.getLimit()); + .setOffset(requestCriteria.getPage() * requestCriteria.getLimit()) + .setQuery(createQuery(filterCriteria)) + .setFilterBy(createFilterBy(filterCriteria)); } GrpcQuery createQuery(FilterCriteria filterCriteria) { -- GitLab