From e6af23933721f1ce4f24d3840a766ac4a736e75b Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 16 Dec 2024 13:50:28 +0100
Subject: [PATCH] OZG-7350 use simplified GrpcCreateCollaborationRequestData
---
.../collaboration/CollaborationRequestMapper.java | 3 ++-
.../ozgcloud/collaboration/CollaborationService.java | 8 ++++----
.../GrpcCreateCollaborationRequestDataTestFactory.java | 10 +---------
3 files changed, 7 insertions(+), 14 deletions(-)
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 ea4049e..79781c4 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,6 +121,8 @@ public abstract class CollaborationRequestMapper {
@Mapping(target = "allFields", ignore = true)
public abstract GrpcCollaborationRequest toGrpcCollaborationRequest(CollaborationRequest request);
+ @Mapping(target = "organisationsEinheitId", source = "zustaendigeStelle.subjectId")
+ @Mapping(target = "organisationsEinheitIdBytes", ignore = true)
@Mapping(target = "mergeFrom", ignore = true)
@Mapping(target = "clearField", ignore = true)
@Mapping(target = "clearOneof", ignore = true)
@@ -128,7 +130,6 @@ public abstract class CollaborationRequestMapper {
@Mapping(target = "unknownFields", ignore = true)
@Mapping(target = "vorgangIdBytes", 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/main/java/de/ozgcloud/collaboration/CollaborationService.java b/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/CollaborationService.java
index 4a2ff75..7e1aeb0 100644
--- a/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/CollaborationService.java
+++ b/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/CollaborationService.java
@@ -89,10 +89,6 @@ public class CollaborationService {
commandService.addSubCommands(buildCreateCollaborationRequestRequest(enrichedRequest));
}
- String getUserId() {
- return userProfileService.getUserProfile().getId().toString();
- }
-
OzgCloudCreateSubCommandsRequest buildCreateCollaborationRequestRequest(CollaborationRequest request) {
return OzgCloudCreateSubCommandsRequest.builder()
.parentId(request.getCommandId())
@@ -116,6 +112,10 @@ public class CollaborationService {
return request.toBuilder().collaborationVorgangId(collaborationVorgangId).createdBy(getUserId()).build();
}
+ String getUserId() {
+ return userProfileService.getUserProfile().getId().toString();
+ }
+
OzgCloudCreateSubCommandsRequest buildCreateSubCommandsRequest(CollaborationRequest collaborationRequest, List<OzgCloudCommand> subCommands) {
return OzgCloudCreateSubCommandsRequest.builder()
.parentId(collaborationRequest.getCommandId())
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 5ac03d1..1f00e14 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,17 +4,9 @@ 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();
}
@@ -23,6 +15,6 @@ public class GrpcCreateCollaborationRequestDataTestFactory {
return GrpcCreateCollaborationRequestData.newBuilder()
.setCollaborationLevel(CollaborationRequestTestFactory.COLLABORATION_LEVEL)
.setVorgangId(CommandTestFactory.VORGANG_ID)
- .setZustaendigeStelle(FACHSTELLE);
+ .setOrganisationsEinheitId(FachstelleTestFactory.SUBJECT_ID);
}
}
\ No newline at end of file
--
GitLab