From 1055b20bef0257b9dca3ddf4494e649f1b763f1e Mon Sep 17 00:00:00 2001
From: Krzysztof <krzysztof.witukiewicz@mgm-tp.com>
Date: Fri, 7 Mar 2025 14:44:33 +0100
Subject: [PATCH] OZG-7501 OZG-7874 Point the link forwardByOzgCloud to
ForwardByVorgangCommandController
---
.../forwarding/ForwardingVorgangWithEingangProcessor.java | 3 +--
.../ForwardingVorgangWithEingangProcessorTest.java | 5 ++---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/forwarding/ForwardingVorgangWithEingangProcessor.java b/alfa-service/src/main/java/de/ozgcloud/alfa/forwarding/ForwardingVorgangWithEingangProcessor.java
index 714dc343d3..3aa5eca619 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/forwarding/ForwardingVorgangWithEingangProcessor.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/forwarding/ForwardingVorgangWithEingangProcessor.java
@@ -34,7 +34,6 @@ import org.springframework.hateoas.server.RepresentationModelProcessor;
import org.springframework.stereotype.Component;
import de.ozgcloud.alfa.common.FeatureToggleProperties;
-import de.ozgcloud.alfa.common.command.CommandController;
import de.ozgcloud.alfa.common.user.CurrentUserService;
import de.ozgcloud.alfa.common.user.UserRole;
import de.ozgcloud.alfa.vorgang.Vorgang.VorgangStatus;
@@ -74,7 +73,7 @@ class ForwardingVorgangWithEingangProcessor implements RepresentationModelProces
}
private Link buildForwardByOzgCloudLink(VorgangWithEingang vorgang) {
- return linkTo(methodOn(CommandController.CommandByRelationController.class).createCommand(vorgang.getId(), vorgang.getId(),
+ return linkTo(methodOn(ForwardByVorgangCommandController.class).createCommand(vorgang.getId(),
vorgang.getVersion(), null)).withRel(REL_FORWARD_BY_OZGCLOUD);
}
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/forwarding/ForwardingVorgangWithEingangProcessorTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/forwarding/ForwardingVorgangWithEingangProcessorTest.java
index e1da1b36f7..ffa0dbd2fb 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/forwarding/ForwardingVorgangWithEingangProcessorTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/forwarding/ForwardingVorgangWithEingangProcessorTest.java
@@ -42,7 +42,6 @@ import org.springframework.hateoas.Link;
import org.springframework.web.util.UriComponentsBuilder;
import de.ozgcloud.alfa.common.FeatureToggleProperties;
-import de.ozgcloud.alfa.common.command.CommandController.CommandByRelationController;
import de.ozgcloud.alfa.common.user.CurrentUserService;
import de.ozgcloud.alfa.common.user.UserRole;
import de.ozgcloud.alfa.vorgang.Vorgang.VorgangStatus;
@@ -122,8 +121,8 @@ class ForwardingVorgangWithEingangProcessorTest {
@Test
void shouldAddForwardByOzgCloudLink() {
- var expectedHref = UriComponentsBuilder.fromUriString(CommandByRelationController.COMMAND_BY_RELATION_PATH)
- .buildAndExpand(VorgangHeaderTestFactory.ID, VorgangHeaderTestFactory.ID, VorgangHeaderTestFactory.VERSION).toString();
+ var expectedHref = UriComponentsBuilder.fromUriString(ForwardByVorgangCommandController.PATH)
+ .buildAndExpand(VorgangHeaderTestFactory.ID, VorgangHeaderTestFactory.VERSION).toString();
var model = processor.process(EntityModel.of(vorgang));
--
GitLab