Ozg 7501 weiterleitung vorbereiten

vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingEventListener.java

@@ -97,16 +97,25 @@ public class ForwardingEventListener {
 
 	@EventListener(condition = IS_FORWARD_VORGANG_ORDER_CONDITION)
 	public void onForwardVorgangOrder(CommandCreatedEvent event) {
-		lockVorgangOnForwarding(event.getSource());
-		service.forward(forwardingRequestMapper.fromCommand(event.getSource()));
-		publisher.publishEvent(new VorgangLockedEvent(event.getSource()));
+		handleException(() -> handleForwardVorgangCommand(event.getSource()), event.getSource().getId());
+	}
+
+	void handleForwardVorgangCommand(Command command) {
+		lockVorgangOnForwarding(command);
+		service.forward(updateVorgangVersion(forwardingRequestMapper.fromCommand(command)));
+		publisher.publishEvent(new VorgangLockedEvent(command));
 	}
 
 	private void lockVorgangOnForwarding(Command command) {
-		var lock = lockMapper.fromCommand(command).toBuilder().reason("Vorgang is being forwarded").build();
+		var lock = lockMapper.fromCommand(command).toBuilder().reason("Vorgang was forwarded").build();
 		vorgangService.lockVorgang(lock, command.getVorgangId(), command.getRelationVersion());
 	}
 
+	ForwardingRequest updateVorgangVersion(ForwardingRequest request) {
+		var vorgang = vorgangService.getById(request.getVorgangId());
+		return request.toBuilder().version(vorgang.getVersion()).build();
+	}
+
 	private void handleException(Runnable runnable, String commandId) {
 		try {
 			runnable.run();