From 0fabb4585117f703a78bc14bc7bf0425cb55e82e Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 5 Dec 2024 14:58:52 +0100
Subject: [PATCH] OZG-6989 OZG-7216 Set VorgangHead.locked property
---
alfa-service/pom.xml | 7 ++++++-
.../de/ozgcloud/alfa/vorgang/VorgangHead.java | 1 +
.../vorgang/VorgangWithEingangMapper.java | 3 +++
.../alfa/vorgang/GrpcLockTestFactory.java | 14 +++++++++++++
.../vorgang/GrpcVorgangHeadTestFactory.java | 14 +++++++++++++
.../vorgang/VorgangWithEingangMapperTest.java | 20 +++++++++++++++++++
pom.xml | 8 +++++++-
7 files changed, 65 insertions(+), 2 deletions(-)
create mode 100644 alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcLockTestFactory.java
create mode 100644 alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangHeadTestFactory.java
diff --git a/alfa-service/pom.xml b/alfa-service/pom.xml
index 488cb1b698..f6c6e79f08 100644
--- a/alfa-service/pom.xml
+++ b/alfa-service/pom.xml
@@ -24,7 +24,8 @@
unter der Lizenz sind dem Lizenztext zu entnehmen.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -139,6 +140,10 @@
<groupId>de.ozgcloud.archive</groupId>
<artifactId>archive-manager-interface</artifactId>
</dependency>
+ <dependency>
+ <groupId>de.ozgcloud.document</groupId>
+ <artifactId>document-manager-interface</artifactId>
+ </dependency>
<!-- tools -->
<dependency>
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangHead.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangHead.java
index 5c2199b7a1..3becef5bdb 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangHead.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangHead.java
@@ -8,4 +8,5 @@ import lombok.Getter;
public class VorgangHead {
private ServiceKonto serviceKonto;
+ private boolean locked;
}
\ No newline at end of file
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangMapper.java
index 108df0164d..e2eca7becd 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangMapper.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangMapper.java
@@ -34,6 +34,7 @@ import de.ozgcloud.alfa.common.clientattribute.ClientAttributeUtils;
import de.ozgcloud.alfa.common.user.UserIdMapper;
import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcClientAttribute;
import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcClientAttributeValue;
+import de.ozgcloud.vorgang.vorgang.GrpcVorgangHead;
import de.ozgcloud.vorgang.vorgang.GrpcVorgangWithEingang;
@Mapper(uses = { EingangMapper.class, UserIdMapper.class, BaseTypesMapper.class, ServiceKontoMapper.class })
@@ -49,4 +50,6 @@ interface VorgangWithEingangMapper {
.orElse(false);
}
+ @Mapping(target = "locked", expression = "java(vorgangHead.hasLock())")
+ VorgangHead toVorgangHead(GrpcVorgangHead vorgangHead);
}
\ No newline at end of file
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcLockTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcLockTestFactory.java
new file mode 100644
index 0000000000..b8f28d9853
--- /dev/null
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcLockTestFactory.java
@@ -0,0 +1,14 @@
+package de.ozgcloud.alfa.vorgang;
+
+import de.ozgcloud.vorgang.vorgang.GrpcLock;
+
+class GrpcLockTestFactory {
+
+ public static GrpcLock create() {
+ return createBuilder().build();
+ }
+
+ public static GrpcLock.Builder createBuilder() {
+ return GrpcLock.newBuilder();
+ }
+}
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangHeadTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangHeadTestFactory.java
new file mode 100644
index 0000000000..b11ce836e7
--- /dev/null
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangHeadTestFactory.java
@@ -0,0 +1,14 @@
+package de.ozgcloud.alfa.vorgang;
+
+import de.ozgcloud.vorgang.vorgang.GrpcVorgangHead;
+
+class GrpcVorgangHeadTestFactory {
+
+ public static GrpcVorgangHead create() {
+ return createBuilder().build();
+ }
+
+ public static GrpcVorgangHead.Builder createBuilder() {
+ return GrpcVorgangHead.newBuilder();
+ }
+}
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangMapperTest.java
index 560bc6dd72..1314632285 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangMapperTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangMapperTest.java
@@ -144,6 +144,26 @@ class VorgangWithEingangMapperTest {
assertThat(vorgang.isHasNewPostfachNachricht()).isEqualTo(value);
}
+ @Test
+ void shouldMapLockedToFalseIfLockIsNotPresent() {
+ var grpcVorgang = GrpcVorgangWithEingangTestFactory.createBuilder().setHeader(GrpcVorgangHeadTestFactory.create()).build();
+
+ var vorgang = mapper.toVorgangWithEingang(grpcVorgang);
+
+ assertThat(vorgang.getHeader().isLocked()).isFalse();
+ }
+
+ @Test
+ void shouldMapLockedToTrueIfLockIsPresent() {
+ var grpcVorgang = GrpcVorgangWithEingangTestFactory.createBuilder()
+ .setHeader(GrpcVorgangHeadTestFactory.createBuilder().setLock(GrpcLockTestFactory.create()).build())
+ .build();
+
+ var vorgang = mapper.toVorgangWithEingang(grpcVorgang);
+
+ assertThat(vorgang.getHeader().isLocked()).isTrue();
+ }
+
private VorgangWithEingang callMapper() {
return mapper.toVorgangWithEingang(grpcVorgangMitEingang);
}
diff --git a/pom.xml b/pom.xml
index 7f69ffa8ae..b4a9f9211c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,12 +49,13 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <vorgang-manager.version>2.13.0</vorgang-manager.version>
+ <vorgang-manager.version>2.19.0-SNAPSHOT</vorgang-manager.version>
<nachrichten-manager.version>2.11.0</nachrichten-manager.version>
<ozgcloud-common-pdf.version>3.0.1</ozgcloud-common-pdf.version>
<user-manager.version>2.8.0</user-manager.version>
<zufi-manager.version>1.5.0</zufi-manager.version>
<archive-manager.version>0.1.0-SNAPSHOT</archive-manager.version>
+ <document-manager.version>1.1.0</document-manager.version>
<spring-cloud-config-client.version>4.1.3</spring-cloud-config-client.version>
<!-- TODO: die Version über ozgcloud-common ziehen -->
@@ -145,6 +146,11 @@
<artifactId>archive-manager-interface</artifactId>
<version>${archive-manager.version}</version>
</dependency>
+ <dependency>
+ <groupId>de.ozgcloud.document</groupId>
+ <artifactId>document-manager-interface</artifactId>
+ <version>${document-manager.version}</version>
+ </dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
--
GitLab