From 36482777a933ed12df2b29cb238df3cc338d8d9b Mon Sep 17 00:00:00 2001
From: Felix Reichenbach <felix.reichenbach@mgm-tp.com>
Date: Wed, 19 Feb 2025 14:14:39 +0100
Subject: [PATCH] OZG-7472 OZG-7771 add organisationEinheitId to
organisationHeader
---
.../alfa/collaboration/OrganisationsEinheitHeader.java | 1 +
.../alfa/collaboration/OrganisationsEinheitHeaderMapper.java | 2 ++
.../collaboration/OrganisationsEinheitHeaderTestFactory.java | 4 +++-
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/collaboration/OrganisationsEinheitHeader.java b/alfa-service/src/main/java/de/ozgcloud/alfa/collaboration/OrganisationsEinheitHeader.java
index f29a5d8b3e..b62a4788a8 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/collaboration/OrganisationsEinheitHeader.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/collaboration/OrganisationsEinheitHeader.java
@@ -36,5 +36,6 @@ class OrganisationsEinheitHeader {
private String id;
private String name;
private Anschrift anschrift;
+ private String organisationEinheitId;
}
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/collaboration/OrganisationsEinheitHeaderMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/collaboration/OrganisationsEinheitHeaderMapper.java
index 073b6a098e..d582ab1f69 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/collaboration/OrganisationsEinheitHeaderMapper.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/collaboration/OrganisationsEinheitHeaderMapper.java
@@ -24,11 +24,13 @@
package de.ozgcloud.alfa.collaboration;
import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
import de.ozgcloud.zufi.grpc.organisationseinheit.GrpcOrganisationsEinheit;
@Mapper
interface OrganisationsEinheitHeaderMapper {
+ @Mapping(target = "organisationEinheitId", source = "xzufiId.id")
OrganisationsEinheitHeader fromGrpc(GrpcOrganisationsEinheit organisationsEinheit);
}
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/collaboration/OrganisationsEinheitHeaderTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/collaboration/OrganisationsEinheitHeaderTestFactory.java
index 81ac634cb4..86bb5efd53 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/collaboration/OrganisationsEinheitHeaderTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/collaboration/OrganisationsEinheitHeaderTestFactory.java
@@ -30,6 +30,7 @@ import de.ozgcloud.alfa.collaboration.OrganisationsEinheitHeader.OrganisationsEi
public class OrganisationsEinheitHeaderTestFactory {
public static final String ID = OrganisationsEinheitTestFactory.ID;
public static final String NAME = OrganisationsEinheitTestFactory.NAME;
+ public static final String ORGANISATION_EINHEIT_ID = GrpcXzufiIdTestFactory.ORGANISATIONS_EINHEIT_ID;
public static final Anschrift ANSCHRIFT = AnschriftTestFactory.create();
public static OrganisationsEinheitHeader create() {
@@ -40,6 +41,7 @@ public class OrganisationsEinheitHeaderTestFactory {
return OrganisationsEinheitHeader.builder()
.id(ID)
.name(NAME)
- .anschrift(ANSCHRIFT);
+ .anschrift(ANSCHRIFT)
+ .organisationEinheitId(ORGANISATION_EINHEIT_ID);
}
}
--
GitLab