diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/clientattribute/ClientAttribute.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/clientattribute/ClientAttribute.java index 2d3e78f89f3c8499c828048cd2b9c649534ce9da..2bc2adb8c80288083118884beb2f004b35c2ec88 100644 --- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/clientattribute/ClientAttribute.java +++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/clientattribute/ClientAttribute.java @@ -10,7 +10,8 @@ public enum ClientAttribute { WIEDERVORLAGE_NEXT_FRIST("nextWiedervorlageFrist", ClientName.ALFA), HAS_POSTFACH_NACHRICHT("hasPostfachNachricht", ClientName.NACHRICHTEN_MANAGER), HAS_NEW_POSTFACH_NACHRICHT("hasNewPostfachNachricht", ClientName.NACHRICHTEN_MANAGER), - ANTRAG_BEWILLIGT("antragBewilligt", ClientName.BESCHEID_MANAGER); + ANTRAG_BEWILLIGT("antragBewilligt", ClientName.BESCHEID_MANAGER), + ARCHIVING("ARCHIVING", ClientName.ARCHIVE_MANAGER); private final String attributeName; private final ClientName clientName; diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/clientattribute/ClientName.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/clientattribute/ClientName.java index 33b4cd6bf468c47463d1c7fca978534519bd89f9..51ab8829b4d0f1238d325a09d85189615ee7c250 100644 --- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/clientattribute/ClientName.java +++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/clientattribute/ClientName.java @@ -6,7 +6,8 @@ import lombok.RequiredArgsConstructor; public enum ClientName { ALFA("Alfa"), NACHRICHTEN_MANAGER("OzgCloud_NachrichtenManager"), - BESCHEID_MANAGER("OzgCloud_BescheidManager"); + BESCHEID_MANAGER("OzgCloud_BescheidManager"), + ARCHIVE_MANAGER("OzgCloud_ArchiveManager"); private final String text; diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangHeader.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangHeader.java index 5140891d53190ffe1d6b7f50127f1fc4a547388f..4cb67d35df601ca867f36ed659d688b2d1f68e8f 100644 --- a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangHeader.java +++ b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangHeader.java @@ -63,4 +63,6 @@ class VorgangHeader implements Vorgang { private boolean hasNewPostfachNachricht; private Boolean antragBewilligt; + + private boolean archiving; } diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangHeaderMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangHeaderMapper.java index fc0528d16b45e0f1a5620cc3e6b82050cf33fabf..f27255ca3f547f7f1fbb6d278de94af893ca6062 100644 --- a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangHeaderMapper.java +++ b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangHeaderMapper.java @@ -45,6 +45,7 @@ interface VorgangHeaderMapper { @Mapping(target = "antragBewilligt", source = "clientAttributesList") @Mapping(target = "hasPostfachNachricht", expression = "java(mapBoolClientAttribute(vorgangHeader.getClientAttributesList(), ClientAttribute.HAS_POSTFACH_NACHRICHT))") @Mapping(target = "hasNewPostfachNachricht", expression = "java(mapBoolClientAttribute(vorgangHeader.getClientAttributesList(), ClientAttribute.HAS_NEW_POSTFACH_NACHRICHT))") + @Mapping(target = "archiving", expression = "java(mapBoolClientAttribute(vorgangHeader.getClientAttributesList(), ClientAttribute.ARCHIVING))") VorgangHeader toVorgangHeader(GrpcVorgangHeader vorgangHeader); default LocalDate mapNextFrist(List<GrpcClientAttribute> clientAttributes) { diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangHeaderMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangHeaderMapperTest.java index c0d328e8de6057807245fc741c6cf739f70e10e9..4ad7c274765f6b48cb7a466b1bf3eeb78f5d66be 100644 --- a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangHeaderMapperTest.java +++ b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangHeaderMapperTest.java @@ -235,4 +235,26 @@ class VorgangHeaderMapperTest { return mapper.toVorgangHeader(GrpcVorgangHeaderTestFactory.create()); } } + + @Nested + class TestArchiving { + + @Test + void shouldBeFalseIfClientAttributeIsMissing() { + var header = mapper.toVorgangHeader(GrpcVorgangHeaderTestFactory.create()); + + assertThat(header.isArchiving()).isFalse(); + } + + @ParameterizedTest + @ValueSource(booleans = { true, false }) + void shouldBeValueOfClientAttribute(boolean value) { + var clientAttribute = GrpcClientAttributeTestFactory.createWith(ClientAttribute.ARCHIVING, value); + var vorgangHeader = GrpcVorgangHeaderTestFactory.createBuilder().addClientAttributes(clientAttribute).build(); + + var mapped = mapper.toVorgangHeader(vorgangHeader); + + assertThat(mapped.isArchiving()).isEqualTo(value); + } + } }