prj-42 fix after run test

bescheid-manager/src/main/java/de/ozgcloud/bescheid/Bescheid.java

@@ -8,7 +8,7 @@ import lombok.Builder;
 import lombok.Getter;
 import lombok.With;
 
-@Builder
+@Builder(toBuilder = true)
 @Getter
 public class Bescheid {
 
@@ -21,7 +21,6 @@ public class Bescheid {
 	private File bescheidFile;
 	@With
 	private FileId bescheidFileId;
-
 	private String contentType;
 	private long size;
 

bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidCreatedEvent.java

+package de.ozgcloud.bescheid;
+
+import de.itvsh.ozg.pluto.command.Command;
+import de.itvsh.ozg.pluto.command.CommandExecutedEvent;
+
+class BescheidCreatedEvent extends CommandExecutedEvent {
+
+	public BescheidCreatedEvent(Command command) {
+		super(command.getId());
+	}
+}

bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidEventListener.java

@@ -58,6 +58,7 @@ class BescheidEventListener {
 		try {
 			prevContext = userService.startSecurityContext(command);
 			doCreateBescheidBiz(command);
+			eventPublisher.publishEvent(new BescheidCreatedEvent(command));
 		} catch (Exception e) {
 			LOG.error("Error on executing Create Bescheid Command. Command failed.", e);
 			eventPublisher.publishEvent(new CommandFailedEvent(command.getId(), buildErrorMessage(e)));
@@ -79,7 +80,7 @@ class BescheidEventListener {
 		var eventBody = command.getBodyObject();
 		var builder = BescheidRequest.builder();
 
-		Optional.ofNullable(eventBody.get(VORGANG_ID_BODYKEY)).map(String.class::cast).map(VorgangId::from).ifPresent(builder::vorgangId);
+		builder.vorgangId(VorgangId.from(command.getVorgangId()));
 		Optional.ofNullable(eventBody.get(BESCHEID_VOM_BODYKEY)).map(LocalDate.class::cast).ifPresent(builder::bescheidVom);
 		Optional.ofNullable(eventBody.get(GENEHMIGT_BODYKEY)).map(Boolean.class::cast).ifPresent(builder::genehmigt);
 		builder.createFor(UserId.from(command.getCreatedBy()));

bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidService.java

@@ -16,7 +16,9 @@ class BescheidService {
 	public Bescheid createBescheid(BescheidRequest request) {
 		var vorgang = vorgangService.getById(request.getVorgangId());
 
-		return remoteService.create(request, vorgang);
+		var bescheid = remoteService.create(request, vorgang);
+
+		return bescheid.toBuilder().vorgangId(request.getVorgangId()).build();
 	}
 
 }

bescheid-manager/src/main/java/de/ozgcloud/bescheid/binaryfile/BinaryFileRemoteService.java

@@ -25,6 +25,7 @@ import de.itvsh.ozg.pluto.grpc.command.GrpcCallContext;
 import de.ozgcloud.bescheid.Bescheid;
 import io.grpc.stub.CallStreamObserver;
 import io.grpc.stub.StreamObserver;
+import lombok.NonNull;
 import net.devh.boot.grpc.client.inject.GrpcClient;
 
 @Service
@@ -36,7 +37,7 @@ class BinaryFileRemoteService {
 	@GrpcClient("vorgang-manager")
 	private BinaryFileServiceStub binaryFileRemoteStub;
 
-	FileId uploadBescheidFile(Bescheid bescheid) {
+	FileId uploadBescheidFile(@NonNull Bescheid bescheid) {
 		try (var in = openFile(bescheid.getBescheidFile())) {
 			var resultFuture = GrpcFileUploadUtils.createSender(this::buildChunkRequest, in,
 					this::buildCallStreamObserver)

bescheid-manager/src/main/java/de/ozgcloud/bescheid/common/callcontext/CurrentUserService.java

@@ -37,7 +37,7 @@ import org.springframework.stereotype.Service;
 
 import de.itvsh.ozg.pluto.command.Command;
 
-@Service
+@Service("bescheid_currentUserService")
 public class CurrentUserService {
 
 	@Autowired

bescheid-manager/src/main/java/de/ozgcloud/bescheid/dummy/DummyBescheidRemoteService.java

@@ -22,6 +22,7 @@ class DummyBescheidRemoteService implements BescheidRemoteService {
 
 		return Bescheid.builder()
 				.bescheidFile(file)
+				.bescheidFileName(DUMMY_BESCHEID_FILE_NAME)
 				.contentType(DUMMY_BESCHEID_CONTENT_TYPE)
 				.size(file.length())
 				.createdBy(request.getCreateFor())

bescheid-manager/src/main/java/de/ozgcloud/bescheid/vorgang/VorgangMapper.java → bescheid-manager/src/main/java/de/ozgcloud/bescheid/vorgang/BescheidVorgangMapper.java

@@ -15,7 +15,7 @@ import de.itvsh.ozg.pluto.vorgang.GrpcVorgangWithEingang;
 
 @Mapper(unmappedTargetPolicy = ReportingPolicy.ERROR, //
 		uses = FormDataEntryMapper.class)
-interface VorgangMapper {
+interface BescheidVorgangMapper {
 
 	@Mapping(target = "vorgangNummer", source = "nummer")
 	Vorgang mapVorgang(GrpcVorgangWithEingang vorgang);

bescheid-manager/src/main/java/de/ozgcloud/bescheid/vorgang/VorgangRemoteService.java

@@ -8,13 +8,13 @@ import de.itvsh.ozg.pluto.vorgang.VorgangServiceGrpc.VorgangServiceBlockingStub;
 import lombok.NonNull;
 import net.devh.boot.grpc.client.inject.GrpcClient;
 
-@Service
+@Service("bescheid_VorgangRemoteService")
 class VorgangRemoteService {
 
-	@GrpcClient("pluto")
+	@GrpcClient("vorgang-manager")
 	private VorgangServiceBlockingStub vorgangServiceStub;
 	@Autowired
-	private VorgangMapper mapper;
+	private BescheidVorgangMapper mapper;
 
 	public Vorgang getById(@NonNull VorgangId vorgangId) {
 		var request = GrpcFindVorgangWithEingangRequest.newBuilder().setId(vorgangId.toString()).build();

bescheid-manager/src/main/java/de/ozgcloud/bescheid/vorgang/VorgangService.java

@@ -3,13 +3,15 @@ package de.ozgcloud.bescheid.vorgang;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-@Service
+import lombok.NonNull;
+
+@Service("bescheid_VorgangService")
 public class VorgangService {
 
 	@Autowired
 	public VorgangRemoteService remoteService;
 
-	public Vorgang getById(VorgangId id) {
+	public Vorgang getById(@NonNull VorgangId id) {
 		return remoteService.getById(id);
 	}
 }

bescheid-manager/src/test/java/de/ozgcloud/bescheid/vorgang/VorgangMapperTest.java → bescheid-manager/src/test/java/de/ozgcloud/bescheid/vorgang/BescheidVorgangMapperTest.java

@@ -6,10 +6,10 @@ import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 
-class VorgangMapperTest {
+class BescheidVorgangMapperTest {
 
 	@InjectMocks
-	private VorgangMapperImpl mapper;
+	private BescheidVorgangMapperImpl mapper;
 
 	@Nested
 	class TestMapVorgang {

bescheid-manager/src/test/java/de/ozgcloud/bescheid/vorgang/VorgangRemoteServiceTest.java

@@ -25,7 +25,7 @@ class VorgangRemoteServiceTest {
 	@Mock
 	private VorgangServiceBlockingStub serviceStub;
 	@Mock
-	private VorgangMapper mapper;
+	private BescheidVorgangMapper mapper;
 
 	@Nested
 	class TestGetById {

pluto-server/pom.xml

@@ -24,7 +24,9 @@
     unter der Lizenz sind dem Lizenztext zu entnehmen.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
@@ -84,6 +86,12 @@
 			<version>${project.version}</version>
 			<scope>runtime</scope>
 		</dependency>
+		<dependency>
+			<groupId>de.ozgcloud.bescheid</groupId>
+			<artifactId>bescheid-manager</artifactId>
+			<version>1.0.0-SNAPSHOT</version>
+			<scope>runtime</scope>
+		</dependency>
 
 		<dependency>
 			<groupId>de.itvsh.kop.zufi</groupId>
@@ -95,7 +103,8 @@
 			<groupId>de.itvsh.kop.user</groupId>
 			<artifactId>user-manager-interface</artifactId>
 			<version>${user-manager-interface.version}</version>
-			<!-- TODO Nur proto sources verwenden um quarkus Abhaenigkeiten zu vermeiden. Ebenso im notification-manager -->
+			<!-- TODO Nur proto sources verwenden um quarkus Abhaenigkeiten zu
+			vermeiden. Ebenso im notification-manager -->
 			<exclusions>
 				<exclusion>
 					<groupId>io.grpc</groupId>

pluto-server/src/main/java/de/itvsh/ozg/pluto/PlutoServerApplication.java

@@ -42,7 +42,7 @@ import org.springframework.security.task.DelegatingSecurityContextAsyncTaskExecu
 
 import io.mongock.runner.springboot.EnableMongock;
 
-@SpringBootApplication(scanBasePackages = "de.itvsh.*")
+@SpringBootApplication(scanBasePackages = { "de.itvsh.*", "de.ozgcloud" })
 @EnableAsync
 @EnableScheduling
 @EnableAspectJAutoProxy(proxyTargetClass = true)

pluto-server/src/main/resources/application.yml

@@ -24,11 +24,17 @@ grpc:
     pluto:
       address: self:self
       negotiationType: PLAINTEXT
+    vorgang-manager:
+      address: self:self
+      negotiationType: PLAINTEXT
     user-manager:
       negotiationType: TLS  
     email:
       address: self:self
       negotiationType: PLAINTEXT
+    nachrichten-manager:
+      address: self:self
+      negotiationType: PLAINTEXT
 
 pluto:
   redirect: