From a36654dd5f078888aaf19efca2773bbc3f9bf8a7 Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Fri, 3 May 2024 09:48:33 +0200 Subject: [PATCH] OZG-4979 delete outdated orders --- .../de/ozgcloud/vorgang/command/Order.java | 8 ------- .../command/GrpcCommandServiceITCase.java | 23 +++++++++++++++++++ 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/Order.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/Order.java index e2a9bb3ad..7bdcc47b4 100644 --- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/Order.java +++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/Order.java @@ -49,14 +49,6 @@ public enum Order { FORWARD_SUCCESSFULL, FORWARD_FAILED, - CREATE_WIEDERVORLAGE, - EDIT_WIEDERVORLAGE, - WIEDERVORLAGE_ERLEDIGEN, - WIEDERVORLAGE_WIEDEREROEFFNEN, - - CREATE_KOMMENTAR, - EDIT_KOMMENTAR, - SEND_POSTFACH_MAIL, RESEND_POSTFACH_MAIL, diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/GrpcCommandServiceITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/GrpcCommandServiceITCase.java index d9e3cf0a8..f31271192 100644 --- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/GrpcCommandServiceITCase.java +++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/GrpcCommandServiceITCase.java @@ -7,8 +7,11 @@ import static org.mockito.Mockito.*; import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; import org.mapstruct.factory.Mappers; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -26,6 +29,7 @@ import de.ozgcloud.vorgang.clientattribute.ClientAttributeReadPermitted; import de.ozgcloud.vorgang.common.grpc.GrpcObjectMapper; import de.ozgcloud.vorgang.grpc.command.CommandServiceGrpc.CommandServiceBlockingStub; import de.ozgcloud.vorgang.grpc.command.GrpcCreateCommandRequest; +import de.ozgcloud.vorgang.grpc.command.GrpcFindCommandsRequest; import de.ozgcloud.vorgang.vorgang.Vorgang; import de.ozgcloud.vorgang.vorgang.VorgangTestFactory; import net.devh.boot.grpc.client.inject.GrpcClient; @@ -96,4 +100,23 @@ class GrpcCommandServiceITCase { }); } } + + @Nested + class TestLoadOutdatedOrders { + + @DisplayName("should load outdated orders") + @ParameterizedTest(name = "for order {0}") + @ValueSource(strings = { "CREATE_WIEDERVORLAGE", "EDIT_WIEDERVORLAGE", "WIEDERVORLAGE_ERLEDIGEN", "WIEDERVORLAGE_WIEDEREROEFFNEN", + "CREATE_KOMMENTAR", "EDIT_KOMMENTAR" }) + void shouldLoadCommands(String order) { + var vorgang = mongoOperations.save(VorgangTestFactory.createBuilder().id(null).build()); + var command = mongoOperations.save(CommandTestFactory.createBuilder().id(null).vorgangId(vorgang.getId()).order(order).build()); + + var response = + serviceBlockingStub.findCommands( + GrpcFindCommandsRequest.newBuilder().setVorgangId(vorgang.getId()).setOrderString(order).build()); + + assertThat(response.getCommandList()).hasSize(1); + } + } } -- GitLab