From 07dac95954feefa7869550b873af790a6939fdaf Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 19 Dec 2024 09:30:42 +0100
Subject: [PATCH] OZG-7350 rename method in CollaborationRequestMapper
---
.../collaboration/CollaborationEventListener.java | 2 +-
.../collaboration/CollaborationRequestMapper.java | 2 +-
.../collaboration/CollaborationEventListenerTest.java | 10 +++++-----
.../collaboration/CollaborationRequestMapperTest.java | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/CollaborationEventListener.java b/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/CollaborationEventListener.java
index d29b34d..d078c9d 100644
--- a/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/CollaborationEventListener.java
+++ b/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/CollaborationEventListener.java
@@ -68,7 +68,7 @@ class CollaborationEventListener {
}
void createCollaborationRequest(Command command) {
- var collaborationRequest = collaborationRequestMapper.toCollaborationRequest(command);
+ var collaborationRequest = collaborationRequestMapper.toCollaborationRequestExcludingFachstelle(command);
switch (collaborationRequest.getCollaborationLevel()) {
case 1 -> createLevel1CollaborationRequest(collaborationRequest, command);
case 4 -> createLevel4CollaborationRequest(collaborationRequest, command);
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 19e0a4c..a23e2a1 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
@@ -73,7 +73,7 @@ public abstract class CollaborationRequestMapper {
@Mapping(target = "titel", expression = "java(getStringProperty(CollaborationRequest.PROPERTY_TITEL, command.getBodyObject()))")
@Mapping(target = "beschreibung", expression = "java(getStringProperty(CollaborationRequest.PROPERTY_BESCHREIBUNG, command.getBodyObject()))")
@Mapping(target = "collaborationLevel", expression = "java(getIntProperty(CollaborationRequest.PROPERTY_COLLABORATION_LEVEL, command.getBodyObject()))")
- public abstract CollaborationRequest toCollaborationRequest(Command command);
+ public abstract CollaborationRequest toCollaborationRequestExcludingFachstelle(Command command);
@Mapping(target = "id", ignore = true)
@Mapping(target = "status", ignore = true)
diff --git a/collaboration-manager-server/src/test/java/de/ozgcloud/collaboration/CollaborationEventListenerTest.java b/collaboration-manager-server/src/test/java/de/ozgcloud/collaboration/CollaborationEventListenerTest.java
index 2535305..55c3bf4 100644
--- a/collaboration-manager-server/src/test/java/de/ozgcloud/collaboration/CollaborationEventListenerTest.java
+++ b/collaboration-manager-server/src/test/java/de/ozgcloud/collaboration/CollaborationEventListenerTest.java
@@ -98,17 +98,17 @@ class CollaborationEventListenerTest {
@Test
void shouldCallCommandMapper() {
- when(commandMapper.toCollaborationRequest(any())).thenReturn(CollaborationRequestTestFactory.create());
+ when(commandMapper.toCollaborationRequestExcludingFachstelle(any())).thenReturn(CollaborationRequestTestFactory.create());
eventListener.createCollaborationRequest(command);
- verify(commandMapper).toCollaborationRequest(command);
+ verify(commandMapper).toCollaborationRequestExcludingFachstelle(command);
}
@Test
void shouldCallCreateLevel1CollaborationRequest() {
var collaborationRequest = CollaborationRequestTestFactory.create();
- when(commandMapper.toCollaborationRequest(any())).thenReturn(collaborationRequest);
+ when(commandMapper.toCollaborationRequestExcludingFachstelle(any())).thenReturn(collaborationRequest);
eventListener.createCollaborationRequest(command);
@@ -118,7 +118,7 @@ class CollaborationEventListenerTest {
@Test
void shouldCallCreateLevel4CollaborationRequest() {
var collaborationRequest = CollaborationRequestTestFactory.createBuilder().collaborationLevel(4).build();
- when(commandMapper.toCollaborationRequest(any())).thenReturn(collaborationRequest);
+ when(commandMapper.toCollaborationRequestExcludingFachstelle(any())).thenReturn(collaborationRequest);
eventListener.createCollaborationRequest(command);
@@ -130,7 +130,7 @@ class CollaborationEventListenerTest {
@ValueSource(ints = { 0, 2, 3, 5 })
void shouldDeclineRequest(int collaborationLevel) {
var collaborationRequest = CollaborationRequestTestFactory.createBuilder().collaborationLevel(collaborationLevel).build();
- when(commandMapper.toCollaborationRequest(any())).thenReturn(collaborationRequest);
+ when(commandMapper.toCollaborationRequestExcludingFachstelle(any())).thenReturn(collaborationRequest);
eventListener.createCollaborationRequest(command);
diff --git a/collaboration-manager-server/src/test/java/de/ozgcloud/collaboration/CollaborationRequestMapperTest.java b/collaboration-manager-server/src/test/java/de/ozgcloud/collaboration/CollaborationRequestMapperTest.java
index eb380e3..5d0d748 100644
--- a/collaboration-manager-server/src/test/java/de/ozgcloud/collaboration/CollaborationRequestMapperTest.java
+++ b/collaboration-manager-server/src/test/java/de/ozgcloud/collaboration/CollaborationRequestMapperTest.java
@@ -70,7 +70,7 @@ class CollaborationRequestMapperTest {
private FachstelleMapper fachstelleMapper;
@Nested
- class TestToCreateCollaborationRequest {
+ class TestToCollaborationRequestExcludingFachstelle {
private static final Map<String, Object> BODY_OBJECT = Map.of(
CollaborationRequest.PROPERTY_TITEL, CollaborationRequestTestFactory.TITEL,
@@ -84,7 +84,7 @@ class CollaborationRequestMapperTest {
@Test
void shouldMapCommand() {
- var result = mapper.toCollaborationRequest(COMMAND);
+ var result = mapper.toCollaborationRequestExcludingFachstelle(COMMAND);
assertThat(result).usingRecursiveComparison()
.ignoringFields("id", "createdBy", "collaborationVorgangId", "zustaendigeStelle")
--
GitLab