From afb8af75671a57bee4ed36a9701af1c82f6b476d Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 12 Apr 2024 17:53:45 +0200
Subject: [PATCH] OZG-5010 OZG-5432 grpc call to getDocument()
---
.../alfa/bescheid/BescheidMapper.java | 2 +-
.../alfa/bescheid/BescheidRemoteService.java | 14 ----
.../alfa/bescheid/BescheidService.java | 4 --
.../alfa/bescheid/DocumentController.java | 4 +-
.../alfa/bescheid/DocumentMapper.java | 14 ++++
.../alfa/bescheid/DocumentRemoteService.java | 23 +++++++
.../alfa/bescheid/DocumentService.java | 16 +++++
.../alfa/bescheid/BescheidMapperTest.java | 7 ++
.../bescheid/BescheidRemoteServiceTest.java | 6 +-
.../alfa/bescheid/BescheidServiceTest.java | 21 ------
.../alfa/bescheid/DocumentControllerTest.java | 8 +--
.../alfa/bescheid/DocumentMapperTest.java | 69 +++++++++++++++++++
.../bescheid/DocumentRemoteServiceTest.java | 65 +++++++++++++++++
.../alfa/bescheid/DocumentServiceTest.java | 46 +++++++++++++
.../bescheid/GrpcBescheidTestFactory.java | 2 +
.../bescheid/GrpcDocumentTestFactory.java | 25 +++++++
.../GrpcGetDocumentRequestTestFactory.java | 16 +++++
.../GrpcGetDocumentResponseTestFactory.java | 17 +++++
pom.xml | 2 +-
19 files changed, 311 insertions(+), 50 deletions(-)
create mode 100644 alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/DocumentMapper.java
create mode 100644 alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/DocumentRemoteService.java
create mode 100644 alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/DocumentService.java
create mode 100644 alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/DocumentMapperTest.java
create mode 100644 alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/DocumentRemoteServiceTest.java
create mode 100644 alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/DocumentServiceTest.java
create mode 100644 alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/GrpcDocumentTestFactory.java
create mode 100644 alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/GrpcGetDocumentRequestTestFactory.java
create mode 100644 alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/GrpcGetDocumentResponseTestFactory.java
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidMapper.java
index 96d008cd02..633caec19a 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidMapper.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidMapper.java
@@ -13,7 +13,7 @@ import de.ozgcloud.alfa.common.binaryfile.FileId;
import de.ozgcloud.alfa.common.binaryfile.FileIdMapper;
import de.ozgcloud.bescheid.GrpcBescheid;
-@Mapper(unmappedTargetPolicy = ReportingPolicy.WARN, nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS, uses = FileIdMapper.class)
+@Mapper(unmappedTargetPolicy = ReportingPolicy.ERROR, nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS, uses = FileIdMapper.class)
interface BescheidMapper {
@Mapping(target = "attachments", source = "grpcBescheid.attachmentsList")
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidRemoteService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidRemoteService.java
index 44ad13b70c..c68d00855d 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidRemoteService.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidRemoteService.java
@@ -5,10 +5,7 @@ import java.util.Optional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.thedeanda.lorem.LoremIpsum;
-
import de.ozgcloud.alfa.common.GrpcUtil;
-import de.ozgcloud.alfa.common.binaryfile.FileId;
import de.ozgcloud.bescheid.BescheidServiceGrpc.BescheidServiceBlockingStub;
import de.ozgcloud.bescheid.GrpcBescheid;
import de.ozgcloud.bescheid.GrpcGetBescheidDraftRequest;
@@ -38,15 +35,4 @@ class BescheidRemoteService {
Optional<GrpcBescheid> getBescheidFromResponse(GrpcGetBescheidDraftResponse response) {
return response.hasBescheid() ? Optional.of(response.getBescheid()) : Optional.empty();
}
-
- public Document getDocument(String documentId) {
- // TODO: replace this dummy implementation with a grpc call (OZG-5323)
- return Document.builder()
- .id(documentId)
- .fileId(FileId.from("Test-File-ID"))
- .type("Bescheid")
- .nachrichtSubject("Ein Bescheid-Dokument")
- .nachrichtText(LoremIpsum.getInstance().getWords(20))
- .build();
- }
}
\ No newline at end of file
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidService.java
index 4d6e4b5e0f..67bef19968 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidService.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidService.java
@@ -15,8 +15,4 @@ public class BescheidService {
public Optional<Bescheid> getBescheidDraft(String vorgangId) {
return remoteService.getBescheidDraft(vorgangId);
}
-
- public Document getDocument(String documentId) {
- return remoteService.getDocument(documentId);
- }
}
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/DocumentController.java b/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/DocumentController.java
index 2a5d46f43e..9959aef97d 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/DocumentController.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/DocumentController.java
@@ -15,11 +15,11 @@ public class DocumentController {
static final String PATH = BescheidController.PATH + "/document";
- private final BescheidService bescheidService;
+ private final DocumentService documentService;
private final DocumentModelAssembler assembler;
@GetMapping("/{documentId}")
public EntityModel<Document> getDocument(@PathVariable String documentId) {
- return assembler.toModel(bescheidService.getDocument(documentId));
+ return assembler.toModel(documentService.getDocument(documentId));
}
}
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/DocumentMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/DocumentMapper.java
new file mode 100644
index 0000000000..e2c70b0551
--- /dev/null
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/DocumentMapper.java
@@ -0,0 +1,14 @@
+package de.ozgcloud.alfa.bescheid;
+
+import org.mapstruct.Mapper;
+import org.mapstruct.NullValueCheckStrategy;
+import org.mapstruct.ReportingPolicy;
+
+import de.ozgcloud.alfa.common.binaryfile.FileIdMapper;
+import de.ozgcloud.document.GrpcDocument;
+
+@Mapper(unmappedTargetPolicy = ReportingPolicy.ERROR, nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS, uses = FileIdMapper.class)
+public interface DocumentMapper {
+
+ Document fromGrpc(GrpcDocument grpcDocument);
+}
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/DocumentRemoteService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/DocumentRemoteService.java
new file mode 100644
index 0000000000..83cdf65fad
--- /dev/null
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/DocumentRemoteService.java
@@ -0,0 +1,23 @@
+package de.ozgcloud.alfa.bescheid;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import de.ozgcloud.alfa.common.GrpcUtil;
+import de.ozgcloud.document.DocumentServiceGrpc.DocumentServiceBlockingStub;
+import de.ozgcloud.document.GrpcGetDocumentRequest;
+import net.devh.boot.grpc.client.inject.GrpcClient;
+
+@Service
+public class DocumentRemoteService {
+
+ @GrpcClient(GrpcUtil.VORGANG_MANAGER_GRPC_CLIENT)
+ private DocumentServiceBlockingStub documentServiceStub;
+ @Autowired
+ private DocumentMapper documentMapper;
+
+ public Document getDocument(String documentId) {
+ var response = documentServiceStub.getDocument(GrpcGetDocumentRequest.newBuilder().setId(documentId).build());
+ return documentMapper.fromGrpc(response.getDocument());
+ }
+}
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/DocumentService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/DocumentService.java
new file mode 100644
index 0000000000..5fbade2a2e
--- /dev/null
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/DocumentService.java
@@ -0,0 +1,16 @@
+package de.ozgcloud.alfa.bescheid;
+
+import org.springframework.stereotype.Service;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class DocumentService {
+
+ private final DocumentRemoteService remoteService;
+
+ public Document getDocument(String documentId) {
+ return remoteService.getDocument(documentId);
+ }
+}
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/BescheidMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/BescheidMapperTest.java
index 356e58b1bf..7f7425cca4 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/BescheidMapperTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/BescheidMapperTest.java
@@ -23,6 +23,13 @@ class BescheidMapperTest {
@Nested
class TestFromGrpc {
+ @Test
+ void shouldMapId() {
+ var bescheid = map();
+
+ assertThat(bescheid.getId()).isEqualTo(GrpcBescheidTestFactory.ID);
+ }
+
@Test
void shouldMapVorgangId() {
var bescheid = map();
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/BescheidRemoteServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/BescheidRemoteServiceTest.java
index 2671618ca8..8c06cc6275 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/BescheidRemoteServiceTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/BescheidRemoteServiceTest.java
@@ -28,7 +28,7 @@ class BescheidRemoteServiceTest {
private BescheidMapper bescheidMapper;
@Nested
- class GetBescheidDraftTest {
+ class TestGetBescheidDraft {
private final GrpcGetBescheidDraftRequest request = GrpcGetBescheidDraftRequestTestFactory.create();
private final GrpcGetBescheidDraftResponse response = GrpcGetBescheidDraftResponseTestFactory.create();
@@ -91,7 +91,7 @@ class BescheidRemoteServiceTest {
}
@Nested
- class GrpcGetBescheidDraftRequestTest {
+ class TestBuildGetBescheidDraftRequest {
@Test
void shouldHaveVorgangId() {
@@ -102,7 +102,7 @@ class BescheidRemoteServiceTest {
}
@Nested
- class GetBescheidFromResponseTest {
+ class TestGetBescheidFromResponse {
@Test
void shouldReturnEmpty() {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/BescheidServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/BescheidServiceTest.java
index 35c6e54a41..6241bdce4c 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/BescheidServiceTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/BescheidServiceTest.java
@@ -41,25 +41,4 @@ class BescheidServiceTest {
assertThat(result).isEqualTo(remoteServiceResult);
}
}
-
- @Nested
- class TestGetDocument {
-
- @Test
- void shouldCallRemoteService() {
- service.getDocument(DocumentTestFactory.ID);
-
- verify(remoteService).getDocument(DocumentTestFactory.ID);
- }
-
- @Test
- void shouldReturnResultFromRemoteService() {
- var remoteServiceResult = DocumentTestFactory.create();
- when(remoteService.getDocument(DocumentTestFactory.ID)).thenReturn(remoteServiceResult);
-
- var result = service.getDocument(DocumentTestFactory.ID);
-
- assertThat(result).isEqualTo(remoteServiceResult);
- }
- }
}
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/DocumentControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/DocumentControllerTest.java
index 9eae2f415b..f3f4ff473d 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/DocumentControllerTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/DocumentControllerTest.java
@@ -17,7 +17,7 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders;
class DocumentControllerTest {
@Mock
- private BescheidService bescheidService;
+ private DocumentService documentService;
@Mock
private DocumentModelAssembler assembler;
@Spy
@@ -38,14 +38,14 @@ class DocumentControllerTest {
@BeforeEach
void init() {
- when(bescheidService.getDocument(BescheidTestFactory.BESCHEID_DOCUMENT)).thenReturn(document);
+ when(documentService.getDocument(DocumentTestFactory.ID)).thenReturn(document);
}
@Test
void shouldGetDocument() throws Exception {
doRequest();
- verify(bescheidService).getDocument(BescheidTestFactory.BESCHEID_DOCUMENT);
+ verify(documentService).getDocument(DocumentTestFactory.ID);
}
@Test
@@ -61,7 +61,7 @@ class DocumentControllerTest {
}
private ResultActions doRequest() throws Exception {
- return mockMvc.perform(get(DocumentController.PATH + "/{documentId}", BescheidTestFactory.BESCHEID_DOCUMENT));
+ return mockMvc.perform(get(DocumentController.PATH + "/{documentId}", DocumentTestFactory.ID));
}
}
}
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/DocumentMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/DocumentMapperTest.java
new file mode 100644
index 0000000000..316aacd331
--- /dev/null
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/DocumentMapperTest.java
@@ -0,0 +1,69 @@
+package de.ozgcloud.alfa.bescheid;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.mapstruct.factory.Mappers;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+
+import de.ozgcloud.alfa.common.binaryfile.FileIdMapper;
+
+public class DocumentMapperTest {
+
+ @Mock
+ private FileIdMapper fileIdMapper;
+ @InjectMocks
+ private final DocumentMapper mapper = Mappers.getMapper(DocumentMapper.class);
+
+ @Nested
+ class TestFromGrpc {
+
+ @BeforeEach
+ void init() {
+ when(fileIdMapper.toFileId(GrpcDocumentTestFactory.FILE_ID)).thenReturn(DocumentTestFactory.FILE_ID);
+ }
+
+ @Test
+ void shouldMapId() {
+ var document = map();
+
+ assertThat(document.getId()).isEqualTo(GrpcDocumentTestFactory.ID);
+ }
+
+ @Test
+ void shouldMapType() {
+ var document = map();
+
+ assertThat(document.getType()).isEqualTo(GrpcDocumentTestFactory.TYPE);
+ }
+
+ @Test
+ void shouldMapFileId() {
+ var document = map();
+
+ assertThat(document.getFileId()).isEqualTo(DocumentTestFactory.FILE_ID);
+ }
+
+ @Test
+ void shouldMapNachrichtSubject() {
+ var document = map();
+
+ assertThat(document.getNachrichtSubject()).isEqualTo(GrpcDocumentTestFactory.NACHRICHT_SUBJECT);
+ }
+
+ @Test
+ void shouldMapNachrichtText() {
+ var document = map();
+
+ assertThat(document.getNachrichtText()).isEqualTo(GrpcDocumentTestFactory.NACHRICHT_TEXT);
+ }
+
+ private Document map() {
+ return mapper.fromGrpc(GrpcDocumentTestFactory.create());
+ }
+ }
+}
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/DocumentRemoteServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/DocumentRemoteServiceTest.java
new file mode 100644
index 0000000000..c0d1654723
--- /dev/null
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/DocumentRemoteServiceTest.java
@@ -0,0 +1,65 @@
+package de.ozgcloud.alfa.bescheid;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentMatcher;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Spy;
+
+import de.ozgcloud.document.DocumentServiceGrpc.DocumentServiceBlockingStub;
+import de.ozgcloud.document.GrpcGetDocumentRequest;
+
+public class DocumentRemoteServiceTest {
+
+ @Mock
+ private DocumentServiceBlockingStub documentServiceStub;
+ @Mock
+ private DocumentMapper documentMapper;
+ @Spy
+ @InjectMocks
+ private DocumentRemoteService service;
+
+ @Nested
+ class TestGetDocument {
+
+ private static final ArgumentMatcher<GrpcGetDocumentRequest> REQUEST_MATCHER = request -> request.getId().equals(DocumentTestFactory.ID);
+
+ private final Document document = DocumentTestFactory.create();
+
+ @BeforeEach
+ void init() {
+ when(documentServiceStub.getDocument(argThat(REQUEST_MATCHER))).thenReturn(GrpcGetDocumentResponseTestFactory.create());
+ when(documentMapper.fromGrpc(GrpcGetDocumentResponseTestFactory.GRPC_DOCUMENT)).thenReturn(document);
+ }
+
+ @Test
+ void shouldCallGrpcService() {
+ callService();
+
+ verify(documentServiceStub).getDocument(argThat(REQUEST_MATCHER));
+ }
+
+ @Test
+ void shouldCallMapper() {
+ callService();
+
+ verify(documentMapper).fromGrpc(GrpcGetDocumentResponseTestFactory.GRPC_DOCUMENT);
+ }
+
+ @Test
+ void shouldReturnDocument() {
+ var result = callService();
+
+ assertThat(result).isEqualTo(document);
+ }
+
+ private Document callService() {
+ return service.getDocument(DocumentTestFactory.ID);
+ }
+ }
+}
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/DocumentServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/DocumentServiceTest.java
new file mode 100644
index 0000000000..dbdf7d79ff
--- /dev/null
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/DocumentServiceTest.java
@@ -0,0 +1,46 @@
+package de.ozgcloud.alfa.bescheid;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Spy;
+
+public class DocumentServiceTest {
+
+ @Mock
+ private DocumentRemoteService remoteService;
+ @Spy
+ @InjectMocks
+ private DocumentService service;
+
+ @Nested
+ class TestGetDocument {
+
+ private final Document document = DocumentTestFactory.create();
+
+ @BeforeEach
+ void init() {
+ when(remoteService.getDocument(DocumentTestFactory.ID)).thenReturn(document);
+
+ }
+
+ @Test
+ void shouldCallRemoteService() {
+ service.getDocument(DocumentTestFactory.ID);
+
+ verify(remoteService).getDocument(DocumentTestFactory.ID);
+ }
+
+ @Test
+ void shouldReturnResultFromRemoteService() {
+ var result = service.getDocument(DocumentTestFactory.ID);
+
+ assertThat(result).isEqualTo(document);
+ }
+ }
+}
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/GrpcBescheidTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/GrpcBescheidTestFactory.java
index 4f6c168d8e..9dbee01fd0 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/GrpcBescheidTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/GrpcBescheidTestFactory.java
@@ -7,6 +7,7 @@ import de.ozgcloud.common.datatype.StringBasedValue;
public class GrpcBescheidTestFactory {
+ public static final String ID = BescheidTestFactory.ID;
public static final boolean BEWILLIGT = BescheidTestFactory.BEWILLIGT;
public static final String BESCHIEDEN_AM = BescheidTestFactory.BESCHIEDEN_AM;
public static final String BESCHEID_DOCUMENT = BescheidTestFactory.BESCHEID_DOCUMENT;
@@ -20,6 +21,7 @@ public class GrpcBescheidTestFactory {
public static GrpcBescheid.Builder createBuilder() {
return GrpcBescheid.newBuilder()
+ .setId(ID)
.setBewilligt(BEWILLIGT)
.setBeschiedenAm(BESCHIEDEN_AM)
.setBescheidDocument(BESCHEID_DOCUMENT)
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/GrpcDocumentTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/GrpcDocumentTestFactory.java
new file mode 100644
index 0000000000..c8c704474b
--- /dev/null
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/GrpcDocumentTestFactory.java
@@ -0,0 +1,25 @@
+package de.ozgcloud.alfa.bescheid;
+
+import de.ozgcloud.document.GrpcDocument;
+
+public class GrpcDocumentTestFactory {
+
+ public static final String ID = DocumentTestFactory.ID;
+ public static final String TYPE = DocumentTestFactory.TYPE;
+ public static final String FILE_ID = DocumentTestFactory.FILE_ID.toString();
+ public static final String NACHRICHT_SUBJECT = DocumentTestFactory.NACHRICHT_SUBJECT;
+ public static final String NACHRICHT_TEXT = DocumentTestFactory.NACHRICHT_TEXT;
+
+ public static GrpcDocument create() {
+ return createBuilder().build();
+ }
+
+ public static GrpcDocument.Builder createBuilder() {
+ return GrpcDocument.newBuilder()
+ .setId(ID)
+ .setType(TYPE)
+ .setFileId(FILE_ID)
+ .setNachrichtSubject(NACHRICHT_SUBJECT)
+ .setNachrichtText(NACHRICHT_TEXT);
+ }
+}
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/GrpcGetDocumentRequestTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/GrpcGetDocumentRequestTestFactory.java
new file mode 100644
index 0000000000..6cd448d4b8
--- /dev/null
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/GrpcGetDocumentRequestTestFactory.java
@@ -0,0 +1,16 @@
+package de.ozgcloud.alfa.bescheid;
+
+import de.ozgcloud.document.GrpcGetDocumentRequest;
+
+public class GrpcGetDocumentRequestTestFactory {
+
+ public static final String ID = DocumentTestFactory.ID;
+
+ public static GrpcGetDocumentRequest create() {
+ return createBuilder().build();
+ }
+
+ public static GrpcGetDocumentRequest.Builder createBuilder() {
+ return GrpcGetDocumentRequest.newBuilder().setId(ID);
+ }
+}
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/GrpcGetDocumentResponseTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/GrpcGetDocumentResponseTestFactory.java
new file mode 100644
index 0000000000..febb293de5
--- /dev/null
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/GrpcGetDocumentResponseTestFactory.java
@@ -0,0 +1,17 @@
+package de.ozgcloud.alfa.bescheid;
+
+import de.ozgcloud.document.GrpcDocument;
+import de.ozgcloud.document.GrpcGetDocumentResponse;
+
+public class GrpcGetDocumentResponseTestFactory {
+
+ public static final GrpcDocument GRPC_DOCUMENT = GrpcDocumentTestFactory.create();
+
+ public static GrpcGetDocumentResponse create() {
+ return createBuilder().build();
+ }
+
+ public static GrpcGetDocumentResponse.Builder createBuilder() {
+ return GrpcGetDocumentResponse.newBuilder().setDocument(GRPC_DOCUMENT);
+ }
+}
diff --git a/pom.xml b/pom.xml
index 13fc91d97b..4408121ed2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <vorgang-manager.version>2.5.0</vorgang-manager.version>
+ <vorgang-manager.version>2.6.0-SNAPSHOT</vorgang-manager.version>
<ozgcloud-common-pdf.version>3.0.1</ozgcloud-common-pdf.version>
<user-manager.version>2.2.0</user-manager.version>
--
GitLab