From 60146ff01efca1a6f76e98198f6e21e4d50347c1 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 13 Dec 2024 17:17:05 +0100
Subject: [PATCH] OZG-7350 send fuill Fachstelle to VorgangManager
---
collaboration-manager-server/pom.xml | 2 +-
.../collaboration/CollaborationRequestMapper.java | 3 +--
.../fachstelle/GrpcFachstelleTestFactory.java | 6 +++---
.../GrpcCreateCollaborationRequestDataTestFactory.java | 10 +++++++++-
4 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/collaboration-manager-server/pom.xml b/collaboration-manager-server/pom.xml
index a11db1d..3d2b405 100644
--- a/collaboration-manager-server/pom.xml
+++ b/collaboration-manager-server/pom.xml
@@ -40,7 +40,7 @@
<name>OZG-Cloud Collaboration Manager Server</name>
<properties>
- <vorgang-manager.version>2.18.0</vorgang-manager.version>
+ <vorgang-manager.version>2.20.0-PR-525-SNAPSHOT</vorgang-manager.version>
<zufi-manager.version>1.6.0</zufi-manager.version>
<api-lib.version>0.13.0</api-lib.version>
</properties>
diff --git a/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/CollaborationRequestMapper.java b/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/CollaborationRequestMapper.java
index 1dce316..ea4049e 100644
--- a/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/CollaborationRequestMapper.java
+++ b/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/CollaborationRequestMapper.java
@@ -121,15 +121,14 @@ public abstract class CollaborationRequestMapper {
@Mapping(target = "allFields", ignore = true)
public abstract GrpcCollaborationRequest toGrpcCollaborationRequest(CollaborationRequest request);
- @Mapping(target = "zustaendigeStelle", source = "zustaendigeStelle.subjectId")
@Mapping(target = "mergeFrom", ignore = true)
@Mapping(target = "clearField", ignore = true)
@Mapping(target = "clearOneof", ignore = true)
@Mapping(target = "mergeUnknownFields", ignore = true)
@Mapping(target = "unknownFields", ignore = true)
@Mapping(target = "vorgangIdBytes", ignore = true)
- @Mapping(target = "zustaendigeStelleBytes", ignore = true)
@Mapping(target = "allFields", ignore = true)
+ @Mapping(target = "mergeZustaendigeStelle", ignore = true)
public abstract GrpcCreateCollaborationRequestData toGrpcCreateCollaborationRequestData(CollaborationRequest request);
@Mapping(target = "id", expression = "java(toCollaborationRequestId(getStringProperty(CollaborationRequest.PROPERTY_ID, item.getItem())))")
diff --git a/collaboration-manager-server/src/test/java/de/ozgcloud/collaboration/fachstelle/GrpcFachstelleTestFactory.java b/collaboration-manager-server/src/test/java/de/ozgcloud/collaboration/fachstelle/GrpcFachstelleTestFactory.java
index 00ca89b..98ffc37 100644
--- a/collaboration-manager-server/src/test/java/de/ozgcloud/collaboration/fachstelle/GrpcFachstelleTestFactory.java
+++ b/collaboration-manager-server/src/test/java/de/ozgcloud/collaboration/fachstelle/GrpcFachstelleTestFactory.java
@@ -8,8 +8,8 @@ import de.ozgcloud.zufi.grpc.fachstelle.GrpcFachstelle;
public class GrpcFachstelleTestFactory {
- private static final String MUK_ID = FachstelleTestFactory.SUBJECT_ID;
- private static final String ID = FachstelleTestFactory.TECHNICAL_ID;
+ public static final String MUK_ID = FachstelleTestFactory.SUBJECT_ID;
+ public static final String ID = FachstelleTestFactory.TECHNICAL_ID;
public static final String FIRMEN_NAME = LoremIpsum.getInstance().getWords(2);
public static final String RECHTSFORM = LoremIpsum.getInstance().getWords(1);
public static final String RECHTSFORM_TEXT = LoremIpsum.getInstance().getWords(1);
@@ -22,7 +22,7 @@ public class GrpcFachstelleTestFactory {
return createBuilder().build();
}
- private static GrpcFachstelle.Builder createBuilder() {
+ public static GrpcFachstelle.Builder createBuilder() {
return GrpcFachstelle.newBuilder()
.setId(ID)
.setMukId(MUK_ID)
diff --git a/collaboration-manager-server/src/test/java/de/ozgcloud/collaboration/request/GrpcCreateCollaborationRequestDataTestFactory.java b/collaboration-manager-server/src/test/java/de/ozgcloud/collaboration/request/GrpcCreateCollaborationRequestDataTestFactory.java
index ebff716..5ac03d1 100644
--- a/collaboration-manager-server/src/test/java/de/ozgcloud/collaboration/request/GrpcCreateCollaborationRequestDataTestFactory.java
+++ b/collaboration-manager-server/src/test/java/de/ozgcloud/collaboration/request/GrpcCreateCollaborationRequestDataTestFactory.java
@@ -4,9 +4,17 @@ import de.ozgcloud.collaboration.CollaborationRequestTestFactory;
import de.ozgcloud.collaboration.fachstelle.FachstelleTestFactory;
import de.ozgcloud.command.CommandTestFactory;
import de.ozgcloud.vorgang.vorgang.GrpcCreateCollaborationRequestData;
+import de.ozgcloud.vorgang.vorgang.GrpcFachstelle;
+import de.ozgcloud.vorgang.vorgang.GrpcFachstelleType;
public class GrpcCreateCollaborationRequestDataTestFactory {
+ public static final GrpcFachstelle FACHSTELLE = GrpcFachstelle.newBuilder()
+ .setSubjectId(FachstelleTestFactory.SUBJECT_ID)
+ .setTechnicalId(FachstelleTestFactory.TECHNICAL_ID)
+ .setType(GrpcFachstelleType.valueOf(FachstelleTestFactory.TYPE.name()))
+ .build();
+
public static GrpcCreateCollaborationRequestData create() {
return createBuilder().build();
}
@@ -15,6 +23,6 @@ public class GrpcCreateCollaborationRequestDataTestFactory {
return GrpcCreateCollaborationRequestData.newBuilder()
.setCollaborationLevel(CollaborationRequestTestFactory.COLLABORATION_LEVEL)
.setVorgangId(CommandTestFactory.VORGANG_ID)
- .setZustaendigeStelle(FachstelleTestFactory.SUBJECT_ID);
+ .setZustaendigeStelle(FACHSTELLE);
}
}
\ No newline at end of file
--
GitLab