From 32022c5ca1fb42087449f7bb6f72a3544343cc7b Mon Sep 17 00:00:00 2001 From: Felix Reichenbach <felix.reichenbach@mgm-tp.com> Date: Mon, 17 Mar 2025 15:36:29 +0100 Subject: [PATCH] OZG-7573 implement RouteForwardingService --- .../forwarder/RouteForwardingService.java | 14 +----- .../forwarder/RouteForwardingServiceTest.java | 43 ++++--------------- 2 files changed, 9 insertions(+), 48 deletions(-) diff --git a/forwarder/src/main/java/de/ozgcloud/eingang/forwarder/RouteForwardingService.java b/forwarder/src/main/java/de/ozgcloud/eingang/forwarder/RouteForwardingService.java index 8a455d31e..40e9b7707 100644 --- a/forwarder/src/main/java/de/ozgcloud/eingang/forwarder/RouteForwardingService.java +++ b/forwarder/src/main/java/de/ozgcloud/eingang/forwarder/RouteForwardingService.java @@ -35,19 +35,7 @@ class RouteForwardingService { private final VorgangService vorgangService; - // public void route(RouteCriteria criteria, FormData formData) { - // vorgangService.createVorgang(formData.toBuilder() - // .clearZustaendigeStelles() - // .zustaendigeStelle(ZustaendigeStelle.builder() - // .organisationseinheitenId(criteria.getOrganisationEinheitId() - // .orElseThrow(() -> new UnsupportedOperationException("OrganisationseinheitId - // is required!"))) - // .build()) - // .build()); - // } - public void route(FormData formData) { - // TODO Auto-generated method stub - throw new UnsupportedOperationException("Unimplemented method 'route'"); + vorgangService.createVorgang(formData); } } diff --git a/forwarder/src/test/java/de/ozgcloud/eingang/forwarder/RouteForwardingServiceTest.java b/forwarder/src/test/java/de/ozgcloud/eingang/forwarder/RouteForwardingServiceTest.java index 45015dff9..4b36715c7 100644 --- a/forwarder/src/test/java/de/ozgcloud/eingang/forwarder/RouteForwardingServiceTest.java +++ b/forwarder/src/test/java/de/ozgcloud/eingang/forwarder/RouteForwardingServiceTest.java @@ -23,9 +23,10 @@ */ package de.ozgcloud.eingang.forwarder; +import static org.mockito.Mockito.*; + import org.junit.jupiter.api.Nested; -import org.mockito.ArgumentCaptor; -import org.mockito.Captor; +import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; import org.mockito.Mock; @@ -39,45 +40,17 @@ class RouteForwardingServiceTest { private RouteForwardingService routeForwardingService; @Mock private VorgangService vorgangService; - @Captor - private ArgumentCaptor<FormData> formDataCaptor; @Nested class TestRoute { private final FormData formData = FormDataTestFactory.create(); - // @Test - // void shouldCallVorgangService() { - // var criteria = RouteCriteriaTestFactory.create(); - - // routeForwardingService.route(criteria, formData); - - // verify(vorgangService).createVorgang(formDataCaptor.capture()); - // assertThat(formDataCaptor.getValue()).usingRecursiveComparison().ignoringFields("zustaendigeStelles").isEqualTo(formData); - // } - - // @Test - // void shouldSetOrganisationEinheitIdInFormData() { - // var criteria = RouteCriteriaTestFactory.create(); - // var expectedZustaendigeStelle = ZustaendigeStelle.builder() - // .organisationseinheitenId(RouteCriteriaTestFactory.ORGANISATION_EINHEIT_ID) - // .build(); - - // routeForwardingService.route(criteria, formData); - - // verify(vorgangService).createVorgang(formDataCaptor.capture()); - // assertThat(formDataCaptor.getValue().getZustaendigeStelles()).usingRecursiveFieldByFieldElementComparator() - // .containsExactly(expectedZustaendigeStelle); - // } - - // @Test - // void shouldThrowUnsupportedOperationException() { - // var criteria = - // RouteCriteriaTestFactory.createBuilder().organisationEinheitId(Optional.empty()).build(); + @Test + void shouldCallVorgangService() { + routeForwardingService.route(formData); - // assertThrows(UnsupportedOperationException.class, () -> - // routeForwardingService.route(criteria, formData)); - // } + verify(vorgangService).createVorgang(formData); + } } } -- GitLab