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 714dc343d3a87d3ea38fa781a544b79121f254f5..863d725f77977266b1ce78f38d075283e4993083 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 e1da1b36f786f0186bbf35ed53b12cbb398b94a8..2b480261858a77629a4036c3d29c6da52a452aa0 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(); } } }