From 9cdc09fe1282c3afa63371f1c3011b53f0f400f5 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 3 Sep 2024 09:45:50 +0200
Subject: [PATCH] OZG-5899 fix bescheid mapping
---
.../src/main/java/de/ozgcloud/bescheid/BescheidMapper.java | 6 +++---
.../test/java/de/ozgcloud/bescheid/BescheidMapperTest.java | 5 ++++-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidMapper.java b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidMapper.java
index 40409deea..3e40177df 100644
--- a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidMapper.java
+++ b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidMapper.java
@@ -66,9 +66,9 @@ public interface BescheidMapper {
default Bescheid mapFromAttachedItem(AttachedItem item) {
var itemMap = item.getItem();
var builder = Bescheid.builder()
- .id(BescheidId.from(MapUtils.getString(itemMap, AttachedItem.PROPERTY_ID)))
- .version(MapUtils.getLongValue(itemMap, AttachedItem.PROPERTY_VERSION))
- .vorgangId(VorgangId.from(MapUtils.getString(itemMap, Bescheid.FIELD_VORGANG_ID)))
+ .id(BescheidId.from(item.getId()))
+ .version(item.getVersion())
+ .vorgangId(VorgangId.from(item.getVorgangId()))
.createdBy(UserId.from(MapUtils.getString(itemMap, Bescheid.FIELD_CREATED_BY)))
.bewilligt(MapUtils.getBoolean(itemMap, Bescheid.FIELD_BEWILLIGT))
.nachrichtText(Optional.ofNullable(MapUtils.getString(itemMap, Bescheid.FIELD_NACHRICHT_TEXT)))
diff --git a/bescheid-manager/src/test/java/de/ozgcloud/bescheid/BescheidMapperTest.java b/bescheid-manager/src/test/java/de/ozgcloud/bescheid/BescheidMapperTest.java
index b6b611b38..0abec882c 100644
--- a/bescheid-manager/src/test/java/de/ozgcloud/bescheid/BescheidMapperTest.java
+++ b/bescheid-manager/src/test/java/de/ozgcloud/bescheid/BescheidMapperTest.java
@@ -15,6 +15,7 @@ import org.mapstruct.factory.Mappers;
import org.mockito.InjectMocks;
import org.mockito.Spy;
+import de.ozgcloud.bescheid.vorgang.VorgangTestFactory;
import de.ozgcloud.common.attached_item.AttachedItemTestFactory;
class BescheidMapperTest {
@@ -66,7 +67,9 @@ class BescheidMapperTest {
@Test
void shouldMapItem() {
- var bescheid = mapper.mapFromAttachedItem(AttachedItemTestFactory.createBescheidWithoutDocument());
+ var bescheidWithoutDocument = AttachedItemTestFactory.createBescheidWithoutDocumentBuilder().vorgangId(VorgangTestFactory.ID_STR).build();
+
+ var bescheid = mapper.mapFromAttachedItem(bescheidWithoutDocument);
assertThat(bescheid).usingRecursiveComparison().isEqualTo(BescheidTestFactory.create());
}
--
GitLab