Skip to content
Snippets Groups Projects
Commit 0fabb458 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-6989 OZG-7216 Set VorgangHead.locked property

parent 18e56d53
Branches
Tags
No related merge requests found
...@@ -24,7 +24,8 @@ ...@@ -24,7 +24,8 @@
unter der Lizenz sind dem Lizenztext zu entnehmen. 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> <modelVersion>4.0.0</modelVersion>
...@@ -139,6 +140,10 @@ ...@@ -139,6 +140,10 @@
<groupId>de.ozgcloud.archive</groupId> <groupId>de.ozgcloud.archive</groupId>
<artifactId>archive-manager-interface</artifactId> <artifactId>archive-manager-interface</artifactId>
</dependency> </dependency>
<dependency>
<groupId>de.ozgcloud.document</groupId>
<artifactId>document-manager-interface</artifactId>
</dependency>
<!-- tools --> <!-- tools -->
<dependency> <dependency>
......
...@@ -8,4 +8,5 @@ import lombok.Getter; ...@@ -8,4 +8,5 @@ import lombok.Getter;
public class VorgangHead { public class VorgangHead {
private ServiceKonto serviceKonto; private ServiceKonto serviceKonto;
private boolean locked;
} }
\ No newline at end of file
...@@ -34,6 +34,7 @@ import de.ozgcloud.alfa.common.clientattribute.ClientAttributeUtils; ...@@ -34,6 +34,7 @@ import de.ozgcloud.alfa.common.clientattribute.ClientAttributeUtils;
import de.ozgcloud.alfa.common.user.UserIdMapper; import de.ozgcloud.alfa.common.user.UserIdMapper;
import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcClientAttribute; import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcClientAttribute;
import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcClientAttributeValue; import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcClientAttributeValue;
import de.ozgcloud.vorgang.vorgang.GrpcVorgangHead;
import de.ozgcloud.vorgang.vorgang.GrpcVorgangWithEingang; import de.ozgcloud.vorgang.vorgang.GrpcVorgangWithEingang;
@Mapper(uses = { EingangMapper.class, UserIdMapper.class, BaseTypesMapper.class, ServiceKontoMapper.class }) @Mapper(uses = { EingangMapper.class, UserIdMapper.class, BaseTypesMapper.class, ServiceKontoMapper.class })
...@@ -49,4 +50,6 @@ interface VorgangWithEingangMapper { ...@@ -49,4 +50,6 @@ interface VorgangWithEingangMapper {
.orElse(false); .orElse(false);
} }
@Mapping(target = "locked", expression = "java(vorgangHead.hasLock())")
VorgangHead toVorgangHead(GrpcVorgangHead vorgangHead);
} }
\ No newline at end of file
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();
}
}
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();
}
}
...@@ -144,6 +144,26 @@ class VorgangWithEingangMapperTest { ...@@ -144,6 +144,26 @@ class VorgangWithEingangMapperTest {
assertThat(vorgang.isHasNewPostfachNachricht()).isEqualTo(value); 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() { private VorgangWithEingang callMapper() {
return mapper.toVorgangWithEingang(grpcVorgangMitEingang); return mapper.toVorgangWithEingang(grpcVorgangMitEingang);
} }
......
...@@ -49,12 +49,13 @@ ...@@ -49,12 +49,13 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <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> <nachrichten-manager.version>2.11.0</nachrichten-manager.version>
<ozgcloud-common-pdf.version>3.0.1</ozgcloud-common-pdf.version> <ozgcloud-common-pdf.version>3.0.1</ozgcloud-common-pdf.version>
<user-manager.version>2.8.0</user-manager.version> <user-manager.version>2.8.0</user-manager.version>
<zufi-manager.version>1.5.0</zufi-manager.version> <zufi-manager.version>1.5.0</zufi-manager.version>
<archive-manager.version>0.1.0-SNAPSHOT</archive-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> <spring-cloud-config-client.version>4.1.3</spring-cloud-config-client.version>
<!-- TODO: die Version über ozgcloud-common ziehen --> <!-- TODO: die Version über ozgcloud-common ziehen -->
...@@ -145,6 +146,11 @@ ...@@ -145,6 +146,11 @@
<artifactId>archive-manager-interface</artifactId> <artifactId>archive-manager-interface</artifactId>
<version>${archive-manager.version}</version> <version>${archive-manager.version}</version>
</dependency> </dependency>
<dependency>
<groupId>de.ozgcloud.document</groupId>
<artifactId>document-manager-interface</artifactId>
<version>${document-manager.version}</version>
</dependency>
<dependency> <dependency>
<groupId>io.jsonwebtoken</groupId> <groupId>io.jsonwebtoken</groupId>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment