From a1987b4155b868c3d77401f00d9d5d8fc039cf85 Mon Sep 17 00:00:00 2001
From: Felix Reichenbach <felix.reichenbach@mgm-tp.com>
Date: Mon, 10 Mar 2025 08:46:36 +0100
Subject: [PATCH] OZG-7726 remove role check for forward by ozg-cloud link
---
...ForwardingVorgangWithEingangProcessor.java | 6 +---
...ardingVorgangWithEingangProcessorTest.java | 34 ++-----------------
2 files changed, 3 insertions(+), 37 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..863d725f77 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
@@ -62,17 +62,13 @@ class ForwardingVorgangWithEingangProcessor implements RepresentationModelProces
}
boolean isForwardableByOzgCloud(VorgangWithEingang vorgang) {
- return featureToggleProperties.isForwardByOzgCloudEnabled() && isStatusNeu(vorgang) && isVerwaltungUser();
+ return featureToggleProperties.isForwardByOzgCloudEnabled() && isStatusNeu(vorgang);
}
private boolean isStatusNeu(VorgangWithEingang vorgang) {
return vorgang.getStatus() == VorgangStatus.NEU;
}
- private boolean isVerwaltungUser() {
- return userService.hasRole(UserRole.VERWALTUNG_USER);
- }
-
private Link buildForwardByOzgCloudLink(VorgangWithEingang vorgang) {
return linkTo(methodOn(CommandController.CommandByRelationController.class).createCommand(vorgang.getId(), 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..2b48026185 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
@@ -205,16 +205,6 @@ class ForwardingVorgangWithEingangProcessorTest {
assertThat(forwardableByOzgCloud).isFalse();
}
-
- @ParameterizedTest
- @EnumSource
- void shouldNotCallUserService(VorgangStatus status) {
- var vorgang = VorgangWithEingangTestFactory.createBuilder().status(status).build();
-
- processor.isForwardableByOzgCloud(vorgang);
-
- verify(userService, never()).hasRole(any());
- }
}
@Nested
@@ -236,16 +226,6 @@ class ForwardingVorgangWithEingangProcessorTest {
assertThat(forwardableByOzgCloud).isFalse();
}
-
- @ParameterizedTest
- @EnumSource(mode = Mode.EXCLUDE, names = { "NEU" })
- void shouldNotCallUserService(VorgangStatus status) {
- var vorgang = VorgangWithEingangTestFactory.createBuilder().status(status).build();
-
- processor.isForwardableByOzgCloud(vorgang);
-
- verify(userService, never()).hasRole(any());
- }
}
@Nested
@@ -254,20 +234,10 @@ class ForwardingVorgangWithEingangProcessorTest {
private final VorgangWithEingang newVorgang = VorgangWithEingangTestFactory.createBuilder().status(VorgangStatus.NEU).build();
@Test
- void shouldCheckUserRole() {
- processor.isForwardableByOzgCloud(newVorgang);
-
- verify(userService).hasRole(UserRole.VERWALTUNG_USER);
- }
-
- @ParameterizedTest
- @ValueSource(booleans = { true, false })
- void shouldReturnValueOfHasVerwaltungUserRole(boolean isVerwaltungUser) {
- when(userService.hasRole(UserRole.VERWALTUNG_USER)).thenReturn(isVerwaltungUser);
-
+ void shouldReturnTrue() {
var forwardableByOzgCloud = processor.isForwardableByOzgCloud(newVorgang);
- assertThat(forwardableByOzgCloud).isEqualTo(isVerwaltungUser);
+ assertThat(forwardableByOzgCloud).isTrue();
}
}
}
--
GitLab