Skip to content
Snippets Groups Projects
Commit e5d71f46 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-5571 Small refactoring

parent 3202778e
Branches
Tags
No related merge requests found
......@@ -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);
}
}
......@@ -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());
......
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();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment