diff --git a/vorgang-manager-server/pom.xml b/vorgang-manager-server/pom.xml
index a818a41c24c5d50eaf6674b179b45e402e9460a8..cc2cb35378e083c702921fa8108a9b2bcc9e4309 100644
--- a/vorgang-manager-server/pom.xml
+++ b/vorgang-manager-server/pom.xml
@@ -58,7 +58,9 @@
<nachrichten-manager.version>2.14.0</nachrichten-manager.version>
<ozgcloud-starter.version>0.14.0-SNAPSHOT</ozgcloud-starter.version>
<notification-manager.version>2.12.0</notification-manager.version>
- <collaboration-manager.version>0.4.0</collaboration-manager.version>
+ <collaboration-manager.version>0.5.0-SNAPSHOT</collaboration-manager.version>
+ <archive-manager.version>0.1.0-SNAPSHOT</archive-manager.version>
+ <document-manager.version>1.1.0-SNAPSHOT</document-manager.version>
<zip.version>2.11.5</zip.version>
<jsoup.version>1.15.3</jsoup.version>
@@ -157,6 +159,11 @@
<artifactId>collaboration-manager-server</artifactId>
<version>${collaboration-manager.version}</version>
</dependency>
+ <dependency>
+ <groupId>de.ozgcloud.archive</groupId>
+ <artifactId>archive-manager-server</artifactId>
+ <version>${archive-manager.version}</version>
+ </dependency>
<!-- Spring -->
<dependency>
@@ -265,6 +272,12 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>de.ozgcloud.document</groupId>
+ <artifactId>document-manager-server</artifactId>
+ <version>${document-manager.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>de.ozgcloud.nachrichten</groupId>
<artifactId>nachrichten-manager-interface</artifactId>
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidITCase.java
index a376c15ff6b445389fec85a2e0c42e058d136174..90bf36e78e775f9bdd28cc97b125602749363529 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidITCase.java
@@ -42,6 +42,7 @@ import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.boot.test.mock.mockito.SpyBean;
@@ -62,6 +63,7 @@ import de.ozgcloud.command.CommandStatus;
import de.ozgcloud.common.test.DataITCase;
import de.ozgcloud.document.BescheidDocumentCreatedEvent;
import de.ozgcloud.document.Document;
+import de.ozgcloud.document.DocumentManagerConfiguration;
import de.ozgcloud.document.DocumentService;
import de.ozgcloud.document.common.attached_item.AttachedItemService;
import de.ozgcloud.nachrichten.postfach.PostfachAddressTestFactory;
@@ -110,7 +112,8 @@ class BescheidITCase {
@MockBean
private PostfachRemoteService postfachRemoteService;
@MockBean
- private OzgCloudUserProfileService userProfileService;
+ @Qualifier(DocumentManagerConfiguration.USER_PROFILE_SERVICE_NAME)
+ private OzgCloudUserProfileService documentUserProfileService;
@Captor
private ArgumentCaptor<BescheidDocumentCreatedEvent> bescheidDocumentCreatedEventCaptor;
@@ -120,7 +123,7 @@ class BescheidITCase {
mongoOperations.dropCollection(VorgangAttachedItem.COLLECTION_NAME);
mongoOperations.dropCollection(Vorgang.COLLECTION_NAME);
when(postfachRemoteService.getPostfachType()).thenReturn(ServiceKontoTestFactory.TYPE);
- when(userProfileService.getById(any())).thenReturn(OzgCloudUserProfile.builder().id(OzgCloudUserId.from(USER_ID)).build());
+ when(documentUserProfileService.getById(any())).thenReturn(OzgCloudUserProfile.builder().id(OzgCloudUserId.from(USER_ID)).build());
}
@Nested
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/TestConfiguration.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/TestConfiguration.java
index 4675116b7a4bebb163b2f8c8c5cdc76497b7b3ba..5cc668752eae4480fa6c9c8d4767483ab56db5a6 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/TestConfiguration.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/TestConfiguration.java
@@ -25,16 +25,21 @@ package de.ozgcloud.vorgang;
import static org.mockito.Mockito.*;
+import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.EnableAspectJAutoProxy;
import org.springframework.mail.javamail.JavaMailSender;
+import de.ozgcloud.archive.common.callcontext.CallContextProvider;
+
@Configuration
public class TestConfiguration {
+ @MockBean
+ private CallContextProvider callContextProvider;
+
@Bean
- public JavaMailSender mockMailSender() {
+ JavaMailSender mockMailSender() {
return mock(JavaMailSender.class);
}
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/CollaborationITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/CollaborationITCase.java
index 2a9d8659032b1ea7aa719ebab32e5f1570c3d361..f73ea147c5bebaf8475ec0fa9206f26780363d4b 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/CollaborationITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/CollaborationITCase.java
@@ -47,6 +47,7 @@ import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.data.mongodb.core.MongoOperations;
@@ -61,6 +62,7 @@ import com.thedeanda.lorem.LoremIpsum;
import de.ozgcloud.apilib.user.OzgCloudUserId;
import de.ozgcloud.apilib.user.OzgCloudUserProfile;
import de.ozgcloud.apilib.user.OzgCloudUserProfileService;
+import de.ozgcloud.collaboration.CollaborationManagerConfiguration;
import de.ozgcloud.collaboration.CollaborationRequest;
import de.ozgcloud.collaboration.CollaborationServiceGrpc.CollaborationServiceBlockingStub;
import de.ozgcloud.collaboration.GrpcGetFileContentRequest;
@@ -122,7 +124,8 @@ class CollaborationITCase {
private MongoOperations mongoOperations;
@MockBean
- private OzgCloudUserProfileService ozgCloudUserProfileService;
+ @Qualifier(CollaborationManagerConfiguration.OZG_CLOUD_USER_PROFILE_SERVICE_NAME)
+ private OzgCloudUserProfileService collaborationOzgCloudUserProfileService;
@MockBean
private PostfachRemoteService postfachRemoteService;
@@ -241,7 +244,7 @@ class CollaborationITCase {
@BeforeEach
void init() {
when(ozgCloudUserProfile.getId()).thenReturn(OzgCloudUserId.from(CommandTestFactory.CREATED_BY));
- when(ozgCloudUserProfileService.getById(any())).thenReturn(ozgCloudUserProfile);
+ when(collaborationOzgCloudUserProfileService.getById(any())).thenReturn(ozgCloudUserProfile);
}
@Test
@@ -289,7 +292,7 @@ class CollaborationITCase {
@BeforeEach
void init() {
when(ozgCloudUserProfile.getId()).thenReturn(OzgCloudUserId.from(CommandTestFactory.CREATED_BY));
- when(ozgCloudUserProfileService.getById(any())).thenReturn(ozgCloudUserProfile);
+ when(collaborationOzgCloudUserProfileService.getById(any())).thenReturn(ozgCloudUserProfile);
}
@Test