From 8a125c621fd4c2cb5a19363fa518b5f40229a05e Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 10 Jun 2024 15:17:18 +0200
Subject: [PATCH] OZG-5666 set default for direction
---
.../antragraum/AntragraumGrpcService.java | 6 ++++--
.../antragraum/AntragraumNachrichtMapper.java | 4 ++--
.../antragraum/AntragraumGrpcServiceTest.java | 21 ++++++++++---------
.../AntragraumNachrichtMapperTest.java | 10 ++++++++-
4 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AntragraumGrpcService.java b/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AntragraumGrpcService.java
index 45f6901..b7d094f 100644
--- a/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AntragraumGrpcService.java
+++ b/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AntragraumGrpcService.java
@@ -23,10 +23,11 @@
package de.ozgcloud.nachrichten.antragraum;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+
import io.grpc.stub.StreamObserver;
import lombok.RequiredArgsConstructor;
import net.devh.boot.grpc.server.service.GrpcService;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@GrpcService
@RequiredArgsConstructor
@@ -48,7 +49,8 @@ class AntragraumGrpcService extends AntragraumServiceGrpc.AntragraumServiceImplB
public void sendRueckfrageAnswer(GrpcSendRueckfrageAnswerRequest request, StreamObserver<GrpcSendRueckfrageAnswerResponse> streamObserver) {
var answer = request.getAnswer();
- var commandId = antragraumService.sendRueckfrageAnswer(request.getSamlToken(), answer.getRueckfrageId(), mapper.toPostfachNachricht(answer));
+ var commandId = antragraumService.sendRueckfrageAnswer(request.getSamlToken(), answer.getRueckfrageId(),
+ mapper.fromRueckfrage(answer));
streamObserver.onNext(GrpcSendRueckfrageAnswerResponse.newBuilder().setCommandId(commandId).build());
streamObserver.onCompleted();
diff --git a/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AntragraumNachrichtMapper.java b/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AntragraumNachrichtMapper.java
index cb54984..4fe613e 100644
--- a/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AntragraumNachrichtMapper.java
+++ b/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AntragraumNachrichtMapper.java
@@ -46,7 +46,7 @@ interface AntragraumNachrichtMapper {
@Mapping(target = "attachments", source = "attachmentFileIdList")
@Mapping(target = "createdAt", ignore = true)
@Mapping(target = "createdBy", ignore = true)
- @Mapping(target = "direction", ignore = true)
+ @Mapping(target = "direction", constant = "IN")
@Mapping(target = "id", ignore = true)
@Mapping(target = "messageCode", ignore = true)
@Mapping(target = "messageId", source = "rueckfrageId")
@@ -57,5 +57,5 @@ interface AntragraumNachrichtMapper {
@Mapping(target = "sentSuccessful", ignore = true)
@Mapping(target = "subject", ignore = true)
@Mapping(target = "vorgangId", ignore = true)
- PostfachNachricht toPostfachNachricht(GrpcRueckfrageAnswer answer);
+ PostfachNachricht fromRueckfrage(GrpcRueckfrageAnswer answer);
}
diff --git a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AntragraumGrpcServiceTest.java b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AntragraumGrpcServiceTest.java
index e5ab9a2..9772bf5 100644
--- a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AntragraumGrpcServiceTest.java
+++ b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AntragraumGrpcServiceTest.java
@@ -20,9 +20,12 @@
package de.ozgcloud.nachrichten.antragraum;
-import de.ozgcloud.nachrichten.postfach.PostfachNachricht;
-import de.ozgcloud.nachrichten.postfach.PostfachNachrichtTestFactory;
-import io.grpc.stub.StreamObserver;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+
+import java.util.UUID;
+import java.util.stream.Stream;
+
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
@@ -30,11 +33,9 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
-import java.util.UUID;
-import java.util.stream.Stream;
-
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.*;
+import de.ozgcloud.nachrichten.postfach.PostfachNachricht;
+import de.ozgcloud.nachrichten.postfach.PostfachNachrichtTestFactory;
+import io.grpc.stub.StreamObserver;
class AntragraumGrpcServiceTest {
@Spy
@@ -91,14 +92,14 @@ class AntragraumGrpcServiceTest {
void setup() {
when(antragraumService.sendRueckfrageAnswer(anyString(), anyString(), any(PostfachNachricht.class)))
.thenReturn(UUID.randomUUID().toString());
- when(mapper.toPostfachNachricht(any(GrpcRueckfrageAnswer.class))).thenReturn(PostfachNachrichtTestFactory.create());
+ when(mapper.fromRueckfrage(any(GrpcRueckfrageAnswer.class))).thenReturn(PostfachNachrichtTestFactory.create());
}
@Test
void shouldCallMapper() {
antragsraumGrpcService.sendRueckfrageAnswer(GrpcSendRueckfrageAnswerRequestTestFactory.create(), streamObserver);
- verify(mapper).toPostfachNachricht(any(GrpcRueckfrageAnswer.class));
+ verify(mapper).fromRueckfrage(any(GrpcRueckfrageAnswer.class));
}
@Test
diff --git a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AntragraumNachrichtMapperTest.java b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AntragraumNachrichtMapperTest.java
index 5ff78a9..c0b9812 100644
--- a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AntragraumNachrichtMapperTest.java
+++ b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AntragraumNachrichtMapperTest.java
@@ -29,6 +29,7 @@ import org.junit.jupiter.api.Test;
import org.mapstruct.factory.Mappers;
import de.ozgcloud.nachrichten.postfach.PostfachNachricht;
+import de.ozgcloud.nachrichten.postfach.PostfachNachricht.Direction;
import de.ozgcloud.nachrichten.postfach.PostfachNachrichtTestFactory;
import de.ozgcloud.nachrichten.postfach.osi.MessageTestFactory;
@@ -118,8 +119,15 @@ class AntragraumNachrichtMapperTest {
assertThat(result.getAttachments()).isEqualTo(GrpcRueckfrageAnswerTestFactory.ATTACHMENT_ID_LIST);
}
+ @Test
+ void shouldMapDirection() {
+ var result = map();
+
+ assertThat(result.getDirection()).isEqualTo(Direction.IN);
+ }
+
private PostfachNachricht map() {
- return mapper.toPostfachNachricht(GrpcRueckfrageAnswerTestFactory.create());
+ return mapper.fromRueckfrage(GrpcRueckfrageAnswerTestFactory.create());
}
}
}
\ No newline at end of file
--
GitLab