diff --git a/nachrichten-manager-interface/src/main/protobuf/antragraum.model.proto b/nachrichten-manager-interface/src/main/protobuf/antragraum.model.proto index 282543d0303eaf7f5eae47245f936f1d1d75fb46..80234a7f435bc161ae2df951c7f0226d2503d9c9 100644 --- a/nachrichten-manager-interface/src/main/protobuf/antragraum.model.proto +++ b/nachrichten-manager-interface/src/main/protobuf/antragraum.model.proto @@ -61,6 +61,7 @@ message GrpcRueckfrageAnswer { string rueckfrageId = 1; string answerText = 2; repeated string attachmentFileId = 3; + string sentAt = 4; } message GrpcSendRueckfrageAnswerResponse { 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 25500e8ea808c7e719814d097e7b25587873e8ff..d9ccf624316bd2b4ae37c8b0b4233da607e0f517 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 @@ -72,7 +72,6 @@ interface AntragraumNachrichtMapper { @Mapping(target = "postfachAddress", ignore = true) @Mapping(target = "postfachId", ignore = true) @Mapping(target = "replyOption", constant = "FORBIDDEN") - @Mapping(target = "sentAt", ignore = true) @Mapping(target = "sentSuccessful", constant = "true") @Mapping(target = "subject", constant = "Antwort") // TODO klären @Mapping(target = "vorgangId", ignore = true) 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 0fe3c3d3fc8b70e2dfacf2edb39a53970712b9e7..dcf8e12576334ad06dd15a75af23594f76a71cf6 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 @@ -32,9 +32,9 @@ import org.mapstruct.factory.Mappers; import de.ozgcloud.nachrichten.postfach.PostfachNachricht; import de.ozgcloud.nachrichten.postfach.PostfachNachricht.Direction; +import de.ozgcloud.nachrichten.postfach.PostfachNachricht.ReplyOption; import de.ozgcloud.nachrichten.postfach.PostfachNachrichtTestFactory; import de.ozgcloud.nachrichten.postfach.osi.MessageTestFactory; -import de.ozgcloud.nachrichten.postfach.osi.ReplyOption; class AntragraumNachrichtMapperTest { @@ -123,17 +123,17 @@ class AntragraumNachrichtMapperTest { } @Test - void shouldMapDirection() { + void shouldSetDirection() { var result = map(); assertThat(result.getDirection()).isEqualTo(Direction.IN); } @Test - void shouldMapReplyOption() { + void shouldSetReplyOption() { var result = map(); - assertThat(result.getReplyOption()).hasToString(ReplyOption.FORBIDDEN.name()); + assertThat(result.getReplyOption()).isEqualTo(ReplyOption.FORBIDDEN); } @Test @@ -143,6 +143,13 @@ class AntragraumNachrichtMapperTest { assertThat(result.getCreatedAt()).isCloseTo(ZonedDateTime.now(), within(2, ChronoUnit.SECONDS)); } + @Test + void shouldSetSentAt() { + var result = map(); + + assertThat(result.getSentAt()).isCloseTo(PostfachNachrichtTestFactory.SENT_AT, within(2, ChronoUnit.SECONDS)); + } + private PostfachNachricht map() { return mapper.fromRueckfrageAnswer(GrpcRueckfrageAnswerTestFactory.create()); } diff --git a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/GrpcRueckfrageAnswerTestFactory.java b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/GrpcRueckfrageAnswerTestFactory.java index 6c0fb28f113bc5e179aff00d19a9e5cd5a7a6cc9..a5a1c3d84905536ae3be2ed01e8e596095f8ff7c 100644 --- a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/GrpcRueckfrageAnswerTestFactory.java +++ b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/GrpcRueckfrageAnswerTestFactory.java @@ -5,6 +5,8 @@ import java.util.UUID; import com.thedeanda.lorem.LoremIpsum; +import de.ozgcloud.nachrichten.postfach.PostfachNachrichtTestFactory; + public class GrpcRueckfrageAnswerTestFactory { static final String RUECKFRAGE_ID = UUID.randomUUID().toString(); static final String TEXT = LoremIpsum.getInstance().getParagraphs(2, 4); @@ -18,6 +20,7 @@ public class GrpcRueckfrageAnswerTestFactory { return GrpcRueckfrageAnswer.newBuilder() .setRueckfrageId(RUECKFRAGE_ID) .setAnswerText(TEXT) - .addAllAttachmentFileId(ATTACHMENT_ID_LIST); + .addAllAttachmentFileId(ATTACHMENT_ID_LIST) + .setSentAt(PostfachNachrichtTestFactory.SENT_AT_STR); } }