diff --git a/vorgang-manager-interface/src/main/protobuf/command.model.proto b/vorgang-manager-interface/src/main/protobuf/command.model.proto
index 5ad12bd936e633bd2af5fc5fa6334e3d523224cc..63faf593da27be4b65ffefd10aaf1ec42729dd23 100644
--- a/vorgang-manager-interface/src/main/protobuf/command.model.proto
+++ b/vorgang-manager-interface/src/main/protobuf/command.model.proto
@@ -32,44 +32,9 @@ option java_multiple_files = true;
option java_package = "de.ozgcloud.vorgang.grpc.command";
option java_outer_classname = "CommandModelProto";
-// DEPRECATED: don't use GrpcOrder enum directly
-enum GrpcOrder {
- UNDEFINED = 0;
- VORGANG_ANNEHMEN = 1;
- VORGANG_VERWERFEN = 2;
- VORGANG_ZURUECKHOLEN = 3;
- VORGANG_BEARBEITEN = 4;
- VORGANG_BESCHEIDEN = 5;
- VORGANG_ZURUECKSTELLEN = 6;
- VORGANG_ABSCHLIESSEN = 7;
- VORGANG_WIEDEREROEFFNEN = 8;
-
- ASSIGN_USER = 9;
-
- REDIRECT_VORGANG = 20;
- FORWARD_SUCCESSFULL = 21;
- FORWARD_FAILED = 22;
-
- CREATE_WIEDERVORLAGE = 30;
- EDIT_WIEDERVORLAGE = 31;
- WIEDERVORLAGE_ERLEDIGEN = 32;
- WIEDERVORLAGE_WIEDEREROEFFNEN = 33;
-
- CREATE_KOMMENTAR = 40;
- EDIT_KOMMENTAR = 41;
-
- SEND_POSTFACH_MAIL = 50;
- RESEND_POSTFACH_MAIL = 51;
-
- CREATE_ATTACHED_ITEM = 60;
- UPDATE_ATTACHED_ITEM = 61;
-}
-
message GrpcCreateCommandRequest {
de.ozgcloud.vorgang.grpc.command.GrpcCallContext callContext = 1;
string vorgangId = 2;
- // DEPRECATED: Use orderString instead
- GrpcOrder order = 3 [deprecated=true];
string relationId = 4;
int64 relationVersion = 5;
GrpcRedirectRequest redirectRequest = 12;
@@ -116,8 +81,6 @@ message GrpcCommand {
string status = 12;
string errorMessage=13;
string relationId = 14;
- // DEPRECATED: Use orderString instead
- GrpcOrder order = 15 [deprecated=true];
GrpcCommandBody body = 16;
de.ozgcloud.vorgang.common.GrpcObject bodyObj = 17;
GrpcRedirectRequest redirectRequest = 20;
@@ -150,8 +113,6 @@ message GrpcFindCommandsRequest {
de.ozgcloud.vorgang.grpc.command.GrpcCallContext context = 1;
string vorgangId = 2;
repeated string status = 3;
- // DEPRECATED: Use orderString instead
- GrpcOrder order = 4 [deprecated=true];
string orderString = 5;
}
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/GrpcCommandMapper.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/GrpcCommandMapper.java
index 10bd00606f284e34ec35d828868b2d7fdfcbb14c..054b38fb8b79c12fc3505e68963a5167c2c8f14b 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/GrpcCommandMapper.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/GrpcCommandMapper.java
@@ -23,7 +23,6 @@
*/
package de.ozgcloud.vorgang.command;
-import org.apache.commons.lang3.StringUtils;
import org.mapstruct.CollectionMappingStrategy;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
@@ -33,13 +32,16 @@ import org.mapstruct.NullValuePropertyMappingStrategy;
import de.ozgcloud.command.Command;
import de.ozgcloud.vorgang.common.grpc.GrpcObjectMapper;
import de.ozgcloud.vorgang.grpc.command.GrpcCommand;
-import de.ozgcloud.vorgang.grpc.command.GrpcOrder;
@Mapper(uses = { CommandBodyMapper.class, GrpcObjectMapper.class }, //
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE, //
nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS, //
collectionMappingStrategy = CollectionMappingStrategy.ADDER_PREFERRED)
interface GrpcCommandMapper {
+
+ @Mapping(target = "redirectRequest", ignore = true)
+ @Mapping(target = "orderStringBytes", ignore = true)
+ @Mapping(target = "createdResourceBytes", ignore = true)
@Mapping(target = "mergeFrom", ignore = true)
@Mapping(target = "clearField", ignore = true)
@Mapping(target = "clearOneof", ignore = true)
@@ -53,7 +55,6 @@ interface GrpcCommandMapper {
@Mapping(target = "errorMessageBytes", ignore = true)
@Mapping(target = "finishedAtBytes", ignore = true)
@Mapping(target = "idBytes", ignore = true)
- @Mapping(target = "orderValue", ignore = true)
@Mapping(target = "relationIdBytes", ignore = true)
@Mapping(target = "statusBytes", ignore = true)
@Mapping(target = "unknownFields", ignore = true)
@@ -61,19 +62,7 @@ interface GrpcCommandMapper {
@Mapping(target = "allFields", ignore = true)
@Mapping(target = "bodyObj", source = "bodyObject")
- @Mapping(target = "order", expression = "java(mapEnumOrder(vorgangCommand))")
@Mapping(target = "orderString", source = "order")
GrpcCommand toGrpc(Command vorgangCommand);
- default GrpcOrder mapEnumOrder(Command vorgangCommand) {
- if (StringUtils.isNoneBlank(vorgangCommand.getOrder())) {
- try {
- return GrpcOrder.valueOf(vorgangCommand.getOrder());
- } catch (IllegalArgumentException e) {
- return GrpcOrder.UNDEFINED;
- }
- }
- return GrpcOrder.UNDEFINED;
- }
-
}
\ No newline at end of file
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/GrpcCommandResponseMapper.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/GrpcCommandResponseMapper.java
index 3ddb6c690ca4e4541ccc238133fa8d7bc8ae3907..f87966e2b9fb4bda867b4ba2ff71e3076348be8b 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/GrpcCommandResponseMapper.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/GrpcCommandResponseMapper.java
@@ -30,7 +30,6 @@ import org.mapstruct.NullValueCheckStrategy;
import org.mapstruct.NullValuePropertyMappingStrategy;
import de.ozgcloud.vorgang.grpc.command.GrpcCommandResponse;
-import de.ozgcloud.vorgang.grpc.command.GrpcOrder;
@Mapper(uses = CommandBodyMapper.class, //
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE, //
@@ -50,11 +49,4 @@ public interface GrpcCommandResponseMapper {
@Mapping(target = "command.orderString", source = "command.order")
GrpcCommandResponse toGrpc(CommandResponse response);
- default GrpcOrder orderMapping(String order) {
- try {
- return GrpcOrder.valueOf(order);
- } catch (IllegalArgumentException e) {
- return GrpcOrder.UNDEFINED;
- }
- }
}
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/GrpcCommandService.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/GrpcCommandService.java
index 5a10d3113ab33358ca015fbb3c28673401fd27ad..ed57fa34334a6b88303783e7074e692c23156341 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/GrpcCommandService.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/GrpcCommandService.java
@@ -52,7 +52,6 @@ import de.ozgcloud.vorgang.grpc.command.GrpcFindCommandsRequest;
import de.ozgcloud.vorgang.grpc.command.GrpcGetCommandRequest;
import de.ozgcloud.vorgang.grpc.command.GrpcGetPendingCommandsRequest;
import de.ozgcloud.vorgang.grpc.command.GrpcGetPendingCommandsResponse;
-import de.ozgcloud.vorgang.grpc.command.GrpcOrder;
import de.ozgcloud.vorgang.grpc.command.GrpcRevokeCommandRequest;
import de.ozgcloud.vorgang.grpc.command.GrpcSetCommandExecutedRequest;
import io.grpc.stub.StreamObserver;
@@ -168,8 +167,7 @@ public class GrpcCommandService extends CommandServiceImplBase {
policyService.checkPermission(request.getVorgangId());
var statusList = request.getStatusList().stream().map(CommandStatus::valueOf).toList();
- var order = Optional.of(request.getOrderString()).filter(StringUtils::isNotBlank).flatMap(Order::fromString)
- .or(() -> fromGrpcOrder(request.getOrder()));
+ var order = Optional.of(request.getOrderString()).filter(StringUtils::isNotBlank).flatMap(Order::fromString);
var commands = commandService.findCommands(request.getVorgangId(), statusList, order);
@@ -177,10 +175,6 @@ public class GrpcCommandService extends CommandServiceImplBase {
responseObserver.onCompleted();
}
- Optional<Order> fromGrpcOrder(GrpcOrder grpcOrder) {
- return Optional.of(grpcOrder).filter(order -> order != GrpcOrder.UNDEFINED).map(order -> Order.valueOf(order.name()));
- }
-
private GrpcCommandsResponse buildCommandsResponse(Stream<Command> commands) {
return GrpcCommandsResponse.newBuilder().addAllCommand(commands.map(grpcCommandMapper::toGrpc).toList()).build();
}
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/GrpcCreateCommandRequestMapper.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/GrpcCreateCommandRequestMapper.java
index d6a41587f1b19c9ed0051ef9f234b7f54f976826..e182a394bdca2168a31acb3c4cacfbad03d35dc5 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/GrpcCreateCommandRequestMapper.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/GrpcCreateCommandRequestMapper.java
@@ -29,10 +29,8 @@ import org.apache.commons.lang3.StringUtils;
import org.mapstruct.CollectionMappingStrategy;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
-import org.mapstruct.MappingConstants;
import org.mapstruct.NullValueCheckStrategy;
import org.mapstruct.NullValuePropertyMappingStrategy;
-import org.mapstruct.ValueMapping;
import org.springframework.beans.factory.annotation.Autowired;
import de.ozgcloud.vorgang.callcontext.CallContext;
@@ -42,7 +40,6 @@ import de.ozgcloud.vorgang.common.grpc.GrpcObjectMapper;
import de.ozgcloud.vorgang.files.FileIdMapper;
import de.ozgcloud.vorgang.grpc.command.GrpcCallContext;
import de.ozgcloud.vorgang.grpc.command.GrpcCreateCommandRequest;
-import de.ozgcloud.vorgang.grpc.command.GrpcOrder;
import de.ozgcloud.vorgang.grpc.command.GrpcUser;
import de.ozgcloud.vorgang.vorgang.redirect.RedirectRequestMapper;
@@ -57,22 +54,10 @@ public abstract class GrpcCreateCommandRequestMapper {
@Mapping(target = "bodyObject", source = "bodyObj")
@Mapping(target = "body", source = "bodyList")
- @Mapping(target = "order", expression = "java(mapOrder(grpcRequest))")
+ @Mapping(target = "order", source = "orderString")
@Mapping(target = "callContext", expression = "java(fromHeaderOrCall(grpcRequest.getCallContext()))")
abstract CreateCommandRequest fromGrpc(GrpcCreateCommandRequest grpcRequest);
- String mapOrder(GrpcCreateCommandRequest request) {
- if (StringUtils.isBlank(request.getOrderString())) {
- return map(request.getOrder()).name();
- } else {
- return request.getOrderString();
- }
- }
-
- @ValueMapping(source = "UNRECOGNIZED", target = MappingConstants.NULL)
- @ValueMapping(source = "UNDEFINED", target = MappingConstants.NULL)
- abstract Order map(GrpcOrder grpcOrder);
-
CallContext fromHeaderOrCall(GrpcCallContext callContext) {
return userService.findUser().map(user -> CallContext.builder()
.client(user.getClientName())
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 e2a9bb3adccef3e829452e97ca367a0eff6926f0..7bdcc47b4fc18edd75dc50802ecc6a8c3a7ca980 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/CommandITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandITCase.java
index 781bc27e06e3d0cc611558b5441081ff51aa5b27..5a6b4241e64b294b555226694b24e3d72bc97281 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandITCase.java
@@ -53,7 +53,6 @@ import de.ozgcloud.vorgang.grpc.command.GrpcCreateCommandRequest;
import de.ozgcloud.vorgang.grpc.command.GrpcGetCommandRequest;
import de.ozgcloud.vorgang.grpc.command.GrpcGetPendingCommandsRequest;
import de.ozgcloud.vorgang.grpc.command.GrpcGetPendingCommandsResponse;
-import de.ozgcloud.vorgang.grpc.command.GrpcOrder;
import de.ozgcloud.vorgang.grpc.command.GrpcRevokeCommandRequest;
import de.ozgcloud.vorgang.vorgang.Vorgang;
import de.ozgcloud.vorgang.vorgang.Vorgang.Status;
@@ -99,7 +98,8 @@ class CommandITCase {
@Captor
private ArgumentCaptor<GrpcCommandResponse> responseCaptor;
- private GrpcCreateCommandRequest request = GrpcCreateCommandRequestTestFactory.create();
+ private GrpcCreateCommandRequest request = GrpcCreateCommandRequestTestFactory.createBuilder().setOrderString(Order.VORGANG_ANNEHMEN.name())
+ .build();
@BeforeEach
void persistVorgang() {
@@ -108,7 +108,7 @@ class CommandITCase {
persistedVorgang = mongoOperations.save(VorgangTestFactory.createBuilder().id(null).build());
request = GrpcCreateCommandRequestTestFactory.createBuilder().clearRelationId().setVorgangId(persistedVorgang.getId())
- .setRelationId(persistedVorgang.getId()).build();
+ .setOrderString(Order.VORGANG_ANNEHMEN.name()).setRelationId(persistedVorgang.getId()).build();
}
@Test
@@ -178,7 +178,7 @@ class CommandITCase {
void buildRequest() {
request = GrpcCreateCommandRequestTestFactory.createBuilder()
.setVorgangId(persistedVorgang.getId()).setRelationId(persistedVorgang.getId())
- .setOrder(GrpcOrder.SEND_POSTFACH_MAIL)
+ .setOrderString("SEND_POSTFACH_MAIL")
.clearBody().addBody(GrpcCommandBodyField.newBuilder().setName("mailBody").build())
.build();
}
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandResponseMapperTest.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandResponseMapperTest.java
index cf53e9e5517e104fd4fe03a89165563b598d5358..8efc1d4bc4fb0b3057106c2524733a65ecdd306f 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandResponseMapperTest.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandResponseMapperTest.java
@@ -23,7 +23,7 @@
*/
package de.ozgcloud.vorgang.command;
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.*;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
@@ -31,11 +31,10 @@ import org.mapstruct.factory.Mappers;
import de.ozgcloud.vorgang.grpc.command.GrpcCommandResponse;
import de.ozgcloud.vorgang.grpc.command.GrpcCommandResponse.GrpcResponseCode;
-import de.ozgcloud.vorgang.grpc.command.GrpcOrder;
class CommandResponseMapperTest {
- private GrpcCommandResponseMapper mapper = Mappers.getMapper(GrpcCommandResponseMapper.class);
+ private final GrpcCommandResponseMapper mapper = Mappers.getMapper(GrpcCommandResponseMapper.class);
@Nested
class TestCommandResponseToGrpcCommandResponse {
@@ -132,15 +131,5 @@ class CommandResponseMapperTest {
assertThat(grpcResponse.getCommand().getRelationId()).isEqualTo(CommandTestFactory.RELATION_ID);
}
-
- @Test
- void shouldMapCommandOrder() {
-
- CommandResponse response = CommandResponseTestFactory.create();
-
- GrpcCommandResponse grpcResponse = mapper.toGrpc(response);
-
- assertThat(grpcResponse.getCommand().getOrder()).isEqualTo(GrpcOrder.VORGANG_ANNEHMEN);
- }
}
}
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/GrpcCommandMapperTest.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/GrpcCommandMapperTest.java
index ffba1a22c9dc100c68e5249d55bb2e5bc357d470..84b21644cabcb77cbd215aa4ec96c43a219c7028 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/GrpcCommandMapperTest.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/GrpcCommandMapperTest.java
@@ -30,11 +30,10 @@ import org.junit.jupiter.api.Test;
import org.mapstruct.factory.Mappers;
import de.ozgcloud.vorgang.grpc.command.GrpcCommand;
-import de.ozgcloud.vorgang.grpc.command.GrpcOrder;
class GrpcCommandMapperTest {
- private GrpcCommandMapper mapper = Mappers.getMapper(GrpcCommandMapper.class);
+ private final GrpcCommandMapper mapper = Mappers.getMapper(GrpcCommandMapper.class);
@Nested
class TestCommandToGrpcCommand {
@@ -48,16 +47,7 @@ class GrpcCommandMapperTest {
assertThat(grpcCommand.getCreatedBy()).isEqualTo(CommandTestFactory.CREATED_BY);
assertThat(grpcCommand.getStatus()).isEqualTo(CommandTestFactory.STATUS.toString());
assertThat(grpcCommand.getRelationId()).isEqualTo(CommandTestFactory.RELATION_ID);
- assertThat(grpcCommand.getOrder()).isNotNull();
- }
-
- @Test
- void shouldMapNonEnumOrders() {
- var orderString = "non-enum";
- var grpcCommand = mapper.toGrpc(CommandTestFactory.createBuilder().order(orderString).build());
-
- assertThat(grpcCommand.getOrder()).isEqualTo(GrpcOrder.UNDEFINED);
- assertThat(grpcCommand.getOrderString()).isEqualTo(orderString);
+ assertThat(grpcCommand.getOrderString()).hasToString(CommandTestFactory.ORDER.name());
}
}
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 cc5ea45edaae38fcc9a9f72c772c57a109198685..f3127119272c881f1c3197ca6115bc100f376691 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,7 +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.GrpcOrder;
+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;
@@ -49,7 +52,7 @@ class GrpcCommandServiceITCase {
@MockBean
private ClientAttributeReadPermitted readIsPermitted;
- private GrpcObjectMapper grpcObjectMapper = Mappers.getMapper(GrpcObjectMapper.class);
+ private final GrpcObjectMapper grpcObjectMapper = Mappers.getMapper(GrpcObjectMapper.class);
@Nested
class TestCreateCommand {
@@ -66,7 +69,7 @@ class GrpcCommandServiceITCase {
request = GrpcCreateCommandRequestTestFactory.createBuilder()
.setVorgangId(vorgang.getId()).setRelationId(vorgang.getId())
- .setOrder(GrpcOrder.CREATE_ATTACHED_ITEM)
+ .setOrderString("CREATE_ATTACHED_ITEM")
.setBodyObj(grpcObjectMapper.fromMap(VorgangAttachedItemTestFactory.asMap())).build();
when(readIsPermitted.test(any())).thenReturn(true);
@@ -97,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);
+ }
+ }
}
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/GrpcCommandServiceTest.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/GrpcCommandServiceTest.java
index ce32aff4a08d9eb73a7d6effaf24dae1664857e1..bdba2fe83bcb6ec2fa1684cf80f705eacd069250 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/GrpcCommandServiceTest.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/GrpcCommandServiceTest.java
@@ -61,7 +61,6 @@ import de.ozgcloud.vorgang.grpc.command.GrpcFindCommandsRequest;
import de.ozgcloud.vorgang.grpc.command.GrpcGetCommandRequest;
import de.ozgcloud.vorgang.grpc.command.GrpcGetPendingCommandsRequest;
import de.ozgcloud.vorgang.grpc.command.GrpcGetPendingCommandsResponse;
-import de.ozgcloud.vorgang.grpc.command.GrpcOrder;
import de.ozgcloud.vorgang.grpc.command.GrpcRevokeCommandRequest;
import de.ozgcloud.vorgang.grpc.command.GrpcSetCommandExecutedRequest;
import de.ozgcloud.vorgang.vorgang.VorgangTestFactory;
@@ -259,7 +258,7 @@ class GrpcCommandServiceTest {
@Nested
class TestProceedRevokeCommand {
- private PersistedCommand command = CommandTestFactory.create();
+ private final PersistedCommand command = CommandTestFactory.create();
@BeforeEach
void init() {
@@ -389,16 +388,9 @@ class GrpcCommandServiceTest {
verify(commandService).findCommands(VorgangTestFactory.ID, Collections.singletonList(CommandStatus.FINISHED), Optional.empty());
}
- @Test
- void shouldCallServiceWithOrder() {
- callFindCommands(requestBuilder.setOrder(GrpcOrder.VORGANG_ABSCHLIESSEN).build());
-
- verify(commandService).findCommands(VorgangTestFactory.ID, Collections.emptyList(), Optional.of(Order.VORGANG_ABSCHLIESSEN));
- }
-
@Test
void shouldPreferOrderString() {
- callFindCommands(requestBuilder.setOrder(GrpcOrder.UNDEFINED).setOrderString(Order.VORGANG_ABSCHLIESSEN.name()).build());
+ callFindCommands(requestBuilder.setOrderString(Order.VORGANG_ABSCHLIESSEN.name()).build());
verify(commandService).findCommands(VorgangTestFactory.ID, Collections.emptyList(), Optional.of(Order.VORGANG_ABSCHLIESSEN));
}
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/GrpcCreateCommandRequestMapperTest.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/GrpcCreateCommandRequestMapperTest.java
index f022faae73e200737bf67157e32bf86959b5702b..3e96fc0d0b05dee7f388a1b469d8046b01d54343 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/GrpcCreateCommandRequestMapperTest.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/GrpcCreateCommandRequestMapperTest.java
@@ -106,26 +106,14 @@ class GrpcCreateCommandRequestMapperTest {
assertThat(request.getRelationId()).isEqualTo(GrpcCreateCommandRequestTestFactory.RELATION_ID);
}
- @Nested
- class shouldMapOrder {
-
- @Test
- void fromOrderStringField() {
- GrpcCreateCommandRequest grpcRequest = GrpcCreateCommandRequestTestFactory.createBuilder().clearOrder().build();
-
- CreateCommandRequest request = mapper.fromGrpc(grpcRequest);
-
- assertThat(request.getOrder()).isEqualTo(GrpcCreateCommandRequestTestFactory.ORDER.name());
- }
-
- @Test
- void fromOrderField() {
- GrpcCreateCommandRequest grpcRequest = GrpcCreateCommandRequestTestFactory.createBuilder().clearOrderString().build();
+ @Test
+ void fromOrderStringField() {
+ GrpcCreateCommandRequest grpcRequest = GrpcCreateCommandRequestTestFactory.create();
- CreateCommandRequest request = mapper.fromGrpc(grpcRequest);
+ CreateCommandRequest request = mapper.fromGrpc(grpcRequest);
- assertThat(request.getOrder()).isEqualTo(GrpcCreateCommandRequestTestFactory.ORDER.name());
- }
+ assertThat(request.getOrder()).isEqualTo(GrpcCreateCommandRequestTestFactory.ORDER);
}
+
}
}
\ No newline at end of file
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/GrpcCreateCommandRequestTestFactory.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/GrpcCreateCommandRequestTestFactory.java
index b72491846bd2fc4353071f65db417ed4119f0097..b9659b19275f8837f789dd68aa79a98b08f147e5 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/GrpcCreateCommandRequestTestFactory.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/GrpcCreateCommandRequestTestFactory.java
@@ -25,14 +25,13 @@ package de.ozgcloud.vorgang.command;
import de.ozgcloud.vorgang.grpc.command.GrpcCallContext;
import de.ozgcloud.vorgang.grpc.command.GrpcCreateCommandRequest;
-import de.ozgcloud.vorgang.grpc.command.GrpcOrder;
import de.ozgcloud.vorgang.vorgang.VorgangTestFactory;
public class GrpcCreateCommandRequestTestFactory {
private static final GrpcCallContext CALLCONTEXT = GrpcCallContextTestFactory.create();
static final String RELATION_ID = CommandTestFactory.RELATION_ID;
- static final GrpcOrder ORDER = GrpcOrder.VORGANG_ANNEHMEN;
+ static final String ORDER = "ANY_ORDER";
static final long RELATION_VERSION = VorgangTestFactory.VERSION;
public static GrpcCreateCommandRequest create() {
@@ -43,8 +42,7 @@ public class GrpcCreateCommandRequestTestFactory {
return GrpcCreateCommandRequest.newBuilder()
.setCallContext(CALLCONTEXT)
.setRelationId(RELATION_ID)
- .setOrder(ORDER)
- .setOrderString(ORDER.name())
+ .setOrderString(ORDER)
.setRelationVersion(RELATION_VERSION)
.setVorgangId(VorgangTestFactory.ID);
}
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardVorgangITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardVorgangITCase.java
index 51637df98ba492f515656a27b27888a2dd15f3e0..acc5763a8dde97a1b6da72ce4188756fe9829fb3 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardVorgangITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardVorgangITCase.java
@@ -61,7 +61,6 @@ import de.ozgcloud.vorgang.files.GridFsTestFactory;
import de.ozgcloud.vorgang.files.OzgFileTestFactory;
import de.ozgcloud.vorgang.grpc.command.GrpcCommandResponse;
import de.ozgcloud.vorgang.grpc.command.GrpcCreateCommandRequest;
-import de.ozgcloud.vorgang.grpc.command.GrpcOrder;
import de.ozgcloud.vorgang.grpc.command.GrpcRedirectRequest;
import de.ozgcloud.vorgang.vorgang.EingangTestFactory;
import de.ozgcloud.vorgang.vorgang.IncomingFileGroupTestFactory;
@@ -205,7 +204,7 @@ class ForwardVorgangITCase {
private GrpcCreateCommandRequest buildCommandRequest() {
return GrpcCreateCommandRequestTestFactory.createBuilder()
.clearOrderString()
- .clearOrder().setOrder(GrpcOrder.REDIRECT_VORGANG)
+ .setOrderString("REDIRECT_VORGANG")
.clearRelationId().setRelationId(VorgangTestFactory.ID)
.setRelationVersion(VorgangTestFactory.VERSION)
.setRedirectRequest(buildRedirectRequest())