From e5d71f461092ca600cfc91082a323baacc12f81a Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 28 May 2024 15:35:55 +0200
Subject: [PATCH] OZG-5571 Small refactoring
---
.../java/de/ozgcloud/alfa/bescheid/BescheidMapper.java | 9 +++------
.../de/ozgcloud/alfa/bescheid/BescheidMapperTest.java | 5 +++++
.../ozgcloud/alfa/bescheid/GrpcSentInfoTestFactory.java | 4 ++--
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidMapper.java
index 97161e464b..bf8932e3df 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidMapper.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidMapper.java
@@ -11,11 +11,12 @@ import com.google.protobuf.ProtocolStringList;
import de.ozgcloud.alfa.common.binaryfile.FileId;
import de.ozgcloud.alfa.common.binaryfile.FileIdMapper;
-import de.ozgcloud.alfa.common.user.UserId;
+import de.ozgcloud.alfa.common.user.UserIdMapper;
import de.ozgcloud.bescheid.GrpcBescheid;
import de.ozgcloud.bescheid.GrpcSentInfo;
-@Mapper(unmappedTargetPolicy = ReportingPolicy.ERROR, nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS, uses = FileIdMapper.class)
+@Mapper(unmappedTargetPolicy = ReportingPolicy.ERROR, nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS, uses = { FileIdMapper.class,
+ UserIdMapper.class })
interface BescheidMapper {
@Mapping(target = "attachments", source = "grpcBescheid.attachmentsList")
@@ -24,8 +25,4 @@ interface BescheidMapper {
List<FileId> fromProtocolStringList(ProtocolStringList value);
SentInfo fromGrpcSentInfo(GrpcSentInfo grpcSentInfo);
-
- default UserId map(String value) {
- return UserId.from(value);
- }
}
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/BescheidMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/BescheidMapperTest.java
index 9861b8bbf8..ddf307c06f 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/BescheidMapperTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/BescheidMapperTest.java
@@ -14,12 +14,15 @@ import org.mockito.Mock;
import de.ozgcloud.alfa.common.binaryfile.FileIdMapper;
import de.ozgcloud.alfa.common.user.UserId;
+import de.ozgcloud.alfa.common.user.UserIdMapper;
import de.ozgcloud.alfa.vorgang.VorgangHeaderTestFactory;
class BescheidMapperTest {
@Mock
private FileIdMapper fileIdMapper;
+ @Mock
+ private UserIdMapper userIdMapper;
@InjectMocks
private final BescheidMapper mapper = Mappers.getMapper(BescheidMapper.class);
@@ -100,6 +103,8 @@ class BescheidMapperTest {
@Test
void shouldMapSentBy() {
+ when(userIdMapper.fromString(GrpcSentInfoTestFactory.SENT_BY)).thenCallRealMethod();
+
var bescheid = map();
assertThat(bescheid.getSentInfo().getSentBy()).isEqualTo(expectedSentInfo.getSentBy());
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/GrpcSentInfoTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/GrpcSentInfoTestFactory.java
index 0607dc0a26..cf0dc48600 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/GrpcSentInfoTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/GrpcSentInfoTestFactory.java
@@ -1,14 +1,14 @@
package de.ozgcloud.alfa.bescheid;
import java.time.ZonedDateTime;
-import java.util.UUID;
+import de.ozgcloud.alfa.common.user.GrpcUserTestFactory;
import de.ozgcloud.bescheid.GrpcSentInfo;
public class GrpcSentInfoTestFactory {
public static final String SENT_AT = ZonedDateTime.now().toString();
- public static final String SENT_BY = UUID.randomUUID().toString();
+ public static final String SENT_BY = GrpcUserTestFactory.ID;
public static GrpcSentInfo create() {
return createBuilder().build();
--
GitLab