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

OZG-530 OZG-570 add mapper for file attachments

parent edafed48
No related branches found
No related tags found
No related merge requests found
...@@ -14,8 +14,7 @@ import org.mapstruct.Mapping; ...@@ -14,8 +14,7 @@ import org.mapstruct.Mapping;
import org.mapstruct.NullValueCheckStrategy; import org.mapstruct.NullValueCheckStrategy;
import org.mapstruct.NullValuePropertyMappingStrategy; import org.mapstruct.NullValuePropertyMappingStrategy;
@Mapper(uses = { AntragstellerMapper.class, @Mapper(uses = { AntragstellerMapper.class, EingangHeaderMapper.class, OzgFileMapper.class }, //
EingangHeaderMapper.class }, //
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE, // nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE, //
nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS, // nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS, //
collectionMappingStrategy = CollectionMappingStrategy.ADDER_PREFERRED) collectionMappingStrategy = CollectionMappingStrategy.ADDER_PREFERRED)
......
package de.itvsh.ozg.pluto.vorgang; package de.itvsh.ozg.pluto.vorgang;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Getter; import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.ToString; import lombok.ToString;
@Builder @Builder
@Getter @Getter
@NoArgsConstructor
@AllArgsConstructor(access = AccessLevel.PRIVATE)
@ToString @ToString
public class File { public class File {
......
package de.itvsh.ozg.pluto.vorgang;
import org.mapstruct.Mapper;
@Mapper
public interface OzgFileMapper {
File map(GrpcAttachment attachment);
File map(GrpcRepresentation representation);
}
...@@ -15,6 +15,7 @@ import org.junit.jupiter.api.Test; ...@@ -15,6 +15,7 @@ import org.junit.jupiter.api.Test;
import org.mapstruct.factory.Mappers; import org.mapstruct.factory.Mappers;
import org.mockito.InjectMocks; import org.mockito.InjectMocks;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.Spy;
class EingangMapperTest { class EingangMapperTest {
...@@ -26,6 +27,9 @@ class EingangMapperTest { ...@@ -26,6 +27,9 @@ class EingangMapperTest {
@Mock @Mock
private EingangHeaderMapper eingangHeaderMapper; private EingangHeaderMapper eingangHeaderMapper;
@Spy
private OzgFileMapper ozgFileMapper = Mappers.getMapper(OzgFileMapper.class);
@Nested @Nested
class TestGrpcEingangToEingang { class TestGrpcEingangToEingang {
...@@ -95,7 +99,6 @@ class EingangMapperTest { ...@@ -95,7 +99,6 @@ class EingangMapperTest {
@Test @Test
void shouldNotBeEmpty() { void shouldNotBeEmpty() {
var eingang = mapper.fromGrpc(grpcEingang); var eingang = mapper.fromGrpc(grpcEingang);
assertThat(eingang.getFormData()).isNotEmpty(); assertThat(eingang.getFormData()).isNotEmpty();
...@@ -103,7 +106,6 @@ class EingangMapperTest { ...@@ -103,7 +106,6 @@ class EingangMapperTest {
@Test @Test
void shouldHaveMappedSubForm() { void shouldHaveMappedSubForm() {
var eingang = mapper.fromGrpc(grpcEingang); var eingang = mapper.fromGrpc(grpcEingang);
assertThat(eingang.getFormData()).containsKey(TITLE); assertThat(eingang.getFormData()).containsKey(TITLE);
...@@ -112,7 +114,6 @@ class EingangMapperTest { ...@@ -112,7 +114,6 @@ class EingangMapperTest {
@DisplayName("mapped FormData should contain fields") @DisplayName("mapped FormData should contain fields")
@Test @Test
void fieldsInSubForm() { void fieldsInSubForm() {
var eingang = mapper.fromGrpc(grpcEingang); var eingang = mapper.fromGrpc(grpcEingang);
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
Map<String, Object> formData = (Map<String, Object>) eingang.getFormData().get(TITLE); Map<String, Object> formData = (Map<String, Object>) eingang.getFormData().get(TITLE);
...@@ -123,7 +124,6 @@ class EingangMapperTest { ...@@ -123,7 +124,6 @@ class EingangMapperTest {
@DisplayName("mapped FormData should contains subForm") @DisplayName("mapped FormData should contains subForm")
@Test @Test
void shouldHaveMappedSubFormWithSubForm() { void shouldHaveMappedSubFormWithSubForm() {
var eingang = mapper.fromGrpc(grpcEingang); var eingang = mapper.fromGrpc(grpcEingang);
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
Map<String, Object> formData = (Map<String, Object>) eingang.getFormData().get(TITLE); Map<String, Object> formData = (Map<String, Object>) eingang.getFormData().get(TITLE);
...@@ -134,7 +134,6 @@ class EingangMapperTest { ...@@ -134,7 +134,6 @@ class EingangMapperTest {
@DisplayName("mapped SubForm should contain field") @DisplayName("mapped SubForm should contain field")
@Test @Test
void subFormShouldContainField() { void subFormShouldContainField() {
var eingang = mapper.fromGrpc(grpcEingang); var eingang = mapper.fromGrpc(grpcEingang);
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
Map<String, Object> subForm = (Map<String, Object>) ((Map<String, Object>) eingang.getFormData().get(TITLE)).get(SUBFORM_NAME); Map<String, Object> subForm = (Map<String, Object>) ((Map<String, Object>) eingang.getFormData().get(TITLE)).get(SUBFORM_NAME);
...@@ -151,19 +150,16 @@ class EingangMapperTest { ...@@ -151,19 +150,16 @@ class EingangMapperTest {
@BeforeEach @BeforeEach
void init() { void init() {
eingang = mapper.fromGrpc(GrpcEingangTestFactory.create()); eingang = mapper.fromGrpc(GrpcEingangTestFactory.create());
} }
@Test @Test
void testAttachmentsCount() { void testAttachmentsCount() {
assertThat(eingang.getAttachments()).isNotNull().isNotEmpty().hasSize(1); assertThat(eingang.getAttachments()).isNotNull().isNotEmpty().hasSize(1);
} }
@Test @Test
void testAttachment1() { void testAttachment1() {
File attachment = eingang.getAttachments().get(0); File attachment = eingang.getAttachments().get(0);
assertThat(attachment.getId()).isEqualTo(FileTestFactory.ID); assertThat(attachment.getId()).isEqualTo(FileTestFactory.ID);
...@@ -173,13 +169,11 @@ class EingangMapperTest { ...@@ -173,13 +169,11 @@ class EingangMapperTest {
@Test @Test
void testRepresentationsCount() { void testRepresentationsCount() {
assertThat(eingang.getRepresentations()).isNotNull().isNotEmpty().hasSize(1); assertThat(eingang.getRepresentations()).isNotNull().isNotEmpty().hasSize(1);
} }
@Test @Test
void testRepresentation1() { void testRepresentation1() {
File representation = eingang.getRepresentations().get(0); File representation = eingang.getRepresentations().get(0);
assertThat(representation.getId()).isEqualTo(FileTestFactory.ID); assertThat(representation.getId()).isEqualTo(FileTestFactory.ID);
...@@ -191,7 +185,6 @@ class EingangMapperTest { ...@@ -191,7 +185,6 @@ class EingangMapperTest {
@Nested @Nested
class TestEingangToGrpcEingang { class TestEingangToGrpcEingang {
private final GrpcAntragsteller antragsteller = GrpcAntragstellerTestFactory.create(); private final GrpcAntragsteller antragsteller = GrpcAntragstellerTestFactory.create();
private final GrpcEingangHeader eingangHeader = GrpcEingangHeaderTestFactory.create(); private final GrpcEingangHeader eingangHeader = GrpcEingangHeaderTestFactory.create();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment