From f793fd7b3f0d1e34eb2e786cc1591d1e64c4a7bc Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 1 Sep 2023 15:01:57 +0200
Subject: [PATCH] fix search vorgang
---
.../ozgcloud/apilib/vorgang/dummy/DummyVorgangService.java | 2 +-
.../apilib/vorgang/grpc/GrpcOzgCloudVorgangService.java | 2 ++
api-lib-demo/pom.xml | 2 +-
.../src/main/java/de/ozgcloud/apilib/demo/DemoRunner.java | 7 +++----
api-lib-demo/src/main/resources/application.yml | 5 +++--
ozg-cloud-spring-boot-starter/pom.xml | 2 +-
6 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/dummy/DummyVorgangService.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/dummy/DummyVorgangService.java
index 449e147..3babc22 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/dummy/DummyVorgangService.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/dummy/DummyVorgangService.java
@@ -9,7 +9,7 @@ import java.util.Objects;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.stereotype.Service;
-import de.ozgcloud.apilib.errorhandling.NotFoundException;
+import de.ozgcloud.apilib.common.errorhandling.NotFoundException;
import de.ozgcloud.apilib.file.dummy.DummyOzgCloudFileService;
import de.ozgcloud.apilib.vorgang.OzgCloudAntragsteller;
import de.ozgcloud.apilib.vorgang.OzgCloudEingang;
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/GrpcOzgCloudVorgangService.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/GrpcOzgCloudVorgangService.java
index bbcbcf7..2494c42 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/GrpcOzgCloudVorgangService.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/GrpcOzgCloudVorgangService.java
@@ -6,6 +6,7 @@ import org.mapstruct.factory.Mappers;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.stereotype.Service;
+import de.itvsh.ozg.pluto.vorgang.GrpcFilterBy;
import de.itvsh.ozg.pluto.vorgang.GrpcFindVorgangRequest;
import de.itvsh.ozg.pluto.vorgang.GrpcFindVorgangRequest.GrpcOrderBy;
import de.itvsh.ozg.pluto.vorgang.GrpcFindVorgangWithEingangRequest;
@@ -57,6 +58,7 @@ public class GrpcOzgCloudVorgangService implements OzgCloudVorgangService {
GrpcFindVorgangRequest buildSearchRequest(@NonNull String searchString, Page page) {
return GrpcFindVorgangRequest.newBuilder()
+ .setFilterBy(GrpcFilterBy.newBuilder().build())
.setSearchBy(searchString)
.setOffset(page.getOffset())
.setLimit(page.getLimit())
diff --git a/api-lib-demo/pom.xml b/api-lib-demo/pom.xml
index 53dc4c2..b2d3769 100644
--- a/api-lib-demo/pom.xml
+++ b/api-lib-demo/pom.xml
@@ -8,7 +8,7 @@
<version>0.2.0-SNAPSHOT</version>
</parent>
<artifactId>api-lib-demo</artifactId>
-
+
<dependencies>
<dependency>
<groupId>de.ozgcloud.api-lib</groupId>
diff --git a/api-lib-demo/src/main/java/de/ozgcloud/apilib/demo/DemoRunner.java b/api-lib-demo/src/main/java/de/ozgcloud/apilib/demo/DemoRunner.java
index 9053188..690fc86 100644
--- a/api-lib-demo/src/main/java/de/ozgcloud/apilib/demo/DemoRunner.java
+++ b/api-lib-demo/src/main/java/de/ozgcloud/apilib/demo/DemoRunner.java
@@ -6,7 +6,6 @@ import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.stereotype.Component;
import de.ozgcloud.apilib.alfa.AlfaService;
-import de.ozgcloud.apilib.file.OzgCloudFileId;
import de.ozgcloud.apilib.file.OzgCloudFileService;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangId;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangService;
@@ -14,7 +13,7 @@ import de.ozgcloud.apilib.vorgang.OzgCloudVorgangService;
@Component
class DemoRunner implements ApplicationListener<ContextRefreshedEvent> {
- private static final OzgCloudVorgangId VORGANG_ID = OzgCloudVorgangId.from("64bfd6597a08cf6e8a5185c6");
+ private static final OzgCloudVorgangId VORGANG_ID = OzgCloudVorgangId.from("64dde1bd0ffe733638cc7d2a");
@Autowired
private OzgCloudVorgangService vorgangService;
@@ -25,9 +24,9 @@ class DemoRunner implements ApplicationListener<ContextRefreshedEvent> {
@Override
public void onApplicationEvent(ContextRefreshedEvent event) {
- System.out.println(vorgangService.getById(VORGANG_ID));
+ System.out.println(vorgangService.search("Deutschland"));
- System.out.println(fileService.getFile(OzgCloudFileId.from("630363d5b5816c0d8efd6f19")));
+ System.out.println(vorgangService.getById(VORGANG_ID));
alfaService.addAktenNotiz(VORGANG_ID, "Hello World!");
}
diff --git a/api-lib-demo/src/main/resources/application.yml b/api-lib-demo/src/main/resources/application.yml
index 0fd2021..7250759 100644
--- a/api-lib-demo/src/main/resources/application.yml
+++ b/api-lib-demo/src/main/resources/application.yml
@@ -1,7 +1,8 @@
ozgcloud:
vorgang-manager:
- address: static://127.0.0.1:9090
- negotiation-type: plaintext
+# address: static://127.0.0.1:9090
+ address: nordfriesland-pluto-grpc.test.by.ozg-cloud.de:443
+ negotiation-type: tls
file-manager:
address: ${ozgcloud.vorgang-manager.address}
negotiation-type: plaintext
\ No newline at end of file
diff --git a/ozg-cloud-spring-boot-starter/pom.xml b/ozg-cloud-spring-boot-starter/pom.xml
index 16b2d2c..b289343 100644
--- a/ozg-cloud-spring-boot-starter/pom.xml
+++ b/ozg-cloud-spring-boot-starter/pom.xml
@@ -8,7 +8,7 @@
<version>0.2.0-SNAPSHOT</version>
</parent>
<artifactId>ozg-cloud-spring-boot-starter</artifactId>
-
+
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
--
GitLab