diff --git a/vorgang-manager-interface/src/main/protobuf/vorgang.model.proto b/vorgang-manager-interface/src/main/protobuf/vorgang.model.proto
index 5f9efe1e4c9399cf8eecada3d7a23b1e89909f02..6cb340282fed34aa603ea49cde9b6bc5453467cd 100644
--- a/vorgang-manager-interface/src/main/protobuf/vorgang.model.proto
+++ b/vorgang-manager-interface/src/main/protobuf/vorgang.model.proto
@@ -213,7 +213,7 @@ message GrpcCreateCollaborationVorgangRequest {
message GrpcCreateCollaborationRequestData {
string vorgangId = 1;
int32 collaborationLevel = 2;
- string zustaendigeStelle = 3;
+ string organisationEinheitId = 3;
}
message GrpcCreateCollaborationVorgangResponse {
diff --git a/vorgang-manager-server/pom.xml b/vorgang-manager-server/pom.xml
index fcd302bb295ecaa21607af955270490beb3122b3..6856303d2841b697fe029a51022eff38c724d565 100644
--- a/vorgang-manager-server/pom.xml
+++ b/vorgang-manager-server/pom.xml
@@ -58,7 +58,7 @@
<nachrichten-manager.version>2.15.0</nachrichten-manager.version>
<api-lib.version>0.15.0</api-lib.version>
<notification-manager.version>2.14.0-SNAPSHOT</notification-manager.version>
- <collaboration-manager.version>0.6.0</collaboration-manager.version>
+ <collaboration-manager.version>0.7.0-SNAPSHOT</collaboration-manager.version>
<archive-manager.version>0.1.0</archive-manager.version>
<document-manager.version>1.1.0</document-manager.version>
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/collaboration/CollaborationService.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/collaboration/CollaborationService.java
index 763856b36699f916425c90f13b512ffae5982bce..71742302527d0f51ffd2ac4205780dfef32996a2 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/collaboration/CollaborationService.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/collaboration/CollaborationService.java
@@ -59,7 +59,7 @@ public class CollaborationService {
VorgangHead getHeader(CreateCollaborationVorgangRequest request) {
return request.getVorgang().getHeader().toBuilder()
.collaborationLevel(request.getCollaborationLevel())
- .organisationsEinheitId(request.getZustaendigeStelle())
+ .organisationsEinheitId(request.getOrganisationsEinheitId())
.build();
}
}
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/collaboration/CreateCollaborationVorgangRequest.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/collaboration/CreateCollaborationVorgangRequest.java
index 44f61fed6d4ea63527907176ab79f790fdc534d0..a5fc2f862ab9333ca9ea6afb341908ad2c0691d7 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/collaboration/CreateCollaborationVorgangRequest.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/collaboration/CreateCollaborationVorgangRequest.java
@@ -33,5 +33,5 @@ public class CreateCollaborationVorgangRequest {
private Vorgang vorgang;
private int collaborationLevel;
- private String zustaendigeStelle;
+ private String organisationsEinheitId;
}
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/collaboration/CreateCollaborationVorgangRequestMapper.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/collaboration/CreateCollaborationVorgangRequestMapper.java
index e7d98214f47767f8e504319062e735e1f1542162..413ae397c7278b3351fba46dafb843e2bc1abd32 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/collaboration/CreateCollaborationVorgangRequestMapper.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/collaboration/CreateCollaborationVorgangRequestMapper.java
@@ -33,5 +33,6 @@ import de.ozgcloud.vorgang.vorgang.GrpcCreateCollaborationRequestData;
public interface CreateCollaborationVorgangRequestMapper {
@Mapping(target = "vorgang", ignore = true)
+ @Mapping(target = "organisationsEinheitId", source = "organisationEinheitId")
CreateCollaborationVorgangRequest mapFrom(GrpcCreateCollaborationRequestData grpcCollaborationRequest);
}
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 d357defbf51b46d208695ecc316a18453f277517..7285590660bcc4f959b39c081ee093131be46848 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
@@ -24,6 +24,7 @@
package de.ozgcloud.vorgang.collaboration;
import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.InstanceOfAssertFactories.*;
import static org.awaitility.Awaitility.*;
import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.ArgumentMatchers.*;
@@ -69,6 +70,8 @@ import de.ozgcloud.collaboration.CollaborationRequest;
import de.ozgcloud.collaboration.CollaborationService;
import de.ozgcloud.collaboration.CollaborationServiceGrpc.CollaborationServiceBlockingStub;
import de.ozgcloud.collaboration.GrpcGetFileContentRequest;
+import de.ozgcloud.collaboration.fachstelle.Fachstelle.FachstelleType;
+import de.ozgcloud.collaboration.fachstelle.FachstelleService;
import de.ozgcloud.collaboration.request.CollaborationRequestId;
import de.ozgcloud.collaboration.request.CollaborationRequestServiceGrpc.CollaborationRequestServiceBlockingStub;
import de.ozgcloud.collaboration.request.GrpcFindRequestsRequest;
@@ -116,7 +119,6 @@ class CollaborationITCase {
private static final String FIELD_COLLABORATION_VORGANG_ID = "collaborationVorgangId";
private static final String TITEL = "Collaboration Vorgang";
private static final String BESCHREIBUNG = "Beschreibung der Anfrage";
- private static final String MUK_POSTFACH_ID = UUID.randomUUID().toString();
@Autowired
private CommandService commandService;
@@ -136,6 +138,8 @@ class CollaborationITCase {
private OzgCloudUserProfile ozgCloudUserProfile;
@MockBean
private OzgCloudClientAttributeMapper clientAttributeMapper;
+ @MockBean
+ private FachstelleService fachstelleService;
private String vorgangId;
@@ -216,20 +220,6 @@ class CollaborationITCase {
}
}
- private CreateCommandRequest buildCreateCollaborationVorgangCommand(String vorgangId, int collaborationLevel) {
- return CreateCommandRequest.builder()
- .callContext(CallContext.builder().client("test").build())
- .vorgangId(vorgangId)
- .relationId(vorgangId)
- .order("CREATE_COLLABORATION_REQUEST")
- .bodyObject(Map.of(
- "titel", TITEL,
- "beschreibung", BESCHREIBUNG,
- "collaborationLevel", collaborationLevel,
- "zustaendigeStelle", MUK_POSTFACH_ID))
- .build();
- }
-
private List<VorgangAttachedItem> loadCollaborationRequest(String vorgangId) {
var query = new Query(new Criteria().andOperator(
Criteria.where(VorgangAttachedItem.FIELDNAME_VORGANG_ID).is(vorgangId),
@@ -245,17 +235,18 @@ class CollaborationITCase {
@Nested
class TestCreateCollaborationVorgang {
+ public static final String ORGANISATIONS_EINHEIT_ID = UUID.randomUUID().toString();
@BeforeEach
void init() {
when(ozgCloudUserProfile.getId()).thenReturn(OzgCloudUserId.from(CommandTestFactory.CREATED_BY));
when(collaborationOzgCloudUserProfileService.getById(any())).thenReturn(ozgCloudUserProfile);
+ when(fachstelleService.getOrganisationEinheit(FachstelleTestFactory.TECHNICAL_ID)).thenReturn(FachstelleTestFactory.create());
}
@Test
void shouldSetCollaborationVorgangId() {
- var command = commandService.createCommand(
- buildCreateCollaborationVorgangCommand(vorgangId, CreateCollaborationVorgangRequestTestFactory.COLLABORATION_LEVEL));
+ var command = createCommand();
waitUntilCommandHasStatus(command.getId(), CommandStatus.FINISHED);
@@ -266,8 +257,7 @@ class CollaborationITCase {
@Test
void shouldCreateCollaborationVorgang() {
- var command = commandService.createCommand(
- buildCreateCollaborationVorgangCommand(vorgangId, CreateCollaborationVorgangRequestTestFactory.COLLABORATION_LEVEL));
+ var command = createCommand();
waitUntilCommandHasStatus(command.getId(), CommandStatus.FINISHED);
@@ -275,10 +265,16 @@ class CollaborationITCase {
assertThat(collaborationVorgang.getHeader()).extracting(VorgangHead::getCollaborationLevel)
.isEqualTo(CreateCollaborationVorgangRequestTestFactory.COLLABORATION_LEVEL);
assertThat(collaborationVorgang.getHeader()).extracting(VorgangHead::getOrganisationsEinheitId)
- .isEqualTo(MUK_POSTFACH_ID);
+ .isEqualTo(FachstelleTestFactory.SUBJECT_ID);
assertThat(collaborationVorgang.getClientAttributes()).isEmpty();
}
+ private Command createCommand() {
+ return commandService.createCommand(
+ buildCreateCollaborationVorgangCommand(vorgangId,
+ CreateCollaborationVorgangRequestTestFactory.COLLABORATION_LEVEL, FachstelleTestFactory.TECHNICAL_ID));
+ }
+
private Vorgang loadCollaborationVorgang(String sourceVorgangId) {
var collaborationVorgangId = loadCollaborationRequest(sourceVorgangId).getFirst().getItem().get(FIELD_COLLABORATION_VORGANG_ID);
return mongoOperations.findById(collaborationVorgangId, Vorgang.class);
@@ -291,6 +287,11 @@ class CollaborationITCase {
private static final int COLLABORATION_LEVEL = 4;
+ @BeforeEach
+ void mockFachstelleService() {
+ when(fachstelleService.getExterneFachstelle(FachstelleTestFactory.TECHNICAL_ID)).thenReturn(FachstelleTestFactory.create());
+ }
+
@Nested
class TestSuccessfully {
@Captor
@@ -304,7 +305,7 @@ class CollaborationITCase {
@Test
void shouldCreateCollaborationRequest() {
- var command = commandService.createCommand(buildCreateCollaborationVorgangCommand(vorgangId, COLLABORATION_LEVEL));
+ var command = createCommand();
waitUntilCommandHasStatus(command.getId(), CommandStatus.FINISHED);
@@ -315,19 +316,19 @@ class CollaborationITCase {
@Test
void shouldSendPostfachNachricht() {
- var command = commandService.createCommand(buildCreateCollaborationVorgangCommand(vorgangId, COLLABORATION_LEVEL));
+ var command = createCommand();
waitUntilCommandHasStatus(command.getId(), CommandStatus.FINISHED);
verify(postfachRemoteService).sendMessage(postfachNachrichtCaptor.capture());
assertThat(postfachNachrichtCaptor.getValue().getPostfachAddress()).extracting(PostfachAddress::getIdentifier)
- .hasToString(MUK_POSTFACH_ID);
+ .hasToString(FachstelleTestFactory.SUBJECT_ID);
}
@Test
void shouldDeleteCollaborationRequest() {
doThrow(TechnicalException.class).when(postfachRemoteService).sendMessage(any());
- var command = commandService.createCommand(buildCreateCollaborationVorgangCommand(vorgangId, COLLABORATION_LEVEL));
+ var command = createCommand();
waitUntilCommandHasStatus(command.getId(), CommandStatus.ERROR);
@@ -340,13 +341,32 @@ class CollaborationITCase {
@Test
void shouldFailOnMissingFachstelle() {
ReflectionTestUtils.setField(collaborationService, "urlProvider", Optional.empty());
- var command = commandService.createCommand(buildCreateCollaborationVorgangCommand(vorgangId, COLLABORATION_LEVEL));
+ var command = createCommand();
waitUntilCommandHasStatus(command.getId(), CommandStatus.ERROR);
command = mongoOperations.findById(command.getId(), Command.class);
assertThat(command.getErrorMessage()).contains("Fachstelle not configured.");
}
+
+ private Command createCommand() {
+ return commandService
+ .createCommand(buildCreateCollaborationVorgangCommand(vorgangId, COLLABORATION_LEVEL, FachstelleTestFactory.TECHNICAL_ID));
+ }
+ }
+
+ private CreateCommandRequest buildCreateCollaborationVorgangCommand(String vorgangId, int collaborationLevel, String zustaendigeStelleId) {
+ return CreateCommandRequest.builder()
+ .callContext(CallContext.builder().client("test").build())
+ .vorgangId(vorgangId)
+ .relationId(vorgangId)
+ .order("CREATE_COLLABORATION_REQUEST")
+ .bodyObject(Map.of(
+ "titel", TITEL,
+ "beschreibung", BESCHREIBUNG,
+ "collaborationLevel", collaborationLevel,
+ "zustaendigeStelle", zustaendigeStelleId))
+ .build();
}
@DisplayName("Collaboration requests")
@@ -361,9 +381,12 @@ class CollaborationITCase {
public static final String TITEL = LoremIpsum.getInstance().getWords(5);
public static final String BESCHREIBUNG = LoremIpsum.getInstance().getWords(10);
- public static final String ZUSTAENDIGE_STELLE = UUID.randomUUID().toString();
public static final String COLLABORATION_VORGANG_ID = UUID.randomUUID().toString();
- public static final int COLLABORATION_lEVEL = 1;
+ public static final int COLLABORATION_LEVEL = 1;
+
+ private static final String TECHNICAL_ID = FachstelleTestFactory.TECHNICAL_ID;
+ private static final String SUBJECT_ID = FachstelleTestFactory.SUBJECT_ID;
+ private static final FachstelleType TYPE = FachstelleType.ORGANISATION_EINHEIT;
private final Vorgang vorgang = VorgangTestFactory.create();
@@ -371,11 +394,14 @@ class CollaborationITCase {
CollaborationRequest.PROPERTY_COMMAND_ID, CommandTestFactory.ID,
CollaborationRequest.PROPERTY_VORGANG_ID, VorgangTestFactory.ID,
CollaborationRequest.PROPERTY_COLLABORATION_VORGANG_ID, COLLABORATION_VORGANG_ID,
- CollaborationRequest.PROPERTY_COLLABORATION_LEVEL, String.valueOf(COLLABORATION_lEVEL),
+ CollaborationRequest.PROPERTY_COLLABORATION_LEVEL, String.valueOf(COLLABORATION_LEVEL),
CollaborationRequest.PROPERTY_CREATED_BY, CommandTestFactory.CREATED_BY,
CollaborationRequest.PROPERTY_TITEL, TITEL,
CollaborationRequest.PROPERTY_BESCHREIBUNG, BESCHREIBUNG,
- CollaborationRequest.PROPERTY_ZUSTAENDIGE_STELLE, ZUSTAENDIGE_STELLE);
+ CollaborationRequest.PROPERTY_ZUSTAENDIGE_STELLE, Map.of(
+ de.ozgcloud.collaboration.fachstelle.Fachstelle.PROPERTY_TECHNICAL_ID, TECHNICAL_ID,
+ de.ozgcloud.collaboration.fachstelle.Fachstelle.PROPERTY_SUBJECT_ID, SUBJECT_ID,
+ de.ozgcloud.collaboration.fachstelle.Fachstelle.PROPERTY_TYPE, TYPE.name()));
private final VorgangAttachedItem vorgangAttachedItem = VorgangAttachedItemTestFactory.createBuilder()
.id(null)
@@ -419,8 +445,8 @@ class CollaborationITCase {
assertThat(grpcCollaborationRequest.getId()).isEqualTo(savedCollaborationRequest.getId());
assertThat(grpcCollaborationRequest.getTitel()).isEqualTo(TITEL);
assertThat(grpcCollaborationRequest.getBeschreibung()).isEqualTo(BESCHREIBUNG);
- assertThat(grpcCollaborationRequest.getZustaendigeStelle()).isEqualTo(ZUSTAENDIGE_STELLE);
- assertThat(grpcCollaborationRequest.getCollaborationLevel()).isEqualTo(COLLABORATION_lEVEL);
+ assertThat(grpcCollaborationRequest.getZustaendigeStelle()).isEqualTo(TECHNICAL_ID);
+ assertThat(grpcCollaborationRequest.getCollaborationLevel()).isEqualTo(COLLABORATION_LEVEL);
assertThat(grpcCollaborationRequest.getCreatedBy()).isEqualTo(CommandTestFactory.CREATED_BY);
});
}
@@ -470,4 +496,5 @@ class CollaborationITCase {
return collaborationRequestStub.withInterceptors(new TestCallContextAttachingInterceptor());
}
}
+
}
\ No newline at end of file
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/CollaborationServiceTest.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/CollaborationServiceTest.java
index 01e063f2c45e20dcbd8a8fa3bbc4caa589205784..202002fb45f313d978d0f79bc0181a806deed13d 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/CollaborationServiceTest.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/CollaborationServiceTest.java
@@ -24,6 +24,7 @@
package de.ozgcloud.vorgang.collaboration;
import static org.assertj.core.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
import java.time.ZonedDateTime;
@@ -46,7 +47,6 @@ import de.ozgcloud.vorgang.vorgang.Vorgang;
import de.ozgcloud.vorgang.vorgang.VorgangHead;
import de.ozgcloud.vorgang.vorgang.VorgangHeadTestFactory;
import de.ozgcloud.vorgang.vorgang.VorgangTestFactory;
-import de.ozgcloud.vorgang.vorgang.ZustaendigeStelleTestFactory;
class CollaborationServiceTest {
@@ -62,7 +62,8 @@ class CollaborationServiceTest {
@Nested
class TestCreateCollaborationVorgang {
- private static final CreateCollaborationVorgangRequest CREATE_COLLABORATION_VORGANG_REQUEST = CreateCollaborationVorgangRequestTestFactory.create();
+ private static final CreateCollaborationVorgangRequest CREATE_COLLABORATION_VORGANG_REQUEST = CreateCollaborationVorgangRequestTestFactory
+ .create();
private static final String COLLABORATION_VORGANG_ID = "collaboration-vorgang-id";
private static final Vorgang SAVED_VORGANG = VorgangTestFactory.createBuilder().id(COLLABORATION_VORGANG_ID).build();
@@ -97,8 +98,8 @@ class CollaborationServiceTest {
verifyNoInteractions(publisher);
// TODO: aktiviere, wenn VorgangCreatedEvent veröffentlicht wird
- // verify(publisher).publishEvent(eventCaptor.capture());
- // assertThat(eventCaptor.getValue().getSource()).isEqualTo(COLLABORATION_VORGANG_ID);
+ // verify(publisher).publishEvent(eventCaptor.capture());
+ // assertThat(eventCaptor.getValue().getSource()).isEqualTo(COLLABORATION_VORGANG_ID);
}
@Test
@@ -228,10 +229,10 @@ class CollaborationServiceTest {
private static final ServiceKonto SERVICE_KONTO = ServiceKontoTestFactory.create();
@Test
- void shouldSetZustaendigeStelle() {
+ void shouldSetOrganisationsEinheitId() {
var result = getHeader();
- assertThat(result.getOrganisationsEinheitId()).isEqualTo(ZustaendigeStelleTestFactory.ORGANISATIONSEINHEIT_ID);
+ assertThat(result.getOrganisationsEinheitId()).isEqualTo(CreateCollaborationVorgangRequestTestFactory.ORGANISATIONSEINHEIT_ID);
}
@Test
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/CreateCollaborationVorgangRequestMapperTest.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/CreateCollaborationVorgangRequestMapperTest.java
index 813820f57598e988451867b6f263cf84da1c5d45..538564b81a70c301825e3125253829b10f88fcf4 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/CreateCollaborationVorgangRequestMapperTest.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/CreateCollaborationVorgangRequestMapperTest.java
@@ -25,17 +25,24 @@ package de.ozgcloud.vorgang.collaboration;
import static org.assertj.core.api.Assertions.*;
+import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.mapstruct.factory.Mappers;
+import org.mockito.InjectMocks;
class CreateCollaborationVorgangRequestMapperTest {
+ @InjectMocks
private final CreateCollaborationVorgangRequestMapper mapper = Mappers.getMapper(CreateCollaborationVorgangRequestMapper.class);
- @Test
- void shouldMapFromGrpc() {
- var result = mapper.mapFrom(GrpcCreateCollaborationRequestDataTestFactory.create());
+ @Nested
+ class TestMapFrom {
- assertThat(result).usingRecursiveComparison().ignoringFields("vorgang").isEqualTo(CreateCollaborationVorgangRequestTestFactory.create());
+ @Test
+ void shouldMapFromGrpc() {
+ var result = mapper.mapFrom(GrpcCreateCollaborationRequestDataTestFactory.create());
+
+ assertThat(result).usingRecursiveComparison().ignoringFields("vorgang").isEqualTo(CreateCollaborationVorgangRequestTestFactory.create());
+ }
}
}
\ No newline at end of file
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/CreateCollaborationVorgangRequestTestFactory.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/CreateCollaborationVorgangRequestTestFactory.java
index 642dd5385a37c04998ee35664c908cd91a1866f4..5cb6d604bff8fc6f0762fa4fb33e3aee7afc313b 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/CreateCollaborationVorgangRequestTestFactory.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/CreateCollaborationVorgangRequestTestFactory.java
@@ -23,12 +23,14 @@
*/
package de.ozgcloud.vorgang.collaboration;
+import java.util.UUID;
+
import de.ozgcloud.vorgang.collaboration.CreateCollaborationVorgangRequest.CreateCollaborationVorgangRequestBuilder;
import de.ozgcloud.vorgang.vorgang.VorgangTestFactory;
-import de.ozgcloud.vorgang.vorgang.ZustaendigeStelleTestFactory;
public class CreateCollaborationVorgangRequestTestFactory {
+ public static final String ORGANISATIONSEINHEIT_ID = UUID.randomUUID().toString();
public static final int COLLABORATION_LEVEL = 1;
public static CreateCollaborationVorgangRequest create() {
@@ -38,7 +40,7 @@ public class CreateCollaborationVorgangRequestTestFactory {
public static CreateCollaborationVorgangRequestBuilder createBuilder() {
return CreateCollaborationVorgangRequest.builder()
.vorgang(VorgangTestFactory.create())
- .zustaendigeStelle(ZustaendigeStelleTestFactory.ORGANISATIONSEINHEIT_ID)
+ .organisationsEinheitId(ORGANISATIONSEINHEIT_ID)
.collaborationLevel(COLLABORATION_LEVEL);
}
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/FachstelleTestFactory.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/FachstelleTestFactory.java
new file mode 100644
index 0000000000000000000000000000000000000000..fb7d82bf3137a889aebf6d7e3e7f4b6aecd6cb17
--- /dev/null
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/FachstelleTestFactory.java
@@ -0,0 +1,26 @@
+package de.ozgcloud.vorgang.collaboration;
+
+import java.util.UUID;
+
+import de.ozgcloud.collaboration.fachstelle.Fachstelle;
+import de.ozgcloud.collaboration.fachstelle.Fachstelle.FachstelleBuilder;
+import de.ozgcloud.collaboration.fachstelle.Fachstelle.FachstelleType;
+
+public class FachstelleTestFactory {
+
+ public static final String SUBJECT_ID = UUID.randomUUID().toString();
+ public static final String TECHNICAL_ID = UUID.randomUUID().toString();
+ public static final FachstelleType TYPE = FachstelleType.ORGANISATION_EINHEIT;
+
+ public static Fachstelle create() {
+ return createBuilder().build();
+ }
+
+ public static FachstelleBuilder createBuilder() {
+ return Fachstelle.builder()
+ .subjectId(SUBJECT_ID)
+ .technicalId(TECHNICAL_ID)
+ .type(TYPE);
+ }
+
+}
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/GrpcCreateCollaborationRequestDataTestFactory.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/GrpcCreateCollaborationRequestDataTestFactory.java
index 139b28a5ce95adaf82e99e464cc31c36bb67424f..74da3279207eee66dabaee50c77e185d7073da78 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/GrpcCreateCollaborationRequestDataTestFactory.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/GrpcCreateCollaborationRequestDataTestFactory.java
@@ -25,7 +25,6 @@ package de.ozgcloud.vorgang.collaboration;
import de.ozgcloud.vorgang.vorgang.GrpcCreateCollaborationRequestData;
import de.ozgcloud.vorgang.vorgang.VorgangTestFactory;
-import de.ozgcloud.vorgang.vorgang.ZustaendigeStelleTestFactory;
public class GrpcCreateCollaborationRequestDataTestFactory {
@@ -36,7 +35,7 @@ public class GrpcCreateCollaborationRequestDataTestFactory {
public static GrpcCreateCollaborationRequestData.Builder createBuilder() {
return GrpcCreateCollaborationRequestData.newBuilder()
.setVorgangId(VorgangTestFactory.ID)
- .setZustaendigeStelle(ZustaendigeStelleTestFactory.ORGANISATIONSEINHEIT_ID)
+ .setOrganisationEinheitId(CreateCollaborationVorgangRequestTestFactory.ORGANISATIONSEINHEIT_ID)
.setCollaborationLevel(CreateCollaborationVorgangRequestTestFactory.COLLABORATION_LEVEL);
}
}